Skip to content

Commit 758f36f

Browse files
authored
ActorType documentation, delink ActorManager_001 (zeldaret#6)
* ActorUnk_ov000_0209767c -> ActorType * ActorRupee instance * ActorManager * Delink ActorManager_001 * Fix build * Document actor types * Actor flags * Fix build * ActorSCCN
1 parent 9a9311a commit 758f36f

File tree

29 files changed

+874
-676
lines changed

29 files changed

+874
-676
lines changed

config/eur/arm9/dtcm/symbols.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ data_027e0ccc kind:bss addr:0x027e0ccc
107107
data_027e0cd8 kind:bss addr:0x027e0cd8
108108
data_027e0cdc kind:bss addr:0x027e0cdc
109109
data_027e0ce0 kind:bss addr:0x027e0ce0
110-
data_027e0ce4 kind:bss addr:0x027e0ce4
110+
gActorManager kind:bss addr:0x027e0ce4
111111
data_027e0ce8 kind:bss addr:0x027e0ce8
112112
data_027e0cec kind:bss addr:0x027e0cec
113113
data_027e0cf0 kind:bss addr:0x027e0cf0

config/eur/arm9/itcm/symbols.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ func_01fff2a8 kind:function(arm,size=0x24) addr:0x01fff2a8
200200
func_01fff2cc kind:function(arm,size=0x30) addr:0x01fff2cc
201201
func_01fff2fc kind:function(arm,size=0x54) addr:0x01fff2fc
202202
func_01fff350 kind:function(arm,size=0x64) addr:0x01fff350
203-
_ZN18UnkStruct_027e0ce413func_01fff3b4Ei kind:function(arm,size=0x8c) addr:0x01fff3b4
203+
_ZN12ActorManager13func_01fff3b4Ei kind:function(arm,size=0x8c) addr:0x01fff3b4
204204
func_01fff440 kind:function(arm,size=0x18) addr:0x01fff440
205205
func_01fff458 kind:function(arm,size=0xc) addr:0x01fff458
206206
_ZN5Actor8vfunc_10Ev kind:function(arm,size=0x34) addr:0x01fff464

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2263,7 +2263,7 @@ func_ov000_020975c0 kind:function(arm,size=0x1c) addr:0x020975c0
22632263
func_ov000_020975dc kind:function(arm,size=0x1c) addr:0x020975dc
22642264
_ZN8Actor_5c19func_ov000_020975f8Ev kind:function(arm,size=0x78) addr:0x020975f8
22652265
func_ov000_02097670 kind:function(arm,size=0xc) addr:0x02097670
2266-
_ZN23ActorUnk_ov000_0209767cC2Ej kind:function(arm,size=0xa8) addr:0x0209767c
2266+
_ZN9ActorTypeC2Ej kind:function(arm,size=0xa8) addr:0x0209767c
22672267
func_ov000_02097724 kind:function(arm,size=0x28) addr:0x02097724
22682268
func_ov000_0209774c kind:function(arm,size=0x8) addr:0x0209774c
22692269
func_ov000_02097754 kind:function(arm,size=0x7c) addr:0x02097754

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,5 @@
55
.data start:0x020c2940 end:0x020c2fe0 kind:data align:32
66
.bss start:0x020c2fe0 end:0x020c4720 kind:bss align:32
77

8+
src/001_SceneInit/Actor/ActorManager_001.cpp:
9+
.text start:0x020baf64 end:0x020bb87c

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -173,23 +173,23 @@ func_ov001_020baea0 kind:function(thumb,size=0x88) addr:0x020baea0
173173
func_ov001_020baf28 kind:function(thumb,size=0x22) addr:0x020baf28
174174
func_ov001_020baf4c kind:function(thumb,size=0xc) addr:0x020baf4c
175175
func_ov001_020baf58 kind:function(thumb,size=0xc) addr:0x020baf58
176-
func_ov001_020baf64 kind:function(thumb,size=0x16) addr:0x020baf64
177-
func_ov001_020baf7c kind:function(thumb,size=0x46) addr:0x020baf7c
178-
func_ov001_020bafc4 kind:function(thumb,size=0x18) addr:0x020bafc4
179-
func_ov001_020bafdc kind:function(thumb,size=0x3c) addr:0x020bafdc
180-
func_ov001_020bb018 kind:function(thumb,size=0x3fc) addr:0x020bb018
181-
func_ov001_020bb414 kind:function(thumb,size=0x74) addr:0x020bb414
182-
func_ov001_020bb488 kind:function(thumb,size=0xc0) addr:0x020bb488
183-
func_ov001_020bb548 kind:function(thumb,size=0xe8) addr:0x020bb548
184-
func_ov001_020bb630 kind:function(thumb,size=0x80) addr:0x020bb630
185-
func_ov001_020bb6b0 kind:function(thumb,size=0x78) addr:0x020bb6b0
186-
func_ov001_020bb728 kind:function(thumb,size=0x88) addr:0x020bb728
187-
func_ov001_020bb7b0 kind:function(thumb,size=0x40) addr:0x020bb7b0
188-
func_ov001_020bb7f0 kind:function(thumb,size=0x34) addr:0x020bb7f0
189-
func_ov001_020bb824 kind:function(thumb,size=0x20) addr:0x020bb824
190-
func_ov001_020bb844 kind:function(thumb,size=0x20) addr:0x020bb844
191-
func_ov001_020bb864 kind:function(thumb,size=0xc) addr:0x020bb864
192-
func_ov001_020bb870 kind:function(thumb,size=0xc) addr:0x020bb870
176+
_ZN12ActorManager6CreateEv kind:function(thumb,size=0x16) addr:0x020baf64
177+
_ZN12ActorManagerC1Ev kind:function(thumb,size=0x46) addr:0x020baf7c
178+
_ZN12ActorManagerD1Ev kind:function(thumb,size=0x18) addr:0x020bafc4
179+
_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
182+
_ZN12ActorManager19func_ov001_020bb488Ev kind:function(thumb,size=0xc0) addr:0x020bb488
183+
_ZN12ActorManager19func_ov001_020bb548Ev kind:function(thumb,size=0xe8) addr:0x020bb548
184+
_ZN12ActorManager19func_ov001_020bb630Ev kind:function(thumb,size=0x80) addr:0x020bb630
185+
_ZN12ActorManager19func_ov001_020bb6b0EPi kind:function(thumb,size=0x78) addr:0x020bb6b0
186+
_ZN12ActorManager19func_ov001_020bb728Ei kind:function(thumb,size=0x88) addr:0x020bb728
187+
_ZN12ActorManager19func_ov001_020bb7b0Ei kind:function(thumb,size=0x40) addr:0x020bb7b0
188+
_ZN12ActorManager19func_ov001_020bb7f0Ev kind:function(thumb,size=0x34) addr:0x020bb7f0
189+
_ZN12ActorManager19func_ov001_020bb824Ev kind:function(thumb,size=0x20) addr:0x020bb824
190+
_ZN12ActorManager19func_ov001_020bb844Ev kind:function(thumb,size=0x20) addr:0x020bb844
191+
_ZN12ActorManager11SetInstanceEPS_ kind:function(thumb,size=0xc) addr:0x020bb864
192+
_ZN12ActorManager13ClearInstanceEv kind:function(thumb,size=0xc) addr:0x020bb870
193193
func_ov001_020bb87c kind:function(thumb,size=0x3c) addr:0x020bb87c
194194
func_ov001_020bb8b8 kind:function(thumb,size=0x2) addr:0x020bb8b8
195195
func_ov001_020bb8bc kind:function(thumb,size=0x13c) addr:0x020bb8bc

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -556,9 +556,9 @@ func_ov031_020e8c08 kind:function(arm,size=0x44) addr:0x020e8c08
556556
func_ov031_020e8c4c kind:function(arm,size=0x28) addr:0x020e8c4c
557557
func_ov031_020e8c74 kind:function(arm,size=0x30) addr:0x020e8c74
558558
func_ov031_020e8ca4 kind:function(arm,size=0x14) addr:0x020e8ca4
559-
_ZN10ActorRupee19func_ov031_020e8cb8Ev kind:function(arm,size=0xc) addr:0x020e8cb8
560-
_ZN14ActorRupeeBase6CreateEv kind:function(arm,size=0x24) addr:0x020e8cc4
561-
_ZN14ActorRupeeBaseC1Ev kind:function(arm,size=0x44) addr:0x020e8ce8
559+
_ZN14ActorTypeRupee11GetInstanceEv kind:function(arm,size=0xc) addr:0x020e8cb8
560+
_ZN14ActorTypeRupee6CreateEv kind:function(arm,size=0x24) addr:0x020e8cc4
561+
_ZN14ActorTypeRupeeC1Ev kind:function(arm,size=0x44) addr:0x020e8ce8
562562
_ZN10ActorRupee19func_ov031_020e8d2cEv kind:function(arm,size=0x7c) addr:0x020e8d2c
563563
_ZN10ActorRupeeC1Ev kind:function(arm,size=0x74) addr:0x020e8da8
564564
_ZN10ActorRupee8vfunc_18Ev kind:function(arm,size=0x1d0) addr:0x020e8e1c
@@ -2290,7 +2290,7 @@ data_ov031_02113414 kind:data(any) addr:0x02113414
22902290
data_ov031_02113468 kind:data(any) addr:0x02113468
22912291
data_ov031_02113478 kind:data(any) addr:0x02113478
22922292
_ZTV8Actor_c4 kind:data(any) addr:0x02113488
2293-
_ZTV14ActorRupeeBase kind:data(any) addr:0x021134a0
2293+
_ZTV14ActorTypeRupee kind:data(any) addr:0x021134a0
22942294
_ZTV10ActorRupee kind:data(any) addr:0x021134c4
22952295
data_ov031_02113520 kind:data(any) addr:0x02113520
22962296
data_ov031_02113588 kind:data(any) addr:0x02113588
@@ -2552,7 +2552,7 @@ data_ov031_021165f0 kind:bss addr:0x021165f0 ambiguous
25522552
data_ov031_021166b8 kind:bss addr:0x021166b8
25532553
data_ov031_021166d8 kind:bss addr:0x021166d8
25542554
data_ov031_021166dc kind:bss addr:0x021166dc
2555-
data_ov031_021166e8 kind:bss addr:0x021166e8
2555+
_ZN14ActorTypeRupee9gInstanceE kind:bss addr:0x021166e8
25562556
data_ov031_02116724 kind:bss addr:0x02116724
25572557
data_ov031_0211672c kind:bss addr:0x0211672c
25582558
data_ov031_02116738 kind:bss addr:0x02116738

config/jp/arm9/dtcm/symbols.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ data_027e0ccc kind:bss addr:0x027e0ccc
107107
data_027e0cd8 kind:bss addr:0x027e0cd8
108108
data_027e0cdc kind:bss addr:0x027e0cdc
109109
data_027e0ce0 kind:bss addr:0x027e0ce0
110-
data_027e0ce4 kind:bss addr:0x027e0ce4
110+
gActorManager kind:bss addr:0x027e0ce4
111111
data_027e0ce8 kind:bss addr:0x027e0ce8
112112
data_027e0cec kind:bss addr:0x027e0cec
113113
data_027e0cf0 kind:bss addr:0x027e0cf0

config/jp/arm9/itcm/symbols.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ func_01fff2a8 kind:function(arm,size=0x24) addr:0x01fff2a8
200200
func_01fff2cc kind:function(arm,size=0x30) addr:0x01fff2cc
201201
func_01fff2fc kind:function(arm,size=0x54) addr:0x01fff2fc
202202
func_01fff350 kind:function(arm,size=0x64) addr:0x01fff350
203-
_ZN18UnkStruct_027e0ce413func_01fff3b4Ei kind:function(arm,size=0x8c) addr:0x01fff3b4
203+
_ZN12ActorManager13func_01fff3b4Ei kind:function(arm,size=0x8c) addr:0x01fff3b4
204204
func_01fff440 kind:function(arm,size=0x18) addr:0x01fff440
205205
func_01fff458 kind:function(arm,size=0xc) addr:0x01fff458
206206
_ZN5Actor8vfunc_10Ev kind:function(arm,size=0x34) addr:0x01fff464

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2260,7 +2260,7 @@ func_ov000_02098cfc kind:function(arm,size=0x78) addr:0x02098cfc
22602260
func_ov000_02098d74 kind:function(arm,size=0x1c) addr:0x02098d74
22612261
func_ov000_02098d90 kind:function(arm,size=0x1c) addr:0x02098d90
22622262
_ZN8Actor_5c19func_ov000_020975f8Ev kind:function(arm,size=0x78) addr:0x02098dac
2263-
_ZN23ActorUnk_ov000_0209767cC2Ej kind:function(arm,size=0xa8) addr:0x02098e24
2263+
_ZN9ActorTypeC2Ej kind:function(arm,size=0xa8) addr:0x02098e24
22642264
func_ov000_02098ecc kind:function(arm,size=0x28) addr:0x02098ecc
22652265
func_ov000_02098ef4 kind:function(arm,size=0x8) addr:0x02098ef4
22662266
func_ov000_02098efc kind:function(arm,size=0x7c) addr:0x02098efc

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,5 @@
55
.data start:0x020c4180 end:0x020c4820 kind:data align:32
66
.bss start:0x020c4820 end:0x020c5f60 kind:bss align:32
77

8+
src/001_SceneInit/Actor/ActorManager_001.cpp:
9+
.text start:0x020bc7ac end:0x020bd0c4

0 commit comments

Comments
 (0)