From e4f21d9ba7115f678671c02c066ee152d76e87af Mon Sep 17 00:00:00 2001
From: MtH <mth@mth.moe>
Date: Sun, 11 Apr 2021 18:41:23 +0200
Subject: [PATCH 1/2] bf gf dead offsets also lets you enter anim debug from
 game over screen, and with player1 if holding shift

---
 source/GameOverSubstate.hx | 10 ++++++----
 source/PlayState.hx        |  7 ++++++-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/source/GameOverSubstate.hx b/source/GameOverSubstate.hx
index c427e140d..c0b6d516f 100644
--- a/source/GameOverSubstate.hx
+++ b/source/GameOverSubstate.hx
@@ -23,10 +23,7 @@ class GameOverSubstate extends MusicBeatSubstate
 		var daBf:String = '';
 		switch (daStage)
 		{
-			case 'school':
-				stageSuffix = '-pixel';
-				daBf = 'bf-pixel-dead';
-			case 'schoolEvil':
+			case 'school' | 'schoolEvil':
 				stageSuffix = '-pixel';
 				daBf = 'bf-pixel-dead';
 			default:
@@ -92,6 +89,11 @@ class GameOverSubstate extends MusicBeatSubstate
 				FlxG.switchState(new FreeplayState());
 		}
 
+		#if debug
+		if (FlxG.keys.justPressed.EIGHT)
+			FlxG.switchState(new AnimationDebug(bf.curCharacter));
+		#end
+
 		if (bf.animation.curAnim.name == 'firstDeath' && bf.animation.curAnim.curFrame == 12)
 		{
 			FlxG.camera.follow(camFollow, LOCKON, 0.01);
diff --git a/source/PlayState.hx b/source/PlayState.hx
index 25a4ffcae..3de0871bd 100644
--- a/source/PlayState.hx
+++ b/source/PlayState.hx
@@ -1976,7 +1976,12 @@ class PlayState extends MusicBeatState
 
 		#if debug
 		if (FlxG.keys.justPressed.EIGHT)
-			FlxG.switchState(new AnimationDebug(SONG.player2));
+		{
+			if (FlxG.keys.pressed.SHIFT)
+				FlxG.switchState(new AnimationDebug(SONG.player1));
+			else
+				FlxG.switchState(new AnimationDebug(SONG.player2));
+		}
 		#end
 
 		if (generatedMusic && SONG.notes[Std.int(curStep / 16)] != null)

From b4274343c590cbf03904b8c2155abf89cf6a8546 Mon Sep 17 00:00:00 2001
From: MtH <mth@mth.moe>
Date: Mon, 12 Apr 2021 00:53:37 +0200
Subject: [PATCH 2/2] double gf on tutorial fix and inCutscene for week7

---
 source/PlayState.hx | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/source/PlayState.hx b/source/PlayState.hx
index 3de0871bd..59f6eaad3 100644
--- a/source/PlayState.hx
+++ b/source/PlayState.hx
@@ -928,6 +928,8 @@ class PlayState extends MusicBeatState
 
 	function ughIntro()
 	{
+		inCutscene = true;
+
 		FlxG.sound.playMusic(Paths.music('DISTORTO'), 0);
 		FlxG.sound.music.fadeIn(5, 0, 0.5);
 
@@ -957,7 +959,9 @@ class PlayState extends MusicBeatState
 			{
 				boyfriend.playAnim('singUP');
 				// play sound
-				FlxG.sound.play(Paths.sound('bfBeep'));
+				FlxG.sound.play(Paths.sound('bfBeep'), function() {
+					boyfriend.playAnim('idle');
+				});
 			});
 
 			new FlxTimer().start(3, function(swaggy:FlxTimer)
@@ -990,6 +994,8 @@ class PlayState extends MusicBeatState
 
 	function gunsIntro()
 	{
+		inCutscene = true;
+
 		camFollow.setPosition(camPos.x, camPos.y);
 
 		camHUD.visible = false;
@@ -1048,6 +1054,8 @@ class PlayState extends MusicBeatState
 
 	function stressIntro()
 	{
+		inCutscene = true;
+
 		// for story mode shit
 		camFollow.setPosition(camPos.x, camPos.y);
 
@@ -1382,8 +1390,6 @@ class PlayState extends MusicBeatState
 
 	function startCountdown():Void
 	{
-		gf.visible = true;
-
 		inCutscene = false;
 
 		generateStaticArrows(0);