Skip to content

Commit 0b367ec

Browse files
authored
Decompile ActorManager_001.cpp (#31)
* started ActorManager_001.cpp * create, ctor, dtor * prog * fix build * fix build issues * progress * struct comments * match ClearInstance
1 parent 3ab5bf6 commit 0b367ec

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+1068
-161
lines changed

config/eur/arm9/itcm/symbols.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ func_01ffd250 kind:function(arm,size=0x44) addr:0x01ffd250
155155
func_01ffd294 kind:function(arm,size=0x11c) addr:0x01ffd294
156156
func_01ffd3b0 kind:function(arm,size=0x28) addr:0x01ffd3b0
157157
func_01ffd3d8 kind:function(arm,size=0x28) addr:0x01ffd3d8
158-
func_01ffd400 kind:function(arm,size=0x20) addr:0x01ffd400
158+
_ZN18UnkStruct_027e09a413func_01ffd400Ev kind:function(arm,size=0x20) addr:0x01ffd400
159159
_ZN18UnkStruct_027e09b813func_01ffd420Ev kind:function(arm,size=0x1c) addr:0x01ffd420
160160
func_01ffd43c kind:function(arm,size=0x60) addr:0x01ffd43c
161161
func_01ffd49c kind:function(arm,size=0x1a4) addr:0x01ffd49c

config/eur/arm9/overlays/ov000/symbols.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -189,9 +189,9 @@ func_ov000_02059168 kind:function(arm,size=0x28) addr:0x02059168
189189
func_ov000_02059190 kind:function(arm,size=0x3c) addr:0x02059190
190190
_ZN29UnkStruct_ov000_020b4ec4_BaseC2Ev kind:function(arm,size=0x20) addr:0x020591cc
191191
_ZN26UnkStruct_StackTitleScreenC1EPKci kind:function(arm,size=0x54) addr:0x020591ec
192-
_ZN26UnkStruct_StackTitleScreen19func_ov000_02059240Ev kind:function(arm,size=0x30) addr:0x02059240
192+
_ZN26UnkStruct_StackTitleScreenD1Ev kind:function(arm,size=0x30) addr:0x02059240
193193
_ZN26UnkStruct_StackTitleScreen19func_ov000_02059270EiPci kind:function(arm,size=0x18) addr:0x02059270
194-
func_ov000_02059288 kind:function(arm,size=0x18) addr:0x02059288
194+
_ZN26UnkStruct_StackTitleScreen19func_ov000_02059288EiPci kind:function(arm,size=0x18) addr:0x02059288
195195
func_ov000_020592a0 kind:function(thumb,size=0x4c) addr:0x020592a0
196196
func_ov000_020592ec kind:function(thumb,size=0x70) addr:0x020592ec
197197
func_ov000_0205935c kind:function(thumb,size=0xc) addr:0x0205935c
@@ -986,7 +986,7 @@ func_ov000_02070134 kind:function(arm,size=0x14) addr:0x02070134
986986
func_ov000_02070148 kind:function(arm,size=0x1c) addr:0x02070148
987987
func_ov000_02070164 kind:function(arm,size=0xfc) addr:0x02070164
988988
func_ov000_02070260 kind:function(arm,size=0x3c) addr:0x02070260
989-
func_ov000_0207029c kind:function(arm,size=0xc) addr:0x0207029c
989+
_ZN18UnkStruct_027e09a019func_ov000_0207029cEi kind:function(arm,size=0xc) addr:0x0207029c
990990
func_ov000_020702a8 kind:function(arm,size=0x14) addr:0x020702a8
991991
func_ov000_020702bc kind:function(arm,size=0x40) addr:0x020702bc
992992
func_ov000_020702fc kind:function(arm,size=0x14) addr:0x020702fc
@@ -1000,7 +1000,7 @@ _ZN18UnkStruct_027e09a4D1Ev kind:function(arm,size=0x44) addr:0x020704f4
10001000
func_ov000_02070538 kind:function(arm,size=0xc) addr:0x02070538
10011001
func_ov000_02070544 kind:function(arm,size=0x10) addr:0x02070544
10021002
func_ov000_02070554 kind:function(arm,size=0xc) addr:0x02070554
1003-
func_ov000_02070560 kind:function(arm,size=0xc) addr:0x02070560
1003+
_ZN18UnkStruct_027e09a419func_ov000_02070560Ev kind:function(arm,size=0xc) addr:0x02070560
10041004
func_ov000_0207056c kind:function(arm,size=0x14) addr:0x0207056c
10051005
func_ov000_02070580 kind:function(arm,size=0x1c) addr:0x02070580
10061006
func_ov000_0207059c kind:function(arm,size=0x4c) addr:0x0207059c
@@ -2244,19 +2244,19 @@ func_ov000_02096cc8 kind:function(arm,size=0x24) addr:0x02096cc8
22442244
func_ov000_02096cec kind:function(arm,size=0x14) addr:0x02096cec
22452245
func_ov000_02096d00 kind:function(arm,size=0x68) addr:0x02096d00
22462246
func_ov000_02096d68 kind:function(arm,size=0xdc) addr:0x02096d68
2247-
func_ov000_02096e44 kind:function(arm,size=0x6c) addr:0x02096e44
2247+
_ZN12ActorManager19func_ov000_02096e44Ei kind:function(arm,size=0x6c) addr:0x02096e44
22482248
func_ov000_02096eb0 kind:function(arm,size=0x38) addr:0x02096eb0
22492249
func_ov000_02096ee8 kind:function(arm,size=0x164) addr:0x02096ee8
22502250
func_ov000_0209704c kind:function(arm,size=0x7c) addr:0x0209704c
22512251
func_ov000_020970c8 kind:function(arm,size=0xc4) addr:0x020970c8
22522252
func_ov000_0209718c kind:function(arm,size=0xb8) addr:0x0209718c
22532253
func_ov000_02097244 kind:function(arm,size=0x44) addr:0x02097244
22542254
func_ov000_02097288 kind:function(arm,size=0x154) addr:0x02097288
2255-
func_ov000_020973dc kind:function(arm,size=0xc) addr:0x020973dc
2256-
func_ov000_020973e8 kind:function(arm,size=0xc) addr:0x020973e8
2255+
_ZN24UnkStruct_ov000_020b539c18func_ov000_02073dcEv kind:function(arm,size=0xc) addr:0x020973dc
2256+
_ZN24UnkStruct_ov000_020b539c18func_ov000_02073e8Ev kind:function(arm,size=0xc) addr:0x020973e8
22572257
func_ov000_020973f4 kind:function(arm,size=0x50) addr:0x020973f4
22582258
func_ov000_02097444 kind:function(arm,size=0x98) addr:0x02097444
2259-
func_ov000_020974dc kind:function(arm,size=0x4c) addr:0x020974dc
2259+
_ZN24UnkStruct_ov000_020b539c19func_ov000_020974dcEj kind:function(arm,size=0x4c) addr:0x020974dc
22602260
func_ov000_02097528 kind:function(arm,size=0x20) addr:0x02097528
22612261
func_ov000_02097548 kind:function(arm,size=0x78) addr:0x02097548
22622262
func_ov000_020975c0 kind:function(arm,size=0x1c) addr:0x020975c0

config/eur/arm9/overlays/ov001/delinks.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,5 @@
77

88
src/001_SceneInit/Actor/ActorManager_001.cpp:
99
.text start:0x020baf64 end:0x020bb87c
10+
.rodata start:0x020c2624 end:0x020c264c
11+
.data start:0x020c2b3c end:0x020c2c70

config/eur/arm9/overlays/ov001/relocs.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2349,7 +2349,7 @@ from:0x020c1524 kind:load to:0x020c3508 module:overlay(1)
23492349
from:0x020c1590 kind:load to:0x020c4701 module:overlay(1)
23502350
from:0x020c159c kind:load to:0x020c2550 module:overlay(1)
23512351
from:0x020c1608 kind:load to:0x020c4701 module:overlay(1)
2352-
from:0x020c1614 kind:load to:0x020c2628 module:overlay(1)
2352+
from:0x020c1614 kind:load to:0x020c2624 add:4 module:overlay(1)
23532353
from:0x020c1680 kind:load to:0x020c4701 module:overlay(1)
23542354
from:0x020c168c kind:load to:0x020c273c module:overlay(1)
23552355
from:0x020c16f8 kind:load to:0x020c4701 module:overlay(1)

config/eur/arm9/overlays/ov001/symbols.txt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -177,14 +177,14 @@ _ZN12ActorManager6CreateEv kind:function(thumb,size=0x16) addr:0x020baf64
177177
_ZN12ActorManagerC1Ev kind:function(thumb,size=0x46) addr:0x020baf7c
178178
_ZN12ActorManagerD1Ev kind:function(thumb,size=0x18) addr:0x020bafc4
179179
_ZN12ActorManager19func_ov001_020bafdcEv kind:function(thumb,size=0x3c) addr:0x020bafdc
180-
_ZN12ActorManager19func_ov001_020bb018Ei kind:function(thumb,size=0x3fc) addr:0x020bb018
181-
_ZN12ActorManager19func_ov001_020bb414Ev kind:function(thumb,size=0x74) addr:0x020bb414
180+
_ZN12ActorManager19func_ov001_020bb018EP36UnkStruct_func_ov001_020bb018_param2 kind:function(thumb,size=0x3fc) addr:0x020bb018
181+
_ZN12ActorManager19func_ov001_020bb414EPS_ kind:function(thumb,size=0x74) addr:0x020bb414
182182
_ZN12ActorManager19func_ov001_020bb488Ev kind:function(thumb,size=0xc0) addr:0x020bb488
183183
_ZN12ActorManager19func_ov001_020bb548Ev kind:function(thumb,size=0xe8) addr:0x020bb548
184184
_ZN12ActorManager19func_ov001_020bb630Ev kind:function(thumb,size=0x80) addr:0x020bb630
185185
_ZN12ActorManager19func_ov001_020bb6b0EPi kind:function(thumb,size=0x78) addr:0x020bb6b0
186186
_ZN12ActorManager19func_ov001_020bb728Ei kind:function(thumb,size=0x88) addr:0x020bb728
187-
_ZN12ActorManager19func_ov001_020bb7b0Ei kind:function(thumb,size=0x40) addr:0x020bb7b0
187+
_ZN12ActorManager19func_ov001_020bb7b0EP15ZeldaObjectList kind:function(thumb,size=0x40) addr:0x020bb7b0
188188
_ZN12ActorManager19func_ov001_020bb7f0Ev kind:function(thumb,size=0x34) addr:0x020bb7f0
189189
_ZN12ActorManager19func_ov001_020bb824Ev kind:function(thumb,size=0x20) addr:0x020bb824
190190
_ZN12ActorManager19func_ov001_020bb844Ev kind:function(thumb,size=0x20) addr:0x020bb844
@@ -473,7 +473,6 @@ data_ov001_020c25c0 kind:data(any) addr:0x020c25c0
473473
data_ov001_020c25d4 kind:data(any) addr:0x020c25d4
474474
data_ov001_020c25fc kind:data(any) addr:0x020c25fc
475475
data_ov001_020c2624 kind:data(any) addr:0x020c2624
476-
data_ov001_020c2628 kind:data(any) addr:0x020c2628
477476
data_ov001_020c262e kind:data(any) addr:0x020c262e
478477
data_ov001_020c2638 kind:data(any) addr:0x020c2638
479478
data_ov001_020c264c kind:data(any) addr:0x020c264c

config/eur/arm9/overlays/ov021/symbols.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -443,9 +443,9 @@ func_ov021_020f879c kind:function(arm,size=0x18) addr:0x020f879c
443443
func_ov021_020f87b4 kind:function(arm,size=0x64) addr:0x020f87b4
444444
func_ov021_020f8818 kind:function(arm,size=0x28) addr:0x020f8818
445445
func_ov021_020f8840 kind:function(arm,size=0x458) addr:0x020f8840
446-
func_ov021_020f8c98 kind:function(arm,size=0x44) addr:0x020f8c98
447-
func_ov021_020f8cdc kind:function(arm,size=0x44) addr:0x020f8cdc
448-
func_ov021_020f8d20 kind:function(arm,size=0x48) addr:0x020f8d20
446+
_ZN18UnkStruct_027e0cf4D1Ev kind:function(arm,size=0x44) addr:0x020f8c98
447+
_ZN18UnkStruct_027e0cf419func_ov021_020f8cdcEv kind:function(arm,size=0x44) addr:0x020f8cdc
448+
_ZN18UnkStruct_027e0cf419func_ov021_020f8d20Ev kind:function(arm,size=0x48) addr:0x020f8d20
449449
func_ov021_020f8d68 kind:function(arm,size=0x334) addr:0x020f8d68
450450
func_ov021_020f909c kind:function(arm,size=0x48) addr:0x020f909c
451451
func_ov021_020f90e4 kind:function(arm,size=0x150) addr:0x020f90e4

config/eur/arm9/overlays/ov060/symbols.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ func_ov060_0215e974 kind:function(arm,size=0xc) addr:0x0215e974
249249
func_ov060_0215e980 kind:function(arm,size=0x24) addr:0x0215e980
250250
func_ov060_0215e9a4 kind:function(arm,size=0x28) addr:0x0215e9a4
251251
func_ov060_0215e9cc kind:function(arm,size=0xc4) addr:0x0215e9cc
252-
func_ov060_0215ea90 kind:function(arm,size=0x6c) addr:0x0215ea90
252+
_ZN18UnkStruct_027e0d70D1Ev kind:function(arm,size=0x6c) addr:0x0215ea90
253253
func_ov060_0215eafc kind:function(arm,size=0x14) addr:0x0215eafc
254254
func_ov060_0215eb10 kind:function(arm,size=0x14) addr:0x0215eb10
255255
func_ov060_0215eb24 kind:function(arm,size=0x20) addr:0x0215eb24

config/eur/arm9/overlays/ov068/symbols.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ func_ov068_0215e7e4 kind:function(arm,size=0xb0) addr:0x0215e7e4
253253
func_ov068_0215e894 kind:function(arm,size=0xc) addr:0x0215e894
254254
func_ov068_0215e8a0 kind:function(arm,size=0x28) addr:0x0215e8a0
255255
func_ov068_0215e8c8 kind:function(arm,size=0x30) addr:0x0215e8c8
256-
func_ov068_0215e8f8 kind:function(arm,size=0x14) addr:0x0215e8f8
256+
_ZN18UnkStruct_027e0d7019func_ov068_0215e8f8Ev kind:function(arm,size=0x14) addr:0x0215e8f8
257257
func_ov068_0215e90c kind:function(arm,size=0xc) addr:0x0215e90c
258258
func_ov068_0215e918 kind:function(arm,size=0x28) addr:0x0215e918
259259
func_ov068_0215e940 kind:function(arm,size=0x54) addr:0x0215e940

config/eur/arm9/overlays/ov071/symbols.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,10 +265,10 @@ func_ov071_0215e7fc kind:function(arm,size=0xd8) addr:0x0215e7fc
265265
func_ov071_0215e8d4 kind:function(arm,size=0x24) addr:0x0215e8d4
266266
func_ov071_0215e8f8 kind:function(arm,size=0x70) addr:0x0215e8f8
267267
func_ov071_0215e968 kind:function(arm,size=0x44) addr:0x0215e968
268-
func_ov071_0215e9ac kind:function(arm,size=0x68) addr:0x0215e9ac
268+
_ZN18UnkStruct_027e0d7019func_ov071_0215e9acEv kind:function(arm,size=0x68) addr:0x0215e9ac
269269
func_ov071_0215ea14 kind:function(arm,size=0x7c) addr:0x0215ea14
270270
func_ov071_0215ea90 kind:function(arm,size=0x38) addr:0x0215ea90
271-
func_ov071_0215eac8 kind:function(arm,size=0x50) addr:0x0215eac8
271+
_ZN18UnkStruct_027e0d7019func_ov071_0215eac8Ev kind:function(arm,size=0x50) addr:0x0215eac8
272272
func_ov071_0215eb18 kind:function(arm,size=0xc) addr:0x0215eb18
273273
func_ov071_0215eb24 kind:function(arm,size=0x27c) addr:0x0215eb24
274274
func_ov071_0215eda0 kind:function(arm,size=0x50) addr:0x0215eda0

config/eur/arm9/symbols.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,7 @@ _Z9SysDeletePv kind:function(arm,size=0x6c) addr:0x02011ea4
606606
_Z13func_02011f10i kind:function(arm,size=0x20) addr:0x02011f10
607607
_Z13func_02011f30i kind:function(arm,size=0xc) addr:0x02011f30
608608
_Znwmjj kind:function(arm,size=0xb8) addr:0x02011f3c
609-
_ZN9SysObjectdlEPv kind:function(arm,size=0xc) addr:0x02011ff4
609+
_ZdlPv kind:function(arm,size=0xc) addr:0x02011ff4
610610
_ZN9SysObjectdaEPv kind:function(arm,size=0xc) addr:0x02012000
611611
func_0201200c kind:function(arm,size=0x15c) addr:0x0201200c
612612
func_02012168 kind:function(arm,size=0x198) addr:0x02012168

0 commit comments

Comments
 (0)