it builds! also seed generation runs!

libultraship/libultraship/SohImGuiImpl.h

@@ -74,7 +74,6 @@ namespace SohImGui {
 
     void DrawMainMenuAndCalculateGameSize(void);
     
-    void GenerateRandomizerImgui();
     void DrawFramebufferAndGameInput(void);
     void Render(void);
     void CancelFrame(void);

soh/soh/Enhancements/randomizer/3drando/item_pool.hpp

@@ -4,6 +4,7 @@
 
 #include <cstddef>
 #include <vector>
+#include <stdint.h>
 
 class ItemLocation;
 

soh/soh/Enhancements/randomizer/3drando/music.hpp

@@ -2,7 +2,7 @@
 
 #include <array>
 #include <vector>
-
+#include <stdint.h>
 
 namespace Music {
     const uint32_t BGM_BASE  = 0x1000585;

soh/soh/Enhancements/randomizer/3drando/rando_main.cpp

@@ -4,7 +4,7 @@
 #include "item_location.hpp"
 #include "location_access.hpp"
 #include "rando_main.hpp"
-#include <soh/Enhancements/randomizer.h>
+// #include <soh/Enhancements/randomizer.h>
 #include <Cvar.h>
 #include <GameSettings.h>
 

soh/soh/Enhancements/randomizer/3drando/sound_effects.cpp

@@ -1,6 +1,7 @@
 #include "sound_effects.hpp"
 #include "settings.hpp"
 #include <cstdlib>
+#include <stdint.h>
 
 namespace SFX {
     const std::array<SeqType, SFX_COUNT> seqTypesSFX = {

soh/soh/Enhancements/randomizer/3drando/sound_effects.hpp

@@ -2,6 +2,7 @@
 
 #include <array>
 #include <vector>
+#include <stdint.h>
 
 #define SFX_BASE 0x1000001
 #define SFX_COUNT 1388

soh/soh/Enhancements/randomizer/3drando/starting_inventory.hpp

@@ -3,6 +3,7 @@
 #include "keys.hpp"
 
 #include <vector>
+#include <stdint.h>
 
 extern std::vector<uint32_t> StartingInventory;
 extern uint8_t AdditionalHeartContainers;

soh/soh/Enhancements/randomizer/randomizer.cpp

@@ -2056,6 +2056,20 @@ RandomizerCheck Randomizer::GetCheckFromActor(s16 sceneNum, s16 actorId, s16 act
 
 std::thread randoThread;
 
+void GenerateRandomizerImgui() {
+    CVar_SetS32("gRandoGenerating", 1);
+    Game::SaveSettings();
+
+    RandoMain::GenerateRando();
+
+    CVar_SetS32("gRandoGenerating", 0);
+    Game::SaveSettings();
+
+    Game::LoadSettings();
+
+    generated = 1;
+}
+
 void DrawRandoEditor(bool& open) {
     if (!open) {
         return;
@@ -2074,7 +2088,7 @@ void DrawRandoEditor(bool& open) {
     }
 
     if (ImGui::Button("Generate")) {
-        // GenerateRandomizerImgui();
+        GenerateRandomizerImgui();
     }
 
     // if (generated) {
@@ -2085,21 +2099,6 @@ void DrawRandoEditor(bool& open) {
     ImGui::End();
 }
 
-void GenerateRandomizerImgui() {
-    CVar_SetS32("gRandoGenerating", 1);
-    Game::SaveSettings();
-
-    // WHY CAN'T I FIND THIS??????????????????
-    RandoMain::GenerateRando();
-
-    CVar_SetS32("gRandoGenerating", 0);
-    Game::SaveSettings();
-
-    Game::LoadSettings();
-
-    generated = 1;
-}
-
 // void EnhancementCheckbox(const char* text, const char* cvarName)
 // {
 //     bool val = (bool)CVar_GetS32(cvarName, 0);

soh/soh/Enhancements/randomizer/randomizer.h

@@ -3,8 +3,8 @@
 
 #include <unordered_map>
 #include <string>
-#include "../../include/ultra64.h"
-#include "../../include/z64item.h"
+#include "../../../include/ultra64.h"
+#include "../../../include/z64item.h"
 // #include "randomizer/keys.hpp"
 // #include <randomizer/spoiler_log.hpp>
 #include <randomizerTypes.h>

soh/soh/OTRGlobals.cpp

@@ -29,7 +29,7 @@
 #include "AudioPlayer.h"
 #include "Enhancements/debugconsole.h"
 #include "Enhancements/debugger/debugger.h"
-#include "Enhancements/randomizer.h"
+#include "Enhancements/randomizer/randomizer.h"
 #include "soh/frame_interpolation.h"
 #include "Utils/BitConverter.h"
 #include "variables.h"

soh/soh/OTRGlobals.h

@@ -7,7 +7,7 @@
 
 #ifdef __cplusplus
 #include "Enhancements/savestates.h"
-#include "Enhancements/randomizer.h"
+#include "Enhancements/randomizer/randomizer.h"
 // #include "randomizer/spoiler_log.hpp"
 
 class OTRGlobals