ActorCharacterBase OK (#161)

* ActorCharacterBase OK

* Fix broken matches

4 files changed, 20 insertions, 18 deletions

diff --git a/config/eur/arm9/overlays/ov000/symbols.txt b/config/eur/arm9/overlays/ov000/symbols.txt
index f6f84a60..b0efe540 100644
--- a/config/eur/arm9/overlays/ov000/symbols.txt
+++ b/config/eur/arm9/overlays/ov000/symbols.txt
@@ -2751,7 +2751,7 @@ _ZN5Actor4GrabEv kind:function(arm,size=0x1c) addr:0x020c18a8
 _ZN5Actor4DropEP5Vec3p kind:function(arm,size=0x38) addr:0x020c18c4
 _ZN5Actor8vfunc_60Ev kind:function(arm,size=0x8) addr:0x020c18fc
 _ZN5Actor8vfunc_64Ev kind:function(arm,size=0x4) addr:0x020c1904
-_ZN5Actor10SetUnk_11cEc kind:function(arm,size=0x8) addr:0x020c1908
+_ZN5Actor10SetUnk_11cEb kind:function(arm,size=0x8) addr:0x020c1908
 _ZN5Actor8vfunc_68Ev kind:function(arm,size=0x4) addr:0x020c1910
 _ZN5Actor8vfunc_6cEv kind:function(arm,size=0x8) addr:0x020c1914
 _ZN5Actor8vfunc_70Ev kind:function(arm,size=0x8) addr:0x020c191c
diff --git a/config/eur/arm9/overlays/ov014/delinks.txt b/config/eur/arm9/overlays/ov014/delinks.txt
index fb52d807..dd2dfac8 100644
--- a/config/eur/arm9/overlays/ov014/delinks.txt
+++ b/config/eur/arm9/overlays/ov014/delinks.txt
@@ -22,7 +22,9 @@ src/14_Land/Actor/Player/ActorRefill.cpp:
     .bss        start:0x0215af94 end:0x0215b034
 
 src/14_Land/Actor/Character/ActorCharacterBase.cpp:
+    complete
     .text       start:0x021447f8 end:0x02144d94
+    .data       start:0x021594b8 end:0x021595ac
 
 src/14_Land/Actor/Character/ActorCharacter.cpp:
     .text       start:0x02144d94 end:0x02145a74
diff --git a/config/eur/arm9/overlays/ov014/relocs.txt b/config/eur/arm9/overlays/ov014/relocs.txt
index a64144fd..49babc8e 100644
--- a/config/eur/arm9/overlays/ov014/relocs.txt
+++ b/config/eur/arm9/overlays/ov014/relocs.txt
@@ -4513,22 +4513,22 @@ from:0x021447e4 kind:arm_call_thumb to:0x020a95ec module:overlay(0)
 from:0x021447ec kind:arm_call to:0x0202ea0c module:main
 from:0x02144908 kind:arm_call to:0x020c1554 module:overlay(0)
 from:0x0214491c kind:arm_call to:0x020d18f4 module:overlay(0)
-from:0x02144948 kind:load to:0x021594c0 module:overlay(14)
+from:0x02144948 kind:load to:0x021594b8 module:overlay(14) add:0x8
 from:0x02144970 kind:arm_call to:0x02036d4c module:main
 from:0x02144978 kind:arm_call to:0x020d1980 module:overlay(0)
 from:0x02144980 kind:arm_call to:0x020c1730 module:overlay(0)
-from:0x0214498c kind:load to:0x021594c0 module:overlay(14)
+from:0x0214498c kind:load to:0x021594b8 module:overlay(14) add:0x8
 from:0x02144990 kind:load to:0x027e0c68 module:dtcm
 from:0x021449b8 kind:arm_call to:0x02036d4c module:main
 from:0x021449c0 kind:arm_call to:0x020d1980 module:overlay(0)
 from:0x021449c8 kind:arm_call to:0x020c1730 module:overlay(0)
 from:0x021449d0 kind:arm_call to:0x0202ea0c module:main
-from:0x021449dc kind:load to:0x021594c0 module:overlay(14)
+from:0x021449dc kind:load to:0x021594b8 module:overlay(14) add:0x8
 from:0x021449e0 kind:load to:0x027e0c68 module:dtcm
 from:0x02144a08 kind:arm_call to:0x02036d4c module:main
 from:0x02144a10 kind:arm_call to:0x020d1980 module:overlay(0)
 from:0x02144a18 kind:arm_call to:0x020c1730 module:overlay(0)
-from:0x02144a24 kind:load to:0x021594c0 module:overlay(14)
+from:0x02144a24 kind:load to:0x021594b8 module:overlay(14) add:0x8
 from:0x02144a28 kind:load to:0x027e0c68 module:dtcm
 from:0x02144a7c kind:load to:0x021447f8 module:overlay(14)
 from:0x02144a80 kind:load to:0x0214480c module:overlay(14)
@@ -4574,7 +4574,7 @@ from:0x02144f44 kind:arm_call_thumb to:0x020c0c08 module:overlay(0)
 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:0x021595b4 module:overlay(14)
+from:0x02144ff8 kind:load to:0x021595ac module:overlay(14) add:0x8
 from:0x02144ffc kind:load to:0x021596cc module:overlay(14)
 from:0x02145000 kind:load to:0x020a9b6d module:overlay(0)
 from:0x02145004 kind:load to:0x02144eb0 module:overlay(14)
diff --git a/config/eur/arm9/overlays/ov014/symbols.txt b/config/eur/arm9/overlays/ov014/symbols.txt
index a5b3a461..11661c0b 100644
--- a/config/eur/arm9/overlays/ov014/symbols.txt
+++ b/config/eur/arm9/overlays/ov014/symbols.txt
@@ -1061,16 +1061,16 @@ func_ov014_02144750 kind:function(arm,size=0x38) addr:0x02144750
 func_ov014_02144788 kind:function(arm,size=0x38) addr:0x02144788
 func_ov014_021447c0 kind:function(arm,size=0x1c) addr:0x021447c0
 func_ov014_021447dc kind:function(arm,size=0x1c) addr:0x021447dc
-_Z19func_ov014_021447f8P18ActorCharacterBase kind:function(arm,size=0x14) addr:0x021447f8
-_Z19func_ov014_0214480cP18ActorCharacterBase kind:function(arm,size=0x14) addr:0x0214480c
-_Z19func_ov014_02144820P18ActorCharacterBase kind:function(arm,size=0x14) addr:0x02144820
-_Z19func_ov014_02144834P18ActorCharacterBase kind:function(arm,size=0x14) addr:0x02144834
-_Z19func_ov014_02144848PiiP18ActorCharacterBase kind:function(arm,size=0x8c) addr:0x02144848
-_ZN18ActorCharacterBase8vfunc_d8Ev kind:function(arm,size=0x8) addr:0x021448d4
-_ZN18ActorCharacterBase8vfunc_dcEv kind:function(arm,size=0x8) addr:0x021448dc
-_ZN18ActorCharacterBase8vfunc_e0Ev kind:function(arm,size=0x8) addr:0x021448e4
-_ZN18ActorCharacterBase8vfunc_e4Ev kind:function(arm,size=0x8) addr:0x021448ec
-_ZN18ActorCharacterBase8vfunc_e8Ev kind:function(arm,size=0xc) addr:0x021448f4
+_Z19func_ov014_021447f8Pvi kind:function(arm,size=0x14) addr:0x021447f8 local
+_Z19func_ov014_0214480cPvi kind:function(arm,size=0x14) addr:0x0214480c local
+_Z19func_ov014_02144820Pvi kind:function(arm,size=0x14) addr:0x02144820 local
+_Z19func_ov014_02144834Pvi kind:function(arm,size=0x14) addr:0x02144834 local
+_Z19func_ov014_0214484824UnkStruct_ov014_02144848P18ActorCharacterBase kind:function(arm,size=0x8c) addr:0x02144848 local
+_ZN18ActorCharacterBase8vfunc_d8Ei kind:function(arm,size=0x8) addr:0x021448d4
+_ZN18ActorCharacterBase8vfunc_dcEi kind:function(arm,size=0x8) addr:0x021448dc
+_ZN18ActorCharacterBase8vfunc_e0Ei kind:function(arm,size=0x8) addr:0x021448e4
+_ZN18ActorCharacterBase8vfunc_e4Ei kind:function(arm,size=0x8) addr:0x021448ec
+_ZN18ActorCharacterBase8vfunc_e8Ett kind:function(arm,size=0xc) addr:0x021448f4
 _ZN18ActorCharacterBaseC2Ev kind:function(arm,size=0x4c) addr:0x02144900
 _ZN18ActorCharacterBaseD1Ev kind:function(arm,size=0x48) addr:0x0214494c
 _ZN18ActorCharacterBaseD0Ev kind:function(arm,size=0x50) addr:0x02144994
@@ -2077,8 +2077,8 @@ data_ov014_021593d8 kind:data(any) addr:0x021593d8
 data_ov014_021593dc kind:data(any) addr:0x021593dc
 data_ov014_02159408 kind:data(any) addr:0x02159408
 data_ov014_02159478 kind:data(any) addr:0x02159478
-data_ov014_021594c0 kind:data(any) addr:0x021594c0
-data_ov014_021595b4 kind:data(any) addr:0x021595b4
+_ZTV18ActorCharacterBase kind:data(any) addr:0x021594b8
+_ZTV14ActorCharacter kind:data(any) addr:0x021595ac
 data_ov014_021596b0 kind:data(any) addr:0x021596b0
 data_ov014_021596b8 kind:data(any) addr:0x021596b8
 data_ov014_021596bc kind:data(any) addr:0x021596bc