From 304de9b0a42036eac8793c4db05fc7379c909a09 Mon Sep 17 00:00:00 2001
From: Waterdish <waterdish101@gmail.com>
Date: Sat, 13 Jan 2024 00:06:10 -0800
Subject: [PATCH] Android back button can open Enhancements Menu. Also some
 extractor file updates

---
 app/build.gradle                                          | 2 +-
 app/jni/src/libultraship                                  | 2 +-
 app/release/output-metadata.json                          | 4 ++--
 app/src/main/AndroidManifest.xml                          | 2 +-
 .../assets/extractor/xmls/GC_MQ_D/objects/object_mo.xml   | 2 +-
 .../extractor/xmls/GC_MQ_D/overlays/ovl_Boss_Dodongo.xml  | 2 +-
 .../extractor/xmls/GC_MQ_PAL_F/objects/object_mo.xml      | 8 ++++----
 .../xmls/GC_MQ_PAL_F/overlays/ovl_Boss_Dodongo.xml        | 4 ++--
 .../xmls/GC_MQ_PAL_F/text/message_data_static.xml         | 8 ++++----
 .../assets/extractor/xmls/GC_NMQ_D/objects/object_mo.xml  | 8 ++++----
 .../extractor/xmls/GC_NMQ_D/overlays/ovl_Boss_Dodongo.xml | 2 +-
 .../extractor/xmls/GC_NMQ_PAL_F/objects/object_mo.xml     | 8 ++++----
 .../xmls/GC_NMQ_PAL_F/overlays/ovl_Boss_Dodongo.xml       | 6 +++---
 .../extractor/xmls/N64_PAL_10/objects/object_mo.xml       | 8 ++++----
 .../xmls/N64_PAL_10/overlays/ovl_Boss_Dodongo.xml         | 2 +-
 .../extractor/xmls/N64_PAL_11/objects/object_mo.xml       | 8 ++++----
 .../xmls/N64_PAL_11/overlays/ovl_Boss_Dodongo.xml         | 2 +-
 17 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index afb144f1..d55578a0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,7 +17,7 @@ android {
         minSdkVersion 18
         targetSdkVersion 31
         versionCode 4
-        versionName "1.1.2"
+        versionName "1.1.3"
         externalNativeBuild {
             //ndkBuild {
             //    arguments "APP_PLATFORM=android-23"
diff --git a/app/jni/src/libultraship b/app/jni/src/libultraship
index bbadf503..11738709 160000
--- a/app/jni/src/libultraship
+++ b/app/jni/src/libultraship
@@ -1 +1 @@
-Subproject commit bbadf5030146d13a16372943aa54f314adb3e3ff
+Subproject commit 11738709d18a72360c198a6b567bf3f262a1d848
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index 79aa92cf..ac424ce6 100644
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 3,
-      "versionName": "1.1.1",
+      "versionCode": 4,
+      "versionName": "1.1.3",
       "outputFile": "app-release.apk"
     }
   ],
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 36e9bc3a..f995cc1d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -5,7 +5,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.dishii.soh"
     android:versionCode="4"
-    android:versionName="1.1.2"
+    android:versionName="1.1.3"
     android:installLocation="auto">
 
     <!-- OpenGL ES 3.0 -->
diff --git a/app/src/main/assets/assets/extractor/xmls/GC_MQ_D/objects/object_mo.xml b/app/src/main/assets/assets/extractor/xmls/GC_MQ_D/objects/object_mo.xml
index f25286df..f31a345d 100644
--- a/app/src/main/assets/assets/extractor/xmls/GC_MQ_D/objects/object_mo.xml
+++ b/app/src/main/assets/assets/extractor/xmls/GC_MQ_D/objects/object_mo.xml
@@ -79,7 +79,7 @@
             <Vtx/>
         </Array>
 
-        <Array Name="gMorphaVtx_007BB8" Count="4" Offset="0x7BB8">
+        <Array Name="gMorphaVtx_006A18" Count="286" Offset="0x006A18">
             <Vtx/>
         </Array>
 
diff --git a/app/src/main/assets/assets/extractor/xmls/GC_MQ_D/overlays/ovl_Boss_Dodongo.xml b/app/src/main/assets/assets/extractor/xmls/GC_MQ_D/overlays/ovl_Boss_Dodongo.xml
index f2ee5b7b..0e2c84f5 100644
--- a/app/src/main/assets/assets/extractor/xmls/GC_MQ_D/overlays/ovl_Boss_Dodongo.xml
+++ b/app/src/main/assets/assets/extractor/xmls/GC_MQ_D/overlays/ovl_Boss_Dodongo.xml
@@ -1,6 +1,6 @@
 <Root>
     <File Name="ovl_Boss_Dodongo" BaseAddress="0x808C1190" RangeStart="0x6238" RangeEnd="0x9238">
-        <Texture Name="sLavaFloorLavaTex" OutName="lava_floor_lava" Format="rgba16" Width="64" Height="64" Offset="0x6238"/>
+        <Texture Name="sLavaFloorLavaTex" OutName="lava_floor_lava" Format="rgba16" Width="32" Height="64" Offset="0x6238"/>
         <Texture Name="sLavaFloorRockTex" OutName="lava_floor_rock" Format="rgba16" Width="32" Height="64" Offset="0x8238"/>
     </File>
 </Root>
diff --git a/app/src/main/assets/assets/extractor/xmls/GC_MQ_PAL_F/objects/object_mo.xml b/app/src/main/assets/assets/extractor/xmls/GC_MQ_PAL_F/objects/object_mo.xml
index 2a6247c9..b4528ef3 100644
--- a/app/src/main/assets/assets/extractor/xmls/GC_MQ_PAL_F/objects/object_mo.xml
+++ b/app/src/main/assets/assets/extractor/xmls/GC_MQ_PAL_F/objects/object_mo.xml
@@ -8,7 +8,7 @@
         <!-- Morpha's Title Card -->
         <Texture Name="gMorphaTitleCardTex" Format="i8" Width="128" Height="120" Offset="0x1010"/>
         <Texture Name="gMorphaWaterTex" Format="rgba16" Width="32" Height="32" Offset="0x8870"/>
-				
+
         <!-- DLists for Morpha's Core -->
         <DList Name="gMorphaCoreMembraneDL" Offset="0x6700"/>
         <DList Name="gMorphaCoreNucleusDL" Offset="0x6838"/>
@@ -69,17 +69,17 @@
         <!-- Unused content -->
 
         <!-- This is the dlist for EnVbBall for some reason. -->
-        <DList Name="gMorphaDL_000550" Offset="0x550"/> 
+        <DList Name="gMorphaDL_000550" Offset="0x550"/>
 
         <DList Name="gMorphaDL_000EC0" Offset="0xEC0"/>
         <DList Name="gMorphaDL_000EF8" Offset="0xEF8"/>
         <DList Name="gMorphaDL_007BF8" Offset="0x7BF8"/>
-        
+
         <Array Name="gMorphaVtx_006938" Count="14" Offset="0x6938">
             <Vtx/>
         </Array>
 
-        <Array Name="gMorphaVtx_007BB8" Count="4" Offset="0x7BB8">
+        <Array Name="gMorphaVtx_006A18" Count="286" Offset="0x006A18">
             <Vtx/>
         </Array>
 
diff --git a/app/src/main/assets/assets/extractor/xmls/GC_MQ_PAL_F/overlays/ovl_Boss_Dodongo.xml b/app/src/main/assets/assets/extractor/xmls/GC_MQ_PAL_F/overlays/ovl_Boss_Dodongo.xml
index 0e1303c1..8a1c4ee9 100644
--- a/app/src/main/assets/assets/extractor/xmls/GC_MQ_PAL_F/overlays/ovl_Boss_Dodongo.xml
+++ b/app/src/main/assets/assets/extractor/xmls/GC_MQ_PAL_F/overlays/ovl_Boss_Dodongo.xml
@@ -1,6 +1,6 @@
 <Root>
-    <File Name="ovl_Boss_Dodongo" BaseAddress="0x808B7370" RangeStart="0x61E8" RangeEnd="0x9238">
-        <Texture Name="sLavaFloorLavaTex" OutName="lava_floor_lava" Format="rgba16" Width="64" Height="64" Offset="0x61E8"/>
+    <File Name="ovl_Boss_Dodongo" BaseAddress="0x808B7370" RangeStart="0x61E8" RangeEnd="0x91E8">
+        <Texture Name="sLavaFloorLavaTex" OutName="lava_floor_lava" Format="rgba16" Width="32" Height="64" Offset="0x61E8"/>
         <Texture Name="sLavaFloorRockTex" OutName="lava_floor_rock" Format="rgba16" Width="32" Height="64" Offset="0x81E8"/>
     </File>
 </Root>
diff --git a/app/src/main/assets/assets/extractor/xmls/GC_MQ_PAL_F/text/message_data_static.xml b/app/src/main/assets/assets/extractor/xmls/GC_MQ_PAL_F/text/message_data_static.xml
index 400a27e2..5241e3ef 100644
--- a/app/src/main/assets/assets/extractor/xmls/GC_MQ_PAL_F/text/message_data_static.xml
+++ b/app/src/main/assets/assets/extractor/xmls/GC_MQ_PAL_F/text/message_data_static.xml
@@ -1,14 +1,14 @@
 <Root>
   <File Name="nes_message_data_static">
-    <Text Name="nes_message_data_static" CodeOffset="0xF6910"/>
+    <Text Name="nes_message_data_static" CodeOffset="0xF68F0"/>
   </File>
 	<File Name="ger_message_data_static">
-		<Text Name="ger_message_data_static" CodeOffset="0xF6910" LangOffset="0xFAB38"/>
+		<Text Name="ger_message_data_static" CodeOffset="0xF68F0" LangOffset="0xFAB18"/>
 	</File>
 	<File Name="fra_message_data_static">
-		<Text Name="fra_message_data_static" CodeOffset="0xF6910" LangOffset="0xFCC48"/>
+		<Text Name="fra_message_data_static" CodeOffset="0xF68F0" LangOffset="0xFCC28"/>
 	</File>
 	<File Name="staff_message_data_static">
-		<Text Name="staff_message_data_static" CodeOffset="0xFED58"/>
+		<Text Name="staff_message_data_static" CodeOffset="0xFED38"/>
 	</File>
 </Root>
diff --git a/app/src/main/assets/assets/extractor/xmls/GC_NMQ_D/objects/object_mo.xml b/app/src/main/assets/assets/extractor/xmls/GC_NMQ_D/objects/object_mo.xml
index 2a6247c9..b4528ef3 100644
--- a/app/src/main/assets/assets/extractor/xmls/GC_NMQ_D/objects/object_mo.xml
+++ b/app/src/main/assets/assets/extractor/xmls/GC_NMQ_D/objects/object_mo.xml
@@ -8,7 +8,7 @@
         <!-- Morpha's Title Card -->
         <Texture Name="gMorphaTitleCardTex" Format="i8" Width="128" Height="120" Offset="0x1010"/>
         <Texture Name="gMorphaWaterTex" Format="rgba16" Width="32" Height="32" Offset="0x8870"/>
-				
+
         <!-- DLists for Morpha's Core -->
         <DList Name="gMorphaCoreMembraneDL" Offset="0x6700"/>
         <DList Name="gMorphaCoreNucleusDL" Offset="0x6838"/>
@@ -69,17 +69,17 @@
         <!-- Unused content -->
 
         <!-- This is the dlist for EnVbBall for some reason. -->
-        <DList Name="gMorphaDL_000550" Offset="0x550"/> 
+        <DList Name="gMorphaDL_000550" Offset="0x550"/>
 
         <DList Name="gMorphaDL_000EC0" Offset="0xEC0"/>
         <DList Name="gMorphaDL_000EF8" Offset="0xEF8"/>
         <DList Name="gMorphaDL_007BF8" Offset="0x7BF8"/>
-        
+
         <Array Name="gMorphaVtx_006938" Count="14" Offset="0x6938">
             <Vtx/>
         </Array>
 
-        <Array Name="gMorphaVtx_007BB8" Count="4" Offset="0x7BB8">
+        <Array Name="gMorphaVtx_006A18" Count="286" Offset="0x006A18">
             <Vtx/>
         </Array>
 
diff --git a/app/src/main/assets/assets/extractor/xmls/GC_NMQ_D/overlays/ovl_Boss_Dodongo.xml b/app/src/main/assets/assets/extractor/xmls/GC_NMQ_D/overlays/ovl_Boss_Dodongo.xml
index f6a52f04..d31e4abc 100644
--- a/app/src/main/assets/assets/extractor/xmls/GC_NMQ_D/overlays/ovl_Boss_Dodongo.xml
+++ b/app/src/main/assets/assets/extractor/xmls/GC_NMQ_D/overlays/ovl_Boss_Dodongo.xml
@@ -1,6 +1,6 @@
 <Root>
     <File Name="ovl_Boss_Dodongo" BaseAddress="0x808C1210" RangeStart="0x6238" RangeEnd="0x9238">
-        <Texture Name="sLavaFloorLavaTex" OutName="lava_floor_lava" Format="rgba16" Width="64" Height="64" Offset="0x6238"/>
+        <Texture Name="sLavaFloorLavaTex" OutName="lava_floor_lava" Format="rgba16" Width="32" Height="64" Offset="0x6238"/>
         <Texture Name="sLavaFloorRockTex" OutName="lava_floor_rock" Format="rgba16" Width="32" Height="64" Offset="0x8238"/>
     </File>
 </Root>
diff --git a/app/src/main/assets/assets/extractor/xmls/GC_NMQ_PAL_F/objects/object_mo.xml b/app/src/main/assets/assets/extractor/xmls/GC_NMQ_PAL_F/objects/object_mo.xml
index 2a6247c9..b4528ef3 100644
--- a/app/src/main/assets/assets/extractor/xmls/GC_NMQ_PAL_F/objects/object_mo.xml
+++ b/app/src/main/assets/assets/extractor/xmls/GC_NMQ_PAL_F/objects/object_mo.xml
@@ -8,7 +8,7 @@
         <!-- Morpha's Title Card -->
         <Texture Name="gMorphaTitleCardTex" Format="i8" Width="128" Height="120" Offset="0x1010"/>
         <Texture Name="gMorphaWaterTex" Format="rgba16" Width="32" Height="32" Offset="0x8870"/>
-				
+
         <!-- DLists for Morpha's Core -->
         <DList Name="gMorphaCoreMembraneDL" Offset="0x6700"/>
         <DList Name="gMorphaCoreNucleusDL" Offset="0x6838"/>
@@ -69,17 +69,17 @@
         <!-- Unused content -->
 
         <!-- This is the dlist for EnVbBall for some reason. -->
-        <DList Name="gMorphaDL_000550" Offset="0x550"/> 
+        <DList Name="gMorphaDL_000550" Offset="0x550"/>
 
         <DList Name="gMorphaDL_000EC0" Offset="0xEC0"/>
         <DList Name="gMorphaDL_000EF8" Offset="0xEF8"/>
         <DList Name="gMorphaDL_007BF8" Offset="0x7BF8"/>
-        
+
         <Array Name="gMorphaVtx_006938" Count="14" Offset="0x6938">
             <Vtx/>
         </Array>
 
-        <Array Name="gMorphaVtx_007BB8" Count="4" Offset="0x7BB8">
+        <Array Name="gMorphaVtx_006A18" Count="286" Offset="0x006A18">
             <Vtx/>
         </Array>
 
diff --git a/app/src/main/assets/assets/extractor/xmls/GC_NMQ_PAL_F/overlays/ovl_Boss_Dodongo.xml b/app/src/main/assets/assets/extractor/xmls/GC_NMQ_PAL_F/overlays/ovl_Boss_Dodongo.xml
index f2ee5b7b..67d85d16 100644
--- a/app/src/main/assets/assets/extractor/xmls/GC_NMQ_PAL_F/overlays/ovl_Boss_Dodongo.xml
+++ b/app/src/main/assets/assets/extractor/xmls/GC_NMQ_PAL_F/overlays/ovl_Boss_Dodongo.xml
@@ -1,6 +1,6 @@
 <Root>
-    <File Name="ovl_Boss_Dodongo" BaseAddress="0x808C1190" RangeStart="0x6238" RangeEnd="0x9238">
-        <Texture Name="sLavaFloorLavaTex" OutName="lava_floor_lava" Format="rgba16" Width="64" Height="64" Offset="0x6238"/>
-        <Texture Name="sLavaFloorRockTex" OutName="lava_floor_rock" Format="rgba16" Width="32" Height="64" Offset="0x8238"/>
+    <File Name="ovl_Boss_Dodongo" BaseAddress="0x808C1190" RangeStart="0x61E8" RangeEnd="0x91E8">
+        <Texture Name="sLavaFloorLavaTex" OutName="lava_floor_lava" Format="rgba16" Width="32" Height="64" Offset="0x61E8"/>
+        <Texture Name="sLavaFloorRockTex" OutName="lava_floor_rock" Format="rgba16" Width="32" Height="64" Offset="0x81E8"/>
     </File>
 </Root>
diff --git a/app/src/main/assets/assets/extractor/xmls/N64_PAL_10/objects/object_mo.xml b/app/src/main/assets/assets/extractor/xmls/N64_PAL_10/objects/object_mo.xml
index 2a6247c9..b4528ef3 100644
--- a/app/src/main/assets/assets/extractor/xmls/N64_PAL_10/objects/object_mo.xml
+++ b/app/src/main/assets/assets/extractor/xmls/N64_PAL_10/objects/object_mo.xml
@@ -8,7 +8,7 @@
         <!-- Morpha's Title Card -->
         <Texture Name="gMorphaTitleCardTex" Format="i8" Width="128" Height="120" Offset="0x1010"/>
         <Texture Name="gMorphaWaterTex" Format="rgba16" Width="32" Height="32" Offset="0x8870"/>
-				
+
         <!-- DLists for Morpha's Core -->
         <DList Name="gMorphaCoreMembraneDL" Offset="0x6700"/>
         <DList Name="gMorphaCoreNucleusDL" Offset="0x6838"/>
@@ -69,17 +69,17 @@
         <!-- Unused content -->
 
         <!-- This is the dlist for EnVbBall for some reason. -->
-        <DList Name="gMorphaDL_000550" Offset="0x550"/> 
+        <DList Name="gMorphaDL_000550" Offset="0x550"/>
 
         <DList Name="gMorphaDL_000EC0" Offset="0xEC0"/>
         <DList Name="gMorphaDL_000EF8" Offset="0xEF8"/>
         <DList Name="gMorphaDL_007BF8" Offset="0x7BF8"/>
-        
+
         <Array Name="gMorphaVtx_006938" Count="14" Offset="0x6938">
             <Vtx/>
         </Array>
 
-        <Array Name="gMorphaVtx_007BB8" Count="4" Offset="0x7BB8">
+        <Array Name="gMorphaVtx_006A18" Count="286" Offset="0x006A18">
             <Vtx/>
         </Array>
 
diff --git a/app/src/main/assets/assets/extractor/xmls/N64_PAL_10/overlays/ovl_Boss_Dodongo.xml b/app/src/main/assets/assets/extractor/xmls/N64_PAL_10/overlays/ovl_Boss_Dodongo.xml
index 8f0c7612..5e4975bc 100644
--- a/app/src/main/assets/assets/extractor/xmls/N64_PAL_10/overlays/ovl_Boss_Dodongo.xml
+++ b/app/src/main/assets/assets/extractor/xmls/N64_PAL_10/overlays/ovl_Boss_Dodongo.xml
@@ -1,6 +1,6 @@
 <Root>
     <File Name="ovl_Boss_Dodongo" BaseAddress="0x8089E470" RangeStart="0x61C8" RangeEnd="0x91C8">
-        <Texture Name="sLavaFloorLavaTex" OutName="lava_floor_lava" Format="rgba16" Width="64" Height="64" Offset="0x61C8"/>
+        <Texture Name="sLavaFloorLavaTex" OutName="lava_floor_lava" Format="rgba16" Width="32" Height="64" Offset="0x61C8"/>
         <Texture Name="sLavaFloorRockTex" OutName="lava_floor_rock" Format="rgba16" Width="32" Height="64" Offset="0x81C8"/>
     </File>
 </Root>
diff --git a/app/src/main/assets/assets/extractor/xmls/N64_PAL_11/objects/object_mo.xml b/app/src/main/assets/assets/extractor/xmls/N64_PAL_11/objects/object_mo.xml
index 2a6247c9..b4528ef3 100644
--- a/app/src/main/assets/assets/extractor/xmls/N64_PAL_11/objects/object_mo.xml
+++ b/app/src/main/assets/assets/extractor/xmls/N64_PAL_11/objects/object_mo.xml
@@ -8,7 +8,7 @@
         <!-- Morpha's Title Card -->
         <Texture Name="gMorphaTitleCardTex" Format="i8" Width="128" Height="120" Offset="0x1010"/>
         <Texture Name="gMorphaWaterTex" Format="rgba16" Width="32" Height="32" Offset="0x8870"/>
-				
+
         <!-- DLists for Morpha's Core -->
         <DList Name="gMorphaCoreMembraneDL" Offset="0x6700"/>
         <DList Name="gMorphaCoreNucleusDL" Offset="0x6838"/>
@@ -69,17 +69,17 @@
         <!-- Unused content -->
 
         <!-- This is the dlist for EnVbBall for some reason. -->
-        <DList Name="gMorphaDL_000550" Offset="0x550"/> 
+        <DList Name="gMorphaDL_000550" Offset="0x550"/>
 
         <DList Name="gMorphaDL_000EC0" Offset="0xEC0"/>
         <DList Name="gMorphaDL_000EF8" Offset="0xEF8"/>
         <DList Name="gMorphaDL_007BF8" Offset="0x7BF8"/>
-        
+
         <Array Name="gMorphaVtx_006938" Count="14" Offset="0x6938">
             <Vtx/>
         </Array>
 
-        <Array Name="gMorphaVtx_007BB8" Count="4" Offset="0x7BB8">
+        <Array Name="gMorphaVtx_006A18" Count="286" Offset="0x006A18">
             <Vtx/>
         </Array>
 
diff --git a/app/src/main/assets/assets/extractor/xmls/N64_PAL_11/overlays/ovl_Boss_Dodongo.xml b/app/src/main/assets/assets/extractor/xmls/N64_PAL_11/overlays/ovl_Boss_Dodongo.xml
index cd9069e1..d6f77448 100644
--- a/app/src/main/assets/assets/extractor/xmls/N64_PAL_11/overlays/ovl_Boss_Dodongo.xml
+++ b/app/src/main/assets/assets/extractor/xmls/N64_PAL_11/overlays/ovl_Boss_Dodongo.xml
@@ -1,6 +1,6 @@
 <Root>
     <File Name="ovl_Boss_Dodongo" BaseAddress="0x808C1190" RangeStart="0x61C8" RangeEnd="0x91C8">
-        <Texture Name="sLavaFloorLavaTex" OutName="lava_floor_lava" Format="rgba16" Width="64" Height="64" Offset="0x61C8"/>
+        <Texture Name="sLavaFloorLavaTex" OutName="lava_floor_lava" Format="rgba16" Width="32" Height="64" Offset="0x61C8"/>
         <Texture Name="sLavaFloorRockTex" OutName="lava_floor_rock" Format="rgba16" Width="32" Height="64" Offset="0x81C8"/>
     </File>
 </Root>