ActorCharacter OK (#162)

* ActorCharacter 93%

* ActorCharacter 98%

* ActorCharacter OK

* Fix broken matches

3 files changed, 23 insertions, 21 deletions

diff --git a/config/eur/arm9/overlays/ov014/delinks.txt b/config/eur/arm9/overlays/ov014/delinks.txt
index dd2dfac8..477a8e81 100644
--- a/config/eur/arm9/overlays/ov014/delinks.txt
+++ b/config/eur/arm9/overlays/ov014/delinks.txt
@@ -27,7 +27,9 @@ src/14_Land/Actor/Character/ActorCharacterBase.cpp:
     .data       start:0x021594b8 end:0x021595ac
 
 src/14_Land/Actor/Character/ActorCharacter.cpp:
+    complete
     .text       start:0x02144d94 end:0x02145a74
+    .data       start:0x021595ac end:0x021596a8
 
 src/14_Land/Actor/Character/ActorGenericCharacter.cpp:
     .text       start:0x021476d0 end:0x02148234
diff --git a/config/eur/arm9/overlays/ov014/relocs.txt b/config/eur/arm9/overlays/ov014/relocs.txt
index 49babc8e..2d69e72a 100644
--- a/config/eur/arm9/overlays/ov014/relocs.txt
+++ b/config/eur/arm9/overlays/ov014/relocs.txt
@@ -4564,7 +4564,7 @@ from:0x02144e70 kind:load to:0x02097760 module:overlay(0)
 from:0x02144e84 kind:arm_call to:0x02144e58 module:overlay(14)
 from:0x02144ea4 kind:arm_call_thumb to:0x020a95ec module:overlay(0)
 from:0x02144ec0 kind:arm_call_thumb to:0x020c0c08 module:overlay(0)
-from:0x02144ed4 kind:load to:0x021596b0 module:overlay(14)
+from:0x02144ed4 kind:load to:0x021596a8 module:overlay(14) add:0x8
 from:0x02144ee4 kind:arm_call to:0x02144900 module:overlay(14)
 from:0x02144ef4 kind:arm_call to:0x020ccef0 module:overlay(0)
 from:0x02144f08 kind:arm_call to:0x020c5c2c module:overlay(0)
@@ -4575,10 +4575,10 @@ from:0x02144f94 kind:arm_call to:0x020c66bc module:overlay(0)
 from:0x02144fd4 kind:arm_call to:0x020078f4 module:main
 from:0x02144fe8 kind:arm_call to:0x020078f4 module:main
 from:0x02144ff8 kind:load to:0x021595ac module:overlay(14) add:0x8
-from:0x02144ffc kind:load to:0x021596cc module:overlay(14)
+from:0x02144ffc kind:load to:0x021596c4 module:overlay(14) add:0x8
 from:0x02145000 kind:load to:0x020a9b6d module:overlay(0)
 from:0x02145004 kind:load to:0x02144eb0 module:overlay(14)
-from:0x02145008 kind:load to:0x021596b0 module:overlay(14)
+from:0x02145008 kind:load to:0x021596a8 module:overlay(14) add:0x8
 from:0x0214501c kind:arm_call to:0x020c66d0 module:overlay(0)
 from:0x02145024 kind:arm_call_thumb to:0x020a9b6c module:overlay(0)
 from:0x02145038 kind:arm_call to:0x0204f754 module:main
diff --git a/config/eur/arm9/overlays/ov014/symbols.txt b/config/eur/arm9/overlays/ov014/symbols.txt
index 11661c0b..17f4d1bf 100644
--- a/config/eur/arm9/overlays/ov014/symbols.txt
+++ b/config/eur/arm9/overlays/ov014/symbols.txt
@@ -1096,8 +1096,8 @@ _ZN14ActorCharacter19func_ov014_02144e28Ev kind:function(arm,size=0x14) addr:0x0
 _ZN14ActorCharacter19func_ov014_02144e3cEv kind:function(arm,size=0x1c) addr:0x02144e3c
 _ZN14ActorCharacter19func_ov014_02144e58Ev kind:function(arm,size=0x1c) addr:0x02144e58
 _ZN14ActorCharacter19func_ov014_02144e74Ev kind:function(arm,size=0x28) addr:0x02144e74
-_ZN19ActorCharacterModelD0Ev kind:function(arm,size=0x14) addr:0x02144e9c
-_ZN18ActorCharacter_288C1Ev kind:function(arm,size=0x28) addr:0x02144eb0
+_ZN19ActorCharacterModelD1Ev kind:function(arm,size=0x14) addr:0x02144e9c
+_ZN21ActorCharacter_1d8_b0C1Ev kind:function(arm,size=0x28) addr:0x02144eb0
 _ZN14ActorCharacterC2Ev kind:function(arm,size=0x138) addr:0x02144ed8
 _ZN14ActorCharacterD1Ev kind:function(arm,size=0x48) addr:0x02145010
 _ZN14ActorCharacterD0Ev kind:function(arm,size=0x50) addr:0x02145058
@@ -1109,26 +1109,26 @@ _ZN14ActorCharacter19func_ov014_021451f0EPi kind:function(arm,size=0x68) addr:0x
 _ZN14ActorCharacter19func_ov014_02145258Ev kind:function(arm,size=0x58) addr:0x02145258
 _ZN14ActorCharacter19func_ov014_021452b0Ev kind:function(arm,size=0x68) addr:0x021452b0
 _ZN14ActorCharacter19func_ov014_02145318Ev kind:function(arm,size=0xdc) addr:0x02145318
-_ZN14ActorCharacter19func_ov014_021453f4Ev kind:function(arm,size=0x20) addr:0x021453f4
-_ZN14ActorCharacter19func_ov014_02145414Ev kind:function(arm,size=0x78) addr:0x02145414
-_ZN14ActorCharacter19func_ov014_0214548cEv kind:function(arm,size=0x7c) addr:0x0214548c
+_ZN14ActorCharacter19func_ov014_021453f4Ei kind:function(arm,size=0x20) addr:0x021453f4
+_ZN14ActorCharacter19func_ov014_02145414Eii kind:function(arm,size=0x78) addr:0x02145414
+_ZN14ActorCharacter19func_ov014_0214548cEi kind:function(arm,size=0x7c) addr:0x0214548c
 _ZN14ActorCharacter19func_ov014_02145508Ev kind:function(arm,size=0x18) addr:0x02145508
-_Z19func_ov014_02145520P14ActorCharacter kind:function(arm,size=0xc) addr:0x02145520
+_ZN14ActorCharacter19func_ov014_02145520EP18ActorCharacterBase kind:function(arm,size=0xc) addr:0x02145520
 _ZN14ActorCharacter19func_ov014_0214552cEv kind:function(arm,size=0x4c) addr:0x0214552c
 _ZN14ActorCharacter8vfunc_80Ev kind:function(arm,size=0x38) addr:0x02145578
 _ZN14ActorCharacter8vfunc_84Ev kind:function(arm,size=0x34) addr:0x021455b0
 _ZN14ActorCharacter8vfunc_ccEv kind:function(arm,size=0x94) addr:0x021455e4
 _ZN14ActorCharacter8vfunc_c8Ev kind:function(arm,size=0x18) addr:0x02145678
 _ZN14ActorCharacter8vfunc_78Ev kind:function(arm,size=0x8) addr:0x02145690
-_ZN14ActorCharacter8vfunc_74Ev kind:function(arm,size=0xa4) addr:0x02145698
-_ZN14ActorCharacter8vfunc_7cEv kind:function(arm,size=0x24) addr:0x0214573c
-_ZN14ActorCharacter8vfunc_90Ev kind:function(arm,size=0xb4) addr:0x02145760
-_ZN14ActorCharacter8vfunc_94Ev kind:function(arm,size=0x60) addr:0x02145814
+_ZN14ActorCharacter8vfunc_74EP8ActorRef kind:function(arm,size=0xa4) addr:0x02145698
+_ZN14ActorCharacter8vfunc_7cEP8ActorRef kind:function(arm,size=0x24) addr:0x0214573c
+_ZN14ActorCharacter8vfunc_90Eii kind:function(arm,size=0xb4) addr:0x02145760
+_ZN14ActorCharacter8vfunc_94Eii kind:function(arm,size=0x60) addr:0x02145814
 _ZN14ActorCharacter8vfunc_98Ev kind:function(arm,size=0x2c) addr:0x02145874
 _ZN14ActorCharacter8vfunc_d0Ev kind:function(arm,size=0x10) addr:0x021458a0
 _ZN14ActorCharacter8vfunc_9cEv kind:function(arm,size=0x1c) addr:0x021458b0
 _ZN14ActorCharacter8vfunc_ecEi kind:function(arm,size=0x34) addr:0x021458cc
-_ZN14ActorCharacter8vfunc_f0Ei kind:function(arm,size=0x1c) addr:0x02145900
+_ZN14ActorCharacter8vfunc_f0Eii kind:function(arm,size=0x1c) addr:0x02145900
 _ZN14ActorCharacter19func_ov014_0214591cEv kind:function(arm,size=0x58) addr:0x0214591c
 _ZN14ActorCharacter15IsHitboxTouchedEb kind:function(arm,size=0x100) addr:0x02145974
 func_ov014_02145a74 kind:function(arm,size=0x74) addr:0x02145a74
@@ -1136,9 +1136,9 @@ func_ov014_02145ae8 kind:function(arm,size=0x30) addr:0x02145ae8
 func_ov014_02145b18 kind:function(arm,size=0xb4) addr:0x02145b18
 func_ov014_02145bcc kind:function(arm,size=0xb0) addr:0x02145bcc
 func_ov014_02145c7c kind:function(arm,size=0x30) addr:0x02145c7c
-func_ov014_02145cac kind:function(arm,size=0x19c) addr:0x02145cac
+_ZN18ActorCharacter_1d819func_ov014_02145cacEv kind:function(arm,size=0x19c) addr:0x02145cac
 func_ov014_02145e48 kind:function(arm,size=0xc4) addr:0x02145e48
-func_ov014_02145f0c kind:function(arm,size=0x1ac) addr:0x02145f0c
+_ZN18ActorCharacter_1d819func_ov014_02145f0cEi kind:function(arm,size=0x1ac) addr:0x02145f0c
 func_ov014_021460b8 kind:function(arm,size=0x54) addr:0x021460b8
 func_ov014_0214610c kind:function(arm,size=0x14) addr:0x0214610c
 func_ov014_02146120 kind:function(arm,size=0x74) addr:0x02146120
@@ -1254,12 +1254,12 @@ func_ov014_0214a4bc kind:function(arm,size=0x8) addr:0x0214a4bc
 func_ov014_0214a4c4 kind:function(arm,size=0x20) addr:0x0214a4c4
 func_ov014_0214a4e4 kind:function(arm,size=0x18) addr:0x0214a4e4
 func_ov014_0214a4fc kind:function(arm,size=0x64) addr:0x0214a4fc
-func_ov014_0214a560 kind:function(arm,size=0xa4) addr:0x0214a560
+_ZN19ActorCharacterModelC1Ev kind:function(arm,size=0xa4) addr:0x0214a560
 func_ov014_0214a604 kind:function(arm,size=0x14) addr:0x0214a604
 func_ov014_0214a618 kind:function(arm,size=0x108) addr:0x0214a618
 func_ov014_0214a720 kind:function(arm,size=0x20c) addr:0x0214a720
-func_ov014_0214a92c kind:function(arm,size=0xe0) addr:0x0214a92c
-func_ov014_0214aa0c kind:function(arm,size=0x20) addr:0x0214aa0c
+_ZN19ActorCharacterModel19func_ov014_0214a92cEP5Vec3pS1_s kind:function(arm,size=0xe0) addr:0x0214a92c
+_ZN19ActorCharacterModel19func_ov014_0214aa0cEP5Vec3ps kind:function(arm,size=0x20) addr:0x0214aa0c
 func_ov014_0214aa2c kind:function(arm,size=0xe8) addr:0x0214aa2c
 func_ov014_0214ab14 kind:function(arm,size=0x1c) addr:0x0214ab14
 func_ov014_0214ab30 kind:function(arm,size=0x30) addr:0x0214ab30
@@ -2079,10 +2079,10 @@ data_ov014_02159408 kind:data(any) addr:0x02159408
 data_ov014_02159478 kind:data(any) addr:0x02159478
 _ZTV18ActorCharacterBase kind:data(any) addr:0x021594b8
 _ZTV14ActorCharacter kind:data(any) addr:0x021595ac
-data_ov014_021596b0 kind:data(any) addr:0x021596b0
+_ZTV21ActorCharacter_1d8_b0 kind:data(any) addr:0x021596a8
 data_ov014_021596b8 kind:data(any) addr:0x021596b8
 data_ov014_021596bc kind:data(any) addr:0x021596bc
-data_ov014_021596cc kind:data(any) addr:0x021596cc
+_ZTV18ActorCharacter_1d8 kind:data(any) addr:0x021596c4
 data_ov014_021596d8 kind:data(any) addr:0x021596d8
 data_ov014_021596dc kind:data(any) addr:0x021596dc
 data_ov014_021596e0 kind:data(any) addr:0x021596e0