From b540b7fcfcaca50ddaa42f9018232c8634cfd2fa Mon Sep 17 00:00:00 2001
From: Baoulettes <perlouzerie@hotmail.fr>
Date: Sun, 24 Apr 2022 16:50:41 +0200
Subject: [PATCH 01/26] Add Enhancement 3D Dropped Items (#144)

* Add Enhancement 3D Dropped Items

It will change most of dropped item to there 3D models variant, Exclude Rupee from Hyrule Castle (when you are child and in quest to see Zelda.)

* Fix z_kaleido_scope_PAL.c L and R button color issues

This fix an issue in IF and gDPSetPrimColor for button L & R icon.
making it with an else to place the on hover and normal color properly in both button so they both have exact same colour

* Fix quite a big logic issue for 3D item drops

In short,case logic required to be different with break; old version make it all fucked up with improper values.

* Clean Const that was present nor not.

* Update z_kaleido_scope_PAL.c

* Update z_kaleido_scope_PAL.c
---
 libultraship/libultraship/GameSettings.cpp |   4 +
 libultraship/libultraship/GameSettings.h   |   1 +
 libultraship/libultraship/SohImGuiImpl.cpp |   6 +
 soh/soh/Enhancements/bootcommands.c        |   2 +
 soh/src/code/z_en_item00.c                 | 326 ++++++++++++++++++---
 5 files changed, 293 insertions(+), 46 deletions(-)

diff --git a/libultraship/libultraship/GameSettings.cpp b/libultraship/libultraship/GameSettings.cpp
index 2ce22d6f9..c056dec71 100644
--- a/libultraship/libultraship/GameSettings.cpp
+++ b/libultraship/libultraship/GameSettings.cpp
@@ -73,6 +73,9 @@ namespace Game {
         Settings.enhancements.mm_bunny_hood = stob(Conf[EnhancementSection]["mm_bunny_hood"]);
         CVar_SetS32("gMMBunnyHood", Settings.enhancements.mm_bunny_hood);
 
+        Settings.enhancements.newdrops = stob(Conf[EnhancementSection]["newdrops"]);
+        CVar_SetS32("gNewDrops", Settings.enhancements.newdrops);
+        
         // Audio
         Settings.audio.master = Ship::stof(Conf[AudioSection]["master"]);
         CVar_SetFloat("gGameMasterVolume", Settings.audio.master);
@@ -178,6 +181,7 @@ namespace Game {
         Conf[EnhancementSection]["animated_pause_menu"] = std::to_string(Settings.enhancements.animated_pause_menu);
         Conf[EnhancementSection]["dynamic_wallet_icon"] = std::to_string(Settings.enhancements.dynamic_wallet_icon);
         Conf[EnhancementSection]["minimal_ui"] = std::to_string(Settings.enhancements.minimal_ui);
+        Conf[EnhancementSection]["newdrops"] = std::to_string(Settings.enhancements.newdrops);
         Conf[EnhancementSection]["visualagony"] = std::to_string(Settings.enhancements.visualagony);
         Conf[EnhancementSection]["mm_bunny_hood"] = std::to_string(Settings.enhancements.mm_bunny_hood);
 
diff --git a/libultraship/libultraship/GameSettings.h b/libultraship/libultraship/GameSettings.h
index 070bdce38..990132f4e 100644
--- a/libultraship/libultraship/GameSettings.h
+++ b/libultraship/libultraship/GameSettings.h
@@ -26,6 +26,7 @@ struct SoHConfigType {
         bool animated_pause_menu = false;
         bool dynamic_wallet_icon = false;
         bool minimal_ui = false;
+        bool newdrops = false;
         bool visualagony = false;
         bool mm_bunny_hood = false;
 
diff --git a/libultraship/libultraship/SohImGuiImpl.cpp b/libultraship/libultraship/SohImGuiImpl.cpp
index 7355d16a2..72a44162e 100644
--- a/libultraship/libultraship/SohImGuiImpl.cpp
+++ b/libultraship/libultraship/SohImGuiImpl.cpp
@@ -431,8 +431,14 @@ namespace SohImGui {
                     needs_save = true;
                 }
 
+                if (ImGui::Checkbox("Enable 3D Dropped items", &Game::Settings.enhancements.newdrops)) {
+                    CVar_SetS32("gNewDrops", Game::Settings.enhancements.newdrops);
+                    needs_save = true;
+                }
+              
                 if (ImGui::Checkbox("Dynamic Wallet Icon", &Game::Settings.enhancements.dynamic_wallet_icon)) {
                     CVar_SetS32(const_cast<char*>("gDynamicWalletIcon"), Game::Settings.enhancements.dynamic_wallet_icon);
+
                     needs_save = true;
                 }
 
diff --git a/soh/soh/Enhancements/bootcommands.c b/soh/soh/Enhancements/bootcommands.c
index c58a11b6b..f3ad9aaac 100644
--- a/soh/soh/Enhancements/bootcommands.c
+++ b/soh/soh/Enhancements/bootcommands.c
@@ -25,7 +25,9 @@ void BootCommands_Init()
     CVar_RegisterS32("gDebugEnabled", 0);
     CVar_RegisterS32("gPauseLiveLink", 0);
     CVar_RegisterS32("gMinimalUI", 0);
+    CVar_RegisterS32("gNewDrops", 0);
     CVar_RegisterS32("gVisualAgony", 0);
+
 }
 
 //void BootCommands_ParseBootArgs(char* str)
diff --git a/soh/src/code/z_en_item00.c b/soh/src/code/z_en_item00.c
index 2693c4b0f..d0179a5e1 100644
--- a/soh/src/code/z_en_item00.c
+++ b/soh/src/code/z_en_item00.c
@@ -5,6 +5,9 @@
 
 #define FLAGS 0
 
+//Used to force variable to be used in different function, feel free to correct me if you have a better way
+static s16 DroppedItemRot = 0;
+
 void EnItem00_Init(Actor* thisx, GlobalContext* globalCtx);
 void EnItem00_Destroy(Actor* thisx, GlobalContext* globalCtx);
 void EnItem00_Update(Actor* thisx, GlobalContext* globalCtx);
@@ -355,11 +358,34 @@ void EnItem00_Init(Actor* thisx, GlobalContext* globalCtx) {
 
     switch (this->actor.params) {
         case ITEM00_RUPEE_GREEN:
+        	if (CVar_GetS32("gNewDrops", 0) !=0) {
+				Actor_SetScale(&this->actor, 0.3f);
+				this->scale = 0.3f;
+				yOffset = 50.0f;
+				shadowScale = 0.3f;
+				this->actor.world.rot.x = 0x4000;
+				break;
+            }
         case ITEM00_RUPEE_BLUE:
+        	if (CVar_GetS32("gNewDrops", 0) !=0) {
+				Actor_SetScale(&this->actor, 0.3f);
+				this->scale = 0.3f;
+				yOffset = 50.0f;
+				shadowScale = 0.3f;
+				this->actor.world.rot.x = 0x4000;
+            }
         case ITEM00_RUPEE_RED:
-            Actor_SetScale(&this->actor, 0.015f);
-            this->scale = 0.015f;
-            yOffset = 750.0f;
+        	if (CVar_GetS32("gNewDrops", 0) !=0) {
+				Actor_SetScale(&this->actor, 0.3f);
+				this->scale = 0.3f;
+				yOffset = 50.0f;
+				shadowScale = 0.3f;
+				this->actor.world.rot.x = 0x4000;
+            } else {
+		        Actor_SetScale(&this->actor, 0.015f);
+		        this->scale = 0.015f;
+		        yOffset = 750.0f;
+            }
             break;
         case ITEM00_SMALL_KEY:
             this->unk_158 = 0;
@@ -374,10 +400,18 @@ void EnItem00_Init(Actor* thisx, GlobalContext* globalCtx) {
             this->scale = 0.02f;
             break;
         case ITEM00_HEART:
-            this->actor.home.rot.z = Rand_CenteredFloat(65535.0f);
-            yOffset = 430.0f;
-            Actor_SetScale(&this->actor, 0.02f);
-            this->scale = 0.02f;
+        	if (CVar_GetS32("gNewDrops", 0) !=0) {
+		        this->actor.home.rot.z = Rand_CenteredFloat(65535.0f);
+		        yOffset = 25.0f;
+		        Actor_SetScale(&this->actor, 0.3f);
+		        this->scale = 0.3f;
+		        shadowScale = 0.5f;
+            } else {
+		        this->actor.home.rot.z = Rand_CenteredFloat(65535.0f);
+		        yOffset = 430.0f;
+		        Actor_SetScale(&this->actor, 0.02f);
+		        this->scale = 0.02f;
+            }
             break;
         case ITEM00_HEART_CONTAINER:
             yOffset = 430.0f;
@@ -386,42 +420,154 @@ void EnItem00_Init(Actor* thisx, GlobalContext* globalCtx) {
             this->scale = 0.02f;
             break;
         case ITEM00_ARROWS_SINGLE:
-            yOffset = 400.0f;
-            Actor_SetScale(&this->actor, 0.02f);
-            this->scale = 0.02f;
-            break;
+			if (CVar_GetS32("gNewDrops", 0) !=0) {
+				Actor_SetScale(&this->actor, 0.2f);
+				this->scale = 0.2f;
+				yOffset = 50.0f;
+				shadowScale = 0.5f;
+				this->actor.world.rot.x = 0x4000;
+			} else {
+		        yOffset = 400.0f;
+		        Actor_SetScale(&this->actor, 0.02f);
+		        this->scale = 0.02f;
+			}
+			break;
         case ITEM00_ARROWS_SMALL:
+			if (CVar_GetS32("gNewDrops", 0) !=0) {
+				Actor_SetScale(&this->actor, 0.2f);
+				this->scale = 0.2f;
+				yOffset = 50.0f;
+				shadowScale = 0.5f;
+				this->actor.world.rot.x = 0x4000;
+				break;
+			}
         case ITEM00_ARROWS_MEDIUM:
+			if (CVar_GetS32("gNewDrops", 0) !=0) {
+				Actor_SetScale(&this->actor, 0.2f);
+				this->scale = 0.2f;
+				yOffset = 50.0f;
+				shadowScale = 0.5f;
+				this->actor.world.rot.x = 0x4000;
+				break;
+			}
         case ITEM00_ARROWS_LARGE:
-            Actor_SetScale(&this->actor, 0.035f);
-            this->scale = 0.035f;
-            yOffset = 250.0f;
-            break;
+			if (CVar_GetS32("gNewDrops", 0) !=0) {
+				Actor_SetScale(&this->actor, 0.2f);
+				this->scale = 0.2f;
+				yOffset = 50.0f;
+				shadowScale = 0.5f;
+				this->actor.world.rot.x = 0x4000;
+			} else {
+		        Actor_SetScale(&this->actor, 0.035f);
+		        this->scale = 0.035f;
+		        yOffset = 250.0f;
+			}
+			break;
         case ITEM00_BOMBS_A:
+			if (CVar_GetS32("gNewDrops", 0) !=0) {
+				Actor_SetScale(&this->actor, 0.2f);
+				this->scale = 0.2f;
+				yOffset = 50.0f;
+				shadowScale = 0.5f;
+				this->actor.world.rot.x = 0x4000;
+				break;			
+			}
         case ITEM00_BOMBS_B:
+			if (CVar_GetS32("gNewDrops", 0) !=0) {
+				Actor_SetScale(&this->actor, 0.2f);
+				this->scale = 0.2f;
+				yOffset = 50.0f;
+				shadowScale = 0.5f;
+				this->actor.world.rot.x = 0x4000;
+				break;			
+			}
         case ITEM00_NUTS:
+			if (CVar_GetS32("gNewDrops", 0) !=0) {
+				Actor_SetScale(&this->actor, 0.2f);
+				this->scale = 0.2f;
+				yOffset = 50.0f;
+				shadowScale = 0.5f;
+				this->actor.world.rot.x = 0x4000;
+				break;			
+			}
         case ITEM00_STICK:
+			if (CVar_GetS32("gNewDrops", 0) !=0) {
+				Actor_SetScale(&this->actor, 0.2f);
+				this->scale = 0.2f;
+				yOffset = 50.0f;
+				shadowScale = 0.5f;
+				this->actor.world.rot.x = 0x4000;
+				break;			
+			}
         case ITEM00_MAGIC_SMALL:
+			if (CVar_GetS32("gNewDrops", 0) !=0) {
+				Actor_SetScale(&this->actor, 0.2f);
+				this->scale = 0.2f;
+				yOffset = 50.0f;
+				shadowScale = 0.5f;
+				this->actor.world.rot.x = 0x4000;
+				break;			
+			}
         case ITEM00_SEEDS:
+        	if (CVar_GetS32("gNewDrops", 0) !=0) {
+		        Actor_SetScale(&this->actor, 0.2f);
+		        this->scale = 0.2f;
+		        yOffset = 50.0f;
+		        shadowScale = 0.5f;
+		        this->actor.world.rot.x = 0x4000;
+				break;			
+			}
         case ITEM00_BOMBS_SPECIAL:
-            Actor_SetScale(&this->actor, 0.03f);
-            this->scale = 0.03f;
-            yOffset = 320.0f;
-            break;
+			if (CVar_GetS32("gNewDrops", 0) !=0) {
+				Actor_SetScale(&this->actor, 0.2f);
+				this->scale = 0.2f;
+				yOffset = 50.0f;
+				shadowScale = 0.5f;
+				this->actor.world.rot.x = 0x4000;		
+			} else {
+				Actor_SetScale(&this->actor, 0.03f);
+				this->scale = 0.03f;
+				yOffset = 320.0f;
+			}
+			break;
         case ITEM00_MAGIC_LARGE:
-            Actor_SetScale(&this->actor, 0.045 - 1e-10);
-            this->scale = 0.045 - 1e-10;
-            yOffset = 320.0f;
-            break;
+			if (CVar_GetS32("gNewDrops", 0) !=0) {
+				Actor_SetScale(&this->actor, 0.2f);
+				this->scale = 0.2f;
+				yOffset = 50.0f;
+				shadowScale = 0.5f;
+				this->actor.world.rot.x = 0x4000;
+			} else {
+		        Actor_SetScale(&this->actor, 0.045 - 1e-10);
+		        this->scale = 0.045 - 1e-10;
+		        yOffset = 320.0f;
+			}
+			break;
         case ITEM00_RUPEE_ORANGE:
-            Actor_SetScale(&this->actor, 0.045 - 1e-10);
-            this->scale = 0.045 - 1e-10;
-            yOffset = 750.0f;
+        	if (CVar_GetS32("gNewDrops", 0) !=0) {
+				Actor_SetScale(&this->actor, 0.45f);
+				this->scale = 0.45f;
+				yOffset = 50.0f;
+				shadowScale = 0.3f;
+				this->actor.world.rot.x = 0x4000;
+            } else {
+		        Actor_SetScale(&this->actor, 0.045 - 1e-10);
+		        this->scale = 0.045 - 1e-10;
+		        yOffset = 750.0f;
+            }
             break;
         case ITEM00_RUPEE_PURPLE:
-            Actor_SetScale(&this->actor, 0.03f);
-            this->scale = 0.03f;
-            yOffset = 750.0f;
+        	if (CVar_GetS32("gNewDrops", 0) !=0) {
+				Actor_SetScale(&this->actor, 0.4f);
+				this->scale = 0.4f;
+				yOffset = 50.0f;
+				shadowScale = 0.3f;
+				this->actor.world.rot.x = 0x4000;
+            } else {
+		        Actor_SetScale(&this->actor, 0.03f);
+		        this->scale = 0.03f;
+		        yOffset = 750.0f;
+            }
             break;
         case ITEM00_FLEXIBLE:
             yOffset = 500.0f;
@@ -558,6 +704,19 @@ void EnItem00_Destroy(Actor* thisx, GlobalContext* globalCtx) {
 }
 
 void func_8001DFC8(EnItem00* this, GlobalContext* globalCtx) {
+
+	if (CVar_GetS32("gNewDrops", 0) !=0) { //set the rotation system on selected model only :)
+		if ((this->actor.params == ITEM_RUPEE_GOLD) || (this->actor.params == ITEM_RUPEE_PURPLE) ||
+			(this->actor.params == ITEM00_ARROWS_SINGLE) || (this->actor.params == ITEM00_ARROWS_SMALL) ||
+		    (this->actor.params == ITEM00_ARROWS_MEDIUM) || (this->actor.params == ITEM00_ARROWS_LARGE) ||
+		    (this->actor.params == ITEM00_BOMBS_A) || (this->actor.params == ITEM00_BOMBS_B) ||
+		    (this->actor.params == ITEM00_NUTS) || (this->actor.params == ITEM00_STICK) ||
+		    (this->actor.params == ITEM00_MAGIC_SMALL) || (this->actor.params == ITEM00_SEEDS) ||
+		    (this->actor.params == ITEM00_MAGIC_LARGE) || (this->actor.params == ITEM00_HEART) || (this->actor.params == ITEM00_BOMBS_SPECIAL)) {
+		    this->actor.shape.rot.y = DroppedItemRot;
+		}
+	}
+	
     if ((this->actor.params <= ITEM00_RUPEE_RED) || ((this->actor.params == ITEM00_HEART) && (this->unk_15A < 0)) ||
         (this->actor.params == ITEM00_HEART_PIECE)) {
         this->actor.shape.rot.y += 960;
@@ -731,6 +890,10 @@ void EnItem00_Update(Actor* thisx, GlobalContext* globalCtx) {
     EnItem00* this = (EnItem00*)thisx;
     s32 pad;
 
+	if (CVar_GetS32("gNewDrops", 0) !=0) { //Update 3D Model rotation on frame update :)
+		DroppedItemRot += 100;
+	}
+
     if (this->unk_15A > 0) {
         this->unk_15A--;
     }
@@ -934,15 +1097,35 @@ void EnItem00_Update(Actor* thisx, GlobalContext* globalCtx) {
 void EnItem00_Draw(Actor* thisx, GlobalContext* globalCtx) {
     EnItem00* this = (EnItem00*)thisx;
     f32 mtxScale;
-
+	
     if (!(this->unk_156 & this->unk_158)) {
         switch (this->actor.params) {
             case ITEM00_RUPEE_GREEN:
+				if (CVar_GetS32("gNewDrops", 0) !=0) {
+					GetItem_Draw(globalCtx, GID_RUPEE_GREEN);
+					break;
+				}	
             case ITEM00_RUPEE_BLUE:
+				if (CVar_GetS32("gNewDrops", 0) !=0) {
+                	GetItem_Draw(globalCtx, GID_RUPEE_BLUE);
+					break;
+				}
             case ITEM00_RUPEE_RED:
+				if (CVar_GetS32("gNewDrops", 0) !=0) {
+                	GetItem_Draw(globalCtx, GID_RUPEE_RED);
+					break;
+				}
             case ITEM00_RUPEE_ORANGE:
+				if (CVar_GetS32("gNewDrops", 0) !=0) {
+                	GetItem_Draw(globalCtx, GID_RUPEE_GOLD);
+					break;
+				}
             case ITEM00_RUPEE_PURPLE:
-                EnItem00_DrawRupee(this, globalCtx);
+				if (CVar_GetS32("gNewDrops", 0) !=0) {
+                	GetItem_Draw(globalCtx, GID_RUPEE_PURPLE);
+				} else {
+					EnItem00_DrawRupee(this, globalCtx);
+				}
                 break;
             case ITEM00_HEART_PIECE:
                 EnItem00_DrawHeartPiece(this, globalCtx);
@@ -951,34 +1134,85 @@ void EnItem00_Draw(Actor* thisx, GlobalContext* globalCtx) {
                 EnItem00_DrawHeartContainer(this, globalCtx);
                 break;
             case ITEM00_HEART:
-                if (this->unk_15A < 0) {
-                    if (this->unk_15A == -1) {
-                        s8 bankIndex = Object_GetIndex(&globalCtx->objectCtx, OBJECT_GI_HEART);
-
-                        if (Object_IsLoaded(&globalCtx->objectCtx, bankIndex)) {
-                            this->actor.objBankIndex = bankIndex;
-                            Actor_SetObjectDependency(globalCtx, &this->actor);
-                            this->unk_15A = -2;
-                        }
-                    } else {
-                        mtxScale = 16.0f;
-                        Matrix_Scale(mtxScale, mtxScale, mtxScale, MTXMODE_APPLY);
-                        GetItem_Draw(globalCtx, GID_HEART);
-                    }
-                    break;
+				if (CVar_GetS32("gNewDrops", 0) !=0) {
+					GetItem_Draw(globalCtx, GID_HEART);
+                    mtxScale = 16.0f;
+                    Matrix_Scale(mtxScale, mtxScale, mtxScale, MTXMODE_APPLY);
+		            break;
+				} else {
+			        if (this->unk_15A < 0) {
+		                if (this->unk_15A == -1) {
+		                    s8 bankIndex = Object_GetIndex(&globalCtx->objectCtx, OBJECT_GI_HEART);
+		                    
+		                    if (Object_IsLoaded(&globalCtx->objectCtx, bankIndex)) {
+		                        this->actor.objBankIndex = bankIndex;
+		                        Actor_SetObjectDependency(globalCtx, &this->actor);
+		                        this->unk_15A = -2;
+		                    }
+		                } else {
+		                    mtxScale = 16.0f;
+		                    Matrix_Scale(mtxScale, mtxScale, mtxScale, MTXMODE_APPLY);
+		                    GetItem_Draw(globalCtx, GID_HEART);
+		                }
+		                break;
+		            }
                 }
             case ITEM00_BOMBS_A:
+				if (CVar_GetS32("gNewDrops", 0) !=0) {
+					GetItem_Draw(globalCtx, GID_BOMB);
+					break;
+				}
             case ITEM00_BOMBS_B:
+				if (CVar_GetS32("gNewDrops", 0) !=0) {
+                	GetItem_Draw(globalCtx, GID_BOMB);
+					break;
+				}
             case ITEM00_BOMBS_SPECIAL:
             case ITEM00_ARROWS_SINGLE:
+				if (CVar_GetS32("gNewDrops", 0) !=0) {
+                	GetItem_Draw(globalCtx, GID_ARROWS_SMALL);
+                	break;
+                }
             case ITEM00_ARROWS_SMALL:
+				if (CVar_GetS32("gNewDrops", 0) !=0) {
+                	GetItem_Draw(globalCtx, GID_ARROWS_SMALL);
+                	break;
+				}
             case ITEM00_ARROWS_MEDIUM:
+				if (CVar_GetS32("gNewDrops", 0) !=0) {
+                	GetItem_Draw(globalCtx, GID_ARROWS_MEDIUM);
+					break;
+				}
             case ITEM00_ARROWS_LARGE:
+				if (CVar_GetS32("gNewDrops", 0) !=0) {
+                	GetItem_Draw(globalCtx, GID_ARROWS_LARGE);
+					break;
+				}
             case ITEM00_NUTS:
+				if (CVar_GetS32("gNewDrops", 0) !=0) {
+                	GetItem_Draw(globalCtx, GID_NUTS);
+                	break;
+				}
             case ITEM00_STICK:
+				if (CVar_GetS32("gNewDrops", 0) !=0) {
+		            GetItem_Draw(globalCtx, GID_STICK);
+					break;
+				}
             case ITEM00_MAGIC_LARGE:
+				if (CVar_GetS32("gNewDrops", 0) !=0) {
+		            GetItem_Draw(globalCtx, GID_MAGIC_LARGE);
+					break;
+				}
             case ITEM00_MAGIC_SMALL:
+				if (CVar_GetS32("gNewDrops", 0) !=0) {
+		            GetItem_Draw(globalCtx, GID_MAGIC_SMALL);
+					break;
+				}
             case ITEM00_SEEDS:
+				if (CVar_GetS32("gNewDrops", 0) !=0) {
+		            GetItem_Draw(globalCtx, GID_SEEDS);
+					break;
+				}
             case ITEM00_SMALL_KEY:
                 EnItem00_DrawCollectible(this, globalCtx);
                 break;

From 6860600648b06778b5ff57e0aab5f2fd48749a1b Mon Sep 17 00:00:00 2001
From: Baoulettes <perlouzerie@hotmail.fr>
Date: Sun, 24 Apr 2022 16:51:29 +0200
Subject: [PATCH 02/26] Potential fix for Title being over Kaleido. (#162)

* Potential fix for Title being over Kaleido.

Changing "OVERLAY_DISP" to "POLY_XLU_DISP" seem to fix and do not bring any errors (I did tried scene one by one and walked around in game)
It may be no correct but it could point to the right direction if that is not correct.

* Update z_actor.c

* Update graph.c

* Update z64.h

* Update macros.h
---
 soh/include/macros.h   |  1 +
 soh/include/z64.h      |  3 +++
 soh/src/code/graph.c   |  5 +++++
 soh/src/code/z_actor.c | 13 +++++++------
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/soh/include/macros.h b/soh/include/macros.h
index 0d86c56c3..8563449b1 100644
--- a/soh/include/macros.h
+++ b/soh/include/macros.h
@@ -129,6 +129,7 @@ extern GraphicsContext* __gfxCtx;
 #define WORK_DISP       __gfxCtx->work.p
 #define POLY_OPA_DISP   __gfxCtx->polyOpa.p
 #define POLY_XLU_DISP   __gfxCtx->polyXlu.p
+#define TITLE_CARD_DISP   __gfxCtx->titlecard.p
 #define POLY_KAL_DISP   __gfxCtx->polyKal.p
 #define OVERLAY_DISP    __gfxCtx->overlay.p
 
diff --git a/soh/include/z64.h b/soh/include/z64.h
index 24ec79946..92966f239 100644
--- a/soh/include/z64.h
+++ b/soh/include/z64.h
@@ -83,6 +83,7 @@ typedef struct {
     /* 0x00000 */ u16 headMagic; // GFXPOOL_HEAD_MAGIC
     /* 0x00008 */ Gfx polyOpaBuffer[0x2FC0];
     /* 0x0BF08 */ Gfx polyXluBuffer[0x1000];
+    /* 0xXXXXX */ Gfx titlecardBuffer[0x1000];
     /* 0x0BF08 */ Gfx polyKalBuffer[0x1000];
     /* 0x0FF08 */ Gfx overlayBuffer[0x800];
     /* 0x11F08 */ Gfx workBuffer[0x100];
@@ -130,6 +131,7 @@ typedef struct OSScTask {
 typedef struct GraphicsContext {
     /* 0x0000 */ Gfx* polyOpaBuffer; // Pointer to "Zelda 0"
     /* 0x0004 */ Gfx* polyXluBuffer; // Pointer to "Zelda 1"
+    /* 0xXXX */  Gfx* titlecardBuffer; // Pointer to "Paris"
     /* 0xXXX */  Gfx* polyKalBuffer; // Pointer to "Rome"
     /* 0x0008 */ char unk_008[0x08]; // Unused, could this be pointers to "Zelda 2" / "Zelda 3"
     /* 0x0010 */ Gfx* overlayBuffer; // Pointer to "Zelda 4"
@@ -149,6 +151,7 @@ typedef struct GraphicsContext {
     /* 0x02A8 */ TwoHeadGfxArena overlay; // "Zelda 4"
     /* 0x02B8 */ TwoHeadGfxArena polyOpa; // "Zelda 0"
     /* 0x02C8 */ TwoHeadGfxArena polyXlu; // "Zelda 1"
+    /* 0x0XXX */ TwoHeadGfxArena titlecard; // When in Paris...
     /* 0x0XXX */ TwoHeadGfxArena polyKal; // When in Rome...
     /* 0x02D8 */ u32 gfxPoolIdx;
     /* 0x02DC */ u16* curFrameBuffer;
diff --git a/soh/src/code/graph.c b/soh/src/code/graph.c
index 34283f342..3a1719731 100644
--- a/soh/src/code/graph.c
+++ b/soh/src/code/graph.c
@@ -95,12 +95,14 @@ void Graph_InitTHGA(GraphicsContext* gfxCtx) {
     pool->tailMagic = GFXPOOL_TAIL_MAGIC;
     THGA_Ct(&gfxCtx->polyOpa, pool->polyOpaBuffer, sizeof(pool->polyOpaBuffer));
     THGA_Ct(&gfxCtx->polyXlu, pool->polyXluBuffer, sizeof(pool->polyXluBuffer));
+    THGA_Ct(&gfxCtx->titlecard, pool->titlecardBuffer, sizeof(pool->titlecardBuffer));
     THGA_Ct(&gfxCtx->polyKal, pool->polyKalBuffer, sizeof(pool->polyKalBuffer));
     THGA_Ct(&gfxCtx->overlay, pool->overlayBuffer, sizeof(pool->overlayBuffer));
     THGA_Ct(&gfxCtx->work, pool->workBuffer, sizeof(pool->workBuffer));
 
     gfxCtx->polyOpaBuffer = pool->polyOpaBuffer;
     gfxCtx->polyXluBuffer = pool->polyXluBuffer;
+    gfxCtx->titlecardBuffer = pool->titlecardBuffer;
     gfxCtx->polyKalBuffer = pool->polyKalBuffer;
     gfxCtx->overlayBuffer = pool->overlayBuffer;
     gfxCtx->workBuffer = pool->workBuffer;
@@ -274,6 +276,7 @@ void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState) {
     gDPNoOpString(WORK_DISP++, "WORK_DISP 開始", 0);
     gDPNoOpString(POLY_OPA_DISP++, "POLY_OPA_DISP 開始", 0);
     gDPNoOpString(POLY_XLU_DISP++, "POLY_XLU_DISP 開始", 0);
+    gDPNoOpString(TITLE_CARD_DISP++, "TITLE_CARD_DISP 開始", 0);//unsure if needed
     gDPNoOpString(OVERLAY_DISP++, "OVERLAY_DISP 開始", 0);
 
     CLOSE_DISPS(gfxCtx, "../graph.c", 975);
@@ -286,6 +289,7 @@ void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState) {
     gDPNoOpString(WORK_DISP++, "WORK_DISP 終了", 0);
     gDPNoOpString(POLY_OPA_DISP++, "POLY_OPA_DISP 終了", 0);
     gDPNoOpString(POLY_XLU_DISP++, "POLY_XLU_DISP 終了", 0);
+    gDPNoOpString(TITLE_CARD_DISP++, "TITLE_CARD_DISP 終了", 0);
     gDPNoOpString(OVERLAY_DISP++, "OVERLAY_DISP 終了", 0);
 
     CLOSE_DISPS(gfxCtx, "../graph.c", 996);
@@ -294,6 +298,7 @@ void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState) {
 
     gSPBranchList(WORK_DISP++, gfxCtx->polyOpaBuffer);
     gSPBranchList(POLY_OPA_DISP++, gfxCtx->polyXluBuffer);
+    gSPBranchList(POLY_XLU_DISP++, gfxCtx->titlecardBuffer);
     gSPBranchList(POLY_XLU_DISP++, gfxCtx->polyKalBuffer);
     gSPBranchList(POLY_KAL_DISP++, gfxCtx->overlayBuffer);
     gDPPipeSync(OVERLAY_DISP++);
diff --git a/soh/src/code/z_actor.c b/soh/src/code/z_actor.c
index fee697055..eee9d8882 100644
--- a/soh/src/code/z_actor.c
+++ b/soh/src/code/z_actor.c
@@ -992,29 +992,30 @@ void TitleCard_Draw(GlobalContext* globalCtx, TitleCardContext* titleCtx) {
         height = (width * height > 0x1000) ? 0x1000 / width : height;
         titleSecondY = titleY + (height * 4);
 
-        OVERLAY_DISP = func_80093808(OVERLAY_DISP);
+        //TITLE_CARD_DISP Goes over POLY_XLU_DISP but under POLY_KAL_DISP
+        TITLE_CARD_DISP = func_80093808(TITLE_CARD_DISP);
 
-        gDPSetPrimColor(OVERLAY_DISP++, 0, 0, (u8)titleCtx->intensity, (u8)titleCtx->intensity, (u8)titleCtx->intensity,
+        gDPSetPrimColor(TITLE_CARD_DISP++, 0, 0, (u8)titleCtx->intensity, (u8)titleCtx->intensity, (u8)titleCtx->intensity,
                         (u8)titleCtx->alpha);
 
-        gDPLoadTextureBlock(OVERLAY_DISP++, (uintptr_t)titleCtx->texture + textureLanguageOffset, G_IM_FMT_IA,
+        gDPLoadTextureBlock(TITLE_CARD_DISP++, (uintptr_t)titleCtx->texture + textureLanguageOffset, G_IM_FMT_IA,
                             G_IM_SIZ_8b,
                             width, height, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
                             G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
 
-        gSPTextureRectangle(OVERLAY_DISP++, titleX, titleY, ((doubleWidth * 2) + titleX) - 4, titleY + (height * 4) - 1,
+        gSPTextureRectangle(TITLE_CARD_DISP++, titleX, titleY, ((doubleWidth * 2) + titleX) - 4, titleY + (height * 4) - 1,
                             G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10);
 
         height = titleCtx->height - height;
 
         // If texture is bigger than 0x1000, display the rest
         if (height > 0) {
-            gDPLoadTextureBlock(OVERLAY_DISP++, (uintptr_t)titleCtx->texture + textureLanguageOffset + 0x1000,
+            gDPLoadTextureBlock(TITLE_CARD_DISP++, (uintptr_t)titleCtx->texture + textureLanguageOffset + 0x1000,
                                 G_IM_FMT_IA,
                                 G_IM_SIZ_8b, width, height, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP,
                                 G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
 
-            gSPTextureRectangle(OVERLAY_DISP++, titleX, titleSecondY, ((doubleWidth * 2) + titleX) - 4,
+            gSPTextureRectangle(TITLE_CARD_DISP++, titleX, titleSecondY, ((doubleWidth * 2) + titleX) - 4,
                                 titleSecondY + (height * 4) - 1, G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10);
         }
 

From 7d26b322f580e29855dba20a71670cbcfbfd423f Mon Sep 17 00:00:00 2001
From: Baoulettes <perlouzerie@hotmail.fr>
Date: Sun, 24 Apr 2022 16:51:54 +0200
Subject: [PATCH 03/26] Fix minimap update in dungeon (#171)

Thanks to Rozelette for this method !
---
 soh/src/code/z_map_exp.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/soh/src/code/z_map_exp.c b/soh/src/code/z_map_exp.c
index 734209770..cfef800c9 100644
--- a/soh/src/code/z_map_exp.c
+++ b/soh/src/code/z_map_exp.c
@@ -664,6 +664,7 @@ void Minimap_Draw(GlobalContext* globalCtx) {
                     if (CHECK_DUNGEON_ITEM(DUNGEON_MAP, mapIndex)) {
                         gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 100, 255, 255, interfaceCtx->minimapAlpha);
 
+                        gSPInvalidateTexCache(OVERLAY_DISP++, interfaceCtx->mapSegment);
                         gDPLoadTextureBlock_4b(OVERLAY_DISP++, interfaceCtx->mapSegment, G_IM_FMT_I, 96, 85, 0,
                                                G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
                                                G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);

From 73ede53447c842c1c48d82a6636d9288490dbf71 Mon Sep 17 00:00:00 2001
From: sholdee <102821812+sholdee@users.noreply.github.com>
Date: Sun, 24 Apr 2022 09:58:29 -0500
Subject: [PATCH 04/26] Fix build dates (#194)

* Delete build.c

* Update build.c

* Update soh.vcxproj
---
 soh/build.c          | 8 --------
 soh/soh.vcxproj      | 5 +----
 soh/src/boot/build.c | 4 ----
 3 files changed, 1 insertion(+), 16 deletions(-)
 delete mode 100644 soh/build.c

diff --git a/soh/build.c b/soh/build.c
deleted file mode 100644
index f3f9bdae6..000000000
--- a/soh/build.c
+++ /dev/null
@@ -1,8 +0,0 @@
-const char gBuildVersion[] = "DECKARD ALFA (1.0.0)";
-const char gBuildTeam[] = "github.com/harbourmasters";
-#ifdef __TIMESTAMP__
-const char gBuildDate[] = __TIMESTAMP__;
-#else
-const char gBuildDate[] = __DATE__ " " __TIME__;
-#endif
-const char gBuildMakeOption[] = "";
diff --git a/soh/soh.vcxproj b/soh/soh.vcxproj
index adf205f14..d35dd18b3 100644
--- a/soh/soh.vcxproj
+++ b/soh/soh.vcxproj
@@ -112,9 +112,6 @@
       <GenerateMapFile>true</GenerateMapFile>
       <MapExports>true</MapExports>
     </Link>
-    <PreBuildEvent>
-      <Command>copy /b $(ProjectDir)src\boot\build.c +,,</Command>
-    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -1407,4 +1404,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/soh/src/boot/build.c b/soh/src/boot/build.c
index f3f9bdae6..f60380467 100644
--- a/soh/src/boot/build.c
+++ b/soh/src/boot/build.c
@@ -1,8 +1,4 @@
 const char gBuildVersion[] = "DECKARD ALFA (1.0.0)";
 const char gBuildTeam[] = "github.com/harbourmasters";
-#ifdef __TIMESTAMP__
-const char gBuildDate[] = __TIMESTAMP__;
-#else
 const char gBuildDate[] = __DATE__ " " __TIME__;
-#endif
 const char gBuildMakeOption[] = "";

From 5a40f394944a69c1fa16d993eee3a2ae8752cd04 Mon Sep 17 00:00:00 2001
From: Ada <60364512+GreatArgorath@users.noreply.github.com>
Date: Sun, 24 Apr 2022 15:59:41 +0100
Subject: [PATCH 05/26] Adds checkbox for visual stone of agony (#200)

---
 libultraship/libultraship/SohImGuiImpl.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libultraship/libultraship/SohImGuiImpl.cpp b/libultraship/libultraship/SohImGuiImpl.cpp
index 72a44162e..3556177d7 100644
--- a/libultraship/libultraship/SohImGuiImpl.cpp
+++ b/libultraship/libultraship/SohImGuiImpl.cpp
@@ -416,6 +416,11 @@ namespace SohImGui {
                     needs_save = true;
                 }
 
+                if (ImGui::Checkbox("Visual Stone of Agony", &Game::Settings.enhancements.visualagony)) {
+                    CVar_SetS32("gVisualAgony", Game::Settings.enhancements.visualagony);
+                    needs_save = true;
+                }
+
                 ImGui::Text("Graphics");
                 ImGui::Separator();
 

From eb97186f73187089d6b5134f639b5942b2295cbd Mon Sep 17 00:00:00 2001
From: MegaMech <MegaMech@users.noreply.github.com>
Date: Sun, 24 Apr 2022 09:00:14 -0600
Subject: [PATCH 06/26] readme build instructions split (#201)

* Create BUILDING.md

* Update README.md

* Update README.md

* Update README.md
---
 BUILDING.md | 22 ++++++++++++++++++++++
 README.md   | 20 +-------------------
 2 files changed, 23 insertions(+), 19 deletions(-)
 create mode 100644 BUILDING.md

diff --git a/BUILDING.md b/BUILDING.md
new file mode 100644
index 000000000..82c26bff4
--- /dev/null
+++ b/BUILDING.md
@@ -0,0 +1,22 @@
+# Building Ship of Harkinian
+
+ 1. Install [Python](https://www.python.org/ftp/python/3.10.2/python-3.10.2-amd64.exe)
+ 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++`.
+ 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`.
+ 7. Switch the solution to `Release x64`.
+ 8. Build the solution. 
+ 9. Launching `OTRExporter/extract_assets.py` will generate an `oot.otr` archive file in `OTRExporter/oot.otr`.
+ 10. Run `soh/soh.sln`
+ 11. Switch the solution to `Release x86`.
+ 12. Build the solution.
+ 13. Copy the `OTRExporter/oot.otr` archive file to `soh/Release`.
+ 14. Launch `soh.exe`.
+
+## Compatible Roms
+```
+OOT_PAL_GC      checksum 0x09465AC3
+OOT_PAL_GC_DBG1 checksum 0x871E1C92 (debug non-master quest)
+```
diff --git a/README.md b/README.md
index e9e7b9070..65a6b90e0 100644
--- a/README.md
+++ b/README.md
@@ -51,26 +51,8 @@ Official Discord: https://discord.com/invite/BtBmd55HVH
 
 ## Building The Ship of Harkinian
 
- 1. Install [Python](https://www.python.org/ftp/python/3.10.2/python-3.10.2-amd64.exe)
- 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++`.
- 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`.
- 7. Switch the solution to `Release x64`.
- 8. Build the solution. 
- 9. Launching `OTRExporter/extract_assets.py` will generate an `oot.otr` archive file in `OTRExporter/oot.otr`.
- 10. Run `soh/soh.sln`
- 11. Switch the solution to `Release x86`.
- 12. Build the solution.
- 13. Copy the `OTRExporter/oot.otr` archive file to `soh/Release`.
- 14. Launch `soh.exe`.
+Refer to the [building instructions](https://github.com/HarbourMasters/Shipwright/BUILDING.md) to compile SoH.
 
-## Compatible Roms
-```
-OOT_PAL_GC      checksum 0x09465AC3
-OOT_PAL_GC_DBG1 checksum 0x871E1C92 (debug non-master quest)
-```
 ## Troubleshooting The Exporter
 - 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

From 17858fb67c6aee7813e3e4310785803815b9ff08 Mon Sep 17 00:00:00 2001
From: Baoulettes <perlouzerie@hotmail.fr>
Date: Sun, 24 Apr 2022 17:00:46 +0200
Subject: [PATCH 07/26] Fix languages Zone name on Kaleido (#203)

This fix town/village and zone on maps in Kaleido menu.
---
 .../misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c       | 10 ++--------
 1 file changed, 2 insertions(+), 8 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 9db5399a4..3c023105f 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
@@ -3177,15 +3177,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) {
-                    DmaMgr_SendRequest1(pauseCtx->nameSegment + 0x400,
-                                        (uintptr_t)_map_name_staticSegmentRomStart +
-                                            (((void)0, gSaveContext.worldMapArea) * 0xA00) + 0x16C00,
-                                        0xA00, "../z_kaleido_scope_PAL.c", 3780);
+                    memcpy(pauseCtx->nameSegment + 0x400, ResourceMgr_LoadTexByName(mapNameTextures[59 + gSaveContext.worldMapArea]), 0xA00);
                 } else {
-                    DmaMgr_SendRequest1(pauseCtx->nameSegment + 0x400,
-                                        (uintptr_t)_map_name_staticSegmentRomStart +
-                                            (((void)0, gSaveContext.worldMapArea) * 0xA00) + 0x24800,
-                                        0xA00, "../z_kaleido_scope_PAL.c", 3784);
+                    memcpy(pauseCtx->nameSegment + 0x400, ResourceMgr_LoadTexByName(mapNameTextures[81 + gSaveContext.worldMapArea]), 0xA00);
                 }
             }
             // OTRTODO - player on pause

From bb3227a7c20c0a6ddbac285a4047ccab3e29b1ea Mon Sep 17 00:00:00 2001
From: Ada <60364512+GreatArgorath@users.noreply.github.com>
Date: Sun, 24 Apr 2022 16:02:15 +0100
Subject: [PATCH 08/26] Fixes default text speed (#207)

* Fixes text speed

* Adds text speed default to ConfigFile.cpp

+ removes workaround
---
 libultraship/libultraship/ConfigFile.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libultraship/libultraship/ConfigFile.cpp b/libultraship/libultraship/ConfigFile.cpp
index 1b4952139..2e9a8cc94 100644
--- a/libultraship/libultraship/ConfigFile.cpp
+++ b/libultraship/libultraship/ConfigFile.cpp
@@ -2,6 +2,7 @@
 #include "spdlog/spdlog.h"
 #include "GlobalCtx2.h"
 #include "Window.h"
+#include "GameSettings.h"
 
 namespace Ship {
 	ConfigFile::ConfigFile(std::shared_ptr<GlobalCtx2> Context, const std::string& Path) : Context(Context), Path(Path), File(Path.c_str()) {
@@ -149,6 +150,8 @@ namespace Ship {
 		(*this)["KEYBOARD CONTROLLER BINDING 4"][STR(BTN_STICKDOWN)] = std::to_string(0x01F);
 		(*this)["KEYBOARD CONTROLLER BINDING 4"][STR(BTN_STICKUP)] = std::to_string(0x011);
 
+		(*this)["ENHANCEMENT SETTINGS"]["TEXT_SPEED"] = "1";
+
 		(*this)["SDL CONTROLLER 1"]["GUID"] = "";
 		(*this)["SDL CONTROLLER 2"]["GUID"] = "";
 		(*this)["SDL CONTROLLER 3"]["GUID"] = "";

From 576842ac74f2e18c2ad75d345be68ea446ad2d2f Mon Sep 17 00:00:00 2001
From: Ada <60364512+GreatArgorath@users.noreply.github.com>
Date: Sun, 24 Apr 2022 16:03:25 +0100
Subject: [PATCH 09/26] Makes text speed slider consistent with the rest of the
 UI (#208)

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

diff --git a/libultraship/libultraship/SohImGuiImpl.cpp b/libultraship/libultraship/SohImGuiImpl.cpp
index 3556177d7..7af532a09 100644
--- a/libultraship/libultraship/SohImGuiImpl.cpp
+++ b/libultraship/libultraship/SohImGuiImpl.cpp
@@ -395,8 +395,8 @@ namespace SohImGui {
                 ImGui::Text("Gameplay");
                 ImGui::Separator();
 
-                ImGui::Text("Text Speed", Game::Settings.enhancements.text_speed);
-                if (ImGui::SliderInt("##TEXTSPEED", &Game::Settings.enhancements.text_speed, 1, 5)) {
+                ImGui::Text("Text Speed: %dx", Game::Settings.enhancements.text_speed);
+                if (ImGui::SliderInt("##TEXTSPEED", &Game::Settings.enhancements.text_speed, 1, 5, "")) {
                     CVar_SetS32("gTextSpeed", Game::Settings.enhancements.text_speed);
                     needs_save = true;
                 }

From ffa4a111484cd95cb20985e8f378e59af30eb5dc Mon Sep 17 00:00:00 2001
From: Ada <60364512+GreatArgorath@users.noreply.github.com>
Date: Sun, 24 Apr 2022 16:04:06 +0100
Subject: [PATCH 10/26] Fixes visual bug in shops when above 2x text speed
 (#211)

---
 soh/src/code/z_message_PAL.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/soh/src/code/z_message_PAL.c b/soh/src/code/z_message_PAL.c
index a767ede79..4780044a6 100644
--- a/soh/src/code/z_message_PAL.c
+++ b/soh/src/code/z_message_PAL.c
@@ -1144,7 +1144,7 @@ void Message_DrawText(GlobalContext* globalCtx, Gfx** gfxP) {
         }
     }
     if (msgCtx->textDelayTimer == 0) {
-        msgCtx->textDrawPos = i + CVar_GetS32("gTextSpeed", 1);
+        msgCtx->textDrawPos = i + 1;
         msgCtx->textDelayTimer = msgCtx->textDelay;
     } else {
         msgCtx->textDelayTimer--;

From 1f3a6b928f4025c12d3ec72263bb6a6bb39c45af Mon Sep 17 00:00:00 2001
From: KiritoDev <36680385+KiritoDv@users.noreply.github.com>
Date: Mon, 25 Apr 2022 15:19:00 -0500
Subject: [PATCH 11/26] Moved grayscale effect to the gpu and replaced some
 texture loads (#221)

---
 .../Lib/Fast3D/U64/PR/ultra64/gbi.h           | 17 +++++-
 .../libultraship/Lib/Fast3D/gfx_cc.cpp        |  1 +
 libultraship/libultraship/Lib/Fast3D/gfx_cc.h | 10 ++--
 .../Lib/Fast3D/gfx_direct3d11.cpp             |  9 ++-
 .../Lib/Fast3D/gfx_direct3d_common.cpp        | 15 +++++
 .../libultraship/Lib/Fast3D/gfx_opengl.cpp    | 24 ++++++++
 .../libultraship/Lib/Fast3D/gfx_pc.cpp        | 55 ++++++++++---------
 soh/include/variables.h                       |  1 +
 soh/src/code/z_fbdemo_circle.c                |  2 -
 .../overlays/actors/ovl_En_Part/z_en_part.c   | 12 ++--
 .../ovl_file_choose/z_file_choose.c           |  9 +--
 .../overlays/gamestates/ovl_title/z_title.c   |  2 +-
 .../ovl_kaleido_scope/z_kaleido_equipment.c   | 11 +++-
 .../misc/ovl_kaleido_scope/z_kaleido_item.c   |  9 ++-
 .../ovl_kaleido_scope/z_kaleido_scope_PAL.c   |  8 ---
 15 files changed, 126 insertions(+), 59 deletions(-)

diff --git a/libultraship/libultraship/Lib/Fast3D/U64/PR/ultra64/gbi.h b/libultraship/libultraship/Lib/Fast3D/U64/PR/ultra64/gbi.h
index 83cc9a55c..3b4b8f7d8 100644
--- a/libultraship/libultraship/Lib/Fast3D/U64/PR/ultra64/gbi.h
+++ b/libultraship/libultraship/Lib/Fast3D/U64/PR/ultra64/gbi.h
@@ -170,6 +170,12 @@
 #define G_TEXRECT_WIDE          0x37
 #define G_FILLWIDERECT          0x38
 
+/* GFX Effects */
+
+// RDP Cmd
+#define G_SETGRAYSCALE       0x39
+#define G_SETINTENSITY       0x40
+
 /*
  * The following commands are the "generated" RDP commands; the user
  * never sees them, the RSP microcode generates them.
@@ -2821,6 +2827,14 @@ _DW({                                   \
     _g->words.w1 = 0;                       \
 }
 
+#define gsSPGrayscale(pkt, state)                   \
+{                                                   \
+    Gfx *_g = (Gfx *)(pkt);                         \
+                                                    \
+    _g->words.w0 = _SHIFTL(G_SETGRAYSCALE, 24, 8);  \
+    _g->words.w1 = state;                           \
+}
+
 #ifdef  F3DEX_GBI_2
     /*
      *  One gSPGeometryMode(pkt,c,s) GBI is equal to these two GBIs.
@@ -3161,6 +3175,8 @@ _DW({                                   \
              (_SHIFTL(r, 24, 8) | _SHIFTL(g, 16, 8) |   \
               _SHIFTL(b, 8, 8) | _SHIFTL(a, 0, 8)))
 
+#define gsDPSetGrayscaleColor(pkt, r, g, b)              \
+            DPRGBColor(pkt, G_SETINTENSITY, r, g, b, 255)
 #define gDPSetEnvColor(pkt, r, g, b, a)                 \
             DPRGBColor(pkt, G_SETENVCOLOR, r,g,b,a)
 #define gsDPSetEnvColor(r, g, b, a)                 \
@@ -3177,7 +3193,6 @@ _DW({                                   \
             gDPSetColor(pkt, G_SETFILLCOLOR, (d))
 #define gsDPSetFillColor(d)                     \
             gsDPSetColor(G_SETFILLCOLOR, (d))
-
 #define gDPSetPrimDepth(pkt, z, dz)                 \
         gDPSetColor(pkt, G_SETPRIMDEPTH,            \
                 _SHIFTL(z, 16, 16) | _SHIFTL(dz, 0, 16))
diff --git a/libultraship/libultraship/Lib/Fast3D/gfx_cc.cpp b/libultraship/libultraship/Lib/Fast3D/gfx_cc.cpp
index 25ae8b324..c92a05b8b 100644
--- a/libultraship/libultraship/Lib/Fast3D/gfx_cc.cpp
+++ b/libultraship/libultraship/Lib/Fast3D/gfx_cc.cpp
@@ -16,6 +16,7 @@ void gfx_cc_get_features(uint64_t shader_id0, uint32_t shader_id1, struct CCFeat
     cc_features->opt_2cyc = (shader_id1 & SHADER_OPT_2CYC) != 0;
     cc_features->opt_alpha_threshold = (shader_id1 & SHADER_OPT_ALPHA_THRESHOLD) != 0;
     cc_features->opt_invisible = (shader_id1 & SHADER_OPT_INVISIBLE) != 0;
+    cc_features->opt_grayscale = (shader_id1 & SHADER_OPT_GRAYSCALE) != 0;
 
     cc_features->clamp[0][0] = (shader_id1 & SHADER_OPT_TEXEL0_CLAMP_S);
     cc_features->clamp[0][1] = (shader_id1 & SHADER_OPT_TEXEL0_CLAMP_T);
diff --git a/libultraship/libultraship/Lib/Fast3D/gfx_cc.h b/libultraship/libultraship/Lib/Fast3D/gfx_cc.h
index 7bf415f84..f0a9f2eca 100644
--- a/libultraship/libultraship/Lib/Fast3D/gfx_cc.h
+++ b/libultraship/libultraship/Lib/Fast3D/gfx_cc.h
@@ -39,10 +39,11 @@ enum {
 #define SHADER_OPT_2CYC (1 << 4)
 #define SHADER_OPT_ALPHA_THRESHOLD (1 << 5)
 #define SHADER_OPT_INVISIBLE (1 << 6)
-#define SHADER_OPT_TEXEL0_CLAMP_S (1 << 7)
-#define SHADER_OPT_TEXEL0_CLAMP_T (1 << 8)
-#define SHADER_OPT_TEXEL1_CLAMP_S (1 << 9)
-#define SHADER_OPT_TEXEL1_CLAMP_T (1 << 10)
+#define SHADER_OPT_GRAYSCALE (1 << 7)
+#define SHADER_OPT_TEXEL0_CLAMP_S (1 << 8)
+#define SHADER_OPT_TEXEL0_CLAMP_T (1 << 9)
+#define SHADER_OPT_TEXEL1_CLAMP_S (1 << 10)
+#define SHADER_OPT_TEXEL1_CLAMP_T (1 << 11)
 #define CC_SHADER_OPT_POS 56
 
 struct CCFeatures {
@@ -54,6 +55,7 @@ struct CCFeatures {
     bool opt_2cyc;
     bool opt_alpha_threshold;
     bool opt_invisible;
+    bool opt_grayscale;
     bool used_textures[2];
     bool clamp[2][2];
     int num_inputs;
diff --git a/libultraship/libultraship/Lib/Fast3D/gfx_direct3d11.cpp b/libultraship/libultraship/Lib/Fast3D/gfx_direct3d11.cpp
index 04d777e7e..cea82e09e 100644
--- a/libultraship/libultraship/Lib/Fast3D/gfx_direct3d11.cpp
+++ b/libultraship/libultraship/Lib/Fast3D/gfx_direct3d11.cpp
@@ -88,13 +88,13 @@ struct ShaderProgramD3D11 {
 static struct {
     HMODULE d3d11_module;
     PFN_D3D11_CREATE_DEVICE D3D11CreateDevice;
-    
+
     HMODULE d3dcompiler_module;
     pD3DCompile D3DCompile;
-    
+
     D3D_FEATURE_LEVEL feature_level;
     uint32_t msaa_num_quality_levels[D3D11_MAX_MULTISAMPLE_SAMPLE_COUNT];
-    
+
     ComPtr<ID3D11Device> device;
     ComPtr<IDXGISwapChain1> swap_chain;
     ComPtr<ID3D11DeviceContext> context;
@@ -448,6 +448,9 @@ static struct ShaderProgram *gfx_d3d11_create_and_load_new_shader(uint64_t shade
     if (cc_features.opt_fog) {
         ied[ied_index++] = { "FOG", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, D3D11_APPEND_ALIGNED_ELEMENT, D3D11_INPUT_PER_VERTEX_DATA, 0 };
     }
+    if (cc_features.opt_grayscale) {
+        ied[ied_index++] = { "GRAYSCALE", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, D3D11_APPEND_ALIGNED_ELEMENT, D3D11_INPUT_PER_VERTEX_DATA, 0 };
+    }
     for (unsigned int i = 0; i < cc_features.num_inputs; i++) {
         DXGI_FORMAT format = cc_features.opt_alpha ? DXGI_FORMAT_R32G32B32A32_FLOAT : DXGI_FORMAT_R32G32B32_FLOAT;
         ied[ied_index++] = { "INPUT", i, format, 0, D3D11_APPEND_ALIGNED_ELEMENT, D3D11_INPUT_PER_VERTEX_DATA, 0 };
diff --git a/libultraship/libultraship/Lib/Fast3D/gfx_direct3d_common.cpp b/libultraship/libultraship/Lib/Fast3D/gfx_direct3d_common.cpp
index f778812d1..8df273be7 100644
--- a/libultraship/libultraship/Lib/Fast3D/gfx_direct3d_common.cpp
+++ b/libultraship/libultraship/Lib/Fast3D/gfx_direct3d_common.cpp
@@ -138,6 +138,10 @@ void gfx_direct3d_common_build_shader(char buf[4096], size_t& len, size_t& num_f
         append_line(buf, &len, "    float4 fog : FOG;");
         num_floats += 4;
     }
+    if (cc_features.opt_grayscale) {
+        append_line(buf, &len, "    float4 grayscale : GRAYSCALE;");
+        num_floats += 4;
+    }
     for (int i = 0; i < cc_features.num_inputs; i++) {
         len += sprintf(buf + len, "    float%d input%d : INPUT%d;\r\n", cc_features.opt_alpha ? 4 : 3, i + 1, i);
         num_floats += cc_features.opt_alpha ? 4 : 3;
@@ -208,6 +212,9 @@ void gfx_direct3d_common_build_shader(char buf[4096], size_t& len, size_t& num_f
     if (cc_features.opt_fog) {
         append_str(buf, &len, ", float4 fog : FOG");
     }
+    if (cc_features.opt_grayscale) {
+        append_str(buf, &len, ", float4 grayscale : GRAYSCALE");
+    }
     for (int i = 0; i < cc_features.num_inputs; i++) {
         len += sprintf(buf + len, ", float%d input%d : INPUT%d", cc_features.opt_alpha ? 4 : 3, i + 1, i);
     }
@@ -228,6 +235,9 @@ void gfx_direct3d_common_build_shader(char buf[4096], size_t& len, size_t& num_f
     if (cc_features.opt_fog) {
         append_line(buf, &len, "    result.fog = fog;");
     }
+    if (cc_features.opt_grayscale) {
+        append_line(buf, &len, "    result.grayscale = grayscale;");
+    }
     for (int i = 0; i < cc_features.num_inputs; i++) {
         len += sprintf(buf + len, "    result.input%d = input%d;\r\n", i + 1, i + 1);
     }
@@ -298,6 +308,11 @@ void gfx_direct3d_common_build_shader(char buf[4096], size_t& len, size_t& num_f
         }
     }
 
+    if (cc_features.opt_grayscale) {
+        append_line(buf, &len, "float intensity = (texel.r + texel.g + texel.b) / 3.0;");
+        append_line(buf, &len, "texel.rgb = input.grayscale.rgb * intensity;");
+    }
+
     if (cc_features.opt_alpha && cc_features.opt_noise) {
         append_line(buf, &len, "    float2 coords = screenSpace.xy * noise_scale;");
         append_line(buf, &len, "    texel.a *= round(saturate(random(float3(floor(coords), noise_frame)) + texel.a - 0.5));");
diff --git a/libultraship/libultraship/Lib/Fast3D/gfx_opengl.cpp b/libultraship/libultraship/Lib/Fast3D/gfx_opengl.cpp
index e19e9538c..808b0a558 100644
--- a/libultraship/libultraship/Lib/Fast3D/gfx_opengl.cpp
+++ b/libultraship/libultraship/Lib/Fast3D/gfx_opengl.cpp
@@ -238,6 +238,13 @@ static struct ShaderProgram* gfx_opengl_create_and_load_new_shader(uint64_t shad
         append_line(vs_buf, &vs_len, "varying vec4 vFog;");
         num_floats += 4;
     }
+
+    if (cc_features.opt_grayscale) {
+        append_line(vs_buf, &vs_len, "attribute vec4 aGrayscaleColor;");
+        append_line(vs_buf, &vs_len, "varying vec4 vGrayscaleColor;");
+        num_floats += 4;
+    }
+
     for (int i = 0; i < cc_features.num_inputs; i++) {
         vs_len += sprintf(vs_buf + vs_len, "attribute vec%d aInput%d;\n", cc_features.opt_alpha ? 4 : 3, i + 1);
         vs_len += sprintf(vs_buf + vs_len, "varying vec%d vInput%d;\n", cc_features.opt_alpha ? 4 : 3, i + 1);
@@ -257,6 +264,9 @@ static struct ShaderProgram* gfx_opengl_create_and_load_new_shader(uint64_t shad
     if (cc_features.opt_fog) {
         append_line(vs_buf, &vs_len, "vFog = aFog;");
     }
+    if (cc_features.opt_grayscale) {
+        append_line(vs_buf, &vs_len, "vGrayscaleColor = aGrayscaleColor;");
+    }
     for (int i = 0; i < cc_features.num_inputs; i++) {
         vs_len += sprintf(vs_buf + vs_len, "vInput%d = aInput%d;\n", i + 1, i + 1);
     }
@@ -279,6 +289,9 @@ static struct ShaderProgram* gfx_opengl_create_and_load_new_shader(uint64_t shad
     if (cc_features.opt_fog) {
         append_line(fs_buf, &fs_len, "varying vec4 vFog;");
     }
+    if (cc_features.opt_grayscale) {
+        append_line(fs_buf, &fs_len, "varying vec4 vGrayscaleColor;");
+    }
     for (int i = 0; i < cc_features.num_inputs; i++) {
         fs_len += sprintf(fs_buf + fs_len, "varying vec%d vInput%d;\n", cc_features.opt_alpha ? 4 : 3, i + 1);
     }
@@ -355,6 +368,11 @@ static struct ShaderProgram* gfx_opengl_create_and_load_new_shader(uint64_t shad
         append_line(fs_buf, &fs_len, "texel.a *= floor(clamp(random(vec3(floor(gl_FragCoord.xy * noise_scale), float(frame_count))) + texel.a, 0.0, 1.0));");
     }
 
+    if (cc_features.opt_grayscale) {
+        append_line(fs_buf, &fs_len, "float intensity = (texel.r + texel.g + texel.b) / 3.0;");
+        append_line(fs_buf, &fs_len, "texel.rgb = vGrayscaleColor.rgb * intensity;");
+    }
+
     if (cc_features.opt_alpha) {
         if (cc_features.opt_alpha_threshold) {
             append_line(fs_buf, &fs_len, "if (texel.a < 8.0 / 256.0) discard;");
@@ -446,6 +464,12 @@ static struct ShaderProgram* gfx_opengl_create_and_load_new_shader(uint64_t shad
         ++cnt;
     }
 
+    if (cc_features.opt_grayscale) {
+        prg->attrib_locations[cnt] = glGetAttribLocation(shader_program, "aGrayscaleColor");
+        prg->attrib_sizes[cnt] = 4;
+        ++cnt;
+    }
+
     for (int i = 0; i < cc_features.num_inputs; i++) {
         char name[16];
         sprintf(name, "aInput%d", i + 1);
diff --git a/libultraship/libultraship/Lib/Fast3D/gfx_pc.cpp b/libultraship/libultraship/Lib/Fast3D/gfx_pc.cpp
index 5918ccaf7..130d07b73 100644
--- a/libultraship/libultraship/Lib/Fast3D/gfx_pc.cpp
+++ b/libultraship/libultraship/Lib/Fast3D/gfx_pc.cpp
@@ -155,9 +155,10 @@ static struct RDP {
 
     uint32_t other_mode_l, other_mode_h;
     uint64_t combine_mode;
+    bool     grayscale;
 
     uint8_t prim_lod_fraction;
-    struct RGBA env_color, prim_color, fog_color, fill_color;
+    struct RGBA env_color, prim_color, fog_color, fill_color, grayscale_color;
     struct XYWidthHeight viewport, scissor;
     bool viewport_or_scissor_changed;
     void *z_buf_address;
@@ -825,22 +826,6 @@ static void import_texture(int i, int tile) {
     uint8_t siz = rdp.texture_tile[tile].siz;
     uint32_t tmem_index = rdp.texture_tile[tile].tmem_index;
 
-    // OTRTODO: Move it to a function to be faster 
-    // ModInternal::bindHook(LOOKUP_TEXTURE);
-    // ModInternal::initBindHook(8,
-    //     HOOK_PARAMETER("gfx_api", gfx_get_current_rendering_api()),
-    //     HOOK_PARAMETER("path", rdp.loaded_texture[tmem_index].otr_path),
-    //     HOOK_PARAMETER("node", &rendering_state.textures[i]),
-    //     HOOK_PARAMETER("fmt", &fmt),
-    //     HOOK_PARAMETER("siz", &siz),
-    //     HOOK_PARAMETER("tile", &i),
-    //     HOOK_PARAMETER("palette", &rdp.texture_tile[tile].palette),
-    //     HOOK_PARAMETER("addr", const_cast<uint8_t*>(rdp.loaded_texture[tmem_index].addr))
-    // );
-    //
-    // if (ModInternal::callBindHook(0))
-    //     return;
-
     if (gfx_texture_cache_lookup(i, tile))
     {
         return;
@@ -1220,7 +1205,6 @@ static void gfx_sp_tri1(uint8_t vtx1_idx, uint8_t vtx2_idx, uint8_t vtx3_idx, bo
 
     uint64_t cc_id = rdp.combine_mode;
 
-    //bool use_alpha = (rdp.other_mode_l & (3 << 18)) == G_BL_1MA || (rdp.other_mode_l & (3 << 16)) == G_BL_1MA;
     bool use_alpha = (rdp.other_mode_l & (3 << 20)) == (G_BL_CLR_MEM << 20) && (rdp.other_mode_l & (3 << 16)) == (G_BL_1MA << 16);
     bool use_fog = (rdp.other_mode_l >> 30) == G_BL_CLR_FOG;
     bool texture_edge = (rdp.other_mode_l & CVG_X_ALPHA) == CVG_X_ALPHA;
@@ -1228,6 +1212,7 @@ static void gfx_sp_tri1(uint8_t vtx1_idx, uint8_t vtx2_idx, uint8_t vtx3_idx, bo
     bool use_2cyc = (rdp.other_mode_h & (3U << G_MDSFT_CYCLETYPE)) == G_CYC_2CYCLE;
     bool alpha_threshold = (rdp.other_mode_l & (3U << G_MDSFT_ALPHACOMPARE)) == G_AC_THRESHOLD;
     bool invisible = (rdp.other_mode_l & (3 << 24)) == (G_BL_0 << 24) && (rdp.other_mode_l & (3 << 20)) == (G_BL_CLR_MEM << 20);
+    bool use_grayscale = rdp.grayscale;
 
     if (texture_edge) {
         use_alpha = true;
@@ -1240,12 +1225,13 @@ static void gfx_sp_tri1(uint8_t vtx1_idx, uint8_t vtx2_idx, uint8_t vtx3_idx, bo
     if (use_2cyc) cc_id |= (uint64_t)SHADER_OPT_2CYC << CC_SHADER_OPT_POS;
     if (alpha_threshold) cc_id |= (uint64_t)SHADER_OPT_ALPHA_THRESHOLD << CC_SHADER_OPT_POS;
     if (invisible) cc_id |= (uint64_t)SHADER_OPT_INVISIBLE << CC_SHADER_OPT_POS;
+    if (use_grayscale) cc_id |= (uint64_t)SHADER_OPT_GRAYSCALE << CC_SHADER_OPT_POS;
 
     if (!use_alpha) {
         cc_id &= ~((0xfff << 16) | ((uint64_t)0xfff << 44));
     }
 
-    struct ColorCombiner* comb = gfx_lookup_or_create_color_combiner(cc_id);
+    ColorCombiner* comb = gfx_lookup_or_create_color_combiner(cc_id);
 
     uint32_t tm = 0;
     uint32_t tex_width[2], tex_height[2], tex_width2[2], tex_height2[2];
@@ -1407,6 +1393,13 @@ static void gfx_sp_tri1(uint8_t vtx1_idx, uint8_t vtx2_idx, uint8_t vtx3_idx, bo
             buf_vbo[buf_vbo_len++] = v_arr[i]->color.a / 255.0f; // fog factor (not alpha)
         }
 
+        if (use_grayscale) {
+            buf_vbo[buf_vbo_len++] = rdp.grayscale_color.r / 255.0f;
+            buf_vbo[buf_vbo_len++] = rdp.grayscale_color.g / 255.0f;
+            buf_vbo[buf_vbo_len++] = rdp.grayscale_color.b / 255.0f;
+            buf_vbo[buf_vbo_len++] = rdp.grayscale_color.a / 255.0f; // Unused
+        }
+
         for (int j = 0; j < num_inputs; j++) {
             struct RGBA* color = 0;
             struct RGBA tmp;
@@ -1807,6 +1800,13 @@ static inline uint32_t alpha_comb(uint32_t a, uint32_t b, uint32_t c, uint32_t d
     return (a & 7) | ((b & 7) << 3) | ((c & 7) << 6) | ((d & 7) << 9);
 }
 
+static void gfx_dp_set_grayscale_color(uint8_t r, uint8_t g, uint8_t b, uint8_t a) {
+    rdp.grayscale_color.r = r;
+    rdp.grayscale_color.g = g;
+    rdp.grayscale_color.b = b;
+    rdp.grayscale_color.a = a;
+}
+
 static void gfx_dp_set_env_color(uint8_t r, uint8_t g, uint8_t b, uint8_t a) {
     rdp.env_color.r = r;
     rdp.env_color.g = g;
@@ -2411,8 +2411,6 @@ static void gfx_run_dl(Gfx* cmd) {
                 cmd++;
                 uint64_t hash = ((uint64_t)cmd->words.w0 << 32) + (uint64_t)cmd->words.w1;
                 ResourceMgr_GetNameByCRC(hash, fileName);
-
-
 #if _DEBUG && 0
                 char* tex = ResourceMgr_LoadTexByCRC(hash);
                 ResourceMgr_GetNameByCRC(hash, fileName);
@@ -2453,8 +2451,8 @@ static void gfx_run_dl(Gfx* cmd) {
                     gfx_dp_set_texture_image(fmt, size, width, tex, fileName);
 
                 cmd++;
-            }
                 break;
+            }
             case G_SETFB:
             {
                 gfx_flush();
@@ -2462,8 +2460,8 @@ static void gfx_run_dl(Gfx* cmd) {
                 active_fb = framebuffers.find(cmd->words.w1);
                 gfx_rapi->start_draw_to_framebuffer(active_fb->first, (float)active_fb->second.applied_height / active_fb->second.orig_height);
                 gfx_rapi->clear_framebuffer();
-            }
                 break;
+            }
             case G_RESETFB:
             {
                 gfx_flush();
@@ -2471,7 +2469,6 @@ static void gfx_run_dl(Gfx* cmd) {
                 gfx_rapi->start_draw_to_framebuffer(game_renders_to_framebuffer ? game_framebuffer : 0, (float)gfx_current_dimensions.height / SCREEN_HEIGHT);
                 break;
             }
-            break;
             case G_SETTIMG_FB:
             {
                 gfx_flush();
@@ -2481,8 +2478,13 @@ static void gfx_run_dl(Gfx* cmd) {
 
                 //if (texPtr != NULL)
                     //gfx_dp_set_texture_image(C0(21, 3), C0(19, 2), C0(0, 10), texPtr);
+                break;
+            }
+            case G_SETGRAYSCALE:
+            {
+                rdp.grayscale = cmd->words.w1;
+                break;
             }
-            break;
             case G_LOADBLOCK:
                 gfx_dp_load_block(C1(24, 3), C0(12, 12), C0(0, 12), C1(12, 12), C1(0, 12));
                 break;
@@ -2510,6 +2512,9 @@ static void gfx_run_dl(Gfx* cmd) {
             case G_SETFILLCOLOR:
                 gfx_dp_set_fill_color(cmd->words.w1);
                 break;
+            case G_SETINTENSITY:
+                gfx_dp_set_grayscale_color(C1(24, 8), C1(16, 8), C1(8, 8), C1(0, 8));
+                break;
             case G_SETCOMBINE:
                 gfx_dp_set_combine_mode(
                     color_comb(C0(20, 4), C1(28, 4), C0(15, 5), C1(15, 3)),
diff --git a/soh/include/variables.h b/soh/include/variables.h
index b58166b60..64b8c75c7 100644
--- a/soh/include/variables.h
+++ b/soh/include/variables.h
@@ -99,6 +99,7 @@ extern "C"
 	extern u32 gGsFlagsMasks[4];
 	extern u32 gGsFlagsShifts[4];
 	extern void* gItemIcons[0x82];
+	extern u8 gItemAgeReqs[];
 	extern u8 gItemSlots[56];
 	extern void (*gSceneCmdHandlers[26])(GlobalContext*, SceneCmd*);
 	extern s16 gLinkObjectIds[2];
diff --git a/soh/src/code/z_fbdemo_circle.c b/soh/src/code/z_fbdemo_circle.c
index 630f198d1..b19948737 100644
--- a/soh/src/code/z_fbdemo_circle.c
+++ b/soh/src/code/z_fbdemo_circle.c
@@ -56,8 +56,6 @@ void TransitionCircle_Start(void* thisx) {
             break;
     }
 
-    this->texture = ResourceMgr_LoadTexByName(this->texture);
-
     if (this->speed == 0) {
         this->step = 0x14;
     } else {
diff --git a/soh/src/overlays/actors/ovl_En_Part/z_en_part.c b/soh/src/overlays/actors/ovl_En_Part/z_en_part.c
index ec4079887..bdf29aa52 100644
--- a/soh/src/overlays/actors/ovl_En_Part/z_en_part.c
+++ b/soh/src/overlays/actors/ovl_En_Part/z_en_part.c
@@ -298,13 +298,13 @@ void EnPart_Draw(Actor* thisx, GlobalContext* globalCtx) {
         gSPSegment(POLY_OPA_DISP++, 0x09, func_80ACEAC0(globalCtx->state.gfxCtx, 225, 205, 115, 25, 20, 0));
         gSPSegment(POLY_OPA_DISP++, 0x0A, func_80ACEAC0(globalCtx->state.gfxCtx, 225, 205, 115, 25, 20, 0));
     } else if ((thisx->params == 9) && (this->displayList == ResourceMgr_LoadGfxByName(object_tite_DL_002FF0))) {
-        gSPSegment(POLY_OPA_DISP++, 0x08, ResourceMgr_LoadTexByName(SEGMENTED_TO_VIRTUAL(object_tite_Tex_001300)));
-        gSPSegment(POLY_OPA_DISP++, 0x09, ResourceMgr_LoadTexByName(SEGMENTED_TO_VIRTUAL(object_tite_Tex_001700)));
-        gSPSegment(POLY_OPA_DISP++, 0x0A, ResourceMgr_LoadTexByName(SEGMENTED_TO_VIRTUAL(object_tite_Tex_001900)));
+        gSPSegment(POLY_OPA_DISP++, 0x08, object_tite_Tex_001300);
+        gSPSegment(POLY_OPA_DISP++, 0x09, object_tite_Tex_001700);
+        gSPSegment(POLY_OPA_DISP++, 0x0A, object_tite_Tex_001900);
     } else if ((thisx->params == 10) && (this->displayList == ResourceMgr_LoadGfxByName(object_tite_DL_002FF0))) {
-        gSPSegment(POLY_OPA_DISP++, 0x08, ResourceMgr_LoadTexByName(SEGMENTED_TO_VIRTUAL(object_tite_Tex_001B00)));
-        gSPSegment(POLY_OPA_DISP++, 0x09, ResourceMgr_LoadTexByName(SEGMENTED_TO_VIRTUAL(object_tite_Tex_001F00)));
-        gSPSegment(POLY_OPA_DISP++, 0x0A, ResourceMgr_LoadTexByName(SEGMENTED_TO_VIRTUAL(object_tite_Tex_002100)));
+        gSPSegment(POLY_OPA_DISP++, 0x08, object_tite_Tex_001B00);
+        gSPSegment(POLY_OPA_DISP++, 0x09, object_tite_Tex_001F00);
+        gSPSegment(POLY_OPA_DISP++, 0x0A, object_tite_Tex_002100);
     }
 
     if (this->displayList != NULL) {
diff --git a/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c b/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
index 84543fa26..dc48b277d 100644
--- a/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
+++ b/soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
@@ -45,11 +45,8 @@ void FileChoose_SetView(FileChooseContext* this, f32 eyeX, f32 eyeY, f32 eyeZ) {
     func_800AAA50(&this->view, 0x7F);
 }
 
-Gfx* FileChoose_QuadTextureIA8(Gfx* gfx, void* texture, s16 width, s16 height, s16 point) 
+Gfx* FileChoose_QuadTextureIA8(Gfx* gfx, void* texture, s16 width, s16 height, s16 point)
 {
-    if (ResourceMgr_OTRSigCheck(texture))
-        texture = ResourceMgr_LoadTexByName(texture);
-
     gDPLoadTextureBlock(gfx++, texture, G_IM_FMT_IA, G_IM_SIZ_8b, width, height, 0, G_TX_NOMIRROR | G_TX_WRAP,
                         G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
 
@@ -1500,13 +1497,13 @@ void FileChoose_LoadGame(GameState* thisx) {
     gSaveContext.naviTimer = 0;
 
     // SWORDLESS LINK IS BACK BABY
-    if (CVar_GetS32("gSwordlessLink", 0) != 0) 
+    if (CVar_GetS32("gSwordlessLink", 0) != 0)
     {
         if ((gSaveContext.equips.buttonItems[0] != ITEM_SWORD_KOKIRI) &&
             (gSaveContext.equips.buttonItems[0] != ITEM_SWORD_MASTER) &&
             (gSaveContext.equips.buttonItems[0] != ITEM_SWORD_BGS) &&
             (gSaveContext.equips.buttonItems[0] != ITEM_SWORD_KNIFE)) {
-            
+
             gSaveContext.equips.buttonItems[0] = ITEM_NONE;
             swordEquipMask = _byteswap_ushort(gEquipMasks[EQUIP_SWORD]) & gSaveContext.equips.equipment;
             gSaveContext.equips.equipment &= gEquipNegMasks[EQUIP_SWORD];
diff --git a/soh/src/overlays/gamestates/ovl_title/z_title.c b/soh/src/overlays/gamestates/ovl_title/z_title.c
index 942962f2e..3b7cfe84c 100644
--- a/soh/src/overlays/gamestates/ovl_title/z_title.c
+++ b/soh/src/overlays/gamestates/ovl_title/z_title.c
@@ -199,7 +199,7 @@ void Title_Draw(TitleContext* this) {
     gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 170, 255, 255, 255);
     gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 255, 128);
 
-    gDPLoadMultiBlock(POLY_OPA_DISP++, ResourceMgr_LoadTexByName(nintendo_rogo_static_Tex_001800), 0x100, 1, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0,
+    gDPLoadMultiBlock(POLY_OPA_DISP++, nintendo_rogo_static_Tex_001800, 0x100, 1, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0,
         G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 5, 5, 2, 11);
 
     for (idx = 0, y = 94; idx < 16; idx++, y += 2)
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 2003a8b14..c21ef4ca7 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
@@ -64,7 +64,7 @@ void KaleidoScope_DrawEquipmentImage(GlobalContext* globalCtx, void* source, u32
 
         gDPLoadSync(POLY_KAL_DISP++);
         gDPLoadTile(POLY_KAL_DISP++, G_TX_LOADTILE, 0, 0, (width - 1) << 2, (textureHeight - 1) << 2);
-        
+
         gDPSetTextureImageFB(POLY_KAL_DISP++, G_IM_FMT_RGBA, G_IM_SIZ_16b, width, fbTest);
         gSP1Quadrangle(POLY_KAL_DISP++, 0, 2, 3, 1, 0);
 
@@ -575,7 +575,14 @@ void KaleidoScope_DrawEquipment(GlobalContext* globalCtx) {
             } else if ((i == 0) && (k == 2) && (gBitFlags[bit + 1] & gSaveContext.inventory.equipment)) {
                 KaleidoScope_DrawQuadTextureRGBA32(globalCtx->state.gfxCtx, gBrokenGiantsKnifeIconTex, 32, 32, point);
             } else if (gBitFlags[bit] & gSaveContext.inventory.equipment) {
-                KaleidoScope_DrawQuadTextureRGBA32(globalCtx->state.gfxCtx, gItemIcons[ITEM_SWORD_KOKIRI + temp], 32, 32, point);
+                int itemId = ITEM_SWORD_KOKIRI + temp;
+                bool not_acquired = (gItemAgeReqs[itemId] != 9) && (gItemAgeReqs[itemId] != gSaveContext.linkAge);
+                if (not_acquired) {
+                    gsDPSetGrayscaleColor(POLY_KAL_DISP++, 100, 100, 100);
+                    gsSPGrayscale(POLY_KAL_DISP++, true);
+                }
+                KaleidoScope_DrawQuadTextureRGBA32(globalCtx->state.gfxCtx, gItemIcons[itemId], 32, 32, point);
+                gsSPGrayscale(POLY_KAL_DISP++, false);
             }
         }
     }
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 d39a90e16..7f7d81075 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
@@ -467,8 +467,15 @@ void KaleidoScope_DrawItemSelect(GlobalContext* globalCtx) {
             }
 
             gSPVertex(POLY_KAL_DISP++, &pauseCtx->itemVtx[j + 0], 4, 0);
-            KaleidoScope_DrawQuadTextureRGBA32(globalCtx->state.gfxCtx, gItemIcons[gSaveContext.inventory.items[i]], 32,
+            int itemId = gSaveContext.inventory.items[i];
+            bool not_acquired = (gItemAgeReqs[itemId] != 9) && (gItemAgeReqs[itemId] != gSaveContext.linkAge);
+            if (not_acquired) {
+                gsDPSetGrayscaleColor(POLY_KAL_DISP++, 100, 100, 100);
+                gsSPGrayscale(POLY_KAL_DISP++, true);
+            }
+            KaleidoScope_DrawQuadTextureRGBA32(globalCtx->state.gfxCtx, gItemIcons[itemId], 32,
                                                32, 0);
+            gsSPGrayscale(POLY_KAL_DISP++, false);
         }
     }
 
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 3c023105f..60d3595aa 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
@@ -3081,14 +3081,6 @@ void KaleidoScope_Update(GlobalContext* globalCtx)
 
             gSegments[8] = VIRTUAL_TO_PHYSICAL(pauseCtx->iconItemSegment);
 
-            for (i = 0; i < ARRAY_COUNTU(gItemAgeReqs); i++) {
-                if ((gItemAgeReqs[i] != 9) && (gItemAgeReqs[i] != ((void)0, gSaveContext.linkAge)))
-                {
-                    gSPInvalidateTexCache(globalCtx->state.gfxCtx->polyKal.p++, ResourceMgr_LoadTexByName(gItemIcons[i]));
-                    KaleidoScope_GrayOutTextureRGBA32(SEGMENTED_TO_VIRTUAL(gItemIcons[i]), 0x400);
-                }
-            }
-
             pauseCtx->iconItem24Segment = (void*)(((uintptr_t)pauseCtx->iconItemSegment + size0 + 0xF) & ~0xF);
 
 #if 1

From 3c471f2fc5ae45082682b66ed077312501c64fbd Mon Sep 17 00:00:00 2001
From: Baoulettes <perlouzerie@hotmail.fr>
Date: Sun, 24 Apr 2022 18:26:49 +0200
Subject: [PATCH 12/26] Quick fix for Title cards issues

Funny on linux it show properly but windows require it
---
 soh/src/code/graph.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/soh/src/code/graph.c b/soh/src/code/graph.c
index 3a1719731..dbbbb9df1 100644
--- a/soh/src/code/graph.c
+++ b/soh/src/code/graph.c
@@ -299,7 +299,7 @@ void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState) {
     gSPBranchList(WORK_DISP++, gfxCtx->polyOpaBuffer);
     gSPBranchList(POLY_OPA_DISP++, gfxCtx->polyXluBuffer);
     gSPBranchList(POLY_XLU_DISP++, gfxCtx->titlecardBuffer);
-    gSPBranchList(POLY_XLU_DISP++, gfxCtx->polyKalBuffer);
+    gSPBranchList(TITLE_CARD_DISP++, gfxCtx->polyKalBuffer);
     gSPBranchList(POLY_KAL_DISP++, gfxCtx->overlayBuffer);
     gDPPipeSync(OVERLAY_DISP++);
     gDPFullSync(OVERLAY_DISP++);

From 53e45e879ed1bf18748d28b2bb9d94a2c1725ba4 Mon Sep 17 00:00:00 2001
From: GaryOderNichts <12049776+GaryOderNichts@users.noreply.github.com>
Date: Mon, 18 Apr 2022 21:04:35 +0200
Subject: [PATCH 13/26] Fix texture width for G_SETTIMG

---
 OTRExporter/OTRExporter/DisplayListExporter.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OTRExporter/OTRExporter/DisplayListExporter.cpp b/OTRExporter/OTRExporter/DisplayListExporter.cpp
index 4e68d8f13..1fe7cb44a 100644
--- a/OTRExporter/OTRExporter/DisplayListExporter.cpp
+++ b/OTRExporter/OTRExporter/DisplayListExporter.cpp
@@ -689,7 +689,7 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 				uint32_t fmt = (__ & 0xE0) >> 5;
 				uint32_t siz = (__ & 0x18) >> 3;
 
-				Gfx value = gsDPSetTextureImage(fmt, siz, www - 1, (seg & 0x0FFFFFFF) + 0xF0000000);
+				Gfx value = gsDPSetTextureImage(fmt, siz, www + 1, (seg & 0x0FFFFFFF) + 0xF0000000);
 				word0 = value.words.w0;
 				word1 = value.words.w1;
 
@@ -707,7 +707,7 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina
 				uint32_t fmt = (__ & 0xE0) >> 5;
 				uint32_t siz = (__ & 0x18) >> 3;
 
-				Gfx value = gsDPSetTextureImage(fmt, siz, www - 1, __);
+				Gfx value = gsDPSetTextureImage(fmt, siz, www + 1, __);
 				word0 = value.words.w0 & 0x00FFFFFF;
 				word0 += (G_SETTIMG_OTR << 24);
 				//word1 = value.words.w1;

From caebcc4f9ab156acb15736225907ad47e99be1eb Mon Sep 17 00:00:00 2001
From: Nicholas Estelami <NEstelami@users.noreply.github.com>
Date: Sun, 24 Apr 2022 17:10:38 -0400
Subject: [PATCH 14/26] Fixed bug in extract_assets.py that caused wrong XML
 folder to be used

Also removed duplicate python script in soh folder.
---
 OTRExporter/extract_assets.py |    6 +-
 soh/extract_baserom.py        | 1608 ---------------------------------
 2 files changed, 3 insertions(+), 1611 deletions(-)
 delete mode 100755 soh/extract_baserom.py

diff --git a/OTRExporter/extract_assets.py b/OTRExporter/extract_assets.py
index f15cb1beb..e33b65f0e 100755
--- a/OTRExporter/extract_assets.py
+++ b/OTRExporter/extract_assets.py
@@ -132,13 +132,13 @@ def main():
     else:
         romToUse = roms[0]
     
-    match checkChecksum(romToUse).name:
+    match checkChecksum(romToUse):
         case Checksums.OOT_PAL_GC:
             xmlVer = "GC_NMQ_PAL_F"
         case Checksums.OOT_PAL_GC_DBG1:
-            xmlVer = "GC_MQ_D"
-        case _: # default case
             xmlVer = "GC_NMQ_D"
+        case _: # default case
+            xmlVer = "GC_MQ_D"
 
     if (os.path.exists("Extract")):
         shutil.rmtree("Extract")
diff --git a/soh/extract_baserom.py b/soh/extract_baserom.py
deleted file mode 100755
index a3eb83a8f..000000000
--- a/soh/extract_baserom.py
+++ /dev/null
@@ -1,1608 +0,0 @@
-#!/usr/bin/python3
-
-import os
-import sys
-import struct
-from multiprocessing import Pool, cpu_count
-
-
-ROM_FILE_NAME = 'baserom_non_mq.z64'
-FILE_TABLE_OFFSET = 0x12F70
-
-FILE_NAMES = [
-    'makerom',
-    'boot',
-    'dmadata',
-    'Audiobank',
-    'Audioseq',
-    'Audiotable',
-    'link_animetion',
-    'icon_item_static',
-    'icon_item_24_static',
-    'icon_item_field_static',
-    'icon_item_dungeon_static',
-    'icon_item_gameover_static',
-    'icon_item_nes_static',
-    'icon_item_ger_static',
-    'icon_item_fra_static',
-    'item_name_static',
-    'map_name_static',
-    'do_action_static',
-    'message_static',
-    'message_texture_static',
-    'nes_font_static',
-    'nes_message_data_static',
-    'ger_message_data_static',
-    'fra_message_data_static',
-    'staff_message_data_static',
-    'map_grand_static',
-    'map_i_static',
-    'map_48x85_static',
-    'code',
-    'ovl_title',
-    'ovl_select',
-    'ovl_opening',
-    'ovl_file_choose',
-    'ovl_kaleido_scope',
-    'ovl_player_actor',
-    'ovl_map_mark_data',
-    'ovl_En_Test',
-    'ovl_Arms_Hook',
-    'ovl_Arrow_Fire',
-    'ovl_Arrow_Ice',
-    'ovl_Arrow_Light',
-    'ovl_Bg_Bdan_Objects',
-    'ovl_Bg_Bdan_Switch',
-    'ovl_Bg_Bom_Guard',
-    'ovl_Bg_Bombwall',
-    'ovl_Bg_Bowl_Wall',
-    'ovl_Bg_Breakwall',
-    'ovl_Bg_Ddan_Jd',
-    'ovl_Bg_Ddan_Kd',
-    'ovl_Bg_Dodoago',
-    'ovl_Bg_Dy_Yoseizo',
-    'ovl_Bg_Ganon_Otyuka',
-    'ovl_Bg_Gate_Shutter',
-    'ovl_Bg_Gjyo_Bridge',
-    'ovl_Bg_Gnd_Darkmeiro',
-    'ovl_Bg_Gnd_Firemeiro',
-    'ovl_Bg_Gnd_Iceblock',
-    'ovl_Bg_Gnd_Nisekabe',
-    'ovl_Bg_Gnd_Soulmeiro',
-    'ovl_Bg_Haka',
-    'ovl_Bg_Haka_Gate',
-    'ovl_Bg_Haka_Huta',
-    'ovl_Bg_Haka_Megane',
-    'ovl_Bg_Haka_MeganeBG',
-    'ovl_Bg_Haka_Sgami',
-    'ovl_Bg_Haka_Ship',
-    'ovl_Bg_Haka_Trap',
-    'ovl_Bg_Haka_Tubo',
-    'ovl_Bg_Haka_Water',
-    'ovl_Bg_Haka_Zou',
-    'ovl_Bg_Heavy_Block',
-    'ovl_Bg_Hidan_Curtain',
-    'ovl_Bg_Hidan_Dalm',
-    'ovl_Bg_Hidan_Firewall',
-    'ovl_Bg_Hidan_Fslift',
-    'ovl_Bg_Hidan_Fwbig',
-    'ovl_Bg_Hidan_Hamstep',
-    'ovl_Bg_Hidan_Hrock',
-    'ovl_Bg_Hidan_Kousi',
-    'ovl_Bg_Hidan_Kowarerukabe',
-    'ovl_Bg_Hidan_Rock',
-    'ovl_Bg_Hidan_Rsekizou',
-    'ovl_Bg_Hidan_Sekizou',
-    'ovl_Bg_Hidan_Sima',
-    'ovl_Bg_Hidan_Syoku',
-    'ovl_Bg_Ice_Objects',
-    'ovl_Bg_Ice_Shelter',
-    'ovl_Bg_Ice_Shutter',
-    'ovl_Bg_Ice_Turara',
-    'ovl_Bg_Ingate',
-    'ovl_Bg_Jya_1flift',
-    'ovl_Bg_Jya_Amishutter',
-    'ovl_Bg_Jya_Bigmirror',
-    'ovl_Bg_Jya_Block',
-    'ovl_Bg_Jya_Bombchuiwa',
-    'ovl_Bg_Jya_Bombiwa',
-    'ovl_Bg_Jya_Cobra',
-    'ovl_Bg_Jya_Goroiwa',
-    'ovl_Bg_Jya_Haheniron',
-    'ovl_Bg_Jya_Ironobj',
-    'ovl_Bg_Jya_Kanaami',
-    'ovl_Bg_Jya_Lift',
-    'ovl_Bg_Jya_Megami',
-    'ovl_Bg_Jya_Zurerukabe',
-    'ovl_Bg_Menkuri_Eye',
-    'ovl_Bg_Menkuri_Kaiten',
-    'ovl_Bg_Menkuri_Nisekabe',
-    'ovl_Bg_Mizu_Bwall',
-    'ovl_Bg_Mizu_Movebg',
-    'ovl_Bg_Mizu_Shutter',
-    'ovl_Bg_Mizu_Uzu',
-    'ovl_Bg_Mizu_Water',
-    'ovl_Bg_Mjin',
-    'ovl_Bg_Mori_Bigst',
-    'ovl_Bg_Mori_Elevator',
-    'ovl_Bg_Mori_Hashigo',
-    'ovl_Bg_Mori_Hashira4',
-    'ovl_Bg_Mori_Hineri',
-    'ovl_Bg_Mori_Idomizu',
-    'ovl_Bg_Mori_Kaitenkabe',
-    'ovl_Bg_Mori_Rakkatenjo',
-    'ovl_Bg_Po_Event',
-    'ovl_Bg_Po_Syokudai',
-    'ovl_Bg_Pushbox',
-    'ovl_Bg_Relay_Objects',
-    'ovl_Bg_Spot00_Break',
-    'ovl_Bg_Spot00_Hanebasi',
-    'ovl_Bg_Spot01_Fusya',
-    'ovl_Bg_Spot01_Idohashira',
-    'ovl_Bg_Spot01_Idomizu',
-    'ovl_Bg_Spot01_Idosoko',
-    'ovl_Bg_Spot01_Objects2',
-    'ovl_Bg_Spot02_Objects',
-    'ovl_Bg_Spot03_Taki',
-    'ovl_Bg_Spot05_Soko',
-    'ovl_Bg_Spot06_Objects',
-    'ovl_Bg_Spot07_Taki',
-    'ovl_Bg_Spot08_Bakudankabe',
-    'ovl_Bg_Spot08_Iceblock',
-    'ovl_Bg_Spot09_Obj',
-    'ovl_Bg_Spot11_Bakudankabe',
-    'ovl_Bg_Spot11_Oasis',
-    'ovl_Bg_Spot12_Gate',
-    'ovl_Bg_Spot12_Saku',
-    'ovl_Bg_Spot15_Rrbox',
-    'ovl_Bg_Spot15_Saku',
-    'ovl_Bg_Spot16_Bombstone',
-    'ovl_Bg_Spot16_Doughnut',
-    'ovl_Bg_Spot17_Bakudankabe',
-    'ovl_Bg_Spot17_Funen',
-    'ovl_Bg_Spot18_Basket',
-    'ovl_Bg_Spot18_Futa',
-    'ovl_Bg_Spot18_Obj',
-    'ovl_Bg_Spot18_Shutter',
-    'ovl_Bg_Sst_Floor',
-    'ovl_Bg_Toki_Hikari',
-    'ovl_Bg_Toki_Swd',
-    'ovl_Bg_Treemouth',
-    'ovl_Bg_Umajump',
-    'ovl_Bg_Vb_Sima',
-    'ovl_Bg_Ydan_Hasi',
-    'ovl_Bg_Ydan_Maruta',
-    'ovl_Bg_Ydan_Sp',
-    'ovl_Bg_Zg',
-    'ovl_Boss_Dodongo',
-    'ovl_Boss_Fd',
-    'ovl_Boss_Fd2',
-    'ovl_Boss_Ganon',
-    'ovl_Boss_Ganon2',
-    'ovl_Boss_Ganondrof',
-    'ovl_Boss_Goma',
-    'ovl_Boss_Mo',
-    'ovl_Boss_Sst',
-    'ovl_Boss_Tw',
-    'ovl_Boss_Va',
-    'ovl_Demo_6K',
-    'ovl_Demo_Du',
-    'ovl_Demo_Ec',
-    'ovl_Demo_Effect',
-    'ovl_Demo_Ext',
-    'ovl_Demo_Geff',
-    'ovl_Demo_Gj',
-    'ovl_Demo_Go',
-    'ovl_Demo_Gt',
-    'ovl_Demo_Ik',
-    'ovl_Demo_Im',
-    'ovl_Demo_Kankyo',
-    'ovl_Demo_Kekkai',
-    'ovl_Demo_Sa',
-    'ovl_Demo_Shd',
-    'ovl_Demo_Tre_Lgt',
-    'ovl_Door_Ana',
-    'ovl_Door_Gerudo',
-    'ovl_Door_Killer',
-    'ovl_Door_Shutter',
-    'ovl_Door_Toki',
-    'ovl_Door_Warp1',
-    'ovl_Efc_Erupc',
-    'ovl_Eff_Dust',
-    'ovl_Effect_Ss_Blast',
-    'ovl_Effect_Ss_Bomb',
-    'ovl_Effect_Ss_Bomb2',
-    'ovl_Effect_Ss_Bubble',
-    'ovl_Effect_Ss_D_Fire',
-    'ovl_Effect_Ss_Dead_Db',
-    'ovl_Effect_Ss_Dead_Dd',
-    'ovl_Effect_Ss_Dead_Ds',
-    'ovl_Effect_Ss_Dead_Sound',
-    'ovl_Effect_Ss_Dt_Bubble',
-    'ovl_Effect_Ss_Dust',
-    'ovl_Effect_Ss_En_Fire',
-    'ovl_Effect_Ss_En_Ice',
-    'ovl_Effect_Ss_Extra',
-    'ovl_Effect_Ss_Fcircle',
-    'ovl_Effect_Ss_Fhg_Flash',
-    'ovl_Effect_Ss_Fire_Tail',
-    'ovl_Effect_Ss_G_Fire',
-    'ovl_Effect_Ss_G_Magma',
-    'ovl_Effect_Ss_G_Magma2',
-    'ovl_Effect_Ss_G_Ripple',
-    'ovl_Effect_Ss_G_Spk',
-    'ovl_Effect_Ss_G_Splash',
-    'ovl_Effect_Ss_Hahen',
-    'ovl_Effect_Ss_HitMark',
-    'ovl_Effect_Ss_Ice_Piece',
-    'ovl_Effect_Ss_Ice_Smoke',
-    'ovl_Effect_Ss_K_Fire',
-    'ovl_Effect_Ss_Kakera',
-    'ovl_Effect_Ss_KiraKira',
-    'ovl_Effect_Ss_Lightning',
-    'ovl_Effect_Ss_Sibuki',
-    'ovl_Effect_Ss_Sibuki2',
-    'ovl_Effect_Ss_Solder_Srch_Ball',
-    'ovl_Effect_Ss_Stick',
-    'ovl_Effect_Ss_Stone1',
-    'ovl_Elf_Msg',
-    'ovl_Elf_Msg2',
-    'ovl_En_Am',
-    'ovl_En_Ani',
-    'ovl_En_Anubice',
-    'ovl_En_Anubice_Fire',
-    'ovl_En_Anubice_Tag',
-    'ovl_En_Arow_Trap',
-    'ovl_En_Arrow',
-    'ovl_En_Attack_Niw',
-    'ovl_En_Ba',
-    'ovl_En_Bb',
-    'ovl_En_Bdfire',
-    'ovl_En_Bigokuta',
-    'ovl_En_Bili',
-    'ovl_En_Bird',
-    'ovl_En_Blkobj',
-    'ovl_En_Bom',
-    'ovl_En_Bom_Bowl_Man',
-    'ovl_En_Bom_Bowl_Pit',
-    'ovl_En_Bom_Chu',
-    'ovl_En_Bombf',
-    'ovl_En_Boom',
-    'ovl_En_Box',
-    'ovl_En_Brob',
-    'ovl_En_Bubble',
-    'ovl_En_Butte',
-    'ovl_En_Bw',
-    'ovl_En_Bx',
-    'ovl_En_Changer',
-    'ovl_En_Clear_Tag',
-    'ovl_En_Cow',
-    'ovl_En_Crow',
-    'ovl_En_Cs',
-    'ovl_En_Daiku',
-    'ovl_En_Daiku_Kakariko',
-    'ovl_En_Dekubaba',
-    'ovl_En_Dekunuts',
-    'ovl_En_Dh',
-    'ovl_En_Dha',
-    'ovl_En_Diving_Game',
-    'ovl_En_Dns',
-    'ovl_En_Dnt_Demo',
-    'ovl_En_Dnt_Jiji',
-    'ovl_En_Dnt_Nomal',
-    'ovl_En_Dodojr',
-    'ovl_En_Dodongo',
-    'ovl_En_Dog',
-    'ovl_En_Door',
-    'ovl_En_Ds',
-    'ovl_En_Du',
-    'ovl_En_Dy_Extra',
-    'ovl_En_Eg',
-    'ovl_En_Eiyer',
-    'ovl_En_Elf',
-    'ovl_En_Encount1',
-    'ovl_En_Encount2',
-    'ovl_En_Ex_Item',
-    'ovl_En_Ex_Ruppy',
-    'ovl_En_Fd',
-    'ovl_En_Fd_Fire',
-    'ovl_En_Fhg_Fire',
-    'ovl_En_Fire_Rock',
-    'ovl_En_Firefly',
-    'ovl_En_Fish',
-    'ovl_En_Floormas',
-    'ovl_En_Fr',
-    'ovl_En_Fu',
-    'ovl_En_Fw',
-    'ovl_En_Fz',
-    'ovl_En_G_Switch',
-    'ovl_En_Ganon_Mant',
-    'ovl_En_Ganon_Organ',
-    'ovl_En_Gb',
-    'ovl_En_Ge1',
-    'ovl_En_Ge2',
-    'ovl_En_Ge3',
-    'ovl_En_GeldB',
-    'ovl_En_GirlA',
-    'ovl_En_Gm',
-    'ovl_En_Go',
-    'ovl_En_Go2',
-    'ovl_En_Goma',
-    'ovl_En_Goroiwa',
-    'ovl_En_Gs',
-    'ovl_En_Guest',
-    'ovl_En_Hata',
-    'ovl_En_Heishi1',
-    'ovl_En_Heishi2',
-    'ovl_En_Heishi3',
-    'ovl_En_Heishi4',
-    'ovl_En_Hintnuts',
-    'ovl_En_Holl',
-    'ovl_En_Honotrap',
-    'ovl_En_Horse',
-    'ovl_En_Horse_Game_Check',
-    'ovl_En_Horse_Ganon',
-    'ovl_En_Horse_Link_Child',
-    'ovl_En_Horse_Normal',
-    'ovl_En_Horse_Zelda',
-    'ovl_En_Hs',
-    'ovl_En_Hs2',
-    'ovl_En_Hy',
-    'ovl_En_Ice_Hono',
-    'ovl_En_Ik',
-    'ovl_En_In',
-    'ovl_En_Insect',
-    'ovl_En_Ishi',
-    'ovl_En_It',
-    'ovl_En_Jj',
-    'ovl_En_Js',
-    'ovl_En_Jsjutan',
-    'ovl_En_Kakasi',
-    'ovl_En_Kakasi2',
-    'ovl_En_Kakasi3',
-    'ovl_En_Kanban',
-    'ovl_En_Karebaba',
-    'ovl_En_Ko',
-    'ovl_En_Kusa',
-    'ovl_En_Kz',
-    'ovl_En_Light',
-    'ovl_En_Lightbox',
-    'ovl_En_M_Fire1',
-    'ovl_En_M_Thunder',
-    'ovl_En_Ma1',
-    'ovl_En_Ma2',
-    'ovl_En_Ma3',
-    'ovl_En_Mag',
-    'ovl_En_Mb',
-    'ovl_En_Md',
-    'ovl_En_Mk',
-    'ovl_En_Mm',
-    'ovl_En_Mm2',
-    'ovl_En_Ms',
-    'ovl_En_Mu',
-    'ovl_En_Nb',
-    'ovl_En_Niw',
-    'ovl_En_Niw_Girl',
-    'ovl_En_Niw_Lady',
-    'ovl_En_Nutsball',
-    'ovl_En_Nwc',
-    'ovl_En_Ny',
-    'ovl_En_OE2',
-    'ovl_En_Okarina_Effect',
-    'ovl_En_Okarina_Tag',
-    'ovl_En_Okuta',
-    'ovl_En_Ossan',
-    'ovl_En_Owl',
-    'ovl_En_Part',
-    'ovl_En_Peehat',
-    'ovl_En_Po_Desert',
-    'ovl_En_Po_Field',
-    'ovl_En_Po_Relay',
-    'ovl_En_Po_Sisters',
-    'ovl_En_Poh',
-    'ovl_En_Pu_box',
-    'ovl_En_Rd',
-    'ovl_En_Reeba',
-    'ovl_En_River_Sound',
-    'ovl_En_Rl',
-    'ovl_En_Rr',
-    'ovl_En_Ru1',
-    'ovl_En_Ru2',
-    'ovl_En_Sa',
-    'ovl_En_Sb',
-    'ovl_En_Scene_Change',
-    'ovl_En_Sda',
-    'ovl_En_Shopnuts',
-    'ovl_En_Si',
-    'ovl_En_Siofuki',
-    'ovl_En_Skb',
-    'ovl_En_Skj',
-    'ovl_En_Skjneedle',
-    'ovl_En_Ssh',
-    'ovl_En_St',
-    'ovl_En_Sth',
-    'ovl_En_Stream',
-    'ovl_En_Sw',
-    'ovl_En_Syateki_Itm',
-    'ovl_En_Syateki_Man',
-    'ovl_En_Syateki_Niw',
-    'ovl_En_Ta',
-    'ovl_En_Takara_Man',
-    'ovl_En_Tana',
-    'ovl_En_Tg',
-    'ovl_En_Tite',
-    'ovl_En_Tk',
-    'ovl_En_Torch',
-    'ovl_En_Torch2',
-    'ovl_En_Toryo',
-    'ovl_En_Tp',
-    'ovl_En_Tr',
-    'ovl_En_Trap',
-    'ovl_En_Tubo_Trap',
-    'ovl_En_Vali',
-    'ovl_En_Vase',
-    'ovl_En_Vb_Ball',
-    'ovl_En_Viewer',
-    'ovl_En_Vm',
-    'ovl_En_Wall_Tubo',
-    'ovl_En_Wallmas',
-    'ovl_En_Weather_Tag',
-    'ovl_En_Weiyer',
-    'ovl_En_Wf',
-    'ovl_En_Wonder_Item',
-    'ovl_En_Wonder_Talk',
-    'ovl_En_Wonder_Talk2',
-    'ovl_En_Wood02',
-    'ovl_En_Xc',
-    'ovl_En_Yabusame_Mark',
-    'ovl_En_Yukabyun',
-    'ovl_En_Zf',
-    'ovl_En_Zl1',
-    'ovl_En_Zl2',
-    'ovl_En_Zl3',
-    'ovl_En_Zl4',
-    'ovl_En_Zo',
-    'ovl_En_fHG',
-    'ovl_End_Title',
-    'ovl_Fishing',
-    'ovl_Item_B_Heart',
-    'ovl_Item_Etcetera',
-    'ovl_Item_Inbox',
-    'ovl_Item_Ocarina',
-    'ovl_Item_Shield',
-    'ovl_Magic_Dark',
-    'ovl_Magic_Fire',
-    'ovl_Magic_Wind',
-    'ovl_Mir_Ray',
-    'ovl_Obj_Bean',
-    'ovl_Obj_Blockstop',
-    'ovl_Obj_Bombiwa',
-    'ovl_Obj_Comb',
-    'ovl_Obj_Dekujr',
-    'ovl_Obj_Elevator',
-    'ovl_Obj_Hamishi',
-    'ovl_Obj_Hana',
-    'ovl_Obj_Hsblock',
-    'ovl_Obj_Ice_Poly',
-    'ovl_Obj_Kibako',
-    'ovl_Obj_Kibako2',
-    'ovl_Obj_Lift',
-    'ovl_Obj_Lightswitch',
-    'ovl_Obj_Makekinsuta',
-    'ovl_Obj_Makeoshihiki',
-    'ovl_Obj_Mure',
-    'ovl_Obj_Mure2',
-    'ovl_Obj_Mure3',
-    'ovl_Obj_Oshihiki',
-    'ovl_Obj_Roomtimer',
-    'ovl_Obj_Switch',
-    'ovl_Obj_Syokudai',
-    'ovl_Obj_Timeblock',
-    'ovl_Obj_Tsubo',
-    'ovl_Obj_Warp2block',
-    'ovl_Object_Kankyo',
-    'ovl_Oceff_Spot',
-    'ovl_Oceff_Storm',
-    'ovl_Oceff_Wipe',
-    'ovl_Oceff_Wipe2',
-    'ovl_Oceff_Wipe3',
-    'ovl_Oceff_Wipe4',
-    'ovl_Shot_Sun',
-    'gameplay_keep',
-    'gameplay_field_keep',
-    'gameplay_dangeon_keep',
-    'gameplay_object_exchange_static',
-    'object_link_boy',
-    'object_link_child',
-    'object_box',
-    'object_human',
-    'object_okuta',
-    'object_poh',
-    'object_wallmaster',
-    'object_dy_obj',
-    'object_firefly',
-    'object_dodongo',
-    'object_fire',
-    'object_niw',
-    'object_tite',
-    'object_reeba',
-    'object_peehat',
-    'object_kingdodongo',
-    'object_horse',
-    'object_zf',
-    'object_goma',
-    'object_zl1',
-    'object_gol',
-    'object_bubble',
-    'object_dodojr',
-    'object_torch2',
-    'object_bl',
-    'object_tp',
-    'object_oA1',
-    'object_st',
-    'object_bw',
-    'object_ei',
-    'object_horse_normal',
-    'object_oB1',
-    'object_o_anime',
-    'object_spot04_objects',
-    'object_ddan_objects',
-    'object_hidan_objects',
-    'object_horse_ganon',
-    'object_oA2',
-    'object_spot00_objects',
-    'object_mb',
-    'object_bombf',
-    'object_sk2',
-    'object_oE1',
-    'object_oE_anime',
-    'object_oE2',
-    'object_ydan_objects',
-    'object_gnd',
-    'object_am',
-    'object_dekubaba',
-    'object_oA3',
-    'object_oA4',
-    'object_oA5',
-    'object_oA6',
-    'object_oA7',
-    'object_jj',
-    'object_oA8',
-    'object_oA9',
-    'object_oB2',
-    'object_oB3',
-    'object_oB4',
-    'object_horse_zelda',
-    'object_opening_demo1',
-    'object_warp1',
-    'object_b_heart',
-    'object_dekunuts',
-    'object_oE3',
-    'object_oE4',
-    'object_menkuri_objects',
-    'object_oE5',
-    'object_oE6',
-    'object_oE7',
-    'object_oE8',
-    'object_oE9',
-    'object_oE10',
-    'object_oE11',
-    'object_oE12',
-    'object_vali',
-    'object_oA10',
-    'object_oA11',
-    'object_mizu_objects',
-    'object_fhg',
-    'object_ossan',
-    'object_mori_hineri1',
-    'object_Bb',
-    'object_toki_objects',
-    'object_yukabyun',
-    'object_zl2',
-    'object_mjin',
-    'object_mjin_flash',
-    'object_mjin_dark',
-    'object_mjin_flame',
-    'object_mjin_ice',
-    'object_mjin_soul',
-    'object_mjin_wind',
-    'object_mjin_oka',
-    'object_haka_objects',
-    'object_spot06_objects',
-    'object_ice_objects',
-    'object_relay_objects',
-    'object_mori_hineri1a',
-    'object_mori_hineri2',
-    'object_mori_hineri2a',
-    'object_mori_objects',
-    'object_mori_tex',
-    'object_spot08_obj',
-    'object_warp2',
-    'object_hata',
-    'object_bird',
-    'object_wood02',
-    'object_lightbox',
-    'object_pu_box',
-    'object_trap',
-    'object_vase',
-    'object_im',
-    'object_ta',
-    'object_tk',
-    'object_xc',
-    'object_vm',
-    'object_bv',
-    'object_hakach_objects',
-    'object_efc_crystal_light',
-    'object_efc_fire_ball',
-    'object_efc_flash',
-    'object_efc_lgt_shower',
-    'object_efc_star_field',
-    'object_god_lgt',
-    'object_light_ring',
-    'object_triforce_spot',
-    'object_medal',
-    'object_bdan_objects',
-    'object_sd',
-    'object_rd',
-    'object_po_sisters',
-    'object_heavy_object',
-    'object_gndd',
-    'object_fd',
-    'object_du',
-    'object_fw',
-    'object_horse_link_child',
-    'object_spot02_objects',
-    'object_haka',
-    'object_ru1',
-    'object_syokudai',
-    'object_fd2',
-    'object_dh',
-    'object_rl',
-    'object_efc_tw',
-    'object_demo_tre_lgt',
-    'object_gi_key',
-    'object_mir_ray',
-    'object_brob',
-    'object_gi_jewel',
-    'object_spot09_obj',
-    'object_spot18_obj',
-    'object_bdoor',
-    'object_spot17_obj',
-    'object_shop_dungen',
-    'object_nb',
-    'object_mo',
-    'object_sb',
-    'object_gi_melody',
-    'object_gi_heart',
-    'object_gi_compass',
-    'object_gi_bosskey',
-    'object_gi_medal',
-    'object_gi_nuts',
-    'object_sa',
-    'object_gi_hearts',
-    'object_gi_arrowcase',
-    'object_gi_bombpouch',
-    'object_in',
-    'object_tr',
-    'object_spot16_obj',
-    'object_oE1s',
-    'object_oE4s',
-    'object_os_anime',
-    'object_gi_bottle',
-    'object_gi_stick',
-    'object_gi_map',
-    'object_oF1d_map',
-    'object_ru2',
-    'object_gi_shield_1',
-    'object_dekujr',
-    'object_gi_magicpot',
-    'object_gi_bomb_1',
-    'object_oF1s',
-    'object_ma2',
-    'object_gi_purse',
-    'object_hni',
-    'object_tw',
-    'object_rr',
-    'object_bxa',
-    'object_anubice',
-    'object_gi_gerudo',
-    'object_gi_arrow',
-    'object_gi_bomb_2',
-    'object_gi_egg',
-    'object_gi_scale',
-    'object_gi_shield_2',
-    'object_gi_hookshot',
-    'object_gi_ocarina',
-    'object_gi_milk',
-    'object_ma1',
-    'object_ganon',
-    'object_sst',
-    'object_ny',
-    'object_fr',
-    'object_gi_pachinko',
-    'object_gi_boomerang',
-    'object_gi_bow',
-    'object_gi_glasses',
-    'object_gi_liquid',
-    'object_ani',
-    'object_demo_6k',
-    'object_gi_shield_3',
-    'object_gi_letter',
-    'object_spot15_obj',
-    'object_jya_obj',
-    'object_gi_clothes',
-    'object_gi_bean',
-    'object_gi_fish',
-    'object_gi_saw',
-    'object_gi_hammer',
-    'object_gi_grass',
-    'object_gi_longsword',
-    'object_spot01_objects',
-    'object_md',
-    'object_km1',
-    'object_kw1',
-    'object_zo',
-    'object_kz',
-    'object_umajump',
-    'object_masterkokiri',
-    'object_masterkokirihead',
-    'object_mastergolon',
-    'object_masterzoora',
-    'object_aob',
-    'object_ik',
-    'object_ahg',
-    'object_cne',
-    'object_gi_niwatori',
-    'object_skj',
-    'object_gi_bottle_letter',
-    'object_bji',
-    'object_bba',
-    'object_gi_ocarina_0',
-    'object_ds',
-    'object_ane',
-    'object_boj',
-    'object_spot03_object',
-    'object_spot07_object',
-    'object_fz',
-    'object_bob',
-    'object_ge1',
-    'object_yabusame_point',
-    'object_gi_boots_2',
-    'object_gi_seed',
-    'object_gnd_magic',
-    'object_d_elevator',
-    'object_d_hsblock',
-    'object_d_lift',
-    'object_mamenoki',
-    'object_goroiwa',
-    'object_toryo',
-    'object_daiku',
-    'object_nwc',
-    'object_blkobj',
-    'object_gm',
-    'object_ms',
-    'object_hs',
-    'object_ingate',
-    'object_lightswitch',
-    'object_kusa',
-    'object_tsubo',
-    'object_gi_gloves',
-    'object_gi_coin',
-    'object_kanban',
-    'object_gjyo_objects',
-    'object_owl',
-    'object_mk',
-    'object_fu',
-    'object_gi_ki_tan_mask',
-    'object_gi_redead_mask',
-    'object_gi_skj_mask',
-    'object_gi_rabit_mask',
-    'object_gi_truth_mask',
-    'object_ganon_objects',
-    'object_siofuki',
-    'object_stream',
-    'object_mm',
-    'object_fa',
-    'object_os',
-    'object_gi_eye_lotion',
-    'object_gi_powder',
-    'object_gi_mushroom',
-    'object_gi_ticketstone',
-    'object_gi_brokensword',
-    'object_js',
-    'object_cs',
-    'object_gi_prescription',
-    'object_gi_bracelet',
-    'object_gi_soldout',
-    'object_gi_frog',
-    'object_mag',
-    'object_door_gerudo',
-    'object_gt',
-    'object_efc_erupc',
-    'object_zl2_anime1',
-    'object_zl2_anime2',
-    'object_gi_golonmask',
-    'object_gi_zoramask',
-    'object_gi_gerudomask',
-    'object_ganon2',
-    'object_ka',
-    'object_ts',
-    'object_zg',
-    'object_gi_hoverboots',
-    'object_gi_m_arrow',
-    'object_ds2',
-    'object_ec',
-    'object_fish',
-    'object_gi_sutaru',
-    'object_gi_goddess',
-    'object_ssh',
-    'object_bigokuta',
-    'object_bg',
-    'object_spot05_objects',
-    'object_spot12_obj',
-    'object_bombiwa',
-    'object_hintnuts',
-    'object_rs',
-    'object_spot00_break',
-    'object_gla',
-    'object_shopnuts',
-    'object_geldb',
-    'object_gr',
-    'object_dog',
-    'object_jya_iron',
-    'object_jya_door',
-    'object_spot01_objects2',
-    'object_spot11_obj',
-    'object_kibako2',
-    'object_dns',
-    'object_dnk',
-    'object_gi_fire',
-    'object_gi_insect',
-    'object_gi_butterfly',
-    'object_gi_ghost',
-    'object_gi_soul',
-    'object_bowl',
-    'object_po_field',
-    'object_demo_kekkai',
-    'object_efc_doughnut',
-    'object_gi_dekupouch',
-    'object_ganon_anime1',
-    'object_ganon_anime2',
-    'object_ganon_anime3',
-    'object_gi_rupy',
-    'object_spot01_matoya',
-    'object_spot01_matoyab',
-    'object_po_composer',
-    'object_mu',
-    'object_wf',
-    'object_skb',
-    'object_gj',
-    'object_geff',
-    'object_haka_door',
-    'object_gs',
-    'object_ps',
-    'object_bwall',
-    'object_crow',
-    'object_cow',
-    'object_cob',
-    'object_gi_sword_1',
-    'object_door_killer',
-    'object_ouke_haka',
-    'object_timeblock',
-    'object_zl4',
-    'g_pn_01',
-    'g_pn_02',
-    'g_pn_03',
-    'g_pn_04',
-    'g_pn_05',
-    'g_pn_06',
-    'g_pn_07',
-    'g_pn_08',
-    'g_pn_09',
-    'g_pn_10',
-    'g_pn_11',
-    'g_pn_12',
-    'g_pn_13',
-    'g_pn_14',
-    'g_pn_15',
-    'g_pn_16',
-    'g_pn_17',
-    'g_pn_18',
-    'g_pn_19',
-    'g_pn_20',
-    'g_pn_21',
-    'g_pn_22',
-    'g_pn_23',
-    'g_pn_24',
-    'g_pn_25',
-    'g_pn_26',
-    'g_pn_27',
-    'g_pn_28',
-    'g_pn_29',
-    'g_pn_30',
-    'g_pn_31',
-    'g_pn_32',
-    'g_pn_33',
-    'g_pn_34',
-    'g_pn_35',
-    'g_pn_36',
-    'g_pn_37',
-    'g_pn_38',
-    'g_pn_39',
-    'g_pn_40',
-    'g_pn_41',
-    'g_pn_42',
-    'g_pn_43',
-    'g_pn_44',
-    'g_pn_45',
-    'g_pn_46',
-    'g_pn_47',
-    'g_pn_48',
-    'g_pn_49',
-    'g_pn_50',
-    'g_pn_51',
-    'g_pn_52',
-    'g_pn_53',
-    'g_pn_54',
-    'g_pn_55',
-    'g_pn_56',
-    'g_pn_57',
-    'z_select_static',
-    'nintendo_rogo_static',
-    'title_static',
-    'parameter_static',
-    'vr_fine0_static',
-    'vr_fine0_pal_static',
-    'vr_fine1_static',
-    'vr_fine1_pal_static',
-    'vr_fine2_static',
-    'vr_fine2_pal_static',
-    'vr_fine3_static',
-    'vr_fine3_pal_static',
-    'vr_cloud0_static',
-    'vr_cloud0_pal_static',
-    'vr_cloud1_static',
-    'vr_cloud1_pal_static',
-    'vr_cloud2_static',
-    'vr_cloud2_pal_static',
-    'vr_cloud3_static',
-    'vr_cloud3_pal_static',
-    'vr_holy0_static',
-    'vr_holy0_pal_static',
-    'vr_holy1_static',
-    'vr_holy1_pal_static',
-    'vr_MDVR_static',
-    'vr_MDVR_pal_static',
-    'vr_MNVR_static',
-    'vr_MNVR_pal_static',
-    'vr_RUVR_static',
-    'vr_RUVR_pal_static',
-    'vr_LHVR_static',
-    'vr_LHVR_pal_static',
-    'vr_KHVR_static',
-    'vr_KHVR_pal_static',
-    'vr_K3VR_static',
-    'vr_K3VR_pal_static',
-    'vr_K4VR_static',
-    'vr_K4VR_pal_static',
-    'vr_K5VR_static',
-    'vr_K5VR_pal_static',
-    'vr_SP1a_static',
-    'vr_SP1a_pal_static',
-    'vr_MLVR_static',
-    'vr_MLVR_pal_static',
-    'vr_KKRVR_static',
-    'vr_KKRVR_pal_static',
-    'vr_KR3VR_static',
-    'vr_KR3VR_pal_static',
-    'vr_IPVR_static',
-    'vr_IPVR_pal_static',
-    'vr_KSVR_static',
-    'vr_KSVR_pal_static',
-    'vr_GLVR_static',
-    'vr_GLVR_pal_static',
-    'vr_ZRVR_static',
-    'vr_ZRVR_pal_static',
-    'vr_DGVR_static',
-    'vr_DGVR_pal_static',
-    'vr_ALVR_static',
-    'vr_ALVR_pal_static',
-    'vr_NSVR_static',
-    'vr_NSVR_pal_static',
-    'vr_LBVR_static',
-    'vr_LBVR_pal_static',
-    'vr_TTVR_static',
-    'vr_TTVR_pal_static',
-    'vr_FCVR_static',
-    'vr_FCVR_pal_static',
-    'elf_message_field',
-    'elf_message_ydan',
-    'syotes_scene',
-    'syotes_room_0',
-    'syotes2_scene',
-    'syotes2_room_0',
-    'depth_test_scene',
-    'depth_test_room_0',
-    'spot00_scene',
-    'spot00_room_0',
-    'spot01_scene',
-    'spot01_room_0',
-    'spot02_scene',
-    'spot02_room_0',
-    'spot02_room_1',
-    'spot03_scene',
-    'spot03_room_0',
-    'spot03_room_1',
-    'spot04_scene',
-    'spot04_room_0',
-    'spot04_room_1',
-    'spot04_room_2',
-    'spot05_scene',
-    'spot05_room_0',
-    'spot06_scene',
-    'spot06_room_0',
-    'spot07_scene',
-    'spot07_room_0',
-    'spot07_room_1',
-    'spot08_scene',
-    'spot08_room_0',
-    'spot09_scene',
-    'spot09_room_0',
-    'spot10_scene',
-    'spot10_room_0',
-    'spot10_room_1',
-    'spot10_room_2',
-    'spot10_room_3',
-    'spot10_room_4',
-    'spot10_room_5',
-    'spot10_room_6',
-    'spot10_room_7',
-    'spot10_room_8',
-    'spot10_room_9',
-    'spot11_scene',
-    'spot11_room_0',
-    'spot12_scene',
-    'spot12_room_0',
-    'spot12_room_1',
-    'spot13_scene',
-    'spot13_room_0',
-    'spot13_room_1',
-    'spot15_scene',
-    'spot15_room_0',
-    'spot16_scene',
-    'spot16_room_0',
-    'spot17_scene',
-    'spot17_room_0',
-    'spot17_room_1',
-    'spot18_scene',
-    'spot18_room_0',
-    'spot18_room_1',
-    'spot18_room_2',
-    'spot18_room_3',
-    'ydan_scene',
-    'ydan_room_0',
-    'ydan_room_1',
-    'ydan_room_2',
-    'ydan_room_3',
-    'ydan_room_4',
-    'ydan_room_5',
-    'ydan_room_6',
-    'ydan_room_7',
-    'ydan_room_8',
-    'ydan_room_9',
-    'ydan_room_10',
-    'ydan_room_11',
-    'ddan_scene',
-    'ddan_room_0',
-    'ddan_room_1',
-    'ddan_room_2',
-    'ddan_room_3',
-    'ddan_room_4',
-    'ddan_room_5',
-    'ddan_room_6',
-    'ddan_room_7',
-    'ddan_room_8',
-    'ddan_room_9',
-    'ddan_room_10',
-    'ddan_room_11',
-    'ddan_room_12',
-    'ddan_room_13',
-    'ddan_room_14',
-    'ddan_room_15',
-    'ddan_room_16',
-    'bdan_scene',
-    'bdan_room_0',
-    'bdan_room_1',
-    'bdan_room_2',
-    'bdan_room_3',
-    'bdan_room_4',
-    'bdan_room_5',
-    'bdan_room_6',
-    'bdan_room_7',
-    'bdan_room_8',
-    'bdan_room_9',
-    'bdan_room_10',
-    'bdan_room_11',
-    'bdan_room_12',
-    'bdan_room_13',
-    'bdan_room_14',
-    'bdan_room_15',
-    'Bmori1_scene',
-    'Bmori1_room_0',
-    'Bmori1_room_1',
-    'Bmori1_room_2',
-    'Bmori1_room_3',
-    'Bmori1_room_4',
-    'Bmori1_room_5',
-    'Bmori1_room_6',
-    'Bmori1_room_7',
-    'Bmori1_room_8',
-    'Bmori1_room_9',
-    'Bmori1_room_10',
-    'Bmori1_room_11',
-    'Bmori1_room_12',
-    'Bmori1_room_13',
-    'Bmori1_room_14',
-    'Bmori1_room_15',
-    'Bmori1_room_16',
-    'Bmori1_room_17',
-    'Bmori1_room_18',
-    'Bmori1_room_19',
-    'Bmori1_room_20',
-    'Bmori1_room_21',
-    'Bmori1_room_22',
-    'HIDAN_scene',
-    'HIDAN_room_0',
-    'HIDAN_room_1',
-    'HIDAN_room_2',
-    'HIDAN_room_3',
-    'HIDAN_room_4',
-    'HIDAN_room_5',
-    'HIDAN_room_6',
-    'HIDAN_room_7',
-    'HIDAN_room_8',
-    'HIDAN_room_9',
-    'HIDAN_room_10',
-    'HIDAN_room_11',
-    'HIDAN_room_12',
-    'HIDAN_room_13',
-    'HIDAN_room_14',
-    'HIDAN_room_15',
-    'HIDAN_room_16',
-    'HIDAN_room_17',
-    'HIDAN_room_18',
-    'HIDAN_room_19',
-    'HIDAN_room_20',
-    'HIDAN_room_21',
-    'HIDAN_room_22',
-    'HIDAN_room_23',
-    'HIDAN_room_24',
-    'HIDAN_room_25',
-    'HIDAN_room_26',
-    'MIZUsin_scene',
-    'MIZUsin_room_0',
-    'MIZUsin_room_1',
-    'MIZUsin_room_2',
-    'MIZUsin_room_3',
-    'MIZUsin_room_4',
-    'MIZUsin_room_5',
-    'MIZUsin_room_6',
-    'MIZUsin_room_7',
-    'MIZUsin_room_8',
-    'MIZUsin_room_9',
-    'MIZUsin_room_10',
-    'MIZUsin_room_11',
-    'MIZUsin_room_12',
-    'MIZUsin_room_13',
-    'MIZUsin_room_14',
-    'MIZUsin_room_15',
-    'MIZUsin_room_16',
-    'MIZUsin_room_17',
-    'MIZUsin_room_18',
-    'MIZUsin_room_19',
-    'MIZUsin_room_20',
-    'MIZUsin_room_21',
-    'MIZUsin_room_22',
-    'jyasinzou_scene',
-    'jyasinzou_room_0',
-    'jyasinzou_room_1',
-    'jyasinzou_room_2',
-    'jyasinzou_room_3',
-    'jyasinzou_room_4',
-    'jyasinzou_room_5',
-    'jyasinzou_room_6',
-    'jyasinzou_room_7',
-    'jyasinzou_room_8',
-    'jyasinzou_room_9',
-    'jyasinzou_room_10',
-    'jyasinzou_room_11',
-    'jyasinzou_room_12',
-    'jyasinzou_room_13',
-    'jyasinzou_room_14',
-    'jyasinzou_room_15',
-    'jyasinzou_room_16',
-    'jyasinzou_room_17',
-    'jyasinzou_room_18',
-    'jyasinzou_room_19',
-    'jyasinzou_room_20',
-    'jyasinzou_room_21',
-    'jyasinzou_room_22',
-    'jyasinzou_room_23',
-    'jyasinzou_room_24',
-    'jyasinzou_room_25',
-    'jyasinzou_room_26',
-    'jyasinzou_room_27',
-    'jyasinzou_room_28',
-    'HAKAdan_scene',
-    'HAKAdan_room_0',
-    'HAKAdan_room_1',
-    'HAKAdan_room_2',
-    'HAKAdan_room_3',
-    'HAKAdan_room_4',
-    'HAKAdan_room_5',
-    'HAKAdan_room_6',
-    'HAKAdan_room_7',
-    'HAKAdan_room_8',
-    'HAKAdan_room_9',
-    'HAKAdan_room_10',
-    'HAKAdan_room_11',
-    'HAKAdan_room_12',
-    'HAKAdan_room_13',
-    'HAKAdan_room_14',
-    'HAKAdan_room_15',
-    'HAKAdan_room_16',
-    'HAKAdan_room_17',
-    'HAKAdan_room_18',
-    'HAKAdan_room_19',
-    'HAKAdan_room_20',
-    'HAKAdan_room_21',
-    'HAKAdan_room_22',
-    'HAKAdanCH_scene',
-    'HAKAdanCH_room_0',
-    'HAKAdanCH_room_1',
-    'HAKAdanCH_room_2',
-    'HAKAdanCH_room_3',
-    'HAKAdanCH_room_4',
-    'HAKAdanCH_room_5',
-    'HAKAdanCH_room_6',
-    'ice_doukutu_scene',
-    'ice_doukutu_room_0',
-    'ice_doukutu_room_1',
-    'ice_doukutu_room_2',
-    'ice_doukutu_room_3',
-    'ice_doukutu_room_4',
-    'ice_doukutu_room_5',
-    'ice_doukutu_room_6',
-    'ice_doukutu_room_7',
-    'ice_doukutu_room_8',
-    'ice_doukutu_room_9',
-    'ice_doukutu_room_10',
-    'ice_doukutu_room_11',
-    'men_scene',
-    'men_room_0',
-    'men_room_1',
-    'men_room_2',
-    'men_room_3',
-    'men_room_4',
-    'men_room_5',
-    'men_room_6',
-    'men_room_7',
-    'men_room_8',
-    'men_room_9',
-    'men_room_10',
-    'ganontika_scene',
-    'ganontika_room_0',
-    'ganontika_room_1',
-    'ganontika_room_2',
-    'ganontika_room_3',
-    'ganontika_room_4',
-    'ganontika_room_5',
-    'ganontika_room_6',
-    'ganontika_room_7',
-    'ganontika_room_8',
-    'ganontika_room_9',
-    'ganontika_room_10',
-    'ganontika_room_11',
-    'ganontika_room_12',
-    'ganontika_room_13',
-    'ganontika_room_14',
-    'ganontika_room_15',
-    'ganontika_room_16',
-    'ganontika_room_17',
-    'ganontika_room_18',
-    'ganontika_room_19',
-    'market_day_scene',
-    'market_day_room_0',
-    'market_night_scene',
-    'market_night_room_0',
-    'testroom_scene',
-    'testroom_room_0',
-    'testroom_room_1',
-    'testroom_room_2',
-    'testroom_room_3',
-    'testroom_room_4',
-    'kenjyanoma_scene',
-    'kenjyanoma_room_0',
-    'tokinoma_scene',
-    'tokinoma_room_0',
-    'tokinoma_room_1',
-    'sutaru_scene',
-    'sutaru_room_0',
-    'link_home_scene',
-    'link_home_room_0',
-    'kokiri_shop_scene',
-    'kokiri_shop_room_0',
-    'kokiri_home_scene',
-    'kokiri_home_room_0',
-    'kakusiana_scene',
-    'kakusiana_room_0',
-    'kakusiana_room_1',
-    'kakusiana_room_2',
-    'kakusiana_room_3',
-    'kakusiana_room_4',
-    'kakusiana_room_5',
-    'kakusiana_room_6',
-    'kakusiana_room_7',
-    'kakusiana_room_8',
-    'kakusiana_room_9',
-    'kakusiana_room_10',
-    'kakusiana_room_11',
-    'kakusiana_room_12',
-    'kakusiana_room_13',
-    'entra_scene',
-    'entra_room_0',
-    'moribossroom_scene',
-    'moribossroom_room_0',
-    'moribossroom_room_1',
-    'syatekijyou_scene',
-    'syatekijyou_room_0',
-    'shop1_scene',
-    'shop1_room_0',
-    'hairal_niwa_scene',
-    'hairal_niwa_room_0',
-    'ganon_tou_scene',
-    'ganon_tou_room_0',
-    'sasatest_scene',
-    'sasatest_room_0',
-    'market_alley_scene',
-    'market_alley_room_0',
-    'spot20_scene',
-    'spot20_room_0',
-    'market_ruins_scene',
-    'market_ruins_room_0',
-    'entra_n_scene',
-    'entra_n_room_0',
-    'enrui_scene',
-    'enrui_room_0',
-    'market_alley_n_scene',
-    'market_alley_n_room_0',
-    'hiral_demo_scene',
-    'hiral_demo_room_0',
-    'kokiri_home3_scene',
-    'kokiri_home3_room_0',
-    'malon_stable_scene',
-    'malon_stable_room_0',
-    'kakariko_scene',
-    'kakariko_room_0',
-    'bdan_boss_scene',
-    'bdan_boss_room_0',
-    'bdan_boss_room_1',
-    'FIRE_bs_scene',
-    'FIRE_bs_room_0',
-    'FIRE_bs_room_1',
-    'hut_scene',
-    'hut_room_0',
-    'daiyousei_izumi_scene',
-    'daiyousei_izumi_room_0',
-    'hakaana_scene',
-    'hakaana_room_0',
-    'yousei_izumi_tate_scene',
-    'yousei_izumi_tate_room_0',
-    'yousei_izumi_yoko_scene',
-    'yousei_izumi_yoko_room_0',
-    'golon_scene',
-    'golon_room_0',
-    'zoora_scene',
-    'zoora_room_0',
-    'drag_scene',
-    'drag_room_0',
-    'alley_shop_scene',
-    'alley_shop_room_0',
-    'night_shop_scene',
-    'night_shop_room_0',
-    'impa_scene',
-    'impa_room_0',
-    'labo_scene',
-    'labo_room_0',
-    'tent_scene',
-    'tent_room_0',
-    'nakaniwa_scene',
-    'nakaniwa_room_0',
-    'ddan_boss_scene',
-    'ddan_boss_room_0',
-    'ddan_boss_room_1',
-    'ydan_boss_scene',
-    'ydan_boss_room_0',
-    'ydan_boss_room_1',
-    'HAKAdan_bs_scene',
-    'HAKAdan_bs_room_0',
-    'HAKAdan_bs_room_1',
-    'MIZUsin_bs_scene',
-    'MIZUsin_bs_room_0',
-    'MIZUsin_bs_room_1',
-    'ganon_scene',
-    'ganon_room_0',
-    'ganon_room_1',
-    'ganon_room_2',
-    'ganon_room_3',
-    'ganon_room_4',
-    'ganon_room_5',
-    'ganon_room_6',
-    'ganon_room_7',
-    'ganon_room_8',
-    'ganon_room_9',
-    'ganon_boss_scene',
-    'ganon_boss_room_0',
-    'jyasinboss_scene',
-    'jyasinboss_room_0',
-    'jyasinboss_room_1',
-    'jyasinboss_room_2',
-    'jyasinboss_room_3',
-    'kokiri_home4_scene',
-    'kokiri_home4_room_0',
-    'kokiri_home5_scene',
-    'kokiri_home5_room_0',
-    'ganon_final_scene',
-    'ganon_final_room_0',
-    'kakariko3_scene',
-    'kakariko3_room_0',
-    'hairal_niwa2_scene',
-    'hairal_niwa2_room_0',
-    'hakasitarelay_scene',
-    'hakasitarelay_room_0',
-    'hakasitarelay_room_1',
-    'hakasitarelay_room_2',
-    'hakasitarelay_room_3',
-    'hakasitarelay_room_4',
-    'hakasitarelay_room_5',
-    'hakasitarelay_room_6',
-    'shrine_scene',
-    'shrine_room_0',
-    'turibori_scene',
-    'turibori_room_0',
-    'shrine_n_scene',
-    'shrine_n_room_0',
-    'shrine_r_scene',
-    'shrine_r_room_0',
-    'hakaana2_scene',
-    'hakaana2_room_0',
-    'gerudoway_scene',
-    'gerudoway_room_0',
-    'gerudoway_room_1',
-    'gerudoway_room_2',
-    'gerudoway_room_3',
-    'gerudoway_room_4',
-    'gerudoway_room_5',
-    'hairal_niwa_n_scene',
-    'hairal_niwa_n_room_0',
-    'bowling_scene',
-    'bowling_room_0',
-    'hakaana_ouke_scene',
-    'hakaana_ouke_room_0',
-    'hakaana_ouke_room_1',
-    'hakaana_ouke_room_2',
-    'hylia_labo_scene',
-    'hylia_labo_room_0',
-    'souko_scene',
-    'souko_room_0',
-    'souko_room_1',
-    'souko_room_2',
-    'miharigoya_scene',
-    'miharigoya_room_0',
-    'mahouya_scene',
-    'mahouya_room_0',
-    'takaraya_scene',
-    'takaraya_room_0',
-    'takaraya_room_1',
-    'takaraya_room_2',
-    'takaraya_room_3',
-    'takaraya_room_4',
-    'takaraya_room_5',
-    'takaraya_room_6',
-    'ganon_sonogo_scene',
-    'ganon_sonogo_room_0',
-    'ganon_sonogo_room_1',
-    'ganon_sonogo_room_2',
-    'ganon_sonogo_room_3',
-    'ganon_sonogo_room_4',
-    'ganon_demo_scene',
-    'ganon_demo_room_0',
-    'besitu_scene',
-    'besitu_room_0',
-    'face_shop_scene',
-    'face_shop_room_0',
-    'kinsuta_scene',
-    'kinsuta_room_0',
-    'ganontikasonogo_scene',
-    'ganontikasonogo_room_0',
-    'ganontikasonogo_room_1',
-    'test01_scene',
-    'test01_room_0',
-    'bump_texture_static',
-    'anime_model_1_static',
-    'anime_model_2_static',
-    'anime_model_3_static',
-    'anime_model_4_static',
-    'anime_model_5_static',
-    'anime_model_6_static',
-    'anime_texture_1_static',
-    'anime_texture_2_static',
-    'anime_texture_3_static',
-    'anime_texture_4_static',
-    'anime_texture_5_static',
-    'anime_texture_6_static',
-    'softsprite_matrix_static',
-]
-
-romData = None
-
-
-def initialize_worker(rom_data):
-    global romData
-    romData = rom_data
-
-def read_uint32_be(offset):
-    return struct.unpack('>I', romData[offset:offset+4])[0]
-
-def write_output_file(name, offset, size):
-    try:
-        with open(name, 'wb') as f:
-            f.write(romData[offset:offset+size])
-    except IOError:
-        print('failed to write file ' + name)
-
-def ExtractFunc(i):
-    filename = 'baserom/' + FILE_NAMES[i]
-    entryOffset = FILE_TABLE_OFFSET + 16 * i
-
-    virtStart = read_uint32_be(entryOffset + 0)
-    virtEnd   = read_uint32_be(entryOffset + 4)
-    physStart = read_uint32_be(entryOffset + 8)
-    physEnd   = read_uint32_be(entryOffset + 12)
-
-    if physEnd == 0:  # uncompressed
-        compressed = False
-        size = virtEnd - virtStart
-    else:             # compressed
-        compressed = True
-        size = physEnd - physStart
-    
-    print('extracting ' + filename + " (0x%08X, 0x%08X)" % (virtStart, virtEnd))
-    write_output_file(filename, physStart, size)
-    if compressed:
-        os.system('tools/yaz0 -d ' + filename + ' ' + filename)
-
-#####################################################################
-
-def main():
-    try:
-        os.mkdir('baserom')
-    except:
-        pass
-
-    # read baserom data
-    try:
-        with open(ROM_FILE_NAME, 'rb') as f:
-            rom_data = f.read()
-    except IOError:
-        print('failed to read ' + ROM_FILE_NAME)
-        sys.exit(1)
-
-    # extract files
-    num_cores = cpu_count()
-    print("Extracting baserom with " + str(num_cores) + " CPU cores.")
-    with Pool(num_cores, initialize_worker, (rom_data,)) as p:
-        p.map(ExtractFunc, range(len(FILE_NAMES)))
-
-if __name__ == "__main__":
-    main()

From baf366c0864c154c7bc6c739ea3f3ba3099392a9 Mon Sep 17 00:00:00 2001
From: Emil Lenngren <emil.lenngren@gmail.com>
Date: Mon, 25 Apr 2022 22:53:06 +0200
Subject: [PATCH 15/26] Modify grayscale intensity for item icons to match
 original

---
 soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c | 2 +-
 soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 c21ef4ca7..1e778663d 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
@@ -578,7 +578,7 @@ void KaleidoScope_DrawEquipment(GlobalContext* globalCtx) {
                 int itemId = ITEM_SWORD_KOKIRI + temp;
                 bool not_acquired = (gItemAgeReqs[itemId] != 9) && (gItemAgeReqs[itemId] != gSaveContext.linkAge);
                 if (not_acquired) {
-                    gsDPSetGrayscaleColor(POLY_KAL_DISP++, 100, 100, 100);
+                    gsDPSetGrayscaleColor(POLY_KAL_DISP++, 109, 109, 109);
                     gsSPGrayscale(POLY_KAL_DISP++, true);
                 }
                 KaleidoScope_DrawQuadTextureRGBA32(globalCtx->state.gfxCtx, gItemIcons[itemId], 32, 32, point);
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 7f7d81075..2ce63cf51 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
@@ -470,7 +470,7 @@ void KaleidoScope_DrawItemSelect(GlobalContext* globalCtx) {
             int itemId = gSaveContext.inventory.items[i];
             bool not_acquired = (gItemAgeReqs[itemId] != 9) && (gItemAgeReqs[itemId] != gSaveContext.linkAge);
             if (not_acquired) {
-                gsDPSetGrayscaleColor(POLY_KAL_DISP++, 100, 100, 100);
+                gsDPSetGrayscaleColor(POLY_KAL_DISP++, 109, 109, 109);
                 gsSPGrayscale(POLY_KAL_DISP++, true);
             }
             KaleidoScope_DrawQuadTextureRGBA32(globalCtx->state.gfxCtx, gItemIcons[itemId], 32,

From eecad3dc1513f0dd62e8022c86ae1f07c1598a76 Mon Sep 17 00:00:00 2001
From: vaguerant <vaguerant@users.noreply.github.com>
Date: Sat, 23 Apr 2022 16:31:02 +1000
Subject: [PATCH 16/26] Credits message order fix by rink

---
 soh/src/code/z_message_PAL.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/soh/src/code/z_message_PAL.c b/soh/src/code/z_message_PAL.c
index 4780044a6..8b9410018 100644
--- a/soh/src/code/z_message_PAL.c
+++ b/soh/src/code/z_message_PAL.c
@@ -391,7 +391,7 @@ void Message_FindCreditsMessage(GlobalContext* globalCtx, u16 textId) {
         if (messageTableEntry->textId == textId) {
             foundSeg = messageTableEntry->segment;
             font->charTexBuf[0] = messageTableEntry->typePos;
-            messageTableEntry++;
+            //messageTableEntry++;
             nextSeg = messageTableEntry->segment;
             font->msgOffset = messageTableEntry->segment;
             font->msgLength = messageTableEntry->msgSize;

From 0ea9612b7e1ea82b771b0d85a42a86f9bd530b4a Mon Sep 17 00:00:00 2001
From: KiritoDev <36680385+KiritoDv@users.noreply.github.com>
Date: Mon, 25 Apr 2022 17:04:15 -0500
Subject: [PATCH 17/26] Moved vismono effect to the gpu

---
 .../libultraship/Lib/Fast3D/U64/PR/ultra64/gbi.h      |  4 ++--
 .../libultraship/Lib/Fast3D/gfx_direct3d_common.cpp   |  3 ++-
 libultraship/libultraship/Lib/Fast3D/gfx_opengl.cpp   |  3 ++-
 soh/src/code/z_play.c                                 | 11 +++++++----
 soh/src/overlays/actors/ovl_End_Title/z_end_title.c   |  5 ++++-
 soh/src/overlays/gamestates/ovl_title/z_title.c       |  2 ++
 .../misc/ovl_kaleido_scope/z_kaleido_equipment.c      |  2 +-
 .../overlays/misc/ovl_kaleido_scope/z_kaleido_item.c  |  2 +-
 8 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/libultraship/libultraship/Lib/Fast3D/U64/PR/ultra64/gbi.h b/libultraship/libultraship/Lib/Fast3D/U64/PR/ultra64/gbi.h
index 3b4b8f7d8..b91856ef6 100644
--- a/libultraship/libultraship/Lib/Fast3D/U64/PR/ultra64/gbi.h
+++ b/libultraship/libultraship/Lib/Fast3D/U64/PR/ultra64/gbi.h
@@ -3175,8 +3175,8 @@ _DW({                                   \
              (_SHIFTL(r, 24, 8) | _SHIFTL(g, 16, 8) |   \
               _SHIFTL(b, 8, 8) | _SHIFTL(a, 0, 8)))
 
-#define gsDPSetGrayscaleColor(pkt, r, g, b)              \
-            DPRGBColor(pkt, G_SETINTENSITY, r, g, b, 255)
+#define gsDPSetGrayscaleColor(pkt, r, g, b, lerp)       \
+            DPRGBColor(pkt, G_SETINTENSITY, r, g, b, lerp)
 #define gDPSetEnvColor(pkt, r, g, b, a)                 \
             DPRGBColor(pkt, G_SETENVCOLOR, r,g,b,a)
 #define gsDPSetEnvColor(r, g, b, a)                 \
diff --git a/libultraship/libultraship/Lib/Fast3D/gfx_direct3d_common.cpp b/libultraship/libultraship/Lib/Fast3D/gfx_direct3d_common.cpp
index 8df273be7..a8197b321 100644
--- a/libultraship/libultraship/Lib/Fast3D/gfx_direct3d_common.cpp
+++ b/libultraship/libultraship/Lib/Fast3D/gfx_direct3d_common.cpp
@@ -310,7 +310,8 @@ void gfx_direct3d_common_build_shader(char buf[4096], size_t& len, size_t& num_f
 
     if (cc_features.opt_grayscale) {
         append_line(buf, &len, "float intensity = (texel.r + texel.g + texel.b) / 3.0;");
-        append_line(buf, &len, "texel.rgb = input.grayscale.rgb * intensity;");
+        append_line(buf, &len, "float3 new_texel = input.grayscale.rgb * intensity;");
+        append_line(buf, &len, "texel.rgb = input.grayscale.a > 0 ? lerp(texel.rgb, new_texel, input.grayscale.a) : new_texel;");
     }
 
     if (cc_features.opt_alpha && cc_features.opt_noise) {
diff --git a/libultraship/libultraship/Lib/Fast3D/gfx_opengl.cpp b/libultraship/libultraship/Lib/Fast3D/gfx_opengl.cpp
index 808b0a558..c8dc4666e 100644
--- a/libultraship/libultraship/Lib/Fast3D/gfx_opengl.cpp
+++ b/libultraship/libultraship/Lib/Fast3D/gfx_opengl.cpp
@@ -370,7 +370,8 @@ static struct ShaderProgram* gfx_opengl_create_and_load_new_shader(uint64_t shad
 
     if (cc_features.opt_grayscale) {
         append_line(fs_buf, &fs_len, "float intensity = (texel.r + texel.g + texel.b) / 3.0;");
-        append_line(fs_buf, &fs_len, "texel.rgb = vGrayscaleColor.rgb * intensity;");
+        append_line(fs_buf, &fs_len, "vec3 new_texel = vGrayscaleColor.rgb * intensity;");
+        append_line(fs_buf, &fs_len, "texel.rgb = vGrayscaleColor.a > 0 ? mix(texel.rgb, new_texel, vGrayscaleColor.a) : new_texel;");
     }
 
     if (cc_features.opt_alpha) {
diff --git a/soh/src/code/z_play.c b/soh/src/code/z_play.c
index 193b14164..f62e719ba 100644
--- a/soh/src/code/z_play.c
+++ b/soh/src/code/z_play.c
@@ -1,3 +1,5 @@
+#include <stdio.h>
+
 #include "global.h"
 #include "vt.h"
 
@@ -1119,6 +1121,7 @@ void Gameplay_Draw(GlobalContext* globalCtx) {
 
             gfxP = Graph_GfxPlusOne(sp1CC);
             gSPDisplayList(OVERLAY_DISP++, gfxP);
+            gsSPGrayscale(gfxP++, false);
 
             if ((globalCtx->transitionMode == 3) || (globalCtx->transitionMode == 11) ||
                 (globalCtx->transitionCtx.transitionType >= 56)) {
@@ -1136,8 +1139,8 @@ void Gameplay_Draw(GlobalContext* globalCtx) {
             TransitionFade_Draw(&globalCtx->transitionFade, &gfxP);
 
             if (D_801614B0.a > 0) {
-                D_80161498.primColor.rgba = D_801614B0.rgba;
-                VisMono_Draw(&D_80161498, &gfxP);
+                gsDPSetGrayscaleColor(gfxP++, D_801614B0.r, D_801614B0.g, D_801614B0.b, D_801614B0.a);
+                gsSPGrayscale(gfxP++, true);
             }
 
             gSPEndDisplayList(gfxP++);
@@ -1171,7 +1174,7 @@ void Gameplay_Draw(GlobalContext* globalCtx) {
 
                 //goto Gameplay_Draw_DrawOverlayElements;
             }
-            //else 
+            //else
             {
                 s32 sp80;
 
@@ -1472,7 +1475,7 @@ void Gameplay_InitEnvironment(GlobalContext* globalCtx, s16 skyboxId) {
     Environment_Init(globalCtx, &globalCtx->envCtx, 0);
 }
 
-void Gameplay_InitScene(GlobalContext* globalCtx, s32 spawn) 
+void Gameplay_InitScene(GlobalContext* globalCtx, s32 spawn)
 {
     globalCtx->curSpawn = spawn;
     globalCtx->linkActorEntry = NULL;
diff --git a/soh/src/overlays/actors/ovl_End_Title/z_end_title.c b/soh/src/overlays/actors/ovl_End_Title/z_end_title.c
index f76ac084d..0c903bb80 100644
--- a/soh/src/overlays/actors/ovl_End_Title/z_end_title.c
+++ b/soh/src/overlays/actors/ovl_End_Title/z_end_title.c
@@ -84,6 +84,8 @@ void EndTitle_DrawFull(Actor* thisx, GlobalContext* globalCtx) {
     }
 
     OVERLAY_DISP = func_80093F34(OVERLAY_DISP);
+    if (D_801614B0.a > 0)
+        gsSPGrayscale(OVERLAY_DISP++, false);
     gDPSetTextureLUT(OVERLAY_DISP++, G_TT_NONE);
     gDPSetEnvColor(OVERLAY_DISP++, 255, 120, 30, 0);
     gDPSetRenderMode(OVERLAY_DISP++, G_RM_PASS, G_RM_XLU_SURF2);
@@ -108,7 +110,8 @@ void EndTitle_DrawFull(Actor* thisx, GlobalContext* globalCtx) {
                        G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 0, 0, 0, 0);
     gSPTextureRectangle(OVERLAY_DISP++, 104 << 2, 177 << 2, 216 << 2, 192 << 2, G_TX_RENDERTILE, 0, 0, 1 << 10,
                         1 << 10);
-
+    if (D_801614B0.a > 0)
+        gsSPGrayscale(OVERLAY_DISP++, true);
     CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_end_title.c", 515);
 }
 
diff --git a/soh/src/overlays/gamestates/ovl_title/z_title.c b/soh/src/overlays/gamestates/ovl_title/z_title.c
index 3b7cfe84c..380720dd1 100644
--- a/soh/src/overlays/gamestates/ovl_title/z_title.c
+++ b/soh/src/overlays/gamestates/ovl_title/z_title.c
@@ -271,6 +271,8 @@ void Title_Init(GameState* thisx) {
 
     //ResourceMgr_CacheDirectory("nintendo_rogo_static*");
 
+    // Disable vismono
+    D_801614B0.a = 0;
     R_UPDATE_RATE = 1;
     Matrix_Init(&this->state);
     View_Init(&this->view, this->state.gfxCtx);
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 1e778663d..ba981c58f 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
@@ -578,7 +578,7 @@ void KaleidoScope_DrawEquipment(GlobalContext* globalCtx) {
                 int itemId = ITEM_SWORD_KOKIRI + temp;
                 bool not_acquired = (gItemAgeReqs[itemId] != 9) && (gItemAgeReqs[itemId] != gSaveContext.linkAge);
                 if (not_acquired) {
-                    gsDPSetGrayscaleColor(POLY_KAL_DISP++, 109, 109, 109);
+                    gsDPSetGrayscaleColor(POLY_KAL_DISP++, 109, 109, 109, 0);
                     gsSPGrayscale(POLY_KAL_DISP++, true);
                 }
                 KaleidoScope_DrawQuadTextureRGBA32(globalCtx->state.gfxCtx, gItemIcons[itemId], 32, 32, point);
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 2ce63cf51..26f37deb9 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
@@ -470,7 +470,7 @@ void KaleidoScope_DrawItemSelect(GlobalContext* globalCtx) {
             int itemId = gSaveContext.inventory.items[i];
             bool not_acquired = (gItemAgeReqs[itemId] != 9) && (gItemAgeReqs[itemId] != gSaveContext.linkAge);
             if (not_acquired) {
-                gsDPSetGrayscaleColor(POLY_KAL_DISP++, 109, 109, 109);
+                gsDPSetGrayscaleColor(POLY_KAL_DISP++, 109, 109, 109, 0);
                 gsSPGrayscale(POLY_KAL_DISP++, true);
             }
             KaleidoScope_DrawQuadTextureRGBA32(globalCtx->state.gfxCtx, gItemIcons[itemId], 32,

From f5f2205d0f0a1f2fcbedaa8b648d83113e7ab3d7 Mon Sep 17 00:00:00 2001
From: KiritoDev <36680385+KiritoDv@users.noreply.github.com>
Date: Mon, 25 Apr 2022 17:07:40 -0500
Subject: [PATCH 18/26] Removed stdio and added documentation

---
 libultraship/libultraship/Lib/Fast3D/U64/PR/ultra64/gbi.h | 2 +-
 libultraship/libultraship/Lib/Fast3D/gfx_pc.cpp           | 2 +-
 soh/src/code/z_play.c                                     | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/libultraship/libultraship/Lib/Fast3D/U64/PR/ultra64/gbi.h b/libultraship/libultraship/Lib/Fast3D/U64/PR/ultra64/gbi.h
index b91856ef6..8af624e8f 100644
--- a/libultraship/libultraship/Lib/Fast3D/U64/PR/ultra64/gbi.h
+++ b/libultraship/libultraship/Lib/Fast3D/U64/PR/ultra64/gbi.h
@@ -3175,7 +3175,7 @@ _DW({                                   \
              (_SHIFTL(r, 24, 8) | _SHIFTL(g, 16, 8) |   \
               _SHIFTL(b, 8, 8) | _SHIFTL(a, 0, 8)))
 
-#define gsDPSetGrayscaleColor(pkt, r, g, b, lerp)       \
+#define gsDPSetGrayscaleColor(pkt, r, g, b, lerp)        \
             DPRGBColor(pkt, G_SETINTENSITY, r, g, b, lerp)
 #define gDPSetEnvColor(pkt, r, g, b, a)                 \
             DPRGBColor(pkt, G_SETENVCOLOR, r,g,b,a)
diff --git a/libultraship/libultraship/Lib/Fast3D/gfx_pc.cpp b/libultraship/libultraship/Lib/Fast3D/gfx_pc.cpp
index 130d07b73..1d03befe6 100644
--- a/libultraship/libultraship/Lib/Fast3D/gfx_pc.cpp
+++ b/libultraship/libultraship/Lib/Fast3D/gfx_pc.cpp
@@ -1397,7 +1397,7 @@ static void gfx_sp_tri1(uint8_t vtx1_idx, uint8_t vtx2_idx, uint8_t vtx3_idx, bo
             buf_vbo[buf_vbo_len++] = rdp.grayscale_color.r / 255.0f;
             buf_vbo[buf_vbo_len++] = rdp.grayscale_color.g / 255.0f;
             buf_vbo[buf_vbo_len++] = rdp.grayscale_color.b / 255.0f;
-            buf_vbo[buf_vbo_len++] = rdp.grayscale_color.a / 255.0f; // Unused
+            buf_vbo[buf_vbo_len++] = rdp.grayscale_color.a / 255.0f; // lerp interpolation factor (not alpha)
         }
 
         for (int j = 0; j < num_inputs; j++) {
diff --git a/soh/src/code/z_play.c b/soh/src/code/z_play.c
index f62e719ba..6218b7d76 100644
--- a/soh/src/code/z_play.c
+++ b/soh/src/code/z_play.c
@@ -1,5 +1,3 @@
-#include <stdio.h>
-
 #include "global.h"
 #include "vt.h"
 

From 6991549cde13791a094cecd383ba38baf80d3719 Mon Sep 17 00:00:00 2001
From: KiritoDev <36680385+KiritoDv@users.noreply.github.com>
Date: Mon, 25 Apr 2022 17:56:52 -0500
Subject: [PATCH 19/26] Removed ternary operator

---
 libultraship/libultraship/Lib/Fast3D/gfx_direct3d_common.cpp  | 2 +-
 libultraship/libultraship/Lib/Fast3D/gfx_opengl.cpp           | 2 +-
 soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c | 2 +-
 soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libultraship/libultraship/Lib/Fast3D/gfx_direct3d_common.cpp b/libultraship/libultraship/Lib/Fast3D/gfx_direct3d_common.cpp
index a8197b321..2c10e6605 100644
--- a/libultraship/libultraship/Lib/Fast3D/gfx_direct3d_common.cpp
+++ b/libultraship/libultraship/Lib/Fast3D/gfx_direct3d_common.cpp
@@ -311,7 +311,7 @@ void gfx_direct3d_common_build_shader(char buf[4096], size_t& len, size_t& num_f
     if (cc_features.opt_grayscale) {
         append_line(buf, &len, "float intensity = (texel.r + texel.g + texel.b) / 3.0;");
         append_line(buf, &len, "float3 new_texel = input.grayscale.rgb * intensity;");
-        append_line(buf, &len, "texel.rgb = input.grayscale.a > 0 ? lerp(texel.rgb, new_texel, input.grayscale.a) : new_texel;");
+        append_line(buf, &len, "texel.rgb = lerp(texel.rgb, new_texel, input.grayscale.a);");
     }
 
     if (cc_features.opt_alpha && cc_features.opt_noise) {
diff --git a/libultraship/libultraship/Lib/Fast3D/gfx_opengl.cpp b/libultraship/libultraship/Lib/Fast3D/gfx_opengl.cpp
index c8dc4666e..6f3017c15 100644
--- a/libultraship/libultraship/Lib/Fast3D/gfx_opengl.cpp
+++ b/libultraship/libultraship/Lib/Fast3D/gfx_opengl.cpp
@@ -371,7 +371,7 @@ static struct ShaderProgram* gfx_opengl_create_and_load_new_shader(uint64_t shad
     if (cc_features.opt_grayscale) {
         append_line(fs_buf, &fs_len, "float intensity = (texel.r + texel.g + texel.b) / 3.0;");
         append_line(fs_buf, &fs_len, "vec3 new_texel = vGrayscaleColor.rgb * intensity;");
-        append_line(fs_buf, &fs_len, "texel.rgb = vGrayscaleColor.a > 0 ? mix(texel.rgb, new_texel, vGrayscaleColor.a) : new_texel;");
+        append_line(fs_buf, &fs_len, "texel.rgb = mix(texel.rgb, new_texel, vGrayscaleColor.a);");
     }
 
     if (cc_features.opt_alpha) {
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 ba981c58f..5b90725e1 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
@@ -578,7 +578,7 @@ void KaleidoScope_DrawEquipment(GlobalContext* globalCtx) {
                 int itemId = ITEM_SWORD_KOKIRI + temp;
                 bool not_acquired = (gItemAgeReqs[itemId] != 9) && (gItemAgeReqs[itemId] != gSaveContext.linkAge);
                 if (not_acquired) {
-                    gsDPSetGrayscaleColor(POLY_KAL_DISP++, 109, 109, 109, 0);
+                    gsDPSetGrayscaleColor(POLY_KAL_DISP++, 109, 109, 109, 255);
                     gsSPGrayscale(POLY_KAL_DISP++, true);
                 }
                 KaleidoScope_DrawQuadTextureRGBA32(globalCtx->state.gfxCtx, gItemIcons[itemId], 32, 32, point);
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 26f37deb9..52c04908f 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
@@ -470,7 +470,7 @@ void KaleidoScope_DrawItemSelect(GlobalContext* globalCtx) {
             int itemId = gSaveContext.inventory.items[i];
             bool not_acquired = (gItemAgeReqs[itemId] != 9) && (gItemAgeReqs[itemId] != gSaveContext.linkAge);
             if (not_acquired) {
-                gsDPSetGrayscaleColor(POLY_KAL_DISP++, 109, 109, 109, 0);
+                gsDPSetGrayscaleColor(POLY_KAL_DISP++, 109, 109, 109, 255);
                 gsSPGrayscale(POLY_KAL_DISP++, true);
             }
             KaleidoScope_DrawQuadTextureRGBA32(globalCtx->state.gfxCtx, gItemIcons[itemId], 32,

From 4869eea9686d3f28f79d8af67fb09efd16e34c22 Mon Sep 17 00:00:00 2001
From: Emil Lenngren <emil.lenngren@gmail.com>
Date: Tue, 26 Apr 2022 00:24:21 +0200
Subject: [PATCH 20/26] Fix random crash in z_construct

---
 soh/src/code/z_construct.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/soh/src/code/z_construct.c b/soh/src/code/z_construct.c
index 5149fd974..c74d3c14c 100644
--- a/soh/src/code/z_construct.c
+++ b/soh/src/code/z_construct.c
@@ -56,7 +56,8 @@ void func_801109B0(GlobalContext* globalCtx) {
         doActionOffset = 0x5700;
     }
 
-    memcpy(interfaceCtx->doActionSegment, ResourceMgr_LoadTexByName(gAttackDoActionENGTex), 0x300);
+    memcpy(interfaceCtx->doActionSegment, ResourceMgr_LoadTexByName(gAttackDoActionENGTex), 0x180);
+    memcpy(interfaceCtx->doActionSegment + 0x180, ResourceMgr_LoadTexByName(gCheckDoActionENGTex), 0x180);
     //DmaMgr_SendRequest1(interfaceCtx->doActionSegment, (uintptr_t)_do_action_staticSegmentRomStart + doActionOffset, 0x300,
                         //"../z_construct.c", 174);
 

From b82871e62f4934787e9585116469c161816c9670 Mon Sep 17 00:00:00 2001
From: IShallRiseAgain <49771132+IShallRiseAgain@users.noreply.github.com>
Date: Tue, 26 Apr 2022 18:33:18 -0400
Subject: [PATCH 21/26] Added custom color support for Tunic and Navi (#98)

---
 libultraship/libultraship/GameSettings.cpp | 123 ++++++++++++++
 libultraship/libultraship/GameSettings.h   |  42 +++++
 libultraship/libultraship/SohImGuiImpl.cpp | 178 +++++++++++++++++++++
 soh/src/code/z_actor.c                     |  32 ++++
 soh/src/code/z_player_lib.c                |  23 ++-
 5 files changed, 396 insertions(+), 2 deletions(-)

diff --git a/libultraship/libultraship/GameSettings.cpp b/libultraship/libultraship/GameSettings.cpp
index c056dec71..5e02037de 100644
--- a/libultraship/libultraship/GameSettings.cpp
+++ b/libultraship/libultraship/GameSettings.cpp
@@ -27,8 +27,10 @@ namespace Game {
     const std::string AudioSection = AUDIO_SECTION;
     const std::string ControllerSection = CONTROLLER_SECTION;
     const std::string EnhancementSection = ENHANCEMENTS_SECTION;
+    const std::string CosmeticsSection = COSMETICS_SECTION;
     const std::string CheatSection = CHEATS_SECTION;
 
+
     void UpdateAudio() {
         Audio_SetGameVolume(SEQ_BGM_MAIN, Settings.audio.music_main);
         Audio_SetGameVolume(SEQ_BGM_SUB, Settings.audio.music_sub);
@@ -103,6 +105,84 @@ namespace Game {
         CVar_SetFloat("gInputScale", Settings.controller.input_scale);
 
         Settings.controller.input_enabled = stob(Conf[ControllerSection]["input_enabled"]);
+
+        CVar_SetS32(const_cast<char*>("gInputEnabled"), Settings.controller.input_enabled);
+        //Tunics
+        Settings.cosmetic.tunic_kokiri_red = (Conf[CosmeticsSection]["tunic_kokiri_red"] != "") ? Ship::stoi(Conf[CosmeticsSection]["tunic_kokiri_red"]) : Settings.cosmetic.tunic_kokiri_red;
+        CVar_SetS32(const_cast<char*>("gTunic_Kokiri_Red"), Settings.cosmetic.tunic_kokiri_red);
+        Settings.cosmetic.tunic_kokiri_green = (Conf[CosmeticsSection]["tunic_kokiri_green"] != "") ? Ship::stoi(Conf[CosmeticsSection]["tunic_kokiri_green"]) : Settings.cosmetic.tunic_kokiri_green;
+        CVar_SetS32(const_cast<char*>("gTunic_Kokiri_Green"), Settings.cosmetic.tunic_kokiri_green);
+        Settings.cosmetic.tunic_kokiri_blue = (Conf[CosmeticsSection]["tunic_kokiri_blue"] != "") ? Ship::stoi(Conf[CosmeticsSection]["tunic_kokiri_blue"]) : Settings.cosmetic.tunic_kokiri_blue;
+        CVar_SetS32(const_cast<char*>("gTunic_Kokiri_Blue"), Settings.cosmetic.tunic_kokiri_blue);
+
+        Settings.cosmetic.tunic_goron_red = (Conf[CosmeticsSection]["tunic_goron_red"] != "") ? Ship::stoi(Conf[CosmeticsSection]["tunic_goron_red"]) : Settings.cosmetic.tunic_goron_red;
+        CVar_SetS32(const_cast<char*>("gTunic_Goron_Red"), Settings.cosmetic.tunic_goron_red);
+        Settings.cosmetic.tunic_goron_green = (Conf[CosmeticsSection]["tunic_goron_green"] != "") ? Ship::stoi(Conf[CosmeticsSection]["tunic_goron_green"]) : Settings.cosmetic.tunic_goron_green;
+        CVar_SetS32(const_cast<char*>("gTunic_Goron_Green"), Settings.cosmetic.tunic_goron_green);
+        Settings.cosmetic.tunic_goron_blue = (Conf[CosmeticsSection]["tunic_goron_blue"] != "") ? Ship::stoi(Conf[CosmeticsSection]["tunic_goron_blue"]) : Settings.cosmetic.tunic_goron_blue;
+        CVar_SetS32(const_cast<char*>("gTunic_Goron_Blue"), Settings.cosmetic.tunic_goron_blue);
+
+        Settings.cosmetic.tunic_zora_red = (Conf[CosmeticsSection]["tunic_zora_green"] != "") ? Ship::stoi(Conf[CosmeticsSection]["tunic_zora_red"]) : Settings.cosmetic.tunic_zora_red;
+        CVar_SetS32(const_cast<char*>("gTunic_Zora_Red"), Settings.cosmetic.tunic_zora_red);
+        Settings.cosmetic.tunic_zora_green = (Conf[CosmeticsSection]["tunic_zora_green"] != "") ? Ship::stoi(Conf[CosmeticsSection]["tunic_zora_green"]) : Settings.cosmetic.tunic_zora_green;
+        CVar_SetS32(const_cast<char*>("gTunic_Zora_Green"), Settings.cosmetic.tunic_zora_green);
+        Settings.cosmetic.tunic_zora_blue = (Conf[CosmeticsSection]["tunic_zora_blue"] != "" ) ? Ship::stoi(Conf[CosmeticsSection]["tunic_zora_blue"]) : Settings.cosmetic.tunic_zora_blue;
+        CVar_SetS32(const_cast<char*>("gTunic_Zora_Blue"), Settings.cosmetic.tunic_zora_blue);
+        //Navi
+        Settings.cosmetic.navi_idle_inner_red = (Conf[CosmeticsSection]["navi_idle_inner_red"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_idle_inner_red"]) : Settings.cosmetic.navi_idle_inner_red;
+        CVar_SetS32(const_cast<char*>("gNavi_Idle_Inner_Red"), Settings.cosmetic.navi_idle_inner_red);
+        Settings.cosmetic.navi_idle_inner_green = (Conf[CosmeticsSection]["navi_idle_inner_green"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_idle_inner_green"]) : Settings.cosmetic.navi_idle_inner_green;
+        CVar_SetS32(const_cast<char*>("gNavi_Idle_Inner_Green"), Settings.cosmetic.navi_idle_inner_green);
+        Settings.cosmetic.navi_idle_inner_blue = (Conf[CosmeticsSection]["navi_idle_inner_blue"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_idle_inner_blue"]) : Settings.cosmetic.navi_idle_inner_blue;
+        CVar_SetS32(const_cast<char*>("gNavi_Idle_Inner_Blue"), Settings.cosmetic.navi_idle_inner_blue);
+        Settings.cosmetic.navi_idle_outer_red = (Conf[CosmeticsSection]["navi_idle_outer_red"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_idle_outer_red"]) : Settings.cosmetic.navi_idle_outer_red;
+        CVar_SetS32(const_cast<char*>("gNavi_Idle_Outer_Red"), Settings.cosmetic.navi_idle_outer_red);
+        Settings.cosmetic.navi_idle_outer_green = (Conf[CosmeticsSection]["navi_idle_outer_green"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_idle_outer_green"]) : Settings.cosmetic.navi_idle_outer_green;
+        CVar_SetS32(const_cast<char*>("gNavi_Idle_Outer_Green"), Settings.cosmetic.navi_idle_outer_green);
+        Settings.cosmetic.navi_idle_outer_blue = (Conf[CosmeticsSection]["navi_idle_outer_blue"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_idle_outer_blue"]) : Settings.cosmetic.navi_idle_outer_blue;
+        CVar_SetS32(const_cast<char*>("gNavi_Idle_Outer_Blue"), Settings.cosmetic.navi_idle_outer_blue);
+
+        Settings.cosmetic.navi_npc_inner_red = (Conf[CosmeticsSection]["navi_npc_inner_red"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_npc_inner_red"]) : Settings.cosmetic.navi_npc_inner_red;
+        CVar_SetS32(const_cast<char*>("gNavi_NPC_Inner_Red"), Settings.cosmetic.navi_npc_inner_red);
+        Settings.cosmetic.navi_npc_inner_green = (Conf[CosmeticsSection]["navi_npc_inner_green"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_npc_inner_green"]) : Settings.cosmetic.navi_npc_inner_green;
+        CVar_SetS32(const_cast<char*>("gNavi_NPC_Inner_Green"), Settings.cosmetic.navi_npc_inner_green);
+        Settings.cosmetic.navi_npc_inner_blue = (Conf[CosmeticsSection]["navi_npc_inner_blue"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_npc_inner_blue"]) : Settings.cosmetic.navi_npc_inner_blue;
+        CVar_SetS32(const_cast<char*>("gNavi_NPC_Inner_Blue"), Settings.cosmetic.navi_npc_inner_blue);
+        Settings.cosmetic.navi_npc_outer_red = (Conf[CosmeticsSection]["navi_npc_outer_red"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_npc_outer_red"]) : Settings.cosmetic.navi_npc_outer_red;
+        CVar_SetS32(const_cast<char*>("gNavi_NPC_Outer_Red"), Settings.cosmetic.navi_npc_outer_red);
+        Settings.cosmetic.navi_npc_outer_green = (Conf[CosmeticsSection]["navi_npc_outer_green"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_npc_outer_green"]) : Settings.cosmetic.navi_npc_outer_green;
+        CVar_SetS32(const_cast<char*>("gNavi_NPC_Outer_Green"), Settings.cosmetic.navi_npc_outer_green);
+        Settings.cosmetic.navi_npc_outer_blue = (Conf[CosmeticsSection]["navi_npc_outer_blue"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_npc_outer_blue"]) : Settings.cosmetic.navi_npc_outer_blue;
+        CVar_SetS32(const_cast<char*>("gNavi_NPC_Outer_Blue"), Settings.cosmetic.navi_npc_outer_blue);
+
+        Settings.cosmetic.navi_enemy_inner_red = (Conf[CosmeticsSection]["navi_enemy_inner_red"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_enemy_inner_red"]) : Settings.cosmetic.navi_enemy_inner_red;
+        CVar_SetS32(const_cast<char*>("gNavi_Enemy_Inner_Red"), Settings.cosmetic.navi_enemy_inner_red);
+        Settings.cosmetic.navi_enemy_inner_green = (Conf[CosmeticsSection]["navi_enemy_inner_green"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_enemy_inner_green"]) : Settings.cosmetic.navi_enemy_inner_green;
+        CVar_SetS32(const_cast<char*>("gNavi_Enemy_Inner_Green"), Settings.cosmetic.navi_enemy_inner_green);
+        Settings.cosmetic.navi_enemy_inner_blue = (Conf[CosmeticsSection]["navi_enemy_inner_blue"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_enemy_inner_blue"]) : Settings.cosmetic.navi_enemy_inner_blue;
+        CVar_SetS32(const_cast<char*>("gNavi_Enemy_Inner_Blue"), Settings.cosmetic.navi_enemy_inner_blue);
+        Settings.cosmetic.navi_enemy_outer_red = (Conf[CosmeticsSection]["navi_enemy_outer_red"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_enemy_outer_red"]) : Settings.cosmetic.navi_enemy_outer_red;
+        CVar_SetS32(const_cast<char*>("gNavi_Enemy_Outer_Red"), Settings.cosmetic.navi_enemy_outer_red);
+        Settings.cosmetic.navi_enemy_outer_green = (Conf[CosmeticsSection]["navi_enemy_outer_green"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_enemy_outer_green"]) : Settings.cosmetic.navi_enemy_outer_green;
+        CVar_SetS32(const_cast<char*>("gNavi_Enemy_Outer_Green"), Settings.cosmetic.navi_enemy_outer_green);
+        Settings.cosmetic.navi_enemy_outer_blue = (Conf[CosmeticsSection]["navi_enemy_outer_blue"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_enemy_outer_blue"]) : Settings.cosmetic.navi_enemy_outer_blue;
+        CVar_SetS32(const_cast<char*>("gNavi_Enemy_Outer_Blue"), Settings.cosmetic.navi_enemy_outer_blue);
+
+        Settings.cosmetic.navi_prop_inner_red = (Conf[CosmeticsSection]["navi_prop_inner_red"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_prop_inner_red"]) : Settings.cosmetic.navi_prop_inner_red;
+        CVar_SetS32(const_cast<char*>("gNavi_Prop_Inner_Red"), Settings.cosmetic.navi_prop_inner_red);
+        Settings.cosmetic.navi_prop_inner_green = (Conf[CosmeticsSection]["navi_prop_inner_green"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_prop_inner_green"]) : Settings.cosmetic.navi_prop_inner_green;
+        CVar_SetS32(const_cast<char*>("gNavi_Prop_Inner_Green"), Settings.cosmetic.navi_prop_inner_green);
+        Settings.cosmetic.navi_prop_inner_blue = (Conf[CosmeticsSection]["navi_prop_inner_blue"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_prop_inner_blue"]) : Settings.cosmetic.navi_prop_inner_blue;
+        CVar_SetS32(const_cast<char*>("gNavi_Prop_Inner_Blue"), Settings.cosmetic.navi_prop_inner_blue);
+        Settings.cosmetic.navi_prop_outer_red = (Conf[CosmeticsSection]["navi_prop_outer_red"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_prop_outer_red"]) : Settings.cosmetic.navi_prop_outer_red;
+        CVar_SetS32(const_cast<char*>("gNavi_Prop_Outer_Red"), Settings.cosmetic.navi_prop_outer_red);
+        Settings.cosmetic.navi_prop_outer_green = (Conf[CosmeticsSection]["navi_prop_outer_green"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_prop_outer_green"]) : Settings.cosmetic.navi_prop_outer_green;
+        CVar_SetS32(const_cast<char*>("gNavi_Prop_Outer_Green"), Settings.cosmetic.navi_prop_outer_green);
+        Settings.cosmetic.navi_prop_outer_blue = (Conf[CosmeticsSection]["navi_prop_outer_blue"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_prop_outer_blue"]) : Settings.cosmetic.navi_prop_outer_blue;
+        CVar_SetS32(const_cast<char*>("gNavi_Prop_Outer_Blue"), Settings.cosmetic.navi_prop_outer_blue);
+
+
+
         CVar_SetS32("gInputEnabled", Settings.controller.input_enabled);
 
         Settings.controller.dpad_pause_name = stob(Conf[ControllerSection]["dpad_pause_name"]);
@@ -195,6 +275,48 @@ namespace Game {
         Conf[ControllerSection]["dpad_ocarina_text"] = std::to_string(Settings.controller.dpad_ocarina_text);
         Conf[ControllerSection]["dpad_shop"] = std::to_string(Settings.controller.dpad_shop);
 
+
+        // Cosmetics 
+        Conf[CosmeticsSection]["tunic_kokiri_red"] = std::to_string(Settings.cosmetic.tunic_kokiri_red);
+        Conf[CosmeticsSection]["tunic_kokiri_green"] = std::to_string(Settings.cosmetic.tunic_kokiri_green);
+        Conf[CosmeticsSection]["tunic_kokiri_blue"] = std::to_string(Settings.cosmetic.tunic_kokiri_blue);
+
+        Conf[CosmeticsSection]["tunic_goron_red"] = std::to_string(Settings.cosmetic.tunic_goron_red);
+        Conf[CosmeticsSection]["tunic_goron_green"] = std::to_string(Settings.cosmetic.tunic_goron_green);
+        Conf[CosmeticsSection]["tunic_goron_blue"] = std::to_string(Settings.cosmetic.tunic_goron_blue);
+
+        Conf[CosmeticsSection]["tunic_zora_red"] = std::to_string(Settings.cosmetic.tunic_zora_red);
+        Conf[CosmeticsSection]["tunic_zora_green"] = std::to_string(Settings.cosmetic.tunic_zora_green);
+        Conf[CosmeticsSection]["tunic_zora_blue"] = std::to_string(Settings.cosmetic.tunic_zora_blue);
+
+        Conf[CosmeticsSection]["navi_idle_inner_red"] = std::to_string(Settings.cosmetic.navi_idle_inner_red);
+        Conf[CosmeticsSection]["navi_idle_inner_green"] = std::to_string(Settings.cosmetic.navi_idle_inner_green);
+        Conf[CosmeticsSection]["navi_idle_inner_blue"] = std::to_string(Settings.cosmetic.navi_idle_inner_blue);
+        Conf[CosmeticsSection]["navi_idle_outer_red"] = std::to_string(Settings.cosmetic.navi_idle_outer_red);
+        Conf[CosmeticsSection]["navi_idle_outer_green"] = std::to_string(Settings.cosmetic.navi_idle_outer_green);
+        Conf[CosmeticsSection]["navi_idle_outer_blue"] = std::to_string(Settings.cosmetic.navi_idle_outer_blue);
+
+        Conf[CosmeticsSection]["navi_npc_inner_red"] = std::to_string(Settings.cosmetic.navi_npc_inner_red);
+        Conf[CosmeticsSection]["navi_npc_inner_green"] = std::to_string(Settings.cosmetic.navi_npc_inner_green);
+        Conf[CosmeticsSection]["navi_npc_inner_blue"] = std::to_string(Settings.cosmetic.navi_npc_inner_blue);
+        Conf[CosmeticsSection]["navi_npc_outer_red"] = std::to_string(Settings.cosmetic.navi_npc_outer_red);
+        Conf[CosmeticsSection]["navi_npc_outer_green"] = std::to_string(Settings.cosmetic.navi_npc_outer_green);
+        Conf[CosmeticsSection]["navi_npc_outer_blue"] = std::to_string(Settings.cosmetic.navi_npc_outer_blue);
+
+        Conf[CosmeticsSection]["navi_enemy_inner_red"] = std::to_string(Settings.cosmetic.navi_enemy_inner_red);
+        Conf[CosmeticsSection]["navi_enemy_inner_green"] = std::to_string(Settings.cosmetic.navi_enemy_inner_green);
+        Conf[CosmeticsSection]["navi_enemy_inner_blue"] = std::to_string(Settings.cosmetic.navi_enemy_inner_blue);
+        Conf[CosmeticsSection]["navi_enemy_outer_red"] = std::to_string(Settings.cosmetic.navi_enemy_outer_red);
+        Conf[CosmeticsSection]["navi_enemy_outer_green"] = std::to_string(Settings.cosmetic.navi_enemy_outer_green);
+        Conf[CosmeticsSection]["navi_enemy_outer_blue"] = std::to_string(Settings.cosmetic.navi_enemy_outer_blue);
+
+        Conf[CosmeticsSection]["navi_prop_inner_red"] = std::to_string(Settings.cosmetic.navi_prop_inner_red);
+        Conf[CosmeticsSection]["navi_prop_inner_green"] = std::to_string(Settings.cosmetic.navi_prop_inner_green);
+        Conf[CosmeticsSection]["navi_prop_inner_blue"] = std::to_string(Settings.cosmetic.navi_prop_inner_blue);
+        Conf[CosmeticsSection]["navi_prop_outer_red"] = std::to_string(Settings.cosmetic.navi_prop_outer_red);
+        Conf[CosmeticsSection]["navi_prop_outer_green"] = std::to_string(Settings.cosmetic.navi_prop_outer_green);
+        Conf[CosmeticsSection]["navi_prop_outer_blue"] = std::to_string(Settings.cosmetic.navi_prop_outer_blue);
+
         // Cheats
         Conf[CheatSection]["debug_mode"] = std::to_string(Settings.cheats.debug_mode);
         Conf[CheatSection]["infinite_money"] = std::to_string(Settings.cheats.infinite_money);
@@ -206,6 +328,7 @@ namespace Game {
         Conf[CheatSection]["moon_jump_on_l"] = std::to_string(Settings.cheats.moon_jump_on_l);
         Conf[CheatSection]["super_tunic"] = std::to_string(Settings.cheats.super_tunic);
 
+
         Conf.Save();
     }
 
diff --git a/libultraship/libultraship/GameSettings.h b/libultraship/libultraship/GameSettings.h
index 990132f4e..c2d2107e0 100644
--- a/libultraship/libultraship/GameSettings.h
+++ b/libultraship/libultraship/GameSettings.h
@@ -45,6 +45,47 @@ struct SoHConfigType {
         bool dpad_shop = false;
     } controller;
 
+    struct {
+        int tunic_kokiri_red = 30;
+        int tunic_kokiri_green = 105;
+        int tunic_kokiri_blue = 27;
+        int tunic_goron_red = 100;
+        int tunic_goron_green = 20;
+        int tunic_goron_blue = 0;
+        int tunic_zora_red = 0;
+        int tunic_zora_green = 60;
+        int tunic_zora_blue = 100;
+        
+        int navi_idle_inner_red = 255;
+        int navi_idle_inner_green = 255;
+        int navi_idle_inner_blue = 255;
+        int navi_idle_outer_red = 0;
+        int navi_idle_outer_green = 0;
+        int navi_idle_outer_blue = 255;
+
+        int navi_enemy_inner_red = 255;
+        int navi_enemy_inner_green = 255;
+        int navi_enemy_inner_blue = 0;
+        int navi_enemy_outer_red = 200;
+        int navi_enemy_outer_green = 155;
+        int navi_enemy_outer_blue = 0;
+
+        int navi_npc_inner_red = 150;
+        int navi_npc_inner_green = 150;
+        int navi_npc_inner_blue = 255;
+        int navi_npc_outer_red = 150;
+        int navi_npc_outer_green = 150;
+        int navi_npc_outer_blue = 255;
+
+        int navi_prop_inner_red = 0;
+        int navi_prop_inner_green = 250;
+        int navi_prop_inner_blue = 0;
+        int navi_prop_outer_red = 0;
+        int navi_prop_outer_green = 250;
+        int navi_prop_outer_blue = 0;
+
+    } cosmetic;
+
     // Cheats
     struct {
         bool debug_mode = false;
@@ -80,6 +121,7 @@ enum SeqPlayers {
 #define AUDIO_SECTION "AUDIO SETTINGS"
 #define CONTROLLER_SECTION "CONTROLLER SECTION"
 #define ENHANCEMENTS_SECTION "ENHANCEMENT SETTINGS"
+#define COSMETICS_SECTION "COSMETIC SETTINGS"
 #define CHEATS_SECTION "CHEATS SETTINGS"
 
 namespace Game {
diff --git a/libultraship/libultraship/SohImGuiImpl.cpp b/libultraship/libultraship/SohImGuiImpl.cpp
index 7af532a09..a2a648bc8 100644
--- a/libultraship/libultraship/SohImGuiImpl.cpp
+++ b/libultraship/libultraship/SohImGuiImpl.cpp
@@ -53,6 +53,21 @@ namespace SohImGui {
     Console* console = new Console;
     bool p_open = false;
     bool needs_save = false;
+    float kokiri_col[3] = { 0.118f, 0.41f, 0.106f };
+    float goron_col[3] = { 0.392f, 0.078f, 0.0f };
+    float zora_col[3] = { 0.0f, 0.235f, 0.392f };
+
+    float navi_idle_i_col[3] = { 0.0f, 0.0f, 0.0f };
+    float navi_idle_o_col[3] = { 0.0f, 0.0f, 0.0f };
+
+    float navi_npc_i_col[3] = { 0.0f, 0.0f, 0.0f };
+    float navi_npc_o_col[3] = { 0.0f, 0.0f, 0.0f };
+
+    float navi_enemy_i_col[3] = { 0.0f, 0.0f, 0.0f };
+    float navi_enemy_o_col[3] = { 0.0f, 0.0f, 0.0f };
+
+    float navi_prop_i_col[3] = { 0.0f, 0.0f, 0.0f };
+    float navi_prop_o_col[3] = { 0.0f, 0.0f, 0.0f };
 
     std::map<std::string, std::vector<std::string>> windowCategories;
     std::map<std::string, CustomWindow> customWindows;
@@ -66,6 +81,49 @@ namespace SohImGui {
             ImGui_ImplWin32_Init(impl.dx11.window);
             break;
         }
+        kokiri_col[0] = std::clamp((float) CVar_GetS32((char*)"gTunic_Kokiri_Red", 30)/255, 0.0f, 1.0f);
+        kokiri_col[1] = std::clamp((float)CVar_GetS32((char*)"gTunic_Kokiri_Green", 105) / 255, 0.0f, 1.0f);
+        kokiri_col[2] = std::clamp((float)CVar_GetS32((char*)"gTunic_Kokiri_Blue", 27) / 255, 0.0f, 1.0f);
+
+        goron_col[0] = std::clamp((float)CVar_GetS32((char*)"gTunic_Goron_Red", 100) / 255, 0.0f, 1.0f);
+        goron_col[1] = std::clamp((float)CVar_GetS32((char*)"gTunic_Goron_Green", 20) / 255, 0.0f, 1.0f);
+        goron_col[2] = std::clamp((float)CVar_GetS32((char*)"gTunic_Goron_Blue", 0) / 255, 0.0f, 1.0f);
+        
+        zora_col[0] = std::clamp((float)CVar_GetS32((char*)"gTunic_Zora_Red", 0) / 255, 0.0f, 1.0f);
+        zora_col[1] = std::clamp((float)CVar_GetS32((char*)"gTunic_Zora_Green", 60) / 255, 0.0f, 1.0f);
+        zora_col[2] = std::clamp((float)CVar_GetS32((char*)"gTunic_Zora_Blue", 100) / 255, 0.0f, 1.0f);
+
+        navi_idle_i_col[0] = std::clamp((float)CVar_GetS32((char*)"gNavi_Idle_Inner_Red", 0) / 255, 0.0f, 1.0f);
+        navi_idle_i_col[1] = std::clamp((float)CVar_GetS32((char*)"gNavi_Idle_Inner_Green", 0) / 255, 0.0f, 1.0f);
+        navi_idle_i_col[2] = std::clamp((float)CVar_GetS32((char*)"gNavi_Idle_Inner_Blue", 0) / 255, 0.0f, 1.0f);
+
+        navi_idle_o_col[0] = std::clamp((float)CVar_GetS32((char*)"gNavi_Idle_Outer_Red", 0) / 255, 0.0f, 1.0f);
+        navi_idle_o_col[1] = std::clamp((float)CVar_GetS32((char*)"gNavi_Idle_Outer_Green", 0) / 255, 0.0f, 1.0f);
+        navi_idle_o_col[2] = std::clamp((float)CVar_GetS32((char*)"gNavi_Idle_Outer_Blue", 0) / 255, 0.0f, 1.0f);
+
+        navi_npc_i_col[0] = std::clamp((float)CVar_GetS32((char*)"gNavi_NPC_Inner_Red", 0) / 255, 0.0f, 1.0f);
+        navi_npc_i_col[1] = std::clamp((float)CVar_GetS32((char*)"gNavi_NPC_Inner_Green", 0) / 255, 0.0f, 1.0f);
+        navi_npc_i_col[2] = std::clamp((float)CVar_GetS32((char*)"gNavi_NPC_Inner_Blue", 0) / 255, 0.0f, 1.0f);
+
+        navi_npc_o_col[0] = std::clamp((float)CVar_GetS32((char*)"gNavi_NPC_Outer_Red", 0) / 255, 0.0f, 1.0f);
+        navi_npc_o_col[1] = std::clamp((float)CVar_GetS32((char*)"gNavi_NPC_Outer_Green", 0) / 255, 0.0f, 1.0f);
+        navi_npc_o_col[2] = std::clamp((float)CVar_GetS32((char*)"gNavi_NPC_Outer_Blue", 0) / 255, 0.0f, 1.0f);
+
+        navi_enemy_i_col[0] = std::clamp((float)CVar_GetS32((char*)"gNavi_Enemy_Inner_Red", 0) / 255, 0.0f, 1.0f);
+        navi_enemy_i_col[1] = std::clamp((float)CVar_GetS32((char*)"gNavi_Enemy_Inner_Green", 0) / 255, 0.0f, 1.0f);
+        navi_enemy_i_col[2] = std::clamp((float)CVar_GetS32((char*)"gNavi_Enemy_Inner_Blue", 0) / 255, 0.0f, 1.0f);
+
+        navi_enemy_o_col[0] = std::clamp((float)CVar_GetS32((char*)"gNavi_Enemy_Outer_Red", 0) / 255, 0.0f, 1.0f);
+        navi_enemy_o_col[1] = std::clamp((float)CVar_GetS32((char*)"gNavi_Enemy_Outer_Green", 0) / 255, 0.0f, 1.0f);
+        navi_enemy_o_col[2] = std::clamp((float)CVar_GetS32((char*)"gNavi_Enemy_Outer_Blue", 0) / 255, 0.0f, 1.0f);
+
+        navi_prop_i_col[0] = std::clamp((float)CVar_GetS32((char*)"gNavi_Prop_Inner_Red", 0) / 255, 0.0f, 1.0f);
+        navi_prop_i_col[1] = std::clamp((float)CVar_GetS32((char*)"gNavi_Prop_Inner_Green", 0) / 255, 0.0f, 1.0f);
+        navi_prop_i_col[2] = std::clamp((float)CVar_GetS32((char*)"gNavi_Prop_Inner_Blue", 0) / 255, 0.0f, 1.0f);
+
+        navi_prop_o_col[0] = std::clamp((float)CVar_GetS32((char*)"gNavi_Prop_Outer_Red", 0) / 255, 0.0f, 1.0f);
+        navi_prop_o_col[1] = std::clamp((float)CVar_GetS32((char*)"gNavi_Prop_Outer_Green", 0) / 255, 0.0f, 1.0f);
+        navi_prop_o_col[2] = std::clamp((float)CVar_GetS32((char*)"gNavi_Prop_Outer_Blue", 0) / 255, 0.0f, 1.0f);
     }
 
     void ImGuiBackendInit() {
@@ -520,6 +578,126 @@ namespace SohImGui {
                     needs_save = true;
                 }
 
+
+            if (ImGui::BeginMenu("Cosmetics")) {
+                ImGui::Text("Tunics");
+                ImGui::Separator();
+                if (ImGui::ColorEdit3("Kokiri Tunic", kokiri_col)) {
+                    Game::Settings.cosmetic.tunic_kokiri_red = (int) (kokiri_col[0] * 255);
+                    Game::Settings.cosmetic.tunic_kokiri_green = (int) (kokiri_col[1] * 255);
+                    Game::Settings.cosmetic.tunic_kokiri_blue = (int) (kokiri_col[2] * 255);
+                    CVar_SetS32(const_cast<char*>("gTunic_Kokiri_Red"), Game::Settings.cosmetic.tunic_kokiri_red);
+                    CVar_SetS32(const_cast<char*>("gTunic_Kokiri_Green"), Game::Settings.cosmetic.tunic_kokiri_green);
+                    CVar_SetS32(const_cast<char*>("gTunic_Kokiri_Blue"), Game::Settings.cosmetic.tunic_kokiri_blue);
+                    needs_save = true;
+                }
+                if (ImGui::ColorEdit3("Goron Tunic", goron_col)) {
+                    Game::Settings.cosmetic.tunic_goron_red = (int)(goron_col[0] * 255);
+                    Game::Settings.cosmetic.tunic_goron_green = (int)(goron_col[1] * 255);
+                    Game::Settings.cosmetic.tunic_goron_blue = (int)(goron_col[2] * 255);
+                    CVar_SetS32(const_cast<char*>("gTunic_Goron_Red"), Game::Settings.cosmetic.tunic_goron_red);
+                    CVar_SetS32(const_cast<char*>("gTunic_Goron_Green"), Game::Settings.cosmetic.tunic_goron_green);
+                    CVar_SetS32(const_cast<char*>("gTunic_Goron_Blue"), Game::Settings.cosmetic.tunic_goron_blue);
+                    needs_save = true;
+                }
+                if (ImGui::ColorEdit3("Zora Tunic", zora_col)) {
+                    Game::Settings.cosmetic.tunic_zora_red = (int)(zora_col[0] * 255);
+                    Game::Settings.cosmetic.tunic_zora_green = (int)(zora_col[1] * 255);
+                    Game::Settings.cosmetic.tunic_zora_blue = (int)(zora_col[2] * 255);
+                    CVar_SetS32(const_cast<char*>("gTunic_Zora_Red"), Game::Settings.cosmetic.tunic_zora_red);
+                    CVar_SetS32(const_cast<char*>("gTunic_Zora_Green"), Game::Settings.cosmetic.tunic_zora_green);
+                    CVar_SetS32(const_cast<char*>("gTunic_Zora_Blue"), Game::Settings.cosmetic.tunic_zora_blue);
+                    needs_save = true;
+                }
+                ImGui::Text("Navi");
+                ImGui::Separator();
+                if (ImGui::ColorEdit3("Navi Idle Inner", navi_idle_i_col)) {
+                    Game::Settings.cosmetic.navi_idle_inner_red = (int)(navi_idle_i_col[0] * 255);
+                    Game::Settings.cosmetic.navi_idle_inner_green = (int)(navi_idle_i_col[1] * 255);
+                    Game::Settings.cosmetic.navi_idle_inner_blue = (int)(navi_idle_i_col[2] * 255);
+                    CVar_SetS32(const_cast<char*>("gNavi_Idle_Inner_Red"), Game::Settings.cosmetic.navi_idle_inner_red);
+                    CVar_SetS32(const_cast<char*>("gNavi_Idle_Inner_Green"), Game::Settings.cosmetic.navi_idle_inner_green);
+                    CVar_SetS32(const_cast<char*>("gNavi_Idle_Inner_Blue"), Game::Settings.cosmetic.navi_idle_inner_blue);
+                    needs_save = true;
+                }
+
+                if (ImGui::ColorEdit3("Navi Idle Outer", navi_idle_o_col)) {
+                    Game::Settings.cosmetic.navi_idle_outer_red = (int)(navi_idle_o_col[0] * 255);
+                    Game::Settings.cosmetic.navi_idle_outer_green = (int)(navi_idle_o_col[1] * 255);
+                    Game::Settings.cosmetic.navi_idle_outer_blue = (int)(navi_idle_o_col[2] * 255);
+                    CVar_SetS32(const_cast<char*>("gNavi_Idle_Outer_Red"), Game::Settings.cosmetic.navi_idle_outer_red);
+                    CVar_SetS32(const_cast<char*>("gNavi_Idle_Outer_Green"), Game::Settings.cosmetic.navi_idle_outer_green);
+                    CVar_SetS32(const_cast<char*>("gNavi_Idle_Outer_Blue"), Game::Settings.cosmetic.navi_idle_outer_blue);
+                    needs_save = true;
+                }
+
+                if (ImGui::ColorEdit3("Navi NPC Inner", navi_npc_i_col)) {
+                    Game::Settings.cosmetic.navi_npc_inner_red = (int)(navi_npc_i_col[0] * 255);
+                    Game::Settings.cosmetic.navi_npc_inner_green = (int)(navi_npc_i_col[1] * 255);
+                    Game::Settings.cosmetic.navi_npc_inner_blue = (int)(navi_npc_i_col[2] * 255);
+                    CVar_SetS32(const_cast<char*>("gNavi_NPC_Inner_Red"), Game::Settings.cosmetic.navi_npc_inner_red);
+                    CVar_SetS32(const_cast<char*>("gNavi_NPC_Inner_Green"), Game::Settings.cosmetic.navi_npc_inner_green);
+                    CVar_SetS32(const_cast<char*>("gNavi_NPC_Inner_Blue"), Game::Settings.cosmetic.navi_npc_inner_blue);
+                    needs_save = true;
+                }
+
+                if (ImGui::ColorEdit3("Navi NPC Outer", navi_npc_o_col)) {
+                    Game::Settings.cosmetic.navi_npc_outer_red = (int)(navi_npc_o_col[0] * 255);
+                    Game::Settings.cosmetic.navi_npc_outer_green = (int)(navi_npc_o_col[1] * 255);
+                    Game::Settings.cosmetic.navi_npc_outer_blue = (int)(navi_npc_o_col[2] * 255);
+                    CVar_SetS32(const_cast<char*>("gNavi_NPC_Outer_Red"), Game::Settings.cosmetic.navi_npc_outer_red);
+                    CVar_SetS32(const_cast<char*>("gNavi_NPC_Outer_Green"), Game::Settings.cosmetic.navi_npc_outer_green);
+                    CVar_SetS32(const_cast<char*>("gNavi_NPC_Outer_Blue"), Game::Settings.cosmetic.navi_npc_outer_blue);
+                    needs_save = true;
+                }
+
+                if (ImGui::ColorEdit3("Navi Enemy Inner", navi_enemy_i_col)) {
+                    Game::Settings.cosmetic.navi_enemy_inner_red = (int)(navi_enemy_i_col[0] * 255);
+                    Game::Settings.cosmetic.navi_enemy_inner_green = (int)(navi_enemy_i_col[1] * 255);
+                    Game::Settings.cosmetic.navi_enemy_inner_blue = (int)(navi_enemy_i_col[2] * 255);
+                    CVar_SetS32(const_cast<char*>("gNavi_Enemy_Inner_Red"), Game::Settings.cosmetic.navi_enemy_inner_red);
+                    CVar_SetS32(const_cast<char*>("gNavi_Enemy_Inner_Green"), Game::Settings.cosmetic.navi_enemy_inner_green);
+                    CVar_SetS32(const_cast<char*>("gNavi_Enemy_Inner_Blue"), Game::Settings.cosmetic.navi_enemy_inner_blue);
+                    needs_save = true;
+                }
+
+                if (ImGui::ColorEdit3("Navi Enemy Outer", navi_enemy_o_col)) {
+                    Game::Settings.cosmetic.navi_enemy_outer_red = (int)(navi_enemy_o_col[0] * 255);
+                    Game::Settings.cosmetic.navi_enemy_outer_green = (int)(navi_enemy_o_col[1] * 255);
+                    Game::Settings.cosmetic.navi_enemy_outer_blue = (int)(navi_enemy_o_col[2] * 255);
+                    CVar_SetS32(const_cast<char*>("gNavi_Enemy_Outer_Red"), Game::Settings.cosmetic.navi_enemy_outer_red);
+                    CVar_SetS32(const_cast<char*>("gNavi_Enemy_Outer_Green"), Game::Settings.cosmetic.navi_enemy_outer_green);
+                    CVar_SetS32(const_cast<char*>("gNavi_Enemy_Outer_Blue"), Game::Settings.cosmetic.navi_enemy_outer_blue);
+                    needs_save = true;
+                }
+
+                if (ImGui::ColorEdit3("Navi Prop Inner", navi_prop_i_col)) {
+                    Game::Settings.cosmetic.navi_prop_inner_red = (int)(navi_prop_i_col[0] * 255);
+                    Game::Settings.cosmetic.navi_prop_inner_green = (int)(navi_prop_i_col[1] * 255);
+                    Game::Settings.cosmetic.navi_prop_inner_blue = (int)(navi_prop_i_col[2] * 255);
+                    CVar_SetS32(const_cast<char*>("gNavi_Prop_Inner_Red"), Game::Settings.cosmetic.navi_prop_inner_red);
+                    CVar_SetS32(const_cast<char*>("gNavi_Prop_Inner_Green"), Game::Settings.cosmetic.navi_prop_inner_green);
+                    CVar_SetS32(const_cast<char*>("gNavi_Prop_Inner_Blue"), Game::Settings.cosmetic.navi_prop_inner_blue);
+                    needs_save = true;
+                }
+
+                if (ImGui::ColorEdit3("Navi Prop Outer", navi_prop_o_col)) {
+                    Game::Settings.cosmetic.navi_prop_outer_red = (int)(navi_prop_o_col[0] * 255);
+                    Game::Settings.cosmetic.navi_prop_outer_green = (int)(navi_prop_o_col[1] * 255);
+                    Game::Settings.cosmetic.navi_prop_outer_blue = (int)(navi_prop_o_col[2] * 255);
+                    CVar_SetS32(const_cast<char*>("gNavi_Prop_Outer_Red"), Game::Settings.cosmetic.navi_prop_outer_red);
+                    CVar_SetS32(const_cast<char*>("gNavi_Prop_Outer_Green"), Game::Settings.cosmetic.navi_prop_outer_green);
+                    CVar_SetS32(const_cast<char*>("gNavi_Prop_Outer_Blue"), Game::Settings.cosmetic.navi_prop_outer_blue);
+                    needs_save = true;
+                }
+
+                ImGui::EndMenu();
+            }
+
+
+            if (ImGui::BeginMenu("Developer Tools")) {
+                HOOK(ImGui::MenuItem("Stats", nullptr, &Game::Settings.debug.soh));
+                HOOK(ImGui::MenuItem("Console", nullptr, &console->opened));
                 if (ImGui::Checkbox("Easy ISG", &Game::Settings.cheats.ez_isg)) {
                     CVar_SetS32("gEzISG", Game::Settings.cheats.ez_isg);
                     needs_save = true;
diff --git a/soh/src/code/z_actor.c b/soh/src/code/z_actor.c
index eee9d8882..640429515 100644
--- a/soh/src/code/z_actor.c
+++ b/soh/src/code/z_actor.c
@@ -334,6 +334,38 @@ void func_8002BE98(TargetContext* targetCtx, s32 actorCategory, GlobalContext* g
 
 void func_8002BF60(TargetContext* targetCtx, Actor* actor, s32 actorCategory, GlobalContext* globalCtx) {
     NaviColor* naviColor = &sNaviColorList[actorCategory];
+    if (actorCategory == ACTORCAT_PLAYER) {
+        naviColor->inner.r = CVar_GetS32("gNavi_Idle_Inner_Red", naviColor->inner.r);
+        naviColor->inner.g = CVar_GetS32("gNavi_Idle_Inner_Green", naviColor->inner.g);
+        naviColor->inner.b = CVar_GetS32("gNavi_Idle_Inner_Blue", naviColor->inner.b);
+        naviColor->outer.r = CVar_GetS32("gNavi_Idle_Outer_Red", naviColor->outer.r);
+        naviColor->outer.g = CVar_GetS32("gNavi_Idle_Outer_Green", naviColor->outer.g);
+        naviColor->outer.b = CVar_GetS32("gNavi_Idle_Outer_Blue", naviColor->outer.b);
+    }
+    if (actorCategory == ACTORCAT_NPC) {
+        naviColor->inner.r = CVar_GetS32("gNavi_NPC_Inner_Red", naviColor->inner.r);
+        naviColor->inner.g = CVar_GetS32("gNavi_NPC_Inner_Green", naviColor->inner.g);
+        naviColor->inner.b = CVar_GetS32("gNavi_NPC_Inner_Blue", naviColor->inner.b);
+        naviColor->outer.r = CVar_GetS32("gNavi_NPC_Outer_Red", naviColor->outer.r);
+        naviColor->outer.g = CVar_GetS32("gNavi_NPC_Outer_Green", naviColor->outer.g);
+        naviColor->outer.b = CVar_GetS32("gNavi_NPC_Outer_Blue", naviColor->outer.b);
+    }
+    if (actorCategory == ACTORCAT_BOSS || actorCategory == ACTORCAT_ENEMY) {
+        naviColor->inner.r = CVar_GetS32("gNavi_Enemy_Inner_Red", naviColor->inner.r);
+        naviColor->inner.g = CVar_GetS32("gNavi_Enemy_Inner_Green", naviColor->inner.g);
+        naviColor->inner.b = CVar_GetS32("gNavi_Enemy_Inner_Blue", naviColor->inner.b);
+        naviColor->outer.r = CVar_GetS32("gNavi_Enemy_Outer_Red", naviColor->outer.r);
+        naviColor->outer.g = CVar_GetS32("gNavi_Enemy_Outer_Green", naviColor->outer.g);
+        naviColor->outer.b = CVar_GetS32("gNavi_Enemy_Outer_Blue", naviColor->outer.b);
+    }
+    if (actorCategory == ACTORCAT_PROP) {
+        naviColor->inner.r = CVar_GetS32("gNavi_Prop_Inner_Red", naviColor->inner.r);
+        naviColor->inner.g = CVar_GetS32("gNavi_Prop_Inner_Green", naviColor->inner.g);
+        naviColor->inner.b = CVar_GetS32("gNavi_Prop_Inner_Blue", naviColor->inner.b);
+        naviColor->outer.r = CVar_GetS32("gNavi_Prop_Outer_Red", naviColor->outer.r);
+        naviColor->outer.g = CVar_GetS32("gNavi_Prop_Outer_Green", naviColor->outer.g);
+        naviColor->outer.b = CVar_GetS32("gNavi_Prop_Outer_Blue", naviColor->outer.b);
+    }
     targetCtx->naviRefPos.x = actor->focus.pos.x;
     targetCtx->naviRefPos.y = actor->focus.pos.y + (actor->targetArrowOffset * actor->scale.y);
     targetCtx->naviRefPos.z = actor->focus.pos.z;
diff --git a/soh/src/code/z_player_lib.c b/soh/src/code/z_player_lib.c
index 87a7009ec..4adbb75ce 100644
--- a/soh/src/code/z_player_lib.c
+++ b/soh/src/code/z_player_lib.c
@@ -743,8 +743,27 @@ void func_8008F470(GlobalContext* globalCtx, void** skeleton, Vec3s* jointTable,
 #else
     gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(sMouthTextures[eyeIndex]));
 #endif
-  
-    color = &sTunicColors[tunic];
+    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;
+    } 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;
+    } 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;
+    } 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;
+    }
     gDPSetEnvColor(POLY_OPA_DISP++, color->r, color->g, color->b, 0);
 
     sDListsLodOffset = lod * 2;

From 0e6ca5361e03c4945a7a8a1a3f858dc764cb0a97 Mon Sep 17 00:00:00 2001
From: Baoulettes <perlouzerie@hotmail.fr>
Date: Wed, 27 Apr 2022 00:36:28 +0200
Subject: [PATCH 22/26] Fix L/R buttons color in Kaleido menu (#172)

* Fix L/R buttons color in Kaleido menu.

I know this is a bug even official game but that definitely a logic bug.
That could be considered are a mods.
This make both button L and R have the same color on Hover and normal.

* Update z_kaleido_scope_PAL.c

* Condition to be on

Added condition to be on only if toggled on

* Cvar registers

* bool addition

* Added the item in menu

* Added bool in bootcommands

By default it is on.

* Hide and make it forced on by default

* Hide menu entry for that fix
---
 libultraship/libultraship/GameSettings.cpp       |  5 +++++
 libultraship/libultraship/GameSettings.h         |  2 +-
 libultraship/libultraship/SohImGuiImpl.cpp       |  5 +++++
 soh/soh/Enhancements/bootcommands.c              |  2 +-
 .../misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c | 16 +++++++++++++---
 5 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/libultraship/libultraship/GameSettings.cpp b/libultraship/libultraship/GameSettings.cpp
index 5e02037de..029e2a1a2 100644
--- a/libultraship/libultraship/GameSettings.cpp
+++ b/libultraship/libultraship/GameSettings.cpp
@@ -74,6 +74,10 @@ namespace Game {
       
         Settings.enhancements.mm_bunny_hood = stob(Conf[EnhancementSection]["mm_bunny_hood"]);
         CVar_SetS32("gMMBunnyHood", Settings.enhancements.mm_bunny_hood);
+	    
+        Settings.enhancements.uniform_lr = stob(Conf[EnhancementSection]["uniform_lr"]);
+        //CVar_SetS32("gUniformLR", Settings.enhancements.uniform_lr);
+        CVar_SetS32("gUniformLR", 1);
 
         Settings.enhancements.newdrops = stob(Conf[EnhancementSection]["newdrops"]);
         CVar_SetS32("gNewDrops", Settings.enhancements.newdrops);
@@ -264,6 +268,7 @@ namespace Game {
         Conf[EnhancementSection]["newdrops"] = std::to_string(Settings.enhancements.newdrops);
         Conf[EnhancementSection]["visualagony"] = std::to_string(Settings.enhancements.visualagony);
         Conf[EnhancementSection]["mm_bunny_hood"] = std::to_string(Settings.enhancements.mm_bunny_hood);
+        Conf[EnhancementSection]["uniform_lr"] = std::to_string(Settings.enhancements.uniform_lr);
 
 
         // Controllers
diff --git a/libultraship/libultraship/GameSettings.h b/libultraship/libultraship/GameSettings.h
index c2d2107e0..4f4eecb97 100644
--- a/libultraship/libultraship/GameSettings.h
+++ b/libultraship/libultraship/GameSettings.h
@@ -29,7 +29,7 @@ struct SoHConfigType {
         bool newdrops = false;
         bool visualagony = false;
         bool mm_bunny_hood = false;
-
+        bool uniform_lr = true;
     } enhancements;
 
     // Controller
diff --git a/libultraship/libultraship/SohImGuiImpl.cpp b/libultraship/libultraship/SohImGuiImpl.cpp
index a2a648bc8..478f51590 100644
--- a/libultraship/libultraship/SohImGuiImpl.cpp
+++ b/libultraship/libultraship/SohImGuiImpl.cpp
@@ -473,6 +473,11 @@ namespace SohImGui {
                     CVar_SetS32("gMMBunnyHood", Game::Settings.enhancements.mm_bunny_hood);
                     needs_save = true;
                 }
+                
+                /*if (ImGui::Checkbox("Fix L&R Pause menu", &Game::Settings.enhancements.uniform_lr)) {
+                    CVar_SetS32("gUniformLR", Game::Settings.enhancements.uniform_lr);
+                    needs_save = true;
+                }*/
 
                 if (ImGui::Checkbox("Visual Stone of Agony", &Game::Settings.enhancements.visualagony)) {
                     CVar_SetS32("gVisualAgony", Game::Settings.enhancements.visualagony);
diff --git a/soh/soh/Enhancements/bootcommands.c b/soh/soh/Enhancements/bootcommands.c
index f3ad9aaac..60143e295 100644
--- a/soh/soh/Enhancements/bootcommands.c
+++ b/soh/soh/Enhancements/bootcommands.c
@@ -25,9 +25,9 @@ void BootCommands_Init()
     CVar_RegisterS32("gDebugEnabled", 0);
     CVar_RegisterS32("gPauseLiveLink", 0);
     CVar_RegisterS32("gMinimalUI", 0);
+    CVar_RegisterS32("gUniformLR", 1);
     CVar_RegisterS32("gNewDrops", 0);
     CVar_RegisterS32("gVisualAgony", 0);
-
 }
 
 //void BootCommands_ParseBootArgs(char* str)
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 60d3595aa..ac1864412 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
@@ -1614,14 +1614,24 @@ void KaleidoScope_DrawInfoPanel(GlobalContext* globalCtx) {
 
     if ((pauseCtx->cursorSpecialPos == PAUSE_CURSOR_PAGE_LEFT) && (pauseCtx->unk_1E4 == 0)) {
         gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, D_808321A0, D_808321A2, D_808321A4, D_808321A6);
+    } else {
+      if (CVar_GetS32("gUniformLR", 0) != 0) {
+        gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 180, 210, 255, 255);
+      }
     }
-
+    
     gSPDisplayList(POLY_KAL_DISP++, gLButtonIconDL);
-
-    gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 180, 210, 255, 220);
+    
+    if (CVar_GetS32("gUniformLR", 0) == 0) { //Restore the misplace gDPSetPrimColor
+      gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 180, 210, 255, 255);
+    }
 
     if ((pauseCtx->cursorSpecialPos == PAUSE_CURSOR_PAGE_RIGHT) && (pauseCtx->unk_1E4 == 0)) {
         gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, D_808321A0, D_808321A2, D_808321A4, D_808321A6);
+    } else {
+      if (CVar_GetS32("gUniformLR", 0) != 0) {
+        gDPSetPrimColor(POLY_KAL_DISP++, 0, 0, 180, 210, 255, 255);
+      }
     }
 
     gSPDisplayList(POLY_KAL_DISP++, gRButtonIconDL);

From 9c2c443a6abb9a4b0baf0d5059111af7d2cac411 Mon Sep 17 00:00:00 2001
From: Baoulettes <perlouzerie@hotmail.fr>
Date: Wed, 27 Apr 2022 00:41:24 +0200
Subject: [PATCH 23/26] Fix Title card name for FRA and GER (#204)

---
 soh/src/code/z_actor.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/soh/src/code/z_actor.c b/soh/src/code/z_actor.c
index 640429515..0c46a8fc5 100644
--- a/soh/src/code/z_actor.c
+++ b/soh/src/code/z_actor.c
@@ -1009,7 +1009,6 @@ void TitleCard_Draw(GlobalContext* globalCtx, TitleCardContext* titleCtx) {
     s32 doubleWidth;
     s32 titleY;
     s32 titleSecondY;
-    s32 textureLanguageOffset;
 
     if (titleCtx->alpha != 0) {
         width = titleCtx->width;
@@ -1020,7 +1019,6 @@ void TitleCard_Draw(GlobalContext* globalCtx, TitleCardContext* titleCtx) {
 
         OPEN_DISPS(globalCtx->state.gfxCtx, "../z_actor.c", 2824);
 
-        textureLanguageOffset = width * height * gSaveContext.language;
         height = (width * height > 0x1000) ? 0x1000 / width : height;
         titleSecondY = titleY + (height * 4);
 
@@ -1030,7 +1028,8 @@ void TitleCard_Draw(GlobalContext* globalCtx, TitleCardContext* titleCtx) {
         gDPSetPrimColor(TITLE_CARD_DISP++, 0, 0, (u8)titleCtx->intensity, (u8)titleCtx->intensity, (u8)titleCtx->intensity,
                         (u8)titleCtx->alpha);
 
-        gDPLoadTextureBlock(TITLE_CARD_DISP++, (uintptr_t)titleCtx->texture + textureLanguageOffset, G_IM_FMT_IA,
+        gDPLoadTextureBlock(TITLE_CARD_DISP++, (uintptr_t)titleCtx->texture, G_IM_FMT_IA,
+
                             G_IM_SIZ_8b,
                             width, height, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK,
                             G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
@@ -1042,7 +1041,7 @@ void TitleCard_Draw(GlobalContext* globalCtx, TitleCardContext* titleCtx) {
 
         // If texture is bigger than 0x1000, display the rest
         if (height > 0) {
-            gDPLoadTextureBlock(TITLE_CARD_DISP++, (uintptr_t)titleCtx->texture + textureLanguageOffset + 0x1000,
+            gDPLoadTextureBlock(TITLE_CARD_DISP++, (uintptr_t)titleCtx->texture + 0x1000,
                                 G_IM_FMT_IA,
                                 G_IM_SIZ_8b, width, height, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP,
                                 G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);

From 1f663dda7bec991eaa4ede0635b147b7869a5f5d Mon Sep 17 00:00:00 2001
From: Ada <60364512+GreatArgorath@users.noreply.github.com>
Date: Tue, 26 Apr 2022 20:58:21 +0100
Subject: [PATCH 24/26] Adds exception for text speed in the case of ocarina
 playing

---
 soh/src/code/z_message_PAL.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/soh/src/code/z_message_PAL.c b/soh/src/code/z_message_PAL.c
index 8b9410018..6a29a6564 100644
--- a/soh/src/code/z_message_PAL.c
+++ b/soh/src/code/z_message_PAL.c
@@ -1096,6 +1096,7 @@ void Message_DrawText(GlobalContext* globalCtx, Gfx** gfxP) {
                 *gfxP = gfx;
                 return;
             case MESSAGE_OCARINA:
+                msgCtx->textDrawPos = i + 1;
                 if (i + 1 == msgCtx->textDrawPos) {
                     Message_HandleOcarina(globalCtx);
                     *gfxP = gfx;

From 486f673df53fa63a96d6173991189084027ebd72 Mon Sep 17 00:00:00 2001
From: KiritoDev <36680385+KiritoDv@users.noreply.github.com>
Date: Tue, 26 Apr 2022 18:04:47 -0500
Subject: [PATCH 25/26] Fixed develop

---
 libultraship/libultraship/SohImGuiImpl.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/libultraship/libultraship/SohImGuiImpl.cpp b/libultraship/libultraship/SohImGuiImpl.cpp
index 478f51590..96211fe20 100644
--- a/libultraship/libultraship/SohImGuiImpl.cpp
+++ b/libultraship/libultraship/SohImGuiImpl.cpp
@@ -559,8 +559,7 @@ namespace SohImGui {
                         CVar_SetS32("gInfiniteNayru", Game::Settings.cheats.infinite_nayru);
                         needs_save = true;
                     }
-
-                ImGui::EndMenu();
+                    ImGui::EndMenu();
                 }
 
                 if (ImGui::Checkbox("No Clip", &Game::Settings.cheats.no_clip)) {
@@ -582,7 +581,7 @@ namespace SohImGui {
                     CVar_SetS32("gSuperTunic", Game::Settings.cheats.super_tunic);
                     needs_save = true;
                 }
-
+            }
 
             if (ImGui::BeginMenu("Cosmetics")) {
                 ImGui::Text("Tunics");

From eea5135d629fc4589c4a51680d42841ff189e542 Mon Sep 17 00:00:00 2001
From: Sirius902 <10891979+Sirius902@users.noreply.github.com>
Date: Tue, 26 Apr 2022 16:50:24 -0700
Subject: [PATCH 26/26] Rumble cvar and fixes (#184)

* Rumble indefinitely until turned off

* Add rumble cvar

* Register CVar

* Check if controller can rumble to insert rumble pak

* Reduce verbosity of checks

* Remove extraneous const_cast

* Once again remove extraneous const_cast

* Add per-controller settings

* Add nice spacing

* Only display controller entry if pad connected

* Const some stuff
---
 libultraship/libultraship/Controller.h        |   6 +
 libultraship/libultraship/GameSettings.cpp    | 112 +++++++----
 libultraship/libultraship/GameSettings.h      |  12 +-
 .../libultraship/KeyboardController.cpp       |   2 +-
 .../libultraship/KeyboardController.h         |   5 +
 libultraship/libultraship/SDLController.cpp   |  65 +++++--
 libultraship/libultraship/SDLController.h     |   6 +
 libultraship/libultraship/SohImGuiImpl.cpp    | 182 ++++++++++--------
 soh/soh/Enhancements/bootcommands.c           |   1 +
 soh/soh/Enhancements/debugconsole.cpp         |  10 +-
 soh/soh/OTRGlobals.cpp                        |  11 ++
 soh/soh/OTRGlobals.h                          |   1 +
 soh/soh/stubs.c                               |   4 +-
 soh/src/code/padmgr.c                         |   7 +-
 14 files changed, 274 insertions(+), 150 deletions(-)

diff --git a/libultraship/libultraship/Controller.h b/libultraship/libultraship/Controller.h
index c78142af4..256b31fee 100644
--- a/libultraship/libultraship/Controller.h
+++ b/libultraship/libultraship/Controller.h
@@ -3,6 +3,7 @@
 #include <memory>
 #include <map>
 #include <string>
+#include <optional>
 #include "stdint.h"
 #include "UltraController.h"
 #include "ControllerAttachment.h"
@@ -19,12 +20,17 @@ namespace Ship {
 			void Read(OSContPad* pad);
 			virtual void ReadFromSource() = 0;
 			virtual void WriteToSource(ControllerCallback* controller) = 0;
+			virtual bool Connected() const = 0;
+			virtual bool CanRumble() const = 0;
 			bool isRumbling;
 
 			void SetButtonMapping(const std::string& szButtonName, int32_t dwScancode);
 			std::shared_ptr<ControllerAttachment> GetAttachment() { return Attachment; }
 			int32_t GetControllerNumber() { return dwControllerNumber; }
 
+			virtual bool HasPadConf() const = 0;
+			virtual std::optional<std::string> GetPadConfSection() = 0;
+
 		protected:
 			int32_t dwPressedButtons;
 			std::map<int32_t, int32_t> ButtonMapping;
diff --git a/libultraship/libultraship/GameSettings.cpp b/libultraship/libultraship/GameSettings.cpp
index 029e2a1a2..244e1a394 100644
--- a/libultraship/libultraship/GameSettings.cpp
+++ b/libultraship/libultraship/GameSettings.cpp
@@ -15,6 +15,8 @@
 #include <string>
 #include "SohHooks.h"
 
+#include "Window.h"
+
 #define ABS(var) var < 0 ? -(var) : var
 
 using namespace Ship;
@@ -64,7 +66,7 @@ namespace Game {
         CVar_SetS32("gPauseLiveLink", Settings.enhancements.animated_pause_menu);
 
         Settings.enhancements.dynamic_wallet_icon = stob(Conf[EnhancementSection]["dynamic_wallet_icon"]);
-        CVar_SetS32(const_cast<char*>("gDynamicWalletIcon"), Settings.enhancements.dynamic_wallet_icon);
+        CVar_SetS32("gDynamicWalletIcon", Settings.enhancements.dynamic_wallet_icon);
 
         Settings.enhancements.minimal_ui = stob(Conf[EnhancementSection]["minimal_ui"]);
         CVar_SetS32("gMinimalUI", Settings.enhancements.minimal_ui);
@@ -99,91 +101,88 @@ namespace Game {
         CVar_SetFloat("gFanfareVolume", Settings.audio.fanfare);
 
         // Controllers
-        Settings.controller.gyro_sensitivity = Ship::stof(Conf[ControllerSection]["gyro_sensitivity"]);
-        CVar_SetFloat("gGyroSensitivity", Settings.controller.gyro_sensitivity);
-
-        Settings.controller.rumble_strength = Ship::stof(Conf[ControllerSection]["rumble_strength"]);
-        CVar_SetFloat("gRumbleStrength", Settings.controller.rumble_strength);
+        Settings.controller.rumble_enabled = Ship::stof(Conf[ControllerSection]["rumble_enabled"]);
+        CVar_SetS32("gRumbleEnabled", Settings.controller.rumble_enabled);
 
         Settings.controller.input_scale = Ship::stof(Conf[ControllerSection]["input_scale"]);
         CVar_SetFloat("gInputScale", Settings.controller.input_scale);
 
         Settings.controller.input_enabled = stob(Conf[ControllerSection]["input_enabled"]);
 
-        CVar_SetS32(const_cast<char*>("gInputEnabled"), Settings.controller.input_enabled);
+        CVar_SetS32("gInputEnabled", Settings.controller.input_enabled);
         //Tunics
         Settings.cosmetic.tunic_kokiri_red = (Conf[CosmeticsSection]["tunic_kokiri_red"] != "") ? Ship::stoi(Conf[CosmeticsSection]["tunic_kokiri_red"]) : Settings.cosmetic.tunic_kokiri_red;
-        CVar_SetS32(const_cast<char*>("gTunic_Kokiri_Red"), Settings.cosmetic.tunic_kokiri_red);
+        CVar_SetS32("gTunic_Kokiri_Red", Settings.cosmetic.tunic_kokiri_red);
         Settings.cosmetic.tunic_kokiri_green = (Conf[CosmeticsSection]["tunic_kokiri_green"] != "") ? Ship::stoi(Conf[CosmeticsSection]["tunic_kokiri_green"]) : Settings.cosmetic.tunic_kokiri_green;
-        CVar_SetS32(const_cast<char*>("gTunic_Kokiri_Green"), Settings.cosmetic.tunic_kokiri_green);
+        CVar_SetS32("gTunic_Kokiri_Green", Settings.cosmetic.tunic_kokiri_green);
         Settings.cosmetic.tunic_kokiri_blue = (Conf[CosmeticsSection]["tunic_kokiri_blue"] != "") ? Ship::stoi(Conf[CosmeticsSection]["tunic_kokiri_blue"]) : Settings.cosmetic.tunic_kokiri_blue;
-        CVar_SetS32(const_cast<char*>("gTunic_Kokiri_Blue"), Settings.cosmetic.tunic_kokiri_blue);
+        CVar_SetS32("gTunic_Kokiri_Blue", Settings.cosmetic.tunic_kokiri_blue);
 
         Settings.cosmetic.tunic_goron_red = (Conf[CosmeticsSection]["tunic_goron_red"] != "") ? Ship::stoi(Conf[CosmeticsSection]["tunic_goron_red"]) : Settings.cosmetic.tunic_goron_red;
-        CVar_SetS32(const_cast<char*>("gTunic_Goron_Red"), Settings.cosmetic.tunic_goron_red);
+        CVar_SetS32("gTunic_Goron_Red", Settings.cosmetic.tunic_goron_red);
         Settings.cosmetic.tunic_goron_green = (Conf[CosmeticsSection]["tunic_goron_green"] != "") ? Ship::stoi(Conf[CosmeticsSection]["tunic_goron_green"]) : Settings.cosmetic.tunic_goron_green;
-        CVar_SetS32(const_cast<char*>("gTunic_Goron_Green"), Settings.cosmetic.tunic_goron_green);
+        CVar_SetS32("gTunic_Goron_Green", Settings.cosmetic.tunic_goron_green);
         Settings.cosmetic.tunic_goron_blue = (Conf[CosmeticsSection]["tunic_goron_blue"] != "") ? Ship::stoi(Conf[CosmeticsSection]["tunic_goron_blue"]) : Settings.cosmetic.tunic_goron_blue;
-        CVar_SetS32(const_cast<char*>("gTunic_Goron_Blue"), Settings.cosmetic.tunic_goron_blue);
+        CVar_SetS32("gTunic_Goron_Blue", Settings.cosmetic.tunic_goron_blue);
 
         Settings.cosmetic.tunic_zora_red = (Conf[CosmeticsSection]["tunic_zora_green"] != "") ? Ship::stoi(Conf[CosmeticsSection]["tunic_zora_red"]) : Settings.cosmetic.tunic_zora_red;
-        CVar_SetS32(const_cast<char*>("gTunic_Zora_Red"), Settings.cosmetic.tunic_zora_red);
+        CVar_SetS32("gTunic_Zora_Red", Settings.cosmetic.tunic_zora_red);
         Settings.cosmetic.tunic_zora_green = (Conf[CosmeticsSection]["tunic_zora_green"] != "") ? Ship::stoi(Conf[CosmeticsSection]["tunic_zora_green"]) : Settings.cosmetic.tunic_zora_green;
-        CVar_SetS32(const_cast<char*>("gTunic_Zora_Green"), Settings.cosmetic.tunic_zora_green);
+        CVar_SetS32("gTunic_Zora_Green", Settings.cosmetic.tunic_zora_green);
         Settings.cosmetic.tunic_zora_blue = (Conf[CosmeticsSection]["tunic_zora_blue"] != "" ) ? Ship::stoi(Conf[CosmeticsSection]["tunic_zora_blue"]) : Settings.cosmetic.tunic_zora_blue;
-        CVar_SetS32(const_cast<char*>("gTunic_Zora_Blue"), Settings.cosmetic.tunic_zora_blue);
+        CVar_SetS32("gTunic_Zora_Blue", Settings.cosmetic.tunic_zora_blue);
         //Navi
         Settings.cosmetic.navi_idle_inner_red = (Conf[CosmeticsSection]["navi_idle_inner_red"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_idle_inner_red"]) : Settings.cosmetic.navi_idle_inner_red;
-        CVar_SetS32(const_cast<char*>("gNavi_Idle_Inner_Red"), Settings.cosmetic.navi_idle_inner_red);
+        CVar_SetS32("gNavi_Idle_Inner_Red", Settings.cosmetic.navi_idle_inner_red);
         Settings.cosmetic.navi_idle_inner_green = (Conf[CosmeticsSection]["navi_idle_inner_green"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_idle_inner_green"]) : Settings.cosmetic.navi_idle_inner_green;
-        CVar_SetS32(const_cast<char*>("gNavi_Idle_Inner_Green"), Settings.cosmetic.navi_idle_inner_green);
+        CVar_SetS32("gNavi_Idle_Inner_Green", Settings.cosmetic.navi_idle_inner_green);
         Settings.cosmetic.navi_idle_inner_blue = (Conf[CosmeticsSection]["navi_idle_inner_blue"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_idle_inner_blue"]) : Settings.cosmetic.navi_idle_inner_blue;
-        CVar_SetS32(const_cast<char*>("gNavi_Idle_Inner_Blue"), Settings.cosmetic.navi_idle_inner_blue);
+        CVar_SetS32("gNavi_Idle_Inner_Blue", Settings.cosmetic.navi_idle_inner_blue);
         Settings.cosmetic.navi_idle_outer_red = (Conf[CosmeticsSection]["navi_idle_outer_red"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_idle_outer_red"]) : Settings.cosmetic.navi_idle_outer_red;
-        CVar_SetS32(const_cast<char*>("gNavi_Idle_Outer_Red"), Settings.cosmetic.navi_idle_outer_red);
+        CVar_SetS32("gNavi_Idle_Outer_Red", Settings.cosmetic.navi_idle_outer_red);
         Settings.cosmetic.navi_idle_outer_green = (Conf[CosmeticsSection]["navi_idle_outer_green"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_idle_outer_green"]) : Settings.cosmetic.navi_idle_outer_green;
-        CVar_SetS32(const_cast<char*>("gNavi_Idle_Outer_Green"), Settings.cosmetic.navi_idle_outer_green);
+        CVar_SetS32("gNavi_Idle_Outer_Green", Settings.cosmetic.navi_idle_outer_green);
         Settings.cosmetic.navi_idle_outer_blue = (Conf[CosmeticsSection]["navi_idle_outer_blue"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_idle_outer_blue"]) : Settings.cosmetic.navi_idle_outer_blue;
-        CVar_SetS32(const_cast<char*>("gNavi_Idle_Outer_Blue"), Settings.cosmetic.navi_idle_outer_blue);
+        CVar_SetS32("gNavi_Idle_Outer_Blue", Settings.cosmetic.navi_idle_outer_blue);
 
         Settings.cosmetic.navi_npc_inner_red = (Conf[CosmeticsSection]["navi_npc_inner_red"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_npc_inner_red"]) : Settings.cosmetic.navi_npc_inner_red;
-        CVar_SetS32(const_cast<char*>("gNavi_NPC_Inner_Red"), Settings.cosmetic.navi_npc_inner_red);
+        CVar_SetS32("gNavi_NPC_Inner_Red", Settings.cosmetic.navi_npc_inner_red);
         Settings.cosmetic.navi_npc_inner_green = (Conf[CosmeticsSection]["navi_npc_inner_green"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_npc_inner_green"]) : Settings.cosmetic.navi_npc_inner_green;
-        CVar_SetS32(const_cast<char*>("gNavi_NPC_Inner_Green"), Settings.cosmetic.navi_npc_inner_green);
+        CVar_SetS32("gNavi_NPC_Inner_Green", Settings.cosmetic.navi_npc_inner_green);
         Settings.cosmetic.navi_npc_inner_blue = (Conf[CosmeticsSection]["navi_npc_inner_blue"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_npc_inner_blue"]) : Settings.cosmetic.navi_npc_inner_blue;
-        CVar_SetS32(const_cast<char*>("gNavi_NPC_Inner_Blue"), Settings.cosmetic.navi_npc_inner_blue);
+        CVar_SetS32("gNavi_NPC_Inner_Blue", Settings.cosmetic.navi_npc_inner_blue);
         Settings.cosmetic.navi_npc_outer_red = (Conf[CosmeticsSection]["navi_npc_outer_red"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_npc_outer_red"]) : Settings.cosmetic.navi_npc_outer_red;
-        CVar_SetS32(const_cast<char*>("gNavi_NPC_Outer_Red"), Settings.cosmetic.navi_npc_outer_red);
+        CVar_SetS32("gNavi_NPC_Outer_Red", Settings.cosmetic.navi_npc_outer_red);
         Settings.cosmetic.navi_npc_outer_green = (Conf[CosmeticsSection]["navi_npc_outer_green"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_npc_outer_green"]) : Settings.cosmetic.navi_npc_outer_green;
-        CVar_SetS32(const_cast<char*>("gNavi_NPC_Outer_Green"), Settings.cosmetic.navi_npc_outer_green);
+        CVar_SetS32("gNavi_NPC_Outer_Green", Settings.cosmetic.navi_npc_outer_green);
         Settings.cosmetic.navi_npc_outer_blue = (Conf[CosmeticsSection]["navi_npc_outer_blue"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_npc_outer_blue"]) : Settings.cosmetic.navi_npc_outer_blue;
-        CVar_SetS32(const_cast<char*>("gNavi_NPC_Outer_Blue"), Settings.cosmetic.navi_npc_outer_blue);
+        CVar_SetS32("gNavi_NPC_Outer_Blue", Settings.cosmetic.navi_npc_outer_blue);
 
         Settings.cosmetic.navi_enemy_inner_red = (Conf[CosmeticsSection]["navi_enemy_inner_red"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_enemy_inner_red"]) : Settings.cosmetic.navi_enemy_inner_red;
-        CVar_SetS32(const_cast<char*>("gNavi_Enemy_Inner_Red"), Settings.cosmetic.navi_enemy_inner_red);
+        CVar_SetS32("gNavi_Enemy_Inner_Red", Settings.cosmetic.navi_enemy_inner_red);
         Settings.cosmetic.navi_enemy_inner_green = (Conf[CosmeticsSection]["navi_enemy_inner_green"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_enemy_inner_green"]) : Settings.cosmetic.navi_enemy_inner_green;
-        CVar_SetS32(const_cast<char*>("gNavi_Enemy_Inner_Green"), Settings.cosmetic.navi_enemy_inner_green);
+        CVar_SetS32("gNavi_Enemy_Inner_Green", Settings.cosmetic.navi_enemy_inner_green);
         Settings.cosmetic.navi_enemy_inner_blue = (Conf[CosmeticsSection]["navi_enemy_inner_blue"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_enemy_inner_blue"]) : Settings.cosmetic.navi_enemy_inner_blue;
-        CVar_SetS32(const_cast<char*>("gNavi_Enemy_Inner_Blue"), Settings.cosmetic.navi_enemy_inner_blue);
+        CVar_SetS32("gNavi_Enemy_Inner_Blue", Settings.cosmetic.navi_enemy_inner_blue);
         Settings.cosmetic.navi_enemy_outer_red = (Conf[CosmeticsSection]["navi_enemy_outer_red"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_enemy_outer_red"]) : Settings.cosmetic.navi_enemy_outer_red;
-        CVar_SetS32(const_cast<char*>("gNavi_Enemy_Outer_Red"), Settings.cosmetic.navi_enemy_outer_red);
+        CVar_SetS32("gNavi_Enemy_Outer_Red", Settings.cosmetic.navi_enemy_outer_red);
         Settings.cosmetic.navi_enemy_outer_green = (Conf[CosmeticsSection]["navi_enemy_outer_green"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_enemy_outer_green"]) : Settings.cosmetic.navi_enemy_outer_green;
-        CVar_SetS32(const_cast<char*>("gNavi_Enemy_Outer_Green"), Settings.cosmetic.navi_enemy_outer_green);
+        CVar_SetS32("gNavi_Enemy_Outer_Green", Settings.cosmetic.navi_enemy_outer_green);
         Settings.cosmetic.navi_enemy_outer_blue = (Conf[CosmeticsSection]["navi_enemy_outer_blue"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_enemy_outer_blue"]) : Settings.cosmetic.navi_enemy_outer_blue;
-        CVar_SetS32(const_cast<char*>("gNavi_Enemy_Outer_Blue"), Settings.cosmetic.navi_enemy_outer_blue);
+        CVar_SetS32("gNavi_Enemy_Outer_Blue", Settings.cosmetic.navi_enemy_outer_blue);
 
         Settings.cosmetic.navi_prop_inner_red = (Conf[CosmeticsSection]["navi_prop_inner_red"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_prop_inner_red"]) : Settings.cosmetic.navi_prop_inner_red;
-        CVar_SetS32(const_cast<char*>("gNavi_Prop_Inner_Red"), Settings.cosmetic.navi_prop_inner_red);
+        CVar_SetS32("gNavi_Prop_Inner_Red", Settings.cosmetic.navi_prop_inner_red);
         Settings.cosmetic.navi_prop_inner_green = (Conf[CosmeticsSection]["navi_prop_inner_green"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_prop_inner_green"]) : Settings.cosmetic.navi_prop_inner_green;
-        CVar_SetS32(const_cast<char*>("gNavi_Prop_Inner_Green"), Settings.cosmetic.navi_prop_inner_green);
+        CVar_SetS32("gNavi_Prop_Inner_Green", Settings.cosmetic.navi_prop_inner_green);
         Settings.cosmetic.navi_prop_inner_blue = (Conf[CosmeticsSection]["navi_prop_inner_blue"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_prop_inner_blue"]) : Settings.cosmetic.navi_prop_inner_blue;
-        CVar_SetS32(const_cast<char*>("gNavi_Prop_Inner_Blue"), Settings.cosmetic.navi_prop_inner_blue);
+        CVar_SetS32("gNavi_Prop_Inner_Blue", Settings.cosmetic.navi_prop_inner_blue);
         Settings.cosmetic.navi_prop_outer_red = (Conf[CosmeticsSection]["navi_prop_outer_red"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_prop_outer_red"]) : Settings.cosmetic.navi_prop_outer_red;
-        CVar_SetS32(const_cast<char*>("gNavi_Prop_Outer_Red"), Settings.cosmetic.navi_prop_outer_red);
+        CVar_SetS32("gNavi_Prop_Outer_Red", Settings.cosmetic.navi_prop_outer_red);
         Settings.cosmetic.navi_prop_outer_green = (Conf[CosmeticsSection]["navi_prop_outer_green"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_prop_outer_green"]) : Settings.cosmetic.navi_prop_outer_green;
-        CVar_SetS32(const_cast<char*>("gNavi_Prop_Outer_Green"), Settings.cosmetic.navi_prop_outer_green);
+        CVar_SetS32("gNavi_Prop_Outer_Green", Settings.cosmetic.navi_prop_outer_green);
         Settings.cosmetic.navi_prop_outer_blue = (Conf[CosmeticsSection]["navi_prop_outer_blue"] != "") ? Ship::stoi(Conf[CosmeticsSection]["navi_prop_outer_blue"]) : Settings.cosmetic.navi_prop_outer_blue;
-        CVar_SetS32(const_cast<char*>("gNavi_Prop_Outer_Blue"), Settings.cosmetic.navi_prop_outer_blue);
+        CVar_SetS32("gNavi_Prop_Outer_Blue", Settings.cosmetic.navi_prop_outer_blue);
 
 
 
@@ -238,9 +237,28 @@ namespace Game {
         Settings.cheats.freeze_time = stob(Conf[CheatSection]["freeze_time"]);
         CVar_SetS32("gFreezeTime", Settings.cheats.freeze_time);
 
+        // Per-Controller
+        LoadPadSettings();
+
         UpdateAudio();
     }
 
+    void LoadPadSettings() {
+        const std::shared_ptr<ConfigFile> pConf = GlobalCtx2::GetInstance()->GetConfig();
+        ConfigFile& Conf = *pConf;
+
+        for (const auto& [i, controllers] : Ship::Window::Controllers) {
+            for (const auto& controller : controllers) {
+                if (auto padConfSection = controller->GetPadConfSection()) {
+                    Settings.controller.extra[i].gyro_sensitivity = Ship::stof(Conf[*padConfSection]["gyro_sensitivity"]);
+                    Settings.controller.extra[i].rumble_strength = Ship::stof(Conf[*padConfSection]["rumble_strength"]);
+                    Settings.controller.extra[i].gyro_drift_x = Ship::stof(Conf[*padConfSection]["gyro_drift_x"], 0.0f);
+                    Settings.controller.extra[i].gyro_drift_y = Ship::stof(Conf[*padConfSection]["gyro_drift_y"], 0.0f);
+                }
+            }
+        }
+    }
+
     void SaveSettings() {
 	    const std::shared_ptr<ConfigFile> pConf = GlobalCtx2::GetInstance()->GetConfig();
         ConfigFile& Conf = *pConf;
@@ -272,8 +290,7 @@ namespace Game {
 
 
         // Controllers
-        Conf[ControllerSection]["gyro_sensitivity"] = std::to_string(Settings.controller.gyro_sensitivity);
-        Conf[ControllerSection]["rumble_strength"]  = std::to_string(Settings.controller.rumble_strength);
+        Conf[ControllerSection]["rumble_enabled"]  = std::to_string(Settings.controller.rumble_enabled);
         Conf[ControllerSection]["input_scale"]   = std::to_string(Settings.controller.input_scale);
         Conf[ControllerSection]["input_enabled"] = std::to_string(Settings.controller.input_enabled);
         Conf[ControllerSection]["dpad_pause_name"] = std::to_string(Settings.controller.dpad_pause_name);
@@ -333,6 +350,17 @@ namespace Game {
         Conf[CheatSection]["moon_jump_on_l"] = std::to_string(Settings.cheats.moon_jump_on_l);
         Conf[CheatSection]["super_tunic"] = std::to_string(Settings.cheats.super_tunic);
 
+        // Per-Controller
+        for (const auto& [i, controllers] : Ship::Window::Controllers) {
+            for (const auto& controller : controllers) {
+                if (auto padConfSection = controller->GetPadConfSection()) {
+                    Conf[*padConfSection]["gyro_sensitivity"] = std::to_string(Settings.controller.extra[i].gyro_sensitivity);
+                    Conf[*padConfSection]["rumble_strength"]  = std::to_string(Settings.controller.extra[i].rumble_strength);
+                    Conf[*padConfSection]["gyro_drift_x"] = std::to_string(Settings.controller.extra[i].gyro_drift_x);
+                    Conf[*padConfSection]["gyro_drift_y"]  = std::to_string(Settings.controller.extra[i].gyro_drift_y);
+                }
+            }
+        }
 
         Conf.Save();
     }
diff --git a/libultraship/libultraship/GameSettings.h b/libultraship/libultraship/GameSettings.h
index 4f4eecb97..2feea8dcb 100644
--- a/libultraship/libultraship/GameSettings.h
+++ b/libultraship/libultraship/GameSettings.h
@@ -34,11 +34,14 @@ struct SoHConfigType {
 
     // Controller
     struct {
-        float gyro_sensitivity = 1.0f;
-        float rumble_strength = 1.0f;
+        struct {
+            float gyro_sensitivity = 1.0f;
+            float rumble_strength = 1.0f;
+            float gyro_drift_x = 0.0f;
+            float gyro_drift_y = 0.0f;
+        } extra[4];
+        bool rumble_enabled = true;
         float input_scale = 1.0f;
-        float gyroDriftX = 0.0f;
-        float gyroDriftY = 0.0f;
         bool input_enabled = false;
         bool dpad_pause_name = false;
         bool dpad_ocarina_text = false;
@@ -128,6 +131,7 @@ namespace Game {
     extern SoHConfigType Settings;
     void InitSettings();
     void LoadSettings();
+    void LoadPadSettings();
     void SaveSettings();
     void SetSeqPlayerVolume(SeqPlayers playerId, float volume);
 }
diff --git a/libultraship/libultraship/KeyboardController.cpp b/libultraship/libultraship/KeyboardController.cpp
index 6f78a1678..13014c6a7 100644
--- a/libultraship/libultraship/KeyboardController.cpp
+++ b/libultraship/libultraship/KeyboardController.cpp
@@ -53,4 +53,4 @@ namespace Ship {
 	std::string KeyboardController::GetBindingConfSection() {
 		return GetControllerType() + " CONTROLLER BINDING " + std::to_string(GetControllerNumber() + 1);
 	}
-}
\ No newline at end of file
+}
diff --git a/libultraship/libultraship/KeyboardController.h b/libultraship/libultraship/KeyboardController.h
index ab0f98e64..f6c109ca7 100644
--- a/libultraship/libultraship/KeyboardController.h
+++ b/libultraship/libultraship/KeyboardController.h
@@ -10,11 +10,16 @@ namespace Ship {
 
 			void ReadFromSource();
 			void WriteToSource(ControllerCallback* controller);
+			bool Connected() const { return true; }
+			bool CanRumble() const { return false; }
 
 			bool PressButton(int32_t dwScancode);
 			bool ReleaseButton(int32_t dwScancode);
 			void ReleaseAllButtons();
 
+			bool HasPadConf() const { return false; }
+			std::optional<std::string> GetPadConfSection() { return {}; }
+
 		protected:
 			std::string GetControllerType();
 			std::string GetConfSection();
diff --git a/libultraship/libultraship/SDLController.cpp b/libultraship/libultraship/SDLController.cpp
index 47fb57441..267607048 100644
--- a/libultraship/libultraship/SDLController.cpp
+++ b/libultraship/libultraship/SDLController.cpp
@@ -74,15 +74,21 @@ namespace Ship {
                     Cont = NewCont;
 
                     std::string BindingConfSection = GetBindingConfSection();
-                    std::shared_ptr<ConfigFile> pBindingConf = GlobalCtx2::GetInstance()->GetConfig();
-                    ConfigFile& BindingConf = *pBindingConf.get();
+                    std::string PadConfSection = *GetPadConfSection();
+                    std::shared_ptr<ConfigFile> config = GlobalCtx2::GetInstance()->GetConfig();
 
-                    if (!BindingConf.has(BindingConfSection)) {
+                    if (!config->has(BindingConfSection)) {
                         CreateDefaultBinding();
                     }
 
+                    if (!config->has(PadConfSection)) {
+                        CreateDefaultPadConf();
+                    }
+
                     LoadBinding();
                     LoadAxisThresholds();
+                    // Update per-controller settings in ImGui menu after opening controller.
+                    Game::LoadPadSettings();
 
                     break;
                 }
@@ -93,6 +99,9 @@ namespace Ship {
     }
 
     bool SDLController::Close() {
+        if (SDL_GameControllerHasRumble(Cont)) {
+            SDL_GameControllerRumble(Cont, 0, 0, 0);
+        }
         if (Cont != nullptr) {
             SDL_GameControllerClose(Cont);
         }
@@ -178,37 +187,41 @@ namespace Ship {
 
         if (SDL_GameControllerHasSensor(Cont, SDL_SENSOR_GYRO))
         {
+            size_t contNumber = GetControllerNumber();
+            float& gyro_drift_x = Game::Settings.controller.extra[contNumber].gyro_drift_x;
+            float& gyro_drift_y = Game::Settings.controller.extra[contNumber].gyro_drift_y;
+            const float gyro_sensitivity = Game::Settings.controller.extra[contNumber].gyro_sensitivity;
+
             float gyroData[3];
             SDL_GameControllerGetSensorData(Cont, SDL_SENSOR_GYRO, gyroData, 3);
 
             const char* contName = SDL_GameControllerName(Cont);
             const int isSpecialController = !strcmp("PS5 Controller", contName);
-            const float gyroSensitivity = Game::Settings.controller.gyro_sensitivity;
 
-            if (Game::Settings.controller.gyroDriftX == 0) {
-                Game::Settings.controller.gyroDriftX = gyroData[0];
+            if (gyro_drift_x == 0) {
+                gyro_drift_x = gyroData[0];
             }
 
-            if (Game::Settings.controller.gyroDriftY == 0) {
+            if (gyro_drift_y == 0) {
                 if (isSpecialController == 1) {
-                    Game::Settings.controller.gyroDriftY = gyroData[2];
+                    gyro_drift_y = gyroData[2];
                 }
                 else {
-                    Game::Settings.controller.gyroDriftY = gyroData[1];
+                    gyro_drift_y = gyroData[1];
                 }
             }
 
             if (isSpecialController == 1) {
-                wGyroX = gyroData[0] - Game::Settings.controller.gyroDriftX;
-                wGyroY = -gyroData[2] - Game::Settings.controller.gyroDriftY;
+                wGyroX = gyroData[0] - gyro_drift_x;
+                wGyroY = -gyroData[2] - gyro_drift_y;
             }
             else {
-                wGyroX = gyroData[0] - Game::Settings.controller.gyroDriftX;
-                wGyroY = gyroData[1] - Game::Settings.controller.gyroDriftY;
+                wGyroX = gyroData[0] - gyro_drift_x;
+                wGyroY = gyroData[1] - gyro_drift_y;
             }
 
-            wGyroX *= gyroSensitivity;
-            wGyroY *= gyroSensitivity;
+            wGyroX *= gyro_sensitivity;
+            wGyroY *= gyro_sensitivity;
         }
 
         for (int32_t i = SDL_CONTROLLER_BUTTON_A; i < SDL_CONTROLLER_BUTTON_MAX; i++) {
@@ -331,7 +344,10 @@ namespace Ship {
     {
         if (SDL_GameControllerHasRumble(Cont)) {
             if (controller->rumble > 0) {
-                SDL_GameControllerRumble(Cont, 0xFFFF * Game::Settings.controller.rumble_strength, 0xFFFF * Game::Settings.controller.rumble_strength, 1);
+                float rumble_strength = Game::Settings.controller.extra[GetControllerNumber()].rumble_strength;
+                SDL_GameControllerRumble(Cont, 0xFFFF * rumble_strength, 0xFFFF * rumble_strength, 0);
+            } else {
+                SDL_GameControllerRumble(Cont, 0, 0, 0);
             }
         }
 
@@ -391,6 +407,19 @@ namespace Ship {
         Conf.Save();
     }
 
+    void SDLController::CreateDefaultPadConf() {
+        std::string ConfSection = *GetPadConfSection();
+        std::shared_ptr<ConfigFile> pConf = GlobalCtx2::GetInstance()->GetConfig();
+        ConfigFile& Conf = *pConf.get();
+
+        Conf[ConfSection]["gyro_sensitivity"] = std::to_string(1.0f);
+        Conf[ConfSection]["rumble_strength"] = std::to_string(1.0f);
+        Conf[ConfSection]["gyro_drift_x"] = std::to_string(0.0f);
+        Conf[ConfSection]["gyro_drift_y"] = std::to_string(0.0f);
+
+        Conf.Save();
+    }
+
     void SDLController::SetButtonMapping(const std::string& szButtonName, int32_t dwScancode) {
         if (guid.compare(INVALID_SDL_CONTROLLER_GUID)) {
             return;
@@ -410,4 +439,8 @@ namespace Ship {
     std::string SDLController::GetBindingConfSection() {
         return GetControllerType() + " CONTROLLER BINDING " + guid;
     }
+
+    std::optional<std::string> SDLController::GetPadConfSection() {
+        return GetControllerType() + " CONTROLLER PAD " + guid;
+    }
 }
diff --git a/libultraship/libultraship/SDLController.h b/libultraship/libultraship/SDLController.h
index 5c71c50a9..138466a89 100644
--- a/libultraship/libultraship/SDLController.h
+++ b/libultraship/libultraship/SDLController.h
@@ -12,15 +12,21 @@ namespace Ship {
 
 			void ReadFromSource();
 			void WriteToSource(ControllerCallback* controller);
+			bool Connected() const { return Cont != nullptr; }
+			bool CanRumble() const { return SDL_GameControllerHasRumble(Cont); }
 
 			std::string GetGuid() { return guid; };
 
+			bool HasPadConf() const { return true; }
+			std::optional<std::string> GetPadConfSection();
+
 		protected:
 			std::string GetControllerType();
 			void SetButtonMapping(const std::string& szButtonName, int32_t dwScancode);
 			std::string GetConfSection();
 			std::string GetBindingConfSection();
 			void CreateDefaultBinding();
+			void CreateDefaultPadConf();
 			static bool IsGuidInUse(const std::string& guid);
 
 		private:
diff --git a/libultraship/libultraship/SohImGuiImpl.cpp b/libultraship/libultraship/SohImGuiImpl.cpp
index 96211fe20..5111a0d6d 100644
--- a/libultraship/libultraship/SohImGuiImpl.cpp
+++ b/libultraship/libultraship/SohImGuiImpl.cpp
@@ -3,6 +3,9 @@
 #include <iostream>
 #include <map>
 #include <utility>
+#include <string>
+#include <algorithm>
+#include <vector>
 
 #include "Archive.h"
 #include "Environment.h"
@@ -81,49 +84,49 @@ namespace SohImGui {
             ImGui_ImplWin32_Init(impl.dx11.window);
             break;
         }
-        kokiri_col[0] = std::clamp((float) CVar_GetS32((char*)"gTunic_Kokiri_Red", 30)/255, 0.0f, 1.0f);
-        kokiri_col[1] = std::clamp((float)CVar_GetS32((char*)"gTunic_Kokiri_Green", 105) / 255, 0.0f, 1.0f);
-        kokiri_col[2] = std::clamp((float)CVar_GetS32((char*)"gTunic_Kokiri_Blue", 27) / 255, 0.0f, 1.0f);
+        kokiri_col[0] = std::clamp((float) CVar_GetS32("gTunic_Kokiri_Red", 30)/255, 0.0f, 1.0f);
+        kokiri_col[1] = std::clamp((float)CVar_GetS32("gTunic_Kokiri_Green", 105) / 255, 0.0f, 1.0f);
+        kokiri_col[2] = std::clamp((float)CVar_GetS32("gTunic_Kokiri_Blue", 27) / 255, 0.0f, 1.0f);
 
-        goron_col[0] = std::clamp((float)CVar_GetS32((char*)"gTunic_Goron_Red", 100) / 255, 0.0f, 1.0f);
-        goron_col[1] = std::clamp((float)CVar_GetS32((char*)"gTunic_Goron_Green", 20) / 255, 0.0f, 1.0f);
-        goron_col[2] = std::clamp((float)CVar_GetS32((char*)"gTunic_Goron_Blue", 0) / 255, 0.0f, 1.0f);
+        goron_col[0] = std::clamp((float)CVar_GetS32("gTunic_Goron_Red", 100) / 255, 0.0f, 1.0f);
+        goron_col[1] = std::clamp((float)CVar_GetS32("gTunic_Goron_Green", 20) / 255, 0.0f, 1.0f);
+        goron_col[2] = std::clamp((float)CVar_GetS32("gTunic_Goron_Blue", 0) / 255, 0.0f, 1.0f);
         
-        zora_col[0] = std::clamp((float)CVar_GetS32((char*)"gTunic_Zora_Red", 0) / 255, 0.0f, 1.0f);
-        zora_col[1] = std::clamp((float)CVar_GetS32((char*)"gTunic_Zora_Green", 60) / 255, 0.0f, 1.0f);
-        zora_col[2] = std::clamp((float)CVar_GetS32((char*)"gTunic_Zora_Blue", 100) / 255, 0.0f, 1.0f);
+        zora_col[0] = std::clamp((float)CVar_GetS32("gTunic_Zora_Red", 0) / 255, 0.0f, 1.0f);
+        zora_col[1] = std::clamp((float)CVar_GetS32("gTunic_Zora_Green", 60) / 255, 0.0f, 1.0f);
+        zora_col[2] = std::clamp((float)CVar_GetS32("gTunic_Zora_Blue", 100) / 255, 0.0f, 1.0f);
 
-        navi_idle_i_col[0] = std::clamp((float)CVar_GetS32((char*)"gNavi_Idle_Inner_Red", 0) / 255, 0.0f, 1.0f);
-        navi_idle_i_col[1] = std::clamp((float)CVar_GetS32((char*)"gNavi_Idle_Inner_Green", 0) / 255, 0.0f, 1.0f);
-        navi_idle_i_col[2] = std::clamp((float)CVar_GetS32((char*)"gNavi_Idle_Inner_Blue", 0) / 255, 0.0f, 1.0f);
+        navi_idle_i_col[0] = std::clamp((float)CVar_GetS32("gNavi_Idle_Inner_Red", 0) / 255, 0.0f, 1.0f);
+        navi_idle_i_col[1] = std::clamp((float)CVar_GetS32("gNavi_Idle_Inner_Green", 0) / 255, 0.0f, 1.0f);
+        navi_idle_i_col[2] = std::clamp((float)CVar_GetS32("gNavi_Idle_Inner_Blue", 0) / 255, 0.0f, 1.0f);
 
-        navi_idle_o_col[0] = std::clamp((float)CVar_GetS32((char*)"gNavi_Idle_Outer_Red", 0) / 255, 0.0f, 1.0f);
-        navi_idle_o_col[1] = std::clamp((float)CVar_GetS32((char*)"gNavi_Idle_Outer_Green", 0) / 255, 0.0f, 1.0f);
-        navi_idle_o_col[2] = std::clamp((float)CVar_GetS32((char*)"gNavi_Idle_Outer_Blue", 0) / 255, 0.0f, 1.0f);
+        navi_idle_o_col[0] = std::clamp((float)CVar_GetS32("gNavi_Idle_Outer_Red", 0) / 255, 0.0f, 1.0f);
+        navi_idle_o_col[1] = std::clamp((float)CVar_GetS32("gNavi_Idle_Outer_Green", 0) / 255, 0.0f, 1.0f);
+        navi_idle_o_col[2] = std::clamp((float)CVar_GetS32("gNavi_Idle_Outer_Blue", 0) / 255, 0.0f, 1.0f);
 
-        navi_npc_i_col[0] = std::clamp((float)CVar_GetS32((char*)"gNavi_NPC_Inner_Red", 0) / 255, 0.0f, 1.0f);
-        navi_npc_i_col[1] = std::clamp((float)CVar_GetS32((char*)"gNavi_NPC_Inner_Green", 0) / 255, 0.0f, 1.0f);
-        navi_npc_i_col[2] = std::clamp((float)CVar_GetS32((char*)"gNavi_NPC_Inner_Blue", 0) / 255, 0.0f, 1.0f);
+        navi_npc_i_col[0] = std::clamp((float)CVar_GetS32("gNavi_NPC_Inner_Red", 0) / 255, 0.0f, 1.0f);
+        navi_npc_i_col[1] = std::clamp((float)CVar_GetS32("gNavi_NPC_Inner_Green", 0) / 255, 0.0f, 1.0f);
+        navi_npc_i_col[2] = std::clamp((float)CVar_GetS32("gNavi_NPC_Inner_Blue", 0) / 255, 0.0f, 1.0f);
 
-        navi_npc_o_col[0] = std::clamp((float)CVar_GetS32((char*)"gNavi_NPC_Outer_Red", 0) / 255, 0.0f, 1.0f);
-        navi_npc_o_col[1] = std::clamp((float)CVar_GetS32((char*)"gNavi_NPC_Outer_Green", 0) / 255, 0.0f, 1.0f);
-        navi_npc_o_col[2] = std::clamp((float)CVar_GetS32((char*)"gNavi_NPC_Outer_Blue", 0) / 255, 0.0f, 1.0f);
+        navi_npc_o_col[0] = std::clamp((float)CVar_GetS32("gNavi_NPC_Outer_Red", 0) / 255, 0.0f, 1.0f);
+        navi_npc_o_col[1] = std::clamp((float)CVar_GetS32("gNavi_NPC_Outer_Green", 0) / 255, 0.0f, 1.0f);
+        navi_npc_o_col[2] = std::clamp((float)CVar_GetS32("gNavi_NPC_Outer_Blue", 0) / 255, 0.0f, 1.0f);
 
-        navi_enemy_i_col[0] = std::clamp((float)CVar_GetS32((char*)"gNavi_Enemy_Inner_Red", 0) / 255, 0.0f, 1.0f);
-        navi_enemy_i_col[1] = std::clamp((float)CVar_GetS32((char*)"gNavi_Enemy_Inner_Green", 0) / 255, 0.0f, 1.0f);
-        navi_enemy_i_col[2] = std::clamp((float)CVar_GetS32((char*)"gNavi_Enemy_Inner_Blue", 0) / 255, 0.0f, 1.0f);
+        navi_enemy_i_col[0] = std::clamp((float)CVar_GetS32("gNavi_Enemy_Inner_Red", 0) / 255, 0.0f, 1.0f);
+        navi_enemy_i_col[1] = std::clamp((float)CVar_GetS32("gNavi_Enemy_Inner_Green", 0) / 255, 0.0f, 1.0f);
+        navi_enemy_i_col[2] = std::clamp((float)CVar_GetS32("gNavi_Enemy_Inner_Blue", 0) / 255, 0.0f, 1.0f);
 
-        navi_enemy_o_col[0] = std::clamp((float)CVar_GetS32((char*)"gNavi_Enemy_Outer_Red", 0) / 255, 0.0f, 1.0f);
-        navi_enemy_o_col[1] = std::clamp((float)CVar_GetS32((char*)"gNavi_Enemy_Outer_Green", 0) / 255, 0.0f, 1.0f);
-        navi_enemy_o_col[2] = std::clamp((float)CVar_GetS32((char*)"gNavi_Enemy_Outer_Blue", 0) / 255, 0.0f, 1.0f);
+        navi_enemy_o_col[0] = std::clamp((float)CVar_GetS32("gNavi_Enemy_Outer_Red", 0) / 255, 0.0f, 1.0f);
+        navi_enemy_o_col[1] = std::clamp((float)CVar_GetS32("gNavi_Enemy_Outer_Green", 0) / 255, 0.0f, 1.0f);
+        navi_enemy_o_col[2] = std::clamp((float)CVar_GetS32("gNavi_Enemy_Outer_Blue", 0) / 255, 0.0f, 1.0f);
 
-        navi_prop_i_col[0] = std::clamp((float)CVar_GetS32((char*)"gNavi_Prop_Inner_Red", 0) / 255, 0.0f, 1.0f);
-        navi_prop_i_col[1] = std::clamp((float)CVar_GetS32((char*)"gNavi_Prop_Inner_Green", 0) / 255, 0.0f, 1.0f);
-        navi_prop_i_col[2] = std::clamp((float)CVar_GetS32((char*)"gNavi_Prop_Inner_Blue", 0) / 255, 0.0f, 1.0f);
+        navi_prop_i_col[0] = std::clamp((float)CVar_GetS32("gNavi_Prop_Inner_Red", 0) / 255, 0.0f, 1.0f);
+        navi_prop_i_col[1] = std::clamp((float)CVar_GetS32("gNavi_Prop_Inner_Green", 0) / 255, 0.0f, 1.0f);
+        navi_prop_i_col[2] = std::clamp((float)CVar_GetS32("gNavi_Prop_Inner_Blue", 0) / 255, 0.0f, 1.0f);
 
-        navi_prop_o_col[0] = std::clamp((float)CVar_GetS32((char*)"gNavi_Prop_Outer_Red", 0) / 255, 0.0f, 1.0f);
-        navi_prop_o_col[1] = std::clamp((float)CVar_GetS32((char*)"gNavi_Prop_Outer_Green", 0) / 255, 0.0f, 1.0f);
-        navi_prop_o_col[2] = std::clamp((float)CVar_GetS32((char*)"gNavi_Prop_Outer_Blue", 0) / 255, 0.0f, 1.0f);
+        navi_prop_o_col[0] = std::clamp((float)CVar_GetS32("gNavi_Prop_Outer_Red", 0) / 255, 0.0f, 1.0f);
+        navi_prop_o_col[1] = std::clamp((float)CVar_GetS32("gNavi_Prop_Outer_Green", 0) / 255, 0.0f, 1.0f);
+        navi_prop_o_col[2] = std::clamp((float)CVar_GetS32("gNavi_Prop_Outer_Blue", 0) / 255, 0.0f, 1.0f);
     }
 
     void ImGuiBackendInit() {
@@ -402,20 +405,41 @@ namespace SohImGui {
             }
 
             if (ImGui::BeginMenu("Controller")) {
-                ImGui::Text("Gyro Sensitivity: %d %%", static_cast<int>(100 * Game::Settings.controller.gyro_sensitivity));
-                if (ImGui::SliderFloat("##GYROSCOPE", &Game::Settings.controller.gyro_sensitivity, 0.0f, 1.0f, "")) {
-                    needs_save = true;
-                }
+                for (const auto& [i, controllers] : Ship::Window::Controllers) {
+                    bool hasPad = std::find_if(controllers.begin(), controllers.end(), [](const auto& c) {
+                        return c->HasPadConf() && c->Connected();
+                    }) != controllers.end();
 
-                if (ImGui::Button("Recalibrate Gyro")) {
-                    Game::Settings.controller.gyroDriftX = 0;
-                    Game::Settings.controller.gyroDriftY = 0;
+                    if (!hasPad) continue;
+
+                    auto menuLabel = "Controller " + std::to_string(i + 1);
+                    if (ImGui::BeginMenu(menuLabel.c_str())) {
+                        ImGui::Text("Gyro Sensitivity: %d %%", static_cast<int>(100 * Game::Settings.controller.extra[i].gyro_sensitivity));
+                        if (ImGui::SliderFloat("##GYROSCOPE", &Game::Settings.controller.extra[i].gyro_sensitivity, 0.0f, 1.0f, "")) {
+                            needs_save = true;
+                        }
+
+                        if (ImGui::Button("Recalibrate Gyro")) {
+                            Game::Settings.controller.extra[i].gyro_drift_x = 0;
+                            Game::Settings.controller.extra[i].gyro_drift_y = 0;
+                            needs_save = true;
+                        }
+
+                        ImGui::Separator();
+
+                        ImGui::Text("Rumble Strength: %d %%", static_cast<int>(100 * Game::Settings.controller.extra[i].rumble_strength));
+                        if (ImGui::SliderFloat("##RUMBLE", &Game::Settings.controller.extra[i].rumble_strength, 0.0f, 1.0f, "")) {
+                            needs_save = true;
+                        }
+
+                        ImGui::EndMenu();
+                    }
                 }
 
                 ImGui::Separator();
 
-                ImGui::Text("Rumble Strength: %d %%", static_cast<int>(100 * Game::Settings.controller.rumble_strength));
-                if (ImGui::SliderFloat("##RUMBLE", &Game::Settings.controller.rumble_strength, 0.0f, 1.0f, "")) {
+                if (ImGui::Checkbox("Rumble Enabled", &Game::Settings.controller.rumble_enabled)) {
+                    CVar_SetS32("gRumbleEnabled", Game::Settings.controller.rumble_enabled);
                     needs_save = true;
                 }
 
@@ -505,7 +529,7 @@ namespace SohImGui {
                 }
               
                 if (ImGui::Checkbox("Dynamic Wallet Icon", &Game::Settings.enhancements.dynamic_wallet_icon)) {
-                    CVar_SetS32(const_cast<char*>("gDynamicWalletIcon"), Game::Settings.enhancements.dynamic_wallet_icon);
+                    CVar_SetS32("gDynamicWalletIcon", Game::Settings.enhancements.dynamic_wallet_icon);
 
                     needs_save = true;
                 }
@@ -587,30 +611,30 @@ namespace SohImGui {
                 ImGui::Text("Tunics");
                 ImGui::Separator();
                 if (ImGui::ColorEdit3("Kokiri Tunic", kokiri_col)) {
-                    Game::Settings.cosmetic.tunic_kokiri_red = (int) (kokiri_col[0] * 255);
-                    Game::Settings.cosmetic.tunic_kokiri_green = (int) (kokiri_col[1] * 255);
-                    Game::Settings.cosmetic.tunic_kokiri_blue = (int) (kokiri_col[2] * 255);
-                    CVar_SetS32(const_cast<char*>("gTunic_Kokiri_Red"), Game::Settings.cosmetic.tunic_kokiri_red);
-                    CVar_SetS32(const_cast<char*>("gTunic_Kokiri_Green"), Game::Settings.cosmetic.tunic_kokiri_green);
-                    CVar_SetS32(const_cast<char*>("gTunic_Kokiri_Blue"), Game::Settings.cosmetic.tunic_kokiri_blue);
+                    Game::Settings.cosmetic.tunic_kokiri_red = (int)(kokiri_col[0] * 255);
+                    Game::Settings.cosmetic.tunic_kokiri_green = (int)(kokiri_col[1] * 255);
+                    Game::Settings.cosmetic.tunic_kokiri_blue = (int)(kokiri_col[2] * 255);
+                    CVar_SetS32("gTunic_Kokiri_Red", Game::Settings.cosmetic.tunic_kokiri_red);
+                    CVar_SetS32("gTunic_Kokiri_Green", Game::Settings.cosmetic.tunic_kokiri_green);
+                    CVar_SetS32("gTunic_Kokiri_Blue", Game::Settings.cosmetic.tunic_kokiri_blue);
                     needs_save = true;
                 }
                 if (ImGui::ColorEdit3("Goron Tunic", goron_col)) {
                     Game::Settings.cosmetic.tunic_goron_red = (int)(goron_col[0] * 255);
                     Game::Settings.cosmetic.tunic_goron_green = (int)(goron_col[1] * 255);
                     Game::Settings.cosmetic.tunic_goron_blue = (int)(goron_col[2] * 255);
-                    CVar_SetS32(const_cast<char*>("gTunic_Goron_Red"), Game::Settings.cosmetic.tunic_goron_red);
-                    CVar_SetS32(const_cast<char*>("gTunic_Goron_Green"), Game::Settings.cosmetic.tunic_goron_green);
-                    CVar_SetS32(const_cast<char*>("gTunic_Goron_Blue"), Game::Settings.cosmetic.tunic_goron_blue);
+                    CVar_SetS32("gTunic_Goron_Red", Game::Settings.cosmetic.tunic_goron_red);
+                    CVar_SetS32("gTunic_Goron_Green", Game::Settings.cosmetic.tunic_goron_green);
+                    CVar_SetS32("gTunic_Goron_Blue", Game::Settings.cosmetic.tunic_goron_blue);
                     needs_save = true;
                 }
                 if (ImGui::ColorEdit3("Zora Tunic", zora_col)) {
                     Game::Settings.cosmetic.tunic_zora_red = (int)(zora_col[0] * 255);
                     Game::Settings.cosmetic.tunic_zora_green = (int)(zora_col[1] * 255);
                     Game::Settings.cosmetic.tunic_zora_blue = (int)(zora_col[2] * 255);
-                    CVar_SetS32(const_cast<char*>("gTunic_Zora_Red"), Game::Settings.cosmetic.tunic_zora_red);
-                    CVar_SetS32(const_cast<char*>("gTunic_Zora_Green"), Game::Settings.cosmetic.tunic_zora_green);
-                    CVar_SetS32(const_cast<char*>("gTunic_Zora_Blue"), Game::Settings.cosmetic.tunic_zora_blue);
+                    CVar_SetS32("gTunic_Zora_Red", Game::Settings.cosmetic.tunic_zora_red);
+                    CVar_SetS32("gTunic_Zora_Green", Game::Settings.cosmetic.tunic_zora_green);
+                    CVar_SetS32("gTunic_Zora_Blue", Game::Settings.cosmetic.tunic_zora_blue);
                     needs_save = true;
                 }
                 ImGui::Text("Navi");
@@ -619,9 +643,9 @@ namespace SohImGui {
                     Game::Settings.cosmetic.navi_idle_inner_red = (int)(navi_idle_i_col[0] * 255);
                     Game::Settings.cosmetic.navi_idle_inner_green = (int)(navi_idle_i_col[1] * 255);
                     Game::Settings.cosmetic.navi_idle_inner_blue = (int)(navi_idle_i_col[2] * 255);
-                    CVar_SetS32(const_cast<char*>("gNavi_Idle_Inner_Red"), Game::Settings.cosmetic.navi_idle_inner_red);
-                    CVar_SetS32(const_cast<char*>("gNavi_Idle_Inner_Green"), Game::Settings.cosmetic.navi_idle_inner_green);
-                    CVar_SetS32(const_cast<char*>("gNavi_Idle_Inner_Blue"), Game::Settings.cosmetic.navi_idle_inner_blue);
+                    CVar_SetS32("gNavi_Idle_Inner_Red", Game::Settings.cosmetic.navi_idle_inner_red);
+                    CVar_SetS32("gNavi_Idle_Inner_Green", Game::Settings.cosmetic.navi_idle_inner_green);
+                    CVar_SetS32("gNavi_Idle_Inner_Blue", Game::Settings.cosmetic.navi_idle_inner_blue);
                     needs_save = true;
                 }
 
@@ -629,9 +653,9 @@ namespace SohImGui {
                     Game::Settings.cosmetic.navi_idle_outer_red = (int)(navi_idle_o_col[0] * 255);
                     Game::Settings.cosmetic.navi_idle_outer_green = (int)(navi_idle_o_col[1] * 255);
                     Game::Settings.cosmetic.navi_idle_outer_blue = (int)(navi_idle_o_col[2] * 255);
-                    CVar_SetS32(const_cast<char*>("gNavi_Idle_Outer_Red"), Game::Settings.cosmetic.navi_idle_outer_red);
-                    CVar_SetS32(const_cast<char*>("gNavi_Idle_Outer_Green"), Game::Settings.cosmetic.navi_idle_outer_green);
-                    CVar_SetS32(const_cast<char*>("gNavi_Idle_Outer_Blue"), Game::Settings.cosmetic.navi_idle_outer_blue);
+                    CVar_SetS32("gNavi_Idle_Outer_Red", Game::Settings.cosmetic.navi_idle_outer_red);
+                    CVar_SetS32("gNavi_Idle_Outer_Green", Game::Settings.cosmetic.navi_idle_outer_green);
+                    CVar_SetS32("gNavi_Idle_Outer_Blue", Game::Settings.cosmetic.navi_idle_outer_blue);
                     needs_save = true;
                 }
 
@@ -639,9 +663,9 @@ namespace SohImGui {
                     Game::Settings.cosmetic.navi_npc_inner_red = (int)(navi_npc_i_col[0] * 255);
                     Game::Settings.cosmetic.navi_npc_inner_green = (int)(navi_npc_i_col[1] * 255);
                     Game::Settings.cosmetic.navi_npc_inner_blue = (int)(navi_npc_i_col[2] * 255);
-                    CVar_SetS32(const_cast<char*>("gNavi_NPC_Inner_Red"), Game::Settings.cosmetic.navi_npc_inner_red);
-                    CVar_SetS32(const_cast<char*>("gNavi_NPC_Inner_Green"), Game::Settings.cosmetic.navi_npc_inner_green);
-                    CVar_SetS32(const_cast<char*>("gNavi_NPC_Inner_Blue"), Game::Settings.cosmetic.navi_npc_inner_blue);
+                    CVar_SetS32("gNavi_NPC_Inner_Red", Game::Settings.cosmetic.navi_npc_inner_red);
+                    CVar_SetS32("gNavi_NPC_Inner_Green", Game::Settings.cosmetic.navi_npc_inner_green);
+                    CVar_SetS32("gNavi_NPC_Inner_Blue", Game::Settings.cosmetic.navi_npc_inner_blue);
                     needs_save = true;
                 }
 
@@ -649,9 +673,9 @@ namespace SohImGui {
                     Game::Settings.cosmetic.navi_npc_outer_red = (int)(navi_npc_o_col[0] * 255);
                     Game::Settings.cosmetic.navi_npc_outer_green = (int)(navi_npc_o_col[1] * 255);
                     Game::Settings.cosmetic.navi_npc_outer_blue = (int)(navi_npc_o_col[2] * 255);
-                    CVar_SetS32(const_cast<char*>("gNavi_NPC_Outer_Red"), Game::Settings.cosmetic.navi_npc_outer_red);
-                    CVar_SetS32(const_cast<char*>("gNavi_NPC_Outer_Green"), Game::Settings.cosmetic.navi_npc_outer_green);
-                    CVar_SetS32(const_cast<char*>("gNavi_NPC_Outer_Blue"), Game::Settings.cosmetic.navi_npc_outer_blue);
+                    CVar_SetS32("gNavi_NPC_Outer_Red", Game::Settings.cosmetic.navi_npc_outer_red);
+                    CVar_SetS32("gNavi_NPC_Outer_Green", Game::Settings.cosmetic.navi_npc_outer_green);
+                    CVar_SetS32("gNavi_NPC_Outer_Blue", Game::Settings.cosmetic.navi_npc_outer_blue);
                     needs_save = true;
                 }
 
@@ -659,9 +683,9 @@ namespace SohImGui {
                     Game::Settings.cosmetic.navi_enemy_inner_red = (int)(navi_enemy_i_col[0] * 255);
                     Game::Settings.cosmetic.navi_enemy_inner_green = (int)(navi_enemy_i_col[1] * 255);
                     Game::Settings.cosmetic.navi_enemy_inner_blue = (int)(navi_enemy_i_col[2] * 255);
-                    CVar_SetS32(const_cast<char*>("gNavi_Enemy_Inner_Red"), Game::Settings.cosmetic.navi_enemy_inner_red);
-                    CVar_SetS32(const_cast<char*>("gNavi_Enemy_Inner_Green"), Game::Settings.cosmetic.navi_enemy_inner_green);
-                    CVar_SetS32(const_cast<char*>("gNavi_Enemy_Inner_Blue"), Game::Settings.cosmetic.navi_enemy_inner_blue);
+                    CVar_SetS32("gNavi_Enemy_Inner_Red", Game::Settings.cosmetic.navi_enemy_inner_red);
+                    CVar_SetS32("gNavi_Enemy_Inner_Green", Game::Settings.cosmetic.navi_enemy_inner_green);
+                    CVar_SetS32("gNavi_Enemy_Inner_Blue", Game::Settings.cosmetic.navi_enemy_inner_blue);
                     needs_save = true;
                 }
 
@@ -669,9 +693,9 @@ namespace SohImGui {
                     Game::Settings.cosmetic.navi_enemy_outer_red = (int)(navi_enemy_o_col[0] * 255);
                     Game::Settings.cosmetic.navi_enemy_outer_green = (int)(navi_enemy_o_col[1] * 255);
                     Game::Settings.cosmetic.navi_enemy_outer_blue = (int)(navi_enemy_o_col[2] * 255);
-                    CVar_SetS32(const_cast<char*>("gNavi_Enemy_Outer_Red"), Game::Settings.cosmetic.navi_enemy_outer_red);
-                    CVar_SetS32(const_cast<char*>("gNavi_Enemy_Outer_Green"), Game::Settings.cosmetic.navi_enemy_outer_green);
-                    CVar_SetS32(const_cast<char*>("gNavi_Enemy_Outer_Blue"), Game::Settings.cosmetic.navi_enemy_outer_blue);
+                    CVar_SetS32("gNavi_Enemy_Outer_Red", Game::Settings.cosmetic.navi_enemy_outer_red);
+                    CVar_SetS32("gNavi_Enemy_Outer_Green", Game::Settings.cosmetic.navi_enemy_outer_green);
+                    CVar_SetS32("gNavi_Enemy_Outer_Blue", Game::Settings.cosmetic.navi_enemy_outer_blue);
                     needs_save = true;
                 }
 
@@ -679,9 +703,9 @@ namespace SohImGui {
                     Game::Settings.cosmetic.navi_prop_inner_red = (int)(navi_prop_i_col[0] * 255);
                     Game::Settings.cosmetic.navi_prop_inner_green = (int)(navi_prop_i_col[1] * 255);
                     Game::Settings.cosmetic.navi_prop_inner_blue = (int)(navi_prop_i_col[2] * 255);
-                    CVar_SetS32(const_cast<char*>("gNavi_Prop_Inner_Red"), Game::Settings.cosmetic.navi_prop_inner_red);
-                    CVar_SetS32(const_cast<char*>("gNavi_Prop_Inner_Green"), Game::Settings.cosmetic.navi_prop_inner_green);
-                    CVar_SetS32(const_cast<char*>("gNavi_Prop_Inner_Blue"), Game::Settings.cosmetic.navi_prop_inner_blue);
+                    CVar_SetS32("gNavi_Prop_Inner_Red", Game::Settings.cosmetic.navi_prop_inner_red);
+                    CVar_SetS32("gNavi_Prop_Inner_Green", Game::Settings.cosmetic.navi_prop_inner_green);
+                    CVar_SetS32("gNavi_Prop_Inner_Blue", Game::Settings.cosmetic.navi_prop_inner_blue);
                     needs_save = true;
                 }
 
@@ -689,9 +713,9 @@ namespace SohImGui {
                     Game::Settings.cosmetic.navi_prop_outer_red = (int)(navi_prop_o_col[0] * 255);
                     Game::Settings.cosmetic.navi_prop_outer_green = (int)(navi_prop_o_col[1] * 255);
                     Game::Settings.cosmetic.navi_prop_outer_blue = (int)(navi_prop_o_col[2] * 255);
-                    CVar_SetS32(const_cast<char*>("gNavi_Prop_Outer_Red"), Game::Settings.cosmetic.navi_prop_outer_red);
-                    CVar_SetS32(const_cast<char*>("gNavi_Prop_Outer_Green"), Game::Settings.cosmetic.navi_prop_outer_green);
-                    CVar_SetS32(const_cast<char*>("gNavi_Prop_Outer_Blue"), Game::Settings.cosmetic.navi_prop_outer_blue);
+                    CVar_SetS32("gNavi_Prop_Outer_Red", Game::Settings.cosmetic.navi_prop_outer_red);
+                    CVar_SetS32("gNavi_Prop_Outer_Green", Game::Settings.cosmetic.navi_prop_outer_green);
+                    CVar_SetS32("gNavi_Prop_Outer_Blue", Game::Settings.cosmetic.navi_prop_outer_blue);
                     needs_save = true;
                 }
 
diff --git a/soh/soh/Enhancements/bootcommands.c b/soh/soh/Enhancements/bootcommands.c
index 60143e295..da4276f77 100644
--- a/soh/soh/Enhancements/bootcommands.c
+++ b/soh/soh/Enhancements/bootcommands.c
@@ -25,6 +25,7 @@ void BootCommands_Init()
     CVar_RegisterS32("gDebugEnabled", 0);
     CVar_RegisterS32("gPauseLiveLink", 0);
     CVar_RegisterS32("gMinimalUI", 0);
+    CVar_RegisterS32("gRumbleEnabled", 0);
     CVar_RegisterS32("gUniformLR", 1);
     CVar_RegisterS32("gNewDrops", 0);
     CVar_RegisterS32("gVisualAgony", 0);
diff --git a/soh/soh/Enhancements/debugconsole.cpp b/soh/soh/Enhancements/debugconsole.cpp
index 06126281f..de8cab260 100644
--- a/soh/soh/Enhancements/debugconsole.cpp
+++ b/soh/soh/Enhancements/debugconsole.cpp
@@ -337,11 +337,11 @@ static bool SetCVarHandler(const std::vector<std::string>& args) {
     int vType = CheckVarType(args[2]);
 
     if (vType == VARTYPE_STRING)
-        CVar_SetString((char*)args[1].c_str(), (char*)args[2].c_str());
+        CVar_SetString(args[1].c_str(), (char*)args[2].c_str());
     else if (vType == VARTYPE_FLOAT)
-        CVar_SetFloat((char*)args[1].c_str(), std::stof(args[2]));
+        CVar_SetFloat(args[1].c_str(), std::stof(args[2]));
     else
-        CVar_SetS32((char*)args[1].c_str(), std::stoi(args[2]));
+        CVar_SetS32(args[1].c_str(), std::stoi(args[2]));
 
     DebugConsole_SaveCVars();
 
@@ -354,7 +354,7 @@ static bool GetCVarHandler(const std::vector<std::string>& args) {
     if (args.size() < 2)
         return CMD_FAILED;
 
-    CVar* cvar = CVar_GetVar((char*) args[1].c_str());
+    CVar* cvar = CVar_GetVar(args[1].c_str());
 
     if (cvar != nullptr)
     {
@@ -446,4 +446,4 @@ void DebugConsole_SaveCVars()
     }
 
     File::WriteAllText("cvars.cfg", output);
-}
\ No newline at end of file
+}
diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp
index fca6d6b7d..f125437ab 100644
--- a/soh/soh/OTRGlobals.cpp
+++ b/soh/soh/OTRGlobals.cpp
@@ -3,6 +3,7 @@
 #include <locale>
 #include <codecvt>
 #include "GlobalCtx2.h"
+#include "GameSettings.h"
 #include "ResourceMgr.h"
 #include "DisplayList.h"
 #include "PlayerAnimation.h"
@@ -885,3 +886,13 @@ extern "C" void AudioPlayer_Play(const uint8_t* buf, uint32_t len) {
         OTRGlobals::Instance->context->GetWindow()->GetAudioPlayer()->Play(buf, len);
     }
 }
+
+extern "C" int Controller_ShouldRumble(size_t i) {
+    for (const auto& controller : Ship::Window::Controllers.at(i)) {
+        if (controller->CanRumble() && Game::Settings.controller.extra[i].rumble_strength > 0.001f) {
+            return 1;
+        }
+    }
+
+    return 0;
+}
diff --git a/soh/soh/OTRGlobals.h b/soh/soh/OTRGlobals.h
index 20080fcb1..dfb235712 100644
--- a/soh/soh/OTRGlobals.h
+++ b/soh/soh/OTRGlobals.h
@@ -64,4 +64,5 @@ int AudioPlayer_Buffered(void);
 int AudioPlayer_GetDesiredBuffered(void);
 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
diff --git a/soh/soh/stubs.c b/soh/soh/stubs.c
index 871d5ca22..c47c1fa5d 100644
--- a/soh/soh/stubs.c
+++ b/soh/soh/stubs.c
@@ -102,7 +102,7 @@ void osCreateViManager(OSPri pri)
 
 s32 osMotorInit(OSMesgQueue* ctrlrqueue, OSPfs* pfs, s32 channel)
 {
-
+    return 0;
 }
 
 u32 osAiGetLength(void)
@@ -2099,4 +2099,4 @@ u8 gSequenceFontTable[0x1C0] = {
     0x01, 0x12, 0x01, 0x24, 0x01, 0x18, 0x01, 0x19, 0x01, 0x13, 0x01, 0x20, 0x01, 0x1B, 0x01, 0x1C, 0x01, 0x1D, 0x01,
     0x03, 0x01, 0x1F, 0x01, 0x20, 0x01, 0x20, 0x01, 0x09, 0x01, 0x21, 0x01, 0x22, 0x01, 0x21, 0x01, 0x09, 0x01, 0x20,
     0x01, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
\ No newline at end of file
+};
diff --git a/soh/src/code/padmgr.c b/soh/src/code/padmgr.c
index 973c2b446..08c89869f 100644
--- a/soh/src/code/padmgr.c
+++ b/soh/src/code/padmgr.c
@@ -269,7 +269,7 @@ void PadMgr_ProcessInputs(PadMgr* padMgr) {
         input->press.stick_y += (s8)(input->cur.stick_y - input->prev.stick_y);
     }
 
-    controllerCallback.rumble = padMgr->rumbleEnable[0] > 0 ? 1 : 0;
+    controllerCallback.rumble = CVar_GetS32("gRumbleEnabled", 0) && (padMgr->rumbleEnable[0] > 0);
 
     if (HealthMeter_IsCritical()) {
         controllerCallback.ledColor = 0;
@@ -303,6 +303,11 @@ void PadMgr_HandleRetraceMsg(PadMgr* padMgr) {
     }
     osRecvMesg(queue, NULL, OS_MESG_BLOCK);
     osContGetReadData(padMgr->pads);
+
+    for (i = 0; i < __osMaxControllers; i++) {
+        padMgr->padStatus[i].status = CVar_GetS32("gRumbleEnabled", 0) && Controller_ShouldRumble(i);
+    }
+
     if (padMgr->preNMIShutdown) {
         memset(padMgr->pads, 0, sizeof(padMgr->pads));
     }