Skip to content

Commit 304de9b

Browse files
WaterdishWaterdish
committed
Android back button can open Enhancements Menu. Also some extractor file updates
1 parent aa1f345 commit 304de9b

17 files changed

Lines changed: 39 additions & 39 deletions

File tree

‎app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ android {
1717
minSdkVersion 18
1818
targetSdkVersion 31
1919
versionCode 4
20-
versionName "1.1.2"
20+
versionName "1.1.3"
2121
externalNativeBuild {
2222
//ndkBuild {
2323
// arguments "APP_PLATFORM=android-23"

‎app/jni/src/libultraship‎

‎app/release/output-metadata.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"type": "SINGLE",
1212
"filters": [],
1313
"attributes": [],
14-
"versionCode": 3,
15-
"versionName": "1.1.1",
14+
"versionCode": 4,
15+
"versionName": "1.1.3",
1616
"outputFile": "app-release.apk"
1717
}
1818
],

‎app/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
66
package="com.dishii.soh"
77
android:versionCode="4"
8-
android:versionName="1.1.2"
8+
android:versionName="1.1.3"
99
android:installLocation="auto">
1010

1111
<!-- OpenGL ES 3.0 -->

‎app/src/main/assets/assets/extractor/xmls/GC_MQ_D/objects/object_mo.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
<Vtx/>
8080
</Array>
8181

82-
<Array Name="gMorphaVtx_007BB8" Count="4" Offset="0x7BB8">
82+
<Array Name="gMorphaVtx_006A18" Count="286" Offset="0x006A18">
8383
<Vtx/>
8484
</Array>
8585

‎app/src/main/assets/assets/extractor/xmls/GC_MQ_D/overlays/ovl_Boss_Dodongo.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Root>
22
<File Name="ovl_Boss_Dodongo" BaseAddress="0x808C1190" RangeStart="0x6238" RangeEnd="0x9238">
3-
<Texture Name="sLavaFloorLavaTex" OutName="lava_floor_lava" Format="rgba16" Width="64" Height="64" Offset="0x6238"/>
3+
<Texture Name="sLavaFloorLavaTex" OutName="lava_floor_lava" Format="rgba16" Width="32" Height="64" Offset="0x6238"/>
44
<Texture Name="sLavaFloorRockTex" OutName="lava_floor_rock" Format="rgba16" Width="32" Height="64" Offset="0x8238"/>
55
</File>
66
</Root>

‎app/src/main/assets/assets/extractor/xmls/GC_MQ_PAL_F/objects/object_mo.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<!-- Morpha's Title Card -->
99
<Texture Name="gMorphaTitleCardTex" Format="i8" Width="128" Height="120" Offset="0x1010"/>
1010
<Texture Name="gMorphaWaterTex" Format="rgba16" Width="32" Height="32" Offset="0x8870"/>
11-
11+
1212
<!-- DLists for Morpha's Core -->
1313
<DList Name="gMorphaCoreMembraneDL" Offset="0x6700"/>
1414
<DList Name="gMorphaCoreNucleusDL" Offset="0x6838"/>
@@ -69,17 +69,17 @@
6969
<!-- Unused content -->
7070

7171
<!-- This is the dlist for EnVbBall for some reason. -->
72-
<DList Name="gMorphaDL_000550" Offset="0x550"/>
72+
<DList Name="gMorphaDL_000550" Offset="0x550"/>
7373

7474
<DList Name="gMorphaDL_000EC0" Offset="0xEC0"/>
7575
<DList Name="gMorphaDL_000EF8" Offset="0xEF8"/>
7676
<DList Name="gMorphaDL_007BF8" Offset="0x7BF8"/>
77-
77+
7878
<Array Name="gMorphaVtx_006938" Count="14" Offset="0x6938">
7979
<Vtx/>
8080
</Array>
8181

82-
<Array Name="gMorphaVtx_007BB8" Count="4" Offset="0x7BB8">
82+
<Array Name="gMorphaVtx_006A18" Count="286" Offset="0x006A18">
8383
<Vtx/>
8484
</Array>
8585

‎app/src/main/assets/assets/extractor/xmls/GC_MQ_PAL_F/overlays/ovl_Boss_Dodongo.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Root>
2-
<File Name="ovl_Boss_Dodongo" BaseAddress="0x808B7370" RangeStart="0x61E8" RangeEnd="0x9238">
3-
<Texture Name="sLavaFloorLavaTex" OutName="lava_floor_lava" Format="rgba16" Width="64" Height="64" Offset="0x61E8"/>
2+
<File Name="ovl_Boss_Dodongo" BaseAddress="0x808B7370" RangeStart="0x61E8" RangeEnd="0x91E8">
3+
<Texture Name="sLavaFloorLavaTex" OutName="lava_floor_lava" Format="rgba16" Width="32" Height="64" Offset="0x61E8"/>
44
<Texture Name="sLavaFloorRockTex" OutName="lava_floor_rock" Format="rgba16" Width="32" Height="64" Offset="0x81E8"/>
55
</File>
66
</Root>

‎app/src/main/assets/assets/extractor/xmls/GC_MQ_PAL_F/text/message_data_static.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<Root>
22
<File Name="nes_message_data_static">
3-
<Text Name="nes_message_data_static" CodeOffset="0xF6910"/>
3+
<Text Name="nes_message_data_static" CodeOffset="0xF68F0"/>
44
</File>
55
<File Name="ger_message_data_static">
6-
<Text Name="ger_message_data_static" CodeOffset="0xF6910" LangOffset="0xFAB38"/>
6+
<Text Name="ger_message_data_static" CodeOffset="0xF68F0" LangOffset="0xFAB18"/>
77
</File>
88
<File Name="fra_message_data_static">
9-
<Text Name="fra_message_data_static" CodeOffset="0xF6910" LangOffset="0xFCC48"/>
9+
<Text Name="fra_message_data_static" CodeOffset="0xF68F0" LangOffset="0xFCC28"/>
1010
</File>
1111
<File Name="staff_message_data_static">
12-
<Text Name="staff_message_data_static" CodeOffset="0xFED58"/>
12+
<Text Name="staff_message_data_static" CodeOffset="0xFED38"/>
1313
</File>
1414
</Root>

‎app/src/main/assets/assets/extractor/xmls/GC_NMQ_D/objects/object_mo.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<!-- Morpha's Title Card -->
99
<Texture Name="gMorphaTitleCardTex" Format="i8" Width="128" Height="120" Offset="0x1010"/>
1010
<Texture Name="gMorphaWaterTex" Format="rgba16" Width="32" Height="32" Offset="0x8870"/>
11-
11+
1212
<!-- DLists for Morpha's Core -->
1313
<DList Name="gMorphaCoreMembraneDL" Offset="0x6700"/>
1414
<DList Name="gMorphaCoreNucleusDL" Offset="0x6838"/>
@@ -69,17 +69,17 @@
6969
<!-- Unused content -->
7070

7171
<!-- This is the dlist for EnVbBall for some reason. -->
72-
<DList Name="gMorphaDL_000550" Offset="0x550"/>
72+
<DList Name="gMorphaDL_000550" Offset="0x550"/>
7373

7474
<DList Name="gMorphaDL_000EC0" Offset="0xEC0"/>
7575
<DList Name="gMorphaDL_000EF8" Offset="0xEF8"/>
7676
<DList Name="gMorphaDL_007BF8" Offset="0x7BF8"/>
77-
77+
7878
<Array Name="gMorphaVtx_006938" Count="14" Offset="0x6938">
7979
<Vtx/>
8080
</Array>
8181

82-
<Array Name="gMorphaVtx_007BB8" Count="4" Offset="0x7BB8">
82+
<Array Name="gMorphaVtx_006A18" Count="286" Offset="0x006A18">
8383
<Vtx/>
8484
</Array>
8585

0 commit comments

Comments
 (0)