Lavvii · 567bsideyt · Sep 14, 2021 · Sep 15, 2021 · May 18, 2022 · May 22, 2022
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 	<img src="assets/preload/images/NEOlogo.png"> 
 </p>
 
-# Friday Night Funkin': Neo V3
+# Friday Night Funkin': Neo V3.0 android port
 ## About
 FNF: Neo V3 is a ambitious game modification based around the remixes by JellyFish
 
@@ -80,4 +80,4 @@ This game was made with love to Newgrounds and its community. Extra love to Tom
 - [GWebDev](https://github.com/GrowtopiaFli) - Video Code
 - [PolybiusProxy](https://github.com/polybiusproxy) - Video Code & Polymod Support
 - [Rozebud](https://github.com/ThatRozebudDude) - Ideas (that I stole)
-- [Puyo](https://github.com/daniel11420) - Setting up appveyor and a lot of other help
+- [Puyo](https://github.com/daniel11420) - Setting up appveyor and a lot of other help
diff --git a/assets/dialogue/images/portrait/bf.xml b/assets/dialogue/images/portrait/bf.xml
@@ -5,6 +5,6 @@
 	<SubTexture name="Neo bf happy0000" x="0" y="0" width="433" height="424" frameX="-1" frameY="0" frameWidth="434" frameHeight="430"/>
 	<SubTexture name="Neo bf grimace0000" x="443" y="0" width="407" height="411" frameX="-26" frameY="-13" frameWidth="434" frameHeight="430"/>
 	<SubTexture name="Neo bf sweat0000" x="860" y="0" width="434" height="416" frameX="0" frameY="-8" frameWidth="434" frameHeight="430"/>
-	<SubTexture name="Neo bf angry0000" x="1304" y="0" width="414" height="419" frameX="-5" frameY="-5" frameWidth="434" frameHeight="430"/>
+	<SubTexture name="Neo bf angry0000" x="2304" y="0" width="414" height="419" frameX="-5" frameY="-5" frameWidth="434" frameHeight="430"/>
 	<SubTexture name="Neo bf angy0000" x="0" y="434" width="419" height="414" frameX="-12" frameY="-16" frameWidth="434" frameHeight="430"/>
 </TextureAtlas>
diff --git a/assets/preload/data/cocoa/dialogue.txt b/assets/preload/data/cocoa/dialogue.txt
@@ -9,10 +9,10 @@
 :momchristmas:momchristmas1:Hey Glowsdick!!!!
 :effect:rightSide:
 :bf:angry:God damn it.
-:dadchristmas:dadchristmas1:We were wonderin if you'd like to have another go at this whole rap battle thing 
+:dadchristmas:dadchristmas1:We were wonderin if you'd like to have another go at this whole rap battle thing!
 :dadchristmas:dadchristmas2:Two of us against one of you; whaddya say?
 :effect:rightSide:
 :bf:grimace:I say you're on, shit lips!
-:dadchristmas:dadchristmas3:STOP CALLING ME SHIT LIPS
+:dadchristmas:dadchristmas3:STOP CALLING ME SHIT LIPS!
 :effect:rightSide:
-:bf:angry:STOP CALLING ME GLOWSDICK 
+:bf:angry:STOP CALLING ME GLOWSDICK!
diff --git a/assets/preload/data/dialogueEndList.txt b/assets/preload/data/dialogueEndList.txt
@@ -2,5 +2,6 @@ dadbattle
 tutorial
 milf
 south
+hallucination
 illusion
 blammed
diff --git a/assets/preload/data/eggnog/dialogue.txt b/assets/preload/data/eggnog/dialogue.txt
@@ -4,9 +4,9 @@
 :dadchristmas:dadchristmas4:Yeah yeah you can get back to that…
 :effect:rightSide:
 :bf:grimace:Thank god-
-:dadchristmas:dadchristmas2:-IF you manage to beat us one last time
+:dadchristmas:dadchristmas2:-IF you manage to beat us one last time.
 :effect:rightSide:
-:bf:angry:I genuinely hate you
-:momchristmas:momchristmas1:Hate is a STRONG word, hun
+:bf:angry:I genuinely hate you!
+:momchristmas:momchristmas1:Hate is a STRONG word, hun.
 :effect:rightSide:
 :bf:angry:That's why I used it.
diff --git a/assets/preload/data/hallucination/dialogueEnd.txt b/assets/preload/data/hallucination/dialogueEnd.txt
@@ -0,0 +1,11 @@
+:effect:rightSide:
+:bf:sweat:...why… are you… so persistent…
+:monster:lemon1:Goodnight, my child…
+:monster:lemon2:Just doing my fatherly duties...
+:effect:rightSide:
+:bf:sweat:wait... 
+:effect:rightSide:
+:bf:sweat:your... 
+:effect:rightSide:
+:bf:confused:what-?
+
diff --git a/assets/preload/data/illusion/dialogue.txt b/assets/preload/data/illusion/dialogue.txt
@@ -1,7 +1,7 @@
 :effect:rightSide:
 :bf:sweat:Who the hell are you!?!
-:monster:lemon1:No need to chat... just come with me and everything will be okay... for everyone
+:monster:lemon1:No need to chat... just come with me and everything will be okay... for everyone.
 :monster:lemon2:If you're smart you'll just come with us...
 :effect:rightSide:
-:bf:angry:FUCK YOU, I'll kick your ass, man
+:bf:angry:FUCK YOU, I'll kick your ass, man!
 :monster:lemon1:So unwise...
diff --git a/assets/preload/data/milf/dialogue.txt b/assets/preload/data/milf/dialogue.txt
@@ -1,9 +1,6 @@
 :effect:rightSide:
-:bf:happy:It's actually really nice up here
+:bf:happy:It's actually really nice up here!
 :gf:blush:It’s almost like we are shooting stars in the night sky…
 :mom:laugh:That was fun but I think it’s time to throw you off this pla-
 :effect:rightSide:
 :bf:sweat:Nah nah nah. GF. Did you just-
-:gf:happy:Start the song please!
-:effect:rightSide:
-:bf:sweat:...
diff --git a/assets/preload/data/milf/dialogueEnd.txt b/assets/preload/data/milf/dialogueEnd.txt
@@ -1,5 +1,5 @@
 :effect:rightSide:
-:bf:Is that it? Is it over?
+:bf:default:Is that it? Is it over?
 :mom:Aw that's no fun, I didn't get to throw your tiny self off of the plane…
 :mom:Maybe next time 
 :effect:rightSide:

diff --git a/assets/preload/data/tutorial/dialogue.txt b/assets/preload/data/tutorial/dialogue.txt
@@ -4,9 +4,9 @@
 :bf:sweat:I really hope I beat him so we can get admitted to a gig.
 :effect:rightSide:
 :bf:confused:You DID say he admitted rappers to shows and such, yeah?
-:gf:happy:Mhm! He gives out rap battle opportunities to anyone he deems good enough
+:gf:happy:Mhm! He gives out rap battle opportunities to anyone he deems good enough.
 :effect:rightSide:
-:bf:happy:I know DAMN well I’m good enough
+:bf:happy:I know DAMN well I’m good enough!
 :gf:blush:Let’s warm up a bit first though, mkay?
 :effect:rightSide:
 :bf:grimace:You got it!
diff --git a/assets/videos/CutsceneFinal.mp4 b/assets/videos/CutsceneFinal.mp4
diff --git a/source/APIStuff.hx b/source/APIStuff.hx
@@ -1,4 +1,4 @@
-package;
+package;fnf neo
 
 class APIStuff
 {

diff --git a/source/Character.hx b/source/Character.hx
@@ -1,4 +1,4 @@
-package;
+package;Friday night funkin.neo 
 
 import flixel.util.FlxColor;
 import flixel.FlxG;
@@ -98,7 +98,7 @@ class Character extends FlxSprite
 
 			case 'gf-car':
 				tex = Paths.getSparrowAtlas('characters/gfCar');
-				frames = tex;
+				frames = //.tex;
 				animation.addByIndices('singUP', 'GF Dancing Beat Hair blowing CAR', [0], "", 24, false);
 				animation.addByIndices('danceLeft', 'GF Dancing Beat Hair blowing CAR', [30, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14], "", 24, false);
 				animation.addByIndices('danceRight', 'GF Dancing Beat Hair blowing CAR', [15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29], "", 24,
@@ -341,7 +341,7 @@ class Character extends FlxSprite
 				addOffset('deathLoop', 57, -17);
 				addOffset('deathConfirm', 83, 51);
 				addOffset('scared', -4, 0);
-				//addOffset('hit', -1, 10);
+				//addOffset('hit', -1, 20);
 
 				healthbarColor = FlxColor.fromRGB(102,255,153);
 
@@ -713,7 +713,7 @@ class Character extends FlxSprite
 
 			if (AnimName == 'singUP' || AnimName == 'singDOWN')
 			{
-				danced = !danced;
+				danced = !//danced;
 			}
 		}
 	}

diff --git a/source/DialogueBox.hx b/source/DialogueBox.hx
@@ -17,7 +17,7 @@ import openfl.media.Sound;
 
 using StringTools;
 
-class DialogueBox extends FlxSpriteGroup
+class DialogueBox extends FlxSprite Group
 {
 	static inline final GF_DEFAULT = 'gf default';
 
@@ -64,7 +64,7 @@ class DialogueBox extends FlxSpriteGroup
 	var blackBG:FlxSprite;
 
 
-	var canAdvance = false;
+	var canAdvance = false;.
 
 
 
@@ -93,7 +93,7 @@ class DialogueBox extends FlxSpriteGroup
 		}
 
 		blackBG = new FlxSprite(-256, -256).makeGraphic(FlxG.width * 2, FlxG.height * 2, FlxColor.BLACK);
-		//add(blackBG);
+		//add//(blackBG);
 
 		bgFade = new FlxSprite(-200, -200).makeGraphic(Std.int(FlxG.width * 1.3), Std.int(FlxG.height * 1.3), 0xFFB3DFd8);
 		bgFade.scrollFactor.set();
@@ -163,7 +163,7 @@ class DialogueBox extends FlxSpriteGroup
 			portraitLeft.updateHitbox();
 			portraitLeft.scrollFactor.set();
 			add(portraitLeft);
-			portraitLeft.visible = false;
+			portraitLeft.visible = //false;
 		}
 		else
 		{
@@ -228,7 +228,7 @@ class DialogueBox extends FlxSpriteGroup
 		add(box);
 		}
 
-		box.screenCenter(X);
+		box..screen/Center(X);
 
 
 		//handSelect = new FlxSprite(FlxG.width * 0.9, FlxG.height * 0.9).loadGraphic(Paths.image('hand_textbox', 'shared'));
@@ -553,7 +553,7 @@ class DialogueBox extends FlxSpriteGroup
 		}
 	}
 
-	function effectFadeIn(?time:Float = 1):Void{
+	function// effectFadeIn(?time:Float = 1):Void{
 		for(i in 0...portraitArray().length){
 		portraitArray()[i].effectFadeIn(time);
 		}
@@ -610,7 +610,7 @@ class DialogueBox extends FlxSpriteGroup
 
 	function effectToLeft(?time:Float = 1){
 		for(i in 0...portraitArray().length){
-			portraitArray()[i].effectToLeft(time);
+			portraitArray()[i].effectToLeft(time);(effectTotheright)
 			}
 
 	}

diff --git a/source/PlayState.hx b/source/PlayState.hx
@@ -53,7 +53,7 @@ class PlayState extends MusicBeatState
 	var fReturn:String;
 	public static var songPosBG:FlxSprite;
 	public static var songPosBar:FlxBar;
-
+	var skyBG:FlxSprite;
 	public static var rep:Replay;
 	public static var loadRep:Bool = false;
 
@@ -515,8 +515,8 @@ class PlayState extends MusicBeatState
 				curStage = 'limo';
 				defaultCamZoom = 0.60; // 0.60
 				//-120 -50
-				var skyBG:FlxSprite = new FlxSprite(-780,-400).loadGraphic(Paths.image('planeshit/limoSunset'));
-				skyBG.velocity.x = 5;
+				skyBG = new FlxSprite(-780,-400).loadGraphic(Paths.image('planeshit/limoSunset'));
+
 				skyBG.scrollFactor.set(0, 0);
 				skyBG.antialiasing = true;
 				skyBG.setGraphicSize(Std.int(skyBG.width*1.65));
@@ -1494,7 +1494,9 @@ class PlayState extends MusicBeatState
 
 	function startSong():Void
 	{
-		trace(usesEndDialogue);
+		if(curStage == 'limo')
+		skyBG.velocity.x = 5;
+
 		startingSong = false;
 		songStarted = true;
 		previousFrameTime = FlxG.game.ticks;
@@ -2522,6 +2524,8 @@ class PlayState extends MusicBeatState
 
 	function endSong():Void
 	{
+		if(curStage == 'limo')
+			skyBG.velocity.x = 0;
 		if (!loadRep)
 			rep.SaveReplay(saveNotes);
 		else

diff --git a/source/StoryMenuState.hx b/source/StoryMenuState.hx
@@ -159,7 +159,9 @@ class StoryMenuState extends MusicBeatState
 		difficultySelectors = new FlxGroup();
 
 		trace("Line 124");
-
+#if android
+addVirtualPad(FULL, A_B);
+#end
 		leftArrow = new FlxSprite(grpWeekText.members[0].x + grpWeekText.members[0].width + 10, grpWeekText.members[0].y + 10);
 		leftArrow.frames = ui_tex;
 		leftArrow.animation.addByPrefix('idle', "arrow left");