ActorManager_04 (#138)

* Map symbol in Game

* ActorManager_04 OK

8 files changed, 28 insertions, 20 deletions

diff --git a/config/eur/arm9/overlays/ov003/symbols.txt b/config/eur/arm9/overlays/ov003/symbols.txt
index c805e540..ee39ed3a 100644
--- a/config/eur/arm9/overlays/ov003/symbols.txt
+++ b/config/eur/arm9/overlays/ov003/symbols.txt
@@ -116,7 +116,7 @@ func_ov003_020f3c28 kind:function(thumb,size=0x5a) addr:0x020f3c28
 func_ov003_020f3c84 kind:function(thumb,size=0x42) addr:0x020f3c84
 func_ov003_020f3cc8 kind:function(arm,size=0x8) addr:0x020f3cc8
 func_ov003_020f3cd0 kind:function(arm,size=0x8c) addr:0x020f3cd0
-func_ov003_020f3d5c kind:function(thumb,size=0x16) addr:0x020f3d5c
+_ZN18UnkStruct_027e0dbc19func_ov003_020f3d5cEi kind:function(thumb,size=0x16) addr:0x020f3d5c
 func_ov003_020f3d74 kind:function(thumb,size=0xc) addr:0x020f3d74
 func_ov003_020f3d80 kind:function(thumb,size=0xc) addr:0x020f3d80
 func_ov003_020f3d8c kind:function(thumb,size=0x6) addr:0x020f3d8c
diff --git a/config/eur/arm9/overlays/ov004/delinks.txt b/config/eur/arm9/overlays/ov004/delinks.txt
index 3a3f9a9f..86850f15 100644
--- a/config/eur/arm9/overlays/ov004/delinks.txt
+++ b/config/eur/arm9/overlays/ov004/delinks.txt
@@ -11,3 +11,7 @@ src/04_Load/Player/LinkStateMove_04.cpp:
 
 src/04_Load/Actor/Navi/ActorNavi_04.cpp:
     .text       start:0x02107810 end:0x02107c00
+
+src/04_Load/Actor/ActorManager_04.cpp:
+    complete
+    .text       start:0x021051e0 end:0x021056c8
diff --git a/config/eur/arm9/overlays/ov004/relocs.txt b/config/eur/arm9/overlays/ov004/relocs.txt
index ea0b6de9..fe9777c4 100644
--- a/config/eur/arm9/overlays/ov004/relocs.txt
+++ b/config/eur/arm9/overlays/ov004/relocs.txt
@@ -1052,14 +1052,14 @@ from:0x02105324 kind:thumb_call_arm to:0x020c3fd4 module:overlay(0)
 from:0x02105334 kind:thumb_call_arm to:0x020c4014 module:overlay(0)
 from:0x0210534c kind:thumb_call_arm to:0x020a5e9c module:overlay(0)
 from:0x02105364 kind:thumb_call_arm to:0x02168a54 module:overlay(17)
-from:0x0210536c kind:thumb_call_arm to:0x0216d6a0 module:overlays(19,20,21,22,23,24,25,26,27,28,29)
-from:0x0210537a kind:thumb_call_arm to:0x0216d6a0 module:overlays(19,20,21,22,23,24,25,26,27,28,29)
+from:0x0210536c kind:thumb_call_arm to:0x0216d6a0 module:overlay(25)
+from:0x0210537a kind:thumb_call_arm to:0x0216d6a0 module:overlay(29)
 from:0x02105384 kind:thumb_call_arm to:0x020a5e9c module:overlay(0)
 from:0x02105394 kind:thumb_call_arm to:0x020a5e9c module:overlay(0)
 from:0x021053cc kind:load to:0x027e0fe8 module:dtcm
 from:0x021053d0 kind:load to:0x027e0ff4 module:dtcm
 from:0x021053d4 kind:load to:0x027e0d38 module:dtcm
-from:0x021053d8 kind:load to:0x0217a4ac module:overlays(22,23,24,25,26,29,61)
+from:0x021053d8 kind:load to:0x0217a4ac module:overlay(29)
 from:0x021053f8 kind:thumb_call_arm to:0x020c33d4 module:overlay(0)
 from:0x0210540c kind:thumb_call to:0x020174a4 module:main
 from:0x0210541c kind:thumb_call to:0x0210f744 module:overlay(4)
@@ -1067,13 +1067,13 @@ from:0x02105422 kind:thumb_call_arm to:0x0202ea0c module:main
 from:0x02105436 kind:thumb_call_arm to:0x020a5e9c module:overlay(0)
 from:0x0210544e kind:thumb_call_arm to:0x02168a90 module:overlay(17)
 from:0x02105456 kind:thumb_call_arm to:0x0216d6dc module:overlay(25)
-from:0x02105464 kind:thumb_call_arm to:0x0216d6f0 module:overlays(23,29)
+from:0x02105464 kind:thumb_call_arm to:0x0216d6f0 module:overlay(29)
 from:0x0210546c kind:thumb_call_arm to:0x020c4018 module:overlay(0)
 from:0x02105470 kind:thumb_call to:0x020c33b0 module:overlay(0)
 from:0x02105478 kind:thumb_call to:0x02105950 module:overlay(4)
 from:0x02105490 kind:load to:0x027e0ce0 module:dtcm
 from:0x02105494 kind:load to:0x027e0d38 module:dtcm
-from:0x02105498 kind:load to:0x0217a4ac module:overlays(22,23,24,25,26,29,61)
+from:0x02105498 kind:load to:0x0217a4ac module:overlay(29)
 from:0x0210549c kind:load to:0x027e0fe8 module:dtcm
 from:0x021054a0 kind:load to:0x027e0fec module:dtcm
 from:0x021054ca kind:thumb_call_arm to:0x02097c80 module:overlay(0)
@@ -1091,7 +1091,7 @@ from:0x02105594 kind:thumb_call_arm to:0x020a5e9c module:overlay(0)
 from:0x021055bc kind:thumb_call to:0x02184554 module:overlay(30)
 from:0x021055c6 kind:thumb_call to:0x021843c4 module:overlay(30)
 from:0x021055ce kind:thumb_call to:0x02184640 module:overlay(30)
-from:0x021055dc kind:thumb_call_arm to:0x0216daa4 module:overlays(19,25)
+from:0x021055dc kind:thumb_call_arm to:0x0216daa4 module:overlay(25)
 from:0x021055e6 kind:thumb_call_arm to:0x0216d804 module:overlay(25)
 from:0x021055f0 kind:load to:0x027e0fec module:dtcm
 from:0x021055f4 kind:load to:0x027e0d38 module:dtcm
diff --git a/config/eur/arm9/overlays/ov004/symbols.txt b/config/eur/arm9/overlays/ov004/symbols.txt
index 02a8328f..740920d8 100644
--- a/config/eur/arm9/overlays/ov004/symbols.txt
+++ b/config/eur/arm9/overlays/ov004/symbols.txt
@@ -135,7 +135,7 @@ _ZN12ActorManagerC1Ev kind:function(thumb,size=0xe8) addr:0x02105230
 _ZN12ActorManagerD1Ev kind:function(thumb,size=0x14) addr:0x02105318
 _ZN12ActorManager19func_ov004_0210532cEv kind:function(thumb,size=0xb0) addr:0x0210532c
 _ZN12ActorManager19func_ov004_021053dcEv kind:function(thumb,size=0xc8) addr:0x021053dc
-_ZN12ActorManager19func_ov004_021054a4EPiii kind:function(thumb,size=0xa8) addr:0x021054a4
+_ZN12ActorManager19func_ov004_021054a4EP13FileEntryFlagii kind:function(thumb,size=0xa8) addr:0x021054a4
 _ZN12ActorManager19func_ov004_0210554cEv kind:function(thumb,size=0x2c) addr:0x0210554c
 _ZN12ActorManager19func_ov004_02105578Ei kind:function(thumb,size=0x90) addr:0x02105578
 _ZN12ActorManager19func_ov004_02105608Eiii kind:function(thumb,size=0xb0) addr:0x02105608
@@ -435,8 +435,8 @@ func_ov004_0210f650 kind:function(thumb,size=0x20) addr:0x0210f650
 func_ov004_0210f670 kind:function(thumb,size=0x6c) addr:0x0210f670
 func_ov004_0210f6dc kind:function(arm,size=0x4) addr:0x0210f6dc
 func_ov004_0210f6e0 kind:function(thumb,size=0x28) addr:0x0210f6e0
-func_ov004_0210f708 kind:function(thumb,size=0x3c) addr:0x0210f708
-func_ov004_0210f744 kind:function(thumb,size=0x26) addr:0x0210f744
+_ZN18ActorManager_Unk14C1Ej kind:function(thumb,size=0x3c) addr:0x0210f708
+_ZN18ActorManager_Unk14D1Ev kind:function(thumb,size=0x26) addr:0x0210f744
 func_ov004_0210f76c kind:function(thumb,size=0x24) addr:0x0210f76c
 func_ov004_0210f790 kind:function(thumb,size=0x24) addr:0x0210f790
 func_ov004_0210f7b4 kind:function(thumb,size=0x38) addr:0x0210f7b4
diff --git a/config/usa/arm9/overlays/ov003/symbols.txt b/config/usa/arm9/overlays/ov003/symbols.txt
index ce78bf0e..105805cd 100644
--- a/config/usa/arm9/overlays/ov003/symbols.txt
+++ b/config/usa/arm9/overlays/ov003/symbols.txt
@@ -116,7 +116,7 @@ func_ov003_020f3c28 kind:function(thumb,size=0x5a) addr:0x020f3bc8
 func_ov003_020f3c84 kind:function(thumb,size=0x42) addr:0x020f3c24
 func_ov003_020f3cc8 kind:function(arm,size=0x8) addr:0x020f3c68
 func_ov003_020f3cd0 kind:function(arm,size=0x8c) addr:0x020f3c70
-func_ov003_020f3d5c kind:function(thumb,size=0x16) addr:0x020f3cfc
+_ZN18UnkStruct_027e0dbc19func_ov003_020f3d5cEi kind:function(thumb,size=0x16) addr:0x020f3cfc
 func_ov003_020f3d74 kind:function(thumb,size=0xc) addr:0x020f3d14
 func_ov003_020f3d80 kind:function(thumb,size=0xc) addr:0x020f3d20
 func_ov003_020f3d8c kind:function(thumb,size=0x6) addr:0x020f3d2c
diff --git a/config/usa/arm9/overlays/ov004/delinks.txt b/config/usa/arm9/overlays/ov004/delinks.txt
index 39f0bf59..d7cf827e 100644
--- a/config/usa/arm9/overlays/ov004/delinks.txt
+++ b/config/usa/arm9/overlays/ov004/delinks.txt
@@ -11,3 +11,7 @@ src/04_Load/Player/LinkStateMove_04.cpp:
 
 src/04_Load/Actor/Navi/ActorNavi_04.cpp:
     .text       start:0x02107790 end:0x02107b80
+
+src/04_Load/Actor/ActorManager_04.cpp:
+    complete
+    .text       start:0x02105160 end:0x02105648
diff --git a/config/usa/arm9/overlays/ov004/relocs.txt b/config/usa/arm9/overlays/ov004/relocs.txt
index b7303b1d..07a60ef9 100644
--- a/config/usa/arm9/overlays/ov004/relocs.txt
+++ b/config/usa/arm9/overlays/ov004/relocs.txt
@@ -1052,14 +1052,14 @@ from:0x021052a4 kind:thumb_call_arm to:0x020c3f74 module:overlay(0)
 from:0x021052b4 kind:thumb_call_arm to:0x020c3fb4 module:overlay(0)
 from:0x021052cc kind:thumb_call_arm to:0x020a5e3c module:overlay(0)
 from:0x021052e4 kind:thumb_call_arm to:0x021689b4 module:overlay(17)
-from:0x021052ec kind:thumb_call_arm to:0x0216d600 module:overlays(19,20,21,22,23,24,25,26,27,28,29)
-from:0x021052fa kind:thumb_call_arm to:0x0216d600 module:overlays(19,20,21,22,23,24,25,26,27,28,29)
+from:0x021052ec kind:thumb_call_arm to:0x0216d600 module:overlay(25)
+from:0x021052fa kind:thumb_call_arm to:0x0216d600 module:overlay(29)
 from:0x02105304 kind:thumb_call_arm to:0x020a5e3c module:overlay(0)
 from:0x02105314 kind:thumb_call_arm to:0x020a5e3c module:overlay(0)
 from:0x0210534c kind:load to:0x027e0fe8 module:dtcm
 from:0x02105350 kind:load to:0x027e0ff4 module:dtcm
 from:0x02105354 kind:load to:0x027e0d38 module:dtcm
-from:0x02105358 kind:load to:0x0217a40c module:overlays(22,23,24,25,26,29,61)
+from:0x02105358 kind:load to:0x0217a40c module:overlay(29)
 from:0x02105378 kind:thumb_call_arm to:0x020c3374 module:overlay(0)
 from:0x0210538c kind:thumb_call to:0x020174a4 module:main
 from:0x0210539c kind:thumb_call to:0x0210f6c4 module:overlay(4)
@@ -1067,13 +1067,13 @@ from:0x021053a2 kind:thumb_call_arm to:0x0202ea08 module:main
 from:0x021053b6 kind:thumb_call_arm to:0x020a5e3c module:overlay(0)
 from:0x021053ce kind:thumb_call_arm to:0x021689f0 module:overlay(17)
 from:0x021053d6 kind:thumb_call_arm to:0x0216d63c module:overlay(25)
-from:0x021053e4 kind:thumb_call_arm to:0x0216d650 module:overlays(23,29)
+from:0x021053e4 kind:thumb_call_arm to:0x0216d650 module:overlay(29)
 from:0x021053ec kind:thumb_call_arm to:0x020c3fb8 module:overlay(0)
 from:0x021053f0 kind:thumb_call to:0x020c3350 module:overlay(0)
 from:0x021053f8 kind:thumb_call to:0x021058d0 module:overlay(4)
 from:0x02105410 kind:load to:0x027e0ce0 module:dtcm
 from:0x02105414 kind:load to:0x027e0d38 module:dtcm
-from:0x02105418 kind:load to:0x0217a40c module:overlays(22,23,24,25,26,29,61)
+from:0x02105418 kind:load to:0x0217a40c module:overlay(29)
 from:0x0210541c kind:load to:0x027e0fe8 module:dtcm
 from:0x02105420 kind:load to:0x027e0fec module:dtcm
 from:0x0210544a kind:thumb_call_arm to:0x02097c20 module:overlay(0)
@@ -1091,7 +1091,7 @@ from:0x02105514 kind:thumb_call_arm to:0x020a5e3c module:overlay(0)
 from:0x0210553c kind:thumb_call to:0x021844b4 module:overlay(30)
 from:0x02105546 kind:thumb_call to:0x02184324 module:overlay(30)
 from:0x0210554e kind:thumb_call to:0x021845a0 module:overlay(30)
-from:0x0210555c kind:thumb_call_arm to:0x0216da04 module:overlays(19,25)
+from:0x0210555c kind:thumb_call_arm to:0x0216da04 module:overlay(25)
 from:0x02105566 kind:thumb_call_arm to:0x0216d764 module:overlay(25)
 from:0x02105570 kind:load to:0x027e0fec module:dtcm
 from:0x02105574 kind:load to:0x027e0d38 module:dtcm
diff --git a/config/usa/arm9/overlays/ov004/symbols.txt b/config/usa/arm9/overlays/ov004/symbols.txt
index d0c72faa..18887b0a 100644
--- a/config/usa/arm9/overlays/ov004/symbols.txt
+++ b/config/usa/arm9/overlays/ov004/symbols.txt
@@ -135,7 +135,7 @@ _ZN12ActorManagerC1Ev kind:function(thumb,size=0xe8) addr:0x021051b0
 _ZN12ActorManagerD1Ev kind:function(thumb,size=0x14) addr:0x02105298
 _ZN12ActorManager19func_ov004_0210532cEv kind:function(thumb,size=0xb0) addr:0x021052ac
 _ZN12ActorManager19func_ov004_021053dcEv kind:function(thumb,size=0xc8) addr:0x0210535c
-_ZN12ActorManager19func_ov004_021054a4EPiii kind:function(thumb,size=0xa8) addr:0x02105424
+_ZN12ActorManager19func_ov004_021054a4EP13FileEntryFlagii kind:function(thumb,size=0xa8) addr:0x02105424
 _ZN12ActorManager19func_ov004_0210554cEv kind:function(thumb,size=0x2c) addr:0x021054cc
 _ZN12ActorManager19func_ov004_02105578Ei kind:function(thumb,size=0x90) addr:0x021054f8
 _ZN12ActorManager19func_ov004_02105608Eiii kind:function(thumb,size=0xb0) addr:0x02105588
@@ -435,8 +435,8 @@ func_ov004_0210f650 kind:function(thumb,size=0x20) addr:0x0210f5d0
 func_ov004_0210f670 kind:function(thumb,size=0x6c) addr:0x0210f5f0
 func_ov004_0210f6dc kind:function(arm,size=0x4) addr:0x0210f65c
 func_ov004_0210f6e0 kind:function(thumb,size=0x28) addr:0x0210f660
-func_ov004_0210f708 kind:function(thumb,size=0x3c) addr:0x0210f688
-func_ov004_0210f744 kind:function(thumb,size=0x26) addr:0x0210f6c4
+_ZN18ActorManager_Unk14C1Ej kind:function(thumb,size=0x3c) addr:0x0210f688
+_ZN18ActorManager_Unk14D1Ev kind:function(thumb,size=0x26) addr:0x0210f6c4
 func_ov004_0210f76c kind:function(thumb,size=0x24) addr:0x0210f6ec
 func_ov004_0210f790 kind:function(thumb,size=0x24) addr:0x0210f710
 func_ov004_0210f7b4 kind:function(thumb,size=0x38) addr:0x0210f734