mirror/st
1
0
Fork 0
mirror of https://github.com/zeldaret/st synced 2026-07-07 14:03:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Start MapObject documentation (#47)

Browse Source 
* set the right base class size

* actor and map object changes

* rename id getters functions

* document unknown file system used in mapobjectprofile

* start to document MapObjectProfile
This commit is contained in:
Yanis
2026-04-13 18:55:04 +02:00
committed by GitHub
parent dcf9268df6
commit 59a312e30a
299 changed files with 1230 additions and 899 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/eur/arm9/delinks.txt
+11 -12
View File
@@ -25,10 +25,9 @@ src/Main/Player/TouchControl.cpp:
src/Main/System/OverlayManager.cpp:
.text start:0x020147fc end:0x02014944
src/Main/UnkStruct_ov000_020b4f84_00_Base.cpp:
complete
.text start:0x02015528 end:0x02015628
.data start:0x02043f00 end:0x02043f1c
src/Main/UnkFileSystem.cpp:
.text start:0x02015518 end:0x02015788
.data start:0x02043f00 end:0x02043f8c
src/Main/System/Random.cpp:
.text start:0x02016384 end:0x02016404
@@ -68,6 +67,14 @@ libs/c/src/ansi_files.c:
.data start:0x020446a8 end:0x0204478c
.bss start:0x020517a0 end:0x02051aa0
libs/c/src/float.c:
complete
.data start:0x0204478c end:0x02044790
libs/c/src/locale.c:
complete
.data start:0x02044790 end:0x020449ac
libs/c/src/arith.c:
complete
.text start:0x020338d4 end:0x020338ec
@@ -114,14 +121,6 @@ libs/c/src/wmem.c:
complete
.text start:0x020341f8 end:0x02034230
libs/c/src/float.c:
complete
.data start:0x0204478c end:0x02044790
libs/c/src/locale.c:
complete
.data start:0x02044790 end:0x020449ac
libs/c/src/wprintf.c:
.text start:0x02034230 end:0x0203615c
.data start:0x020449ac end:0x02044a2c
config/eur/arm9/dtcm/symbols.txt
+2 -2
View File
@@ -107,8 +107,8 @@ data_027e0ccc kind:bss addr:0x027e0ccc
data_027e0cd8 kind:bss addr:0x027e0cd8
data_027e0cdc kind:bss addr:0x027e0cdc
data_027e0ce0 kind:bss addr:0x027e0ce0
gActorManager kind:bss addr:0x027e0ce4
data_027e0ce8 kind:bss addr:0x027e0ce8
gpActorManager kind:bss addr:0x027e0ce4
gpMapObjManager kind:bss addr:0x027e0ce8
data_027e0cec kind:bss addr:0x027e0cec
data_027e0cf0 kind:bss addr:0x027e0cf0
data_027e0cf4 kind:bss addr:0x027e0cf4
config/eur/arm9/itcm/symbols.txt
+3 -3
View File
@@ -202,12 +202,12 @@ func_01fff2fc kind:function(arm,size=0x54) addr:0x01fff2fc
func_01fff350 kind:function(arm,size=0x64) addr:0x01fff350
_ZN12ActorManager13func_01fff3b4Ei kind:function(arm,size=0x8c) addr:0x01fff3b4
func_01fff440 kind:function(arm,size=0x18) addr:0x01fff440
func_01fff458 kind:function(arm,size=0xc) addr:0x01fff458
_ZN5Actor10GetActorIdEv kind:function(arm,size=0xc) addr:0x01fff458
_ZN5Actor8vfunc_10Ev kind:function(arm,size=0x34) addr:0x01fff464
func_01fff498 kind:function(arm,size=0x34) addr:0x01fff498
_ZN16MapObjectManager13func_01fff498Eii kind:function(arm,size=0x34) addr:0x01fff498
func_01fff4cc kind:function(arm,size=0x54) addr:0x01fff4cc
func_01fff520 kind:function(arm,size=0x64) addr:0x01fff520
func_01fff584 kind:function(arm,size=0xc) addr:0x01fff584
_ZN9MapObject14GetMapObjectIdEv kind:function(arm,size=0xc) addr:0x01fff584
func_01fff590 kind:function(arm,size=0x40) addr:0x01fff590
_ZN10ActorRupee13func_01fff5d0Eii kind:function(arm,size=0x3c) addr:0x01fff5d0
func_01fff60c kind:function(arm,size=0x8c) addr:0x01fff60c
config/eur/arm9/overlays/ov000/relocs.txt
+16 -16
View File
@@ -389,10 +389,10 @@ from:0x02058578 kind:thumb_call to:0x020153fc module:main
from:0x02058596 kind:thumb_call to:0x02015550 module:main
from:0x020585aa kind:thumb_call_arm to:0x0203d160 module:main
from:0x020585b4 kind:load to:0x020b1b14 module:overlay(0)
from:0x020585b8 kind:load to:0x02043f40 module:main
from:0x020585b8 kind:load to:0x02043f38 add:0x8 module:main
from:0x020585bc kind:load to:0x0201568d module:main
from:0x020585c0 kind:load to:0x020585c5 module:overlay(0)
from:0x020585d4 kind:load to:0x02043f40 module:main
from:0x020585d4 kind:load to:0x02043f38 add:0x8 module:main
from:0x020585e0 kind:thumb_call to:0x020589e4 module:overlay(0)
from:0x020585ee kind:thumb_call_arm to:0x0203d210 module:main
from:0x020585f6 kind:thumb_call to:0x0201556c module:main
@@ -575,8 +575,8 @@ from:0x0205957a kind:thumb_call to:0x02012fa8 module:main
from:0x020595d6 kind:thumb_call to:0x02059714 module:overlay(0)
from:0x020595e0 kind:load to:0x020b4ed4 module:overlay(0)
from:0x020595e4 kind:load to:0x020b1b78 module:overlay(0)
from:0x020595e8 kind:load to:0x02043f78 module:main
from:0x020595ec kind:load to:0x02043f40 module:main
from:0x020595e8 kind:load to:0x02043f70 add:0x8 module:main
from:0x020595ec kind:load to:0x02043f38 add:0x8 module:main
from:0x020595f0 kind:load to:0x020b1b84 module:overlay(0)
from:0x020595f4 kind:load to:0x020b1b8c module:overlay(0)
from:0x020595f8 kind:load to:0x020b1b94 module:overlay(0)
@@ -589,8 +589,8 @@ from:0x020596b6 kind:thumb_call_arm to:0x02033f7c module:main
from:0x020596c6 kind:thumb_call_arm to:0x02034060 module:main
from:0x020596f6 kind:thumb_call to:0x02059714 module:overlay(0)
from:0x02059700 kind:load to:0x020b4ed4 module:overlay(0)
from:0x02059704 kind:load to:0x02043f78 module:main
from:0x02059708 kind:load to:0x02043f40 module:main
from:0x02059704 kind:load to:0x02043f70 add:0x8 module:main
from:0x02059708 kind:load to:0x02043f38 add:0x8 module:main
from:0x0205970c kind:load to:0x020b1b84 module:overlay(0)
from:0x02059710 kind:load to:0x020b1b9c module:overlay(0)
from:0x02059722 kind:thumb_call to:0x02012fa8 module:main
@@ -1180,7 +1180,7 @@ from:0x0206026c kind:arm_call to:0x0201c780 module:main
from:0x02060274 kind:arm_call_thumb to:0x0201568c module:main
from:0x02060280 kind:load to:0x020b1c90 module:overlay(0)
from:0x02060284 kind:load to:0x020b1c94 module:overlay(0)
from:0x02060288 kind:load to:0x02043f40 module:main
from:0x02060288 kind:load to:0x02043f38 add:0x8 module:main
from:0x0206028c kind:load to:0x0204a480 module:main
from:0x02060290 kind:load to:0x020b1c9c module:overlay(0)
from:0x0206029c kind:arm_call to:0x0205fdd0 module:overlay(0)
@@ -1226,7 +1226,7 @@ from:0x0206061c kind:arm_call to:0x0201c780 module:main
from:0x02060624 kind:arm_call_thumb to:0x0201568c module:main
from:0x02060630 kind:load to:0x020b1c90 module:overlay(0)
from:0x02060634 kind:load to:0x020b1c94 module:overlay(0)
from:0x02060638 kind:load to:0x02043f40 module:main
from:0x02060638 kind:load to:0x02043f38 add:0x8 module:main
from:0x0206063c kind:load to:0x0204a480 module:main
from:0x02060640 kind:load to:0x020b1c9c module:overlay(0)
from:0x02060644 kind:load to:0x020b1ca0 module:overlay(0)
@@ -4356,7 +4356,7 @@ from:0x02080240 kind:arm_call to:0x02026800 module:main
from:0x02080264 kind:arm_call_thumb to:0x020156ac module:main
from:0x02080270 kind:arm_call_thumb to:0x0201568c module:main
from:0x02080280 kind:load to:0x020b28e0 module:overlay(0)
from:0x02080284 kind:load to:0x02043f40 module:main
from:0x02080284 kind:load to:0x02043f38 add:0x8 module:main
from:0x02080444 kind:arm_call to:0x0207fc90 module:overlay(0)
from:0x02080458 kind:arm_call to:0x0209718c module:overlay(0)
from:0x0208046c kind:arm_call to:0x020c6dec module:overlay(24)
@@ -4435,7 +4435,7 @@ from:0x02081444 kind:arm_call to:0x0208146c module:overlay(0)
from:0x0208144c kind:arm_call_thumb to:0x0201568c module:main
from:0x0208145c kind:load to:0x020b28f8 module:overlay(0)
from:0x02081460 kind:load to:0x020b290c module:overlay(0)
from:0x02081464 kind:load to:0x02043f40 module:main
from:0x02081464 kind:load to:0x02043f38 add:0x8 module:main
from:0x02081468 kind:load to:0x027e09a0 module:dtcm
from:0x020814b0 kind:arm_call to:0x02081150 module:overlay(0)
from:0x020814e0 kind:arm_call to:0x02081b24 module:overlay(0)
@@ -7404,7 +7404,7 @@ from:0x0209ed0c kind:load to:0x020b4174 module:overlay(0)
from:0x0209ed10 kind:load to:0x020b3cb4 module:overlay(0)
from:0x0209ed14 kind:load to:0x020b41a0 module:overlay(0)
from:0x0209ed18 kind:load to:0x0204a110 module:main
from:0x0209ed1c kind:load to:0x02043f40 module:main
from:0x0209ed1c kind:load to:0x02043f38 add:0x8 module:main
from:0x0209ed20 kind:load to:0x0204a120 module:main
from:0x0209ed4c kind:arm_call to:0x02034060 module:main
from:0x0209ed58 kind:arm_call to:0x02033f7c module:main
@@ -7421,7 +7421,7 @@ from:0x0209ee08 kind:arm_call_thumb to:0x0201568c module:main
from:0x0209ee14 kind:load to:0x020b4174 module:overlay(0)
from:0x0209ee18 kind:load to:0x020b3cb4 module:overlay(0)
from:0x0209ee1c kind:load to:0x020b41a0 module:overlay(0)
from:0x0209ee20 kind:load to:0x02043f40 module:main
from:0x0209ee20 kind:load to:0x02043f38 add:0x8 module:main
from:0x0209ee2c kind:arm_call to:0x0209f10c module:overlay(0)
from:0x0209ee3c kind:arm_call_thumb to:0x0201c9e4 module:main
from:0x0209ee4c kind:load to:0x0204a120 module:main
@@ -7439,7 +7439,7 @@ from:0x0209ef30 kind:arm_call_thumb to:0x0201568c module:main
from:0x0209ef4c kind:load to:0x020b3cb4 module:overlay(0)
from:0x0209ef50 kind:load to:0x020b4174 module:overlay(0)
from:0x0209ef54 kind:load to:0x020b41a8 module:overlay(0)
from:0x0209ef58 kind:load to:0x02043f40 module:main
from:0x0209ef58 kind:load to:0x02043f38 add:0x8 module:main
from:0x0209ef84 kind:arm_call to:0x02032db0 module:main
from:0x0209efac kind:arm_call to:0x02034060 module:main
from:0x0209efb8 kind:arm_call to:0x02033f7c module:main
@@ -7456,7 +7456,7 @@ from:0x0209f074 kind:arm_call_thumb to:0x0201568c module:main
from:0x0209f090 kind:load to:0x020b3cb4 module:overlay(0)
from:0x0209f094 kind:load to:0x020b4174 module:overlay(0)
from:0x0209f098 kind:load to:0x020b41a8 module:overlay(0)
from:0x0209f09c kind:load to:0x02043f40 module:main
from:0x0209f09c kind:load to:0x02043f38 add:0x8 module:main
from:0x0209f0a0 kind:load to:0x0204a480 module:main
from:0x0209f0cc kind:arm_call to:0x020575e0 module:overlay(0)
from:0x0209f0e8 kind:arm_call to:0x02057610 module:overlay(0)
@@ -7514,7 +7514,7 @@ from:0x0209f584 kind:load to:0x0204a120 module:main
from:0x0209f588 kind:load to:0x020b43b0 module:overlay(0)
from:0x0209f58c kind:load to:0x020b4888 module:overlay(0)
from:0x0209f590 kind:load to:0x020b488c module:overlay(0)
from:0x0209f594 kind:load to:0x02043f40 module:main
from:0x0209f594 kind:load to:0x02043f38 add:0x8 module:main
from:0x0209f598 kind:load to:0x0204a480 module:main
from:0x0209f5c0 kind:arm_call_thumb to:0x020154b0 module:main
from:0x0209f5cc kind:arm_call to:0x02016620 module:main
@@ -7555,7 +7555,7 @@ from:0x0209f8cc kind:arm_call_thumb to:0x0201568c module:main
from:0x0209f8d8 kind:load to:0x020b43b0 module:overlay(0)
from:0x0209f8dc kind:load to:0x020b4888 module:overlay(0)
from:0x0209f8e0 kind:load to:0x020b488c module:overlay(0)
from:0x0209f8e4 kind:load to:0x02043f40 module:main
from:0x0209f8e4 kind:load to:0x02043f38 add:0x8 module:main
from:0x0209f8e8 kind:load to:0x0204a480 module:main
from:0x0209f8f8 kind:arm_call to:0x0209f958 module:overlay(0)
from:0x0209f914 kind:arm_call to:0x0209ee50 module:overlay(0)
config/eur/arm9/overlays/ov000/symbols.txt
+1 -1
View File
@@ -2263,7 +2263,7 @@ func_ov000_020975c0 kind:function(arm,size=0x1c) addr:0x020975c0
func_ov000_020975dc kind:function(arm,size=0x1c) addr:0x020975dc
_ZN8Actor_5c19func_ov000_020975f8Ev kind:function(arm,size=0x78) addr:0x020975f8
func_ov000_02097670 kind:function(arm,size=0xc) addr:0x02097670
_ZN12ActorProfileC2E7ActorId kind:function(arm,size=0xa8) addr:0x0209767c
_ZN12ActorProfileC2Ej kind:function(arm,size=0xa8) addr:0x0209767c
_ZN12ActorProfileD2Ev kind:function(arm,size=0x28) addr:0x02097724
_ZN12ActorProfile8vfunc_04Ev kind:function(arm,size=0x8) addr:0x0209774c
_ZN12ActorProfile8vfunc_08Ev kind:function(arm,size=0x7c) addr:0x02097754
config/eur/arm9/overlays/ov001/relocs.txt
+4 -4
View File
@@ -385,10 +385,10 @@ from:0x020b7a3c kind:thumb_call to:0x020154c4 module:main
from:0x020b7a44 kind:load to:0x027e09a0 module:dtcm
from:0x020b7a48 kind:load to:0x020c2970 module:overlay(1)
from:0x020b7a4c kind:load to:0x020c2984 module:overlay(1)
from:0x020b7a50 kind:load to:0x02043f78 module:main
from:0x020b7a50 kind:load to:0x02043f70 add:0x8 module:main
from:0x020b7a54 kind:load to:0x020c2988 module:overlay(1)
from:0x020b7a58 kind:load to:0x020c29a4 module:overlay(1)
from:0x020b7a5c kind:load to:0x02043f40 module:main
from:0x020b7a5c kind:load to:0x02043f38 add:0x8 module:main
from:0x020b7a60 kind:load to:0x027e0ce4 module:dtcm
from:0x020b7a64 kind:load to:0x020c29bc module:overlay(1)
from:0x020b7a68 kind:load to:0x020c29d8 module:overlay(1)
@@ -629,7 +629,7 @@ from:0x020b8880 kind:load to:0x020c2a90 module:overlay(1)
from:0x020b8884 kind:load to:0x027e09a0 module:dtcm
from:0x020b8888 kind:load to:0x020c2a98 module:overlay(1)
from:0x020b888c kind:load to:0x020c2aac module:overlay(1)
from:0x020b8890 kind:load to:0x02043f40 module:main
from:0x020b8890 kind:load to:0x02043f38 add:0x8 module:main
from:0x020b8894 kind:load to:0x027e09c0 module:dtcm
from:0x020b8898 kind:load to:0x020c2ac0 module:overlay(1)
from:0x020b889c kind:load to:0x027e0ce8 module:dtcm
@@ -666,7 +666,7 @@ from:0x020b8a00 kind:thumb_call_arm to:0x0200e6a0 module:main
from:0x020b8a12 kind:thumb_call to:0x0201568c module:main
from:0x020b8a1c kind:load to:0x027e09a0 module:dtcm
from:0x020b8a20 kind:load to:0x020c2b0c module:overlay(1)
from:0x020b8a24 kind:load to:0x02043f40 module:main
from:0x020b8a24 kind:load to:0x02043f38 add:0x8 module:main
from:0x020b8a28 kind:load to:0x020c2b24 module:overlay(1)
from:0x020b8a54 kind:load to:0x027e0994 module:dtcm
from:0x020b8ac6 kind:thumb_call to:0x020b8a5c module:overlay(1)
config/eur/arm9/overlays/ov012/relocs.txt
+1 -1
View File
@@ -112,7 +112,7 @@ from:0x020b6d44 kind:thumb_call_arm to:0x0201665c module:main
from:0x020b6d4a kind:thumb_call to:0x020154c4 module:main
from:0x020b6d54 kind:load to:0x020b4464 module:overlay(0)
from:0x020b6d58 kind:load to:0x020b8450 module:overlay(12)
from:0x020b6d5c kind:load to:0x02043f40 module:main
from:0x020b6d5c kind:load to:0x02043f38 add:0x8 module:main
from:0x020b6d64 kind:load to:0x0204a480 module:main
from:0x020b6d68 kind:load to:0x020b8460 module:overlay(12)
from:0x020b6d70 kind:load to:0x020b45f4 module:overlay(0)
config/eur/arm9/overlays/ov024/relocs.txt
+1 -1
View File
@@ -2053,7 +2053,7 @@ from:0x020d269c kind:load to:0x020d8268 module:overlay(24)
from:0x020d26a0 kind:load to:0x027e09a0 module:dtcm
from:0x020d26a4 kind:load to:0x020d8270 module:overlay(24)
from:0x020d26a8 kind:load to:0x020d8288 module:overlay(24)
from:0x020d26ac kind:load to:0x02043f40 module:main
from:0x020d26ac kind:load to:0x02043f38 add:0x8 module:main
from:0x020d2760 kind:arm_call to:0x02011f3c module:main
from:0x020d2774 kind:arm_call to:0x020d27cc module:overlay(24)
from:0x020d27a4 kind:arm_call to:0x02011ff4 module:main
config/eur/arm9/overlays/ov026/relocs.txt
+1 -1
View File
@@ -4611,7 +4611,7 @@ from:0x02105f30 kind:arm_call_thumb to:0x0201568c module:main
from:0x02105f3c kind:load to:0x027e09a4 module:dtcm
from:0x02105f40 kind:load to:0x027e09a0 module:dtcm
from:0x02105f44 kind:load to:0x02136750 module:overlay(26)
from:0x02105f48 kind:load to:0x02043f40 module:main
from:0x02105f48 kind:load to:0x02043f38 add:0x8 module:main
from:0x02106078 kind:arm_call to:0x020c6770 module:overlay(24)
from:0x02106090 kind:arm_call_thumb to:0x020b8a5c module:overlay(1)
from:0x021060e4 kind:load to:0x027e09a4 module:dtcm
config/eur/arm9/overlays/ov028/relocs.txt
+1 -1
View File
@@ -302,7 +302,7 @@ from:0x02143f1c kind:arm_call_thumb to:0x020156f4 module:main
from:0x02143f24 kind:arm_call_thumb to:0x0201568c module:main
from:0x02143f30 kind:load to:0x02147320 module:overlay(28)
from:0x02143f34 kind:load to:0x021473b4 module:overlay(28)
from:0x02143f38 kind:load to:0x02043f40 module:main
from:0x02143f38 kind:load to:0x02043f38 add:0x8 module:main
from:0x02143f50 kind:arm_call_thumb to:0x0205777c module:overlay(0)
from:0x02143f58 kind:arm_call to:0x02011ff4 module:main
from:0x0214401c kind:arm_call to:0x0200eab0 module:main
config/eur/arm9/overlays/ov031/relocs.txt
+1 -1
View File
@@ -29,7 +29,7 @@ from:0x020d8ad0 kind:load to:0x02110651 module:overlay(31)
from:0x020d8ad4 kind:load to:0x0211296c module:overlay(31)
from:0x020d8ad8 kind:load to:0x02112958 module:overlay(31)
from:0x020d8adc kind:load to:0x02112a50 module:overlay(31)
from:0x020d8ae0 kind:load to:0x02043f40 module:main
from:0x020d8ae0 kind:load to:0x02043f38 add:0x8 module:main
from:0x020d8b10 kind:arm_call to:0x0200f218 module:main
from:0x020d8b38 kind:arm_call to:0x0200b578 module:main
from:0x020d8b48 kind:load to:0x02110640 module:overlay(31)
config/eur/arm9/overlays/ov088/relocs.txt
+1 -1
View File
@@ -1223,7 +1223,7 @@ from:0x0216f5a4 kind:load to:0x020b64f8 module:overlay(0)
from:0x0216f5b0 kind:arm_call_thumb to:0x0205866c module:overlay(0)
from:0x0216f5f8 kind:arm_call_thumb to:0x02015550 module:main
from:0x0216f608 kind:arm_call to:0x02016620 module:main
from:0x0216f614 kind:load to:0x02043f40 module:main
from:0x0216f614 kind:load to:0x02043f38 add:0x8 module:main
from:0x0216f620 kind:arm_call to:0x0216f7b4 module:overlay(88)
from:0x0216f628 kind:arm_call to:0x0201665c module:main
from:0x0216f630 kind:arm_call_thumb to:0x0201556c module:main
config/eur/arm9/overlays/ov089/relocs.txt
+1 -1
View File
@@ -61,7 +61,7 @@ from:0x021660d8 kind:load to:0x02049be0 module:main
from:0x021660dc kind:load to:0x02170e50 module:overlay(89)
from:0x021660e0 kind:load to:0x02170e68 module:overlay(89)
from:0x021660e4 kind:load to:0x02170628 module:overlay(89)
from:0x021660e8 kind:load to:0x02043f40 module:main
from:0x021660e8 kind:load to:0x02043f38 add:0x8 module:main
from:0x021660ec kind:load to:0x02170e6c module:overlay(89)
from:0x02166118 kind:arm_call_thumb to:0x0201547c module:main
from:0x02166134 kind:arm_call to:0x02167f60 module:overlay(89)
config/eur/arm9/relocs.txt
+9 -9
View File
@@ -1964,8 +1964,8 @@ from:0x0201569c kind:thumb_call to:0x02015528 module:main
from:0x020156a2 kind:thumb_call_arm to:0x02011ff4 module:main
from:0x020156bc kind:thumb_call to:0x02012f6c module:main
from:0x020156de kind:thumb_call_arm to:0x02015380 module:main
from:0x020156ec kind:load to:0x02043f78 module:main
from:0x020156f0 kind:load to:0x02043f5c module:main
from:0x020156ec kind:load to:0x02043f70 add:0x8 module:main
from:0x020156f0 kind:load to:0x02043f54 add:0x8 module:main
from:0x020156fa kind:thumb_call_arm to:0x020153c4 module:main
from:0x02015700 kind:thumb_call to:0x02015528 module:main
from:0x0201570e kind:thumb_call_arm to:0x020153c4 module:main
@@ -2010,7 +2010,7 @@ from:0x0201632c kind:load to:0x02043f90 module:main
from:0x0201635c kind:arm_call_thumb to:0x020164a0 module:main
from:0x0201636c kind:arm_call to:0x02028c30 module:main
from:0x02016374 kind:arm_call_thumb to:0x0201568c module:main
from:0x02016380 kind:load to:0x02043f40 module:main
from:0x02016380 kind:load to:0x02043f38 add:0x8 module:main
from:0x02016398 kind:arm_call to:0x02028450 module:main
from:0x020163b0 kind:arm_call to:0x02032920 module:main
from:0x02016426 kind:thumb_call to:0x02016404 module:main
@@ -2100,7 +2100,7 @@ from:0x0201711c kind:arm_call to:0x01ffb9cc module:itcm
from:0x02017138 kind:arm_call to:0x01fff520 module:itcm
from:0x02017154 kind:load to:0x027e0ce8 module:dtcm
from:0x0201718c kind:load to:0x0203e330 module:main
from:0x0201722c kind:load to:0x02043f40 module:main
from:0x0201722c kind:load to:0x02043f38 add:0x8 module:main
from:0x020172a0 kind:arm_call to:0x02034060 module:main
from:0x020172a8 kind:arm_call to:0x02033f7c module:main
from:0x020172bc kind:arm_call to:0x02034060 module:main
@@ -2113,7 +2113,7 @@ from:0x02017340 kind:arm_call to:0x02034060 module:main
from:0x02017348 kind:arm_call to:0x02033f7c module:main
from:0x0201735c kind:arm_call to:0x02034060 module:main
from:0x02017378 kind:arm_call_thumb to:0x020164a0 module:main
from:0x0201738c kind:load to:0x02043f40 module:main
from:0x0201738c kind:load to:0x02043f38 add:0x8 module:main
from:0x02017390 kind:load to:0x02043f98 module:main
from:0x02017394 kind:load to:0x02043fa0 module:main
from:0x02017398 kind:load to:0x02043fa8 module:main
@@ -2129,7 +2129,7 @@ from:0x020174c4 kind:arm_call to:0x02034060 module:main
from:0x020174cc kind:arm_call to:0x02033f7c module:main
from:0x020174e0 kind:arm_call to:0x02034060 module:main
from:0x020174fc kind:arm_call_thumb to:0x020164a0 module:main
from:0x02017510 kind:load to:0x02043f40 module:main
from:0x02017510 kind:load to:0x02043f38 add:0x8 module:main
from:0x02017514 kind:load to:0x02043f98 module:main
from:0x02017518 kind:load to:0x02043fa0 module:main
from:0x0201751c kind:load to:0x02043fa8 module:main
@@ -2373,7 +2373,7 @@ from:0x020195dc kind:arm_call to:0x02027654 module:main
from:0x02019604 kind:arm_call to:0x02025000 module:main
from:0x0201960c kind:arm_call to:0x02025050 module:main
from:0x02019614 kind:arm_call_thumb to:0x0201568c module:main
from:0x02019620 kind:load to:0x02043f40 module:main
from:0x02019620 kind:load to:0x02043f38 add:0x8 module:main
from:0x02019644 kind:arm_call to:0x0201ce60 module:main
from:0x02019670 kind:arm_call to:0x0201cea0 module:main
from:0x020196a4 kind:arm_call to:0x0201e610 module:main
@@ -2600,8 +2600,8 @@ from:0x0201b244 kind:arm_call_thumb to:0x02000cdc module:main
from:0x0201b24c kind:arm_call_thumb to:0x0201568c module:main
from:0x0201b254 kind:arm_call_thumb to:0x0201568c module:main
from:0x0201b260 kind:load to:0x0203e3dc module:main
from:0x0201b268 kind:load to:0x02043f78 module:main
from:0x0201b26c kind:load to:0x02043f40 module:main
from:0x0201b268 kind:load to:0x02043f70 add:0x8 module:main
from:0x0201b26c kind:load to:0x02043f38 add:0x8 module:main
from:0x0201b270 kind:load to:0x0204d9d0 module:main
from:0x0201b274 kind:load to:0x0204dfdc module:main
from:0x0201b298 kind:arm_call to:0x02027654 module:main
config/eur/arm9/symbols.txt
+31 -31
View File
@@ -750,7 +750,7 @@ func_02015338 kind:function(arm,size=0x10) addr:0x02015338
_ZN18SomeSaveFileStructC1Ei kind:function(arm,size=0x38) addr:0x02015348
func_02015380 kind:function(arm,size=0x24) addr:0x02015380
_ZN18SomeSaveFileStructD1Ev kind:function(arm,size=0x20) addr:0x020153a4
func_020153c4 kind:function(arm,size=0x20) addr:0x020153c4
_ZN17UnkFileSystem2_10D1Ev kind:function(arm,size=0x20) addr:0x020153c4
func_020153e4 kind:function(arm,size=0x18) addr:0x020153e4
func_020153fc kind:function(thumb,size=0x12) addr:0x020153fc
_ZN10UnkSystem313func_02015410EPKci kind:function(thumb,size=0xc) addr:0x02015410
@@ -762,31 +762,31 @@ _ZN10UnkStruct2C1EPKci kind:function(thumb,size=0x14) addr:0x020154b0
_ZN10UnkStruct2D1Ev kind:function(thumb,size=0x14) addr:0x020154c4
func_020154d8 kind:function(thumb,size=0x14) addr:0x020154d8
_ZN10UnkStruct213func_020154ecEPKc kind:function(thumb,size=0x2a) addr:0x020154ec
func_02015518 kind:function(thumb,size=0x2) addr:0x02015518
_ZN13func_0201551cD0Ev kind:function(thumb,size=0xc) addr:0x0201551c
_ZN32UnkStruct_ov000_020b4f84_00_Base13func_02015528Ev kind:function(thumb,size=0x2) addr:0x02015528
_ZN32UnkStruct_ov000_020b4f84_00_Base13func_0201552cEv kind:function(thumb,size=0x8) addr:0x0201552c
_ZN32UnkStruct_ov000_020b4f84_00_Base13func_02015534Ev kind:function(thumb,size=0x4) addr:0x02015534
_ZN32UnkStruct_ov000_020b4f84_00_BaseC1Ev kind:function(thumb,size=0x18) addr:0x02015538
_ZN32UnkStruct_ov000_020b4f84_00_BaseC1EPviih kind:function(thumb,size=0x1c) addr:0x02015550
_ZN32UnkStruct_ov000_020b4f84_00_BaseD1Ev kind:function(thumb,size=0x1c) addr:0x0201556c
_ZN32UnkStruct_ov000_020b4f84_00_BaseD0Ev kind:function(thumb,size=0x24) addr:0x02015588
_ZN32UnkStruct_ov000_020b4f84_00_Base8vfunc_08Ei kind:function(thumb,size=0x2a) addr:0x020155ac
_ZN32UnkStruct_ov000_020b4f84_00_Base8vfunc_0CEv kind:function(thumb,size=0x18) addr:0x020155d8
_ZN32UnkStruct_ov000_020b4f84_00_Base8vfunc_10Ei kind:function(thumb,size=0x38) addr:0x020155f0
func_02015628 kind:function(thumb,size=0x1c) addr:0x02015628
func_02015644 kind:function(thumb,size=0xc) addr:0x02015644
func_02015650 kind:function(thumb,size=0x12) addr:0x02015650
func_02015664 kind:function(thumb,size=0x26) addr:0x02015664
_ZN10UnkSystem4D1Ev kind:function(thumb,size=0xc) addr:0x0201568c
func_02015698 kind:function(thumb,size=0x12) addr:0x02015698
func_020156ac kind:function(thumb,size=0x1a) addr:0x020156ac
func_020156c8 kind:function(thumb,size=0x2c) addr:0x020156c8
func_020156f4 kind:function(thumb,size=0x14) addr:0x020156f4
func_02015708 kind:function(thumb,size=0x1a) addr:0x02015708
func_02015724 kind:function(thumb,size=0x2a) addr:0x02015724
func_02015750 kind:function(thumb,size=0x6) addr:0x02015750
func_02015758 kind:function(thumb,size=0x30) addr:0x02015758
_ZN14UnkFileSystem1D1Ev kind:function(thumb,size=0x2) addr:0x02015518
_ZN14UnkFileSystem1D0Ev kind:function(thumb,size=0xc) addr:0x0201551c
_ZN14UnkFileSystem1D2Ev kind:function(thumb,size=0x2) addr:0x02015528
_ZN14UnkFileSystem18vfunc_0CEv kind:function(thumb,size=0x8) addr:0x0201552c
_ZN14UnkFileSystem18vfunc_10Ei kind:function(thumb,size=0x4) addr:0x02015534
_ZN14UnkFileSystem5C1Ev kind:function(thumb,size=0x18) addr:0x02015538
_ZN14UnkFileSystem5C1EPviih kind:function(thumb,size=0x1c) addr:0x02015550
_ZN14UnkFileSystem5D1Ev kind:function(thumb,size=0x1c) addr:0x0201556c
_ZN14UnkFileSystem5D0Ev kind:function(thumb,size=0x24) addr:0x02015588
_ZN14UnkFileSystem58vfunc_08Ei kind:function(thumb,size=0x2a) addr:0x020155ac
_ZN14UnkFileSystem58vfunc_0CEv kind:function(thumb,size=0x18) addr:0x020155d8
_ZN14UnkFileSystem58vfunc_10Ei kind:function(thumb,size=0x38) addr:0x020155f0
_ZN14UnkFileSystem4C1EPviii kind:function(thumb,size=0x1c) addr:0x02015628
_ZN14UnkFileSystem4D1Ev kind:function(thumb,size=0xc) addr:0x02015644
_ZN14UnkFileSystem4D0Ev kind:function(thumb,size=0x12) addr:0x02015650
_ZN14UnkFileSystem48vfunc_08Ei kind:function(thumb,size=0x26) addr:0x02015664
_ZN14UnkFileSystem3D1Ev kind:function(thumb,size=0xc) addr:0x0201568c
_ZN14UnkFileSystem3D0Ev kind:function(thumb,size=0x12) addr:0x02015698
_ZN14UnkFileSystem38vfunc_08Ei kind:function(thumb,size=0x1a) addr:0x020156ac
_ZN14UnkFileSystem2C1EPvi kind:function(thumb,size=0x2c) addr:0x020156c8
_ZN14UnkFileSystem2D1Ev kind:function(thumb,size=0x14) addr:0x020156f4
_ZN14UnkFileSystem2D0Ev kind:function(thumb,size=0x1a) addr:0x02015708
_ZN14UnkFileSystem28vfunc_08Ei kind:function(thumb,size=0x2a) addr:0x02015724
_ZN14UnkFileSystem28vfunc_0CEv kind:function(thumb,size=0x6) addr:0x02015750
_ZN14UnkFileSystem28vfunc_10Ei kind:function(thumb,size=0x30) addr:0x02015758
func_02015788 kind:function(arm,size=0x38) addr:0x02015788
func_020157c0 kind:function(arm,size=0x30) addr:0x020157c0
func_020157f0 kind:function(arm,size=0x30) addr:0x020157f0
@@ -2525,11 +2525,11 @@ data_02043ed0 kind:data(any) addr:0x02043ed0
data_02043ed8 kind:data(any) addr:0x02043ed8
data_02043ee0 kind:data(any) addr:0x02043ee0
data_02043efc kind:data(any) addr:0x02043efc
_ZTV32UnkStruct_ov000_020b4f84_00_Base kind:data(any) addr:0x02043f00
data_02043f24 kind:data(any) addr:0x02043f1c
data_02043f40 kind:data(any) addr:0x02043f40
data_02043f5c kind:data(any) addr:0x02043f5c
data_02043f78 kind:data(any) addr:0x02043f78
_ZTV14UnkFileSystem5 kind:data(any) addr:0x02043f00
_ZTV14UnkFileSystem4 kind:data(any) addr:0x02043f1c
_ZTV14UnkFileSystem3 kind:data(any) addr:0x02043f38
_ZTV14UnkFileSystem2 kind:data(any) addr:0x02043f54
_ZTV14UnkFileSystem1 kind:data(any) addr:0x02043f70
data_02043f8c kind:data(any) addr:0x02043f8c
data_02043f90 kind:data(any) addr:0x02043f90
data_02043f98 kind:data(any) addr:0x02043f98
config/jp/arm9/delinks.txt
+11 -12
View File
@@ -25,10 +25,9 @@ src/Main/Player/TouchControl.cpp:
src/Main/System/OverlayManager.cpp:
.text start:0x02014800 end:0x02014948
src/Main/UnkStruct_ov000_020b4f84_00_Base.cpp:
complete
.text start:0x020154c0 end:0x020155c0
.data start:0x02045444 end:0x02045460
src/Main/UnkFileSystem.cpp:
.text start:0x020154b0 end:0x02015720
.data start:0x02045444 end:0x020454d0
src/Main/System/Random.cpp:
.text start:0x0201631c end:0x0201639c
@@ -68,6 +67,14 @@ libs/c/src/ansi_files.c:
.data start:0x02045c1c end:0x02045d00
.bss start:0x02052d20 end:0x02053020
libs/c/src/float.c:
complete
.data start:0x02045d00 end:0x02045d04
libs/c/src/locale.c:
complete
.data start:0x02045d04 end:0x02045f20
libs/c/src/arith.c:
complete
.text start:0x02034e04 end:0x02034e1c
@@ -114,14 +121,6 @@ libs/c/src/wmem.c:
complete
.text start:0x02035728 end:0x02035760
libs/c/src/float.c:
complete
.data start:0x02045d00 end:0x02045d04
libs/c/src/locale.c:
complete
.data start:0x02045d04 end:0x02045f20
libs/c/src/wprintf.c:
.text start:0x02035760 end:0x0203768c
.data start:0x02045f20 end:0x02045fa0
config/jp/arm9/dtcm/symbols.txt
+2 -2
View File
@@ -107,8 +107,8 @@ data_027e0ccc kind:bss addr:0x027e0ccc
data_027e0cd8 kind:bss addr:0x027e0cd8
data_027e0cdc kind:bss addr:0x027e0cdc
data_027e0ce0 kind:bss addr:0x027e0ce0
gActorManager kind:bss addr:0x027e0ce4
data_027e0ce8 kind:bss addr:0x027e0ce8
gpActorManager kind:bss addr:0x027e0ce4
gpMapObjManager kind:bss addr:0x027e0ce8
data_027e0cec kind:bss addr:0x027e0cec
data_027e0cf0 kind:bss addr:0x027e0cf0
data_027e0cf4 kind:bss addr:0x027e0cf4
config/jp/arm9/itcm/symbols.txt
+3 -3
View File
@@ -202,12 +202,12 @@ func_01fff2fc kind:function(arm,size=0x54) addr:0x01fff2fc
func_01fff350 kind:function(arm,size=0x64) addr:0x01fff350
_ZN12ActorManager13func_01fff3b4Ei kind:function(arm,size=0x8c) addr:0x01fff3b4
func_01fff440 kind:function(arm,size=0x18) addr:0x01fff440
func_01fff458 kind:function(arm,size=0xc) addr:0x01fff458
_ZN5Actor10GetActorIdEv kind:function(arm,size=0xc) addr:0x01fff458
_ZN5Actor8vfunc_10Ev kind:function(arm,size=0x34) addr:0x01fff464
func_01fff498 kind:function(arm,size=0x34) addr:0x01fff498
_ZN16MapObjectManager13func_01fff498Eii kind:function(arm,size=0x34) addr:0x01fff498
func_01fff4cc kind:function(arm,size=0x54) addr:0x01fff4cc
func_01fff520 kind:function(arm,size=0x64) addr:0x01fff520
func_01fff584 kind:function(arm,size=0xc) addr:0x01fff584
_ZN9MapObject14GetMapObjectIdEv kind:function(arm,size=0xc) addr:0x01fff584
func_01fff590 kind:function(arm,size=0x40) addr:0x01fff590
_ZN10ActorRupee13func_01fff5d0Eii kind:function(arm,size=0x3c) addr:0x01fff5d0
func_01fff60c kind:function(arm,size=0x8c) addr:0x01fff60c
config/jp/arm9/overlays/ov000/relocs.txt
+16 -16
View File
@@ -389,10 +389,10 @@ from:0x02059af8 kind:thumb_call to:0x02015394 module:main
from:0x02059b16 kind:thumb_call to:0x020154e8 module:main
from:0x02059b2a kind:thumb_call_arm to:0x0203e690 module:main
from:0x02059b34 kind:load to:0x020b3314 module:overlay(0)
from:0x02059b38 kind:load to:0x02045484 module:main
from:0x02059b38 kind:load to:0x0204547c add:0x8 module:main
from:0x02059b3c kind:load to:0x02015625 module:main
from:0x02059b40 kind:load to:0x02059b45 module:overlay(0)
from:0x02059b54 kind:load to:0x02045484 module:main
from:0x02059b54 kind:load to:0x0204547c add:0x8 module:main
from:0x02059b60 kind:thumb_call to:0x02059f64 module:overlay(0)
from:0x02059b6e kind:thumb_call_arm to:0x0203e740 module:main
from:0x02059b76 kind:thumb_call to:0x02015504 module:main
@@ -575,8 +575,8 @@ from:0x0205ab02 kind:thumb_call to:0x02012fa8 module:main
from:0x0205ab5e kind:thumb_call to:0x0205ac9c module:overlay(0)
from:0x0205ab68 kind:load to:0x020b66d4 module:overlay(0)
from:0x0205ab6c kind:load to:0x020b3378 module:overlay(0)
from:0x0205ab70 kind:load to:0x020454bc module:main
from:0x0205ab74 kind:load to:0x02045484 module:main
from:0x0205ab70 kind:load to:0x020454b4 add:0x8 module:main
from:0x0205ab74 kind:load to:0x0204547c add:0x8 module:main
from:0x0205ab78 kind:load to:0x020b3384 module:overlay(0)
from:0x0205ab7c kind:load to:0x020b338c module:overlay(0)
from:0x0205ab80 kind:load to:0x020b3394 module:overlay(0)
@@ -589,8 +589,8 @@ from:0x0205ac3e kind:thumb_call_arm to:0x020354ac module:main
from:0x0205ac4e kind:thumb_call_arm to:0x02035590 module:main
from:0x0205ac7e kind:thumb_call to:0x0205ac9c module:overlay(0)
from:0x0205ac88 kind:load to:0x020b66d4 module:overlay(0)
from:0x0205ac8c kind:load to:0x020454bc module:main
from:0x0205ac90 kind:load to:0x02045484 module:main
from:0x0205ac8c kind:load to:0x020454b4 add:0x8 module:main
from:0x0205ac90 kind:load to:0x0204547c add:0x8 module:main
from:0x0205ac94 kind:load to:0x020b3384 module:overlay(0)
from:0x0205ac98 kind:load to:0x020b339c module:overlay(0)
from:0x0205acaa kind:thumb_call to:0x02012fa8 module:main
@@ -1180,7 +1180,7 @@ from:0x020617f4 kind:arm_call to:0x0201c570 module:main
from:0x020617fc kind:arm_call_thumb to:0x02015624 module:main
from:0x02061808 kind:load to:0x020b3490 module:overlay(0)
from:0x0206180c kind:load to:0x020b3494 module:overlay(0)
from:0x02061810 kind:load to:0x02045484 module:main
from:0x02061810 kind:load to:0x0204547c add:0x8 module:main
from:0x02061814 kind:load to:0x0204ba00 module:main
from:0x02061818 kind:load to:0x020b349c module:overlay(0)
from:0x02061824 kind:arm_call to:0x02061358 module:overlay(0)
@@ -1226,7 +1226,7 @@ from:0x02061ba4 kind:arm_call to:0x0201c570 module:main
from:0x02061bac kind:arm_call_thumb to:0x02015624 module:main
from:0x02061bb8 kind:load to:0x020b3490 module:overlay(0)
from:0x02061bbc kind:load to:0x020b3494 module:overlay(0)
from:0x02061bc0 kind:load to:0x02045484 module:main
from:0x02061bc0 kind:load to:0x0204547c add:0x8 module:main
from:0x02061bc4 kind:load to:0x0204ba00 module:main
from:0x02061bc8 kind:load to:0x020b349c module:overlay(0)
from:0x02061bcc kind:load to:0x020b34a0 module:overlay(0)
@@ -4356,7 +4356,7 @@ from:0x020818f8 kind:arm_call to:0x02027d30 module:main
from:0x0208191c kind:arm_call_thumb to:0x02015644 module:main
from:0x02081928 kind:arm_call_thumb to:0x02015624 module:main
from:0x02081938 kind:load to:0x020b40e0 module:overlay(0)
from:0x0208193c kind:load to:0x02045484 module:main
from:0x0208193c kind:load to:0x0204547c add:0x8 module:main
from:0x02081afc kind:arm_call to:0x02081348 module:overlay(0)
from:0x02081b10 kind:arm_call to:0x02098940 module:overlay(0)
from:0x02081b24 kind:arm_call to:0x020c863c module:overlay(24)
@@ -4435,7 +4435,7 @@ from:0x02082afc kind:arm_call to:0x02082b24 module:overlay(0)
from:0x02082b04 kind:arm_call_thumb to:0x02015624 module:main
from:0x02082b14 kind:load to:0x020b40f8 module:overlay(0)
from:0x02082b18 kind:load to:0x020b410c module:overlay(0)
from:0x02082b1c kind:load to:0x02045484 module:main
from:0x02082b1c kind:load to:0x0204547c add:0x8 module:main
from:0x02082b20 kind:load to:0x027e09a0 module:dtcm
from:0x02082b68 kind:arm_call to:0x02082808 module:overlay(0)
from:0x02082b98 kind:arm_call to:0x020831dc module:overlay(0)
@@ -7405,7 +7405,7 @@ from:0x020a04e4 kind:load to:0x020b5974 module:overlay(0)
from:0x020a04e8 kind:load to:0x020b54b4 module:overlay(0)
from:0x020a04ec kind:load to:0x020b59a0 module:overlay(0)
from:0x020a04f0 kind:load to:0x0204b690 module:main
from:0x020a04f4 kind:load to:0x02045484 module:main
from:0x020a04f4 kind:load to:0x0204547c add:0x8 module:main
from:0x020a04f8 kind:load to:0x0204b6a0 module:main
from:0x020a0524 kind:arm_call to:0x02035590 module:main
from:0x020a0530 kind:arm_call to:0x020354ac module:main
@@ -7422,7 +7422,7 @@ from:0x020a05e0 kind:arm_call_thumb to:0x02015624 module:main
from:0x020a05ec kind:load to:0x020b5974 module:overlay(0)
from:0x020a05f0 kind:load to:0x020b54b4 module:overlay(0)
from:0x020a05f4 kind:load to:0x020b59a0 module:overlay(0)
from:0x020a05f8 kind:load to:0x02045484 module:main
from:0x020a05f8 kind:load to:0x0204547c add:0x8 module:main
from:0x020a0604 kind:arm_call to:0x020a08e4 module:overlay(0)
from:0x020a0614 kind:arm_call_thumb to:0x0201c7d4 module:main
from:0x020a0624 kind:load to:0x0204b6a0 module:main
@@ -7440,7 +7440,7 @@ from:0x020a0708 kind:arm_call_thumb to:0x02015624 module:main
from:0x020a0724 kind:load to:0x020b54b4 module:overlay(0)
from:0x020a0728 kind:load to:0x020b5974 module:overlay(0)
from:0x020a072c kind:load to:0x020b59a8 module:overlay(0)
from:0x020a0730 kind:load to:0x02045484 module:main
from:0x020a0730 kind:load to:0x0204547c add:0x8 module:main
from:0x020a075c kind:arm_call to:0x020342e0 module:main
from:0x020a0784 kind:arm_call to:0x02035590 module:main
from:0x020a0790 kind:arm_call to:0x020354ac module:main
@@ -7457,7 +7457,7 @@ from:0x020a084c kind:arm_call_thumb to:0x02015624 module:main
from:0x020a0868 kind:load to:0x020b54b4 module:overlay(0)
from:0x020a086c kind:load to:0x020b5974 module:overlay(0)
from:0x020a0870 kind:load to:0x020b59a8 module:overlay(0)
from:0x020a0874 kind:load to:0x02045484 module:main
from:0x020a0874 kind:load to:0x0204547c add:0x8 module:main
from:0x020a0878 kind:load to:0x0204ba00 module:main
from:0x020a08a4 kind:arm_call to:0x02058b60 module:overlay(0)
from:0x020a08c0 kind:arm_call to:0x02058b90 module:overlay(0)
@@ -7515,7 +7515,7 @@ from:0x020a0d5c kind:load to:0x0204b6a0 module:main
from:0x020a0d60 kind:load to:0x020b5bb0 module:overlay(0)
from:0x020a0d64 kind:load to:0x020b6088 module:overlay(0)
from:0x020a0d68 kind:load to:0x020b608c module:overlay(0)
from:0x020a0d6c kind:load to:0x02045484 module:main
from:0x020a0d6c kind:load to:0x0204547c add:0x8 module:main
from:0x020a0d70 kind:load to:0x0204ba00 module:main
from:0x020a0d98 kind:arm_call_thumb to:0x02015448 module:main
from:0x020a0da4 kind:arm_call to:0x020165b8 module:main
@@ -7556,7 +7556,7 @@ from:0x020a10a4 kind:arm_call_thumb to:0x02015624 module:main
from:0x020a10b0 kind:load to:0x020b5bb0 module:overlay(0)
from:0x020a10b4 kind:load to:0x020b6088 module:overlay(0)
from:0x020a10b8 kind:load to:0x020b608c module:overlay(0)
from:0x020a10bc kind:load to:0x02045484 module:main
from:0x020a10bc kind:load to:0x0204547c add:0x8 module:main
from:0x020a10c0 kind:load to:0x0204ba00 module:main
from:0x020a10d0 kind:arm_call to:0x020a1130 module:overlay(0)
from:0x020a10ec kind:arm_call to:0x020a0628 module:overlay(0)
config/jp/arm9/overlays/ov000/symbols.txt
+1 -1
View File
@@ -2260,7 +2260,7 @@ func_ov000_02098cfc kind:function(arm,size=0x78) addr:0x02098cfc
func_ov000_02098d74 kind:function(arm,size=0x1c) addr:0x02098d74
func_ov000_02098d90 kind:function(arm,size=0x1c) addr:0x02098d90
_ZN8Actor_5c19func_ov000_020975f8Ev kind:function(arm,size=0x78) addr:0x02098dac
_ZN12ActorProfileC2E7ActorId kind:function(arm,size=0xa8) addr:0x02098e24
_ZN12ActorProfileC2Ej kind:function(arm,size=0xa8) addr:0x02098e24
_ZN12ActorProfileD2Ev kind:function(arm,size=0x28) addr:0x02098ecc
_ZN12ActorProfile8vfunc_04Ev kind:function(arm,size=0x8) addr:0x02098ef4
_ZN12ActorProfile8vfunc_08Ev kind:function(arm,size=0x7c) addr:0x02098efc
config/jp/arm9/overlays/ov001/relocs.txt
+4 -4
View File
@@ -385,10 +385,10 @@ from:0x020b9264 kind:thumb_call to:0x0201545c module:main
from:0x020b926c kind:load to:0x027e09a0 module:dtcm
from:0x020b9270 kind:load to:0x020c41b0 module:overlay(1)
from:0x020b9274 kind:load to:0x020c41c4 module:overlay(1)
from:0x020b9278 kind:load to:0x020454bc module:main
from:0x020b9278 kind:load to:0x020454b4 add:0x8 module:main
from:0x020b927c kind:load to:0x020c41c8 module:overlay(1)
from:0x020b9280 kind:load to:0x020c41e4 module:overlay(1)
from:0x020b9284 kind:load to:0x02045484 module:main
from:0x020b9284 kind:load to:0x0204547c add:0x8 module:main
from:0x020b9288 kind:load to:0x027e0ce4 module:dtcm
from:0x020b928c kind:load to:0x020c41fc module:overlay(1)
from:0x020b9290 kind:load to:0x020c4218 module:overlay(1)
@@ -629,7 +629,7 @@ from:0x020ba0c0 kind:load to:0x020c42d0 module:overlay(1)
from:0x020ba0c4 kind:load to:0x027e09a0 module:dtcm
from:0x020ba0c8 kind:load to:0x020c42d8 module:overlay(1)
from:0x020ba0cc kind:load to:0x020c42ec module:overlay(1)
from:0x020ba0d0 kind:load to:0x02045484 module:main
from:0x020ba0d0 kind:load to:0x0204547c add:0x8 module:main
from:0x020ba0d4 kind:load to:0x027e09c0 module:dtcm
from:0x020ba0d8 kind:load to:0x020c4300 module:overlay(1)
from:0x020ba0dc kind:load to:0x027e0ce8 module:dtcm
@@ -666,7 +666,7 @@ from:0x020ba240 kind:thumb_call_arm to:0x0200e6a0 module:main
from:0x020ba252 kind:thumb_call to:0x02015624 module:main
from:0x020ba25c kind:load to:0x027e09a0 module:dtcm
from:0x020ba260 kind:load to:0x020c434c module:overlay(1)
from:0x020ba264 kind:load to:0x02045484 module:main
from:0x020ba264 kind:load to:0x0204547c add:0x8 module:main
from:0x020ba268 kind:load to:0x020c4364 module:overlay(1)
from:0x020ba294 kind:load to:0x027e0994 module:dtcm
from:0x020ba306 kind:thumb_call to:0x020ba29c module:overlay(1)
config/jp/arm9/overlays/ov012/relocs.txt
+1 -1
View File
@@ -112,7 +112,7 @@ from:0x020b8564 kind:thumb_call_arm to:0x020165f4 module:main
from:0x020b856a kind:thumb_call to:0x0201545c module:main
from:0x020b8574 kind:load to:0x020b5c64 module:overlay(0)
from:0x020b8578 kind:load to:0x020b9c70 module:overlay(12)
from:0x020b857c kind:load to:0x02045484 module:main
from:0x020b857c kind:load to:0x0204547c add:0x8 module:main
from:0x020b8584 kind:load to:0x0204ba00 module:main
from:0x020b8588 kind:load to:0x020b9c80 module:overlay(12)
from:0x020b8590 kind:load to:0x020b5df4 module:overlay(0)
config/jp/arm9/overlays/ov024/relocs.txt
+1 -1
View File
@@ -2058,7 +2058,7 @@ from:0x020d3ff0 kind:load to:0x020d9c08 module:overlay(24)
from:0x020d3ff4 kind:load to:0x027e09a0 module:dtcm
from:0x020d3ff8 kind:load to:0x020d9c10 module:overlay(24)
from:0x020d3ffc kind:load to:0x020d9c28 module:overlay(24)
from:0x020d4000 kind:load to:0x02045484 module:main
from:0x020d4000 kind:load to:0x0204547c add:0x8 module:main
from:0x020d40b4 kind:arm_call to:0x02011f3c module:main
from:0x020d40c8 kind:arm_call to:0x020d4120 module:overlay(24)
from:0x020d40f8 kind:arm_call to:0x02011ff4 module:main
config/jp/arm9/overlays/ov026/relocs.txt
+1 -1
View File
@@ -4673,7 +4673,7 @@ from:0x0210818c kind:arm_call_thumb to:0x02015624 module:main
from:0x02108198 kind:load to:0x027e09a4 module:dtcm
from:0x0210819c kind:load to:0x027e09a0 module:dtcm
from:0x021081a0 kind:load to:0x02138ad0 module:overlay(26)
from:0x021081a4 kind:load to:0x02045484 module:main
from:0x021081a4 kind:load to:0x0204547c add:0x8 module:main
from:0x021082d4 kind:arm_call to:0x020c7f90 module:overlay(24)
from:0x021082ec kind:arm_call_thumb to:0x020ba29c module:overlays(1,2)
from:0x02108340 kind:load to:0x027e09a4 module:dtcm
config/jp/arm9/overlays/ov028/relocs.txt
+1 -1
View File
@@ -302,7 +302,7 @@ from:0x0214629c kind:arm_call_thumb to:0x0201568c module:main
from:0x021462a4 kind:arm_call_thumb to:0x02015624 module:main
from:0x021462b0 kind:load to:0x021496a0 module:overlay(28)
from:0x021462b4 kind:load to:0x02149734 module:overlay(28)
from:0x021462b8 kind:load to:0x02045484 module:main
from:0x021462b8 kind:load to:0x0204547c add:0x8 module:main
from:0x021462d0 kind:arm_call_thumb to:0x02058cfc module:overlay(0)
from:0x021462d8 kind:arm_call to:0x02011ff4 module:main
from:0x0214639c kind:arm_call to:0x0200eab0 module:main
config/jp/arm9/overlays/ov031/relocs.txt
+1 -1
View File
@@ -29,7 +29,7 @@ from:0x020da470 kind:load to:0x021123c1 module:overlay(31)
from:0x020da474 kind:load to:0x0211470c module:overlay(31)
from:0x020da478 kind:load to:0x021146f8 module:overlay(31)
from:0x020da47c kind:load to:0x021147f0 module:overlay(31)
from:0x020da480 kind:load to:0x02045484 module:main
from:0x020da480 kind:load to:0x0204547c add:0x8 module:main
from:0x020da4b0 kind:arm_call to:0x0200f218 module:main
from:0x020da4d8 kind:arm_call to:0x0200b578 module:main
from:0x020da4e8 kind:load to:0x021123b0 module:overlay(31)
config/jp/arm9/overlays/ov088/relocs.txt
+1 -1
View File
@@ -1223,7 +1223,7 @@ from:0x02171804 kind:load to:0x020b7d08 module:overlay(0)
from:0x02171810 kind:arm_call_thumb to:0x02059bec module:overlay(0)
from:0x02171858 kind:arm_call_thumb to:0x020154e8 module:main
from:0x02171868 kind:arm_call to:0x020165b8 module:main
from:0x02171874 kind:load to:0x02045484 module:main
from:0x02171874 kind:load to:0x0204547c add:0x8 module:main
from:0x02171880 kind:arm_call to:0x02171a14 module:overlay(88)
from:0x02171888 kind:arm_call to:0x020165f4 module:main
from:0x02171890 kind:arm_call_thumb to:0x02015504 module:main
config/jp/arm9/overlays/ov089/relocs.txt
+1 -1
View File
@@ -61,7 +61,7 @@ from:0x02168338 kind:load to:0x0204b15c module:main
from:0x0216833c kind:load to:0x021730b0 module:overlay(89)
from:0x02168340 kind:load to:0x021730c8 module:overlay(89)
from:0x02168344 kind:load to:0x02172888 module:overlay(89)
from:0x02168348 kind:load to:0x02045484 module:main
from:0x02168348 kind:load to:0x0204547c add:0x8 module:main
from:0x0216834c kind:load to:0x021730cc module:overlay(89)
from:0x02168378 kind:arm_call_thumb to:0x02015414 module:main
from:0x02168394 kind:arm_call to:0x0216a1c0 module:overlay(89)
config/jp/arm9/relocs.txt
+9 -9
View File
@@ -1964,8 +1964,8 @@ from:0x02015634 kind:thumb_call to:0x020154c0 module:main
from:0x0201563a kind:thumb_call_arm to:0x02011ff4 module:main
from:0x02015654 kind:thumb_call to:0x02012f6c module:main
from:0x02015676 kind:thumb_call_arm to:0x02015318 module:main
from:0x02015684 kind:load to:0x020454bc module:main
from:0x02015688 kind:load to:0x020454a0 module:main
from:0x02015684 kind:load to:0x020454b4 add:0x8 module:main
from:0x02015688 kind:load to:0x02045498 add:0x8 module:main
from:0x02015692 kind:thumb_call_arm to:0x0201535c module:main
from:0x02015698 kind:thumb_call to:0x020154c0 module:main
from:0x020156a6 kind:thumb_call_arm to:0x0201535c module:main
@@ -2010,7 +2010,7 @@ from:0x020162c4 kind:load to:0x020454d4 module:main
from:0x020162f4 kind:arm_call_thumb to:0x02016438 module:main
from:0x02016304 kind:arm_call to:0x0202a160 module:main
from:0x0201630c kind:arm_call_thumb to:0x02015624 module:main
from:0x02016318 kind:load to:0x02045484 module:main
from:0x02016318 kind:load to:0x0204547c add:0x8 module:main
from:0x02016330 kind:arm_call to:0x02029980 module:main
from:0x02016348 kind:arm_call to:0x02033e50 module:main
from:0x020163be kind:thumb_call to:0x0201639c module:main
@@ -2100,7 +2100,7 @@ from:0x020170b4 kind:arm_call to:0x01ffb9cc module:itcm
from:0x020170d0 kind:arm_call to:0x01fff520 module:itcm
from:0x020170ec kind:load to:0x027e0ce8 module:dtcm
from:0x02017124 kind:load to:0x0203f87c module:main
from:0x020171c4 kind:load to:0x02045484 module:main
from:0x020171c4 kind:load to:0x0204547c add:0x8 module:main
from:0x02017238 kind:arm_call to:0x02035590 module:main
from:0x02017240 kind:arm_call to:0x020354ac module:main
from:0x02017254 kind:arm_call to:0x02035590 module:main
@@ -2113,7 +2113,7 @@ from:0x020172d8 kind:arm_call to:0x02035590 module:main
from:0x020172e0 kind:arm_call to:0x020354ac module:main
from:0x020172f4 kind:arm_call to:0x02035590 module:main
from:0x02017310 kind:arm_call_thumb to:0x02016438 module:main
from:0x02017324 kind:load to:0x02045484 module:main
from:0x02017324 kind:load to:0x0204547c add:0x8 module:main
from:0x02017328 kind:load to:0x020454dc module:main
from:0x0201732c kind:load to:0x020454e4 module:main
from:0x02017330 kind:load to:0x020454ec module:main
@@ -2129,7 +2129,7 @@ from:0x0201745c kind:arm_call to:0x02035590 module:main
from:0x02017464 kind:arm_call to:0x020354ac module:main
from:0x02017478 kind:arm_call to:0x02035590 module:main
from:0x02017494 kind:arm_call_thumb to:0x02016438 module:main
from:0x020174a8 kind:load to:0x02045484 module:main
from:0x020174a8 kind:load to:0x0204547c add:0x8 module:main
from:0x020174ac kind:load to:0x020454dc module:main
from:0x020174b0 kind:load to:0x020454e4 module:main
from:0x020174b4 kind:load to:0x020454ec module:main
@@ -2373,7 +2373,7 @@ from:0x02019574 kind:arm_call to:0x02028b84 module:main
from:0x0201959c kind:arm_call to:0x02026530 module:main
from:0x020195a4 kind:arm_call to:0x02026580 module:main
from:0x020195ac kind:arm_call_thumb to:0x02015624 module:main
from:0x020195b8 kind:load to:0x02045484 module:main
from:0x020195b8 kind:load to:0x0204547c add:0x8 module:main
from:0x020195dc kind:arm_call to:0x0201cc50 module:main
from:0x02019608 kind:arm_call to:0x0201cc90 module:main
from:0x0201963c kind:arm_call to:0x0201e400 module:main
@@ -2600,8 +2600,8 @@ from:0x0201b136 kind:thumb_call to:0x02000cdc module:main
from:0x0201b13c kind:thumb_call to:0x02015624 module:main
from:0x0201b142 kind:thumb_call to:0x02015624 module:main
from:0x0201b14c kind:load to:0x0203f928 module:main
from:0x0201b154 kind:load to:0x020454bc module:main
from:0x0201b158 kind:load to:0x02045484 module:main
from:0x0201b154 kind:load to:0x020454b4 add:0x8 module:main
from:0x0201b158 kind:load to:0x0204547c add:0x8 module:main
from:0x0201b15c kind:load to:0x0204ef50 module:main
from:0x0201b160 kind:load to:0x0204f55c module:main
from:0x0201b176 kind:thumb_call_arm to:0x02028b84 module:main
config/jp/arm9/symbols.txt
+30 -30
View File
@@ -762,31 +762,31 @@ _ZN10UnkStruct2C1EPKci kind:function(thumb,size=0x14) addr:0x02015448
_ZN10UnkStruct2D1Ev kind:function(thumb,size=0x14) addr:0x0201545c
func_02015470 kind:function(thumb,size=0x14) addr:0x02015470
_ZN10UnkStruct213func_020154ecEPKc kind:function(thumb,size=0x2a) addr:0x02015484
func_020154b0 kind:function(thumb,size=0x2) addr:0x020154b0
_ZN13func_020154b4D0Ev kind:function(thumb,size=0xc) addr:0x020154b4
_ZN32UnkStruct_ov000_020b4f84_00_Base13func_02015528Ev kind:function(thumb,size=0x2) addr:0x020154c0
_ZN32UnkStruct_ov000_020b4f84_00_Base13func_0201552cEv kind:function(thumb,size=0x8) addr:0x020154c4
_ZN32UnkStruct_ov000_020b4f84_00_Base13func_02015534Ev kind:function(thumb,size=0x4) addr:0x020154cc
_ZN32UnkStruct_ov000_020b4f84_00_BaseC1Ev kind:function(thumb,size=0x18) addr:0x020154d0
_ZN32UnkStruct_ov000_020b4f84_00_BaseC1EPviih kind:function(thumb,size=0x1c) addr:0x020154e8
_ZN32UnkStruct_ov000_020b4f84_00_BaseD1Ev kind:function(thumb,size=0x1c) addr:0x02015504
_ZN32UnkStruct_ov000_020b4f84_00_BaseD0Ev kind:function(thumb,size=0x24) addr:0x02015520
_ZN32UnkStruct_ov000_020b4f84_00_Base8vfunc_08Ei kind:function(thumb,size=0x2a) addr:0x02015544
_ZN32UnkStruct_ov000_020b4f84_00_Base8vfunc_0CEv kind:function(thumb,size=0x18) addr:0x02015570
_ZN32UnkStruct_ov000_020b4f84_00_Base8vfunc_10Ei kind:function(thumb,size=0x38) addr:0x02015588
func_020155c0 kind:function(thumb,size=0x1c) addr:0x020155c0
func_020155dc kind:function(thumb,size=0xc) addr:0x020155dc
func_020155e8 kind:function(thumb,size=0x12) addr:0x020155e8
func_020155fc kind:function(thumb,size=0x26) addr:0x020155fc
_ZN10UnkSystem4D1Ev kind:function(thumb,size=0xc) addr:0x02015624
func_02015630 kind:function(thumb,size=0x12) addr:0x02015630
func_02015644 kind:function(thumb,size=0x1a) addr:0x02015644
func_02015660 kind:function(thumb,size=0x2c) addr:0x02015660
func_0201568c kind:function(thumb,size=0x14) addr:0x0201568c
func_020156a0 kind:function(thumb,size=0x1a) addr:0x020156a0
func_020156bc kind:function(thumb,size=0x2a) addr:0x020156bc
func_020156e8 kind:function(thumb,size=0x6) addr:0x020156e8
func_020156f0 kind:function(thumb,size=0x30) addr:0x020156f0
_ZN14UnkFileSystem1D1Ev kind:function(thumb,size=0x2) addr:0x020154b0
_ZN14UnkFileSystem1D0Ev kind:function(thumb,size=0xc) addr:0x020154b4
_ZN14UnkFileSystem1D2Ev kind:function(thumb,size=0x2) addr:0x020154c0
_ZN14UnkFileSystem18vfunc_0CEv kind:function(thumb,size=0x8) addr:0x020154c4
_ZN14UnkFileSystem18vfunc_10Ei kind:function(thumb,size=0x4) addr:0x020154cc
_ZN14UnkFileSystem5C1Ev kind:function(thumb,size=0x18) addr:0x020154d0
_ZN14UnkFileSystem5C1EPviih kind:function(thumb,size=0x1c) addr:0x020154e8
_ZN14UnkFileSystem5D1Ev kind:function(thumb,size=0x1c) addr:0x02015504
_ZN14UnkFileSystem5D0Ev kind:function(thumb,size=0x24) addr:0x02015520
_ZN14UnkFileSystem58vfunc_08Ei kind:function(thumb,size=0x2a) addr:0x02015544
_ZN14UnkFileSystem58vfunc_0CEv kind:function(thumb,size=0x18) addr:0x02015570
_ZN14UnkFileSystem58vfunc_10Ei kind:function(thumb,size=0x38) addr:0x02015588
_ZN14UnkFileSystem4C1EPviii kind:function(thumb,size=0x1c) addr:0x020155c0
_ZN14UnkFileSystem4D1Ev kind:function(thumb,size=0xc) addr:0x020155dc
_ZN14UnkFileSystem4D0Ev kind:function(thumb,size=0x12) addr:0x020155e8
_ZN14UnkFileSystem48vfunc_08Ei kind:function(thumb,size=0x26) addr:0x020155fc
_ZN14UnkFileSystem3D1Ev kind:function(thumb,size=0xc) addr:0x02015624
_ZN14UnkFileSystem3D0Ev kind:function(thumb,size=0x12) addr:0x02015630
_ZN14UnkFileSystem38vfunc_08Ei kind:function(thumb,size=0x1a) addr:0x02015644
_ZN14UnkFileSystem2C1EPvi kind:function(thumb,size=0x2c) addr:0x02015660
_ZN14UnkFileSystem2D1Ev kind:function(thumb,size=0x14) addr:0x0201568c
_ZN14UnkFileSystem2D0Ev kind:function(thumb,size=0x1a) addr:0x020156a0
_ZN14UnkFileSystem28vfunc_08Ei kind:function(thumb,size=0x2a) addr:0x020156bc
_ZN14UnkFileSystem28vfunc_0CEv kind:function(thumb,size=0x6) addr:0x020156e8
_ZN14UnkFileSystem28vfunc_10Ei kind:function(thumb,size=0x30) addr:0x020156f0
func_02015720 kind:function(arm,size=0x38) addr:0x02015720
func_02015758 kind:function(arm,size=0x30) addr:0x02015758
func_02015788 kind:function(arm,size=0x30) addr:0x02015788
@@ -2544,11 +2544,11 @@ data_02045408 kind:data(any) addr:0x02045408
data_02045418 kind:data(any) addr:0x02045418
data_02045424 kind:data(any) addr:0x02045424
data_02045440 kind:data(any) addr:0x02045440
_ZTV32UnkStruct_ov000_020b4f84_00_Base kind:data(any) addr:0x02045444
data_02045468 kind:data(any) addr:0x02045460
data_02045484 kind:data(any) addr:0x02045484
data_020454a0 kind:data(any) addr:0x020454a0
data_020454bc kind:data(any) addr:0x020454bc
_ZTV14UnkFileSystem5 kind:data(any) addr:0x02045444
_ZTV14UnkFileSystem4 kind:data(any) addr:0x02045460
_ZTV14UnkFileSystem3 kind:data(any) addr:0x0204547c
_ZTV14UnkFileSystem2 kind:data(any) addr:0x02045498
_ZTV14UnkFileSystem1 kind:data(any) addr:0x020454b4
data_020454d0 kind:data(any) addr:0x020454d0
data_020454d4 kind:data(any) addr:0x020454d4
data_020454dc kind:data(any) addr:0x020454dc
include/Actor/Actor.hpp
+3
View File
@@ -170,6 +170,9 @@ public:
}
Actor();
ActorId GetActorId();
void func_ov000_0209848c(ActorProfile *param1);
void func_ov000_020984b0();
void func_ov000_020984b4();
include/Actor/ActorId.hpp
+3 -1
View File
@@ -3,7 +3,9 @@
#include "types.h"
#include "versions.h"
enum ActorId {
typedef u32 ActorId;
enum ActorId_ {
ActorId_None = 0,
#define DEFINE_ACTOR_TYPE(id, name) ActorId_##name = id,
#include "Actor/ActorTable.inl"
#undef DEFINE_ACTOR_TYPE
include/Actor/ActorManager.hpp
+3 -3
View File
@@ -16,7 +16,7 @@ class ActorManager : public SysObject {
public:
/* 00 */ Actor **mActorTable;
/* 04 */ Actor **mActorTableEnd;
/* 08 */ Actor **mUnk_08;
/* 08 */ Actor **mUnk_08; // pointer to first available slot?
/* 0c */ unk16 mActorCount;
/* 0e */ unk16 mNextActorId;
/* 10 */ unk8 mUnk_10;
@@ -41,7 +41,7 @@ public:
ActorManager();
~ActorManager();
ActorUnk_ov000_020a8bb0 *func_01fff3b4(unk32 param1);
Actor *func_01fff3b4(unk32 param1);
Actor **func_01fff350(void *param1, Actor **ppActorTable);
void func_ov000_02096e44(int index);
@@ -65,4 +65,4 @@ public:
static void func_ov001_020bb844();
};
extern ActorManager *gActorManager;
extern ActorManager *gpActorManager;
include/Actor/ActorRupee.hpp
+1 -1
View File
@@ -76,7 +76,7 @@ public:
/* 2c */ virtual void vfunc_2c(unk32 param1) override;
/* 4c */ virtual ~ActorRupee() override;
void func_ov017_020bf9c8(ActorUnk_ov000_020a8bb0 *param1);
void func_ov017_020bf9c8(Actor *param1);
void func_ov031_020e8d2c(Vec3p *param1, u8 param2, unk32 param3, unk32 param4);
void func_ov031_020e8fec();
include/Actor/ActorUnk_ov000_020a8bb0.hpp
-4
View File
@@ -143,8 +143,6 @@ public:
/* b8 */ virtual void vfunc_b8();
/* bc */
ActorId func_01fff458();
void func_ov000_020a8ae0(q20 param1);
ActorUnk_ov000_020a8bb0(ActorUnk_ov000_020a8bb0_a4_00 *param1, unk32 param2);
unk32 func_ov000_020a8db0();
@@ -167,6 +165,4 @@ public:
void func_ov000_020a9afc();
void func_ov031_020e3ca4();
void func_ov062_02158ce8();
};
include/Map/MapObjectId.hpp
+3 -1
View File
@@ -2,7 +2,9 @@
#include "types.h"
enum MapObjectId {
typedef u32 MapObjectId;
enum MapObjectId_ {
MapObjectId_None = 0,
#define DEFINE_MAP_OBJECT_TYPE(id, name) MapObjectId_##name = id,
#include "Map/MapObjectTable.inl"
#undef DEFINE_MAP_OBJECT_TYPE
include/MapObject/MapObject.hpp
+61 -3
View File
@@ -1,8 +1,7 @@
#pragma once
#include "Actor/ActorProfile.hpp"
#include "Actor/ActorRef.hpp"
#include "Map/MapObjectId.hpp"
#include "MapObject/MapObjectProfile.hpp"
#include "Physics/Cylinder.hpp"
#include "System/SysNew.hpp"
#include "flags.h"
@@ -10,9 +9,63 @@
#include "nitro/math.h"
#include "types.h"
typedef u32 MapObjFlags;
enum MapObjFlag_ {
MapObjFlag_Alive = FLAG(0, 0),
MapObjFlag_1 = FLAG(0, 1),
MapObjFlag_2 = FLAG(0, 2),
MapObjFlag_3 = FLAG(0, 3),
MapObjFlag_4 = FLAG(0, 4),
MapObjFlag_5 = FLAG(0, 5),
MapObjFlag_6 = FLAG(0, 6),
MapObjFlag_7 = FLAG(0, 7),
MapObjFlag_8 = FLAG(0, 8),
MapObjFlag_9 = FLAG(0, 9),
MapObjFlag_10 = FLAG(0, 10),
MapObjFlag_11 = FLAG(0, 11),
MapObjFlag_12 = FLAG(0, 12),
MapObjFlag_13 = FLAG(0, 13),
MapObjFlag_14 = FLAG(0, 14),
MapObjFlag_15 = FLAG(0, 15),
MapObjFlag_16 = FLAG(0, 16),
MapObjFlag_17 = FLAG(0, 17),
MapObjFlag_18 = FLAG(0, 18),
MapObjFlag_19 = FLAG(0, 19),
MapObjFlag_20 = FLAG(0, 20),
MapObjFlag_21 = FLAG(0, 21),
MapObjFlag_22 = FLAG(0, 22),
MapObjFlag_23 = FLAG(0, 23),
MapObjFlag_24 = FLAG(0, 24),
MapObjFlag_25 = FLAG(0, 25),
MapObjFlag_26 = FLAG(0, 26),
MapObjFlag_27 = FLAG(0, 27),
MapObjFlag_28 = FLAG(0, 28),
MapObjFlag_29 = FLAG(0, 29),
MapObjFlag_30 = FLAG(0, 30),
MapObjFlag_31 = FLAG(0, 31),
};
class MapObject : public SysObject {
public:
/* 00 (vtable) */
/* 04 */ Vec3p mPos;
/* 10 */ void *mUnk_10;
/* 14 */ unk16 mUnk_14;
/* 16 */ unk16 mUnk_16;
/* 18 */ unk8 mUnk_18; // bool? when set Link walks to the map object when touched
/* 19 */ unk8 mUnk_19;
/* 1A */ unk8 mUnk_1A;
/* 1B */ unk8 mUnk_1B;
/* 1C */ MapObjFlags mFlags[1];
/* 20 */ unk32 mUnk_20;
/* 20 */ unk32 mUnk_24;
/* 20 */ unk32 mUnk_28;
/* 20 */ unk32 mUnk_2C;
/* 20 */ unk32 mUnk_30;
/* 20 */ unk32 mUnk_34;
/* 38 */ unk32 mUnk_38;
/* 3C */ MapObjectProfile *mpProfile;
/* 40 */
/* 00 */ virtual void vfunc_00();
/* 04 */ virtual bool vfunc_04();
@@ -27,7 +80,12 @@ public:
/* 28 */ virtual void vfunc_28();
/* 2c */ virtual void vfunc_2c();
/* 30 */ virtual ~MapObject();
/* 34 */
/* 38 */
MapObject();
MapObjectId GetMapObjectId();
void func_ov000_0209d6ac(Vec3p *param1);
void func_ov031_02103878();
};
include/MapObject/MapObjectManager.hpp
+29
View File
@@ -0,0 +1,29 @@
#pragma once
#include "MapObject/MapObject.hpp"
#include "Unknown/UnkStruct_ov000_020b34c4.hpp"
#include "types.h"
class MapObjectManager {
public:
/* 00 */ MapObject **mMapObjTable;
/* 04 */ MapObject **mMapObjTableEnd;
/* 08 */ MapObject **mUnk_08; // pointer to first available slot?
/* 0C */ void **mUnk_0C; // unknown table
/* 10 */ void **mUnk_10; // unknown table end
/* 14 */ void *mUnk_14;
/* 18 */ unk16 mUnk_18;
/* 1A */ unk16 mUnk_1A;
/* 1C */ unk16 mUnk_1C;
/* 1E */ unk16 mUnk_1E;
/* 20 */ unk16 mUnk_20;
/* 22 */ unk16 mUnk_22;
/* 24 */ STRUCT_PAD(0x24, 0x6C);
/* 6C */ void *mUnk_6C;
/* 70 */
MapObject **func_01fff520(UnkStruct_ov000_020b34c4 *param1, void *);
MapObject *func_01fff498(unk32 param1, unk32 param2);
};
extern MapObjectManager *gpMapObjManager;
include/MapObject/MapObjectProfile.hpp
+183 -2
View File
@@ -3,23 +3,204 @@
#include "Map/MapObjectId.hpp"
#include "Physics/Cylinder.hpp"
#include "System/SysNew.hpp"
#include "Unknown/Common.hpp"
#include "Unknown/UnkStruct_ov000_020b4f84.hpp"
#include "profile.hpp"
#include "types.h"
class MapObject;
class MapObjectProfile_D4_Base {
public:
/* 00 (vtable) */
/* 04 */ unk8 mUnk_04;
/* 05 */ unk8 mUnk_05;
/* 06 */ unk8 mUnk_06;
/* 07 */ unk8 mUnk_07;
/* 08 */ unk32 mUnk_08;
/* 0C */
MapObjectProfile_D4_Base(); // func_ov000_0207c018
// data_ov000_020b2854
/* 00 */ virtual void vfunc_00(void) = 0;
/* 04 */ virtual void vfunc_04(void) = 0;
/* 08 */ virtual void vfunc_08(void) = 0;
/* 0C */ virtual void vfunc_0C(void) = 0;
/* 10 */ virtual void vfunc_10(void) = 0;
/* 14 */ virtual void vfunc_14(void) = 0;
/* 18 */ virtual void vfunc_18(void) = 0;
/* 1C */ virtual void vfunc_1C(void) = 0;
/* 20 */
};
class MapObjectProfile_D4 : public MapObjectProfile_D4_Base {
public:
/* 00 (base) */
/* 0C */
MapObjectProfile_D4() {}
/* 00 */ virtual void vfunc_00(void);
/* 04 */ virtual void vfunc_04(void);
/* 08 */ virtual void vfunc_08(void);
/* 0C */ virtual void vfunc_0C(void);
/* 10 */ virtual void vfunc_10(void);
/* 14 */ virtual void vfunc_14(void);
/* 18 */ virtual void vfunc_18(void);
/* 1C */ virtual void vfunc_1C(void);
};
class MapObjectProfile : public SysObject {
public:
/* 00 (vtable) */
/* 04 */ unk8 mUnk_04[2];
/* 06 */ u8 mUnk_06;
/* 07 */ unk8 mUnk_07;
/* 08 */ unk32 mUnk_08;
/* 0C */ unk16 mUnk_0C;
/* 0E */ unk8 mUnk_0E;
/* 0F */ unk8 mUnk_0F;
/* 10 */ MapObjectId mMapObjId;
/* 14 */ unk32 mUnk_14;
/* 18 */ unk32 mUnk_18;
/* 1C */ unk8 mUnk_1C;
/* 1D */ unk8 mUnk_1D;
/* 1E */ unk16 mUnk_1E;
/* 20 */
MapObjectProfile(MapObjectId actorId);
MapObjectProfile(MapObjectId mapObjId); // func_ov000_0209c828
// data_ov000_020b3524
/* 00 */ virtual MapObject *Create() = 0;
/* 04 */ virtual void vfunc_04();
/* 08 */ virtual void vfunc_08();
/* 0c */ virtual void vfunc_0c();
/* 0C */ virtual void vfunc_0C();
/* 10 */ virtual void vfunc_10();
/* 14 */
};
class MapObjectProfile_Derived1_20 {
public:
/* 00 */ unk32 mUnk_00;
MapObjectProfile_Derived1_20() {
this->mUnk_00 = 0;
}
};
class MapObjectProfile_Derived1 : public MapObjectProfile {
public:
/* 00 (base) */
/* 20 */ MapObjectProfile_Derived1_20 mUnk_20[16];
/* 60 */ unk32 mUnk_60;
/* 64 */ unk16 mUnk_64;
/* 66 */ unk16 mUnk_66;
/* 68 */ MapObjectProfile_D4 mUnk_68;
/* 74 */ unk32 mUnk_74;
/* 78 */ unk32 mUnk_78;
/* 7C */ unk32 mUnk_7C;
/* 80 */ unk32 mUnk_80;
/* 84 */ unk32 mUnk_84;
/* 88 */
MapObjectProfile_Derived1(MapObjectId mapObjId); // func_ov000_0209cb4c
};
class MapObjectProfile_Derived2_20_Base_18 {
public:
/* 00 */ unk32 mUnk_00;
/* 04 */ unk32 mUnk_04;
/* 08 */
MapObjectProfile_Derived2_20_Base_18(); // func_02016620
};
class MapObjectProfile_Derived2_20_Base_20 {
public:
/* 00 */ unk32 mUnk_00;
/* 04 */ unk32 mUnk_04;
/* 08 */ unk32 mUnk_08;
/* 0C */
MapObjectProfile_Derived2_20_Base_20(unk32 param1, unk32 param2, unk32 param3, unk32 param4,
unk32 param5); // func_020153fc
};
class MapObjectProfile_Derived2_20_Base_54 {
public:
/* 00 */ unk32 mUnk_00;
/* 04 */ unk32 mUnk_04;
/* 08 */ unk32 mUnk_08;
/* 0C */ unk32 mUnk_0C;
/* 10 */
MapObjectProfile_Derived2_20_Base_54();
~MapObjectProfile_Derived2_20_Base_54();
};
class MapObjectProfile_Derived2_20_Base {
public:
/* 00 (vtable) */
/* 04 */ unk32 mUnk_04;
/* 08 */ unk32 mUnk_08;
/* 0C */ unk32 mUnk_0C;
/* 10 */ unk32 mUnk_10;
/* 14 */ unk8 mUnk_14; // bool?
/* 15 */ unk8 mUnk_15; // bool?
/* 16 */ unk8 mUnk_16; // bool?
/* 17 */ unk8 mUnk_17; // pad?
/* 18 */ MapObjectProfile_Derived2_20_Base_18 mUnk_18;
/* 20 */ MapObjectProfile_Derived2_20_Base_20 mUnk_20;
/* 2C */ UnkFileSystem3 mUnk_2C;
/* 3C */ UnkFileSystem5 mUnk_3C;
/* 50 */ unk32 mUnk_50;
/* 54 */ MapObjectProfile_Derived2_20_Base_54 mUnk_54[4];
/* 94 */
MapObjectProfile_Derived2_20_Base(const char *directory, void *param2, void *param3, void *param4, unk32 param5,
unk32 param6); // func_ov000_02058540
// data_ov000_020b1b14
/* 00 */ virtual ~MapObjectProfile_Derived2_20_Base();
/* 08 */
};
class MapObjectProfile_Derived2_20 : public MapObjectProfile_Derived2_20_Base {
public:
/* 00 (base) */
/* 94 */ unk16 mUnk_94;
/* 96 */ unk16 mUnk_96;
/* 98 */ unk16 mUnk_98;
/* 9A */ unk16 mUnk_9A;
/* 9C */ UnkFileSystem5 mUnk_9C;
/* B0 */ unk8 mUnk_B0; // bool?
/* B1 */ unk8 mUnk_B1; // bool?
/* B2 */ unk8 mUnk_B2; // pad?
/* B3 */ unk8 mUnk_B3; // pad?
/* B4 */
MapObjectProfile_Derived2_20(MapObjectId mapObjId2); // func_ov000_0209ce08
// data_ov000_020b3568
/* 00 */ virtual ~MapObjectProfile_Derived2_20() override;
};
class MapObjectProfile_Derived2 : public MapObjectProfile {
public:
/* 00 (base) */
/* 20 */ MapObjectProfile_Derived2_20 mUnk_20;
/* D4 */ MapObjectProfile_D4 mUnk_D4;
/* E0 */ Vec3p mUnk_E0;
/* EC */ Vec3p mUnk_EC;
/* F8 */
MapObjectProfile_Derived2(MapObjectId mapObjId1, MapObjectId mapObjId2); // func_ov000_0209c9a8
// data_ov000_020b3508
/* 04 */ virtual void vfunc_04() override;
/* 08 */ virtual void vfunc_08() override;
/* 0C */ virtual void vfunc_0C() override;
};
typedef MapObjectProfile *(*GetMapObjectProfile)();
include/MapObject/MapObjectUnkARWL.hpp
+2 -2
View File
@@ -10,11 +10,11 @@
class MapObjectUnkARWL : public MapObject {
public:
/* 00 (base) */
/* 94 */
/* 40 */
MapObjectUnkARWL();
/* 4C */ virtual ~MapObjectUnkARWL() override;
/* 30 */ virtual ~MapObjectUnkARWL() override;
void func_ov070_02146230(void);
void func_ov070_02146258(void);
include/MapObject/MapObjectUnkBAPL.hpp
+2 -2
View File
@@ -10,11 +10,11 @@
class MapObjectUnkBAPL : public MapObject {
public:
/* 00 (base) */
/* 94 */
/* 40 */
MapObjectUnkBAPL();
/* 4C */ virtual ~MapObjectUnkBAPL() override;
/* 30 */ virtual ~MapObjectUnkBAPL() override;
void func_ov021_020f49f4(void);
void func_ov021_020f4b4c(void);
include/MapObject/MapObjectUnkBBFL.hpp
+2 -2
View File
@@ -10,11 +10,11 @@
class MapObjectUnkBBFL : public MapObject {
public:
/* 00 (base) */
/* 94 */
/* 40 */
MapObjectUnkBBFL();
/* 4C */ virtual ~MapObjectUnkBBFL() override;
/* 30 */ virtual ~MapObjectUnkBBFL() override;
void func_ov058_0214fff4(void);
void func_ov058_021501ec(void);
include/MapObject/MapObjectUnkBFFL.hpp
+2 -2
View File
@@ -10,11 +10,11 @@
class MapObjectUnkBFFL : public MapObject {
public:
/* 00 (base) */
/* 94 */
/* 40 */
MapObjectUnkBFFL();
/* 4C */ virtual ~MapObjectUnkBFFL() override;
/* 30 */ virtual ~MapObjectUnkBFFL() override;
void func_ov021_020f5b9c(void);
void func_ov021_020f5c08(void);
include/MapObject/MapObjectUnkBFSP.hpp
+2 -2
View File
@@ -10,11 +10,11 @@
class MapObjectUnkBFSP : public MapObject {
public:
/* 00 (base) */
/* 94 */
/* 40 */
MapObjectUnkBFSP();
/* 4C */ virtual ~MapObjectUnkBFSP() override;
/* 30 */ virtual ~MapObjectUnkBFSP() override;
void func_ov021_020f6308(void);
void func_ov021_020f6334(void);
include/MapObject/MapObjectUnkBLCC.hpp
+2 -2
View File
@@ -10,11 +10,11 @@
class MapObjectUnkBLCC : public MapObject {
public:
/* 00 (base) */
/* 94 */
/* 40 */
MapObjectUnkBLCC();
/* 4C */ virtual ~MapObjectUnkBLCC() override;
/* 30 */ virtual ~MapObjectUnkBLCC() override;
void func_ov031_02109ac4(void);
void func_ov031_02109b94(void);
include/MapObject/MapObjectUnkBLCE.hpp
+2 -2
View File
@@ -10,11 +10,11 @@
class MapObjectUnkBLCE : public MapObject {
public:
/* 00 (base) */
/* 94 */
/* 40 */
MapObjectUnkBLCE();
/* 4C */ virtual ~MapObjectUnkBLCE() override;
/* 30 */ virtual ~MapObjectUnkBLCE() override;
void func_ov071_02161a40(void);
};
include/MapObject/MapObjectUnkBLCK.hpp
+2 -2
View File
@@ -10,11 +10,11 @@
class MapObjectUnkBLCK : public MapObject {
public:
/* 00 (base) */
/* 94 */
/* 40 */
MapObjectUnkBLCK();
/* 4C */ virtual ~MapObjectUnkBLCK() override;
/* 30 */ virtual ~MapObjectUnkBLCK() override;
void func_ov070_021440ac(void);
void func_ov070_02144174(void);
include/MapObject/MapObjectUnkBLCM.hpp
+2 -2
View File
@@ -10,11 +10,11 @@
class MapObjectUnkBLCM : public MapObject {
public:
/* 00 (base) */
/* 94 */
/* 40 */
MapObjectUnkBLCM();
/* 4C */ virtual ~MapObjectUnkBLCM() override;
/* 30 */ virtual ~MapObjectUnkBLCM() override;
void func_ov000_0209e4b0(void);
void func_ov000_0209e6ac(void);
include/MapObject/MapObjectUnkBLCT.hpp
+2 -2
View File
@@ -10,11 +10,11 @@
class MapObjectUnkBLCT : public MapObject {
public:
/* 00 (base) */
/* 94 */
/* 40 */
MapObjectUnkBLCT();
/* 4C */ virtual ~MapObjectUnkBLCT() override;
/* 30 */ virtual ~MapObjectUnkBLCT() override;
void func_ov071_021630e8(void);
void func_ov071_0216322c(void);
include/MapObject/MapObjectUnkBLHL.hpp
+2 -2
View File
@@ -10,11 +10,11 @@
class MapObjectUnkBLHL : public MapObject {
public:
/* 00 (base) */
/* 94 */
/* 40 */
MapObjectUnkBLHL();
/* 4C */ virtual ~MapObjectUnkBLHL() override;
/* 30 */ virtual ~MapObjectUnkBLHL() override;
void func_ov079_0215673c(void);
void func_ov079_02156780(void);
include/MapObject/MapObjectUnkBLRB.hpp
+2 -2
View File
@@ -10,11 +10,11 @@
class MapObjectUnkBLRB : public MapObject {
public:
/* 00 (base) */
/* 94 */
/* 40 */
MapObjectUnkBLRB();
/* 4C */ virtual ~MapObjectUnkBLRB() override;
/* 30 */ virtual ~MapObjectUnkBLRB() override;
void func_ov070_021454b8(void);
void func_ov070_021454cc(void);
include/MapObject/MapObjectUnkBLSR.hpp
+2 -2
View File
@@ -10,11 +10,11 @@
class MapObjectUnkBLSR : public MapObject {
public:
/* 00 (base) */
/* 94 */
/* 40 */
MapObjectUnkBLSR();
/* 4C */ virtual ~MapObjectUnkBLSR() override;
/* 30 */ virtual ~MapObjectUnkBLSR() override;
void func_ov038_0211e548(void);
void func_ov038_0211e6a0(void);
include/MapObject/MapObjectUnkBMFL.hpp
+2 -2
View File
@@ -10,11 +10,11 @@
class MapObjectUnkBMFL : public MapObject {
public:
/* 00 (base) */
/* 94 */
/* 40 */
MapObjectUnkBMFL();
/* 4C */ virtual ~MapObjectUnkBMFL() override;
/* 30 */ virtual ~MapObjectUnkBMFL() override;
void func_ov031_021025c4(void);
void func_ov031_02102708(void);
include/MapObject/MapObjectUnkBOGN.hpp
+2 -2
View File
@@ -10,11 +10,11 @@
class MapObjectUnkBOGN : public MapObject {
public:
/* 00 (base) */
/* 94 */
/* 40 */
MapObjectUnkBOGN();
/* 4C */ virtual ~MapObjectUnkBOGN() override;
/* 30 */ virtual ~MapObjectUnkBOGN() override;
void func_ov091_021688e0(void);
void func_ov091_02168910(void);
include/MapObject/MapObjectUnkBREX.hpp
+2 -2
View File
@@ -10,11 +10,11 @@
class MapObjectUnkBREX : public MapObject {
public:
/* 00 (base) */
/* 94 */
/* 40 */
MapObjectUnkBREX();
/* 4C */ virtual ~MapObjectUnkBREX() override;
/* 30 */ virtual ~MapObjectUnkBREX() override;
void func_ov031_021076b8(void);
void func_ov031_02107b04(void);
include/MapObject/MapObjectUnkBRGL.hpp
+2 -2
View File
@@ -10,11 +10,11 @@
class MapObjectUnkBRGL : public MapObject {
public:
/* 00 (base) */
/* 94 */
/* 40 */
MapObjectUnkBRGL();
/* 4C */ virtual ~MapObjectUnkBRGL() override;
/* 30 */ virtual ~MapObjectUnkBRGL() override;
void func_ov067_0215b180(void);
void func_ov067_0215b268(void);
include/MapObject/MapObjectUnkBRGS.hpp
+2 -2
View File
@@ -10,11 +10,11 @@
class MapObjectUnkBRGS : public MapObject {
public:
/* 00 (base) */
/* 94 */
/* 40 */
MapObjectUnkBRGS();
/* 4C */ virtual ~MapObjectUnkBRGS() override;
/* 30 */ virtual ~MapObjectUnkBRGS() override;
void func_ov071_021621a4(void);
void func_ov071_02162480(void);
include/MapObject/MapObjectUnkBRGW.hpp
+2 -2
View File
@@ -10,11 +10,11 @@
class MapObjectUnkBRGW : public MapObject {
public:
/* 00 (base) */
/* 94 */
/* 40 */
MapObjectUnkBRGW();
/* 4C */ virtual ~MapObjectUnkBRGW() override;
/* 30 */ virtual ~MapObjectUnkBRGW() override;
void func_ov094_02174a04(void);
void func_ov094_02174c88(void);
include/MapObject/MapObjectUnkCLMN.hpp
+2 -2
View File
@@ -10,11 +10,11 @@
class MapObjectUnkCLMN : public MapObject {
public:
/* 00 (base) */
/* 94 */
/* 40 */
MapObjectUnkCLMN();
/* 4C */ virtual ~MapObjectUnkCLMN() override;
/* 30 */ virtual ~MapObjectUnkCLMN() override;
void func_ov094_0217195c(void);
};
include/MapObject/MapObjectUnkCRWL.hpp
+2 -2
View File
@@ -10,11 +10,11 @@
class MapObjectUnkCRWL : public MapObject {
public:
/* 00 (base) */
/* 94 */
/* 40 */
MapObjectUnkCRWL();
/* 4C */ virtual ~MapObjectUnkCRWL() override;
/* 30 */ virtual ~MapObjectUnkCRWL() override;
void func_ov031_02106ff4(void);
void func_ov031_02107198(void);
include/MapObject/MapObjectUnkCSTL.hpp
+2 -2
View File
@@ -10,11 +10,11 @@
class MapObjectUnkCSTL : public MapObject {
public:
/* 00 (base) */
/* 94 */
/* 40 */
MapObjectUnkCSTL();
/* 4C */ virtual ~MapObjectUnkCSTL() override;
/* 30 */ virtual ~MapObjectUnkCSTL() override;
void func_ov027_02143c70(void);
void func_ov027_02143d5c(void);
include/MapObject/MapObjectUnkCTPT.hpp
+2 -2
View File
@@ -10,11 +10,11 @@
class MapObjectUnkCTPT : public MapObject {
public:
/* 00 (base) */
/* 94 */
/* 40 */
MapObjectUnkCTPT();
/* 4C */ virtual ~MapObjectUnkCTPT() override;
/* 30 */ virtual ~MapObjectUnkCTPT() override;
void func_ov085_02153388(void);
void func_ov085_0215339c(void);
include/MapObject/MapObjectUnkDFNC.hpp
+2 -2
View File
@@ -10,11 +10,11 @@
class MapObjectUnkDFNC : public MapObject {
public:
/* 00 (base) */
/* 94 */
/* 40 */
MapObjectUnkDFNC();
/* 4C */ virtual ~MapObjectUnkDFNC() override;
/* 30 */ virtual ~MapObjectUnkDFNC() override;
void func_ov060_02160664(void);
void func_ov060_021606b4(void);
include/MapObject/MapObjectUnkDOPA.hpp
+2 -2
View File
@@ -10,11 +10,11 @@
class MapObjectUnkDOPA : public MapObject {
public:
/* 00 (base) */
/* 94 */
/* 40 */
MapObjectUnkDOPA();
/* 4C */ virtual ~MapObjectUnkDOPA() override;
/* 30 */ virtual ~MapObjectUnkDOPA() override;
void func_ov033_02119e7c(void);
void func_ov033_02119ee0(void);
include/MapObject/MapObjectUnkDRBK.hpp
+2 -2
View File
@@ -10,11 +10,11 @@
class MapObjectUnkDRBK : public MapObject {
public:
/* 00 (base) */
/* 94 */
/* 40 */
MapObjectUnkDRBK();
/* 4C */ virtual ~MapObjectUnkDRBK() override;
/* 30 */ virtual ~MapObjectUnkDRBK() override;
void func_ov041_0212ba90(void);
void func_ov041_0212bac8(void);
include/MapObject/MapObjectUnkDRBR.hpp
+2 -2
View File
@@ -10,11 +10,11 @@
class MapObjectUnkDRBR : public MapObject {
public:
/* 00 (base) */
/* 94 */
/* 40 */
MapObjectUnkDRBR();
/* 4C */ virtual ~MapObjectUnkDRBR() override;
/* 30 */ virtual ~MapObjectUnkDRBR() override;
void func_ov086_0215e1bc(void);
};
include/MapObject/MapObjectUnkDRCK.hpp
+2 -2
View File
@@ -10,11 +10,11 @@
class MapObjectUnkDRCK : public MapObject {
public:
/* 00 (base) */
/* 94 */
/* 40 */
MapObjectUnkDRCK();
/* 4C */ virtual ~MapObjectUnkDRCK() override;
/* 30 */ virtual ~MapObjectUnkDRCK() override;
void func_ov031_020ff598(void);
void func_ov031_020ff6a8(void);
include/MapObject/MapObjectUnkDRDS.hpp
+2 -2
View File
@@ -10,11 +10,11 @@
class MapObjectUnkDRDS : public MapObject {
public:
/* 00 (base) */
/* 94 */
/* 40 */
MapObjectUnkDRDS();
/* 4C */ virtual ~MapObjectUnkDRDS() override;
/* 30 */ virtual ~MapObjectUnkDRDS() override;
void func_ov031_020fd234(void);
void func_ov031_020fd284(void);
include/MapObject/MapObjectUnkDRGN.hpp
+2 -2
View File
@@ -10,11 +10,11 @@
class MapObjectUnkDRGN : public MapObject {
public:
/* 00 (base) */
/* 94 */
/* 40 */
MapObjectUnkDRGN();
/* 4C */ virtual ~MapObjectUnkDRGN() override;
/* 30 */ virtual ~MapObjectUnkDRGN() override;
void func_ov067_0215bb08(void);
void func_ov067_0215bce0(void);
include/MapObject/MapObjectUnkDRHS.hpp
+2 -2
View File
@@ -10,11 +10,11 @@
class MapObjectUnkDRHS : public MapObject {
public:
/* 00 (base) */
/* 94 */
/* 40 */
MapObjectUnkDRHS();
/* 4C */ virtual ~MapObjectUnkDRHS() override;
/* 30 */ virtual ~MapObjectUnkDRHS() override;
void func_ov058_0214f964(void);
void func_ov058_0214f9f4(void);
include/MapObject/MapObjectUnkDRKY.hpp
+2 -2
View File
@@ -10,11 +10,11 @@
class MapObjectUnkDRKY : public MapObject {
public:
/* 00 (base) */
/* 94 */
/* 40 */
MapObjectUnkDRKY();
/* 4C */ virtual ~MapObjectUnkDRKY() override;
/* 30 */ virtual ~MapObjectUnkDRKY() override;
void func_ov031_020fe86c(void);
void func_ov031_020fe888(void);
include/MapObject/MapObjectUnkDRMC.hpp
+2 -2
View File
@@ -10,11 +10,11 @@
class MapObjectUnkDRMC : public MapObject {
public:
/* 00 (base) */
/* 94 */
/* 40 */
MapObjectUnkDRMC();
/* 4C */ virtual ~MapObjectUnkDRMC() override;
/* 30 */ virtual ~MapObjectUnkDRMC() override;
void func_ov041_0212d050(void);
void func_ov041_0212d074(void);
include/MapObject/MapObjectUnkDRRS.hpp
+2 -2
View File
@@ -10,11 +10,11 @@
class MapObjectUnkDRRS : public MapObject {
public:
/* 00 (base) */
/* 94 */
/* 40 */
MapObjectUnkDRRS();
/* 4C */ virtual ~MapObjectUnkDRRS() override;
/* 30 */ virtual ~MapObjectUnkDRRS() override;
void func_ov086_0215e778(void);
void func_ov086_0215e78c(void);
include/MapObject/MapObjectUnkDRSN.hpp
+2 -2
View File
@@ -10,11 +10,11 @@
class MapObjectUnkDRSN : public MapObject {
public:
/* 00 (base) */
/* 94 */
/* 40 */
MapObjectUnkDRSN();
/* 4C */ virtual ~MapObjectUnkDRSN() override;
/* 30 */ virtual ~MapObjectUnkDRSN() override;
void func_ov079_021569b4(void);
void func_ov079_02156a90(void);
include/MapObject/MapObjectUnkDRST.hpp
+2 -2
View File
@@ -10,11 +10,11 @@
class MapObjectUnkDRST : public MapObject {
public:
/* 00 (base) */
/* 94 */
/* 40 */
MapObjectUnkDRST();
/* 4C */ virtual ~MapObjectUnkDRST() override;
/* 30 */ virtual ~MapObjectUnkDRST() override;
void func_ov070_02148cf0(void);
void func_ov070_02148d0c(void);
include/MapObject/MapObjectUnkDRSW.hpp
+2 -2
View File
@@ -10,11 +10,11 @@
class MapObjectUnkDRSW : public MapObject {
public:
/* 00 (base) */
/* 94 */
/* 40 */
MapObjectUnkDRSW();
/* 4C */ virtual ~MapObjectUnkDRSW() override;
/* 30 */ virtual ~MapObjectUnkDRSW() override;
void func_ov031_020feee4(void);
void func_ov031_020fefac(void);
include/MapObject/MapObjectUnkDRTC.hpp
+2 -2
View File
@@ -10,11 +10,11 @@
class MapObjectUnkDRTC : public MapObject {
public:
/* 00 (base) */
/* 94 */
/* 40 */
MapObjectUnkDRTC();
/* 4C */ virtual ~MapObjectUnkDRTC() override;
/* 30 */ virtual ~MapObjectUnkDRTC() override;
void func_ov031_021002fc(void);
void func_ov031_02100314(void);
include/MapObject/MapObjectUnkDRTK.hpp
+2 -2
View File
@@ -10,11 +10,11 @@
class MapObjectUnkDRTK : public MapObject {
public:
/* 00 (base) */
/* 94 */
/* 40 */
MapObjectUnkDRTK();
/* 4C */ virtual ~MapObjectUnkDRTK() override;
/* 30 */ virtual ~MapObjectUnkDRTK() override;
void func_ov041_0212c96c(void);
void func_ov041_0212c9e0(void);
include/MapObject/MapObjectUnkDRTW.hpp
+2 -2
View File
@@ -10,11 +10,11 @@
class MapObjectUnkDRTW : public MapObject {
public:
/* 00 (base) */
/* 94 */
/* 40 */
MapObjectUnkDRTW();
/* 4C */ virtual ~MapObjectUnkDRTW() override;
/* 30 */ virtual ~MapObjectUnkDRTW() override;
void func_ov048_02133dc4(void);
void func_ov048_02133e94(void);
include/MapObject/MapObjectUnkDRTY.hpp
+7 -3
View File
@@ -4,17 +4,21 @@
#include "MapObject/MapObject.hpp"
#include "MapObject/MapObjectProfile.hpp"
#include "MapObject/MapObjectUnkWPHL.hpp"
#include "global.h"
#include "types.h"
class MapObjectUnkDRTY : public MapObject {
class MapObjectUnkDRTY : public MapObjectUnkWPHL { //! TODO: fake?
public:
/* 00 (base) */
/* 94 */
/* 8C */ STRUCT_PAD(0x8C, 0xCC);
/* CC */ unk32 mUnk_CC;
/* D0 */ STRUCT_PAD(0xD0, 0xF4);
/* F4 */
MapObjectUnkDRTY();
/* 4C */ virtual ~MapObjectUnkDRTY() override;
/* 30 */ virtual ~MapObjectUnkDRTY() override;
void func_ov061_02159660(void);
void func_ov061_0215978c(void);
include/MapObject/MapObjectUnkDRVC.hpp
+2 -2
View File
@@ -10,11 +10,11 @@
class MapObjectUnkDRVC : public MapObject {
public:
/* 00 (base) */
/* 94 */
/* 40 */
MapObjectUnkDRVC();
/* 4C */ virtual ~MapObjectUnkDRVC() override;
/* 30 */ virtual ~MapObjectUnkDRVC() override;
void func_ov068_02160be8(void);
void func_ov068_02160c64(void);
include/MapObject/MapObjectUnkDRVT.hpp
+2 -2
View File
@@ -10,11 +10,11 @@
class MapObjectUnkDRVT : public MapObject {
public:
/* 00 (base) */
/* 94 */
/* 40 */
MapObjectUnkDRVT();
/* 4C */ virtual ~MapObjectUnkDRVT() override;
/* 30 */ virtual ~MapObjectUnkDRVT() override;
void func_ov067_0215c27c(void);
void func_ov067_0215c318(void);
include/MapObject/MapObjectUnkEBRD.hpp
+2 -2
View File
@@ -10,11 +10,11 @@
class MapObjectUnkEBRD : public MapObject {
public:
/* 00 (base) */
/* 94 */
/* 40 */
MapObjectUnkEBRD();
/* 4C */ virtual ~MapObjectUnkEBRD() override;
/* 30 */ virtual ~MapObjectUnkEBRD() override;
void func_ov026_0210aa20(void);
void func_ov026_0210ab3c(void);
include/MapObject/MapObjectUnkEFRF.hpp
+2 -2
View File
@@ -10,11 +10,11 @@
class MapObjectUnkEFRF : public MapObject {
public:
/* 00 (base) */
/* 94 */
/* 40 */
MapObjectUnkEFRF();
/* 4C */ virtual ~MapObjectUnkEFRF() override;
/* 30 */ virtual ~MapObjectUnkEFRF() override;
void func_ov028_02145b2c(void);
void func_ov028_02145b7c(void);
include/MapObject/MapObjectUnkEFRS.hpp
+2 -2
View File
@@ -10,11 +10,11 @@
class MapObjectUnkEFRS : public MapObject {
public:
/* 00 (base) */
/* 94 */
/* 40 */
MapObjectUnkEFRS();
/* 4C */ virtual ~MapObjectUnkEFRS() override;
/* 30 */ virtual ~MapObjectUnkEFRS() override;
void func_ov026_0210e944(void);
void func_ov026_0210e9bc(void);
include/MapObject/MapObjectUnkETDD.hpp
+2 -2
View File
@@ -10,11 +10,11 @@
class MapObjectUnkETDD : public MapObject {
public:
/* 00 (base) */
/* 94 */
/* 40 */
MapObjectUnkETDD();
/* 4C */ virtual ~MapObjectUnkETDD() override;
/* 30 */ virtual ~MapObjectUnkETDD() override;
void func_ov092_02168130(void);
void func_ov092_021681bc(void);
include/MapObject/MapObjectUnkETDK.hpp
+2 -2
View File
@@ -10,11 +10,11 @@
class MapObjectUnkETDK : public MapObject {
public:
/* 00 (base) */
/* 94 */
/* 40 */
MapObjectUnkETDK();
/* 4C */ virtual ~MapObjectUnkETDK() override;
/* 30 */ virtual ~MapObjectUnkETDK() override;
void func_ov027_021430dc(void);
void func_ov027_021432cc(void);
include/MapObject/MapObjectUnkETET.hpp
+2 -2
View File
@@ -10,11 +10,11 @@
class MapObjectUnkETET : public MapObject {
public:
/* 00 (base) */
/* 94 */
/* 40 */
MapObjectUnkETET();
/* 4C */ virtual ~MapObjectUnkETET() override;
/* 30 */ virtual ~MapObjectUnkETET() override;
void func_ov092_02166b7c(void);
void func_ov092_02166cd8(void);
include/MapObject/MapObjectUnkETFD.hpp
+2 -2
View File
@@ -10,11 +10,11 @@
class MapObjectUnkETFD : public MapObject {
public:
/* 00 (base) */
/* 94 */
/* 40 */
MapObjectUnkETFD();
/* 4C */ virtual ~MapObjectUnkETFD() override;
/* 30 */ virtual ~MapObjectUnkETFD() override;
void func_ov092_02166f5c(void);
void func_ov092_02166ffc(void);
include/MapObject/MapObjectUnkETMW.hpp
+2 -2
View File
@@ -10,11 +10,11 @@
class MapObjectUnkETMW : public MapObject {
public:
/* 00 (base) */
/* 94 */
/* 40 */
MapObjectUnkETMW();
/* 4C */ virtual ~MapObjectUnkETMW() override;
/* 30 */ virtual ~MapObjectUnkETMW() override;
void func_ov092_021673e4(void);
void func_ov092_021674a8(void);
include/MapObject/MapObjectUnkETNL.hpp
+2 -2
View File
@@ -10,11 +10,11 @@
class MapObjectUnkETNL : public MapObject {
public:
/* 00 (base) */
/* 94 */
/* 40 */
MapObjectUnkETNL();
/* 4C */ virtual ~MapObjectUnkETNL() override;
/* 30 */ virtual ~MapObjectUnkETNL() override;
void func_ov026_0210ac24(void);
void func_ov026_0210ac7c(void);
include/MapObject/MapObjectUnkETNM.hpp
+2 -2
View File
@@ -10,11 +10,11 @@
class MapObjectUnkETNM : public MapObject {
public:
/* 00 (base) */
/* 94 */
/* 40 */
MapObjectUnkETNM();
/* 4C */ virtual ~MapObjectUnkETNM() override;
/* 30 */ virtual ~MapObjectUnkETNM() override;
void func_ov090_021752cc(void);
};
include/MapObject/MapObjectUnkETNS.hpp
+2 -2
View File
@@ -10,11 +10,11 @@
class MapObjectUnkETNS : public MapObject {
public:
/* 00 (base) */
/* 94 */
/* 40 */
MapObjectUnkETNS();
/* 4C */ virtual ~MapObjectUnkETNS() override;
/* 30 */ virtual ~MapObjectUnkETNS() override;
void func_ov028_0214568c(void);
};
include/MapObject/MapObjectUnkETSD.hpp
+2 -2
View File
@@ -10,11 +10,11 @@
class MapObjectUnkETSD : public MapObject {
public:
/* 00 (base) */
/* 94 */
/* 40 */
MapObjectUnkETSD();
/* 4C */ virtual ~MapObjectUnkETSD() override;
/* 30 */ virtual ~MapObjectUnkETSD() override;
void func_ov026_0210edcc(void);
void func_ov026_0210f02c(void);
include/MapObject/MapObjectUnkETSW.hpp
+2 -2
View File
@@ -10,11 +10,11 @@
class MapObjectUnkETSW : public MapObject {
public:
/* 00 (base) */
/* 94 */
/* 40 */
MapObjectUnkETSW();
/* 4C */ virtual ~MapObjectUnkETSW() override;
/* 30 */ virtual ~MapObjectUnkETSW() override;
void func_ov028_021457e0(void);
void func_ov028_02145958(void);
include/MapObject/MapObjectUnkETTV.hpp
+2 -2
View File
@@ -10,11 +10,11 @@
class MapObjectUnkETTV : public MapObject {
public:
/* 00 (base) */
/* 94 */
/* 40 */
MapObjectUnkETTV();
/* 4C */ virtual ~MapObjectUnkETTV() override;
/* 30 */ virtual ~MapObjectUnkETTV() override;
void func_ov030_02141f54(void);
void func_ov030_02141f68(void);
include/MapObject/MapObjectUnkETUS.hpp
+2 -2
View File
@@ -10,11 +10,11 @@
class MapObjectUnkETUS : public MapObject {
public:
/* 00 (base) */
/* 94 */
/* 40 */
MapObjectUnkETUS();
/* 4C */ virtual ~MapObjectUnkETUS() override;
/* 30 */ virtual ~MapObjectUnkETUS() override;
void func_ov091_021686a4(void);
void func_ov091_0216872c(void);
include/MapObject/MapObjectUnkETYG.hpp
+2 -2
View File
@@ -10,11 +10,11 @@
class MapObjectUnkETYG : public MapObject {
public:
/* 00 (base) */
/* 94 */
/* 40 */
MapObjectUnkETYG();
/* 4C */ virtual ~MapObjectUnkETYG() override;
/* 30 */ virtual ~MapObjectUnkETYG() override;
void func_ov092_021676e8(void);
void func_ov092_021677e4(void);
include/MapObject/MapObjectUnkEXCT.hpp
+2 -2
View File
@@ -10,11 +10,11 @@
class MapObjectUnkEXCT : public MapObject {
public:
/* 00 (base) */
/* 94 */
/* 40 */
MapObjectUnkEXCT();
/* 4C */ virtual ~MapObjectUnkEXCT() override;
/* 30 */ virtual ~MapObjectUnkEXCT() override;
void func_ov060_02160a84(void);
};
include/MapObject/MapObjectUnkEXHS.hpp
+2 -2
View File
@@ -10,11 +10,11 @@
class MapObjectUnkEXHS : public MapObject {
public:
/* 00 (base) */
/* 94 */
/* 40 */
MapObjectUnkEXHS();
/* 4C */ virtual ~MapObjectUnkEXHS() override;
/* 30 */ virtual ~MapObjectUnkEXHS() override;
void func_ov058_0214fdc0(void);
};

Some files were not shown because too many files have changed in this diff Show More