summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--config/eur/arm9/overlays/ov002/symbols.txt6
-rw-r--r--config/eur/arm9/overlays/ov003/symbols.txt20
-rw-r--r--config/eur/arm9/overlays/ov005/symbols.txt2
-rw-r--r--config/eur/arm9/overlays/ov009/delinks.txt1
-rw-r--r--config/eur/arm9/overlays/ov009/symbols.txt14
-rw-r--r--config/usa/arm9/overlays/ov002/symbols.txt6
-rw-r--r--config/usa/arm9/overlays/ov003/symbols.txt20
-rw-r--r--config/usa/arm9/overlays/ov005/symbols.txt2
-rw-r--r--config/usa/arm9/overlays/ov009/delinks.txt1
-rw-r--r--config/usa/arm9/overlays/ov009/symbols.txt14
-rw-r--r--include/DTCM/UnkStruct_027e0d38.hpp71
-rw-r--r--include/Game/Game.hpp2
-rw-r--r--include/Game/GameMode.hpp4
-rw-r--r--include/Game/GameModeAdventure.hpp87
-rw-r--r--include/Message/MsgProc.hpp8
-rw-r--r--include/System/SysNew.hpp2
-rw-r--r--src/09_Adventure/Game/GameModeAdventure.cpp272
17 files changed, 467 insertions, 65 deletions
diff --git a/config/eur/arm9/overlays/ov002/symbols.txt b/config/eur/arm9/overlays/ov002/symbols.txt
index 59355af3..b8b31716 100644
--- a/config/eur/arm9/overlays/ov002/symbols.txt
+++ b/config/eur/arm9/overlays/ov002/symbols.txt
@@ -164,9 +164,9 @@ func_ov002_020f41f8 kind:function(arm,size=0x14) addr:0x020f41f8
func_ov002_020f420c kind:function(arm,size=0xb90) addr:0x020f420c
func_ov002_020f4d9c kind:function(arm,size=0x324) addr:0x020f4d9c
func_ov002_020f50c0 kind:function(arm,size=0x2d0) addr:0x020f50c0
-func_ov002_020f5390 kind:function(arm,size=0x174) addr:0x020f5390
-func_ov002_020f5504 kind:function(arm,size=0x1c4) addr:0x020f5504
-func_ov002_020f56c8 kind:function(arm,size=0x19c) addr:0x020f56c8
+_ZN18UnkStruct_0211a9ac19func_ov002_020f5390EPt kind:function(arm,size=0x174) addr:0x020f5390
+_ZN18UnkStruct_0211a9ac19func_ov002_020f5504EPt kind:function(arm,size=0x1c4) addr:0x020f5504
+_ZN18UnkStruct_0211a9ac19func_ov002_020f56c8EPt kind:function(arm,size=0x19c) addr:0x020f56c8
func_ov002_020f5864 kind:function(arm,size=0x50) addr:0x020f5864
func_ov002_020f58b4 kind:function(arm,size=0x248) addr:0x020f58b4
func_ov002_020f5afc kind:function(arm,size=0x2c8) addr:0x020f5afc
diff --git a/config/eur/arm9/overlays/ov003/symbols.txt b/config/eur/arm9/overlays/ov003/symbols.txt
index c41b9d74..8c395677 100644
--- a/config/eur/arm9/overlays/ov003/symbols.txt
+++ b/config/eur/arm9/overlays/ov003/symbols.txt
@@ -75,7 +75,7 @@ func_ov003_020f2944 kind:function(thumb,size=0x32) addr:0x020f2944
func_ov003_020f2978 kind:function(thumb,size=0xa0) addr:0x020f2978
func_ov003_020f2a18 kind:function(arm,size=0x14) addr:0x020f2a18
func_ov003_020f2a2c kind:function(thumb,size=0xa0) addr:0x020f2a2c
-func_ov003_020f2acc kind:function(thumb,size=0xb8) addr:0x020f2acc
+_ZN18UnkStruct_020f297819func_ov003_020f2accEv kind:function(thumb,size=0xb8) addr:0x020f2acc
func_ov003_020f2b84 kind:function(thumb,size=0x46) addr:0x020f2b84
func_ov003_020f2bcc kind:function(thumb,size=0x50) addr:0x020f2bcc
func_ov003_020f2c1c kind:function(arm,size=0x1c) addr:0x020f2c1c
@@ -171,8 +171,8 @@ func_ov003_020f4510 kind:function(thumb,size=0x24) addr:0x020f4510
func_ov003_020f4534 kind:function(thumb,size=0x24) addr:0x020f4534
func_ov003_020f4558 kind:function(thumb,size=0xa8) addr:0x020f4558
func_ov003_020f4600 kind:function(thumb,size=0x78) addr:0x020f4600
-func_ov003_020f4678 kind:function(thumb,size=0x80) addr:0x020f4678
-func_ov003_020f46f8 kind:function(thumb,size=0x1e) addr:0x020f46f8
+_ZN17UnkClass_027e105419func_ov003_020f4678Ei kind:function(thumb,size=0x80) addr:0x020f4678
+_ZN17UnkClass_027e105418func_ov003_02f46f8Ev kind:function(thumb,size=0x1e) addr:0x020f46f8
func_ov003_020f4718 kind:function(thumb,size=0x48) addr:0x020f4718
func_ov003_020f4760 kind:function(thumb,size=0x18) addr:0x020f4760
func_ov003_020f4778 kind:function(thumb,size=0x6c) addr:0x020f4778
@@ -184,7 +184,7 @@ func_ov003_020f48dc kind:function(thumb,size=0x2e) addr:0x020f48dc
func_ov003_020f490c kind:function(thumb,size=0x34) addr:0x020f490c
func_ov003_020f4940 kind:function(thumb,size=0x20) addr:0x020f4940
func_ov003_020f4960 kind:function(arm,size=0xfc) addr:0x020f4960
-func_ov003_020f4a5c kind:function(arm,size=0xbc) addr:0x020f4a5c
+_ZN17UnkClass_027e105419func_ov003_020f4a5cEv kind:function(arm,size=0xbc) addr:0x020f4a5c
func_ov003_020f4b18 kind:function(thumb,size=0x64) addr:0x020f4b18
func_ov003_020f4b7c kind:function(arm,size=0x44) addr:0x020f4b7c
func_ov003_020f4bc0 kind:function(thumb,size=0x48) addr:0x020f4bc0
@@ -355,23 +355,23 @@ func_ov003_020fab64 kind:function(thumb,size=0x240) addr:0x020fab64
func_ov003_020fada4 kind:function(thumb,size=0x2e) addr:0x020fada4
func_ov003_020fadd4 kind:function(thumb,size=0x20) addr:0x020fadd4
func_ov003_020fadf4 kind:function(thumb,size=0x40) addr:0x020fadf4
-func_ov003_020fae34 kind:function(thumb,size=0x30) addr:0x020fae34
-func_ov003_020fae64 kind:function(thumb,size=0x22) addr:0x020fae64
+_ZN18UnkStruct_020fadf4D1Ev kind:function(thumb,size=0x30) addr:0x020fae34
+_ZN18UnkStruct_020fadf419func_ov003_020fae64Ev kind:function(thumb,size=0x22) addr:0x020fae64
func_ov003_020fae88 kind:function(thumb,size=0x18) addr:0x020fae88
func_ov003_020faea0 kind:function(thumb,size=0x44) addr:0x020faea0
func_ov003_020faee4 kind:function(thumb,size=0x48) addr:0x020faee4
func_ov003_020faf2c kind:function(thumb,size=0x48) addr:0x020faf2c
func_ov003_020faf74 kind:function(thumb,size=0x1c) addr:0x020faf74
-func_ov003_020faf90 kind:function(thumb,size=0x80) addr:0x020faf90
-func_ov003_020fb010 kind:function(thumb,size=0x44) addr:0x020fb010
+_ZN18UnkStruct_0211ac0c19func_ov003_020faf90Ev kind:function(thumb,size=0x80) addr:0x020faf90
+_ZN18UnkStruct_0211ac0c19func_ov003_020fb010Ev kind:function(thumb,size=0x44) addr:0x020fb010
func_ov003_020fb054 kind:function(thumb,size=0x30) addr:0x020fb054
func_ov003_020fb084 kind:function(thumb,size=0x24) addr:0x020fb084
func_ov003_020fb0a8 kind:function(thumb,size=0x8) addr:0x020fb0a8
func_ov003_020fb0b0 kind:function(thumb,size=0x68) addr:0x020fb0b0
func_ov003_020fb118 kind:function(thumb,size=0x2e) addr:0x020fb118
func_ov003_020fb148 kind:function(arm,size=0x110) addr:0x020fb148
-func_ov003_020fb258 kind:function(thumb,size=0x14) addr:0x020fb258
-func_ov003_020fb26c kind:function(thumb,size=0x26) addr:0x020fb26c
+_ZN18UnkStruct_0211ac0c19func_ov003_020fb258EPt kind:function(thumb,size=0x14) addr:0x020fb258
+_ZN18UnkStruct_0211ac0c19func_ov003_020fb26cEv kind:function(thumb,size=0x26) addr:0x020fb26c
func_ov003_020fb294 kind:function(thumb,size=0x38) addr:0x020fb294
func_ov003_020fb2cc kind:function(thumb,size=0x1a) addr:0x020fb2cc
func_ov003_020fb2e8 kind:function(thumb,size=0x88) addr:0x020fb2e8
diff --git a/config/eur/arm9/overlays/ov005/symbols.txt b/config/eur/arm9/overlays/ov005/symbols.txt
index c4456c3a..ce09a288 100644
--- a/config/eur/arm9/overlays/ov005/symbols.txt
+++ b/config/eur/arm9/overlays/ov005/symbols.txt
@@ -1,5 +1,5 @@
func_ov005_02100ae0 kind:function(arm,size=0x9c) addr:0x02100ae0
-func_ov005_02100b7c kind:function(arm,size=0x74) addr:0x02100b7c
+_ZN18UnkStruct_027e0d3819func_ov005_02100b7cEi kind:function(arm,size=0x74) addr:0x02100b7c
func_ov005_02100bf0 kind:function(arm,size=0xc0) addr:0x02100bf0
func_ov005_02100cb0 kind:function(arm,size=0x110) addr:0x02100cb0
func_ov005_02100dc0 kind:function(arm,size=0x4c) addr:0x02100dc0
diff --git a/config/eur/arm9/overlays/ov009/delinks.txt b/config/eur/arm9/overlays/ov009/delinks.txt
index fd22621b..6aed3d4e 100644
--- a/config/eur/arm9/overlays/ov009/delinks.txt
+++ b/config/eur/arm9/overlays/ov009/delinks.txt
@@ -7,3 +7,4 @@
src/09_Adventure/Game/GameModeAdventure.cpp:
.text start:0x02112c20 end:0x021132cc
+ .data start:0x0211e6c8 end:0x0211e6ec
diff --git a/config/eur/arm9/overlays/ov009/symbols.txt b/config/eur/arm9/overlays/ov009/symbols.txt
index 778e9232..a533393a 100644
--- a/config/eur/arm9/overlays/ov009/symbols.txt
+++ b/config/eur/arm9/overlays/ov009/symbols.txt
@@ -1,6 +1,6 @@
_ZN17GameModeAdventure6CreateEi kind:function(thumb,size=0x20) addr:0x02112c20
_ZN17GameModeAdventureC1Ei kind:function(thumb,size=0x128) addr:0x02112c40
-_Z19func_ov009_02112d68v kind:function(arm,size=0x4) addr:0x02112d68
+_ZN21UnkStruct_020f2978_00D1Ev kind:function(arm,size=0x4) addr:0x02112d68
_ZN17GameModeAdventureD0Ev kind:function(thumb,size=0x88) addr:0x02112d6c
_ZN17GameModeAdventureD2Ev kind:function(thumb,size=0x84) addr:0x02112df4
_ZN17GameModeAdventure8vfunc_08Ei kind:function(arm,size=0x17c) addr:0x02112e78
@@ -22,9 +22,9 @@ func_ov009_0211364c kind:function(thumb,size=0x2) addr:0x0211364c
func_ov009_02113650 kind:function(arm,size=0x1c) addr:0x02113650
func_ov009_0211366c kind:function(arm,size=0x2c) addr:0x0211366c
func_ov009_02113698 kind:function(arm,size=0x2c) addr:0x02113698
-func_ov009_021136c4 kind:function(arm,size=0x24) addr:0x021136c4
-func_ov009_021136e8 kind:function(arm,size=0x24) addr:0x021136e8
-func_ov009_0211370c kind:function(arm,size=0x20) addr:0x0211370c
+_ZN23UnkStruct_020fadf4_Base19func_ov009_021136c4Ev kind:function(arm,size=0x24) addr:0x021136c4
+_ZN18UnkStruct_0211ac0c19func_ov009_021136e8Ev kind:function(arm,size=0x24) addr:0x021136e8
+_ZN23UnkStruct_020fadf4_Base19func_ov009_0211370cEv kind:function(arm,size=0x20) addr:0x0211370c
func_ov009_0211372c kind:function(arm,size=0x11c) addr:0x0211372c
func_ov009_02113848 kind:function(thumb,size=0x20) addr:0x02113848
func_ov009_02113868 kind:function(thumb,size=0x94) addr:0x02113868
@@ -345,12 +345,12 @@ func_ov009_0211a880 kind:function(arm,size=0x2c) addr:0x0211a880
func_ov009_0211a8ac kind:function(arm,size=0xdc) addr:0x0211a8ac
func_ov009_0211a988 kind:function(arm,size=0x24) addr:0x0211a988
func_ov009_0211a9ac kind:function(thumb,size=0x88) addr:0x0211a9ac
-func_ov009_0211aa34 kind:function(thumb,size=0x60) addr:0x0211aa34
+_ZN18UnkStruct_0211a9acD1Ev kind:function(thumb,size=0x60) addr:0x0211aa34
func_ov009_0211aa94 kind:function(arm,size=0xf8) addr:0x0211aa94
func_ov009_0211ab8c kind:function(arm,size=0x3c) addr:0x0211ab8c
func_ov009_0211abc8 kind:function(arm,size=0x44) addr:0x0211abc8
func_ov009_0211ac0c kind:function(thumb,size=0x20) addr:0x0211ac0c
-func_ov009_0211ac2c kind:function(thumb,size=0x2a) addr:0x0211ac2c
+_ZN18UnkStruct_0211ac0c19func_ov009_0211ac2cEv kind:function(thumb,size=0x2a) addr:0x0211ac2c
func_ov009_0211ac58 kind:function(thumb,size=0x90) addr:0x0211ac58
func_ov009_0211ace8 kind:function(thumb,size=0x10) addr:0x0211ace8
func_ov009_0211acf8 kind:function(thumb,size=0xa0) addr:0x0211acf8
@@ -608,7 +608,7 @@ data_ov009_0211e690 kind:data(any) addr:0x0211e690
data_ov009_0211e694 kind:data(any) addr:0x0211e694
data_ov009_0211e698 kind:data(any) addr:0x0211e698
data_ov009_0211e69c kind:data(any) addr:0x0211e69c
-data_ov009_0211e6c8 kind:data(any) addr:0x0211e6c8
+_ZTV17GameModeAdventure kind:data(any) addr:0x0211e6c8
data_ov009_0211e6ec kind:data(any) addr:0x0211e6ec
data_ov009_0211e6f0 kind:data(any) addr:0x0211e6f0
data_ov009_0211e6f4 kind:data(any) addr:0x0211e6f4
diff --git a/config/usa/arm9/overlays/ov002/symbols.txt b/config/usa/arm9/overlays/ov002/symbols.txt
index 5f2c4302..49478e5d 100644
--- a/config/usa/arm9/overlays/ov002/symbols.txt
+++ b/config/usa/arm9/overlays/ov002/symbols.txt
@@ -164,9 +164,9 @@ func_ov002_020f41f8 kind:function(arm,size=0x14) addr:0x020f4198
func_ov002_020f420c kind:function(arm,size=0xb90) addr:0x020f41ac
func_ov002_020f4d9c kind:function(arm,size=0x324) addr:0x020f4d3c
func_ov002_020f50c0 kind:function(arm,size=0x2d0) addr:0x020f5060
-func_ov002_020f5390 kind:function(arm,size=0x174) addr:0x020f5330
-func_ov002_020f5504 kind:function(arm,size=0x1c4) addr:0x020f54a4
-func_ov002_020f56c8 kind:function(arm,size=0x19c) addr:0x020f5668
+_ZN18UnkStruct_0211a9ac19func_ov002_020f5390EPt kind:function(arm,size=0x174) addr:0x020f5330
+_ZN18UnkStruct_0211a9ac19func_ov002_020f5504EPt kind:function(arm,size=0x1c4) addr:0x020f54a4
+_ZN18UnkStruct_0211a9ac19func_ov002_020f56c8EPt kind:function(arm,size=0x19c) addr:0x020f5668
func_ov002_020f5864 kind:function(arm,size=0x50) addr:0x020f5804
func_ov002_020f58b4 kind:function(arm,size=0x248) addr:0x020f5854
func_ov002_020f5afc kind:function(arm,size=0x2c8) addr:0x020f5a9c
diff --git a/config/usa/arm9/overlays/ov003/symbols.txt b/config/usa/arm9/overlays/ov003/symbols.txt
index 1629ce3f..832e33c1 100644
--- a/config/usa/arm9/overlays/ov003/symbols.txt
+++ b/config/usa/arm9/overlays/ov003/symbols.txt
@@ -75,7 +75,7 @@ func_ov003_020f2944 kind:function(thumb,size=0x32) addr:0x020f28e4
func_ov003_020f2978 kind:function(thumb,size=0xa0) addr:0x020f2918
func_ov003_020f2a18 kind:function(arm,size=0x14) addr:0x020f29b8
func_ov003_020f2a2c kind:function(thumb,size=0xa0) addr:0x020f29cc
-func_ov003_020f2acc kind:function(thumb,size=0xb8) addr:0x020f2a6c
+_ZN18UnkStruct_020f297819func_ov003_020f2accEv kind:function(thumb,size=0xb8) addr:0x020f2a6c
func_ov003_020f2b84 kind:function(thumb,size=0x46) addr:0x020f2b24
func_ov003_020f2bcc kind:function(thumb,size=0x50) addr:0x020f2b6c
func_ov003_020f2c1c kind:function(arm,size=0x1c) addr:0x020f2bbc
@@ -171,8 +171,8 @@ func_ov003_020f4510 kind:function(thumb,size=0x24) addr:0x020f44b0
func_ov003_020f4534 kind:function(thumb,size=0x24) addr:0x020f44d4
func_ov003_020f4558 kind:function(thumb,size=0xa8) addr:0x020f44f8
func_ov003_020f4600 kind:function(thumb,size=0x78) addr:0x020f45a0
-func_ov003_020f4678 kind:function(thumb,size=0x80) addr:0x020f4618
-func_ov003_020f46f8 kind:function(thumb,size=0x1e) addr:0x020f4698
+_ZN17UnkClass_027e105419func_ov003_020f4678Ei kind:function(thumb,size=0x80) addr:0x020f4618
+_ZN17UnkClass_027e105418func_ov003_02f46f8Ev kind:function(thumb,size=0x1e) addr:0x020f4698
func_ov003_020f4718 kind:function(thumb,size=0x48) addr:0x020f46b8
func_ov003_020f4760 kind:function(thumb,size=0x18) addr:0x020f4700
func_ov003_020f4778 kind:function(thumb,size=0x6c) addr:0x020f4718
@@ -184,7 +184,7 @@ func_ov003_020f48dc kind:function(thumb,size=0x2e) addr:0x020f487c
func_ov003_020f490c kind:function(thumb,size=0x34) addr:0x020f48ac
func_ov003_020f4940 kind:function(thumb,size=0x20) addr:0x020f48e0
func_ov003_020f4960 kind:function(arm,size=0xfc) addr:0x020f4900
-func_ov003_020f4a5c kind:function(arm,size=0xbc) addr:0x020f49fc
+_ZN17UnkClass_027e105419func_ov003_020f4a5cEv kind:function(arm,size=0xbc) addr:0x020f49fc
func_ov003_020f4b18 kind:function(thumb,size=0x64) addr:0x020f4ab8
func_ov003_020f4b7c kind:function(arm,size=0x44) addr:0x020f4b1c
func_ov003_020f4bc0 kind:function(thumb,size=0x48) addr:0x020f4b60
@@ -355,23 +355,23 @@ func_ov003_020fab64 kind:function(thumb,size=0x240) addr:0x020faad8
func_ov003_020fada4 kind:function(thumb,size=0x2e) addr:0x020fad18
func_ov003_020fadd4 kind:function(thumb,size=0x20) addr:0x020fad48
func_ov003_020fadf4 kind:function(thumb,size=0x40) addr:0x020fad68
-func_ov003_020fae34 kind:function(thumb,size=0x30) addr:0x020fada8
-func_ov003_020fae64 kind:function(thumb,size=0x22) addr:0x020fadd8
+_ZN18UnkStruct_020fadf4D1Ev kind:function(thumb,size=0x30) addr:0x020fada8
+_ZN18UnkStruct_020fadf419func_ov003_020fae64Ev kind:function(thumb,size=0x22) addr:0x020fadd8
func_ov003_020fae88 kind:function(thumb,size=0x18) addr:0x020fadfc
func_ov003_020faea0 kind:function(thumb,size=0x44) addr:0x020fae14
func_ov003_020faee4 kind:function(thumb,size=0x48) addr:0x020fae58
func_ov003_020faf2c kind:function(thumb,size=0x48) addr:0x020faea0
func_ov003_020faf74 kind:function(thumb,size=0x1c) addr:0x020faee8
-func_ov003_020faf90 kind:function(thumb,size=0x80) addr:0x020faf04
-func_ov003_020fb010 kind:function(thumb,size=0x44) addr:0x020faf84
+_ZN18UnkStruct_0211ac0c19func_ov003_020faf90Ev kind:function(thumb,size=0x80) addr:0x020faf04
+_ZN18UnkStruct_0211ac0c19func_ov003_020fb010Ev kind:function(thumb,size=0x44) addr:0x020faf84
func_ov003_020fb054 kind:function(thumb,size=0x30) addr:0x020fafc8
func_ov003_020fb084 kind:function(thumb,size=0x24) addr:0x020faff8
func_ov003_020fb0a8 kind:function(thumb,size=0x8) addr:0x020fb01c
func_ov003_020fb0b0 kind:function(thumb,size=0x68) addr:0x020fb024
func_ov003_020fb118 kind:function(thumb,size=0x2e) addr:0x020fb08c
func_ov003_020fb148 kind:function(arm,size=0x110) addr:0x020fb0bc
-func_ov003_020fb258 kind:function(thumb,size=0x14) addr:0x020fb1cc
-func_ov003_020fb26c kind:function(thumb,size=0x26) addr:0x020fb1e0
+_ZN18UnkStruct_0211ac0c19func_ov003_020fb258EPt kind:function(thumb,size=0x14) addr:0x020fb1cc
+_ZN18UnkStruct_0211ac0c19func_ov003_020fb26cEv kind:function(thumb,size=0x26) addr:0x020fb1e0
func_ov003_020fb294 kind:function(thumb,size=0x38) addr:0x020fb208
func_ov003_020fb2cc kind:function(thumb,size=0x1a) addr:0x020fb240
func_ov003_020fb2e8 kind:function(thumb,size=0x88) addr:0x020fb25c
diff --git a/config/usa/arm9/overlays/ov005/symbols.txt b/config/usa/arm9/overlays/ov005/symbols.txt
index 5bf8daa0..2c4e1df0 100644
--- a/config/usa/arm9/overlays/ov005/symbols.txt
+++ b/config/usa/arm9/overlays/ov005/symbols.txt
@@ -1,5 +1,5 @@
func_ov005_02100ae0 kind:function(arm,size=0x9c) addr:0x02100a60
-func_ov005_02100b7c kind:function(arm,size=0x74) addr:0x02100afc
+_ZN18UnkStruct_027e0d3819func_ov005_02100b7cEi kind:function(arm,size=0x74) addr:0x02100afc
func_ov005_02100bf0 kind:function(arm,size=0xc0) addr:0x02100b70
func_ov005_02100cb0 kind:function(arm,size=0x110) addr:0x02100c30
func_ov005_02100dc0 kind:function(arm,size=0x4c) addr:0x02100d40
diff --git a/config/usa/arm9/overlays/ov009/delinks.txt b/config/usa/arm9/overlays/ov009/delinks.txt
index 6ec6679e..75f90144 100644
--- a/config/usa/arm9/overlays/ov009/delinks.txt
+++ b/config/usa/arm9/overlays/ov009/delinks.txt
@@ -7,3 +7,4 @@
src/09_Adventure/Game/GameModeAdventure.cpp:
.text start:0x02112ba0 end:0x0211324c
+ .data start:0x0211e648 end:0x0211e66c
diff --git a/config/usa/arm9/overlays/ov009/symbols.txt b/config/usa/arm9/overlays/ov009/symbols.txt
index 63774c30..ea6d5d4e 100644
--- a/config/usa/arm9/overlays/ov009/symbols.txt
+++ b/config/usa/arm9/overlays/ov009/symbols.txt
@@ -1,6 +1,6 @@
_ZN17GameModeAdventure6CreateEi kind:function(thumb,size=0x20) addr:0x02112ba0
_ZN17GameModeAdventureC1Ei kind:function(thumb,size=0x128) addr:0x02112bc0
-_Z19func_ov009_02112d68v kind:function(arm,size=0x4) addr:0x02112ce8
+_ZN21UnkStruct_020f2978_00D1Ev kind:function(arm,size=0x4) addr:0x02112ce8
_ZN17GameModeAdventureD0Ev kind:function(thumb,size=0x88) addr:0x02112cec
_ZN17GameModeAdventureD2Ev kind:function(thumb,size=0x84) addr:0x02112d74
_ZN17GameModeAdventure8vfunc_08Ei kind:function(arm,size=0x17c) addr:0x02112df8
@@ -22,9 +22,9 @@ func_ov009_0211364c kind:function(thumb,size=0x2) addr:0x021135cc
func_ov009_02113650 kind:function(arm,size=0x1c) addr:0x021135d0
func_ov009_0211366c kind:function(arm,size=0x2c) addr:0x021135ec
func_ov009_02113698 kind:function(arm,size=0x2c) addr:0x02113618
-func_ov009_021136c4 kind:function(arm,size=0x24) addr:0x02113644
-func_ov009_021136e8 kind:function(arm,size=0x24) addr:0x02113668
-func_ov009_0211370c kind:function(arm,size=0x20) addr:0x0211368c
+_ZN23UnkStruct_020fadf4_Base19func_ov009_021136c4Ev kind:function(arm,size=0x24) addr:0x02113644
+_ZN18UnkStruct_0211ac0c19func_ov009_021136e8Ev kind:function(arm,size=0x24) addr:0x02113668
+_ZN23UnkStruct_020fadf4_Base19func_ov009_0211370cEv kind:function(arm,size=0x20) addr:0x0211368c
func_ov009_0211372c kind:function(arm,size=0x11c) addr:0x021136ac
func_ov009_02113848 kind:function(thumb,size=0x20) addr:0x021137c8
func_ov009_02113868 kind:function(thumb,size=0x94) addr:0x021137e8
@@ -345,12 +345,12 @@ func_ov009_0211a880 kind:function(arm,size=0x2c) addr:0x0211a800
func_ov009_0211a8ac kind:function(arm,size=0xdc) addr:0x0211a82c
func_ov009_0211a988 kind:function(arm,size=0x24) addr:0x0211a908
func_ov009_0211a9ac kind:function(thumb,size=0x88) addr:0x0211a92c
-func_ov009_0211aa34 kind:function(thumb,size=0x60) addr:0x0211a9b4
+_ZN18UnkStruct_0211a9acD1Ev kind:function(thumb,size=0x60) addr:0x0211a9b4
func_ov009_0211aa94 kind:function(arm,size=0xf8) addr:0x0211aa14
func_ov009_0211ab8c kind:function(arm,size=0x3c) addr:0x0211ab0c
func_ov009_0211abc8 kind:function(arm,size=0x44) addr:0x0211ab48
func_ov009_0211ac0c kind:function(thumb,size=0x20) addr:0x0211ab8c
-func_ov009_0211ac2c kind:function(thumb,size=0x2a) addr:0x0211abac
+_ZN18UnkStruct_0211ac0c19func_ov009_0211ac2cEv kind:function(thumb,size=0x2a) addr:0x0211abac
func_ov009_0211ac58 kind:function(thumb,size=0x90) addr:0x0211abd8
func_ov009_0211ace8 kind:function(thumb,size=0x10) addr:0x0211ac68
func_ov009_0211acf8 kind:function(thumb,size=0xa0) addr:0x0211ac78
@@ -608,7 +608,7 @@ data_ov009_0211e690 kind:data(any) addr:0x0211e610
data_ov009_0211e694 kind:data(any) addr:0x0211e614
data_ov009_0211e698 kind:data(any) addr:0x0211e618
data_ov009_0211e69c kind:data(any) addr:0x0211e61c
-data_ov009_0211e6c8 kind:data(any) addr:0x0211e648
+_ZTV17GameModeAdventure kind:data(any) addr:0x0211e648
data_ov009_0211e6ec kind:data(any) addr:0x0211e66c
data_ov009_0211e6f0 kind:data(any) addr:0x0211e670
data_ov009_0211e6f4 kind:data(any) addr:0x0211e674
diff --git a/include/DTCM/UnkStruct_027e0d38.hpp b/include/DTCM/UnkStruct_027e0d38.hpp
index ba565f60..ab7b7794 100644
--- a/include/DTCM/UnkStruct_027e0d38.hpp
+++ b/include/DTCM/UnkStruct_027e0d38.hpp
@@ -1,6 +1,7 @@
#pragma once
#include "global.h"
+#include "nds/math.h"
#include "types.h"
struct UnkStruct_027e0d38_UnkC {
@@ -9,12 +10,68 @@ struct UnkStruct_027e0d38_UnkC {
s32 func_ov000_020a5e9c(void);
};
+class UnkStruct_02082348_04 {
+public:
+ /* 00 */ Vec3p mPos;
+ /* 0c */ unk16 mAngle;
+ /* 0e */ u8 mId;
+ /* 0f */ u8 mUnk_0f;
+ /* 10 */ u8 mUnk_10;
+ /* 11 */ u8 mUnk_11;
+ /* 14 */
+};
+
+// This might be FlagsUnk2
+struct UnkStruct_02082348 {
+ /* 00 */ UnkStruct_027e0d38_UnkC mUnk_00;
+ /* 04 */ UnkStruct_02082348_04 mUnk_04;
+ /* 18 */
+
+ void func_ov000_02078bf0(UnkStruct_02082348 *param_2);
+ void func_ov004_02100ae0();
+};
+
struct UnkStruct_027e0d38_Unk28 {
- /* 00 */ unk8 mUnk_00[0x34];
- /* 34 */ bool mUnk_34;
- /* 35 */ unk8 mUnk_35[0x27];
- /* 5c */ unk32 mUnk_5c[3];
- /* 68 */
+ /* 000 */ unk32 *mUnk_00;
+ /* 004 */ unk32 mUnk_04;
+ /* 008 */ unk32 mUnk_08;
+ /* 00C */ unk32 mUnk_0c;
+ /* 010 */ unk32 mUnk_10;
+ /* 014 */ unk32 mUnk_14;
+ /* 018 */ unk32 mUnk_18;
+ /* 01C */ UnkStruct_027e0d38_UnkC mUnk_1c;
+ /* 020 */ unk32 mUnk_20;
+ /* 024 */ unk32 mUnk_24;
+ /* 028 */ unk32 mUnk_28;
+ /* 02C */ unk8 mUnk_2c;
+ /* 02D */ unk8 mUnk_2d;
+ /* 02E */ u8 mUnk_2e;
+ /* 02F */ unk8 mUnk_2f;
+ /* 030 */ unk32 mUnk_30;
+ /* 034 */ bool mUnk_34;
+ /* 035 */ unk8 mUnk_35;
+ /* 036 */ unk16 mUnk_36;
+ /* 038 */ Vec3p mUnk_38;
+ /* 044 */ UnkStruct_027e0d38_UnkC mUnk_44;
+ /* 048 */ unk8 mUnk_48[0x50 - 0x48];
+ /* 050 */ unk8 mUnk_50;
+ /* 051 */ unk8 mUnk_51;
+ /* 052 */ unk8 mUnk_52;
+ /* 053 */ unk8 mUnk_53;
+ /* 054 */ unk8 mUnk_54;
+ /* 055 */ unk8 mUnk_55;
+ /* 056 */ u8 mUnk_56;
+ /* 057 */ unk8 mUnk_57;
+ /* 058 */ unk32 mUnk_58;
+ /* 05c */ UnkStruct_02082348_04 mUnk_5c;
+ /* 070 */ UnkStruct_02082348 mUnk_70;
+ /* 088 */ unk8 pad1[0x9A - 0x88];
+ /* 09a */ u8 mUnk_9a;
+ /* 09b */ u8 mUnk_9b;
+ /* 09c */ unk32 mUnk_9c;
+ /* 0a0 */ Vec3p mUnk_a0;
+ /* 0ac */ unk32 mUnk_ac;
+ /* 110 */
};
struct UnkStruct_027e0d38 {
@@ -23,7 +80,7 @@ struct UnkStruct_027e0d38 {
/* 04 */ unk32 mUnk_04;
/* 08 */ unk32 mUnk_08;
/* 0c */ UnkStruct_027e0d38_UnkC mUnk_0c;
- /* 10 */ unk32 mUnk_10;
+ /* 10 */ unk32 mUnk_10; // `UnkStruct_02082348_04`?
/* 14 */ unk32 mUnk_14;
/* 18 */ unk32 mUnk_18;
/* 1c */ unk16 mUnk_1c;
@@ -39,6 +96,8 @@ struct UnkStruct_027e0d38 {
s32 func_ov000_02078b40();
unk8 func_ov000_02078b64();
bool func_ov000_02078b88();
+ void func_ov004_02100bcc();
+ unk32 func_ov005_02100b7c(unk32 param_1);
};
extern UnkStruct_027e0d38 *data_027e0d38;
diff --git a/include/Game/Game.hpp b/include/Game/Game.hpp
index 95d49801..8bb41b95 100644
--- a/include/Game/Game.hpp
+++ b/include/Game/Game.hpp
@@ -21,7 +21,7 @@ public:
/* 0fe */ unk16 mUnk_0fe;
/* 100 */ unk8 mUnk_100;
/* 101 */ s8 mUnk_101;
- /* 102 */ unk8 mUnk_102;
+ /* 102 */ bool mUnk_102;
/* 103 */ u8 mUnk_103;
/* 104 */
diff --git a/include/Game/GameMode.hpp b/include/Game/GameMode.hpp
index 6888b023..315847ee 100644
--- a/include/Game/GameMode.hpp
+++ b/include/Game/GameMode.hpp
@@ -8,7 +8,7 @@
class GameMode : public SysObject {
public:
/* 000 (vtable) */
- /* 004 */ unk32 mUnk_000;
+ /* 004 */ unk32 mUnk_004;
/* 008 */
/* 00 */ virtual ~GameMode();
@@ -21,7 +21,7 @@ public:
inline GameMode() {}
inline GameMode(unk32 param1) :
- mUnk_000(param1) {}
+ mUnk_004(param1) {}
void func_0202c0b8();
};
diff --git a/include/Game/GameModeAdventure.hpp b/include/Game/GameModeAdventure.hpp
index a004fb70..015ab345 100644
--- a/include/Game/GameModeAdventure.hpp
+++ b/include/Game/GameModeAdventure.hpp
@@ -4,13 +4,96 @@
#include "types.h"
#include "Game/GameModePlay.hpp"
+#include "Render/FadeControl.hpp"
+#include "System/SysNew.hpp"
+#include "Unknown/UnkStruct_02037750.hpp"
+
+class UnkStruct_020fadf4_Base : public SysObject {
+public:
+ unk32 func_ov009_021136c4();
+ unk32 func_ov009_0211370c();
+};
+
+class UnkStruct_0211a9ac : public SysObject {
+public:
+ /* 000 */ unk8 pad[0x354];
+ /* 354 */
+
+ UnkStruct_0211a9ac();
+ ~UnkStruct_0211a9ac();
+
+ void func_ov002_020f50c0(unk32 param_1);
+ void func_ov002_020f5390(u16 *param_1);
+ void func_ov002_020f5504(u16 *param_1);
+ void func_ov002_020f56c8(u16 *param_1);
+};
+
+// ov003
+class UnkStruct_020fadf4 : public UnkStruct_020fadf4_Base {
+public:
+ /* 00 */ unk8 pad[0x4c];
+ /* 4c */
+
+ UnkStruct_020fadf4();
+ UnkStruct_020fadf4(UnkStruct_0211a9ac *param_1);
+ ~UnkStruct_020fadf4();
+
+ void func_ov009_021135d0();
+ void func_ov003_020fae64();
+};
+
+class UnkStruct_020f2978_00 {
+public:
+ /* 00 */ unk8 pad[0x18];
+ /* 18 */
+
+ UnkStruct_020f2978_00();
+ ~UnkStruct_020f2978_00();
+};
+
+// ov003
+class UnkStruct_020f2978 : public SysObject {
+public:
+ /* 00 */ UnkStruct_020f2978_00 mUnk_00[2];
+ /* 30 */ UnkStruct_02037750 mUnk_30;
+ /* 50 */ unk8 pad2[0x88 - 0x50];
+ /* 88 */
+
+ UnkStruct_020f2978();
+
+ unk32 func_ov003_020f2a2c();
+ unk32 func_ov003_020f2acc();
+};
+
+class UnkStruct_0211ac0c : public UnkStruct_020fadf4_Base {
+public:
+ /* 00 */ unk32 mUnk_00;
+ /* 04 */ FadeControl mUnk_04;
+ /* 28 */ unk8 pad[0x44 - 0x28];
+ /* 44 */
+
+ UnkStruct_0211ac0c();
+ UnkStruct_0211ac0c(UnkStruct_020f2978 *param_1);
+
+ void func_ov009_0211372c();
+ void func_ov003_020fb26c();
+ unk32 func_ov009_021136e8();
+ unk32 func_ov003_020fb148();
+ unk32 func_ov003_020fb258(u16 *param_1);
+ void func_ov009_0211ac2c();
+ void func_ov003_020faf90();
+ void func_ov003_020fb010();
+};
class GameModeAdventure : public GameModePlay {
+public:
/* 000 (base) */
- /* 008 */ unk8 mUnk_008[0x10];
+ /* 008 */ UnkStruct_0211a9ac *mUnk_008;
+ /* 00c */ UnkStruct_020fadf4 *mUnk_00c;
+ /* 010 */ UnkStruct_020f2978 *mUnk_010;
+ /* 014 */ UnkStruct_0211ac0c *mUnk_014;
/* 018 */
-public:
/* 00 */ virtual ~GameModeAdventure() override;
/* 08 */ virtual unk32 vfunc_08(unk32 param1) override;
/* 0c */ virtual void vfunc_0c(u16 *param1) override;
diff --git a/include/Message/MsgProc.hpp b/include/Message/MsgProc.hpp
index bfdbc86b..00536c57 100644
--- a/include/Message/MsgProc.hpp
+++ b/include/Message/MsgProc.hpp
@@ -120,11 +120,13 @@ extern struct TouchControl gTouchControl;
class UnkClass_027e0e28 {
public:
unk32 func_ov000_0207bc48();
+ void func_ov000_0207bc9c();
};
extern UnkClass_027e0e28 *data_027e0e28;
extern u8 data_027e0c54;
extern unk32 *data_ov009_0211f5b4;
extern "C" unk32 func_ov003_020f3f94(unk32 *);
+extern "C" void func_ov003_020f4060(unk32 **);
extern unk32 *data_02057ed4;
// see Actor.cpp
@@ -161,8 +163,12 @@ public:
void func_ov003_020f4874(void);
void func_ov003_020f4760(u8, unk32);
+ unk32 func_ov003_020f4960(void);
+ void func_ov003_020f4a5c(void);
+ void func_ov003_02f46f8(void);
+ void func_ov003_020f4678(unk32);
};
-extern UnkClass_027e1054 data_027e1054;
+extern UnkClass_027e1054 *data_027e1054;
class UnkClass_ov000_020eec9c {
public:
diff --git a/include/System/SysNew.hpp b/include/System/SysNew.hpp
index 184c27fb..df660a1b 100644
--- a/include/System/SysNew.hpp
+++ b/include/System/SysNew.hpp
@@ -15,6 +15,8 @@ void SysDelete(void *ptr);
void *func_0202e99c(s32 length);
void *func_0202e9bc(s32 length);
+extern u32 *data_027e0ce0[];
+
class SysObject {
public:
static void *operator new(unsigned long length, u32 *id, u32 idLength);
diff --git a/src/09_Adventure/Game/GameModeAdventure.cpp b/src/09_Adventure/Game/GameModeAdventure.cpp
index bdf61424..630c4c07 100644
--- a/src/09_Adventure/Game/GameModeAdventure.cpp
+++ b/src/09_Adventure/Game/GameModeAdventure.cpp
@@ -1,13 +1,263 @@
+#include "global.h"
+
+#include "DTCM/UnkStruct_027e0d38.hpp"
+#include "Game/Game.hpp"
#include "Game/GameModeAdventure.hpp"
+#include "Message/MsgProc.hpp"
+#include "Save/AdventureFlags.hpp"
+#include "System/OverlayManager.hpp"
+
+extern unk32 data_027e1044;
+extern unk32 data_ov000_020eab04;
+extern unk32 data_ov000_020eab08;
+extern unk8 data_ov000_020eab09;
+
+extern "C" void *func_ov003_020f4510();
+extern "C" void func_ov000_02078b0c();
+extern "C" void func_ov003_020f4534();
+
+extern UnkStruct_0211ac0c data_ov009_0211f5dc;
+
+extern "C" void func_ov029_0216dcf4(unk32 *, unk32);
+extern unk32 data_ov022_0217a4ac;
+
+extern "C" void func_ov015_0217707c(unk32 *);
+extern unk32 data_027e1060;
+
+extern "C" void func_ov005_0210274c(void *, unk32, u16 *);
+extern "C" void func_ov005_021026f8(void *, unk32, u16 *);
+extern "C" void func_ov005_02102828(void *, unk32, u16 *);
+extern "C" void func_ov003_020f40c0(unk32 **, u16 *);
+extern "C" void func_ov003_020f40e8(unk32 **, u16 *);
+
+THUMB GameModeAdventure *GameModeAdventure::Create(unk32 param1) {
+ return new(data_027e0ce0[1], 4) GameModeAdventure(param1);
+}
+
+// non-matching
+THUMB GameModeAdventure::GameModeAdventure(unk32 param1) :
+ GameModePlay(param1) {
+ UnkStruct_02082348 local_28;
+
+ this->mUnk_008 = new(data_027e0ce0[1], 4) UnkStruct_0211a9ac();
+ this->mUnk_00c = new(data_027e0ce0[1], 4) UnkStruct_020fadf4(this->mUnk_008);
+ this->mUnk_010 = new(data_027e0ce0[1], 4) UnkStruct_020f2978();
+ this->mUnk_014 = new(data_027e0ce0[1], 4) UnkStruct_0211ac0c(this->mUnk_010);
+ data_027e1044 = param1;
+ func_ov003_020f4510();
+
+ local_28.mUnk_00.mUnk_00 = 0x47;
+ local_28.mUnk_04.mPos.x = 0;
+ local_28.mUnk_04.mPos.y = 0;
+ local_28.mUnk_04.mPos.z = -2;
+ local_28.mUnk_04.mAngle = 0;
+ local_28.mUnk_04.mId = -1;
+ local_28.mUnk_04.mUnk_0f = 0;
+ local_28.mUnk_04.mUnk_10 = 0;
+ local_28.mUnk_04.mUnk_11 = 0;
+
+ if (gGame.mUnk_102 != 0) {
+ AdventureFlags::Get_FlagsUnk_00(0x17, (FlagsUnk2 *) &local_28);
+ } else {
+ if (gGame.mPrevModeId == 1) {
+ AdventureFlags::Get_FlagsUnk_00(0x17, (FlagsUnk2 *) &local_28);
+ } else if (data_ov000_020eab04 == 0x47) {
+ AdventureFlags::Get_FlagsUnk_00(0x01, (FlagsUnk2 *) &local_28);
+ } else {
+ unk32 index = AdventureFlags::func_ov00_02097ecc();
+
+ if (index != 0x21) {
+ AdventureFlags::Get_FlagsUnk_00(index, (FlagsUnk2 *) &local_28);
+ } else {
+ local_28.mUnk_00.mUnk_00 = data_ov000_020eab04;
+ local_28.mUnk_04.mId = data_ov000_020eab08;
+ local_28.mUnk_04.mUnk_0f = data_ov000_020eab09;
+ }
+ }
+ }
+
+ local_28.func_ov004_02100ae0();
+ data_027e0d38->func_ov004_02100bcc();
+ gOverlayManager.LoadIfNotLoaded(OverlayIndex_2, OverlayId_05);
+}
+
+ARM UnkStruct_020f2978_00::~UnkStruct_020f2978_00() {}
+
+// non-matching
+THUMB GameModeAdventure::~GameModeAdventure() {
+ func_ov000_02078b0c();
+ func_ov003_020f4534();
+ data_027e1044 = 0;
+
+ if (this->mUnk_014 != NULL) {
+ this->mUnk_014->mUnk_04.Unregister();
+ delete this->mUnk_014;
+ }
+
+ delete this->mUnk_010;
+ delete this->mUnk_00c;
+ delete this->mUnk_008;
+}
+
+// non-matching
+ARM unk32 GameModeAdventure::vfunc_08(unk32 param1) {
+ unk32 uVar2 = 0;
+
+ if (data_027e0d38->mUnk_14 == 1) {
+ uVar2 = data_027e0d38->func_ov005_02100b7c(param1);
+ } else {
+ if (data_027e0d38->mUnk_0c.func_ov000_020a5e9c() == 2) {
+ func_ov015_0217707c(&data_027e1060);
+ uVar2 = data_027e0d38->func_ov005_02100b7c(param1);
+ } else {
+ if (this->mUnk_00c->func_ov009_0211370c() == 0) {
+ if (this->mUnk_00c->func_ov009_021136c4() != 0) {
+ this->mUnk_008->func_ov002_020f50c0(param1);
+ } else {
+ if (data_ov009_0211f5dc.func_ov009_021136e8() != 0) {
+ if (this->mUnk_014->func_ov009_0211370c() == 0) {
+ if (this->mUnk_014->func_ov009_021136c4() != 0) {
+ uVar2 = this->mUnk_010->func_ov003_020f2a2c();
+ } else {
+ uVar2 = data_027e0d38->func_ov005_02100b7c(param1);
+
+ if (data_027e0d38->mUnk_14 == 1) {
+ return uVar2;
+ }
+
+ if (gOverlayManager.mLoadedOverlays[OverlayIndex_6] == OverlayId_29) {
+ func_ov029_0216dcf4(&data_ov022_0217a4ac, param1);
+ } else {
+ func_ov003_020f4060(&data_ov009_0211f5b4);
+ }
+ }
+ }
+ }
+
+ data_027e1054->func_ov003_020f4960();
+ }
+
+ data_ov009_0211f5dc.func_ov003_020fb148();
+ }
+
+ this->mUnk_00c->func_ov009_021135d0();
+ this->mUnk_014->func_ov009_0211372c();
+ data_027e0e28->func_ov000_0207bc9c();
+ }
+ }
+
+ return uVar2;
+}
+
+ARM void GameModeAdventure::vfunc_0c(u16 *param1) {
+ if (data_027e0d38->mUnk_14 == 1) {
+ func_ov005_021026f8(data_027e0d38->mUnk_24, data_027e0d38->mUnk_04, param1);
+ return;
+ }
+
+ if (this->mUnk_00c->func_ov009_0211370c() != 0) {
+ return;
+ }
+
+ if (this->mUnk_00c->func_ov009_021136c4() != 0) {
+ this->mUnk_008->func_ov002_020f5390(param1);
+ return;
+ }
+
+ if (data_ov009_0211f5dc.func_ov009_021136e8() == 0) {
+ return;
+ }
+
+ if (this->mUnk_014->func_ov009_021136e8() == 0) {
+ return;
+ }
+
+ func_ov005_021026f8(data_027e0d38->mUnk_24, data_027e0d38->mUnk_04, param1);
+ func_ov003_020f40c0(&data_ov009_0211f5b4, param1);
+ data_027e1054->func_ov003_020f4a5c();
+}
+
+ARM void GameModeAdventure::vfunc_10(u16 *param1) {
+ if (data_027e0d38->mUnk_14 == 1) {
+ func_ov005_0210274c(data_027e0d38->mUnk_24, data_027e0d38->mUnk_04, param1);
+ return;
+ }
+
+ if (this->mUnk_00c->func_ov009_0211370c() != 0) {
+ return;
+ }
+
+ if (this->mUnk_00c->func_ov009_021136c4() != 0) {
+ this->mUnk_008->func_ov002_020f5504(param1);
+ return;
+ }
+
+ if (this->mUnk_014->func_ov009_0211370c() != 0) {
+ return;
+ }
+
+ if (this->mUnk_014->func_ov009_021136c4() != 0) {
+ this->mUnk_010->func_ov003_020f2acc();
+ return;
+ }
+
+ func_ov005_0210274c(data_027e0d38->mUnk_24, data_027e0d38->mUnk_04, param1);
+ func_ov003_020f40e8(&data_ov009_0211f5b4, param1);
+
+ if (data_ov009_0211f5dc.func_ov009_021136c4() == 0) {
+ return;
+ }
+
+ data_ov009_0211f5dc.func_ov003_020fb258(param1);
+}
+
+ARM void GameModeAdventure::vfunc_14(u16 *param1) {
+ if (data_027e0d38->mUnk_14 == 1) {
+ func_ov005_02102828(data_027e0d38->mUnk_24, data_027e0d38->mUnk_04, param1);
+ return;
+ }
+
+ if (this->mUnk_00c->func_ov009_0211370c() != 0) {
+ return;
+ }
+
+ if (this->mUnk_00c->func_ov009_021136c4() != 0) {
+ this->mUnk_008->func_ov002_020f56c8(param1);
+ return;
+ }
+
+ if (data_ov009_0211f5dc.func_ov009_0211370c() != 0) {
+ return;
+ }
+
+ if (data_ov009_0211f5dc.func_ov009_021136c4() != 0) {
+ data_ov009_0211f5dc.func_ov003_020fb26c();
+ return;
+ }
+
+ if (this->mUnk_014->func_ov009_021136e8() == 0) {
+ return;
+ }
+
+ func_ov005_02102828(data_027e0d38->mUnk_24, data_027e0d38->mUnk_04, param1);
+}
+
+THUMB void GameModeAdventure::vfunc_1c() {
+ this->GameModePlay::vfunc_1c();
+
+ if (data_027e0d38->mUnk_14 != 1) {
+ this->mUnk_00c->func_ov003_020fae64();
+ data_ov009_0211f5dc.func_ov003_020faf90();
+ this->mUnk_014->func_ov009_0211ac2c();
+ data_027e1054->func_ov003_020f4678(1);
+ }
+}
+
+THUMB void GameModeAdventure::vfunc_20() {
+ if (data_027e0d38->mUnk_14 != 1) {
+ data_027e1054->func_ov003_02f46f8();
+ data_ov009_0211f5dc.func_ov003_020fb010();
+ }
-GameModeAdventure *GameModeAdventure::Create(unk32 param1) {}
-GameModeAdventure::GameModeAdventure(unk32 param1) :
- GameModePlay(param1) {}
-void func_ov009_02112d68() {}
-GameModeAdventure::~GameModeAdventure() {}
-unk32 GameModeAdventure::vfunc_08(unk32 param1) {}
-void GameModeAdventure::vfunc_0c(u16 *param1) {}
-void GameModeAdventure::vfunc_10(u16 *param1) {}
-void GameModeAdventure::vfunc_14(u16 *param1) {}
-void GameModeAdventure::vfunc_1c() {}
-void GameModeAdventure::vfunc_20() {}
+ this->GameModePlay::vfunc_20();
+}
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 08:09:46 +0000