relocated game reset flag.

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

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

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();
 }

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() {