From 6e0f577d54f48b77c6e1e7e58cbeddc5311d8c57 Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Tue, 13 Feb 2024 00:29:46 -0500
Subject: [PATCH] debugger fixes

---
 source/funkin/InitState.hx                    |  5 ++---
 source/funkin/play/GameOverSubState.hx        |  1 +
 source/funkin/play/PauseSubState.hx           |  2 +-
 source/funkin/play/PlayState.hx               | 20 +++++++++----------
 .../ui/debug/charting/ChartEditorState.hx     |  2 +-
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/source/funkin/InitState.hx b/source/funkin/InitState.hx
index 21946819f..09afe6cf4 100644
--- a/source/funkin/InitState.hx
+++ b/source/funkin/InitState.hx
@@ -89,7 +89,7 @@ class InitState extends FlxState
     //
     // FLIXEL DEBUG SETUP
     //
-    #if debug
+    #if (debug || FORCE_DEBUG_VERSION)
     // Disable using ~ to open the console (we use that for the Editor menu)
     FlxG.debugger.toggleKeys = [F2];
 
@@ -141,16 +141,15 @@ class InitState extends FlxState
       FlxG.sound.music.pause();
       FlxG.sound.music.time += FlxG.elapsed * 1000;
     });
+    #end
 
     // Make errors and warnings less annoying.
-    // TODO: Disable this so we know to fix warnings.
     #if FORCE_DEBUG_VERSION
     LogStyle.ERROR.openConsole = false;
     LogStyle.ERROR.errorSound = null;
     LogStyle.WARNING.openConsole = false;
     LogStyle.WARNING.errorSound = null;
     #end
-    #end
 
     //
     // FLIXEL TRANSITIONS
diff --git a/source/funkin/play/GameOverSubState.hx b/source/funkin/play/GameOverSubState.hx
index 36f72237e..f6d75c61b 100644
--- a/source/funkin/play/GameOverSubState.hx
+++ b/source/funkin/play/GameOverSubState.hx
@@ -90,6 +90,7 @@ class GameOverSubState extends MusicBeatSubState
   {
     animationSuffix = "";
     musicSuffix = "";
+    blueBallSuffix = "";
   }
 
   override public function create()
diff --git a/source/funkin/play/PauseSubState.hx b/source/funkin/play/PauseSubState.hx
index c9039ce40..77999b60a 100644
--- a/source/funkin/play/PauseSubState.hx
+++ b/source/funkin/play/PauseSubState.hx
@@ -168,7 +168,7 @@ class PauseSubState extends MusicBeatSubState
     var downP = controls.UI_DOWN_P;
     var accepted = controls.ACCEPT;
 
-    #if debug
+    #if (debug || FORCE_DEBUG_VERSION)
     // to pause the game and get screenshots easy, press H on pause menu!
     if (FlxG.keys.justPressed.H)
     {
diff --git a/source/funkin/play/PlayState.hx b/source/funkin/play/PlayState.hx
index aee9f2210..c9d41f254 100644
--- a/source/funkin/play/PlayState.hx
+++ b/source/funkin/play/PlayState.hx
@@ -638,7 +638,7 @@ class PlayState extends MusicBeatSubState
     rightWatermarkText.cameras = [camHUD];
 
     // Initialize some debug stuff.
-    #if debug
+    #if (debug || FORCE_DEBUG_VERSION)
     // Display the version number (and git commit hash) in the bottom right corner.
     this.rightWatermarkText.text = Constants.VERSION;
 
@@ -907,7 +907,7 @@ class PlayState extends MusicBeatSubState
 
         // Disable updates, preventing animations in the background from playing.
         persistentUpdate = false;
-        #if debug
+        #if (debug || FORCE_DEBUG_VERSION)
         if (FlxG.keys.pressed.THREE)
         {
           // TODO: Change the key or delete this?
@@ -918,7 +918,7 @@ class PlayState extends MusicBeatSubState
         {
         #end
           persistentDraw = false;
-        #if debug
+        #if (debug || FORCE_DEBUG_VERSION)
         }
         #end
 
@@ -1368,7 +1368,7 @@ class PlayState extends MusicBeatSubState
       // Add the stage to the scene.
       this.add(currentStage);
 
-      #if debug
+      #if (debug || FORCE_DEBUG_VERSION)
       FlxG.console.registerObject('stage', currentStage);
       #end
     }
@@ -1458,7 +1458,7 @@ class PlayState extends MusicBeatSubState
       {
         currentStage.addCharacter(girlfriend, GF);
 
-        #if debug
+        #if (debug || FORCE_DEBUG_VERSION)
         FlxG.console.registerObject('gf', girlfriend);
         #end
       }
@@ -1467,7 +1467,7 @@ class PlayState extends MusicBeatSubState
       {
         currentStage.addCharacter(boyfriend, BF);
 
-        #if debug
+        #if (debug || FORCE_DEBUG_VERSION)
         FlxG.console.registerObject('bf', boyfriend);
         #end
       }
@@ -1478,7 +1478,7 @@ class PlayState extends MusicBeatSubState
         // Camera starts at dad.
         cameraFollowPoint.setPosition(dad.cameraFocusPoint.x, dad.cameraFocusPoint.y);
 
-        #if debug
+        #if (debug || FORCE_DEBUG_VERSION)
         FlxG.console.registerObject('dad', dad);
         #end
       }
@@ -2253,7 +2253,7 @@ class PlayState extends MusicBeatSubState
         }));
     }
 
-    #if debug
+    #if (debug || FORCE_DEBUG_VERSION)
     // 1: End the song immediately.
     if (FlxG.keys.justPressed.ONE) endSong();
 
@@ -2267,7 +2267,7 @@ class PlayState extends MusicBeatSubState
     // 9: Toggle the old icon.
     if (FlxG.keys.justPressed.NINE) iconP1.toggleOldIcon();
 
-    #if debug
+    #if (debug || FORCE_DEBUG_VERSION)
     // PAGEUP: Skip forward two sections.
     // SHIFT+PAGEUP: Skip forward twenty sections.
     if (FlxG.keys.justPressed.PAGEUP) changeSection(FlxG.keys.pressed.SHIFT ? 20 : 2);
@@ -2768,7 +2768,7 @@ class PlayState extends MusicBeatSubState
     FlxG.camera.focusOn(cameraFollowPoint.getPosition());
   }
 
-  #if debug
+  #if (debug || FORCE_DEBUG_VERSION)
   /**
    * Jumps forward or backward a number of sections in the song.
    * Accounts for BPM changes, does not prevent death from skipped notes.
diff --git a/source/funkin/ui/debug/charting/ChartEditorState.hx b/source/funkin/ui/debug/charting/ChartEditorState.hx
index dab79a21c..759a54ec7 100644
--- a/source/funkin/ui/debug/charting/ChartEditorState.hx
+++ b/source/funkin/ui/debug/charting/ChartEditorState.hx
@@ -3183,7 +3183,7 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
     handleTestKeybinds();
     handleHelpKeybinds();
 
-    #if debug
+    #if (debug || FORCE_DEBUG_VERSION)
     handleQuickWatch();
     #end