mirror/st
1
0
Fork 0
mirror of https://github.com/zeldaret/st synced 2026-05-23 15:01:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

Decompile Actors SWOB, SWTM, EVIC and EFIK (#46)

Browse Source 
* decompile SWOB

* match sinit

* remove useless stuff

* decompile actor swtm

* decompile actor evic

* mark evic as complete

* decompile actor efik

* EVIC -> EventIcon
This commit is contained in:
Yanis
2026-04-12 16:54:21 +02:00
committed by GitHub
parent a12d3af472
commit dcf9268df6
36 changed files with 677 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/eur/arm9/itcm/symbols.txt
+1 -1
View File
@@ -189,7 +189,7 @@ func_01ffee10 kind:function(arm,size=0x124) addr:0x01ffee10
func_01ffef34 kind:function(arm,size=0x128) addr:0x01ffef34
func_01fff05c kind:function(arm,size=0x58) addr:0x01fff05c
func_01fff0b4 kind:function(arm,size=0x94) addr:0x01fff0b4
_ZN18UnkStruct_027e0ce013func_01fff148Ev kind:function(arm,size=0x20) addr:0x01fff148
_ZN18UnkStruct_027e0ce013func_01fff148Ei kind:function(arm,size=0x20) addr:0x01fff148
func_01fff168 kind:function(arm,size=0x14) addr:0x01fff168
func_01fff17c kind:function(arm,size=0x28) addr:0x01fff17c
func_01fff1a4 kind:function(arm,size=0x3c) addr:0x01fff1a4
config/eur/arm9/overlays/ov000/delinks.txt
+9 -3
View File
@@ -31,25 +31,31 @@ src/000_Second/Actor/ActorUnkSWOB.cpp:
.text start:0x0209a8b8 end:0x0209aca8
.init start:0x020b07e8 end:0x020b0838
.ctor start:0x020b1908 end:0x020b190c
.data start:0x020b328c end:0x020b330c
.bss start:0x020b5bfc end:0x020b5c48
src/000_Second/Actor/ActorUnkSWTM.cpp:
.text start:0x0209aca8 end:0x0209b22c
.init start:0x020b0838 end:0x020b0888
.ctor start:0x020b190c end:0x020b1910
.bss start:0x020b5c48 end:0x020b5c98
.data start:0x020b330c end:0x020b338c
.bss start:0x020b5c48 end:0x020b5c94
src/000_Second/Actor/ActorUnkEVIC.cpp:
src/000_Second/Actor/ActorEventIcon.cpp:
complete
.text start:0x0209bf88 end:0x0209c074
.init start:0x020b0888 end:0x020b08d8
.ctor start:0x020b1910 end:0x020b1914
.data start:0x020b33ac end:0x020b342c
.bss start:0x020b5c98 end:0x020b5ce4
src/000_Second/Actor/ActorUnkEFIK.cpp:
complete
.text start:0x0209c074 end:0x0209c348
.init start:0x020b08d8 end:0x020b0928
.ctor start:0x020b1914 end:0x020b1918
.bss start:0x020b5ce4 end:0x020b6118
.data start:0x020b342c end:0x020b34b0
.bss start:0x020b5ce4 end:0x020b5d30
src/000_Second/MapObject/MapObjectUnkSWST.cpp:
.text start:0x0209dce0 end:0x0209e3f8
config/eur/arm9/overlays/ov000/symbols.txt
+47 -47
View File
@@ -929,7 +929,7 @@ func_ov000_0206e654 kind:function(arm,size=0x1c) addr:0x0206e654
func_ov000_0206e670 kind:function(arm,size=0xec) addr:0x0206e670
func_ov000_0206e75c kind:function(arm,size=0x4c) addr:0x0206e75c
func_ov000_0206e7a8 kind:function(arm,size=0x40) addr:0x0206e7a8
func_ov000_0206e7e8 kind:function(arm,size=0xf0) addr:0x0206e7e8
_ZN24UnkStruct_ov000_020b521419func_ov000_0206e7e8Ei kind:function(arm,size=0xf0) addr:0x0206e7e8
func_ov000_0206e8d8 kind:function(arm,size=0xc0) addr:0x0206e8d8
func_ov000_0206e998 kind:function(arm,size=0x60) addr:0x0206e998
func_ov000_0206e9f8 kind:function(arm,size=0x60) addr:0x0206e9f8
@@ -1548,14 +1548,14 @@ func_ov000_0207fd14 kind:function(arm,size=0x4) addr:0x0207fd14
func_ov000_0207fd18 kind:function(arm,size=0x28) addr:0x0207fd18
func_ov000_0207fd40 kind:function(arm,size=0x38) addr:0x0207fd40
func_ov000_0207fd78 kind:function(arm,size=0x4) addr:0x0207fd78
func_ov000_0207fd7c kind:function(arm,size=0x40) addr:0x0207fd7c
Unknown_func_ov000_0207fd7c kind:function(arm,size=0x40) addr:0x0207fd7c
func_ov000_0207fdbc kind:function(arm,size=0x250) addr:0x0207fdbc
func_ov000_0208000c kind:function(arm,size=0x5c) addr:0x0208000c
func_ov000_02080068 kind:function(arm,size=0x18) addr:0x02080068
func_ov000_02080080 kind:function(arm,size=0x18) addr:0x02080080
func_ov000_02080098 kind:function(arm,size=0xc8) addr:0x02080098
func_ov000_02080160 kind:function(arm,size=0x20) addr:0x02080160
func_ov000_02080180 kind:function(arm,size=0x10) addr:0x02080180
_ZN21UnkStruct_027e0cd8_0c19func_ov000_02080180EPv kind:function(arm,size=0x10) addr:0x02080180
func_ov000_02080190 kind:function(arm,size=0x20) addr:0x02080190
func_ov000_020801b0 kind:function(arm,size=0x60) addr:0x020801b0
func_ov000_02080210 kind:function(arm,size=0x78) addr:0x02080210
@@ -1572,7 +1572,7 @@ func_ov000_02080840 kind:function(arm,size=0x6c) addr:0x02080840
func_ov000_020808ac kind:function(arm,size=0x20) addr:0x020808ac
func_ov000_020808cc kind:function(arm,size=0x8) addr:0x020808cc
func_ov000_020808d4 kind:function(arm,size=0x20) addr:0x020808d4
func_ov000_020808f4 kind:function(arm,size=0x5c) addr:0x020808f4
_ZN21UnkStruct_027e0cd8_0c19func_ov000_020808f4EPvS0_i kind:function(arm,size=0x5c) addr:0x020808f4
func_ov000_02080950 kind:function(arm,size=0x48) addr:0x02080950
func_ov000_02080998 kind:function(arm,size=0x40) addr:0x02080998
func_ov000_020809d8 kind:function(arm,size=0x6c) addr:0x020809d8
@@ -1633,8 +1633,8 @@ func_ov000_02081ca0 kind:function(arm,size=0xa8) addr:0x02081ca0
func_ov000_02081d48 kind:function(arm,size=0x10) addr:0x02081d48
func_ov000_02081d58 kind:function(arm,size=0x4) addr:0x02081d58
func_ov000_02081d5c kind:function(arm,size=0x20) addr:0x02081d5c
func_ov000_02081d7c kind:function(arm,size=0xb4) addr:0x02081d7c
func_ov000_02081e30 kind:function(arm,size=0x8c) addr:0x02081e30
_ZN18UnkStruct_027e0cd819func_ov000_02081d7cEiii kind:function(arm,size=0xb4) addr:0x02081d7c
_ZN18UnkStruct_027e0cd819func_ov000_02081e30Eii kind:function(arm,size=0x8c) addr:0x02081e30
func_ov000_02081ebc kind:function(arm,size=0x10) addr:0x02081ebc
_ZN18UnkStruct_027e0cd819func_ov000_02081eccEsi kind:function(arm,size=0x10) addr:0x02081ecc
func_ov000_02081edc kind:function(arm,size=0x10) addr:0x02081edc
@@ -2321,13 +2321,13 @@ _ZN5Actor8vfunc_1cEv kind:function(arm,size=0x4) addr:0x020984b0
_ZN5Actor8vfunc_20Ev kind:function(arm,size=0x4) addr:0x020984b4
_ZN5Actor8vfunc_24Ev kind:function(arm,size=0x4) addr:0x020984b8
_ZN5Actor8vfunc_28Ev kind:function(arm,size=0x4) addr:0x020984bc
_ZN5Actor8vfunc_2cEv kind:function(arm,size=0x4) addr:0x020984c0
_ZN5Actor8vfunc_2cEi kind:function(arm,size=0x4) addr:0x020984c0
_ZN5Actor8vfunc_30Ev kind:function(arm,size=0x4) addr:0x020984c4
_ZN5Actor8vfunc_34Ev kind:function(arm,size=0x8) addr:0x020984c8
_ZN5Actor19func_ov000_020984d0Ev kind:function(arm,size=0x20) addr:0x020984d0
_ZN5Actor19func_ov000_020984f0Ev kind:function(arm,size=0x28) addr:0x020984f0
_ZN5Actor8vfunc_00EP5Vec3p kind:function(arm,size=0x24) addr:0x02098518
_ZN5Actor19func_ov000_0209853cEv kind:function(arm,size=0x18) addr:0x0209853c
_ZN5Actor19func_ov000_0209853cEi kind:function(arm,size=0x18) addr:0x0209853c
_ZN5Actor8vfunc_04Ev kind:function(arm,size=0x18) addr:0x02098554
_ZN5Actor8vfunc_08Ev kind:function(arm,size=0xc) addr:0x0209856c
_ZN5Actor8vfunc_0cEv kind:function(arm,size=0xc) addr:0x02098578
@@ -2346,7 +2346,7 @@ _ZN5Actor19func_ov000_02098910Eii kind:function(arm,size=0xd0) addr:0x02098910
func_ov000_020989e0 kind:function(arm,size=0x38) addr:0x020989e0
func_ov000_02098a18 kind:function(arm,size=0x48) addr:0x02098a18
_ZN5Actor19func_ov000_02098a60Ei kind:function(arm,size=0x28) addr:0x02098a60
func_ov000_02098a88 kind:function(arm,size=0x2c) addr:0x02098a88
_ZN5Actor19func_ov000_02098a88Eii kind:function(arm,size=0x2c) addr:0x02098a88
func_ov000_02098ab4 kind:function(arm,size=0x74) addr:0x02098ab4
func_ov000_02098b28 kind:function(arm,size=0x64) addr:0x02098b28
func_ov000_02098b8c kind:function(arm,size=0x184) addr:0x02098b8c
@@ -2436,8 +2436,8 @@ _ZN19ActorProfileUnkSWOB10GetProfileEv kind:function(arm,size=0xc) addr:0x0209a8
_ZN19ActorProfileUnkSWOB6CreateEv kind:function(arm,size=0x24) addr:0x0209a8c4
_ZN19ActorProfileUnkSWOBC1Ev kind:function(arm,size=0x28) addr:0x0209a8e8
_ZN12ActorUnkSWOBC1Ev kind:function(arm,size=0x38) addr:0x0209a910
_ZN12ActorUnkSWOB19func_ov000_0209a948Ev kind:function(arm,size=0x6c) addr:0x0209a948
_ZN12ActorUnkSWOB19func_ov000_0209a9b4Ev kind:function(arm,size=0x7c) addr:0x0209a9b4
_ZN12ActorUnkSWOB8vfunc_18Ei kind:function(arm,size=0x6c) addr:0x0209a948
_ZN12ActorUnkSWOB19func_ov000_0209a9b4Ei kind:function(arm,size=0x7c) addr:0x0209a9b4
_ZN12ActorUnkSWOB19func_ov000_0209aa30Ev kind:function(arm,size=0x234) addr:0x0209aa30
_ZN12ActorUnkSWOBD1Ev kind:function(arm,size=0x14) addr:0x0209ac64
_ZN12ActorUnkSWOBD0Ev kind:function(arm,size=0x1c) addr:0x0209ac78
@@ -2448,10 +2448,10 @@ _ZN19ActorProfileUnkSWTMC1Ev kind:function(arm,size=0x28) addr:0x0209acd8
_ZN12ActorUnkSWTMC1Ev kind:function(arm,size=0x5c) addr:0x0209ad00
_ZN12ActorUnkSWTMD1Ev kind:function(arm,size=0x48) addr:0x0209ad5c
_ZN12ActorUnkSWTMD0Ev kind:function(arm,size=0x50) addr:0x0209ada4
_ZN12ActorUnkSWTM19func_ov000_0209adf4Ev kind:function(arm,size=0x74) addr:0x0209adf4
_ZN12ActorUnkSWTM19func_ov000_0209ae68Ev kind:function(arm,size=0xe8) addr:0x0209ae68
_ZN12ActorUnkSWTM19func_ov000_0209af50Ev kind:function(arm,size=0x4) addr:0x0209af50
_ZN12ActorUnkSWTM19func_ov000_0209af54Ev kind:function(arm,size=0x90) addr:0x0209af54
_ZN12ActorUnkSWTM8vfunc_18Ei kind:function(arm,size=0x74) addr:0x0209adf4
_ZN12ActorUnkSWTM8vfunc_20Ev kind:function(arm,size=0xe8) addr:0x0209ae68
_ZN12ActorUnkSWTM8vfunc_24Ev kind:function(arm,size=0x4) addr:0x0209af50
_ZN12ActorUnkSWTM19func_ov000_0209af54Ei kind:function(arm,size=0x90) addr:0x0209af54
_ZN12ActorUnkSWTM19func_ov000_0209afe4Ev kind:function(arm,size=0x54) addr:0x0209afe4
_ZN12ActorUnkSWTM19func_ov000_0209b038Ev kind:function(arm,size=0x128) addr:0x0209b038
_ZN12ActorUnkSWTM19func_ov000_0209b160Ev kind:function(arm,size=0x24) addr:0x0209b160
@@ -2473,22 +2473,22 @@ func_ov000_0209bce8 kind:function(arm,size=0x40) addr:0x0209bce8
func_ov000_0209bd28 kind:function(arm,size=0x200) addr:0x0209bd28
func_ov000_0209bf28 kind:function(arm,size=0x2c) addr:0x0209bf28
func_ov000_0209bf54 kind:function(arm,size=0x34) addr:0x0209bf54
_ZN19ActorProfileUnkEVIC10GetProfileEv kind:function(arm,size=0xc) addr:0x0209bf88
_ZN19ActorProfileUnkEVIC6CreateEv kind:function(arm,size=0x24) addr:0x0209bf94
_ZN19ActorProfileUnkEVICC1Ev kind:function(arm,size=0x28) addr:0x0209bfb8
_ZN12ActorUnkEVICC1Ev kind:function(arm,size=0x34) addr:0x0209bfe0
_ZN12ActorUnkEVIC19func_ov000_0209c014Ev kind:function(arm,size=0x1c) addr:0x0209c014
_ZN12ActorUnkEVICD1Ev kind:function(arm,size=0x14) addr:0x0209c030
_ZN12ActorUnkEVICD0Ev kind:function(arm,size=0x1c) addr:0x0209c044
_ZN19ActorProfileUnkEVICD1Ev kind:function(arm,size=0x14) addr:0x0209c060
_ZN21ActorProfileEventIcon10GetProfileEv kind:function(arm,size=0xc) addr:0x0209bf88
_ZN21ActorProfileEventIcon6CreateEv kind:function(arm,size=0x24) addr:0x0209bf94
_ZN21ActorProfileEventIconC1Ev kind:function(arm,size=0x28) addr:0x0209bfb8
_ZN14ActorEventIconC1Ev kind:function(arm,size=0x34) addr:0x0209bfe0
_ZN14ActorEventIcon8vfunc_18Ei kind:function(arm,size=0x1c) addr:0x0209c014
_ZN14ActorEventIconD1Ev kind:function(arm,size=0x14) addr:0x0209c030
_ZN14ActorEventIconD0Ev kind:function(arm,size=0x1c) addr:0x0209c044
_ZN21ActorProfileEventIconD1Ev kind:function(arm,size=0x14) addr:0x0209c060
_ZN19ActorProfileUnkEFIK10GetProfileEv kind:function(arm,size=0xc) addr:0x0209c074
_ZN19ActorProfileUnkEFIK6CreateEv kind:function(arm,size=0x24) addr:0x0209c080
_ZN19ActorProfileUnkEFIKC1Ev kind:function(arm,size=0x28) addr:0x0209c0a4
_ZN12ActorUnkEFIKC1Ev kind:function(arm,size=0x34) addr:0x0209c0cc
_ZN12ActorUnkEFIK19func_ov000_0209c100Ev kind:function(arm,size=0x40) addr:0x0209c100
_ZN12ActorUnkEFIK19func_ov000_0209c140Ev kind:function(arm,size=0x190) addr:0x0209c140
_ZN12ActorUnkEFIK19func_ov000_0209c2d0Ev kind:function(arm,size=0x14) addr:0x0209c2d0
_ZN12ActorUnkEFIK19func_ov000_0209c2e4Ev kind:function(arm,size=0x8) addr:0x0209c2e4
_ZN12ActorUnkEFIK8vfunc_18Ei kind:function(arm,size=0x40) addr:0x0209c100
_ZN12ActorUnkEFIK8vfunc_20Ev kind:function(arm,size=0x190) addr:0x0209c140
_ZN12ActorUnkEFIK8vfunc_24Ev kind:function(arm,size=0x14) addr:0x0209c2d0
_ZN12ActorUnkEFIK8vfunc_54Ei kind:function(arm,size=0x8) addr:0x0209c2e4
_ZN12ActorUnkEFIKD1Ev kind:function(arm,size=0x20) addr:0x0209c2ec
_ZN12ActorUnkEFIKD0Ev kind:function(arm,size=0x28) addr:0x0209c30c
_ZN19ActorProfileUnkEFIKD1Ev kind:function(arm,size=0x14) addr:0x0209c334
@@ -2678,10 +2678,10 @@ func_ov000_020a00a0 kind:function(arm,size=0x34) addr:0x020a00a0
func_ov000_020a00d4 kind:function(arm,size=0x3c) addr:0x020a00d4
_ZN18UnkStruct_027e0cec19func_ov000_020a0110EP22UnkStruct_PlayerGet_ec kind:function(arm,size=0x30) addr:0x020a0110
func_ov000_020a0140 kind:function(arm,size=0xe0) addr:0x020a0140
func_ov000_020a0220 kind:function(arm,size=0xb4) addr:0x020a0220
_ZN18UnkStruct_027e0cec19func_ov000_020a0220EPvS0_ kind:function(arm,size=0xb4) addr:0x020a0220
_ZN22UnkStruct_PlayerGet_ecD1Ev kind:function(arm,size=0x30) addr:0x020a02d4
func_ov000_020a0304 kind:function(arm,size=0x30) addr:0x020a0304
func_ov000_020a0334 kind:function(arm,size=0x38) addr:0x020a0334
_ZN15ActorUnkEFIK_9819func_ov000_020a0304Ev kind:function(arm,size=0x30) addr:0x020a0304
_ZN15ActorUnkEFIK_9819func_ov000_020a0334Ev kind:function(arm,size=0x38) addr:0x020a0334
func_ov000_020a036c kind:function(arm,size=0x20) addr:0x020a036c
func_ov000_020a038c kind:function(arm,size=0x24) addr:0x020a038c
func_ov000_020a03b0 kind:function(arm,size=0x3c) addr:0x020a03b0
@@ -3349,8 +3349,8 @@ __sinit_ov000_020b0774 kind:function(arm,size=0x34) addr:0x020b0774
__sinit_ov000_020b07a8 kind:function(arm,size=0x40) addr:0x020b07a8
__sinit_ActorUnkSWOB.cpp kind:function(arm,size=0x50) addr:0x020b07e8
__sinit_ActorUnkSWTM.cpp kind:function(arm,size=0x50) addr:0x020b0838
__sinit_ActorUnkEVIC.cpp kind:function(arm,size=0x50) addr:0x020b0888
__sinit_ActorUnkEFIK.cpp kind:function(arm,size=0x50) addr:0x020b08d8
__sinit_ActorEventIcon.cpp kind:function(arm,size=0x50) addr:0x020b0888 local
__sinit_ActorUnkEFIK.cpp kind:function(arm,size=0x50) addr:0x020b08d8 local
__sinit_ov000_020b0928 kind:function(arm,size=0x28) addr:0x020b0928
__sinit_MapObjectUnkSWST.cpp kind:function(arm,size=0x5c) addr:0x020b0950
__sinit_MapObjectUnkBLCM.cpp kind:function(arm,size=0x50) addr:0x020b09ac
@@ -3384,8 +3384,8 @@ __sinit_ov000_020b18a0 kind:function(arm,size=0x14) addr:0x020b18a0
.p__sinit_ov000_020b07a8 kind:data(word) addr:0x020b1904
.p__sinit_ActorUnkSWOB.cpp kind:data(word) addr:0x020b1908
.p__sinit_ActorUnkSWTM.cpp kind:data(word) addr:0x020b190c
.p__sinit_ActorUnkEVIC.cpp kind:data(word) addr:0x020b1910
.p__sinit_ActorUnkEFIK.cpp kind:data(word) addr:0x020b1914
.p__sinit_ActorEventIcon.cpp kind:data(word) addr:0x020b1910 local
.p__sinit_ActorUnkEFIK.cpp kind:data(word) addr:0x020b1914 local
.p__sinit_ov000_020b0928 kind:data(word) addr:0x020b1918
.p__sinit_MapObjectUnkSWST.cpp kind:data(word) addr:0x020b191c
.p__sinit_MapObjectUnkBLCM.cpp kind:data(word) addr:0x020b1920
@@ -3673,17 +3673,17 @@ data_ov000_020b31a8 kind:data(any) addr:0x020b31a8
data_ov000_020b31f0 kind:data(any) addr:0x020b31f0
data_ov000_020b323c kind:data(any) addr:0x020b323c
data_ov000_020b3268 kind:data(any) addr:0x020b3268
_ZTV19data_ov000_020b328c kind:data(any) addr:0x020b328c
_ZTV19data_ov000_020b32b0 kind:data(any) addr:0x020b32b0
_ZTV19data_ov000_020b330c kind:data(any) addr:0x020b330c
_ZTV19data_ov000_020b3330 kind:data(any) addr:0x020b3330
_ZTV19ActorProfileUnkSWOB kind:data(any) addr:0x020b328c
_ZTV12ActorUnkSWOB kind:data(any) addr:0x020b32b0
_ZTV19ActorProfileUnkSWTM kind:data(any) addr:0x020b330c
_ZTV12ActorUnkSWTM kind:data(any) addr:0x020b3330
data_ov000_020b338c kind:data(any) addr:0x020b338c
data_ov000_020b33a4 kind:data(any) addr:0x020b33a4
_ZTV19data_ov000_020b33ac kind:data(any) addr:0x020b33ac
_ZTV19data_ov000_020b33d0 kind:data(any) addr:0x020b33d0
_ZTV19data_ov000_020b342c kind:data(any) addr:0x020b342c
_ZTV19data_ov000_020b3450 kind:data(any) addr:0x020b3450
data_ov000_020b34b8 kind:data(any) addr:0x020b34b8
_ZTV21ActorProfileEventIcon kind:data(any) addr:0x020b33ac
_ZTV14ActorEventIcon kind:data(any) addr:0x020b33d0
_ZTV19ActorProfileUnkEFIK kind:data(any) addr:0x020b342c
_ZTV12ActorUnkEFIK kind:data(any) addr:0x020b3450
data_ov000_020b34b8 kind:data(any) addr:0x020b34b0
data_ov000_020b34c4 kind:data(any) addr:0x020b34c4
data_ov000_020b34d0 kind:data(any) addr:0x020b34d0
data_ov000_020b34ec kind:data(any) addr:0x020b34ec
@@ -4053,11 +4053,11 @@ _ZGVN15ProfileInstanceI19ActorProfileUnkSWTME8sProfileE kind:bss addr:0x020b5c48
@10039 kind:bss addr:0x020b5c4c
_ZN15ProfileInstanceI19ActorProfileUnkSWTME8sProfileE kind:bss addr:0x020b5c58
data_ov000_020b5c94 kind:bss addr:0x020b5c94
_ZGVN15ProfileInstanceI19ActorProfileUnkEVICE8sProfileE kind:bss addr:0x020b5c98
@10045 kind:bss addr:0x020b5c9c
_ZN15ProfileInstanceI19ActorProfileUnkEVICE8sProfileE kind:bss addr:0x020b5ca8
_ZGVN15ProfileInstanceI21ActorProfileEventIconE8sProfileE kind:bss addr:0x020b5c98
@10045 kind:bss addr:0x020b5c9c local
_ZN15ProfileInstanceI21ActorProfileEventIconE8sProfileE kind:bss addr:0x020b5ca8
_ZGVN15ProfileInstanceI19ActorProfileUnkEFIKE8sProfileE kind:bss addr:0x020b5ce4
@10051 kind:bss addr:0x020b5ce8
@10051 kind:bss addr:0x020b5ce8 local
_ZN15ProfileInstanceI19ActorProfileUnkEFIKE8sProfileE kind:bss addr:0x020b5cf4
data_ov000_020b5d30 kind:bss addr:0x020b5d30
data_ov000_020b5d34 kind:bss addr:0x020b5d34
config/eur/arm9/overlays/ov005/symbols.txt
+2 -2
View File
@@ -2,10 +2,10 @@ func_ov005_020b6520 kind:function(arm,size=0x28) addr:0x020b6520
func_ov005_020b6548 kind:function(arm,size=0x28) addr:0x020b6548
func_ov005_020b6570 kind:function(arm,size=0x134) addr:0x020b6570
func_ov005_020b66a4 kind:function(arm,size=0x1a4) addr:0x020b66a4
func_ov005_020b6848 kind:function(arm,size=0xf4) addr:0x020b6848
_ZN12ActorUnkSWOB8vfunc_20Ev kind:function(arm,size=0xf4) addr:0x020b6848
func_ov005_020b693c kind:function(arm,size=0x224) addr:0x020b693c
func_ov005_020b6b60 kind:function(arm,size=0x4c) addr:0x020b6b60
func_ov005_020b6bac kind:function(arm,size=0x84) addr:0x020b6bac
_ZN14ActorEventIcon8vfunc_20Ev kind:function(arm,size=0x84) addr:0x020b6bac
func_ov005_020b6c30 kind:function(arm,size=0xd0) addr:0x020b6c30
func_ov005_020b6d00 kind:function(arm,size=0x84) addr:0x020b6d00
func_ov005_020b6d84 kind:function(arm,size=0x15c) addr:0x020b6d84
config/eur/arm9/overlays/ov017/symbols.txt
+2 -2
View File
@@ -82,8 +82,8 @@ func_ov017_020bfb18 kind:function(arm,size=0x238) addr:0x020bfb18
_ZN5Actor8vfunc_14Ev kind:function(arm,size=0x4c) addr:0x020bfd50
func_ov017_020bfd9c kind:function(arm,size=0x130) addr:0x020bfd9c
_ZN5Actor8vfunc_48Ev kind:function(arm,size=0x80) addr:0x020bfecc
func_ov017_020bff4c kind:function(arm,size=0xc) addr:0x020bff4c
func_ov017_020bff58 kind:function(arm,size=0xd4) addr:0x020bff58
_ZN14ActorEventIcon8vfunc_24Ev kind:function(arm,size=0xc) addr:0x020bff4c
_ZN14ActorEventIcon8vfunc_30Ev kind:function(arm,size=0xd4) addr:0x020bff58
func_ov017_020c002c kind:function(arm,size=0x50) addr:0x020c002c
func_ov017_020c007c kind:function(arm,size=0x60) addr:0x020c007c
func_ov017_020c00dc kind:function(arm,size=0xec) addr:0x020c00dc
config/eur/arm9/overlays/ov026/relocs.txt
+1 -1
View File
@@ -5483,7 +5483,7 @@ from:0x0210c9a8 kind:load to:0x027e0cd8 module:dtcm
from:0x0210c9b0 kind:load to:0x021334fc module:overlay(26)
from:0x0210c9b8 kind:load to:0x027e0ce8 module:dtcm
from:0x0210ca08 kind:arm_call to:0x01fff520 module:itcm
from:0x0210ca38 kind:load to:0x020b34b8 module:overlay(0)
from:0x0210ca38 kind:load to:0x020b34b0 add:0x8 module:overlay(0)
from:0x0210ca3c kind:load to:0x027e0ce8 module:dtcm
from:0x0210ca68 kind:arm_call to:0x020e94d8 module:overlay(26)
from:0x0210ca90 kind:arm_call to:0x020e9614 module:overlay(26)
config/eur/arm9/overlays/ov041/relocs.txt
+1 -1
View File
@@ -1036,7 +1036,7 @@ from:0x0212c6c8 kind:load to:0x0212d400 module:overlay(41)
from:0x0212c72c kind:arm_call to:0x01fff520 module:itcm
from:0x0212c74c kind:arm_call to:0x0209d29c module:overlay(0)
from:0x0212c780 kind:load to:0x027e09a4 module:dtcm
from:0x0212c788 kind:load to:0x020b34b8 module:overlay(0)
from:0x0212c788 kind:load to:0x020b34b0 add:0x8 module:overlay(0)
from:0x0212c78c kind:load to:0x027e0ce8 module:dtcm
from:0x0212c79c kind:arm_call_thumb to:0x02057bd4 module:overlay(0)
from:0x0212c7a4 kind:arm_call to:0x02011ff4 module:main
config/jp/arm9/itcm/symbols.txt
+1 -1
View File
@@ -189,7 +189,7 @@ func_01ffee10 kind:function(arm,size=0x124) addr:0x01ffee10
func_01ffef34 kind:function(arm,size=0x128) addr:0x01ffef34
func_01fff05c kind:function(arm,size=0x58) addr:0x01fff05c
func_01fff0b4 kind:function(arm,size=0x94) addr:0x01fff0b4
_ZN18UnkStruct_027e0ce013func_01fff148Ev kind:function(arm,size=0x20) addr:0x01fff148
_ZN18UnkStruct_027e0ce013func_01fff148Ei kind:function(arm,size=0x20) addr:0x01fff148
func_01fff168 kind:function(arm,size=0x14) addr:0x01fff168
func_01fff17c kind:function(arm,size=0x28) addr:0x01fff17c
func_01fff1a4 kind:function(arm,size=0x3c) addr:0x01fff1a4
config/jp/arm9/overlays/ov000/delinks.txt
+9 -3
View File
@@ -30,25 +30,31 @@ src/000_Second/Actor/ActorUnkSWOB.cpp:
.text start:0x0209c084 end:0x0209c474
.init start:0x020b1ff8 end:0x020b2048
.ctor start:0x020b3118 end:0x020b311c
.data start:0x020b4a8c end:0x020b4b0c
.bss start:0x020b740c end:0x020b7458
src/000_Second/Actor/ActorUnkSWTM.cpp:
.text start:0x0209c474 end:0x0209c9f8
.init start:0x020b2048 end:0x020b2098
.ctor start:0x020b311c end:0x020b3120
.bss start:0x020b7458 end:0x020b74a8
.data start:0x020b4b0c end:0x020b4b8c
.bss start:0x020b7458 end:0x020b74a4
src/000_Second/Actor/ActorUnkEVIC.cpp:
src/000_Second/Actor/ActorEventIcon.cpp:
complete
.text start:0x0209d754 end:0x0209d840
.init start:0x020b2098 end:0x020b20e8
.ctor start:0x020b3120 end:0x020b3124
.data start:0x020b4bac end:0x020b4c2c
.bss start:0x020b74a8 end:0x020b74f4
src/000_Second/Actor/ActorUnkEFIK.cpp:
complete
.text start:0x0209d840 end:0x0209db14
.init start:0x020b20e8 end:0x020b2138
.ctor start:0x020b3124 end:0x020b3128
.bss start:0x020b74f4 end:0x020b7928
.data start:0x020b4c2c end:0x020b4cb0
.bss start:0x020b74f4 end:0x020b7540
src/000_Second/MapObject/MapObjectUnkSWST.cpp:
.text start:0x0209f4a4 end:0x0209fbbc
config/jp/arm9/overlays/ov000/symbols.txt
+54 -54
View File
@@ -930,7 +930,7 @@ func_ov000_0206fc88 kind:function(arm,size=0x1c) addr:0x0206fc88
func_ov000_0206fca4 kind:function(arm,size=0xec) addr:0x0206fca4
func_ov000_0206fd90 kind:function(arm,size=0x4c) addr:0x0206fd90
func_ov000_0206fddc kind:function(arm,size=0x40) addr:0x0206fddc
func_ov000_0206fe1c kind:function(arm,size=0xf0) addr:0x0206fe1c
_ZN24UnkStruct_ov000_020b521419func_ov000_0206e7e8Ei kind:function(arm,size=0xf0) addr:0x0206fe1c
func_ov000_0206ff0c kind:function(arm,size=0xc0) addr:0x0206ff0c
func_ov000_0206ffcc kind:function(arm,size=0x60) addr:0x0206ffcc
func_ov000_0207002c kind:function(arm,size=0x60) addr:0x0207002c
@@ -1546,14 +1546,14 @@ func_ov000_020813cc kind:function(arm,size=0x4) addr:0x020813cc
func_ov000_020813d0 kind:function(arm,size=0x28) addr:0x020813d0
func_ov000_020813f8 kind:function(arm,size=0x38) addr:0x020813f8
func_ov000_02081430 kind:function(arm,size=0x4) addr:0x02081430
func_ov000_02081434 kind:function(arm,size=0x40) addr:0x02081434
Unknown_func_ov000_0207fd7c kind:function(arm,size=0x40) addr:0x02081434
func_ov000_02081474 kind:function(arm,size=0x250) addr:0x02081474
func_ov000_020816c4 kind:function(arm,size=0x5c) addr:0x020816c4
func_ov000_02081720 kind:function(arm,size=0x18) addr:0x02081720
func_ov000_02081738 kind:function(arm,size=0x18) addr:0x02081738
func_ov000_02081750 kind:function(arm,size=0xc8) addr:0x02081750
func_ov000_02081818 kind:function(arm,size=0x20) addr:0x02081818
func_ov000_02081838 kind:function(arm,size=0x10) addr:0x02081838
_ZN21UnkStruct_027e0cd8_0c19func_ov000_02080180EPv kind:function(arm,size=0x10) addr:0x02081838
func_ov000_02081848 kind:function(arm,size=0x20) addr:0x02081848
func_ov000_02081868 kind:function(arm,size=0x60) addr:0x02081868
func_ov000_020818c8 kind:function(arm,size=0x78) addr:0x020818c8
@@ -1570,7 +1570,7 @@ func_ov000_02081ef8 kind:function(arm,size=0x6c) addr:0x02081ef8
func_ov000_02081f64 kind:function(arm,size=0x20) addr:0x02081f64
func_ov000_02081f84 kind:function(arm,size=0x8) addr:0x02081f84
func_ov000_02081f8c kind:function(arm,size=0x20) addr:0x02081f8c
func_ov000_02081fac kind:function(arm,size=0x5c) addr:0x02081fac
_ZN21UnkStruct_027e0cd8_0c19func_ov000_020808f4EPvS0_i kind:function(arm,size=0x5c) addr:0x02081fac
func_ov000_02082008 kind:function(arm,size=0x48) addr:0x02082008
func_ov000_02082050 kind:function(arm,size=0x40) addr:0x02082050
func_ov000_02082090 kind:function(arm,size=0x6c) addr:0x02082090
@@ -1631,8 +1631,8 @@ func_ov000_02083358 kind:function(arm,size=0xa8) addr:0x02083358
func_ov000_02083400 kind:function(arm,size=0x10) addr:0x02083400
func_ov000_02083410 kind:function(arm,size=0x4) addr:0x02083410
func_ov000_02083414 kind:function(arm,size=0x20) addr:0x02083414
func_ov000_02083434 kind:function(arm,size=0xb4) addr:0x02083434
func_ov000_020834e8 kind:function(arm,size=0x8c) addr:0x020834e8
_ZN18UnkStruct_027e0cd819func_ov000_02081d7cEiii kind:function(arm,size=0xb4) addr:0x02083434
_ZN18UnkStruct_027e0cd819func_ov000_02081e30Eii kind:function(arm,size=0x8c) addr:0x020834e8
func_ov000_02083574 kind:function(arm,size=0x10) addr:0x02083574
_ZN18UnkStruct_027e0cd819func_ov000_02081eccEsi kind:function(arm,size=0x10) addr:0x02083584
func_ov000_02083594 kind:function(arm,size=0x10) addr:0x02083594
@@ -2318,13 +2318,13 @@ _ZN5Actor8vfunc_1cEv kind:function(arm,size=0x4) addr:0x02099c58
_ZN5Actor8vfunc_20Ev kind:function(arm,size=0x4) addr:0x02099c5c
_ZN5Actor8vfunc_24Ev kind:function(arm,size=0x4) addr:0x02099c60
_ZN5Actor8vfunc_28Ev kind:function(arm,size=0x4) addr:0x02099c64
_ZN5Actor8vfunc_2cEv kind:function(arm,size=0x4) addr:0x02099c68
_ZN5Actor8vfunc_2cEi kind:function(arm,size=0x4) addr:0x02099c68
_ZN5Actor8vfunc_30Ev kind:function(arm,size=0x4) addr:0x02099c6c
_ZN5Actor8vfunc_34Ev kind:function(arm,size=0x8) addr:0x02099c70
_ZN5Actor19func_ov000_020984d0Ev kind:function(arm,size=0x20) addr:0x02099c78
_ZN5Actor19func_ov000_020984f0Ev kind:function(arm,size=0x28) addr:0x02099c98
_ZN5Actor8vfunc_00EP5Vec3p kind:function(arm,size=0x24) addr:0x02099cc0
_ZN5Actor19func_ov000_0209853cEv kind:function(arm,size=0x18) addr:0x02099ce4
_ZN5Actor19func_ov000_0209853cEi kind:function(arm,size=0x18) addr:0x02099ce4
_ZN5Actor8vfunc_04Ev kind:function(arm,size=0x18) addr:0x02099cfc
_ZN5Actor8vfunc_08Ev kind:function(arm,size=0xc) addr:0x02099d14
_ZN5Actor8vfunc_0cEv kind:function(arm,size=0xc) addr:0x02099d20
@@ -2343,7 +2343,7 @@ _ZN5Actor19func_ov000_02098910Eii kind:function(arm,size=0xd0) addr:0x0209a0b8
func_ov000_0209a188 kind:function(arm,size=0x38) addr:0x0209a188
func_ov000_0209a1c0 kind:function(arm,size=0x48) addr:0x0209a1c0
_ZN5Actor19func_ov000_02098a60Ei kind:function(arm,size=0x28) addr:0x0209a208
_ZN10ActorRupee19func_ov000_02098a88Eii kind:function(arm,size=0x2c) addr:0x0209a230
_ZN5Actor19func_ov000_02098a88Eii kind:function(arm,size=0x2c) addr:0x0209a230
func_ov000_0209a25c kind:function(arm,size=0x74) addr:0x0209a25c
func_ov000_0209a2d0 kind:function(arm,size=0x64) addr:0x0209a2d0
func_ov000_0209a334 kind:function(arm,size=0x1a8) addr:0x0209a334
@@ -2433,9 +2433,9 @@ _ZN19ActorProfileUnkSWOB10GetProfileEv kind:function(arm,size=0xc) addr:0x0209c0
_ZN19ActorProfileUnkSWOB6CreateEv kind:function(arm,size=0x24) addr:0x0209c090
_ZN19ActorProfileUnkSWOBC1Ev kind:function(arm,size=0x28) addr:0x0209c0b4
_ZN12ActorUnkSWOBC1Ev kind:function(arm,size=0x38) addr:0x0209c0dc
_ZN12ActorUnkSWOB19func_ov000_0209c114Ev kind:function(arm,size=0x6c) addr:0x0209c114
_ZN12ActorUnkSWOB19func_ov000_0209c180Ev kind:function(arm,size=0x7c) addr:0x0209c180
_ZN12ActorUnkSWOB19func_ov000_0209c1fcEv kind:function(arm,size=0x234) addr:0x0209c1fc
_ZN12ActorUnkSWOB8vfunc_18Ei kind:function(arm,size=0x6c) addr:0x0209c114
_ZN12ActorUnkSWOB19func_ov000_0209a9b4Ei kind:function(arm,size=0x7c) addr:0x0209c180
_ZN12ActorUnkSWOB19func_ov000_0209aa30Ev kind:function(arm,size=0x234) addr:0x0209c1fc
_ZN12ActorUnkSWOBD1Ev kind:function(arm,size=0x14) addr:0x0209c430
_ZN12ActorUnkSWOBD0Ev kind:function(arm,size=0x1c) addr:0x0209c444
_ZN19ActorProfileUnkSWOBD1Ev kind:function(arm,size=0x14) addr:0x0209c460
@@ -2445,15 +2445,15 @@ _ZN19ActorProfileUnkSWTMC1Ev kind:function(arm,size=0x28) addr:0x0209c4a4
_ZN12ActorUnkSWTMC1Ev kind:function(arm,size=0x5c) addr:0x0209c4cc
_ZN12ActorUnkSWTMD1Ev kind:function(arm,size=0x48) addr:0x0209c528
_ZN12ActorUnkSWTMD0Ev kind:function(arm,size=0x50) addr:0x0209c570
_ZN12ActorUnkSWTM19func_ov000_0209c5c0Ev kind:function(arm,size=0x74) addr:0x0209c5c0
_ZN12ActorUnkSWTM19func_ov000_0209c634Ev kind:function(arm,size=0xe8) addr:0x0209c634
_ZN12ActorUnkSWTM19func_ov000_0209c71cEv kind:function(arm,size=0x4) addr:0x0209c71c
_ZN12ActorUnkSWTM19func_ov000_0209c720Ev kind:function(arm,size=0x90) addr:0x0209c720
_ZN12ActorUnkSWTM19func_ov000_0209c7b0Ev kind:function(arm,size=0x54) addr:0x0209c7b0
_ZN12ActorUnkSWTM19func_ov000_0209c804Ev kind:function(arm,size=0x128) addr:0x0209c804
_ZN12ActorUnkSWTM19func_ov000_0209c92cEv kind:function(arm,size=0x24) addr:0x0209c92c
_ZN12ActorUnkSWTM19func_ov000_0209c950Ev kind:function(arm,size=0x4c) addr:0x0209c950
_ZN12ActorUnkSWTM19func_ov000_0209c99cEv kind:function(arm,size=0x48) addr:0x0209c99c
_ZN12ActorUnkSWTM8vfunc_18Ei kind:function(arm,size=0x74) addr:0x0209c5c0
_ZN12ActorUnkSWTM8vfunc_20Ev kind:function(arm,size=0xe8) addr:0x0209c634
_ZN12ActorUnkSWTM8vfunc_24Ev kind:function(arm,size=0x4) addr:0x0209c71c
_ZN12ActorUnkSWTM19func_ov000_0209af54Ei kind:function(arm,size=0x90) addr:0x0209c720
_ZN12ActorUnkSWTM19func_ov000_0209afe4Ev kind:function(arm,size=0x54) addr:0x0209c7b0
_ZN12ActorUnkSWTM19func_ov000_0209b038Ev kind:function(arm,size=0x128) addr:0x0209c804
_ZN12ActorUnkSWTM19func_ov000_0209b160Ev kind:function(arm,size=0x24) addr:0x0209c92c
_ZN12ActorUnkSWTM19func_ov000_0209b184Ev kind:function(arm,size=0x4c) addr:0x0209c950
_ZN12ActorUnkSWTM19func_ov000_0209b1d0Ev kind:function(arm,size=0x48) addr:0x0209c99c
_ZN19ActorProfileUnkSWTMD1Ev kind:function(arm,size=0x14) addr:0x0209c9e4
func_ov000_0209c9f8 kind:function(thumb,size=0x1c) addr:0x0209c9f8
func_ov000_0209ca14 kind:function(thumb,size=0x1c) addr:0x0209ca14
@@ -2470,22 +2470,22 @@ func_ov000_0209d4b4 kind:function(arm,size=0x40) addr:0x0209d4b4
func_ov000_0209d4f4 kind:function(arm,size=0x200) addr:0x0209d4f4
func_ov000_0209d6f4 kind:function(arm,size=0x2c) addr:0x0209d6f4
func_ov000_0209d720 kind:function(arm,size=0x34) addr:0x0209d720
_ZN19ActorProfileUnkEVIC10GetProfileEv kind:function(arm,size=0xc) addr:0x0209d754
_ZN19ActorProfileUnkEVIC6CreateEv kind:function(arm,size=0x24) addr:0x0209d760
_ZN19ActorProfileUnkEVICC1Ev kind:function(arm,size=0x28) addr:0x0209d784
_ZN12ActorUnkEVICC1Ev kind:function(arm,size=0x34) addr:0x0209d7ac
_ZN12ActorUnkEVIC19func_ov000_0209d7e0Ev kind:function(arm,size=0x1c) addr:0x0209d7e0
_ZN12ActorUnkEVICD1Ev kind:function(arm,size=0x14) addr:0x0209d7fc
_ZN12ActorUnkEVICD0Ev kind:function(arm,size=0x1c) addr:0x0209d810
_ZN19ActorProfileUnkEVICD1Ev kind:function(arm,size=0x14) addr:0x0209d82c
_ZN21ActorProfileEventIcon10GetProfileEv kind:function(arm,size=0xc) addr:0x0209d754
_ZN21ActorProfileEventIcon6CreateEv kind:function(arm,size=0x24) addr:0x0209d760
_ZN21ActorProfileEventIconC1Ev kind:function(arm,size=0x28) addr:0x0209d784
_ZN14ActorEventIconC1Ev kind:function(arm,size=0x34) addr:0x0209d7ac
_ZN14ActorEventIcon8vfunc_18Ei kind:function(arm,size=0x1c) addr:0x0209d7e0
_ZN14ActorEventIconD1Ev kind:function(arm,size=0x14) addr:0x0209d7fc
_ZN14ActorEventIconD0Ev kind:function(arm,size=0x1c) addr:0x0209d810
_ZN21ActorProfileEventIconD1Ev kind:function(arm,size=0x14) addr:0x0209d82c
_ZN19ActorProfileUnkEFIK10GetProfileEv kind:function(arm,size=0xc) addr:0x0209d840
_ZN19ActorProfileUnkEFIK6CreateEv kind:function(arm,size=0x24) addr:0x0209d84c
_ZN19ActorProfileUnkEFIKC1Ev kind:function(arm,size=0x28) addr:0x0209d870
_ZN12ActorUnkEFIKC1Ev kind:function(arm,size=0x34) addr:0x0209d898
_ZN12ActorUnkEFIK19func_ov000_0209d8ccEv kind:function(arm,size=0x40) addr:0x0209d8cc
_ZN12ActorUnkEFIK19func_ov000_0209d90cEv kind:function(arm,size=0x190) addr:0x0209d90c
_ZN12ActorUnkEFIK19func_ov000_0209da9cEv kind:function(arm,size=0x14) addr:0x0209da9c
_ZN12ActorUnkEFIK19func_ov000_0209dab0Ev kind:function(arm,size=0x8) addr:0x0209dab0
_ZN12ActorUnkEFIK8vfunc_18Ei kind:function(arm,size=0x40) addr:0x0209d8cc
_ZN12ActorUnkEFIK8vfunc_20Ev kind:function(arm,size=0x190) addr:0x0209d90c
_ZN12ActorUnkEFIK8vfunc_24Ev kind:function(arm,size=0x14) addr:0x0209da9c
_ZN12ActorUnkEFIK8vfunc_54Ei kind:function(arm,size=0x8) addr:0x0209dab0
_ZN12ActorUnkEFIKD1Ev kind:function(arm,size=0x20) addr:0x0209dab8
_ZN12ActorUnkEFIKD0Ev kind:function(arm,size=0x28) addr:0x0209dad8
_ZN19ActorProfileUnkEFIKD1Ev kind:function(arm,size=0x14) addr:0x0209db00
@@ -2676,10 +2676,10 @@ func_ov000_020a1878 kind:function(arm,size=0x34) addr:0x020a1878
func_ov000_020a18ac kind:function(arm,size=0x3c) addr:0x020a18ac
_ZN18UnkStruct_027e0cec19func_ov000_020a0110EP22UnkStruct_PlayerGet_ec kind:function(arm,size=0x30) addr:0x020a18e8
func_ov000_020a1918 kind:function(arm,size=0xe0) addr:0x020a1918
func_ov000_020a19f8 kind:function(arm,size=0xb4) addr:0x020a19f8
_ZN18UnkStruct_027e0cec19func_ov000_020a0220EPvS0_ kind:function(arm,size=0xb4) addr:0x020a19f8
_ZN22UnkStruct_PlayerGet_ecD1Ev kind:function(arm,size=0x30) addr:0x020a1aac
func_ov000_020a1adc kind:function(arm,size=0x30) addr:0x020a1adc
func_ov000_020a1b0c kind:function(arm,size=0x38) addr:0x020a1b0c
_ZN15ActorUnkEFIK_9819func_ov000_020a0304Ev kind:function(arm,size=0x30) addr:0x020a1adc
_ZN15ActorUnkEFIK_9819func_ov000_020a0334Ev kind:function(arm,size=0x38) addr:0x020a1b0c
func_ov000_020a1b44 kind:function(arm,size=0x20) addr:0x020a1b44
func_ov000_020a1b64 kind:function(arm,size=0x24) addr:0x020a1b64
func_ov000_020a1b88 kind:function(arm,size=0x3c) addr:0x020a1b88
@@ -3256,7 +3256,7 @@ data_ov000_020af4a8 kind:data(any) addr:0x020af4a8
data_ov000_020af4ac kind:data(any) addr:0x020af4ac
data_ov000_020af4b0 kind:data(any) addr:0x020af4b0
data_ov000_020af4b4 kind:data(any) addr:0x020af4b4
data_ov000_020af4c4 kind:data(any) addr:0x020af4c4
data_ov000_020aed1c kind:data(any) addr:0x020af4c4
data_ov000_020af4cc kind:data(any) addr:0x020af4cc
data_ov000_020af4d0 kind:data(any) addr:0x020af4d0
data_ov000_020af4e4 kind:data(any) addr:0x020af4e4
@@ -3349,8 +3349,8 @@ __sinit_ov000_020b1f84 kind:function(arm,size=0x34) addr:0x020b1f84
__sinit_ov000_020b1fb8 kind:function(arm,size=0x40) addr:0x020b1fb8
__sinit_ActorUnkSWOB.cpp kind:function(arm,size=0x50) addr:0x020b1ff8
__sinit_ActorUnkSWTM.cpp kind:function(arm,size=0x50) addr:0x020b2048
__sinit_ActorUnkEVIC.cpp kind:function(arm,size=0x50) addr:0x020b2098
__sinit_ActorUnkEFIK.cpp kind:function(arm,size=0x50) addr:0x020b20e8
__sinit_ActorEventIcon.cpp kind:function(arm,size=0x50) addr:0x020b2098 local
__sinit_ActorUnkEFIK.cpp kind:function(arm,size=0x50) addr:0x020b20e8 local
__sinit_ov000_020b2138 kind:function(arm,size=0x28) addr:0x020b2138
__sinit_MapObjectUnkSWST.cpp kind:function(arm,size=0x5c) addr:0x020b2160
__sinit_MapObjectUnkBLCM.cpp kind:function(arm,size=0x50) addr:0x020b21bc
@@ -3384,8 +3384,8 @@ __sinit_ov000_020b30b0 kind:function(arm,size=0x14) addr:0x020b30b0
.p__sinit_ov000_020b1fb8 kind:data(word) addr:0x020b3114
.p__sinit_ActorUnkSWOB.cpp kind:data(word) addr:0x020b3118
.p__sinit_ActorUnkSWTM.cpp kind:data(word) addr:0x020b311c
.p__sinit_ActorUnkEVIC.cpp kind:data(word) addr:0x020b3120
.p__sinit_ActorUnkEFIK.cpp kind:data(word) addr:0x020b3124
.p__sinit_ActorEventIcon.cpp kind:data(word) addr:0x020b3120 local
.p__sinit_ActorUnkEFIK.cpp kind:data(word) addr:0x020b3124 local
.p__sinit_ov000_020b2138 kind:data(word) addr:0x020b3128
.p__sinit_MapObjectUnkSWST.cpp kind:data(word) addr:0x020b312c
.p__sinit_MapObjectUnkBLCM.cpp kind:data(word) addr:0x020b3130
@@ -3673,17 +3673,17 @@ data_ov000_020b49a8 kind:data(any) addr:0x020b49a8
data_ov000_020b49f0 kind:data(any) addr:0x020b49f0
data_ov000_020b4a3c kind:data(any) addr:0x020b4a3c
data_ov000_020b4a68 kind:data(any) addr:0x020b4a68
_ZTV19data_ov000_020b4a8c kind:data(any) addr:0x020b4a8c
_ZTV19data_ov000_020b4ab0 kind:data(any) addr:0x020b4ab0
_ZTV19data_ov000_020b4b0c kind:data(any) addr:0x020b4b0c
_ZTV19data_ov000_020b4b30 kind:data(any) addr:0x020b4b30
_ZTV19ActorProfileUnkSWOB kind:data(any) addr:0x020b4a8c
_ZTV12ActorUnkSWOB kind:data(any) addr:0x020b4ab0
_ZTV19ActorProfileUnkSWTM kind:data(any) addr:0x020b4b0c
_ZTV12ActorUnkSWTM kind:data(any) addr:0x020b4b30
data_ov000_020b4b8c kind:data(any) addr:0x020b4b8c
data_ov000_020b4ba4 kind:data(any) addr:0x020b4ba4
_ZTV19data_ov000_020b4bac kind:data(any) addr:0x020b4bac
_ZTV19data_ov000_020b4bd0 kind:data(any) addr:0x020b4bd0
_ZTV19data_ov000_020b4c2c kind:data(any) addr:0x020b4c2c
_ZTV19data_ov000_020b4c50 kind:data(any) addr:0x020b4c50
data_ov000_020b4cb8 kind:data(any) addr:0x020b4cb8
_ZTV21ActorProfileEventIcon kind:data(any) addr:0x020b4bac
_ZTV14ActorEventIcon kind:data(any) addr:0x020b4bd0
_ZTV19ActorProfileUnkEFIK kind:data(any) addr:0x020b4c2c
_ZTV12ActorUnkEFIK kind:data(any) addr:0x020b4c50
data_ov000_020b4cb8 kind:data(any) addr:0x020b4cb0
data_ov000_020b4cc4 kind:data(any) addr:0x020b4cc4
data_ov000_020b4cd0 kind:data(any) addr:0x020b4cd0
data_ov000_020b4cec kind:data(any) addr:0x020b4cec
@@ -4053,11 +4053,11 @@ _ZGVN15ProfileInstanceI19ActorProfileUnkSWTME8sProfileE kind:bss addr:0x020b7458
@30038 kind:bss addr:0x020b745c
_ZN15ProfileInstanceI19ActorProfileUnkSWTME8sProfileE kind:bss addr:0x020b7468
data_ov000_020b74a4 kind:bss addr:0x020b74a4
_ZGVN15ProfileInstanceI19ActorProfileUnkEVICE8sProfileE kind:bss addr:0x020b74a8
@30044 kind:bss addr:0x020b74ac
_ZN15ProfileInstanceI19ActorProfileUnkEVICE8sProfileE kind:bss addr:0x020b74b8
_ZGVN15ProfileInstanceI21ActorProfileEventIconE8sProfileE kind:bss addr:0x020b74a8
@30044 kind:bss addr:0x020b74ac local
_ZN15ProfileInstanceI21ActorProfileEventIconE8sProfileE kind:bss addr:0x020b74b8
_ZGVN15ProfileInstanceI19ActorProfileUnkEFIKE8sProfileE kind:bss addr:0x020b74f4
@30050 kind:bss addr:0x020b74f8
@30050 kind:bss addr:0x020b74f8 local
_ZN15ProfileInstanceI19ActorProfileUnkEFIKE8sProfileE kind:bss addr:0x020b7504
data_ov000_020b7540 kind:bss addr:0x020b7540
data_ov000_020b7544 kind:bss addr:0x020b7544
config/jp/arm9/overlays/ov005/symbols.txt
+2 -2
View File
@@ -2,10 +2,10 @@ func_ov005_020b7d40 kind:function(arm,size=0x28) addr:0x020b7d40
func_ov005_020b7d68 kind:function(arm,size=0x28) addr:0x020b7d68
func_ov005_020b7d90 kind:function(arm,size=0x134) addr:0x020b7d90
func_ov005_020b7ec4 kind:function(arm,size=0x1a4) addr:0x020b7ec4
func_ov005_020b8068 kind:function(arm,size=0xf4) addr:0x020b8068
_ZN12ActorUnkSWOB8vfunc_20Ev kind:function(arm,size=0xf4) addr:0x020b8068
func_ov005_020b815c kind:function(arm,size=0x224) addr:0x020b815c
func_ov005_020b8380 kind:function(arm,size=0x4c) addr:0x020b8380
func_ov005_020b83cc kind:function(arm,size=0x84) addr:0x020b83cc
_ZN14ActorEventIcon8vfunc_20Ev kind:function(arm,size=0x84) addr:0x020b83cc
func_ov005_020b8450 kind:function(arm,size=0xd0) addr:0x020b8450
func_ov005_020b8520 kind:function(arm,size=0x84) addr:0x020b8520
func_ov005_020b85a4 kind:function(arm,size=0x15c) addr:0x020b85a4
config/jp/arm9/overlays/ov017/symbols.txt
+2 -2
View File
@@ -82,8 +82,8 @@ func_ov017_020c1344 kind:function(arm,size=0x238) addr:0x020c1344
_ZN5Actor8vfunc_14Ev kind:function(arm,size=0x4c) addr:0x020c157c
func_ov017_020c15c8 kind:function(arm,size=0x130) addr:0x020c15c8
_ZN5Actor8vfunc_48Ev kind:function(arm,size=0x80) addr:0x020c16f8
func_ov017_020c1778 kind:function(arm,size=0xc) addr:0x020c1778
func_ov017_020c1784 kind:function(arm,size=0xd4) addr:0x020c1784
_ZN14ActorEventIcon8vfunc_24Ev kind:function(arm,size=0xc) addr:0x020c1778
_ZN14ActorEventIcon8vfunc_30Ev kind:function(arm,size=0xd4) addr:0x020c1784
func_ov017_020c1858 kind:function(arm,size=0x50) addr:0x020c1858
func_ov017_020c18a8 kind:function(arm,size=0x60) addr:0x020c18a8
func_ov017_020c1908 kind:function(arm,size=0xec) addr:0x020c1908
config/jp/arm9/overlays/ov026/relocs.txt
+1 -1
View File
@@ -5545,7 +5545,7 @@ from:0x0210ec04 kind:load to:0x027e0cd8 module:dtcm
from:0x0210ec0c kind:load to:0x02135874 module:overlay(26)
from:0x0210ec14 kind:load to:0x027e0ce8 module:dtcm
from:0x0210ec64 kind:arm_call to:0x01fff520 module:itcm
from:0x0210ec94 kind:load to:0x020b4cb8 module:overlay(0)
from:0x0210ec94 kind:load to:0x020b4cb0 add:0x8 module:overlay(0)
from:0x0210ec98 kind:load to:0x027e0ce8 module:dtcm
from:0x0210ecc4 kind:arm_call to:0x020eb46c module:overlay(26)
from:0x0210ecec kind:arm_call to:0x020eb5a8 module:overlay(26)
config/jp/arm9/overlays/ov041/relocs.txt
+1 -1
View File
@@ -1044,7 +1044,7 @@ from:0x0212e578 kind:load to:0x0212f2c0 module:overlay(41)
from:0x0212e5dc kind:arm_call to:0x01fff520 module:itcm
from:0x0212e5fc kind:arm_call to:0x0209ea60 module:overlay(0)
from:0x0212e630 kind:load to:0x027e09a4 module:dtcm
from:0x0212e638 kind:load to:0x020b4cb8 module:overlay(0)
from:0x0212e638 kind:load to:0x020b4cb0 add:0x8 module:overlay(0)
from:0x0212e63c kind:load to:0x027e0ce8 module:dtcm
from:0x0212e64c kind:arm_call_thumb to:0x02059154 module:overlay(0)
from:0x0212e654 kind:arm_call to:0x02011ff4 module:main
include/Actor/Actor.hpp
+19 -6
View File
@@ -31,11 +31,23 @@ public:
class Actor_5c : public Actor_5c_Base {
public:
/* 00 (base) */
// /* 04 */ STRUCT_PAD(0x04, 0x28);
// /* 28 */ unk32 mUnk_28;
Actor_5c() {};
void func_ov000_020975f8();
};
class Actor_5c_temp : public Actor_5c_Base {
public:
/* 00 (base) */
/* 10 */ STRUCT_PAD(0x10, 0x28);
/* 28 */ unk32 mUnk_28;
Actor_5c_temp() {};
void func_ov000_020975f8();
};
class UnkStruct_ov000_020b539c {
public:
/* 00 */ Actor_5c_Base mUnk_00[3];
@@ -114,18 +126,18 @@ public:
/* 6c */ u16 mUnk_6c; // actor user id?
/* 6e */ u16 mUnk_6e;
/* 70 */ u16 mUnk_70;
/* 70 */ unk16 mUnk_72;
/* 70 */ u16 mUnk_72;
/* 74 */ u8 mUnk_74;
/* 74 */ u8 mUnk_75;
/* 76 */ u16 mUnk_76;
/* 78 */ u16 mUnk_78;
/* 78 */ unk16 mUnk_7a;
/* 7c */ unk32 mUnk_7c;
/* 7A */ unk16 mUnk_7a;
/* 7C */ unk32 mUnk_7c;
/* 80 */ s16 mUnk_80;
/* 80 */ unk16 mUnk_82;
/* 84 */ unk32 mUnk_84;
/* 88 */ unk32 mUnk_88;
/* 8c */ ActorRef mRef;
/* 8C */ ActorRef mRef;
/* 90 */ ActorProfile *mType;
/* 94 */
@@ -171,7 +183,7 @@ public:
unk32 func_ov000_02098910(unk32 param1, unk32 param2);
s32 func_ov000_02098518(unk32 *param1);
void func_ov000_0209853c();
Vec3p *func_ov000_0209853c(unk32 param1);
s32 func_ov000_02098554();
s16 func_ov000_0209856c();
s8 func_ov000_02098578();
@@ -184,7 +196,8 @@ public:
void func_ov000_020973f4(UnkStruct_ov000_020b539c *param1, ActorId param2, Actor_5c param3);
void func_ov000_020989e0();
unk32 func_ov000_02098a60(unk32 param1);
bool func_ov000_02098a60(unk32 param1);
void func_ov000_02098a88(unk32 param1, unk32 param2);
void func_ov017_020bf5c4(Vec3p *param1, unk32 param2, unk32 param3, unk32 param4, unk32 param5);
};
include/Actor/ActorEventIcon.hpp
+37
View File
@@ -0,0 +1,37 @@
#pragma once
#include "Actor/Actor.hpp"
#include "Actor/ActorProfile.hpp"
#include "Unknown/Common.hpp"
#include "global.h"
#include "types.h"
class ActorEventIcon : public Actor {
public:
/* 000 (base) */
/* 094 */ UnkSubStruct19 mUnk_094; // event icon
/* 10C */ unk16 mUnk_10C;
/* 110 */ unk16 mUnk_10E; // pad?
ActorEventIcon();
/* 18 */ virtual bool vfunc_18(unk32 param1) override;
/* 20 */ virtual void vfunc_20() override;
/* 24 */ virtual void vfunc_24() override;
/* 30 */ virtual void vfunc_30() override;
/* 4C */ virtual ~ActorEventIcon() override;
void func_ov000_0209c014(void);
};
class ActorProfileEventIcon : public ActorProfile {
public:
/* 00 (base) */
ActorProfileEventIcon();
~ActorProfileEventIcon();
/* 0C */ virtual Actor *Create();
static ActorProfileEventIcon *GetProfile();
};
include/Actor/ActorProfile.hpp
+1 -1
View File
@@ -58,4 +58,4 @@ public:
/* 18 */ virtual void vfunc_18() override;
};
typedef ActorProfile *(*GetActorProfile)();
// typedef ActorProfile *(*GetActorProfile)();
include/Actor/ActorRupee.hpp
-2
View File
@@ -76,8 +76,6 @@ public:
/* 2c */ virtual void vfunc_2c(unk32 param1) override;
/* 4c */ virtual ~ActorRupee() override;
void func_ov000_02098a88(unk32 param1, unk32 param2);
void func_ov017_020bf9c8(ActorUnk_ov000_020a8bb0 *param1);
void func_ov031_020e8d2c(Vec3p *param1, u8 param2, unk32 param3, unk32 param4);
include/Actor/ActorTable.inl
+1 -1
View File
@@ -121,7 +121,7 @@ DEFINE_ACTOR_TYPE('EFWV', EFWV)
DEFINE_ACTOR_TYPE('ELVT', ELVT)
DEFINE_ACTOR_TYPE('ENGE', ENGE)
DEFINE_ACTOR_TYPE('EVCH', EVCH)
DEFINE_ACTOR_TYPE('EVIC', EVIC)
DEFINE_ACTOR_TYPE('EVIC', EventIcon)
DEFINE_ACTOR_TYPE('EWHI', EWHI)
DEFINE_ACTOR_TYPE('FBBF', FBBF)
DEFINE_ACTOR_TYPE('FBBH', FBBH)
include/Actor/ActorUnkEFIK.hpp
+20 -14
View File
@@ -1,5 +1,3 @@
//! TODO: This file was generated automatically and might contain errors
#pragma once
#include "Actor/Actor.hpp"
@@ -7,29 +5,37 @@
#include "global.h"
#include "types.h"
class ActorUnkEFIK_c4 : public Actor_c4 {
class ActorUnkEFIK_98 {
public:
ActorUnkEFIK_c4(Actor *param1);
/* 00 */ unk32 mUnk_00;
/* 00 */ virtual unk32 vfunc_00(Actor_c4_stack param1, unk32 param2) override;
/* 04 */ virtual void vfunc_04() override;
/* 08 */ virtual void vfunc_08() override;
/* 0C */ virtual void vfunc_0c(unk32 param1) override;
ActorUnkEFIK_98() {
this->mUnk_00 = 0;
}
~ActorUnkEFIK_98() {
this->func_ov000_020a0304();
}
void func_ov000_020a0304(void);
void func_ov000_020a0334();
};
class ActorUnkEFIK : public Actor {
public:
/* 00 (base) */
/* 94 */
/* 94 */ unk32 mUnk_94;
/* 98 */ ActorUnkEFIK_98 mUnk_98;
/* 9C */ unk32 mUnk_9C;
/* A0 */ unk32 mUnk_A0;
ActorUnkEFIK();
/* 18 */ virtual bool vfunc_18(unk32 param1) override;
/* 20 */ virtual void vfunc_20() override;
/* 24 */ virtual void vfunc_24() override;
/* 4C */ virtual ~ActorUnkEFIK() override;
void func_ov000_0209c100(void);
void func_ov000_0209c140(void);
void func_ov000_0209c2d0(void);
void func_ov000_0209c2e4(void);
/* 54 */ virtual void vfunc_54(unk32 param1);
};
class ActorProfileUnkEFIK : public ActorProfile {
include/Actor/ActorUnkEVIC.hpp
-42
View File
@@ -1,42 +0,0 @@
//! TODO: This file was generated automatically and might contain errors
#pragma once
#include "Actor/Actor.hpp"
#include "Actor/ActorProfile.hpp"
#include "global.h"
#include "types.h"
class ActorUnkEVIC_c4 : public Actor_c4 {
public:
ActorUnkEVIC_c4(Actor *param1);
/* 00 */ virtual unk32 vfunc_00(Actor_c4_stack param1, unk32 param2) override;
/* 04 */ virtual void vfunc_04() override;
/* 08 */ virtual void vfunc_08() override;
/* 0C */ virtual void vfunc_0c(unk32 param1) override;
};
class ActorUnkEVIC : public Actor {
public:
/* 00 (base) */
/* 94 */
ActorUnkEVIC();
/* 4C */ virtual ~ActorUnkEVIC() override;
void func_ov000_0209c014(void);
};
class ActorProfileUnkEVIC : public ActorProfile {
public:
/* 00 (base) */
ActorProfileUnkEVIC();
~ActorProfileUnkEVIC();
/* 0C */ virtual Actor *Create();
static ActorProfileUnkEVIC *GetProfile();
};
include/Actor/ActorUnkSWOB.hpp
+17 -11
View File
@@ -1,5 +1,3 @@
//! TODO: This file was generated automatically and might contain errors
#pragma once
#include "Actor/Actor.hpp"
@@ -7,27 +5,35 @@
#include "global.h"
#include "types.h"
class ActorUnkSWOB_c4 : public Actor_c4 {
class ActorUnkSWOB_A4 {
public:
ActorUnkSWOB_c4(Actor *param1);
/* 00 */ unk32 mUnk_00;
/* 00 */ virtual unk32 vfunc_00(Actor_c4_stack param1, unk32 param2) override;
/* 04 */ virtual void vfunc_04() override;
/* 08 */ virtual void vfunc_08() override;
/* 0C */ virtual void vfunc_0c(unk32 param1) override;
ActorUnkSWOB_A4() {
this->mUnk_00 = 0;
};
};
class ActorUnkSWOB : public Actor {
public:
/* 00 (base) */
/* 94 */
/* 94 */ unk32 mUnk_94;
/* 98 */ unk32 mUnk_98;
/* 9C */ unk16 mUnk_9C;
/* 9C */ unk16 mUnk_9E;
/* A0 */ unk16 mUnk_A0;
/* A0 */ unk16 mUnk_A2;
/* A4 */ ActorUnkSWOB_A4 mUnk_A4[5];
/* B8 */
ActorUnkSWOB();
/* 18 */ virtual bool vfunc_18(unk32 param1) override;
/* 20 */ virtual void vfunc_20() override;
/* 4C */ virtual ~ActorUnkSWOB() override;
void func_ov000_0209a948(void);
void func_ov000_0209a9b4(void);
bool func_ov000_0209a948(void);
void func_ov000_0209a9b4(unk32 param1);
void func_ov000_0209aa30(void);
};
include/Actor/ActorUnkSWTM.hpp
+25 -15
View File
@@ -1,5 +1,3 @@
//! TODO: This file was generated automatically and might contain errors
#pragma once
#include "Actor/Actor.hpp"
@@ -7,31 +5,43 @@
#include "global.h"
#include "types.h"
class ActorUnkSWTM_c4 : public Actor_c4 {
class ActorUnkSWTM_B0 {
public:
ActorUnkSWTM_c4(Actor *param1);
/* 00 */ unk32 mUnk_00;
/* 00 */ virtual unk32 vfunc_00(Actor_c4_stack param1, unk32 param2) override;
/* 04 */ virtual void vfunc_04() override;
/* 08 */ virtual void vfunc_08() override;
/* 0C */ virtual void vfunc_0c(unk32 param1) override;
ActorUnkSWTM_B0() {
this->mUnk_00 = 0;
};
};
class ActorUnkSWTM : public Actor {
public:
/* 00 (base) */
/* 94 */
/* 94 */ unk32 mUnk_94;
/* 98 */ unk32 mUnk_98;
/* 9C */ unk16 mUnk_9C;
/* 9C */ unk16 mUnk_9E;
/* A0 */ unk16 mUnk_A0;
/* A0 */ s16 mUnk_A2;
/* A4 */ u32 mUnk_A4;
/* A8 */ u32 mUnk_A8;
/* AC */ bool mUnk_AC;
/* AC */ unk8 mUnk_AD; // pad?
/* AC */ unk8 mUnk_AE; // pad?
/* AC */ unk8 mUnk_AF; // pad?
/* B0 */ ActorUnkSWTM_B0 mUnk_B0[5]; // unused?
/* C4 */
ActorUnkSWTM();
/* 18 */ virtual bool vfunc_18(unk32 param1) override;
/* 20 */ virtual void vfunc_20() override;
/* 24 */ virtual void vfunc_24() override;
/* 4C */ virtual ~ActorUnkSWTM() override;
void func_ov000_0209adf4(void);
void func_ov000_0209ae68(void);
void func_ov000_0209af50(void);
void func_ov000_0209af54(void);
void func_ov000_0209afe4(void);
void func_ov000_0209b038(void);
void func_ov000_0209af54(unk32 param1);
bool func_ov000_0209afe4(void);
unk32 func_ov000_0209b038(void);
void func_ov000_0209b160(void);
void func_ov000_0209b184(void);
void func_ov000_0209b1d0(void);
include/Unknown/UnkStruct_027e0cd8.hpp
+5 -2
View File
@@ -80,8 +80,10 @@ public:
/* 28 */ virtual q20 vfunc_28(Vec3p *param1, unk32 param2, unk32 param3);
/* 2c */ virtual void vfunc_2c();
unk32 func_ov000_02080a44();
unk32 func_ov000_02080180(void *param1);
bool func_ov000_02080658(unk32 param1, UnkStruct_SceneChange1 *param2);
void func_ov000_020808f4(void *param1, void *param2, unk32 param3);
unk32 func_ov000_02080a44();
};
class UnkStruct_027e0cd8 {
@@ -92,7 +94,8 @@ public:
/* 0c */ UnkStruct_027e0cd8_0c *mUnk_0c;
/* 10 */
unk32 func_ov000_02081e30(u16 param1, u8 param2);
unk32 func_ov000_02081e30(unk32 param1, unk32 param2);
void func_ov000_02081d7c(unk32 param1, unk32 param2, unk32 param3);
void func_ov000_02081ecc(unk16 param1, unk32 param2);
};
include/Unknown/UnkStruct_027e0ce0.hpp
+1 -1
View File
@@ -53,7 +53,7 @@ public:
/* 40 */ unk32 *mUnk_40; // pointer to data_027e0478 when not on the train
/* 44 */
void func_01fff148();
Vec3p *func_01fff148(unk32 param1);
void func_ov000_0208a318(unk32 param1, unk32 param2, unk32 param3);
};
include/Unknown/UnkStruct_027e0cec.hpp
+1
View File
@@ -9,6 +9,7 @@ public:
void func_ov000_0209ff8c(UnkStruct_PlayerGet_ec *param1, unk32 param2, Vec3p *param3, unk32 param4);
void func_ov000_020a0000(UnkStruct_PlayerGet_ec *param1, void *param2, unk32 *param3, Vec3p *param4, unk32 param5);
void func_ov000_020a0110(UnkStruct_PlayerGet_ec *param1);
void func_ov000_020a0220(void *param1, void *param2);
};
extern UnkStruct_027e0cec *data_027e0cec;
include/Unknown/UnkStruct_ov000_020aed1c.hpp
+15
View File
@@ -0,0 +1,15 @@
#pragma once
#include "global.h"
#include "types.h"
class UnkStruct_ov000_020aed1c {
public:
/* 00 */ unk32 mUnk_00;
/* 04 */ unk32 mUnk_04;
UnkStruct_ov000_020aed1c();
~UnkStruct_ov000_020aed1c();
};
extern UnkStruct_ov000_020aed1c data_ov000_020aed1c;
include/Unknown/UnkStruct_ov000_020b5214.hpp
+1
View File
@@ -48,6 +48,7 @@ public:
void func_ov000_0206d6b4(unk32 param1, unk32 param2);
void func_ov000_0206d83c(unk32 param1);
void func_ov000_0206db44(unk32 param1); // play sfx?
void func_ov000_0206e7e8(unk32 param1);
};
extern UnkStruct_ov000_020b5214 data_ov000_020b5214;
src/000_Second/Actor/Actor.cpp
+2 -2
View File
@@ -94,8 +94,8 @@ ARM void Actor::vfunc_00(Vec3p *param1) {
// param1->z = this->mPos.z;
}
ARM void Actor::func_ov000_0209853c(void) {
data_027e0ce0->func_01fff148();
ARM Vec3p *Actor::func_ov000_0209853c(unk32 param1) {
return data_027e0ce0->func_01fff148(param1);
}
ARM bool Actor::vfunc_04() {
src/000_Second/Actor/ActorEventIcon.cpp
+24
View File
@@ -0,0 +1,24 @@
#include "Actor/ActorEventIcon.hpp"
#include "System/SysNew.hpp"
ARM DECL_PROFILE(ActorProfileEventIcon);
ARM Actor *ActorProfileEventIcon::Create() {
return new(HeapIndex_2) ActorEventIcon();
}
ARM ActorProfileEventIcon::ActorProfileEventIcon() :
ActorProfile(ActorId_EventIcon) {}
ARM ActorEventIcon::ActorEventIcon() {
this->mUnk_10C = 0;
}
ARM bool ActorEventIcon::vfunc_18(unk32 param1) {
this->mUnk_094.func_ov000_0206082c(0x5D, this->mUnk_6c);
return true;
}
ARM ActorEventIcon::~ActorEventIcon() {}
ARM ActorProfileEventIcon::~ActorProfileEventIcon() {}
src/000_Second/Actor/ActorUnkEFIK.cpp
+76 -7
View File
@@ -1,7 +1,12 @@
//! TODO: This file was generated automatically and might contain errors
#include "Actor/ActorUnkEFIK.hpp"
#include "System/Random.hpp"
#include "System/SysNew.hpp"
#include "Unknown/UnkStruct_0204a110.hpp"
#include "Unknown/UnkStruct_027e0cd8.hpp"
#include "Unknown/UnkStruct_027e0cec.hpp"
#include "Unknown/UnkStruct_ov000_020aed1c.hpp"
extern "C" void Unknown_func_ov000_0207fd7c(void *, void *, unk32);
ARM DECL_PROFILE(ActorProfileUnkEFIK);
@@ -12,12 +17,76 @@ ARM Actor *ActorProfileUnkEFIK::Create() {
ARM ActorProfileUnkEFIK::ActorProfileUnkEFIK() :
ActorProfile(ActorId_EFIK) {}
ARM ActorUnkEFIK::ActorUnkEFIK() {}
ARM ActorUnkEFIK::ActorUnkEFIK() {
this->mUnk_9C = -1;
this->mUnk_A0 = 0;
}
ARM void ActorUnkEFIK::func_ov000_0209c100(void) {}
ARM void ActorUnkEFIK::func_ov000_0209c140(void) {}
ARM void ActorUnkEFIK::func_ov000_0209c2d0(void) {}
ARM void ActorUnkEFIK::func_ov000_0209c2e4(void) {}
ARM bool ActorUnkEFIK::vfunc_18(unk32 param1) {
this->mUnk_9C = 0x86F;
this->mUnk_A0 = 4;
this->mUnk_98.func_ov000_020a0334();
this->vfunc_54(0);
return true;
}
ARM void ActorUnkEFIK::vfunc_20() {
if (this->mUnk_94 != 0) {
return;
}
unk32 auStack_38[2];
auStack_38[0] = data_ov000_020aed1c.mUnk_00;
auStack_38[1] = data_ov000_020aed1c.mUnk_04;
int length = 1;
if (data_0204a110.mUnk_008 == 1) {
length = 2;
}
for (int i = 0; i < length; i++) {
u8 j;
u8 k;
UnkStruct_027e0cd8_0c *pUVar5 = data_027e0cd8->mUnk_0c;
u8 bStack_3c[2];
bStack_3c[0] = 0;
bStack_3c[1] = 0;
u8 bStack_3e[2];
bStack_3e[0] = 0;
bStack_3e[1] = 0;
Unknown_func_ov000_0207fd7c(bStack_3c, bStack_3e, auStack_38[i]);
for (j = bStack_3c[0]; j < bStack_3e[0]; j++) {
for (k = bStack_3c[1]; k < bStack_3e[1]; k++) {
u8 bStack_40[2];
bStack_40[0] = j;
bStack_40[1] = k;
if (pUVar5->func_ov000_02080180(bStack_40) == 0x38) {
u16 random = gRandom.Next32(0, 6);
if (random == 0) {
Vec3p vec;
pUVar5->func_ov000_020808f4(&vec, bStack_40, 0);
data_027e0cec->func_ov000_020a0220(&this->mUnk_98, &vec);
}
}
}
}
}
}
ARM void ActorUnkEFIK::vfunc_24() {
this->vfunc_20();
}
ARM void ActorUnkEFIK::vfunc_54(unk32 param1) {
this->mUnk_94 = param1;
}
ARM ActorUnkEFIK::~ActorUnkEFIK() {}
ARM ActorProfileUnkEFIK::~ActorProfileUnkEFIK() {}
src/000_Second/Actor/ActorUnkEVIC.cpp
-20
View File
@@ -1,20 +0,0 @@
//! TODO: This file was generated automatically and might contain errors
#include "Actor/ActorUnkEVIC.hpp"
#include "System/SysNew.hpp"
ARM DECL_PROFILE(ActorProfileUnkEVIC);
ARM Actor *ActorProfileUnkEVIC::Create() {
return new(HeapIndex_2) ActorUnkEVIC();
}
ARM ActorProfileUnkEVIC::ActorProfileUnkEVIC() :
ActorProfile(ActorId_EVIC) {}
ARM ActorUnkEVIC::ActorUnkEVIC() {}
ARM void ActorUnkEVIC::func_ov000_0209c014(void) {}
ARM ActorUnkEVIC::~ActorUnkEVIC() {}
ARM ActorProfileUnkEVIC::~ActorProfileUnkEVIC() {}
src/000_Second/Actor/ActorUnkSWOB.cpp
+109 -5
View File
@@ -1,7 +1,13 @@
//! TODO: This file was generated automatically and might contain errors
#include "Actor/ActorUnkSWOB.hpp"
#include "Actor/ActorManager.hpp"
#include "System/Random.hpp"
#include "System/SysNew.hpp"
#include "Unknown/UnkStruct_027e0cd8.hpp"
#include "Unknown/UnkStruct_027e0ce0.hpp"
#include "Unknown/UnkStruct_ov000_020b5214.hpp"
extern "C" void func_01ffedac(u16 *, Vec3p *);
extern "C" void func_01ffb9cc(void *, Vec3p *);
ARM DECL_PROFILE(ActorProfileUnkSWOB);
@@ -14,9 +20,107 @@ ARM ActorProfileUnkSWOB::ActorProfileUnkSWOB() :
ARM ActorUnkSWOB::ActorUnkSWOB() {}
ARM void ActorUnkSWOB::func_ov000_0209a948(void) {}
ARM void ActorUnkSWOB::func_ov000_0209a9b4(void) {}
ARM void ActorUnkSWOB::func_ov000_0209aa30(void) {}
ARM bool ActorUnkSWOB::vfunc_18(unk32 param1) {
this->mUnk_9E = this->mUnk_78;
this->mUnk_94 = this->mUnk_6e;
this->mUnk_98 = this->mUnk_70;
this->mUnk_A0 = this->mUnk_9E + this->mUnk_6c;
this->mUnk_A2 = this->mUnk_75;
this->mUnk_9C = this->mUnk_9E;
if (this->func_ov000_02098a60(0)) {
this->func_ov000_0209a9b4(1);
} else {
this->func_ov000_0209a9b4(0);
}
return true;
}
ARM void ActorUnkSWOB::func_ov000_0209a9b4(unk32 param1) {
this->mUnk_4c = param1;
switch (this->mUnk_4c) {
case 0:
this->func_ov000_02098a88(0, 0);
break;
case 1:
this->func_ov000_02098a88(0, 1);
if (this->mUnk_94 == 0) {
UNSET_FLAG(this->mFlags, ActorFlag_Alive);
}
break;
case 2:
this->func_ov000_0209aa30();
this->mUnk_52 = -1;
this->mUnk_50 = 0;
break;
default:
break;
}
}
// https://decomp.me/scratch/cUf0c
ARM void ActorUnkSWOB::func_ov000_0209aa30(void) {
if (this->mUnk_4c == 1) {
return;
}
switch (this->mUnk_72) {
case 1:
data_ov000_020b5214.func_ov000_0206db44(0xA3);
break;
case 3:
data_ov000_020b5214.func_ov000_0206db44(0xA3);
s16 unk_78 = this->mUnk_78;
if (unk_78 > 0) {
data_027e0cd8->func_ov000_02081d7c((s16) (unk_78 - 1), this->mUnk_75, 1);
}
break;
case 2: {
Vec3p temp;
Vec3p vec2;
Vec3p vec;
Actor_5c_temp AStack_7c;
u16 auStack_80[4];
int j;
u32 i;
data_ov000_020b5214.func_ov000_0206db44(0xA3);
temp.coords = data_027e0ce0->func_01fff148(0)->coords;
vec2.x = temp.x;
vec2.y = temp.y + FLOAT_TO_Q20(3.0f);
vec2.z = temp.z;
AStack_7c.mUnk_28 = 0;
AStack_7c.func_ov000_020975f8();
for (j = 0, i = 0; i < ARRAY_LEN(this->mUnk_A4); i++) {
if (gActorManager->func_01fff3b4(this->mUnk_A4[i].mUnk_00) == NULL) {
this->mUnk_A4[i].mUnk_00 = 0;
vec.x = INT_TO_Q20(gRandom.Next32(0, 11) - 5);
vec.y = 0;
vec.z = INT_TO_Q20(gRandom.Next32(0, 11) - 5);
Vec3p_Add(&vec, &vec2, &vec);
if (j < 10) {
func_01ffedac(auStack_80, &vec);
func_01ffb9cc(&vec2, &vec);
i--;
j++;
}
}
}
break;
}
default:
break;
}
}
ARM ActorUnkSWOB::~ActorUnkSWOB() {}
ARM ActorProfileUnkSWOB::~ActorProfileUnkSWOB() {}
src/000_Second/Actor/ActorUnkSWTM.cpp
+188 -13
View File
@@ -1,7 +1,7 @@
//! TODO: This file was generated automatically and might contain errors
#include "Actor/ActorUnkSWTM.hpp"
#include "System/SysNew.hpp"
#include "Unknown/UnkStruct_027e0cd8.hpp"
#include "Unknown/UnkStruct_ov000_020b5214.hpp"
ARM DECL_PROFILE(ActorProfileUnkSWTM);
@@ -12,17 +12,192 @@ ARM Actor *ActorProfileUnkSWTM::Create() {
ARM ActorProfileUnkSWTM::ActorProfileUnkSWTM() :
ActorProfile(ActorId_SWTM) {}
ARM ActorUnkSWTM::ActorUnkSWTM() {}
ARM ActorUnkSWTM::ActorUnkSWTM() :
mUnk_94(0),
mUnk_98(0),
mUnk_9C(0),
mUnk_9E(0),
mUnk_A0(0),
mUnk_A2(0),
mUnk_A4(0),
mUnk_A8(0) {}
ARM void ActorUnkSWTM::func_ov000_0209adf4(void) {}
ARM void ActorUnkSWTM::func_ov000_0209ae68(void) {}
ARM void ActorUnkSWTM::func_ov000_0209af50(void) {}
ARM void ActorUnkSWTM::func_ov000_0209af54(void) {}
ARM void ActorUnkSWTM::func_ov000_0209afe4(void) {}
ARM void ActorUnkSWTM::func_ov000_0209b038(void) {}
ARM void ActorUnkSWTM::func_ov000_0209b160(void) {}
ARM void ActorUnkSWTM::func_ov000_0209b184(void) {}
ARM void ActorUnkSWTM::func_ov000_0209b1d0(void) {}
ARM ActorUnkSWTM::~ActorUnkSWTM() {
if (this->mUnk_4c != 2 && this->func_ov000_02098a60(0) == 0) {
this->func_ov000_0209b184();
}
}
// https://decomp.me/scratch/qkP8m
ARM bool ActorUnkSWTM::vfunc_18(unk32 param1) {
this->mUnk_9E = this->mUnk_78;
this->mUnk_98 = this->mUnk_70;
this->mUnk_A4 = this->mUnk_6e * 30;
this->mUnk_A0 = this->mUnk_9E + this->mUnk_6c;
this->mUnk_A2 = this->mUnk_75;
this->mUnk_9C = this->mUnk_9E;
if (this->func_ov000_02098a60(0)) {
this->func_ov000_0209af54(2);
} else {
this->func_ov000_0209af54(0);
}
return true;
}
ARM void ActorUnkSWTM::vfunc_20(void) {
switch (this->mUnk_4c) {
case 0:
if (!this->func_ov000_0209afe4()) {
return;
}
this->func_ov000_0209af54(1);
break;
case 1:
this->mUnk_A8++;
this->func_ov000_0209b1d0();
if (this->mUnk_A8 >= this->mUnk_A4) {
this->func_ov000_0209af54(3);
} else {
switch (this->func_ov000_0209b038()) {
case 1:
this->func_ov000_0209af54(2);
break;
case 2:
this->func_ov000_0209af54(3);
break;
default:
break;
}
}
break;
case 2:
break;
case 3:
if (this->mUnk_50 < this->mUnk_52) {
this->mUnk_50++;
}
if ((s32) this->mUnk_50 >= 15) {
this->func_ov000_0209b184();
this->func_ov000_0209af54(0);
}
break;
default:
break;
}
}
ARM void ActorUnkSWTM::vfunc_24(void) {}
ARM void ActorUnkSWTM::func_ov000_0209af54(unk32 param1) {
this->mUnk_4c = param1;
this->mUnk_A8 = 0;
switch (this->mUnk_4c) {
case 0:
this->func_ov000_02098a88(0, 0);
break;
case 1:
this->mUnk_AC = false;
this->mUnk_9C = this->mUnk_9E;
break;
case 2:
this->func_ov000_02098a88(0, 1);
if (this->mUnk_94 == 0) {
UNSET_FLAG(this->mFlags, ActorFlag_Alive);
}
break;
case 3:
this->func_ov000_0209b160();
this->mUnk_50 = 0;
this->mUnk_52 = -1;
break;
default:
break;
}
}
ARM bool ActorUnkSWTM::func_ov000_0209afe4(void) {
for (int i = this->mUnk_9E; i < this->mUnk_A0; i++) {
if (data_027e0cd8->func_ov000_02081e30(i, this->mUnk_A2)) {
return true;
}
}
return false;
}
ARM unk32 ActorUnkSWTM::func_ov000_0209b038(void) {
switch (this->mUnk_98) {
case 1:
case 2: {
int i;
bool bVar1 = true;
for (i = this->mUnk_9E; i < this->mUnk_A0; i++) {
if (i > this->mUnk_9C && data_027e0cd8->func_ov000_02081e30(i, this->mUnk_A2) != 0) {
this->mUnk_AC = true;
}
if (i == this->mUnk_9C && data_027e0cd8->func_ov000_02081e30(i, this->mUnk_A2) != 0) {
this->mUnk_9C++;
}
if (data_027e0cd8->func_ov000_02081e30(i, this->mUnk_A2) == 0) {
bVar1 = false;
}
}
if (bVar1) {
if (!this->mUnk_AC) {
return 1;
}
return 2;
}
return 0;
}
default:
break;
}
for (int i = 0; i < this->mUnk_6c; i++) {
if (data_027e0cd8->func_ov000_02081e30(this->mUnk_9E + i, this->mUnk_A2) == 0) {
return 0;
}
}
return 1;
}
ARM void ActorUnkSWTM::func_ov000_0209b160(void) {
if (this->mUnk_4c != 2) {
data_ov000_020b5214.func_ov000_0206db44(0xA3);
}
}
ARM void ActorUnkSWTM::func_ov000_0209b184(void) {
for (int i = this->mUnk_9E; i < this->mUnk_A0; i++) {
data_027e0cd8->func_ov000_02081d7c(i, this->mUnk_A2, 0);
}
}
ARM void ActorUnkSWTM::func_ov000_0209b1d0(void) {
if (this->mUnk_98 == 2) {
return;
}
if (this->mUnk_A4 - this->mUnk_A8 < 0x3C) {
data_ov000_020b5214.func_ov000_0206e7e8(0x92);
} else {
data_ov000_020b5214.func_ov000_0206e7e8(0x91);
}
}
ARM ActorUnkSWTM::~ActorUnkSWTM() {}
ARM ActorProfileUnkSWTM::~ActorProfileUnkSWTM() {}
src/031_Land/Actor/ActorRupee.cpp
+1 -1
View File
@@ -82,7 +82,7 @@ ARM bool ActorRupee::vfunc_18(unk32 param1) {
}
if (this->mUnk_80 >= 0) {
if (this->func_ov000_02098a60(0) != 0) {
if (this->func_ov000_02098a60(0)) {
return false;
}
tools/configure.py
+1 -1
View File
@@ -152,7 +152,7 @@ config.libs = [
Object("000_Second/Item/ItemManager.cpp"),
Object("000_Second/Item/TreasureManager.cpp"),
Object("000_Second/Actor/ActorUnkEFIK.cpp"),
Object("000_Second/Actor/ActorUnkEVIC.cpp"),
Object("000_Second/Actor/ActorEventIcon.cpp"),
Object("000_Second/Actor/ActorUnkSWOB.cpp"),
Object("000_Second/Actor/ActorUnkSWTM.cpp"),
Object("000_Second/MapObject/MapObjectUnkBLCM.cpp"),