From 058987b78872be51a9165760984ec09018599a59 Mon Sep 17 00:00:00 2001
From: LT-Schmiddy <schmidalex1996@gmail.com>
Date: Sun, 24 Nov 2024 16:42:09 -0500
Subject: [PATCH] relocated game reset flag.

---
 include/zelda_config.h  | 2 --
 include/zelda_game.h    | 7 +++++--
 src/game/recomp_api.cpp | 5 +++++
 src/ui/ui_config.cpp    | 5 +----
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/include/zelda_config.h b/include/zelda_config.h
index 5a3c1a7..47c426b 100644
--- a/include/zelda_config.h
+++ b/include/zelda_config.h
@@ -89,8 +89,6 @@ namespace zelda64 {
 
     void open_quit_game_prompt();
     void open_reset_game_prompt();
-
-    extern bool should_game_reset;
 };
 
 #endif
diff --git a/include/zelda_game.h b/include/zelda_game.h
index ac63979..16be35d 100644
--- a/include/zelda_game.h
+++ b/include/zelda_game.h
@@ -2,8 +2,11 @@
 #define __ZELDA_GAME_H__
 
 namespace zelda64 {
-    void quicksave_save();
-    void quicksave_load();
+    // Quicksaving is disabled for now:
+    //void quicksave_save();
+    //void quicksave_load();
+
+    extern bool should_game_reset;
 };
 
 #endif
diff --git a/src/game/recomp_api.cpp b/src/game/recomp_api.cpp
index 5bb0cf7..3b0da56 100644
--- a/src/game/recomp_api.cpp
+++ b/src/game/recomp_api.cpp
@@ -3,6 +3,7 @@
 #include "librecomp/recomp.h"
 #include "librecomp/overlays.hpp"
 #include "zelda_config.h"
+#include "zelda_game.h"
 #include "recomp_input.h"
 #include "recomp_ui.h"
 #include "zelda_render.h"
@@ -14,6 +15,10 @@
 #include "ultramodern/ultramodern.hpp"
 #include "ultramodern/config.hpp"
 
+namespace zelda64 {
+    bool should_game_reset;
+}
+
 extern "C" void recomp_update_inputs(uint8_t* rdram, recomp_context* ctx) {
     recomp::poll_inputs();
 }
diff --git a/src/ui/ui_config.cpp b/src/ui/ui_config.cpp
index 4f712c7..93292bb 100644
--- a/src/ui/ui_config.cpp
+++ b/src/ui/ui_config.cpp
@@ -3,6 +3,7 @@
 #include "zelda_sound.h"
 #include "zelda_config.h"
 #include "zelda_debug.h"
+#include "zelda_game.h"
 #include "zelda_render.h"
 #include "promptfont.h"
 #include "ultramodern/config.hpp"
@@ -161,10 +162,6 @@ static bool sample_positions_supported = false;
 
 static bool cont_active = true;
 
-namespace zelda64 {
-	bool should_game_reset;
-}
-
 static recomp::InputDevice cur_device = recomp::InputDevice::Controller;
 
 int recomp::get_scanned_input_index() {