Blair Charlie version bump (#5407 )

Implements a rand inf for Ruto's letter to apply to logic to track it separate from the underwater item check. (#5405 )
Fix Entrance Rando weather override behavior (#5403 )
2026-05-24 23:31:34 -04:00 · 2025-04-15 14:27:55 -04:00 · 2025-04-15 13:13:30 -04:00 · 2025-04-14 19:11:36 -04:00 · 2025-04-13 19:29:29 -04:00 · 2025-04-12 12:12:48 -04:00
163 changed files with 1318 additions and 941 deletions
@@ -5,7 +5,7 @@ set(CMAKE_CXX_STANDARD 20 CACHE STRING "The C++ standard to use")

 set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version")

-project(Ship VERSION 9.0.0 LANGUAGES C CXX)
+project(Ship VERSION 9.0.2 LANGUAGES C CXX)
 include(CMake/soh-cvars.cmake)
 include(CMake/lus-cvars.cmake)

@@ -61,7 +61,8 @@ Congratulations, you are now sailing with the Ship of Harkinian! Have fun!
 ### Other shortcuts
 | Keys | Action |
 | - | - |
-| F1 | Toggle menubar |
+| ESC | Toggle menu |
+| F2 | Toggle capture mouse input |
 | F5 | Save state |
 | F6 | Change state |
 | F7 | Load state |
@@ -18,6 +18,12 @@ static const ALIGN_ASSET(2) char gTitleCopyright19982002Tex[] = dgTitleCopyright
 #define dgTitleCopyright19982003Tex "__OTR__objects/object_mag/gTitleCopyright19982003Tex"
 static const ALIGN_ASSET(2) char gTitleCopyright19982003Tex[] = dgTitleCopyright19982003Tex;

+#define dgTitleCopyright19982004EngTex "__OTR__objects/object_mag/gTitleCopyright19982004EngTex"
+static const ALIGN_ASSET(2) char gTitleCopyright19982004EngTex[] = dgTitleCopyright19982004EngTex;
+
+#define dgTitleCopyright19982004JpnTex "__OTR__objects/object_mag/gTitleCopyright19982004JpnTex"
+static const ALIGN_ASSET(2) char gTitleCopyright19982004JpnTex[] = dgTitleCopyright19982004JpnTex;
+
 #define dgTitleMasterQuestSubtitleTex "__OTR__objects/object_mag/gTitleMasterQuestSubtitleTex"
 static const ALIGN_ASSET(2) char gTitleMasterQuestSubtitleTex[] = dgTitleMasterQuestSubtitleTex;

@@ -38,7 +38,7 @@
        <Texture Name="object_bvTLUT_01DBB0" OutName="object_bvTLUT_01DBB0" Format="rgba16" Width="16" Height="16" Offset="0x1C7B0" AddedByScript="true"/>
        <Texture Name="object_bvTLUT_01E6B0" OutName="object_bvTLUT_01E6B0" Format="rgba16" Width="16" Height="16" Offset="0x1D2B0" AddedByScript="true"/>
        <!-- Boss title card -->
-        <Texture Name="gBarinadeTitleCardTex" OutName="barinade_title_card" Format="i8" Width="128" Height="120" Offset="0x1230"/>
+        <Texture Name="gBarinadeTitleCardTex" OutName="barinade_title_card" Format="i8" Width="128" Height="80" Offset="0x1230"/>

        <Skeleton Name="gBarinadeBodySkel" Type="Normal" LimbType="Standard" Offset="0x14718"/>
        <Skeleton Name="gBarinadeSupportSkel" Type="Flex" LimbType="Standard" Offset="0x16098"/>
@@ -28,7 +28,7 @@
        <Texture Name="object_fdTLUT_000A58" OutName="object_fdTLUT_000A58" Format="rgba16" Width="4" Height="4" Offset="0xA58" AddedByScript="true"/>
        <Texture Name="object_fdTLUT_0032A8" OutName="object_fdTLUT_0032A8" Format="rgba16" Width="16" Height="16" Offset="0x32A8" AddedByScript="true"/>
        <!-- Boss title card -->
-        <!-- <Texture Name="gVolvagiaTitleCardTex" OutName="volvagia_boss_title_card" Format="i8" Width="128" Height="120" Offset="0xD700"/> -->
+        <!-- <Texture Name="gVolvagiaTitleCardTex" OutName="volvagia_boss_title_card" Format="i8" Width="128" Height="80" Offset="0xD700"/> -->

        <!-- Skeletons -->
        <Skeleton Name="gVolvagiaLeftArmSkel" Type="Normal" LimbType="Standard" Offset="0x100E0"/>
@@ -38,7 +38,7 @@
        <Animation Name="gPhantomHorseFenceJumpAnim" Offset="0xAD80"/>
        
        <!-- Boss title card -->
-        <Texture Name="gPhantomGanonTitleCardTex" OutName="phantom_ganon_title_card" Format="i8" Width="128" Height="120" Offset="0x59A0"/>
+        <Texture Name="gPhantomGanonTitleCardTex" OutName="phantom_ganon_title_card" Format="i8" Width="128" Height="80" Offset="0x59A0"/>
    
        <!-- Energy attack DLists -->
        <DList Name="gPhantomWarpDL" Offset="0xE6A0"/>
@@ -68,7 +68,7 @@
        <DList Name="gGanondorfRightHandOpenDL" Offset="0xC9E8"/>

        <!-- Ganondorf Title Card Texture -->
-        <!-- <Texture Name="gGanondorfTitleCardTex" OutName="ganondorf_title_card" Format="i8" Width="128" Height="120" Offset="0xCF00"/> -->
+        <!-- <Texture Name="gGanondorfTitleCardTex" OutName="ganondorf_title_card" Format="i8" Width="128" Height="80" Offset="0xCF00"/> -->

        <!-- Ganondorf Animation -->
        <Animation Name="gGanondorfEndingFloatAnim" Offset="0xFF48"/> <!-- Original name is "ONOLEE" (lit. "Curse you!" from his in-game dialogue) -->
@@ -159,7 +159,7 @@
        <Texture Name="gGohmaIrisTex" OutName="gohma_iris" Format="rgba16" Width="32" Height="32" Offset="0x193A8"/>

        <!-- Boss title card -->
-        <Texture Name="gGohmaTitleCardTex" OutName="gohma_title_card" Format="i8" Width="128" Height="120" Offset="0x19BA8"/>
+        <Texture Name="gGohmaTitleCardTex" OutName="gohma_title_card" Format="i8" Width="128" Height="80" Offset="0x19BA8"/>

        <!-- Door -->
        <DList Name="gGohmaDoorDL" Offset="0x1D820"/>
@@ -48,7 +48,7 @@
        <Texture Name="object_kingdodongo_Tex_016D90" OutName="tex_00016D90" Format="rgba16" Width="8" Height="8" Offset="0x16D90"/>
        <Texture Name="object_kingdodongo_Tex_016E10" OutName="tex_00016E10" Format="rgba16" Width="32" Height="16" Offset="0x16E10"/>
        <Texture Name="object_kingdodongo_Tex_017210" OutName="tex_00017210" Format="rgba16" Width="8" Height="32" Offset="0x17210"/>
-        <Texture Name="gKingDodongoTitleCardTex" OutName="title_card" Format="i8" Width="128" Height="120" Offset="0x17410"/>
+        <Texture Name="gKingDodongoTitleCardTex" OutName="title_card" Format="i8" Width="128" Height="80" Offset="0x17410"/>
        <Limb Name="object_kingdodongo_Limb_01B010" LimbType="Standard" Offset="0x19C10"/>
        <Limb Name="object_kingdodongo_Limb_01B01C" LimbType="Standard" Offset="0x19C1C"/>
        <Limb Name="object_kingdodongo_Limb_01B028" LimbType="Standard" Offset="0x19C28"/>
@@ -1,7 +1,7 @@
 <Root>
    <File Name="object_mag" Segment="6">
        <Texture Name="gTitleZeldaShieldLogoMQTex" OutName="title_zelda_shield_logo_mq" Format="rgba32" Width="160" Height="160" Offset="0x0"/>
-        <Texture Name="gTitleCopyright19982003Tex" OutName="title_copyright_19982003" Format="ia8" Width="160" Height="16" Offset="0x19000"/>
+        <Texture Name="gTitleCopyright19982002Tex" OutName="title_copyright_19982002" Format="ia8" Width="160" Height="16" Offset="0x19000"/>
        <Texture Name="gTitleEffectMask00Tex" OutName="title_effect_mask_0_0" Format="i4" Width="64" Height="64" Offset="0x1B600"/>
        <Texture Name="gTitleEffectMask01Tex" OutName="title_effect_mask_0_1" Format="i4" Width="64" Height="64" Offset="0x1BE00"/>
        <Texture Name="gTitleEffectMask02Tex" OutName="title_effect_mask_0_2" Format="i4" Width="64" Height="64" Offset="0x1C600"/>
@@ -18,4 +18,4 @@
        <Texture Name="gTitleDiskTex" OutName="title_disk" Format="ia8" Width="48" Height="16" Offset="0x1B300"/>
        <Texture Name="gTitleTitleJPNTex" OutName="title_title_jpn" Format="i8" Width="128" Height="16" Offset="0x20740"/>
    </File>
-</Root>
+</Root>
@@ -6,7 +6,7 @@
        <Texture Name="object_moTex_005520" OutName="object_moTex_005520" Format="ia16" Width="32" Height="32" Offset="0x4120" AddedByScript="true"/>
        <Texture Name="object_moTex_005D20" OutName="object_moTex_005D20" Format="ia16" Width="32" Height="32" Offset="0x4920" AddedByScript="true"/>
        <!-- Morpha's Title Card -->
-        <Texture Name="gMorphaTitleCardTex" Format="i8" Width="128" Height="120" Offset="0x1010"/>
+        <Texture Name="gMorphaTitleCardTex" Format="i8" Width="128" Height="80" Offset="0x1010"/>
        <Texture Name="gMorphaWaterTex" Format="rgba16" Width="32" Height="32" Offset="0x7470"/>

        <!-- DLists for Morpha's Core -->
@@ -17,7 +17,7 @@
        <Texture Name="object_sstTex_01A730" OutName="object_sstTex_01A730" Format="rgba16" Width="4" Height="16" Offset="0x19330" AddedByScript="true"/>
        <Texture Name="object_sstTex_01A7B0" OutName="object_sstTex_01A7B0" Format="rgba16" Width="16" Height="16" Offset="0x193B0" AddedByScript="true"/>
        <!-- Boss Title Card -->
-        <Texture Name="gBongoTitleCardTex" OutName="bongo_title_card" Format="i8" Width="128" Height="120" Offset="0x13D80"/>
+        <Texture Name="gBongoTitleCardTex" OutName="bongo_title_card" Format="i8" Width="128" Height="80" Offset="0x13D80"/>
        
        <!-- Skeletons -->
        <Skeleton Name="gBongoLeftHandSkel" Type="Flex" LimbType="Standard" Offset="0x04DE0"/>
@@ -273,7 +273,7 @@
        <DList Name="gTwinrovaBroomIceTrailDL" Offset="0x2DEB0"/>
        <DList Name="gTwinrovaBroomFireJetDL" Offset="0x2DFB0"/>
        <DList Name="gTwinrovaBroomFireTrailDL" Offset="0x2E098"/>
-        <Texture Name="gTwinrovaTitleCardTex" OutName="title_card" Format="i8" Width="128" Height="120" Offset="0x2E170"/>
+        <Texture Name="gTwinrovaTitleCardTex" OutName="title_card" Format="i8" Width="128" Height="80" Offset="0x2E170"/>
        <Limb Name="gTwinrovaPelvisLimb" LimbType="Standard" Offset="0x30970"/>
        <Limb Name="gTwinrovaSash1Limb" LimbType="Standard" Offset="0x3097C"/>
        <Limb Name="gTwinrovaSash2Limb" LimbType="Standard" Offset="0x30988"/>
@@ -239,7 +239,7 @@
        <Texture Name="gGoldSkulltulaItemNameENGTex" OutName="gold_skulltula_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3B000"/>
        <Texture Name="gPieceOfHeartItemNameENGTex" OutName="piece_of_heart_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3B400"/>
        <Texture Name="gUnusedPieceOfHeartItemName2JPNTex" OutName="piece_of_heart_item_name_unused_jpn_2" Format="ia4" Width="128" Height="16" Offset="0x3B800"/>
-        <Texture Name="gBigKeyItemNameENGTex" OutName="big_key_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3BC00"/>
+        <Texture Name="gUnusedBigKeyItemNameENGTex" OutName="big_key_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3BC00"/>
        <Texture Name="gCompassItemNameENGTex" OutName="compass_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3C000"/>
        <Texture Name="gDungeonMapItemNameENGTex" OutName="dungeon_map_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3C400"/>
        <Texture Name="gUnusedBossKeyItemName12JPNTex" OutName="boss_key_item_name_unused_jpn_12" Format="ia4" Width="128" Height="16" Offset="0x3C800"/>
@@ -38,7 +38,7 @@
        <Texture Name="object_bvTLUT_01DBB0" OutName="object_bvTLUT_01DBB0" Format="rgba16" Width="16" Height="16" Offset="0x1C7B0" AddedByScript="true"/>
        <Texture Name="object_bvTLUT_01E6B0" OutName="object_bvTLUT_01E6B0" Format="rgba16" Width="16" Height="16" Offset="0x1D2B0" AddedByScript="true"/>
        <!-- Boss title card -->
-        <Texture Name="gBarinadeTitleCardTex" OutName="barinade_title_card" Format="i8" Width="128" Height="120" Offset="0x1230"/>
+        <Texture Name="gBarinadeTitleCardTex" OutName="barinade_title_card" Format="i8" Width="128" Height="80" Offset="0x1230"/>

        <Skeleton Name="gBarinadeBodySkel" Type="Normal" LimbType="Standard" Offset="0x14718"/>
        <Skeleton Name="gBarinadeSupportSkel" Type="Flex" LimbType="Standard" Offset="0x16098"/>
@@ -28,7 +28,7 @@
        <Texture Name="object_fdTLUT_000A58" OutName="object_fdTLUT_000A58" Format="rgba16" Width="4" Height="4" Offset="0xA58" AddedByScript="true"/>
        <Texture Name="object_fdTLUT_0032A8" OutName="object_fdTLUT_0032A8" Format="rgba16" Width="16" Height="16" Offset="0x32A8" AddedByScript="true"/>
        <!-- Boss title card -->
-        <!-- <Texture Name="gVolvagiaTitleCardTex" OutName="volvagia_boss_title_card" Format="i8" Width="128" Height="120" Offset="0xD700"/> -->
+        <!-- <Texture Name="gVolvagiaTitleCardTex" OutName="volvagia_boss_title_card" Format="i8" Width="128" Height="80" Offset="0xD700"/> -->

        <!-- Skeletons -->
        <Skeleton Name="gVolvagiaLeftArmSkel" Type="Normal" LimbType="Standard" Offset="0x100E0"/>
@@ -38,7 +38,7 @@
        <Animation Name="gPhantomHorseFenceJumpAnim" Offset="0xAD80"/>
        
        <!-- Boss title card -->
-        <Texture Name="gPhantomGanonTitleCardTex" OutName="phantom_ganon_title_card" Format="i8" Width="128" Height="120" Offset="0x59A0"/>
+        <Texture Name="gPhantomGanonTitleCardTex" OutName="phantom_ganon_title_card" Format="i8" Width="128" Height="80" Offset="0x59A0"/>
    
        <!-- Energy attack DLists -->
        <DList Name="gPhantomWarpDL" Offset="0xE6A0"/>
@@ -68,7 +68,7 @@
        <DList Name="gGanondorfRightHandOpenDL" Offset="0xC9E8"/>

        <!-- Ganondorf Title Card Texture -->
-        <!-- <Texture Name="gGanondorfTitleCardTex" OutName="ganondorf_title_card" Format="i8" Width="128" Height="120" Offset="0xCF00"/> -->
+        <!-- <Texture Name="gGanondorfTitleCardTex" OutName="ganondorf_title_card" Format="i8" Width="128" Height="80" Offset="0xCF00"/> -->

        <!-- Ganondorf Animation -->
        <Animation Name="gGanondorfEndingFloatAnim" Offset="0xFF48"/> <!-- Original name is "ONOLEE" (lit. "Curse you!" from his in-game dialogue) -->
@@ -159,7 +159,7 @@
        <Texture Name="gGohmaIrisTex" OutName="gohma_iris" Format="rgba16" Width="32" Height="32" Offset="0x193A8"/>

        <!-- Boss title card -->
-        <Texture Name="gGohmaTitleCardTex" OutName="gohma_title_card" Format="i8" Width="128" Height="120" Offset="0x19BA8"/>
+        <Texture Name="gGohmaTitleCardTex" OutName="gohma_title_card" Format="i8" Width="128" Height="80" Offset="0x19BA8"/>

        <!-- Door -->
        <DList Name="gGohmaDoorDL" Offset="0x1D820"/>
@@ -48,7 +48,7 @@
        <Texture Name="object_kingdodongo_Tex_016D90" OutName="tex_00016D90" Format="rgba16" Width="8" Height="8" Offset="0x16D90"/>
        <Texture Name="object_kingdodongo_Tex_016E10" OutName="tex_00016E10" Format="rgba16" Width="32" Height="16" Offset="0x16E10"/>
        <Texture Name="object_kingdodongo_Tex_017210" OutName="tex_00017210" Format="rgba16" Width="8" Height="32" Offset="0x17210"/>
-        <Texture Name="gKingDodongoTitleCardTex" OutName="title_card" Format="i8" Width="128" Height="120" Offset="0x17410"/>
+        <Texture Name="gKingDodongoTitleCardTex" OutName="title_card" Format="i8" Width="128" Height="80" Offset="0x17410"/>
        <Limb Name="object_kingdodongo_Limb_01B010" LimbType="Standard" Offset="0x19C10"/>
        <Limb Name="object_kingdodongo_Limb_01B01C" LimbType="Standard" Offset="0x19C1C"/>
        <Limb Name="object_kingdodongo_Limb_01B028" LimbType="Standard" Offset="0x19C28"/>
@@ -6,7 +6,7 @@
        <Texture Name="object_moTex_005520" OutName="object_moTex_005520" Format="ia16" Width="32" Height="32" Offset="0x4120" AddedByScript="true"/>
        <Texture Name="object_moTex_005D20" OutName="object_moTex_005D20" Format="ia16" Width="32" Height="32" Offset="0x4920" AddedByScript="true"/>
        <!-- Morpha's Title Card -->
-        <Texture Name="gMorphaTitleCardTex" Format="i8" Width="128" Height="120" Offset="0x1010"/>
+        <Texture Name="gMorphaTitleCardTex" Format="i8" Width="128" Height="80" Offset="0x1010"/>
        <Texture Name="gMorphaWaterTex" Format="rgba16" Width="32" Height="32" Offset="0x7470"/>

        <!-- DLists for Morpha's Core -->
@@ -17,7 +17,7 @@
        <Texture Name="object_sstTex_01A730" OutName="object_sstTex_01A730" Format="rgba16" Width="4" Height="16" Offset="0x19330" AddedByScript="true"/>
        <Texture Name="object_sstTex_01A7B0" OutName="object_sstTex_01A7B0" Format="rgba16" Width="16" Height="16" Offset="0x193B0" AddedByScript="true"/>
        <!-- Boss Title Card -->
-        <Texture Name="gBongoTitleCardTex" OutName="bongo_title_card" Format="i8" Width="128" Height="120" Offset="0x13D80"/>
+        <Texture Name="gBongoTitleCardTex" OutName="bongo_title_card" Format="i8" Width="128" Height="80" Offset="0x13D80"/>
        
        <!-- Skeletons -->
        <Skeleton Name="gBongoLeftHandSkel" Type="Flex" LimbType="Standard" Offset="0x04DE0"/>
@@ -273,7 +273,7 @@
        <DList Name="gTwinrovaBroomIceTrailDL" Offset="0x2DEB0"/>
        <DList Name="gTwinrovaBroomFireJetDL" Offset="0x2DFB0"/>
        <DList Name="gTwinrovaBroomFireTrailDL" Offset="0x2E098"/>
-        <Texture Name="gTwinrovaTitleCardTex" OutName="title_card" Format="i8" Width="128" Height="120" Offset="0x2E170"/>
+        <Texture Name="gTwinrovaTitleCardTex" OutName="title_card" Format="i8" Width="128" Height="80" Offset="0x2E170"/>
        <Limb Name="gTwinrovaPelvisLimb" LimbType="Standard" Offset="0x30970"/>
        <Limb Name="gTwinrovaSash1Limb" LimbType="Standard" Offset="0x3097C"/>
        <Limb Name="gTwinrovaSash2Limb" LimbType="Standard" Offset="0x30988"/>
@@ -239,7 +239,7 @@
        <Texture Name="gGoldSkulltulaItemNameENGTex" OutName="gold_skulltula_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3B000"/>
        <Texture Name="gPieceOfHeartItemNameENGTex" OutName="piece_of_heart_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3B400"/>
        <Texture Name="gUnusedPieceOfHeartItemName2JPNTex" OutName="piece_of_heart_item_name_unused_jpn_2" Format="ia4" Width="128" Height="16" Offset="0x3B800"/>
-        <Texture Name="gBigKeyItemNameENGTex" OutName="big_key_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3BC00"/>
+        <Texture Name="gUnusedBigKeyItemNameENGTex" OutName="big_key_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3BC00"/>
        <Texture Name="gCompassItemNameENGTex" OutName="compass_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3C000"/>
        <Texture Name="gDungeonMapItemNameENGTex" OutName="dungeon_map_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3C400"/>
        <Texture Name="gUnusedBossKeyItemName12JPNTex" OutName="boss_key_item_name_unused_jpn_12" Format="ia4" Width="128" Height="16" Offset="0x3C800"/>
@@ -38,7 +38,7 @@
        <Texture Name="object_bvTLUT_01DBB0" OutName="object_bvTLUT_01DBB0" Format="rgba16" Width="16" Height="16" Offset="0x1C7B0" AddedByScript="true"/>
        <Texture Name="object_bvTLUT_01E6B0" OutName="object_bvTLUT_01E6B0" Format="rgba16" Width="16" Height="16" Offset="0x1D2B0" AddedByScript="true"/>
        <!-- Boss title card -->
-        <Texture Name="gBarinadeTitleCardTex" OutName="barinade_title_card" Format="i8" Width="128" Height="120" Offset="0x1230"/>
+        <Texture Name="gBarinadeTitleCardTex" OutName="barinade_title_card" Format="i8" Width="128" Height="80" Offset="0x1230"/>

        <Skeleton Name="gBarinadeBodySkel" Type="Normal" LimbType="Standard" Offset="0x14718"/>
        <Skeleton Name="gBarinadeSupportSkel" Type="Flex" LimbType="Standard" Offset="0x16098"/>
@@ -28,7 +28,7 @@
        <Texture Name="object_fdTLUT_000A58" OutName="object_fdTLUT_000A58" Format="rgba16" Width="4" Height="4" Offset="0xA58" AddedByScript="true"/>
        <Texture Name="object_fdTLUT_0032A8" OutName="object_fdTLUT_0032A8" Format="rgba16" Width="16" Height="16" Offset="0x32A8" AddedByScript="true"/>
        <!-- Boss title card -->
-        <!-- <Texture Name="gVolvagiaTitleCardTex" OutName="volvagia_boss_title_card" Format="i8" Width="128" Height="120" Offset="0xD700"/> -->
+        <!-- <Texture Name="gVolvagiaTitleCardTex" OutName="volvagia_boss_title_card" Format="i8" Width="128" Height="80" Offset="0xD700"/> -->

        <!-- Skeletons -->
        <Skeleton Name="gVolvagiaLeftArmSkel" Type="Normal" LimbType="Standard" Offset="0x100E0"/>
@@ -38,7 +38,7 @@
        <Animation Name="gPhantomHorseFenceJumpAnim" Offset="0xAD80"/>
        
        <!-- Boss title card -->
-        <Texture Name="gPhantomGanonTitleCardTex" OutName="phantom_ganon_title_card" Format="i8" Width="128" Height="120" Offset="0x59A0"/>
+        <Texture Name="gPhantomGanonTitleCardTex" OutName="phantom_ganon_title_card" Format="i8" Width="128" Height="80" Offset="0x59A0"/>
    
        <!-- Energy attack DLists -->
        <DList Name="gPhantomWarpDL" Offset="0xE6A0"/>
@@ -68,7 +68,7 @@
        <DList Name="gGanondorfRightHandOpenDL" Offset="0xC9E8"/>

        <!-- Ganondorf Title Card Texture -->
-        <!-- <Texture Name="gGanondorfTitleCardTex" OutName="ganondorf_title_card" Format="i8" Width="128" Height="120" Offset="0xCF00"/> -->
+        <!-- <Texture Name="gGanondorfTitleCardTex" OutName="ganondorf_title_card" Format="i8" Width="128" Height="80" Offset="0xCF00"/> -->

        <!-- Ganondorf Animation -->
        <Animation Name="gGanondorfEndingFloatAnim" Offset="0xFF48"/> <!-- Original name is "ONOLEE" (lit. "Curse you!" from his in-game dialogue) -->
@@ -159,7 +159,7 @@
        <Texture Name="gGohmaIrisTex" OutName="gohma_iris" Format="rgba16" Width="32" Height="32" Offset="0x193A8"/>

        <!-- Boss title card -->
-        <Texture Name="gGohmaTitleCardTex" OutName="gohma_title_card" Format="i8" Width="128" Height="120" Offset="0x19BA8"/>
+        <Texture Name="gGohmaTitleCardTex" OutName="gohma_title_card" Format="i8" Width="128" Height="80" Offset="0x19BA8"/>

        <!-- Door -->
        <DList Name="gGohmaDoorDL" Offset="0x1D820"/>
@@ -48,7 +48,7 @@
        <Texture Name="object_kingdodongo_Tex_016D90" OutName="tex_00016D90" Format="rgba16" Width="8" Height="8" Offset="0x16D90"/>
        <Texture Name="object_kingdodongo_Tex_016E10" OutName="tex_00016E10" Format="rgba16" Width="32" Height="16" Offset="0x16E10"/>
        <Texture Name="object_kingdodongo_Tex_017210" OutName="tex_00017210" Format="rgba16" Width="8" Height="32" Offset="0x17210"/>
-        <Texture Name="gKingDodongoTitleCardTex" OutName="title_card" Format="i8" Width="128" Height="120" Offset="0x17410"/>
+        <Texture Name="gKingDodongoTitleCardTex" OutName="title_card" Format="i8" Width="128" Height="80" Offset="0x17410"/>
        <Limb Name="object_kingdodongo_Limb_01B010" LimbType="Standard" Offset="0x19C10"/>
        <Limb Name="object_kingdodongo_Limb_01B01C" LimbType="Standard" Offset="0x19C1C"/>
        <Limb Name="object_kingdodongo_Limb_01B028" LimbType="Standard" Offset="0x19C28"/>
@@ -1,7 +1,7 @@
 <Root>
    <File Name="object_mag" Segment="6">
        <Texture Name="gTitleZeldaShieldLogoMQTex" OutName="title_zelda_shield_logo_mq" Format="rgba32" Width="160" Height="160" Offset="0x0"/>
-        <Texture Name="gTitleCopyright19982003Tex" OutName="title_copyright_19982003" Format="ia8" Width="160" Height="16" Offset="0x19000"/>
+        <Texture Name="gTitleCopyright19982002Tex" OutName="title_copyright_19982002" Format="ia8" Width="160" Height="16" Offset="0x19000"/>
        <Texture Name="gTitleDiskTex" OutName="title_disk" Format="ia8" Width="48" Height="16" Offset="0x19A00"/>
        <Texture Name="gTitleEffectMask00Tex" OutName="title_effect_mask_0_0" Format="i4" Width="64" Height="64" Offset="0x19D00"/>
        <Texture Name="gTitleEffectMask01Tex" OutName="title_effect_mask_0_1" Format="i4" Width="64" Height="64" Offset="0x1A500"/>
@@ -17,4 +17,4 @@
        <Texture Name="gTitleOcarinaOfTimeTMTextTex" OutName="title_ocarina_of_time_tm_text" Format="i8" Width="96" Height="8" Offset="0x1EB40"/>
        <Texture Name="gTitleTitleJPNTex" OutName="title_title_jpn" Format="i8" Width="128" Height="16" Offset="0x1EE40"/>
    </File>
-</Root>
+</Root>
@@ -6,7 +6,7 @@
        <Texture Name="object_moTex_005520" OutName="object_moTex_005520" Format="ia16" Width="32" Height="32" Offset="0x4120" AddedByScript="true"/>
        <Texture Name="object_moTex_005D20" OutName="object_moTex_005D20" Format="ia16" Width="32" Height="32" Offset="0x4920" AddedByScript="true"/>
        <!-- Morpha's Title Card -->
-        <Texture Name="gMorphaTitleCardTex" Format="i8" Width="128" Height="120" Offset="0x1010"/>
+        <Texture Name="gMorphaTitleCardTex" Format="i8" Width="128" Height="80" Offset="0x1010"/>
        <Texture Name="gMorphaWaterTex" Format="rgba16" Width="32" Height="32" Offset="0x7470"/>

        <!-- DLists for Morpha's Core -->
@@ -17,7 +17,7 @@
        <Texture Name="object_sstTex_01A730" OutName="object_sstTex_01A730" Format="rgba16" Width="4" Height="16" Offset="0x19330" AddedByScript="true"/>
        <Texture Name="object_sstTex_01A7B0" OutName="object_sstTex_01A7B0" Format="rgba16" Width="16" Height="16" Offset="0x193B0" AddedByScript="true"/>
        <!-- Boss Title Card -->
-        <Texture Name="gBongoTitleCardTex" OutName="bongo_title_card" Format="i8" Width="128" Height="120" Offset="0x13D80"/>
+        <Texture Name="gBongoTitleCardTex" OutName="bongo_title_card" Format="i8" Width="128" Height="80" Offset="0x13D80"/>
        
        <!-- Skeletons -->
        <Skeleton Name="gBongoLeftHandSkel" Type="Flex" LimbType="Standard" Offset="0x04DE0"/>
@@ -273,7 +273,7 @@
        <DList Name="gTwinrovaBroomIceTrailDL" Offset="0x2DEB0"/>
        <DList Name="gTwinrovaBroomFireJetDL" Offset="0x2DFB0"/>
        <DList Name="gTwinrovaBroomFireTrailDL" Offset="0x2E098"/>
-        <Texture Name="gTwinrovaTitleCardTex" OutName="title_card" Format="i8" Width="128" Height="120" Offset="0x2E170"/>
+        <Texture Name="gTwinrovaTitleCardTex" OutName="title_card" Format="i8" Width="128" Height="80" Offset="0x2E170"/>
        <Limb Name="gTwinrovaPelvisLimb" LimbType="Standard" Offset="0x30970"/>
        <Limb Name="gTwinrovaSash1Limb" LimbType="Standard" Offset="0x3097C"/>
        <Limb Name="gTwinrovaSash2Limb" LimbType="Standard" Offset="0x30988"/>
@@ -239,7 +239,7 @@
        <Texture Name="gGoldSkulltulaItemNameENGTex" OutName="gold_skulltula_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3B000"/>
        <Texture Name="gPieceOfHeartItemNameENGTex" OutName="piece_of_heart_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3B400"/>
        <Texture Name="gUnusedPieceOfHeartItemName2JPNTex" OutName="piece_of_heart_item_name_unused_jpn_2" Format="ia4" Width="128" Height="16" Offset="0x3B800"/>
-        <Texture Name="gBigKeyItemNameENGTex" OutName="big_key_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3BC00"/>
+        <Texture Name="gUnusedBigKeyItemNameENGTex" OutName="big_key_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3BC00"/>
        <Texture Name="gCompassItemNameENGTex" OutName="compass_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3C000"/>
        <Texture Name="gDungeonMapItemNameENGTex" OutName="dungeon_map_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3C400"/>
        <Texture Name="gUnusedBossKeyItemName12JPNTex" OutName="boss_key_item_name_unused_jpn_12" Format="ia4" Width="128" Height="16" Offset="0x3C800"/>
@@ -38,7 +38,7 @@
        <Texture Name="object_bvTLUT_01DBB0" OutName="object_bvTLUT_01DBB0" Format="rgba16" Width="16" Height="16" Offset="0x1C7B0" AddedByScript="true"/>
        <Texture Name="object_bvTLUT_01E6B0" OutName="object_bvTLUT_01E6B0" Format="rgba16" Width="16" Height="16" Offset="0x1D2B0" AddedByScript="true"/>
        <!-- Boss title card -->
-        <Texture Name="gBarinadeTitleCardTex" OutName="barinade_title_card" Format="i8" Width="128" Height="120" Offset="0x1230"/>
+        <Texture Name="gBarinadeTitleCardTex" OutName="barinade_title_card" Format="i8" Width="128" Height="80" Offset="0x1230"/>

        <Skeleton Name="gBarinadeBodySkel" Type="Normal" LimbType="Standard" Offset="0x14718"/>
        <Skeleton Name="gBarinadeSupportSkel" Type="Flex" LimbType="Standard" Offset="0x16098"/>
@@ -28,7 +28,7 @@
        <Texture Name="object_fdTLUT_000A58" OutName="object_fdTLUT_000A58" Format="rgba16" Width="4" Height="4" Offset="0xA58" AddedByScript="true"/>
        <Texture Name="object_fdTLUT_0032A8" OutName="object_fdTLUT_0032A8" Format="rgba16" Width="16" Height="16" Offset="0x32A8" AddedByScript="true"/>
        <!-- Boss title card -->
-        <!-- <Texture Name="gVolvagiaTitleCardTex" OutName="volvagia_boss_title_card" Format="i8" Width="128" Height="120" Offset="0xD700"/> -->
+        <!-- <Texture Name="gVolvagiaTitleCardTex" OutName="volvagia_boss_title_card" Format="i8" Width="128" Height="80" Offset="0xD700"/> -->

        <!-- Skeletons -->
        <Skeleton Name="gVolvagiaLeftArmSkel" Type="Normal" LimbType="Standard" Offset="0x100E0"/>
@@ -38,7 +38,7 @@
        <Animation Name="gPhantomHorseFenceJumpAnim" Offset="0xAD80"/>
        
        <!-- Boss title card -->
-        <Texture Name="gPhantomGanonTitleCardTex" OutName="phantom_ganon_title_card" Format="i8" Width="128" Height="120" Offset="0x59A0"/>
+        <Texture Name="gPhantomGanonTitleCardTex" OutName="phantom_ganon_title_card" Format="i8" Width="128" Height="80" Offset="0x59A0"/>
    
        <!-- Energy attack DLists -->
        <DList Name="gPhantomWarpDL" Offset="0xE6A0"/>
@@ -68,7 +68,7 @@
        <DList Name="gGanondorfRightHandOpenDL" Offset="0xC9E8"/>

        <!-- Ganondorf Title Card Texture -->
-        <!-- <Texture Name="gGanondorfTitleCardTex" OutName="ganondorf_title_card" Format="i8" Width="128" Height="120" Offset="0xCF00"/> -->
+        <!-- <Texture Name="gGanondorfTitleCardTex" OutName="ganondorf_title_card" Format="i8" Width="128" Height="80" Offset="0xCF00"/> -->

        <!-- Ganondorf Animation -->
        <Animation Name="gGanondorfEndingFloatAnim" Offset="0xFF48"/> <!-- Original name is "ONOLEE" (lit. "Curse you!" from his in-game dialogue) -->
@@ -159,7 +159,7 @@
        <Texture Name="gGohmaIrisTex" OutName="gohma_iris" Format="rgba16" Width="32" Height="32" Offset="0x193A8"/>

        <!-- Boss title card -->
-        <Texture Name="gGohmaTitleCardTex" OutName="gohma_title_card" Format="i8" Width="128" Height="120" Offset="0x19BA8"/>
+        <Texture Name="gGohmaTitleCardTex" OutName="gohma_title_card" Format="i8" Width="128" Height="80" Offset="0x19BA8"/>

        <!-- Door -->
        <DList Name="gGohmaDoorDL" Offset="0x1D820"/>
@@ -48,7 +48,7 @@
        <Texture Name="object_kingdodongo_Tex_016D90" OutName="tex_00016D90" Format="rgba16" Width="8" Height="8" Offset="0x16D90"/>
        <Texture Name="object_kingdodongo_Tex_016E10" OutName="tex_00016E10" Format="rgba16" Width="32" Height="16" Offset="0x16E10"/>
        <Texture Name="object_kingdodongo_Tex_017210" OutName="tex_00017210" Format="rgba16" Width="8" Height="32" Offset="0x17210"/>
-        <Texture Name="gKingDodongoTitleCardTex" OutName="title_card" Format="i8" Width="128" Height="120" Offset="0x17410"/>
+        <Texture Name="gKingDodongoTitleCardTex" OutName="title_card" Format="i8" Width="128" Height="80" Offset="0x17410"/>
        <Limb Name="object_kingdodongo_Limb_01B010" LimbType="Standard" Offset="0x19C10"/>
        <Limb Name="object_kingdodongo_Limb_01B01C" LimbType="Standard" Offset="0x19C1C"/>
        <Limb Name="object_kingdodongo_Limb_01B028" LimbType="Standard" Offset="0x19C28"/>
@@ -1,8 +1,8 @@
 <Root>
    <File Name="object_mag" Segment="6">
        <Texture Name="gTitleZeldaShieldLogoMQTex" OutName="title_zelda_shield_logo_mq" Format="rgba32" Width="160" Height="160" Offset="0x0"/>
-        <Texture Name="gTitleCopyright19982002Tex" OutName="title_copyright_19982002" Format="ia8" Width="160" Height="16" Offset="0x19000"/>
-        <Texture Name="gTitleCopyright19982003Tex" OutName="title_copyright_19982003" Format="ia8" Width="160" Height="16" Offset="0x19A00"/>
+        <Texture Name="gTitleCopyright19982004JpnTex" OutName="title_copyright_19982004_jpn" Format="ia8" Width="160" Height="16" Offset="0x19000"/>
+        <Texture Name="gTitleCopyright19982004EngTex" OutName="title_copyright_19982004_eng" Format="ia8" Width="160" Height="16" Offset="0x19A00"/>
        <Texture Name="gTitleDiskTex" OutName="title_disk" Format="ia8" Width="48" Height="16" Offset="0x1A400"/>
        <Texture Name="gTitleEffectMask00Tex" OutName="title_effect_mask_0_0" Format="i4" Width="64" Height="64" Offset="0x1A700"/>
        <Texture Name="gTitleEffectMask01Tex" OutName="title_effect_mask_0_1" Format="i4" Width="64" Height="64" Offset="0x1AF00"/>
@@ -18,4 +18,4 @@
        <Texture Name="gTitleOcarinaOfTimeTMTextTex" OutName="title_ocarina_of_time_tm_text" Format="i8" Width="96" Height="8" Offset="0x1F540"/>
        <Texture Name="gTitleTitleJPNTex" OutName="title_title_jpn" Format="i8" Width="128" Height="16" Offset="0x1F840"/>
    </File>
-</Root>
+</Root>
@@ -6,7 +6,7 @@
        <Texture Name="object_moTex_005520" OutName="object_moTex_005520" Format="ia16" Width="32" Height="32" Offset="0x4120" AddedByScript="true"/>
        <Texture Name="object_moTex_005D20" OutName="object_moTex_005D20" Format="ia16" Width="32" Height="32" Offset="0x4920" AddedByScript="true"/>
        <!-- Morpha's Title Card -->
-        <Texture Name="gMorphaTitleCardTex" Format="i8" Width="128" Height="120" Offset="0x1010"/>
+        <Texture Name="gMorphaTitleCardTex" Format="i8" Width="128" Height="80" Offset="0x1010"/>
        <Texture Name="gMorphaWaterTex" Format="rgba16" Width="32" Height="32" Offset="0x7470"/>

        <!-- DLists for Morpha's Core -->
@@ -17,7 +17,7 @@
        <Texture Name="object_sstTex_01A730" OutName="object_sstTex_01A730" Format="rgba16" Width="4" Height="16" Offset="0x19330" AddedByScript="true"/>
        <Texture Name="object_sstTex_01A7B0" OutName="object_sstTex_01A7B0" Format="rgba16" Width="16" Height="16" Offset="0x193B0" AddedByScript="true"/>
        <!-- Boss Title Card -->
-        <Texture Name="gBongoTitleCardTex" OutName="bongo_title_card" Format="i8" Width="128" Height="120" Offset="0x13D80"/>
+        <Texture Name="gBongoTitleCardTex" OutName="bongo_title_card" Format="i8" Width="128" Height="80" Offset="0x13D80"/>
        
        <!-- Skeletons -->
        <Skeleton Name="gBongoLeftHandSkel" Type="Flex" LimbType="Standard" Offset="0x04DE0"/>
@@ -273,7 +273,7 @@
        <DList Name="gTwinrovaBroomIceTrailDL" Offset="0x2DEB0"/>
        <DList Name="gTwinrovaBroomFireJetDL" Offset="0x2DFB0"/>
        <DList Name="gTwinrovaBroomFireTrailDL" Offset="0x2E098"/>
-        <Texture Name="gTwinrovaTitleCardTex" OutName="title_card" Format="i8" Width="128" Height="120" Offset="0x2E170"/>
+        <Texture Name="gTwinrovaTitleCardTex" OutName="title_card" Format="i8" Width="128" Height="80" Offset="0x2E170"/>
        <Limb Name="gTwinrovaPelvisLimb" LimbType="Standard" Offset="0x30970"/>
        <Limb Name="gTwinrovaSash1Limb" LimbType="Standard" Offset="0x3097C"/>
        <Limb Name="gTwinrovaSash2Limb" LimbType="Standard" Offset="0x30988"/>
@@ -239,7 +239,7 @@
        <Texture Name="gGoldSkulltulaItemNameENGTex" OutName="gold_skulltula_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3B000"/>
        <Texture Name="gPieceOfHeartItemNameENGTex" OutName="piece_of_heart_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3B400"/>
        <Texture Name="gUnusedPieceOfHeartItemName2JPNTex" OutName="piece_of_heart_item_name_unused_jpn_2" Format="ia4" Width="128" Height="16" Offset="0x3B800"/>
-        <Texture Name="gBigKeyItemNameENGTex" OutName="big_key_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3BC00"/>
+        <Texture Name="gUnusedBigKeyItemNameENGTex" OutName="big_key_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3BC00"/>
        <Texture Name="gCompassItemNameENGTex" OutName="compass_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3C000"/>
        <Texture Name="gDungeonMapItemNameENGTex" OutName="dungeon_map_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3C400"/>
        <Texture Name="gUnusedBossKeyItemName12JPNTex" OutName="boss_key_item_name_unused_jpn_12" Format="ia4" Width="128" Height="16" Offset="0x3C800"/>
@@ -38,7 +38,7 @@
        <Texture Name="object_bvTLUT_01DBB0" OutName="object_bvTLUT_01DBB0" Format="rgba16" Width="16" Height="16" Offset="0x1C7B0" AddedByScript="true"/>
        <Texture Name="object_bvTLUT_01E6B0" OutName="object_bvTLUT_01E6B0" Format="rgba16" Width="16" Height="16" Offset="0x1D2B0" AddedByScript="true"/>
        <!-- Boss title card -->
-        <Texture Name="gBarinadeTitleCardTex" OutName="barinade_title_card" Format="i8" Width="128" Height="120" Offset="0x1230"/>
+        <Texture Name="gBarinadeTitleCardTex" OutName="barinade_title_card" Format="i8" Width="128" Height="80" Offset="0x1230"/>

        <Skeleton Name="gBarinadeBodySkel" Type="Normal" LimbType="Standard" Offset="0x14718"/>
        <Skeleton Name="gBarinadeSupportSkel" Type="Flex" LimbType="Standard" Offset="0x16098"/>
@@ -28,7 +28,7 @@
        <Texture Name="object_fdTLUT_000A58" OutName="object_fdTLUT_000A58" Format="rgba16" Width="4" Height="4" Offset="0xA58" AddedByScript="true"/>
        <Texture Name="object_fdTLUT_0032A8" OutName="object_fdTLUT_0032A8" Format="rgba16" Width="16" Height="16" Offset="0x32A8" AddedByScript="true"/>
        <!-- Boss title card -->
-        <!-- <Texture Name="gVolvagiaTitleCardTex" OutName="volvagia_boss_title_card" Format="i8" Width="128" Height="120" Offset="0xD700"/> -->
+        <!-- <Texture Name="gVolvagiaTitleCardTex" OutName="volvagia_boss_title_card" Format="i8" Width="128" Height="80" Offset="0xD700"/> -->

        <!-- Skeletons -->
        <Skeleton Name="gVolvagiaLeftArmSkel" Type="Normal" LimbType="Standard" Offset="0x100E0"/>
@@ -38,7 +38,7 @@
        <Animation Name="gPhantomHorseFenceJumpAnim" Offset="0xAD80"/>
        
        <!-- Boss title card -->
-        <Texture Name="gPhantomGanonTitleCardTex" OutName="phantom_ganon_title_card" Format="i8" Width="128" Height="120" Offset="0x59A0"/>
+        <Texture Name="gPhantomGanonTitleCardTex" OutName="phantom_ganon_title_card" Format="i8" Width="128" Height="80" Offset="0x59A0"/>
    
        <!-- Energy attack DLists -->
        <DList Name="gPhantomWarpDL" Offset="0xE6A0"/>
@@ -68,7 +68,7 @@
        <DList Name="gGanondorfRightHandOpenDL" Offset="0xC9E8"/>

        <!-- Ganondorf Title Card Texture -->
-        <!-- <Texture Name="gGanondorfTitleCardTex" OutName="ganondorf_title_card" Format="i8" Width="128" Height="120" Offset="0xCF00"/> -->
+        <!-- <Texture Name="gGanondorfTitleCardTex" OutName="ganondorf_title_card" Format="i8" Width="128" Height="80" Offset="0xCF00"/> -->

        <!-- Ganondorf Animation -->
        <Animation Name="gGanondorfEndingFloatAnim" Offset="0xFF48"/> <!-- Original name is "ONOLEE" (lit. "Curse you!" from his in-game dialogue) -->
@@ -159,7 +159,7 @@
        <Texture Name="gGohmaIrisTex" OutName="gohma_iris" Format="rgba16" Width="32" Height="32" Offset="0x193A8"/>

        <!-- Boss title card -->
-        <Texture Name="gGohmaTitleCardTex" OutName="gohma_title_card" Format="i8" Width="128" Height="120" Offset="0x19BA8"/>
+        <Texture Name="gGohmaTitleCardTex" OutName="gohma_title_card" Format="i8" Width="128" Height="80" Offset="0x19BA8"/>

        <!-- Door -->
        <DList Name="gGohmaDoorDL" Offset="0x1D820"/>
@@ -48,7 +48,7 @@
        <Texture Name="object_kingdodongo_Tex_016D90" OutName="tex_00016D90" Format="rgba16" Width="8" Height="8" Offset="0x16D90"/>
        <Texture Name="object_kingdodongo_Tex_016E10" OutName="tex_00016E10" Format="rgba16" Width="32" Height="16" Offset="0x16E10"/>
        <Texture Name="object_kingdodongo_Tex_017210" OutName="tex_00017210" Format="rgba16" Width="8" Height="32" Offset="0x17210"/>
-        <Texture Name="gKingDodongoTitleCardTex" OutName="title_card" Format="i8" Width="128" Height="120" Offset="0x17410"/>
+        <Texture Name="gKingDodongoTitleCardTex" OutName="title_card" Format="i8" Width="128" Height="80" Offset="0x17410"/>
        <Limb Name="object_kingdodongo_Limb_01B010" LimbType="Standard" Offset="0x19C10"/>
        <Limb Name="object_kingdodongo_Limb_01B01C" LimbType="Standard" Offset="0x19C1C"/>
        <Limb Name="object_kingdodongo_Limb_01B028" LimbType="Standard" Offset="0x19C28"/>
@@ -6,7 +6,7 @@
        <Texture Name="object_moTex_005520" OutName="object_moTex_005520" Format="ia16" Width="32" Height="32" Offset="0x4120" AddedByScript="true"/>
        <Texture Name="object_moTex_005D20" OutName="object_moTex_005D20" Format="ia16" Width="32" Height="32" Offset="0x4920" AddedByScript="true"/>
        <!-- Morpha's Title Card -->
-        <Texture Name="gMorphaTitleCardTex" Format="i8" Width="128" Height="120" Offset="0x1010"/>
+        <Texture Name="gMorphaTitleCardTex" Format="i8" Width="128" Height="80" Offset="0x1010"/>
        <Texture Name="gMorphaWaterTex" Format="rgba16" Width="32" Height="32" Offset="0x7470"/>

        <!-- DLists for Morpha's Core -->
@@ -17,7 +17,7 @@
        <Texture Name="object_sstTex_01A730" OutName="object_sstTex_01A730" Format="rgba16" Width="4" Height="16" Offset="0x19330" AddedByScript="true"/>
        <Texture Name="object_sstTex_01A7B0" OutName="object_sstTex_01A7B0" Format="rgba16" Width="16" Height="16" Offset="0x193B0" AddedByScript="true"/>
        <!-- Boss Title Card -->
-        <Texture Name="gBongoTitleCardTex" OutName="bongo_title_card" Format="i8" Width="128" Height="120" Offset="0x13D80"/>
+        <Texture Name="gBongoTitleCardTex" OutName="bongo_title_card" Format="i8" Width="128" Height="80" Offset="0x13D80"/>
        
        <!-- Skeletons -->
        <Skeleton Name="gBongoLeftHandSkel" Type="Flex" LimbType="Standard" Offset="0x04DE0"/>
@@ -273,7 +273,7 @@
        <DList Name="gTwinrovaBroomIceTrailDL" Offset="0x2DEB0"/>
        <DList Name="gTwinrovaBroomFireJetDL" Offset="0x2DFB0"/>
        <DList Name="gTwinrovaBroomFireTrailDL" Offset="0x2E098"/>
-        <Texture Name="gTwinrovaTitleCardTex" OutName="title_card" Format="i8" Width="128" Height="120" Offset="0x2E170"/>
+        <Texture Name="gTwinrovaTitleCardTex" OutName="title_card" Format="i8" Width="128" Height="80" Offset="0x2E170"/>
        <Limb Name="gTwinrovaPelvisLimb" LimbType="Standard" Offset="0x30970"/>
        <Limb Name="gTwinrovaSash1Limb" LimbType="Standard" Offset="0x3097C"/>
        <Limb Name="gTwinrovaSash2Limb" LimbType="Standard" Offset="0x30988"/>
@@ -239,7 +239,7 @@
        <Texture Name="gGoldSkulltulaItemNameENGTex" OutName="gold_skulltula_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3B000"/>
        <Texture Name="gPieceOfHeartItemNameENGTex" OutName="piece_of_heart_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3B400"/>
        <Texture Name="gUnusedPieceOfHeartItemName2JPNTex" OutName="piece_of_heart_item_name_unused_jpn_2" Format="ia4" Width="128" Height="16" Offset="0x3B800"/>
-        <Texture Name="gBigKeyItemNameENGTex" OutName="big_key_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3BC00"/>
+        <Texture Name="gUnusedBigKeyItemNameENGTex" OutName="big_key_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3BC00"/>
        <Texture Name="gCompassItemNameENGTex" OutName="compass_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3C000"/>
        <Texture Name="gDungeonMapItemNameENGTex" OutName="dungeon_map_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3C400"/>
        <Texture Name="gUnusedBossKeyItemName12JPNTex" OutName="boss_key_item_name_unused_jpn_12" Format="ia4" Width="128" Height="16" Offset="0x3C800"/>
@@ -38,7 +38,7 @@
        <Texture Name="object_bvTLUT_01DBB0" OutName="object_bvTLUT_01DBB0" Format="rgba16" Width="16" Height="16" Offset="0x1C7B0" AddedByScript="true"/>
        <Texture Name="object_bvTLUT_01E6B0" OutName="object_bvTLUT_01E6B0" Format="rgba16" Width="16" Height="16" Offset="0x1D2B0" AddedByScript="true"/>
        <!-- Boss title card -->
-        <Texture Name="gBarinadeTitleCardTex" OutName="barinade_title_card" Format="i8" Width="128" Height="120" Offset="0x1230"/>
+        <Texture Name="gBarinadeTitleCardTex" OutName="barinade_title_card" Format="i8" Width="128" Height="80" Offset="0x1230"/>

        <Skeleton Name="gBarinadeBodySkel" Type="Normal" LimbType="Standard" Offset="0x14718"/>
        <Skeleton Name="gBarinadeSupportSkel" Type="Flex" LimbType="Standard" Offset="0x16098"/>
@@ -28,7 +28,7 @@
        <Texture Name="object_fdTLUT_000A58" OutName="object_fdTLUT_000A58" Format="rgba16" Width="4" Height="4" Offset="0xA58" AddedByScript="true"/>
        <Texture Name="object_fdTLUT_0032A8" OutName="object_fdTLUT_0032A8" Format="rgba16" Width="16" Height="16" Offset="0x32A8" AddedByScript="true"/>
        <!-- Boss title card -->
-        <!-- <Texture Name="gVolvagiaTitleCardTex" OutName="volvagia_boss_title_card" Format="i8" Width="128" Height="120" Offset="0xD700"/> -->
+        <!-- <Texture Name="gVolvagiaTitleCardTex" OutName="volvagia_boss_title_card" Format="i8" Width="128" Height="80" Offset="0xD700"/> -->

        <!-- Skeletons -->
        <Skeleton Name="gVolvagiaLeftArmSkel" Type="Normal" LimbType="Standard" Offset="0x100E0"/>
@@ -38,7 +38,7 @@
        <Animation Name="gPhantomHorseFenceJumpAnim" Offset="0xAD80"/>
        
        <!-- Boss title card -->
-        <Texture Name="gPhantomGanonTitleCardTex" OutName="phantom_ganon_title_card" Format="i8" Width="128" Height="120" Offset="0x59A0"/>
+        <Texture Name="gPhantomGanonTitleCardTex" OutName="phantom_ganon_title_card" Format="i8" Width="128" Height="80" Offset="0x59A0"/>
    
        <!-- Energy attack DLists -->
        <DList Name="gPhantomWarpDL" Offset="0xE6A0"/>
@@ -68,7 +68,7 @@
        <DList Name="gGanondorfRightHandOpenDL" Offset="0xC9E8"/>

        <!-- Ganondorf Title Card Texture -->
-        <!-- <Texture Name="gGanondorfTitleCardTex" OutName="ganondorf_title_card" Format="i8" Width="128" Height="120" Offset="0xCF00"/> -->
+        <!-- <Texture Name="gGanondorfTitleCardTex" OutName="ganondorf_title_card" Format="i8" Width="128" Height="80" Offset="0xCF00"/> -->

        <!-- Ganondorf Animation -->
        <Animation Name="gGanondorfEndingFloatAnim" Offset="0xFF48"/> <!-- Original name is "ONOLEE" (lit. "Curse you!" from his in-game dialogue) -->
@@ -159,7 +159,7 @@
        <Texture Name="gGohmaIrisTex" OutName="gohma_iris" Format="rgba16" Width="32" Height="32" Offset="0x193A8"/>

        <!-- Boss title card -->
-        <Texture Name="gGohmaTitleCardTex" OutName="gohma_title_card" Format="i8" Width="128" Height="120" Offset="0x19BA8"/>
+        <Texture Name="gGohmaTitleCardTex" OutName="gohma_title_card" Format="i8" Width="128" Height="80" Offset="0x19BA8"/>

        <!-- Door -->
        <DList Name="gGohmaDoorDL" Offset="0x1D820"/>
@@ -48,7 +48,7 @@
        <Texture Name="object_kingdodongo_Tex_016D90" OutName="tex_00016D90" Format="rgba16" Width="8" Height="8" Offset="0x16D90"/>
        <Texture Name="object_kingdodongo_Tex_016E10" OutName="tex_00016E10" Format="rgba16" Width="32" Height="16" Offset="0x16E10"/>
        <Texture Name="object_kingdodongo_Tex_017210" OutName="tex_00017210" Format="rgba16" Width="8" Height="32" Offset="0x17210"/>
-        <Texture Name="gKingDodongoTitleCardTex" OutName="title_card" Format="i8" Width="128" Height="120" Offset="0x17410"/>
+        <Texture Name="gKingDodongoTitleCardTex" OutName="title_card" Format="i8" Width="128" Height="80" Offset="0x17410"/>
        <Limb Name="object_kingdodongo_Limb_01B010" LimbType="Standard" Offset="0x19C10"/>
        <Limb Name="object_kingdodongo_Limb_01B01C" LimbType="Standard" Offset="0x19C1C"/>
        <Limb Name="object_kingdodongo_Limb_01B028" LimbType="Standard" Offset="0x19C28"/>
@@ -6,7 +6,7 @@
        <Texture Name="object_moTex_005520" OutName="object_moTex_005520" Format="ia16" Width="32" Height="32" Offset="0x4120" AddedByScript="true"/>
        <Texture Name="object_moTex_005D20" OutName="object_moTex_005D20" Format="ia16" Width="32" Height="32" Offset="0x4920" AddedByScript="true"/>
        <!-- Morpha's Title Card -->
-        <Texture Name="gMorphaTitleCardTex" Format="i8" Width="128" Height="120" Offset="0x1010"/>
+        <Texture Name="gMorphaTitleCardTex" Format="i8" Width="128" Height="80" Offset="0x1010"/>
        <Texture Name="gMorphaWaterTex" Format="rgba16" Width="32" Height="32" Offset="0x7470"/>

        <!-- DLists for Morpha's Core -->
@@ -17,7 +17,7 @@
        <Texture Name="object_sstTex_01A730" OutName="object_sstTex_01A730" Format="rgba16" Width="4" Height="16" Offset="0x19330" AddedByScript="true"/>
        <Texture Name="object_sstTex_01A7B0" OutName="object_sstTex_01A7B0" Format="rgba16" Width="16" Height="16" Offset="0x193B0" AddedByScript="true"/>
        <!-- Boss Title Card -->
-        <Texture Name="gBongoTitleCardTex" OutName="bongo_title_card" Format="i8" Width="128" Height="120" Offset="0x13D80"/>
+        <Texture Name="gBongoTitleCardTex" OutName="bongo_title_card" Format="i8" Width="128" Height="80" Offset="0x13D80"/>
        
        <!-- Skeletons -->
        <Skeleton Name="gBongoLeftHandSkel" Type="Flex" LimbType="Standard" Offset="0x04DE0"/>
@@ -273,7 +273,7 @@
        <DList Name="gTwinrovaBroomIceTrailDL" Offset="0x2DEB0"/>
        <DList Name="gTwinrovaBroomFireJetDL" Offset="0x2DFB0"/>
        <DList Name="gTwinrovaBroomFireTrailDL" Offset="0x2E098"/>
-        <Texture Name="gTwinrovaTitleCardTex" OutName="title_card" Format="i8" Width="128" Height="120" Offset="0x2E170"/>
+        <Texture Name="gTwinrovaTitleCardTex" OutName="title_card" Format="i8" Width="128" Height="80" Offset="0x2E170"/>
        <Limb Name="gTwinrovaPelvisLimb" LimbType="Standard" Offset="0x30970"/>
        <Limb Name="gTwinrovaSash1Limb" LimbType="Standard" Offset="0x3097C"/>
        <Limb Name="gTwinrovaSash2Limb" LimbType="Standard" Offset="0x30988"/>
@@ -239,7 +239,7 @@
        <Texture Name="gGoldSkulltulaItemNameENGTex" OutName="gold_skulltula_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3B000"/>
        <Texture Name="gPieceOfHeartItemNameENGTex" OutName="piece_of_heart_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3B400"/>
        <Texture Name="gUnusedPieceOfHeartItemName2JPNTex" OutName="piece_of_heart_item_name_unused_jpn_2" Format="ia4" Width="128" Height="16" Offset="0x3B800"/>
-        <Texture Name="gBigKeyItemNameENGTex" OutName="big_key_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3BC00"/>
+        <Texture Name="gUnusedBigKeyItemNameENGTex" OutName="big_key_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3BC00"/>
        <Texture Name="gCompassItemNameENGTex" OutName="compass_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3C000"/>
        <Texture Name="gDungeonMapItemNameENGTex" OutName="dungeon_map_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3C400"/>
        <Texture Name="gUnusedBossKeyItemName12JPNTex" OutName="boss_key_item_name_unused_jpn_12" Format="ia4" Width="128" Height="16" Offset="0x3C800"/>
@@ -38,7 +38,7 @@
        <Texture Name="object_bvTLUT_01DBB0" OutName="object_bvTLUT_01DBB0" Format="rgba16" Width="16" Height="16" Offset="0x1C7B0" AddedByScript="true"/>
        <Texture Name="object_bvTLUT_01E6B0" OutName="object_bvTLUT_01E6B0" Format="rgba16" Width="16" Height="16" Offset="0x1D2B0" AddedByScript="true"/>
        <!-- Boss title card -->
-        <Texture Name="gBarinadeTitleCardTex" OutName="barinade_title_card" Format="i8" Width="128" Height="120" Offset="0x1230"/>
+        <Texture Name="gBarinadeTitleCardTex" OutName="barinade_title_card" Format="i8" Width="128" Height="80" Offset="0x1230"/>

        <Skeleton Name="gBarinadeBodySkel" Type="Normal" LimbType="Standard" Offset="0x14718"/>
        <Skeleton Name="gBarinadeSupportSkel" Type="Flex" LimbType="Standard" Offset="0x16098"/>
@@ -28,7 +28,7 @@
        <Texture Name="object_fdTLUT_000A58" OutName="object_fdTLUT_000A58" Format="rgba16" Width="4" Height="4" Offset="0xA58" AddedByScript="true"/>
        <Texture Name="object_fdTLUT_0032A8" OutName="object_fdTLUT_0032A8" Format="rgba16" Width="16" Height="16" Offset="0x32A8" AddedByScript="true"/>
        <!-- Boss title card -->
-        <!-- <Texture Name="gVolvagiaTitleCardTex" OutName="volvagia_boss_title_card" Format="i8" Width="128" Height="120" Offset="0xD700"/> -->
+        <!-- <Texture Name="gVolvagiaTitleCardTex" OutName="volvagia_boss_title_card" Format="i8" Width="128" Height="80" Offset="0xD700"/> -->

        <!-- Skeletons -->
        <Skeleton Name="gVolvagiaLeftArmSkel" Type="Normal" LimbType="Standard" Offset="0x100E0"/>
@@ -38,7 +38,7 @@
        <Animation Name="gPhantomHorseFenceJumpAnim" Offset="0xAD80"/>
        
        <!-- Boss title card -->
-        <Texture Name="gPhantomGanonTitleCardTex" OutName="phantom_ganon_title_card" Format="i8" Width="128" Height="120" Offset="0x59A0"/>
+        <Texture Name="gPhantomGanonTitleCardTex" OutName="phantom_ganon_title_card" Format="i8" Width="128" Height="80" Offset="0x59A0"/>
    
        <!-- Energy attack DLists -->
        <DList Name="gPhantomWarpDL" Offset="0xE6A0"/>
@@ -68,7 +68,7 @@
        <DList Name="gGanondorfRightHandOpenDL" Offset="0xC9E8"/>

        <!-- Ganondorf Title Card Texture -->
-        <!-- <Texture Name="gGanondorfTitleCardTex" OutName="ganondorf_title_card" Format="i8" Width="128" Height="120" Offset="0xCF00"/> -->
+        <!-- <Texture Name="gGanondorfTitleCardTex" OutName="ganondorf_title_card" Format="i8" Width="128" Height="80" Offset="0xCF00"/> -->

        <!-- Ganondorf Animation -->
        <Animation Name="gGanondorfEndingFloatAnim" Offset="0xFF48"/> <!-- Original name is "ONOLEE" (lit. "Curse you!" from his in-game dialogue) -->
@@ -159,7 +159,7 @@
        <Texture Name="gGohmaIrisTex" OutName="gohma_iris" Format="rgba16" Width="32" Height="32" Offset="0x193A8"/>

        <!-- Boss title card -->
-        <Texture Name="gGohmaTitleCardTex" OutName="gohma_title_card" Format="i8" Width="128" Height="120" Offset="0x19BA8"/>
+        <Texture Name="gGohmaTitleCardTex" OutName="gohma_title_card" Format="i8" Width="128" Height="80" Offset="0x19BA8"/>

        <!-- Door -->
        <DList Name="gGohmaDoorDL" Offset="0x1D820"/>
@@ -48,7 +48,7 @@
        <Texture Name="object_kingdodongo_Tex_016D90" OutName="tex_00016D90" Format="rgba16" Width="8" Height="8" Offset="0x16D90"/>
        <Texture Name="object_kingdodongo_Tex_016E10" OutName="tex_00016E10" Format="rgba16" Width="32" Height="16" Offset="0x16E10"/>
        <Texture Name="object_kingdodongo_Tex_017210" OutName="tex_00017210" Format="rgba16" Width="8" Height="32" Offset="0x17210"/>
-        <Texture Name="gKingDodongoTitleCardTex" OutName="title_card" Format="i8" Width="128" Height="120" Offset="0x17410"/>
+        <Texture Name="gKingDodongoTitleCardTex" OutName="title_card" Format="i8" Width="128" Height="80" Offset="0x17410"/>
        <Limb Name="object_kingdodongo_Limb_01B010" LimbType="Standard" Offset="0x19C10"/>
        <Limb Name="object_kingdodongo_Limb_01B01C" LimbType="Standard" Offset="0x19C1C"/>
        <Limb Name="object_kingdodongo_Limb_01B028" LimbType="Standard" Offset="0x19C28"/>
@@ -6,7 +6,7 @@
        <Texture Name="object_moTex_005520" OutName="object_moTex_005520" Format="ia16" Width="32" Height="32" Offset="0x4120" AddedByScript="true"/>
        <Texture Name="object_moTex_005D20" OutName="object_moTex_005D20" Format="ia16" Width="32" Height="32" Offset="0x4920" AddedByScript="true"/>
        <!-- Morpha's Title Card -->
-        <Texture Name="gMorphaTitleCardTex" Format="i8" Width="128" Height="120" Offset="0x1010"/>
+        <Texture Name="gMorphaTitleCardTex" Format="i8" Width="128" Height="80" Offset="0x1010"/>
        <Texture Name="gMorphaWaterTex" Format="rgba16" Width="32" Height="32" Offset="0x7470"/>

        <!-- DLists for Morpha's Core -->
@@ -17,7 +17,7 @@
        <Texture Name="object_sstTex_01A730" OutName="object_sstTex_01A730" Format="rgba16" Width="4" Height="16" Offset="0x19330" AddedByScript="true"/>
        <Texture Name="object_sstTex_01A7B0" OutName="object_sstTex_01A7B0" Format="rgba16" Width="16" Height="16" Offset="0x193B0" AddedByScript="true"/>
        <!-- Boss Title Card -->
-        <Texture Name="gBongoTitleCardTex" OutName="bongo_title_card" Format="i8" Width="128" Height="120" Offset="0x13D80"/>
+        <Texture Name="gBongoTitleCardTex" OutName="bongo_title_card" Format="i8" Width="128" Height="80" Offset="0x13D80"/>
        
        <!-- Skeletons -->
        <Skeleton Name="gBongoLeftHandSkel" Type="Flex" LimbType="Standard" Offset="0x04DE0"/>
@@ -273,7 +273,7 @@
        <DList Name="gTwinrovaBroomIceTrailDL" Offset="0x2DEB0"/>
        <DList Name="gTwinrovaBroomFireJetDL" Offset="0x2DFB0"/>
        <DList Name="gTwinrovaBroomFireTrailDL" Offset="0x2E098"/>
-        <Texture Name="gTwinrovaTitleCardTex" OutName="title_card" Format="i8" Width="128" Height="120" Offset="0x2E170"/>
+        <Texture Name="gTwinrovaTitleCardTex" OutName="title_card" Format="i8" Width="128" Height="80" Offset="0x2E170"/>
        <Limb Name="gTwinrovaPelvisLimb" LimbType="Standard" Offset="0x30970"/>
        <Limb Name="gTwinrovaSash1Limb" LimbType="Standard" Offset="0x3097C"/>
        <Limb Name="gTwinrovaSash2Limb" LimbType="Standard" Offset="0x30988"/>
@@ -239,7 +239,7 @@
        <Texture Name="gGoldSkulltulaItemNameENGTex" OutName="gold_skulltula_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3B000"/>
        <Texture Name="gPieceOfHeartItemNameENGTex" OutName="piece_of_heart_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3B400"/>
        <Texture Name="gUnusedPieceOfHeartItemName2JPNTex" OutName="piece_of_heart_item_name_unused_jpn_2" Format="ia4" Width="128" Height="16" Offset="0x3B800"/>
-        <Texture Name="gBigKeyItemNameENGTex" OutName="big_key_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3BC00"/>
+        <Texture Name="gUnusedBigKeyItemNameENGTex" OutName="big_key_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3BC00"/>
        <Texture Name="gCompassItemNameENGTex" OutName="compass_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3C000"/>
        <Texture Name="gDungeonMapItemNameENGTex" OutName="dungeon_map_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3C400"/>
        <Texture Name="gUnusedBossKeyItemName12JPNTex" OutName="boss_key_item_name_unused_jpn_12" Format="ia4" Width="128" Height="16" Offset="0x3C800"/>
@@ -38,7 +38,7 @@
        <Texture Name="object_bvTLUT_01DBB0" OutName="object_bvTLUT_01DBB0" Format="rgba16" Width="16" Height="16" Offset="0x1C7B0" AddedByScript="true"/>
        <Texture Name="object_bvTLUT_01E6B0" OutName="object_bvTLUT_01E6B0" Format="rgba16" Width="16" Height="16" Offset="0x1D2B0" AddedByScript="true"/>
        <!-- Boss title card -->
-        <Texture Name="gBarinadeTitleCardTex" OutName="barinade_title_card" Format="i8" Width="128" Height="120" Offset="0x1230"/>
+        <Texture Name="gBarinadeTitleCardTex" OutName="barinade_title_card" Format="i8" Width="128" Height="80" Offset="0x1230"/>

        <Skeleton Name="gBarinadeBodySkel" Type="Normal" LimbType="Standard" Offset="0x14718"/>
        <Skeleton Name="gBarinadeSupportSkel" Type="Flex" LimbType="Standard" Offset="0x16098"/>
@@ -28,7 +28,7 @@
        <Texture Name="object_fdTLUT_000A58" OutName="object_fdTLUT_000A58" Format="rgba16" Width="4" Height="4" Offset="0xA58" AddedByScript="true"/>
        <Texture Name="object_fdTLUT_0032A8" OutName="object_fdTLUT_0032A8" Format="rgba16" Width="16" Height="16" Offset="0x32A8" AddedByScript="true"/>
        <!-- Boss title card -->
-        <!-- <Texture Name="gVolvagiaTitleCardTex" OutName="volvagia_boss_title_card" Format="i8" Width="128" Height="120" Offset="0xD700"/> -->
+        <!-- <Texture Name="gVolvagiaTitleCardTex" OutName="volvagia_boss_title_card" Format="i8" Width="128" Height="80" Offset="0xD700"/> -->

        <!-- Skeletons -->
        <Skeleton Name="gVolvagiaLeftArmSkel" Type="Normal" LimbType="Standard" Offset="0x100E0"/>
@@ -38,7 +38,7 @@
        <Animation Name="gPhantomHorseFenceJumpAnim" Offset="0xAD80"/>
        
        <!-- Boss title card -->
-        <Texture Name="gPhantomGanonTitleCardTex" OutName="phantom_ganon_title_card" Format="i8" Width="128" Height="120" Offset="0x59A0"/>
+        <Texture Name="gPhantomGanonTitleCardTex" OutName="phantom_ganon_title_card" Format="i8" Width="128" Height="80" Offset="0x59A0"/>
    
        <!-- Energy attack DLists -->
        <DList Name="gPhantomWarpDL" Offset="0xE6A0"/>
@@ -68,7 +68,7 @@
        <DList Name="gGanondorfRightHandOpenDL" Offset="0xC9E8"/>

        <!-- Ganondorf Title Card Texture -->
-        <!-- <Texture Name="gGanondorfTitleCardTex" OutName="ganondorf_title_card" Format="i8" Width="128" Height="120" Offset="0xCF00"/> -->
+        <!-- <Texture Name="gGanondorfTitleCardTex" OutName="ganondorf_title_card" Format="i8" Width="128" Height="80" Offset="0xCF00"/> -->

        <!-- Ganondorf Animation -->
        <Animation Name="gGanondorfEndingFloatAnim" Offset="0xFF48"/> <!-- Original name is "ONOLEE" (lit. "Curse you!" from his in-game dialogue) -->
@@ -159,7 +159,7 @@
        <Texture Name="gGohmaIrisTex" OutName="gohma_iris" Format="rgba16" Width="32" Height="32" Offset="0x193A8"/>

        <!-- Boss title card -->
-        <Texture Name="gGohmaTitleCardTex" OutName="gohma_title_card" Format="i8" Width="128" Height="120" Offset="0x19BA8"/>
+        <Texture Name="gGohmaTitleCardTex" OutName="gohma_title_card" Format="i8" Width="128" Height="80" Offset="0x19BA8"/>

        <!-- Door -->
        <DList Name="gGohmaDoorDL" Offset="0x1D820"/>
@@ -48,7 +48,7 @@
        <Texture Name="object_kingdodongo_Tex_016D90" OutName="tex_00016D90" Format="rgba16" Width="8" Height="8" Offset="0x16D90"/>
        <Texture Name="object_kingdodongo_Tex_016E10" OutName="tex_00016E10" Format="rgba16" Width="32" Height="16" Offset="0x16E10"/>
        <Texture Name="object_kingdodongo_Tex_017210" OutName="tex_00017210" Format="rgba16" Width="8" Height="32" Offset="0x17210"/>
-        <Texture Name="gKingDodongoTitleCardTex" OutName="title_card" Format="i8" Width="128" Height="120" Offset="0x17410"/>
+        <Texture Name="gKingDodongoTitleCardTex" OutName="title_card" Format="i8" Width="128" Height="80" Offset="0x17410"/>
        <Limb Name="object_kingdodongo_Limb_01B010" LimbType="Standard" Offset="0x19C10"/>
        <Limb Name="object_kingdodongo_Limb_01B01C" LimbType="Standard" Offset="0x19C1C"/>
        <Limb Name="object_kingdodongo_Limb_01B028" LimbType="Standard" Offset="0x19C28"/>
@@ -6,7 +6,7 @@
        <Texture Name="object_moTex_005520" OutName="object_moTex_005520" Format="ia16" Width="32" Height="32" Offset="0x4120" AddedByScript="true"/>
        <Texture Name="object_moTex_005D20" OutName="object_moTex_005D20" Format="ia16" Width="32" Height="32" Offset="0x4920" AddedByScript="true"/>
        <!-- Morpha's Title Card -->
-        <Texture Name="gMorphaTitleCardTex" Format="i8" Width="128" Height="120" Offset="0x1010"/>
+        <Texture Name="gMorphaTitleCardTex" Format="i8" Width="128" Height="80" Offset="0x1010"/>
        <Texture Name="gMorphaWaterTex" Format="rgba16" Width="32" Height="32" Offset="0x7470"/>

        <!-- DLists for Morpha's Core -->
@@ -17,7 +17,7 @@
        <Texture Name="object_sstTex_01A730" OutName="object_sstTex_01A730" Format="rgba16" Width="4" Height="16" Offset="0x19330" AddedByScript="true"/>
        <Texture Name="object_sstTex_01A7B0" OutName="object_sstTex_01A7B0" Format="rgba16" Width="16" Height="16" Offset="0x193B0" AddedByScript="true"/>
        <!-- Boss Title Card -->
-        <Texture Name="gBongoTitleCardTex" OutName="bongo_title_card" Format="i8" Width="128" Height="120" Offset="0x13D80"/>
+        <Texture Name="gBongoTitleCardTex" OutName="bongo_title_card" Format="i8" Width="128" Height="80" Offset="0x13D80"/>
        
        <!-- Skeletons -->
        <Skeleton Name="gBongoLeftHandSkel" Type="Flex" LimbType="Standard" Offset="0x04DE0"/>
@@ -273,7 +273,7 @@
        <DList Name="gTwinrovaBroomIceTrailDL" Offset="0x2DEB0"/>
        <DList Name="gTwinrovaBroomFireJetDL" Offset="0x2DFB0"/>
        <DList Name="gTwinrovaBroomFireTrailDL" Offset="0x2E098"/>
-        <Texture Name="gTwinrovaTitleCardTex" OutName="title_card" Format="i8" Width="128" Height="120" Offset="0x2E170"/>
+        <Texture Name="gTwinrovaTitleCardTex" OutName="title_card" Format="i8" Width="128" Height="80" Offset="0x2E170"/>
        <Limb Name="gTwinrovaPelvisLimb" LimbType="Standard" Offset="0x30970"/>
        <Limb Name="gTwinrovaSash1Limb" LimbType="Standard" Offset="0x3097C"/>
        <Limb Name="gTwinrovaSash2Limb" LimbType="Standard" Offset="0x30988"/>
@@ -239,7 +239,7 @@
        <Texture Name="gGoldSkulltulaItemNameENGTex" OutName="gold_skulltula_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3B000"/>
        <Texture Name="gPieceOfHeartItemNameENGTex" OutName="piece_of_heart_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3B400"/>
        <Texture Name="gUnusedPieceOfHeartItemName2JPNTex" OutName="piece_of_heart_item_name_unused_jpn_2" Format="ia4" Width="128" Height="16" Offset="0x3B800"/>
-        <Texture Name="gBigKeyItemNameENGTex" OutName="big_key_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3BC00"/>
+        <Texture Name="gUnusedBigKeyItemNameENGTex" OutName="big_key_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3BC00"/>
        <Texture Name="gCompassItemNameENGTex" OutName="compass_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3C000"/>
        <Texture Name="gDungeonMapItemNameENGTex" OutName="dungeon_map_item_name_eng" Format="ia4" Width="128" Height="16" Offset="0x3C400"/>
        <Texture Name="gUnusedBossKeyItemName12JPNTex" OutName="boss_key_item_name_unused_jpn_12" Format="ia4" Width="128" Height="16" Offset="0x3C800"/>
@@ -544,6 +544,8 @@ typedef enum {
    LANGUAGE_MAX
 } Language;

+#define TODO_TRANSLATE "__Translate_This__" 
+
 // TODO get these properties from the textures themselves
 #define FONT_CHAR_TEX_WIDTH  16
 #define FONT_CHAR_TEX_HEIGHT 16
@@ -46,7 +46,7 @@ const std::vector<PresetEntry> vanillaPlusPresetEntries = {
    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixZoraHintDialogue"), 1), PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixVineFall"), 1),
    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("EnemySpawnsOverWaterboxes"), 1),
    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixSawSoftlock"), 1), PRESET_ENTRY_S32(CVAR_ENHANCEMENT("DekuNutUpgradeFix"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixGrokenGiantsKnife"), 1), PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixMenuLR"), 1),
+    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixBrokenGiantsKnife"), 1), PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixMenuLR"), 1),
    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixDungeonMinimapIcon"), 1),
    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("TwoHandedIdle"), 1), PRESET_ENTRY_S32(CVAR_ENHANCEMENT("NaviTextFix"), 1),
    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("GerudoWarriorClothingFix"), 1),
@@ -125,7 +125,7 @@ const std::vector<PresetEntry> enhancedPresetEntries = {
    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixZoraHintDialogue"), 1), PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixVineFall"), 1),
    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("EnemySpawnsOverWaterboxes"), 1),
    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixSawSoftlock"), 1), PRESET_ENTRY_S32(CVAR_ENHANCEMENT("DekuNutUpgradeFix"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixGrokenGiantsKnife"), 1), PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixMenuLR"), 1),
+    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixBrokenGiantsKnife"), 1), PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixMenuLR"), 1),
    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixDungeonMinimapIcon"), 1),
    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("TwoHandedIdle"), 1), PRESET_ENTRY_S32(CVAR_ENHANCEMENT("NaviTextFix"), 1),
    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("GerudoWarriorClothingFix"), 1),
@@ -251,7 +251,7 @@ const std::vector<PresetEntry> randomizerPresetEntries = {
    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("EnemySpawnsOverWaterboxes"), 1),
    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixSawSoftlock"), 1),
    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("DekuNutUpgradeFix"), 1),
-    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixGrokenGiantsKnife"), 1),
+    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixBrokenGiantsKnife"), 1),
    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixMenuLR"), 1),
    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("FixDungeonMinimapIcon"), 1),
    PRESET_ENTRY_S32(CVAR_ENHANCEMENT("TwoHandedIdle"), 1),
@@ -151,7 +151,7 @@ void InputViewer::DrawElement() {
        }

        ImVec2 mainPos = ImGui::GetWindowPos();
-        ImVec2 size = ImGui::GetContentRegionAvail();
+        ImVec2 size = ImGui::GetMainViewport()->WorkSize;

 #ifdef __WIIU__
        const float scale = CVarGetFloat(CVAR_INPUT_VIEWER("Scale"), 1.0f) * 2.0f;
@@ -584,7 +584,7 @@ void InputViewerSettingsWindow::DrawElement() {
        }
        // gInputViewer.Dpad
        CVarCheckbox("Show D-Pad Layers", CVAR_INPUT_VIEWER("Dpad"),
-                     CheckboxOptions().Color(THEME_COLOR).DefaultValue(true));
+                     CheckboxOptions().Color(THEME_COLOR).DefaultValue(false));
        if (useIndividualOutlines && CVarGetInteger(CVAR_INPUT_VIEWER("Dpad"), 0)) {
            ImGui::Indent();
            CVarCombobox("##DpadOutline", CVAR_INPUT_VIEWER("DpadOutlineMode"), buttonOutlineOptionsVerbose,
@@ -593,7 +593,7 @@ void InputViewerSettingsWindow::DrawElement() {
        }
        // gInputViewer.Mod1
        CVarCheckbox("Show Modifier Button 1 Layers", CVAR_INPUT_VIEWER("Mod1"),
-                     CheckboxOptions().Color(THEME_COLOR).DefaultValue(true));
+                     CheckboxOptions().Color(THEME_COLOR).DefaultValue(false));
        if (useIndividualOutlines && CVarGetInteger(CVAR_INPUT_VIEWER("Mod1"), 0)) {
            ImGui::Indent();
            CVarCombobox("##Mmod1Outline", CVAR_INPUT_VIEWER("Mod1OutlineMode"), buttonOutlineOptionsVerbose,
@@ -602,7 +602,7 @@ void InputViewerSettingsWindow::DrawElement() {
        }
        // gInputViewer.Mod2
        CVarCheckbox("Show Modifier Button 2 Layers", CVAR_INPUT_VIEWER("Mod2"),
-                     CheckboxOptions().Color(THEME_COLOR).DefaultValue(true));
+                     CheckboxOptions().Color(THEME_COLOR).DefaultValue(false));
        if (useIndividualOutlines && CVarGetInteger(CVAR_INPUT_VIEWER("Mod2"), 0)) {
            ImGui::Indent();
            CVarCombobox("##Mod2Outline", CVAR_INPUT_VIEWER("Mod2OutlineMode"), buttonOutlineOptionsVerbose,
@@ -652,7 +652,7 @@ void InputViewerSettingsWindow::DrawElement() {
            "Right Stick Visibility", CVAR_INPUT_VIEWER("RightStick.VisibilityMode"), stickModeOptions,
            ComboboxOptions()
                .Color(THEME_COLOR)
-                .DefaultIndex(STICK_MODE_ALWAYS_SHOWN)
+                .DefaultIndex(STICK_MODE_ALWAYS_HIDDEN)
                .Tooltip(
                    "Determines the conditions under which the moving layer of the right stick texture is visible."));

@@ -661,7 +661,7 @@ void InputViewerSettingsWindow::DrawElement() {
            "Right Stick Outline/Background Visibility", CVAR_INPUT_VIEWER("RightStick.OutlineMode"), stickModeOptions,
            ComboboxOptions()
                .Color(THEME_COLOR)
-                .DefaultIndex(STICK_MODE_ALWAYS_SHOWN)
+                .DefaultIndex(STICK_MODE_ALWAYS_HIDDEN)
                .Tooltip(
                    "Determines the conditions under which the right stick outline/background texture is visible."));

@@ -2376,10 +2376,12 @@ void CosmeticsEditorWindow::DrawElement() {
                                   .Step(0.01f)
                                   .Size(ImVec2(300.0f, 0.0f))
                                   .Color(THEME_COLOR));
+    ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
    UIWidgets::CVarCheckbox("Randomize All on New Scene", CVAR_COSMETIC("RandomizeAllOnNewScene"),
                            UIWidgets::CheckboxOptions()
                                .Color(THEME_COLOR)
                                .Tooltip("Enables randomizing all unlocked cosmetics when you enter a new scene."));
+    ImGui::EndDisabled();
    UIWidgets::CVarCheckbox(
        "Advanced Mode", CVAR_COSMETIC("AdvancedMode"),
        UIWidgets::CheckboxOptions()
@@ -2408,13 +2410,15 @@ void CosmeticsEditorWindow::DrawElement() {
            }
        }
    }
+    ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
    if (UIWidgets::Button("Randomize All", UIWidgets::ButtonOptions().Size(ImVec2(250.0f, 0.0f)).Color(THEME_COLOR))) {
        CosmeticsEditor_RandomizeAll();
    }
+    ImGui::EndDisabled();
+
    ImGui::SameLine();
    if (UIWidgets::Button("Reset All", UIWidgets::ButtonOptions().Size(ImVec2(250.0f, 0.0f)).Color(THEME_COLOR))) {
-        CVarClearBlock("gCosmetics");
-        ApplyOrResetCustomGfxPatches();
+        CosmeticsEditor_ResetAll();
    }
    if (UIWidgets::Button("Lock All", UIWidgets::ButtonOptions().Size(ImVec2(250.0f, 0.0f)).Color(THEME_COLOR))) {
        for (auto& [id, cosmeticOption] : cosmeticOptions) {
@@ -2432,6 +2436,7 @@ void CosmeticsEditorWindow::DrawElement() {
        }
    }

+    ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
    if (UIWidgets::Button("Rainbow All", UIWidgets::ButtonOptions().Size(ImVec2(250.0f, 0.0f)).Color(THEME_COLOR))) {
        for (auto& [id, cosmeticOption] : cosmeticOptions) {
            if (!CVarGetInteger(cosmeticOption.lockedCvar, 0) &&
@@ -2441,6 +2446,8 @@ void CosmeticsEditorWindow::DrawElement() {
            }
        }
    }
+    ImGui::EndDisabled();
+
    ImGui::SameLine();
    if (UIWidgets::Button("Un-Rainbow All", UIWidgets::ButtonOptions().Size(ImVec2(250.0f, 0.0f)).Color(THEME_COLOR))) {
        for (auto& [id, cosmeticOption] : cosmeticOptions) {
@@ -2470,6 +2477,7 @@ void CosmeticsEditorWindow::DrawElement() {

        if (ImGui::BeginTabItem("Keys")) {

+            ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
            UIWidgets::Separator(true, true, 2.0f, 2.0f);

            if (UIWidgets::Button("Give all keys dungeon-specific colors",
@@ -2483,6 +2491,7 @@ void CosmeticsEditorWindow::DrawElement() {
            DrawCosmeticGroup(COSMETICS_GROUP_SMALL_KEYS);
            DrawCosmeticGroup(COSMETICS_GROUP_BOSS_KEYS);

+            ImGui::EndDisabled();
            ImGui::EndTabItem();
        }

@@ -281,11 +281,24 @@ void PatchIronKnuckleTextureOverflow() {
    }
 }

+void PatchBoulderFragment() {
+    // The boulder fragment renders invisible due to the change made by https://github.com/Kenix3/libultraship/pull/721
+    // Until it is known wether this change is approriate or something else should be done to it, the following patches
+    // adjust the render mode for the DL to not become invisible
+    ResourceMgr_PatchGfxByName(gBoulderFragmentsDL, "boulderFragmentRenderFix3", 3,
+                               gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_OPA_SURF2));
+    ResourceMgr_PatchGfxByName(gBoulderFragmentsDL, "boulderFragmentRenderFix6", 6,
+                               gsDPSetCombineMode(G_CC_MODULATEIDECALA, G_CC_MODULATEIA_PRIM2));
+}
+
 void ApplyAuthenticGfxPatches() {
+    // Overflow textures
    PatchArrowTipTexture();
    PatchDekuStickTextureOverflow();
    PatchFreezardTextureOverflow();
    PatchIronKnuckleTextureOverflow();
+
+    PatchBoulderFragment();
 }

 // Patches the Sold Out GI DL to render the texture in the mirror boundary
@@ -155,11 +155,12 @@ const std::string CustomMessage::GetFrench(MessageFormat format) const {
 }

 const std::string CustomMessage::GetForCurrentLanguage(MessageFormat format) const {
-    return GetForLanguage((gSaveContext.language == LANGUAGE_JPN) ? LANGUAGE_ENG : gSaveContext.language, format);
+    return GetForLanguage(((Language)gSaveContext.language == LANGUAGE_JPN) ? LANGUAGE_ENG : gSaveContext.language,
+                          format);
 }

 const std::string CustomMessage::GetForLanguage(uint8_t language, MessageFormat format) const {
-    std::string output = messages[language].length() > 0 ? messages[language] : messages[LANGUAGE_ENG];
+    std::string output = messages[language] != TODO_TRANSLATE ? messages[language] : messages[LANGUAGE_ENG];
    ProcessMessageFormat(output, format);
    return output;
 }
@@ -273,8 +274,12 @@ void CustomMessage::Replace(std::string&& oldStr, std::string&& newStr) {
 void CustomMessage::Replace(std::string&& oldStr, CustomMessage newMessage) {
    for (uint8_t language = 0; language < LANGUAGE_MAX - 1; language++) {
        size_t position = messages[language].find(oldStr);
+        std::string newMsg = newMessage.messages[language];
+        if (language != LANGUAGE_ENG && newMsg == TODO_TRANSLATE) {
+            newMsg = newMessage.messages[LANGUAGE_ENG];
+        }
        while (position != std::string::npos) {
-            messages[language].replace(position, oldStr.length(), newMessage.messages[language]);
+            messages[language].replace(position, oldStr.length(), newMsg);
            position = messages[language].find(oldStr);
        }
    }
@@ -6,6 +6,7 @@
 #include <string>

 #include "../../../include/z64item.h"
+#include "../../../include/z64.h"
 #include "../../../include/message_data_textbox_types.h"
 #include "../randomizer/3drando/text.hpp"

@@ -203,7 +204,7 @@ class CustomMessage {
    void CleanString(std::string& str) const;

  private:
-    std::vector<std::string> messages = { "", "", "" };
+    std::vector<std::string> messages = { "", TODO_TRANSLATE, TODO_TRANSLATE };
    TextBoxType type = TEXTBOX_TYPE_BLACK;
    TextBoxPosition position = TEXTBOX_POS_BOTTOM;
    std::vector<std::string> colors = {};
@@ -2,6 +2,7 @@

 #include "soh/SohGui/UIWidgets.hpp"
 #include "soh/SohGui/SohGui.hpp"
+#include "soh/SohGui/SohMenu.h"
 #include "soh/OTRGlobals.h"

 #include <textures/message_static/message_static.h>
@@ -26,6 +27,7 @@ void MessageViewer::InitElement() {
 }

 void MessageViewer::DrawElement() {
+    ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
    ImGui::Text("Table ID");
    ImGui::SameLine();
    PushStyleInput(THEME_COLOR);
@@ -56,22 +58,12 @@ void MessageViewer::DrawElement() {
        memset(mTextIdBuf, 0, sizeof(char) * MAX_STRING_SIZE);
    }
    PopStyleCheckbox();
-    ImGui::Text("Language");
-    ImGui::SameLine();
-    PushStyleCombobox(THEME_COLOR);
-    if (ImGui::BeginCombo("##Language", mLanguages[mLanguage])) {
-        // ReSharper disable CppDFAUnreachableCode
-        for (size_t i = 0; i < mLanguages.size(); i++) {
-            if (strlen(mLanguages[i]) > 0) {
-                if (ImGui::Selectable(mLanguages[i], i == mLanguage)) {
-                    mLanguage = i;
-                }
-            }
-        }
-        ImGui::EndCombo();
-    }
-    PopStyleCombobox();
-    UIWidgets::InsertHelpHoverText("Which language to load from the selected text ID");
+    SohGui::SohMenu::UpdateLanguageMap(SohGui::languages);
+    UIWidgets::Combobox("Language", &mLanguage, SohGui::languages,
+                        UIWidgets::ComboboxOptions()
+                            .Color(THEME_COLOR)
+                            .DefaultIndex(0)
+                            .Tooltip("Which language to load from the selected text ID"));
    PushStyleButton(THEME_COLOR);
    if (ImGui::Button("Display Message##ExistingMessage")) {
        mDisplayExistingMessageClicked = true;
@@ -87,6 +79,7 @@ void MessageViewer::DrawElement() {
        mDisplayCustomMessageClicked = true;
    }
    PopStyleButton();
+    ImGui::EndDisabled();
 }

 void MessageViewer::UpdateElement() {
@@ -196,6 +189,11 @@ void MessageDebug_StartTextBox(const char* tableId, uint16_t textId, uint8_t lan
    R_TEXT_CHAR_SCALE = 75;
    R_TEXT_LINE_SPACING = 12;
    R_TEXT_INIT_XPOS = 65;
+    if (language == LANGUAGE_JPN) {
+        R_TEXT_CHAR_SCALE = 88;
+        R_TEXT_LINE_SPACING = 18;
+        R_TEXT_INIT_XPOS = 65;
+    }
    char* buffer = font->msgBuf;
    msgCtx->textId = textId;
    if (strlen(tableId) == 0) {
@@ -207,10 +205,8 @@ void MessageDebug_StartTextBox(const char* tableId, uint16_t textId, uint8_t lan
        constexpr int maxBufferSize = sizeof(font->msgBuf);
        const CustomMessage messageEntry = CustomMessageManager::Instance->RetrieveMessage(tableId, textId);
        font->charTexBuf[0] = (messageEntry.GetTextBoxType() << 4) | messageEntry.GetTextBoxPosition();
-        switch (language) {
-            font->msgLength =
-                SohUtils::CopyStringToCharBuffer(buffer, messageEntry.GetForLanguage(language), maxBufferSize);
-        }
+        font->msgLength =
+            SohUtils::CopyStringToCharBuffer(buffer, messageEntry.GetForLanguage(language), maxBufferSize);
        msgCtx->msgLength = static_cast<int32_t>(font->msgLength);
    }
    msgCtx->textBoxProperties = font->charTexBuf[0];
@@ -4,7 +4,7 @@

 #ifdef __cplusplus
 #include "GuiWindow.h"
-#include <array>
+#include <unordered_map>
 extern "C" {
 #endif
 /**
@@ -41,7 +41,6 @@ class MessageViewer : public Ship::GuiWindow {
    void DisplayCustomMessage() const;

    static constexpr uint16_t MAX_STRING_SIZE = 1024;
-    static constexpr std::array<const char*, LANGUAGE_MAX> mLanguages = { "English", "German", "French" };
    static constexpr int HEXADECIMAL = 0;
    static constexpr int DECIMAL = 1;
    char* mTableIdBuf;
@@ -49,7 +48,7 @@ class MessageViewer : public Ship::GuiWindow {
    char* mTextIdBuf;
    uint16_t mTextId;
    int mTextIdBase = HEXADECIMAL;
-    size_t mLanguage = LANGUAGE_ENG;
+    int32_t mLanguage = LANGUAGE_ENG;
    char* mCustomMessageBuf;
    std::string mCustomMessageString;
    bool mDisplayExistingMessageClicked = false;
@@ -12,6 +12,7 @@ void SohConsoleWindow::UpdateElement() {
 }

 void SohConsoleWindow::DrawElement() {
+    ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
    UIWidgets::PushStyleInput(THEME_COLOR);
    // Small font (13) to match hardcoded width values in the LUS window.. set large font after below TODO addressed
    ImGui::PushFont(OTRGlobals::Instance->fontMonoSmall);
@@ -27,4 +28,5 @@ void SohConsoleWindow::DrawElement() {

    ImGui::PopFont();
    UIWidgets::PopStyleInput();
+    ImGui::EndDisabled();
 }
@@ -10,7 +10,9 @@ void SohGfxDebuggerWindow::UpdateElement() {
 }

 void SohGfxDebuggerWindow::DrawElement() {
+    ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
    ImGui::PushFont(OTRGlobals::Instance->fontMonoLarger);
    GfxDebuggerWindow::DrawElement();
    ImGui::PopFont();
+    ImGui::EndDisabled();
 }
@@ -849,6 +849,7 @@ void ActorViewer_AddTagForAllActors() {
 }

 void ActorViewerWindow::DrawElement() {
+    ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
    static Actor* display;
    static Actor empty{};
    static Actor* fetch = NULL;
@@ -1186,6 +1187,7 @@ void ActorViewerWindow::DrawElement() {
            actors.clear();
        }
    }
+    ImGui::EndDisabled();
 }

 void ActorViewerWindow::InitElement() {
@@ -58,6 +58,7 @@ using namespace UIWidgets;

 // Draws the ImGui window for the collision viewer
 void ColViewerWindow::DrawElement() {
+    ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
    CheckboxOptions checkOpt = CheckboxOptions().Color(THEME_COLOR);
    ComboboxOptions comboOpt = ComboboxOptions().Color(THEME_COLOR);
    CVarCheckbox("Enabled", CVAR_DEVELOPER_TOOLS("ColViewer.Enabled"), checkOpt);
@@ -139,6 +140,7 @@ void ColViewerWindow::DrawElement() {
        UIWidgets::Tooltip(colorHelpText.c_str());
    }
    PopStyleHeader();
+    ImGui::EndDisabled();
 }

 // Calculates the normal for a triangle at the 3 specified points
@@ -849,9 +849,19 @@ void DrawFlagsTab() {

    DrawGroupWithBorder(
        [&]() {
-            size_t selectedGsMap = 0;
+            PushStyleCombobox(THEME_COLOR);
+            static size_t selectedGsMap = 0;
            ImGui::Text("Gold Skulltulas");
-            Combobox("Map##Gold Skulltulas", &selectedGsMap, gsMapping, comboboxOptionsBase.Tooltip(""));
+            if (ImGui::BeginCombo("##GSMap", gsMapping[selectedGsMap])) {
+                for (size_t index = 0; index < gsMapping.size(); index++) {
+                    if (ImGui::Selectable(gsMapping[index])) {
+                        selectedGsMap = index;
+                    }
+                }
+
+                ImGui::EndCombo();
+            }
+            PopStyleCombobox();

            // TODO We should write out descriptions for each one... ugh
            ImGui::AlignTextToFramePadding();
@@ -1655,6 +1665,7 @@ void ResetBaseOptions() {
 void SaveEditorWindow::DrawElement() {
    PushStyleTabs(THEME_COLOR);
    ImGui::PushFont(OTRGlobals::Instance->fontMonoLarger);
+    ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));

    if (ImGui::BeginTabBar("SaveContextTabBar", ImGuiTabBarFlags_NoCloseWithMiddleMouseButton)) {
        ResetBaseOptions();
@@ -1696,6 +1707,7 @@ void SaveEditorWindow::DrawElement() {
        ImGui::EndTabBar();
    }

+    ImGui::EndDisabled();
    ImGui::PopFont();
    PopStyleTabs();
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Christopher Leggett	1b6dc13491	Blair Charlie version bump (#5407 )	2025-04-15 14:27:55 -04:00
Malkierian	02ef33393a	Implements a rand inf for Ruto's letter to apply to logic to track it separate from the underwater item check. (#5405 )	2025-04-15 13:13:30 -04:00
Archez	5ae8ce4eac	Fix Entrance Rando weather override behavior (#5403 ) * Add AfterSceneCommands hook * move ER weather override to AfterSceneCommands	2025-04-14 19:11:36 -04:00
Malkierian	5e399fe7a2	Race Lockout (#5364 ) * Implement race lockout on the new menu, with option for opt-out. * Cal's requests.	2025-04-13 19:29:29 -04:00
Jordan Longstaff	46b40b0220	Fix misspelling of Broken Giant's Knife fix CVar (#5395 )	2025-04-12 12:12:48 -04:00
Malkierian	1416b2490a	Change the Reset All callback back to `CosmeticsEditor_ResetAll`, because it's already set up to not reset HUD position stuff. (#5385 )	2025-04-12 09:14:13 -04:00
Pepper0ni	f304de2eb1	fix oversight in forest trial first room (#5381 )	2025-04-11 22:56:47 -04:00
Malkierian	fc0cbbe9e7	Improve tracker dock bgs (#5383 ) * Modify the flow for applying opacity to docked tracker windows only when they are docked to the "Main - Deck" dockspace. * Add opacity clamping for check tracker.	2025-04-11 22:54:52 -04:00
Malkierian	f0f2157a4c	Move processing for RAND_INF_WEIRD_EGG to trade item processing so it happens whenever you get the egg. (#5382 ) Remove RSK check for garden entrance because access is still handled by `CanUse(RG_WEIRD_EGG)`.	2025-04-11 15:49:34 -04:00
Proloe	698fca8862	Fixed right stick aiming being significantly less precise than left stick aiming. (#5388 )	2025-04-11 15:44:40 -04:00
Archez	86e1e8e3aa	Fix boss key kaleido text for NTSC (#5389 )	2025-04-11 13:42:08 -04:00
Christopher Leggett	05e96f310d	Fix Fishing-related checks location pool (again) (#5378 )	2025-04-11 10:15:31 -04:00
Eric Hoey	a93917bb4a	Fix Adult Fishing as Child Softlock (#5377 ) * pass a pointer not a pointer to a pointer * update GIVanillaBehavior comment * also drop this	2025-04-10 17:14:25 -04:00
Malkierian	9783f918d2	Add `ImGuiWindowFlags_NoSavedSettings` to notification windows to prevent cluttering the imgui.ini (#5380 )	2025-04-10 09:50:35 -04:00
Malkierian	1791a0c52c	Fix input viewer's first-open position calculation. (#5376 )	2025-04-10 09:49:21 -04:00
Christopher Leggett	85bc67ef24	Blair Bravo version bump (#5372 )	2025-04-09 19:04:28 -04:00
Malkierian	a99e8836fb	Allow seeded enemy rando to use the values of the enemy list selection. (#5371 )	2025-04-09 18:18:44 -04:00
Malkierian	c12349a7a3	Add check for bean inventory slot having bean on it to allow availability to succeed with ammo count 0. (#5370 )	2025-04-09 16:58:06 -04:00
Pepper0ni	73400f5856	IC ledge to fountain child logic fixed (#5368 ) * IC ledge to fountain child logic fixed * fully unblob ZF	2025-04-09 16:46:43 -04:00
Malkierian	e98a6c3748	Fix migrators for tracker colors to match new menu formats. (#5369 ) Add temporary additional clearing to CVarColorPicker's reset functionality to resolve already migrated issues.	2025-04-09 16:38:27 -04:00
Malkierian	c3322c85ae	Swap call to `RecalculateAvailableChecks()` in `SaveFile()` to a variable that triggers a recalculation in `DrawElement()`. (#5366 )	2025-04-09 15:26:20 -04:00
Extloga	c21c632c09	Additions for the currencies in randomizer.cpp (#5344 ) * Rearrangement of the currencies in randomizer.cpp * Rearrangement of the currencies in randomizer.cpp * Rearrangement of the currencies in randomizer.cpp * Rearrangement of the currencies in randomizer.cpp * Rearrangement of the currencies in randomizer.cpp * Rearrangement of the currencies in randomizer.cpp * Rearrangement of the currencies in randomizer.cpp * Rearrangement of the currencies in randomizer.cpp * Rearrangement of the currencies in randomizer.cpp * Rearrangement of the currencies in randomizer.cpp * Rearrangement of the currencies in randomizer.cpp * Rearrangement of the currencies in randomizer.cpp	2025-04-09 15:24:05 -04:00
Pepper0ni	93d49d5c41	Fix ZD beehives and some small cleanup. (#5353 ) * clean up zora domain logic * revert useless short circuits	2025-04-09 15:17:25 -04:00
Christopher Leggett	cf75520394	Fix crash in Message Viewer when playing with an NTSC OTR. (#5367 )	2025-04-09 15:16:25 -04:00
Eric Hoey	9250af0216	add check for agony option (#5365 )	2025-04-09 13:01:26 -04:00
Christopher Leggett	2576f75b1a	Fix non-loach fish making it into the pool when Loach Only is selected. (#5360 )	2025-04-09 12:20:37 -04:00
PurpleHato	30520a7565	Rando: Last missing french + tiny tweak (#5359 ) * Update hint_list_exclude_overworld.cpp * missing ones * Oops forgot a '	2025-04-09 11:35:39 -04:00
Pepper0ni	f2161297a8	Fix break room access and crates underneath crates logic (#5347 ) * fix break room acces and crates underneath crates logic * apply GF_JUMP to the jump from NEAR_GS to LONG_ROOF to reach BREAK_ROOM	2025-04-09 11:21:22 -04:00
Extloga	c1885991fa	Additions for the German translation in two files (#5351 ) * Additions for the German translation in hint_list_exclude_dungeon.cpp * Additions for the German translation in hint_list_exclude_overworld.cpp * Additions for the German translation in hint_list_exclude_overworld.cpp	2025-04-08 16:31:52 -04:00
Malkierian	f5e0179e2b	Fix a couple typos in enhancement descriptions. (#5358 )	2025-04-08 11:44:24 -07:00
Malkierian	f0f6259d2f	Fix Docked Tracker Ghosting (#5354 ) * Dynamically changes a tracker's chosen color's opacity to full when it registers as docked to fix the framebuffer ghosting. * remove debugging	2025-04-08 10:22:25 -07:00
Archez	1b17fea3d0	Add temporary patch for invisible boulder fragments (#5352 )	2025-04-08 12:53:39 -04:00
Archez	88669742a2	Fix copyright tex for GC JP (#5324 ) * Fix copyright tex for GC JP * add 2004 texture for jp ce	2025-04-08 08:38:28 -07:00
Eric Hoey	4a3d60d061	Fix Rando Give for Adult Fishing as Child Glitch (#5349 ) * VBVBVB * Update soh/soh/Enhancements/randomizer/hook_handlers.cpp * Update soh/soh/Enhancements/randomizer/hook_handlers.cpp * first try	2025-04-08 11:27:08 -04:00
Pepper0ni	d40fa00b9e	Mixed pools now properly disables itself when hidden. (#5341 ) * mixed pools now sets itself off when hidden * the clanging never ends	2025-04-08 08:26:18 -07:00
Pepper0ni	88154d78c8	Fix Market Grass and Crate logic (#5340 ) * fix market grass and crate logic * apply clang	2025-04-08 08:26:04 -07:00
Malkierian	ae7654cb0e	Change check total array types to s16 to handle more check totals (thanks storage temple). (#5348 ) Fix typos regarding `overridden` in various parts of the codebase.	2025-04-08 10:13:08 -04:00
Malkierian	71bd48cba9	Move the white iron knuckle entry in `randomizedEnemySpawnTable` to match the order of `enemyCvarList`. (#5350 )	2025-04-08 07:45:35 -04:00
Christopher Leggett	b71a0c5803	Fix checking gSaveContext for used small keys (#5346 )	2025-04-07 19:07:07 -04:00
PurpleHato	4acbf799cc	French Rando : Add missing text + some tweaks (#5327 ) * Should cover everything, I hope * One last * final tweaks for real this time * Update soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp Co-authored-by: Extloga <141232749+Extloga@users.noreply.github.com> * Update soh/soh/Enhancements/randomizer/3drando/shops.cpp Co-authored-by: Extloga <141232749+Extloga@users.noreply.github.com> * Update soh/soh/Enhancements/randomizer/3drando/shops.cpp Co-authored-by: Extloga <141232749+Extloga@users.noreply.github.com> * TODO_TRANSLATE is a macro no a string Hato --------- Co-authored-by: Extloga <141232749+Extloga@users.noreply.github.com>	2025-04-07 18:34:56 -04:00
briaguya	98146c29f9	fix blank names in spoiler (#5329 ) * fix blank names in spoiler * replace a couple more `.english`/`.french` with `.GetEnglish()`/`.GetFrench()`	2025-04-07 17:24:24 -04:00
Pepper0ni	c351a2cf75	Fix shop translations and unify untranslated message alerts. (#5312 ) * try to fix messages, crashing on vanilla text * oops * adjust shop flavor translations to better fit on 2 lines * run clang format	2025-04-07 17:22:23 -04:00
Eric Hoey	497f90a392	Set Savewarp in Ganondorf to Ganon's Tower in Entrance Rando (#5339 )	2025-04-07 13:27:47 -04:00
Eric Hoey	a247c06be8	Various menu fixes (#5321 ) * input viewer + rang + draw + circledisp * clang	2025-04-04 18:49:03 -04:00
Christopher Leggett	ee23d02921	move AltAssets to gSettings from gEnhancements (#5323 )	2025-04-04 15:25:30 -04:00
Archez	2589448057	Fix boss title card extraction for NTSC; Fix Morpha water (#5320 )	2025-04-04 11:57:37 -04:00
Malkierian	cb7d9279e4	Fix the GS Map combobox in the Flags tab of the save editor not remembering the selected index, and also rework it to remove the label. (#5317 )	2025-04-04 11:00:05 -04:00
Christopher Leggett	38574bbb9e	Fix excluded locations on subsequent seed generations (#5302 )	2025-04-04 10:15:04 -04:00
Christopher Leggett	e2bb2edb8a	Fix the start with Master Sword option (#5304 )	2025-04-04 10:14:23 -04:00
PBillodeau	9a78b04e68	ESC now toggles menubar (#5293 ) * ESC now toggles menubar * Update "menubar" to "menu" in README * Add mouse capture toggle to README	2025-04-03 17:33:02 -07:00
Pepper0ni	4f783d5945	fix oversight causing big poes check not to run (#5303 )	2025-04-03 16:47:56 -04:00
inspectredc	fd96bf6b14	Fix Disable Bomb Billboarding (#5290 )	2025-04-03 00:06:16 -04:00