From 10ba7a961edf7b68aa3ad88753e9507122cdceb2 Mon Sep 17 00:00:00 2001
From: Mors <morsgames8@gmail.com>
Date: Fri, 18 Nov 2022 22:35:26 +0300
Subject: [PATCH] The actual fix for the debug object spawner

---
 src/game/debug.c | 3 ++-
 src/game/mario.c | 3 ---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/game/debug.c b/src/game/debug.c
index 7e55a74..f9925f1 100644
--- a/src/game/debug.c
+++ b/src/game/debug.c
@@ -509,6 +509,7 @@ void try_print_debug_mario_level_info(void) {
 void try_do_mario_debug_object_spawn(void) {
     UNUSED s32 unused;
 
+    if ((gPlayer1Controller->buttonDown & L_TRIG) && configDebugObjectSpawner) {
     //if (sDebugPage == DEBUG_PAGE_STAGEINFO && gDebugInfo[DEBUG_PAGE_ENEMYINFO][7] == 1) {
         if (gPlayer1Controller->buttonPressed & R_JPAD) {
             spawn_object_relative(0, 0, 100, 200, gCurrentObject, MODEL_KOOPA_SHELL, bhvKoopaShell);
@@ -521,7 +522,7 @@ void try_do_mario_debug_object_spawn(void) {
             spawn_object_relative(0, 0, 100, 200, gCurrentObject, MODEL_KOOPA_SHELL,
                                   bhvKoopaShellUnderwater);
         }
-    //}
+    }
 }
 
 // TODO: figure out what this is
diff --git a/src/game/mario.c b/src/game/mario.c
index 94ccec5..a6310bf 100644
--- a/src/game/mario.c
+++ b/src/game/mario.c
@@ -1904,9 +1904,6 @@ void handle_cheats() {
             /* 8133AFA0 0000 */ gControllers[0].buttonDown = (gControllers[0].buttonDown & 0xffffffffffff0000) | 0x0;
         }
     }
-
-    if ((gPlayer1Controller->buttonDown & L_TRIG) && configDebugObjectSpawner)
-        try_do_mario_debug_object_spawn();
 }
 
 u32 mario_has_improved_metal_cap(struct MarioState *m) {