From fe3e53493850c2f7f897d27a31dc8bee916ce50c Mon Sep 17 00:00:00 2001
From: KiritoDev <36680385+KiritoDv@users.noreply.github.com>
Date: Wed, 11 May 2022 12:35:03 -0500
Subject: [PATCH 01/43] Implemented overlay command and api (#289)

* Added overlay command

* Moved Overlays to GameOverlay

* Added custom text size calculation

* Fixed string cvar load and added fipps font
---
 .../ship_of_harkinian/fonts/Fipps-Regular.otf | Bin 0 -> 34220 bytes
 .../fonts/PressStart2P-Regular.ttf            | Bin 0 -> 116008 bytes
 libultraship/libultraship/GameOverlay.cpp     | 186 ++++++++++++++++++
 libultraship/libultraship/GameOverlay.h       |  38 ++++
 libultraship/libultraship/SohImGuiImpl.cpp    |  11 +-
 libultraship/libultraship/SohImGuiImpl.h      |   3 +
 .../libultraship/libultraship.vcxproj         |   2 +
 .../libultraship/libultraship.vcxproj.filters |   9 +
 soh/soh/Enhancements/debugconsole.cpp         |  12 +-
 9 files changed, 259 insertions(+), 2 deletions(-)
 create mode 100644 OTRExporter/assets/ship_of_harkinian/fonts/Fipps-Regular.otf
 create mode 100644 OTRExporter/assets/ship_of_harkinian/fonts/PressStart2P-Regular.ttf
 create mode 100644 libultraship/libultraship/GameOverlay.cpp
 create mode 100644 libultraship/libultraship/GameOverlay.h

diff --git a/OTRExporter/assets/ship_of_harkinian/fonts/Fipps-Regular.otf b/OTRExporter/assets/ship_of_harkinian/fonts/Fipps-Regular.otf
new file mode 100644
index 0000000000000000000000000000000000000000..9334dad594277ba8339786217d75260e58436dc8
GIT binary patch
literal 34220
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

literal 0
HcmV?d00001

diff --git a/OTRExporter/assets/ship_of_harkinian/fonts/PressStart2P-Regular.ttf b/OTRExporter/assets/ship_of_harkinian/fonts/PressStart2P-Regular.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..2442affbf6570d23c0b2b270cca8d49535df27bf
GIT binary patch
literal 116008
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

literal 0
HcmV?d00001

diff --git a/libultraship/libultraship/GameOverlay.cpp b/libultraship/libultraship/GameOverlay.cpp
new file mode 100644
index 000000000..a8438643f
--- /dev/null
+++ b/libultraship/libultraship/GameOverlay.cpp
@@ -0,0 +1,186 @@
+#include "GameOverlay.h"
+
+#include "Cvar.h"
+#include "File.h"
+#include "Archive.h"
+#include "ResourceMgr.h"
+#include "SohConsole.h"
+#include "SohImGuiImpl.h"
+#include "TextureMod.h"
+#include "Lib/ImGui/imgui_internal.h"
+
+void Ship::GameOverlay::LoadFont(const std::string& name, const std::string& path, float fontSize) {
+	ImGuiIO& io = ImGui::GetIO();
+	std::shared_ptr<Archive> base = GlobalCtx2::GetInstance()->GetResourceManager()->GetArchive();
+	std::shared_ptr<File> font = std::make_shared<File>();
+	base->LoadFile(normalize(path), false, font);
+	if (font->bIsLoaded) {
+		char* font_data = new char[font->dwBufferSize];
+		memcpy(font_data, font->buffer.get(), font->dwBufferSize);
+		Fonts[name] = io.Fonts->AddFontFromMemoryTTF(font_data, font->dwBufferSize, fontSize);
+	}
+}
+
+void Ship::GameOverlay::TextDraw(float x, float y, bool shadow, const char* fmt, ...) IM_FMTARGS(5) {
+	char buf[1024];
+	va_list args;
+	va_start(args, fmt);
+	vsnprintf(buf, IM_ARRAYSIZE(buf), fmt, args);
+	buf[IM_ARRAYSIZE(buf) - 1] = 0;
+	va_end(args);
+
+	ImGui::PushFont(Fonts[this->CurrentFont]);
+	if (shadow) {
+		ImGui::SetCursorPos(ImVec2(x + 1, y + 1));
+		ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(.0f, .0f, .0f, 255));
+		ImGui::Text(buf, args);
+	}
+	ImGui::PopStyleColor();
+	ImGui::SetCursorPos(ImVec2(x, y));
+	ImGui::Text(buf, args);
+	ImGui::PopFont();
+}
+
+float Ship::GameOverlay::GetScreenWidth() {
+	const ImGuiViewport* viewport = ImGui::GetMainViewport();
+	return viewport->Size.x;
+}
+
+float Ship::GameOverlay::GetScreenHeight() {
+	const ImGuiViewport* viewport = ImGui::GetMainViewport();
+	return viewport->Size.y;
+}
+
+float Ship::GameOverlay::GetStringWidth(const char* text) {
+	return CalculateTextSize(text).x;
+}
+
+ImVec2 Ship::GameOverlay::CalculateTextSize(const char* text, const char* text_end, bool hide_text_after_double_hash, float wrap_width) {
+	ImGuiContext& g = *GImGui;
+
+	const char* text_display_end;
+	if (hide_text_after_double_hash)
+		text_display_end = ImGui::FindRenderedTextEnd(text, text_end);      // Hide anything after a '##' string
+	else
+		text_display_end = text_end;
+
+	GameOverlay* overlay = SohImGui::overlay;
+	
+	ImFont* font = overlay->CurrentFont == "Default" ? g.Font : overlay->Fonts[overlay->CurrentFont];
+	const float font_size = font->FontSize;
+	if (text == text_display_end)
+		return ImVec2(0.0f, font_size);
+	ImVec2 text_size = font->CalcTextSizeA(font_size, FLT_MAX, wrap_width, text, text_display_end, NULL);
+
+	// Round
+	// FIXME: This has been here since Dec 2015 (7b0bf230) but down the line we want this out.
+	// FIXME: Investigate using ceilf or e.g.
+	// - https://git.musl-libc.org/cgit/musl/tree/src/math/ceilf.c
+	// - https://embarkstudios.github.io/rust-gpu/api/src/libm/math/ceilf.rs.html
+	text_size.x = IM_FLOOR(text_size.x + 0.99999f);
+
+	return text_size;
+}
+
+void Ship::GameOverlay::Init() {
+	this->LoadFont("Press Start 2P", "assets/ship_of_harkinian/fonts/PressStart2P-Regular.ttf", 12.0f);
+	this->LoadFont("Fipps", "assets/ship_of_harkinian/fonts/Fipps-Regular.otf", 32.0f);
+	const std::string DefaultFont = this->Fonts.begin()->first;
+	if(!this->Fonts.empty()) {
+		const std::string font = CVar_GetString("gOverlayFont", ImStrdup(DefaultFont.c_str()));
+		for (auto& [name, _] : this->Fonts) {
+			if (font.starts_with(name)) {
+				this->CurrentFont = name;
+				break;
+			}
+			this->CurrentFont = DefaultFont;
+		}
+	}
+	SohImGui::console->Commands["overlay"] = { OverlayCommand, "Draw an overlay using a cvar value" };
+}
+
+void Ship::GameOverlay::DrawSettings() {
+	ImGui::Text("Overlays Text Font");
+	if (ImGui::BeginCombo("##TextFont", this->CurrentFont.c_str())) {
+		for (auto& [name, font] : this->Fonts) {
+			if (ImGui::Selectable(name.c_str(), name == this->CurrentFont)) {
+				this->CurrentFont = name;
+				CVar_SetString("gOverlayFont", ImStrdup(name.c_str()));
+				SohImGui::needs_save = true;
+			}
+
+		}
+		ImGui::EndCombo();
+	}
+}
+
+
+void Ship::GameOverlay::Draw() {
+	const ImGuiViewport* viewport = ImGui::GetMainViewport();
+
+	ImGui::SetNextWindowPos(viewport->Pos, ImGuiCond_Always);
+	ImGui::SetNextWindowSize(viewport->Size, ImGuiCond_Always);
+	ImGui::Begin("SoHOverlay", nullptr, ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoBackground |
+		ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoInputs);
+
+	float textY = 50;
+	for (auto &[key, overlay] : this->RegisteredOverlays) {
+
+		if (overlay.type == OverlayType::TEXT) {
+			const char* text = ImStrdup(key.c_str());
+			const CVar* var = CVar_GetVar(text);
+
+			switch (var->type) {
+			case CVAR_TYPE_FLOAT:
+				this->TextDraw(30, textY, true, "%s %.2f", text, var->value.valueFloat);
+				break;
+			case CVAR_TYPE_S32:
+				this->TextDraw(30, textY, true, "%s %d", text, var->value.valueS32);
+				break;
+			case CVAR_TYPE_STRING:
+				this->TextDraw(30, textY, true, "%s %s", text, var->value.valueStr);
+				break;
+			}
+
+			free((void*) text);
+			textY += 30;
+		}
+	}
+
+	ImGui::End();
+}
+
+
+bool Ship::OverlayCommand(const std::vector<std::string>& args) {
+	if (args.size() < 3) {
+		return CMD_FAILED;
+	}
+
+	if (CVar_GetVar(args[2].c_str()) != nullptr) {
+		const char* key = args[2].c_str();
+		GameOverlay* overlay = SohImGui::overlay;
+		if (args[1] == "add") {
+			if (!overlay->RegisteredOverlays.contains(args[2])) {
+				overlay->RegisteredOverlays[args[2]] = {
+					OverlayType::TEXT,
+					key
+				};
+				INFO("Added overlay: %s ", key);
+			} else {
+				ERROR("Overlay already exists: %s", key);
+			}
+		}
+		else if (args[1] == "remove") {
+			if (overlay->RegisteredOverlays.contains(args[2])) {
+				overlay->RegisteredOverlays.erase(args[2]);
+				INFO("Removed overlay: %s ", key);
+			} else {
+				ERROR("Overlay not found: %s ", key);
+			}
+		}
+	} else {
+		ERROR("CVar %s does not exist", args[2].c_str());
+	}
+
+	return CMD_SUCCESS;
+}
diff --git a/libultraship/libultraship/GameOverlay.h b/libultraship/libultraship/GameOverlay.h
new file mode 100644
index 000000000..c53503a52
--- /dev/null
+++ b/libultraship/libultraship/GameOverlay.h
@@ -0,0 +1,38 @@
+#pragma once
+#include <string>
+#include <vector>
+
+#include "Lib/ImGui/imgui.h"
+#include <map>
+#include <unordered_map>
+
+enum class OverlayType {
+	TEXT, IMAGE
+};
+
+struct Overlay {
+	OverlayType type;
+	const char* value;
+};
+
+namespace Ship {
+	class GameOverlay {
+	public:
+		std::unordered_map<std::string, Overlay> RegisteredOverlays;
+		std::unordered_map<std::string, ImFont*> Fonts;
+		std::string CurrentFont = "Default";
+		void Init();
+		void Draw();
+		void DrawSettings();
+		static float GetScreenWidth();
+		static float GetScreenHeight();
+		static float GetStringWidth(const char* text);
+		static ImVec2 CalculateTextSize(const char* text, const char* text_end = NULL, bool hide_text_after_double_hash = false, float wrap_width = -1.0f);
+	private:
+		void TextDraw(float x, float y, bool shadow, const char* text, ...);
+		void LoadFont(const std::string& name, const std::string& path, float fontSize);
+	};
+
+	static bool OverlayCommand(const std::vector<std::string>& args);
+}
+
diff --git a/libultraship/libultraship/SohImGuiImpl.cpp b/libultraship/libultraship/SohImGuiImpl.cpp
index 7e7082b7b..9adbdd820 100644
--- a/libultraship/libultraship/SohImGuiImpl.cpp
+++ b/libultraship/libultraship/SohImGuiImpl.cpp
@@ -18,6 +18,7 @@
 #include "TextureMod.h"
 #include "Window.h"
 #include "Cvar.h"
+#include "GameOverlay.h"
 #include "Texture.h"
 #include "../Fast3D/gfx_pc.h"
 #include "Lib/stb/stb_image.h"
@@ -59,8 +60,10 @@ namespace SohImGui {
     WindowImpl impl;
     ImGuiIO* io;
     Console* console = new Console;
+    GameOverlay* overlay = new GameOverlay;
     bool p_open = false;
     bool needs_save = false;
+    std::vector<const char*> CustomTexts;
     int SelectedLanguage = CVar_GetS32("gLanguages", 0); //Default Language to 0=English 1=German 2=French
     float kokiri_col[3] = { 0.118f, 0.41f, 0.106f };
     float goron_col[3] = { 0.392f, 0.078f, 0.0f };
@@ -323,10 +326,13 @@ namespace SohImGui {
         ImGui::SetCurrentContext(ctx);
         io = &ImGui::GetIO();
         io->ConfigFlags |= ImGuiConfigFlags_DockingEnable;
+        io->Fonts->AddFontDefault();
+
         if (UseViewports()) {
             io->ConfigFlags |= ImGuiConfigFlags_ViewportsEnable;
         }
         console->Init();
+        overlay->Init();
         ImGuiWMInit();
         ImGuiBackendInit();
 
@@ -490,7 +496,7 @@ namespace SohImGui {
         }
     }
 
-    void DrawMainMenuAndCalculateGameSize() {
+   void DrawMainMenuAndCalculateGameSize() {
         console->Update();
         ImGuiBackendNewFrame();
         ImGuiWMNewFrame();
@@ -624,6 +630,7 @@ namespace SohImGui {
                     }
                     ImGui::EndCombo();
                 }
+                overlay->DrawSettings();
                 ImGui::EndMenu();
             }
 
@@ -800,6 +807,8 @@ namespace SohImGui {
             pos = ImVec2(size.x / 2 - sw / 2, 0);
             size = ImVec2(sw, size.y);
         }
+
+        overlay->Draw();
     }
 
     void DrawFramebufferAndGameInput() {
diff --git a/libultraship/libultraship/SohImGuiImpl.h b/libultraship/libultraship/SohImGuiImpl.h
index c4fe3f825..dd0ec9fd3 100644
--- a/libultraship/libultraship/SohImGuiImpl.h
+++ b/libultraship/libultraship/SohImGuiImpl.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "GameOverlay.h"
 #include "Lib/ImGui/imgui.h"
 #include "SohConsole.h"
 
@@ -58,6 +59,8 @@ namespace SohImGui {
     } CustomWindow;
 
     extern Console* console;
+    extern Ship::GameOverlay* overlay;
+    extern bool needs_save;
     void Init(WindowImpl window_impl);
     void Update(EventImpl event);
 
diff --git a/libultraship/libultraship/libultraship.vcxproj b/libultraship/libultraship/libultraship.vcxproj
index 3bf81a67d..b3448e7b0 100644
--- a/libultraship/libultraship/libultraship.vcxproj
+++ b/libultraship/libultraship/libultraship.vcxproj
@@ -256,6 +256,7 @@
     <ClCompile Include="Blob.cpp" />
     <ClCompile Include="Cvar.cpp" />
     <ClCompile Include="Environment.cpp" />
+    <ClCompile Include="GameOverlay.cpp" />
     <ClCompile Include="GameSettings.cpp" />
     <ClCompile Include="Lib\ImGui\backends\imgui_impl_dx11.cpp" />
     <ClCompile Include="Lib\ImGui\backends\imgui_impl_win32.cpp" />
@@ -343,6 +344,7 @@
     <ClInclude Include="Blob.h" />
     <ClInclude Include="Cvar.h" />
     <ClInclude Include="Environment.h" />
+    <ClInclude Include="GameOverlay.h" />
     <ClInclude Include="GameSettings.h" />
     <ClInclude Include="GameVersions.h" />
     <ClInclude Include="Lib\ImGui\backends\imgui_impl_dx11.h" />
diff --git a/libultraship/libultraship/libultraship.vcxproj.filters b/libultraship/libultraship/libultraship.vcxproj.filters
index 5079d826e..8ac4f0afb 100644
--- a/libultraship/libultraship/libultraship.vcxproj.filters
+++ b/libultraship/libultraship/libultraship.vcxproj.filters
@@ -88,6 +88,9 @@
     <Filter Include="Source Files\Logging">
       <UniqueIdentifier>{bd6557f1-9480-413b-b0cd-843f8efc1939}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Source Files\CustomImpl\Overlay">
+      <UniqueIdentifier>{3285ab8a-06d8-4dac-9af9-efb2a9723ab1}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Factories\MaterialFactory.cpp">
@@ -339,6 +342,9 @@
     <ClCompile Include="GameSettings.cpp">
       <Filter>Source Files\CustomImpl</Filter>
     </ClCompile>
+    <ClCompile Include="GameOverlay.cpp">
+      <Filter>Source Files\CustomImpl\Overlay</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Lib\tinyxml2\tinyxml2.h">
@@ -629,5 +635,8 @@
     <ClInclude Include="GameVersions.h">
       <Filter>Source Files\Resources</Filter>
     </ClInclude>
+    <ClInclude Include="GameOverlay.h">
+      <Filter>Source Files\CustomImpl\Overlay</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/soh/soh/Enhancements/debugconsole.cpp b/soh/soh/Enhancements/debugconsole.cpp
index e22f66d8c..94b230cd1 100644
--- a/soh/soh/Enhancements/debugconsole.cpp
+++ b/soh/soh/Enhancements/debugconsole.cpp
@@ -421,6 +421,14 @@ template <typename Numeric> bool is_number(const std::string& s) {
     return ((std::istringstream(s) >> n >> std::ws).eof());
 }
 
+char* Strdup(const char* src) {
+    const unsigned len = strlen(src) + 1;
+    char* newstr = static_cast<char*>(malloc(len));
+    if (newstr)
+        memcpy(newstr, src, len);
+    return newstr;
+}
+
 void DebugConsole_LoadCVars()
 {
     if (File::Exists("cvars.cfg")) {
@@ -431,7 +439,9 @@ void DebugConsole_LoadCVars()
             if (line.empty()) continue;
             if (cfg.size() < 2) continue;
             if (cfg[1].find("\"") != std::string::npos) {
-                CVar_SetString(cfg[0].c_str(), const_cast<char*>(cfg[1].c_str()));
+                std::string value(cfg[1]);
+                value.erase(std::ranges::remove(value, '\"').begin(), value.end());
+                CVar_SetString(cfg[0].c_str(), Strdup(value.c_str()));
             }
             if (is_number<float>(cfg[1])) {
                 CVar_SetFloat(cfg[0].c_str(), std::stof(cfg[1]));

From 108cd8efc8801ecaaa10a1ebc3abd8312b87ecc6 Mon Sep 17 00:00:00 2001
From: GaryOderNichts <12049776+GaryOderNichts@users.noreply.github.com>
Date: Wed, 11 May 2022 19:37:10 +0200
Subject: [PATCH 02/43] Fix crash if LoadFile fails (#265)

---
 libultraship/libultraship/Archive.cpp | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/libultraship/libultraship/Archive.cpp b/libultraship/libultraship/Archive.cpp
index 67ec8831a..1e8f8d597 100644
--- a/libultraship/libultraship/Archive.cpp
+++ b/libultraship/libultraship/Archive.cpp
@@ -54,11 +54,16 @@ namespace Ship {
 	std::shared_ptr<File> Archive::LoadFile(const std::string& filePath, bool includeParent, std::shared_ptr<File> FileToLoad) {
 		HANDLE fileHandle = NULL;
 
+		if (FileToLoad == nullptr) {
+			FileToLoad = std::make_shared<File>();
+			FileToLoad->path = filePath;
+		}
+
 		if (!SFileOpenFileEx(mainMPQ, filePath.c_str(), 0, &fileHandle)) {
 			SPDLOG_ERROR("({}) Failed to open file {} from mpq archive {}", GetLastError(), filePath.c_str(), MainPath.c_str());
 			std::unique_lock<std::mutex> Lock(FileToLoad->FileLoadMutex);
 			FileToLoad->bHasLoadError = true;
-			return nullptr;
+			return FileToLoad;
 		}
 
 		DWORD dwFileSize = SFileGetFileSize(fileHandle, 0);
@@ -72,18 +77,13 @@ namespace Ship {
 			}
 			std::unique_lock<std::mutex> Lock(FileToLoad->FileLoadMutex);
 			FileToLoad->bHasLoadError = true;
-			return nullptr;
+			return FileToLoad;
 		}
 
 		if (!SFileCloseFile(fileHandle)) {
 			SPDLOG_ERROR("({}) Failed to close file {} from mpq archive {}", GetLastError(), filePath.c_str(), MainPath.c_str());
 		}
 
-		if (FileToLoad == nullptr) {
-			FileToLoad = std::make_shared<File>();
-			FileToLoad->path = filePath;
-		}
-
 		std::unique_lock<std::mutex> Lock(FileToLoad->FileLoadMutex);
 		FileToLoad->parent = includeParent ? shared_from_this() : nullptr;
 		FileToLoad->buffer = fileData;
@@ -97,6 +97,11 @@ namespace Ship {
 		HANDLE fileHandle = NULL;
 		HANDLE mpqHandle = NULL;
 
+		if (FileToLoad == nullptr) {
+			FileToLoad = std::make_shared<File>();
+			FileToLoad->path = filePath;
+		}
+
 		for(auto [path, handle] : mpqHandles) {
 			if (SFileOpenFileEx(mpqHandle, filePath.c_str(), 0, &fileHandle)) {
 				std::unique_lock Lock(FileToLoad->FileLoadMutex);
@@ -121,18 +126,13 @@ namespace Ship {
 			}
 			std::unique_lock<std::mutex> Lock(FileToLoad->FileLoadMutex);
 			FileToLoad->bHasLoadError = true;
-			return nullptr;
+			return FileToLoad;
 		}
 
 		if (!SFileCloseFile(fileHandle)) {
 			SPDLOG_ERROR("({}) Failed to close file {} from mpq archive {}", GetLastError(), filePath.c_str(), MainPath.c_str());
 		}
 
-		if (FileToLoad == nullptr) {
-			FileToLoad = std::make_shared<File>();
-			FileToLoad->path = filePath;
-		}
-
 		std::unique_lock<std::mutex> Lock(FileToLoad->FileLoadMutex);
 		FileToLoad->parent = includeParent ? shared_from_this() : nullptr;
 		FileToLoad->buffer = fileData;

From 6d2e1a603f9aff76f4cf02c22788ace358bed134 Mon Sep 17 00:00:00 2001
From: KiritoDev <36680385+KiritoDv@users.noreply.github.com>
Date: Wed, 11 May 2022 13:00:04 -0500
Subject: [PATCH 03/43] Fixed windows build

---
 libultraship/libultraship/GameOverlay.cpp            |  4 ++--
 .../libultraship/Lib/Fast3D/gfx_direct3d11.cpp       |  2 +-
 soh/soh/Enhancements/debugconsole.cpp                | 12 +++---------
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/libultraship/libultraship/GameOverlay.cpp b/libultraship/libultraship/GameOverlay.cpp
index a8438643f..f514599b1 100644
--- a/libultraship/libultraship/GameOverlay.cpp
+++ b/libultraship/libultraship/GameOverlay.cpp
@@ -13,7 +13,7 @@ void Ship::GameOverlay::LoadFont(const std::string& name, const std::string& pat
 	ImGuiIO& io = ImGui::GetIO();
 	std::shared_ptr<Archive> base = GlobalCtx2::GetInstance()->GetResourceManager()->GetArchive();
 	std::shared_ptr<File> font = std::make_shared<File>();
-	base->LoadFile(normalize(path), false, font);
+	base->LoadFile(path, false, font);
 	if (font->bIsLoaded) {
 		char* font_data = new char[font->dwBufferSize];
 		memcpy(font_data, font->buffer.get(), font->dwBufferSize);
@@ -65,7 +65,7 @@ ImVec2 Ship::GameOverlay::CalculateTextSize(const char* text, const char* text_e
 		text_display_end = text_end;
 
 	GameOverlay* overlay = SohImGui::overlay;
-	
+
 	ImFont* font = overlay->CurrentFont == "Default" ? g.Font : overlay->Fonts[overlay->CurrentFont];
 	const float font_size = font->FontSize;
 	if (text == text_display_end)
diff --git a/libultraship/libultraship/Lib/Fast3D/gfx_direct3d11.cpp b/libultraship/libultraship/Lib/Fast3D/gfx_direct3d11.cpp
index 448c90735..4664a0faa 100644
--- a/libultraship/libultraship/Lib/Fast3D/gfx_direct3d11.cpp
+++ b/libultraship/libultraship/Lib/Fast3D/gfx_direct3d11.cpp
@@ -1027,7 +1027,7 @@ struct GfxRenderingAPI gfx_direct3d11_api = {
     gfx_d3d11_get_framebuffer_texture_id,
     gfx_d3d11_select_texture_fb,
     gfx_d3d11_delete_texture,
-	gfx_d3d11_set_texture_filter,
+    gfx_d3d11_set_texture_filter,
     gfx_d3d11_get_texture_filter
 };
 
diff --git a/soh/soh/Enhancements/debugconsole.cpp b/soh/soh/Enhancements/debugconsole.cpp
index 94b230cd1..60375d440 100644
--- a/soh/soh/Enhancements/debugconsole.cpp
+++ b/soh/soh/Enhancements/debugconsole.cpp
@@ -7,6 +7,8 @@
 #define PATH_HACK
 #include <Utils/StringHelper.h>
 #include <Utils/File.h>
+
+#include "Lib/ImGui/imgui_internal.h"
 #undef PATH_HACK
 #undef Path
 
@@ -421,14 +423,6 @@ template <typename Numeric> bool is_number(const std::string& s) {
     return ((std::istringstream(s) >> n >> std::ws).eof());
 }
 
-char* Strdup(const char* src) {
-    const unsigned len = strlen(src) + 1;
-    char* newstr = static_cast<char*>(malloc(len));
-    if (newstr)
-        memcpy(newstr, src, len);
-    return newstr;
-}
-
 void DebugConsole_LoadCVars()
 {
     if (File::Exists("cvars.cfg")) {
@@ -441,7 +435,7 @@ void DebugConsole_LoadCVars()
             if (cfg[1].find("\"") != std::string::npos) {
                 std::string value(cfg[1]);
                 value.erase(std::ranges::remove(value, '\"').begin(), value.end());
-                CVar_SetString(cfg[0].c_str(), Strdup(value.c_str()));
+                CVar_SetString(cfg[0].c_str(), ImStrdup(value.c_str()));
             }
             if (is_number<float>(cfg[1])) {
                 CVar_SetFloat(cfg[0].c_str(), std::stof(cfg[1]));

From 3f74e82a22a88737e6a353fae5ae0181a3383037 Mon Sep 17 00:00:00 2001
From: KiritoDev <36680385+KiritoDv@users.noreply.github.com>
Date: Wed, 11 May 2022 13:13:22 -0500
Subject: [PATCH 04/43] Fixed linux compilation

---
 libultraship/libultraship/GameOverlay.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libultraship/libultraship/GameOverlay.cpp b/libultraship/libultraship/GameOverlay.cpp
index f514599b1..f54bc7e1a 100644
--- a/libultraship/libultraship/GameOverlay.cpp
+++ b/libultraship/libultraship/GameOverlay.cpp
@@ -21,7 +21,7 @@ void Ship::GameOverlay::LoadFont(const std::string& name, const std::string& pat
 	}
 }
 
-void Ship::GameOverlay::TextDraw(float x, float y, bool shadow, const char* fmt, ...) IM_FMTARGS(5) {
+void Ship::GameOverlay::TextDraw(float x, float y, bool shadow, const char* fmt, ...) {
 	char buf[1024];
 	va_list args;
 	va_start(args, fmt);

From fca0566cef729b3c13bdc181b674d9b125f7820e Mon Sep 17 00:00:00 2001
From: Ralphie Morell <stratomaster64@gmail.com>
Date: Wed, 11 May 2022 15:08:22 -0400
Subject: [PATCH 05/43] Save Editor Enhancements (#273)

* Added more SaveContext elements to save viewer; Added player-specific tab

* some std::strings changed to const char*; fixed bug with current equips on tunic+boots

* Spacing & misc. edits; reversed flag drawing order to match tcrf.net flag tables
---
 .../Enhancements/debugger/debugSaveEditor.cpp | 540 +++++++++++++++++-
 1 file changed, 511 insertions(+), 29 deletions(-)

diff --git a/soh/soh/Enhancements/debugger/debugSaveEditor.cpp b/soh/soh/Enhancements/debugger/debugSaveEditor.cpp
index e7bf0a783..800f8d5b2 100644
--- a/soh/soh/Enhancements/debugger/debugSaveEditor.cpp
+++ b/soh/soh/Enhancements/debugger/debugSaveEditor.cpp
@@ -251,15 +251,31 @@ void DrawGroupWithBorder(T&& drawFunc) {
     ImGui::EndGroup();
 }
 
+char z2ASCII(int code) {
+    int ret;
+    if (code < 10) { //Digits
+        ret = code + 0x30;
+    } else if (code >= 10 && code < 36) { //Uppercase letters
+        ret = code + 0x37;
+    } else if (code >= 36 && code < 62) { //Lowercase letters
+        ret = code + 0x3D;
+    } else if (code == 62) { //Space
+        ret = code - 0x1E;
+    } else if (code == 63 || code == 64) { // _ and .
+        ret = code - 0x12;
+    } else {
+        ret = code;
+    }
+    return char(ret);
+
+}
+
 void DrawInfoTab() {
-    // TODO This is the bare minimum to get the player name showing
-    // There will need to be more effort to get it robust and editable
+    // TODO Needs a better method for name changing but for now this will work.
     std::string name;
+    ImU16 one = 1;
     for (int i = 0; i < 8; i++) {
-        char letter = gSaveContext.playerName[i] + 0x3D;
-        if (letter == '{') {
-            letter = '\0';
-        }
+        char letter = z2ASCII(gSaveContext.playerName[i]);
         name += letter;
     }
     name += '\0';
@@ -268,6 +284,14 @@ void DrawInfoTab() {
 
     ImGui::Text("Name: %s", name.c_str());
     InsertHelpHoverText("Player Name");
+    std::string nameID;
+    for (int i = 0; i < 8; i++) {
+        nameID = z2ASCII(i);
+        if (i % 4 != 0) {
+            ImGui::SameLine();
+        }
+        ImGui::InputScalar(nameID.c_str(), ImGuiDataType_U8, &gSaveContext.playerName[i], &one, NULL);
+    }
 
     // Use an intermediary to keep the health from updating (and potentially killing the player)
     // until it is done being edited
@@ -377,21 +401,101 @@ void DrawInfoTab() {
     ImGui::InputScalar("Bgs Day Count", ImGuiDataType_S32, &gSaveContext.bgsDayCount);
     InsertHelpHoverText("Total number of days elapsed since giving Biggoron the claim check");
 
-    // TODO Changing Link's age is more involved than just setting gSaveContext.linkAge
-    // It might not fit here and instead should be only changable when changing scenes
-    /*
-    if (ImGui::BeginCombo("Link Age", LINK_IS_ADULT ? "Adult" : "Child")) {
-        if (ImGui::Selectable("Adult")) {
-            gSaveContext.linkAge = 0;
+    ImGui::InputScalar("Entrance Index", ImGuiDataType_S32, &gSaveContext.entranceIndex);
+    InsertHelpHoverText("From which entrance did Link arrive?");
+
+    ImGui::InputScalar("Cutscene Index", ImGuiDataType_S32, &gSaveContext.cutsceneIndex);
+    InsertHelpHoverText("Which cutscene is this?");
+
+    ImGui::InputScalar("Navi Timer", ImGuiDataType_U16, &gSaveContext.naviTimer);
+    InsertHelpHoverText("Navi wants to talk at 600 units, decides not to at 3000.");
+
+    ImGui::InputScalar("Timer 1 State", ImGuiDataType_S16, &gSaveContext.timer1State);
+    InsertHelpHoverText("Heat timer, race timer, etc. Has white font");
+
+    ImGui::InputScalar("Timer 1 Value", ImGuiDataType_S16, &gSaveContext.timer1Value, &one, NULL);
+    InsertHelpHoverText("Time, in seconds");
+
+    ImGui::InputScalar("Timer 2 State", ImGuiDataType_S16, &gSaveContext.timer2State);
+    InsertHelpHoverText("Trade timer, Ganon collapse timer, etc. Has yellow font");
+
+    ImGui::InputScalar("Timer 2 Value", ImGuiDataType_S16, &gSaveContext.timer2Value, &one, NULL);
+    InsertHelpHoverText("Time, in seconds");
+     
+    const char* audioName;
+    switch (gSaveContext.audioSetting) { 
+        case 0:
+            audioName = "Stereo";
+            break;
+        case 1:
+            audioName = "Mono";
+            break;
+        case 2:
+            audioName = "Headset";
+            break;
+        case 3:
+            audioName = "Surround";
+            break;
+        default:
+            audioName = "?";
+    }
+    if (ImGui::BeginCombo("Audio", audioName)) {
+        if (ImGui::Selectable("Stereo")) {
+            gSaveContext.audioSetting = 0;
         }
-        if (ImGui::Selectable("Child")) {
-            gSaveContext.linkAge = 1;
+        if (ImGui::Selectable("Mono")) {
+            gSaveContext.audioSetting = 1;
+        }
+        if (ImGui::Selectable("Headset")) {
+            gSaveContext.audioSetting = 2;
+        }
+        if (ImGui::Selectable("Surround")) {
+            gSaveContext.audioSetting = 3;
         }
 
         ImGui::EndCombo();
     }
-    */
+    InsertHelpHoverText("Sound setting");
+    
+    bool n64DDFlag = gSaveContext.n64ddFlag != 0;
+    if (ImGui::Checkbox("64 DD file?", &n64DDFlag)) {
+        gSaveContext.n64ddFlag = n64DDFlag;
+    }
+    InsertHelpHoverText("WARNING! If you save, your file may be locked! Use caution!");
+    
+    if (ImGui::BeginCombo("Z Target Mode", gSaveContext.zTargetSetting ? "Hold" : "Switch")) {
+        if (ImGui::Selectable("Switch")) {
+            gSaveContext.zTargetSetting = 0;
+        }
+        if (ImGui::Selectable("Hold")) {
+            gSaveContext.zTargetSetting = 1;
+        }
+        ImGui::EndCombo();
+    }
+    InsertHelpHoverText("Z-Targeting behavior");
 
+
+    ImGui::PushItemWidth(ImGui::GetFontSize() * 10);
+    static std::array<const char*, 7> minigameHS = { "Horseback Archery", 
+        "Big Poe Points",                                            
+        "Fishing",
+        "Malon's Obstacle Course",                                    
+        "Running Man Race",
+        "?",
+        "Dampe's Race" };
+    
+    if (ImGui::TreeNode("Minigames")) {
+        for (int i = 0; i < 7; i++) {
+            if (i == 5) { //HS_UNK_05 is unused
+                continue;
+            }
+            std::string minigameLbl = minigameHS[i];
+            ImGui::InputScalar(minigameLbl.c_str(), ImGuiDataType_S32, &gSaveContext.highScores[i], &one, NULL);
+        }
+        
+        ImGui::TreePop();
+    }
+    
     ImGui::PopItemWidth();
 }
 
@@ -505,7 +609,7 @@ void DrawInventoryTab() {
 }
 
 // Draw a flag bitfield as an grid of checkboxes
-void DrawFlagArray(const std::string& name, uint32_t& flags) {
+void DrawFlagArray32(const std::string& name, uint32_t& flags) {
     ImGui::PushID(name.c_str());
     for (int32_t flagIndex = 0; flagIndex < 32; flagIndex++) {
         if ((flagIndex % 8) != 0) {
@@ -526,6 +630,25 @@ void DrawFlagArray(const std::string& name, uint32_t& flags) {
     ImGui::PopID();
 }
 
+void DrawFlagArray16(const std::string& name, uint16_t& flags) {
+    ImGui::PushID(name.c_str());
+    for (int32_t flagIndex = 15; flagIndex >= 0; flagIndex--) {
+        ImGui::SameLine();
+        ImGui::PushID(flagIndex);
+        uint32_t bitMask = 1 << flagIndex;
+        bool flag = (flags & bitMask) != 0;
+        if (ImGui::Checkbox("##check", &flag)) {
+            if (flag) {
+                flags |= bitMask;
+            } else {
+                flags &= ~bitMask;
+            }
+        }
+        ImGui::PopID();
+    }
+    ImGui::PopID();
+}
+
 void DrawFlagsTab() {
     if (ImGui::TreeNode("Current Scene")) {
         if (gGlobalCtx != nullptr) {
@@ -534,7 +657,7 @@ void DrawFlagsTab() {
             DrawGroupWithBorder([&]() {
                 ImGui::Text("Switch");
                 InsertHelpHoverText("Permanently-saved switch flags");
-                DrawFlagArray("Switch", act->flags.swch);
+                DrawFlagArray32("Switch", act->flags.swch);
             });
 
             ImGui::SameLine();
@@ -542,13 +665,13 @@ void DrawFlagsTab() {
             DrawGroupWithBorder([&]() {
                 ImGui::Text("Temp Switch");
                 InsertHelpHoverText("Temporary switch flags. Unset on scene transitions");
-                DrawFlagArray("Temp Switch", act->flags.tempSwch);
+                DrawFlagArray32("Temp Switch", act->flags.tempSwch);
             });
 
             DrawGroupWithBorder([&]() {
                 ImGui::Text("Clear");
                 InsertHelpHoverText("Permanently-saved room-clear flags");
-                DrawFlagArray("Clear", act->flags.clear);
+                DrawFlagArray32("Clear", act->flags.clear);
             });
 
             ImGui::SameLine();
@@ -556,13 +679,13 @@ void DrawFlagsTab() {
             DrawGroupWithBorder([&]() {
                 ImGui::Text("Temp Clear");
                 InsertHelpHoverText("Temporary room-clear flags. Unset on scene transitions");
-                DrawFlagArray("Temp Clear", act->flags.tempClear);
+                DrawFlagArray32("Temp Clear", act->flags.tempClear);
             });
 
             DrawGroupWithBorder([&]() {
                 ImGui::Text("Collect");
                 InsertHelpHoverText("Permanently-saved collect flags");
-                DrawFlagArray("Collect", act->flags.collect);
+                DrawFlagArray32("Collect", act->flags.collect);
             });
 
             ImGui::SameLine();
@@ -570,13 +693,13 @@ void DrawFlagsTab() {
             DrawGroupWithBorder([&]() {
                 ImGui::Text("Temp Collect");
                 InsertHelpHoverText("Temporary collect flags. Unset on scene transitions");
-                DrawFlagArray("Temp Collect", act->flags.tempCollect);
+                DrawFlagArray32("Temp Collect", act->flags.tempCollect);
             });
 
             DrawGroupWithBorder([&]() {
                 ImGui::Text("Chest");
                 InsertHelpHoverText("Permanently-saved chest flags");
-                DrawFlagArray("Chest", act->flags.chest);
+                DrawFlagArray32("Chest", act->flags.chest);
             });
 
             ImGui::SameLine();
@@ -633,7 +756,7 @@ void DrawFlagsTab() {
         DrawGroupWithBorder([&]() {
             ImGui::Text("Switch");
             InsertHelpHoverText("Switch flags");
-            DrawFlagArray("Switch", gSaveContext.sceneFlags[selectedSceneFlagMap].swch);
+            DrawFlagArray32("Switch", gSaveContext.sceneFlags[selectedSceneFlagMap].swch);
         });
 
         ImGui::SameLine();
@@ -641,13 +764,13 @@ void DrawFlagsTab() {
         DrawGroupWithBorder([&]() {
             ImGui::Text("Clear");
             InsertHelpHoverText("Room-clear flags");
-            DrawFlagArray("Clear", gSaveContext.sceneFlags[selectedSceneFlagMap].clear);
+            DrawFlagArray32("Clear", gSaveContext.sceneFlags[selectedSceneFlagMap].clear);
         });
 
         DrawGroupWithBorder([&]() {
             ImGui::Text("Collect");
             InsertHelpHoverText("Collect flags");
-            DrawFlagArray("Collect", gSaveContext.sceneFlags[selectedSceneFlagMap].collect);
+            DrawFlagArray32("Collect", gSaveContext.sceneFlags[selectedSceneFlagMap].collect);
         });
 
         ImGui::SameLine();
@@ -655,13 +778,13 @@ void DrawFlagsTab() {
         DrawGroupWithBorder([&]() {
             ImGui::Text("Chest");
             InsertHelpHoverText("Chest flags");
-            DrawFlagArray("Chest", gSaveContext.sceneFlags[selectedSceneFlagMap].chest);
+            DrawFlagArray32("Chest", gSaveContext.sceneFlags[selectedSceneFlagMap].chest);
         });
 
         DrawGroupWithBorder([&]() {
             ImGui::Text("Rooms");
             InsertHelpHoverText("Flags for visted rooms");
-            DrawFlagArray("Rooms", gSaveContext.sceneFlags[selectedSceneFlagMap].rooms);
+            DrawFlagArray32("Rooms", gSaveContext.sceneFlags[selectedSceneFlagMap].rooms);
         });
 
         ImGui::SameLine();
@@ -669,7 +792,7 @@ void DrawFlagsTab() {
         DrawGroupWithBorder([&]() {
             ImGui::Text("Floors");
             InsertHelpHoverText("Flags for visted floors");
-            DrawFlagArray("Floors", gSaveContext.sceneFlags[selectedSceneFlagMap].floors);
+            DrawFlagArray32("Floors", gSaveContext.sceneFlags[selectedSceneFlagMap].floors);
         });
 
         ImGui::TreePop();
@@ -730,6 +853,124 @@ void DrawFlagsTab() {
             gSaveContext.inventory.gsTokens = gsCount;
         }
     });
+
+    if (ImGui::TreeNode("Event Check Inf Flags")) {
+        DrawGroupWithBorder([&]() {
+            ImGui::Text("0");
+            InsertHelpHoverText("Mostly Kokiri Forest related");
+            DrawFlagArray16("eci0", gSaveContext.eventChkInf[0]);
+        });
+
+        DrawGroupWithBorder([&]() {
+            ImGui::Text("1");
+            InsertHelpHoverText("Mostly Lon Lon Ranch related");
+            DrawFlagArray16("eci1", gSaveContext.eventChkInf[1]);
+        });
+
+        DrawGroupWithBorder([&]() {
+            ImGui::Text("2");
+            InsertHelpHoverText("Dodongo Related?");
+            DrawFlagArray16("eci2", gSaveContext.eventChkInf[2]);
+        });
+
+        DrawGroupWithBorder([&]() {
+            ImGui::Text("3");
+            InsertHelpHoverText("Mostly Zora related");
+            DrawFlagArray16("eci3", gSaveContext.eventChkInf[3]);
+        });
+
+        DrawGroupWithBorder([&]() {
+            ImGui::Text("4");
+            InsertHelpHoverText("Random");
+            DrawFlagArray16("eci4", gSaveContext.eventChkInf[4]);
+        });
+
+        DrawGroupWithBorder([&]() {
+            ImGui::Text("5");
+            InsertHelpHoverText("Mostly song learning related");
+            DrawFlagArray16("eci5", gSaveContext.eventChkInf[5]);
+        });
+
+        DrawGroupWithBorder([&]() {
+            ImGui::Text("6");
+            InsertHelpHoverText("Random");
+            DrawFlagArray16("eci6", gSaveContext.eventChkInf[6]);
+        });
+
+        DrawGroupWithBorder([&]() {
+            ImGui::Text("7");
+            InsertHelpHoverText("Boss Battle related");
+            DrawFlagArray16("eci7", gSaveContext.eventChkInf[7]);
+        });
+
+        DrawGroupWithBorder([&]() {
+            ImGui::Text("8");
+            InsertHelpHoverText("Mask related?");
+            DrawFlagArray16("eci8", gSaveContext.eventChkInf[8]);
+        });
+
+        DrawGroupWithBorder([&]() {
+            ImGui::Text("9");
+            InsertHelpHoverText("Mostly carpenter related");
+            DrawFlagArray16("eci9", gSaveContext.eventChkInf[9]);
+        });
+
+        DrawGroupWithBorder([&]() {
+            ImGui::Text("A");
+            InsertHelpHoverText("First-time overworld entrance cs related");
+            DrawFlagArray16("eci1", gSaveContext.eventChkInf[10]);
+        });
+
+        DrawGroupWithBorder([&]() {
+            ImGui::Text("B");
+            InsertHelpHoverText("First-time dungeon entrance cs/trial cs related");
+            DrawFlagArray16("eci11", gSaveContext.eventChkInf[11]);
+        });
+
+        DrawGroupWithBorder([&]() {
+            ImGui::Text("C");
+            InsertHelpHoverText("Random");
+            DrawFlagArray16("eci12", gSaveContext.eventChkInf[12]);
+        });
+
+        DrawGroupWithBorder([&]() {
+            ImGui::Text("D");
+            InsertHelpHoverText("Frog songs/GS rewards");
+            DrawFlagArray16("eci13", gSaveContext.eventChkInf[13]);
+        });
+
+        ImGui::TreePop();
+    }
+    if (ImGui::TreeNode("Inf Table Flags")) {
+        for (int i = 0; i < 30; i++) {
+            std::string it_id = "it" + std::to_string(i);
+            DrawGroupWithBorder([&]() {
+                ImGui::Text("%2d", i);
+                DrawFlagArray16(it_id, gSaveContext.infTable[i]);
+            });
+        }
+        ImGui::TreePop();
+    }
+    if (ImGui::TreeNode("Item Get Inf Flags")) {
+        for (int i = 0; i < 4; i++) {
+            std::string igi_id = "igi" + std::to_string(i);
+            DrawGroupWithBorder([&]() {
+                ImGui::Text("%d", i);
+                DrawFlagArray16(igi_id, gSaveContext.itemGetInf[i]);
+            });
+        }
+        ImGui::TreePop();
+    }
+    if (ImGui::TreeNode("Event Inf Flags")) {
+        for (int i = 0; i < 4; i++) {
+            std::string ei_id = "ei" + std::to_string(i);
+            DrawGroupWithBorder([&]() {
+                ImGui::Text("%d", i);
+                DrawFlagArray16(ei_id, gSaveContext.eventInf[i]);
+            });
+        }
+        ImGui::TreePop();
+    }
 }
 
 // Draws a combo that lets you choose and upgrade value from a drop-down of text values
@@ -1057,6 +1298,242 @@ void DrawQuestStatusTab() {
     ImGui::PopItemWidth();
 }
 
+void DrawPlayerTab() {
+    if (gGlobalCtx != nullptr) {
+        Player* player = GET_PLAYER(gGlobalCtx);
+        const char* curSword;
+        const char* curShield;
+        const char* curTunic;
+        const char* curBoots;
+
+        switch (player->currentSwordItem) {
+            case ITEM_SWORD_KOKIRI:
+                curSword = "Kokiri Sword"; 
+                break;
+            case ITEM_SWORD_MASTER:
+                curSword = "Master Sword";
+                break;
+            case ITEM_SWORD_BGS:
+                curSword = "Biggoron's Sword";
+                break;
+            case ITEM_NONE:
+                curSword = "None";
+                break;
+            default:
+                curSword = "None";
+                break;
+        }
+
+        switch (player->currentShield) {
+            case PLAYER_SHIELD_NONE:
+                curShield = "None";
+                break;
+            case PLAYER_SHIELD_DEKU:
+                curShield = "Deku Shield";
+                break;
+            case PLAYER_SHIELD_HYLIAN:
+                curShield = "Hylian Shield";
+                break;
+            case PLAYER_SHIELD_MIRROR:
+                curShield = "Mirror Shield";
+                break;
+            default:
+                break;
+        }
+
+        switch (player->currentTunic) {
+            case PLAYER_TUNIC_KOKIRI:
+                curTunic = "Kokiri Tunic";
+                break;
+            case PLAYER_TUNIC_GORON:
+                curTunic = "Goron Tunic";
+                break;
+            case PLAYER_TUNIC_ZORA:
+                curTunic = "Zora Tunic";
+                break;
+            default:
+                break;
+        }
+
+        switch (player->currentBoots) {
+            case PLAYER_BOOTS_KOKIRI:
+                curBoots = "Kokiri Boots";
+                break;
+            case PLAYER_BOOTS_IRON:
+                curBoots = "Iron Boots";
+                break;
+            case PLAYER_BOOTS_HOVER:
+                curBoots = "Hover Boots";
+                break;
+            default:
+                break;
+        }
+
+        ImGui::PushItemWidth(ImGui::GetFontSize() * 6);
+        DrawGroupWithBorder([&]() {
+            ImGui::Text("Link's Position");
+            ImGui::InputScalar("X Pos", ImGuiDataType_Float, &player->actor.world.pos.x);
+            ImGui::SameLine();
+            ImGui::InputScalar("Y Pos", ImGuiDataType_Float, &player->actor.world.pos.y);
+            ImGui::SameLine();
+            ImGui::InputScalar("Z Pos", ImGuiDataType_Float, &player->actor.world.pos.z);
+        });
+
+        DrawGroupWithBorder([&]() {
+            ImGui::Text("Link's Rotation");
+            InsertHelpHoverText("For Link's rotation in relation to the world");
+            ImGui::InputScalar("X Rot", ImGuiDataType_S16, &player->actor.world.rot.x);
+            ImGui::SameLine();
+            ImGui::InputScalar("Y Rot", ImGuiDataType_S16, &player->actor.world.rot.y);
+            ImGui::SameLine();
+            ImGui::InputScalar("Z Rot", ImGuiDataType_S16, &player->actor.world.rot.z);
+        });
+
+        DrawGroupWithBorder([&]() {
+            ImGui::Text("Link's Model Rotation");
+            InsertHelpHoverText("For Link's actual model");
+            ImGui::InputScalar("X ModRot", ImGuiDataType_S16, &player->actor.shape.rot.x);
+            ImGui::SameLine();
+            ImGui::InputScalar("Y ModRot", ImGuiDataType_S16, &player->actor.shape.rot.y);
+            ImGui::SameLine();
+            ImGui::InputScalar("Z ModRot", ImGuiDataType_S16, &player->actor.shape.rot.z);
+        });
+
+        ImGui::InputScalar("Linear Velocity", ImGuiDataType_Float, &player->linearVelocity);
+        InsertHelpHoverText("Link's speed along the XZ plane");
+
+        ImGui::InputScalar("Y Velocity", ImGuiDataType_Float, &player->actor.velocity.y);
+        InsertHelpHoverText("Link's speed along the Y plane. Caps at -20");
+
+        ImGui::InputScalar("Wall Height", ImGuiDataType_Float, &player->wallHeight);
+        InsertHelpHoverText("\"height used to determine whether link can climb or grab a ledge at the top\"");
+
+        ImGui::InputScalar("Invincibility Timer", ImGuiDataType_S8, &player->invincibilityTimer);
+        InsertHelpHoverText("Can't take damage while this is nonzero");
+
+        ImGui::InputScalar("Gravity", ImGuiDataType_Float, &player->actor.gravity);
+        InsertHelpHoverText("Rate at which Link falls. Default -4.0f");
+
+        if (ImGui::BeginCombo("Link Age on Load", gGlobalCtx->linkAgeOnLoad == 0 ? "Adult" : "Child")) {
+            if (ImGui::Selectable("Adult")) {
+                gGlobalCtx->linkAgeOnLoad = 0;
+            }
+            if (ImGui::Selectable("Child")) {
+                gGlobalCtx->linkAgeOnLoad = 1;
+            }
+            ImGui::EndCombo();
+        }
+
+        InsertHelpHoverText("This will change Link's age when you load a map");
+
+        ImGui::Separator();
+        
+        ImGui::Text("Link's Current Equipment");
+        ImGui::PushItemWidth(ImGui::GetFontSize() * 15);
+        if (ImGui::BeginCombo("Sword", curSword)) {
+            if (ImGui::Selectable("None")) {
+                player->currentSwordItem = ITEM_NONE;
+                gSaveContext.equips.buttonItems[0] = ITEM_NONE;
+                Inventory_ChangeEquipment(EQUIP_SWORD, PLAYER_SWORD_NONE);
+            }
+            if (ImGui::Selectable("Kokiri Sword")) {
+                player->currentSwordItem = ITEM_SWORD_KOKIRI;
+                gSaveContext.equips.buttonItems[0] = ITEM_SWORD_KOKIRI;
+                Inventory_ChangeEquipment(EQUIP_SWORD, PLAYER_SWORD_KOKIRI);
+            }
+            if (ImGui::Selectable("Master Sword")) {
+                player->currentSwordItem = ITEM_SWORD_MASTER;
+                gSaveContext.equips.buttonItems[0] = ITEM_SWORD_MASTER;
+                Inventory_ChangeEquipment(EQUIP_SWORD, PLAYER_SWORD_MASTER);
+            }
+            if (ImGui::Selectable("Biggoron's Sword")) {
+                if (gSaveContext.bgsFlag) {
+                    if (gSaveContext.swordHealth < 8) {
+                        gSaveContext.swordHealth = 8;
+                    }
+                    player->currentSwordItem = ITEM_SWORD_BGS;
+                    gSaveContext.equips.buttonItems[0] = ITEM_SWORD_BGS;
+                } else {
+                    if (gSaveContext.swordHealth < 8) {
+                        gSaveContext.swordHealth = 8;
+                    }
+                    player->currentSwordItem = ITEM_SWORD_BGS;
+                    gSaveContext.equips.buttonItems[0] = ITEM_SWORD_KNIFE;
+                }
+                
+                Inventory_ChangeEquipment(EQUIP_SWORD, PLAYER_SWORD_BGS);
+            }
+            ImGui::EndCombo();
+
+        }
+        if (ImGui::BeginCombo("Shield", curShield)) {
+            if (ImGui::Selectable("None")) {
+                player->currentShield = PLAYER_SHIELD_NONE;
+                Inventory_ChangeEquipment(EQUIP_SHIELD, PLAYER_SHIELD_NONE);
+            }
+            if (ImGui::Selectable("Deku Shield")) {
+                player->currentShield = PLAYER_SHIELD_DEKU;
+                Inventory_ChangeEquipment(EQUIP_SHIELD, PLAYER_SHIELD_DEKU);
+            }
+            if (ImGui::Selectable("Hylian Shield")) {
+                player->currentShield = PLAYER_SHIELD_HYLIAN;
+                Inventory_ChangeEquipment(EQUIP_SHIELD, PLAYER_SHIELD_HYLIAN);
+            }
+            if (ImGui::Selectable("Mirror Shield")) {
+                player->currentShield = PLAYER_SHIELD_MIRROR;
+                Inventory_ChangeEquipment(EQUIP_SHIELD, PLAYER_SHIELD_MIRROR);
+            }
+            ImGui::EndCombo();
+        }
+
+        if (ImGui::BeginCombo("Tunic", curTunic)) {
+            if (ImGui::Selectable("Kokiri Tunic")) {
+                player->currentTunic = PLAYER_TUNIC_KOKIRI;
+                Inventory_ChangeEquipment(EQUIP_TUNIC, PLAYER_TUNIC_KOKIRI + 1);
+            }
+            if (ImGui::Selectable("Goron Tunic")) {
+                player->currentTunic = PLAYER_TUNIC_GORON;
+                Inventory_ChangeEquipment(EQUIP_TUNIC, PLAYER_TUNIC_GORON + 1);
+            }
+            if (ImGui::Selectable("Zora Tunic")) {
+                player->currentTunic = PLAYER_TUNIC_ZORA;
+                Inventory_ChangeEquipment(EQUIP_TUNIC, PLAYER_TUNIC_ZORA + 1);
+            }
+            ImGui::EndCombo();
+        }
+
+        if (ImGui::BeginCombo("Boots", curBoots)) {
+            if (ImGui::Selectable("Kokiri Boots")) {
+                player->currentBoots = PLAYER_BOOTS_KOKIRI;
+                Inventory_ChangeEquipment(EQUIP_BOOTS, PLAYER_BOOTS_KOKIRI + 1);
+            }
+            if (ImGui::Selectable("Iron Boots")) {
+                player->currentBoots = PLAYER_BOOTS_IRON;
+                Inventory_ChangeEquipment(EQUIP_BOOTS, PLAYER_BOOTS_IRON + 1);
+            }
+            if (ImGui::Selectable("Hover Boots")) {
+                player->currentBoots = PLAYER_BOOTS_HOVER;
+                Inventory_ChangeEquipment(EQUIP_BOOTS, PLAYER_BOOTS_HOVER + 1);
+            }
+            ImGui::EndCombo();
+        }
+
+        ImU16 one = 1;
+        ImGui::PushItemWidth(ImGui::GetFontSize() * 6);
+        DrawGroupWithBorder([&]() {
+            ImGui::Text("Current C Equips");
+            ImGui::InputScalar("C Left", ImGuiDataType_U8, &gSaveContext.equips.buttonItems[1], &one, NULL);
+            ImGui::SameLine();
+            ImGui::InputScalar("C Down", ImGuiDataType_U8, &gSaveContext.equips.buttonItems[2], &one, NULL);
+            ImGui::SameLine();
+            ImGui::InputScalar("C Right", ImGuiDataType_U8, &gSaveContext.equips.buttonItems[3], &one, NULL);
+        });
+
+    } else {
+        ImGui::Text("Global Context needed for player info!");
+    }
+}
+
 void DrawSaveEditor(bool& open) {
     if (!open) {
         return;
@@ -1094,6 +1571,11 @@ void DrawSaveEditor(bool& open) {
             ImGui::EndTabItem();
         }
 
+        if (ImGui::BeginTabItem("Player")) {
+            DrawPlayerTab();
+            ImGui::EndTabItem();
+        }
+
         ImGui::EndTabBar();
     }
 

From 234283f4652867bc1bf64f69ecbda91dc3a64884 Mon Sep 17 00:00:00 2001
From: Baoulettes <perlouzerie@hotmail.fr>
Date: Wed, 11 May 2022 21:10:07 +0200
Subject: [PATCH 06/43] Fix actual position map name GER/FRA (#279)

---
 soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c
index 8732093ca..df6520ebf 100644
--- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c
+++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c
@@ -3179,9 +3179,9 @@ void KaleidoScope_Update(GlobalContext* globalCtx)
                 if (gSaveContext.language == LANGUAGE_ENG) {
                     memcpy(pauseCtx->nameSegment + 0x400, ResourceMgr_LoadTexByName(mapNameTextures[36 + gSaveContext.worldMapArea]), 0xA00);
                 } else if (gSaveContext.language == LANGUAGE_GER) {
-                    memcpy(pauseCtx->nameSegment + 0x400, ResourceMgr_LoadTexByName(mapNameTextures[59 + gSaveContext.worldMapArea]), 0xA00);
+                    memcpy(pauseCtx->nameSegment + 0x400, ResourceMgr_LoadTexByName(mapNameTextures[58 + gSaveContext.worldMapArea]), 0xA00);
                 } else {
-                    memcpy(pauseCtx->nameSegment + 0x400, ResourceMgr_LoadTexByName(mapNameTextures[81 + gSaveContext.worldMapArea]), 0xA00);
+                    memcpy(pauseCtx->nameSegment + 0x400, ResourceMgr_LoadTexByName(mapNameTextures[80 + gSaveContext.worldMapArea]), 0xA00);
                 }
             }
             // OTRTODO - player on pause

From b054abbd657a0e15c7d2f6e9b4cbdd4f9d2aa3c1 Mon Sep 17 00:00:00 2001
From: GaryOderNichts <12049776+GaryOderNichts@users.noreply.github.com>
Date: Wed, 11 May 2022 21:10:44 +0200
Subject: [PATCH 07/43] Fix tunic colors (#280)

---
 soh/src/code/z_player_lib.c | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/soh/src/code/z_player_lib.c b/soh/src/code/z_player_lib.c
index 1c8e013f6..355d323e0 100644
--- a/soh/src/code/z_player_lib.c
+++ b/soh/src/code/z_player_lib.c
@@ -743,26 +743,24 @@ void func_8008F470(GlobalContext* globalCtx, void** skeleton, Vec3s* jointTable,
 #else
     gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(sMouthTextures[eyeIndex]));
 #endif
+    Color_RGB8 sTemp;
+    color = &sTemp;
     if (tunic == PLAYER_TUNIC_KOKIRI) {
-        Color_RGB8 sTemp = { CVar_GetS32("gTunic_Kokiri_Red", sTunicColors[PLAYER_TUNIC_KOKIRI].r),
-                             CVar_GetS32("gTunic_Kokiri_Green", sTunicColors[PLAYER_TUNIC_KOKIRI].g),
-                             CVar_GetS32("gTunic_Kokiri_Blue", sTunicColors[PLAYER_TUNIC_KOKIRI].b) };
-        color = &sTemp;
+        color->r = CVar_GetS32("gTunic_Kokiri_Red", sTunicColors[PLAYER_TUNIC_KOKIRI].r);
+        color->g = CVar_GetS32("gTunic_Kokiri_Green", sTunicColors[PLAYER_TUNIC_KOKIRI].g);
+        color->b = CVar_GetS32("gTunic_Kokiri_Blue", sTunicColors[PLAYER_TUNIC_KOKIRI].b);
     } else if (tunic == PLAYER_TUNIC_GORON) {
-        Color_RGB8 sTemp = { CVar_GetS32("gTunic_Goron_Red", sTunicColors[PLAYER_TUNIC_GORON].r),
-                             CVar_GetS32("gTunic_Goron_Green", sTunicColors[PLAYER_TUNIC_GORON].g),
-                             CVar_GetS32("gTunic_Goron_Blue", sTunicColors[PLAYER_TUNIC_GORON].b) };
-        color = &sTemp;
+        color->r = CVar_GetS32("gTunic_Goron_Red", sTunicColors[PLAYER_TUNIC_GORON].r);
+        color->g = CVar_GetS32("gTunic_Goron_Green", sTunicColors[PLAYER_TUNIC_GORON].g);
+        color->b = CVar_GetS32("gTunic_Goron_Blue", sTunicColors[PLAYER_TUNIC_GORON].b);
     } else if (tunic == PLAYER_TUNIC_ZORA) {
-        Color_RGB8 sTemp = { CVar_GetS32("gTunic_Zora_Red", sTunicColors[PLAYER_TUNIC_ZORA].r),
-                             CVar_GetS32("gTunic_Zora_Green", sTunicColors[PLAYER_TUNIC_ZORA].g),
-                             CVar_GetS32("gTunic_Zora_Blue", sTunicColors[PLAYER_TUNIC_ZORA].b) };
-        color = &sTemp;
+        color->r = CVar_GetS32("gTunic_Zora_Red", sTunicColors[PLAYER_TUNIC_ZORA].r);
+        color->g = CVar_GetS32("gTunic_Zora_Green", sTunicColors[PLAYER_TUNIC_ZORA].g);
+        color->b = CVar_GetS32("gTunic_Zora_Blue", sTunicColors[PLAYER_TUNIC_ZORA].b);
     } else {
-        Color_RGB8 sTemp = { CVar_GetS32("gTunic_Kokiri_Red", sTunicColors[PLAYER_TUNIC_KOKIRI].r),
-                             CVar_GetS32("gTunic_Kokiri_Green", sTunicColors[PLAYER_TUNIC_KOKIRI].g),
-                             CVar_GetS32("gTunic_Kokiri_Blue", sTunicColors[PLAYER_TUNIC_KOKIRI].b) };
-        color = &sTemp;
+        color->r = CVar_GetS32("gTunic_Kokiri_Red", sTunicColors[PLAYER_TUNIC_KOKIRI].r);
+        color->g = CVar_GetS32("gTunic_Kokiri_Green", sTunicColors[PLAYER_TUNIC_KOKIRI].g);
+        color->b = CVar_GetS32("gTunic_Kokiri_Blue", sTunicColors[PLAYER_TUNIC_KOKIRI].b);
     }
     gDPSetEnvColor(POLY_OPA_DISP++, color->r, color->g, color->b, 0);
 

From f8b47b36bf012341793453f02ae16e2cbd37be6c Mon Sep 17 00:00:00 2001
From: Baoulettes <perlouzerie@hotmail.fr>
Date: Wed, 11 May 2022 21:11:36 +0200
Subject: [PATCH 08/43] Added GER/FRA textures variant + offset (#286)

---
 .../misc/ovl_kaleido_scope/z_kaleido_map_PAL.c         | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map_PAL.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map_PAL.c
index bd5277286..f0b59fa4b 100644
--- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map_PAL.c
+++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map_PAL.c
@@ -17,6 +17,14 @@ void KaleidoScope_DrawDungeonMap(GlobalContext* globalCtx, GraphicsContext* gfxC
         gPauseDekuTitleENGTex, gPauseDodongoTitleENGTex,   gPauseJabuTitleENGTex,   gPauseForestTitleENGTex,
         gPauseFireTitleENGTex, gPauseWaterTitleENGTex,     gPauseSpiritTitleENGTex, gPauseShadowTitleENGTex,
         gPauseBotWTitleENGTex, gPauseIceCavernTitleENGTex,
+
+        gPauseDekuTitleGERTex, gPauseDodongoTitleGERTex,   gPauseJabuTitleGERTex,   gPauseForestTitleGERTex,
+        gPauseFireTitleGERTex, gPauseWaterTitleGERTex,     gPauseSpiritTitleGERTex, gPauseShadowTitleGERTex,
+        gPauseBotWTitleGERTex, gPauseIceCavernTitleGERTex,
+
+        gPauseDekuTitleFRATex, gPauseDodongoTitleFRATex,   gPauseJabuTitleFRATex,   gPauseForestTitleFRATex,
+        gPauseFireTitleFRATex, gPauseWaterTitleFRATex,     gPauseSpiritTitleFRATex, gPauseShadowTitleFRATex,
+        gPauseBotWTitleFRATex, gPauseIceCavernTitleFRATex,
     };
     static void* floorIconTexs[] = {
         gDungeonMapBlankFloorButtonTex, gDungeonMap8FButtonTex, gDungeonMap7FButtonTex, gDungeonMap6FButtonTex,
@@ -216,7 +224,7 @@ void KaleidoScope_DrawDungeonMap(GlobalContext* globalCtx, GraphicsContext* gfxC
 
     gSPVertex(POLY_KAL_DISP++, &pauseCtx->mapPageVtx[68], 16, 0);
 
-    gDPLoadTextureBlock(POLY_KAL_DISP++, dungeonTitleTexs[gSaveContext.mapIndex], G_IM_FMT_IA, G_IM_SIZ_8b, 96, 16, 0,
+    gDPLoadTextureBlock(POLY_KAL_DISP++, dungeonTitleTexs[gSaveContext.mapIndex+(10*gSaveContext.language)], G_IM_FMT_IA, G_IM_SIZ_8b, 96, 16, 0,
                         G_TX_WRAP | G_TX_NOMIRROR, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD,
                         G_TX_NOLOD);
 

From a12e8b68aeba22184d2f4991ebd41c15bdc98f8d Mon Sep 17 00:00:00 2001
From: Baoulettes <perlouzerie@hotmail.fr>
Date: Wed, 11 May 2022 21:12:04 +0200
Subject: [PATCH 09/43] Fix dungeons chests map Kaleido (#285)

* fix chest position

* Add original game chests loc

* Remove Jabu jabu 1F left over
---
 .../misc/ovl_kaleido_scope/z_lmap_mark_data.c | 516 ++++++++++++++++++
 1 file changed, 516 insertions(+)

diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark_data.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark_data.c
index df96fc876..64275108b 100644
--- a/soh/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark_data.c
+++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_lmap_mark_data.c
@@ -15,6 +15,522 @@ static const Vtx sMarkChestVtx[] = {
 };
 
 PauseMapMarksData gPauseMapMarkDataTable[] = {
+    // Deku Tree map 3F
+    {
+        { PAUSE_MAP_MARK_CHEST,
+          23, //unk
+          sMarkChestVtx,
+          4, //unk
+          2, //Number of icons to show.
+          { //ID,    X,      Y
+            { 2, 40.0f, -33.0f },
+            { 6, 49.0f, -42.0f },
+          } },
+        { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
+    },
+    // Deku Tree map 2F
+    {
+        { PAUSE_MAP_MARK_CHEST,
+          23,
+          sMarkChestVtx,
+          4,
+          2,
+          {
+            { 1, 48.0f, -63.0f },
+            { 5, 52.0f, -68.0f },
+          } },
+        { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
+    },
+    // Deku Tree map 1F
+    {
+        { PAUSE_MAP_MARK_CHEST,
+          23,
+          sMarkChestVtx,
+          4,
+          1,
+          {
+            { 3, 84.0f, -39.0f },
+          } },
+        { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
+    },
+    // Deku Tree map B1
+    {
+        { PAUSE_MAP_MARK_CHEST,
+          23,
+          sMarkChestVtx,
+          4,
+          1,
+          {
+            { 4, 77.0f, -26.0f },
+          } },
+        { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
+    },
+    // Deku Tree map B2
+    {
+        { PAUSE_MAP_MARK_BOSS,
+          23,
+          sMarkBossVtx,
+          4,
+          1,
+          {
+             { -1, 55.0f, 0.0f },
+          } },
+        { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
+    },
+    // Dodongo's Cavern map 2F
+    {
+        { PAUSE_MAP_MARK_CHEST,
+          23,
+          sMarkChestVtx,
+          4,
+          3,
+          {
+              { 10, 25.0f, -41.0f },
+              { 4, 53.0f, -47.0f },
+              { 6, 58.0f, -59.0f },
+          } },
+        { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
+    },
+    // Dodongo's Cavern map 1F
+    {
+        { PAUSE_MAP_MARK_CHEST,
+          23,
+          sMarkChestVtx,
+          4,
+          2,
+          {
+            { 5, 13.0f, -60.0f },
+            { 8, 20.0f, -49.0f },
+          } },
+        { PAUSE_MAP_MARK_BOSS,
+          23,
+          sMarkBossVtx,
+          4,
+          1,
+          {
+              { -1, 23.0f, -25.0f },
+          } },
+        { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
+    },
+    // Jabu-Jabu's Belly map 1F
+    {
+        { PAUSE_MAP_MARK_CHEST,
+          23,
+          sMarkChestVtx,
+          4,
+          3,
+          {
+            { 1, 67.0f, -13.0f },
+            { 2, 28.0f, -13.0f },
+            { 4, 38.0f, 0.0f },
+          } },
+        { PAUSE_MAP_MARK_BOSS,
+          23,
+          sMarkBossVtx,
+          4,
+          1,
+          {
+              { -1, 65.0f, -37.0f },
+          } },
+        { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
+    },
+    // Jabu-Jabu's Belly map B1
+    {
+        { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
+    },
+    // Forest Temple map 2F
+    {
+        { PAUSE_MAP_MARK_CHEST,
+          23,
+          sMarkChestVtx,
+          4,
+          4,
+          {
+            { 0, 49.0f, -3.0f },
+            { 2, 12.0f, -26.0f },
+            { 5, 74.0f, -13.0f },
+            { 7, 82.0f, -22.0f },
+          } },
+        { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
+    },
+    // Forest Temple map 1F
+    {
+        { PAUSE_MAP_MARK_CHEST,
+          23,
+          sMarkChestVtx,
+          4,
+          4,
+          {
+            { 0, 49.0f, -3.0f },
+            { 2, 12.0f, -26.0f },
+            { 5, 74.0f, -13.0f },
+            { 7, 82.0f, -22.0f },
+          } },
+        { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
+    },
+    // Forest Temple map B1
+    {
+        { PAUSE_MAP_MARK_CHEST,
+          23,
+          sMarkChestVtx,
+          4,
+          1,
+          {
+            { 9, 31.0f, -29.0f },
+          } },
+        { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
+    },
+    // Forest Temple map B2
+    {
+        { PAUSE_MAP_MARK_CHEST,
+          23,
+          sMarkChestVtx,
+          4,
+          1,
+          {
+            { 11, 40.0f, -41.0f },
+          } },
+        { PAUSE_MAP_MARK_BOSS,
+          23,
+          sMarkBossVtx,
+          4,
+          1,
+          {
+              { -1, 50.0f, -11.0f },
+          } },
+        { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
+    },
+    // Fire Temple map 5F
+    {
+        { PAUSE_MAP_MARK_CHEST,
+          23,
+          sMarkChestVtx,
+          4,
+          2,
+          {
+            { 5, 22.0f, -41.0f },
+            { 13, 74.0f, -29.0f },
+          } },
+        { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
+    },
+    // Fire Temple map 4F
+    {
+        { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
+    },
+    // Fire Temple map 3F
+    {
+        { PAUSE_MAP_MARK_CHEST,
+          23,
+          sMarkChestVtx,
+          4,
+          3,
+          {
+            { 3, 76.0f, -48.0f },
+            { 6, 72.0f, -50.0f },
+            { 7, 44.0f, -17.0f },
+            { 8, 63.0f, -12.0f },
+            { 9, 30.0f, -34.0f },
+            { 10, 61.0f, -31.0f },
+          } },
+        { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
+    },
+    // Fire Temple map 2F
+    {
+        { PAUSE_MAP_MARK_CHEST,
+          23,
+          sMarkChestVtx,
+          4,
+          1,
+          {
+            { 11, 78.0f, -34.0f },
+          } },
+        { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
+    },
+    // Fire Temple map 1F
+    {
+        { PAUSE_MAP_MARK_CHEST,
+          23,
+          sMarkChestVtx,
+          4,
+          5,
+          {
+            { 0, 48.0f, -17.0f },
+            { 1, 35.0f, -45.0f },
+            { 2, 67.0f, -58.0f },
+            { 4, 74.0f, -15.0f },
+            { 12, 47.0f, -27.0f },
+          } },
+        { PAUSE_MAP_MARK_BOSS,
+          23,
+          sMarkBossVtx,
+          4,
+          1,
+          {
+              { -1, 26.0f, -34.0f },
+          } },
+        { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
+    },
+    // Water Temple map 3F
+    {
+        { PAUSE_MAP_MARK_CHEST,
+          23,
+          sMarkChestVtx,
+          4,
+          3,
+          {
+            { 2, 88.0f, -60.0f },
+            { 7, 23.0f, -2.0f },
+            { 9, 84.0f, -45.0f },
+          } },
+        { PAUSE_MAP_MARK_BOSS,
+          23,
+          sMarkBossVtx,
+          4,
+          1,
+          {
+              { -1, 62.0f, -23.0f },
+          } },
+        { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
+    },
+    // Water Temple map 2F
+    {
+        { PAUSE_MAP_MARK_CHEST,
+          23,
+          sMarkChestVtx,
+          4,
+          2,
+          {
+            { 0, 86.0f, -60.0f },
+            { 8, 76.0f, -72.0f },
+          } },
+        { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
+    },
+    // Water Temple map 1F
+    {
+        { PAUSE_MAP_MARK_CHEST,
+          23,
+          sMarkChestVtx,
+          4,
+          4,
+          {
+            { 1, 88.0f, -60.0f },
+            { 3, 42.0f, -21.0f },
+            { 5, 47.0f, -15.0f },
+            { 10, 33.0f, -31.0f },
+          } },
+        { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
+    },
+    // Water Temple map B1
+    {
+        { PAUSE_MAP_MARK_CHEST,
+          23,
+          sMarkChestVtx,
+          4,
+          1,
+          {
+            { 6, 77.0f, -66.0f },
+          } },
+        { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
+    },
+    // Spirit Temple map 4F
+    {
+        { PAUSE_MAP_MARK_CHEST,
+          23,
+          sMarkChestVtx,
+          4,
+          2,
+          {
+            { 10, 59.0f, -9.0f },
+            { 18, 32.0f, -20.0f },
+          } },
+        { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
+    },
+    // Spirit Temple map 3F
+    {
+        { PAUSE_MAP_MARK_CHEST,
+          23,
+          sMarkChestVtx,
+          4,
+          5,
+          {
+            { 1, 20.0f, -43.0f },
+            { 5, 83.0f, -26.0f },
+            { 15, 57.0f, -14.0f },
+            { 20, 81.0f, -55.0f },
+            { 21, 87.0f, -55.0f },
+          } },
+        { PAUSE_MAP_MARK_BOSS,
+          23,
+          sMarkBossVtx,
+          4,
+          1,
+          {
+              { -1, 47.0f, 0.0f },
+          } },
+        { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
+    },
+    // Spirit Temple map 2F
+    {
+        { PAUSE_MAP_MARK_CHEST,
+          23,
+          sMarkChestVtx,
+          4,
+          6,
+          {
+            { 2, 41.0f, -16.0f },
+            { 3, 47.0f, -17.0f },
+            { 6, 27.0f, -16.0f },
+            { 12, 29.0f, -20.0f },
+            { 13, 70.0f, -22.0f },
+            { 14, 70.0f, -25.0f },
+          } },
+        { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
+    },
+    // Spirit Temple map 1F
+    {
+        { PAUSE_MAP_MARK_CHEST,
+          23,
+          sMarkChestVtx,
+          4,
+          4,
+          {
+            { 0, 38.0f, -17.0f },
+            { 4, 55.0f, -14.0f },
+            { 8, 15.0f, -14.0f },
+            { 7, 78.0f, -3.0f },
+          } },
+        { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
+    },
+    // Shadow Temple map B1
+    {
+        { PAUSE_MAP_MARK_CHEST,
+          23,
+          sMarkChestVtx,
+          4,
+          2,
+          {
+            { 1, 41.0f, -17.0f },
+            { 7, 27.0f, -24.0f },
+          } },
+        { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
+    },
+    // Shadow Temple map B2
+    {
+        { PAUSE_MAP_MARK_CHEST,
+          23,
+          sMarkChestVtx,
+          4,
+          2,
+          {
+            { 2, 81.0f, -20.0f },
+            { 3, 74.0f, -37.0f },
+          } },
+        { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
+    },
+    // Shadow Temple map B3
+    {
+        { PAUSE_MAP_MARK_CHEST,
+          23,
+          sMarkChestVtx,
+          4,
+          2,
+          {
+            { 12, 96.0f, -51.0f },
+            { 22, 96.0f, -55.0f },
+          } },
+        { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
+    },
+    // Shadow Temple map B4
+    {
+        { PAUSE_MAP_MARK_CHEST,
+          23,
+          sMarkChestVtx,
+          4,
+          10,
+          {
+            { 4, 43.0f, -66.0f },
+            { 5, 37.0f, -66.0f },
+            { 6, 33.0f, -72.0f },
+            { 8, 85.0f, -18.0f },
+            { 9, 61.0f, -42.0f },
+            { 10, 15.0f, -4.0f },
+            { 11, 25.0f, -4.0f },
+            { 13, 19.0f, -29.0f },
+            { 21, 92.0f, -29.0f },
+            { 20, 87.0f, -20.0f },
+          } },
+        { PAUSE_MAP_MARK_BOSS,
+          23,
+          sMarkBossVtx,
+          4,
+          1,
+          {
+              { -1, 31.0f, -45.0f },
+          } },
+        { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
+    },
+    // Bottom of the Well map B1
+    {
+        { PAUSE_MAP_MARK_CHEST,
+          23,
+          sMarkChestVtx,
+          4,
+          9,
+          {
+            { 1, 51.0f, -24.0f },
+            { 3, 84.0f, -38.0f },
+            { 4, 31.0f, -2.0f },
+            { 5, 67.0f, -27.0f },
+            { 8, 46.0f, -27.0f },
+            { 10, 82.0f, -12.0f },
+            { 12, 80.0f, -16.0f },
+            { 14, 62.0f, -24.0f },
+            { 20, 89.0f, -38.0f },
+          } },
+        { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
+    },
+    // Bottom of the Well map B2
+    {
+        { PAUSE_MAP_MARK_CHEST,
+          23,
+          sMarkChestVtx,
+          4,
+          3,
+          {
+            { 2, 54.0f, -27.0f },
+            { 9, 28.0f, -17.0f },
+            { 16, 56.0f, -38.0f },
+          } },
+        { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
+    },
+    // Bottom of the Well map B3
+    {
+        { PAUSE_MAP_MARK_CHEST,
+          23,
+          sMarkChestVtx,
+          4,
+          1,
+          {
+            { 7, 71.0f, -33.0f },
+          } },
+        { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
+    },
+    // Ice Cavern map 1F
+    {
+        { PAUSE_MAP_MARK_CHEST,
+          23,
+          sMarkChestVtx,
+          4,
+          3,
+          {
+            { 0, 66.0f, -2.0f },
+            { 1, 77.0f, -46.0f },
+            { 2, 27.0f, -45.0f },
+          } },
+        { PAUSE_MAP_MARK_NONE, 0, NULL, 0, 0, { 0 } },
+    },
+};
+PauseMapMarksData gPauseMapMarkDataTableMasterQuest[] = {
     // Deku Tree map 0
     {
         { PAUSE_MAP_MARK_CHEST,

From a5651742baa7b4b5c5ba18d81ede5af6bd9542ce Mon Sep 17 00:00:00 2001
From: Sirius902 <10891979+Sirius902@users.noreply.github.com>
Date: Wed, 11 May 2022 12:12:52 -0700
Subject: [PATCH 10/43] Improve CVars a bit (#283)

* Improve CVars a bit

* Just use boolean operators on ptr
---
 libultraship/libultraship/Cvar.cpp       | 53 ++++++++++--------------
 libultraship/libultraship/Cvar.h         | 15 +++----
 libultraship/libultraship/SohConsole.cpp |  2 +-
 soh/soh/Enhancements/debugconsole.cpp    |  4 +-
 4 files changed, 32 insertions(+), 42 deletions(-)

diff --git a/libultraship/libultraship/Cvar.cpp b/libultraship/libultraship/Cvar.cpp
index b895ac747..891ee73af 100644
--- a/libultraship/libultraship/Cvar.cpp
+++ b/libultraship/libultraship/Cvar.cpp
@@ -1,23 +1,22 @@
 #include "Cvar.h"
 #include <map>
 #include <string>
+#include <functional>
+#include <memory>
+#include <utility>
 #include <PR/ultra64/gbi.h>
 
-std::map<std::string, CVar*> cvars;
-
-CVar* CVar_GetVar(const char* name) {
-    std::string key(name);
-    return cvars.contains(key) ? cvars[key] : nullptr;
-}
+std::map<std::string, std::unique_ptr<CVar>, std::less<>> cvars;
 
 extern "C" CVar* CVar_Get(const char* name) {
-    return CVar_GetVar(name);
+    auto it = cvars.find(name);
+    return (it != cvars.end()) ? it->second.get() : nullptr;
 }
 
 extern "C" s32 CVar_GetS32(const char* name, s32 defaultValue) {
     CVar* cvar = CVar_Get(name);
 
-    if (cvar != nullptr) {
+    if (cvar) {
         if (cvar->type == CVAR_TYPE_S32)
             return cvar->value.valueS32;
     }
@@ -28,7 +27,7 @@ extern "C" s32 CVar_GetS32(const char* name, s32 defaultValue) {
 extern "C" float CVar_GetFloat(const char* name, float defaultValue) {
     CVar* cvar = CVar_Get(name);
 
-    if (cvar != nullptr) {
+    if (cvar) {
         if (cvar->type == CVAR_TYPE_FLOAT)
             return cvar->value.valueFloat;
     }
@@ -36,10 +35,10 @@ extern "C" float CVar_GetFloat(const char* name, float defaultValue) {
     return defaultValue;
 }
 
-extern "C" char* CVar_GetString(const char* name, char* defaultValue) {
+extern "C" const char* CVar_GetString(const char* name, const char* defaultValue) {
     CVar* cvar = CVar_Get(name);
 
-    if (cvar != nullptr) {
+    if (cvar) {
         if (cvar->type == CVAR_TYPE_STRING)
             return cvar->value.valueStr;
     }
@@ -48,53 +47,43 @@ extern "C" char* CVar_GetString(const char* name, char* defaultValue) {
 }
 
 extern "C" void CVar_SetS32(const char* name, s32 value) {
-    CVar* cvar = CVar_Get(name);
+    auto& cvar = cvars[name];
     if (!cvar) {
-        cvar = new CVar;
-        cvars[std::string(name)] = cvar;
+        cvar = std::make_unique<CVar>();
     }
     cvar->type = CVAR_TYPE_S32;
     cvar->value.valueS32 = value;
 }
 
 void CVar_SetFloat(const char* name, float value) {
-    CVar* cvar = CVar_Get(name);
+    auto& cvar = cvars[name];
     if (!cvar) {
-        cvar = new CVar;
-        cvars[std::string(name)] = cvar;
+        cvar = std::make_unique<CVar>();
     }
     cvar->type = CVAR_TYPE_FLOAT;
     cvar->value.valueFloat = value;
 }
 
-void CVar_SetString(const char* name, char* value) {
-    CVar* cvar = CVar_Get(name);
+void CVar_SetString(const char* name, const char* value) {
+    auto& cvar = cvars[name];
     if (!cvar) {
-        cvar = new CVar;
-        cvars[std::string(name)] = cvar;
+        cvar = std::make_unique<CVar>();
     }
     cvar->type = CVAR_TYPE_STRING;
     cvar->value.valueStr = value;
 }
 
-
 extern "C" void CVar_RegisterS32(const char* name, s32 defaultValue) {
-    CVar* cvar = CVar_Get(name);
-
-    if (cvar == nullptr)
+    if (!CVar_Get(name))
         CVar_SetS32(name, defaultValue);
 }
 
 extern "C" void CVar_RegisterFloat(const char* name, float defaultValue) {
-    CVar* cvar = CVar_Get(name);
-
-    if (cvar == nullptr)
+    if (!CVar_Get(name))
         CVar_SetFloat(name, defaultValue);
 }
 
-extern "C" void CVar_RegisterString(const char* name, char* defaultValue) {
-    CVar* cvar = CVar_Get(name);
-
-    if (cvar == nullptr)
+extern "C" void CVar_RegisterString(const char* name, const char* defaultValue) {
+    if (!CVar_Get(name))
         CVar_SetString(name, defaultValue);
 }
diff --git a/libultraship/libultraship/Cvar.h b/libultraship/libultraship/Cvar.h
index a85bb8fd3..4d75bb440 100644
--- a/libultraship/libultraship/Cvar.h
+++ b/libultraship/libultraship/Cvar.h
@@ -6,13 +6,13 @@
 typedef enum CVarType { CVAR_TYPE_S32, CVAR_TYPE_FLOAT, CVAR_TYPE_STRING } CVarType;
 
 typedef struct CVar {
-    char* name;
+    const char* name;
     CVarType type;
 
     union {
         s32 valueS32;
         float valueFloat;
-        char* valueStr;
+        const char* valueStr;
     } value;
 } CVar;
 
@@ -22,16 +22,15 @@ extern "C"
 #endif
 //#include <ultra64.h>
 
-
 CVar* CVar_Get(const char* name);
 s32 CVar_GetS32(const char* name, s32 defaultValue);
 float CVar_GetFloat(const char* name, float defaultValue);
-char* CVar_GetString(const char* name, char* defaultValue);
+const char* CVar_GetString(const char* name, const char* defaultValue);
 void CVar_SetS32(const char* name, s32 value);
 
 void CVar_RegisterS32(const char* name, s32 defaultValue);
 void CVar_RegisterFloat(const char* name, float defaultValue);
-void CVar_RegisterString(const char* name, char* defaultValue);
+void CVar_RegisterString(const char* name, const char* defaultValue);
 
 #ifdef __cplusplus
 };
@@ -40,10 +39,12 @@ void CVar_RegisterString(const char* name, char* defaultValue);
 #ifdef __cplusplus
 #include <map>
 #include <string>
+#include <functional>
+#include <memory>
 
-extern std::map<std::string, CVar*> cvars;
+extern std::map<std::string, std::unique_ptr<CVar>, std::less<>> cvars;
 CVar* CVar_GetVar(const char* name);
 void CVar_SetFloat(const char* name, float value);
-void CVar_SetString(const char* name, char* value);
+void CVar_SetString(const char* name, const char* value);
 #endif
 #endif
diff --git a/libultraship/libultraship/SohConsole.cpp b/libultraship/libultraship/SohConsole.cpp
index 6c7df3847..29e8a5daa 100644
--- a/libultraship/libultraship/SohConsole.cpp
+++ b/libultraship/libultraship/SohConsole.cpp
@@ -92,7 +92,7 @@ void Console::Update() {
 	}
 	for (auto [key, var] : BindingToggle) {
 		if (ImGui::IsKeyPressed(key)) {
-			CVar* cvar = CVar_GetVar(var.c_str());
+			CVar* cvar = CVar_Get(var.c_str());
 			Dispatch("set " + var + " " + std::to_string(cvar == nullptr ? 0 : !static_cast<bool>(cvar->value.valueS32)));
 		}
 	}
diff --git a/soh/soh/Enhancements/debugconsole.cpp b/soh/soh/Enhancements/debugconsole.cpp
index 60375d440..189230798 100644
--- a/soh/soh/Enhancements/debugconsole.cpp
+++ b/soh/soh/Enhancements/debugconsole.cpp
@@ -336,7 +336,7 @@ static bool SetCVarHandler(const std::vector<std::string>& args) {
     int vType = CheckVarType(args[2]);
 
     if (vType == VARTYPE_STRING)
-        CVar_SetString(args[1].c_str(), (char*)args[2].c_str());
+        CVar_SetString(args[1].c_str(), args[2].c_str());
     else if (vType == VARTYPE_FLOAT)
         CVar_SetFloat(args[1].c_str(), std::stof(args[2]));
     else
@@ -353,7 +353,7 @@ static bool GetCVarHandler(const std::vector<std::string>& args) {
     if (args.size() < 2)
         return CMD_FAILED;
 
-    CVar* cvar = CVar_GetVar(args[1].c_str());
+    CVar* cvar = CVar_Get(args[1].c_str());
 
     if (cvar != nullptr)
     {

From bf2825e9a54313fcf8048aff9a64a72a36b44341 Mon Sep 17 00:00:00 2001
From: GaryOderNichts <12049776+GaryOderNichts@users.noreply.github.com>
Date: Wed, 11 May 2022 21:14:40 +0200
Subject: [PATCH 11/43] Fix missing gMtxClear address for pal gc roms (#282)

---
 libultraship/libultraship/Lib/Fast3D/gfx_pc.cpp | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/libultraship/libultraship/Lib/Fast3D/gfx_pc.cpp b/libultraship/libultraship/Lib/Fast3D/gfx_pc.cpp
index 6d3a5a5bc..da39c0a4d 100644
--- a/libultraship/libultraship/Lib/Fast3D/gfx_pc.cpp
+++ b/libultraship/libultraship/Lib/Fast3D/gfx_pc.cpp
@@ -31,6 +31,8 @@
 #include "../StrHash64.h"
 #include "../../SohImGuiImpl.h"
 #include "../../Environment.h"
+#include "../../GameVersions.h"
+#include "../../ResourceMgr.h"
 
 // OTRTODO: fix header files for these
 extern "C" {
@@ -2151,8 +2153,16 @@ static void gfx_run_dl(Gfx* cmd) {
                 uintptr_t mtxAddr = cmd->words.w1;
 
                 // OTRTODO: Temp way of dealing with gMtxClear. Need something more elegant in the future...
-                if (mtxAddr == SEG_ADDR(0, 0x12DB20) || mtxAddr == SEG_ADDR(0, 0x12DB40))
-                    mtxAddr = clearMtx;
+                uint32_t gameVersion = Ship::GlobalCtx2::GetInstance()->GetResourceManager()->GetGameVersion();
+                if (gameVersion == OOT_PAL_GC) {
+                    if (mtxAddr == SEG_ADDR(0, 0x0FBC20)) {
+                        mtxAddr = clearMtx;
+                    }
+                } else {
+                    if (mtxAddr == SEG_ADDR(0, 0x12DB20) || mtxAddr == SEG_ADDR(0, 0x12DB40)) {
+                        mtxAddr = clearMtx;
+                    }
+                }
 
 #ifdef F3DEX_GBI_2
                 gfx_sp_matrix(C0(0, 8) ^ G_MTX_PUSH, (const int32_t *) seg_addr(mtxAddr));

From c7e552fc5f7589386681d2df77a8c13190f760ca Mon Sep 17 00:00:00 2001
From: Sirius902 <3645979-Sirius902@users.noreply.gitlab.com>
Date: Wed, 11 May 2022 12:44:12 -0700
Subject: [PATCH 12/43] Replace remaining occurances of CVar_GetVar with
 CVar_Get

---
 libultraship/libultraship/Cvar.h          | 1 -
 libultraship/libultraship/GameOverlay.cpp | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/libultraship/libultraship/Cvar.h b/libultraship/libultraship/Cvar.h
index 4d75bb440..e16f4469f 100644
--- a/libultraship/libultraship/Cvar.h
+++ b/libultraship/libultraship/Cvar.h
@@ -43,7 +43,6 @@ void CVar_RegisterString(const char* name, const char* defaultValue);
 #include <memory>
 
 extern std::map<std::string, std::unique_ptr<CVar>, std::less<>> cvars;
-CVar* CVar_GetVar(const char* name);
 void CVar_SetFloat(const char* name, float value);
 void CVar_SetString(const char* name, const char* value);
 #endif
diff --git a/libultraship/libultraship/GameOverlay.cpp b/libultraship/libultraship/GameOverlay.cpp
index f54bc7e1a..bf9ca9a71 100644
--- a/libultraship/libultraship/GameOverlay.cpp
+++ b/libultraship/libultraship/GameOverlay.cpp
@@ -128,7 +128,7 @@ void Ship::GameOverlay::Draw() {
 
 		if (overlay.type == OverlayType::TEXT) {
 			const char* text = ImStrdup(key.c_str());
-			const CVar* var = CVar_GetVar(text);
+			const CVar* var = CVar_Get(text);
 
 			switch (var->type) {
 			case CVAR_TYPE_FLOAT:
@@ -156,7 +156,7 @@ bool Ship::OverlayCommand(const std::vector<std::string>& args) {
 		return CMD_FAILED;
 	}
 
-	if (CVar_GetVar(args[2].c_str()) != nullptr) {
+	if (CVar_Get(args[2].c_str()) != nullptr) {
 		const char* key = args[2].c_str();
 		GameOverlay* overlay = SohImGui::overlay;
 		if (args[1] == "add") {

From 8ba5d827c5e03762829f481aef424609f2949af3 Mon Sep 17 00:00:00 2001
From: sholdee <102821812+sholdee@users.noreply.github.com>
Date: Wed, 11 May 2022 14:38:05 -0500
Subject: [PATCH 13/43] Increase build pipeline timeout

30min could possibly be too low in some instances
---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 2171cbdc6..71513289b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -3,7 +3,7 @@ pipeline {
     
     options {
         timestamps() 
-        timeout(time: 30, unit: 'MINUTES')
+        timeout(time: 60, unit: 'MINUTES')
         skipDefaultCheckout(true)
     }
     

From 3013c18e13c8cdd26dcc3ab46bb53f5936e05d14 Mon Sep 17 00:00:00 2001
From: sholdee <102821812+sholdee@users.noreply.github.com>
Date: Wed, 11 May 2022 14:58:02 -0500
Subject: [PATCH 14/43] Get rid of timeout

Just causing problems
---
 Jenkinsfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 71513289b..7f1132bae 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -3,7 +3,6 @@ pipeline {
     
     options {
         timestamps() 
-        timeout(time: 60, unit: 'MINUTES')
         skipDefaultCheckout(true)
     }
     

From 1719986a35b5d0c727eab479c012691e85aa7120 Mon Sep 17 00:00:00 2001
From: KiritoDev <36680385+KiritoDv@users.noreply.github.com>
Date: Wed, 11 May 2022 18:07:35 -0500
Subject: [PATCH 15/43] Added notification system

---
 libultraship/libultraship/GameOverlay.cpp  | 59 +++++++++++++++-------
 libultraship/libultraship/GameOverlay.h    | 10 ++--
 libultraship/libultraship/SohImGuiImpl.cpp |  4 ++
 3 files changed, 52 insertions(+), 21 deletions(-)

diff --git a/libultraship/libultraship/GameOverlay.cpp b/libultraship/libultraship/GameOverlay.cpp
index bf9ca9a71..02e089366 100644
--- a/libultraship/libultraship/GameOverlay.cpp
+++ b/libultraship/libultraship/GameOverlay.cpp
@@ -21,7 +21,7 @@ void Ship::GameOverlay::LoadFont(const std::string& name, const std::string& pat
 	}
 }
 
-void Ship::GameOverlay::TextDraw(float x, float y, bool shadow, const char* fmt, ...) {
+void Ship::GameOverlay::TextDraw(float x, float y, bool shadow, ImVec4 color, const char* fmt, ...) {
 	char buf[1024];
 	va_list args;
 	va_start(args, fmt);
@@ -29,18 +29,32 @@ void Ship::GameOverlay::TextDraw(float x, float y, bool shadow, const char* fmt,
 	buf[IM_ARRAYSIZE(buf) - 1] = 0;
 	va_end(args);
 
+	ImGui::PushStyleColor(ImGuiCol_Text, color);
 	ImGui::PushFont(Fonts[this->CurrentFont]);
 	if (shadow) {
 		ImGui::SetCursorPos(ImVec2(x + 1, y + 1));
-		ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(.0f, .0f, .0f, 255));
+		ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(.0f, .0f, .0f, color.w));
 		ImGui::Text(buf, args);
 	}
 	ImGui::PopStyleColor();
 	ImGui::SetCursorPos(ImVec2(x, y));
 	ImGui::Text(buf, args);
 	ImGui::PopFont();
+	ImGui::PopStyleColor();
 }
 
+void Ship::GameOverlay::TextDrawNotification(float duration, bool shadow, const char* fmt, ...) {
+	char buf[1024];
+	va_list args;
+	va_start(args, fmt);
+	vsnprintf(buf, IM_ARRAYSIZE(buf), fmt, args);
+	buf[IM_ARRAYSIZE(buf) - 1] = 0;
+	va_end(args);
+
+	this->RegisteredOverlays[fmt] = new Overlay({ OverlayType::NOTIFICATION, ImStrdup(buf), duration, duration });
+}
+
+
 float Ship::GameOverlay::GetScreenWidth() {
 	const ImGuiViewport* viewport = ImGui::GetMainViewport();
 	return viewport->Size.x;
@@ -124,27 +138,42 @@ void Ship::GameOverlay::Draw() {
 		ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoInputs);
 
 	float textY = 50;
+	float notY = 0;
+
 	for (auto &[key, overlay] : this->RegisteredOverlays) {
 
-		if (overlay.type == OverlayType::TEXT) {
-			const char* text = ImStrdup(key.c_str());
+		if (overlay->type == OverlayType::TEXT) {
+			const char* text = ImStrdup(overlay->value);
 			const CVar* var = CVar_Get(text);
+			ImVec4 color = ImVec4(1.0f, 1.0f, 1.0f, 1.0f);
 
 			switch (var->type) {
 			case CVAR_TYPE_FLOAT:
-				this->TextDraw(30, textY, true, "%s %.2f", text, var->value.valueFloat);
+				this->TextDraw(30, textY, true, color, "%s %.2f", text, var->value.valueFloat);
 				break;
 			case CVAR_TYPE_S32:
-				this->TextDraw(30, textY, true, "%s %d", text, var->value.valueS32);
+				this->TextDraw(30, textY, true, color, "%s %d", text, var->value.valueS32);
 				break;
 			case CVAR_TYPE_STRING:
-				this->TextDraw(30, textY, true, "%s %s", text, var->value.valueStr);
+				this->TextDraw(30, textY, true, color, "%s %s", text, var->value.valueStr);
 				break;
 			}
 
 			free((void*) text);
 			textY += 30;
 		}
+
+		if (overlay->type == OverlayType::NOTIFICATION && overlay->duration > 0) {
+			const char* text = overlay->value;
+			const float duration = overlay->duration / overlay->fadeTime;
+
+			const ImVec4 color = ImVec4(1.0f, 1.0f, 1.0f, duration);
+			const float textWidth = this->GetStringWidth(overlay->value);
+
+			this->TextDraw(GetScreenWidth() - textWidth - 40, GetScreenHeight() - 40 - notY, true, color, text);
+			notY += 30;
+			overlay->duration -= .05f;
+		}
 	}
 
 	ImGui::End();
@@ -160,19 +189,15 @@ bool Ship::OverlayCommand(const std::vector<std::string>& args) {
 		const char* key = args[2].c_str();
 		GameOverlay* overlay = SohImGui::overlay;
 		if (args[1] == "add") {
-			if (!overlay->RegisteredOverlays.contains(args[2])) {
-				overlay->RegisteredOverlays[args[2]] = {
-					OverlayType::TEXT,
-					key
-				};
+			if (!overlay->RegisteredOverlays.contains(key)) {
+				overlay->RegisteredOverlays[key] = new Overlay({ OverlayType::TEXT, ImStrdup(key), -1.0f });
 				INFO("Added overlay: %s ", key);
 			} else {
 				ERROR("Overlay already exists: %s", key);
 			}
-		}
-		else if (args[1] == "remove") {
-			if (overlay->RegisteredOverlays.contains(args[2])) {
-				overlay->RegisteredOverlays.erase(args[2]);
+		} else if (args[1] == "remove") {
+			if (overlay->RegisteredOverlays.contains(key)) {
+				overlay->RegisteredOverlays.erase(key);
 				INFO("Removed overlay: %s ", key);
 			} else {
 				ERROR("Overlay not found: %s ", key);
@@ -183,4 +208,4 @@ bool Ship::OverlayCommand(const std::vector<std::string>& args) {
 	}
 
 	return CMD_SUCCESS;
-}
+}
\ No newline at end of file
diff --git a/libultraship/libultraship/GameOverlay.h b/libultraship/libultraship/GameOverlay.h
index c53503a52..e3161bca3 100644
--- a/libultraship/libultraship/GameOverlay.h
+++ b/libultraship/libultraship/GameOverlay.h
@@ -7,18 +7,20 @@
 #include <unordered_map>
 
 enum class OverlayType {
-	TEXT, IMAGE
+	TEXT, IMAGE, NOTIFICATION
 };
 
 struct Overlay {
 	OverlayType type;
 	const char* value;
+	float fadeTime;
+	float duration;
 };
 
 namespace Ship {
 	class GameOverlay {
 	public:
-		std::unordered_map<std::string, Overlay> RegisteredOverlays;
+		std::unordered_map<std::string, Overlay*> RegisteredOverlays;
 		std::unordered_map<std::string, ImFont*> Fonts;
 		std::string CurrentFont = "Default";
 		void Init();
@@ -28,11 +30,11 @@ namespace Ship {
 		static float GetScreenHeight();
 		static float GetStringWidth(const char* text);
 		static ImVec2 CalculateTextSize(const char* text, const char* text_end = NULL, bool hide_text_after_double_hash = false, float wrap_width = -1.0f);
+		void TextDraw(float x, float y, bool shadow, ImVec4 color, const char* text, ...);
+		void TextDrawNotification(float duration, bool shadow, const char* fmt, ...);
 	private:
-		void TextDraw(float x, float y, bool shadow, const char* text, ...);
 		void LoadFont(const std::string& name, const std::string& path, float fontSize);
 	};
 
 	static bool OverlayCommand(const std::vector<std::string>& args);
 }
-
diff --git a/libultraship/libultraship/SohImGuiImpl.cpp b/libultraship/libultraship/SohImGuiImpl.cpp
index 9adbdd820..40e1b56c4 100644
--- a/libultraship/libultraship/SohImGuiImpl.cpp
+++ b/libultraship/libultraship/SohImGuiImpl.cpp
@@ -808,6 +808,10 @@ namespace SohImGui {
             size = ImVec2(sw, size.y);
         }
 
+        if (ImGui::Button("Test Notification")) {
+            overlay->TextDrawNotification(3.0f, true, ("Test Notification: " + std::to_string(rand())).c_str());
+        }
+
         overlay->Draw();
     }
 

From 4aeed97e3ad94cceb039f05dcc67c986df2c7265 Mon Sep 17 00:00:00 2001
From: KiritoDev <36680385+KiritoDv@users.noreply.github.com>
Date: Wed, 11 May 2022 18:08:28 -0500
Subject: [PATCH 16/43] Removed debug button

---
 libultraship/libultraship/SohImGuiImpl.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/libultraship/libultraship/SohImGuiImpl.cpp b/libultraship/libultraship/SohImGuiImpl.cpp
index 40e1b56c4..9adbdd820 100644
--- a/libultraship/libultraship/SohImGuiImpl.cpp
+++ b/libultraship/libultraship/SohImGuiImpl.cpp
@@ -808,10 +808,6 @@ namespace SohImGui {
             size = ImVec2(sw, size.y);
         }
 
-        if (ImGui::Button("Test Notification")) {
-            overlay->TextDrawNotification(3.0f, true, ("Test Notification: " + std::to_string(rand())).c_str());
-        }
-
         overlay->Draw();
     }
 

From 0adad641a64b226f10cf2851772c519bf3037931 Mon Sep 17 00:00:00 2001
From: Random <28494085+Random06457@users.noreply.github.com>
Date: Thu, 12 May 2022 12:21:25 +0900
Subject: [PATCH 17/43] fix thisx hack (#299)

---
 soh/include/functions.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/soh/include/functions.h b/soh/include/functions.h
index 4cbc285a3..360afc687 100644
--- a/soh/include/functions.h
+++ b/soh/include/functions.h
@@ -2404,6 +2404,7 @@ void Heaps_Alloc(void);
 void Heaps_Free(void);
 
 #ifdef __cplusplus
+#undef this
 };
 #endif
 

From e2c801a2acc9a4915ad361fc3808c793bb5019ed Mon Sep 17 00:00:00 2001
From: PurpleHato <47987542+PurpleHato@users.noreply.github.com>
Date: Thu, 12 May 2022 15:05:54 +0200
Subject: [PATCH 18/43] Fixed ImGui developer menu (#298)

Fixes the Auto Windows Opening that could cancel the menu by itself
---
 libultraship/libultraship/SohConsole.cpp          |  2 +-
 libultraship/libultraship/SohImGuiImpl.cpp        | 15 +++++++++++++--
 soh/soh/Enhancements/debugger/colViewer.cpp       |  2 +-
 soh/soh/Enhancements/debugger/debugSaveEditor.cpp |  2 +-
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/libultraship/libultraship/SohConsole.cpp b/libultraship/libultraship/SohConsole.cpp
index 29e8a5daa..6f04bc917 100644
--- a/libultraship/libultraship/SohConsole.cpp
+++ b/libultraship/libultraship/SohConsole.cpp
@@ -106,7 +106,7 @@ void Console::Draw() {
 	if (!this->opened) return;
 
 	ImGui::SetNextWindowSize(ImVec2(520, 600), ImGuiCond_FirstUseEver);
-	ImGui::Begin("Console", nullptr);
+	ImGui::Begin("Console", nullptr, ImGuiWindowFlags_NoFocusOnAppearing);
 		const ImVec2 pos = ImGui::GetWindowPos();
 		const ImVec2 size = ImGui::GetWindowSize();
 
diff --git a/libultraship/libultraship/SohImGuiImpl.cpp b/libultraship/libultraship/SohImGuiImpl.cpp
index 9adbdd820..0fbba2b75 100644
--- a/libultraship/libultraship/SohImGuiImpl.cpp
+++ b/libultraship/libultraship/SohImGuiImpl.cpp
@@ -417,6 +417,15 @@ namespace SohImGui {
         }
     }
 
+    void EnhancementButton(std::string text, std::string cvarName)
+    {
+        bool val = (bool)CVar_GetS32(cvarName.c_str(), 0);
+        if (ImGui::Button(text.c_str())) {
+            CVar_SetS32(cvarName.c_str(), !val);
+            needs_save = true;
+        }
+    }
+
     void EnhancementSliderInt(std::string text, std::string id, std::string cvarName, int min, int max, std::string format)
     {
         int val = CVar_GetS32(cvarName.c_str(), 0);
@@ -725,10 +734,11 @@ namespace SohImGui {
 
             if (ImGui::BeginMenu("Developer Tools"))
             {
+                EnhancementCheckbox("OoT Debug Mode", "gDebugEnabled");
+                ImGui::Separator();
                 EnhancementCheckbox("Stats", "gStatsEnabled");
                 EnhancementCheckbox("Console", "gConsoleEnabled");
                 console->opened = CVar_GetS32("gConsoleEnabled", 0);
-                EnhancementCheckbox("OoT Debug Mode", "gDebugEnabled");
 
                 ImGui::EndMenu();
             }
@@ -745,6 +755,7 @@ namespace SohImGui {
                     }
                     ImGui::EndMenu();
                 }
+
             }
 
             ImGui::EndMenuBar();
@@ -755,7 +766,7 @@ namespace SohImGui {
         if (CVar_GetS32("gStatsEnabled", 0)) {
             const float framerate = ImGui::GetIO().Framerate;
             ImGui::PushStyleColor(ImGuiCol_Border, ImVec4(0, 0, 0, 0));
-            ImGui::Begin("Debug Stats", nullptr, ImGuiWindowFlags_None);
+            ImGui::Begin("Debug Stats", nullptr, ImGuiWindowFlags_NoFocusOnAppearing);
 
 #ifdef _WIN32
             ImGui::Text("Platform: Windows");
diff --git a/soh/soh/Enhancements/debugger/colViewer.cpp b/soh/soh/Enhancements/debugger/colViewer.cpp
index bbf791f67..ed0fe0b56 100644
--- a/soh/soh/Enhancements/debugger/colViewer.cpp
+++ b/soh/soh/Enhancements/debugger/colViewer.cpp
@@ -97,7 +97,7 @@ void DrawColViewerWindow(bool& open) {
     }
 
     ImGui::SetNextWindowSize(ImVec2(520, 600), ImGuiCond_FirstUseEver);
-    if (!ImGui::Begin("Collision Viewer", &open)) {
+    if (!ImGui::Begin("Collision Viewer", &open, ImGuiWindowFlags_NoFocusOnAppearing)) {
         ImGui::End();
         return;
     }
diff --git a/soh/soh/Enhancements/debugger/debugSaveEditor.cpp b/soh/soh/Enhancements/debugger/debugSaveEditor.cpp
index 800f8d5b2..ca1b67798 100644
--- a/soh/soh/Enhancements/debugger/debugSaveEditor.cpp
+++ b/soh/soh/Enhancements/debugger/debugSaveEditor.cpp
@@ -1540,7 +1540,7 @@ void DrawSaveEditor(bool& open) {
     }
 
     ImGui::SetNextWindowSize(ImVec2(520, 600), ImGuiCond_FirstUseEver);
-    if (!ImGui::Begin("Save Editor", &open)) {
+    if (!ImGui::Begin("Save Editor", &open, ImGuiWindowFlags_NoFocusOnAppearing)) {
         ImGui::End();
         return;
     }

From 9eb5ff6136f6f0481c2c8fb84eeb03908a0332cc Mon Sep 17 00:00:00 2001
From: Rozelette <Rozelette@users.noreply.github.com>
Date: Thu, 12 May 2022 08:06:39 -0500
Subject: [PATCH 19/43] Fix GetTextureByID not returning anything on non-DX11
 (#297)

---
 libultraship/libultraship/SohImGuiImpl.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/libultraship/libultraship/SohImGuiImpl.cpp b/libultraship/libultraship/SohImGuiImpl.cpp
index 0fbba2b75..e5d51a5a1 100644
--- a/libultraship/libultraship/SohImGuiImpl.cpp
+++ b/libultraship/libultraship/SohImGuiImpl.cpp
@@ -932,13 +932,12 @@ namespace SohImGui {
 
     ImTextureID GetTextureByID(int id) {
 #ifdef ENABLE_DX11
-    if (impl.backend == Backend::DX11)
-    {
-        ImTextureID gfx_d3d11_get_texture_by_id(int id);
-        return gfx_d3d11_get_texture_by_id(id);
-    }
-#else
-        return reinterpret_cast<ImTextureID>(id);
+        if (impl.backend == Backend::DX11)
+        {
+            ImTextureID gfx_d3d11_get_texture_by_id(int id);
+            return gfx_d3d11_get_texture_by_id(id);
+        }
 #endif
+        return reinterpret_cast<ImTextureID>(id);
     }
 }

From fdd613f41ee70fe5302c7700fad215ad44181361 Mon Sep 17 00:00:00 2001
From: Marcelo20XX <marcelo.xx@gmail.com>
Date: Thu, 12 May 2022 09:08:37 -0400
Subject: [PATCH 20/43] Add QoL feature: Faster Block Pushing (#275)

---
 libultraship/libultraship/SohImGuiImpl.cpp               | 1 +
 .../overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c    | 9 +++++++--
 .../overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c  | 4 ++--
 .../overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c    | 6 ++++--
 .../actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c | 4 ++--
 soh/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c  | 4 ++--
 .../actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c       | 4 ++--
 .../overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c    | 4 ++--
 8 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/libultraship/libultraship/SohImGuiImpl.cpp b/libultraship/libultraship/SohImGuiImpl.cpp
index e5d51a5a1..166edf50d 100644
--- a/libultraship/libultraship/SohImGuiImpl.cpp
+++ b/libultraship/libultraship/SohImGuiImpl.cpp
@@ -670,6 +670,7 @@ namespace SohImGui {
 
                 EnhancementCheckbox("Animated Link in Pause Menu", "gPauseLiveLink");
                 EnhancementCheckbox("Enable 3D Dropped items", "gNewDrops");
+                EnhancementCheckbox("Faster Block Push", "gFasterBlockPush");
                 EnhancementCheckbox("Dynamic Wallet Icon", "gDynamicWalletIcon");
                 EnhancementCheckbox("Always show dungeon entrances", "gAlwaysShowDungeonMinimapIcon");
 
diff --git a/soh/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c b/soh/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c
index 7e3cd9155..46ba447cb 100644
--- a/soh/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c
+++ b/soh/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c
@@ -192,7 +192,12 @@ void BgHakaGate_StatueTurn(BgHakaGate* this, GlobalContext* globalCtx) {
     s16 turnAngle;
 
     this->vTurnRateDeg10++;
-    this->vTurnRateDeg10 = CLAMP_MAX(this->vTurnRateDeg10, 5);
+    if (CVar_GetS32("gFasterBlockPush", 0) != 0) {
+        this->vTurnRateDeg10 = 10;
+        CLAMP_MAX(this->vTurnRateDeg10, 5);
+    } else {
+        this->vTurnRateDeg10 = CLAMP_MAX(this->vTurnRateDeg10, 5);
+    }
     turnFinished = Math_StepToS(&this->vTurnAngleDeg10, 600, this->vTurnRateDeg10);
     turnAngle = this->vTurnAngleDeg10 * this->vTurnDirection;
     this->dyna.actor.shape.rot.y = (this->vRotYDeg10 + turnAngle) * 0.1f * (0x10000 / 360.0f);
@@ -212,7 +217,7 @@ void BgHakaGate_StatueTurn(BgHakaGate* this, GlobalContext* globalCtx) {
         this->vRotYDeg10 = (this->vRotYDeg10 + turnAngle) % 3600;
         this->vTurnRateDeg10 = 0;
         this->vTurnAngleDeg10 = 0;
-        this->vTimer = 5;
+        this->vTimer = CVar_GetS32("gFasterBlockPush", 0) != 0 ? 2 : 5;
         this->actionFunc = BgHakaGate_StatueIdle;
         this->dyna.unk_150 = 0.0f;
     }
diff --git a/soh/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c b/soh/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c
index 4522a9486..4f7ce9a63 100644
--- a/soh/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c
+++ b/soh/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c
@@ -137,7 +137,7 @@ void func_8088B268(BgHidanRock* this, GlobalContext* globalCtx) {
                 }
             }
 
-            this->dyna.actor.speedXZ += 0.05f;
+            this->dyna.actor.speedXZ += CVar_GetS32("gFasterBlockPush", 0) != 0 ? 0.5f : 0.05f;
             this->dyna.actor.speedXZ = CLAMP_MAX(this->dyna.actor.speedXZ, 2.0f);
 
             if (D_8088BFC0 > 0.0f) {
@@ -156,7 +156,7 @@ void func_8088B268(BgHidanRock* this, GlobalContext* globalCtx) {
                 this->dyna.actor.home.pos.z = this->dyna.actor.world.pos.z;
                 D_8088BFC0 = 0.0f;
                 this->dyna.actor.speedXZ = 0.0f;
-                this->timer = 5;
+                this->timer = CVar_GetS32("gFasterBlockPush", 0) != 0 ? 2 : 5;
             }
 
             func_8002F974(&this->dyna.actor, NA_SE_EV_ROCK_SLIDE - SFX_FLAG);
diff --git a/soh/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c b/soh/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c
index 3f659ad57..064537f2d 100644
--- a/soh/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c
+++ b/soh/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c
@@ -444,7 +444,7 @@ void func_80896950(BgJyaCobra* this, GlobalContext* globalCtx) {
 
     if (this->dyna.unk_150 > 0.001f) {
         this->unk_168++;
-        if (this->unk_168 >= 15) {
+        if (this->unk_168 >= CVar_GetS32("gFasterBlockPush", 0) != 0 ? 5 : 15) {
             func_808969F8(this, globalCtx);
         }
     } else {
@@ -484,9 +484,11 @@ void func_808969F8(BgJyaCobra* this, GlobalContext* globalCtx) {
 void func_80896ABC(BgJyaCobra* this, GlobalContext* globalCtx) {
     s16 temp_v0;
     Player* player = GET_PLAYER(globalCtx);
+    if (CVar_GetS32("gFasterBlockPush", 0) != 0)
+        this->unk_16E = 150.0f;
 
     temp_v0 = (s16)((this->unk_16C * 0x2000) + this->dyna.actor.home.rot.y) - this->dyna.actor.world.rot.y;
-    if (ABS(temp_v0) < 7424) {
+    if (ABS(temp_v0) < CVar_GetS32("gFasterBlockPush", 0) != 0 ? 3712 : 7424) {
         Math_StepToS(&this->unk_16E, 106, 4);
     } else {
         Math_StepToS(&this->unk_16E, 21, 10);
diff --git a/soh/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c b/soh/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c
index 4ad89d7b3..68bf02fb7 100644
--- a/soh/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c
+++ b/soh/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c
@@ -94,7 +94,7 @@ void BgMoriKaitenkabe_Wait(BgMoriKaitenkabe* this, GlobalContext* globalCtx) {
 
     if (this->dyna.unk_150 > 0.001f) {
         this->timer++;
-        if ((this->timer > 28) && !Player_InCsMode(globalCtx)) {
+        if ((this->timer > CVar_GetS32("gFasterBlockPush", 0) != 0 ? 14 : 28) && !Player_InCsMode(globalCtx)) {
             BgMoriKaitenkabe_SetupRotate(this);
             func_8002DF54(globalCtx, &this->dyna.actor, 8);
             Math_Vec3f_Copy(&this->lockedPlayerPos, &player->actor.world.pos);
@@ -118,7 +118,7 @@ void BgMoriKaitenkabe_Wait(BgMoriKaitenkabe* this, GlobalContext* globalCtx) {
 
 void BgMoriKaitenkabe_SetupRotate(BgMoriKaitenkabe* this) {
     this->actionFunc = BgMoriKaitenkabe_Rotate;
-    this->rotSpeed = 0.0f;
+    this->rotSpeed = CVar_GetS32("gFasterBlockPush", 0) != 0 ? 0.5f : 0.0f;
     this->rotYdeg = 0.0f;
 }
 
diff --git a/soh/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c b/soh/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c
index 1a1cc6c60..efceb7939 100644
--- a/soh/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c
+++ b/soh/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c
@@ -388,7 +388,7 @@ void BgPoEvent_BlockPush(BgPoEvent* this, GlobalContext* globalCtx) {
     s32 blockStop;
     Player* player = GET_PLAYER(globalCtx);
 
-    this->dyna.actor.speedXZ += 0.1f;
+    this->dyna.actor.speedXZ += CVar_GetS32("gFasterBlockPush", 0) != 0 ? 0.5f : 0.1f;
     this->dyna.actor.speedXZ = CLAMP_MAX(this->dyna.actor.speedXZ, 2.0f);
     blockStop = Math_StepToF(&blockPushDist, 20.0f, this->dyna.actor.speedXZ);
     displacement = this->direction * blockPushDist;
@@ -404,7 +404,7 @@ void BgPoEvent_BlockPush(BgPoEvent* this, GlobalContext* globalCtx) {
         this->dyna.actor.home.pos.z = this->dyna.actor.world.pos.z;
         blockPushDist = 0.0f;
         this->dyna.actor.speedXZ = 0.0f;
-        this->direction = 5;
+        this->direction = CVar_GetS32("gFasterBlockPush", 0) != 0 ? 3 : 5;
         sBlocksAtRest++;
         this->actionFunc = BgPoEvent_BlockIdle;
         if (this->type == 1) {
diff --git a/soh/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c b/soh/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c
index 240235917..684336e17 100644
--- a/soh/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c
+++ b/soh/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c
@@ -260,7 +260,7 @@ void func_808B4194(BgSpot15Rrbox* this, GlobalContext* globalCtx) {
     s32 approxFResult;
     Actor* actor = &this->dyna.actor;
 
-    this->unk_174 += 0.5f;
+    this->unk_174 += CVar_GetS32("gFasterBlockPush", 0) != 0 ? 1.0f : 0.5f;
 
     this->unk_174 = CLAMP_MAX(this->unk_174, 2.0f);
 
@@ -294,7 +294,7 @@ void func_808B4194(BgSpot15Rrbox* this, GlobalContext* globalCtx) {
         this->dyna.unk_150 = 0.0f;
         this->unk_178 = 0.0f;
         this->unk_174 = 0.0f;
-        this->unk_168 = 10;
+        this->unk_168 = CVar_GetS32("gFasterBlockPush", 0) != 0 ? 3 : 10;
         func_808B4084(this, globalCtx);
     }
     Audio_PlayActorSound2(actor, NA_SE_EV_ROCK_SLIDE - SFX_FLAG);
diff --git a/soh/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c b/soh/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c
index 76e285881..70e4f4d7f 100644
--- a/soh/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c
+++ b/soh/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c
@@ -558,7 +558,7 @@ void ObjOshihiki_Push(ObjOshihiki* this, GlobalContext* globalCtx) {
     f32 pushDistSigned;
     s32 stopFlag;
 
-    this->pushSpeed += 0.5f;
+    this->pushSpeed += CVar_GetS32("gFasterBlockPush", 0) != 0 ? 1.0f : 0.5f;
     this->stateFlags |= PUSHBLOCK_PUSH;
     this->pushSpeed = CLAMP_MAX(this->pushSpeed, 2.0f);
     stopFlag = Math_StepToF(&this->pushDist, 20.0f, this->pushSpeed);
@@ -586,7 +586,7 @@ void ObjOshihiki_Push(ObjOshihiki* this, GlobalContext* globalCtx) {
         this->dyna.unk_150 = 0.0f;
         this->pushDist = 0.0f;
         this->pushSpeed = 0.0f;
-        this->timer = 10;
+        this->timer = CVar_GetS32("gFasterBlockPush", 0) != 0 ? 3 : 10;
         if (this->floorBgIds[this->highestFloor] == BGCHECK_SCENE) {
             ObjOshihiki_SetupOnScene(this, globalCtx);
         } else {

From a790638bf50cd92ed0038541fac2301b6520f76d Mon Sep 17 00:00:00 2001
From: KiritoDev <36680385+KiritoDv@users.noreply.github.com>
Date: Thu, 12 May 2022 09:26:32 -0500
Subject: [PATCH 21/43] Fixed texture loads on imgui

---
 libultraship/libultraship/SohImGuiImpl.cpp | 4 ++--
 libultraship/libultraship/TextureMod.cpp   | 2 +-
 libultraship/libultraship/TextureMod.h     | 9 ---------
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/libultraship/libultraship/SohImGuiImpl.cpp b/libultraship/libultraship/SohImGuiImpl.cpp
index 166edf50d..3af8fa885 100644
--- a/libultraship/libultraship/SohImGuiImpl.cpp
+++ b/libultraship/libultraship/SohImGuiImpl.cpp
@@ -257,7 +257,7 @@ namespace SohImGui {
 
     void LoadTexture(const std::string& name, const std::string& path) {
         GfxRenderingAPI* api = gfx_get_current_rendering_api();
-        const auto res = GlobalCtx2::GetInstance()->GetResourceManager()->LoadFile(normalize(path));
+        const auto res = GlobalCtx2::GetInstance()->GetResourceManager()->LoadFile(path);
 
         const auto asset = new GameAsset{ api->new_texture() };
         uint8_t* img_data = stbi_load_from_memory(reinterpret_cast<const stbi_uc*>(res->buffer.get()), res->dwBufferSize, &asset->width, &asset->height, nullptr, 4);
@@ -277,7 +277,7 @@ namespace SohImGui {
 
     void LoadResource(const std::string& name, const std::string& path, const ImVec4& tint) {
         GfxRenderingAPI* api = gfx_get_current_rendering_api();
-        const auto res = static_cast<Ship::Texture*>(GlobalCtx2::GetInstance()->GetResourceManager()->LoadResource(normalize(path)).get());
+        const auto res = static_cast<Ship::Texture*>(GlobalCtx2::GetInstance()->GetResourceManager()->LoadResource(path)).get());
 
         std::vector<uint8_t> texBuffer;
         texBuffer.reserve(res->width * res->height * 4);
diff --git a/libultraship/libultraship/TextureMod.cpp b/libultraship/libultraship/TextureMod.cpp
index 2a7e39511..7caf6b6f6 100644
--- a/libultraship/libultraship/TextureMod.cpp
+++ b/libultraship/libultraship/TextureMod.cpp
@@ -43,7 +43,7 @@ namespace Ship {
 		if (raw_path == nullptr) return;
 
 		const auto api = BIND_PTR("gfx_api", GfxRenderingAPI*);
-		const auto path = normalize(raw_path) + ".png";
+		const auto path = raw_path + ".png";
 		const auto node = BIND_PTR("node", TextureCacheNode**);
 		const auto fmt = BIND_VAR("fmt", uint32_t*);
 		const auto siz = BIND_VAR("siz", uint32_t*);
diff --git a/libultraship/libultraship/TextureMod.h b/libultraship/libultraship/TextureMod.h
index 987a0c6f3..8dac99387 100644
--- a/libultraship/libultraship/TextureMod.h
+++ b/libultraship/libultraship/TextureMod.h
@@ -36,15 +36,6 @@ namespace Ship {
 		void Hook_InvalidateTexture(HookEvent event);
 	};
 
-	inline std::string normalize(std::string path) {
-#ifdef _WIN32
-		std::ranges::replace(path, '/', '\\');
-#else
-		std::replace(path.begin(), path.end(), '\\', '/');
-#endif
-		return path;
-	}
-
 	inline void GrayOutTexture(uint8_t* data, int width, int height) {
 		for (int x = 0; x < width * height * 4; x += 4) {
 

From 57463051576e8208c18f560598f96cd5e64364c8 Mon Sep 17 00:00:00 2001
From: KiritoDev <36680385+KiritoDv@users.noreply.github.com>
Date: Thu, 12 May 2022 09:28:25 -0500
Subject: [PATCH 22/43] Fixed compilation errors

---
 libultraship/libultraship/SohImGuiImpl.cpp | 2 +-
 libultraship/libultraship/TextureMod.cpp   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libultraship/libultraship/SohImGuiImpl.cpp b/libultraship/libultraship/SohImGuiImpl.cpp
index 3af8fa885..72d9cee1a 100644
--- a/libultraship/libultraship/SohImGuiImpl.cpp
+++ b/libultraship/libultraship/SohImGuiImpl.cpp
@@ -277,7 +277,7 @@ namespace SohImGui {
 
     void LoadResource(const std::string& name, const std::string& path, const ImVec4& tint) {
         GfxRenderingAPI* api = gfx_get_current_rendering_api();
-        const auto res = static_cast<Ship::Texture*>(GlobalCtx2::GetInstance()->GetResourceManager()->LoadResource(path)).get());
+        const auto res = static_cast<Ship::Texture*>(GlobalCtx2::GetInstance()->GetResourceManager()->LoadResource(path).get());
 
         std::vector<uint8_t> texBuffer;
         texBuffer.reserve(res->width * res->height * 4);
diff --git a/libultraship/libultraship/TextureMod.cpp b/libultraship/libultraship/TextureMod.cpp
index 7caf6b6f6..b44987a62 100644
--- a/libultraship/libultraship/TextureMod.cpp
+++ b/libultraship/libultraship/TextureMod.cpp
@@ -43,7 +43,7 @@ namespace Ship {
 		if (raw_path == nullptr) return;
 
 		const auto api = BIND_PTR("gfx_api", GfxRenderingAPI*);
-		const auto path = raw_path + ".png";
+		const auto path = std::string(raw_path) + ".png";
 		const auto node = BIND_PTR("node", TextureCacheNode**);
 		const auto fmt = BIND_VAR("fmt", uint32_t*);
 		const auto siz = BIND_VAR("siz", uint32_t*);

From 635fb71b76ad45fb46bceb9c566c6fdc651e3ded Mon Sep 17 00:00:00 2001
From: louist103 <35883445+louist103@users.noreply.github.com>
Date: Thu, 12 May 2022 13:28:24 -0400
Subject: [PATCH 23/43] Save states (#300)

---
 libultraship/libultraship/ConfigFile.h        |   5 +
 libultraship/libultraship/GameVersions.h      |   7 +-
 libultraship/libultraship/GlobalCtx2.h        |   7 +-
 libultraship/libultraship/Window.cpp          |   3 +
 soh/include/functions.h                       |   2 +
 soh/include/libc/stddef.h                     |   5 +
 soh/include/z64.h                             |   3 +
 soh/soh.vcxproj                               |   6 +-
 soh/soh.vcxproj.filters                       |  15 +-
 soh/soh/Enhancements/debugconsole.cpp         |  75 ++
 soh/soh/Enhancements/savestates.cpp           | 957 ++++++++++++++++++
 soh/soh/Enhancements/savestates.h             |  62 ++
 soh/soh/Enhancements/savestates_extern.inc    | 257 +++++
 soh/soh/OTRAudio.h                            |   8 +
 soh/soh/OTRGlobals.cpp                        |  75 +-
 soh/soh/OTRGlobals.h                          |  15 +-
 soh/src/buffers/heaps.c                       |   3 -
 soh/src/code/graph.c                          |   3 +
 soh/src/code/z_camera.c                       |  12 +-
 soh/src/code/z_map_mark.c                     |   2 +-
 soh/src/code/z_onepointdemo.c                 |   4 +-
 ...intdemo_data.c => z_onepointdemo_data.inc} |  70 +-
 soh/src/code/z_play.c                         |   2 +-
 .../actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c      |  26 +-
 .../actors/ovl_Bg_Dodoago/z_bg_dodoago.c      |  36 +-
 .../actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c  |  12 +-
 .../actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c  |   4 +-
 .../ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c       |   2 +-
 .../ovl_Bg_Jya_1flift/z_bg_jya_1flift.c       |  10 +-
 .../ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c |   8 +-
 .../actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c    |   8 +-
 .../ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c     |   2 +-
 .../ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c |  10 +-
 .../ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c     |  16 +-
 .../ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c   |   8 +-
 .../actors/ovl_Bg_Po_Event/z_bg_po_event.c    |  78 +-
 .../ovl_Bg_Relay_Objects/z_bg_relay_objects.c |   2 +-
 .../ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c |   2 +-
 .../actors/ovl_Boss_Ganon/z_boss_ganon.c      | 303 +++---
 .../actors/ovl_Boss_Ganon/z_boss_ganon.h      |  18 +
 .../actors/ovl_Boss_Ganon2/z_boss_ganon2.c    | 201 ++--
 .../actors/ovl_Boss_Ganon2/z_boss_ganon2.h    |  14 +
 .../ovl_Boss_Ganon2/z_boss_ganon2_data.c      |  41 +-
 .../overlays/actors/ovl_Boss_Mo/z_boss_mo.c   |  28 +-
 .../overlays/actors/ovl_Boss_Tw/z_boss_tw.c   |  45 +-
 .../overlays/actors/ovl_Boss_Tw/z_boss_tw.h   |  45 +-
 .../overlays/actors/ovl_Demo_6K/z_demo_6k.c   |  16 +-
 .../actors/ovl_Demo_Kekkai/z_demo_kekkai.c    |  22 +-
 .../actors/ovl_Door_Warp1/z_door_warp1.c      |   2 +-
 soh/src/overlays/actors/ovl_En_Bw/z_en_bw.c   |   2 +-
 .../actors/ovl_En_Clear_Tag/z_en_clear_tag.c  |  14 +-
 soh/src/overlays/actors/ovl_En_Fr/z_en_fr.c   |  14 +-
 soh/src/overlays/actors/ovl_En_Fr/z_en_fr.h   |  11 +
 .../overlays/actors/ovl_En_Goma/z_en_goma.c   |   2 +-
 .../actors/ovl_En_Insect/z_en_insect.c        |   6 +-
 .../overlays/actors/ovl_En_Ishi/z_en_ishi.c   |  24 +-
 soh/src/overlays/actors/ovl_En_Niw/z_en_niw.c |   6 +-
 .../actors/ovl_En_Po_Field/z_en_po_field.c    |  36 +-
 .../ovl_En_Takara_Man/z_en_takara_man.c       |   2 +-
 soh/src/overlays/actors/ovl_En_Xc/z_en_xc.c   |  14 +-
 soh/src/overlays/actors/ovl_En_Zf/z_en_zf.c   |   4 +-
 soh/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c |   6 +-
 .../ovl_Object_Kankyo/z_object_kankyo.c       |  14 +-
 .../actors/ovl_player_actor/z_player.c        |   6 +-
 64 files changed, 2084 insertions(+), 634 deletions(-)
 create mode 100644 soh/soh/Enhancements/savestates.cpp
 create mode 100644 soh/soh/Enhancements/savestates.h
 create mode 100644 soh/soh/Enhancements/savestates_extern.inc
 create mode 100644 soh/soh/OTRAudio.h
 rename soh/src/code/{z_onepointdemo_data.c => z_onepointdemo_data.inc} (96%)

diff --git a/libultraship/libultraship/ConfigFile.h b/libultraship/libultraship/ConfigFile.h
index 17e3720f8..b94e22f88 100644
--- a/libultraship/libultraship/ConfigFile.h
+++ b/libultraship/libultraship/ConfigFile.h
@@ -1,3 +1,6 @@
+#ifndef CONFIG_FILE_H
+#define CONFIG_FILE_H
+
 #pragma once
 
 #include <string>
@@ -35,3 +38,5 @@ namespace Ship {
 			mINI::INIFile File;
 	};
 }
+
+#endif
diff --git a/libultraship/libultraship/GameVersions.h b/libultraship/libultraship/GameVersions.h
index a25463bf4..8d3753b21 100644
--- a/libultraship/libultraship/GameVersions.h
+++ b/libultraship/libultraship/GameVersions.h
@@ -1,3 +1,6 @@
+#ifndef GAME_VERSION_H
+#define GAME_VERSION_H
+
 #pragma once
 
 #define OOT_NTSC_10				0xEC7011B7
@@ -17,4 +20,6 @@
 #define OOT_PAL_GC_MQ_DBG		0x917D18F6
 #define OOT_IQUE_TW				0x3D81FB3E
 #define OOT_IQUE_CN				0xB1E1E07B
-#define OOT_UNKNOWN				0xFFFFFFFF
\ No newline at end of file
+#define OOT_UNKNOWN				0xFFFFFFFF
+
+#endif
diff --git a/libultraship/libultraship/GlobalCtx2.h b/libultraship/libultraship/GlobalCtx2.h
index a10421ec0..1ed512347 100644
--- a/libultraship/libultraship/GlobalCtx2.h
+++ b/libultraship/libultraship/GlobalCtx2.h
@@ -1,3 +1,6 @@
+#ifndef GLOBAL_CTX_2
+#define GLOBAL_CTX_2
+
 #pragma once
 
 #ifdef __cplusplus
@@ -38,4 +41,6 @@ namespace Ship {
 			std::string PatchesPath;
 	};
 }
-#endif
\ No newline at end of file
+#endif
+
+#endif
diff --git a/libultraship/libultraship/Window.cpp b/libultraship/libultraship/Window.cpp
index e7c221e41..35a95f0de 100644
--- a/libultraship/libultraship/Window.cpp
+++ b/libultraship/libultraship/Window.cpp
@@ -24,6 +24,7 @@
 #include <chrono>
 #include "SohHooks.h"
 #include "SohConsole.h"
+
 #include <iostream>
 
 extern "C" {
@@ -328,6 +329,8 @@ namespace Ship {
             GlobalCtx2::GetInstance()->GetWindow()->ToggleFullscreen();
         }
 
+        
+
         // OTRTODO: Rig with Kirito's console?
         //if (dwScancode == Ship::stoi(Conf["KEYBOARD SHORTCUTS"]["KEY_CONSOLE"])) {
         //    ToggleConsole();
diff --git a/soh/include/functions.h b/soh/include/functions.h
index 360afc687..4631cdb92 100644
--- a/soh/include/functions.h
+++ b/soh/include/functions.h
@@ -29,6 +29,7 @@ void gDPSetTextureImage(Gfx* pkt, u32 f, u32 s, u32 w, uintptr_t i);
 void gSPDisplayList(Gfx* pkt, Gfx* dl);
 void gSPDisplayListOffset(Gfx* pkt, Gfx* dl, int offset);
 void gSPVertex(Gfx* pkt, uintptr_t v, int n, int v0);
+void gSPInvalidateTexCache(Gfx* pkt, uintptr_t texAddr);
 
 void cleararena(void);
 void bootproc(void);
@@ -2406,6 +2407,7 @@ void Heaps_Free(void);
 #ifdef __cplusplus
 #undef this
 };
+#undef this
 #endif
 
 #endif
diff --git a/soh/include/libc/stddef.h b/soh/include/libc/stddef.h
index c30e392f8..e5fbe2d22 100644
--- a/soh/include/libc/stddef.h
+++ b/soh/include/libc/stddef.h
@@ -1,7 +1,12 @@
 #ifndef STDDEF_H
 #define STDDEF_H
 
+#ifndef __cplusplus
 #define NULL ((void*)0)
+#else
+#define NULL nullptr
+#endif
+
 #if 0
 #define size_t unsigned long
 #define ssize_t long
diff --git a/soh/include/z64.h b/soh/include/z64.h
index 103c8650f..7720144b4 100644
--- a/soh/include/z64.h
+++ b/soh/include/z64.h
@@ -30,6 +30,9 @@
 #include "ichain.h"
 #include "regs.h"
 
+#define AUDIO_HEAP_SIZE 0x38000
+#define SYSTEM_HEAP_SIZE (1024 * 1024 * 4)
+
 #ifdef __cplusplus
 namespace Ship
 {
diff --git a/soh/soh.vcxproj b/soh/soh.vcxproj
index 418fdd057..a395a22ce 100644
--- a/soh/soh.vcxproj
+++ b/soh/soh.vcxproj
@@ -180,6 +180,7 @@
     <ClCompile Include="soh\Enhancements\debugger\debugSaveEditor.cpp" />
     <ClCompile Include="soh\Enhancements\debugger\ImGuiHelpers.cpp" />
     <ClCompile Include="soh\Enhancements\gameconsole.c" />
+    <ClCompile Include="soh\Enhancements\savestates.cpp" />
     <ClCompile Include="soh\GbiWrap.cpp" />
     <ClCompile Include="soh\gu_pc.c" />
     <ClCompile Include="soh\OTRGlobals.cpp" />
@@ -328,7 +329,6 @@
     <ClCompile Include="src\code\z_msgevent.c" />
     <ClCompile Include="src\code\z_olib.c" />
     <ClCompile Include="src\code\z_onepointdemo.c" />
-    <ClCompile Include="src\code\z_onepointdemo_data.c" />
     <ClCompile Include="src\code\z_parameter.c" />
     <ClCompile Include="src\code\z_path.c" />
     <ClCompile Include="src\code\z_play.c" />
@@ -926,10 +926,12 @@
     <ClInclude Include="soh\Enhancements\cvar.h" />
     <ClInclude Include="soh\Enhancements\debugconsole.h" />
     <ClInclude Include="soh\Enhancements\debugger\colViewer.h" />
+    <ClInclude Include="soh\Enhancements\savestates.h" />
     <ClInclude Include="soh\Enhancements\debugger\debugger.h" />
     <ClInclude Include="soh\Enhancements\debugger\debugSaveEditor.h" />
     <ClInclude Include="soh\Enhancements\debugger\ImGuiHelpers.h" />
     <ClInclude Include="soh\gameconsole.h" />
+    <ClInclude Include="soh\OTRAudio.h" />
     <ClInclude Include="soh\OTRGlobals.h" />
     <ClInclude Include="soh\util.h" />
     <ClInclude Include="src\overlays\actors\ovl_Arms_Hook\z_arms_hook.h" />
@@ -1409,4 +1411,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/soh/soh.vcxproj.filters b/soh/soh.vcxproj.filters
index a8455a4c8..b9d68b704 100644
--- a/soh/soh.vcxproj.filters
+++ b/soh/soh.vcxproj.filters
@@ -630,9 +630,6 @@
     <ClCompile Include="src\code\z_onepointdemo.c">
       <Filter>Source Files\src\code</Filter>
     </ClCompile>
-    <ClCompile Include="src\code\z_onepointdemo_data.c">
-      <Filter>Source Files\src\code</Filter>
-    </ClCompile>
     <ClCompile Include="src\code\z_parameter.c">
       <Filter>Source Files\src\code</Filter>
     </ClCompile>
@@ -2190,6 +2187,12 @@
     <ClCompile Include="soh\Enhancements\debugger\ImGuiHelpers.cpp">
       <Filter>Source Files\soh\Enhancements\debugger</Filter>
     </ClCompile>
+    <ClCompile Include="src\code\z_cheap_proc.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="soh\Enhancements\savestates.cpp">
+      <Filter>Source Files\soh\Enhancements</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\overlays\actors\ovl_kaleido_scope\z_kaleido_scope.h">
@@ -3746,6 +3749,12 @@
     <ClInclude Include="soh\Enhancements\debugger\ImGuiHelpers.h">
       <Filter>Header Files\soh\Enhancements\debugger</Filter>
     </ClInclude>
+    <ClInclude Include="soh\Enhancements\savestates.h">
+      <Filter>Source Files\soh\Enhancements</Filter>
+    </ClInclude>
+    <ClInclude Include="soh\OTRAudio.h">
+      <Filter>Source Files\soh</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="include\macro.inc">
diff --git a/soh/soh/Enhancements/debugconsole.cpp b/soh/soh/Enhancements/debugconsole.cpp
index 189230798..1b892be74 100644
--- a/soh/soh/Enhancements/debugconsole.cpp
+++ b/soh/soh/Enhancements/debugconsole.cpp
@@ -1,7 +1,15 @@
+#ifdef _MSC_VER
+#define NOGDI
+#endif
+
 #include "debugconsole.h"
 #include "../libultraship/SohImGuiImpl.h"
+#include "savestates.h"
+
 #include <vector>
 #include <string>
+#include "soh/OTRGlobals.h"
+
 
 #define Path _Path
 #define PATH_HACK
@@ -303,6 +311,66 @@ static bool EntranceHandler(const std::vector<std::string>& args) {
     gSaveContext.nextTransition = 11;
 }
 
+static bool SaveStateHandler(const std::vector<std::string>& args) {
+    unsigned int slot = OTRGlobals::Instance->gSaveStateMgr->GetCurrentSlot();
+    const SaveStateReturn rtn = OTRGlobals::Instance->gSaveStateMgr->AddRequest({ slot, RequestType::SAVE });
+
+    switch (rtn) { 
+        case SaveStateReturn::SUCCESS:
+            INFO("[SOH] Saved state to slot %u", slot);
+            return CMD_SUCCESS;
+        case SaveStateReturn::FAIL_WRONG_GAMESTATE:
+            ERROR("[SOH] Can not save a state outside of \"GamePlay\"");
+            return CMD_FAILED;
+
+    }
+}
+
+static bool LoadStateHandler(const std::vector<std::string>& args) {
+    unsigned int slot = OTRGlobals::Instance->gSaveStateMgr->GetCurrentSlot();
+    const SaveStateReturn rtn = OTRGlobals::Instance->gSaveStateMgr->AddRequest({ slot, RequestType::LOAD });
+    
+    switch (rtn) {
+        case SaveStateReturn::SUCCESS:
+            INFO("[SOH] Loaded state from slot %u", slot);
+            return CMD_SUCCESS;
+        case SaveStateReturn::FAIL_INVALID_SLOT:
+            ERROR("[SOH] Invalid State Slot Number (%u)", slot);
+            return CMD_FAILED;
+        case SaveStateReturn::FAIL_STATE_EMPTY:
+            ERROR("[SOH] State Slot (%u) is empty", slot);
+            return CMD_FAILED;
+        case SaveStateReturn::FAIL_WRONG_GAMESTATE:
+            ERROR("[SOH] Can not load a state outside of \"GamePlay\"");
+            return CMD_FAILED;            
+    }
+
+}
+
+static bool StateSlotSelectHandler(const std::vector<std::string>& args) {
+    if (args.size() != 2) {
+        ERROR("[SOH] Unexpected arguments passed");
+        return CMD_FAILED;
+    }
+    int slot;
+
+    try {
+        slot = std::stoi(args[1], nullptr, 10);
+    } catch (std::invalid_argument const& ex) {
+        ERROR("[SOH] SaveState slot value must be a number.");
+        return CMD_FAILED;
+    }
+    
+    if (slot < 0) {
+        ERROR("[SOH] Invalid slot passed.  Slot must be between 0 and 2");
+        return CMD_FAILED;
+    }
+
+    OTRGlobals::Instance->gSaveStateMgr->SetCurrentSlot(slot);
+    INFO("[SOH] Slot %u selected", OTRGlobals::Instance->gSaveStateMgr->GetCurrentSlot());
+    return CMD_SUCCESS;
+}
+
 #define VARTYPE_INTEGER 0
 #define VARTYPE_FLOAT   1
 #define VARTYPE_STRING  2
@@ -416,6 +484,13 @@ void DebugConsole_Init(void) {
                              { { "slot", ArgumentType::NUMBER }, { "item id", ArgumentType::NUMBER } } });
     CMD_REGISTER("entrance",
                  { EntranceHandler, "Sends player to the entered entrance (hex)", { { "entrance", ArgumentType::NUMBER } } });
+
+    CMD_REGISTER("save_state", { SaveStateHandler, "Save a state." });
+    CMD_REGISTER("load_state", { LoadStateHandler, "Load a state." });
+    CMD_REGISTER("set_slot", { StateSlotSelectHandler, "Selects a SaveState slot", {
+        { "Slot number", ArgumentType::NUMBER, }
+        } });
+    DebugConsole_LoadCVars();
 }
 
 template <typename Numeric> bool is_number(const std::string& s) {
diff --git a/soh/soh/Enhancements/savestates.cpp b/soh/soh/Enhancements/savestates.cpp
new file mode 100644
index 000000000..2b6d27189
--- /dev/null
+++ b/soh/soh/Enhancements/savestates.cpp
@@ -0,0 +1,957 @@
+#include "savestates.h"
+
+#include "GameVersions.h"
+
+#include <cstdio> // std::sprintf
+
+#include "spdlog/spdlog.h"
+
+#include <soh/OTRGlobals.h>
+#include <soh/OTRAudio.h>
+
+#include <SohImGuiImpl.h>
+
+#include "z64.h"
+#include "z64save.h"
+#include <variables.h>
+#include <functions.h>
+#include "z64map_mark.h"
+#include "../../src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.h"
+#include "../../src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.h"
+#include "../../src/overlays/actors/ovl_Boss_Tw/z_boss_tw.h"
+#include "../../src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h"
+#include "../../src/overlays/actors/ovl_En_Fr/z_en_fr.h"
+
+extern "C" GlobalContext* gGlobalCtx;
+
+// FROM z_lights.c
+// I didn't feel like moving it into a header file.
+#define LIGHTS_BUFFER_SIZE 32
+
+typedef struct {
+    /* 0x000 */ s32 numOccupied;
+    /* 0x004 */ s32 searchIndex;
+    /* 0x008 */ LightNode buf[LIGHTS_BUFFER_SIZE];
+} LightsBuffer; // size = 0x188
+
+#include "savestates_extern.inc"
+
+typedef struct SaveStateInfo {
+    unsigned char sysHeapCopy[SYSTEM_HEAP_SIZE];
+    unsigned char audioHeapCopy[AUDIO_HEAP_SIZE];
+
+    SaveContext saveContextCopy;
+    GameInfo gameInfoCopy;
+    LightsBuffer lightBufferCopy;
+    AudioContext audioContextCopy;
+    MtxF mtxStackCopy[20]; // always 20 matricies
+    MtxF currentMtxCopy;
+    uint32_t rngSeed;
+    int16_t blueWarpTimerCopy; /* From door_warp_1 */
+
+    SeqScriptState seqScriptStateCopy[4];// Unrelocated
+    unk_D_8016E750 unk_D_8016E750Copy[4];
+
+    ActiveSound gActiveSoundsCopy[7][MAX_CHANNELS_PER_BANK];
+    uint8_t gSoundBankMutedCopy[7];
+
+    u8 D_801333F0_copy;
+    u8 gAudioSfxSwapOff_copy;
+    uint16_t gAudioSfxSwapSource_copy[10];
+    uint16_t gAudioSfxSwapTarget_copy[10];
+    uint8_t gAudioSfxSwapMode_copy[10];
+    void (*D_801755D0_copy)(void);
+    MapMarkData** sLoadedMarkDataTableCopy;
+
+    //Static Data
+
+    //Camera data
+    int32_t sInitRegs_copy;
+    int32_t gDbgCamEnabled_copy;
+    int32_t sDbgModeIdx_copy;
+    int16_t sNextUID_copy;             
+    int32_t sCameraInterfaceFlags_copy;
+    int32_t sCameraInterfaceAlpha_copy;
+    int32_t sCameraShrinkWindowVal_copy;
+    int32_t D_8011D3AC_copy;
+    int32_t sDemo5PrevAction12Frame_copy;
+    int32_t sDemo5PrevSfxFrame_copy;
+    int32_t D_8011D3F0_copy;
+    OnePointCsFull D_8011D6AC_copy[3];
+    OnePointCsFull D_8011D724_copy[3];
+    OnePointCsFull D_8011D79C_copy[3];
+    OnePointCsFull D_8011D83C_copy[2];
+    OnePointCsFull D_8011D88C_copy[2];
+    OnePointCsFull D_8011D8DC_copy[3];
+    OnePointCsFull D_8011D954_copy[4];
+    OnePointCsFull D_8011D9F4_copy[3];
+    int16_t D_8011DB08_copy;
+    int16_t D_8011DB0C_copy;
+    int32_t sOOBTimer_copy;
+    f32 D_8015CE50_copy;
+    f32 D_8015CE54_copy;
+    CamColChk D_8015CE58_copy;
+
+    //Gameover
+    uint16_t gGameOverTimer_copy;
+
+    //One point demo
+    uint32_t sPrevFrameCs1100_copy;
+    CutsceneCameraPoint D_8012013C_copy[14];
+    CutsceneCameraPoint D_8012021C_copy[14];
+    CutsceneCameraPoint D_801204D4_copy[14];
+    CutsceneCameraPoint D_801205B4_copy[14];
+    OnePointCsFull D_801208EC_copy[3];
+    OnePointCsFull D_80120964_copy[2];
+    OnePointCsFull D_801209B4_copy[4];
+    OnePointCsFull D_80120ACC_copy[5];
+    OnePointCsFull D_80120B94_copy[11];
+    OnePointCsFull D_80120D4C_copy[7];
+    OnePointCsFull D_80120FA4_copy[6];
+    OnePointCsFull D_80121184_copy[2];
+    OnePointCsFull D_801211D4_copy[2];
+    OnePointCsFull D_8012133C_copy[3];
+    OnePointCsFull D_801213B4_copy[5];
+    OnePointCsFull D_8012151C_copy[2];
+    OnePointCsFull D_8012156C_copy[2];
+    OnePointCsFull D_801215BC_copy[1];
+    OnePointCsFull D_80121C24_copy[7];
+    OnePointCsFull D_80121D3C_copy[3];
+    OnePointCsFull D_80121F1C_copy[4];
+    OnePointCsFull D_80121FBC_copy[4];
+    OnePointCsFull D_801220D4_copy[5];
+    OnePointCsFull D_80122714_copy[4];
+    OnePointCsFull D_80122CB4_copy[2];
+    OnePointCsFull D_80122D04_copy[2];
+    OnePointCsFull D_80122E44_copy[2][7];
+    OnePointCsFull D_8012313C_copy[3];
+    OnePointCsFull D_801231B4_copy[4];
+    OnePointCsFull D_80123254_copy[2];
+    OnePointCsFull D_801232A4_copy[1];
+    OnePointCsFull D_80123894_copy[3];
+    OnePointCsFull D_8012390C_copy[2];
+    OnePointCsFull D_8012395C_copy[3];
+    OnePointCsFull D_801239D4_copy[3];
+
+    uint16_t gTimeIncrement_copy;
+
+    //Overlay static data
+    //  z_bg_ddan_kd
+    Vec3f sBgDdanKdVelocity_copy;
+    Vec3f sBgDdanKdAccel_copy;
+
+    // z_bg_dodoago
+    s16 sBgDodoagoFirstExplosiveFlag_copy;
+    u8 sBgDodoagoDisableBombCatcher_copy;
+    s32 sBgDodoagoTimer_copy;
+
+    // z_bg_haka_trap
+    uint32_t D_80880F30_copy;
+    uint32_t D_80881014_copy;
+
+    // z_bg_hidan_rock
+    float D_8088BFC0_copy;
+
+    // z_bg_menkuri_eye
+    int32_t D_8089C1A0_copy;
+
+    // z_bg_mori_hineri
+    int16_t sBgMoriHineriNextCamIdx_copy;
+
+    // z_bg_po_event
+    uint8_t sBgPoEventBlocksAtRest_copy;
+    uint8_t sBgPoEventPuzzleState_copy;
+    float sBgPoEventblockPushDist_copy;
+
+    // z_bg_relay_objects
+    uint32_t D_808A9508_copy;
+
+    // z_bg_spot18_basket
+    int16_t D_808B85D0_copy;
+
+    // z_boss_ganon
+    uint32_t sBossGanonSeed1_copy;
+    uint32_t sBossGanonSeed2_copy;
+    uint32_t sBossGanonSeed3_copy;
+    void* sBossGanonGanondorf_copy;
+    void* sBossGanonZelda_copy;
+    void* sBossGanonCape_copy;
+    GanondorfEffect sBossGanonEffectBuf_copy[200];
+
+    // z_boss_ganon
+    uint32_t sBossGanonSeed1;
+    uint32_t sBossGanonSeed2;
+    uint32_t sBossGanonSeed3;
+    void* sBossGanonGanondorf;
+    void* sBossGanonZelda;
+    void* sBossGanonCape;
+    GanondorfEffect sBossGanonEffectBuf[200];
+
+    // z_boss_ganon2
+    Vec3f D_8090EB20_copy;
+    int8_t D_80910638_copy;
+    void* sBossGanon2Zelda_copy;
+    void* D_8090EB30_copy;
+    int32_t sBossGanon2Seed1_copy;
+    int32_t sBossGanon2Seed2_copy;
+    int32_t sBossGanon2Seed3_copy;
+    Vec3f D_809105D8_copy[4];
+    Vec3f D_80910608_copy[4];
+    BossGanon2Effect sBossGanon2Particles_copy[100];
+
+    // z_boss_tw
+    uint8_t sTwInitalized_copy;
+    BossTwEffect sTwEffects_copy[150];
+
+    // z_demo_6k
+    Vec3f sDemo6kVelocity_copy;
+
+    // z_demo_du
+    int32_t D_8096CE94_copy;
+
+    // z_demo_kekkai
+    Vec3f demoKekkaiVel_copy;
+
+    // z_en_bw
+    int32_t sSlugGroup_copy;
+
+    // z_en_clear_tag
+    uint8_t sClearTagIsEffectInitialized_copy;
+    EnClearTagEffect sClearTagEffects_copy[CLEAR_TAG_EFFECT_MAX_COUNT];
+
+    // z_en_fr
+    EnFrPointers sEnFrPointers_copy;
+
+    // z_en_goma
+    uint8_t sSpawnNum_copy;
+
+    // z_en_insect
+    float D_80A7DEB0_copy;
+    int16_t D_80A7DEB4_copy;
+    int16_t D_80A7DEB8_copy;
+
+    // z_en_ishi
+    int16_t sRockRotSpeedX_copy;
+    int16_t sRockRotSpeedY_copy;
+
+    // z_en_niw
+    int16_t D_80AB85E0_copy;
+    uint8_t sLowerRiverSpawned_copy;
+    uint8_t sUpperRiverSpawned_copy;
+
+    // z_en_po_field
+    int32_t sEnPoFieldNumSpawned_copy;
+    Vec3s sEnPoFieldSpawnPositions_copy[10];
+    u8 sEnPoFieldSpawnSwitchFlags_copy[10];
+
+    // z_en_takara_man
+    uint8_t sTakaraIsInitialized_copy;
+
+    // z_en_xc
+    int32_t D_80B41D90_copy;
+    int32_t sEnXcFlameSpawned_copy;
+    int32_t D_80B41DA8_copy;
+    int32_t D_80B41DAC_copy;
+
+    // z_en_zf
+    int16_t D_80B4A1B0_copy;
+    int16_t D_80B4A1B4_copy;
+
+    int32_t D_80B5A468_copy;
+    int32_t D_80B5A494_copy;
+    int32_t D_80B5A4BC_copy;
+
+    uint8_t sKankyoIsSpawned_copy;
+    int16_t sTrailingFairies_copy;
+
+
+    //Misc static data
+    // z_map_exp
+
+    s16 sPlayerInitialPosX_copy;
+    s16 sPlayerInitialPosZ_copy;
+    s16 sPlayerInitialDirection_copy;
+
+    // code_800E(something. fill me in later)
+    u8 sOcarinaInpEnabled_copy;
+    s8 D_80130F10_copy;
+    u8 sCurOcarinaBtnVal_copy;
+    u8 sPrevOcarinaNoteVal_copy;
+    u8 sCurOcarinaBtnIdx_copy;
+    u8 sLearnSongLastBtn_copy;
+    f32 D_80130F24_copy;
+    f32 D_80130F28_copy;
+    s8 D_80130F2C_copy;
+    s8 D_80130F30_copy;
+    s8 D_80130F34_copy;
+    u8 sDisplayedNoteValue_copy;
+    u8 sPlaybackState_copy;
+    u32 D_80130F3C_copy;
+    u32 sNotePlaybackTimer_copy;
+    u16 sPlaybackNotePos_copy;
+    u16 sStaffPlaybackPos_copy;
+
+    u32 sCurOcarinaBtnPress_copy;
+    u32 D_8016BA10_copy;
+    u32 sPrevOcarinaBtnPress_copy;
+    s32 D_8016BA18_copy;
+    s32 D_8016BA1C_copy;
+    u8 sCurOcarinaSong_copy[8];
+    u8 sOcarinaSongAppendPos_copy;
+    u8 sOcarinaHasStartedSong_copy;
+    u8 sOcarinaSongNoteStartIdx_copy;
+    u8 sOcarinaSongCnt_copy;
+    u16 sOcarinaAvailSongs_copy;
+    u8 sStaffPlayingPos_copy;
+    u16 sLearnSongPos_copy[0x10];
+    u16 D_8016BA50_copy[0x10];
+    u16 D_8016BA70_copy[0x10];
+    u8 sLearnSongExpectedNote_copy[0x10];
+    OcarinaNote D_8016BAA0_copy;
+    u8 sAudioHasMalonBgm_copy;
+    f32 sAudioMalonBgmDist_copy;
+
+    // Message_PAL
+    s16 sOcarinaNoteBufPos_copy;
+    s16 sOcarinaNoteBufLen_copy;
+    u8 sOcarinaNoteBuf_copy[12];
+
+    u8 D_8014B2F4_copy;
+    u8 sTextboxSkipped_copy;
+    u16 sNextTextId_copy;
+    s16 sLastPlayedSong_copy;
+    s16 sHasSunsSong_copy;
+    s16 sMessageHasSetSfx_copy;
+    u16 sOcarinaSongBitFlags_copy;
+
+
+} SaveStateInfo;
+
+class SaveState {
+    friend class SaveStateMgr;
+
+  public:
+    SaveState(std::shared_ptr<SaveStateMgr> mgr, unsigned int slot);
+
+  private:
+    unsigned int slot;
+    std::shared_ptr<SaveStateMgr> saveStateMgr;
+    std::shared_ptr<SaveStateInfo> info;
+
+    void Save(void);
+    void Load(void);
+    void BackupSeqScriptState(void);
+    void LoadSeqScriptState(void);
+    void BackupCameraData(void);
+    void LoadCameraData(void);
+    void SaveOnePointDemoData(void);
+    void LoadOnePointDemoData(void);
+    void SaveOverlayStaticData(void);
+    void LoadOverlayStaticData(void);
+
+    void SaveMiscCodeData(void);
+    void LoadMiscCodeData(void);
+
+    SaveStateInfo* GetSaveStateInfo(void);
+};
+
+SaveStateMgr::SaveStateMgr() {
+    this->SetCurrentSlot(0);
+}
+SaveStateMgr::~SaveStateMgr() { 
+    this->states.clear();
+}
+
+SaveState::SaveState(std::shared_ptr<SaveStateMgr> mgr, unsigned int slot) : saveStateMgr(mgr), slot(slot), info(nullptr) {
+    this->info = std::make_shared<SaveStateInfo>();
+}
+
+void SaveState::BackupSeqScriptState(void) {
+    for (unsigned int i = 0; i < 4; i++) {
+        info->seqScriptStateCopy[i].value = gAudioContext.seqPlayers[i].scriptState.value;
+        
+        info->seqScriptStateCopy[i].remLoopIters[0] = gAudioContext.seqPlayers[i].scriptState.remLoopIters[0];
+        info->seqScriptStateCopy[i].remLoopIters[1] = gAudioContext.seqPlayers[i].scriptState.remLoopIters[1];
+        info->seqScriptStateCopy[i].remLoopIters[2] = gAudioContext.seqPlayers[i].scriptState.remLoopIters[2];
+        info->seqScriptStateCopy[i].remLoopIters[3] = gAudioContext.seqPlayers[i].scriptState.remLoopIters[3];
+        
+        info->seqScriptStateCopy[i].depth = gAudioContext.seqPlayers[i].scriptState.depth;
+        
+        info->seqScriptStateCopy[i].pc = (u8*)((uintptr_t)gAudioContext.seqPlayers[i].scriptState.pc - (uintptr_t)gAudioHeap);
+        
+        info->seqScriptStateCopy[i].stack[0] =
+            (u8*)((uintptr_t)gAudioContext.seqPlayers[i].scriptState.stack[0] - (uintptr_t)gAudioHeap);
+        info->seqScriptStateCopy[i].stack[1] =
+            (u8*)((uintptr_t)gAudioContext.seqPlayers[i].scriptState.stack[1] - (uintptr_t)gAudioHeap);
+        info->seqScriptStateCopy[i].stack[2] =
+            (u8*)((uintptr_t)gAudioContext.seqPlayers[i].scriptState.stack[2] - (uintptr_t)gAudioHeap);
+        info->seqScriptStateCopy[i].stack[3] =
+            (u8*)((uintptr_t)gAudioContext.seqPlayers[i].scriptState.stack[3] - (uintptr_t)gAudioHeap);
+    }
+}
+
+void SaveState::LoadSeqScriptState(void) {
+    for (unsigned int i = 0; i < 4; i++) {
+        gAudioContext.seqPlayers[i].scriptState.value = info->seqScriptStateCopy[i].value;
+
+        gAudioContext.seqPlayers[i].scriptState.remLoopIters[0] = info->seqScriptStateCopy[i].remLoopIters[0];
+        gAudioContext.seqPlayers[i].scriptState.remLoopIters[1] = info->seqScriptStateCopy[i].remLoopIters[1];
+        gAudioContext.seqPlayers[i].scriptState.remLoopIters[2] = info->seqScriptStateCopy[i].remLoopIters[2];
+        gAudioContext.seqPlayers[i].scriptState.remLoopIters[3] = info->seqScriptStateCopy[i].remLoopIters[3];
+
+        gAudioContext.seqPlayers[i].scriptState.depth = info->seqScriptStateCopy[i].depth;
+
+        gAudioContext.seqPlayers[i].scriptState.pc =
+            (u8*)((uintptr_t)info->seqScriptStateCopy[i].pc + (uintptr_t)gAudioHeap);
+
+        gAudioContext.seqPlayers[i].scriptState.stack[0] =
+            (u8*)((uintptr_t)info->seqScriptStateCopy[i].stack[0] + (uintptr_t)gAudioHeap);
+        gAudioContext.seqPlayers[i].scriptState.stack[1] =
+            (u8*)((uintptr_t)info->seqScriptStateCopy[i].stack[1] + (uintptr_t)gAudioHeap);
+        gAudioContext.seqPlayers[i].scriptState.stack[2] =
+            (u8*)((uintptr_t)info->seqScriptStateCopy[i].stack[2] + (uintptr_t)gAudioHeap);
+        gAudioContext.seqPlayers[i].scriptState.stack[3] =
+            (u8*)((uintptr_t)info->seqScriptStateCopy[i].stack[3] + (uintptr_t)gAudioHeap);
+    }
+}
+
+void SaveState::BackupCameraData(void) {
+    info->sInitRegs_copy = sInitRegs;
+    info->gDbgCamEnabled_copy = gDbgCamEnabled;
+    info->sNextUID_copy = sNextUID;
+    info->sCameraInterfaceFlags_copy = sCameraInterfaceFlags;
+    info->sCameraInterfaceAlpha_copy = sCameraInterfaceAlpha;
+    info->sCameraShrinkWindowVal_copy = sCameraShrinkWindowVal;
+    info->D_8011D3AC_copy = D_8011D3AC;
+    info->sDemo5PrevAction12Frame_copy = sDemo5PrevAction12Frame;
+    info->sDemo5PrevSfxFrame_copy = sDemo5PrevSfxFrame;
+    info->D_8011D3F0_copy = D_8011D3F0;
+    memcpy(info->D_8011D6AC_copy, D_8011D6AC, sizeof(info->D_8011D6AC_copy));
+    memcpy(info->D_8011D724_copy, D_8011D724, sizeof(info->D_8011D724_copy));
+    memcpy(info->D_8011D79C_copy, D_8011D79C, sizeof(info->D_8011D79C_copy));
+    memcpy(info->D_8011D83C_copy, D_8011D83C, sizeof(info->D_8011D83C_copy));
+    memcpy(info->D_8011D88C_copy, D_8011D88C, sizeof(info->D_8011D88C_copy));
+    memcpy(info->D_8011D8DC_copy, D_8011D8DC, sizeof(info->D_8011D8DC_copy));
+    memcpy(info->D_8011D954_copy, D_8011D954, sizeof(info->D_8011D954_copy));
+    memcpy(info->D_8011D9F4_copy, D_8011D9F4, sizeof(info->D_8011D9F4_copy));
+    info->D_8011DB08_copy = D_8011DB08;
+    info->D_8011DB0C_copy = D_8011DB0C;
+    info->sOOBTimer_copy = sOOBTimer;
+    info->D_8015CE50_copy = D_8015CE50;
+    info->D_8015CE54_copy = D_8015CE54;
+    memcpy(&info->D_8015CE58_copy, &D_8015CE58, sizeof(info->D_8015CE58_copy));
+}
+
+void SaveState::LoadCameraData(void) {
+    sInitRegs = info->sInitRegs_copy;
+    gDbgCamEnabled = info->gDbgCamEnabled_copy;
+    sDbgModeIdx = info->sDbgModeIdx_copy;
+    sNextUID = info->sNextUID_copy;
+    sCameraInterfaceAlpha = info->sCameraInterfaceAlpha_copy;
+    sCameraInterfaceFlags = info->sCameraInterfaceFlags_copy;
+    sCameraShrinkWindowVal = info->sCameraShrinkWindowVal_copy;
+    D_8011D3AC = info->D_8011D3AC_copy;
+    sDemo5PrevAction12Frame = info->sDemo5PrevAction12Frame_copy;
+    sDemo5PrevSfxFrame = info->sDemo5PrevSfxFrame_copy;
+    D_8011D3F0 = info->D_8011D3F0_copy;
+    memcpy(D_8011D6AC, info->D_8011D6AC_copy, sizeof(info->D_8011D6AC_copy));
+    memcpy(D_8011D724, info->D_8011D724_copy, sizeof(info->D_8011D724_copy));
+    memcpy(D_8011D79C, info->D_8011D79C_copy, sizeof(info->D_8011D79C_copy));
+    memcpy(D_8011D83C, info->D_8011D83C_copy, sizeof(info->D_8011D83C_copy));
+    memcpy(D_8011D88C, info->D_8011D88C_copy, sizeof(info->D_8011D88C_copy));
+    memcpy(D_8011D8DC, info->D_8011D8DC_copy, sizeof(info->D_8011D8DC_copy));
+    memcpy(D_8011D954, info->D_8011D954_copy, sizeof(info->D_8011D954_copy));
+    memcpy(D_8011D9F4, info->D_8011D9F4_copy, sizeof(info->D_8011D9F4_copy));
+    D_8011DB08 = info->D_8011DB08_copy;
+    D_8011DB0C = info->D_8011DB0C_copy;
+    sOOBTimer = info->sOOBTimer_copy;
+    D_8015CE50 = info->D_8015CE50_copy;
+    D_8015CE54 = info->D_8015CE54_copy;
+    memcpy(&D_8015CE58, &info->D_8015CE58_copy, sizeof(info->D_8015CE58_copy));
+}
+
+void SaveState::SaveOnePointDemoData(void) {
+    info->sPrevFrameCs1100_copy = sPrevFrameCs1100;
+    memcpy(info->D_8012013C_copy, D_8012013C, sizeof(info->D_8012013C_copy));
+    memcpy(info->D_8012021C_copy, D_8012021C, sizeof(info->D_8012021C_copy));
+    memcpy(info->D_801204D4_copy, D_801204D4, sizeof(info->D_801204D4_copy));
+    memcpy(info->D_801205B4_copy, D_801205B4, sizeof(info->D_801205B4_copy));
+    memcpy(info->D_801208EC_copy, D_801208EC, sizeof(info->D_801208EC_copy));
+    memcpy(info->D_80120964_copy, D_80120964, sizeof(info->D_80120964_copy));
+    memcpy(info->D_801209B4_copy, D_801209B4, sizeof(info->D_801209B4_copy));
+    memcpy(info->D_80120ACC_copy, D_80120ACC, sizeof(info->D_80120ACC_copy));
+    memcpy(info->D_80120B94_copy, D_80120B94, sizeof(info->D_80120B94_copy));
+    memcpy(info->D_80120D4C_copy, D_80120D4C, sizeof(info->D_80120D4C_copy));
+    memcpy(info->D_80120FA4_copy, D_80120FA4, sizeof(info->D_80120FA4_copy));
+    memcpy(info->D_80121184_copy, D_80121184, sizeof(info->D_80121184_copy));
+    memcpy(info->D_801211D4_copy, D_801211D4, sizeof(info->D_801211D4_copy));
+    memcpy(info->D_8012133C_copy, D_8012133C, sizeof(info->D_8012133C_copy));
+    memcpy(info->D_801213B4_copy, D_801213B4, sizeof(info->D_801213B4_copy));
+    memcpy(info->D_8012151C_copy, D_8012151C, sizeof(info->D_8012151C_copy));
+    memcpy(info->D_8012156C_copy, D_8012156C, sizeof(info->D_8012156C_copy));
+    memcpy(info->D_801215BC_copy, D_801215BC, sizeof(info->D_801215BC_copy));
+    memcpy(info->D_80121C24_copy, D_80121C24, sizeof(info->D_80121C24_copy));
+    memcpy(info->D_80121D3C_copy, D_80121D3C, sizeof(info->D_80121D3C_copy));
+    memcpy(info->D_80121F1C_copy, D_80121F1C, sizeof(info->D_80121F1C_copy));
+    memcpy(info->D_80121FBC_copy, D_80121FBC, sizeof(info->D_80121FBC_copy));
+    memcpy(info->D_801220D4_copy, D_801220D4, sizeof(info->D_801220D4_copy));
+    memcpy(info->D_80122714_copy, D_80122714, sizeof(info->D_80122714_copy));
+    memcpy(info->D_80122CB4_copy, D_80122CB4, sizeof(info->D_80122CB4_copy));
+    memcpy(info->D_80122D04_copy, D_80122D04, sizeof(info->D_80122D04_copy));
+    memcpy(info->D_80122E44_copy, D_80122E44, sizeof(info->D_80122E44_copy));
+    memcpy(info->D_8012313C_copy, D_8012313C, sizeof(info->D_8012313C_copy));
+    memcpy(info->D_801231B4_copy, D_801231B4, sizeof(info->D_801231B4_copy));
+    memcpy(info->D_80123254_copy, D_80123254, sizeof(info->D_80123254_copy));
+    memcpy(info->D_801232A4_copy, D_801232A4, sizeof(info->D_801232A4_copy));
+    memcpy(info->D_80123894_copy, D_80123894, sizeof(info->D_80123894_copy));
+    memcpy(info->D_8012390C_copy, D_8012390C, sizeof(info->D_8012390C_copy));
+    memcpy(info->D_8012395C_copy, D_8012395C, sizeof(info->D_8012395C_copy));
+    memcpy(info->D_801239D4_copy, D_801239D4, sizeof(info->D_801239D4_copy));
+}
+
+void SaveState::LoadOnePointDemoData(void) {
+    sPrevFrameCs1100 = info->sPrevFrameCs1100_copy;
+    memcpy(D_8012013C, info->D_8012013C_copy, sizeof(info->D_8012013C_copy));
+    memcpy(D_8012021C, info->D_8012021C_copy, sizeof(info->D_8012021C_copy));
+    memcpy(D_801204D4, info->D_801204D4_copy, sizeof(info->D_801204D4_copy));
+    memcpy(D_801205B4, info->D_801205B4_copy, sizeof(info->D_801205B4_copy));
+    memcpy(D_801208EC, info->D_801208EC_copy, sizeof(info->D_801208EC_copy));
+    memcpy(D_80120964, info->D_80120964_copy, sizeof(info->D_80120964_copy));
+    memcpy(D_801209B4, info->D_801209B4_copy, sizeof(info->D_801209B4_copy));
+    memcpy(D_80120ACC, info->D_80120ACC_copy, sizeof(info->D_80120ACC_copy));
+    memcpy(D_80120B94, info->D_80120B94_copy, sizeof(info->D_80120B94_copy));
+    memcpy(D_80120D4C, info->D_80120D4C_copy, sizeof(info->D_80120D4C_copy));
+    memcpy(D_80120FA4, info->D_80120FA4_copy, sizeof(info->D_80120FA4_copy));
+    memcpy(D_80121184, info->D_80121184_copy, sizeof(info->D_80121184_copy));
+    memcpy(D_801211D4, info->D_801211D4_copy, sizeof(info->D_801211D4_copy));
+    memcpy(D_8012133C, info->D_8012133C_copy, sizeof(info->D_8012133C_copy));
+    memcpy(D_801213B4, info->D_801213B4_copy, sizeof(info->D_801213B4_copy));
+    memcpy(D_8012151C, info->D_8012151C_copy, sizeof(info->D_8012151C_copy));
+    memcpy(D_8012156C, info->D_8012156C_copy, sizeof(info->D_8012156C_copy));
+    memcpy(D_801215BC, info->D_801215BC_copy, sizeof(info->D_801215BC_copy));
+    memcpy(D_80121C24, info->D_80121C24_copy, sizeof(info->D_80121C24_copy));
+    memcpy(D_80121D3C, info->D_80121D3C_copy, sizeof(info->D_80121D3C_copy));
+    memcpy(D_80121F1C, info->D_80121F1C_copy, sizeof(info->D_80121F1C_copy));
+    memcpy(D_80121FBC, info->D_80121FBC_copy, sizeof(info->D_80121FBC_copy));
+    memcpy(D_801220D4, info->D_801220D4_copy, sizeof(info->D_801220D4_copy));
+    memcpy(D_80122714, info->D_80122714_copy, sizeof(info->D_80122714_copy));
+    memcpy(D_80122CB4, info->D_80122CB4_copy, sizeof(info->D_80122CB4_copy));
+    memcpy(D_80122D04, info->D_80122D04_copy, sizeof(info->D_80122D04_copy));
+    memcpy(D_80122E44, info->D_80122E44_copy, sizeof(info->D_80122E44_copy));
+    memcpy(D_8012313C, info->D_8012313C_copy, sizeof(info->D_8012313C_copy));
+    memcpy(D_801231B4, info->D_801231B4_copy, sizeof(info->D_801231B4_copy));
+    memcpy(D_80123254, info->D_80123254_copy, sizeof(info->D_80123254_copy));
+    memcpy(D_801232A4, info->D_801232A4_copy, sizeof(info->D_801232A4_copy));
+    memcpy(D_80123894, info->D_80123894_copy, sizeof(info->D_80123894_copy));
+    memcpy(D_8012390C, info->D_8012390C_copy, sizeof(info->D_8012390C_copy));
+    memcpy(D_8012395C, info->D_8012395C_copy, sizeof(info->D_8012395C_copy));
+    memcpy(D_801239D4, info->D_801239D4_copy, sizeof(info->D_801239D4_copy));
+}
+
+void SaveState::SaveOverlayStaticData(void) {
+    info->sBgDdanKdVelocity_copy = sBgDdanKdVelocity;
+    info->sBgDdanKdAccel_copy = sBgDdanKdAccel;
+    info->sBgDodoagoFirstExplosiveFlag_copy = sBgDodoagoFirstExplosiveFlag;
+    info->sBgDodoagoDisableBombCatcher_copy = sBgDodoagoDisableBombCatcher;
+    info->sBgDodoagoTimer_copy = sBgDodoagoTimer;
+    info->D_80880F30_copy = D_80880F30;
+    info->D_80881014_copy = D_80881014;
+    info->D_8088BFC0_copy = D_8088BFC0;
+    info->sBgMoriHineriNextCamIdx_copy = sBgMoriHineriNextCamIdx;
+    info->sBgPoEventBlocksAtRest_copy = sBgPoEventBlocksAtRest;
+    info->sBgPoEventPuzzleState_copy = sBgPoEventPuzzleState;
+    info->sBgPoEventblockPushDist_copy = sBgPoEventblockPushDist;
+    info->D_808A9508_copy = D_808A9508;
+    info->D_808B85D0_copy = D_808B85D0;
+    info->sBossGanonSeed1_copy = sBossGanonSeed1;
+    info->sBossGanonSeed2_copy = sBossGanonSeed2;
+    info->sBossGanonSeed3_copy = sBossGanonSeed3;
+    info->sBossGanonGanondorf_copy = sBossGanonGanondorf;
+    info->sBossGanonZelda_copy = sBossGanonZelda;
+    info->sBossGanonCape_copy = sBossGanonCape;
+    memcpy(info->sBossGanonEffectBuf_copy, sBossGanonEffectBuf, sizeof(info->sBossGanonEffectBuf_copy));
+    info->D_8090EB20_copy = D_8090EB20;
+    info->D_80910638_copy = D_80910638;
+    info->sBossGanon2Zelda_copy = sBossGanon2Zelda;
+    info->D_8090EB30_copy = D_8090EB30;
+    info->sBossGanon2Seed1_copy = sBossGanon2Seed1;
+    info->sBossGanon2Seed2_copy = sBossGanon2Seed2;
+    info->sBossGanon2Seed3_copy = sBossGanon2Seed3;
+    memcpy(info->D_809105D8_copy, D_809105D8, sizeof(D_809105D8));
+    memcpy(info->D_80910608_copy, D_80910608, sizeof(D_80910608));
+    memcpy(info->sBossGanon2Particles_copy, sBossGanon2Particles, sizeof(sBossGanon2Particles));
+    info->sTwInitalized_copy = sTwInitalized;
+    memcpy(info->sTwEffects_copy, sTwEffects, sizeof(sTwEffects));
+    info->sDemo6kVelocity_copy = sDemo6kVelocity;
+    info->D_8096CE94_copy = D_8096CE94;
+    info->demoKekkaiVel_copy = demoKekkaiVel;
+    info->sSlugGroup_copy = sSlugGroup;
+    info->sClearTagIsEffectInitialized_copy = sClearTagIsEffectsInitialized;
+    memcpy(info->sClearTagEffects_copy, sClearTagEffects, sizeof(sClearTagEffects));
+
+    memcpy(&info->sEnFrPointers_copy, &sEnFrPointers, sizeof(info->sEnFrPointers_copy));
+    info->sSpawnNum_copy = sSpawnNum;
+
+    info->D_80A7DEB0_copy = D_80A7DEB0;
+    info->D_80A7DEB4_copy = D_80A7DEB4;
+    info->D_80A7DEB8_copy = D_80A7DEB8; 
+    info->sRockRotSpeedX_copy = sRockRotSpeedX;
+    info->sRockRotSpeedY_copy = sRockRotSpeedY;
+    info->D_80AB85E0_copy = D_80AB85E0;
+    info->sLowerRiverSpawned_copy = sLowerRiverSpawned;
+    info->sUpperRiverSpawned_copy = sUpperRiverSpawned;
+    info->sEnPoFieldNumSpawned_copy = sEnPoFieldNumSpawned;
+    memcpy(info->sEnPoFieldSpawnPositions_copy, sEnPoFieldSpawnPositions, sizeof(info->sEnPoFieldSpawnPositions_copy));
+    memcpy(info->sEnPoFieldSpawnSwitchFlags_copy, sEnPoFieldSpawnSwitchFlags, sizeof(info->sEnPoFieldSpawnSwitchFlags_copy));
+
+    info->sTakaraIsInitialized_copy = sTakaraIsInitialized;
+    info->D_80B41D90_copy = D_80B41D90;
+    info->sEnXcFlameSpawned_copy = sEnXcFlameSpawned;
+    info->D_80B41DA8_copy = D_80B41DA8;
+    info->D_80B41DAC_copy = D_80B41DAC;
+    info->D_80B4A1B0_copy = D_80B4A1B0;
+    info->D_80B4A1B4_copy = D_80B4A1B4;
+    info->D_80B5A468_copy = D_80B5A468;
+    info->D_80B5A494_copy = D_80B5A494;
+    info->D_80B5A4BC_copy = D_80B5A4BC;
+    info->sKankyoIsSpawned_copy = sKankyoIsSpawned;
+    info->sTrailingFairies_copy = sTrailingFairies;
+
+}
+
+void SaveState::LoadOverlayStaticData(void) {
+    sBgDdanKdVelocity = info->sBgDdanKdVelocity_copy;
+    sBgDdanKdAccel = info->sBgDdanKdAccel_copy;
+    sBgDodoagoFirstExplosiveFlag = info->sBgDodoagoFirstExplosiveFlag_copy;
+    sBgDodoagoDisableBombCatcher = info->sBgDodoagoDisableBombCatcher_copy;
+    sBgDodoagoTimer = info->sBgDodoagoTimer_copy;
+    D_80880F30 = info->D_80880F30_copy;
+    D_80881014 = info->D_80881014_copy;
+    D_8088BFC0 = info->D_8088BFC0_copy;
+    sBgMoriHineriNextCamIdx = info->sBgMoriHineriNextCamIdx_copy;
+    sBgPoEventBlocksAtRest = info->sBgPoEventBlocksAtRest_copy;
+    sBgPoEventPuzzleState = info->sBgPoEventPuzzleState_copy;
+    sBgPoEventblockPushDist = info->sBgPoEventblockPushDist_copy;
+    D_808A9508 = info->D_808A9508_copy;
+    D_808B85D0 = info->D_808B85D0_copy;
+    sBossGanonSeed1 = info->sBossGanonSeed1_copy;
+    sBossGanonSeed2 = info->sBossGanonSeed2_copy;
+    sBossGanonSeed3 = info->sBossGanonSeed3_copy;
+    sBossGanonGanondorf = info->sBossGanonGanondorf_copy;
+    sBossGanonZelda = info->sBossGanonZelda_copy;
+    sBossGanonCape = info->sBossGanonCape_copy;
+    memcpy(sBossGanonEffectBuf, info->sBossGanonEffectBuf_copy, sizeof(info->sBossGanonEffectBuf_copy));
+
+    D_8090EB20 = info->D_8090EB20_copy;
+    D_80910638 = info->D_80910638_copy;
+    sBossGanon2Zelda = info->sBossGanon2Zelda_copy;
+    D_8090EB30 = info->D_8090EB30_copy;
+    sBossGanon2Seed1 = info->sBossGanon2Seed1_copy;
+    sBossGanon2Seed2 = info->sBossGanon2Seed2_copy;
+    sBossGanon2Seed3 = info->sBossGanon2Seed3_copy;
+    memcpy(D_809105D8, info->D_809105D8_copy, sizeof(D_809105D8));
+    memcpy(D_80910608, info->D_80910608_copy, sizeof(D_80910608));
+    memcpy(sBossGanon2Particles, info->sBossGanon2Particles_copy, sizeof(sBossGanon2Particles));
+    sTwInitalized = info->sTwInitalized_copy;
+    memcpy(sTwEffects, info->sTwEffects_copy, sizeof(sTwEffects));
+    sDemo6kVelocity = info->sDemo6kVelocity_copy;
+
+    D_8096CE94 = info->D_8096CE94_copy;
+    demoKekkaiVel = info->demoKekkaiVel_copy;
+    sSlugGroup = info->sSlugGroup_copy;
+    sClearTagIsEffectsInitialized = info->sClearTagIsEffectInitialized_copy;
+    memcpy(sClearTagEffects, info->sClearTagEffects_copy, sizeof(sClearTagEffects));
+
+    D_80A7DEB0 = info->D_80A7DEB0_copy;
+    D_80A7DEB4 = info->D_80A7DEB4_copy;
+    D_80A7DEB8 = info->D_80A7DEB8_copy;
+    sRockRotSpeedX = info->sRockRotSpeedX_copy;
+    sRockRotSpeedY = info->sRockRotSpeedY_copy;
+    D_80AB85E0 = info->D_80AB85E0_copy;
+    sLowerRiverSpawned = info->sLowerRiverSpawned_copy;
+    sUpperRiverSpawned = info->sUpperRiverSpawned_copy;
+    sEnPoFieldNumSpawned = info->sEnPoFieldNumSpawned_copy;
+    memcpy(sEnPoFieldSpawnPositions, info->sEnPoFieldSpawnPositions_copy, sizeof(info->sEnPoFieldSpawnPositions_copy));
+    memcpy(sEnPoFieldSpawnSwitchFlags, info->sEnPoFieldSpawnSwitchFlags_copy, sizeof(info->sEnPoFieldSpawnSwitchFlags_copy));
+
+    sTakaraIsInitialized = info->sTakaraIsInitialized_copy;
+    D_80B41D90 = info->D_80B41D90_copy;
+    sEnXcFlameSpawned = info->sEnXcFlameSpawned_copy;
+    D_80B41DA8 = info->D_80B41DA8_copy;
+    D_80B41DAC = info->D_80B41DAC_copy;
+    D_80B4A1B0 = info->D_80B4A1B0_copy;
+    D_80B4A1B4 = info->D_80B4A1B4_copy;
+    D_80B5A468 = info->D_80B5A468_copy;
+    D_80B5A494 = info->D_80B5A494_copy;
+    D_80B5A4BC = info->D_80B5A4BC_copy;
+    sKankyoIsSpawned = info->sKankyoIsSpawned_copy;
+    sTrailingFairies = info->sTrailingFairies_copy;
+}
+
+void SaveState::SaveMiscCodeData(void) {
+    info->gGameOverTimer_copy = gGameOverTimer;
+    info->gTimeIncrement_copy = gTimeIncrement;
+    info->sLoadedMarkDataTableCopy = sLoadedMarkDataTable;
+
+    info->sPlayerInitialPosX_copy = sPlayerInitialPosX;
+    info->sPlayerInitialPosZ_copy = sPlayerInitialPosZ;
+    info->sPlayerInitialDirection_copy = sPlayerInitialDirection;
+
+    info->sOcarinaInpEnabled_copy = sOcarinaInpEnabled;
+    info->D_80130F10_copy = D_80130F10;
+    info->sCurOcarinaBtnVal_copy = sCurOcarinaBtnVal;
+    info->sPrevOcarinaNoteVal_copy = sPrevOcarinaNoteVal;
+    info->sCurOcarinaBtnIdx_copy = sCurOcarinaBtnIdx;
+    info->sLearnSongLastBtn_copy = sLearnSongLastBtn;
+    info->D_80130F24_copy = D_80130F24;
+    info->D_80130F28_copy = D_80130F28;
+    info->D_80130F2C_copy = D_80130F2C;
+    info->D_80130F30_copy = D_80130F30;
+    info->D_80130F34_copy = D_80130F34;
+    info->sPlaybackState_copy = sPlaybackState;
+    info->D_80130F3C_copy = D_80130F3C;
+    info->sNotePlaybackTimer_copy = sNotePlaybackTimer;
+    info->sPlaybackNotePos_copy = sPlaybackNotePos;
+    info->sStaffPlaybackPos_copy = sStaffPlaybackPos;
+
+
+    info->sCurOcarinaBtnPress_copy = sCurOcarinaBtnPress;
+    info->D_8016BA10_copy = D_8016BA10;
+    info->sPrevOcarinaBtnPress_copy = sPrevOcarinaBtnPress;
+    info->D_8016BA18_copy = D_8016BA18;
+    info->D_8016BA1C_copy = D_8016BA1C;
+    memcpy(info->sCurOcarinaSong_copy, sCurOcarinaSong, sizeof(sCurOcarinaSong));
+    info->sOcarinaSongAppendPos_copy = sOcarinaSongAppendPos;
+    info->sOcarinaHasStartedSong_copy = sOcarinaHasStartedSong;
+    info->sOcarinaSongNoteStartIdx_copy = sOcarinaSongNoteStartIdx;
+    info->sOcarinaSongCnt_copy = sOcarinaSongCnt;
+    info->sOcarinaAvailSongs_copy = sOcarinaAvailSongs;
+    info->sStaffPlayingPos_copy = sStaffPlayingPos;
+    memcpy(info->sLearnSongPos_copy, sLearnSongPos, sizeof(sLearnSongPos));
+    memcpy(info->D_8016BA50_copy, D_8016BA50, sizeof(D_8016BA50));
+    memcpy(info->D_8016BA70_copy, D_8016BA70, sizeof(D_8016BA70));
+    memcpy(info->sLearnSongExpectedNote_copy, sLearnSongExpectedNote, sizeof(sLearnSongExpectedNote));
+    memcpy(&info->D_8016BAA0_copy, &D_8016BAA0, sizeof(D_8016BAA0));
+    info->sAudioHasMalonBgm_copy = sAudioHasMalonBgm;
+    info->sAudioMalonBgmDist_copy = sAudioMalonBgmDist;
+    info->sDisplayedNoteValue_copy = sDisplayedNoteValue;
+
+
+    info->sOcarinaNoteBufPos_copy = sOcarinaNoteBufPos;
+    info->sOcarinaNoteBufLen_copy = sOcarinaNoteBufLen;
+    memcpy(info->sOcarinaNoteBuf_copy, sOcarinaNoteBuf, sizeof(sOcarinaNoteBuf));
+    info->D_8014B2F4_copy = D_8014B2F4;
+    info->sTextboxSkipped_copy = sTextboxSkipped;
+    info->sNextTextId_copy = sNextTextId;
+    info->sLastPlayedSong_copy = sLastPlayedSong;
+    info->sHasSunsSong_copy = sHasSunsSong;
+    info->sMessageHasSetSfx_copy = sMessageHasSetSfx;
+    info->sOcarinaSongBitFlags_copy = sOcarinaSongBitFlags;
+}
+
+void SaveState::LoadMiscCodeData(void) {
+    gGameOverTimer = info->gGameOverTimer_copy;
+    gTimeIncrement = info->gTimeIncrement_copy;
+    sLoadedMarkDataTable = info->sLoadedMarkDataTableCopy;
+
+    sPlayerInitialPosX = info->sPlayerInitialPosX_copy;
+    sPlayerInitialPosZ = info->sPlayerInitialPosZ_copy;
+    sPlayerInitialDirection = info->sPlayerInitialDirection_copy;
+
+    sOcarinaInpEnabled = info->sOcarinaInpEnabled_copy;
+    D_80130F10 = info->D_80130F10_copy;
+    sCurOcarinaBtnVal = info->sCurOcarinaBtnVal_copy;
+    sPrevOcarinaNoteVal = info->sPrevOcarinaNoteVal_copy;
+    sCurOcarinaBtnIdx = info->sCurOcarinaBtnIdx_copy;
+    sLearnSongLastBtn = info->sLearnSongLastBtn_copy;
+    D_80130F24 = info->D_80130F24_copy;
+    D_80130F28 = info->D_80130F28_copy;
+    D_80130F2C = info->D_80130F2C_copy;
+    D_80130F30 = info->D_80130F30_copy;
+    D_80130F34 = info->D_80130F34_copy;
+    sPlaybackState = info->sPlaybackState_copy;
+    D_80130F3C = info->D_80130F3C_copy;
+    sNotePlaybackTimer = info->sNotePlaybackTimer_copy;
+    sPlaybackNotePos = info->sPlaybackNotePos_copy;
+    sStaffPlaybackPos = info->sStaffPlaybackPos_copy;
+
+    sCurOcarinaBtnPress = info->sCurOcarinaBtnPress_copy;
+    D_8016BA10 = info->D_8016BA10_copy;
+    sPrevOcarinaBtnPress = info->sPrevOcarinaBtnPress_copy;
+    D_8016BA18 = info->D_8016BA18_copy;
+    D_8016BA1C = info->D_8016BA1C_copy;
+    memcpy(sCurOcarinaSong, info->sCurOcarinaSong_copy, sizeof(sCurOcarinaSong));
+    sOcarinaSongAppendPos = info->sOcarinaSongAppendPos_copy;
+    sOcarinaHasStartedSong = info->sOcarinaHasStartedSong_copy;
+    sOcarinaSongNoteStartIdx = info->sOcarinaSongNoteStartIdx_copy;
+    sOcarinaSongCnt = info->sOcarinaSongCnt_copy;
+    sOcarinaAvailSongs = info->sOcarinaAvailSongs_copy;
+    sStaffPlayingPos = info->sStaffPlayingPos_copy;
+    memcpy(info->sLearnSongPos_copy, info->sLearnSongPos_copy, sizeof(sLearnSongPos));
+    memcpy(info->D_8016BA50_copy, info->D_8016BA50_copy, sizeof(D_8016BA50));
+    memcpy(info->D_8016BA70_copy, info->D_8016BA70_copy, sizeof(D_8016BA70));
+    memcpy(info->sLearnSongExpectedNote_copy, info->sLearnSongExpectedNote_copy, sizeof(sLearnSongExpectedNote));
+    memcpy(&D_8016BAA0, &info->D_8016BAA0_copy, sizeof(D_8016BAA0));
+    sAudioHasMalonBgm = info->sAudioHasMalonBgm_copy;
+    sAudioMalonBgmDist = info->sAudioMalonBgmDist_copy;
+    sDisplayedNoteValue = info->sDisplayedNoteValue_copy;
+    
+    sOcarinaNoteBufPos = info->sOcarinaNoteBufPos_copy;
+    sOcarinaNoteBufLen = info->sOcarinaNoteBufLen_copy;
+    memcpy(sOcarinaNoteBuf, info->sOcarinaNoteBuf_copy, sizeof(sOcarinaNoteBuf));
+
+    D_8014B2F4 = info->D_8014B2F4_copy;
+    sTextboxSkipped = info->sTextboxSkipped_copy;
+    sNextTextId = info->sNextTextId_copy;
+    sLastPlayedSong = info->sLastPlayedSong_copy;
+    sHasSunsSong = info->sHasSunsSong_copy;
+    sMessageHasSetSfx = info->sMessageHasSetSfx_copy;
+    sOcarinaSongBitFlags = info->sOcarinaSongBitFlags_copy;
+
+
+}
+
+extern "C" void ProcessSaveStateRequests(void) {
+    OTRGlobals::Instance->gSaveStateMgr->ProcessSaveStateRequests();
+}
+
+void SaveStateMgr::SetCurrentSlot(unsigned int slot) {
+    SohImGui::overlay->TextDrawNotification(1.0f, true, "slot %u set", slot);
+    this->currentSlot = slot;
+}
+
+unsigned int SaveStateMgr::GetCurrentSlot(void) {
+    return this->currentSlot;
+}
+
+void SaveStateMgr::ProcessSaveStateRequests(void) {
+    while (!this->requests.empty()) {
+        const auto& request = this->requests.front();
+        
+        switch (request.type) {
+            case RequestType::SAVE:
+                if (!this->states.contains(request.slot)) {
+                    this->states[request.slot] = std::make_shared<SaveState>(OTRGlobals::Instance->gSaveStateMgr, request.slot);
+                }
+                this->states[request.slot]->Save();
+                SohImGui::overlay->TextDrawNotification(1.0f, true, "saved state %u", request.slot);
+                break;
+            case RequestType::LOAD:
+                if (this->states.contains(request.slot)) {
+                    this->states[request.slot]->Load();
+                    SohImGui::overlay->TextDrawNotification(1.0f, true, "loaded state %u", request.slot);
+                } else {
+                    SPDLOG_ERROR("Invalid SaveState slot: {}", request.type);
+                }
+                break;
+            [[unlikely]] default: 
+                SPDLOG_ERROR("Invalid SaveState request type: {}", request.type);
+                break;
+        }
+        this->requests.pop();
+    }
+}
+
+SaveStateReturn SaveStateMgr::AddRequest(const SaveStateRequest request) {
+    if (gGlobalCtx == nullptr) {
+        SPDLOG_ERROR("[SOH] Can not save or load a state outside of \"GamePlay\"");
+        SohImGui::overlay->TextDrawNotification(1.0f, true, "states not available here", request.slot);
+        return SaveStateReturn::FAIL_WRONG_GAMESTATE;
+    }
+
+    switch (request.type) { 
+        case RequestType::SAVE:
+            requests.push(request);
+            break;
+        case RequestType::LOAD:
+            if (states.contains(request.slot)) {
+                requests.push(request);
+            } else {
+                SPDLOG_ERROR("Invalid SaveState slot: {}", request.type);
+                SohImGui::overlay->TextDrawNotification(1.0f, true, "state slot %u empty", request.slot);
+                return SaveStateReturn::FAIL_INVALID_SLOT;
+            }
+            break;
+        [[unlikely]] default: 
+            SPDLOG_ERROR("Invalid SaveState request type: {}", request.type);
+            return SaveStateReturn::FAIL_BAD_REQUEST;
+            break;
+        
+    }
+}
+
+void SaveState::Save(void) {
+    std::unique_lock<std::mutex> Lock(audio.mutex);
+    memcpy(&info->sysHeapCopy, gSystemHeap, SYSTEM_HEAP_SIZE /* sizeof(gSystemHeap) */);
+    memcpy(&info->audioHeapCopy, gAudioHeap, AUDIO_HEAP_SIZE /* sizeof(gAudioContext) */);
+
+    memcpy(&info->audioContextCopy, &gAudioContext, sizeof(AudioContext));
+    memcpy(&info->unk_D_8016E750Copy, D_8016E750, sizeof(info->unk_D_8016E750Copy));
+    BackupSeqScriptState();
+
+    memcpy(info->gActiveSoundsCopy, gActiveSounds, sizeof(gActiveSounds));
+    memcpy(&info->gSoundBankMutedCopy, gSoundBankMuted, sizeof(info->gSoundBankMutedCopy));
+    
+    info->D_801333F0_copy = D_801333F0;
+    info->gAudioSfxSwapOff_copy = gAudioSfxSwapOff;
+
+    memcpy(&info->gAudioSfxSwapSource_copy, gAudioSfxSwapSource,
+           sizeof(info->gAudioSfxSwapSource_copy));
+    memcpy(&info->gAudioSfxSwapTarget_copy, gAudioSfxSwapTarget,
+           sizeof(info->gAudioSfxSwapTarget_copy));
+    memcpy(&info->gAudioSfxSwapMode_copy, gAudioSfxSwapMode, 
+        sizeof(info->gAudioSfxSwapMode_copy));
+
+    info->D_801755D0_copy = D_801755D0;
+
+    memcpy(&info->saveContextCopy, &gSaveContext, sizeof(gSaveContext));
+    memcpy(&info->gameInfoCopy, gGameInfo, sizeof(*gGameInfo));
+    memcpy(&info->lightBufferCopy, &sLightsBuffer, sizeof(sLightsBuffer));
+    memcpy(&info->mtxStackCopy, &sMatrixStack, sizeof(MtxF) * 20);
+    memcpy(&info->currentMtxCopy, &sCurrentMatrix, sizeof(MtxF));
+
+    //Various static data
+    info->blueWarpTimerCopy = sWarpTimerTarget;
+    BackupCameraData();
+    SaveOnePointDemoData();
+    SaveOverlayStaticData();
+    SaveMiscCodeData();
+
+}
+
+void SaveState::Load(void) {
+    std::unique_lock<std::mutex> Lock(audio.mutex);
+    memcpy(gSystemHeap, &info->sysHeapCopy, SYSTEM_HEAP_SIZE);
+    memcpy(gAudioHeap, &info->audioHeapCopy, AUDIO_HEAP_SIZE);
+
+    memcpy(&gAudioContext, &info->audioContextCopy, sizeof(AudioContext));
+    memcpy(D_8016E750, &info->unk_D_8016E750Copy, sizeof(info->unk_D_8016E750Copy));
+    LoadSeqScriptState();
+
+    memcpy(&gSaveContext, &info->saveContextCopy, sizeof(gSaveContext));
+    memcpy(gGameInfo, &info->gameInfoCopy, sizeof(*gGameInfo));
+    memcpy(&sLightsBuffer, &info->lightBufferCopy, sizeof(sLightsBuffer));
+    memcpy(&sMatrixStack, &info->mtxStackCopy, sizeof(MtxF) * 20);
+    memcpy(&sCurrentMatrix, &info->currentMtxCopy, sizeof(MtxF));
+    sWarpTimerTarget = info->blueWarpTimerCopy;
+
+    memcpy(gActiveSounds, info->gActiveSoundsCopy, sizeof(gActiveSounds));
+    memcpy(gSoundBankMuted, &info->gSoundBankMutedCopy, sizeof(info->gSoundBankMutedCopy));
+    D_801333F0 = info->D_801333F0_copy;
+    gAudioSfxSwapOff = info->gAudioSfxSwapOff_copy;
+
+    memcpy(gAudioSfxSwapSource, &info->gAudioSfxSwapSource_copy,
+           sizeof(info->gAudioSfxSwapSource_copy));
+    memcpy(gAudioSfxSwapTarget, &info->gAudioSfxSwapTarget_copy,
+           sizeof(info->gAudioSfxSwapTarget_copy));
+    memcpy(gAudioSfxSwapMode, &info->gAudioSfxSwapMode_copy,
+           sizeof(info->gAudioSfxSwapMode_copy));
+    
+    //Various static data
+    D_801755D0 = info->D_801755D0_copy;
+    LoadCameraData();
+    LoadOnePointDemoData();
+    LoadOverlayStaticData();
+    LoadMiscCodeData();
+
+}
diff --git a/soh/soh/Enhancements/savestates.h b/soh/soh/Enhancements/savestates.h
new file mode 100644
index 000000000..4ac142172
--- /dev/null
+++ b/soh/soh/Enhancements/savestates.h
@@ -0,0 +1,62 @@
+#ifndef SAVE_STATES_H
+#define SAVE_STATES_H
+
+#include <cstdint>
+#include <queue>
+#include <unordered_map>
+#include <memory>
+#include <mutex>
+
+enum class SaveStateReturn {
+    SUCCESS,
+    FAIL_INVALID_SLOT,
+    FAIL_NO_MEMORY,
+    FAIL_STATE_EMPTY,
+    FAIL_WRONG_GAMESTATE,
+    FAIL_BAD_REQUEST,
+};
+
+typedef struct SaveStateHeader {
+    uint32_t stateMagic;
+    uint32_t stateVersion;
+    //uint32_t gameVersion;
+} SaveStateHeader;
+
+enum class RequestType {
+    SAVE,
+    LOAD,
+};
+
+typedef struct SaveStateRequest {
+    unsigned int slot;
+    RequestType type;
+} SaveStateRequest;
+
+class SaveState;
+
+class SaveStateMgr {
+    friend class SaveState;
+  private:
+    unsigned int currentSlot;
+    std::unordered_map<unsigned int, std::shared_ptr<SaveState>> states;
+    std::queue <SaveStateRequest> requests;
+    std::mutex mutex;
+    
+  public:
+
+    SaveStateReturn AddRequest(const SaveStateRequest request);
+    SaveStateMgr();
+    ~SaveStateMgr();
+
+    void SetCurrentSlot(unsigned int slot);
+    unsigned int GetCurrentSlot(void);
+    
+    SaveStateMgr& operator=(const SaveStateMgr& rhs) = delete;
+    SaveStateMgr(const SaveStateMgr& rhs) = delete;
+
+    void ProcessSaveStateRequests(void);
+    
+};
+extern std::shared_ptr<SaveStateMgr> gSaveStateMgr;
+
+#endif
diff --git a/soh/soh/Enhancements/savestates_extern.inc b/soh/soh/Enhancements/savestates_extern.inc
new file mode 100644
index 000000000..c3b129a32
--- /dev/null
+++ b/soh/soh/Enhancements/savestates_extern.inc
@@ -0,0 +1,257 @@
+extern "C" MtxF* sMatrixStack;
+extern "C" MtxF* sCurrentMatrix;
+extern "C" LightsBuffer sLightsBuffer;
+extern "C" s16 sWarpTimerTarget;
+extern "C" MapMarkData** sLoadedMarkDataTable;
+
+//Camera static data
+extern "C" int32_t sInitRegs;
+extern "C" int32_t gDbgCamEnabled;
+extern "C" int32_t sDbgModeIdx;
+extern "C" int16_t sNextUID;
+extern "C" int32_t sCameraInterfaceFlags;
+extern "C" int32_t sCameraInterfaceAlpha;
+extern "C" int32_t sCameraShrinkWindowVal;
+extern "C" int32_t D_8011D3AC;
+extern "C" int32_t sDemo5PrevAction12Frame;
+extern "C" int32_t sDemo5PrevSfxFrame;
+extern "C" int32_t D_8011D3F0;
+extern "C" OnePointCsFull D_8011D6AC[];
+extern "C" OnePointCsFull D_8011D724[];
+extern "C" OnePointCsFull D_8011D79C[];
+extern "C" OnePointCsFull D_8011D83C[];
+extern "C" OnePointCsFull D_8011D88C[];
+extern "C" OnePointCsFull D_8011D8DC[];
+extern "C" OnePointCsFull D_8011D954[];
+extern "C" OnePointCsFull D_8011D9F4[]; 
+extern "C" int16_t D_8011DB08;
+extern "C" int16_t D_8011DB0C;
+extern "C" int32_t sOOBTimer;
+extern "C" f32 D_8015CE50;
+extern "C" f32 D_8015CE54;
+extern "C" CamColChk D_8015CE58;
+
+//Gameover
+extern "C" uint16_t gGameOverTimer;
+
+//One Point Demo
+extern "C" uint32_t sPrevFrameCs1100;
+extern "C" CutsceneCameraPoint D_8012013C[14];
+extern "C" CutsceneCameraPoint D_8012021C[14];
+extern "C" CutsceneCameraPoint D_801204D4[14];
+extern "C" CutsceneCameraPoint D_801205B4[14];
+extern "C" OnePointCsFull D_801208EC[3];
+extern "C" OnePointCsFull D_80120964[2];
+extern "C" OnePointCsFull D_801209B4[4];
+extern "C" OnePointCsFull D_80120ACC[5];
+extern "C" OnePointCsFull D_80120B94[11];
+extern "C" OnePointCsFull D_80120D4C[7];
+extern "C" OnePointCsFull D_80120FA4[6];
+extern "C" OnePointCsFull D_80121184[2];
+extern "C" OnePointCsFull D_801211D4[2];
+extern "C" OnePointCsFull D_8012133C[3];
+extern "C" OnePointCsFull D_801213B4[5];
+extern "C" OnePointCsFull D_8012151C[2];
+extern "C" OnePointCsFull D_8012156C[2];
+extern "C" OnePointCsFull D_801215BC[1];
+extern "C" OnePointCsFull D_80121C24[7];
+extern "C" OnePointCsFull D_80121D3C[3];
+extern "C" OnePointCsFull D_80121F1C[4];
+extern "C" OnePointCsFull D_80121FBC[4];
+extern "C" OnePointCsFull D_801220D4[5];
+extern "C" OnePointCsFull D_80122714[4];
+extern "C" OnePointCsFull D_80122CB4[2];
+extern "C" OnePointCsFull D_80122D04[2];
+extern "C" OnePointCsFull D_80122E44[2][7];
+extern "C" OnePointCsFull D_8012313C[3];
+extern "C" OnePointCsFull D_801231B4[4];
+extern "C" OnePointCsFull D_80123254[2];
+extern "C" OnePointCsFull D_801232A4[1];
+extern "C" OnePointCsFull D_80123894[3];
+extern "C" OnePointCsFull D_8012390C[2];
+extern "C" OnePointCsFull D_8012395C[3];
+extern "C" OnePointCsFull D_801239D4[3];
+
+// z_bg_ddan_kd
+extern "C" Vec3f sBgDdanKdVelocity;
+extern "C" Vec3f sBgDdanKdAccel;
+
+// z_bg_dodoago
+extern "C" s16 sBgDodoagoFirstExplosiveFlag;
+extern "C" u8 sBgDodoagoDisableBombCatcher;
+extern "C" s32 sBgDodoagoTimer;
+
+// z_bg_haka_trap
+extern "C" uint32_t D_80880F30;
+extern "C" uint32_t D_80881014;
+
+// z_bg_hidan_rock
+extern "C" float D_8088BFC0;
+
+// z_bg_menkuri_eye
+extern "C" int32_t D_8089C1A0;
+
+// z_bg_mori_hineri
+extern "C" int16_t sBgMoriHineriNextCamIdx;
+
+// z_bg_po_event
+extern "C" uint8_t sBgPoEventBlocksAtRest;
+extern "C" uint8_t sBgPoEventPuzzleState;
+extern "C" float sBgPoEventblockPushDist;
+
+// z_bg_relay_objects
+extern "C" uint32_t D_808A9508;
+
+// z_bg_spot18_basket
+extern "C" int16_t D_808B85D0;
+
+// z_boss_ganon
+extern "C" uint32_t sBossGanonSeed1;
+extern "C" uint32_t sBossGanonSeed2;
+extern "C" uint32_t sBossGanonSeed3;
+extern "C" void* sBossGanonGanondorf;
+extern "C" void* sBossGanonZelda;
+extern "C" void* sBossGanonCape;
+extern "C" GanondorfEffect sBossGanonEffectBuf[200];
+
+// z_boss_ganon2
+extern "C" Vec3f D_8090EB20;
+extern "C" int8_t D_80910638;
+extern "C" void* sBossGanon2Zelda;
+extern "C" void* D_8090EB30;
+extern "C" int32_t sBossGanon2Seed1;
+extern "C" int32_t sBossGanon2Seed2;
+extern "C" int32_t sBossGanon2Seed3;
+extern "C" Vec3f D_809105D8[4];
+extern "C" Vec3f D_80910608[4];
+extern "C" BossGanon2Effect sBossGanon2Particles[100];
+
+// z_boss_tw
+extern "C" uint8_t sTwInitalized;
+extern "C" BossTwEffect sTwEffects[150];
+
+// z_demo_6k
+extern "C" Vec3f sDemo6kVelocity;
+
+// z_demo_du
+extern "C" int32_t D_8096CE94;
+
+// z_demo_kekkai
+extern "C" Vec3f demoKekkaiVel;
+
+// z_en_bw
+extern "C" int32_t sSlugGroup;
+
+// z_en_clear_tag
+extern "C" uint8_t sClearTagIsEffectsInitialized;
+extern "C" EnClearTagEffect sClearTagEffects[CLEAR_TAG_EFFECT_MAX_COUNT];
+
+// z_en_fr
+extern "C" EnFrPointers sEnFrPointers;
+
+// z_en_goma
+extern "C" uint8_t sSpawnNum;
+
+// z_en_in
+extern "C" int32_t D_80A7B998;
+
+// z_en_insect
+extern "C" float D_80A7DEB0;
+extern "C" int16_t D_80A7DEB4;
+extern "C" int16_t D_80A7DEB8;
+
+// z_en_ishi
+extern "C" int16_t sRockRotSpeedX;
+extern "C" int16_t sRockRotSpeedY;
+
+// z_en_niw
+extern "C" int16_t D_80AB85E0;
+extern "C" uint8_t sLowerRiverSpawned;
+extern "C" uint8_t sUpperRiverSpawned;
+
+// z_en_po_field
+extern "C" int32_t sEnPoFieldNumSpawned;
+extern "C" Vec3s sEnPoFieldSpawnPositions[10];
+extern "C" u8 sEnPoFieldSpawnSwitchFlags[10];
+
+// z_en_takara_man
+extern "C" uint8_t sTakaraIsInitialized;
+
+// z_en_xc
+extern "C" int32_t D_80B41D90;
+extern "C" int32_t sEnXcFlameSpawned;
+extern "C" int32_t D_80B41DA8;
+extern "C" int32_t D_80B41DAC;
+
+// z_en_zf
+extern "C" int16_t D_80B4A1B0;
+extern "C" int16_t D_80B4A1B4;
+
+extern "C" int32_t D_80B5A468;
+extern "C" int32_t D_80B5A494;
+extern "C" int32_t D_80B5A4BC;
+
+extern "C" uint8_t sKankyoIsSpawned;
+extern "C" int16_t sTrailingFairies;
+
+extern "C" uint16_t gTimeIncrement;
+
+extern "C" s16 sPlayerInitialPosX;
+extern "C" s16 sPlayerInitialPosZ;
+extern "C" s16 sPlayerInitialDirection;
+
+// code_800EC960
+// Related to ocarina
+extern "C" u8 sOcarinaInpEnabled;
+extern "C" s8 D_80130F10;
+extern "C" u8 sCurOcarinaBtnVal;
+extern "C" u8 sPrevOcarinaNoteVal;
+extern "C" u8 sCurOcarinaBtnIdx;
+extern "C" u8 sLearnSongLastBtn;
+extern "C" f32 D_80130F24;
+extern "C" f32 D_80130F28;
+extern "C" s8 D_80130F2C;
+extern "C" s8 D_80130F30;
+extern "C" s8 D_80130F34;
+extern "C" u8 sPlaybackState;
+extern "C" u32 D_80130F3C;
+extern "C" u32 sNotePlaybackTimer;
+extern "C" u16 sPlaybackNotePos;
+extern "C" u16 sStaffPlaybackPos;
+
+//IDK what this is but it looks important 
+extern "C" u32 sCurOcarinaBtnPress;
+extern "C" u32 D_8016BA10;
+extern "C" u32 sPrevOcarinaBtnPress;
+extern "C" s32 D_8016BA18;
+extern "C" s32 D_8016BA1C;
+extern "C" u8 sCurOcarinaSong[8];
+extern "C" u8 sOcarinaSongAppendPos;
+extern "C" u8 sOcarinaHasStartedSong;
+extern "C" u8 sOcarinaSongNoteStartIdx;
+extern "C" u8 sOcarinaSongCnt;
+extern "C" u16 sOcarinaAvailSongs;
+extern "C" u8 sStaffPlayingPos;
+extern "C" u16 sLearnSongPos[0x10];
+extern "C" u16 D_8016BA50[0x10];
+extern "C" u16 D_8016BA70[0x10];
+extern "C" u8 sLearnSongExpectedNote[0x10];
+extern "C" OcarinaNote D_8016BAA0;
+extern "C" u8 sAudioHasMalonBgm;
+extern "C" f32 sAudioMalonBgmDist;
+extern "C" u8 sDisplayedNoteValue;
+
+
+
+// z_message_PAL
+extern "C" s16 sOcarinaNoteBufPos;
+extern "C" s16 sOcarinaNoteBufLen;
+extern "C" u8 sOcarinaNoteBuf[12];
+
+extern "C" u8 D_8014B2F4;
+extern "C" u8 sTextboxSkipped;
+extern "C" u16 sNextTextId;
+extern "C" s16 sLastPlayedSong;
+extern "C" s16 sHasSunsSong;
+extern "C" s16 sMessageHasSetSfx;
+extern "C" u16 sOcarinaSongBitFlags;
\ No newline at end of file
diff --git a/soh/soh/OTRAudio.h b/soh/soh/OTRAudio.h
new file mode 100644
index 000000000..ee0ec46a2
--- /dev/null
+++ b/soh/soh/OTRAudio.h
@@ -0,0 +1,8 @@
+#pragma once
+
+static struct {
+    std::condition_variable cv_to_thread, cv_from_thread;
+    std::mutex mutex;
+    bool initialized;
+    bool processing;
+} audio;
diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp
index f7ff39cdc..7456ebf7e 100644
--- a/soh/soh/OTRGlobals.cpp
+++ b/soh/soh/OTRGlobals.cpp
@@ -1,4 +1,5 @@
 #include "OTRGlobals.h"
+#include "OTRAudio.h"
 #include <iostream>
 #include <locale>
 #include <codecvt>
@@ -33,17 +34,14 @@
 #include "macros.h"
 #include <Utils/StringHelper.h>
 
+#include <SDL2/SDL_scancode.h>
+
 OTRGlobals* OTRGlobals::Instance;
 
-static struct {
-    std::condition_variable cv_to_thread, cv_from_thread;
-    std::mutex mutex;
-    bool initialized;
-    bool processing;
-} audio;
-
 OTRGlobals::OTRGlobals() {
+
     context = Ship::GlobalCtx2::CreateInstance("Ship of Harkinian");
+    gSaveStateMgr = std::make_shared<SaveStateMgr>();
     context->GetWindow()->Init();
 }
 
@@ -114,6 +112,63 @@ extern "C" void Graph_ProcessFrame(void (*run_one_game_iter)(void)) {
 }
 
 extern "C" void Graph_StartFrame() {
+    // Why -1?
+    int32_t dwScancode = OTRGlobals::Instance->context->GetWindow()->lastScancode;
+    OTRGlobals::Instance->context->GetWindow()->lastScancode = -1;
+
+    switch (dwScancode - 1) {
+        case SDL_SCANCODE_F5: {
+            const unsigned int slot = OTRGlobals::Instance->gSaveStateMgr->GetCurrentSlot();
+            const SaveStateReturn stateReturn =
+                OTRGlobals::Instance->gSaveStateMgr->AddRequest({ slot, RequestType::SAVE });
+
+            switch (stateReturn) {
+                case SaveStateReturn::SUCCESS:
+                    SPDLOG_INFO("[SOH] Saved state to slot {}", slot);
+                    break;
+                case SaveStateReturn::FAIL_WRONG_GAMESTATE:
+                    SPDLOG_ERROR("[SOH] Can not save a state outside of \"GamePlay\"");
+                    break;
+                [[unlikely]] default:
+                    break;
+            }
+            break;
+        }
+        case SDL_SCANCODE_F6: {
+            unsigned int slot = OTRGlobals::Instance->gSaveStateMgr->GetCurrentSlot();
+            slot++;
+            if (slot > 5) {
+                slot = 0;
+            }
+            OTRGlobals::Instance->gSaveStateMgr->SetCurrentSlot(slot);
+            SPDLOG_INFO("Set SaveState slot to {}.", slot);
+            break;
+        }
+        case SDL_SCANCODE_F7: {
+            const unsigned int slot = OTRGlobals::Instance->gSaveStateMgr->GetCurrentSlot();
+            const SaveStateReturn stateReturn =
+                OTRGlobals::Instance->gSaveStateMgr->AddRequest({ slot, RequestType::LOAD });
+
+            switch (stateReturn) {
+                case SaveStateReturn::SUCCESS:
+                    SPDLOG_INFO("[SOH] Loaded state from slot {}", slot);
+                    break;
+                case SaveStateReturn::FAIL_INVALID_SLOT:
+                    SPDLOG_ERROR("[SOH] Invalid State Slot Number {}", slot);
+                    break;
+                case SaveStateReturn::FAIL_STATE_EMPTY:
+                    SPDLOG_ERROR("[SOH] State Slot {} is empty", slot);
+                    break;
+                case SaveStateReturn::FAIL_WRONG_GAMESTATE:
+                    SPDLOG_ERROR("[SOH] Can not load a state outside of \"GamePlay\"");
+                    break;
+                [[unlikely]] default:
+                    break;
+            }
+
+            break;
+        }
+    }
     OTRGlobals::Instance->context->GetWindow()->StartFrame();
 }
 
@@ -131,6 +186,7 @@ extern "C" void Graph_ProcessGfxCommands(Gfx* commands) {
                         audio.cv_to_thread.wait(Lock);
                     }
                 }
+                std::unique_lock<std::mutex> Lock(audio.mutex);
                 //AudioMgr_ThreadEntry(&gAudioMgr);
                 // 528 and 544 relate to 60 fps at 32 kHz 32000/60 = 533.333..
                 // in an ideal world, one third of the calls should use num_samples=544 and two thirds num_samples=528
@@ -156,10 +212,7 @@ extern "C" void Graph_ProcessGfxCommands(Gfx* commands) {
                 // printf("Audio samples before submitting: %d\n", audio_api->buffered());
                 AudioPlayer_Play((u8*)audio_buffer, num_audio_samples * (sizeof(int16_t) * NUM_AUDIO_CHANNELS * AUDIO_FRAMES_PER_UPDATE));
 
-                {
-                    std::unique_lock<std::mutex> Lock(audio.mutex);
-                    audio.processing = false;
-                }
+                audio.processing = false;
                 audio.cv_from_thread.notify_one();
             }
         }).detach();
diff --git a/soh/soh/OTRGlobals.h b/soh/soh/OTRGlobals.h
index 339613b25..0a318de73 100644
--- a/soh/soh/OTRGlobals.h
+++ b/soh/soh/OTRGlobals.h
@@ -1,17 +1,22 @@
+#ifndef OTR_GLOBALS_H
+#define OTR_GLOBALS_H
+
 #pragma once
 
 #include "GlobalCtx2.h"
 
 #ifdef __cplusplus
+#include "Enhancements/savestates.h"
 class OTRGlobals
 {
 public:
-	static OTRGlobals* Instance;
+    static OTRGlobals* Instance;
 
-	std::shared_ptr<Ship::GlobalCtx2> context;
+    std::shared_ptr<Ship::GlobalCtx2> context;
+    std::shared_ptr<SaveStateMgr> gSaveStateMgr;
 
-	OTRGlobals();
-	~OTRGlobals();
+    OTRGlobals();
+    ~OTRGlobals();
 
 private:
 
@@ -68,3 +73,5 @@ void AudioPlayer_Play(const uint8_t* buf, uint32_t len);
 void AudioMgr_CreateNextAudioBuffer(s16* samples, u32 num_samples);
 int Controller_ShouldRumble(size_t i);
 #endif
+
+#endif
\ No newline at end of file
diff --git a/soh/src/buffers/heaps.c b/soh/src/buffers/heaps.c
index d09f86e72..b6f16ab11 100644
--- a/soh/src/buffers/heaps.c
+++ b/soh/src/buffers/heaps.c
@@ -6,9 +6,6 @@
 #include <unistd.h>
 #endif
 
-#define AUDIO_HEAP_SIZE 0x38000
-#define SYSTEM_HEAP_SIZE (1024 * 1024 * 128)
-
 u8* gAudioHeap;
 u8* gSystemHeap;
 
diff --git a/soh/src/code/graph.c b/soh/src/code/graph.c
index 9f744ec02..4b1887c18 100644
--- a/soh/src/code/graph.c
+++ b/soh/src/code/graph.c
@@ -431,6 +431,8 @@ static struct RunFrameContext {
 
 extern AudioMgr gAudioMgr;
 
+extern void ProcessSaveStateRequests(void);
+
 static void RunFrame()
 {
     u32 size;
@@ -487,6 +489,7 @@ static void RunFrame()
             //uint64_t diff = (ticksB - ticksA) / (freq / 1000);
             //printf("Frame simulated in %ims\n", diff);
             runFrameContext.state = 1;
+            ProcessSaveStateRequests();
             return;
             nextFrame:;
         }
diff --git a/soh/src/code/z_camera.c b/soh/src/code/z_camera.c
index 94faf8124..41c16b5cc 100644
--- a/soh/src/code/z_camera.c
+++ b/soh/src/code/z_camera.c
@@ -565,10 +565,10 @@ s16 Camera_XZAngle(Vec3f* to, Vec3f* from) {
     return DEGF_TO_BINANG(RADF_TO_DEGF(Math_FAtan2F(from->x - to->x, from->z - to->z)));
 }
 
+ f32 D_8015CE50;
+ f32 D_8015CE54;
+ CamColChk D_8015CE58;
 s16 func_80044ADC(Camera* camera, s16 yaw, s16 arg2) {
-    static f32 D_8015CE50;
-    static f32 D_8015CE54;
-    static CamColChk D_8015CE58;
     Vec3f playerPos;
     Vec3f rotatedPos;
     Vec3f floorNorm;
@@ -7221,9 +7221,9 @@ s32 Camera_DbgChangeMode(Camera* camera) {
     return true;
 }
 
+s16 D_8011DB08 = 0x3F0;
+s16 D_8011DB0C = 0x156;
 void func_80058E8C(Camera* camera) {
-    static s16 D_8011DB08 = 0x3F0;
-    static s16 D_8011DB0C = 0x156;
     s32 pad3;
     f32 sp60;
     s32 pad;
@@ -7299,8 +7299,8 @@ void func_80058E8C(Camera* camera) {
     }
 }
 
+s32 sOOBTimer = 0;
 Vec3s Camera_Update(Camera* camera) {
-    static s32 sOOBTimer = 0;
     Vec3f viewAt;
     Vec3f viewEye;
     Vec3f viewUp;
diff --git a/soh/src/code/z_map_mark.c b/soh/src/code/z_map_mark.c
index f5a8a3c39..8d43a33a0 100644
--- a/soh/src/code/z_map_mark.c
+++ b/soh/src/code/z_map_mark.c
@@ -52,7 +52,7 @@ static MapMarkDataOverlay sMapMarkDataOvl = {
     gMapMarkDataTable,
 };
 
-static MapMarkData** sLoadedMarkDataTable;
+MapMarkData** sLoadedMarkDataTable;
 
 void MapMark_Init(GlobalContext* globalCtx) {
     MapMarkDataOverlay* overlay = &sMapMarkDataOvl;
diff --git a/soh/src/code/z_onepointdemo.c b/soh/src/code/z_onepointdemo.c
index 96ef33c18..538859764 100644
--- a/soh/src/code/z_onepointdemo.c
+++ b/soh/src/code/z_onepointdemo.c
@@ -4,9 +4,9 @@
 
 static s16 sDisableAttention = false;
 static s16 sUnused = -1;
-static s32 sPrevFrameCs1100 = -4096;
+s32 sPrevFrameCs1100 = -4096;
 
-#include "z_onepointdemo_data.c"
+#include "z_onepointdemo_data.inc"
 
 void OnePointCutscene_AddVecSphToVec3f(Vec3f* dst, Vec3f* src, VecSph* vecSph) {
     Vec3f out;
diff --git a/soh/src/code/z_onepointdemo_data.c b/soh/src/code/z_onepointdemo_data.inc
similarity index 96%
rename from soh/src/code/z_onepointdemo_data.c
rename to soh/src/code/z_onepointdemo_data.inc
index 1d1838b05..2488be71b 100644
--- a/soh/src/code/z_onepointdemo_data.c
+++ b/soh/src/code/z_onepointdemo_data.inc
@@ -1,6 +1,6 @@
 #include "global.h"
 
-static CutsceneCameraPoint D_8012013C[14] = {
+CutsceneCameraPoint D_8012013C[14] = {
     { CS_CMD_CONTINUE, 25, 40, 70.79991f, { -1814, 533, -1297 } },
     { CS_CMD_CONTINUE, 20, 40, 70.99991f, { -1805, 434, -1293 } },
     { CS_CMD_CONTINUE, 10, 30, 60.0f, { -1794, 323, -1280 } },
@@ -16,7 +16,7 @@ static CutsceneCameraPoint D_8012013C[14] = {
     { CS_CMD_STOP, 0, 50, 60.0f, { -1974, 12, -1179 } },
     { CS_CMD_STOP, 0, 30, 60.0f, { -1974, 12, -1179 } },
 };
-static CutsceneCameraPoint D_8012021C[14] = {
+CutsceneCameraPoint D_8012021C[14] = {
     { CS_CMD_CONTINUE, 0, 0, 60.0f, { -1751, 604, -1233 } }, { CS_CMD_CONTINUE, 0, 0, 60.0f, { -1752, 516, -1233 } },
     { CS_CMD_CONTINUE, 0, 0, 60.0f, { -1751, 417, -1233 } }, { CS_CMD_CONTINUE, 0, 0, 60.0f, { -1767, 306, -1219 } },
     { CS_CMD_CONTINUE, 0, 0, 60.0f, { -1776, 257, -1205 } }, { CS_CMD_CONTINUE, 0, 0, 60.0f, { -1881, 147, -1149 } },
@@ -54,7 +54,7 @@ static CutsceneCameraPoint D_80120434[10] = {
     { CS_CMD_STOP, 0, 0, 60.0f, { 0, 62, -119 } },     { CS_CMD_STOP, 0, 0, 60.0f, { 0, 62, -119 } },
 };
 
-static CutsceneCameraPoint D_801204D4[14] = {
+CutsceneCameraPoint D_801204D4[14] = {
     { CS_CMD_CONTINUE, -15, 40, 80.600006f, { -60, 332, 183 } },
     { CS_CMD_CONTINUE, -22, 30, 80.600006f, { -60, 332, 183 } },
     { CS_CMD_CONTINUE, -20, 38, 80.600006f, { -118, 344, 41 } },
@@ -70,7 +70,7 @@ static CutsceneCameraPoint D_801204D4[14] = {
     { CS_CMD_STOP, 6, 30, 85.199936f, { 25, 127, -950 } },
     { CS_CMD_STOP, 0, 30, 85.199936f, { 25, 127, -950 } },
 };
-static CutsceneCameraPoint D_801205B4[14] = {
+CutsceneCameraPoint D_801205B4[14] = {
     { CS_CMD_CONTINUE, 0, 0, 60.0f, { -225, 785, -242 } },
     { CS_CMD_CONTINUE, -21, 0, 80.600006f, { -245, 784, -242 } },
     { CS_CMD_CONTINUE, -21, 0, 80.600006f, { -288, 485, -379 } },
@@ -118,18 +118,18 @@ static s16 D_801208E0 = 12;
 static s16 D_801208E4 = 90;
 static s16 D_801208E8 = 8;
 
-static OnePointCsFull D_801208EC[3] = {
+OnePointCsFull D_801208EC[3] = {
     { 0x0F, 0x08, 0x0101, 1, 0, 60.0f, 1.0f, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } },
     { 0x81, 0xFF, 0x0101, 1, 0, 60.0f, 1.0f, { 0.0f, -10.0f, 0.0f }, { 0.0f, 0.0f, 150.0f } },
     { 0x12, 0xFF, 0x0000, 1, 0, 60.0f, 1.0f, { -1.0f, -1.0f, -1.0f }, { -1.0f, -1.0f, -1.0f } },
 };
 
-static OnePointCsFull D_80120964[2] = {
+OnePointCsFull D_80120964[2] = {
     { 0x8F, 0xFF, 0x0101, 1, 0, 60.0f, 1.0f, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } },
     { 0x81, 0xFF, 0xA121, 1, 0, 75.0f, 0.6f, { 0.0f, -10.0f, 0.0f }, { 0.0f, 0.0f, 150.0f } },
 };
 
-static OnePointCsFull D_801209B4[4] = {
+OnePointCsFull D_801209B4[4] = {
     { 0x8F, 0x08, 0x0101, 1, 0, 60.0f, 0.9f, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } },
     { 0x84, 0x01, 0x0100, 29, 0, 45.0f, 0.1f, { 0.0f, -10.0f, 0.0f }, { 0.0f, 0.0f, 150.0f } },
     { 0x83, 0xFF, 0x0000, 10, 0, 60.0f, 0.2f, { 0.0f, -10.0f, 0.0f }, { 0.0f, 0.0f, 150.0f } },
@@ -142,7 +142,7 @@ static OnePointCsFull D_80120A54[3] = {
     { 0x8B, 0xFF, 0x0022, 5000, 0, 75.0f, 0.005f, { 0.0f, 0.0f, -10.0f }, { -1.0f, -1.0f, -1.0f } },
 };
 
-static OnePointCsFull D_80120ACC[5] = {
+OnePointCsFull D_80120ACC[5] = {
     { 0x8F, 0xFF, 0x0442, 10, 0, 40.0f, 1.0f, { -10.0f, 45.0f, 20.0f }, { 20.0f, 30.0f, 160.0f } },
     { 0x95, 0xFF, 0x0000, 1, 0, 40.0f, 1.0f, { -1.0f, -1.0f, -1.0f }, { -1.0f, -1.0f, -1.0f } },
     { 0x8F, 0x01, 0x0442, 10, 0, 40.0f, 1.0f, { -10.0f, 45.0f, 20.0f }, { 20.0f, 30.0f, 160.0f } },
@@ -150,7 +150,7 @@ static OnePointCsFull D_80120ACC[5] = {
     { 0x11, 0xFF, 0x0000, 1, 0, 60.0f, 1.0f, { -1.0f, -1.0f, -1.0f }, { -1.0f, -1.0f, -1.0f } },
 };
 
-static OnePointCsFull D_80120B94[11] = {
+OnePointCsFull D_80120B94[11] = {
     { 0x8F, 0x01, 0x2142, 1, 0, 40.0f, 1.0f, { 20.0f, 40.0f, 20.0f }, { -20.0f, 0.0f, -30.0f } },
     { 0x84, 0xFF, 0x0404, 19, 5, 70.0f, 0.01f, { 0.0f, 30.0f, 20.0f }, { 120.0f, 60.0f, 120.0f } },
     { 0x84, 0xFF, 0x0404, 20, 0, 60.0f, 0.01f, { 0.0f, 20.0f, 20.0f }, { 120.0f, 60.0f, 120.0f } },
@@ -164,7 +164,7 @@ static OnePointCsFull D_80120B94[11] = {
     { 0x98, 0xFF, 0x0000, 1, 0, 50.0f, 1.0f, { -1.0f, -1.0f, -1.0f }, { -1.0f, -1.0f, -1.0f } },
 };
 
-static OnePointCsFull D_80120D4C[7] = {
+OnePointCsFull D_80120D4C[7] = {
     { 0x8F, 0x01, 0x2142, 1, 0, 40.0f, 1.0f, { 20.0f, 40.0f, 20.0f }, { -20.0f, 0.0f, -30.0f } },
     { 0x84, 0xFF, 0x0404, 19, 5, 70.0f, 0.01f, { 0.0f, 30.0f, 20.0f }, { 120.0f, 60.0f, 120.0f } },
     { 0x84, 0xFF, 0x0404, 20, 0, 60.0f, 0.01f, { 0.0f, 20.0f, 20.0f }, { 120.0f, 60.0f, 120.0f } },
@@ -185,7 +185,7 @@ static OnePointCsFull D_80120E64[8] = {
     { 0x12, 0xFF, 0x0000, 1, 0, 60.0f, 1.0f, { -1.0f, -1.0f, -1.0f }, { -1.0f, -1.0f, -1.0f } },
 };
 
-static OnePointCsFull D_80120FA4[6] = {
+OnePointCsFull D_80120FA4[6] = {
     { 0x8F, 0x01, 0x2143, 30, 0, 70.0f, 0.4f, { 0.0f, 40.0f, 50.0f }, { 30.0f, 10.0f, -50.0f } },
     { 0x95, 0xFF, 0x0000, 1, 0, 50.0f, 1.0f, { -1.0f, -1.0f, -1.0f }, { -1.0f, -1.0f, -1.0f } },
     { 0x8F, 0xFF, 0x2222, 10, 0, 42.0f, 1.0f, { 0.0f, 40.0f, 0.0f }, { 0.0f, 85.0f, 45.0f } },
@@ -206,12 +206,12 @@ static OnePointCsFull D_8012110C[3] = {
     { 0x12, 0xFF, 0x0000, 1, 0, 60.0f, 1.0f, { -1.0f, -1.0f, -1.0f }, { -1.0f, -1.0f, -1.0f } },
 };
 
-static OnePointCsFull D_80121184[2] = {
+OnePointCsFull D_80121184[2] = {
     { 0x83, 0x01, 0x0101, 40, 0, -1.0f, 0.1f, { 0.0f, 10.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } },
     { 0x12, 0xFF, 0x0000, 1, 0, 60.0f, 1.0f, { -1.0f, -1.0f, -1.0f }, { -1.0f, -1.0f, -1.0f } },
 };
 
-static OnePointCsFull D_801211D4[2] = {
+OnePointCsFull D_801211D4[2] = {
     { 0x8F, 0x08, 0x0101, 50, 0, 60.0f, 1.0f, { 0.0f, 10.0f, 0.0f }, { -10.0f, 85.0f, 0.0f } },
     { 0x11, 0xFF, 0x0000, 1, 0, 60.0f, 1.0f, { -1.0f, -1.0f, -1.0f }, { -1.0f, -1.0f, -1.0f } },
 };
@@ -229,13 +229,13 @@ static OnePointCsFull D_80121314[1] = {
     { 0x8F, 0x08, 0x4141, 1000, 0, 75.0f, 0.6f, { 0.0f, 0.0f, 10.0f }, { 0.0f, 0.0f, 100.0f } },
 };
 
-static OnePointCsFull D_8012133C[3] = {
+OnePointCsFull D_8012133C[3] = {
     { 0x8F, 0x01, 0x0141, 40, 0, 75.0f, 1.0f, { 0.0f, 60.0f, 0.0f }, { 0.0f, 0.0f, 100.0f } },
     { 0x83, 0xFF, 0x2121, 20, 0, 60.0f, 0.2f, { 0.0f, -10.0f, -10.0f }, { 0.0f, 10.0f, -100.0f } },
     { 0x11, 0xFF, 0x0000, 1, 0, 60.0f, 1.0f, { -1.0f, -1.0f, -1.0f }, { -1.0f, -1.0f, -1.0f } },
 };
 
-static OnePointCsFull D_801213B4[5] = {
+OnePointCsFull D_801213B4[5] = {
     { 0x8F, 0x08, 0xC2C2, 40, 0, 70.0f, 1.0f, { 80.0f, 0.0f, 20.0f }, { 20.0f, 0.0f, 80.0f } },
     { 0x8B, 0x01, 0xC2C2, 120, 0, 70.0f, 0.1f, { 80.0f, 0.0f, 20.0f }, { 20.0f, 0.0f, 80.0f } },
     { 0x8F, 0x53, 0xC2C2, 30, 0, 50.0f, 1.0f, { 60.0f, 0.0f, 20.0f }, { 60.0f, 0.0f, 60.0f } },
@@ -250,17 +250,17 @@ static OnePointCsFull D_8012147C[4] = {
     { 0x11, 0xFF, 0x0000, 1, 0, 60.0f, 1.0f, { -1.0f, -1.0f, -1.0f }, { -1.0f, -1.0f, -1.0f } },
 };
 
-static OnePointCsFull D_8012151C[2] = {
+OnePointCsFull D_8012151C[2] = {
     { 0x0F, 0x01, 0x0101, 29, 0, 60.0f, 1.0f, { -700.0f, 875.0f, -100.0f }, { -550.0f, 920.0f, -150.0f } },
     { 0x12, 0xFF, 0x0000, 1, 0, 60.0f, 1.0f, { -1.0f, -1.0f, -1.0f }, { -1.0f, -1.0f, -1.0f } },
 };
 
-static OnePointCsFull D_8012156C[2] = {
+OnePointCsFull D_8012156C[2] = {
     { 0x8F, 0x4D, 0x4242, 1, 0, 65.0f, 1.0f, { 60.0f, 30.0f, 0.0f }, { 50.0f, 20.0f, 150.0f } },
     { 0x81, 0xFF, 0x4242, -1, 0, 65.0f, 1.0f, { -50.0f, 60.0f, 0.0f }, { -60.0f, 40.0f, 150.0f } },
 };
 
-static OnePointCsFull D_801215BC[1] = {
+OnePointCsFull D_801215BC[1] = {
     { 0x0F, 0xFF, 0x0101, 5, 0, 65.0f, 1.0f, { -1185.0f, 655.0f, 1185.0f }, { -1255.0f, 735.0f, 1255.0f } },
 };
 
@@ -331,7 +331,7 @@ static OnePointCsFull D_80121A44[12] = {
     { 0x12, 0xFF, 0x0000, 1, 0, 60.0f, 1.0f, { -1.0f, -1.0f, -1.0f }, { -1.0f, -1.0f, -1.0f } },
 };
 
-static OnePointCsFull D_80121C24[7] = {
+OnePointCsFull D_80121C24[7] = {
     { 0x0F, 0x05, 0x0101, 1, 0, 60.0f, 1.0f, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } },
     { 0x03, 0xFF, 0x0101, 89, 0, 50.0f, 0.4f, { 125.0f, 320.0f, -1500.0f }, { 125.0f, 500.0f, -1150.0f } },
     { 0x0F, 0x08, 0x0101, 40, 4, 55.0f, 1.0f, { 0.0f, 375.0f, -1440.0f }, { 5.0f, 365.0f, -1315.0f } },
@@ -341,7 +341,7 @@ static OnePointCsFull D_80121C24[7] = {
     { 0x11, 0xFF, 0x0000, 1, 0, 60.0f, 1.0f, { -1.0f, -1.0f, -1.0f }, { -1.0f, -1.0f, -1.0f } },
 };
 
-static OnePointCsFull D_80121D3C[3] = {
+OnePointCsFull D_80121D3C[3] = {
     { 0x0F, 0xFF, 0x0101, 1, 0, 60.0f, 1.0f, { 1023.0f, 738.0f, -2628.0f }, { 993.0f, 770.0f, -2740.0f } },
     { 0x02, 0xFF, 0x0101, 4, 0, 50.0f, 1.0f, { 1255.0f, 350.0f, -1870.0f }, { 1240.0f, 575.0f, -2100.0f } },
     { 0x0F, 0xFF, 0x0000, -1, 0, 75.0f, 1.0f, { -1.0f, -1.0f, -1.0f }, { -1.0f, -1.0f, -1.0f } },
@@ -359,14 +359,14 @@ static OnePointCsFull D_80121DB4[9] = {
     { 0x12, 0xFF, 0x0000, 1, -1, -1.0f, -1.0f, { -1.0f, -1.0f, -1.0f }, { -1.0f, -1.0f, -1.0f } },
 };
 
-static OnePointCsFull D_80121F1C[4] = {
+OnePointCsFull D_80121F1C[4] = {
     { 0x0F, 0x08, 0x0101, 10, 0, 60.0f, 1.0f, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } },
     { 0x01, 0xFF, 0x2121, 10, 0, 50.0f, 0.5f, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 150.0f } },
     { 0x01, 0x02, 0x2121, 23, 0, 50.0f, 0.5f, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 150.0f } },
     { 0x11, 0xFF, 0x0000, 1, -1, -1.0f, -1.0f, { -1.0f, -1.0f, -1.0f }, { -1.0f, -1.0f, -1.0f } },
 };
 
-static OnePointCsFull D_80121FBC[4] = {
+OnePointCsFull D_80121FBC[4] = {
     { 0x0F, 0xFF, 0x0101, 5, 0, 60.0f, 1.0f, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } },
     { 0x01, 0xFF, 0x0101, 10, 0, 30.0f, 1.0f, { -2130.0f, 2885.0f, -1055.0f }, { -2085.0f, 2875.0f, -1145.0f } },
     { 0x0F, 0xFF, 0x0000, 30, 0, 60.0f, 1.0f, { -1.0f, -1.0f, -1.0f }, { -1.0f, -1.0f, -1.0f } },
@@ -379,7 +379,7 @@ static OnePointCsFull D_8012205C[3] = {
     { 0x01, 0x01, 0x21A1, 10, 0, 60.0f, 1.0f, { 0.0f, -10.0f, 0.0f }, { 0.0f, 10.0f, -200.0f } },
 };
 
-static OnePointCsFull D_801220D4[5] = {
+OnePointCsFull D_801220D4[5] = {
     { 0x0F, 0x01, 0x0101, 5, 0, 60.0f, 1.0f, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } },
     { 0x01, 0xFF, 0x4141, 10, 5, 55.0f, 0.75f, { 400.0f, -50.0f, 800.0f }, { 600.0f, -60.0f, 800.0f } },
     { 0x01, 0xFF, 0x4141, 15, 10, 40.0f, 0.75f, { 0.0f, 0.0f, 0.0f }, { 0.0f, 10.0f, 200.0f } },
@@ -443,7 +443,7 @@ static OnePointCsFull D_8012269C[3] = {
     { 0x11, 0xFF, 0x0000, 1, -1, -1.0f, -1.0f, { -1.0f, -1.0f, -1.0f }, { -1.0f, -1.0f, -1.0f } },
 };
 
-static OnePointCsFull D_80122714[4] = {
+OnePointCsFull D_80122714[4] = {
     { 0x0F, 0xFF, 0x0101, 20, 0, 45.0f, 1.0f, { -915.0f, -2185.0f, 6335.0f }, { -915.0f, -2290.0f, 6165.0f } },
     { 0x02, 0xFF, 0x0101, -1, 0, 80.0f, 0.8f, { -920.0f, -2270.0f, 6140.0f }, { -920.0f, -2280.0f, 6070.0f } },
     { 0x02, 0xFF, 0x0101, 20, 0, 80.0f, 0.9f, { -920.0f, -2300.0f, 6140.0f }, { -920.0f, -2300.0f, 6070.0f } },
@@ -512,12 +512,12 @@ static OnePointCsFull D_80122C8C[1] = {
     { 0x0F, 0xFF, 0x0101, 999, 5, 60.0f, 1.0f, { -70.0f, 140.0f, 25.0f }, { 10.0f, 180.0f, 195.0f } },
 };
 
-static OnePointCsFull D_80122CB4[2] = {
+OnePointCsFull D_80122CB4[2] = {
     { 0x0F, 0xFF, 0x4242, 5, 0, 60.0f, 1.0f, { 0.0f, 0.0f, 1000.0f }, { 0.0f, 0.0f, 1100.0f } },
     { 0x02, 0xFF, 0x4242, -1, 0, 60.0f, 1.0f, { 0.0f, 0.0f, -100.0f }, { 0.0f, 0.0f, 0.0f } },
 };
 
-static OnePointCsFull D_80122D04[2] = {
+OnePointCsFull D_80122D04[2] = {
     { 0x0F, 0xFF, 0x4242, 10, 0, 60.0f, 1.0f, { 0.0f, 0.0f, -100.0f }, { 0.0f, 0.0f, 0.0f } },
     { 0x02, 0xFF, 0x4242, -1, 0, 60.0f, 1.0f, { 0.0f, 0.0f, 1000.0f }, { 0.0f, 0.0f, 1100.0f } },
 };
@@ -534,7 +534,7 @@ static OnePointCsFull D_80122DCC[3] = {
     { 0x11, 0xFF, 0x0000, 1, -1, -1.0f, -1.0f, { -1.0f, -1.0f, -1.0f }, { -1.0f, -1.0f, -1.0f } },
 };
 
-static OnePointCsFull D_80122E44[2][7] = {
+OnePointCsFull D_80122E44[2][7] = {
     {
         { 0x83, 0xFF, 0x2222, 10, 5, 90.0f, 0.2f, { 50.0f, 100.0f, 140.0f }, { -30.0f, 10.0f, -20.0f } },
         { 0x8F, 0xFF, 0x0000, 20, 0, 90.0f, 1.0f, { -1.0f, -1.0f, -1.0f }, { -1.0f, -1.0f, -1.0f } },
@@ -563,25 +563,25 @@ static OnePointCsFull D_80123074[5] = {
     { 0x92, 0xFF, 0x0000, 1, 0, 60.0f, 1.0f, { -1.0f, -1.0f, -1.0f }, { -1.0f, -1.0f, -1.0f } },
 };
 
-static OnePointCsFull D_8012313C[3] = {
+OnePointCsFull D_8012313C[3] = {
     { 0x8F, 0xFF, 0xA2A2, 20, 8, 70.0f, 1.0f, { 65.0f, -150.0f, 50.0f }, { 30.0f, 10.0f, 90.0f } },
     { 0x81, 0xFF, 0xA2A2, 100, 0, 60.0f, 1.0f, { 70.0f, -160.0f, 50.0f }, { 25.0f, 180.0f, 180.0f } },
     { 0x92, 0xFF, 0x0000, 1, 0, 60.0f, 1.0f, { -1.0f, -1.0f, -1.0f }, { -1.0f, -1.0f, -1.0f } },
 };
 
-static OnePointCsFull D_801231B4[4] = {
+OnePointCsFull D_801231B4[4] = {
     { 0x8F, 0xC5, 0x4343, 1, 0, 50.0f, 1.0f, { 0.0f, 20.0f, 0.0f }, { 0.0f, 5.0f, -1.0f } },
     { 0x81, 0xC5, 0x4343, 48, 0, 50.0f, 0.75f, { 0.0f, 80.0f, 0.0f }, { 0.0f, 15.0f, -1.0f } },
     { 0x8F, 0xC5, 0x4343, 1, 5, 45.0f, 1.0f, { 0.0f, 0.0f, 30.0f }, { 30.0f, 120.0f, 60.0f } },
     { 0x81, 0xC5, 0x4343, -1, 0, -1.0f, 1.0f, { -1.0f, -1.0f, -1.0f }, { -1.0f, -1.0f, -1.0f } },
 };
 
-static OnePointCsFull D_80123254[2] = {
+OnePointCsFull D_80123254[2] = {
     { 0x0F, 0xFF, 0x0101, 1, 0, 60.0f, 1.0f, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } },
     { 0x03, 0xC5, 0x0101, 49, 0, 50.0f, 0.05f, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } },
 };
 
-static OnePointCsFull D_801232A4[1] = {
+OnePointCsFull D_801232A4[1] = {
     { 0x0F, 0x45, 0x0101, 9999, 0, 60.0f, 1.0f, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } },
 };
 
@@ -646,24 +646,24 @@ static OnePointCsFull D_801237CC[5] = {
     { 0x0F, 0xFF, 0x0000, 100, -45, 75.0f, 1.0f, { -1.0f, -1.0f, -1.0f }, { -1.0f, -1.0f, -1.0f } },
 };
 
-static OnePointCsFull D_80123894[3] = {
+OnePointCsFull D_80123894[3] = {
     { 0x0F, 0xFF, 0x0101, 60, 0, 60.0f, 1.0f, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } },
     { 0x0F, 0xFF, 0x4242, 30, 0, 50.0f, 1.0f, { 0.0f, 28.0f, 0.0f }, { 0.0f, 20.0f, 40.0f } },
     { 0x0D, 0xFF, 0x0000, 120, 0, 180.0f, 0.4f, { 0.0f, -5.0f, 0.0f }, { 0.0f, 2.0f, 40.0f } },
 };
 
-static OnePointCsFull D_8012390C[2] = {
+OnePointCsFull D_8012390C[2] = {
     { 0x0F, 0xFF, 0x0101, 30, 0, 60.0f, 1.0f, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } },
     { 0x0F, 0xFF, 0x4242, 180, 0, 60.0f, 1.0f, { 0.0f, 78.0f, 0.0f }, { 0.0f, 78.0f, 200.0f } },
 };
 
-static OnePointCsFull D_8012395C[3] = {
+OnePointCsFull D_8012395C[3] = {
     { 0x0F, 0xFF, 0x0101, 60, 0, 60.0f, 1.0f, { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } },
     { 0x0F, 0xFF, 0x4242, 30, 0, 50.0f, 1.0f, { 0.0f, 28.0f, 0.0f }, { 0.0f, 20.0f, -45.0f } },
     { 0x0D, 0xFF, 0x0000, 120, 0, 180.0f, 0.4f, { 0.0f, -5.0f, 0.0f }, { 0.0f, 2.0f, 45.0f } },
 };
 
-static OnePointCsFull D_801239D4[3] = {
+OnePointCsFull D_801239D4[3] = {
     { 0x0F, 0xFF, 0x4242, 5, 0, 60.0f, 1.0f, { 0.0f, 20.0f, 0.0f }, { 0.0f, 40.0f, -120.0f } },
     { 0x09, 0xFF, 0x4242, 0, 0, 60.0f, 1.0f, { 0.0f, 20.0f, 0.0f }, { 0.0f, 0.0f, 0.0f } },
     { 0x12, 0xFF, 0x0000, 1, 0, 60.0f, 1.0f, { -1.0f, -1.0f, -1.0f }, { -1.0f, -1.0f, -1.0f } },
diff --git a/soh/src/code/z_play.c b/soh/src/code/z_play.c
index 6218b7d76..2934e5e1b 100644
--- a/soh/src/code/z_play.c
+++ b/soh/src/code/z_play.c
@@ -421,7 +421,7 @@ void Gameplay_Update(GlobalContext* globalCtx) {
 
     input = globalCtx->state.input;
 
-    if ((SREG(1) < 0) || (DREG(0) != 0)) {
+        if ((SREG(1) < 0) || (DREG(0) != 0)) {
         SREG(1) = 0;
         ZeldaArena_Display();
     }
diff --git a/soh/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c b/soh/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c
index 260fa21ea..9ca8599b9 100644
--- a/soh/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c
+++ b/soh/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c
@@ -121,8 +121,8 @@ void BgDdanKd_CheckForExplosions(BgDdanKd* this, GlobalContext* globalCtx) {
     }
 }
 
-static Vec3f velocity = { 0.0f, 5.0f, 0.0f };
-static Vec3f accel = { 0.0f, -0.45f, 0.0f };
+Vec3f sBgDdanKdVelocity = { 0.0f, 5.0f, 0.0f };
+Vec3f sBgDdanKdAccel = { 0.0f, -0.45f, 0.0f };
 
 void BgDdanKd_LowerStairs(BgDdanKd* this, GlobalContext* globalCtx) {
     Vec3f pos1;
@@ -158,11 +158,11 @@ void BgDdanKd_LowerStairs(BgDdanKd* this, GlobalContext* globalCtx) {
             func_80033480(globalCtx, &pos1, 20.0f, 1, effectStrength * 135.0f, 60, 1);
             func_80033480(globalCtx, &pos2, 20.0f, 1, effectStrength * 135.0f, 60, 1);
 
-            velocity.x = Rand_CenteredFloat(3.0f);
-            velocity.z = Rand_CenteredFloat(3.0f);
+            sBgDdanKdVelocity.x = Rand_CenteredFloat(3.0f);
+            sBgDdanKdVelocity.z = Rand_CenteredFloat(3.0f);
 
-            func_8003555C(globalCtx, &pos1, &velocity, &accel);
-            func_8003555C(globalCtx, &pos2, &velocity, &accel);
+            func_8003555C(globalCtx, &pos1, &sBgDdanKdVelocity, &sBgDdanKdAccel);
+            func_8003555C(globalCtx, &pos2, &sBgDdanKdVelocity, &sBgDdanKdAccel);
 
             pos1 = this->dyna.actor.world.pos;
             pos1.z += 560.0f + Rand_ZeroOne() * 5.0f;
@@ -170,7 +170,7 @@ void BgDdanKd_LowerStairs(BgDdanKd* this, GlobalContext* globalCtx) {
             pos1.y = Rand_ZeroOne() * 3.0f + (this->dyna.actor.floorHeight + 20.0f);
 
             func_80033480(globalCtx, &pos1, 20.0f, 1, effectStrength * 135.0f, 60, 1);
-            func_8003555C(globalCtx, &pos1, &velocity, &accel);
+            func_8003555C(globalCtx, &pos1, &sBgDdanKdVelocity, &sBgDdanKdAccel);
         }
         Camera_AddQuake(&globalCtx->mainCamera, 0, effectStrength * 0.6f, 3);
         Audio_PlaySoundGeneral(NA_SE_EV_PILLAR_SINK - SFX_FLAG, &this->dyna.actor.projectedPos, 4, &D_801333E0,
@@ -192,11 +192,11 @@ void BgDdanKd_Draw(Actor* thisx, GlobalContext* globalCtx) {
 }
 
 void BgDdanKd_Reset(void) {
-    velocity.x = 0.0f;
-    velocity.y = 5.0f;
-    velocity.z = 0.0f;
+    sBgDdanKdVelocity.x = 0.0f;
+    sBgDdanKdVelocity.y = 5.0f;
+    sBgDdanKdVelocity.z = 0.0f;
 
-    accel.x = 0.0f;
-    accel.y = -0.45f;
-    accel.z = 0.0f;
+    sBgDdanKdAccel.x = 0.0f;
+    sBgDdanKdAccel.y = -0.45f;
+    sBgDdanKdAccel.z = 0.0f;
 }
\ No newline at end of file
diff --git a/soh/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c b/soh/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c
index a089aa013..dbeb5eb7c 100644
--- a/soh/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c
+++ b/soh/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c
@@ -74,13 +74,13 @@ static ColliderCylinderInit sColCylinderInitLeftRight = {
     { 50, 60, 280, { 0, 0, 0 } },
 };
 
-static s16 sFirstExplosiveFlag = false;
+s16 sBgDodoagoFirstExplosiveFlag = false;
 
-static u8 sDisableBombCatcher;
+u8 sBgDodoagoDisableBombCatcher;
 
-static u8 sUnused[90]; // unknown length
+//static u8 sUnused[90]; // unknown length
 
-static s32 sTimer;
+s32 sBgDodoagoTimer;
 
 void BgDodoago_SetupAction(BgDodoago* this, BgDodoagoActionFunc actionFunc) {
     this->actionFunc = actionFunc;
@@ -135,7 +135,7 @@ void BgDodoago_Init(Actor* thisx, GlobalContext* globalCtx) {
     Collider_SetCylinder(globalCtx, &this->colliderRight, &this->dyna.actor, &sColCylinderInitLeftRight);
 
     BgDodoago_SetupAction(this, BgDodoago_WaitExplosives);
-    sDisableBombCatcher = false;
+    sBgDodoagoDisableBombCatcher = false;
 }
 
 void BgDodoago_Destroy(Actor* thisx, GlobalContext* globalCtx) {
@@ -170,16 +170,16 @@ void BgDodoago_WaitExplosives(BgDodoago* this, GlobalContext* globalCtx) {
         } else {
             OnePointCutscene_Init(globalCtx, 3065, 20, &this->dyna.actor, MAIN_CAM);
             Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
-            sTimer += 30;
+            sBgDodoagoTimer += 30;
             return;
         }
 
         // the flag is never set back to false, so this only runs once
-        if (!sFirstExplosiveFlag) {
+        if (!sBgDodoagoFirstExplosiveFlag) {
             // this disables the bomb catcher (see BgDodoago_Update) for a few seconds
             this->dyna.actor.parent = explosive;
-            sFirstExplosiveFlag = true;
-            sTimer = 50;
+            sBgDodoagoFirstExplosiveFlag = true;
+            sBgDodoagoTimer = 50;
         }
     } else if (Flags_GetEventChkInf(0xB0)) {
         Collider_UpdateCylinder(&this->dyna.actor, &this->colliderMain);
@@ -219,11 +219,11 @@ void BgDodoago_OpenJaw(BgDodoago* this, GlobalContext* globalCtx) {
     }
 
     if (globalCtx->roomCtx.unk_74[BGDODOAGO_EYE_LEFT] != 255 || globalCtx->roomCtx.unk_74[BGDODOAGO_EYE_RIGHT] != 255) {
-        sTimer--;
+        sBgDodoagoTimer--;
         return;
     }
 
-    if (sTimer == 108) {
+    if (sBgDodoagoTimer == 108) {
         for (i = ARRAY_COUNT(dustOffsets) - 1; i >= 0; i--) {
             pos.x = dustOffsets[i].x + this->dyna.actor.world.pos.x;
             pos.y = dustOffsets[i].y + this->dyna.actor.world.pos.y;
@@ -290,16 +290,16 @@ void BgDodoago_Update(Actor* thisx, GlobalContext* globalCtx) {
                 this->dyna.actor.parent = &bomb->actor;
                 bomb->timer = 50;
                 bomb->actor.speedXZ = 0.0f;
-                sTimer = 0;
+                sBgDodoagoTimer = 0;
             }
         }
     } else {
-        sTimer++;
+        sBgDodoagoTimer++;
         Flags_GetSwitch(globalCtx, this->dyna.actor.params & 0x3F);
-        if (!sDisableBombCatcher && sTimer > 140) {
+        if (!sBgDodoagoDisableBombCatcher && sBgDodoagoTimer > 140) {
             if (Flags_GetSwitch(globalCtx, this->dyna.actor.params & 0x3F)) {
                 // this prevents clearing the actor's parent pointer, effectively disabling the bomb catcher
-                sDisableBombCatcher++;
+                sBgDodoagoDisableBombCatcher++;
             } else {
                 this->dyna.actor.parent = NULL;
             }
@@ -322,7 +322,7 @@ void BgDodoago_Draw(Actor* thisx, GlobalContext* globalCtx) {
 }
 
 void BgDodoago_Reset(void) {
-    sFirstExplosiveFlag = false;
-    sDisableBombCatcher = 0;
-    sTimer = 0;
+    sBgDodoagoFirstExplosiveFlag = false;
+    sBgDodoagoDisableBombCatcher = 0;
+    sBgDodoagoTimer = 0;
 }
\ No newline at end of file
diff --git a/soh/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c b/soh/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c
index 46ba447cb..2a4a4420f 100644
--- a/soh/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c
+++ b/soh/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c
@@ -47,7 +47,7 @@ void BgHakaGate_SkullOfTruth(BgHakaGate* this, GlobalContext* globalCtx);
 void BgHakaGate_FalseSkull(BgHakaGate* this, GlobalContext* globalCtx);
 
 static s16 sSkullOfTruthRotY = 0x100;
-static u8 sPuzzleState = 1;
+static u8 sBgPoEventPuzzleState = 1;
 static f32 sStatueDistToPlayer = 0;
 
 static s16 sStatueRotY;
@@ -82,7 +82,7 @@ void BgHakaGate_Init(Actor* thisx, GlobalContext* globalCtx) {
         if (sSkullOfTruthRotY != 0x100) {
             this->actionFunc = BgHakaGate_FalseSkull;
         } else if (ABS(thisx->shape.rot.y) < 0x4000) {
-            if ((Rand_ZeroOne() * 3.0f) < sPuzzleState) {
+            if ((Rand_ZeroOne() * 3.0f) < sBgPoEventPuzzleState) {
                 this->vIsSkullOfTruth = true;
                 sSkullOfTruthRotY = thisx->shape.rot.y + 0x8000;
                 if (Flags_GetSwitch(globalCtx, this->switchFlag)) {
@@ -91,7 +91,7 @@ void BgHakaGate_Init(Actor* thisx, GlobalContext* globalCtx) {
                     this->actionFunc = BgHakaGate_SkullOfTruth;
                 }
             } else {
-                sPuzzleState++;
+                sBgPoEventPuzzleState++;
                 this->actionFunc = BgHakaGate_FalseSkull;
             }
         } else {
@@ -141,7 +141,7 @@ void BgHakaGate_Destroy(Actor* thisx, GlobalContext* globalCtx) {
     DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
     if (this->dyna.actor.params == BGHAKAGATE_STATUE) {
         sSkullOfTruthRotY = 0x100;
-        sPuzzleState = 1;
+        sBgPoEventPuzzleState = 1;
     }
 }
 
@@ -178,7 +178,7 @@ void BgHakaGate_StatueIdle(BgHakaGate* this, GlobalContext* globalCtx) {
             }
         }
     } else {
-        if (sPuzzleState == SKULL_OF_TRUTH_FOUND) {
+        if (sBgPoEventPuzzleState == SKULL_OF_TRUTH_FOUND) {
             this->actionFunc = BgHakaGate_StatueInactive;
         } else {
             this->vTimer = 0;
@@ -243,7 +243,7 @@ void BgHakaGate_FloorClosed(BgHakaGate* this, GlobalContext* globalCtx) {
             sStatueDistToPlayer = 0.0f;
             if (ABS(yawDiff) < 0x80) {
                 Flags_SetSwitch(globalCtx, this->switchFlag);
-                sPuzzleState = SKULL_OF_TRUTH_FOUND;
+                sBgPoEventPuzzleState = SKULL_OF_TRUTH_FOUND;
                 this->actionFunc = BgHakaGate_DoNothing;
             } else {
                 func_80078884(NA_SE_SY_ERROR);
diff --git a/soh/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c b/soh/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c
index 83cd8dfd6..877916b67 100644
--- a/soh/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c
+++ b/soh/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c
@@ -28,7 +28,7 @@ void func_80880AE8(BgHakaTrap* this, GlobalContext* globalCtx);
 void func_80880C0C(BgHakaTrap* this, GlobalContext* globalCtx);
 void func_80880D68(BgHakaTrap* this);
 
-static UNK_TYPE D_80880F30 = 0;
+UNK_TYPE D_80880F30 = 0;
 
 const ActorInit Bg_Haka_Trap_InitVars = {
     ACTOR_BG_HAKA_TRAP,
@@ -107,7 +107,7 @@ static InitChainEntry sInitChain[] = {
     ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
 };
 
-static UNK_TYPE D_80881014 = 0;
+UNK_TYPE D_80881014 = 0;
 void BgHakaTrap_Init(Actor* thisx, GlobalContext* globalCtx) {
     BgHakaTrap* this = (BgHakaTrap*)thisx;
     s32 pad;
diff --git a/soh/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c b/soh/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c
index 4f7ce9a63..a962dbc2e 100644
--- a/soh/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c
+++ b/soh/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c
@@ -120,7 +120,7 @@ void func_8088B24C(BgHidanRock* this) {
     this->actionFunc = func_8088B990;
 }
 
-static f32 D_8088BFC0 = 0.0f;
+f32 D_8088BFC0 = 0.0f;
 void func_8088B268(BgHidanRock* this, GlobalContext* globalCtx) {
     f32 sp2C;
     s32 temp_v1;
diff --git a/soh/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c b/soh/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c
index 1d50e6c49..dc1a3b758 100644
--- a/soh/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c
+++ b/soh/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c
@@ -23,7 +23,7 @@ void BgJya1flift_SetupDoNothing(BgJya1flift* this);
 void BgJya1flift_ResetMoveDelay(BgJya1flift* this);
 void BgJya1flift_DelayMove(BgJya1flift* this, GlobalContext* globalCtx);
 
-static u8 sIsSpawned = false;
+static u8 sKankyoIsSpawned = false;
 
 const ActorInit Bg_Jya_1flift_InitVars = {
     ACTOR_BG_JYA_1FLIFT,
@@ -94,9 +94,9 @@ void BgJya1flift_InitCollision(Actor* thisx, GlobalContext* globalCtx) {
 void BgJya1flift_Init(Actor* thisx, GlobalContext* globalCtx) {
     BgJya1flift* this = (BgJya1flift*)thisx;
     // "1 F lift"
-    osSyncPrintf("(１Ｆリフト)(flag %d)(room %d)\n", sIsSpawned, globalCtx->roomCtx.curRoom.num);
+    osSyncPrintf("(１Ｆリフト)(flag %d)(room %d)\n", sKankyoIsSpawned, globalCtx->roomCtx.curRoom.num);
     this->hasInitialized = false;
-    if (sIsSpawned) {
+    if (sKankyoIsSpawned) {
         Actor_Kill(thisx);
         return;
     }
@@ -109,7 +109,7 @@ void BgJya1flift_Init(Actor* thisx, GlobalContext* globalCtx) {
         BgJya1flift_SetupWaitForSwitch(this);
     }
     thisx->room = -1;
-    sIsSpawned = true;
+    sKankyoIsSpawned = true;
     this->hasInitialized = true;
 }
 
@@ -117,7 +117,7 @@ void BgJya1flift_Destroy(Actor* thisx, GlobalContext* globalCtx) {
     BgJya1flift* this = (BgJya1flift*)thisx;
 
     if (this->hasInitialized) {
-        sIsSpawned = false;
+        sKankyoIsSpawned = false;
         Collider_DestroyCylinder(globalCtx, &this->collider);
         DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
     }
diff --git a/soh/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c b/soh/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c
index 934329337..e872a4cdf 100644
--- a/soh/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c
+++ b/soh/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c
@@ -14,7 +14,7 @@ void BgJyaBigmirror_Destroy(Actor* thisx, GlobalContext* globalCtx);
 void BgJyaBigmirror_Update(Actor* thisx, GlobalContext* globalCtx);
 void BgJyaBigmirror_Draw(Actor* thisx, GlobalContext* globalCtx);
 
-static u8 sIsSpawned = false;
+static u8 sKankyoIsSpawned = false;
 
 const ActorInit Bg_Jya_Bigmirror_InitVars = {
     ACTOR_BG_JYA_BIGMIRROR,
@@ -176,7 +176,7 @@ void BgJyaBigmirror_HandleMirRay(Actor* thisx, GlobalContext* globalCtx) {
 void BgJyaBigmirror_Init(Actor* thisx, GlobalContext* globalCtx) {
     BgJyaBigmirror* this = (BgJyaBigmirror*)thisx;
 
-    if (sIsSpawned) {
+    if (sKankyoIsSpawned) {
         Actor_Kill(&this->actor);
         return;
     }
@@ -185,7 +185,7 @@ void BgJyaBigmirror_Init(Actor* thisx, GlobalContext* globalCtx) {
     this->cobraInfo[0].rotY = sCobraSpawnData[0].initRotY;
     this->cobraInfo[1].rotY = sCobraSpawnData[1].initRotY;
     this->actor.room = -1;
-    sIsSpawned = true;
+    sKankyoIsSpawned = true;
     this->spawned = true;
     this->mirRayObjIndex = -1;
 
@@ -197,7 +197,7 @@ void BgJyaBigmirror_Destroy(Actor* thisx, GlobalContext* globalCtx) {
     BgJyaBigmirror* this = (BgJyaBigmirror*)thisx;
 
     if (this->spawned) {
-        sIsSpawned = false;
+        sKankyoIsSpawned = false;
     }
 }
 
diff --git a/soh/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c b/soh/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c
index f57c64b84..57c7ac413 100644
--- a/soh/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c
+++ b/soh/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c
@@ -20,7 +20,7 @@ void BgJyaLift_DelayMove(BgJyaLift* this, GlobalContext* globalCtx);
 void BgJyaLift_SetupMove(BgJyaLift* this);
 void BgJyaLift_Move(BgJyaLift* this, GlobalContext* globalCtx);
 
-static s16 sIsSpawned = false;
+static s16 sKankyoIsSpawned = false;
 
 const ActorInit Bg_Jya_Lift_InitVars = {
     ACTOR_BG_JYA_LIFT,
@@ -55,7 +55,7 @@ void BgJyaLift_Init(Actor* thisx, GlobalContext* globalCtx) {
     BgJyaLift* this = (BgJyaLift*)thisx;
 
     this->isSpawned = false;
-    if (sIsSpawned) {
+    if (sKankyoIsSpawned) {
         Actor_Kill(thisx);
         return;
     }
@@ -70,7 +70,7 @@ void BgJyaLift_Init(Actor* thisx, GlobalContext* globalCtx) {
         BgJyaLift_SetInitPosY(this);
     }
     thisx->room = -1;
-    sIsSpawned = true;
+    sKankyoIsSpawned = true;
     this->isSpawned = true;
 }
 
@@ -81,7 +81,7 @@ void BgJyaLift_Destroy(Actor* thisx, GlobalContext* globalCtx) {
 
         // "Goddess Lift DT"
         osSyncPrintf("女神リフト DT\n");
-        sIsSpawned = false;
+        sKankyoIsSpawned = false;
         DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
     }
 }
diff --git a/soh/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c b/soh/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c
index 70360c423..a8871b50c 100644
--- a/soh/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c
+++ b/soh/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c
@@ -28,7 +28,7 @@ const ActorInit Bg_Menkuri_Eye_InitVars = {
     (ActorResetFunc)BgMenkuriEye_Reset,
 };
 
-static s32 D_8089C1A0;
+s32 D_8089C1A0;
 
 static ColliderJntSphElementInit sJntSphElementsInit[1] = {
     {
diff --git a/soh/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c b/soh/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c
index edda63bbb..269b5e411 100644
--- a/soh/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c
+++ b/soh/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c
@@ -17,7 +17,7 @@ void func_808A2008(BgMoriElevator* this, GlobalContext* globalCtx);
 void BgMoriElevator_MoveIntoGround(BgMoriElevator* this, GlobalContext* globalCtx);
 void BgMoriElevator_MoveAboveGround(BgMoriElevator* this, GlobalContext* globalCtx);
 
-static s16 sIsSpawned = false;
+static s16 sKankyoIsSpawned = false;
 
 const ActorInit Bg_Mori_Elevator_InitVars = {
     ACTOR_BG_MORI_ELEVATOR,
@@ -87,18 +87,18 @@ void BgMoriElevator_Init(Actor* thisx, GlobalContext* globalCtx) {
     s32 pad;
     CollisionHeader* colHeader = NULL;
 
-    this->unk_172 = sIsSpawned;
+    this->unk_172 = sKankyoIsSpawned;
     this->moriTexObjIndex = Object_GetIndex(&globalCtx->objectCtx, OBJECT_MORI_TEX);
     if (this->moriTexObjIndex < 0) {
         Actor_Kill(thisx);
         // "Forest Temple obj elevator Bank Danger!"
         osSyncPrintf("Error : 森の神殿 obj elevator バンク危険！(%s %d)\n", "../z_bg_mori_elevator.c", 277);
     } else {
-        switch (sIsSpawned) {
+        switch (sKankyoIsSpawned) {
             case false:
                 // "Forest Temple elevator CT"
                 osSyncPrintf("森の神殿 elevator CT\n");
-                sIsSpawned = true;
+                sKankyoIsSpawned = true;
                 this->dyna.actor.room = -1;
                 Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
                 DynaPolyActor_Init(&this->dyna, DPM_PLAYER);
@@ -120,7 +120,7 @@ void BgMoriElevator_Destroy(Actor* thisx, GlobalContext* globalCtx) {
         // "Forest Temple elevator DT"
         osSyncPrintf("森の神殿 elevator DT\n");
         DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
-        sIsSpawned = false;
+        sKankyoIsSpawned = false;
     }
 }
 
diff --git a/soh/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c b/soh/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c
index 8dfbff765..7508b6a24 100644
--- a/soh/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c
+++ b/soh/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c
@@ -28,7 +28,7 @@ void BgMoriHineri_SpawnBossKeyChest(BgMoriHineri* this, GlobalContext* globalCtx
 void BgMoriHineri_DoNothing(BgMoriHineri* this, GlobalContext* globalCtx);
 void func_808A3D58(BgMoriHineri* this, GlobalContext* globalCtx);
 
-static s16 sNextCamIdx = SUBCAM_NONE;
+s16 sBgMoriHineriNextCamIdx = SUBCAM_NONE;
 
 const ActorInit Bg_Mori_Hineri_InitVars = {
     ACTOR_BG_MORI_HINERI,
@@ -194,28 +194,28 @@ void func_808A3D58(BgMoriHineri* this, GlobalContext* globalCtx) {
             OnePointCutscene_EndCutscene(globalCtx, mainCamChildIdx);
         }
         OnePointCutscene_Init(globalCtx, 3260, 40, &this->dyna.actor, MAIN_CAM);
-        sNextCamIdx = OnePointCutscene_Init(globalCtx, 3261, 40, &this->dyna.actor, MAIN_CAM);
+        sBgMoriHineriNextCamIdx = OnePointCutscene_Init(globalCtx, 3261, 40, &this->dyna.actor, MAIN_CAM);
     }
 }
 
 void func_808A3E54(BgMoriHineri* this, GlobalContext* globalCtx) {
     s8 objBankIndex;
 
-    if (globalCtx->activeCamera == sNextCamIdx) {
-        if (sNextCamIdx != MAIN_CAM) {
+    if (globalCtx->activeCamera == sBgMoriHineriNextCamIdx) {
+        if (sBgMoriHineriNextCamIdx != MAIN_CAM) {
             objBankIndex = this->dyna.actor.objBankIndex;
             this->dyna.actor.objBankIndex = this->moriHineriObjIdx;
             this->moriHineriObjIdx = objBankIndex;
             this->dyna.actor.params ^= 1;
-            sNextCamIdx = MAIN_CAM;
+            sBgMoriHineriNextCamIdx = MAIN_CAM;
             func_80078884(NA_SE_SY_TRE_BOX_APPEAR);
         } else {
             this->dyna.actor.draw = NULL;
             this->actionFunc = func_808A3D58;
-            sNextCamIdx = SUBCAM_NONE;
+            sBgMoriHineriNextCamIdx = SUBCAM_NONE;
         }
     }
-    if ((sNextCamIdx >= SUBCAM_FIRST) &&
+    if ((sBgMoriHineriNextCamIdx >= SUBCAM_FIRST) &&
         ((GET_ACTIVE_CAM(globalCtx)->eye.z - this->dyna.actor.world.pos.z) < 1100.0f)) {
         func_8002F948(&this->dyna.actor, NA_SE_EV_FLOOR_ROLLING - SFX_FLAG);
     }
@@ -283,5 +283,5 @@ void BgMoriHineri_DrawHallAndRoom(Actor* thisx, GlobalContext* globalCtx) {
 }
 
 void BgMoriHineri_Reset() {
-    sNextCamIdx = SUBCAM_NONE;
+    sBgMoriHineriNextCamIdx = SUBCAM_NONE;
 }
\ No newline at end of file
diff --git a/soh/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c b/soh/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c
index 3c605926f..962c4d1aa 100644
--- a/soh/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c
+++ b/soh/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c
@@ -19,7 +19,7 @@ void BgMoriIdomizu_WaitForMoriTex(BgMoriIdomizu* this, GlobalContext* globalCtx)
 void BgMoriIdomizu_SetupMain(BgMoriIdomizu* this);
 void BgMoriIdomizu_Main(BgMoriIdomizu* this, GlobalContext* globalCtx);
 
-static s16 sIsSpawned = false;
+static s16 sKankyoIsSpawned = false;
 
 const ActorInit Bg_Mori_Idomizu_InitVars = {
     ACTOR_BG_MORI_IDOMIZU,
@@ -50,7 +50,7 @@ void BgMoriIdomizu_Init(Actor* thisx, GlobalContext* globalCtx) {
     s32 pad;
     BgMoriIdomizu* this = (BgMoriIdomizu*)thisx;
 
-    if (sIsSpawned) {
+    if (sKankyoIsSpawned) {
         Actor_Kill(&this->actor);
         return;
     }
@@ -76,7 +76,7 @@ void BgMoriIdomizu_Init(Actor* thisx, GlobalContext* globalCtx) {
         return;
     }
     BgMoriIdomizu_SetupWaitForMoriTex(this);
-    sIsSpawned = true;
+    sKankyoIsSpawned = true;
     this->isLoaded = true;
     this->actor.room = -1;
     // "Forest Temple well water"
@@ -88,7 +88,7 @@ void BgMoriIdomizu_Destroy(Actor* thisx, GlobalContext* globalCtx) {
     BgMoriIdomizu* this = (BgMoriIdomizu*)thisx;
 
     if (this->isLoaded) {
-        sIsSpawned = false;
+        sKankyoIsSpawned = false;
     }
 }
 
diff --git a/soh/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c b/soh/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c
index efceb7939..c2ed8a29b 100644
--- a/soh/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c
+++ b/soh/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c
@@ -80,11 +80,11 @@ static ColliderTrisInit sTrisInit = {
     sTrisElementsInit,
 };
 
-static u8 sBlocksAtRest = 0;
+u8 sBgPoEventBlocksAtRest = 0;
 
 static Vec3f sZeroVec = { 0.0f, 0.0f, 0.0f };
 
-static u8 sPuzzleState;
+u8 sBgPoEventPuzzleState;
 
 void BgPoEvent_InitPaintings(BgPoEvent* this, GlobalContext* globalCtx) {
     static s16 paintingPosX[] = { -1302, -866, 1421, 985 };
@@ -142,10 +142,10 @@ void BgPoEvent_InitPaintings(BgPoEvent* this, GlobalContext* globalCtx) {
     }
     this->timer = 0;
     if (this->type == 4) {
-        sPuzzleState = 0;
+        sBgPoEventPuzzleState = 0;
         this->actionFunc = BgPoEvent_AmyWait;
     } else {
-        sPuzzleState = (s32)(Rand_ZeroOne() * 3.0f) % 3;
+        sBgPoEventPuzzleState = (s32)(Rand_ZeroOne() * 3.0f) % 3;
         this->actionFunc = BgPoEvent_PaintingEmpty;
     }
 }
@@ -236,7 +236,7 @@ void BgPoEvent_Destroy(Actor* thisx, GlobalContext* globalCtx) {
 
 void BgPoEvent_BlockWait(BgPoEvent* this, GlobalContext* globalCtx) {
     this->dyna.actor.world.pos.y = 833.0f;
-    if (sPuzzleState == 0x3F) {
+    if (sBgPoEventPuzzleState == 0x3F) {
         if (this->type == 1) {
             OnePointCutscene_Init(globalCtx, 3150, 65, NULL, MAIN_CAM);
         }
@@ -244,14 +244,14 @@ void BgPoEvent_BlockWait(BgPoEvent* this, GlobalContext* globalCtx) {
         this->actionFunc = BgPoEvent_BlockShake;
     } else if (this->dyna.actor.xzDistToPlayer > 50.0f) {
         if (this->type != 1) {
-            sPuzzleState |= (1 << this->index);
+            sBgPoEventPuzzleState |= (1 << this->index);
         } else {
-            sPuzzleState |= 0x10;
+            sBgPoEventPuzzleState |= 0x10;
         }
     } else if (this->type != 1) {
-        sPuzzleState &= ~(1 << this->index);
+        sBgPoEventPuzzleState &= ~(1 << this->index);
     } else {
-        sPuzzleState &= ~0x10;
+        sBgPoEventPuzzleState &= ~0x10;
     }
 }
 
@@ -265,7 +265,7 @@ void BgPoEvent_BlockShake(BgPoEvent* this, GlobalContext* globalCtx) {
     }
     if (this->timer == 0) {
         this->dyna.actor.world.pos.x = this->dyna.actor.home.pos.x;
-        sPuzzleState = 0;
+        sBgPoEventPuzzleState = 0;
         this->timer = 60;
         this->actionFunc = BgPoEvent_BlockFall;
     }
@@ -299,9 +299,9 @@ void BgPoEvent_CheckBlock(BgPoEvent* this) {
         }
     }
     if ((phi_v1 == phi_a1) && ((phi_t0 - phi_a3) == 60)) {
-        sPuzzleState |= (1 << this->index);
+        sBgPoEventPuzzleState |= (1 << this->index);
     } else {
-        sPuzzleState &= ~(1 << this->index);
+        sBgPoEventPuzzleState &= ~(1 << this->index);
     }
 }
 
@@ -312,7 +312,7 @@ void BgPoEvent_BlockFall(BgPoEvent* this, GlobalContext* globalCtx) {
     if (Math_StepToF(&this->dyna.actor.world.pos.y, 433.0f, this->dyna.actor.velocity.y)) {
         this->dyna.actor.flags &= ~ACTOR_FLAG_5;
         this->dyna.actor.velocity.y = 0.0f;
-        sBlocksAtRest++;
+        sBgPoEventBlocksAtRest++;
         if (this->type != 1) {
             BgPoEvent_CheckBlock(this);
         } else {
@@ -334,7 +334,7 @@ void BgPoEvent_BlockIdle(BgPoEvent* this, GlobalContext* globalCtx) {
     Player* player = GET_PLAYER(globalCtx);
     Actor* amy;
 
-    if (sPuzzleState == 0xF) {
+    if (sBgPoEventPuzzleState == 0xF) {
         this->actionFunc = BgPoEvent_BlockSolved;
         if ((this->type == 0) && (this->index == 0)) {
             amy =
@@ -348,23 +348,23 @@ void BgPoEvent_BlockIdle(BgPoEvent* this, GlobalContext* globalCtx) {
             gSaveContext.timer1State = 0xA;
         }
     } else {
-        if ((gSaveContext.timer1Value == 0) && (sBlocksAtRest == 5)) {
+        if ((gSaveContext.timer1Value == 0) && (sBgPoEventBlocksAtRest == 5)) {
             player->stateFlags2 &= ~0x10;
-            sPuzzleState = 0x10;
-            sBlocksAtRest = 0;
+            sBgPoEventPuzzleState = 0x10;
+            sBgPoEventBlocksAtRest = 0;
         }
-        if ((sPuzzleState == 0x40) || ((sPuzzleState == 0x10) && !Player_InCsMode(globalCtx))) {
+        if ((sBgPoEventPuzzleState == 0x40) || ((sBgPoEventPuzzleState == 0x10) && !Player_InCsMode(globalCtx))) {
             this->dyna.actor.world.rot.z = this->dyna.actor.shape.rot.z;
             this->actionFunc = BgPoEvent_BlockReset;
-            if (sPuzzleState == 0x10) {
-                sPuzzleState = 0x40;
+            if (sBgPoEventPuzzleState == 0x10) {
+                sBgPoEventPuzzleState = 0x40;
                 Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_BLOCK_RISING);
                 func_8002DF54(globalCtx, &player->actor, 8);
             }
         } else if (this->dyna.unk_150 != 0.0f) {
             if (this->direction == 0) {
                 if (func_800435D8(globalCtx, &this->dyna, 0x1E, 0x32, -0x14) != 0) {
-                    sBlocksAtRest--;
+                    sBgPoEventBlocksAtRest--;
                     this->direction = (this->dyna.unk_150 >= 0.0f) ? 1.0f : -1.0f;
                     this->actionFunc = BgPoEvent_BlockPush;
                 } else {
@@ -382,7 +382,7 @@ void BgPoEvent_BlockIdle(BgPoEvent* this, GlobalContext* globalCtx) {
     }
 }
 
-static f32 blockPushDist = 0.0f;
+f32 sBgPoEventblockPushDist = 0.0f;
 void BgPoEvent_BlockPush(BgPoEvent* this, GlobalContext* globalCtx) {
     f32 displacement;
     s32 blockStop;
@@ -390,8 +390,8 @@ void BgPoEvent_BlockPush(BgPoEvent* this, GlobalContext* globalCtx) {
 
     this->dyna.actor.speedXZ += CVar_GetS32("gFasterBlockPush", 0) != 0 ? 0.5f : 0.1f;
     this->dyna.actor.speedXZ = CLAMP_MAX(this->dyna.actor.speedXZ, 2.0f);
-    blockStop = Math_StepToF(&blockPushDist, 20.0f, this->dyna.actor.speedXZ);
-    displacement = this->direction * blockPushDist;
+    blockStop = Math_StepToF(&sBgPoEventblockPushDist, 20.0f, this->dyna.actor.speedXZ);
+    displacement = this->direction * sBgPoEventblockPushDist;
     this->dyna.actor.world.pos.x = (Math_SinS(this->dyna.unk_158) * displacement) + this->dyna.actor.home.pos.x;
     this->dyna.actor.world.pos.z = (Math_CosS(this->dyna.unk_158) * displacement) + this->dyna.actor.home.pos.z;
     if (blockStop) {
@@ -402,10 +402,10 @@ void BgPoEvent_BlockPush(BgPoEvent* this, GlobalContext* globalCtx) {
         this->dyna.unk_150 = 0.0f;
         this->dyna.actor.home.pos.x = this->dyna.actor.world.pos.x;
         this->dyna.actor.home.pos.z = this->dyna.actor.world.pos.z;
-        blockPushDist = 0.0f;
+        sBgPoEventblockPushDist = 0.0f;
         this->dyna.actor.speedXZ = 0.0f;
         this->direction = CVar_GetS32("gFasterBlockPush", 0) != 0 ? 3 : 5;
-        sBlocksAtRest++;
+        sBgPoEventBlocksAtRest++;
         this->actionFunc = BgPoEvent_BlockIdle;
         if (this->type == 1) {
             return;
@@ -428,7 +428,7 @@ void BgPoEvent_BlockReset(BgPoEvent* this, GlobalContext* globalCtx) {
 
         this->index = (this->index + 1) % 4;
         this->actionFunc = BgPoEvent_BlockFall;
-        sPuzzleState = 0;
+        sBgPoEventPuzzleState = 0;
         if (this->type == 1) {
             this->timer += 10;
             this->timer = CLAMP_MAX(this->timer, 120);
@@ -443,14 +443,14 @@ void BgPoEvent_BlockSolved(BgPoEvent* this, GlobalContext* globalCtx) {
         player->stateFlags2 &= ~0x10;
     }
     if (Math_StepToF(&this->dyna.actor.world.pos.y, 369.0f, 2.0f)) {
-        sPuzzleState = 0x20;
+        sBgPoEventPuzzleState = 0x20;
         Actor_Kill(&this->dyna.actor);
     }
 }
 
 void BgPoEvent_AmyWait(BgPoEvent* this, GlobalContext* globalCtx) {
     if (this->collider.base.acFlags & AC_HIT) {
-        sPuzzleState |= 0x20;
+        sBgPoEventPuzzleState |= 0x20;
         this->timer = 5;
         Actor_SetColorFilter(&this->dyna.actor, 0x4000, 0xFF, 0, 5);
         Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EN_PO_LAUGH2);
@@ -461,12 +461,12 @@ void BgPoEvent_AmyWait(BgPoEvent* this, GlobalContext* globalCtx) {
 void BgPoEvent_AmyPuzzle(BgPoEvent* this, GlobalContext* globalCtx) {
     Vec3f pos;
 
-    if (sPuzzleState == 0xF) {
+    if (sBgPoEventPuzzleState == 0xF) {
         pos.x = this->dyna.actor.world.pos.x - 5.0f;
         pos.y = Rand_CenteredFloat(120.0f) + this->dyna.actor.world.pos.y;
         pos.z = Rand_CenteredFloat(120.0f) + this->dyna.actor.world.pos.z;
         EffectSsDeadDb_Spawn(globalCtx, &pos, &sZeroVec, &sZeroVec, 170, 0, 200, 255, 100, 170, 0, 255, 0, 1, 9, true);
-    } else if (sPuzzleState == 0x20) {
+    } else if (sBgPoEventPuzzleState == 0x20) {
         Actor_Kill(&this->dyna.actor);
     } else {
         DECR(this->timer);
@@ -476,14 +476,14 @@ void BgPoEvent_AmyPuzzle(BgPoEvent* this, GlobalContext* globalCtx) {
 s32 BgPoEvent_NextPainting(BgPoEvent* this) {
     if ((this->dyna.actor.parent != NULL) && (this->dyna.actor.child != NULL)) {
         if (Rand_ZeroOne() < 0.5f) {
-            sPuzzleState = ((BgPoEvent*)this->dyna.actor.parent)->index;
+            sBgPoEventPuzzleState = ((BgPoEvent*)this->dyna.actor.parent)->index;
         } else {
-            sPuzzleState = ((BgPoEvent*)this->dyna.actor.child)->index;
+            sBgPoEventPuzzleState = ((BgPoEvent*)this->dyna.actor.child)->index;
         }
     } else if (this->dyna.actor.parent != NULL) {
-        sPuzzleState = ((BgPoEvent*)this->dyna.actor.parent)->index;
+        sBgPoEventPuzzleState = ((BgPoEvent*)this->dyna.actor.parent)->index;
     } else if (this->dyna.actor.child != NULL) {
-        sPuzzleState = ((BgPoEvent*)this->dyna.actor.child)->index;
+        sBgPoEventPuzzleState = ((BgPoEvent*)this->dyna.actor.child)->index;
     } else {
         return false;
     }
@@ -491,7 +491,7 @@ s32 BgPoEvent_NextPainting(BgPoEvent* this) {
 }
 
 void BgPoEvent_PaintingEmpty(BgPoEvent* this, GlobalContext* globalCtx) {
-    if (sPuzzleState == this->index) {
+    if (sBgPoEventPuzzleState == this->index) {
         this->timer = 255;
         this->actionFunc = BgPoEvent_PaintingAppear;
     }
@@ -636,7 +636,7 @@ void BgPoEvent_Draw(Actor* thisx, GlobalContext* globalCtx) {
 }
 
 void BgPoEvent_Reset(void) {
-    sBlocksAtRest = 0;
-    sPuzzleState = 0;
-    blockPushDist = 0.0f;
+    sBgPoEventBlocksAtRest = 0;
+    sBgPoEventPuzzleState = 0;
+    sBgPoEventblockPushDist = 0.0f;
 }
\ No newline at end of file
diff --git a/soh/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c b/soh/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c
index 33e94d172..58d0f62d8 100644
--- a/soh/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c
+++ b/soh/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c
@@ -45,7 +45,7 @@ static InitChainEntry sInitChain[] = {
     ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
 };
 
-static u32 D_808A9508 = 0;
+u32 D_808A9508 = 0;
 void BgRelayObjects_Init(Actor* thisx, GlobalContext* globalCtx) {
     BgRelayObjects* this = (BgRelayObjects*)thisx;
     s32 pad;
diff --git a/soh/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c b/soh/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c
index 2e9297e4c..caa727c69 100644
--- a/soh/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c
+++ b/soh/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c
@@ -84,7 +84,7 @@ void func_808B7710(Actor* thisx, GlobalContext* globalCtx) {
     this->dyna.actor.colChkInfo.mass = MASS_IMMOVABLE;
 }
 
-static s16 D_808B85D0 = 0;
+s16 D_808B85D0 = 0;
 void func_808B7770(BgSpot18Basket* this, GlobalContext* globalCtx, f32 arg2) {
     Vec3f acceleration;
     Vec3f velocity;
diff --git a/soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c b/soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c
index e4a5afc65..f7132bcaf 100644
--- a/soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c
+++ b/soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c
@@ -105,35 +105,17 @@ static ColliderCylinderInit sLightBallCylinderInit = {
 static u8 D_808E4C58[] = { 0, 12, 10, 12, 14, 16, 12, 14, 16, 12, 14, 16, 12, 14, 16, 10, 16, 14 };
 static Vec3f sZeroVec = { 0.0f, 0.0f, 0.0f };
 
-static EnGanonMant* sCape;
+EnGanonMant* sBossGanonCape;
 
-static s32 sSeed1;
-static s32 sSeed2;
-static s32 sSeed3;
+s32 sBossGanonSeed1;
+s32 sBossGanonSeed3;
+s32 sBossGanonSeed2;
 
-static BossGanon* sGanondorf;
+BossGanon* sBossGanonGanondorf;
 
-static EnZl3* sZelda;
+EnZl3* sBossGanonZelda;
 
-typedef struct {
-    /* 0x00 */ u8 type;
-    /* 0x01 */ u8 timer;
-    /* 0x04 */ Vec3f pos;
-    /* 0x10 */ Vec3f velocity;
-    /* 0x1C */ Vec3f accel;
-    /* 0x28 */ Color_RGB8 color;
-    /* 0x2C */ s16 alpha;
-    /* 0x2E */ s16 unk_2E;
-    /* 0x30 */ s16 unk_30;
-    /* 0x34 */ f32 scale;
-    /* 0x38 */ f32 unk_38; // scale target mostly, but used for other things
-    /* 0x3C */ f32 unk_3C; // mostly z rot
-    /* 0x40 */ f32 unk_40;
-    /* 0x44 */ f32 unk_44; // mostly x rot
-    /* 0x48 */ f32 unk_48; // mostly y rot
-} GanondorfEffect;         // size = 0x4C
-
-GanondorfEffect sEffectBuf[200];
+GanondorfEffect sBossGanonEffectBuf[200];
 
 void BossGanonEff_SpawnWindowShard(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, f32 scale) {
     static Color_RGB8 shardColors[] = { { 255, 175, 85 }, { 155, 205, 155 }, { 155, 125, 55 } };
@@ -348,13 +330,13 @@ void BossGanon_Init(Actor* thisx, GlobalContext* globalCtx2) {
 
     if (thisx->params < 0x64) {
         Flags_SetSwitch(globalCtx, 0x14);
-        globalCtx->specialEffects = sEffectBuf;
+        globalCtx->specialEffects = sBossGanonEffectBuf;
 
-        for (i = 0; i < ARRAY_COUNT(sEffectBuf); i++) {
-            sEffectBuf[i].type = GDF_EFF_NONE;
+        for (i = 0; i < ARRAY_COUNT(sBossGanonEffectBuf); i++) {
+            sBossGanonEffectBuf[i].type = GDF_EFF_NONE;
         }
 
-        sGanondorf = this;
+        sBossGanonGanondorf = this;
         thisx->colChkInfo.health = 40;
         Actor_ProcessInitChain(thisx, sInitChain);
         ActorShape_Init(&thisx->shape, 0, NULL, 0);
@@ -381,7 +363,7 @@ void BossGanon_Init(Actor* thisx, GlobalContext* globalCtx2) {
             BossGanon_SetupTowerCutscene(this, globalCtx);
         }
 
-        sCape = (EnGanonMant*)Actor_SpawnAsChild(&globalCtx->actorCtx, thisx, globalCtx, ACTOR_EN_GANON_MANT, 0.0f,
+        sBossGanonCape = (EnGanonMant*)Actor_SpawnAsChild(&globalCtx->actorCtx, thisx, globalCtx, ACTOR_EN_GANON_MANT, 0.0f,
                                                  0.0f, 0.0f, 0, 0, 0, 1);
         Actor_ChangeCategory(globalCtx, &globalCtx->actorCtx, thisx, ACTORCAT_BOSS);
     } else {
@@ -538,10 +520,10 @@ void BossGanon_IntroCutscene(BossGanon* this, GlobalContext* globalCtx) {
 
     gSegments[6] = VIRTUAL_TO_PHYSICAL(globalCtx->objectCtx.status[this->animBankIndex].segment);
 
-    sCape->backPush = -2.0f;
-    sCape->backSwayMagnitude = 0.25f;
-    sCape->sideSwayMagnitude = -1.0f;
-    sCape->minDist = 0.0f;
+    sBossGanonCape->backPush = -2.0f;
+    sBossGanonCape->backSwayMagnitude = 0.25f;
+    sBossGanonCape->sideSwayMagnitude = -1.0f;
+    sBossGanonCape->minDist = 0.0f;
 
     this->csTimer++;
 
@@ -584,13 +566,13 @@ void BossGanon_IntroCutscene(BossGanon* this, GlobalContext* globalCtx) {
                 this->useOpenHand = true;
                 BossGanon_SetIntroCsCamera(this, 0);
                 this->csState = 1;
-                sZelda = (EnZl3*)Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_ZL3, 0.0f,
+                sBossGanonZelda = (EnZl3*)Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_ZL3, 0.0f,
                                                     220.0f, -150.0f, 0, 0, 0, 0x2000);
             }
 
             Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_GANON_ORGAN, 0.0f, 0.0f, 0.0f, 0,
                                0, 0, 1);
-            sCape->minY = 57.0f;
+            sBossGanonCape->minY = 57.0f;
             // fallthrough
         case 1:
             this->envLightMode = 3;
@@ -736,7 +718,7 @@ void BossGanon_IntroCutscene(BossGanon* this, GlobalContext* globalCtx) {
             this->csState = 9;
             this->csTimer = 0;
             func_8002DF54(globalCtx, &this->actor, 8);
-            sZelda->unk_3C8 = 0;
+            sBossGanonZelda->unk_3C8 = 0;
             this->triforceType = GDF_TRIFORCE_ZELDA;
             this->fwork[GDF_TRIFORCE_SCALE] = 10.0f;
             this->fwork[GDF_TRIFORCE_PRIM_A] = 0.0f;
@@ -755,7 +737,7 @@ void BossGanon_IntroCutscene(BossGanon* this, GlobalContext* globalCtx) {
             Math_ApproachF(&this->fwork[GDF_TRIFORCE_ENV_G], 200.0f, 1.0f, 3.0f);
 
             if (this->csTimer == 30) {
-                sZelda->unk_3C8 = 1;
+                sBossGanonZelda->unk_3C8 = 1;
             }
 
             if (this->csTimer >= 32) {
@@ -847,7 +829,7 @@ void BossGanon_IntroCutscene(BossGanon* this, GlobalContext* globalCtx) {
                 this->csTimer = 0;
                 BossGanon_SetIntroCsCamera(this, 11);
                 this->unk_198 = 2;
-                sZelda->unk_3C8 = 2;
+                sBossGanonZelda->unk_3C8 = 2;
                 this->timers[2] = 110;
                 this->envLightMode = 3;
             }
@@ -883,7 +865,7 @@ void BossGanon_IntroCutscene(BossGanon* this, GlobalContext* globalCtx) {
 
             if (this->csTimer > 10) {
                 if (this->csTimer == 62) {
-                    sCape->attachRightArmTimer = 20.0f;
+                    sBossGanonCape->attachRightArmTimer = 20.0f;
                 }
 
                 if (this->csTimer == 57) {
@@ -1076,7 +1058,7 @@ void BossGanon_IntroCutscene(BossGanon* this, GlobalContext* globalCtx) {
                 Animation_MorphToPlayOnce(&this->skelAnime, &gDorfGetUp3Anim, 0.0f);
                 SkelAnime_Update(&this->skelAnime);
                 this->actor.shape.yOffset = 0.0f;
-                sCape->attachShouldersTimer = 18.0f;
+                sBossGanonCape->attachShouldersTimer = 18.0f;
                 Audio_PlayActorSound2(&this->actor, NA_SE_EV_GANON_MANTLE);
                 this->unk_198 = 0;
                 Audio_QueueSeqCmd(SEQ_PLAYER_BGM_MAIN << 24 | NA_BGM_GANONDORF_BOSS);
@@ -1101,9 +1083,9 @@ void BossGanon_IntroCutscene(BossGanon* this, GlobalContext* globalCtx) {
                 Math_ApproachF(&this->actor.world.pos.y, 228.0f, 0.05f, 2.0f);
                 Math_ApproachF(&this->actor.world.pos.z, -230.0f, 0.05f, 4.0f);
 
-                sCape->backPush = -3.0f;
-                sCape->backSwayMagnitude = 0.25f;
-                sCape->sideSwayMagnitude = -3.0f;
+                sBossGanonCape->backPush = -3.0f;
+                sBossGanonCape->backSwayMagnitude = 0.25f;
+                sBossGanonCape->sideSwayMagnitude = -3.0f;
 
                 sin = Math_SinS(this->csTimer * 1500);
                 this->actor.velocity.y = this->fwork[GDF_FWORK_0] * sin * 0.04f;
@@ -1136,10 +1118,10 @@ void BossGanon_IntroCutscene(BossGanon* this, GlobalContext* globalCtx) {
                 BossGanon_SetupWait(this, globalCtx);
             }
 
-            if (sZelda != NULL) {
-                sZelda->actor.world.pos.x = 0.0f;
-                sZelda->actor.world.pos.y = 350.0f;
-                sZelda->actor.world.pos.z = 0.0f;
+            if (sBossGanonZelda != NULL) {
+                sBossGanonZelda->actor.world.pos.x = 0.0f;
+                sBossGanonZelda->actor.world.pos.y = 350.0f;
+                sBossGanonZelda->actor.world.pos.z = 0.0f;
             }
     }
 
@@ -1529,7 +1511,7 @@ void BossGanon_DeathAndTowerCutscene(BossGanon* this, GlobalContext* globalCtx)
             this->fwork[1] = Animation_GetLastFrame(&object_ganon_anime2_Anim_00EA00);
             this->csState = 101;
             this->skelAnime.playSpeed = 0.0f;
-            sZelda = (EnZl3*)Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_ZL3, 0.0f,
+            sBossGanonZelda = (EnZl3*)Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_ZL3, 0.0f,
                                                 6000.0f, 0.0f, 0, 0, 0, 0x2000);
 
             player->actor.world.pos.x = -472.0f;
@@ -1551,12 +1533,12 @@ void BossGanon_DeathAndTowerCutscene(BossGanon* this, GlobalContext* globalCtx)
 
             this->csCamAt.z = -100.0f;
 
-            sCape->backPush = -2.0f;
-            sCape->backSwayMagnitude = 0.25f;
-            sCape->sideSwayMagnitude = -1.0f;
-            sCape->minDist = 0.0f;
-            sCape->minY = 4104.0f;
-            sCape->tearTimer = 20;
+            sBossGanonCape->backPush = -2.0f;
+            sBossGanonCape->backSwayMagnitude = 0.25f;
+            sBossGanonCape->sideSwayMagnitude = -1.0f;
+            sBossGanonCape->minDist = 0.0f;
+            sBossGanonCape->minY = 4104.0f;
+            sBossGanonCape->tearTimer = 20;
 
             this->whiteFillAlpha = 255.0f;
             globalCtx->envCtx.unk_D8 = 1.0f;
@@ -1620,27 +1602,27 @@ void BossGanon_DeathAndTowerCutscene(BossGanon* this, GlobalContext* globalCtx)
             if (this->csTimer == 90) {
                 this->csState = 103;
                 this->csTimer = 0;
-                sZelda->actor.world.pos.x = -472.0f;
-                sZelda->actor.world.pos.y = 4352.0f;
-                sZelda->actor.world.pos.z = -200.0f;
-                sZelda->unk_3C8 = 3;
+                sBossGanonZelda->actor.world.pos.x = -472.0f;
+                sBossGanonZelda->actor.world.pos.y = 4352.0f;
+                sBossGanonZelda->actor.world.pos.z = -200.0f;
+                sBossGanonZelda->unk_3C8 = 3;
             }
             break;
 
         case 103:
-            Audio_PlayActorSound2(&sZelda->actor, NA_SE_EV_DOWN_TO_GROUND - SFX_FLAG);
-            Math_ApproachF(&sZelda->actor.world.pos.y, 4102.0f, 0.05f, 1.5f);
+            Audio_PlayActorSound2(&sBossGanonZelda->actor, NA_SE_EV_DOWN_TO_GROUND - SFX_FLAG);
+            Math_ApproachF(&sBossGanonZelda->actor.world.pos.y, 4102.0f, 0.05f, 1.5f);
 
             this->csCamEye.x = -242.0f;
             this->csCamEye.y = 4122.0f;
             this->csCamEye.z = -190.0f;
 
-            this->csCamAt.x = sZelda->actor.world.pos.x;
-            this->csCamAt.y = sZelda->actor.world.pos.y + 40.0f + 5.0f;
-            this->csCamAt.z = sZelda->actor.world.pos.z;
+            this->csCamAt.x = sBossGanonZelda->actor.world.pos.x;
+            this->csCamAt.y = sBossGanonZelda->actor.world.pos.y + 40.0f + 5.0f;
+            this->csCamAt.z = sBossGanonZelda->actor.world.pos.z;
 
             if (this->csTimer == 200) {
-                sZelda->actor.world.pos.y = 4102.0f;
+                sBossGanonZelda->actor.world.pos.y = 4102.0f;
                 this->csState = 104;
                 this->csTimer = 0;
             } else {
@@ -1652,20 +1634,20 @@ void BossGanon_DeathAndTowerCutscene(BossGanon* this, GlobalContext* globalCtx)
             this->csCamEye.y = 4147.0f;
             this->csCamEye.z = -200.0f;
 
-            this->csCamAt.x = sZelda->actor.world.pos.x;
-            this->csCamAt.y = sZelda->actor.world.pos.y + 40.0f + 5.0f;
-            this->csCamAt.z = sZelda->actor.world.pos.z;
+            this->csCamAt.x = sBossGanonZelda->actor.world.pos.x;
+            this->csCamAt.y = sBossGanonZelda->actor.world.pos.y + 40.0f + 5.0f;
+            this->csCamAt.z = sBossGanonZelda->actor.world.pos.z;
 
             if (this->csTimer >= 10) {
                 Math_ApproachZeroF(&globalCtx->envCtx.unk_D8, 1.0f, 0.05f);
             }
 
             if (this->csTimer == 10) {
-                sZelda->unk_3C8 = 8;
+                sBossGanonZelda->unk_3C8 = 8;
             }
 
             if (this->csTimer == 50) {
-                sZelda->unk_3C8 = 4;
+                sBossGanonZelda->unk_3C8 = 4;
             }
 
             if (this->csTimer == 100) {
@@ -1679,9 +1661,9 @@ void BossGanon_DeathAndTowerCutscene(BossGanon* this, GlobalContext* globalCtx)
             this->csCamEye.y = 4154.0f;
             this->csCamEye.z = -182.0f;
 
-            this->csCamAt.x = sZelda->actor.world.pos.x - 5.0f;
-            this->csCamAt.y = sZelda->actor.world.pos.y + 40.0f + 5.0f;
-            this->csCamAt.z = sZelda->actor.world.pos.z - 25.0f;
+            this->csCamAt.x = sBossGanonZelda->actor.world.pos.x - 5.0f;
+            this->csCamAt.y = sBossGanonZelda->actor.world.pos.y + 40.0f + 5.0f;
+            this->csCamAt.z = sBossGanonZelda->actor.world.pos.z - 25.0f;
 
             if (this->csTimer == 10) {
                 Message_StartTextbox(globalCtx, 0x70D0, NULL);
@@ -1698,7 +1680,7 @@ void BossGanon_DeathAndTowerCutscene(BossGanon* this, GlobalContext* globalCtx)
             func_80078884(NA_SE_EV_EARTHQUAKE - SFX_FLAG);
 
             if (this->csTimer == 20) {
-                sZelda->unk_3C8 = 5;
+                sBossGanonZelda->unk_3C8 = 5;
                 func_8002DF54(globalCtx, &this->actor, 0x39);
             }
 
@@ -1747,15 +1729,15 @@ void BossGanon_DeathAndTowerCutscene(BossGanon* this, GlobalContext* globalCtx)
             this->csCamEye.y = 4154.0f;
             this->csCamEye.z = -182.0f;
 
-            this->csCamAt.x = sZelda->actor.world.pos.x - 5.0f;
-            this->csCamAt.y = sZelda->actor.world.pos.y + 40.0f + 5.0f;
-            this->csCamAt.z = sZelda->actor.world.pos.z - 25.0f;
+            this->csCamAt.x = sBossGanonZelda->actor.world.pos.x - 5.0f;
+            this->csCamAt.y = sBossGanonZelda->actor.world.pos.y + 40.0f + 5.0f;
+            this->csCamAt.z = sBossGanonZelda->actor.world.pos.z - 25.0f;
 
             this->unk_70C = Math_SinS(this->csTimer * 0x6300) * 0.3f;
             func_80078884(NA_SE_EV_EARTHQUAKE - SFX_FLAG);
 
             if (this->csTimer == 70) {
-                sZelda->unk_3C8 = 6;
+                sBossGanonZelda->unk_3C8 = 6;
             }
 
             if (this->csTimer == 90) {
@@ -1778,12 +1760,12 @@ void BossGanon_DeathAndTowerCutscene(BossGanon* this, GlobalContext* globalCtx)
             this->csCamEye.y = 4154.0f;
             this->csCamEye.z = -242.0f;
 
-            this->csCamAt.x = (sZelda->actor.world.pos.x - 5.0f) - 30.0f;
-            this->csCamAt.y = (sZelda->actor.world.pos.y + 40.0f + 5.0f) - 20.0f;
-            this->csCamAt.z = (sZelda->actor.world.pos.z - 25.0f) + 80.0f;
+            this->csCamAt.x = (sBossGanonZelda->actor.world.pos.x - 5.0f) - 30.0f;
+            this->csCamAt.y = (sBossGanonZelda->actor.world.pos.y + 40.0f + 5.0f) - 20.0f;
+            this->csCamAt.z = (sBossGanonZelda->actor.world.pos.z - 25.0f) + 80.0f;
 
             if ((this->csTimer > 50) && (Message_GetState(&globalCtx->msgCtx) == TEXT_STATE_NONE)) {
-                sZelda->unk_3C8 = 7;
+                sBossGanonZelda->unk_3C8 = 7;
                 this->csState = 108;
                 this->csTimer = 0;
             }
@@ -1793,9 +1775,9 @@ void BossGanon_DeathAndTowerCutscene(BossGanon* this, GlobalContext* globalCtx)
             this->unk_70C = Math_SinS(this->csTimer * 0x6300) * 0.8f;
             func_80078884(NA_SE_EV_EARTHQUAKE - SFX_FLAG);
 
-            this->csCamAt.x = (sZelda->actor.world.pos.x - 5.0f) - 30.0f;
-            this->csCamAt.y = (sZelda->actor.world.pos.y + 40.0f + 5.0f) - 20.0f;
-            this->csCamAt.z = (sZelda->actor.world.pos.z - 25.0f) + 80.0f;
+            this->csCamAt.x = (sBossGanonZelda->actor.world.pos.x - 5.0f) - 30.0f;
+            this->csCamAt.y = (sBossGanonZelda->actor.world.pos.y + 40.0f + 5.0f) - 20.0f;
+            this->csCamAt.z = (sBossGanonZelda->actor.world.pos.z - 25.0f) + 80.0f;
 
             if (this->csTimer > 50) {
                 mainCam = Gameplay_GetCamera(globalCtx, MAIN_CAM);
@@ -1905,7 +1887,7 @@ void BossGanon_PoundFloor(BossGanon* this, GlobalContext* globalCtx) {
             break;
 
         case 1:
-            sCape->gravity = -1.0f;
+            sBossGanonCape->gravity = -1.0f;
             this->envLightMode = 1;
             Math_ApproachF(&this->actor.velocity.y, -50.0f, 1.0f, 10.0f);
             this->actor.world.pos.y += this->actor.velocity.y;
@@ -1952,7 +1934,7 @@ void BossGanon_PoundFloor(BossGanon* this, GlobalContext* globalCtx) {
                 this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gDorfGetUp3Anim);
                 Animation_MorphToPlayOnce(&this->skelAnime, &gDorfGetUp3Anim, 0.0f);
                 SkelAnime_Update(&this->skelAnime);
-                sCape->attachShouldersTimer = 18.0f;
+                sBossGanonCape->attachShouldersTimer = 18.0f;
                 Audio_PlayActorSound2(&this->actor, NA_SE_EV_GANON_MANTLE);
                 this->unk_1C2 = 4;
             }
@@ -2136,7 +2118,7 @@ void BossGanon_ChargeBigMagic(BossGanon* this, GlobalContext* globalCtx) {
             }
 
             if (this->timers[0] == 1) {
-                sCape->attachLeftArmTimer = 15.0f;
+                sBossGanonCape->attachLeftArmTimer = 15.0f;
                 Audio_PlayActorSound2(&this->actor, NA_SE_EV_GANON_MANTLE);
             }
 
@@ -2174,7 +2156,7 @@ void BossGanon_ChargeBigMagic(BossGanon* this, GlobalContext* globalCtx) {
             }
 
             if (Animation_OnFrame(&this->skelAnime, 3.0f)) {
-                sCape->attachShouldersTimer = 26.0f;
+                sBossGanonCape->attachShouldersTimer = 26.0f;
                 Audio_PlayActorSound2(&this->actor, NA_SE_EV_GANON_MANTLE);
             }
 
@@ -2202,7 +2184,7 @@ void BossGanon_SetupWait(BossGanon* this, GlobalContext* globalCtx) {
     this->fwork[GDF_FWORK_0] = 0.0f;
     this->timers[0] = (s16)Rand_ZeroFloat(64.0f) + 30;
     this->unk_1C2 = 0;
-    sCape->minY = 2.0f;
+    sBossGanonCape->minY = 2.0f;
 }
 
 void BossGanon_Wait(BossGanon* this, GlobalContext* globalCtx) {
@@ -2213,10 +2195,10 @@ void BossGanon_Wait(BossGanon* this, GlobalContext* globalCtx) {
 
     this->legSwayEnabled = true;
 
-    sCape->backPush = -3.0f;
-    sCape->backSwayMagnitude = 0.25f;
-    sCape->sideSwayMagnitude = -3.0f;
-    sCape->minDist = 20.0f;
+    sBossGanonCape->backPush = -3.0f;
+    sBossGanonCape->backSwayMagnitude = 0.25f;
+    sBossGanonCape->sideSwayMagnitude = -3.0f;
+    sBossGanonCape->minDist = 20.0f;
 
     SkelAnime_Update(&this->skelAnime);
 
@@ -2271,10 +2253,10 @@ void BossGanon_SetupChargeLightBall(BossGanon* this, GlobalContext* globalCtx) {
 void BossGanon_ChargeLightBall(BossGanon* this, GlobalContext* globalCtx) {
     SkelAnime_Update(&this->skelAnime);
 
-    sCape->backPush = -3.0f;
-    sCape->backSwayMagnitude = 1.25f;
-    sCape->sideSwayMagnitude = -2.0f;
-    sCape->minDist = 10.0f;
+    sBossGanonCape->backPush = -3.0f;
+    sBossGanonCape->backSwayMagnitude = 1.25f;
+    sBossGanonCape->sideSwayMagnitude = -2.0f;
+    sBossGanonCape->minDist = 10.0f;
 
     if (this->timers[0] < 17) {
         this->envLightMode = 1;
@@ -2355,7 +2337,7 @@ void BossGanon_PlayTennis(BossGanon* this, GlobalContext* globalCtx) {
                 rand = Rand_ZeroOne() * 1.99f;
                 this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(volleyAnims[rand]);
                 Animation_MorphToPlayOnce(&this->skelAnime, volleyAnims[rand], 0.0f);
-                sCape->attachRightArmTimer = capeRightArmDurations[rand];
+                sBossGanonCape->attachRightArmTimer = capeRightArmDurations[rand];
                 Audio_PlayActorSound2(&this->actor, NA_SE_EV_GANON_MANTLE);
                 this->startVolley = false;
             }
@@ -2383,7 +2365,7 @@ void BossGanon_SetupBlock(BossGanon* this, GlobalContext* globalCtx) {
     }
 
     this->unk_1C2 = 0;
-    sCape->attachLeftArmTimer = this->timers[0] = 10;
+    sBossGanonCape->attachLeftArmTimer = this->timers[0] = 10;
     Audio_PlayActorSound2(&this->actor, NA_SE_EV_GANON_MANTLE);
     this->handLightBallScale = 0.0f;
 }
@@ -2391,10 +2373,10 @@ void BossGanon_SetupBlock(BossGanon* this, GlobalContext* globalCtx) {
 void BossGanon_Block(BossGanon* this, GlobalContext* globalCtx) {
     this->collider.base.colType = 9;
     SkelAnime_Update(&this->skelAnime);
-    sCape->backPush = -9.0f;
-    sCape->backSwayMagnitude = 0.25f;
-    sCape->sideSwayMagnitude = -2.0f;
-    sCape->minDist = 13.0f;
+    sBossGanonCape->backPush = -9.0f;
+    sBossGanonCape->backSwayMagnitude = 0.25f;
+    sBossGanonCape->sideSwayMagnitude = -2.0f;
+    sBossGanonCape->minDist = 13.0f;
 
     if (this->unk_1C2 == 0) {
         if (this->timers[0] == 0) {
@@ -2402,11 +2384,11 @@ void BossGanon_Block(BossGanon* this, GlobalContext* globalCtx) {
             Animation_MorphToPlayOnce(&this->skelAnime, &gDorfBlockReleaseAnim, 0.0f);
             this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gDorfBlockReleaseAnim);
             SkelAnime_Update(&this->skelAnime);
-            sCape->attachShouldersTimer = 15.0f;
+            sBossGanonCape->attachShouldersTimer = 15.0f;
             Audio_PlayActorSound2(&this->actor, NA_SE_EV_GANON_MANTLE);
         }
     } else {
-        sCape->sideSwayMagnitude = -13.0f;
+        sBossGanonCape->sideSwayMagnitude = -13.0f;
 
         if (Animation_OnFrame(&this->skelAnime, this->fwork[GDF_FWORK_1])) {
             BossGanon_SetupWait(this, globalCtx);
@@ -2429,7 +2411,7 @@ void BossGanon_SetupHitByLightBall(BossGanon* this, GlobalContext* globalCtx) {
     this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gDorfBigMagicHitAnim);
     Animation_MorphToPlayOnce(&this->skelAnime, &gDorfBigMagicHitAnim, 0);
     this->timers[0] = 70;
-    sCape->attachRightArmTimer = sCape->attachLeftArmTimer = 0;
+    sBossGanonCape->attachRightArmTimer = sBossGanonCape->attachLeftArmTimer = 0;
 
     for (i = 1; i < 15; i++) {
         this->unk_4E4[i] = D_808E4C58[i];
@@ -2466,7 +2448,7 @@ void BossGanon_HitByLightBall(BossGanon* this, GlobalContext* globalCtx) {
             Animation_MorphToPlayOnce(&this->skelAnime, &gDorfGetUp3Anim, 0.0f);
             this->unk_1C2 = 2;
             SkelAnime_Update(&this->skelAnime);
-            sCape->attachShouldersTimer = 18.0f;
+            sBossGanonCape->attachShouldersTimer = 18.0f;
             Audio_PlayActorSound2(&this->actor, NA_SE_EV_GANON_MANTLE);
             Audio_PlayActorSound2(&this->actor, NA_SE_EN_GANON_RESTORE);
             this->timers[2] = 130;
@@ -2500,7 +2482,7 @@ void BossGanon_SetupVulnerable(BossGanon* this, GlobalContext* globalCtx) {
         BossGanon_SetAnimationObject(this, globalCtx, OBJECT_GANON_ANIME1);
         this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gDorfLightArrowHitAnim);
         Animation_MorphToPlayOnce(&this->skelAnime, &gDorfLightArrowHitAnim, 0.0f);
-        sCape->attachRightArmTimer = sCape->attachLeftArmTimer = 0;
+        sBossGanonCape->attachRightArmTimer = sBossGanonCape->attachLeftArmTimer = 0;
         this->actionFunc = BossGanon_Vulnerable;
 
         this->actor.velocity.x = 0.0f;
@@ -2508,10 +2490,10 @@ void BossGanon_SetupVulnerable(BossGanon* this, GlobalContext* globalCtx) {
         this->actor.velocity.z = 0.0f;
 
         this->unk_1C2 = 0;
-        sCape->backPush = -4.0f;
-        sCape->backSwayMagnitude = 0.75f;
-        sCape->sideSwayMagnitude = -3.0f;
-        sCape->minDist = 20.0f;
+        sBossGanonCape->backPush = -4.0f;
+        sBossGanonCape->backSwayMagnitude = 0.75f;
+        sBossGanonCape->sideSwayMagnitude = -3.0f;
+        sBossGanonCape->minDist = 20.0f;
 
         for (i = 0; i < 10; i++) {
             Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_BOSS_GANON, this->unk_1FC.x,
@@ -2571,7 +2553,7 @@ void BossGanon_Vulnerable(BossGanon* this, GlobalContext* globalCtx) {
             break;
 
         case 2:
-            sCape->minDist = 0.0f;
+            sBossGanonCape->minDist = 0.0f;
             this->actor.velocity.y = this->actor.velocity.y - 0.5f;
 
             if (this->actor.world.pos.y < 40.0f) {
@@ -2625,7 +2607,7 @@ void BossGanon_Vulnerable(BossGanon* this, GlobalContext* globalCtx) {
                 this->unk_1C2 = 6;
                 this->fwork[GDF_FWORK_1] = Animation_GetLastFrame(&gDorfGetUp2Anim);
                 Animation_MorphToPlayOnce(&this->skelAnime, &gDorfGetUp2Anim, 0.0f);
-                sCape->minDist = 20.0f;
+                sBossGanonCape->minDist = 20.0f;
                 this->unk_19F = 1;
             }
             break;
@@ -2646,7 +2628,7 @@ void BossGanon_Vulnerable(BossGanon* this, GlobalContext* globalCtx) {
             Animation_MorphToPlayOnce(&this->skelAnime, &gDorfGetUp3Anim, 0.0f);
             this->unk_1C2 = 8;
             SkelAnime_Update(&this->skelAnime);
-            sCape->attachShouldersTimer = 18.0f;
+            sBossGanonCape->attachShouldersTimer = 18.0f;
             Audio_PlayActorSound2(&this->actor, NA_SE_EV_GANON_MANTLE);
             Audio_PlayActorSound2(&this->actor, NA_SE_EN_GANON_RESTORE);
             break;
@@ -2743,10 +2725,10 @@ void BossGanon_UpdateDamage(BossGanon* this, GlobalContext* globalCtx) {
                     this->actor.colChkInfo.health -= damage;
                 }
 
-                for (i = 0; i < ARRAY_COUNT(sCape->strands); i++) {
+                for (i = 0; i < ARRAY_COUNT(sBossGanonCape->strands); i++) {
                     for (j = 1; j < 12; j++) {
-                        sCape->strands[i].velocities[j].x = Rand_CenteredFloat(15.0f);
-                        sCape->strands[i].velocities[j].z = Rand_CenteredFloat(15.0f);
+                        sBossGanonCape->strands[i].velocities[j].x = Rand_CenteredFloat(15.0f);
+                        sBossGanonCape->strands[i].velocities[j].z = Rand_CenteredFloat(15.0f);
                     }
                 }
 
@@ -2762,16 +2744,16 @@ void BossGanon_UpdateDamage(BossGanon* this, GlobalContext* globalCtx) {
                     Audio_PlayActorSound2(&this->actor, NA_SE_EN_GANON_CUTBODY);
                     BossGanon_SetupDamaged(this, globalCtx);
                     this->unk_1A6 = 15;
-                    sCape->tearTimer = 1;
+                    sBossGanonCape->tearTimer = 1;
                 }
             }
         } else if (acHitInfo->toucher.dmgFlags & 0x1F8A4) {
             Audio_PlayActorSound2(&this->actor, 0);
 
-            for (i = 0; i < ARRAY_COUNT(sCape->strands); i++) {
+            for (i = 0; i < ARRAY_COUNT(sBossGanonCape->strands); i++) {
                 for (j = 1; j < 12; j++) {
-                    sCape->strands[i].velocities[j].x = Rand_CenteredFloat(15.0f);
-                    sCape->strands[i].velocities[j].z = Rand_CenteredFloat(15.0f);
+                    sBossGanonCape->strands[i].velocities[j].x = Rand_CenteredFloat(15.0f);
+                    sBossGanonCape->strands[i].velocities[j].z = Rand_CenteredFloat(15.0f);
                 }
             }
         }
@@ -2841,7 +2823,7 @@ void BossGanon_Update(Actor* thisx, GlobalContext* globalCtx2) {
     }
 
     this->collider.base.colType = 3;
-    sCape->gravity = -3.0f;
+    sBossGanonCape->gravity = -3.0f;
     this->shockGlow = false;
     this->actor.flags &= ~ACTOR_FLAG_0;
     this->unk_1A2++;
@@ -3334,20 +3316,20 @@ void BossGanon_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList
 }
 
 void BossGanon_InitRand(s32 seedInit0, s32 seedInit1, s32 seedInit2) {
-    sSeed1 = seedInit0;
-    sSeed2 = seedInit1;
-    sSeed3 = seedInit2;
+    sBossGanonSeed1 = seedInit0;
+    sBossGanonSeed2 = seedInit1;
+    sBossGanonSeed3 = seedInit2;
 }
 
 f32 BossGanon_RandZeroOne(void) {
     // Wichmann-Hill algorithm
     f32 randFloat;
 
-    sSeed1 = (sSeed1 * 171) % 30269;
-    sSeed2 = (sSeed2 * 172) % 30307;
-    sSeed3 = (sSeed3 * 170) % 30323;
+    sBossGanonSeed1 = (sBossGanonSeed1 * 171) % 30269;
+    sBossGanonSeed2 = (sBossGanonSeed2 * 172) % 30307;
+    sBossGanonSeed3 = (sBossGanonSeed3 * 170) % 30323;
 
-    randFloat = (sSeed1 / 30269.0f) + (sSeed2 / 30307.0f) + (sSeed3 / 30323.0f);
+    randFloat = (sBossGanonSeed1 / 30269.0f) + (sBossGanonSeed2 / 30307.0f) + (sBossGanonSeed3 / 30323.0f);
 
     while (randFloat >= 1.0f) {
         randFloat -= 1.0f;
@@ -3559,7 +3541,7 @@ void BossGanon_DrawTriforce(BossGanon* this, GlobalContext* globalCtx) {
             this->triforcePos.y += 3.0f;
             this->triforcePos.z += -2.0f;
         } else if (this->triforceType == GDF_TRIFORCE_ZELDA) {
-            this->triforcePos = sZelda->unk_31C;
+            this->triforcePos = sBossGanonZelda->unk_31C;
 
             this->triforcePos.y += 1.8f;
             this->triforcePos.z += 4.0f;
@@ -3734,9 +3716,9 @@ void BossGanon_GenShadowTexture(u8* tex, BossGanon* this, GlobalContext* globalC
 
     for (i = 0; i < 12; i++) {
         for (j = 0; j < 12; j++) {
-            sp7C.x = sCape->strands[i].joints[j].x - this->actor.world.pos.x;
-            sp7C.y = sCape->strands[i].joints[j].y - this->actor.world.pos.y + 76.0f + 100.0f + 30.0f;
-            sp7C.z = sCape->strands[i].joints[j].z - this->actor.world.pos.z;
+            sp7C.x = sBossGanonCape->strands[i].joints[j].x - this->actor.world.pos.x;
+            sp7C.y = sBossGanonCape->strands[i].joints[j].y - this->actor.world.pos.y + 76.0f + 100.0f + 30.0f;
+            sp7C.z = sBossGanonCape->strands[i].joints[j].z - this->actor.world.pos.z;
 
             Matrix_MultVec3f(&sp7C, &sp70);
 
@@ -3746,7 +3728,7 @@ void BossGanon_GenShadowTexture(u8* tex, BossGanon* this, GlobalContext* globalC
             baseX = (s32)(sp70.x + 32.0f);
             baseY = (s16)sp70.y * 0x40;
 
-            if (!sCape->strands[i].torn[j]) {
+            if (!sBossGanonCape->strands[i].torn[j]) {
                 for (y = -1, addY = -0x40; y <= 1; y++, addY += 0x40) {
                     for (x = -3; x <= 3; x++) {
                         index = baseX + x + baseY + addY;
@@ -3827,13 +3809,13 @@ void BossGanon_Draw(Actor* thisx, GlobalContext* globalCtx) {
 
     BossGanon_DrawEffects(globalCtx);
 
-    sCape->actor.world.pos = this->actor.world.pos;
+    sBossGanonCape->actor.world.pos = this->actor.world.pos;
 
-    sCape->rightForearmPos = this->unk_214;
-    sCape->leftForearmPos = this->unk_220;
+    sBossGanonCape->rightForearmPos = this->unk_214;
+    sBossGanonCape->leftForearmPos = this->unk_220;
 
-    sCape->rightShoulderPos = this->unk_22C;
-    sCape->leftShoulderPos = this->unk_238;
+    sBossGanonCape->rightShoulderPos = this->unk_22C;
+    sBossGanonCape->leftShoulderPos = this->unk_238;
 
     BossGanon_DrawShock(this, globalCtx);
     BossGanon_DrawHandLightBall(this, globalCtx);
@@ -4628,7 +4610,7 @@ void BossGanon_UpdateEffects(GlobalContext* globalCtx) {
     spA0.x = 0.0f;
     spA0.y = 0.0f;
 
-    for (i = 0; i < ARRAY_COUNT(sEffectBuf); i++, eff++) {
+    for (i = 0; i < ARRAY_COUNT(sBossGanonEffectBuf); i++, eff++) {
         if (eff->type != GDF_EFF_NONE) {
             eff->pos.x += eff->velocity.x;
             eff->pos.y += eff->velocity.y;
@@ -4662,9 +4644,9 @@ void BossGanon_UpdateEffects(GlobalContext* globalCtx) {
                     eff->alpha = 255;
                 }
             } else if (eff->type == GDF_EFF_BLACK_DOT) {
-                xDiff = sGanondorf->unk_278.x - eff->pos.x;
-                yDiff = sGanondorf->unk_278.y - eff->pos.y;
-                zDiff = sGanondorf->unk_278.z - eff->pos.z;
+                xDiff = sBossGanonGanondorf->unk_278.x - eff->pos.x;
+                yDiff = sBossGanonGanondorf->unk_278.y - eff->pos.y;
+                zDiff = sBossGanonGanondorf->unk_278.z - eff->pos.z;
 
                 yRot = Math_FAtan2F(xDiff, zDiff);
 
@@ -4704,9 +4686,9 @@ void BossGanon_UpdateEffects(GlobalContext* globalCtx) {
                 if (eff->unk_2E == GDF_SHOCK_DORF_YELLOW) {
                     bodyPart = (s16)Rand_ZeroFloat(13.9f) + 1;
 
-                    eff->pos.x = sGanondorf->unk_2EC[bodyPart].x + Rand_CenteredFloat(20.0f);
-                    eff->pos.y = sGanondorf->unk_2EC[bodyPart].y + Rand_CenteredFloat(20.0f);
-                    eff->pos.z = sGanondorf->unk_2EC[bodyPart].z + Rand_CenteredFloat(20.0f);
+                    eff->pos.x = sBossGanonGanondorf->unk_2EC[bodyPart].x + Rand_CenteredFloat(20.0f);
+                    eff->pos.y = sBossGanonGanondorf->unk_2EC[bodyPart].y + Rand_CenteredFloat(20.0f);
+                    eff->pos.z = sBossGanonGanondorf->unk_2EC[bodyPart].z + Rand_CenteredFloat(20.0f);
                 } else {
                     bodyPart = (s16)Rand_ZeroFloat(17.9f);
 
@@ -4799,7 +4781,7 @@ void BossGanon_UpdateEffects(GlobalContext* globalCtx) {
 
                     if (((eff->scale * 150.0f) < distToPlayer) && (distToPlayer < (eff->scale * 300.0f))) {
                         eff->timer = 150;
-                        func_8002F6D4(globalCtx, &sGanondorf->actor, 7.0f, sGanondorf->actor.yawTowardsPlayer, 0.0f,
+                        func_8002F6D4(globalCtx, &sBossGanonGanondorf->actor, 7.0f, sBossGanonGanondorf->actor.yawTowardsPlayer, 0.0f,
                                       0x20);
                     }
                 }
@@ -4940,7 +4922,7 @@ void BossGanon_DrawEffects(GlobalContext* globalCtx) {
                             255);
             gDPSetEnvColor(POLY_XLU_DISP++, sLightningEnvColors[(eff->timer * 3) + 0],
                            sLightningEnvColors[(eff->timer * 3) + 1], sLightningEnvColors[(eff->timer * 3) + 2], 0);
-            Matrix_Translate(sGanondorf->unk_260.x, sGanondorf->unk_260.y, sGanondorf->unk_260.z, MTXMODE_NEW);
+            Matrix_Translate(sBossGanonGanondorf->unk_260.x, sBossGanonGanondorf->unk_260.y, sBossGanonGanondorf->unk_260.z, MTXMODE_NEW);
             Matrix_RotateY(eff->unk_48, MTXMODE_APPLY);
             Matrix_RotateZ(eff->unk_3C, MTXMODE_APPLY);
             Matrix_Scale(eff->scale, eff->scale, eff->scale, MTXMODE_APPLY);
@@ -5032,16 +5014,11 @@ void BossGanon_DrawEffects(GlobalContext* globalCtx) {
 #include "overlays/ovl_Boss_Ganon/ovl_Boss_Ganon.h"
 
 void BossGanon_Reset(void) {
-
-static EnGanonMant* sCape;
-
-    sSeed1 = 0;
-    sSeed2 = 0;
-    sSeed3 = 0;
-    sGanondorf = NULL;
-    sZelda = NULL;
-    sCape = NULL;
-
-
-    memset(sEffectBuf, 0, sizeof(sEffectBuf));
-}
+    sBossGanonSeed1 = 0;
+    sBossGanonSeed2 = 0;
+    sBossGanonSeed3 = 0;
+    sBossGanonGanondorf = NULL;
+    sBossGanonZelda = NULL;
+    sBossGanonCape = NULL;
+    memset(sBossGanonEffectBuf, 0, sizeof(sBossGanonEffectBuf));
+}
\ No newline at end of file
diff --git a/soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.h b/soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.h
index a3e3e503e..69a983717 100644
--- a/soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.h
+++ b/soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.h
@@ -53,6 +53,24 @@ typedef enum {
     /* 2 */ GDF_TRIFORCE_DORF
 } GanondorfTriforceType;
 
+typedef struct {
+    /* 0x00 */ u8 type;
+    /* 0x01 */ u8 timer;
+    /* 0x04 */ Vec3f pos;
+    /* 0x10 */ Vec3f velocity;
+    /* 0x1C */ Vec3f accel;
+    /* 0x28 */ Color_RGB8 color;
+    /* 0x2C */ s16 alpha;
+    /* 0x2E */ s16 unk_2E;
+    /* 0x30 */ s16 unk_30;
+    /* 0x34 */ f32 scale;
+    /* 0x38 */ f32 unk_38; // scale target mostly, but used for other things
+    /* 0x3C */ f32 unk_3C; // mostly z rot
+    /* 0x40 */ f32 unk_40;
+    /* 0x44 */ f32 unk_44; // mostly x rot
+    /* 0x48 */ f32 unk_48; // mostly y rot
+} GanondorfEffect;         // size = 0x4C
+
 typedef struct BossGanon {
     /* 0x0000 */ Actor actor;
     /* 0x014C */ s32 animBankIndex;
diff --git a/soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c b/soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c
index 21fd1a149..b946054b8 100644
--- a/soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c
+++ b/soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c
@@ -49,21 +49,40 @@ const ActorInit Boss_Ganon2_InitVars = {
 
 #include "z_boss_ganon2_data.c"
 
+Vec3f D_8090EB20;
+
+EnZl3* sBossGanon2Zelda;
+
+Actor* D_8090EB30;
+
+BossGanon2Effect sBossGanon2Particles[100];
+
+s32 sBossGanon2Seed1;
+s32 sBossGanon2Seed2;
+s32 sBossGanon2Seed3;
+
+Vec3f D_809105D8[4];
+
+Vec3f D_80910608[4];
+
+s8 D_80910638;
+
+
 void BossGanon2_InitRand(s32 seedInit0, s32 seedInit1, s32 seedInit2) {
-    sSeed1 = seedInit0;
-    sSeed2 = seedInit1;
-    sSeed3 = seedInit2;
+    sBossGanon2Seed1 = seedInit0;
+    sBossGanon2Seed2 = seedInit1;
+    sBossGanon2Seed3 = seedInit2;
 }
 
 f32 BossGanon2_RandZeroOne(void) {
     // Wichmann-Hill algorithm
     f32 randFloat;
 
-    sSeed1 = (sSeed1 * 171) % 30269;
-    sSeed2 = (sSeed2 * 172) % 30307;
-    sSeed3 = (sSeed3 * 170) % 30323;
+    sBossGanon2Seed1 = (sBossGanon2Seed1 * 171) % 30269;
+    sBossGanon2Seed2 = (sBossGanon2Seed2 * 172) % 30307;
+    sBossGanon2Seed3 = (sBossGanon2Seed3 * 170) % 30323;
 
-    randFloat = (sSeed1 / 30269.0f) + (sSeed2 / 30307.0f) + (sSeed3 / 30323.0f);
+    randFloat = (sBossGanon2Seed1 / 30269.0f) + (sBossGanon2Seed2 / 30307.0f) + (sBossGanon2Seed3 / 30323.0f);
     while (randFloat >= 1.0f) {
         randFloat -= 1.0f;
     }
@@ -114,7 +133,7 @@ void func_808FD27C(GlobalContext* globalCtx, Vec3f* position, Vec3f* velocity, f
     BossGanon2Effect* effect = globalCtx->specialEffects;
     s16 i;
 
-    for (i = 0; i < ARRAY_COUNT(sParticles); i++, effect++) {
+    for (i = 0; i < ARRAY_COUNT(sBossGanon2Particles); i++, effect++) {
         if (effect->type == 0) {
             effect->type = 2;
             effect->position = *position;
@@ -136,10 +155,10 @@ void BossGanon2_Init(Actor* thisx, GlobalContext* globalCtx) {
     s32 pad;
     s16 i;
 
-    globalCtx->specialEffects = sParticles;
+    globalCtx->specialEffects = sBossGanon2Particles;
 
-    for (i = 0; i < ARRAY_COUNT(sParticles); i++) {
-        sParticles[i].type = 0;
+    for (i = 0; i < ARRAY_COUNT(sBossGanon2Particles); i++) {
+        sBossGanon2Particles[i].type = 0;
     }
 
     this->actor.colChkInfo.mass = MASS_IMMOVABLE;
@@ -204,13 +223,13 @@ void func_808FD5F4(BossGanon2* this, GlobalContext* globalCtx) {
                 Gameplay_ChangeCameraStatus(globalCtx, MAIN_CAM, CAM_STAT_WAIT);
                 Gameplay_ChangeCameraStatus(globalCtx, this->unk_39E, CAM_STAT_ACTIVE);
                 this->unk_39C = 1;
-                sZelda = (EnZl3*)Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_ZL3, 970.0f,
+                sBossGanon2Zelda = (EnZl3*)Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_ZL3, 970.0f,
                                                     1086.0f, -200.0f, 0, 0, 0, 1);
-                sZelda->unk_3C8 = 0;
-                sZelda->actor.world.pos.x = 970.0f;
-                sZelda->actor.world.pos.y = 1086.0f;
-                sZelda->actor.world.pos.z = -214.0f;
-                sZelda->actor.shape.rot.y = -0x7000;
+                sBossGanon2Zelda->unk_3C8 = 0;
+                sBossGanon2Zelda->actor.world.pos.x = 970.0f;
+                sBossGanon2Zelda->actor.world.pos.y = 1086.0f;
+                sBossGanon2Zelda->actor.world.pos.z = -214.0f;
+                sBossGanon2Zelda->actor.shape.rot.y = -0x7000;
                 this->unk_3BC.x = 0.0f;
                 this->unk_3BC.y = 1.0f;
                 this->unk_3BC.z = 0.0f;
@@ -258,20 +277,20 @@ void func_808FD5F4(BossGanon2* this, GlobalContext* globalCtx) {
             player->actor.world.pos.x = 970.0f;
             player->actor.world.pos.y = 1086.0f;
             player->actor.world.pos.z = -166.0f;
-            sZelda->actor.world.pos.x = 974.0f;
-            sZelda->actor.world.pos.y = 1086.0f;
-            sZelda->actor.world.pos.z = -186.0f;
+            sBossGanon2Zelda->actor.world.pos.x = 974.0f;
+            sBossGanon2Zelda->actor.world.pos.y = 1086.0f;
+            sBossGanon2Zelda->actor.world.pos.z = -186.0f;
             player->actor.shape.rot.y = -0x5000;
-            sZelda->actor.shape.rot.y = -0x5000;
+            sBossGanon2Zelda->actor.shape.rot.y = -0x5000;
             if (this->unk_398 == 60) {
                 Message_StartTextbox(globalCtx, 0x70D4, NULL);
             }
             if (this->unk_398 == 40) {
-                sZelda->unk_3C8 = 1;
+                sBossGanon2Zelda->unk_3C8 = 1;
                 func_8002DF54(globalCtx, &this->actor, 0x4E);
             }
             if (this->unk_398 == 85) {
-                sZelda->unk_3C8 = 2;
+                sBossGanon2Zelda->unk_3C8 = 2;
                 func_8002DF54(globalCtx, &this->actor, 0x4F);
             }
             this->unk_3A4.x = 930.0f;
@@ -300,14 +319,14 @@ void func_808FD5F4(BossGanon2* this, GlobalContext* globalCtx) {
                 Audio_QueueSeqCmd(SEQ_PLAYER_BGM_MAIN << 24 | NA_BGM_STOP);
             }
             if (this->unk_398 == 20) {
-                sZelda->unk_3C8 = 3;
+                sBossGanon2Zelda->unk_3C8 = 3;
                 func_8002DF54(globalCtx, &this->actor, 0x50);
             }
             if (this->unk_398 == 55) {
                 this->unk_39C = 4;
                 this->unk_398 = 0;
                 this->unk_410.x = 0.0f;
-                sZelda->unk_3C8 = 4;
+                sBossGanon2Zelda->unk_3C8 = 4;
                 func_8002DF54(globalCtx, &this->actor, 0x50);
             }
             break;
@@ -347,11 +366,11 @@ void func_808FD5F4(BossGanon2* this, GlobalContext* globalCtx) {
             player->actor.world.pos.x = 490.0f;
             player->actor.world.pos.y = 1086.0f;
             player->actor.world.pos.z = -166.0f;
-            sZelda->actor.world.pos.x = 724.0f;
-            sZelda->actor.world.pos.y = 1086.0f;
-            sZelda->actor.world.pos.z = -186.0f;
+            sBossGanon2Zelda->actor.world.pos.x = 724.0f;
+            sBossGanon2Zelda->actor.world.pos.y = 1086.0f;
+            sBossGanon2Zelda->actor.world.pos.z = -186.0f;
             player->actor.shape.rot.y = -0x4000;
-            sZelda->actor.shape.rot.y = -0x5000;
+            sBossGanon2Zelda->actor.shape.rot.y = -0x5000;
             this->unk_3A4.x = 410.0f;
             this->unk_3A4.y = 1096.0f;
             this->unk_3A4.z = -110.0f;
@@ -370,7 +389,7 @@ void func_808FD5F4(BossGanon2* this, GlobalContext* globalCtx) {
                 this->unk_339 = 4;
             }
             if (this->unk_398 == 30) {
-                sZelda->unk_3C8 = 5;
+                sBossGanon2Zelda->unk_3C8 = 5;
                 func_8002DF54(globalCtx, &this->actor, 0x51);
             }
             if (this->unk_398 == 50) {
@@ -384,11 +403,11 @@ void func_808FD5F4(BossGanon2* this, GlobalContext* globalCtx) {
             player->actor.world.pos.x = 490.0f;
             player->actor.world.pos.y = 1086.0f;
             player->actor.world.pos.z = -166.0f;
-            sZelda->actor.world.pos.x = 724.0f;
-            sZelda->actor.world.pos.y = 1086.0f;
-            sZelda->actor.world.pos.z = -186.0f;
+            sBossGanon2Zelda->actor.world.pos.x = 724.0f;
+            sBossGanon2Zelda->actor.world.pos.y = 1086.0f;
+            sBossGanon2Zelda->actor.world.pos.z = -186.0f;
             player->actor.shape.rot.y = -0x4000;
-            sZelda->actor.shape.rot.y = -0x5000;
+            sBossGanon2Zelda->actor.shape.rot.y = -0x5000;
             this->unk_3A4.x = 450.0f;
             this->unk_3A4.y = 1121.0f;
             this->unk_3A4.z = -158.0f;
@@ -457,9 +476,9 @@ void func_808FD5F4(BossGanon2* this, GlobalContext* globalCtx) {
             player->actor.world.pos.y = 1086.0f;
             player->actor.world.pos.z = -266.0f;
             player->actor.shape.rot.y = -0x4000;
-            sZelda->actor.world.pos.x = 724.0f;
-            sZelda->actor.world.pos.y = 1086.0f;
-            sZelda->actor.world.pos.z = -186.0f;
+            sBossGanon2Zelda->actor.world.pos.x = 724.0f;
+            sBossGanon2Zelda->actor.world.pos.y = 1086.0f;
+            sBossGanon2Zelda->actor.world.pos.z = -186.0f;
             this->unk_3A4.x = this->actor.world.pos.x + -10.0f;
             this->unk_3A4.y = this->actor.world.pos.y + 80.0f;
             this->unk_3A4.z = this->actor.world.pos.z + 50.0f;
@@ -770,9 +789,9 @@ void func_808FD5F4(BossGanon2* this, GlobalContext* globalCtx) {
                 BossGanon2Effect* effect = globalCtx->specialEffects;
 
                 effect->unk_2E = 1;
-                effect->position.x = sZelda->actor.world.pos.x + 50.0f + 10.0f;
-                effect->position.y = sZelda->actor.world.pos.y + 350.0f;
-                effect->position.z = sZelda->actor.world.pos.z - 25.0f;
+                effect->position.x = sBossGanon2Zelda->actor.world.pos.x + 50.0f + 10.0f;
+                effect->position.y = sBossGanon2Zelda->actor.world.pos.y + 350.0f;
+                effect->position.z = sBossGanon2Zelda->actor.world.pos.z - 25.0f;
                 effect->velocity.x = 0.0f;
                 effect->velocity.z = 0.0f;
                 effect->velocity.y = -30.0f;
@@ -782,15 +801,15 @@ void func_808FD5F4(BossGanon2* this, GlobalContext* globalCtx) {
                 break;
             }
         case 26:
-            this->unk_3A4.x = sZelda->actor.world.pos.x + 100.0f + 30.0f;
-            this->unk_3A4.y = sZelda->actor.world.pos.y + 10.0f;
-            this->unk_3A4.z = sZelda->actor.world.pos.z + 5.0f;
-            this->unk_3B0.x = sZelda->actor.world.pos.x;
-            this->unk_3B0.y = sZelda->actor.world.pos.y + 30.0f;
-            this->unk_3B0.z = sZelda->actor.world.pos.z - 20.0f;
+            this->unk_3A4.x = sBossGanon2Zelda->actor.world.pos.x + 100.0f + 30.0f;
+            this->unk_3A4.y = sBossGanon2Zelda->actor.world.pos.y + 10.0f;
+            this->unk_3A4.z = sBossGanon2Zelda->actor.world.pos.z + 5.0f;
+            this->unk_3B0.x = sBossGanon2Zelda->actor.world.pos.x;
+            this->unk_3B0.y = sBossGanon2Zelda->actor.world.pos.y + 30.0f;
+            this->unk_3B0.z = sBossGanon2Zelda->actor.world.pos.z - 20.0f;
             this->unk_3BC.z = -0.5f;
             if (this->unk_398 == 13) {
-                sZelda->unk_3C8 = 6;
+                sBossGanon2Zelda->unk_3C8 = 6;
             }
             if (this->unk_398 == 50) {
                 this->unk_39C = 27;
@@ -879,7 +898,7 @@ void func_808FD5F4(BossGanon2* this, GlobalContext* globalCtx) {
                 func_808FFDB0(this, globalCtx);
                 this->unk_1A2[1] = 50;
                 this->actor.flags |= ACTOR_FLAG_0;
-                sZelda->unk_3C8 = 7;
+                sBossGanon2Zelda->unk_3C8 = 7;
             }
             break;
     }
@@ -1323,12 +1342,12 @@ void func_80900890(BossGanon2* this, GlobalContext* globalCtx) {
             break;
         case 2:
             this->unk_1A2[0] = 300;
-            this->unk_3A4.x = sZelda->actor.world.pos.x - 100.0f;
-            this->unk_3A4.y = sZelda->actor.world.pos.y + 30.0f;
-            this->unk_3A4.z = (sZelda->actor.world.pos.z + 30.0f) - 60.0f;
-            this->unk_3B0.x = sZelda->actor.world.pos.x;
-            this->unk_3B0.y = sZelda->actor.world.pos.y + 30.0f;
-            this->unk_3B0.z = sZelda->actor.world.pos.z - 10.0f;
+            this->unk_3A4.x = sBossGanon2Zelda->actor.world.pos.x - 100.0f;
+            this->unk_3A4.y = sBossGanon2Zelda->actor.world.pos.y + 30.0f;
+            this->unk_3A4.z = (sBossGanon2Zelda->actor.world.pos.z + 30.0f) - 60.0f;
+            this->unk_3B0.x = sBossGanon2Zelda->actor.world.pos.x;
+            this->unk_3B0.y = sBossGanon2Zelda->actor.world.pos.y + 30.0f;
+            this->unk_3B0.z = sBossGanon2Zelda->actor.world.pos.z - 10.0f;
             Math_ApproachZeroF(&this->unk_324, 1.0f, 5.0f);
             Math_ApproachF(&globalCtx->envCtx.unk_D8, 1.0f, 1.0f, 1.0f / 51);
             if (this->unk_1A2[1] == 80) {
@@ -1356,8 +1375,8 @@ void func_80900890(BossGanon2* this, GlobalContext* globalCtx) {
             func_8002DF54(globalCtx, &this->actor, 0x60);
             this->unk_398 = 0;
         case 11:
-            player->actor.world.pos.x = sZelda->actor.world.pos.x + 50.0f + 10.0f;
-            player->actor.world.pos.z = sZelda->actor.world.pos.z - 25.0f;
+            player->actor.world.pos.x = sBossGanon2Zelda->actor.world.pos.x + 50.0f + 10.0f;
+            player->actor.world.pos.z = sBossGanon2Zelda->actor.world.pos.z - 25.0f;
             player->actor.shape.rot.y = -0x8000;
             this->unk_3A4.x = (player->actor.world.pos.x + 100.0f) - 80.0f;
             this->unk_3A4.y = (player->actor.world.pos.y + 60.0f) - 40.0f;
@@ -1482,7 +1501,7 @@ void func_8090120C(BossGanon2* this, GlobalContext* globalCtx) {
             func_8002DF54(globalCtx, &this->actor, 8);
             this->unk_39C = 1;
             this->unk_398 = 0;
-            sZelda->unk_3C8 = 9;
+            sBossGanon2Zelda->unk_3C8 = 9;
             this->unk_31C = 0;
             this->unk_1A2[2] = 0;
             this->unk_336 = 0;
@@ -1522,9 +1541,9 @@ void func_8090120C(BossGanon2* this, GlobalContext* globalCtx) {
             player->actor.shape.rot.y = -0x4000;
             player->actor.world.pos.x = 200.0f;
             player->actor.world.pos.z = 30.0f;
-            sZelda->actor.world.pos.x = 340.0f;
-            sZelda->actor.world.pos.z = -250.0f;
-            sZelda->actor.world.rot.y = sZelda->actor.shape.rot.y = -0x2000;
+            sBossGanon2Zelda->actor.world.pos.x = 340.0f;
+            sBossGanon2Zelda->actor.world.pos.z = -250.0f;
+            sBossGanon2Zelda->actor.world.rot.y = sBossGanon2Zelda->actor.shape.rot.y = -0x2000;
             this->unk_3A4.x = 250;
             this->unk_3A4.y = 1150.0f;
             this->unk_3A4.z = 0.0f;
@@ -1543,9 +1562,9 @@ void func_8090120C(BossGanon2* this, GlobalContext* globalCtx) {
             this->unk_3A4.x = 250;
             this->unk_3A4.y = 1150.0f;
             this->unk_3A4.z = 0.0f;
-            Math_ApproachF(&this->unk_3B0.x, sZelda->actor.world.pos.x, 0.2f, 20.0f);
-            Math_ApproachF(&this->unk_3B0.y, sZelda->actor.world.pos.y + 50.0f, 0.2f, 10.0f);
-            Math_ApproachF(&this->unk_3B0.z, sZelda->actor.world.pos.z, 0.2f, 20.0f);
+            Math_ApproachF(&this->unk_3B0.x, sBossGanon2Zelda->actor.world.pos.x, 0.2f, 20.0f);
+            Math_ApproachF(&this->unk_3B0.y, sBossGanon2Zelda->actor.world.pos.y + 50.0f, 0.2f, 10.0f);
+            Math_ApproachF(&this->unk_3B0.z, sBossGanon2Zelda->actor.world.pos.z, 0.2f, 20.0f);
             if (this->unk_398 == 50) {
                 this->unk_39C = 3;
                 this->unk_398 = 0;
@@ -1557,9 +1576,9 @@ void func_8090120C(BossGanon2* this, GlobalContext* globalCtx) {
             this->unk_3A4.x = 330.0f;
             this->unk_3A4.y = 1120.0f;
             this->unk_3A4.z = -150.0f;
-            this->unk_3B0.x = sZelda->actor.world.pos.x;
-            this->unk_3B0.y = sZelda->actor.world.pos.y + 40.0f;
-            this->unk_3B0.z = sZelda->actor.world.pos.z;
+            this->unk_3B0.x = sBossGanon2Zelda->actor.world.pos.x;
+            this->unk_3B0.y = sBossGanon2Zelda->actor.world.pos.y + 40.0f;
+            this->unk_3B0.z = sBossGanon2Zelda->actor.world.pos.z;
             if (this->unk_398 == 10) {
                 Message_StartTextbox(globalCtx, 0x70D8, NULL);
             }
@@ -1572,7 +1591,7 @@ void func_8090120C(BossGanon2* this, GlobalContext* globalCtx) {
             if (this->unk_398 > 10) {
                 Math_ApproachZeroF(&this->unk_37C, 1.0f, 10.0f);
                 if (this->unk_398 == 30) {
-                    sZelda->unk_3C8 = 10;
+                    sBossGanon2Zelda->unk_3C8 = 10;
                 }
                 this->unk_339 = 23;
                 Math_ApproachZeroF(&globalCtx->envCtx.unk_D8, 1.0f, 0.05f);
@@ -1743,7 +1762,7 @@ void func_8090120C(BossGanon2* this, GlobalContext* globalCtx) {
             if (this->unk_398 == 40) {
                 this->unk_39C = 9;
                 this->unk_398 = 0;
-                sZelda->unk_3C8 = 11;
+                sBossGanon2Zelda->unk_3C8 = 11;
                 Message_StartTextbox(globalCtx, 0x70D9, NULL);
                 this->unk_336 = 0;
                 globalCtx->envCtx.unk_D8 = 0.0f;
@@ -1754,9 +1773,9 @@ void func_8090120C(BossGanon2* this, GlobalContext* globalCtx) {
             this->unk_3A4.x = 330.0f;
             this->unk_3A4.y = 1120.0f;
             this->unk_3A4.z = -150.0f;
-            this->unk_3B0.x = sZelda->actor.world.pos.x;
-            this->unk_3B0.y = sZelda->actor.world.pos.y + 40.0f;
-            this->unk_3B0.z = sZelda->actor.world.pos.z;
+            this->unk_3B0.x = sBossGanon2Zelda->actor.world.pos.x;
+            this->unk_3B0.y = sBossGanon2Zelda->actor.world.pos.y + 40.0f;
+            this->unk_3B0.z = sBossGanon2Zelda->actor.world.pos.z;
             if (this->unk_398 > 60) {
                 this->unk_39C = 10;
                 this->unk_398 = 0;
@@ -1771,26 +1790,26 @@ void func_8090120C(BossGanon2* this, GlobalContext* globalCtx) {
             if ((this->unk_398 >= 40) && (this->unk_398 <= 110)) {
                 Math_ApproachF(&globalCtx->envCtx.unk_D8, 1.0f, 1.0f, 0.02f);
                 Math_ApproachF(&this->unk_384, 10.0f, 0.1f, 0.2f);
-                Audio_PlayActorSound2(&sZelda->actor, NA_SE_EV_GOD_LIGHTBALL_2 - SFX_FLAG);
+                Audio_PlayActorSound2(&sBossGanon2Zelda->actor, NA_SE_EV_GOD_LIGHTBALL_2 - SFX_FLAG);
             } else {
                 Math_ApproachZeroF(&this->unk_384, 1.0f, 0.2f);
             }
             if (this->unk_398 > 130) {
-                Math_ApproachF(&this->unk_3B0.y, (sZelda->actor.world.pos.y + 40.0f + 10.0f) - 20.0f, 0.1f,
+                Math_ApproachF(&this->unk_3B0.y, (sBossGanon2Zelda->actor.world.pos.y + 40.0f + 10.0f) - 20.0f, 0.1f,
                                this->unk_410.x);
             } else {
-                Math_ApproachF(&this->unk_3B0.y, sZelda->actor.world.pos.y + 40.0f + 10.0f, 0.05f,
+                Math_ApproachF(&this->unk_3B0.y, sBossGanon2Zelda->actor.world.pos.y + 40.0f + 10.0f, 0.05f,
                                this->unk_410.x * 0.25f);
             }
             Math_ApproachF(&this->unk_410.x, 1.0f, 1.0f, 0.01f);
             if (this->unk_398 == 10) {
-                sZelda->unk_3C8 = 12;
+                sBossGanon2Zelda->unk_3C8 = 12;
             }
             if (this->unk_398 == 110) {
-                sZelda->unk_3C8 = 13;
+                sBossGanon2Zelda->unk_3C8 = 13;
             }
             if (this->unk_398 == 140) {
-                Audio_PlayActorSound2(&sZelda->actor, NA_SE_EV_HUMAN_BOUND);
+                Audio_PlayActorSound2(&sBossGanon2Zelda->actor, NA_SE_EV_HUMAN_BOUND);
             }
             if (this->unk_398 < 160) {
                 break;
@@ -1845,7 +1864,7 @@ void func_80902348(BossGanon2* this, GlobalContext* globalCtx) {
                 }
 
                 func_8002F6D4(globalCtx, &this->actor, 15.0f, this->actor.yawTowardsPlayer + phi_v0_2, 2.0f, 0);
-                sZelda->unk_3C8 = 8;
+                sBossGanon2Zelda->unk_3C8 = 8;
                 this->unk_316 = 10;
                 break;
             }
@@ -1864,7 +1883,7 @@ void func_80902348(BossGanon2* this, GlobalContext* globalCtx) {
 
             player->isBurning = true;
             func_8002F6D4(globalCtx, &this->actor, 10.0f, Math_Atan2S(temp_f12, temp_f2), 0.0f, 0x10);
-            sZelda->unk_3C8 = 8;
+            sBossGanon2Zelda->unk_3C8 = 8;
         }
     }
 }
@@ -2168,7 +2187,7 @@ void BossGanon2_Update(Actor* thisx, GlobalContext* globalCtx) {
     if (D_80906D78 != 0) {
         D_80906D78 = 0;
 
-        for (i2 = 0; i2 < ARRAY_COUNT(sParticles); i2++) {
+        for (i2 = 0; i2 < ARRAY_COUNT(sBossGanon2Particles); i2++) {
             angle = Rand_ZeroFloat(2 * M_PI);
             sp44 = Rand_ZeroFloat(40.0f) + 10.0f;
             sp58 = this->actor.world.pos;
@@ -2641,7 +2660,7 @@ void func_80904FC8(BossGanon2* this, GlobalContext* globalCtx) {
         gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 200);
         gDPSetEnvColor(POLY_XLU_DISP++, 255, 200, 0, 0);
         gSPDisplayList(POLY_XLU_DISP++, ovl_Boss_Ganon2_DL_00B308);
-        Matrix_Translate(sZelda->actor.world.pos.x, sZelda->actor.world.pos.y + 80.0f, sZelda->actor.world.pos.z,
+        Matrix_Translate(sBossGanon2Zelda->actor.world.pos.x, sBossGanon2Zelda->actor.world.pos.y + 80.0f, sBossGanon2Zelda->actor.world.pos.z,
                          MTXMODE_NEW);
         Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
         Matrix_Scale(this->unk_384, this->unk_384, this->unk_384, MTXMODE_APPLY);
@@ -2728,8 +2747,8 @@ void func_80905674(BossGanon2* this, GlobalContext* globalCtx) {
                                     this->unk_19C * -8, 32, 32));
         gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 170, (s16)this->unk_37C);
         gDPSetEnvColor(POLY_XLU_DISP++, 255, 200, 0, 128);
-        Matrix_Translate(sZelda->actor.world.pos.x + 100.0f, sZelda->actor.world.pos.y + 35.0f + 7.0f,
-                         sZelda->actor.world.pos.z - 100.0f, MTXMODE_NEW);
+        Matrix_Translate(sBossGanon2Zelda->actor.world.pos.x + 100.0f, sBossGanon2Zelda->actor.world.pos.y + 35.0f + 7.0f,
+                         sBossGanon2Zelda->actor.world.pos.z - 100.0f, MTXMODE_NEW);
         Matrix_RotateY(-M_PI / 4.0f, MTXMODE_APPLY);
         Matrix_Scale(0.040000003f, 0.040000003f, this->unk_380, MTXMODE_APPLY);
         Matrix_RotateX(M_PI / 2.0f, MTXMODE_APPLY);
@@ -2826,7 +2845,7 @@ void func_80905DA8(BossGanon2* this, GlobalContext* globalCtx) {
     Vec3f sp78;
     s16 i;
 
-    for (i = 0; i < ARRAY_COUNT(sParticles); i++, effect++) {
+    for (i = 0; i < ARRAY_COUNT(sBossGanon2Particles); i++, effect++) {
         if (effect->type != 0) {
             effect->position.x += effect->velocity.x;
             effect->position.y += effect->velocity.y;
@@ -2934,7 +2953,7 @@ void func_809060E8(GlobalContext* globalCtx) {
 
     effect = effects;
 
-    for (i = 0; i < ARRAY_COUNT(sParticles); i++, effect++) {
+    for (i = 0; i < ARRAY_COUNT(sBossGanon2Particles); i++, effect++) {
         if (effect->type == 2) {
             if (!usingObjectGEff) {
                 BossGanon2_SetObjectSegment(NULL, globalCtx, OBJECT_GEFF, true);
@@ -3080,12 +3099,12 @@ void BossGanon2_Reset(void) {
     D_8090EB20.y = 0;
     D_8090EB20.z = 0;
     D_80910638 = 0;
-    sZelda = NULL;
+    sBossGanon2Zelda = NULL;
     D_8090EB30 = NULL;
-    sSeed1 = 0;
-    sSeed2 = 0;
-    sSeed3 = 0;
+    sBossGanon2Seed1 = 0;
+    sBossGanon2Seed2 = 0;
+    sBossGanon2Seed3 = 0;
     memset(D_809105D8, 0, sizeof(D_809105D8));
     memset(D_80910608, 0, sizeof(D_80910608));
-    memset(sParticles, 0, sizeof(sParticles));
-}
+    memset(sBossGanon2Particles, 0, sizeof(sBossGanon2Particles));
+}
\ No newline at end of file
diff --git a/soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.h b/soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.h
index 3d2625231..6271f5c14 100644
--- a/soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.h
+++ b/soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.h
@@ -4,6 +4,20 @@
 #include "ultra64.h"
 #include "global.h"
 
+
+typedef struct {
+    /* 0x00 */ u8 type;
+    /* 0x01 */ u8 unk_01;
+    /* 0x04 */ Vec3f position;
+    /* 0x10 */ Vec3f velocity;
+    /* 0x1C */ Vec3f accel;
+    /* 0x28 */ char unk_28[0x6];
+    /* 0x2E */ s16 unk_2E;
+    /* 0x30 */ char unk_30[0x4];
+    /* 0x34 */ f32 scale;
+    /* 0x38 */ Vec3f unk_38;
+} BossGanon2Effect; // size = 0x44
+
 struct BossGanon2;
 
 typedef void (*BossGanon2ActionFunc)(struct BossGanon2*, GlobalContext*);
diff --git a/soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2_data.c b/soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2_data.c
index 47201ed0d..e19b36bd6 100644
--- a/soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2_data.c
+++ b/soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2_data.c
@@ -2,19 +2,6 @@
 #include "overlays/actors/ovl_En_Zl3/z_en_zl3.h"
 #include "objects/object_ganon2/object_ganon2.h"
 
-typedef struct {
-    /* 0x00 */ u8 type;
-    /* 0x01 */ u8 unk_01;
-    /* 0x04 */ Vec3f position;
-    /* 0x10 */ Vec3f velocity;
-    /* 0x1C */ Vec3f accel;
-    /* 0x28 */ char unk_28[0x6];
-    /* 0x2E */ s16 unk_2E;
-    /* 0x30 */ char unk_30[0x4];
-    /* 0x34 */ f32 scale;
-    /* 0x38 */ Vec3f unk_38;
-} BossGanon2Effect; // size = 0x44
-
 static Vec3f D_80906D60 = { 0.0f, 0.0f, 0.0f };
 
 static Vec3f D_80906D6C = { 0.0f, 0.0f, 500.0f };
@@ -326,31 +313,7 @@ static s16 D_809071CC[] = { 1, -1, 1, 1, 3, 4, 1, 6, 7, 2, 9, 10, 2, 12, 13 };
 
 static u8 D_809071EC[] = { 3, 2, 2, 1, 3, 3, 1, 3, 3, 1, 0, 3, 1, 0, 3 };
 
-// padding
-static u32 D_809071FC[2] = { 0 };
-
 #include "overlays/ovl_Boss_Ganon2/ovl_Boss_Ganon2.h"
 
-static Vec3f D_8090EB20;
-
-static EnZl3* sZelda;
-
-static Actor* D_8090EB30;
-
-// unused
-static UNK_TYPE D_8090EB34;
-
-static BossGanon2Effect sParticles[100];
-
-static s32 sSeed1;
-static s32 sSeed2;
-static s32 sSeed3;
-
-// unused
-static UNK_TYPE D_809105DC;
-
-static Vec3f D_809105D8[4];
-
-static Vec3f D_80910608[4];
-
-static s8 D_80910638;
+// padding
+//static u32 D_809071FC[2] = { 0 };
diff --git a/soh/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c b/soh/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c
index c6d8a8032..ec4899a28 100644
--- a/soh/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c
+++ b/soh/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c
@@ -144,25 +144,25 @@ static f32 sFlatWidth[41] = {
 #include "z_boss_mo_colchk.c"
 
 static BossMoEffect sEffects[300];
-static s32 sSeed1;
-static s32 sSeed2;
-static s32 sSeed3;
+static s32 sBossGanonSeed1;
+static s32 sBossGanonSeed2;
+static s32 sBossGanonSeed3;
 
 void BossMo_InitRand(s32 seedInit0, s32 seedInit1, s32 seedInit2) {
-    sSeed1 = seedInit0;
-    sSeed2 = seedInit1;
-    sSeed3 = seedInit2;
+    sBossGanonSeed1 = seedInit0;
+    sBossGanonSeed2 = seedInit1;
+    sBossGanonSeed3 = seedInit2;
 }
 
 f32 BossMo_RandZeroOne(void) {
     // Wichmann-Hill algorithm
     f32 randFloat;
 
-    sSeed1 = (sSeed1 * 171) % 30269;
-    sSeed2 = (sSeed2 * 172) % 30307;
-    sSeed3 = (sSeed3 * 170) % 30323;
+    sBossGanonSeed1 = (sBossGanonSeed1 * 171) % 30269;
+    sBossGanonSeed2 = (sBossGanonSeed2 * 172) % 30307;
+    sBossGanonSeed3 = (sBossGanonSeed3 * 170) % 30323;
 
-    randFloat = (sSeed1 / 30269.0f) + (sSeed2 / 30307.0f) + (sSeed3 / 30323.0f);
+    randFloat = (sBossGanonSeed1 / 30269.0f) + (sBossGanonSeed2 / 30307.0f) + (sBossGanonSeed3 / 30323.0f);
     while (randFloat >= 1.0f) {
         randFloat -= 1.0f;
     }
@@ -3588,7 +3588,7 @@ void BossMo_Reset(void) {
     sMorphaTent1 = NULL;
     sMorphaTent2 = NULL;
     memset(sEffects, 0, sizeof(sEffects));
-    sSeed1 = 0;
-    sSeed2 = 0;
-    sSeed3 = 0;
-}
+    sBossGanonSeed1 = 0;
+    sBossGanonSeed2 = 0;
+    sBossGanonSeed3 = 0;
+}
\ No newline at end of file
diff --git a/soh/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c b/soh/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c
index 6b31635b9..3c8fa9d91 100644
--- a/soh/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c
+++ b/soh/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c
@@ -7,34 +7,6 @@
 
 #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_4 | ACTOR_FLAG_5)
 
-typedef enum {
-    /*  0 */ TWEFF_NONE,
-    /*  1 */ TWEFF_DOT,
-    /*  2 */ TWEFF_2,
-    /*  3 */ TWEFF_3,
-    /*  4 */ TWEFF_RING,
-    /*  5 */ TWEFF_PLYR_FRZ,
-    /*  6 */ TWEFF_FLAME,
-    /*  7 */ TWEFF_MERGEFLAME,
-    /*  8 */ TWEFF_SHLD_BLST,
-    /*  9 */ TWEFF_SHLD_DEFL,
-    /* 10 */ TWEFF_SHLD_HIT
-} TwEffType;
-
-typedef enum {
-    /* 0 */ EFF_ARGS,
-    /* 1 */ EFF_UNKS1,
-    /* 2 */ EFF_WORK_MAX
-} EffectWork;
-
-typedef enum {
-    /* 0 */ EFF_SCALE,
-    /* 1 */ EFF_DIST,
-    /* 2 */ EFF_ROLL,
-    /* 3 */ EFF_YAW,
-    /* 4 */ EFF_FWORK_MAX
-} EffectFWork;
-
 typedef enum {
     /* 0x00 */ TW_KOTAKE,
     /* 0x01 */ TW_KOUME,
@@ -47,19 +19,6 @@ typedef enum {
     /* 0x69 */ TW_DEATHBALL_KOUME
 } TwinrovaType;
 
-typedef struct {
-    /* 0x0000 */ u8 type;
-    /* 0x0001 */ u8 frame;
-    /* 0x0004 */ Vec3f pos;
-    /* 0x0010 */ Vec3f curSpeed;
-    /* 0x001C */ Vec3f accel;
-    /* 0x0028 */ Color_RGB8 color;
-    /* 0x002C */ s16 alpha;
-    /* 0x002E */ s16 work[EFF_WORK_MAX];
-    /* 0x0034 */ f32 workf[EFF_FWORK_MAX];
-    /* 0x0044 */ Actor* target;
-} BossTwEffect;
-
 void BossTw_Init(Actor* thisx, GlobalContext* globalCtx);
 void BossTw_Destroy(Actor* thisx, GlobalContext* globalCtx);
 void BossTw_Update(Actor* thisx, GlobalContext* globalCtx);
@@ -200,7 +159,7 @@ static Vec3f sTwinrovaPillarPos[] = {
     { 0.0f, 380.0f, -580.0f },
 };
 
-static u8 sTwInitalized = false;
+u8 sTwInitalized = false;
 
 static InitChainEntry sInitChain[] = {
     ICHAIN_U8(targetMode, 5, ICHAIN_CONTINUE),
@@ -233,7 +192,7 @@ static u8 D_8094C878;
 static s16 D_8094C87A;
 static s16 D_8094C87C;
 static u8 D_8094C87E;
-static BossTwEffect sTwEffects[150];
+BossTwEffect sTwEffects[150];
 
 void BossTw_AddDotEffect(GlobalContext* globalCtx, Vec3f* initalPos, Vec3f* initalSpeed, Vec3f* accel, f32 scale,
                          s16 args, s16 countLimit) {
diff --git a/soh/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.h b/soh/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.h
index 575997c26..51b664726 100644
--- a/soh/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.h
+++ b/soh/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.h
@@ -4,9 +4,46 @@
 #include "ultra64.h"
 #include "global.h"
 
-struct BossTw;
+typedef enum {
+    /*  0 */ TWEFF_NONE,
+    /*  1 */ TWEFF_DOT,
+    /*  2 */ TWEFF_2,
+    /*  3 */ TWEFF_3,
+    /*  4 */ TWEFF_RING,
+    /*  5 */ TWEFF_PLYR_FRZ,
+    /*  6 */ TWEFF_FLAME,
+    /*  7 */ TWEFF_MERGEFLAME,
+    /*  8 */ TWEFF_SHLD_BLST,
+    /*  9 */ TWEFF_SHLD_DEFL,
+    /* 10 */ TWEFF_SHLD_HIT
+} TwEffType;
 
-typedef void (*BossTwActionFunc)(struct BossTw* this, GlobalContext* globalCtx);
+typedef enum {
+    /* 0 */ EFF_ARGS,
+    /* 1 */ EFF_UNKS1,
+    /* 2 */ EFF_WORK_MAX
+} EffectWork;
+
+typedef enum {
+    /* 0 */ EFF_SCALE,
+    /* 1 */ EFF_DIST,
+    /* 2 */ EFF_ROLL,
+    /* 3 */ EFF_YAW,
+    /* 4 */ EFF_FWORK_MAX
+} EffectFWork;
+
+typedef struct {
+    /* 0x0000 */ u8 type;
+    /* 0x0001 */ u8 frame;
+    /* 0x0004 */ Vec3f pos;
+    /* 0x0010 */ Vec3f curSpeed;
+    /* 0x001C */ Vec3f accel;
+    /* 0x0028 */ Color_RGB8 color;
+    /* 0x002C */ s16 alpha;
+    /* 0x002E */ s16 work[EFF_WORK_MAX];
+    /* 0x0034 */ f32 workf[EFF_FWORK_MAX];
+    /* 0x0044 */ Actor* target;
+} BossTwEffect;
 
 typedef enum {
     /*  0 */ CS_TIMER_1,
@@ -55,6 +92,10 @@ typedef enum {
     /* 26 */ FWORK_MAX
 } TwFwork;
 
+struct BossTw;
+
+typedef void (*BossTwActionFunc)(struct BossTw*, GlobalContext* globalCtx);
+
 typedef struct BossTw {
     /* 0x0000 */ Actor actor;
     /* 0x014C */ BossTwActionFunc actionFunc;
diff --git a/soh/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c b/soh/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c
index 4f75a03cd..acff25c75 100644
--- a/soh/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c
+++ b/soh/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c
@@ -307,7 +307,7 @@ void func_8096712C(Demo6K* this, GlobalContext* globalCtx) {
     }
 }
 
-static Vec3f velocity = { 0.0f, 0.0f, 0.0f };
+Vec3f sDemo6kVelocity = { 0.0f, 0.0f, 0.0f };
 void func_80967244(Demo6K* this, GlobalContext* globalCtx) {
     static Vec3f accel = { 0.0f, 0.0f, 0.0f };
     static Color_RGBA8 primColor = { 255, 255, 255, 0 };
@@ -324,9 +324,9 @@ void func_80967244(Demo6K* this, GlobalContext* globalCtx) {
     rand1 = Rand_ZeroFloat(0xFFFF);
     rand2 = Rand_ZeroFloat(0xFFFF);
 
-    velocity.x = Math_SinS(rand2) * Math_CosS(rand1) * 20.0f;
-    velocity.z = Math_CosS(rand2) * Math_CosS(rand1) * 20.0f;
-    velocity.y = Math_SinS(rand1) * 20.0f;
+    sDemo6kVelocity.x = Math_SinS(rand2) * Math_CosS(rand1) * 20.0f;
+    sDemo6kVelocity.z = Math_CosS(rand2) * Math_CosS(rand1) * 20.0f;
+    sDemo6kVelocity.y = Math_SinS(rand1) * 20.0f;
 
     accel.y = 0.0f;
 
@@ -342,7 +342,7 @@ void func_80967244(Demo6K* this, GlobalContext* globalCtx) {
         scale = 18000;
     }
 
-    EffectSsKiraKira_SpawnFocused(globalCtx, &pos, &velocity, &accel, &primColor, &envColor, scale, 20);
+    EffectSsKiraKira_SpawnFocused(globalCtx, &pos, &sDemo6kVelocity, &accel, &primColor, &envColor, scale, 20);
 }
 
 void func_80967410(Demo6K* this, GlobalContext* globalCtx) {
@@ -820,7 +820,7 @@ void func_809691BC(Demo6K* this, GlobalContext* globalCtx, s32 params) {
 }
 
 void Demo6K_Reset(void) {
-    velocity.x = 0.0f;
-    velocity.y = 0.0f;
-    velocity.z = 0.0f;
+    sDemo6kVelocity.x = 0.0f;
+    sDemo6kVelocity.y = 0.0f;
+    sDemo6kVelocity.z = 0.0f;
 }
\ No newline at end of file
diff --git a/soh/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c b/soh/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c
index a94fa36af..53044464c 100644
--- a/soh/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c
+++ b/soh/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c
@@ -132,7 +132,7 @@ void DemoKekkai_Destroy(Actor* thisx, GlobalContext* globalCtx) {
     Collider_DestroyCylinder(globalCtx, &this->collider2);
 }
 
-static Vec3f vel = { 0.0f, 0.0f, 0.0f };
+Vec3f demoKekkaiVel = { 0.0f, 0.0f, 0.0f };
 void DemoKekkai_SpawnParticles(DemoKekkai* this, GlobalContext* globalCtx) {
     static Vec3f accel = { 0.0f, 0.0f, 0.0f };
     static Color_RGBA8 lightYellow = { 255, 255, 170, 0 };
@@ -144,15 +144,15 @@ void DemoKekkai_SpawnParticles(DemoKekkai* this, GlobalContext* globalCtx) {
         s16 roll = Rand_ZeroFloat(65535.0f);
         s16 yaw = Rand_ZeroFloat(65535.0f);
 
-        vel.x = Math_SinS(yaw) * Math_CosS(roll) * Rand_ZeroFloat(8.0f);
-        vel.z = Math_CosS(yaw) * Math_CosS(roll) * Rand_ZeroFloat(8.0f);
-        vel.y = Math_SinS(roll) * Rand_ZeroFloat(3.0f);
+        demoKekkaiVel.x = Math_SinS(yaw) * Math_CosS(roll) * Rand_ZeroFloat(8.0f);
+        demoKekkaiVel.z = Math_CosS(yaw) * Math_CosS(roll) * Rand_ZeroFloat(8.0f);
+        demoKekkaiVel.y = Math_SinS(roll) * Rand_ZeroFloat(3.0f);
 
-        pos.x = (vel.x * 7.0f) + this->actor.world.pos.x;
-        pos.y = (vel.y * 20.0f) + this->actor.world.pos.y + 120.0f;
-        pos.z = (vel.z * 7.0f) + this->actor.world.pos.z;
+        pos.x = (demoKekkaiVel.x * 7.0f) + this->actor.world.pos.x;
+        pos.y = (demoKekkaiVel.y * 20.0f) + this->actor.world.pos.y + 120.0f;
+        pos.z = (demoKekkaiVel.z * 7.0f) + this->actor.world.pos.z;
 
-        EffectSsKiraKira_SpawnFocused(globalCtx, &pos, &vel, &accel, &lightYellow, &darkRed, 3000,
+        EffectSsKiraKira_SpawnFocused(globalCtx, &pos, &demoKekkaiVel, &accel, &lightYellow, &darkRed, 3000,
                                       (s32)Rand_ZeroFloat(40.0f) + 45);
     }
 }
@@ -338,7 +338,7 @@ void DemoKekkai_DrawTowerBarrier(Actor* thisx, GlobalContext* globalCtx) {
 }
 
 void DemoKekkai_Reset(void) {
-    vel.x = 0.0f;
-    vel.y = 0.0f;
-    vel.z = 0.0f;
+    demoKekkaiVel.x = 0.0f;
+    demoKekkaiVel.y = 0.0f;
+    demoKekkaiVel.z = 0.0f;
 }
\ No newline at end of file
diff --git a/soh/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c b/soh/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c
index 46f3d1857..ee503dd43 100644
--- a/soh/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c
+++ b/soh/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c
@@ -53,7 +53,7 @@ static InitChainEntry sInitChain[] = {
     ICHAIN_F32(uncullZoneDownward, 4000, ICHAIN_STOP),
 };
 
-static s16 sWarpTimerTarget;
+s16 sWarpTimerTarget;
 
 void DoorWarp1_SetupAction(DoorWarp1* this, DoorWarp1ActionFunc actionFunc) {
     this->actionFunc = actionFunc;
diff --git a/soh/src/overlays/actors/ovl_En_Bw/z_en_bw.c b/soh/src/overlays/actors/ovl_En_Bw/z_en_bw.c
index 14e9ff15c..6eaa2f777 100644
--- a/soh/src/overlays/actors/ovl_En_Bw/z_en_bw.c
+++ b/soh/src/overlays/actors/ovl_En_Bw/z_en_bw.c
@@ -122,7 +122,7 @@ static DamageTable sDamageTable = {
     /* Unknown 2     */ DMG_ENTRY(0, 0x0),
 };
 
-static s32 sSlugGroup = 0;
+s32 sSlugGroup = 0;
 
 void EnBw_SetupAction(EnBw* this, EnBwActionFunc actionFunc) {
     this->actionFunc = actionFunc;
diff --git a/soh/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c b/soh/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c
index e68eaabb1..274505978 100644
--- a/soh/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c
+++ b/soh/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c
@@ -35,7 +35,7 @@ const ActorInit En_Clear_Tag_InitVars = {
     (ActorResetFunc)EnClearTag_Reset,
 };
 
-static u8 sIsEffectsInitialized = false;
+u8 sClearTagIsEffectsInitialized = false;
 
 static Vec3f sZeroVector = { 0.0f, 0.0f, 0.0f };
 
@@ -79,10 +79,10 @@ static ColliderCylinderInit sLaserCylinderInit = {
     { 15, 30, 10, { 0, 0, 0 } },
 };
 
-static UNK_TYPE4 D_809D5C98 = 0; // unused
-static UNK_TYPE4 D_809D5C9C = 0; // unused
+//static UNK_TYPE4 D_809D5C98 = 0; // unused
+//static UNK_TYPE4 D_809D5C9C = 0; // unused
 
-static EnClearTagEffect sClearTagEffects[CLEAR_TAG_EFFECT_MAX_COUNT];
+EnClearTagEffect sClearTagEffects[CLEAR_TAG_EFFECT_MAX_COUNT];
 
 #include "overlays/ovl_En_Clear_Tag/ovl_En_Clear_Tag.h"
 
@@ -273,8 +273,8 @@ void EnClearTag_Init(Actor* thisx, GlobalContext* globalCtx) {
         }
 
         // Initialize all effects to available if effects have not been initialized.
-        if (!sIsEffectsInitialized) {
-            sIsEffectsInitialized = true;
+        if (!sClearTagIsEffectsInitialized) {
+            sClearTagIsEffectsInitialized = true;
             globalCtx->specialEffects = &sClearTagEffects[0];
             for (i = 0; i < CLEAR_TAG_EFFECT_MAX_COUNT; i++) {
                 sClearTagEffects[i].type = CLEAR_TAG_EFFECT_AVAILABLE;
@@ -1027,5 +1027,5 @@ void EnClearTag_DrawEffects(GlobalContext* globalCtx) {
 
 void EnClearTag_Reset(void) {
     memset(sClearTagEffects, 0, sizeof(sClearTagEffects));
-    sIsEffectsInitialized = false;
+    sClearTagIsEffectsInitialized = false;
 }
\ No newline at end of file
diff --git a/soh/src/overlays/actors/ovl_En_Fr/z_en_fr.c b/soh/src/overlays/actors/ovl_En_Fr/z_en_fr.c
index 38c86eda3..c84a22fb8 100644
--- a/soh/src/overlays/actors/ovl_En_Fr/z_en_fr.c
+++ b/soh/src/overlays/actors/ovl_En_Fr/z_en_fr.c
@@ -84,18 +84,7 @@ sEnFrPointers.flags = 12
      - Deactivate frogs, frogs will jump back into the water
 */
 
-typedef struct {
-    u8 flags;
-    EnFr* frogs[5];
-} EnFrPointers;
-
-typedef struct {
-    f32 xzDist;
-    f32 yaw;
-    f32 yDist;
-} LogSpotToFromWater;
-
-static EnFrPointers sEnFrPointers = {
+EnFrPointers sEnFrPointers = {
     0x00,
     {
         NULL,
@@ -106,6 +95,7 @@ static EnFrPointers sEnFrPointers = {
     },
 };
 
+
 // Flags for gSaveContext.eventChkInf[13]
 static u16 sSongIndex[] = {
     0x0002, 0x0004, 0x0010, 0x0008, 0x0020, 0x0040, 0x0001, 0x0000,
diff --git a/soh/src/overlays/actors/ovl_En_Fr/z_en_fr.h b/soh/src/overlays/actors/ovl_En_Fr/z_en_fr.h
index ba2ef5014..154aefc17 100644
--- a/soh/src/overlays/actors/ovl_En_Fr/z_en_fr.h
+++ b/soh/src/overlays/actors/ovl_En_Fr/z_en_fr.h
@@ -28,6 +28,12 @@ typedef enum {
     /* 07 */ FROG_NO_SONG
 } FrogSongType;
 
+typedef struct {
+    f32 xzDist;
+    f32 yaw;
+    f32 yDist;
+} LogSpotToFromWater;
+
 typedef struct EnFr {
     /* 0x0000 */ Actor actor;
     /* 0x014C */ SkelAnime skelAnime;   // Frog Skeleton
@@ -69,4 +75,9 @@ typedef struct EnFr {
     /* 0x03B8 */ Vec3f posButterflyLight; // Used in Lights_PointNoGlowSetInfo()
 } EnFr; // size = 0x03C4
 
+typedef struct {
+    u8 flags;
+    EnFr* frogs[5];
+} EnFrPointers;
+
 #endif
diff --git a/soh/src/overlays/actors/ovl_En_Goma/z_en_goma.c b/soh/src/overlays/actors/ovl_En_Goma/z_en_goma.c
index 85049b7f1..a9997c383 100644
--- a/soh/src/overlays/actors/ovl_En_Goma/z_en_goma.c
+++ b/soh/src/overlays/actors/ovl_En_Goma/z_en_goma.c
@@ -96,7 +96,7 @@ static ColliderCylinderInit D_80A4B7CC = {
     { 15, 30, 10, { 0, 0, 0 } },
 };
 
-static u8 sSpawnNum = 0;
+u8 sSpawnNum = 0;
 static Vec3f sDeadEffectVel = { 0.0f, 0.0f, 0.0f };
 
 static InitChainEntry sInitChain[] = {
diff --git a/soh/src/overlays/actors/ovl_En_Insect/z_en_insect.c b/soh/src/overlays/actors/ovl_En_Insect/z_en_insect.c
index 649c1b747..bd529ea55 100644
--- a/soh/src/overlays/actors/ovl_En_Insect/z_en_insect.c
+++ b/soh/src/overlays/actors/ovl_En_Insect/z_en_insect.c
@@ -32,9 +32,9 @@ void func_80A7D26C(EnInsect* this, GlobalContext* globalCtx);
 void func_80A7D39C(EnInsect* this);
 void func_80A7D460(EnInsect* this, GlobalContext* globalCtx);
 
-static f32 D_80A7DEB0 = 0.0f;
-static s16 D_80A7DEB4 = 0;
-static s16 D_80A7DEB8 = 0;
+f32 D_80A7DEB0 = 0.0f;
+s16 D_80A7DEB4 = 0;
+s16 D_80A7DEB8 = 0;
 
 const ActorInit En_Insect_InitVars = {
     ACTOR_EN_INSECT,
diff --git a/soh/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c b/soh/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c
index 4ce8fae20..11573dba0 100644
--- a/soh/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c
+++ b/soh/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c
@@ -29,8 +29,8 @@ void EnIshi_SpawnFragmentsLarge(EnIshi* this, GlobalContext* globalCtx);
 void EnIshi_SpawnDustSmall(EnIshi* this, GlobalContext* globalCtx);
 void EnIshi_SpawnDustLarge(EnIshi* this, GlobalContext* globalCtx);
 
-static s16 sRotSpeedX = 0;
-static s16 sRotSpeedY = 0;
+s16 sRockRotSpeedX = 0;
+s16 sRockRotSpeedY = 0;
 
 const ActorInit En_Ishi_InitVars = {
     ACTOR_EN_ISHI,
@@ -405,11 +405,11 @@ void EnIshi_SetupFly(EnIshi* this) {
     this->actor.velocity.x = Math_SinS(this->actor.world.rot.y) * this->actor.speedXZ;
     this->actor.velocity.z = Math_CosS(this->actor.world.rot.y) * this->actor.speedXZ;
     if ((this->actor.params & 1) == ROCK_SMALL) {
-        sRotSpeedX = (Rand_ZeroOne() - 0.5f) * 16000.0f;
-        sRotSpeedY = (Rand_ZeroOne() - 0.5f) * 2400.0f;
+        sRockRotSpeedX = (Rand_ZeroOne() - 0.5f) * 16000.0f;
+        sRockRotSpeedY = (Rand_ZeroOne() - 0.5f) * 2400.0f;
     } else {
-        sRotSpeedX = (Rand_ZeroOne() - 0.5f) * 8000.0f;
-        sRotSpeedY = (Rand_ZeroOne() - 0.5f) * 1600.0f;
+        sRockRotSpeedX = (Rand_ZeroOne() - 0.5f) * 8000.0f;
+        sRockRotSpeedY = (Rand_ZeroOne() - 0.5f) * 1600.0f;
     }
     this->actor.colChkInfo.mass = 240;
     this->actionFunc = EnIshi_Fly;
@@ -455,8 +455,8 @@ void EnIshi_Fly(EnIshi* this, GlobalContext* globalCtx) {
             EffectSsGRipple_Spawn(globalCtx, &contactPos, 500, 1300, 8);
         }
         this->actor.minVelocityY = -6.0f;
-        sRotSpeedX >>= 2;
-        sRotSpeedY >>= 2;
+        sRockRotSpeedX >>= 2;
+        sRockRotSpeedY >>= 2;
         SoundSource_PlaySfxAtFixedWorldPos(globalCtx, &this->actor.world.pos, 40, NA_SE_EV_DIVE_INTO_WATER_L);
         this->actor.bgCheckFlags &= ~0x40;
     }
@@ -464,8 +464,8 @@ void EnIshi_Fly(EnIshi* this, GlobalContext* globalCtx) {
     EnIshi_Fall(this);
     func_80A7ED94(&this->actor.velocity, D_80A7FA28[type]);
     func_8002D7EC(&this->actor);
-    this->actor.shape.rot.x += sRotSpeedX;
-    this->actor.shape.rot.y += sRotSpeedY;
+    this->actor.shape.rot.x += sRockRotSpeedX;
+    this->actor.shape.rot.y += sRockRotSpeedY;
     Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 7.5f, 35.0f, 0.0f, 0xC5);
     Collider_UpdateCylinder(&this->actor, &this->collider);
     CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
@@ -502,6 +502,6 @@ void EnIshi_Draw(Actor* thisx, GlobalContext* globalCtx) {
 }
 
 void EnIshi_Reset(void) {
-    sRotSpeedX = 0;
-    sRotSpeedY = 0;
+    sRockRotSpeedX = 0;
+    sRockRotSpeedY = 0;
 }
\ No newline at end of file
diff --git a/soh/src/overlays/actors/ovl_En_Niw/z_en_niw.c b/soh/src/overlays/actors/ovl_En_Niw/z_en_niw.c
index c6e23b8b9..5cf7abc25 100644
--- a/soh/src/overlays/actors/ovl_En_Niw/z_en_niw.c
+++ b/soh/src/overlays/actors/ovl_En_Niw/z_en_niw.c
@@ -35,7 +35,7 @@ void EnNiw_FeatherSpawn(EnNiw* this, Vec3f* pos, Vec3f* vel, Vec3f* accel, f32 s
 void EnNiw_FeatherUpdate(EnNiw* this, GlobalContext* globalCtx);
 void EnNiw_FeatherDraw(EnNiw* this, GlobalContext* globalCtx);
 
-static s16 D_80AB85E0 = 0;
+s16 D_80AB85E0 = 0;
 
 const ActorInit En_Niw_InitVars = {
     ACTOR_EN_NIW,
@@ -70,9 +70,9 @@ static s16 sKakarikoFlagList[] = {
     0x0200, 0x0400, 0x0800, 0x1000, 0x2000, 0x4000, 0x8000,
 };
 
-static u8 sLowerRiverSpawned = false;
+u8 sLowerRiverSpawned = false;
 
-static u8 sUpperRiverSpawned = false;
+u8 sUpperRiverSpawned = false;
 
 static ColliderCylinderInit sCylinderInit1 = {
     {
diff --git a/soh/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c b/soh/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c
index 93f48417e..63b386238 100644
--- a/soh/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c
+++ b/soh/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c
@@ -126,7 +126,7 @@ static DamageTable sDamageTable = {
     /* Unknown 2     */ DMG_ENTRY(0, 0x0),
 };
 
-static s32 sNumSpawned = 0;
+s32 sEnPoFieldNumSpawned = 0;
 
 static Vec3f sFieldMiddle = { -1000.0f, 0.0f, 6500.0f };
 
@@ -145,22 +145,22 @@ static EnPoFieldInfo sPoFieldInfo[2] = {
 
 static Vec3f D_80AD714C = { 0.0f, 1400.0f, 0.0f };
 
-static Vec3s sSpawnPositions[10];
-static u8 sSpawnSwitchFlags[10];
+Vec3s sEnPoFieldSpawnPositions[10];
+u8 sEnPoFieldSpawnSwitchFlags[10];
 static MtxF sLimb7Mtx;
 
 void EnPoField_Init(Actor* thisx, GlobalContext* globalCtx) {
     EnPoField* this = (EnPoField*)thisx;
     s32 pad;
 
-    if (sNumSpawned != 10) {
-        sSpawnPositions[sNumSpawned].x = this->actor.world.pos.x;
-        sSpawnPositions[sNumSpawned].y = this->actor.world.pos.y;
-        sSpawnPositions[sNumSpawned].z = this->actor.world.pos.z;
-        sSpawnSwitchFlags[sNumSpawned] = this->actor.params & 0xFF;
-        sNumSpawned++;
+    if (sEnPoFieldNumSpawned != 10) {
+        sEnPoFieldSpawnPositions[sEnPoFieldNumSpawned].x = this->actor.world.pos.x;
+        sEnPoFieldSpawnPositions[sEnPoFieldNumSpawned].y = this->actor.world.pos.y;
+        sEnPoFieldSpawnPositions[sEnPoFieldNumSpawned].z = this->actor.world.pos.z;
+        sEnPoFieldSpawnSwitchFlags[sEnPoFieldNumSpawned] = this->actor.params & 0xFF;
+        sEnPoFieldNumSpawned++;
     }
-    if (sNumSpawned >= 2) {
+    if (sEnPoFieldNumSpawned >= 2) {
         this->actor.params = 0xFF;
         Actor_Kill(&this->actor);
         return;
@@ -407,10 +407,10 @@ void EnPoField_WaitForSpawn(EnPoField* this, GlobalContext* globalCtx) {
         this->actionTimer--;
     }
     if (this->actionTimer == 0) {
-        for (i = 0; i < sNumSpawned; i++) {
-            if (fabsf(sSpawnPositions[i].x - player->actor.world.pos.x) < 150.0f &&
-                fabsf(sSpawnPositions[i].z - player->actor.world.pos.z) < 150.0f) {
-                if (Flags_GetSwitch(globalCtx, sSpawnSwitchFlags[i])) {
+        for (i = 0; i < sEnPoFieldNumSpawned; i++) {
+            if (fabsf(sEnPoFieldSpawnPositions[i].x - player->actor.world.pos.x) < 150.0f &&
+                fabsf(sEnPoFieldSpawnPositions[i].z - player->actor.world.pos.z) < 150.0f) {
+                if (Flags_GetSwitch(globalCtx, sEnPoFieldSpawnSwitchFlags[i])) {
                     if (player->stateFlags1 & 0x800000) { // Player riding Epona
                         return;
                     } else {
@@ -711,7 +711,7 @@ void EnPoField_SoulInteract(EnPoField* this, GlobalContext* globalCtx) {
                     } else {
                         this->actor.textId = 0x508F;
                         Item_Give(globalCtx, ITEM_BIG_POE);
-                        Flags_SetSwitch(globalCtx, sSpawnSwitchFlags[this->spawnFlagIndex]);
+                        Flags_SetSwitch(globalCtx, sEnPoFieldSpawnSwitchFlags[this->spawnFlagIndex]);
                     }
                 } else {
                     Audio_PlayActorSound2(&this->actor, NA_SE_EN_PO_LAUGH);
@@ -1009,8 +1009,8 @@ void EnPoField_DrawSoul(Actor* thisx, GlobalContext* globalCtx) {
 }
 
 void EnPoField_Reset(void) {
-    sNumSpawned = 0;
+    sEnPoFieldNumSpawned = 0;
 
-    memset(sSpawnPositions, 0, sizeof(sSpawnPositions));
-    memset(sSpawnSwitchFlags, 0, sizeof(sSpawnSwitchFlags));
+    memset(sEnPoFieldSpawnPositions, 0, sizeof(sEnPoFieldSpawnPositions));
+    memset(sEnPoFieldSpawnSwitchFlags, 0, sizeof(sEnPoFieldSpawnSwitchFlags));
 }
\ No newline at end of file
diff --git a/soh/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c b/soh/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c
index 71cd47144..c1d169dfe 100644
--- a/soh/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c
+++ b/soh/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c
@@ -35,7 +35,7 @@ const ActorInit En_Takara_Man_InitVars = {
     (ActorResetFunc)EnTakaraMan_Reset,
 };
 
-static u8 sTakaraIsInitialized = false;
+u8 sTakaraIsInitialized = false;
 
 void EnTakaraMan_Reset(Actor* thisx, GlobalContext* globalCtx) {
     sTakaraIsInitialized = false;
diff --git a/soh/src/overlays/actors/ovl_En_Xc/z_en_xc.c b/soh/src/overlays/actors/ovl_En_Xc/z_en_xc.c
index c64f9acb7..92497bf3e 100644
--- a/soh/src/overlays/actors/ovl_En_Xc/z_en_xc.c
+++ b/soh/src/overlays/actors/ovl_En_Xc/z_en_xc.c
@@ -447,7 +447,7 @@ void func_80B3D118(GlobalContext* globalCtx) {
 
 static Vec3f D_80B42DA0;
 
-static s32 D_80B41D90 = 0;
+s32 D_80B41D90 = 0;
 void EnXc_SetColossusWindSFX(GlobalContext* globalCtx) {
     if (gSaveContext.sceneSetupIndex == 4) {
         static Vec3f sPos = { 0.0f, 0.0f, 0.0f };
@@ -484,17 +484,17 @@ void EnXc_SetColossusWindSFX(GlobalContext* globalCtx) {
     }
 }
 
-static s32 sFlameSpawned = false;
+s32 sEnXcFlameSpawned = false;
 void EnXc_SpawnFlame(EnXc* this, GlobalContext* globalCtx) {
 
-    if (!sFlameSpawned) {
+    if (!sEnXcFlameSpawned) {
         CsCmdActorAction* npcAction = EnXc_GetCsCmd(globalCtx, 0);
         f32 xPos = npcAction->startPos.x;
         f32 yPos = npcAction->startPos.y;
         f32 zPos = npcAction->startPos.z;
 
         this->flameActor = Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_LIGHT, xPos, yPos, zPos, 0, 0, 0, 5);
-        sFlameSpawned = true;
+        sEnXcFlameSpawned = true;
     }
 }
 
@@ -519,7 +519,7 @@ void EnXc_DestroyFlame(EnXc* this) {
     Actor_Kill(&this->actor);
 }
 
-static s32 D_80B41DA8 = 1;
+s32 D_80B41DA8 = 1;
 void EnXc_InitFlame(EnXc* this, GlobalContext* globalCtx) {
     s32 pad;
     s16 sceneNum = globalCtx->sceneNum;
@@ -1402,7 +1402,7 @@ void func_80B3F534(GlobalContext* globalCtx) {
     }
 }
 
-static s32 D_80B41DAC = 1;
+s32 D_80B41DAC = 1;
 void func_80B3F59C(EnXc* this, GlobalContext* globalCtx) {
     CsCmdActorAction* npcAction = EnXc_GetCsCmd(globalCtx, 0);
 
@@ -2430,7 +2430,7 @@ const ActorInit En_Xc_InitVars = {
 
 void EnXc_Reset(void) {
     D_80B41D90 = 0;
-    sFlameSpawned = false;
+    sEnXcFlameSpawned = false;
     D_80B41DA8 = 1;
     D_80B41DAC = 1;
 }
\ No newline at end of file
diff --git a/soh/src/overlays/actors/ovl_En_Zf/z_en_zf.c b/soh/src/overlays/actors/ovl_En_Zf/z_en_zf.c
index c5ed809db..a6b0f5809 100644
--- a/soh/src/overlays/actors/ovl_En_Zf/z_en_zf.c
+++ b/soh/src/overlays/actors/ovl_En_Zf/z_en_zf.c
@@ -97,8 +97,8 @@ static Vec3f sPlatformPositions[] = {
 };
 
 // These seem to relate to the tagging in/out the minibosses do
-static s16 D_80B4A1B0 = 0;
-static s16 D_80B4A1B4 = 1;
+s16 D_80B4A1B0 = 0;
+s16 D_80B4A1B4 = 1;
 
 const ActorInit En_Zf_InitVars = {
     ACTOR_EN_ZF,
diff --git a/soh/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c b/soh/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c
index 8ad3a2cef..6ea271bf4 100644
--- a/soh/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c
+++ b/soh/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c
@@ -45,7 +45,7 @@ static void* sEyeTextures[] = { gZelda2EyeOpenTex, gZelda2EyeHalfTex, gZelda2Eye
 
 static void* sMouthTextures[] = { gZelda2MouthSeriousTex, gZelda2MouthHappyTex, gZelda2MouthOpenTex };
 
-static s32 D_80B5A468 = 0;
+s32 D_80B5A468 = 0;
 
 static Vec3f D_80B5A46C = { 0.0f, 0.0f, 0.0f };
 
@@ -55,7 +55,7 @@ static f32 D_80B5A484 = 0.0f;
 
 static Vec3f D_80B5A488 = { 0.0f, 0.0f, 0.0f };
 
-static s32 D_80B5A494 = -1;
+s32 D_80B5A494 = -1;
 
 static Vec3f D_80B5A498 = { 148.0f, 260.0f, -87.0f };
 
@@ -63,7 +63,7 @@ static Vec3f D_80B5A4A4 = { -12.0f, 260.0f, -147.0f };
 
 static Vec3f D_80B5A4B0 = { 42.0f, 260.0f, 13.0f };
 
-static u32 D_80B5A4BC = 0;
+u32 D_80B5A4BC = 0;
 
 void func_80B533B0(Actor* thisx, GlobalContext* globalCtx) {
     EnZl3* this = (EnZl3*)thisx;
diff --git a/soh/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c b/soh/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c
index 237f1e926..b01bcf1d9 100644
--- a/soh/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c
+++ b/soh/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c
@@ -57,8 +57,8 @@ const ActorInit Object_Kankyo_InitVars = {
     (ActorResetFunc)ObjectKankyo_Reset,
 };
 
-static u8 sIsSpawned = false;
-static s16 sTrailingFairies = 0;
+u8 sKankyoIsSpawned = false;
+s16 sTrailingFairies = 0;
 
 void ObjectKankyo_SetupAction(ObjectKankyo* this, ObjectKankyoActionFunc action) {
     this->actionFunc = action;
@@ -76,18 +76,18 @@ void ObjectKankyo_Init(Actor* thisx, GlobalContext* globalCtx) {
     this->actor.room = -1;
     switch (this->actor.params) {
         case 0:
-            if (!sIsSpawned) {
+            if (!sKankyoIsSpawned) {
                 ObjectKankyo_SetupAction(this, ObjectKankyo_Fairies);
-                sIsSpawned = true;
+                sKankyoIsSpawned = true;
             } else {
                 Actor_Kill(&this->actor);
             }
             break;
 
         case 3:
-            if (!sIsSpawned) {
+            if (!sKankyoIsSpawned) {
                 ObjectKankyo_SetupAction(this, ObjectKankyo_Snow);
-                sIsSpawned = true;
+                sKankyoIsSpawned = true;
             } else {
                 Actor_Kill(&this->actor);
             }
@@ -939,6 +939,6 @@ void ObjectKankyo_DrawBeams(ObjectKankyo* this2, GlobalContext* globalCtx2) {
 }
 
 void ObjectKankyo_Reset(void) {
-    sIsSpawned = false;
+    sKankyoIsSpawned = false;
     sTrailingFairies = 0;
 }
\ No newline at end of file
diff --git a/soh/src/overlays/actors/ovl_player_actor/z_player.c b/soh/src/overlays/actors/ovl_player_actor/z_player.c
index aa11b6d7e..49ad4e6e4 100644
--- a/soh/src/overlays/actors/ovl_player_actor/z_player.c
+++ b/soh/src/overlays/actors/ovl_player_actor/z_player.c
@@ -4804,7 +4804,7 @@ s32 func_8083ADD4(GlobalContext* globalCtx, Player* this) {
 
 void func_8083AE40(Player* this, s16 objectId) {
     s32 pad;
-    u32 size;
+    size_t size;
 
     if (objectId != OBJECT_INVALID) {
         this->giObjectLoading = true;
@@ -4815,7 +4815,7 @@ void func_8083AE40(Player* this, s16 objectId) {
         LOG_HEX("size", size, "../z_player.c", 9090);
         ASSERT(size <= 1024 * 8, "size <= 1024 * 8", "../z_player.c", 9091);
 
-        DmaMgr_SendRequest2(&this->giObjectDmaRequest, (u32)this->giObjectSegment, gObjectTable[objectId].vromStart,
+        DmaMgr_SendRequest2(&this->giObjectDmaRequest, (uintptr_t)this->giObjectSegment, gObjectTable[objectId].vromStart,
             size, 0, &this->giObjectLoadQueue, NULL, "../z_player.c", 9099);
     }
 }
@@ -10751,7 +10751,7 @@ void Player_UpdateCommon(Player* this, GlobalContext* globalCtx, Input* input) {
 static Vec3f D_80854838 = { 0.0f, 0.0f, -30.0f };
 
 void Player_Update(Actor* thisx, GlobalContext* globalCtx) {
-    static Vec3f sDogSpawnPos;
+    static Vec3f sDogSpawnPos; 
     Player* this = (Player*)thisx;
     s32 dogParams;
     s32 pad;

From 3bc0564d9abb481749277fab54e5fa449ac57f10 Mon Sep 17 00:00:00 2001
From: Emill <emil.lenngren@gmail.com>
Date: Fri, 13 May 2022 02:43:07 +0200
Subject: [PATCH 24/43] Use DX11 by default, if available (#307)

---
 libultraship/libultraship/ConfigFile.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libultraship/libultraship/ConfigFile.cpp b/libultraship/libultraship/ConfigFile.cpp
index 2e9a8cc94..8a0794643 100644
--- a/libultraship/libultraship/ConfigFile.cpp
+++ b/libultraship/libultraship/ConfigFile.cpp
@@ -72,7 +72,7 @@ namespace Ship {
 		(*this)["WINDOW"]["FULLSCREEN WIDTH"] = std::to_string(1920);
 		(*this)["WINDOW"]["FULLSCREEN HEIGHT"] = std::to_string(1080);
 		(*this)["WINDOW"]["FULLSCREEN"] = std::to_string(false);
-		(*this)["WINDOW"]["GFX BACKEND"] = "sdl";
+		(*this)["WINDOW"]["GFX BACKEND"] = "";
 
 		(*this)["KEYBOARD CONTROLLER BINDING 1"][STR(BTN_CRIGHT)] = std::to_string(0x14D);
 		(*this)["KEYBOARD CONTROLLER BINDING 1"][STR(BTN_CLEFT)] = std::to_string(0x14B);

From b3d19eee3a50fb563cff3fb93e754c4b52f759bf Mon Sep 17 00:00:00 2001
From: KiritoDev <36680385+KiritoDv@users.noreply.github.com>
Date: Thu, 12 May 2022 19:44:50 -0500
Subject: [PATCH 25/43] Fixed id and cleanup on finish of notifications (#304)

Co-authored-by: KiritoDv <nohomoboi01@gmail.com>
---
 libultraship/libultraship/GameOverlay.cpp | 18 ++++++++++++++++--
 libultraship/libultraship/GameOverlay.h   |  2 ++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/libultraship/libultraship/GameOverlay.cpp b/libultraship/libultraship/GameOverlay.cpp
index 02e089366..042ff980c 100644
--- a/libultraship/libultraship/GameOverlay.cpp
+++ b/libultraship/libultraship/GameOverlay.cpp
@@ -8,6 +8,7 @@
 #include "SohImGuiImpl.h"
 #include "TextureMod.h"
 #include "Lib/ImGui/imgui_internal.h"
+#include "Utils/StringHelper.h"
 
 void Ship::GameOverlay::LoadFont(const std::string& name, const std::string& path, float fontSize) {
 	ImGuiIO& io = ImGui::GetIO();
@@ -50,10 +51,21 @@ void Ship::GameOverlay::TextDrawNotification(float duration, bool shadow, const
 	vsnprintf(buf, IM_ARRAYSIZE(buf), fmt, args);
 	buf[IM_ARRAYSIZE(buf) - 1] = 0;
 	va_end(args);
-
-	this->RegisteredOverlays[fmt] = new Overlay({ OverlayType::NOTIFICATION, ImStrdup(buf), duration, duration });
+	this->RegisteredOverlays[StringHelper::Sprintf("NotificationID:%d%d", rand(), this->RegisteredOverlays.size())] = new Overlay({ OverlayType::NOTIFICATION, ImStrdup(buf), duration, duration });
+	NeedsCleanup = true;
 }
 
+void Ship::GameOverlay::CleanupNotifications() {
+	if(!NeedsCleanup) return;
+	for (auto it = this->RegisteredOverlays.begin(); it != this->RegisteredOverlays.end(); ) {
+		if (it->second->type == OverlayType::NOTIFICATION && it->second->duration <= 0.0f) {
+			it = this->RegisteredOverlays.erase(it);
+		} else {
+			++it;
+		}
+	}
+	NeedsCleanup = false;
+}
 
 float Ship::GameOverlay::GetScreenWidth() {
 	const ImGuiViewport* viewport = ImGui::GetMainViewport();
@@ -137,6 +149,8 @@ void Ship::GameOverlay::Draw() {
 	ImGui::Begin("SoHOverlay", nullptr, ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoBackground |
 		ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoInputs);
 
+	this->CleanupNotifications();
+
 	float textY = 50;
 	float notY = 0;
 
diff --git a/libultraship/libultraship/GameOverlay.h b/libultraship/libultraship/GameOverlay.h
index e3161bca3..605cd5898 100644
--- a/libultraship/libultraship/GameOverlay.h
+++ b/libultraship/libultraship/GameOverlay.h
@@ -33,6 +33,8 @@ namespace Ship {
 		void TextDraw(float x, float y, bool shadow, ImVec4 color, const char* text, ...);
 		void TextDrawNotification(float duration, bool shadow, const char* fmt, ...);
 	private:
+		bool NeedsCleanup = false;
+		void CleanupNotifications();
 		void LoadFont(const std::string& name, const std::string& path, float fontSize);
 	};
 

From 0a8db6d8a62f6d997065223cd6e2237f71c6aecc Mon Sep 17 00:00:00 2001
From: louist103 <35883445+louist103@users.noreply.github.com>
Date: Thu, 12 May 2022 20:45:24 -0400
Subject: [PATCH 26/43] add new files (#308)

---
 .../GC_NMQ_D/textures/map_48x85_static.xml    | 136 ++++++++---------
 .../textures/map_48x85_static.xml             | 138 +++++++++---------
 2 files changed, 137 insertions(+), 137 deletions(-)

diff --git a/soh/assets/xml/GC_NMQ_D/textures/map_48x85_static.xml b/soh/assets/xml/GC_NMQ_D/textures/map_48x85_static.xml
index b5b1d1a85..2788498a8 100644
--- a/soh/assets/xml/GC_NMQ_D/textures/map_48x85_static.xml
+++ b/soh/assets/xml/GC_NMQ_D/textures/map_48x85_static.xml
@@ -1,72 +1,72 @@
 <Root>
     <File Name="map_48x85_static" Segment="12">
-        <Texture Name="gDekuTreePauseScreenMapFloor3LeftTex" OutName="deku_tree_pause_screen_map_floor_3_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gDekuTreePauseScreenMapFloor3RightTex" OutName="deku_tree_pause_screen_map_floor_3_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gDekuTreePauseScreenMapFloor2LeftTex" OutName="deku_tree_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gDekuTreePauseScreenMapFloor2RightTex" OutName="deku_tree_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gDekuTreePauseScreenMapFloor1LeftTex" OutName="deku_tree_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gDekuTreePauseScreenMapFloor1RightTex" OutName="deku_tree_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gDekuTreePauseScreenMapBasement1LeftTex" OutName="deku_tree_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gDekuTreePauseScreenMapBasement1RightTex" OutName="deku_tree_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gDekuTreePauseScreenMapBasement2LeftTex" OutName="deku_tree_pause_screen_map_basement_2_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gDekuTreePauseScreenMapBasement2RightTex" OutName="deku_tree_pause_screen_map_basement_2_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gDodongosCavernPauseScreenMapFloor2LeftTex" OutName="dodongos_cavern_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gDodongosCavernPauseScreenMapFloor2RightTex" OutName="dodongos_cavern_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gDodongosCavernPauseScreenMapFloor1LeftTex" OutName="dodongos_cavern_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gDodongosCavernPauseScreenMapFloor1RightTex" OutName="dodongos_cavern_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gJabuPauseScreenMapFloor1LeftTex" OutName="jabu_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gJabuPauseScreenMapFloor1RightTex" OutName="jabu_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gJabuPauseScreenMapBasement1LeftTex" OutName="jabu_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gJabuPauseScreenMapBasement1RightTex" OutName="jabu_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gForestTemplePauseScreenMapFloor2LeftTex" OutName="forest_temple_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gForestTemplePauseScreenMapFloor2RightTex" OutName="forest_temple_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gForestTemplePauseScreenMapFloor1LeftTex" OutName="forest_temple_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gForestTemplePauseScreenMapFloor1RightTex" OutName="forest_temple_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gForestTemplePauseScreenMapBasement1LeftTex" OutName="forest_temple_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gForestTemplePauseScreenMapBasement1RightTex" OutName="forest_temple_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gForestTemplePauseScreenMapBasement2LeftTex" OutName="forest_temple_pause_screen_map_basement_2_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gForestTemplePauseScreenMapBasement2RightTex" OutName="forest_temple_pause_screen_map_basement_2_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gFireTemplePauseScreenMapFloor5LeftTex" OutName="fire_temple_pause_screen_map_floor_5_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gFireTemplePauseScreenMapFloor5RightTex" OutName="fire_temple_pause_screen_map_floor_5_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gFireTemplePauseScreenMapFloor4LeftTex" OutName="fire_temple_pause_screen_map_floor_4_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gFireTemplePauseScreenMapFloor4RightTex" OutName="fire_temple_pause_screen_map_floor_4_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gFireTemplePauseScreenMapFloor3LeftTex" OutName="fire_temple_pause_screen_map_floor_3_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gFireTemplePauseScreenMapFloor3RightTex" OutName="fire_temple_pause_screen_map_floor_3_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gFireTemplePauseScreenMapFloor2LeftTex" OutName="fire_temple_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gFireTemplePauseScreenMapFloor2RightTex" OutName="fire_temple_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gFireTemplePauseScreenMapFloor1LeftTex" OutName="fire_temple_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gFireTemplePauseScreenMapFloor1RightTex" OutName="fire_temple_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gWaterTemplePauseScreenMapFloor3LeftTex" OutName="water_temple_pause_screen_map_floor_3_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gWaterTemplePauseScreenMapFloor3RightTex" OutName="water_temple_pause_screen_map_floor_3_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gWaterTemplePauseScreenMapFloor2LeftTex" OutName="water_temple_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gWaterTemplePauseScreenMapFloor2RightTex" OutName="water_temple_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gWaterTemplePauseScreenMapFloor1LeftTex" OutName="water_temple_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gWaterTemplePauseScreenMapFloor1RightTex" OutName="water_temple_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gWaterTemplePauseScreenMapBasement1LeftTex" OutName="water_temple_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gWaterTemplePauseScreenMapBasement1RightTex" OutName="water_temple_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gSpiritTemplePauseScreenMapFloor4LeftTex" OutName="spirit_temple_pause_screen_map_floor_4_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gSpiritTemplePauseScreenMapFloor4RightTex" OutName="spirit_temple_pause_screen_map_floor_4_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gSpiritTemplePauseScreenMapFloor3LeftTex" OutName="spirit_temple_pause_screen_map_floor_3_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gSpiritTemplePauseScreenMapFloor3RightTex" OutName="spirit_temple_pause_screen_map_floor_3_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gSpiritTemplePauseScreenMapFloor2LeftTex" OutName="spirit_temple_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gSpiritTemplePauseScreenMapFloor2RightTex" OutName="spirit_temple_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gSpiritTemplePauseScreenMapFloor1LeftTex" OutName="spirit_temple_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gSpiritTemplePauseScreenMapFloor1RightTex" OutName="spirit_temple_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gShadowTemplePauseScreenMapBasement1LeftTex" OutName="shadow_temple_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gShadowTemplePauseScreenMapBasement1RightTex" OutName="shadow_temple_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gShadowTemplePauseScreenMapBasement2LeftTex" OutName="shadow_temple_pause_screen_map_basement_2_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gShadowTemplePauseScreenMapBasement2RightTex" OutName="shadow_temple_pause_screen_map_basement_2_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gShadowTemplePauseScreenMapBasement3LeftTex" OutName="shadow_temple_pause_screen_map_basement_3_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gShadowTemplePauseScreenMapBasement3RightTex" OutName="shadow_temple_pause_screen_map_basement_3_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gShadowTemplePauseScreenMapBasement4LeftTex" OutName="shadow_temple_pause_screen_map_basement_4_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gShadowTemplePauseScreenMapBasement4RightTex" OutName="shadow_temple_pause_screen_map_basement_4_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gBottomOfTheWellPauseScreenMapBasement1LeftTex" OutName="bottom_of_the_well_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gBottomOfTheWellPauseScreenMapBasement1RightTex" OutName="bottom_of_the_well_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gBottomOfTheWellPauseScreenMapBasement2LeftTex" OutName="bottom_of_the_well_pause_screen_map_basement_2_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gBottomOfTheWellPauseScreenMapBasement2RightTex" OutName="bottom_of_the_well_pause_screen_map_basement_2_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gBottomOfTheWellPauseScreenMapBasement3LeftTex" OutName="bottom_of_the_well_pause_screen_map_basement_3_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gBottomOfTheWellPauseScreenMapBasement3RightTex" OutName="bottom_of_the_well_pause_screen_map_basement_3_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gIceCavernPauseScreenMapFloor1LeftTex" OutName="ice_cavern_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gIceCavernPauseScreenMapFloor1RightTex" OutName="ice_cavern_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85"/>
+        <Texture Name="gDekuTreePauseScreenMapFloor3LeftTex" OutName="deku_tree_pause_screen_map_floor_3_left" Format="ci4" Width="48" Height="85" Offset="0x0"/>
+        <Texture Name="gDekuTreePauseScreenMapFloor3RightTex" OutName="deku_tree_pause_screen_map_floor_3_right" Format="ci4" Width="48" Height="85" Offset="0x07F8"/>
+        <Texture Name="gDekuTreePauseScreenMapFloor2LeftTex" OutName="deku_tree_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85" Offset="0x0FF0"/>
+        <Texture Name="gDekuTreePauseScreenMapFloor2RightTex" OutName="deku_tree_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85" Offset="0x17E8"/>
+        <Texture Name="gDekuTreePauseScreenMapFloor1LeftTex" OutName="deku_tree_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x1FE0"/>
+        <Texture Name="gDekuTreePauseScreenMapFloor1RightTex" OutName="deku_tree_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x27D8"/>
+        <Texture Name="gDekuTreePauseScreenMapBasement1LeftTex" OutName="deku_tree_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85" Offset="0x2FD0"/>
+        <Texture Name="gDekuTreePauseScreenMapBasement1RightTex" OutName="deku_tree_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85" Offset="0x37C8"/>
+        <Texture Name="gDekuTreePauseScreenMapBasement2LeftTex" OutName="deku_tree_pause_screen_map_basement_2_left" Format="ci4" Width="48" Height="85" Offset="0x3FC0"/>
+        <Texture Name="gDekuTreePauseScreenMapBasement2RightTex" OutName="deku_tree_pause_screen_map_basement_2_right" Format="ci4" Width="48" Height="85" Offset="0x47B8"/>
+        <Texture Name="gDodongosCavernPauseScreenMapFloor2LeftTex" OutName="dodongos_cavern_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85" Offset="0x4FB0"/>
+        <Texture Name="gDodongosCavernPauseScreenMapFloor2RightTex" OutName="dodongos_cavern_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85" Offset="0x57A8"/>
+        <Texture Name="gDodongosCavernPauseScreenMapFloor1LeftTex" OutName="dodongos_cavern_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x5FA0"/>
+        <Texture Name="gDodongosCavernPauseScreenMapFloor1RightTex" OutName="dodongos_cavern_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x6798"/>
+        <Texture Name="gJabuPauseScreenMapFloor1LeftTex" OutName="jabu_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x6F90"/>
+        <Texture Name="gJabuPauseScreenMapFloor1RightTex" OutName="jabu_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x7788"/>
+        <Texture Name="gJabuPauseScreenMapBasement1LeftTex" OutName="jabu_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85" Offset="0x7F80"/>
+        <Texture Name="gJabuPauseScreenMapBasement1RightTex" OutName="jabu_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85" Offset="0x8778"/>
+        <Texture Name="gForestTemplePauseScreenMapFloor2LeftTex" OutName="forest_temple_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85" Offset="0x8F70"/>
+        <Texture Name="gForestTemplePauseScreenMapFloor2RightTex" OutName="forest_temple_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85" Offset="0x9768"/>
+        <Texture Name="gForestTemplePauseScreenMapFloor1LeftTex" OutName="forest_temple_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x9F60"/>
+        <Texture Name="gForestTemplePauseScreenMapFloor1RightTex" OutName="forest_temple_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0xA758"/>
+        <Texture Name="gForestTemplePauseScreenMapBasement1LeftTex" OutName="forest_temple_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85" Offset="0xAF50"/>
+        <Texture Name="gForestTemplePauseScreenMapBasement1RightTex" OutName="forest_temple_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85" Offset="0xB748"/>
+        <Texture Name="gForestTemplePauseScreenMapBasement2LeftTex" OutName="forest_temple_pause_screen_map_basement_2_left" Format="ci4" Width="48" Height="85" Offset="0xBF40"/>
+        <Texture Name="gForestTemplePauseScreenMapBasement2RightTex" OutName="forest_temple_pause_screen_map_basement_2_right" Format="ci4" Width="48" Height="85" Offset="0xC738"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor5LeftTex" OutName="fire_temple_pause_screen_map_floor_5_left" Format="ci4" Width="48" Height="85" Offset="0xCF30"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor5RightTex" OutName="fire_temple_pause_screen_map_floor_5_right" Format="ci4" Width="48" Height="85" Offset="0xD728"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor4LeftTex" OutName="fire_temple_pause_screen_map_floor_4_left" Format="ci4" Width="48" Height="85" Offset="0xDF20"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor4RightTex" OutName="fire_temple_pause_screen_map_floor_4_right" Format="ci4" Width="48" Height="85" Offset="0xE718"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor3LeftTex" OutName="fire_temple_pause_screen_map_floor_3_left" Format="ci4" Width="48" Height="85" Offset="0xEF10"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor3RightTex" OutName="fire_temple_pause_screen_map_floor_3_right" Format="ci4" Width="48" Height="85" Offset="0xF708"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor2LeftTex" OutName="fire_temple_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85" Offset="0xFF00"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor2RightTex" OutName="fire_temple_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85" Offset="0x106F8"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor1LeftTex" OutName="fire_temple_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x10EF0"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor1RightTex" OutName="fire_temple_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x116E8"/>
+        <Texture Name="gWaterTemplePauseScreenMapFloor3LeftTex" OutName="water_temple_pause_screen_map_floor_3_left" Format="ci4" Width="48" Height="85" Offset="0x11EE0"/>
+        <Texture Name="gWaterTemplePauseScreenMapFloor3RightTex" OutName="water_temple_pause_screen_map_floor_3_right" Format="ci4" Width="48" Height="85" Offset="0x126D8"/>
+        <Texture Name="gWaterTemplePauseScreenMapFloor2LeftTex" OutName="water_temple_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85" Offset="0x12ED0"/>
+        <Texture Name="gWaterTemplePauseScreenMapFloor2RightTex" OutName="water_temple_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85" Offset="0x136C8"/>
+        <Texture Name="gWaterTemplePauseScreenMapFloor1LeftTex" OutName="water_temple_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x13EC0"/>
+        <Texture Name="gWaterTemplePauseScreenMapFloor1RightTex" OutName="water_temple_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x146B8"/>
+        <Texture Name="gWaterTemplePauseScreenMapBasement1LeftTex" OutName="water_temple_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85" Offset="0x14EB0"/>
+        <Texture Name="gWaterTemplePauseScreenMapBasement1RightTex" OutName="water_temple_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85" Offset="0x156A8"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor4LeftTex" OutName="spirit_temple_pause_screen_map_floor_4_left" Format="ci4" Width="48" Height="85" Offset="0x15EA0"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor4RightTex" OutName="spirit_temple_pause_screen_map_floor_4_right" Format="ci4" Width="48" Height="85" Offset="0x16698"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor3LeftTex" OutName="spirit_temple_pause_screen_map_floor_3_left" Format="ci4" Width="48" Height="85" Offset="0x16E90"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor3RightTex" OutName="spirit_temple_pause_screen_map_floor_3_right" Format="ci4" Width="48" Height="85" Offset="0x17688"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor2LeftTex" OutName="spirit_temple_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85" Offset="0x17E80"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor2RightTex" OutName="spirit_temple_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85" Offset="0x18678"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor1LeftTex" OutName="spirit_temple_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x18E70"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor1RightTex" OutName="spirit_temple_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x19668"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement1LeftTex" OutName="shadow_temple_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85" Offset="0x19E60"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement1RightTex" OutName="shadow_temple_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85" Offset="0x1A658"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement2LeftTex" OutName="shadow_temple_pause_screen_map_basement_2_left" Format="ci4" Width="48" Height="85" Offset="0x1AE50"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement2RightTex" OutName="shadow_temple_pause_screen_map_basement_2_right" Format="ci4" Width="48" Height="85" Offset="0x1B648"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement3LeftTex" OutName="shadow_temple_pause_screen_map_basement_3_left" Format="ci4" Width="48" Height="85" Offset="0x1BE40"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement3RightTex" OutName="shadow_temple_pause_screen_map_basement_3_right" Format="ci4" Width="48" Height="85" Offset="0x1C638"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement4LeftTex" OutName="shadow_temple_pause_screen_map_basement_4_left" Format="ci4" Width="48" Height="85" Offset="0x1CE30"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement4RightTex" OutName="shadow_temple_pause_screen_map_basement_4_right" Format="ci4" Width="48" Height="85" Offset="0x1D628"/>
+        <Texture Name="gBottomOfTheWellPauseScreenMapBasement1LeftTex" OutName="bottom_of_the_well_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85" Offset="0x1DE20"/>
+        <Texture Name="gBottomOfTheWellPauseScreenMapBasement1RightTex" OutName="bottom_of_the_well_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85" Offset="0x1E618"/>
+        <Texture Name="gBottomOfTheWellPauseScreenMapBasement2LeftTex" OutName="bottom_of_the_well_pause_screen_map_basement_2_left" Format="ci4" Width="48" Height="85" Offset="0x1EE10"/>
+        <Texture Name="gBottomOfTheWellPauseScreenMapBasement2RightTex" OutName="bottom_of_the_well_pause_screen_map_basement_2_right" Format="ci4" Width="48" Height="85" Offset="0x1F608"/>
+        <Texture Name="gBottomOfTheWellPauseScreenMapBasement3LeftTex" OutName="bottom_of_the_well_pause_screen_map_basement_3_left" Format="ci4" Width="48" Height="85" Offset="0x1FE00"/>
+        <Texture Name="gBottomOfTheWellPauseScreenMapBasement3RightTex" OutName="bottom_of_the_well_pause_screen_map_basement_3_right" Format="ci4" Width="48" Height="85" Offset="0x205F8"/>
+        <Texture Name="gIceCavernPauseScreenMapFloor1LeftTex" OutName="ice_cavern_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x20DF0"/>
+        <Texture Name="gIceCavernPauseScreenMapFloor1RightTex" OutName="ice_cavern_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x215E8"/>
     </File>
 </Root>
diff --git a/soh/assets/xml/GC_NMQ_PAL_F/textures/map_48x85_static.xml b/soh/assets/xml/GC_NMQ_PAL_F/textures/map_48x85_static.xml
index b5b1d1a85..b2ea46340 100644
--- a/soh/assets/xml/GC_NMQ_PAL_F/textures/map_48x85_static.xml
+++ b/soh/assets/xml/GC_NMQ_PAL_F/textures/map_48x85_static.xml
@@ -1,72 +1,72 @@
 <Root>
     <File Name="map_48x85_static" Segment="12">
-        <Texture Name="gDekuTreePauseScreenMapFloor3LeftTex" OutName="deku_tree_pause_screen_map_floor_3_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gDekuTreePauseScreenMapFloor3RightTex" OutName="deku_tree_pause_screen_map_floor_3_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gDekuTreePauseScreenMapFloor2LeftTex" OutName="deku_tree_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gDekuTreePauseScreenMapFloor2RightTex" OutName="deku_tree_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gDekuTreePauseScreenMapFloor1LeftTex" OutName="deku_tree_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gDekuTreePauseScreenMapFloor1RightTex" OutName="deku_tree_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gDekuTreePauseScreenMapBasement1LeftTex" OutName="deku_tree_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gDekuTreePauseScreenMapBasement1RightTex" OutName="deku_tree_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gDekuTreePauseScreenMapBasement2LeftTex" OutName="deku_tree_pause_screen_map_basement_2_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gDekuTreePauseScreenMapBasement2RightTex" OutName="deku_tree_pause_screen_map_basement_2_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gDodongosCavernPauseScreenMapFloor2LeftTex" OutName="dodongos_cavern_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gDodongosCavernPauseScreenMapFloor2RightTex" OutName="dodongos_cavern_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gDodongosCavernPauseScreenMapFloor1LeftTex" OutName="dodongos_cavern_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gDodongosCavernPauseScreenMapFloor1RightTex" OutName="dodongos_cavern_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gJabuPauseScreenMapFloor1LeftTex" OutName="jabu_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gJabuPauseScreenMapFloor1RightTex" OutName="jabu_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gJabuPauseScreenMapBasement1LeftTex" OutName="jabu_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gJabuPauseScreenMapBasement1RightTex" OutName="jabu_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gForestTemplePauseScreenMapFloor2LeftTex" OutName="forest_temple_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gForestTemplePauseScreenMapFloor2RightTex" OutName="forest_temple_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gForestTemplePauseScreenMapFloor1LeftTex" OutName="forest_temple_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gForestTemplePauseScreenMapFloor1RightTex" OutName="forest_temple_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gForestTemplePauseScreenMapBasement1LeftTex" OutName="forest_temple_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gForestTemplePauseScreenMapBasement1RightTex" OutName="forest_temple_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gForestTemplePauseScreenMapBasement2LeftTex" OutName="forest_temple_pause_screen_map_basement_2_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gForestTemplePauseScreenMapBasement2RightTex" OutName="forest_temple_pause_screen_map_basement_2_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gFireTemplePauseScreenMapFloor5LeftTex" OutName="fire_temple_pause_screen_map_floor_5_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gFireTemplePauseScreenMapFloor5RightTex" OutName="fire_temple_pause_screen_map_floor_5_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gFireTemplePauseScreenMapFloor4LeftTex" OutName="fire_temple_pause_screen_map_floor_4_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gFireTemplePauseScreenMapFloor4RightTex" OutName="fire_temple_pause_screen_map_floor_4_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gFireTemplePauseScreenMapFloor3LeftTex" OutName="fire_temple_pause_screen_map_floor_3_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gFireTemplePauseScreenMapFloor3RightTex" OutName="fire_temple_pause_screen_map_floor_3_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gFireTemplePauseScreenMapFloor2LeftTex" OutName="fire_temple_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gFireTemplePauseScreenMapFloor2RightTex" OutName="fire_temple_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gFireTemplePauseScreenMapFloor1LeftTex" OutName="fire_temple_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gFireTemplePauseScreenMapFloor1RightTex" OutName="fire_temple_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gWaterTemplePauseScreenMapFloor3LeftTex" OutName="water_temple_pause_screen_map_floor_3_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gWaterTemplePauseScreenMapFloor3RightTex" OutName="water_temple_pause_screen_map_floor_3_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gWaterTemplePauseScreenMapFloor2LeftTex" OutName="water_temple_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gWaterTemplePauseScreenMapFloor2RightTex" OutName="water_temple_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gWaterTemplePauseScreenMapFloor1LeftTex" OutName="water_temple_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gWaterTemplePauseScreenMapFloor1RightTex" OutName="water_temple_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gWaterTemplePauseScreenMapBasement1LeftTex" OutName="water_temple_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gWaterTemplePauseScreenMapBasement1RightTex" OutName="water_temple_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gSpiritTemplePauseScreenMapFloor4LeftTex" OutName="spirit_temple_pause_screen_map_floor_4_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gSpiritTemplePauseScreenMapFloor4RightTex" OutName="spirit_temple_pause_screen_map_floor_4_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gSpiritTemplePauseScreenMapFloor3LeftTex" OutName="spirit_temple_pause_screen_map_floor_3_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gSpiritTemplePauseScreenMapFloor3RightTex" OutName="spirit_temple_pause_screen_map_floor_3_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gSpiritTemplePauseScreenMapFloor2LeftTex" OutName="spirit_temple_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gSpiritTemplePauseScreenMapFloor2RightTex" OutName="spirit_temple_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gSpiritTemplePauseScreenMapFloor1LeftTex" OutName="spirit_temple_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gSpiritTemplePauseScreenMapFloor1RightTex" OutName="spirit_temple_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gShadowTemplePauseScreenMapBasement1LeftTex" OutName="shadow_temple_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gShadowTemplePauseScreenMapBasement1RightTex" OutName="shadow_temple_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gShadowTemplePauseScreenMapBasement2LeftTex" OutName="shadow_temple_pause_screen_map_basement_2_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gShadowTemplePauseScreenMapBasement2RightTex" OutName="shadow_temple_pause_screen_map_basement_2_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gShadowTemplePauseScreenMapBasement3LeftTex" OutName="shadow_temple_pause_screen_map_basement_3_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gShadowTemplePauseScreenMapBasement3RightTex" OutName="shadow_temple_pause_screen_map_basement_3_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gShadowTemplePauseScreenMapBasement4LeftTex" OutName="shadow_temple_pause_screen_map_basement_4_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gShadowTemplePauseScreenMapBasement4RightTex" OutName="shadow_temple_pause_screen_map_basement_4_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gBottomOfTheWellPauseScreenMapBasement1LeftTex" OutName="bottom_of_the_well_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gBottomOfTheWellPauseScreenMapBasement1RightTex" OutName="bottom_of_the_well_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gBottomOfTheWellPauseScreenMapBasement2LeftTex" OutName="bottom_of_the_well_pause_screen_map_basement_2_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gBottomOfTheWellPauseScreenMapBasement2RightTex" OutName="bottom_of_the_well_pause_screen_map_basement_2_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gBottomOfTheWellPauseScreenMapBasement3LeftTex" OutName="bottom_of_the_well_pause_screen_map_basement_3_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gBottomOfTheWellPauseScreenMapBasement3RightTex" OutName="bottom_of_the_well_pause_screen_map_basement_3_right" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gIceCavernPauseScreenMapFloor1LeftTex" OutName="ice_cavern_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85"/>
-        <Texture Name="gIceCavernPauseScreenMapFloor1RightTex" OutName="ice_cavern_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85"/>
+        <Texture Name="gDekuTreePauseScreenMapFloor3LeftTex" OutName="deku_tree_pause_screen_map_floor_3_left" Format="ci4" Width="48" Height="85" Offset="0x0"/>
+        <Texture Name="gDekuTreePauseScreenMapFloor3RightTex" OutName="deku_tree_pause_screen_map_floor_3_right" Format="ci4" Width="48" Height="85" Offset="0x07F8"/>
+        <Texture Name="gDekuTreePauseScreenMapFloor2LeftTex" OutName="deku_tree_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85" Offset="0x0FF0"/>
+        <Texture Name="gDekuTreePauseScreenMapFloor2RightTex" OutName="deku_tree_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85" Offset="0x17E8"/>
+        <Texture Name="gDekuTreePauseScreenMapFloor1LeftTex" OutName="deku_tree_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x1FE0"/>
+        <Texture Name="gDekuTreePauseScreenMapFloor1RightTex" OutName="deku_tree_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x27D8"/>
+        <Texture Name="gDekuTreePauseScreenMapBasement1LeftTex" OutName="deku_tree_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85" Offset="0x2FD0"/>
+        <Texture Name="gDekuTreePauseScreenMapBasement1RightTex" OutName="deku_tree_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85" Offset="0x37C8"/>
+        <Texture Name="gDekuTreePauseScreenMapBasement2LeftTex" OutName="deku_tree_pause_screen_map_basement_2_left" Format="ci4" Width="48" Height="85" Offset="0x3FC0"/>
+        <Texture Name="gDekuTreePauseScreenMapBasement2RightTex" OutName="deku_tree_pause_screen_map_basement_2_right" Format="ci4" Width="48" Height="85" Offset="0x47B8"/>
+        <Texture Name="gDodongosCavernPauseScreenMapFloor2LeftTex" OutName="dodongos_cavern_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85" Offset="0x4FB0"/>
+        <Texture Name="gDodongosCavernPauseScreenMapFloor2RightTex" OutName="dodongos_cavern_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85" Offset="0x57A8"/>
+        <Texture Name="gDodongosCavernPauseScreenMapFloor1LeftTex" OutName="dodongos_cavern_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x5FA0"/>
+        <Texture Name="gDodongosCavernPauseScreenMapFloor1RightTex" OutName="dodongos_cavern_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x6798"/>
+        <Texture Name="gJabuPauseScreenMapFloor1LeftTex" OutName="jabu_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x6F90"/>
+        <Texture Name="gJabuPauseScreenMapFloor1RightTex" OutName="jabu_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x7788"/>
+        <Texture Name="gJabuPauseScreenMapBasement1LeftTex" OutName="jabu_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85" Offset="0x7F80"/>
+        <Texture Name="gJabuPauseScreenMapBasement1RightTex" OutName="jabu_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85" Offset="0x8778"/>
+        <Texture Name="gForestTemplePauseScreenMapFloor2LeftTex" OutName="forest_temple_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85" Offset="0x8F70"/>
+        <Texture Name="gForestTemplePauseScreenMapFloor2RightTex" OutName="forest_temple_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85" Offset="0x9768"/>
+        <Texture Name="gForestTemplePauseScreenMapFloor1LeftTex" OutName="forest_temple_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x9F60"/>
+        <Texture Name="gForestTemplePauseScreenMapFloor1RightTex" OutName="forest_temple_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0xA758"/>
+        <Texture Name="gForestTemplePauseScreenMapBasement1LeftTex" OutName="forest_temple_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85" Offset="0xAF50"/>
+        <Texture Name="gForestTemplePauseScreenMapBasement1RightTex" OutName="forest_temple_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85" Offset="0xB748"/>
+        <Texture Name="gForestTemplePauseScreenMapBasement2LeftTex" OutName="forest_temple_pause_screen_map_basement_2_left" Format="ci4" Width="48" Height="85" Offset="0xBF40"/>
+        <Texture Name="gForestTemplePauseScreenMapBasement2RightTex" OutName="forest_temple_pause_screen_map_basement_2_right" Format="ci4" Width="48" Height="85" Offset="0xC738"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor5LeftTex" OutName="fire_temple_pause_screen_map_floor_5_left" Format="ci4" Width="48" Height="85" Offset="0xCF30"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor5RightTex" OutName="fire_temple_pause_screen_map_floor_5_right" Format="ci4" Width="48" Height="85" Offset="0xD728"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor4LeftTex" OutName="fire_temple_pause_screen_map_floor_4_left" Format="ci4" Width="48" Height="85" Offset="0xDF20"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor4RightTex" OutName="fire_temple_pause_screen_map_floor_4_right" Format="ci4" Width="48" Height="85" Offset="0xE718"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor3LeftTex" OutName="fire_temple_pause_screen_map_floor_3_left" Format="ci4" Width="48" Height="85" Offset="0xEF10"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor3RightTex" OutName="fire_temple_pause_screen_map_floor_3_right" Format="ci4" Width="48" Height="85" Offset="0xF708"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor2LeftTex" OutName="fire_temple_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85" Offset="0xFF00"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor2RightTex" OutName="fire_temple_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85" Offset="0x106F8"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor1LeftTex" OutName="fire_temple_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x10EF0"/>
+        <Texture Name="gFireTemplePauseScreenMapFloor1RightTex" OutName="fire_temple_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x116E8"/>
+        <Texture Name="gWaterTemplePauseScreenMapFloor3LeftTex" OutName="water_temple_pause_screen_map_floor_3_left" Format="ci4" Width="48" Height="85" Offset="0x11EE0"/>
+        <Texture Name="gWaterTemplePauseScreenMapFloor3RightTex" OutName="water_temple_pause_screen_map_floor_3_right" Format="ci4" Width="48" Height="85" Offset="0x126D8"/>
+        <Texture Name="gWaterTemplePauseScreenMapFloor2LeftTex" OutName="water_temple_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85" Offset="0x12ED0"/>
+        <Texture Name="gWaterTemplePauseScreenMapFloor2RightTex" OutName="water_temple_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85" Offset="0x136C8"/>
+        <Texture Name="gWaterTemplePauseScreenMapFloor1LeftTex" OutName="water_temple_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x13EC0"/>
+        <Texture Name="gWaterTemplePauseScreenMapFloor1RightTex" OutName="water_temple_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x146B8"/>
+        <Texture Name="gWaterTemplePauseScreenMapBasement1LeftTex" OutName="water_temple_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85" Offset="0x14EB0"/>
+        <Texture Name="gWaterTemplePauseScreenMapBasement1RightTex" OutName="water_temple_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85" Offset="0x156A8"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor4LeftTex" OutName="spirit_temple_pause_screen_map_floor_4_left" Format="ci4" Width="48" Height="85" Offset="0x15EA0"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor4RightTex" OutName="spirit_temple_pause_screen_map_floor_4_right" Format="ci4" Width="48" Height="85" Offset="0x16698"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor3LeftTex" OutName="spirit_temple_pause_screen_map_floor_3_left" Format="ci4" Width="48" Height="85" Offset="0x16E90"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor3RightTex" OutName="spirit_temple_pause_screen_map_floor_3_right" Format="ci4" Width="48" Height="85" Offset="0x17688"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor2LeftTex" OutName="spirit_temple_pause_screen_map_floor_2_left" Format="ci4" Width="48" Height="85" Offset="0x17E80"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor2RightTex" OutName="spirit_temple_pause_screen_map_floor_2_right" Format="ci4" Width="48" Height="85" Offset="0x18678"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor1LeftTex" OutName="spirit_temple_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x18E70"/>
+        <Texture Name="gSpiritTemplePauseScreenMapFloor1RightTex" OutName="spirit_temple_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x19668"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement1LeftTex" OutName="shadow_temple_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85" Offset="0x19E60"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement1RightTex" OutName="shadow_temple_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85" Offset="0x1A658"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement2LeftTex" OutName="shadow_temple_pause_screen_map_basement_2_left" Format="ci4" Width="48" Height="85" Offset="0x1AE50"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement2RightTex" OutName="shadow_temple_pause_screen_map_basement_2_right" Format="ci4" Width="48" Height="85" Offset="0x1B648"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement3LeftTex" OutName="shadow_temple_pause_screen_map_basement_3_left" Format="ci4" Width="48" Height="85" Offset="0x1BE40"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement3RightTex" OutName="shadow_temple_pause_screen_map_basement_3_right" Format="ci4" Width="48" Height="85" Offset="0x1C638"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement4LeftTex" OutName="shadow_temple_pause_screen_map_basement_4_left" Format="ci4" Width="48" Height="85" Offset="0x1CE30"/>
+        <Texture Name="gShadowTemplePauseScreenMapBasement4RightTex" OutName="shadow_temple_pause_screen_map_basement_4_right" Format="ci4" Width="48" Height="85" Offset="0x1D628"/>
+        <Texture Name="gBottomOfTheWellPauseScreenMapBasement1LeftTex" OutName="bottom_of_the_well_pause_screen_map_basement_1_left" Format="ci4" Width="48" Height="85" Offset="0x1DE20"/>
+        <Texture Name="gBottomOfTheWellPauseScreenMapBasement1RightTex" OutName="bottom_of_the_well_pause_screen_map_basement_1_right" Format="ci4" Width="48" Height="85" Offset="0x1E618"/>
+        <Texture Name="gBottomOfTheWellPauseScreenMapBasement2LeftTex" OutName="bottom_of_the_well_pause_screen_map_basement_2_left" Format="ci4" Width="48" Height="85" Offset="0x1EE10"/>
+        <Texture Name="gBottomOfTheWellPauseScreenMapBasement2RightTex" OutName="bottom_of_the_well_pause_screen_map_basement_2_right" Format="ci4" Width="48" Height="85" Offset="0x1F608"/>
+        <Texture Name="gBottomOfTheWellPauseScreenMapBasement3LeftTex" OutName="bottom_of_the_well_pause_screen_map_basement_3_left" Format="ci4" Width="48" Height="85" Offset="0x1FE00"/>
+        <Texture Name="gBottomOfTheWellPauseScreenMapBasement3RightTex" OutName="bottom_of_the_well_pause_screen_map_basement_3_right" Format="ci4" Width="48" Height="85" Offset="0x205F8"/>
+        <Texture Name="gIceCavernPauseScreenMapFloor1LeftTex" OutName="ice_cavern_pause_screen_map_floor_1_left" Format="ci4" Width="48" Height="85" Offset="0x20DF0"/>
+        <Texture Name="gIceCavernPauseScreenMapFloor1RightTex" OutName="ice_cavern_pause_screen_map_floor_1_right" Format="ci4" Width="48" Height="85" Offset="0x215E8"/>
     </File>
-</Root>
+</Root>
\ No newline at end of file

From bcd57f45b2cf5e553bd5d8dbc0848e26304d9a0b Mon Sep 17 00:00:00 2001
From: Ada <60364512+GreatArgorath@users.noreply.github.com>
Date: Fri, 13 May 2022 01:46:05 +0100
Subject: [PATCH 27/43] Corrects tooltip on otrgui (#305)

Previously said Master Quest rom would work, this removes that and replaces it with GameCube PAL support
---
 OTRGui/src/game/game.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OTRGui/src/game/game.cpp b/OTRGui/src/game/game.cpp
index e995b339c..022a7788e 100644
--- a/OTRGui/src/game/game.cpp
+++ b/OTRGui/src/game/game.cpp
@@ -188,7 +188,7 @@ void OTRGame::draw() {
 		sohFolder = path;
 	}
 
-	if (UIUtils::GuiIconButton("Cartridge", "Open\nOoT Rom", 32, 50, currentStep != NULLSTR, "Select an Ocarina of Time\nMaster Quest or Vanilla Debug Rom\n\nYou can dump it or lend one from Nintendo")) {
+	if (UIUtils::GuiIconButton("Cartridge", "Open\nOoT Rom", 32, 50, currentStep != NULLSTR, "Select an Ocarina of Time\nGameCube PAL or Vanilla Debug Rom\n\nYou can dump it or lend one from Nintendo")) {
 		const std::string path = NativeFS->LaunchFileExplorer(LaunchType::FILE);
 		if (path != NULLSTR) {
 			const std::string patched_n64 = std::string(patched_rom);

From 45e5e5ca720100e22a1e32dba5c84c3f11cbadcd Mon Sep 17 00:00:00 2001
From: Emill <emil.lenngren@gmail.com>
Date: Sat, 14 May 2022 00:43:55 +0200
Subject: [PATCH 28/43] Experimental interpolation (#309)

* Experimental 60 fps

* Fix compile error

* Fix compile error

* Fix compile error
---
 .../libultraship/Lib/Fast3D/gfx_pc.cpp        |  54 +-
 libultraship/libultraship/Lib/Fast3D/gfx_pc.h |  14 +-
 libultraship/libultraship/SohImGuiImpl.cpp    |   1 +
 libultraship/libultraship/Window.cpp          |   8 +-
 libultraship/libultraship/Window.h            |   2 +-
 soh/include/macros.h                          |   8 +
 soh/include/z64effect.h                       |   1 +
 soh/soh.vcxproj                               |   2 +
 soh/soh.vcxproj.filters                       |   4 +
 soh/soh/Enhancements/debugger/colViewer.cpp   |   1 +
 soh/soh/OTRGlobals.cpp                        |  13 +-
 soh/soh/frame_interpolation.cpp               | 732 ++++++++++++++++++
 soh/soh/frame_interpolation.h                 |  61 ++
 soh/src/code/sys_matrix.c                     |  22 +-
 soh/src/code/z_actor.c                        |   8 +
 soh/src/code/z_camera.c                       |   5 +
 soh/src/code/z_eff_blure.c                    |   4 +
 soh/src/code/z_eff_shield_particle.c          |   4 +
 soh/src/code/z_eff_spark.c                    |   4 +
 soh/src/code/z_effect_soft_sprite.c           |   5 +
 soh/src/code/z_lights.c                       |   4 +
 soh/src/code/z_play.c                         |   4 +
 soh/src/code/z_skin_matrix.c                  |   3 +
 soh/src/code/z_view.c                         | 109 ++-
 soh/src/code/z_vr_box_draw.c                  |   5 +-
 soh/src/libultra/gu/guLookAt.c                |   3 +-
 soh/src/libultra/gu/guPerspectiveF.c          |   4 +-
 soh/src/libultra/gu/ortho.c                   |   7 +-
 .../ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c   |  10 +-
 .../z_bg_hidan_rsekizou.c                     |   3 +-
 .../overlays/actors/ovl_Boss_Fd/z_boss_fd.c   |  16 +
 .../overlays/actors/ovl_Boss_Fd/z_boss_fd.h   |   1 +
 .../overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c |   5 +
 .../actors/ovl_Boss_Ganon/z_boss_ganon.c      |  29 +
 .../actors/ovl_Boss_Ganon/z_boss_ganon.h      |   1 +
 .../overlays/actors/ovl_Boss_Mo/z_boss_mo.c   |  17 +
 .../overlays/actors/ovl_Boss_Va/z_boss_va.c   |  20 +
 soh/src/overlays/actors/ovl_En_Zo/z_en_zo.c   |  11 +
 soh/src/overlays/actors/ovl_En_Zo/z_en_zo.h   |   1 +
 .../overlays/actors/ovl_Fishing/z_fishing.c   |  33 +
 .../ovl_Object_Kankyo/z_object_kankyo.c       |  11 +
 .../ovl_Object_Kankyo/z_object_kankyo.h       |   1 +
 .../ovl_kaleido_scope/z_kaleido_scope_PAL.c   |   4 +
 43 files changed, 1206 insertions(+), 49 deletions(-)
 create mode 100644 soh/soh/frame_interpolation.cpp
 create mode 100644 soh/soh/frame_interpolation.h

diff --git a/libultraship/libultraship/Lib/Fast3D/gfx_pc.cpp b/libultraship/libultraship/Lib/Fast3D/gfx_pc.cpp
index da39c0a4d..6f7e8c271 100644
--- a/libultraship/libultraship/Lib/Fast3D/gfx_pc.cpp
+++ b/libultraship/libultraship/Lib/Fast3D/gfx_pc.cpp
@@ -190,8 +190,12 @@ static int game_framebuffer_msaa_resolved;
 
 uint32_t gfx_msaa_level = 1;
 
+static bool has_drawn_imgui_menu;
+
 static bool dropped_frame;
 
+static const std::unordered_map<Mtx *, MtxF> *current_mtx_replacements;
+
 static float buf_vbo[MAX_BUFFERED * (32 * 3)]; // 3 vertices in a triangle and 32 floats per vtx
 static size_t buf_vbo_len;
 static size_t buf_vbo_num_tris;
@@ -916,20 +920,31 @@ static void gfx_matrix_mul(float res[4][4], const float a[4][4], const float b[4
 
 static void gfx_sp_matrix(uint8_t parameters, const int32_t *addr) {
     float matrix[4][4];
-#ifndef GBI_FLOATS
-    // Original GBI where fixed point matrices are used
-    for (int i = 0; i < 4; i++) {
-        for (int j = 0; j < 4; j += 2) {
-            int32_t int_part = addr[i * 2 + j / 2];
-            uint32_t frac_part = addr[8 + i * 2 + j / 2];
-            matrix[i][j] = (int32_t)((int_part & 0xffff0000) | (frac_part >> 16)) / 65536.0f;
-            matrix[i][j + 1] = (int32_t)((int_part << 16) | (frac_part & 0xffff)) / 65536.0f;
+
+    if (auto it = current_mtx_replacements->find((Mtx *)addr); it != current_mtx_replacements->end()) {
+        for (int i = 0; i < 4; i++) {
+            for (int j = 0; j < 4; j++) {
+                float v = it->second.mf[i][j];
+                int as_int = (int)(v * 65536.0f);
+                matrix[i][j] = as_int * (1.0f / 65536.0f);
+            }
+        }
+    } else {
+#ifndef GBI_FLOATS
+        // Original GBI where fixed point matrices are used
+        for (int i = 0; i < 4; i++) {
+            for (int j = 0; j < 4; j += 2) {
+                int32_t int_part = addr[i * 2 + j / 2];
+                uint32_t frac_part = addr[8 + i * 2 + j / 2];
+                matrix[i][j] = (int32_t)((int_part & 0xffff0000) | (frac_part >> 16)) / 65536.0f;
+                matrix[i][j + 1] = (int32_t)((int_part << 16) | (frac_part & 0xffff)) / 65536.0f;
+            }
         }
-    }
 #else
-    // For a modified GBI where fixed point values are replaced with floats
-    memcpy(matrix, addr, sizeof(matrix));
+        // For a modified GBI where fixed point values are replaced with floats
+        memcpy(matrix, addr, sizeof(matrix));
 #endif
+    }
 
     if (parameters & G_MTX_PROJECTION) {
         if (parameters & G_MTX_LOAD) {
@@ -2708,6 +2723,7 @@ void gfx_start_frame(void) {
     gfx_wapi->handle_events();
     gfx_wapi->get_dimensions(&gfx_current_window_dimensions.width, &gfx_current_window_dimensions.height);
     SohImGui::DrawMainMenuAndCalculateGameSize();
+    has_drawn_imgui_menu = true;
     if (gfx_current_dimensions.height == 0) {
         // Avoid division by zero
         gfx_current_dimensions.height = 1;
@@ -2746,7 +2762,7 @@ void gfx_start_frame(void) {
     fbActive = 0;
 }
 
-void gfx_run(Gfx *commands) {
+void gfx_run(Gfx *commands, const std::unordered_map<Mtx *, MtxF>& mtx_replacements) {
     gfx_sp_reset();
 
     //puts("New frame");
@@ -2755,12 +2771,21 @@ void gfx_run(Gfx *commands) {
 
     if (!gfx_wapi->start_frame()) {
         dropped_frame = true;
-        SohImGui::DrawFramebufferAndGameInput();
-        SohImGui::CancelFrame();
+        if (has_drawn_imgui_menu) {
+            SohImGui::DrawFramebufferAndGameInput();
+            SohImGui::CancelFrame();
+            has_drawn_imgui_menu = false;
+        }
         return;
     }
     dropped_frame = false;
 
+    if (!has_drawn_imgui_menu) {
+        SohImGui::DrawMainMenuAndCalculateGameSize();
+    }
+
+    current_mtx_replacements = &mtx_replacements;
+
     double t0 = gfx_wapi->get_time();
     gfx_rapi->update_framebuffer_parameters(0, gfx_current_window_dimensions.width, gfx_current_window_dimensions.height, 1, false, true, true, !game_renders_to_framebuffer);
     gfx_rapi->start_frame();
@@ -2792,6 +2817,7 @@ void gfx_run(Gfx *commands) {
     //printf("Process %f %f\n", t1, t1 - t0);
     gfx_rapi->end_frame();
     gfx_wapi->swap_buffers_begin();
+    has_drawn_imgui_menu = false;
 }
 
 void gfx_end_frame(void) {
diff --git a/libultraship/libultraship/Lib/Fast3D/gfx_pc.h b/libultraship/libultraship/Lib/Fast3D/gfx_pc.h
index d9cd9be8d..62f80ab3c 100644
--- a/libultraship/libultraship/Lib/Fast3D/gfx_pc.h
+++ b/libultraship/libultraship/Lib/Fast3D/gfx_pc.h
@@ -6,6 +6,8 @@
 #include <unordered_map>
 #include <list>
 
+#include "U64/PR/ultra64/types.h"
+
 struct GfxRenderingAPI;
 struct GfxWindowManagerAPI;
 
@@ -52,26 +54,24 @@ struct TextureCacheValue {
 #endif
 };
 
-#ifdef __cplusplus
 extern "C" {
-#endif
+
 extern struct GfxDimensions gfx_current_window_dimensions; // The dimensions of the window
 extern struct GfxDimensions gfx_current_dimensions; // The dimensions of the draw area the game draws to, before scaling (if applicable)
 extern struct XYWidthHeight gfx_current_game_window_viewport; // The area of the window the game is drawn to, (0, 0) is top-left corner
 extern uint32_t gfx_msaa_level;
 
+}
+
 void gfx_init(struct GfxWindowManagerAPI* wapi, struct GfxRenderingAPI* rapi, const char* game_name, bool start_in_fullscreen);
 struct GfxRenderingAPI* gfx_get_current_rendering_api(void);
 void gfx_start_frame(void);
-void gfx_run(Gfx* commands);
+void gfx_run(Gfx* commands, const std::unordered_map<Mtx*, MtxF>& mtx_replacements);
 void gfx_end_frame(void);
 void gfx_set_framedivisor(int);
 void gfx_texture_cache_clear();
-int gfx_create_framebuffer(uint32_t width, uint32_t height);
+extern "C" int gfx_create_framebuffer(uint32_t width, uint32_t height);
 void gfx_get_pixel_depth_prepare(float x, float y);
 uint16_t gfx_get_pixel_depth(float x, float y);
 
-#ifdef __cplusplus
-}
-#endif
 #endif
diff --git a/libultraship/libultraship/SohImGuiImpl.cpp b/libultraship/libultraship/SohImGuiImpl.cpp
index 72d9cee1a..785a29dee 100644
--- a/libultraship/libultraship/SohImGuiImpl.cpp
+++ b/libultraship/libultraship/SohImGuiImpl.cpp
@@ -681,6 +681,7 @@ namespace SohImGui {
 
                 EXPERIMENTAL();
 
+                EnhancementCheckbox("60 fps interpolation", "g60FPS");
                 EnhancementCheckbox("Disable LOD", "gDisableLOD");
 
                 ImGui::EndMenu();
diff --git a/libultraship/libultraship/Window.cpp b/libultraship/libultraship/Window.cpp
index 35a95f0de..588e3af50 100644
--- a/libultraship/libultraship/Window.cpp
+++ b/libultraship/libultraship/Window.cpp
@@ -282,8 +282,12 @@ namespace Ship {
         gfx_start_frame();
     }
 
-    void Window::RunCommands(Gfx* Commands) {
-        gfx_run(Commands);
+    void Window::RunCommands(Gfx* Commands, const std::vector<std::unordered_map<Mtx*, MtxF>>& mtx_replacements) {
+        for (const auto& m : mtx_replacements) {
+            gfx_run(Commands, m);
+            gfx_end_frame();
+        }
+        gfx_run(Commands, {});
         gfx_end_frame();
     }
 
diff --git a/libultraship/libultraship/Window.h b/libultraship/libultraship/Window.h
index b075e496f..04886c53e 100644
--- a/libultraship/libultraship/Window.h
+++ b/libultraship/libultraship/Window.h
@@ -19,7 +19,7 @@ namespace Ship {
 			void MainLoop(void (*MainFunction)(void));
 			void Init();
 			void StartFrame();
-			void RunCommands(Gfx* Commands);
+			void RunCommands(Gfx* Commands, const std::vector<std::unordered_map<Mtx*, MtxF>>& mtx_replacements);
 			void SetFrameDivisor(int divisor);
 			void GetPixelDepthPrepare(float x, float y);
 			uint16_t GetPixelDepth(float x, float y);
diff --git a/soh/include/macros.h b/soh/include/macros.h
index a621a65f8..7392274d9 100644
--- a/soh/include/macros.h
+++ b/soh/include/macros.h
@@ -138,6 +138,8 @@ extern GraphicsContext* __gfxCtx;
 #ifndef NDEBUG
 #define OPEN_DISPS(gfxCtx, file, line) \
     { \
+        void FrameInterpolation_RecordOpenChild(const void* a, int b); \
+        FrameInterpolation_RecordOpenChild(file, line); \
         GraphicsContext* __gfxCtx; \
         Gfx* dispRefs[4]; \
         __gfxCtx = gfxCtx; \
@@ -146,6 +148,8 @@ extern GraphicsContext* __gfxCtx;
 #else
 #define OPEN_DISPS(gfxCtx, file, line) \
     { \
+        void FrameInterpolation_RecordOpenChild(const void* a, int b); \
+        FrameInterpolation_RecordOpenChild(file, line); \
         GraphicsContext* __gfxCtx; \
         __gfxCtx = gfxCtx; \
         (void)__gfxCtx;
@@ -153,11 +157,15 @@ extern GraphicsContext* __gfxCtx;
 
 #ifndef NDEBUG
 #define CLOSE_DISPS(gfxCtx, file, line) \
+    {void FrameInterpolation_RecordCloseChild(void); \
+    FrameInterpolation_RecordCloseChild();} \
     Graph_CloseDisps(dispRefs, gfxCtx, file, line); \
     } \
     (void)0
 #else
 #define CLOSE_DISPS(gfxCtx, file, line) \
+    {void FrameInterpolation_RecordCloseChild(void); \
+    FrameInterpolation_RecordCloseChild();} \
     (void)0; \
     } \
     (void)0
diff --git a/soh/include/z64effect.h b/soh/include/z64effect.h
index c85c9d617..1b35d46b6 100644
--- a/soh/include/z64effect.h
+++ b/soh/include/z64effect.h
@@ -225,6 +225,7 @@ typedef struct EffectSs {
     /* 0x5C */ s16 life; // -1 means this entry is free
     /* 0x5E */ u8 priority; // Lower value means higher priority
     /* 0x5F */ u8 type;
+    u32 epoch;
 } EffectSs; // size = 0x60
 
 typedef struct {
diff --git a/soh/soh.vcxproj b/soh/soh.vcxproj
index a395a22ce..0a2006122 100644
--- a/soh/soh.vcxproj
+++ b/soh/soh.vcxproj
@@ -173,6 +173,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="soh\frame_interpolation.cpp" />
     <ClCompile Include="soh\Enhancements\bootcommands.c" />
     <ClCompile Include="soh\Enhancements\debugconsole.cpp" />
     <ClCompile Include="soh\Enhancements\debugger\colViewer.cpp" />
@@ -878,6 +879,7 @@
     <ClCompile Include="src\overlays\misc\ovl_map_mark_data\z_map_mark_data.c" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="soh\frame_interpolation.h" />
     <ClInclude Include="include\alloca.h" />
     <ClInclude Include="include\bgm.h" />
     <ClInclude Include="include\color.h" />
diff --git a/soh/soh.vcxproj.filters b/soh/soh.vcxproj.filters
index b9d68b704..04f6030a8 100644
--- a/soh/soh.vcxproj.filters
+++ b/soh/soh.vcxproj.filters
@@ -2186,6 +2186,8 @@
     </ClCompile>
     <ClCompile Include="soh\Enhancements\debugger\ImGuiHelpers.cpp">
       <Filter>Source Files\soh\Enhancements\debugger</Filter>
+    <ClCompile Include="soh\frame_interpolation.cpp">
+      <Filter>Source Files\soh</Filter>
     </ClCompile>
     <ClCompile Include="src\code\z_cheap_proc.c">
       <Filter>Source Files</Filter>
@@ -3748,6 +3750,8 @@
     </ClInclude>
     <ClInclude Include="soh\Enhancements\debugger\ImGuiHelpers.h">
       <Filter>Header Files\soh\Enhancements\debugger</Filter>
+    <ClInclude Include="soh\frame_interpolation.h">
+      <Filter>Header Files\soh</Filter>
     </ClInclude>
     <ClInclude Include="soh\Enhancements\savestates.h">
       <Filter>Source Files\soh\Enhancements</Filter>
diff --git a/soh/soh/Enhancements/debugger/colViewer.cpp b/soh/soh/Enhancements/debugger/colViewer.cpp
index ed0fe0b56..f5c283aac 100644
--- a/soh/soh/Enhancements/debugger/colViewer.cpp
+++ b/soh/soh/Enhancements/debugger/colViewer.cpp
@@ -1,6 +1,7 @@
 #include "colViewer.h"
 #include "../libultraship/SohImGuiImpl.h"
 #include "ImGuiHelpers.h"
+#include "../../frame_interpolation.h"
 
 #include <vector>
 #include <string>
diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp
index 7456ebf7e..e8e1b31c1 100644
--- a/soh/soh/OTRGlobals.cpp
+++ b/soh/soh/OTRGlobals.cpp
@@ -29,6 +29,7 @@
 #include "AudioPlayer.h"
 #include "Enhancements/debugconsole.h"
 #include "Enhancements/debugger/debugger.h"
+#include "soh/frame_interpolation.h"
 #include "Utils/BitConverter.h"
 #include "variables.h"
 #include "macros.h"
@@ -174,7 +175,7 @@ extern "C" void Graph_StartFrame() {
 
 // C->C++ Bridge
 extern "C" void Graph_ProcessGfxCommands(Gfx* commands) {
-    OTRGlobals::Instance->context->GetWindow()->SetFrameDivisor(R_UPDATE_RATE);
+    OTRGlobals::Instance->context->GetWindow()->SetFrameDivisor(CVar_GetS32("g60FPS", 0) == 0 ? R_UPDATE_RATE : 1);
 
     if (!audio.initialized) {
         audio.initialized = true;
@@ -224,7 +225,15 @@ extern "C" void Graph_ProcessGfxCommands(Gfx* commands) {
     }
     audio.cv_to_thread.notify_one();
 
-    OTRGlobals::Instance->context->GetWindow()->RunCommands(commands);
+    std::vector<std::unordered_map<Mtx*, MtxF>> mtx_replacements;
+    if (CVar_GetS32("g60FPS", 0) != 0) {
+        int to = R_UPDATE_RATE;
+        for (int i = 1; i < to; i++) {
+            mtx_replacements.push_back(FrameInterpolation_Interpolate(i / (float)to));
+        }
+    }
+
+    OTRGlobals::Instance->context->GetWindow()->RunCommands(commands, mtx_replacements);
 
     {
         std::unique_lock<std::mutex> Lock(audio.mutex);
diff --git a/soh/soh/frame_interpolation.cpp b/soh/soh/frame_interpolation.cpp
new file mode 100644
index 000000000..bd85d41ce
--- /dev/null
+++ b/soh/soh/frame_interpolation.cpp
@@ -0,0 +1,732 @@
+#include "Cvar.h"
+
+#include <vector>
+#include <map>
+#include <unordered_map>
+#include <math.h>
+
+#include "frame_interpolation.h"
+
+/*
+Frame interpolation.
+
+The idea of this code is to interpolate all matrices.
+
+The code contains two approaches. The first is to interpolate
+all inputs in transformations, such as angles, scale and distances,
+and then perform the same transformations with the interpolated values.
+After evaluation for some reason some animations such rolling look strange.
+
+The second approach is to simply interpolate the final matrices. This will
+more or less simply interpolate the world coordinates for movements.
+This will however make rotations ~180 degrees get the "paper effect".
+The mitigation is to identify this case for actors and interpolate the
+matrix but in model coordinates instead, by "removing" the rotation-
+translation before interpolating, create a rotation matrix with the
+interpolated angle which is then applied to the matrix.
+
+Currently the code contains both methods but only the second one is currently
+used.
+
+Both approaches build a tree of instructions, containing matrices
+at leaves. Every node is built from OPEN_DISPS/CLOSE_DISPS and manually
+inserted FrameInterpolation_OpenChild/FrameInterpolation_Close child calls.
+These nodes contain information that should suffice to identify the matrix,
+so we can find it in an adjacent frame.
+
+We can interpolate an arbitrary amount of frames between two original frames,
+given a specific interpolation factor (0=old frame, 0.5=average of frames,
+1.0=new frame).
+*/
+
+extern "C" {
+
+void Matrix_Init(struct GameState* gameState);
+void Matrix_Push(void);
+void Matrix_Pop(void);
+void Matrix_Get(MtxF* dest);
+void Matrix_Put(MtxF* src);
+void Matrix_Mult(MtxF* mf, u8 mode);
+void Matrix_Translate(f32 x, f32 y, f32 z, u8 mode);
+void Matrix_Scale(f32 x, f32 y, f32 z, u8 mode);
+void Matrix_RotateX(f32 x, u8 mode);
+void Matrix_RotateY(f32 y, u8 mode);
+void Matrix_RotateZ(f32 z, u8 mode);
+void Matrix_RotateZYX(s16 x, s16 y, s16 z, u8 mode);
+void Matrix_TranslateRotateZYX(Vec3f* translation, Vec3s* rotation);
+void Matrix_SetTranslateRotateYXZ(f32 translateX, f32 translateY, f32 translateZ, Vec3s* rot);
+Mtx* Matrix_MtxFToMtx(MtxF* src, Mtx* dest);
+Mtx* Matrix_ToMtx(Mtx* dest, char* file, s32 line);
+Mtx* Matrix_NewMtx(struct GraphicsContext* gfxCtx, char* file, s32 line);
+Mtx* Matrix_MtxFToNewMtx(MtxF* src, struct GraphicsContext* gfxCtx);
+void Matrix_MultVec3f(Vec3f* src, Vec3f* dest);
+void Matrix_MtxFCopy(MtxF* dest, MtxF* src);
+void Matrix_MtxToMtxF(Mtx* src, MtxF* dest);
+void Matrix_MultVec3fExt(Vec3f* src, Vec3f* dest, MtxF* mf);
+void Matrix_Transpose(MtxF* mf);
+void Matrix_ReplaceRotation(MtxF* mf);
+void Matrix_MtxFToYXZRotS(MtxF* mf, Vec3s* rotDest, s32 flag);
+void Matrix_MtxFToZYXRotS(MtxF* mf, Vec3s* rotDest, s32 flag);
+void Matrix_RotateAxis(f32 angle, Vec3f* axis, u8 mode);
+MtxF* Matrix_CheckFloats(MtxF* mf, char* file, s32 line);
+void Matrix_SetTranslateScaleMtx2(Mtx* mtx, f32 scaleX, f32 scaleY, f32 scaleZ, f32 translateX, f32 translateY,
+                                  f32 translateZ);
+
+MtxF* Matrix_GetCurrent(void);
+
+void SkinMatrix_MtxFMtxFMult(MtxF* mfA, MtxF* mfB, MtxF* dest);
+
+}
+
+static bool invert_matrix(const float m[16], float invOut[16]);
+
+using namespace std;
+
+namespace {
+
+    enum class Op {
+        OpenChild,
+        CloseChild,
+
+        MatrixPush,
+        MatrixPop,
+        MatrixPut,
+        MatrixMult,
+        MatrixTranslate,
+        MatrixScale,
+        MatrixRotate1Coord,
+        MatrixRotateZYX,
+        MatrixTranslateRotateZYX,
+        MatrixSetTranslateRotateYXZ,
+        MatrixMtxFToMtx,
+        MatrixToMtx,
+        MatrixReplaceRotation,
+        MatrixRotateAxis,
+        SkinMatrixMtxFToMtx
+    };
+
+    typedef pair<const void*, int> label;
+
+    union Data {
+        Data() {
+        }
+
+        struct {
+            MtxF src;
+        } matrix_put;
+
+        struct {
+            MtxF mf;
+            u8 mode;
+        } matrix_mult;
+
+        struct {
+            f32 x, y, z;
+            u8 mode;
+        } matrix_translate, matrix_scale;
+
+        struct {
+            u32 coord;
+            f32 value;
+            u8 mode;
+        } matrix_rotate_1_coord;
+
+        struct {
+            s16 x, y, z;
+            u8 mode;
+        } matrix_rotate_zyx;
+
+        struct {
+            Vec3f translation;
+            Vec3s rotation;
+        } matrix_translate_rotate_zyx;
+
+        struct {
+            f32 translateX, translateY, translateZ;
+            Vec3s rot;
+            //MtxF mtx;
+            bool has_mtx;
+        } matrix_set_translate_rotate_yxz;
+
+        struct {
+            MtxF src;
+            Mtx* dest;
+        } matrix_mtxf_to_mtx;
+
+        struct {
+            Mtx* dest;
+            MtxF src;
+            bool has_adjusted;
+        } matrix_to_mtx;
+
+        struct {
+            MtxF mf;
+        } matrix_replace_rotation;
+
+        struct {
+            f32 angle;
+            Vec3f axis;
+            u8 mode;
+        } matrix_rotate_axis;
+
+        struct {
+            label key;
+            size_t idx;
+        } open_child;
+    };
+
+    struct Path {
+        map<label, vector<Path>> children;
+        map<Op, vector<Data>> ops;
+        vector<pair<Op, size_t>> items;
+    };
+
+    struct Recording {
+        Path root_path;
+    };
+
+    bool is_recording;
+    vector<Path*> current_path;
+    uint32_t camera_epoch;
+    uint32_t previous_camera_epoch;
+    Recording current_recording;
+    Recording previous_recording;
+
+    bool next_is_actor_pos_rot_matrix;
+    bool has_inv_actor_mtx;
+    MtxF inv_actor_mtx;
+    size_t inv_actor_mtx_path_index;
+
+    Data& append(Op op) {
+        auto& m = current_path.back()->ops[op];
+        current_path.back()->items.emplace_back(op, m.size());
+        return m.emplace_back();
+    }
+
+    struct InterpolateCtx {
+        float step;
+        float w;
+        unordered_map<Mtx*, MtxF> mtx_replacements;
+        MtxF tmp_mtxf, tmp_mtxf2;
+        Vec3f tmp_vec3f;
+        Vec3s tmp_vec3s;
+        MtxF actor_mtx;
+
+        MtxF* new_replacement(Mtx* addr) {
+            return &mtx_replacements[addr];
+        }
+
+        void interpolate_mtxf(MtxF* res, MtxF* o, MtxF* n) {
+            for (size_t i = 0; i < 4; i++) {
+                for (size_t j = 0; j < 4; j++) {
+                    res->mf[i][j] = w * o->mf[i][j] + step * n->mf[i][j];
+                }
+            }
+        }
+
+        float lerp(f32 o, f32 n) {
+            return w * o + step * n;
+        }
+
+        void lerp_vec3f(Vec3f* res, Vec3f* o, Vec3f* n) {
+            res->x = lerp(o->x, n->x);
+            res->y = lerp(o->y, n->y);
+            res->z = lerp(o->z, n->z);
+        }
+
+        float interpolate_angle(f32 o, f32 n) {
+            if (o == n)
+                return n;
+            o = fmodf(o, 2 * M_PI);
+            if (o < 0.0f) {
+                o += 2 * M_PI;
+            }
+            n = fmodf(n, 2 * M_PI);
+            if (n < 0.0f) {
+                n += 2 * M_PI;
+            }
+            if (fabsf(o - n) > M_PI) {
+                if (o < n) {
+                    o += 2 * M_PI;
+                } else {
+                    n += 2 * M_PI;
+                }
+            }
+            if (fabsf(o - n) > M_PI / 2) {
+                //return n;
+            }
+            return lerp(o, n);
+        }
+
+        s16 interpolate_angle(s16 os, s16 ns) {
+            if (os == ns)
+                return ns;
+            int o = (u16)os;
+            int n = (u16)ns;
+            u16 res;
+            int diff = o - n;
+            if (-0x8000 <= diff && diff <= 0x8000) {
+                if (diff < -0x4000 || diff > 0x4000) {
+                    return ns;
+                }
+                res = (u16)(w * o + step * n);
+            } else {
+                if (o < n) {
+                    o += 0x10000;
+                } else {
+                    n += 0x10000;
+                }
+                diff = o - n;
+                if (diff < -0x4000 || diff > 0x4000) {
+                    return ns;
+                }
+                res = (u16)(w * o + step * n);
+            }
+            if (os / 327 == ns / 327 && (s16)res / 327 != os / 327) {
+                int bp = 0;
+            }
+            return res;
+        }
+
+        void interpolate_angles(Vec3s* res, Vec3s* o, Vec3s* n) {
+            res->x = interpolate_angle(o->x, n->x);
+            res->y = interpolate_angle(o->y, n->y);
+            res->z = interpolate_angle(o->z, n->z);
+        }
+
+        void interpolate_branch(Path* old_path, Path *new_path) {
+            for (auto& item : new_path->items) {
+                Data& new_op = new_path->ops[item.first][item.second];
+
+                if (item.first == Op::OpenChild) {
+                    if (auto it = old_path->children.find(new_op.open_child.key);
+                        it != old_path->children.end() && new_op.open_child.idx < it->second.size()) {
+                        interpolate_branch(&it->second[new_op.open_child.idx],
+                                            &new_path->children.find(new_op.open_child.key)->second[new_op.open_child.idx]);
+                    } else {
+                        interpolate_branch(
+                            &new_path->children.find(new_op.open_child.key)->second[new_op.open_child.idx],
+                            &new_path->children.find(new_op.open_child.key)->second[new_op.open_child.idx]);
+                    }
+                    continue;
+                }
+
+                if (auto it = old_path->ops.find(item.first); it != old_path->ops.end()) {
+                    if (item.second < it->second.size()) {
+                        Data& old_op = it->second[item.second];
+                        switch (item.first) {
+                            case Op::OpenChild:
+                                break;
+                            case Op::CloseChild:
+                                break;
+
+                            case Op::MatrixPush:
+                                Matrix_Push();
+                                break;
+
+                            case Op::MatrixPop:
+                                Matrix_Pop();
+                                break;
+
+                            case Op::MatrixPut:
+                                interpolate_mtxf(&tmp_mtxf, &old_op.matrix_put.src, &new_op.matrix_put.src);
+                                Matrix_Put(&tmp_mtxf);
+                                break;
+
+                            case Op::MatrixMult:
+                                interpolate_mtxf(&tmp_mtxf, &old_op.matrix_mult.mf, &new_op.matrix_mult.mf);
+                                Matrix_Mult(&tmp_mtxf, new_op.matrix_mult.mode);
+                                break;
+
+                            case Op::MatrixTranslate:
+                                Matrix_Translate(lerp(old_op.matrix_translate.x, new_op.matrix_translate.x),
+                                                 lerp(old_op.matrix_translate.y, new_op.matrix_translate.y),
+                                                 lerp(old_op.matrix_translate.z, new_op.matrix_translate.z),
+                                                 new_op.matrix_translate.mode);
+                                break;
+
+                            case Op::MatrixScale:
+                                Matrix_Scale(lerp(old_op.matrix_scale.x, new_op.matrix_scale.x),
+                                             lerp(old_op.matrix_scale.y, new_op.matrix_scale.y),
+                                             lerp(old_op.matrix_scale.z, new_op.matrix_scale.z),
+                                             new_op.matrix_scale.mode);
+                                break;
+
+                            case Op::MatrixRotate1Coord: {
+                                float v = interpolate_angle(old_op.matrix_rotate_1_coord.value, new_op.matrix_rotate_1_coord.value);
+                                u8 mode = new_op.matrix_rotate_1_coord.mode;
+                                switch (new_op.matrix_rotate_1_coord.coord) {
+                                    case 0:
+                                        Matrix_RotateX(v, mode);
+                                        break;
+
+                                    case 1:
+                                        Matrix_RotateY(v, mode);
+                                        break;
+
+                                    case 2:
+                                        Matrix_RotateZ(v, mode);
+                                        break;
+                                }
+                                break;
+                            }
+
+                            case Op::MatrixRotateZYX:
+                                Matrix_RotateZYX(interpolate_angle(old_op.matrix_rotate_zyx.x, new_op.matrix_rotate_zyx.x),
+                                                 interpolate_angle(old_op.matrix_rotate_zyx.y, new_op.matrix_rotate_zyx.y),
+                                                 interpolate_angle(old_op.matrix_rotate_zyx.z, new_op.matrix_rotate_zyx.z),
+                                                 new_op.matrix_rotate_zyx.mode);
+                                break;
+
+                            case Op::MatrixTranslateRotateZYX:
+                                lerp_vec3f(&tmp_vec3f, &old_op.matrix_translate_rotate_zyx.translation, &new_op.matrix_translate_rotate_zyx.translation);
+                                interpolate_angles(&tmp_vec3s, &old_op.matrix_translate_rotate_zyx.rotation, &new_op.matrix_translate_rotate_zyx.rotation);
+                                Matrix_TranslateRotateZYX(&tmp_vec3f, &tmp_vec3s);
+                                break;
+
+                            case Op::MatrixSetTranslateRotateYXZ:
+                                interpolate_angles(&tmp_vec3s, &old_op.matrix_set_translate_rotate_yxz.rot,
+                                                               &new_op.matrix_set_translate_rotate_yxz.rot);
+                                Matrix_SetTranslateRotateYXZ(lerp(old_op.matrix_set_translate_rotate_yxz.translateX,
+                                                                  new_op.matrix_set_translate_rotate_yxz.translateX),
+                                                             lerp(old_op.matrix_set_translate_rotate_yxz.translateY,
+                                                                  new_op.matrix_set_translate_rotate_yxz.translateY),
+                                                             lerp(old_op.matrix_set_translate_rotate_yxz.translateZ,
+                                                                  new_op.matrix_set_translate_rotate_yxz.translateZ),
+                                                             &tmp_vec3s);
+                                if (new_op.matrix_set_translate_rotate_yxz.has_mtx && old_op.matrix_set_translate_rotate_yxz.has_mtx) {
+                                    actor_mtx = *Matrix_GetCurrent();
+                                }
+                                break;
+
+                            case Op::MatrixMtxFToMtx:
+                                interpolate_mtxf(new_replacement(new_op.matrix_mtxf_to_mtx.dest),
+                                                 &old_op.matrix_mtxf_to_mtx.src, &new_op.matrix_mtxf_to_mtx.src);
+                                break;
+
+                            case Op::MatrixToMtx: {
+                                //*new_replacement(new_op.matrix_to_mtx.dest) = *Matrix_GetCurrent();
+                                if (old_op.matrix_to_mtx.has_adjusted && new_op.matrix_to_mtx.has_adjusted) {
+                                    interpolate_mtxf(&tmp_mtxf, &old_op.matrix_to_mtx.src, &new_op.matrix_to_mtx.src);
+                                    SkinMatrix_MtxFMtxFMult(&actor_mtx, &tmp_mtxf, new_replacement(new_op.matrix_to_mtx.dest));
+                                } else {
+                                    interpolate_mtxf(new_replacement(new_op.matrix_to_mtx.dest),
+                                                     &old_op.matrix_to_mtx.src, &new_op.matrix_to_mtx.src);
+                                }
+                                break;
+                            }
+
+                            case Op::MatrixReplaceRotation:
+                                interpolate_mtxf(&tmp_mtxf, &old_op.matrix_replace_rotation.mf, &new_op.matrix_replace_rotation.mf);
+                                Matrix_ReplaceRotation(&tmp_mtxf);
+                                break;
+
+                            case Op::MatrixRotateAxis:
+                                lerp_vec3f(&tmp_vec3f, &old_op.matrix_rotate_axis.axis, &new_op.matrix_rotate_axis.axis);
+                                Matrix_RotateAxis(interpolate_angle(old_op.matrix_rotate_axis.angle, new_op.matrix_rotate_axis.angle),
+                                                  &tmp_vec3f, new_op.matrix_rotate_axis.mode);
+                                break;
+
+                            case Op::SkinMatrixMtxFToMtx:
+                                break;
+                        }
+                    }
+                }
+            }
+        }
+    };
+
+} // anonymous namespace
+
+unordered_map<Mtx*, MtxF> FrameInterpolation_Interpolate(float step) {
+    InterpolateCtx ctx;
+    ctx.step = step;
+    ctx.w = 1.0f - step;
+    ctx.interpolate_branch(&previous_recording.root_path, &current_recording.root_path);
+    return ctx.mtx_replacements;
+}
+
+void FrameInterpolation_StartRecord(void) {
+    previous_recording = move(current_recording);
+    current_recording = {};
+    current_path.clear();
+    current_path.push_back(&current_recording.root_path);
+    if (CVar_GetS32("g60FPS", 0) != 0) {
+        is_recording = true;
+    }
+}
+
+void FrameInterpolation_StopRecord(void) {
+    previous_camera_epoch = camera_epoch;
+    is_recording = false;
+}
+
+void FrameInterpolation_RecordOpenChild(const void* a, int b) {
+    if (!is_recording)
+        return;
+    label key = { a, b };
+    auto& m = current_path.back()->children[key];
+    append(Op::OpenChild).open_child = { key, m.size() };
+    current_path.push_back(&m.emplace_back());
+}
+
+void FrameInterpolation_RecordCloseChild(void) {
+    if (!is_recording)
+        return;
+    //append(Op::CloseChild);
+    if (has_inv_actor_mtx && current_path.size() == inv_actor_mtx_path_index) {
+        has_inv_actor_mtx = false;
+    }
+    current_path.pop_back();
+}
+
+void FrameInterpolation_DontInterpolateCamera(void) {
+    camera_epoch = previous_camera_epoch + 1;
+}
+
+int FrameInterpolation_GetCameraEpoch(void) {
+    return (int)camera_epoch;
+}
+
+void FrameInterpolation_RecordActorPosRotMatrix(void) {
+    if (!is_recording)
+        return;
+    next_is_actor_pos_rot_matrix = true;
+}
+
+void FrameInterpolation_RecordMatrixPush(void) {
+    if (!is_recording)
+        return;
+    append(Op::MatrixPush);
+}
+
+void FrameInterpolation_RecordMatrixPop(void) {
+    if (!is_recording)
+        return;
+    append(Op::MatrixPop);
+}
+
+void FrameInterpolation_RecordMatrixPut(MtxF* src) {
+    if (!is_recording)
+        return;
+    append(Op::MatrixPut).matrix_put = { *src };
+}
+
+void FrameInterpolation_RecordMatrixMult(MtxF* mf, u8 mode) {
+    if (!is_recording)
+        return;
+    append(Op::MatrixMult).matrix_mult = { *mf, mode };
+}
+
+void FrameInterpolation_RecordMatrixTranslate(f32 x, f32 y, f32 z, u8 mode) {
+    if (!is_recording)
+        return;
+    append(Op::MatrixTranslate).matrix_translate = { x, y, z, mode };
+}
+
+void FrameInterpolation_RecordMatrixScale(f32 x, f32 y, f32 z, u8 mode) {
+    if (!is_recording)
+        return;
+    append(Op::MatrixScale).matrix_scale = { x, y, z, mode };
+}
+
+void FrameInterpolation_RecordMatrixRotate1Coord(u32 coord, f32 value, u8 mode) {
+    if (!is_recording)
+        return;
+    append(Op::MatrixRotate1Coord).matrix_rotate_1_coord = { coord, value, mode };
+}
+
+void FrameInterpolation_RecordMatrixRotateZYX(s16 x, s16 y, s16 z, u8 mode) {
+    if (!is_recording)
+        return;
+    append(Op::MatrixRotateZYX).matrix_rotate_zyx = { x, y, z, mode };
+}
+
+void FrameInterpolation_RecordMatrixTranslateRotateZYX(Vec3f* translation, Vec3s* rotation) {
+    if (!is_recording)
+        return;
+    append(Op::MatrixTranslateRotateZYX).matrix_translate_rotate_zyx = { *translation, *rotation };
+}
+
+void FrameInterpolation_RecordMatrixSetTranslateRotateYXZ(f32 translateX, f32 translateY, f32 translateZ, Vec3s* rot) {
+    if (!is_recording)
+        return;
+    auto& d = append(Op::MatrixSetTranslateRotateYXZ).matrix_set_translate_rotate_yxz = { translateX, translateY, translateZ,
+                                                                                          *rot };
+    if (next_is_actor_pos_rot_matrix) {
+        d.has_mtx = true;
+        //d.mtx = *Matrix_GetCurrent();
+        invert_matrix((const float *)Matrix_GetCurrent()->mf, (float *)inv_actor_mtx.mf);
+        next_is_actor_pos_rot_matrix = false;
+        has_inv_actor_mtx = true;
+        inv_actor_mtx_path_index = current_path.size();
+    }
+}
+
+void FrameInterpolation_RecordMatrixMtxFToMtx(MtxF* src, Mtx* dest) {
+    if (!is_recording)
+        return;
+    append(Op::MatrixMtxFToMtx).matrix_mtxf_to_mtx = { *src, dest };
+}
+
+void FrameInterpolation_RecordMatrixToMtx(Mtx* dest, char* file, s32 line) {
+    if (!is_recording)
+        return;
+    auto& d = append(Op::MatrixToMtx).matrix_to_mtx = { dest };
+    if (has_inv_actor_mtx) {
+        d.has_adjusted = true;
+        SkinMatrix_MtxFMtxFMult(&inv_actor_mtx, Matrix_GetCurrent(), &d.src);
+    } else {
+        d.src = *Matrix_GetCurrent();
+    }
+}
+
+void FrameInterpolation_RecordMatrixReplaceRotation(MtxF* mf) {
+    if (!is_recording)
+        return;
+    append(Op::MatrixReplaceRotation).matrix_replace_rotation = { *mf };
+}
+
+void FrameInterpolation_RecordMatrixRotateAxis(f32 angle, Vec3f* axis, u8 mode) {
+    if (!is_recording)
+        return;
+    append(Op::MatrixRotateAxis).matrix_rotate_axis = { angle, *axis, mode };
+}
+
+void FrameInterpolation_RecordSkinMatrixMtxFToMtx(MtxF* src, Mtx* dest) {
+    if (!is_recording)
+        return;
+    FrameInterpolation_RecordMatrixMtxFToMtx(src, dest);
+}
+
+// https://stackoverflow.com/questions/1148309/inverting-a-4x4-matrix
+static bool invert_matrix(const float m[16], float invOut[16]) {
+    float inv[16], det;
+    int i;
+
+    inv[0] = m[5]  * m[10] * m[15] -
+             m[5]  * m[11] * m[14] -
+             m[9]  * m[6]  * m[15] +
+             m[9]  * m[7]  * m[14] +
+             m[13] * m[6]  * m[11] -
+             m[13] * m[7]  * m[10];
+
+    inv[4] = -m[4]  * m[10] * m[15] +
+              m[4]  * m[11] * m[14] +
+              m[8]  * m[6]  * m[15] -
+              m[8]  * m[7]  * m[14] -
+              m[12] * m[6]  * m[11] +
+              m[12] * m[7]  * m[10];
+
+    inv[8] = m[4]  * m[9] * m[15] -
+             m[4]  * m[11] * m[13] -
+             m[8]  * m[5] * m[15] +
+             m[8]  * m[7] * m[13] +
+             m[12] * m[5] * m[11] -
+             m[12] * m[7] * m[9];
+
+    inv[12] = -m[4]  * m[9] * m[14] +
+               m[4]  * m[10] * m[13] +
+               m[8]  * m[5] * m[14] -
+               m[8]  * m[6] * m[13] -
+               m[12] * m[5] * m[10] +
+               m[12] * m[6] * m[9];
+
+    inv[1] = -m[1]  * m[10] * m[15] +
+              m[1]  * m[11] * m[14] +
+              m[9]  * m[2] * m[15] -
+              m[9]  * m[3] * m[14] -
+              m[13] * m[2] * m[11] +
+              m[13] * m[3] * m[10];
+
+    inv[5] = m[0]  * m[10] * m[15] -
+             m[0]  * m[11] * m[14] -
+             m[8]  * m[2] * m[15] +
+             m[8]  * m[3] * m[14] +
+             m[12] * m[2] * m[11] -
+             m[12] * m[3] * m[10];
+
+    inv[9] = -m[0]  * m[9] * m[15] +
+              m[0]  * m[11] * m[13] +
+              m[8]  * m[1] * m[15] -
+              m[8]  * m[3] * m[13] -
+              m[12] * m[1] * m[11] +
+              m[12] * m[3] * m[9];
+
+    inv[13] = m[0]  * m[9] * m[14] -
+              m[0]  * m[10] * m[13] -
+              m[8]  * m[1] * m[14] +
+              m[8]  * m[2] * m[13] +
+              m[12] * m[1] * m[10] -
+              m[12] * m[2] * m[9];
+
+    inv[2] = m[1]  * m[6] * m[15] -
+             m[1]  * m[7] * m[14] -
+             m[5]  * m[2] * m[15] +
+             m[5]  * m[3] * m[14] +
+             m[13] * m[2] * m[7] -
+             m[13] * m[3] * m[6];
+
+    inv[6] = -m[0]  * m[6] * m[15] +
+              m[0]  * m[7] * m[14] +
+              m[4]  * m[2] * m[15] -
+              m[4]  * m[3] * m[14] -
+              m[12] * m[2] * m[7] +
+              m[12] * m[3] * m[6];
+
+    inv[10] = m[0]  * m[5] * m[15] -
+              m[0]  * m[7] * m[13] -
+              m[4]  * m[1] * m[15] +
+              m[4]  * m[3] * m[13] +
+              m[12] * m[1] * m[7] -
+              m[12] * m[3] * m[5];
+
+    inv[14] = -m[0]  * m[5] * m[14] +
+               m[0]  * m[6] * m[13] +
+               m[4]  * m[1] * m[14] -
+               m[4]  * m[2] * m[13] -
+               m[12] * m[1] * m[6] +
+               m[12] * m[2] * m[5];
+
+    inv[3] = -m[1] * m[6] * m[11] +
+              m[1] * m[7] * m[10] +
+              m[5] * m[2] * m[11] -
+              m[5] * m[3] * m[10] -
+              m[9] * m[2] * m[7] +
+              m[9] * m[3] * m[6];
+
+    inv[7] = m[0] * m[6] * m[11] -
+             m[0] * m[7] * m[10] -
+             m[4] * m[2] * m[11] +
+             m[4] * m[3] * m[10] +
+             m[8] * m[2] * m[7] -
+             m[8] * m[3] * m[6];
+
+    inv[11] = -m[0] * m[5] * m[11] +
+               m[0] * m[7] * m[9] +
+               m[4] * m[1] * m[11] -
+               m[4] * m[3] * m[9] -
+               m[8] * m[1] * m[7] +
+               m[8] * m[3] * m[5];
+
+    inv[15] = m[0] * m[5] * m[10] -
+              m[0] * m[6] * m[9] -
+              m[4] * m[1] * m[10] +
+              m[4] * m[2] * m[9] +
+              m[8] * m[1] * m[6] -
+              m[8] * m[2] * m[5];
+
+    det = m[0] * inv[0] + m[1] * inv[4] + m[2] * inv[8] + m[3] * inv[12];
+
+    if (det == 0) {
+        return false;
+    }
+
+    det = 1.0 / det;
+
+    for (i = 0; i < 16; i++) {
+        invOut[i] = inv[i] * det;
+    }
+
+    return true;
+}
diff --git a/soh/soh/frame_interpolation.h b/soh/soh/frame_interpolation.h
new file mode 100644
index 000000000..64c7197cd
--- /dev/null
+++ b/soh/soh/frame_interpolation.h
@@ -0,0 +1,61 @@
+#pragma once
+
+#include "include/z64math.h"
+
+#ifdef __cplusplus
+
+#include <unordered_map>
+
+std::unordered_map<Mtx*, MtxF> FrameInterpolation_Interpolate(float step);
+
+extern "C" {
+
+#endif
+
+void FrameInterpolation_StartRecord(void);
+
+void FrameInterpolation_StopRecord(void);
+
+void FrameInterpolation_RecordOpenChild(const void* a, int b);
+
+void FrameInterpolation_RecordCloseChild(void);
+
+void FrameInterpolation_DontInterpolateCamera(void);
+
+int FrameInterpolation_GetCameraEpoch(void);
+
+void FrameInterpolation_RecordActorPosRotMatrix(void);
+
+void FrameInterpolation_RecordMatrixPush(void);
+
+void FrameInterpolation_RecordMatrixPop(void);
+
+void FrameInterpolation_RecordMatrixPut(MtxF* src);
+
+void FrameInterpolation_RecordMatrixMult(MtxF* mf, u8 mode);
+
+void FrameInterpolation_RecordMatrixTranslate(f32 x, f32 y, f32 z, u8 mode);
+
+void FrameInterpolation_RecordMatrixScale(f32 x, f32 y, f32 z, u8 mode);
+
+void FrameInterpolation_RecordMatrixRotate1Coord(u32 coord, f32 value, u8 mode);
+
+void FrameInterpolation_RecordMatrixRotateZYX(s16 x, s16 y, s16 z, u8 mode);
+
+void FrameInterpolation_RecordMatrixTranslateRotateZYX(Vec3f* translation, Vec3s* rotation);
+
+void FrameInterpolation_RecordMatrixSetTranslateRotateYXZ(f32 translateX, f32 translateY, f32 translateZ, Vec3s* rot);
+
+void FrameInterpolation_RecordMatrixMtxFToMtx(MtxF* src, Mtx* dest);
+
+void FrameInterpolation_RecordMatrixToMtx(Mtx* dest, char* file, s32 line);
+
+void FrameInterpolation_RecordMatrixReplaceRotation(MtxF* mf);
+
+void FrameInterpolation_RecordMatrixRotateAxis(f32 angle, Vec3f* axis, u8 mode);
+
+void FrameInterpolation_RecordSkinMatrixMtxFToMtx(MtxF* src, Mtx* dest);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/soh/src/code/sys_matrix.c b/soh/src/code/sys_matrix.c
index 9d7c73967..bc90bf669 100644
--- a/soh/src/code/sys_matrix.c
+++ b/soh/src/code/sys_matrix.c
@@ -1,5 +1,7 @@
 #include "global.h"
 
+#include "soh/frame_interpolation.h"
+
 // clang-format off
 Mtx gMtxClear = {
     65536,     0,     1,     0,
@@ -25,11 +27,13 @@ void Matrix_Init(GameState* gameState) {
 }
 
 void Matrix_Push(void) {
+    FrameInterpolation_RecordMatrixPush();
     Matrix_MtxFCopy(sCurrentMatrix + 1, sCurrentMatrix);
     sCurrentMatrix++;
 }
 
 void Matrix_Pop(void) {
+    FrameInterpolation_RecordMatrixPop();
     sCurrentMatrix--;
     ASSERT(sCurrentMatrix >= sMatrixStack, "Matrix_now >= Matrix_stack", "../sys_matrix.c", 176);
 }
@@ -39,6 +43,7 @@ void Matrix_Get(MtxF* dest) {
 }
 
 void Matrix_Put(MtxF* src) {
+    FrameInterpolation_RecordMatrixPut(src);
     Matrix_MtxFCopy(sCurrentMatrix, src);
 }
 
@@ -47,6 +52,7 @@ MtxF* Matrix_GetCurrent(void) {
 }
 
 void Matrix_Mult(MtxF* mf, u8 mode) {
+    FrameInterpolation_RecordMatrixMult(mf, mode);
     MtxF* cmf = Matrix_GetCurrent();
 
     if (mode == MTXMODE_APPLY) {
@@ -57,6 +63,7 @@ void Matrix_Mult(MtxF* mf, u8 mode) {
 }
 
 void Matrix_Translate(f32 x, f32 y, f32 z, u8 mode) {
+    FrameInterpolation_RecordMatrixTranslate(x, y, z, mode);
     MtxF* cmf = sCurrentMatrix;
     f32 tx;
     f32 ty;
@@ -80,6 +87,7 @@ void Matrix_Translate(f32 x, f32 y, f32 z, u8 mode) {
 }
 
 void Matrix_Scale(f32 x, f32 y, f32 z, u8 mode) {
+    FrameInterpolation_RecordMatrixScale(x, y, z, mode);
     MtxF* cmf = sCurrentMatrix;
 
     if (mode == MTXMODE_APPLY) {
@@ -101,6 +109,7 @@ void Matrix_Scale(f32 x, f32 y, f32 z, u8 mode) {
 }
 
 void Matrix_RotateX(f32 x, u8 mode) {
+    FrameInterpolation_RecordMatrixRotate1Coord(0, x, mode);
     MtxF* cmf;
     f32 sin;
     f32 cos;
@@ -165,6 +174,7 @@ void Matrix_RotateX(f32 x, u8 mode) {
 }
 
 void Matrix_RotateY(f32 y, u8 mode) {
+    FrameInterpolation_RecordMatrixRotate1Coord(1, y, mode);
     MtxF* cmf;
     f32 sin;
     f32 cos;
@@ -229,6 +239,7 @@ void Matrix_RotateY(f32 y, u8 mode) {
 }
 
 void Matrix_RotateZ(f32 z, u8 mode) {
+    FrameInterpolation_RecordMatrixRotate1Coord(2, z, mode);
     MtxF* cmf;
     f32 sin;
     f32 cos;
@@ -299,6 +310,7 @@ void Matrix_RotateZ(f32 z, u8 mode) {
  * Original Name: Matrix_RotateXYZ, changed to reflect rotation order.
  */
 void Matrix_RotateZYX(s16 x, s16 y, s16 z, u8 mode) {
+    FrameInterpolation_RecordMatrixRotateZYX(x, y, z, mode);
     MtxF* cmf = sCurrentMatrix;
     f32 temp1;
     f32 temp2;
@@ -389,6 +401,7 @@ void Matrix_RotateZYX(s16 x, s16 y, s16 z, u8 mode) {
  * transformed according to whatever the matrix was previously.
  */
 void Matrix_TranslateRotateZYX(Vec3f* translation, Vec3s* rotation) {
+    FrameInterpolation_RecordMatrixTranslateRotateZYX(translation, rotation);
     MtxF* cmf = sCurrentMatrix;
     f32 sin = Math_SinS(rotation->z);
     f32 cos = Math_CosS(rotation->z);
@@ -530,15 +543,20 @@ void Matrix_SetTranslateRotateYXZ(f32 translateX, f32 translateY, f32 translateZ
     } else {
         cmf->yx = 0.0f;
     }
+    FrameInterpolation_RecordMatrixSetTranslateRotateYXZ(translateX, translateY, translateZ, rot);
 }
 
 Mtx* Matrix_MtxFToMtx(MtxF* src, Mtx* dest) {
+    FrameInterpolation_RecordMatrixMtxFToMtx(src, dest);
     guMtxF2L(src, dest);
     return dest;
 }
 
 Mtx* Matrix_ToMtx(Mtx* dest, char* file, s32 line) {
-    return Matrix_MtxFToMtx(Matrix_CheckFloats(sCurrentMatrix, file, line), dest);
+    FrameInterpolation_RecordMatrixToMtx(dest, file, line);
+    guMtxF2L(Matrix_CheckFloats(sCurrentMatrix, file, line), dest);
+    return dest;
+    //return Matrix_MtxFToMtx(Matrix_CheckFloats(sCurrentMatrix, file, line), dest);
 }
 
 Mtx* Matrix_NewMtx(GraphicsContext* gfxCtx, char* file, s32 line) {
@@ -627,6 +645,7 @@ void Matrix_Transpose(MtxF* mf) {
  * seen as replacing the R rotation with `mf`, hence the function name.
  */
 void Matrix_ReplaceRotation(MtxF* mf) {
+    FrameInterpolation_RecordMatrixReplaceRotation(mf);
     MtxF* cmf = sCurrentMatrix;
     f32 acc;
     f32 temp;
@@ -779,6 +798,7 @@ void Matrix_MtxFToZYXRotS(MtxF* mf, Vec3s* rotDest, s32 flag) {
  * NB: `axis` is assumed to be a unit vector.
  */
 void Matrix_RotateAxis(f32 angle, Vec3f* axis, u8 mode) {
+    FrameInterpolation_RecordMatrixRotateAxis(angle, axis, mode);
     MtxF* cmf;
     f32 sin;
     f32 cos;
diff --git a/soh/src/code/z_actor.c b/soh/src/code/z_actor.c
index a9f50f687..caa16a7ec 100644
--- a/soh/src/code/z_actor.c
+++ b/soh/src/code/z_actor.c
@@ -6,6 +6,7 @@
 #include "objects/gameplay_keep/gameplay_keep.h"
 #include "objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h"
 #include "objects/object_bdoor/object_bdoor.h"
+#include "soh/frame_interpolation.h"
 
 #if defined(_MSC_VER) || defined(__GNUC__)
 #include <string.h>
@@ -410,6 +411,7 @@ void func_8002C124(TargetContext* targetCtx, GlobalContext* globalCtx) {
         f32 var2;
         s32 i;
 
+        FrameInterpolation_RecordOpenChild(actor, 0);
         player = GET_PLAYER(globalCtx);
 
         spCE = 0xFF;
@@ -486,10 +488,12 @@ void func_8002C124(TargetContext* targetCtx, GlobalContext* globalCtx) {
                 }
             }
         }
+        FrameInterpolation_RecordCloseChild();
     }
 
     actor = targetCtx->unk_94;
     if ((actor != NULL) && !(actor->flags & ACTOR_FLAG_27)) {
+        FrameInterpolation_RecordOpenChild(actor, 1);
         NaviColor* naviColor = &sNaviColorList[actor->category];
 
         POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0x7);
@@ -503,6 +507,7 @@ void func_8002C124(TargetContext* targetCtx, GlobalContext* globalCtx) {
         gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 2153),
                   G_MTX_MODELVIEW | G_MTX_LOAD);
         gSPDisplayList(POLY_XLU_DISP++, gZTargetArrowDL);
+        FrameInterpolation_RecordCloseChild();
     }
 
     CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_actor.c", 2158);
@@ -2490,6 +2495,7 @@ void Actor_Draw(GlobalContext* globalCtx, Actor* actor) {
 
     Fault_AddClient(&faultClient, Actor_FaultPrint, actor, "Actor_draw");
 
+    FrameInterpolation_RecordOpenChild(actor, 0);
     OPEN_DISPS(globalCtx->state.gfxCtx, "../z_actor.c", 6035);
 
     lights = LightContext_NewLights(&globalCtx->lightCtx, globalCtx->state.gfxCtx);
@@ -2497,6 +2503,7 @@ void Actor_Draw(GlobalContext* globalCtx, Actor* actor) {
     Lights_BindAll(lights, globalCtx->lightCtx.listHead, (actor->flags & ACTOR_FLAG_22) ? NULL : &actor->world.pos);
     Lights_Draw(lights, globalCtx->state.gfxCtx);
 
+    FrameInterpolation_RecordActorPosRotMatrix();
     if (actor->flags & ACTOR_FLAG_12) {
         Matrix_SetTranslateRotateYXZ(
             actor->world.pos.x + globalCtx->mainCamera.skyboxOffset.x,
@@ -2546,6 +2553,7 @@ void Actor_Draw(GlobalContext* globalCtx, Actor* actor) {
     }
 
     CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_actor.c", 6119);
+    FrameInterpolation_RecordCloseChild();
 
     Fault_RemoveClient(&faultClient);
 }
diff --git a/soh/src/code/z_camera.c b/soh/src/code/z_camera.c
index 41c16b5cc..00f3f70f0 100644
--- a/soh/src/code/z_camera.c
+++ b/soh/src/code/z_camera.c
@@ -6,6 +6,8 @@
 
 #include "overlays/actors/ovl_En_Horse/z_en_horse.h"
 
+#include "soh/frame_interpolation.h"
+
 s16 Camera_ChangeSettingFlags(Camera* camera, s16 setting, s16 flags);
 s32 Camera_ChangeModeFlags(Camera* camera, s16 mode, u8 flags);
 s32 Camera_QRegInit(void);
@@ -6675,6 +6677,7 @@ s32 Camera_Special9(Camera* camera) {
         case 1:
             spec9->doorParams.timer1--;
             if (spec9->doorParams.timer1 <= 0) {
+                FrameInterpolation_DontInterpolateCamera();
                 camera->animState++;
                 if (params->interfaceFlags & 1) {
                     camPosData = Camera_GetCamBGData(camera);
@@ -7968,6 +7971,8 @@ s32 Camera_SetCSParams(Camera* camera, CutsceneCameraPoint* atPoints, CutsceneCa
         camera->speedRatio = 0.0f;
     }
 
+    FrameInterpolation_DontInterpolateCamera();
+
     return 1;
 }
 
diff --git a/soh/src/code/z_eff_blure.c b/soh/src/code/z_eff_blure.c
index e08f8f337..f3a1e6122 100644
--- a/soh/src/code/z_eff_blure.c
+++ b/soh/src/code/z_eff_blure.c
@@ -1,6 +1,8 @@
 #include "global.h"
 #include "objects/gameplay_keep/gameplay_keep.h"
 
+#include "soh/frame_interpolation.h"
+
 void EffectBlure_AddVertex(EffectBlure* this, Vec3f* p1, Vec3f* p2) {
     EffectBlureElement* elem;
     s32 numElements;
@@ -946,6 +948,7 @@ void EffectBlure_Draw(void* thisx, GraphicsContext* gfxCtx) {
     s32 j;
     s32 phi_t2;
 
+    FrameInterpolation_RecordOpenChild(this, 0);
     OPEN_DISPS(gfxCtx, "../z_eff_blure.c", 1596);
 
     gSPMatrix(POLY_XLU_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
@@ -1059,4 +1062,5 @@ void EffectBlure_Draw(void* thisx, GraphicsContext* gfxCtx) {
     }
 
     CLOSE_DISPS(gfxCtx, "../z_eff_blure.c", 1823);
+    FrameInterpolation_RecordCloseChild();
 }
diff --git a/soh/src/code/z_eff_shield_particle.c b/soh/src/code/z_eff_shield_particle.c
index fad499286..73134a654 100644
--- a/soh/src/code/z_eff_shield_particle.c
+++ b/soh/src/code/z_eff_shield_particle.c
@@ -2,6 +2,8 @@
 #include "vt.h"
 #include "objects/gameplay_keep/gameplay_keep.h"
 
+#include "soh/frame_interpolation.h"
+
 static Vtx sVertices[5] = {
     VTX(-32, -32, 0, 0, 1024, 0xFF, 0xFF, 0xFF, 0xFF),
     VTX(32, 32, 0, 1024, 0, 0xFF, 0xFF, 0xFF, 0xFF),
@@ -154,6 +156,7 @@ void EffectShieldParticle_Draw(void* thisx, GraphicsContext* gfxCtx) {
     Color_RGBA8 primColor;
     Color_RGBA8 envColor;
 
+    FrameInterpolation_RecordOpenChild(this, 0);
     OPEN_DISPS(gfxCtx, "../z_eff_shield_particle.c", 272);
 
     if (this != NULL) {
@@ -213,4 +216,5 @@ void EffectShieldParticle_Draw(void* thisx, GraphicsContext* gfxCtx) {
     }
 
     CLOSE_DISPS(gfxCtx, "../z_eff_shield_particle.c", 359);
+    FrameInterpolation_RecordCloseChild();
 }
diff --git a/soh/src/code/z_eff_spark.c b/soh/src/code/z_eff_spark.c
index cfe8f628f..b76968371 100644
--- a/soh/src/code/z_eff_spark.c
+++ b/soh/src/code/z_eff_spark.c
@@ -1,6 +1,8 @@
 #include "global.h"
 #include "objects/gameplay_keep/gameplay_keep.h"
 
+#include "soh/frame_interpolation.h"
+
 // original name: "spark"
 void EffectSpark_Init(void* thisx, void* initParamsx) {
     EffectSpark* this = (EffectSpark*)thisx;
@@ -152,6 +154,7 @@ void EffectSpark_Draw(void* thisx, GraphicsContext* gfxCtx) {
     u8 sp1C4;
     f32 ratio;
 
+    FrameInterpolation_RecordOpenChild(this, 0);
     OPEN_DISPS(gfxCtx, "../z_eff_spark.c", 293);
 
     if (this != NULL) {
@@ -274,4 +277,5 @@ void EffectSpark_Draw(void* thisx, GraphicsContext* gfxCtx) {
 
 end:
     CLOSE_DISPS(gfxCtx, "../z_eff_spark.c", 498);
+    FrameInterpolation_RecordCloseChild();
 }
diff --git a/soh/src/code/z_effect_soft_sprite.c b/soh/src/code/z_effect_soft_sprite.c
index aa0b922fe..2548966cc 100644
--- a/soh/src/code/z_effect_soft_sprite.c
+++ b/soh/src/code/z_effect_soft_sprite.c
@@ -1,6 +1,8 @@
 #include "global.h"
 #include "vt.h"
 
+#include "soh/frame_interpolation.h"
+
 EffectSsInfo sEffectSsInfo = { 0 }; // "EffectSS2Info"
 
 void EffectSs_InitInfo(GlobalContext* globalCtx, s32 tableSize) {
@@ -233,6 +235,7 @@ void EffectSs_Spawn(GlobalContext* globalCtx, s32 type, s32 priority, void* init
 
     sEffectSsInfo.table[index].type = type;
     sEffectSsInfo.table[index].priority = priority;
+    sEffectSsInfo.table[index].epoch++;
 
     if (initInfo->init(globalCtx, index, &sEffectSsInfo.table[index], initParams) == 0) {
         osSyncPrintf(VT_FGCOL(GREEN));
@@ -284,7 +287,9 @@ void EffectSs_Draw(GlobalContext* globalCtx, s32 index) {
     EffectSs* effectSs = &sEffectSsInfo.table[index];
 
     if (effectSs->draw != NULL) {
+        FrameInterpolation_RecordOpenChild(effectSs, effectSs->epoch);
         effectSs->draw(globalCtx, index, effectSs);
+        FrameInterpolation_RecordCloseChild();
     }
 }
 
diff --git a/soh/src/code/z_lights.c b/soh/src/code/z_lights.c
index c9b60ceca..bee677276 100644
--- a/soh/src/code/z_lights.c
+++ b/soh/src/code/z_lights.c
@@ -4,6 +4,8 @@
 
 #include "objects/gameplay_keep/gameplay_keep.h"
 
+#include "soh/frame_interpolation.h"
+
 #define LIGHTS_BUFFER_SIZE 32
 //#define LIGHTS_BUFFER_SIZE 1024 // Kill me
 
@@ -434,12 +436,14 @@ void Lights_DrawGlow(GlobalContext* globalCtx) {
         if ((info->type == LIGHT_POINT_GLOW) && (params->drawGlow)) {
             scale = SQ(params->radius) * 0.0000026f;
 
+            FrameInterpolation_RecordOpenChild(node, 0);
             gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, params->color[0], params->color[1], params->color[2], 50);
             Matrix_Translate(params->x, params->y, params->z, MTXMODE_NEW);
             Matrix_Scale(scale, scale, scale, MTXMODE_APPLY);
             gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_lights.c", 918),
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gGlowCircleDL);
+            FrameInterpolation_RecordCloseChild();
         }
 
         node = node->next;
diff --git a/soh/src/code/z_play.c b/soh/src/code/z_play.c
index 2934e5e1b..632ed41f6 100644
--- a/soh/src/code/z_play.c
+++ b/soh/src/code/z_play.c
@@ -5,6 +5,8 @@
 
 #include "soh/Enhancements/gameconsole.h"
 
+#include "soh/frame_interpolation.h"
+
 void* D_8012D1F0 = NULL;
 //UNK_TYPE D_8012D1F4 = 0; // unused
 Input* D_8012D1F8 = NULL;
@@ -1379,7 +1381,9 @@ void Gameplay_Main(GameState* thisx) {
         LOG_NUM("1", 1, "../z_play.c", 4583);
     }
 
+    FrameInterpolation_StartRecord();
     Gameplay_Draw(globalCtx);
+    FrameInterpolation_StopRecord();
 
     if (1 && HREG(63)) {
         LOG_NUM("1", 1, "../z_play.c", 4587);
diff --git a/soh/src/code/z_skin_matrix.c b/soh/src/code/z_skin_matrix.c
index f7df8091f..d822d6c13 100644
--- a/soh/src/code/z_skin_matrix.c
+++ b/soh/src/code/z_skin_matrix.c
@@ -1,6 +1,8 @@
 #include "global.h"
 #include "vt.h"
 
+#include "soh/frame_interpolation.h"
+
 // clang-format off
 MtxF sMtxFClear = {
     1.0f, 0.0f, 0.0f, 0.0f,
@@ -523,6 +525,7 @@ void SkinMatrix_Vec3sToVec3f(Vec3s* src, Vec3f* dest) {
 }
 
 void SkinMatrix_MtxFToMtx(MtxF* src, Mtx* dest) {
+    FrameInterpolation_RecordSkinMatrixMtxFToMtx(src, dest);
     guMtxF2L(src, dest);
 }
 
diff --git a/soh/src/code/z_view.c b/soh/src/code/z_view.c
index 97f1ad26e..e03daee83 100644
--- a/soh/src/code/z_view.c
+++ b/soh/src/code/z_view.c
@@ -2,6 +2,9 @@
 #include "vt.h"
 
 #include <string.h>
+#include <math.h>
+
+#include "soh/frame_interpolation.h"
 
 vu32 D_8012ABF0 = true;
 
@@ -277,6 +280,10 @@ void func_800AAA50(View* view, s32 arg1) {
     }
 }
 
+static float sqr(float a) {
+    return a * a;
+}
+
 s32 func_800AAA9C(View* view) {
     f32 aspect;
     s32 width;
@@ -307,6 +314,85 @@ s32 func_800AAA9C(View* view) {
     height = view->viewport.bottomY - view->viewport.topY;
     aspect = (f32)width / (f32)height;
 
+    viewing = Graph_Alloc(gfxCtx, sizeof(Mtx));
+    LogUtils_CheckNullPointer("viewing", viewing, "../z_view.c", 667);
+    view->viewingPtr = viewing;
+
+    if (view->eye.x == view->lookAt.x && view->eye.y == view->lookAt.y && view->eye.z == view->lookAt.z) {
+        view->eye.x += 1.0f;
+        view->eye.y += 1.0f;
+        view->eye.z += 1.0f;
+    }
+
+    func_800ABE74(view->eye.x, view->eye.y, view->eye.z);
+    MtxF viewingF;
+    guLookAtF(viewingF.mf, view->eye.x, view->eye.y, view->eye.z, view->lookAt.x, view->lookAt.y, view->lookAt.z, view->up.x,
+             view->up.y, view->up.z);
+
+    // Some heuristics to identify instant camera movements and skip interpolation in that case
+
+    static View old_view;
+
+    float dirx = view->eye.x - view->lookAt.x;
+    float diry = view->eye.y - view->lookAt.y;
+    float dirz = view->eye.z - view->lookAt.z;
+    float dir_dist = sqrtf(sqr(dirx) + sqr(diry) + sqr(dirz));
+    dirx /= dir_dist;
+    diry /= dir_dist;
+    dirz /= dir_dist;
+
+    float odirx = old_view.eye.x - old_view.lookAt.x;
+    float odiry = old_view.eye.y - old_view.lookAt.y;
+    float odirz = old_view.eye.z - old_view.lookAt.z;
+    float odir_dist = sqrtf(sqr(odirx) + sqr(odiry) + sqr(odirz));
+    odirx /= odir_dist;
+    odiry /= odir_dist;
+    odirz /= odir_dist;
+
+    float eye_dist = sqrtf(sqr(view->eye.x - old_view.eye.x) + sqr(view->eye.y - old_view.eye.y) + sqr(view->eye.z - old_view.eye.z));
+    float look_dist = sqrtf(sqr(view->lookAt.x - old_view.lookAt.x) + sqr(view->lookAt.y - old_view.lookAt.y) + sqr(view->lookAt.z - old_view.lookAt.z));
+    float up_dist = sqrtf(sqr(view->up.x - old_view.up.x) + sqr(view->up.y - old_view.up.y) + sqr(view->up.z - old_view.up.z));
+    float d_dist = sqrtf(sqr(dirx - odirx) + sqr(diry - odiry) + sqr(dirz - odirz));
+
+    bool dont_interpolate = false;
+
+    if (up_dist < 0.01 && d_dist < 0.01) {
+        if (eye_dist + look_dist > 300) {
+            dont_interpolate = true;
+        }
+    } else {
+        if (eye_dist >= 400) {
+            dont_interpolate = true;
+        }
+        if (look_dist >= 100) {
+            dont_interpolate = true;
+        }
+        if (up_dist >= 1.50f) {
+            dont_interpolate = true;
+        }
+        if (d_dist >= 1.414f && look_dist >= 15) {
+            dont_interpolate = true;
+        }
+        if (d_dist >= 1.414f && up_dist >= 0.31f && look_dist >= 1 && eye_dist >= 300) {
+            dont_interpolate = true;
+        }
+        if (d_dist >= 0.5f && up_dist >= 0.31f && look_dist >= 3 && eye_dist >= 170) {
+            dont_interpolate = true;
+        }
+        if (look_dist >= 52 && eye_dist >= 52) {
+            dont_interpolate = true;
+        }
+        if (look_dist >= 30 && eye_dist >= 90) {
+            dont_interpolate = true;
+        }
+    }
+
+    if (dont_interpolate) {
+        FrameInterpolation_DontInterpolateCamera();
+    }
+
+    FrameInterpolation_RecordOpenChild(NULL, FrameInterpolation_GetCameraEpoch());
+
     if (HREG(80) == 11) {
         if (HREG(94) != 11) {
             HREG(94) = 11;
@@ -347,22 +433,17 @@ s32 func_800AAA9C(View* view) {
     gSPPerspNormalize(POLY_KAL_DISP++, view->normal);
     gSPMatrix(POLY_KAL_DISP++, projection, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
 
-    viewing = Graph_Alloc(gfxCtx, sizeof(Mtx));
-    LogUtils_CheckNullPointer("viewing", viewing, "../z_view.c", 667);
-    view->viewingPtr = viewing;
-
-    if (view->eye.x == view->lookAt.x && view->eye.y == view->lookAt.y && view->eye.z == view->lookAt.z) {
-        view->eye.x += 1.0f;
-        view->eye.y += 1.0f;
-        view->eye.z += 1.0f;
-    }
-
-    func_800ABE74(view->eye.x, view->eye.y, view->eye.z);
-    guLookAt(viewing, view->eye.x, view->eye.y, view->eye.z, view->lookAt.x, view->lookAt.y, view->lookAt.z, view->up.x,
-             view->up.y, view->up.z);
+    Matrix_MtxFToMtx(viewingF.mf, viewing);
 
     view->viewing = *viewing;
 
+
+    /*if (eye_dist > 1 || look_dist > 1 || abs(up_dist) > 0.1 || abs(d_dist) > 0.1)
+        printf("%d %f %f %f, %f %f %f, %f %f %f, %f %f %f %f %d\n", (int)view->fovy, view->eye.x, view->eye.y, view->eye.z, view->lookAt.x, view->lookAt.y, view->lookAt.z,
+           view->up.x, view->up.y, view->up.z, eye_dist, look_dist, up_dist, d_dist, dont_interpolate);*/
+
+    old_view = *view;
+
     if (QREG(88) & 2) {
         s32 i;
         MtxF mf;
@@ -374,10 +455,10 @@ s32 func_800AAA9C(View* view) {
         }
         osSyncPrintf("\n");
     }
-
     gSPMatrix(POLY_OPA_DISP++, viewing, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION);
     gSPMatrix(POLY_XLU_DISP++, viewing, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION);
     gSPMatrix(POLY_KAL_DISP++, viewing, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION);
+    FrameInterpolation_RecordCloseChild();
 
     CLOSE_DISPS(gfxCtx, "../z_view.c", 711);
 
diff --git a/soh/src/code/z_vr_box_draw.c b/soh/src/code/z_vr_box_draw.c
index 292789333..13eb93bd0 100644
--- a/soh/src/code/z_vr_box_draw.c
+++ b/soh/src/code/z_vr_box_draw.c
@@ -1,5 +1,7 @@
 #include "global.h"
 
+#include "soh/frame_interpolation.h"
+
 Mtx* sSkyboxDrawMatrix;
 
 Mtx* SkyboxDraw_UpdateMatrix(SkyboxContext* skyboxCtx, f32 x, f32 y, f32 z) {
@@ -13,6 +15,7 @@ Mtx* SkyboxDraw_UpdateMatrix(SkyboxContext* skyboxCtx, f32 x, f32 y, f32 z) {
 
 void SkyboxDraw_Draw(SkyboxContext* skyboxCtx, GraphicsContext* gfxCtx, s16 skyboxId, s16 blend, f32 x, f32 y, f32 z) {
     OPEN_DISPS(gfxCtx, "../z_vr_box_draw.c", 52);
+    FrameInterpolation_RecordOpenChild(NULL, FrameInterpolation_GetCameraEpoch());
 
     func_800945A0(gfxCtx);
 
@@ -85,7 +88,7 @@ void SkyboxDraw_Draw(SkyboxContext* skyboxCtx, GraphicsContext* gfxCtx, s16 skyb
     gDPPipeSync(POLY_OPA_DISP++);
     //gsSPShaderTest2(POLY_OPA_DISP++);
 
-
+    FrameInterpolation_RecordCloseChild();
     CLOSE_DISPS(gfxCtx, "../z_vr_box_draw.c", 125);
 }
 
diff --git a/soh/src/libultra/gu/guLookAt.c b/soh/src/libultra/gu/guLookAt.c
index 58946f4dc..f94204bc4 100644
--- a/soh/src/libultra/gu/guLookAt.c
+++ b/soh/src/libultra/gu/guLookAt.c
@@ -62,5 +62,6 @@ void guLookAt(Mtx* m, f32 xEye, f32 yEye, f32 zEye, f32 xAt, f32 yAt, f32 zAt, f
 
     guLookAtF(mf, xEye, yEye, zEye, xAt, yAt, zAt, xUp, yUp, zUp);
 
-    guMtxF2L((MtxF*)mf, m);
+    //guMtxF2L((MtxF*)mf, m);
+    Matrix_MtxFToMtx((MtxF*)mf, m);
 }
diff --git a/soh/src/libultra/gu/guPerspectiveF.c b/soh/src/libultra/gu/guPerspectiveF.c
index 731cec3e9..dd020f589 100644
--- a/soh/src/libultra/gu/guPerspectiveF.c
+++ b/soh/src/libultra/gu/guPerspectiveF.c
@@ -37,6 +37,6 @@ void guPerspective(Mtx* m, u16* perspNorm, f32 fovy, f32 aspect, f32 near, f32 f
     f32 mf[4][4];
 
     guPerspectiveF(mf, perspNorm, fovy, aspect, near, far, scale);
-    guMtxF2L((MtxF*)mf, m);
-
+    //guMtxF2L((MtxF*)mf, m);
+    Matrix_MtxFToMtx((MtxF*)mf, m);
 }
diff --git a/soh/src/libultra/gu/ortho.c b/soh/src/libultra/gu/ortho.c
index 517ba1dcc..77d43ce21 100644
--- a/soh/src/libultra/gu/ortho.c
+++ b/soh/src/libultra/gu/ortho.c
@@ -1,5 +1,7 @@
 #include "global.h"
 
+#include "soh/frame_interpolation.h"
+
 void guOrthoF(f32 mf[4][4], f32 left, f32 right, f32 bottom, f32 top, f32 near, f32 far, f32 scale) {
     s32 i, j;
 
@@ -25,5 +27,8 @@ void guOrtho(Mtx* mtx, f32 left, f32 right, f32 bottom, f32 top, f32 near, f32 f
 
     guOrthoF(mf, left, right, bottom, top, near, far, scale);
 
-    guMtxF2L((MtxF*)mf, mtx);
+    //guMtxF2L((MtxF*)mf, mtx);
+    FrameInterpolation_RecordOpenChild("ortho", 0);
+    Matrix_MtxFToMtx((MtxF*)mf, mtx);
+    FrameInterpolation_RecordCloseChild();
 }
diff --git a/soh/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c b/soh/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c
index d1e940619..9616204cd 100644
--- a/soh/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c
+++ b/soh/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c
@@ -8,6 +8,8 @@
 #include "overlays/actors/ovl_Boss_Ganon/z_boss_ganon.h"
 #include "vt.h"
 
+#include "soh/frame_interpolation.h"
+
 #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5)
 
 typedef enum {
@@ -283,6 +285,7 @@ void BgGanonOtyuka_Draw(Actor* thisx, GlobalContext* globalCtx) {
             platform = (BgGanonOtyuka*)actor;
 
             if (platform->dyna.actor.projectedPos.z > spBC) {
+                FrameInterpolation_RecordOpenChild(platform, 0);
                 if (camera->eye.y > platform->dyna.actor.world.pos.y) {
                     phi_s2 = sPlatformTopDL;
                 } else {
@@ -309,7 +312,7 @@ void BgGanonOtyuka_Draw(Actor* thisx, GlobalContext* globalCtx) {
                 }
 
                 for (i = 0; i < ARRAY_COUNT(sSides); i++) {
-                    if (platform->visibleSides & sSides[i]) {
+                    if ((platform->visibleSides & sSides[i]) || 1) { // || 1 for frame interpolation
                         Matrix_Push();
                         Matrix_Translate(sSideCenters[i].x, 0.0f, sSideCenters[i].z, MTXMODE_APPLY);
                         Matrix_RotateY(sSideAngles[i], MTXMODE_APPLY);
@@ -320,6 +323,7 @@ void BgGanonOtyuka_Draw(Actor* thisx, GlobalContext* globalCtx) {
                         Matrix_Pop();
                     }
                 }
+                FrameInterpolation_RecordCloseChild();
             }
         }
 
@@ -333,6 +337,7 @@ void BgGanonOtyuka_Draw(Actor* thisx, GlobalContext* globalCtx) {
             platform = (BgGanonOtyuka*)actor;
 
             if ((platform->dyna.actor.projectedPos.z > -30.0f) && (platform->flashState != FLASH_NONE)) {
+                FrameInterpolation_RecordOpenChild(platform, 0);
                 gSPSegment(POLY_XLU_DISP++, 0x08,
                            Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, platform->flashTimer * 4, 0, 32, 64, 1,
                                             platform->flashTimer * 4, 0, 32, 64));
@@ -344,7 +349,7 @@ void BgGanonOtyuka_Draw(Actor* thisx, GlobalContext* globalCtx) {
                 Matrix_Translate(platform->dyna.actor.world.pos.x, 0.0f, platform->dyna.actor.world.pos.z, MTXMODE_NEW);
 
                 for (i = 0; i < ARRAY_COUNT(sSides); i++) {
-                    if (platform->unwalledSides & sSides[i]) {
+                    if ((platform->unwalledSides & sSides[i]) || 1) { // || 1 for frame interpolation
                         Matrix_Push();
                         Matrix_Translate(sSideCenters[i].x, 0.0f, sSideCenters[i].z, MTXMODE_APPLY);
                         Matrix_RotateY(sSideAngles[i], MTXMODE_APPLY);
@@ -356,6 +361,7 @@ void BgGanonOtyuka_Draw(Actor* thisx, GlobalContext* globalCtx) {
                         Matrix_Pop();
                     }
                 }
+                FrameInterpolation_RecordCloseChild();
             }
         }
 
diff --git a/soh/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c b/soh/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c
index 73044e8b1..c2599e185 100644
--- a/soh/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c
+++ b/soh/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c
@@ -240,7 +240,8 @@ void BgHidanRsekizou_Draw(Actor* thisx, GlobalContext* globalCtx) {
 
     POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0x14);
 
-    if ((s16)((Camera_GetCamDirYaw(GET_ACTIVE_CAM(globalCtx)) - this->dyna.actor.shape.rot.y) - 0x2E6C) >= 0) {
+    // Strange original code. Add || 1 for frame interpolation to get correct.
+    if ((s16)((Camera_GetCamDirYaw(GET_ACTIVE_CAM(globalCtx)) - this->dyna.actor.shape.rot.y) - 0x2E6C) >= 0 || 1) {
         for (i = 3; i >= 0; i--) {
             POLY_XLU_DISP = BgHidanRsekizou_DrawFireball(globalCtx, this, i, &mf, 0, POLY_XLU_DISP);
         }
diff --git a/soh/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c b/soh/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c
index 649774346..5b468c7d3 100644
--- a/soh/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c
+++ b/soh/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c
@@ -12,6 +12,8 @@
 #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h"
 #include "objects/gameplay_keep/gameplay_keep.h"
 
+#include "soh/frame_interpolation.h"
+
 #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_4 | ACTOR_FLAG_5)
 
 typedef enum {
@@ -78,6 +80,7 @@ void BossFd_SpawnEmber(BossFdEffect* effect, Vec3f* position, Vec3f* velocity, V
             effect->scale = scale / 1000.0f;
             effect->alpha = 255;
             effect->timer1 = (s16)Rand_ZeroFloat(10.0f);
+            effect->epoch++;
             break;
         }
     }
@@ -95,6 +98,7 @@ void BossFd_SpawnDebris(BossFdEffect* effect, Vec3f* position, Vec3f* velocity,
             effect->scale = scale / 1000.0f;
             effect->vFdFxRotX = Rand_ZeroFloat(100.0f);
             effect->vFdFxRotY = Rand_ZeroFloat(100.0f);
+            effect->epoch++;
             break;
         }
     }
@@ -111,6 +115,7 @@ void BossFd_SpawnDust(BossFdEffect* effect, Vec3f* position, Vec3f* velocity, Ve
             effect->accel = *acceleration;
             effect->timer2 = 0;
             effect->scale = scale / 400.0f;
+            effect->epoch++;
             break;
         }
     }
@@ -136,6 +141,7 @@ void BossFd_SpawnFireBreath(BossFdEffect* effect, Vec3f* position, Vec3f* veloci
             effect->timer2 = 0;
             effect->scale = scale / 400.0f;
             effect->kbAngle = kbAngle;
+            effect->epoch++;
             break;
         }
     }
@@ -1522,6 +1528,7 @@ void BossFd_DrawEffects(BossFdEffect* effect, GlobalContext* globalCtx) {
 
     for (i = 0; i < 180; i++, effect++) {
         if (effect->type == BFD_FX_EMBER) {
+            FrameInterpolation_RecordOpenChild(effect, effect->epoch);
             if (!flag) {
                 func_80093D84(globalCtx->state.gfxCtx);
                 gSPDisplayList(POLY_XLU_DISP++, gVolvagiaEmberMaterialDL);
@@ -1536,6 +1543,7 @@ void BossFd_DrawEffects(BossFdEffect* effect, GlobalContext* globalCtx) {
             gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_fd.c", 4046),
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gVolvagiaEmberModelDL);
+            FrameInterpolation_RecordCloseChild();
         }
     }
 
@@ -1543,6 +1551,7 @@ void BossFd_DrawEffects(BossFdEffect* effect, GlobalContext* globalCtx) {
     flag = false;
     for (i = 0; i < 180; i++, effect++) {
         if (effect->type == BFD_FX_DEBRIS) {
+            FrameInterpolation_RecordOpenChild(effect, effect->epoch);
             if (!flag) {
                 func_80093D18(globalCtx->state.gfxCtx);
                 gSPDisplayList(POLY_OPA_DISP++, gVolvagiaDebrisMaterialDL);
@@ -1557,6 +1566,7 @@ void BossFd_DrawEffects(BossFdEffect* effect, GlobalContext* globalCtx) {
             gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_fd.c", 4068),
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_OPA_DISP++, gVolvagiaDebrisModelDL);
+            FrameInterpolation_RecordCloseChild();
         }
     }
 
@@ -1564,6 +1574,7 @@ void BossFd_DrawEffects(BossFdEffect* effect, GlobalContext* globalCtx) {
     flag = false;
     for (i = 0; i < 180; i++, effect++) {
         if (effect->type == BFD_FX_DUST) {
+            FrameInterpolation_RecordOpenChild(effect, effect->epoch);
             if (!flag) {
                 POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0);
                 gSPDisplayList(POLY_XLU_DISP++, gVolvagiaDustMaterialDL);
@@ -1580,6 +1591,7 @@ void BossFd_DrawEffects(BossFdEffect* effect, GlobalContext* globalCtx) {
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(dustTex[effect->timer2]));
             gSPDisplayList(POLY_XLU_DISP++, gVolvagiaDustModelDL);
+            FrameInterpolation_RecordCloseChild();
         }
     }
 
@@ -1587,6 +1599,7 @@ void BossFd_DrawEffects(BossFdEffect* effect, GlobalContext* globalCtx) {
     flag = false;
     for (i = 0; i < 180; i++, effect++) {
         if (effect->type == BFD_FX_FIRE_BREATH) {
+            FrameInterpolation_RecordOpenChild(effect, effect->epoch);
             if (!flag) {
                 POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0);
                 gSPDisplayList(POLY_XLU_DISP++, gVolvagiaDustMaterialDL);
@@ -1603,6 +1616,7 @@ void BossFd_DrawEffects(BossFdEffect* effect, GlobalContext* globalCtx) {
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(dustTex[effect->timer2]));
             gSPDisplayList(POLY_XLU_DISP++, gVolvagiaDustModelDL);
+            FrameInterpolation_RecordCloseChild();
         }
     }
 
@@ -1610,6 +1624,7 @@ void BossFd_DrawEffects(BossFdEffect* effect, GlobalContext* globalCtx) {
     flag = false;
     for (i = 0; i < 180; i++, effect++) {
         if (effect->type == BFD_FX_SKULL_PIECE) {
+            FrameInterpolation_RecordOpenChild(effect, effect->epoch);
             if (!flag) {
                 func_80093D84(globalCtx->state.gfxCtx);
                 gSPDisplayList(POLY_XLU_DISP++, gVolvagiaSkullPieceMaterialDL);
@@ -1624,6 +1639,7 @@ void BossFd_DrawEffects(BossFdEffect* effect, GlobalContext* globalCtx) {
             gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_fd.c", 4192),
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gVolvagiaSkullPieceModelDL);
+            FrameInterpolation_RecordCloseChild();
         }
     }
 
diff --git a/soh/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.h b/soh/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.h
index ea24fd346..d9580fc28 100644
--- a/soh/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.h
+++ b/soh/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.h
@@ -49,6 +49,7 @@ typedef struct {
     /* 0x30 */ f32 scale;
     /* 0x34 */ f32 bFdFxFloat1;
     /* 0x38 */ f32 bFdFxFloat2;
+    u32 epoch;
 } BossFdEffect; // size = 0x3C
 
 #define BOSSFD_EFFECT_COUNT 180
diff --git a/soh/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c b/soh/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c
index 20db1fb55..779584e32 100644
--- a/soh/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c
+++ b/soh/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c
@@ -87,6 +87,7 @@ void BossFd2_SpawnDebris(GlobalContext* globalCtx, BossFdEffect* effect, Vec3f*
             effect->scale = scale / 1000.0f;
             effect->vFdFxRotX = Rand_ZeroFloat(100.0f);
             effect->vFdFxRotY = Rand_ZeroFloat(100.0f);
+            effect->epoch++;
             break;
         }
     }
@@ -112,6 +113,7 @@ void BossFd2_SpawnFireBreath(GlobalContext* globalCtx, BossFdEffect* effect, Vec
             effect->timer2 = 0;
             effect->scale = scale / 400.0f;
             effect->kbAngle = kbAngle;
+            effect->epoch++;
             break;
         }
     }
@@ -130,6 +132,7 @@ void BossFd2_SpawnEmber(GlobalContext* globalCtx, BossFdEffect* effect, Vec3f* p
             effect->scale = scale / 1000.0f;
             effect->alpha = 255;
             effect->timer1 = (s16)Rand_ZeroFloat(10.0f);
+            effect->epoch++;
             break;
         }
     }
@@ -148,6 +151,7 @@ void BossFd2_SpawnSkullPiece(GlobalContext* globalCtx, BossFdEffect* effect, Vec
             effect->scale = scale / 1000.0f;
             effect->vFdFxRotX = Rand_ZeroFloat(100.0f);
             effect->vFdFxRotY = Rand_ZeroFloat(100.0f);
+            effect->epoch++;
             break;
         }
     }
@@ -164,6 +168,7 @@ void BossFd2_SpawnDust(BossFdEffect* effect, Vec3f* position, Vec3f* velocity, V
             effect->accel = *acceleration;
             effect->timer2 = 0;
             effect->scale = scale / 400.0f;
+            effect->epoch++;
             break;
         }
     }
diff --git a/soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c b/soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c
index f7132bcaf..21199d420 100644
--- a/soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c
+++ b/soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c
@@ -9,6 +9,8 @@
 #include "assets/objects/object_ganon_anime2/object_ganon_anime2.h"
 #include "assets/scenes/dungeons/ganon_boss/ganon_boss_scene.h"
 
+#include "soh/frame_interpolation.h"
+
 #include <string.h>
 
 #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_4 | ACTOR_FLAG_5)
@@ -138,6 +140,7 @@ void BossGanonEff_SpawnWindowShard(GlobalContext* globalCtx, Vec3f* pos, Vec3f*
             eff->color.g = color->g;
             eff->color.b = color->b;
             eff->timer = (s16)Rand_ZeroFloat(20.0f);
+            eff->epoch++;
             break;
         }
     }
@@ -158,6 +161,7 @@ void BossGanonEff_SpawnSparkle(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velo
             eff->unk_2E = (s16)Rand_ZeroFloat(100.0f) + 0xC8;
             eff->unk_30 = arg6;
             eff->timer = (s16)Rand_ZeroFloat(10.0f);
+            eff->epoch++;
             break;
         }
     }
@@ -182,6 +186,7 @@ void BossGanonEff_SpawnLightRay(GlobalContext* globalCtx, Vec3f* pos, Vec3f* vel
             eff->timer = (s16)Rand_ZeroFloat(10.0f);
             eff->unk_48 = Math_Atan2F(eff->velocity.z, eff->velocity.x);
             eff->unk_44 = -Math_Atan2F(sqrtf(SQXZ(eff->velocity)), eff->velocity.y);
+            eff->epoch++;
             break;
         }
     }
@@ -201,6 +206,7 @@ void BossGanonEff_SpawnShock(GlobalContext* globalCtx, f32 scale, s16 shockType)
             eff->scale = scale / 1000.0f;
             eff->unk_2E = shockType;
             eff->timer = 0;
+            eff->epoch++;
             break;
         }
     }
@@ -220,6 +226,7 @@ void BossGanonEff_SpawnLightning(GlobalContext* globalCtx, f32 scale, f32 arg2,
             eff->unk_48 = arg2;
             eff->unk_3C = arg3;
             eff->timer = 0;
+            eff->epoch++;
             break;
         }
     }
@@ -240,6 +247,7 @@ void BossGanonEff_SpawnDustDark(GlobalContext* globalCtx, Vec3f* pos, f32 scale,
             eff->unk_38 = arg3;
             eff->unk_30 = (s16)Rand_ZeroFloat(100.0f);
             eff->unk_2E = eff->timer = eff->alpha = 0;
+            eff->epoch++;
             break;
         }
     }
@@ -257,6 +265,7 @@ void BossGanonEff_SpawnDustLight(GlobalContext* globalCtx, Vec3f* pos, f32 scale
     effArr[bufIndex].unk_38 = arg3;
     effArr[bufIndex].unk_30 = Rand_ZeroFloat(100.0f);
     effArr[bufIndex].unk_2E = effArr[bufIndex].timer = effArr[bufIndex].alpha = 0;
+    effArr[bufIndex].epoch++;
 }
 
 void BossGanonEff_SpawnShockwave(GlobalContext* globalCtx, Vec3f* pos, f32 scale, f32 arg3) {
@@ -275,6 +284,7 @@ void BossGanonEff_SpawnShockwave(GlobalContext* globalCtx, Vec3f* pos, f32 scale
             eff->unk_38 = arg3;
             eff->unk_30 = (s16)Rand_ZeroFloat(100.0f);
             eff->unk_2E = eff->timer = 0;
+            eff->epoch++;
             break;
         }
     }
@@ -295,6 +305,7 @@ void BossGanonEff_SpawnBlackDot(GlobalContext* globalCtx, Vec3f* pos, f32 scale)
             eff->timer = 0;
             eff->alpha = 0;
             eff->unk_2E = 0;
+            eff->epoch++;
             break;
         }
     }
@@ -4820,6 +4831,7 @@ void BossGanon_DrawEffects(GlobalContext* globalCtx) {
 
     for (i = 0; i < 200; i++, eff++) {
         if (eff->type == GDF_EFF_WINDOW_SHARD) {
+            FrameInterpolation_RecordOpenChild(eff, eff->epoch);
             gDPPipeSync(POLY_OPA_DISP++);
             if (flag == 0) {
                 gSPDisplayList(POLY_OPA_DISP++, gDorfWindowShardMaterialDL);
@@ -4837,6 +4849,7 @@ void BossGanon_DrawEffects(GlobalContext* globalCtx) {
             gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_ganon.c", 10898),
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_OPA_DISP++, gDorfWindowShardModelDL);
+            FrameInterpolation_RecordCloseChild();
         }
     }
 
@@ -4845,6 +4858,7 @@ void BossGanon_DrawEffects(GlobalContext* globalCtx) {
 
     for (i = 0; i < 150; i++, eff++) {
         if (eff->type == GDF_EFF_SPARKLE) {
+            FrameInterpolation_RecordOpenChild(eff, eff->epoch);
             gDPPipeSync(POLY_XLU_DISP++);
             if (flag == 0) {
                 gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 0, 0);
@@ -4859,6 +4873,7 @@ void BossGanon_DrawEffects(GlobalContext* globalCtx) {
             gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_ganon.c", 10932),
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gDorfSquareDL);
+            FrameInterpolation_RecordCloseChild();
         }
     }
 
@@ -4867,6 +4882,7 @@ void BossGanon_DrawEffects(GlobalContext* globalCtx) {
 
     for (i = 0; i < 150; i++, eff++) {
         if (eff->type == GDF_EFF_LIGHT_RAY) {
+            FrameInterpolation_RecordOpenChild(eff, eff->epoch);
             gDPPipeSync(POLY_XLU_DISP++);
             if (flag == 0) {
                 gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 0, 0);
@@ -4883,6 +4899,7 @@ void BossGanon_DrawEffects(GlobalContext* globalCtx) {
             gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_ganon.c", 10971),
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gDorfSquareDL);
+            FrameInterpolation_RecordCloseChild();
         }
     }
 
@@ -4891,6 +4908,7 @@ void BossGanon_DrawEffects(GlobalContext* globalCtx) {
 
     for (i = 0; i < 150; i++, eff++) {
         if (eff->type == GDF_EFF_SHOCK) {
+            FrameInterpolation_RecordOpenChild(eff, eff->epoch);
             if (flag == 0) {
                 gDPPipeSync(POLY_XLU_DISP++);
                 if (eff->unk_2E == GDF_SHOCK_PLAYER_PURPLE) {
@@ -4909,6 +4927,7 @@ void BossGanon_DrawEffects(GlobalContext* globalCtx) {
             gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_ganon.c", 11023),
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gDorfShockDL);
+            FrameInterpolation_RecordCloseChild();
         }
     }
 
@@ -4916,6 +4935,7 @@ void BossGanon_DrawEffects(GlobalContext* globalCtx) {
 
     for (i = 0; i < 150; i++, eff++) {
         if (eff->type == GDF_EFF_LIGHTNING) {
+            FrameInterpolation_RecordOpenChild(eff, eff->epoch);
             gDPPipeSync(POLY_XLU_DISP++);
             gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, sLightningPrimColors[(eff->timer * 3) + 0],
                             sLightningPrimColors[(eff->timer * 3) + 1], sLightningPrimColors[(eff->timer * 3) + 2],
@@ -4931,6 +4951,7 @@ void BossGanon_DrawEffects(GlobalContext* globalCtx) {
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sLightningTextures[eff->timer]));
             gSPDisplayList(POLY_XLU_DISP++, gDorfLightningDL);
+            FrameInterpolation_RecordCloseChild();
         }
     }
 
@@ -4938,6 +4959,7 @@ void BossGanon_DrawEffects(GlobalContext* globalCtx) {
 
     for (i = 0; i < 150; i++, eff++) {
         if (eff->type == GDF_EFF_IMPACT_DUST_DARK) {
+            FrameInterpolation_RecordOpenChild(eff, eff->epoch);
             gDPPipeSync(POLY_XLU_DISP++);
             gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 0, 0, 0, eff->alpha);
             gDPSetEnvColor(POLY_XLU_DISP++, 100, 70, 0, 128);
@@ -4949,6 +4971,7 @@ void BossGanon_DrawEffects(GlobalContext* globalCtx) {
             gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_ganon.c", 11121),
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gDorfImpactDarkDL);
+            FrameInterpolation_RecordCloseChild();
         }
     }
 
@@ -4956,6 +4979,7 @@ void BossGanon_DrawEffects(GlobalContext* globalCtx) {
 
     for (i = 0; i < 150; i++, eff++) {
         if (eff->type == GDF_EFF_IMPACT_DUST_LIGHT) {
+            FrameInterpolation_RecordOpenChild(eff, eff->epoch);
             gDPPipeSync(POLY_XLU_DISP++);
             gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, eff->alpha);
             gDPSetEnvColor(POLY_XLU_DISP++, 200, 100, 0, 128);
@@ -4967,6 +4991,7 @@ void BossGanon_DrawEffects(GlobalContext* globalCtx) {
             gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_ganon.c", 11165),
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gDorfImpactLightDL);
+            FrameInterpolation_RecordCloseChild();
         }
     }
 
@@ -4974,6 +4999,7 @@ void BossGanon_DrawEffects(GlobalContext* globalCtx) {
 
     for (i = 0; i < 150; i++, eff++) {
         if (eff->type == GDF_EFF_SHOCKWAVE) {
+            FrameInterpolation_RecordOpenChild(eff, eff->epoch);
             gDPPipeSync(POLY_XLU_DISP++);
             gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 170, eff->alpha);
             gDPSetEnvColor(POLY_XLU_DISP++, 150, 255, 0, 128);
@@ -4986,6 +5012,7 @@ void BossGanon_DrawEffects(GlobalContext* globalCtx) {
             gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_ganon.c", 11209),
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gDorfShockwaveDL);
+            FrameInterpolation_RecordCloseChild();
         }
     }
 
@@ -4993,6 +5020,7 @@ void BossGanon_DrawEffects(GlobalContext* globalCtx) {
 
     for (i = 0; i < 150; i++, eff++) {
         if (eff->type == GDF_EFF_BLACK_DOT) {
+            FrameInterpolation_RecordOpenChild(eff, eff->epoch);
             gDPPipeSync(POLY_XLU_DISP++);
             gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 150, 170, 0, eff->alpha);
             gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 255, 128);
@@ -5005,6 +5033,7 @@ void BossGanon_DrawEffects(GlobalContext* globalCtx) {
             gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_ganon.c", 11250),
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gDorfDotDL);
+            FrameInterpolation_RecordCloseChild();
         }
     }
 
diff --git a/soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.h b/soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.h
index 69a983717..7a797ad74 100644
--- a/soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.h
+++ b/soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.h
@@ -69,6 +69,7 @@ typedef struct {
     /* 0x40 */ f32 unk_40;
     /* 0x44 */ f32 unk_44; // mostly x rot
     /* 0x48 */ f32 unk_48; // mostly y rot
+    u32 epoch;
 } GanondorfEffect;         // size = 0x4C
 
 typedef struct BossGanon {
diff --git a/soh/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c b/soh/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c
index ec4899a28..ae436ca2d 100644
--- a/soh/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c
+++ b/soh/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c
@@ -10,6 +10,8 @@
 #include "objects/gameplay_keep/gameplay_keep.h"
 #include "vt.h"
 
+#include "soh/frame_interpolation.h"
+
 #include <string.h>
 
 #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_4 | ACTOR_FLAG_5)
@@ -34,6 +36,7 @@ typedef struct {
     /* 0x30 */ f32 scale;
     /* 0x30 */ f32 fwork[2];
     /* 0x3C */ Vec3f* targetPos;
+    u32 epoch;
 } BossMoEffect; // size = 0x40
 
 #define MO_FX_MAX_SIZE 0
@@ -211,6 +214,7 @@ void BossMo_SpawnRipple(BossMoEffect* effect, Vec3f* pos, f32 scale, f32 maxScal
                 effect->rippleMode = 1;
                 effect->fwork[MO_FX_SPREAD_RATE] = (effect->fwork[MO_FX_MAX_SIZE] - effect->scale) * 0.1f;
             }
+            effect->epoch++;
             break;
         }
     }
@@ -232,6 +236,7 @@ void BossMo_SpawnDroplet(s16 type, BossMoEffect* effect, Vec3f* pos, Vec3f* vel,
             effect->scale = scale;
             effect->fwork[MO_FX_SPREAD_RATE] = 1.0f;
             effect->stopTimer = 0;
+            effect->epoch++;
             break;
         }
     }
@@ -250,6 +255,7 @@ void BossMo_SpawnStillDroplet(BossMoEffect* effect, Vec3f* pos, f32 scale) {
             effect->accel = zeroVec;
             effect->scale = scale;
             effect->fwork[MO_FX_SPREAD_RATE] = 1.0f;
+            effect->epoch++;
             break;
         }
     }
@@ -274,6 +280,7 @@ void BossMo_SpawnBubble(BossMoEffect* effect, Vec3f* pos, Vec3f* vel, Vec3f* acc
                 effect->alpha = 0;
             }
             effect->timer = 0;
+            effect->epoch++;
             break;
         }
     }
@@ -2909,6 +2916,7 @@ void BossMo_DrawEffects(BossMoEffect* effect, GlobalContext* globalCtx) {
 
     for (i = 0; i < ARRAY_COUNT(sEffects); i++, effect++) {
         if (effect->type == MO_FX_BIG_RIPPLE) {
+            FrameInterpolation_RecordOpenChild(effect, effect->epoch);
             if (flag == 0) {
                 func_80094BC4(gfxCtx);
 
@@ -2925,6 +2933,7 @@ void BossMo_DrawEffects(BossMoEffect* effect, GlobalContext* globalCtx) {
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
             gSPDisplayList(POLY_XLU_DISP++, gEffWaterRippleDL);
+            FrameInterpolation_RecordCloseChild();
         }
     }
 
@@ -2932,6 +2941,7 @@ void BossMo_DrawEffects(BossMoEffect* effect, GlobalContext* globalCtx) {
     flag = 0;
     for (i = 0; i < ARRAY_COUNT(sEffects); i++, effect++) {
         if (effect->type == MO_FX_SMALL_RIPPLE) {
+            FrameInterpolation_RecordOpenChild(effect, effect->epoch);
             if (flag == 0) {
                 func_80093D84(globalCtx->state.gfxCtx);
 
@@ -2948,6 +2958,7 @@ void BossMo_DrawEffects(BossMoEffect* effect, GlobalContext* globalCtx) {
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
             gSPDisplayList(POLY_XLU_DISP++, gEffShockwaveDL);
+            FrameInterpolation_RecordCloseChild();
         }
     }
 
@@ -2956,6 +2967,7 @@ void BossMo_DrawEffects(BossMoEffect* effect, GlobalContext* globalCtx) {
     for (i = 0; i < ARRAY_COUNT(sEffects); i++, effect++) {
         if (((effect->type == MO_FX_DROPLET) || (effect->type == MO_FX_SPLASH)) ||
             (effect->type == MO_FX_SPLASH_TRAIL)) {
+            FrameInterpolation_RecordOpenChild(effect, effect->epoch);
             if (flag == 0) {
                 POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0);
 
@@ -2977,6 +2989,7 @@ void BossMo_DrawEffects(BossMoEffect* effect, GlobalContext* globalCtx) {
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
             gSPDisplayList(POLY_XLU_DISP++, gMorphaDropletModelDL);
+            FrameInterpolation_RecordCloseChild();
         }
     }
 
@@ -2984,6 +2997,7 @@ void BossMo_DrawEffects(BossMoEffect* effect, GlobalContext* globalCtx) {
     flag = 0;
     for (i = 0; i < ARRAY_COUNT(sEffects); i++, effect++) {
         if (effect->type == MO_FX_WET_SPOT) {
+            FrameInterpolation_RecordOpenChild(effect, effect->epoch);
             if (flag == 0) {
                 func_80094044(gfxCtx);
 
@@ -3003,6 +3017,7 @@ void BossMo_DrawEffects(BossMoEffect* effect, GlobalContext* globalCtx) {
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
             gSPDisplayList(POLY_XLU_DISP++, gMorphaWetSpotModelDL);
+            FrameInterpolation_RecordCloseChild();
         }
     }
 
@@ -3010,6 +3025,7 @@ void BossMo_DrawEffects(BossMoEffect* effect, GlobalContext* globalCtx) {
     flag = 0;
     for (i = 0; i < ARRAY_COUNT(sEffects); i++, effect++) {
         if (effect->type == MO_FX_BUBBLE) {
+            FrameInterpolation_RecordOpenChild(effect, effect->epoch);
             if (flag == 0) {
                 func_80093D18(globalCtx->state.gfxCtx);
 
@@ -3027,6 +3043,7 @@ void BossMo_DrawEffects(BossMoEffect* effect, GlobalContext* globalCtx) {
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
             gSPDisplayList(POLY_OPA_DISP++, gMorphaBubbleDL);
+            FrameInterpolation_RecordCloseChild();
         }
     }
 
diff --git a/soh/src/overlays/actors/ovl_Boss_Va/z_boss_va.c b/soh/src/overlays/actors/ovl_Boss_Va/z_boss_va.c
index c5b60a327..3d6865e24 100644
--- a/soh/src/overlays/actors/ovl_Boss_Va/z_boss_va.c
+++ b/soh/src/overlays/actors/ovl_Boss_Va/z_boss_va.c
@@ -12,6 +12,8 @@
 #include "overlays/actors/ovl_En_Boom/z_en_boom.h"
 #include "objects/gameplay_keep/gameplay_keep.h"
 
+#include "soh/frame_interpolation.h"
+
 #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_2 | ACTOR_FLAG_4 | ACTOR_FLAG_5)
 
 #define GET_BODY(this) ((BossVa*)(this)->actor.parent)
@@ -40,6 +42,7 @@ typedef struct BossVaEffect {
     /* 0x44 */ f32 scaleMod;
     /* 0x48 */ Vec3f offset;
     /* 0x54 */ struct BossVa* parent;
+    u32 epoch;
 } BossVaEffect; // size = 0x58
 
 typedef enum {
@@ -3519,6 +3522,7 @@ void BossVa_DrawEffects(BossVaEffect* effect, GlobalContext* globalCtx) {
 
     for (i = 0; i < ARRAY_COUNT(sVaEffects); i++, effect++) {
         if (effect->type == VA_LARGE_SPARK) {
+            FrameInterpolation_RecordOpenChild(effect, effect->epoch);
             if (!flag) {
                 func_80093D84(globalCtx->state.gfxCtx);
                 gDPSetEnvColor(POLY_XLU_DISP++, 130, 130, 30, 0);
@@ -3534,12 +3538,14 @@ void BossVa_DrawEffects(BossVaEffect* effect, GlobalContext* globalCtx) {
             gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_va.c", 4976),
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gBarinadeDL_015710);
+            FrameInterpolation_RecordCloseChild();
         }
     }
 
     effect = effectHead;
     for (i = 0, flag = 0; i < ARRAY_COUNT(sVaEffects); i++, effect++) {
         if (effect->type == VA_SPARK_BALL) {
+            FrameInterpolation_RecordOpenChild(effect, effect->epoch);
             if (!flag) {
                 func_80093D84(globalCtx->state.gfxCtx);
                 gSPDisplayList(POLY_XLU_DISP++, gBarinadeDL_011738);
@@ -3560,12 +3566,14 @@ void BossVa_DrawEffects(BossVaEffect* effect, GlobalContext* globalCtx) {
             gDPSetEnvColor(POLY_XLU_DISP++, effect->envColor[0], effect->envColor[1], effect->envColor[2],
                            effect->envColor[3]);
             gSPDisplayList(POLY_XLU_DISP++, gBarinadeDL_011768);
+            FrameInterpolation_RecordCloseChild();
         }
     }
 
     effect = effectHead;
     for (i = 0, flag = 0; i < ARRAY_COUNT(sVaEffects); i++, effect++) {
         if (effect->type == VA_BLOOD) {
+            FrameInterpolation_RecordOpenChild(effect, effect->epoch);
             if (!flag) {
                 func_80093D84(globalCtx->state.gfxCtx);
                 gSPDisplayList(POLY_XLU_DISP++, gBarinadeDL_009430);
@@ -3590,6 +3598,7 @@ void BossVa_DrawEffects(BossVaEffect* effect, GlobalContext* globalCtx) {
             gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_va.c", 5052),
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gBarinadeDL_009468);
+            FrameInterpolation_RecordCloseChild();
         }
     }
 
@@ -3598,6 +3607,7 @@ void BossVa_DrawEffects(BossVaEffect* effect, GlobalContext* globalCtx) {
         if (effect->type == VA_TUMOR) {
             BossVa* parent = effect->parent;
 
+            FrameInterpolation_RecordOpenChild(effect, effect->epoch);
             if (!flag) {
                 func_80093D18(globalCtx->state.gfxCtx);
                 gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, effect->envColor[3]);
@@ -3614,12 +3624,14 @@ void BossVa_DrawEffects(BossVaEffect* effect, GlobalContext* globalCtx) {
                           G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
                 gSPDisplayList(POLY_OPA_DISP++, gBarinadeDL_012948);
             }
+            FrameInterpolation_RecordCloseChild();
         }
     }
 
     effect = effectHead;
     for (i = 0, flag = 0; i < ARRAY_COUNT(sVaEffects); i++, effect++) {
         if (effect->type == VA_GORE) {
+            FrameInterpolation_RecordOpenChild(effect, effect->epoch);
             if (!flag) {
                 func_80093D18(globalCtx->state.gfxCtx);
                 gSPDisplayList(POLY_OPA_DISP++, gBarinadeDL_012BA0);
@@ -3645,12 +3657,14 @@ void BossVa_DrawEffects(BossVaEffect* effect, GlobalContext* globalCtx) {
             gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_va.c", 5124),
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_OPA_DISP++, gBarinadeDL_012C50);
+            FrameInterpolation_RecordCloseChild();
         }
     }
 
     effect = effectHead;
     for (i = 0, flag = 0; i < ARRAY_COUNT(sVaEffects); i++, effect++) {
         if (effect->type == VA_ZAP_CHARGE) {
+            FrameInterpolation_RecordOpenChild(effect, effect->epoch);
             if (!flag) {
                 func_80093D84(globalCtx->state.gfxCtx);
                 gSPDisplayList(POLY_XLU_DISP++, gBarinadeDL_0135B0);
@@ -3668,12 +3682,14 @@ void BossVa_DrawEffects(BossVaEffect* effect, GlobalContext* globalCtx) {
             gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_va.c", 5152),
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gBarinadeDL_013638);
+            FrameInterpolation_RecordCloseChild();
         }
     }
 
     effect = effectHead;
     for (i = 0, flag = 0; i < ARRAY_COUNT(sVaEffects); i++, effect++) {
         if (effect->type == VA_BLAST_SPARK) {
+            FrameInterpolation_RecordOpenChild(effect, effect->epoch);
             if (!flag) {
                 func_80093C14(globalCtx->state.gfxCtx);
                 gDPSetEnvColor(POLY_XLU_DISP++, 130, 130, 30, 0);
@@ -3690,12 +3706,14 @@ void BossVa_DrawEffects(BossVaEffect* effect, GlobalContext* globalCtx) {
             gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_va.c", 5180),
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gBarinadeDL_015710);
+            FrameInterpolation_RecordCloseChild();
         }
     }
 
     effect = effectHead;
     for (i = 0, flag = 0; i < ARRAY_COUNT(sVaEffects); i++, effect++) {
         if (effect->type == VA_SMALL_SPARK) {
+            FrameInterpolation_RecordOpenChild(effect, effect->epoch);
             if (!flag) {
                 func_80093D84(globalCtx->state.gfxCtx);
                 gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 100, 0);
@@ -3712,6 +3730,7 @@ void BossVa_DrawEffects(BossVaEffect* effect, GlobalContext* globalCtx) {
             gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_va.c", 5208),
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gBarinadeDL_008F70);
+            FrameInterpolation_RecordCloseChild();
         }
     }
 
@@ -3734,6 +3753,7 @@ void BossVa_SpawnSpark(GlobalContext* globalCtx, BossVaEffect* effect, BossVa* t
             effect->timer = (s16)(Rand_ZeroOne() * 10.0f) + 111;
             effect->velocity = effect->accel = sZeroVec;
             effect->mode = mode;
+            effect->epoch++;
 
             switch (mode) {
                 case SPARK_UNUSED:
diff --git a/soh/src/overlays/actors/ovl_En_Zo/z_en_zo.c b/soh/src/overlays/actors/ovl_En_Zo/z_en_zo.c
index b55777484..ac50f226a 100644
--- a/soh/src/overlays/actors/ovl_En_Zo/z_en_zo.c
+++ b/soh/src/overlays/actors/ovl_En_Zo/z_en_zo.c
@@ -7,6 +7,8 @@
 #include "z_en_zo.h"
 #include "objects/object_zo/object_zo.h"
 
+#include "soh/frame_interpolation.h"
+
 #define FLAGS (ACTOR_FLAG_0 | ACTOR_FLAG_3)
 
 typedef enum {
@@ -41,6 +43,7 @@ void EnZo_Ripple(EnZo* this, Vec3f* pos, f32 scale, f32 targetScale, u8 alpha) {
             effect->scale = scale;
             effect->targetScale = targetScale;
             effect->color.a = alpha;
+            effect->epoch++;
             break;
         }
         effect++;
@@ -65,6 +68,7 @@ void EnZo_Bubble(EnZo* this, Vec3f* pos) {
                 effect->vec = *pos;
                 effect->vel = vel;
                 effect->scale = ((Rand_ZeroOne() - 0.5f) * 0.02f) + 0.12f;
+                effect->epoch++;
                 break;
             }
         }
@@ -87,6 +91,7 @@ void EnZo_Splash(EnZo* this, Vec3f* pos, Vec3f* vel, f32 scale) {
             effect->vel = *vel;
             effect->color.a = (Rand_ZeroOne() * 100.0f) + 100.0f;
             effect->scale = scale;
+            effect->epoch++;
             break;
         }
         effect++;
@@ -180,6 +185,7 @@ void EnZo_DrawRipples(EnZo* this, GlobalContext* globalCtx) {
     func_80093D84(globalCtx->state.gfxCtx);
     for (i = 0; i < ARRAY_COUNT(this->effects); i++) {
         if (effect->type == ENZO_EFFECT_RIPPLE) {
+            FrameInterpolation_RecordOpenChild(effect, effect->epoch);
             if (!setup) {
                 if (1) {}
                 gDPPipeSync(POLY_XLU_DISP++);
@@ -194,6 +200,7 @@ void EnZo_DrawRipples(EnZo* this, GlobalContext* globalCtx) {
             gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_zo_eff.c", 242),
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gZoraRipplesModelDL);
+            FrameInterpolation_RecordCloseChild();
         }
         effect++;
     }
@@ -210,6 +217,7 @@ void EnZo_DrawBubbles(EnZo* this, GlobalContext* globalCtx) {
     func_80093D84(globalCtx->state.gfxCtx);
     for (i = 0; i < ARRAY_COUNT(this->effects); i++) {
         if (effect->type == ENZO_EFFECT_BUBBLE) {
+            FrameInterpolation_RecordOpenChild(effect, effect->epoch);
             if (!setup) {
                 if (1) {}
                 gSPDisplayList(POLY_XLU_DISP++, gZoraBubblesMaterialDL);
@@ -227,6 +235,7 @@ void EnZo_DrawBubbles(EnZo* this, GlobalContext* globalCtx) {
             gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_zo_eff.c", 281),
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gZoraBubblesModelDL);
+            FrameInterpolation_RecordCloseChild();
         }
         effect++;
     }
@@ -244,6 +253,7 @@ void EnZo_DrawSplashes(EnZo* this, GlobalContext* globalCtx) {
     func_80093D84(globalCtx->state.gfxCtx);
     for (i = 0; i < ARRAY_COUNT(this->effects); i++) {
         if (effect->type == ENZO_EFFECT_SPLASH) {
+            FrameInterpolation_RecordOpenChild(effect, effect->epoch);
             if (!setup) {
                 if (1) {}
                 gSPDisplayList(POLY_XLU_DISP++, gZoraSplashesMaterialDL);
@@ -260,6 +270,7 @@ void EnZo_DrawSplashes(EnZo* this, GlobalContext* globalCtx) {
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
             gSPDisplayList(POLY_XLU_DISP++, gZoraSplashesModelDL);
+            FrameInterpolation_RecordCloseChild();
         }
         effect++;
     }
diff --git a/soh/src/overlays/actors/ovl_En_Zo/z_en_zo.h b/soh/src/overlays/actors/ovl_En_Zo/z_en_zo.h
index ba6eebb30..8911ce399 100644
--- a/soh/src/overlays/actors/ovl_En_Zo/z_en_zo.h
+++ b/soh/src/overlays/actors/ovl_En_Zo/z_en_zo.h
@@ -15,6 +15,7 @@ typedef struct {
     /* 0x14 */ Vec3f pos;
     /* 0x20 */ Vec3f vel;
     /* 0x2C */ Vec3f vec; // Usage specific
+    u32 epoch;
 } EnZoEffect; // size = 0x38
 
 typedef void (*EnZoActionFunc)(struct EnZo*, GlobalContext*);
diff --git a/soh/src/overlays/actors/ovl_Fishing/z_fishing.c b/soh/src/overlays/actors/ovl_Fishing/z_fishing.c
index a103c4826..0798145db 100644
--- a/soh/src/overlays/actors/ovl_Fishing/z_fishing.c
+++ b/soh/src/overlays/actors/ovl_Fishing/z_fishing.c
@@ -10,6 +10,8 @@
 #include "objects/object_fish/object_fish.h"
 #include "vt.h"
 
+#include "soh/frame_interpolation.h"
+
 #define FLAGS ACTOR_FLAG_4
 
 #define WATER_SURFACE_Y(globalCtx) globalCtx->colCtx.colHeader->waterBoxes->ySurface
@@ -56,6 +58,7 @@ typedef struct {
     /* 0x34 */ f32 unk_34;
     /* 0x38 */ f32 unk_38;
     /* 0x3C */ f32 unk_3C;
+    u32 epoch;
 } FishingEffect; // size = 0x40
 
 #define POND_PROP_COUNT 140
@@ -490,6 +493,8 @@ void Fishing_SpawnRipple(Vec3f* projectedPos, FishingEffect* effect, Vec3f* pos,
                 effect->unk_2C = 1;
                 effect->unk_38 = (effect->unk_34 - effect->unk_30) * 0.1f;
             }
+
+            effect->epoch++;
             break;
         }
 
@@ -514,6 +519,7 @@ void Fishing_SpawnDustSplash(Vec3f* projectedPos, FishingEffect* effect, Vec3f*
             effect->accel = accel;
             effect->alpha = 100 + (s16)Rand_ZeroFloat(100.0f);
             effect->unk_30 = scale;
+            effect->epoch++;
             break;
         }
 
@@ -539,6 +545,7 @@ void Fishing_SpawnWaterDust(Vec3f* projectedPos, FishingEffect* effect, Vec3f* p
             effect->timer = (s16)Rand_ZeroFloat(100.0f);
             effect->unk_30 = scale;
             effect->unk_34 = 2.0f * scale;
+            effect->epoch++;
             break;
         }
 
@@ -563,6 +570,7 @@ void Fishing_SpawnBubble(Vec3f* projectedPos, FishingEffect* effect, Vec3f* pos,
             effect->timer = (s16)Rand_ZeroFloat(100.0f);
             effect->unk_30 = scale;
             effect->unk_2C = arg4;
+            effect->epoch++;
             break;
         }
 
@@ -591,6 +599,7 @@ void Fishing_SpawnRainDrop(FishingEffect* effect, Vec3f* pos, Vec3f* rot) {
             Matrix_RotateY(rot->y, MTXMODE_NEW);
             Matrix_RotateX(rot->x, MTXMODE_APPLY);
             Matrix_MultVec3f(&velSrc, &effect->vel);
+            effect->epoch++;
             break;
         }
 
@@ -1182,6 +1191,7 @@ void Fishing_DrawEffects(FishingEffect* effect, GlobalContext* globalCtx) {
 
     for (i = 0; i < 100; i++) {
         if (effect->type == FS_EFF_RIPPLE) {
+            FrameInterpolation_RecordOpenChild(effect, effect->epoch);
             if (flag == 0) {
                 gSPDisplayList(POLY_XLU_DISP++, gFishingRippleMaterialDL);
                 gDPSetEnvColor(POLY_XLU_DISP++, 155, 155, 155, 0);
@@ -1197,6 +1207,7 @@ void Fishing_DrawEffects(FishingEffect* effect, GlobalContext* globalCtx) {
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
             gSPDisplayList(POLY_XLU_DISP++, gFishingRippleModelDL);
+            FrameInterpolation_RecordCloseChild();
         }
         effect++;
     }
@@ -1205,6 +1216,7 @@ void Fishing_DrawEffects(FishingEffect* effect, GlobalContext* globalCtx) {
     flag = 0;
     for (i = 0; i < 100; i++) {
         if (effect->type == FS_EFF_DUST_SPLASH) {
+            FrameInterpolation_RecordOpenChild(effect, effect->epoch);
             if (flag == 0) {
                 gSPDisplayList(POLY_XLU_DISP++, gFishingDustSplashMaterialDL);
                 gDPSetEnvColor(POLY_XLU_DISP++, 200, 200, 200, 0);
@@ -1221,6 +1233,7 @@ void Fishing_DrawEffects(FishingEffect* effect, GlobalContext* globalCtx) {
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
             gSPDisplayList(POLY_XLU_DISP++, gFishingDustSplashModelDL);
+            FrameInterpolation_RecordCloseChild();
         }
         effect++;
     }
@@ -1229,6 +1242,7 @@ void Fishing_DrawEffects(FishingEffect* effect, GlobalContext* globalCtx) {
     flag = 0;
     for (i = 0; i < 100; i++) {
         if (effect->type == FS_EFF_WATER_DUST) {
+            FrameInterpolation_RecordOpenChild(effect, effect->epoch);
             if (flag == 0) {
                 gSPDisplayList(POLY_OPA_DISP++, gFishingWaterDustMaterialDL);
                 gDPSetEnvColor(POLY_OPA_DISP++, 40, 90, 80, 128);
@@ -1249,6 +1263,7 @@ void Fishing_DrawEffects(FishingEffect* effect, GlobalContext* globalCtx) {
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
             gSPDisplayList(POLY_OPA_DISP++, gFishingWaterDustModelDL);
+            FrameInterpolation_RecordCloseChild();
         }
         effect++;
     }
@@ -1257,6 +1272,7 @@ void Fishing_DrawEffects(FishingEffect* effect, GlobalContext* globalCtx) {
     flag = 0;
     for (i = 0; i < 100; i++) {
         if (effect->type == FS_EFF_BUBBLE) {
+            FrameInterpolation_RecordOpenChild(effect, effect->epoch);
             if (flag == 0) {
                 gSPDisplayList(POLY_XLU_DISP++, gFishingBubbleMaterialDL);
                 gDPSetEnvColor(POLY_XLU_DISP++, 150, 150, 150, 0);
@@ -1272,6 +1288,7 @@ void Fishing_DrawEffects(FishingEffect* effect, GlobalContext* globalCtx) {
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
             gSPDisplayList(POLY_XLU_DISP++, gFishingBubbleModelDL);
+            FrameInterpolation_RecordCloseChild();
         }
         effect++;
     }
@@ -1280,6 +1297,7 @@ void Fishing_DrawEffects(FishingEffect* effect, GlobalContext* globalCtx) {
     flag = 0;
     for (i = 30; i < EFFECT_COUNT; i++) {
         if (effect->type == FS_EFF_RAIN_DROP) {
+            FrameInterpolation_RecordOpenChild(effect, effect->epoch);
             if (flag == 0) {
                 POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0x14);
                 gDPSetCombineMode(POLY_XLU_DISP++, G_CC_PRIMITIVE, G_CC_PRIMITIVE);
@@ -1297,6 +1315,7 @@ void Fishing_DrawEffects(FishingEffect* effect, GlobalContext* globalCtx) {
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
             gSPDisplayList(POLY_XLU_DISP++, gFishingRainDropModelDL);
+            FrameInterpolation_RecordCloseChild();
         }
         effect++;
     }
@@ -1307,6 +1326,7 @@ void Fishing_DrawEffects(FishingEffect* effect, GlobalContext* globalCtx) {
     flag = 0;
     for (i = 30; i < EFFECT_COUNT; i++) {
         if (effect->type == FS_EFF_RAIN_RIPPLE) {
+            FrameInterpolation_RecordOpenChild(effect, effect->epoch);
             if (flag == 0) {
                 gSPDisplayList(POLY_XLU_DISP++, gFishingRippleMaterialDL);
                 gDPSetEnvColor(POLY_XLU_DISP++, 155, 155, 155, 0);
@@ -1321,6 +1341,7 @@ void Fishing_DrawEffects(FishingEffect* effect, GlobalContext* globalCtx) {
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
             gSPDisplayList(POLY_XLU_DISP++, gFishingRippleModelDL);
+            FrameInterpolation_RecordCloseChild();
         }
         effect++;
     }
@@ -1329,6 +1350,7 @@ void Fishing_DrawEffects(FishingEffect* effect, GlobalContext* globalCtx) {
     flag = 0;
     for (i = 30; i < EFFECT_COUNT; i++) {
         if (effect->type == FS_EFF_RAIN_SPLASH) {
+            FrameInterpolation_RecordOpenChild(effect, effect->epoch);
             if (flag == 0) {
                 gSPDisplayList(POLY_XLU_DISP++, gFishingRainSplashMaterialDL);
                 gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, KREG(19) + 80);
@@ -1350,12 +1372,14 @@ void Fishing_DrawEffects(FishingEffect* effect, GlobalContext* globalCtx) {
                       G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
             gSPDisplayList(POLY_XLU_DISP++, gFishingRainSplashModelDL);
+            FrameInterpolation_RecordCloseChild();
         }
         effect++;
     }
 
     effect = firstEffect;
     if (effect->type == FS_EFF_OWNER_HAT) {
+        FrameInterpolation_RecordOpenChild(effect, effect->epoch);
         Matrix_Translate(effect->pos.x, effect->pos.y, effect->pos.z, MTXMODE_NEW);
         Matrix_RotateY((sEffOwnerHatRot.y * M_PI) / 32768, MTXMODE_APPLY);
         Matrix_RotateX((sEffOwnerHatRot.x * M_PI) / 32768, MTXMODE_APPLY);
@@ -1367,6 +1391,7 @@ void Fishing_DrawEffects(FishingEffect* effect, GlobalContext* globalCtx) {
                   G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
         gSPDisplayList(POLY_OPA_DISP++, gFishingOwnerHatDL);
+        FrameInterpolation_RecordCloseChild();
     }
 
     Matrix_Pop();
@@ -4398,6 +4423,7 @@ void Fishing_DrawPondProps(GlobalContext* globalCtx) {
             }
 
             if (prop->shouldDraw) {
+                FrameInterpolation_RecordOpenChild(prop, 0);
                 Matrix_Translate(prop->pos.x, prop->pos.y, prop->pos.z, MTXMODE_NEW);
                 Matrix_Scale(prop->scale, prop->scale, prop->scale, MTXMODE_APPLY);
                 Matrix_RotateY(prop->rotY, MTXMODE_APPLY);
@@ -4407,6 +4433,7 @@ void Fishing_DrawPondProps(GlobalContext* globalCtx) {
                 gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_fishing.c", 7726),
                           G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
                 gSPDisplayList(POLY_XLU_DISP++, gFishingReedModelDL);
+                FrameInterpolation_RecordCloseChild();
             }
         }
 
@@ -4423,12 +4450,14 @@ void Fishing_DrawPondProps(GlobalContext* globalCtx) {
             }
 
             if (prop->shouldDraw) {
+                FrameInterpolation_RecordOpenChild(prop, 0);
                 Matrix_Translate(prop->pos.x, prop->pos.y, prop->pos.z, MTXMODE_NEW);
                 Matrix_Scale(prop->scale, prop->scale, prop->scale, MTXMODE_APPLY);
 
                 gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_fishing.c", 7748),
                           G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
                 gSPDisplayList(POLY_OPA_DISP++, gFishingWoodPostModelDL);
+                FrameInterpolation_RecordCloseChild();
             }
         }
 
@@ -4445,6 +4474,7 @@ void Fishing_DrawPondProps(GlobalContext* globalCtx) {
             }
 
             if (prop->shouldDraw) {
+                FrameInterpolation_RecordOpenChild(prop, 0);
                 Matrix_Translate(prop->pos.x, prop->pos.y, prop->pos.z, MTXMODE_NEW);
                 Matrix_Scale(prop->scale, 1.0f, prop->scale, MTXMODE_APPLY);
                 Matrix_RotateY(prop->lilyPadAngle * (M_PI / 32768), MTXMODE_APPLY);
@@ -4454,6 +4484,7 @@ void Fishing_DrawPondProps(GlobalContext* globalCtx) {
                 gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_fishing.c", 7774),
                           G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
                 gSPDisplayList(POLY_XLU_DISP++, gFishingLilyPadModelDL);
+                FrameInterpolation_RecordCloseChild();
             }
         }
 
@@ -4470,6 +4501,7 @@ void Fishing_DrawPondProps(GlobalContext* globalCtx) {
             }
 
             if (prop->shouldDraw) {
+                FrameInterpolation_RecordOpenChild(prop, 0);
                 Matrix_Translate(prop->pos.x, prop->pos.y, prop->pos.z, MTXMODE_NEW);
                 Matrix_Scale(prop->scale, prop->scale, prop->scale, MTXMODE_APPLY);
                 Matrix_RotateY(prop->rotY, MTXMODE_APPLY);
@@ -4477,6 +4509,7 @@ void Fishing_DrawPondProps(GlobalContext* globalCtx) {
                 gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_fishing.c", 7798),
                           G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
                 gSPDisplayList(POLY_OPA_DISP++, gFishingRockModelDL);
+                FrameInterpolation_RecordCloseChild();
             }
         }
 
diff --git a/soh/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c b/soh/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c
index b01bcf1d9..d4282b91b 100644
--- a/soh/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c
+++ b/soh/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c
@@ -9,6 +9,8 @@
 #include "objects/gameplay_keep/gameplay_keep.h"
 #include "objects/object_spot02_objects/object_spot02_objects.h"
 
+#include "soh/frame_interpolation.h"
+
 #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5 | ACTOR_FLAG_25)
 
 void ObjectKankyo_Init(Actor* thisx, GlobalContext* globalCtx);
@@ -260,6 +262,7 @@ void ObjectKankyo_Fairies(ObjectKankyo* this, GlobalContext* globalCtx) {
                 this->effects[i].dirPhase.z = Rand_ZeroOne() * 360.0f;
                 this->effects[i].state++;
                 this->effects[i].timer = 0;
+                this->effects[i].epoch++;
                 break;
 
             case 1: // blinking fairies / inactive fairy trails
@@ -417,26 +420,32 @@ void ObjectKankyo_Fairies(ObjectKankyo* this, GlobalContext* globalCtx) {
                         if (this->effects[i].base.x + this->effects[i].pos.x - baseX > maxDist) {
                             this->effects[i].base.x = baseX - maxDist;
                             this->effects[i].pos.x = 0.0f;
+                            this->effects[i].epoch++;
                         }
                         if (this->effects[i].base.x + this->effects[i].pos.x - baseX < -maxDist) {
                             this->effects[i].base.x = baseX + maxDist;
                             this->effects[i].pos.x = 0.0f;
+                            this->effects[i].epoch++;
                         }
                         if (this->effects[i].base.y + this->effects[i].pos.y - baseY > 50.0f) {
                             this->effects[i].base.y = baseY - 50.0f;
                             this->effects[i].pos.y = 0.0f;
+                            this->effects[i].epoch++;
                         }
                         if (this->effects[i].base.y + this->effects[i].pos.y - baseY < -50.0f) {
                             this->effects[i].base.y = baseY + 50.0f;
                             this->effects[i].pos.y = 0.0f;
+                            this->effects[i].epoch++;
                         }
                         if (this->effects[i].base.z + this->effects[i].pos.z - baseZ > maxDist) {
                             this->effects[i].base.z = baseZ - maxDist;
                             this->effects[i].pos.z = 0.0f;
+                            this->effects[i].epoch++;
                         }
                         if (this->effects[i].base.z + this->effects[i].pos.z - baseZ < -maxDist) {
                             this->effects[i].base.z = baseZ + maxDist;
                             this->effects[i].pos.z = 0.0f;
+                            this->effects[i].epoch++;
                         }
                     }
                 }
@@ -496,6 +505,7 @@ void ObjectKankyo_DrawFairies(ObjectKankyo* this2, GlobalContext* globalCtx2) {
         gSPDisplayList(POLY_XLU_DISP++, gKokiriDustMoteTextureLoadDL);
 
         for (i = 0; i < globalCtx->envCtx.unk_EE[3]; i++) {
+            FrameInterpolation_RecordOpenChild(&this->effects[i], this->effects[i].epoch);
             Matrix_Translate(this->effects[i].base.x + this->effects[i].pos.x,
                              this->effects[i].base.y + this->effects[i].pos.y,
                              this->effects[i].base.z + this->effects[i].pos.z, MTXMODE_NEW);
@@ -561,6 +571,7 @@ void ObjectKankyo_DrawFairies(ObjectKankyo* this2, GlobalContext* globalCtx2) {
             Matrix_RotateZ(DEG_TO_RAD(globalCtx->state.frames * 20.0f), MTXMODE_APPLY);
             gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_object_kankyo.c", 913), G_MTX_LOAD);
             gSPDisplayList(POLY_XLU_DISP++, gKokiriDustMoteDL);
+            FrameInterpolation_RecordCloseChild();
         }
         CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_object_kankyo.c", 922);
     }
diff --git a/soh/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.h b/soh/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.h
index 9b9a69975..fc45e156e 100644
--- a/soh/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.h
+++ b/soh/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.h
@@ -24,6 +24,7 @@ typedef struct ObjectKankyoEffect {
     /* 0x4A */ u16 flightRadius;
     /* 0x4C */ f32 amplitude;
     /* 0x50 */ u16 timer;
+    u32 epoch;
 } ObjectKankyoEffect; // size = 0x54
 
 typedef struct ObjectKankyo {
diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c
index df6520ebf..4dbb1b20f 100644
--- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c
+++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c
@@ -14,6 +14,8 @@
 #include "vt.h"
 #include "SohHooks.h"
 
+#include "soh/frame_interpolation.h"
+
 static void* sEquipmentFRATexs[] = {
     gPauseEquipment00FRATex, gPauseEquipment01Tex, gPauseEquipment02Tex, gPauseEquipment03Tex, gPauseEquipment04Tex,
     gPauseEquipment10FRATex, gPauseEquipment11Tex, gPauseEquipment12Tex, gPauseEquipment13Tex, gPauseEquipment14Tex,
@@ -1047,6 +1049,7 @@ void KaleidoScope_DrawPages(GlobalContext* globalCtx, GraphicsContext* gfxCtx) {
     s16 stepG;
     s16 stepB;
 
+    FrameInterpolation_RecordOpenChild(NULL, pauseCtx->state + pauseCtx->pageIndex * 100);
     OPEN_DISPS(gfxCtx, "../z_kaleido_scope_PAL.c", 1100);
 
     if ((pauseCtx->state < 8) || (pauseCtx->state > 0x11)) {
@@ -1418,6 +1421,7 @@ void KaleidoScope_DrawPages(GlobalContext* globalCtx, GraphicsContext* gfxCtx) {
     }
 
     CLOSE_DISPS(gfxCtx, "../z_kaleido_scope_PAL.c", 1577);
+    FrameInterpolation_RecordCloseChild();
 }
 
 void KaleidoScope_DrawInfoPanel(GlobalContext* globalCtx) {

From 90f849dfcf58c32b001aa2c4691363bbad2d4dca Mon Sep 17 00:00:00 2001
From: sholdee <102821812+sholdee@users.noreply.github.com>
Date: Fri, 13 May 2022 17:44:04 -0500
Subject: [PATCH 29/43] Add args to build release config on Linux (#312)

---
 BUILDING.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/BUILDING.md b/BUILDING.md
index d37d7c0d6..546bb2905 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -41,9 +41,9 @@ cp /usr/local/lib/libGLEW.a external
 
 cd soh
 # Extract the assets/Compile the exporter/Run the exporter
-make setup -j$(nproc)
+make setup -j$(nproc) OPTFLAGS=-O0 DEBUG=0
 # Compile the code
-make -j $(nproc)
+make -j $(nproc) OPTFLAGS=-O0 DEBUG=0
 ```
 
 # Compatible Roms

From 2b0af54f88d34aa088c89afecac2be9ade576da7 Mon Sep 17 00:00:00 2001
From: MelonSpeedruns <melonspeedruns@outlook.com>
Date: Fri, 13 May 2022 18:44:58 -0400
Subject: [PATCH 30/43] Readme stuff (#313)

* Fixed Gyroscopy Settings & Drift

* readme stuff
---
 BUILDING.md          | 17 ++++++++--
 README.md            | 78 ++++++++++++++++++++++++--------------------
 soh/src/boot/build.c |  2 +-
 3 files changed, 58 insertions(+), 39 deletions(-)

diff --git a/BUILDING.md b/BUILDING.md
index 546bb2905..3e4d7b21a 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -2,9 +2,9 @@
 
 ## Windows
 
- 1. Install [Python](https://www.python.org/ftp/python/3.10.2/python-3.10.2-amd64.exe)
+ 1. Install [Python](https://www.python.org/downloads/) >= 3.6.
  2. Install [Visual Studio 2022 Community Edition](https://visualstudio.microsoft.com/vs/community/)
- 2b. In the Visual Studio Installer, install `MSVC v142 - VS 2019 C++`.
+ 3. In the Visual Studio Installer, install `MSVC v142 - VS 2019 C++`.
  4. Clone the Ship of Harkinian repository.
  5. Place one or more [compatible](#compatible-roms) roms in the `OTRExporter` directory with namings of your choice.
  6. Run `OTRExporter/OTRExporter.sln`.
@@ -51,3 +51,16 @@ make -j $(nproc) OPTFLAGS=-O0 DEBUG=0
 OOT_PAL_GC      checksum 0x09465AC3
 OOT_PAL_GC_DBG1 checksum 0x871E1C92 (debug non-master quest)
 ```
+
+# OTRExporter Usage
+
+The OTRExporter exports an `oot.otr` archive file which Ship of Harkinian requires to play.
+
+Use the `extract_assets.py` script file to run the exporter using any of the following methods:
+
+1. Double click on the script after placing one or more roms in the directory.
+2. Drag & Drop a rom onto the script.
+3. In a terminal run `python3 extract_assets.py` after placing one or more roms in the directory.
+4. In a terminal run `python3 extract_assets.py <path_to_rom>`
+
+If the script finds multiple roms the user is prompted which to use. Selection is done using the number keys and then pressing the carriage return key.
\ No newline at end of file
diff --git a/README.md b/README.md
index 3ce3fb21b..8a4538e2a 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ The Ship does not include assets and as such requires a prior copy of the game t
 
 ## Quick Start
 
-1) Download The Ship of Harkinian from Discord.
+1) Download The Ship of Harkinian from [Discord](https://discord.com/invite/BtBmd55HVH).
 2) Requires a supported copy of the game (See supported games below).
 3) Use the OTRGui to generate an `oot.otr` archive file.
 4) Launch `soh.exe`
@@ -18,9 +18,9 @@ Build team: `zelda@srd022j`
 Build date: `03-02-21 00:49:18` (year-month-day)
 sha1: cee6bc3c2a634b41728f2af8da54d9bf8cc14099
 ```
-Ocarina of Time Pal Gamecube
+Ocarina of Time PAL GameCube
 ```
-sha1: d0c95b2cb3c6682a171db267932af7af8cf5fa82
+sha1: 0227d7c0074f2d0ac935631990da8ec5914597b4
 ```
 
 Congratulations, you are now sailing with the Ship of Harkinian! Have fun!
@@ -67,39 +67,45 @@ Refer to the [building instructions](BUILDING.md) to compile SoH.
 
 ## The Harbour Masters Are...
 
-    Kenix 			| Lead Developer/Public Relations - Resource Management Programmer, Audio System Programmer, and General Programmer
-    Jack Walker 		| Lead Developer - OTR Format Programmer, Resource Load Programmer, and General Programmer
-    Louist103 		| Developer - Save System Programmer and General Programmer
-    Emil 			| Developer - Fast3D Programmer
-    m4xw 			| Developer - Shipwright, Throwing Baguettes, and General Programmer
-    MelonSpeedruns 		| Developer - General Programmer
-    Rozlette 		| Developer - General Programmer
-    JoshDuMan 		| Developer - General Programmer
-    KiritoDev/Lywx 		| Developer - General Programmer
-    Theo3 			| Developer - General Programmer
-	Random06457  		| Developer - Linux Build
+    Kenix | Lead Developer/Public Relations - Resource Management Programmer, Audio System Programmer, and General Programmer
+    Jack Walker | Lead Developer - OTR Format Programmer, Resource Load Programmer, and General Programmer
+    Louist103 | Developer - Save System Programmer and General Programmer
+    Emil | Developer - Fast3D Programmer
+    m4xw | Developer - Shipwright, Throwing Baguettes, and General Programmer
+    MelonSpeedruns | Developer - General Programmer
+    Rozlette | Developer - General Programmer
+    JoshDuMan | Developer - General Programmer
+    KiritoDev/Lywx | Developer - General Programmer
+    Theo3 | Developer - General Programmer
+	Random06457 | Developer - Linux Build
 
 ## Special Thanks
 
-    Decomp & ZAPD 		| Made this project even possible in the first place!
-    MNGoldenEagle 		| Patiently explained audio data formats, encouragement, and founding ZSO which was the first source of the game's code and resource format documentation.
-    Rrrrry123 		| Speedbunner, encouragement, and community moderation
-    Fierce deity 		| Encouragement and community moderation
-    mzxrules		| For his contributions to decomp
-    zel.		        | For his contributions to decomp
-    Aloxado 		| Developer - General Programmer
-    MegaMech 		| Developer - General Programmer
-	Revo 			| Tester - GCC support and General Testing
-	zfg 			| Tester - General Testing
-	Horseless Headman 	| Tester - General Testing
-    Steven Pritchett        | Tester - General Testing
-	Trenton May 		| Tester - General Testing
-	Zeldaboy14 		| Tester - General Testing, encouragement, and community moderation
-	Koby Howell 		| Tester - General Testing
-	Logg 			| Tester - General Testing
-	Taylor Daley		| Graphic Design
-	Can't Sleep 		| Graphic Design
-    MicTheMicrophone 	| Voice actor for the King
-    Amphibibro		| Voice actor for Link
-
-Lemons
+    Decomp & ZAPD | Made this project even possible in the first place!
+    MNGoldenEagle | Patiently explained audio data formats, encouragement, and founding ZSO which was the first source of the game's code and resource format documentation.
+    Rrrrry123 | Speedbunner, encouragement, and community moderation
+    Fierce deity | Encouragement and community moderation
+    mzxrules | For his contributions to decomp
+    zel. | For his contributions to decomp
+    Aloxado | Developer - General Programmer
+    MegaMech | Developer - General Programmer
+	Revo | Tester - GCC support and General Testing
+	zfg | Tester - General Testing
+	Horseless Headman | Tester - General Testing
+    Steven Pritchett | Tester - General Testing
+	Trenton May | Tester - General Testing
+	Zeldaboy14 | Tester - General Testing, encouragement, and community moderation
+	Koby Howell | Tester - General Testing
+	Logg | Tester - General Testing
+	Taylor Daley | Graphic Design
+	Can't Sleep | Graphic Design
+	
+## Video Credits
+    Kenix | Producer / Writer
+	rainbow_fash | Executive Producer
+    TheLegendOfXela | Editor
+    MicTheMicrophone | Gwonam / The King
+    Amphibibro | Link
+    AceHeart | Zelda
+    
+###### Lemons
\ No newline at end of file
diff --git a/soh/src/boot/build.c b/soh/src/boot/build.c
index f60380467..94d142020 100644
--- a/soh/src/boot/build.c
+++ b/soh/src/boot/build.c
@@ -1,4 +1,4 @@
-const char gBuildVersion[] = "DECKARD ALFA (1.0.0)";
+const char gBuildVersion[] = "ROY ALFA (2.0.0)";
 const char gBuildTeam[] = "github.com/harbourmasters";
 const char gBuildDate[] = __DATE__ " " __TIME__;
 const char gBuildMakeOption[] = "";

From 24fd3f1cdd345129742e1535c239ee95aeac2703 Mon Sep 17 00:00:00 2001
From: PurpleHato <linkvssangoku.jr@gmail.com>
Date: Wed, 11 May 2022 23:46:19 +0200
Subject: [PATCH 31/43] Fixed idle animations for Two Handed Items

Nintendo messed up and used a 0 instead of a 1 which basically pulled the wrong animation to load.
---
 soh/src/overlays/actors/ovl_player_actor/z_player.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/soh/src/overlays/actors/ovl_player_actor/z_player.c b/soh/src/overlays/actors/ovl_player_actor/z_player.c
index 49ad4e6e4..c37895322 100644
--- a/soh/src/overlays/actors/ovl_player_actor/z_player.c
+++ b/soh/src/overlays/actors/ovl_player_actor/z_player.c
@@ -6981,7 +6981,7 @@ void func_808409CC(GlobalContext* globalCtx, Player* this) {
                 if (sp34 < 4) {
                     if (((sp34 != 0) && (sp34 != 3)) || ((this->rightHandType == PLAYER_MODELTYPE_RH_SHIELD) &&
                         ((sp34 == 3) || Player_GetSwordHeld(this)))) {
-                        if ((sp34 == 0) && Player_HoldsTwoHandedWeapon(this)) {
+                        if ((sp34 == 1) && Player_HoldsTwoHandedWeapon(this)) {
                             sp34 = 4;
                         }
                         sp38 = sp34 + 9;

From 2e84a351b1f2ae728d37a0e93dd5a6fd38153f17 Mon Sep 17 00:00:00 2001
From: PurpleHato <linkvssangoku.jr@gmail.com>
Date: Thu, 12 May 2022 00:18:39 +0200
Subject: [PATCH 32/43] Used Cvars to make it part of the enhancements menu

---
 libultraship/libultraship/SohImGuiImpl.cpp          | 1 +
 soh/soh/Enhancements/bootcommands.c                 | 1 +
 soh/src/overlays/actors/ovl_player_actor/z_player.c | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/libultraship/libultraship/SohImGuiImpl.cpp b/libultraship/libultraship/SohImGuiImpl.cpp
index 785a29dee..042b30a7f 100644
--- a/libultraship/libultraship/SohImGuiImpl.cpp
+++ b/libultraship/libultraship/SohImGuiImpl.cpp
@@ -678,6 +678,7 @@ namespace SohImGui {
                 ImGui::Separator();
                 EnhancementCheckbox("Fix L&R Pause menu", "gUniformLR");
                 EnhancementCheckbox("Fix Dungeon entrances", "gFixDungeonMinimapIcon");
+                EnhancementCheckbox("Fix Two Handed idle animations", "gTwoHandedIdle");
 
                 EXPERIMENTAL();
 
diff --git a/soh/soh/Enhancements/bootcommands.c b/soh/soh/Enhancements/bootcommands.c
index 03742dae9..4995b5248 100644
--- a/soh/soh/Enhancements/bootcommands.c
+++ b/soh/soh/Enhancements/bootcommands.c
@@ -27,6 +27,7 @@ void BootCommands_Init()
     CVar_RegisterS32("gMinimalUI", 0);
     CVar_RegisterS32("gRumbleEnabled", 0);
     CVar_RegisterS32("gUniformLR", 1);
+    CVar_RegisterS32("gTwoHandedIdle", 1);
     CVar_RegisterS32("gNewDrops", 0);
     CVar_RegisterS32("gVisualAgony", 0);
     CVar_RegisterS32("gLanguages", 0); //0 = English / 1 = German / 2 = French
diff --git a/soh/src/overlays/actors/ovl_player_actor/z_player.c b/soh/src/overlays/actors/ovl_player_actor/z_player.c
index c37895322..24ad28c4a 100644
--- a/soh/src/overlays/actors/ovl_player_actor/z_player.c
+++ b/soh/src/overlays/actors/ovl_player_actor/z_player.c
@@ -6981,7 +6981,7 @@ void func_808409CC(GlobalContext* globalCtx, Player* this) {
                 if (sp34 < 4) {
                     if (((sp34 != 0) && (sp34 != 3)) || ((this->rightHandType == PLAYER_MODELTYPE_RH_SHIELD) &&
                         ((sp34 == 3) || Player_GetSwordHeld(this)))) {
-                        if ((sp34 == 1) && Player_HoldsTwoHandedWeapon(this)) {
+                        if ((sp34 == 1) && Player_HoldsTwoHandedWeapon(this) && CVar_GetS32("gTwoHandedIdle", 1) == 1) {
                             sp34 = 4;
                         }
                         sp38 = sp34 + 9;

From 2478ed86eb65330f3c326f3be7e96be69ea3c6f9 Mon Sep 17 00:00:00 2001
From: PurpleHato <linkvssangoku.jr@gmail.com>
Date: Thu, 12 May 2022 15:39:57 +0200
Subject: [PATCH 33/43] Tweak: Don't make the fix enabled by default

---
 soh/soh/Enhancements/bootcommands.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/soh/soh/Enhancements/bootcommands.c b/soh/soh/Enhancements/bootcommands.c
index 4995b5248..71bd00cac 100644
--- a/soh/soh/Enhancements/bootcommands.c
+++ b/soh/soh/Enhancements/bootcommands.c
@@ -27,7 +27,7 @@ void BootCommands_Init()
     CVar_RegisterS32("gMinimalUI", 0);
     CVar_RegisterS32("gRumbleEnabled", 0);
     CVar_RegisterS32("gUniformLR", 1);
-    CVar_RegisterS32("gTwoHandedIdle", 1);
+    CVar_RegisterS32("gTwoHandedIdle", 0);
     CVar_RegisterS32("gNewDrops", 0);
     CVar_RegisterS32("gVisualAgony", 0);
     CVar_RegisterS32("gLanguages", 0); //0 = English / 1 = German / 2 = French

From 247360cbf0e712e029caeaffa024d52757620ce5 Mon Sep 17 00:00:00 2001
From: Ada <60364512+GreatArgorath@users.noreply.github.com>
Date: Sat, 14 May 2022 20:08:17 +0100
Subject: [PATCH 34/43] Adds tooltip function and tooltips to various ImGui
 menu items (#306)

* Adds tooltip function and tooltips to various ImGui menu items

* Update SohImGuiImpl.cpp

* Adds more tooltips and changes input scale tooltip

Adds for anti-aliasing settings, cheats, and debug settings
Changes tooltip for input scale to be more clear

* Fixes typos, makes N64 mode more clear, and americanizes it

* Update SohImGuiImpl.cpp

* Standardises D-pad spelling

* Update SohImGuiImpl.cpp

* Fixes typo, changes dungeon entrances tooltip, and fixes tabs

* Clearer wording

* Removes full stop

* Removes spaces from new line

* Removes space after \n

* Makes Linux compile

* Fixes wording
---
 libultraship/libultraship/SohImGuiImpl.cpp | 36 ++++++++++++++++++++--
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/libultraship/libultraship/SohImGuiImpl.cpp b/libultraship/libultraship/SohImGuiImpl.cpp
index 042b30a7f..8e4becaab 100644
--- a/libultraship/libultraship/SohImGuiImpl.cpp
+++ b/libultraship/libultraship/SohImGuiImpl.cpp
@@ -505,6 +505,11 @@ namespace SohImGui {
         }
     }
 
+    void Tooltip(std::string text){
+        if (ImGui::IsItemHovered())
+            ImGui::SetTooltip("%s", text.c_str());
+    }
+
    void DrawMainMenuAndCalculateGameSize() {
         console->Update();
         ImGuiBackendNewFrame();
@@ -603,15 +608,17 @@ namespace SohImGui {
                 }
 
                 EnhancementCheckbox("Show Inputs", "gInputEnabled");
+                Tooltip("Shows currently pressed inputs on the bottom right of the screen");
                 EnhancementCheckbox("Rumble Enabled", "gRumbleEnabled");
 
                 EnhancementSliderFloat("Input Scale: %.1f", "##Input", "gInputScale", 1.0f, 3.0f, "", 1.0f, false);
+                Tooltip("Sets the on screen size of the displayed inputs from Show Inputs");
 
                 ImGui::Separator();
 
-                EnhancementCheckbox("Dpad Support on Pause and File Select", "gDpadPauseName");
-                EnhancementCheckbox("DPad Support in Ocarina and Text Choice", "gDpadOcarinaText");
-                EnhancementCheckbox("DPad Support for Browsing Shop Items", "gDpadShop");
+                EnhancementCheckbox("D-pad Support on Pause and File Select", "gDpadPauseName");
+                EnhancementCheckbox("D-pad Support in Ocarina and Text Choice", "gDpadOcarinaText");
+                EnhancementCheckbox("D-pad Support for Browsing Shop Items", "gDpadShop");
 
                 ImGui::EndMenu();
             }
@@ -619,8 +626,10 @@ namespace SohImGui {
             if (ImGui::BeginMenu("Graphics"))
             {
                 EnhancementSliderInt("Internal Resolution: %dx", "##IMul", "gInternalResolution", 1, 8, "");
+		Tooltip("Increases the render resolution of the game, up to 8x your output resolution,\nas a more intensive but effective form of anti-aliasing");
                 gfx_current_dimensions.internal_mul = CVar_GetS32("gInternalResolution", 1);
                 EnhancementSliderInt("MSAA: %d", "##IMSAA", "gMSAAValue", 1, 8, "");
+		Tooltip("Activates anti-aliasing when above 1, up to 8x for 8 samples for every pixel");
                 gfx_msaa_level = CVar_GetS32("gMSAAValue", 1);
 
                 EXPERIMENTAL();
@@ -659,31 +668,42 @@ namespace SohImGui {
                 EnhancementSliderInt("King Zora Speed: %dx", "##WEEPSPEED", "gMweepSpeed", 1, 5, "");
 
                 EnhancementCheckbox("Skip Text", "gSkipText");
+                Tooltip("Holding down B skips text");
                 EnhancementCheckbox("Minimal UI", "gMinimalUI");
+                Tooltip("Hides most of the UI when not needed");
                 EnhancementCheckbox("MM Bunny Hood", "gMMBunnyHood");
+                Tooltip("Wearing the Bunny Hood grants a speed increase like in Majora's Mask");
                 EnhancementCheckbox("Visual Stone of Agony", "gVisualAgony");
+                Tooltip("Displays an icon and plays a sound when Stone of Agony should be activated, for those without rumble");
 
                 ImGui::Text("Graphics");
                 ImGui::Separator();
 
                 EnhancementCheckbox("N64 Mode", "gN64Mode");
+                Tooltip("Sets aspect ratio to 4:3 and lowers resolution to 240p, the N64's native resolution");
 
                 EnhancementCheckbox("Animated Link in Pause Menu", "gPauseLiveLink");
                 EnhancementCheckbox("Enable 3D Dropped items", "gNewDrops");
                 EnhancementCheckbox("Faster Block Push", "gFasterBlockPush");
                 EnhancementCheckbox("Dynamic Wallet Icon", "gDynamicWalletIcon");
+                Tooltip("Changes the rupee in the wallet icon to match the wallet size you currently have");
                 EnhancementCheckbox("Always show dungeon entrances", "gAlwaysShowDungeonMinimapIcon");
+                Tooltip("Always shows dungeon entrance icons on the minimap");
 
                 ImGui::Text("Fixes");
                 ImGui::Separator();
                 EnhancementCheckbox("Fix L&R Pause menu", "gUniformLR");
+                Tooltip("Makes the L and R buttons in the pause menu the same color");
                 EnhancementCheckbox("Fix Dungeon entrances", "gFixDungeonMinimapIcon");
+                Tooltip("Show dungeon entrances icon only when it should be");
                 EnhancementCheckbox("Fix Two Handed idle animations", "gTwoHandedIdle");
+                Tooltip("Makes two handed idle animation play, a seemingly finished animation that was disabled on accident in the original game");
 
                 EXPERIMENTAL();
 
                 EnhancementCheckbox("60 fps interpolation", "g60FPS");
                 EnhancementCheckbox("Disable LOD", "gDisableLOD");
+                Tooltip("Turns off the level of detail setting, making models always use their higher poly variants");
 
                 ImGui::EndMenu();
             }
@@ -725,12 +745,19 @@ namespace SohImGui {
                 }
 
                 EnhancementCheckbox("No Clip", "gNoClip");
+		        Tooltip("Allows you to walk through walls");
                 EnhancementCheckbox("Climb Everything", "gClimbEverything");
+		        Tooltip("Makes every surface in the game climbable");
                 EnhancementCheckbox("Moon Jump on L", "gMoonJumpOnL");
+		        Tooltip("Holding L makes you float into the air");
                 EnhancementCheckbox("Super Tunic", "gSuperTunic");
+		        Tooltip("Makes every tunic have the effects of every other tunic");
                 EnhancementCheckbox("Easy ISG", "gEzISG");
+		        Tooltip("Automatically activates the Infinite Sword glitch, making you constantly swing your sword");
                 EnhancementCheckbox("Unrestricted Items", "gNoRestrictItems");
+		        Tooltip("Allows you to use all items at any age");
                 EnhancementCheckbox("Freeze Time", "gFreezeTime");
+		        Tooltip("Freezes the time of day");
 
                 ImGui::EndMenu();
             }
@@ -738,9 +765,12 @@ namespace SohImGui {
             if (ImGui::BeginMenu("Developer Tools"))
             {
                 EnhancementCheckbox("OoT Debug Mode", "gDebugEnabled");
+		        Tooltip("Enables Debug Mode, allowing you to select maps with L + R + Z, noclip with L + D-pad Right,\nand open the debug menu with L on the pause screen");
                 ImGui::Separator();
                 EnhancementCheckbox("Stats", "gStatsEnabled");
+		        Tooltip("Shows the stats window, with your FPS and frametimes, and the OS you're playing on");
                 EnhancementCheckbox("Console", "gConsoleEnabled");
+		        Tooltip("Enables the console window, allowing you to input commands, type help for some examples");
                 console->opened = CVar_GetS32("gConsoleEnabled", 0);
 
                 ImGui::EndMenu();

From 4e15f0b3d181c871876ba0de19ea3cbe42d65caf Mon Sep 17 00:00:00 2001
From: KennyT <47287125+KennyDevT@users.noreply.github.com>
Date: Sun, 15 May 2022 14:55:37 -0400
Subject: [PATCH 35/43] Add The Jenkins Link to the readme (#303)

* Update README.md

* Update README.md

* Update README.md

Fix Build
---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index 8a4538e2a..92fca0615 100644
--- a/README.md
+++ b/README.md
@@ -64,6 +64,9 @@ Refer to the [building instructions](BUILDING.md) to compile SoH.
 - Affirm that you have an `/assets` folder filled with XMLs in the same directory as OTRGui.exe
 - Affirm that `zapd.exe` exists in the `/assets/extractor` folder
 
+## Nightly Builds
+Nightly builds of Ship of Harkinian are available at [https://builds.shipofharkinian.com/job/SoH_Multibranch/job/develop]
+
 
 ## The Harbour Masters Are...
 

From f217b9bb973e334ffc88e37b167cfffa45b4bd3f Mon Sep 17 00:00:00 2001
From: Sirius902 <10891979+Sirius902@users.noreply.github.com>
Date: Sun, 15 May 2022 11:56:09 -0700
Subject: [PATCH 36/43] Workaround for rumble duration being too long (#284)

---
 soh/src/code/graph.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/soh/src/code/graph.c b/soh/src/code/graph.c
index 4b1887c18..651d405d5 100644
--- a/soh/src/code/graph.c
+++ b/soh/src/code/graph.c
@@ -478,7 +478,10 @@ static void RunFrame()
             
             Graph_StartFrame();
 
-            PadMgr_ThreadEntry(&gPadMgr);
+            // TODO: Workaround for rumble being too long. Implement os thread functions.
+            for (int i = 0; i < 3; i++) {
+                PadMgr_ThreadEntry(&gPadMgr);
+            }
             
             Graph_Update(&runFrameContext.gfxCtx, runFrameContext.gameState);
             ticksB = GetPerfCounter();

From 3e01b25573e2f8a70a2abd2829d0ea7c0a7f30da Mon Sep 17 00:00:00 2001
From: earthcrafterman <banddstudios@gmail.com>
Date: Sun, 15 May 2022 15:04:04 -0400
Subject: [PATCH 37/43] Add a toggle for muting the low HP alarm (#310)

* Removes the code that plays the low health alarm sound effect, by removing that instead of making HealthMeter_IsCritical always return false, Link will still play the tired animation when low on health.

* Made the low health alarm an enhancement toggle
---
 libultraship/libultraship/SohImGuiImpl.cpp | 1 +
 soh/src/code/z_lifemeter.c                 | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/libultraship/libultraship/SohImGuiImpl.cpp b/libultraship/libultraship/SohImGuiImpl.cpp
index 8e4becaab..45b305eb1 100644
--- a/libultraship/libultraship/SohImGuiImpl.cpp
+++ b/libultraship/libultraship/SohImGuiImpl.cpp
@@ -667,6 +667,7 @@ namespace SohImGui {
                 EnhancementSliderInt("Text Speed: %dx", "##TEXTSPEED", "gTextSpeed", 1, 5, "");
                 EnhancementSliderInt("King Zora Speed: %dx", "##WEEPSPEED", "gMweepSpeed", 1, 5, "");
 
+                EnhancementCheckbox("Mute Low HP Alarm", "gLowHpAlarm");
                 EnhancementCheckbox("Skip Text", "gSkipText");
                 Tooltip("Holding down B skips text");
                 EnhancementCheckbox("Minimal UI", "gMinimalUI");
diff --git a/soh/src/code/z_lifemeter.c b/soh/src/code/z_lifemeter.c
index 344022505..5f1863440 100644
--- a/soh/src/code/z_lifemeter.c
+++ b/soh/src/code/z_lifemeter.c
@@ -498,8 +498,8 @@ void HealthMeter_HandleCriticalAlarm(GlobalContext* globalCtx) {
         if (interfaceCtx->unk_22A <= 0) {
             interfaceCtx->unk_22A = 0;
             interfaceCtx->unk_22C = 0;
-            if (!Player_InCsMode(globalCtx) && (globalCtx->pauseCtx.state == 0) &&
-                (globalCtx->pauseCtx.debugState == 0) && HealthMeter_IsCritical() && !Gameplay_InCsMode(globalCtx)) {
+            if (CVar_GetS32("gLowHpAlarm", 0) == 0 && !Player_InCsMode(globalCtx) && (globalCtx->pauseCtx.state == 0) &&
+            (globalCtx->pauseCtx.debugState == 0) && HealthMeter_IsCritical() && !Gameplay_InCsMode(globalCtx)) {
                 func_80078884(NA_SE_SY_HITPOINT_ALARM);
             }
         }

From a72ebbe84de7bf5f5c91f56ebe2dd963fd915513 Mon Sep 17 00:00:00 2001
From: Baoulettes <perlouzerie@hotmail.fr>
Date: Sun, 15 May 2022 21:14:43 +0200
Subject: [PATCH 38/43] ACTOR_EN_FLOORMAS splitting fix (#311)

* Fix infinite split

* Update z_en_floormas.c
---
 soh/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/soh/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c b/soh/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c
index 9e9e8f988..bc059daad 100644
--- a/soh/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c
+++ b/soh/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c
@@ -427,7 +427,8 @@ void EnFloormas_SetupFreeze(EnFloormas* this) {
 }
 
 void EnFloormas_Die(EnFloormas* this, GlobalContext* globalCtx) {
-    if (this->actor.scale.x > 0.004f) {
+    //Originally was doing > 0.004f, better fix thanks Gary :D
+    if (this->actor.scale.x > (f32)0.004f) {
         // split
         this->actor.shape.rot.y = this->actor.yawTowardsPlayer + 0x8000;
         EnFloormas_SetupSplit((EnFloormas*)this->actor.child);

From b9c5b34eba9f83d22693630608d0200d4729b5e7 Mon Sep 17 00:00:00 2001
From: Emill <emil.lenngren@gmail.com>
Date: Sun, 15 May 2022 21:20:32 +0200
Subject: [PATCH 39/43] Fix strict aliasing issues (#342)

Should fix linux build on -O2.
---
 libultraship/libultraship/Lib/Fast3D/gfx_pc.cpp | 12 ++++++------
 libultraship/libultraship/Lib/Fast3D/gfx_pc.h   | 11 +++++------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/libultraship/libultraship/Lib/Fast3D/gfx_pc.cpp b/libultraship/libultraship/Lib/Fast3D/gfx_pc.cpp
index 6f7e8c271..c1a130b19 100644
--- a/libultraship/libultraship/Lib/Fast3D/gfx_pc.cpp
+++ b/libultraship/libultraship/Lib/Fast3D/gfx_pc.cpp
@@ -88,7 +88,7 @@ struct LoadedVertex {
 
 static struct {
     TextureCacheMap map;
-    list<TextureCacheMap::iterator> lru;
+    list<TextureCacheMapIter> lru;
     vector<uint32_t> free_texture_ids;
 } gfx_texture_cache;
 
@@ -527,18 +527,18 @@ static bool gfx_texture_cache_lookup(int i, int tile) {
         key = { orig_addr, { }, fmt, siz, palette_index };
     }
 
-    auto it = gfx_texture_cache.map.find(key);
+    TextureCacheMap::iterator it = gfx_texture_cache.map.find(key);
 
     if (it != gfx_texture_cache.map.end()) {
         gfx_rapi->select_texture(i, it->second.texture_id);
         *n = &*it;
-        gfx_texture_cache.lru.splice(gfx_texture_cache.lru.end(), gfx_texture_cache.lru, *(list<TextureCacheMap::iterator>::iterator*)&it->second.lru_location); // move to back
+        gfx_texture_cache.lru.splice(gfx_texture_cache.lru.end(), gfx_texture_cache.lru, it->second.lru_location); // move to back
         return true;
     }
 
     if (gfx_texture_cache.map.size() >= TEXTURE_CACHE_MAX_SIZE) {
         // Remove the texture that was least recently used
-        it = gfx_texture_cache.lru.front();
+        it = gfx_texture_cache.lru.front().it;
         gfx_texture_cache.free_texture_ids.push_back(it->second.texture_id);
         gfx_texture_cache.map.erase(it);
         gfx_texture_cache.lru.pop_front();
@@ -555,7 +555,7 @@ static bool gfx_texture_cache_lookup(int i, int tile) {
     it = gfx_texture_cache.map.insert(make_pair(key, TextureCacheValue())).first;
     TextureCacheNode* node = &*it;
     node->second.texture_id = texture_id;
-    *(list<TextureCacheMap::iterator>::iterator*)&node->second.lru_location = gfx_texture_cache.lru.insert(gfx_texture_cache.lru.end(), it);
+    node->second.lru_location = gfx_texture_cache.lru.insert(gfx_texture_cache.lru.end(), { it });
 
     gfx_rapi->select_texture(i, texture_id);
     gfx_rapi->set_sampler_parameters(i, false, 0, 0);
@@ -571,7 +571,7 @@ static void gfx_texture_cache_delete(const uint8_t* orig_addr)
         bool again = false;
         for (auto it = gfx_texture_cache.map.begin(bucket); it != gfx_texture_cache.map.end(bucket); ++it) {
             if (it->first.texture_addr == orig_addr) {
-                gfx_texture_cache.lru.erase(*(list<TextureCacheMap::iterator>::iterator*)&it->second.lru_location);
+                gfx_texture_cache.lru.erase(it->second.lru_location);
                 gfx_texture_cache.free_texture_ids.push_back(it->second.texture_id);
                 gfx_texture_cache.map.erase(it->first);
                 again = true;
diff --git a/libultraship/libultraship/Lib/Fast3D/gfx_pc.h b/libultraship/libultraship/Lib/Fast3D/gfx_pc.h
index 62f80ab3c..2ecb68898 100644
--- a/libultraship/libultraship/Lib/Fast3D/gfx_pc.h
+++ b/libultraship/libultraship/Lib/Fast3D/gfx_pc.h
@@ -46,12 +46,11 @@ struct TextureCacheValue {
     uint8_t cms, cmt;
     bool linear_filter;
 
-    // Old versions of libstdc++ fail to compile this
-#ifdef _MSC_VER
-    std::list<TextureCacheMap::iterator>::iterator lru_location;
-#else
-    std::list<int>::iterator lru_location;
-#endif
+    std::list<struct TextureCacheMapIter>::iterator lru_location;
+};
+
+struct TextureCacheMapIter {
+    TextureCacheMap::iterator it;
 };
 
 extern "C" {

From 6dbb085a82cde19352919606f5c4e77f97439505 Mon Sep 17 00:00:00 2001
From: Rozelette <Rozelette@users.noreply.github.com>
Date: Sun, 15 May 2022 14:26:54 -0500
Subject: [PATCH 40/43] Add equipable tunics/boots (#328)

---
 libultraship/libultraship/SohImGuiImpl.cpp    |  2 +
 soh/include/z64item.h                         |  6 ++
 soh/include/z64player.h                       | 11 ++-
 soh/src/code/z_parameter.c                    | 10 ++-
 soh/src/code/z_player_lib.c                   |  3 +-
 .../actors/ovl_player_actor/z_player.c        | 45 +++++++++-
 .../ovl_kaleido_scope/z_kaleido_equipment.c   | 77 ++++++++++++-----
 .../misc/ovl_kaleido_scope/z_kaleido_item.c   | 84 ++++++++++---------
 .../misc/ovl_kaleido_scope/z_kaleido_scope.h  |  1 +
 .../ovl_kaleido_scope/z_kaleido_scope_PAL.c   | 16 ++++
 10 files changed, 191 insertions(+), 64 deletions(-)

diff --git a/libultraship/libultraship/SohImGuiImpl.cpp b/libultraship/libultraship/SohImGuiImpl.cpp
index 45b305eb1..78532d85b 100644
--- a/libultraship/libultraship/SohImGuiImpl.cpp
+++ b/libultraship/libultraship/SohImGuiImpl.cpp
@@ -676,6 +676,8 @@ namespace SohImGui {
                 Tooltip("Wearing the Bunny Hood grants a speed increase like in Majora's Mask");
                 EnhancementCheckbox("Visual Stone of Agony", "gVisualAgony");
                 Tooltip("Displays an icon and plays a sound when Stone of Agony should be activated, for those without rumble");
+                EnhancementCheckbox("Assignable Tunics and Boots", "gAssignableTunicsAndBoots");
+                Tooltip("Allows equiping the tunic and boots to c-buttons");
 
                 ImGui::Text("Graphics");
                 ImGui::Separator();
diff --git a/soh/include/z64item.h b/soh/include/z64item.h
index 05b2a24b2..6cb5ec2a4 100644
--- a/soh/include/z64item.h
+++ b/soh/include/z64item.h
@@ -78,6 +78,12 @@ typedef enum {
     /* 0x15 */ SLOT_BOTTLE_4,
     /* 0x16 */ SLOT_TRADE_ADULT,
     /* 0x17 */ SLOT_TRADE_CHILD,
+    /* 0x18 */ SLOT_TUNIC_KOKIRI,
+    /* 0x19 */ SLOT_TUNIC_GORON,
+    /* 0x1A */ SLOT_TUNIC_ZORA,
+    /* 0x1B */ SLOT_BOOTS_KOKIRI,
+    /* 0x1C */ SLOT_BOOTS_IRON,
+    /* 0x1D */ SLOT_BOOTS_HOVER,
     /* 0xFF */ SLOT_NONE = 0xFF
 } InventorySlot;
 
diff --git a/soh/include/z64player.h b/soh/include/z64player.h
index 6771ef5c6..9bce60ffe 100644
--- a/soh/include/z64player.h
+++ b/soh/include/z64player.h
@@ -128,7 +128,16 @@ typedef enum {
     /* 0x40 */ PLAYER_AP_MASK_GERUDO,
     /* 0x41 */ PLAYER_AP_MASK_TRUTH,
     /* 0x42 */ PLAYER_AP_LENS,
-    /* 0x43 */ PLAYER_AP_MAX
+    /* 0x43 */ PLAYER_AP_SHIELD_DEKU,
+    /* 0x44 */ PLAYER_AP_SHIELD_HYLIAN,
+    /* 0x45 */ PLAYER_AP_SHIELD_MIRROR,
+    /* 0x46 */ PLAYER_AP_TUNIC_KOKIRI,
+    /* 0x47 */ PLAYER_AP_TUNIC_GORON,
+    /* 0x48 */ PLAYER_AP_TUNIC_ZORA,
+    /* 0x49 */ PLAYER_AP_BOOTS_KOKIRI,
+    /* 0x4A */ PLAYER_AP_BOOTS_IRON,
+    /* 0x4B */ PLAYER_AP_BOOTS_HOVER,
+    /* 0x4C */ PLAYER_AP_MAX
 } PlayerActionParam;
 
 typedef enum {
diff --git a/soh/src/code/z_parameter.c b/soh/src/code/z_parameter.c
index edc4348b9..8cfcccbf5 100644
--- a/soh/src/code/z_parameter.c
+++ b/soh/src/code/z_parameter.c
@@ -753,7 +753,15 @@ void func_80083108(GlobalContext* globalCtx) {
                 gSaveContext.buttonStatus[0] = BTN_DISABLED;
 
                 for (i = 1; i < 4; i++) {
-                    if (func_8008F2F8(globalCtx) == 2) {
+                    if ((gSaveContext.equips.buttonItems[i] >= ITEM_SHIELD_DEKU) &&
+                        (gSaveContext.equips.buttonItems[i] <= ITEM_BOOTS_HOVER)) {
+                        // Equipment on c-buttons is always enabled
+                        if (gSaveContext.buttonStatus[i] == BTN_DISABLED) {
+                            sp28 = 1;
+                        }
+
+                        gSaveContext.buttonStatus[i] = BTN_ENABLED;
+                    } else if (func_8008F2F8(globalCtx) == 2) {
                         if ((gSaveContext.equips.buttonItems[i] != ITEM_HOOKSHOT) &&
                             (gSaveContext.equips.buttonItems[i] != ITEM_LONGSHOT)) {
                             if (gSaveContext.buttonStatus[i] == BTN_ENABLED) {
diff --git a/soh/src/code/z_player_lib.c b/soh/src/code/z_player_lib.c
index 355d323e0..4e4e1ff70 100644
--- a/soh/src/code/z_player_lib.c
+++ b/soh/src/code/z_player_lib.c
@@ -29,7 +29,8 @@ s16 sBootData[PLAYER_BOOTS_MAX][17] = {
 // Used to map action params to model groups
 u8 sActionModelGroups[] = {
     3,  15, 10, 2,  2,  5,  10, 11, 6,  6, 6, 6, 6, 6, 6, 6, 9, 9, 7, 7, 8, 3, 3, 6, 3, 3, 3, 3, 12, 13, 14, 14, 14, 14,
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,  3,  3,  3,  3,
+    14, 14, 14, 14, 14, 14, 14, 14, 14, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,  3,  3,  3,  3,   3,
+    3,   3,  3,  3,  3,  3,  3,  3
 };
 
 TextTriggerEntry sTextTriggers[] = {
diff --git a/soh/src/overlays/actors/ovl_player_actor/z_player.c b/soh/src/overlays/actors/ovl_player_actor/z_player.c
index 24ad28c4a..733bdee2d 100644
--- a/soh/src/overlays/actors/ovl_player_actor/z_player.c
+++ b/soh/src/overlays/actors/ovl_player_actor/z_player.c
@@ -898,6 +898,15 @@ static s8 sItemActionParams[] = {
     PLAYER_AP_SWORD_KOKIRI,
     PLAYER_AP_SWORD_MASTER,
     PLAYER_AP_SWORD_BGS,
+    PLAYER_AP_SHIELD_DEKU,
+    PLAYER_AP_SHIELD_HYLIAN,
+    PLAYER_AP_SHIELD_MIRROR,
+    PLAYER_AP_TUNIC_KOKIRI,
+    PLAYER_AP_TUNIC_GORON,
+    PLAYER_AP_TUNIC_ZORA,
+    PLAYER_AP_BOOTS_KOKIRI,
+    PLAYER_AP_BOOTS_IRON,
+    PLAYER_AP_BOOTS_HOVER,
 };
 
 static s32(*D_80853EDC[])(Player* this, GlobalContext* globalCtx) = {
@@ -910,7 +919,8 @@ static s32(*D_80853EDC[])(Player* this, GlobalContext* globalCtx) = {
     func_8083485C, func_8083485C, func_8083485C, func_8083485C, func_8083485C, func_8083485C, func_8083485C,
     func_8083485C, func_8083485C, func_8083485C, func_8083485C, func_8083485C, func_8083485C, func_8083485C,
     func_8083485C, func_8083485C, func_8083485C, func_8083485C, func_8083485C, func_8083485C, func_8083485C,
-    func_8083485C, func_8083485C, func_8083485C, func_8083485C,
+    func_8083485C, func_8083485C, func_8083485C, func_8083485C, func_8083485C, func_8083485C, func_8083485C,
+    func_8083485C, func_8083485C, func_8083485C, func_8083485C, func_8083485C, func_8083485C,
 };
 
 static void (*D_80853FE8[])(GlobalContext* globalCtx, Player* this) = {
@@ -923,7 +933,8 @@ static void (*D_80853FE8[])(GlobalContext* globalCtx, Player* this) = {
     func_80833770, func_80833770, func_80833770, func_80833770, func_80833770, func_80833770, func_80833770,
     func_80833770, func_80833770, func_80833770, func_80833770, func_80833770, func_80833770, func_80833770,
     func_80833770, func_80833770, func_80833770, func_80833770, func_80833770, func_80833770, func_80833770,
-    func_80833770, func_80833770, func_80833770, func_80833770,
+    func_80833770, func_80833770, func_80833770, func_80833770, func_80833770, func_80833770, func_80833770,
+    func_80833770, func_80833770, func_80833770, func_80833770, func_80833770, func_80833770,
 };
 
 typedef enum {
@@ -2752,7 +2763,8 @@ void func_80835F44(GlobalContext* globalCtx, Player* this, s32 item) {
 
         if ((actionParam == PLAYER_AP_NONE) || !(this->stateFlags1 & PLAYER_STATE1_27) ||
             ((this->actor.bgCheckFlags & 1) &&
-                ((actionParam == PLAYER_AP_HOOKSHOT) || (actionParam == PLAYER_AP_LONGSHOT)))) {
+                ((actionParam == PLAYER_AP_HOOKSHOT) || (actionParam == PLAYER_AP_LONGSHOT))) ||
+            ((actionParam >= PLAYER_AP_SHIELD_DEKU) && (actionParam <= PLAYER_AP_BOOTS_HOVER))) {
 
             if ((globalCtx->bombchuBowlingStatus == 0) &&
                 (((actionParam == PLAYER_AP_STICK) && (AMMO(ITEM_STICK) == 0)) ||
@@ -2764,6 +2776,33 @@ void func_80835F44(GlobalContext* globalCtx, Player* this, s32 item) {
                 return;
             }
 
+            if (actionParam >= PLAYER_AP_BOOTS_KOKIRI) {
+                u16 bootsValue = actionParam - PLAYER_AP_BOOTS_KOKIRI + 1;
+                if (CUR_EQUIP_VALUE(EQUIP_BOOTS) == bootsValue) {
+                    Inventory_ChangeEquipment(EQUIP_BOOTS, 1);
+                } else {
+                    Inventory_ChangeEquipment(EQUIP_BOOTS, bootsValue);
+                }
+                Player_SetEquipmentData(globalCtx, this);
+                return;
+            }
+
+            if (actionParam >= PLAYER_AP_TUNIC_KOKIRI) {
+                u16 tunicValue = actionParam - PLAYER_AP_TUNIC_KOKIRI + 1;
+                if (CUR_EQUIP_VALUE(EQUIP_TUNIC) == tunicValue) {
+                    Inventory_ChangeEquipment(EQUIP_TUNIC, 1);
+                } else {
+                    Inventory_ChangeEquipment(EQUIP_TUNIC, tunicValue);
+                }
+                Player_SetEquipmentData(globalCtx, this);
+                return;
+            }
+
+            if (actionParam >= PLAYER_AP_SHIELD_DEKU) {
+                // Changing shields through action commands is unimplemented
+                return;
+            }
+
             if (actionParam == PLAYER_AP_LENS) {
                 if (func_80087708(globalCtx, 0, 3)) {
                     if (globalCtx->actorCtx.unk_03 != 0) {
diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c
index 27575c3b6..719eaa3f3 100644
--- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c
+++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c
@@ -471,39 +471,76 @@ void KaleidoScope_DrawEquipment(GlobalContext* globalCtx) {
         KaleidoScope_SetCursorVtx(pauseCtx, cursorSlot * 4, pauseCtx->equipVtx);
 
         if ((pauseCtx->cursorSpecialPos == 0) && (cursorItem != PAUSE_ITEM_NONE) && (pauseCtx->state == 6) &&
-            (pauseCtx->unk_1E4 == 0) && CHECK_BTN_ALL(input->press.button, BTN_A) &&
+            (pauseCtx->unk_1E4 == 0) &&
+            CHECK_BTN_ANY(input->press.button, BTN_A | BTN_CLEFT | BTN_CDOWN | BTN_CRIGHT) &&
             (pauseCtx->cursorX[PAUSE_EQUIP] != 0)) {
 
             if ((gEquipAgeReqs[pauseCtx->cursorY[PAUSE_EQUIP]][pauseCtx->cursorX[PAUSE_EQUIP]] == 9) ||
                 (gEquipAgeReqs[pauseCtx->cursorY[PAUSE_EQUIP]][pauseCtx->cursorX[PAUSE_EQUIP]] ==
                  ((void)0, gSaveContext.linkAge))) {
-                Inventory_ChangeEquipment(pauseCtx->cursorY[PAUSE_EQUIP], pauseCtx->cursorX[PAUSE_EQUIP]);
+                if (CHECK_BTN_ALL(input->press.button, BTN_A)) {
+                    Inventory_ChangeEquipment(pauseCtx->cursorY[PAUSE_EQUIP], pauseCtx->cursorX[PAUSE_EQUIP]);
 
-                if (pauseCtx->cursorY[PAUSE_EQUIP] == 0) {
-                    gSaveContext.infTable[29] = 0;
-                    gSaveContext.equips.buttonItems[0] = cursorItem;
+                    if (pauseCtx->cursorY[PAUSE_EQUIP] == 0) {
+                        gSaveContext.infTable[29] = 0;
+                        gSaveContext.equips.buttonItems[0] = cursorItem;
 
-                    if ((pauseCtx->cursorX[PAUSE_EQUIP] == 3) && (gSaveContext.bgsFlag != 0)) {
-                        gSaveContext.equips.buttonItems[0] = ITEM_SWORD_BGS;
-                        gSaveContext.swordHealth = 8;
-                    } else {
-                        if (gSaveContext.equips.buttonItems[0] == ITEM_HEART_PIECE_2) {
+                        if ((pauseCtx->cursorX[PAUSE_EQUIP] == 3) && (gSaveContext.bgsFlag != 0)) {
                             gSaveContext.equips.buttonItems[0] = ITEM_SWORD_BGS;
+                            gSaveContext.swordHealth = 8;
+                        } else {
+                            if (gSaveContext.equips.buttonItems[0] == ITEM_HEART_PIECE_2) {
+                                gSaveContext.equips.buttonItems[0] = ITEM_SWORD_BGS;
+                            }
+                            if ((gSaveContext.equips.buttonItems[0] == ITEM_SWORD_BGS) && (gSaveContext.bgsFlag == 0) &&
+                                (gBitFlags[3] & gSaveContext.inventory.equipment)) {
+                                gSaveContext.equips.buttonItems[0] = ITEM_SWORD_KNIFE;
+                            }
                         }
-                        if ((gSaveContext.equips.buttonItems[0] == ITEM_SWORD_BGS) && (gSaveContext.bgsFlag == 0) &&
-                            (gBitFlags[3] & gSaveContext.inventory.equipment)) {
-                            gSaveContext.equips.buttonItems[0] = ITEM_SWORD_KNIFE;
-                        }
+
+                        Interface_LoadItemIcon1(globalCtx, 0);
                     }
 
-                    Interface_LoadItemIcon1(globalCtx, 0);
+                    Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
+                    pauseCtx->unk_1E4 = 7;
+                    sEquipTimer = 10;
+                } else if (CVar_GetS32("gAssignableTunicsAndBoots", 0) != 0) {
+                    // Only allow assigning tunic and boots to c-buttons
+                    if (pauseCtx->cursorY[PAUSE_EQUIP] > 1) {
+                        u16 slot = 0;
+                        switch (cursorItem) {
+                            case ITEM_TUNIC_KOKIRI:
+                                slot = SLOT_TUNIC_KOKIRI;
+                                break;
+                            case ITEM_TUNIC_GORON:
+                                slot = SLOT_TUNIC_GORON;
+                                break;
+                            case ITEM_TUNIC_ZORA:
+                                slot = SLOT_TUNIC_ZORA;
+                                break;
+                            case ITEM_BOOTS_KOKIRI:
+                                slot = SLOT_BOOTS_KOKIRI;
+                                break;
+                            case ITEM_BOOTS_IRON:
+                                slot = SLOT_BOOTS_IRON;
+                                break;
+                            case ITEM_BOOTS_HOVER:
+                                slot = SLOT_BOOTS_HOVER;
+                                break;
+                            default:
+                                break;
+                        }
+                        KaleidoScope_SetupItemEquip(globalCtx, cursorItem, slot,
+                                                    pauseCtx->equipVtx[cursorSlot * 4].v.ob[0] * 10,
+                                                    pauseCtx->equipVtx[cursorSlot * 4].v.ob[1] * 10);
+                    }
                 }
-
-                Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
-                pauseCtx->unk_1E4 = 7;
-                sEquipTimer = 10;
             } else {
-                Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
+                if (CHECK_BTN_ALL(input->press.button, BTN_A)) {
+                    Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
+                } else if ((CVar_GetS32("gAssignableTunicsAndBoots", 0) != 0) && (pauseCtx->cursorY[PAUSE_EQUIP] > 1)) {
+                    Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
+                }
             }
         }
 
diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c
index 52c04908f..705d1461e 100644
--- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c
+++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c
@@ -351,43 +351,9 @@ void KaleidoScope_DrawItemSelect(GlobalContext* globalCtx) {
                         if (((gSlotAgeReqs[cursorSlot] == 9) ||
                              (gSlotAgeReqs[cursorSlot] == ((void)0, gSaveContext.linkAge))) &&
                             (cursorItem != ITEM_SOLD_OUT)) {
-                            if (CHECK_BTN_ALL(input->press.button, BTN_CLEFT)) {
-                                pauseCtx->equipTargetCBtn = 0;
-                            } else if (CHECK_BTN_ALL(input->press.button, BTN_CDOWN)) {
-                                pauseCtx->equipTargetCBtn = 1;
-                            } else if (CHECK_BTN_ALL(input->press.button, BTN_CRIGHT)) {
-                                pauseCtx->equipTargetCBtn = 2;
-                            }
-
-                            pauseCtx->equipTargetItem = cursorItem;
-                            pauseCtx->equipTargetSlot = cursorSlot;
-                            pauseCtx->unk_1E4 = 3;
-                            pauseCtx->equipAnimX = pauseCtx->itemVtx[index].v.ob[0] * 10;
-                            pauseCtx->equipAnimY = pauseCtx->itemVtx[index].v.ob[1] * 10;
-                            pauseCtx->equipAnimAlpha = 255;
-                            sEquipAnimTimer = 0;
-                            sEquipState = 3;
-                            sEquipMoveTimer = 10;
-                            if ((pauseCtx->equipTargetItem == ITEM_ARROW_FIRE) ||
-                                (pauseCtx->equipTargetItem == ITEM_ARROW_ICE) ||
-                                (pauseCtx->equipTargetItem == ITEM_ARROW_LIGHT)) {
-                                index = 0;
-                                if (pauseCtx->equipTargetItem == ITEM_ARROW_ICE) {
-                                    index = 1;
-                                }
-                                if (pauseCtx->equipTargetItem == ITEM_ARROW_LIGHT) {
-                                    index = 2;
-                                }
-                                Audio_PlaySoundGeneral(NA_SE_SY_SET_FIRE_ARROW + index, &D_801333D4, 4, &D_801333E0,
-                                                       &D_801333E0, &D_801333E8);
-                                pauseCtx->equipTargetItem = 0xBF + index;
-                                sEquipState = 0;
-                                pauseCtx->equipAnimAlpha = 0;
-                                sEquipMoveTimer = 6;
-                            } else {
-                                Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &D_801333D4, 4, &D_801333E0, &D_801333E0,
-                                                       &D_801333E8);
-                            }
+                            KaleidoScope_SetupItemEquip(globalCtx, cursorItem, cursorSlot,
+                                                        pauseCtx->itemVtx[index].v.ob[0] * 10,
+                                                        pauseCtx->itemVtx[index].v.ob[1] * 10);
                         } else {
                             Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0,
                                                    &D_801333E8);
@@ -419,7 +385,9 @@ void KaleidoScope_DrawItemSelect(GlobalContext* globalCtx) {
     gDPSetEnvColor(POLY_KAL_DISP++, 0, 0, 0, 0);
 
     for (i = 0, j = 24 * 4; i < 3; i++, j += 4) {
-        if (gSaveContext.equips.buttonItems[i + 1] != ITEM_NONE) {
+        if ((gSaveContext.equips.buttonItems[i + 1] != ITEM_NONE) &&
+            !((gSaveContext.equips.buttonItems[i + 1] >= ITEM_SHIELD_DEKU) &&
+              (gSaveContext.equips.buttonItems[i + 1] <= ITEM_BOOTS_HOVER))) {
             gSPVertex(POLY_KAL_DISP++, &pauseCtx->itemVtx[j], 4, 0);
             POLY_KAL_DISP = KaleidoScope_QuadTextureIA8(POLY_KAL_DISP, gEquippedItemOutlineTex, 32, 32, 0);
         }
@@ -496,6 +464,46 @@ void KaleidoScope_DrawItemSelect(GlobalContext* globalCtx) {
     CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_kaleido_item.c", 516);
 }
 
+void KaleidoScope_SetupItemEquip(GlobalContext* globalCtx, u16 item, u16 slot, s16 animX, s16 animY) {
+    Input* input = &globalCtx->state.input[0];
+    PauseContext* pauseCtx = &globalCtx->pauseCtx;
+
+    if (CHECK_BTN_ALL(input->press.button, BTN_CLEFT)) {
+        pauseCtx->equipTargetCBtn = 0;
+    } else if (CHECK_BTN_ALL(input->press.button, BTN_CDOWN)) {
+        pauseCtx->equipTargetCBtn = 1;
+    } else if (CHECK_BTN_ALL(input->press.button, BTN_CRIGHT)) {
+        pauseCtx->equipTargetCBtn = 2;
+    }
+
+    pauseCtx->equipTargetItem = item;
+    pauseCtx->equipTargetSlot = slot;
+    pauseCtx->unk_1E4 = 3;
+    pauseCtx->equipAnimX = animX;
+    pauseCtx->equipAnimY = animY;
+    pauseCtx->equipAnimAlpha = 255;
+    sEquipAnimTimer = 0;
+    sEquipState = 3;
+    sEquipMoveTimer = 10;
+    if ((pauseCtx->equipTargetItem == ITEM_ARROW_FIRE) || (pauseCtx->equipTargetItem == ITEM_ARROW_ICE) ||
+        (pauseCtx->equipTargetItem == ITEM_ARROW_LIGHT)) {
+        u16 index = 0;
+        if (pauseCtx->equipTargetItem == ITEM_ARROW_ICE) {
+            index = 1;
+        }
+        if (pauseCtx->equipTargetItem == ITEM_ARROW_LIGHT) {
+            index = 2;
+        }
+        Audio_PlaySoundGeneral(NA_SE_SY_SET_FIRE_ARROW + index, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
+        pauseCtx->equipTargetItem = 0xBF + index;
+        sEquipState = 0;
+        pauseCtx->equipAnimAlpha = 0;
+        sEquipMoveTimer = 6;
+    } else {
+        Audio_PlaySoundGeneral(NA_SE_SY_DECIDE, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
+    }
+}
+
 static s16 sCButtonPosX[] = { 66, 90, 114 };
 static s16 sCButtonPosY[] = { 110, 92, 110 };
 
diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h
index 928ceadd7..fa1d88fec 100644
--- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h
+++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h
@@ -18,6 +18,7 @@ void KaleidoScope_DrawPlayerWork(GlobalContext* globalCtx);
 void KaleidoScope_DrawEquipment(GlobalContext* globalCtx);
 void KaleidoScope_SetCursorVtx(PauseContext* pauseCtx, u16 index, Vtx* vtx);
 void KaleidoScope_DrawItemSelect(GlobalContext* globalCtx);
+void KaleidoScope_SetupItemEquip(GlobalContext* globalCtx, u16 item, u16 slot, s16 animX, s16 animY);
 void KaleidoScope_UpdateItemEquip(GlobalContext* globalCtx);
 void KaleidoScope_DrawDungeonMap(GlobalContext* globalCtx, GraphicsContext* gfxCtx);
 void KaleidoScope_DrawWorldMap(GlobalContext* globalCtx, GraphicsContext* gfxCtx);
diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c
index 4dbb1b20f..c057c9876 100644
--- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c
+++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c
@@ -916,6 +916,13 @@ void KaleidoScope_SwitchPage(PauseContext* pauseCtx, u8 pt) {
     gSaveContext.buttonStatus[3] = D_8082AB6C[pauseCtx->pageIndex + pt][3];
     gSaveContext.buttonStatus[4] = D_8082AB6C[pauseCtx->pageIndex + pt][4];
 
+    if ((CVar_GetS32("gAssignableTunicsAndBoots", 0) != 0) && (D_8082ABEC[pauseCtx->mode] == PAUSE_EQUIP)) {
+        gSaveContext.buttonStatus[1] = BTN_ENABLED;
+        gSaveContext.buttonStatus[2] = BTN_ENABLED;
+        gSaveContext.buttonStatus[3] = BTN_ENABLED;
+        gSaveContext.buttonStatus[4] = BTN_ENABLED;
+    }
+
     osSyncPrintf("kscope->kscp_pos+pt = %d\n", pauseCtx->pageIndex + pt);
 
     gSaveContext.unk_13EA = 0;
@@ -2902,7 +2909,16 @@ void func_808265BC(GlobalContext* globalCtx) {
         gSaveContext.buttonStatus[2] = D_8082AB6C[pauseCtx->pageIndex][2];
         gSaveContext.buttonStatus[3] = D_8082AB6C[pauseCtx->pageIndex][3];
         gSaveContext.buttonStatus[4] = D_8082AB6C[pauseCtx->pageIndex][4];
+
         pauseCtx->pageIndex = D_8082ABEC[pauseCtx->mode];
+
+        if ((CVar_GetS32("gAssignableTunicsAndBoots", 0) != 0) && (pauseCtx->pageIndex == PAUSE_EQUIP)) {
+            gSaveContext.buttonStatus[1] = BTN_ENABLED;
+            gSaveContext.buttonStatus[2] = BTN_ENABLED;
+            gSaveContext.buttonStatus[3] = BTN_ENABLED;
+            gSaveContext.buttonStatus[4] = BTN_ENABLED;
+        }
+
         pauseCtx->unk_1E4 = 0;
         pauseCtx->state++;
         pauseCtx->alpha = 255;

From bd6e637fee6f6eb3e4c20bf25ec56e6eb25c5101 Mon Sep 17 00:00:00 2001
From: MegaMech <MegaMech@users.noreply.github.com>
Date: Sun, 15 May 2022 13:28:27 -0600
Subject: [PATCH 41/43] Readme/building.md changes (#262)

* add python version requirement to BUILDING.md

extract_assets uses match statements which were added in python version 3.10

* update wording/version on python requirement

https://github.com/HarbourMasters/Shipwright/pull/251 removes the 3.10 specific match statements, dropping the python version requirement to 3.6.

* Update BUILDING.md

* Update BUILDING.md

* Update BUILDING.md

* Update BUILDING.md

* switch python link to download page

* Fixed SHA-1 for retail ROM

* Added discord link

Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
Co-authored-by: InfoManiac742 <ryanjgabel@gmail.com>
---
 BUILDING.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/BUILDING.md b/BUILDING.md
index 3e4d7b21a..726b8a99c 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -2,7 +2,7 @@
 
 ## Windows
 
- 1. Install [Python](https://www.python.org/downloads/) >= 3.6.
+ 1. Requires [Python](https://www.python.org/downloads/) >= 3.6.
  2. Install [Visual Studio 2022 Community Edition](https://visualstudio.microsoft.com/vs/community/)
  3. In the Visual Studio Installer, install `MSVC v142 - VS 2019 C++`.
  4. Clone the Ship of Harkinian repository.
@@ -57,10 +57,10 @@ OOT_PAL_GC_DBG1 checksum 0x871E1C92 (debug non-master quest)
 The OTRExporter exports an `oot.otr` archive file which Ship of Harkinian requires to play.
 
 Use the `extract_assets.py` script file to run the exporter using any of the following methods:
+1) Double click on the script after placing one or more roms in the directory.
+2) Drag & Drop a rom onto the script.
+3) In a terminal run `python3 extract_assets.py` after placing one or more roms in the directory.
+4) In a terminal run `python3 extract_assets.py <path_to_rom>`
 
-1. Double click on the script after placing one or more roms in the directory.
-2. Drag & Drop a rom onto the script.
-3. In a terminal run `python3 extract_assets.py` after placing one or more roms in the directory.
-4. In a terminal run `python3 extract_assets.py <path_to_rom>`
+If the script finds multiple roms the user is prompted which to use. Selection is done using the number keys and then pressing the carriage return key.
 
-If the script finds multiple roms the user is prompted which to use. Selection is done using the number keys and then pressing the carriage return key.
\ No newline at end of file

From d8d1388ec68acfb8bc1f0c0b8e977b4f3c824930 Mon Sep 17 00:00:00 2001
From: Emill <emil.lenngren@gmail.com>
Date: Sun, 15 May 2022 21:32:05 +0200
Subject: [PATCH 42/43] Optimize away memory allocations (#340)

---
 libultraship/libultraship/Archive.cpp         |  9 ++--
 libultraship/libultraship/Archive.h           |  6 +--
 .../libultraship/Lib/Fast3D/gfx_pc.cpp        | 14 +++---
 libultraship/libultraship/Resource.cpp        |  7 ++-
 libultraship/libultraship/ResourceMgr.cpp     | 48 +++++++++++--------
 libultraship/libultraship/ResourceMgr.h       | 12 +++--
 libultraship/libultraship/Window.cpp          | 39 ++++++++-------
 7 files changed, 74 insertions(+), 61 deletions(-)

diff --git a/libultraship/libultraship/Archive.cpp b/libultraship/libultraship/Archive.cpp
index 1e8f8d597..e4646c305 100644
--- a/libultraship/libultraship/Archive.cpp
+++ b/libultraship/libultraship/Archive.cpp
@@ -204,7 +204,7 @@ namespace Ship {
 		return true;
 	}
 
-	std::vector<SFILE_FIND_DATA> Archive::ListFiles(const std::string& searchMask) {
+	std::vector<SFILE_FIND_DATA> Archive::ListFiles(const std::string& searchMask) const {
 		auto fileList = std::vector<SFILE_FIND_DATA>();
 		SFILE_FIND_DATA findContext;
 		HANDLE hFind;
@@ -248,7 +248,7 @@ namespace Ship {
 		return fileList;
 	}
 
-	bool Archive::HasFile(const std::string& filename) {
+	bool Archive::HasFile(const std::string& filename) const {
 		bool result = false;
 		auto start = std::chrono::steady_clock::now();
 
@@ -267,8 +267,9 @@ namespace Ship {
 		return result;
 	}
 
-	std::string Archive::HashToString(uint64_t hash) {
-		return hashes[hash];
+	const std::string* Archive::HashToString(uint64_t hash) const {
+		auto it = hashes.find(hash);
+		return it != hashes.end() ? &it->second : nullptr;
 	}
 
 	bool Archive::Load(bool enableWriting, bool genCRCMap) {
diff --git a/libultraship/libultraship/Archive.h b/libultraship/libultraship/Archive.h
index f8fe3e0fd..b21ad9c73 100644
--- a/libultraship/libultraship/Archive.h
+++ b/libultraship/libultraship/Archive.h
@@ -34,9 +34,9 @@ namespace Ship
 		bool AddFile(const std::string& path, uintptr_t fileData, DWORD dwFileSize);
 		bool RemoveFile(const std::string& path);
 		bool RenameFile(const std::string& oldPath, const std::string& newPath);
-		std::vector<SFILE_FIND_DATA> ListFiles(const std::string& searchMask);
-		bool HasFile(const std::string& searchMask);
-		std::string HashToString(uint64_t hash);
+		std::vector<SFILE_FIND_DATA> ListFiles(const std::string& searchMask) const;
+		bool HasFile(const std::string& searchMask) const;
+		const std::string* HashToString(uint64_t hash) const;
 	protected:
 		bool Load(bool enableWriting, bool genCRCMap);
 		bool Unload();
diff --git a/libultraship/libultraship/Lib/Fast3D/gfx_pc.cpp b/libultraship/libultraship/Lib/Fast3D/gfx_pc.cpp
index c1a130b19..6738f28fa 100644
--- a/libultraship/libultraship/Lib/Fast3D/gfx_pc.cpp
+++ b/libultraship/libultraship/Lib/Fast3D/gfx_pc.cpp
@@ -36,7 +36,7 @@
 
 // OTRTODO: fix header files for these
 extern "C" {
-    char* ResourceMgr_GetNameByCRC(uint64_t crc, char* alloc);
+    const char* ResourceMgr_GetNameByCRC(uint64_t crc);
     int32_t* ResourceMgr_LoadMtxByCRC(uint64_t crc);
     Vtx* ResourceMgr_LoadVtxByCRC(uint64_t crc);
     Gfx* ResourceMgr_LoadGfxByCRC(uint64_t crc);
@@ -134,14 +134,14 @@ static struct RDP {
         const uint8_t *addr;
         uint8_t siz;
         uint32_t width;
-        char* otr_path;
+        const char* otr_path;
     } texture_to_load;
     struct {
         const uint8_t *addr;
         uint32_t size_bytes;
         uint32_t full_image_line_size_bytes;
         uint32_t line_size_bytes;
-        char* otr_path;
+        const char* otr_path;
     } loaded_texture[2];
     struct {
         uint8_t fmt;
@@ -1636,11 +1636,11 @@ static void gfx_dp_set_scissor(uint32_t mode, uint32_t ulx, uint32_t uly, uint32
     rdp.viewport_or_scissor_changed = true;
 }
 
-static void gfx_dp_set_texture_image(uint32_t format, uint32_t size, uint32_t width, const void* addr, char* otr_path) {
+static void gfx_dp_set_texture_image(uint32_t format, uint32_t size, uint32_t width, const void* addr, const char* otr_path) {
     rdp.texture_to_load.addr = (const uint8_t*)addr;
     rdp.texture_to_load.siz = size;
     rdp.texture_to_load.width = width;
-    if ( otr_path != nullptr && !strncmp(otr_path, "__OTR__", 7)) otr_path = otr_path + 7;
+    if (otr_path != nullptr && !strncmp(otr_path, "__OTR__", 7)) otr_path = otr_path + 7;
     rdp.texture_to_load.otr_path = otr_path;
 }
 
@@ -2114,7 +2114,7 @@ static void gfx_run_dl(Gfx* cmd) {
     //puts("dl");
     int dummy = 0;
     char dlName[128];
-    char fileName[128];
+    const char* fileName;
 
     Gfx* dListStart = cmd;
     uint64_t ourHash = -1;
@@ -2437,7 +2437,7 @@ static void gfx_run_dl(Gfx* cmd) {
                 uintptr_t addr = cmd->words.w1;
                 cmd++;
                 uint64_t hash = ((uint64_t)cmd->words.w0 << 32) + (uint64_t)cmd->words.w1;
-                ResourceMgr_GetNameByCRC(hash, fileName);
+                fileName = ResourceMgr_GetNameByCRC(hash);
 #if _DEBUG && 0
                 char* tex = ResourceMgr_LoadTexByCRC(hash);
                 ResourceMgr_GetNameByCRC(hash, fileName);
diff --git a/libultraship/libultraship/Resource.cpp b/libultraship/libultraship/Resource.cpp
index 04fc2bfbb..66a1f4199 100644
--- a/libultraship/libultraship/Resource.cpp
+++ b/libultraship/libultraship/Resource.cpp
@@ -40,8 +40,11 @@ namespace Ship
 
         for (size_t i = 0; i < patches.size(); i++)
         {
-            std::string hashStr = resMgr->HashToString(patches[i].crc);
-            auto resShared = resMgr->GetCachedFile(hashStr);
+            const std::string* hashStr = resMgr->HashToString(patches[i].crc);
+            if (hashStr == nullptr)
+                continue;
+
+            auto resShared = resMgr->GetCachedFile(hashStr->c_str());
             if (resShared != nullptr)
             {
                 auto res = (Ship::DisplayList*)resShared.get();
diff --git a/libultraship/libultraship/ResourceMgr.cpp b/libultraship/libultraship/ResourceMgr.cpp
index de0296d12..0033ef442 100644
--- a/libultraship/libultraship/ResourceMgr.cpp
+++ b/libultraship/libultraship/ResourceMgr.cpp
@@ -215,7 +215,7 @@ namespace Ship {
 		return ToLoad;
 	}
 
-	std::shared_ptr<Ship::Resource> ResourceMgr::GetCachedFile(std::string FilePath) {
+	std::shared_ptr<Ship::Resource> ResourceMgr::GetCachedFile(const char* FilePath) const {
 		auto resCacheFind = ResourceCache.find(FilePath);
 
 		if (resCacheFind != ResourceCache.end() &&
@@ -227,8 +227,13 @@ namespace Ship {
 			return nullptr;
 	}
 
-	std::shared_ptr<Resource> ResourceMgr::LoadResource(std::string FilePath) {
-		auto Promise = LoadResourceAsync(FilePath);
+	std::shared_ptr<Resource> ResourceMgr::LoadResource(const char* FilePath) {
+		auto Res = LoadResourceAsync(FilePath);
+
+		if (std::holds_alternative<std::shared_ptr<Resource>>(Res))
+			return std::get<std::shared_ptr<Resource>>(Res);
+
+		auto& Promise = std::get<std::shared_ptr<ResourcePromise>>(Res);
 
 		if (!Promise->bHasResourceLoaded)
 		{
@@ -241,21 +246,18 @@ namespace Ship {
 		return Promise->resource;
 	}
 
-	std::shared_ptr<ResourcePromise> ResourceMgr::LoadResourceAsync(std::string FilePath) {
-		StringHelper::ReplaceOriginal(FilePath, "\\", "/");
-
-		if (StringHelper::StartsWith(FilePath, "__OTR__"))
-			FilePath = StringHelper::Split(FilePath, "__OTR__")[1];
-
-		std::shared_ptr<ResourcePromise> Promise = std::make_shared<ResourcePromise>();
+	std::variant<std::shared_ptr<Resource>, std::shared_ptr<ResourcePromise>> ResourceMgr::LoadResourceAsync(const char* FilePath) {
+		if (FilePath[0] == '_' && FilePath[1] == '_' && FilePath[2] == 'O' && FilePath[3] == 'T' && FilePath[4] == 'R' && FilePath[5] == '_' && FilePath[6] == '_')
+			FilePath += 7;
 
 		const std::lock_guard<std::mutex> ResLock(ResourceLoadMutex);
 		auto resCacheFind = ResourceCache.find(FilePath);
 		if (resCacheFind == ResourceCache.end() || resCacheFind->second->isDirty/* || !FileData->bIsLoaded*/) {
 			if (resCacheFind == ResourceCache.end()) {
-				SPDLOG_TRACE("Cache miss on Resource load: {}", FilePath.c_str());
+				SPDLOG_TRACE("Cache miss on Resource load: {}", FilePath);
 			}
 
+			std::shared_ptr<ResourcePromise> Promise = std::make_shared<ResourcePromise>();
 			std::shared_ptr<File> FileData = LoadFile(FilePath);
 			Promise->file = FileData;
 
@@ -269,12 +271,13 @@ namespace Ship {
 				ResourceLoadQueue.push(Promise);
 				ResourceLoadNotifier.notify_all();
 			}
-		} else {
-			Promise->bHasResourceLoaded = true;
-			Promise->resource = resCacheFind->second;
-		}
 
-		return Promise;
+			return Promise;
+		}
+		else
+		{
+			return resCacheFind->second;
+		}
 	}
 
 	std::shared_ptr<std::vector<std::shared_ptr<ResourcePromise>>> ResourceMgr::CacheDirectoryAsync(std::string SearchMask) {
@@ -282,10 +285,15 @@ namespace Ship {
 		auto fileList = OTR->ListFiles(SearchMask);
 
 		for (DWORD i = 0; i < fileList.size(); i++) {
-			auto file = LoadResourceAsync(fileList.operator[](i).cFileName);
-			if (file != nullptr) {
-				loadedList->push_back(file);
+			auto resource = LoadResourceAsync(fileList.operator[](i).cFileName);
+			if (std::holds_alternative<std::shared_ptr<Resource>>(resource))
+			{
+				auto promise = std::make_shared<ResourcePromise>();
+				promise->bHasResourceLoaded = true;
+				promise->resource = std::get<std::shared_ptr<Resource>>(resource);
+				resource = promise;
 			}
+			loadedList->push_back(std::get<std::shared_ptr<ResourcePromise>>(resource));
 		}
 
 		return loadedList;
@@ -335,7 +343,7 @@ namespace Ship {
 		ResourceCache.clear();
 	}
 
-	std::string ResourceMgr::HashToString(uint64_t Hash) {
+	const std::string* ResourceMgr::HashToString(uint64_t Hash) const {
 		return OTR->HashToString(Hash);
 	}
 }
\ No newline at end of file
diff --git a/libultraship/libultraship/ResourceMgr.h b/libultraship/libultraship/ResourceMgr.h
index 28e77e537..e76d5b521 100644
--- a/libultraship/libultraship/ResourceMgr.h
+++ b/libultraship/libultraship/ResourceMgr.h
@@ -4,6 +4,7 @@
 #include <string>
 #include <thread>
 #include <queue>
+#include <variant>
 #include "Resource.h"
 #include "GlobalCtx2.h"
 
@@ -25,7 +26,7 @@ namespace Ship
 		std::shared_ptr<Archive> GetArchive() { return OTR; }
 		std::shared_ptr<GlobalCtx2> GetContext() { return Context.lock(); }
 
-		std::string HashToString(uint64_t Hash);
+		const std::string* HashToString(uint64_t Hash) const;
 
 		void InvalidateResourceCache();
 
@@ -33,9 +34,10 @@ namespace Ship
 		void SetGameVersion(uint32_t newGameVersion);
 		std::shared_ptr<File> LoadFileAsync(std::string FilePath);
 		std::shared_ptr<File> LoadFile(std::string FilePath);
-		std::shared_ptr<Ship::Resource> GetCachedFile(std::string FilePath);
-		std::shared_ptr<Resource> LoadResource(std::string FilePath);
-		std::shared_ptr<ResourcePromise> LoadResourceAsync(std::string FilePath);
+		std::shared_ptr<Ship::Resource> GetCachedFile(const char* FilePath) const;
+		std::shared_ptr<Resource> LoadResource(const char* FilePath);
+		std::shared_ptr<Resource> LoadResource(const std::string& FilePath) { return LoadResource(FilePath.c_str()); }
+		std::variant<std::shared_ptr<Resource>, std::shared_ptr<ResourcePromise>> LoadResourceAsync(const char* FilePath);
 		std::shared_ptr<std::vector<std::shared_ptr<Resource>>> CacheDirectory(std::string SearchMask);
 		std::shared_ptr<std::vector<std::shared_ptr<ResourcePromise>>> CacheDirectoryAsync(std::string SearchMask);
 		std::shared_ptr<std::vector<std::shared_ptr<Resource>>> DirtyDirectory(std::string SearchMask);
@@ -50,7 +52,7 @@ namespace Ship
 		std::weak_ptr<GlobalCtx2> Context;
 		volatile bool bIsRunning;
 		std::map<std::string, std::shared_ptr<File>> FileCache;
-		std::map<std::string, std::shared_ptr<Resource>> ResourceCache;
+		std::map<std::string, std::shared_ptr<Resource>, std::less<>> ResourceCache;
 		std::queue<std::shared_ptr<File>> FileLoadQueue;
 		std::queue<std::shared_ptr<ResourcePromise>> ResourceLoadQueue;
 		std::shared_ptr<Archive> OTR;
diff --git a/libultraship/libultraship/Window.cpp b/libultraship/libultraship/Window.cpp
index 588e3af50..bbd906c76 100644
--- a/libultraship/libultraship/Window.cpp
+++ b/libultraship/libultraship/Window.cpp
@@ -119,17 +119,16 @@ extern "C" {
         ModInternal::callBindHook(0);
     }
 
-    char* ResourceMgr_GetNameByCRC(uint64_t crc, char* alloc) {
-        std::string hashStr = Ship::GlobalCtx2::GetInstance()->GetResourceManager()->HashToString(crc);
-        strcpy(alloc, hashStr.c_str());
-        return (char*)hashStr.c_str();
+    const char* ResourceMgr_GetNameByCRC(uint64_t crc) {
+        const std::string* hashStr = Ship::GlobalCtx2::GetInstance()->GetResourceManager()->HashToString(crc);
+        return hashStr != nullptr ? hashStr->c_str() : nullptr;
     }
 
     Vtx* ResourceMgr_LoadVtxByCRC(uint64_t crc) {
-        std::string hashStr = Ship::GlobalCtx2::GetInstance()->GetResourceManager()->HashToString(crc);
+        const std::string* hashStr = Ship::GlobalCtx2::GetInstance()->GetResourceManager()->HashToString(crc);
 
-        if (hashStr != "") {
-            auto res = std::static_pointer_cast<Ship::Array>(Ship::GlobalCtx2::GetInstance()->GetResourceManager()->LoadResource(hashStr));
+        if (hashStr != nullptr) {
+            auto res = std::static_pointer_cast<Ship::Array>(Ship::GlobalCtx2::GetInstance()->GetResourceManager()->LoadResource(hashStr->c_str()));
 
             //if (res != nullptr)
                 return (Vtx*)res->vertices.data();
@@ -142,10 +141,10 @@ extern "C" {
     }
 
     int32_t* ResourceMgr_LoadMtxByCRC(uint64_t crc) {
-        std::string hashStr = Ship::GlobalCtx2::GetInstance()->GetResourceManager()->HashToString(crc);
+        const std::string* hashStr = Ship::GlobalCtx2::GetInstance()->GetResourceManager()->HashToString(crc);
 
-        if (hashStr != "") {
-            auto res = std::static_pointer_cast<Ship::Matrix>(Ship::GlobalCtx2::GetInstance()->GetResourceManager()->LoadResource(hashStr));
+        if (hashStr != nullptr) {
+            auto res = std::static_pointer_cast<Ship::Matrix>(Ship::GlobalCtx2::GetInstance()->GetResourceManager()->LoadResource(hashStr->c_str()));
             return (int32_t*)res->mtx.data();
         } else {
             return nullptr;
@@ -153,10 +152,10 @@ extern "C" {
     }
 
     Gfx* ResourceMgr_LoadGfxByCRC(uint64_t crc) {
-        std::string hashStr = Ship::GlobalCtx2::GetInstance()->GetResourceManager()->HashToString(crc);
+        const std::string* hashStr = Ship::GlobalCtx2::GetInstance()->GetResourceManager()->HashToString(crc);
 
-        if (hashStr != "") {
-            auto res = std::static_pointer_cast<Ship::DisplayList>(Ship::GlobalCtx2::GetInstance()->GetResourceManager()->LoadResource(hashStr));
+        if (hashStr != nullptr) {
+            auto res = std::static_pointer_cast<Ship::DisplayList>(Ship::GlobalCtx2::GetInstance()->GetResourceManager()->LoadResource(hashStr->c_str()));
             return (Gfx*)&res->instructions[0];
         } else {
             return nullptr;
@@ -164,14 +163,14 @@ extern "C" {
     }
 
     char* ResourceMgr_LoadTexByCRC(uint64_t crc)  {
-        const std::string hashStr = Ship::GlobalCtx2::GetInstance()->GetResourceManager()->HashToString(crc);
+        const std::string* hashStr = Ship::GlobalCtx2::GetInstance()->GetResourceManager()->HashToString(crc);
 
-        if (!hashStr.empty())  {
-            const auto res = static_cast<Ship::Texture*>(Ship::GlobalCtx2::GetInstance()->GetResourceManager()->LoadResource(hashStr).get());
+        if (hashStr != nullptr)  {
+            const auto res = static_cast<Ship::Texture*>(Ship::GlobalCtx2::GetInstance()->GetResourceManager()->LoadResource(hashStr->c_str()).get());
 
             ModInternal::bindHook(LOAD_TEXTURE);
             ModInternal::initBindHook(2,
-                HookParameter({.name = "path", .parameter = (void*)hashStr.c_str() }),
+                HookParameter({.name = "path", .parameter = (void*)hashStr->c_str() }),
                 HookParameter({.name = "texture", .parameter = static_cast<void*>(&res->imageData) })
             );
             ModInternal::callBindHook(0);
@@ -184,11 +183,11 @@ extern "C" {
 
     void ResourceMgr_RegisterResourcePatch(uint64_t hash, uint32_t instrIndex, uintptr_t origData)
     {
-        std::string hashStr = Ship::GlobalCtx2::GetInstance()->GetResourceManager()->HashToString(hash);
+        const std::string* hashStr = Ship::GlobalCtx2::GetInstance()->GetResourceManager()->HashToString(hash);
 
-        if (hashStr != "")
+        if (hashStr != nullptr)
         {
-            auto res = (Ship::Texture*)Ship::GlobalCtx2::GetInstance()->GetResourceManager()->LoadResource(hashStr).get();
+            auto res = (Ship::Texture*)Ship::GlobalCtx2::GetInstance()->GetResourceManager()->LoadResource(hashStr->c_str()).get();
 
             Ship::Patch patch;
             patch.crc = hash;

From 076887e71f52d4258aa8fc77d3efeafe09d234d8 Mon Sep 17 00:00:00 2001
From: PurpleHato <47987542+PurpleHato@users.noreply.github.com>
Date: Sun, 15 May 2022 21:51:58 +0200
Subject: [PATCH 43/43] TWEAK: Submenus for the enhancement menu (#343)

* TWEAK: Submenus for the enhancement menu

original PR was #322 closed it because I messed it

* Fix for Assignable Tunics and Boots
---
 libultraship/libultraship/SohImGuiImpl.cpp | 113 +++++++++++----------
 1 file changed, 60 insertions(+), 53 deletions(-)

diff --git a/libultraship/libultraship/SohImGuiImpl.cpp b/libultraship/libultraship/SohImGuiImpl.cpp
index 78532d85b..d17d6ccee 100644
--- a/libultraship/libultraship/SohImGuiImpl.cpp
+++ b/libultraship/libultraship/SohImGuiImpl.cpp
@@ -363,7 +363,7 @@ namespace SohImGui {
 
         ModInternal::registerHookListener({ CONTROLLER_READ, [](const HookEvent ev) {
             pads = static_cast<OSContPad*>(ev->baseArgs["cont_pad"]);
-        }});
+        } });
         Game::InitSettings();
     }
 
@@ -402,7 +402,7 @@ namespace SohImGui {
             EnhancementRadioButton("French", "gLanguages", 2);
         */
         int val = CVar_GetS32(cvarName.c_str(), 0);
-        if (ImGui::RadioButton(text.c_str(), id==val)) {
+        if (ImGui::RadioButton(text.c_str(), id == val)) {
             CVar_SetS32(cvarName.c_str(), (int)id);
             needs_save = true;
         }
@@ -505,12 +505,12 @@ namespace SohImGui {
         }
     }
 
-    void Tooltip(std::string text){
+    void Tooltip(std::string text) {
         if (ImGui::IsItemHovered())
             ImGui::SetTooltip("%s", text.c_str());
     }
 
-   void DrawMainMenuAndCalculateGameSize() {
+    void DrawMainMenuAndCalculateGameSize() {
         console->Update();
         ImGuiBackendNewFrame();
         ImGuiWMNewFrame();
@@ -626,10 +626,10 @@ namespace SohImGui {
             if (ImGui::BeginMenu("Graphics"))
             {
                 EnhancementSliderInt("Internal Resolution: %dx", "##IMul", "gInternalResolution", 1, 8, "");
-		Tooltip("Increases the render resolution of the game, up to 8x your output resolution,\nas a more intensive but effective form of anti-aliasing");
+                Tooltip("Increases the render resolution of the game, up to 8x your output resolution,\nas a more intensive but effective form of anti-aliasing");
                 gfx_current_dimensions.internal_mul = CVar_GetS32("gInternalResolution", 1);
                 EnhancementSliderInt("MSAA: %d", "##IMSAA", "gMSAAValue", 1, 8, "");
-		Tooltip("Activates anti-aliasing when above 1, up to 8x for 8 samples for every pixel");
+                Tooltip("Activates anti-aliasing when above 1, up to 8x for 8 samples for every pixel");
                 gfx_msaa_level = CVar_GetS32("gMSAAValue", 1);
 
                 EXPERIMENTAL();
@@ -641,7 +641,7 @@ namespace SohImGui {
                             INFO("New Filter: %s", filters[fId]);
                             gapi->set_texture_filter((FilteringMode)fId);
 
-                            CVar_SetS32("gTextureFilter", (int) fId);
+                            CVar_SetS32("gTextureFilter", (int)fId);
                             needs_save = true;
                         }
 
@@ -661,50 +661,57 @@ namespace SohImGui {
 
             if (ImGui::BeginMenu("Enhancements"))
             {
-                ImGui::Text("Gameplay");
-                ImGui::Separator();
+                if (ImGui::BeginMenu("Gameplay"))
+                {
+                    EnhancementSliderInt("Text Speed: %dx", "##TEXTSPEED", "gTextSpeed", 1, 5, "");
+                    EnhancementSliderInt("King Zora Speed: %dx", "##WEEPSPEED", "gMweepSpeed", 1, 5, "");
 
-                EnhancementSliderInt("Text Speed: %dx", "##TEXTSPEED", "gTextSpeed", 1, 5, "");
-                EnhancementSliderInt("King Zora Speed: %dx", "##WEEPSPEED", "gMweepSpeed", 1, 5, "");
+                    EnhancementCheckbox("Skip Text", "gSkipText");
+                    Tooltip("Holding down B skips text");
+                    EnhancementCheckbox("Mute Low HP Alarm", "gLowHpAlarm");
+                    Tooltip("Disable the low HP beeping sound");
+                    EnhancementCheckbox("Minimal UI", "gMinimalUI");
+                    Tooltip("Hides most of the UI when not needed");
+                    EnhancementCheckbox("Visual Stone of Agony", "gVisualAgony");
+                    Tooltip("Displays an icon and plays a sound when Stone of Agony should be activated, for those without rumble");
+                    EnhancementCheckbox("Faster Block Push", "gFasterBlockPush");
+                    EnhancementCheckbox("Assignable Tunics and Boots", "gAssignableTunicsAndBoots");
+                    Tooltip("Allows equiping the tunic and boots to c-buttons");
+                    EnhancementCheckbox("MM Bunny Hood", "gMMBunnyHood");
+                    Tooltip("Wearing the Bunny Hood grants a speed increase like in Majora's Mask");
 
-                EnhancementCheckbox("Mute Low HP Alarm", "gLowHpAlarm");
-                EnhancementCheckbox("Skip Text", "gSkipText");
-                Tooltip("Holding down B skips text");
-                EnhancementCheckbox("Minimal UI", "gMinimalUI");
-                Tooltip("Hides most of the UI when not needed");
-                EnhancementCheckbox("MM Bunny Hood", "gMMBunnyHood");
-                Tooltip("Wearing the Bunny Hood grants a speed increase like in Majora's Mask");
-                EnhancementCheckbox("Visual Stone of Agony", "gVisualAgony");
-                Tooltip("Displays an icon and plays a sound when Stone of Agony should be activated, for those without rumble");
-                EnhancementCheckbox("Assignable Tunics and Boots", "gAssignableTunicsAndBoots");
-                Tooltip("Allows equiping the tunic and boots to c-buttons");
+                    ImGui::EndMenu();
+                }
 
-                ImGui::Text("Graphics");
-                ImGui::Separator();
+                if (ImGui::BeginMenu("Graphics"))
+                {
+                    EnhancementCheckbox("N64 Mode", "gN64Mode");
+                    Tooltip("Sets aspect ratio to 4:3 and lowers resolution to 240p, the N64's native resolution");
+                    EnhancementCheckbox("Animated Link in Pause Menu", "gPauseLiveLink");
+                    EnhancementCheckbox("Enable 3D Dropped items", "gNewDrops");
+                    EnhancementCheckbox("Dynamic Wallet Icon", "gDynamicWalletIcon");
+                    Tooltip("Changes the rupee in the wallet icon to match the wallet size you currently have");
+                    EnhancementCheckbox("Always show dungeon entrances", "gAlwaysShowDungeonMinimapIcon");
+                    Tooltip("Always shows dungeon entrance icons on the minimap");
 
-                EnhancementCheckbox("N64 Mode", "gN64Mode");
-                Tooltip("Sets aspect ratio to 4:3 and lowers resolution to 240p, the N64's native resolution");
+                    ImGui::EndMenu();
+                }
 
-                EnhancementCheckbox("Animated Link in Pause Menu", "gPauseLiveLink");
-                EnhancementCheckbox("Enable 3D Dropped items", "gNewDrops");
-                EnhancementCheckbox("Faster Block Push", "gFasterBlockPush");
-                EnhancementCheckbox("Dynamic Wallet Icon", "gDynamicWalletIcon");
-                Tooltip("Changes the rupee in the wallet icon to match the wallet size you currently have");
-                EnhancementCheckbox("Always show dungeon entrances", "gAlwaysShowDungeonMinimapIcon");
-                Tooltip("Always shows dungeon entrance icons on the minimap");
+                if (ImGui::BeginMenu("Fixes"))
+                {
+                    EnhancementCheckbox("Fix L&R Pause menu", "gUniformLR");
+                    Tooltip("Makes the L and R buttons in the pause menu the same color");
+                    EnhancementCheckbox("Fix Dungeon entrances", "gFixDungeonMinimapIcon");
+                    Tooltip("Show dungeon entrances icon only when it should be");
+                    EnhancementCheckbox("Fix Two Handed idle animations", "gTwoHandedIdle");
+                    Tooltip("Makes two handed idle animation play, a seemingly finished animation that was disabled on accident in the original game");
 
-                ImGui::Text("Fixes");
-                ImGui::Separator();
-                EnhancementCheckbox("Fix L&R Pause menu", "gUniformLR");
-                Tooltip("Makes the L and R buttons in the pause menu the same color");
-                EnhancementCheckbox("Fix Dungeon entrances", "gFixDungeonMinimapIcon");
-                Tooltip("Show dungeon entrances icon only when it should be");
-                EnhancementCheckbox("Fix Two Handed idle animations", "gTwoHandedIdle");
-                Tooltip("Makes two handed idle animation play, a seemingly finished animation that was disabled on accident in the original game");
+                    ImGui::EndMenu();
+                }
 
                 EXPERIMENTAL();
 
-                EnhancementCheckbox("60 fps interpolation", "g60FPS");
+                EnhancementCheckbox("60FPS Interpolation", "g60FPS");
                 EnhancementCheckbox("Disable LOD", "gDisableLOD");
                 Tooltip("Turns off the level of detail setting, making models always use their higher poly variants");
 
@@ -748,19 +755,19 @@ namespace SohImGui {
                 }
 
                 EnhancementCheckbox("No Clip", "gNoClip");
-		        Tooltip("Allows you to walk through walls");
+                Tooltip("Allows you to walk through walls");
                 EnhancementCheckbox("Climb Everything", "gClimbEverything");
-		        Tooltip("Makes every surface in the game climbable");
+                Tooltip("Makes every surface in the game climbable");
                 EnhancementCheckbox("Moon Jump on L", "gMoonJumpOnL");
-		        Tooltip("Holding L makes you float into the air");
+                Tooltip("Holding L makes you float into the air");
                 EnhancementCheckbox("Super Tunic", "gSuperTunic");
-		        Tooltip("Makes every tunic have the effects of every other tunic");
+                Tooltip("Makes every tunic have the effects of every other tunic");
                 EnhancementCheckbox("Easy ISG", "gEzISG");
-		        Tooltip("Automatically activates the Infinite Sword glitch, making you constantly swing your sword");
+                Tooltip("Automatically activates the Infinite Sword glitch, making you constantly swing your sword");
                 EnhancementCheckbox("Unrestricted Items", "gNoRestrictItems");
-		        Tooltip("Allows you to use all items at any age");
+                Tooltip("Allows you to use any item at any location");
                 EnhancementCheckbox("Freeze Time", "gFreezeTime");
-		        Tooltip("Freezes the time of day");
+                Tooltip("Freezes the time of day");
 
                 ImGui::EndMenu();
             }
@@ -768,12 +775,12 @@ namespace SohImGui {
             if (ImGui::BeginMenu("Developer Tools"))
             {
                 EnhancementCheckbox("OoT Debug Mode", "gDebugEnabled");
-		        Tooltip("Enables Debug Mode, allowing you to select maps with L + R + Z, noclip with L + D-pad Right,\nand open the debug menu with L on the pause screen");
+                Tooltip("Enables Debug Mode, allowing you to select maps with L + R + Z, noclip with L + D-pad Right,\nand open the debug menu with L on the pause screen");
                 ImGui::Separator();
                 EnhancementCheckbox("Stats", "gStatsEnabled");
-		        Tooltip("Shows the stats window, with your FPS and frametimes, and the OS you're playing on");
+                Tooltip("Shows the stats window, with your FPS and frametimes, and the OS you're playing on");
                 EnhancementCheckbox("Console", "gConsoleEnabled");
-		        Tooltip("Enables the console window, allowing you to input commands, type help for some examples");
+                Tooltip("Enables the console window, allowing you to input commands, type help for some examples");
                 console->opened = CVar_GetS32("gConsoleEnabled", 0);
 
                 ImGui::EndMenu();
@@ -783,7 +790,7 @@ namespace SohImGui {
                 if (ImGui::BeginMenu(category.first.c_str())) {
                     for (const std::string& name : category.second) {
                         std::string varName(name);
-                    	varName.erase(std::ranges::remove_if(varName, isspace).begin(), varName.end());
+                        varName.erase(std::ranges::remove_if(varName, isspace).begin(), varName.end());
                         std::string toggleName = "g" + varName + "Enabled";
 
                         EnhancementCheckbox(name, toggleName);