Delink character actor base classes and shop keeper actors (#152)

* Delink .text for ActorItemSeller, ActorBeedle, ActorTetra

* Delink .text for ActorCharacterBase, ActorCharacter, ActorGenericCharacter

* Define classes ActorCharacterBase, ActorCharacter, ActorGenericCharacter

* Don't define `override` macro during intellisense/clangd

* Define symbols for ActorCharacter, ActorCharacterBase, ActorGenericCharacter

* Define classes and symbols for ActorItemSeller, ActorBeedle, ActorTetra

* Fix duplicate symbol

4 files changed, 214 insertions, 193 deletions

diff --git a/config/usa/arm9/overlays/ov014/delinks.txt b/config/usa/arm9/overlays/ov014/delinks.txt
index 46dc1f9f..32dedf81 100644
--- a/config/usa/arm9/overlays/ov014/delinks.txt
+++ b/config/usa/arm9/overlays/ov014/delinks.txt
@@ -20,3 +20,12 @@ src/14_Land/Actor/Player/ActorRefill.cpp:
     .ctor       start:0x02155848 end:0x0215584c
     .data       start:0x02157810 end:0x02157cd0
     .bss        start:0x0215aef4 end:0x0215af94
+
+src/14_Land/Actor/Character/ActorCharacterBase.cpp:
+    .text       start:0x02144754 end:0x02144cf0
+
+src/14_Land/Actor/Character/ActorCharacter.cpp:
+    .text       start:0x02144cf0 end:0x021459d0
+
+src/14_Land/Actor/Character/ActorGenericCharacter.cpp:
+    .text       start:0x0214762c end:0x02148190
diff --git a/config/usa/arm9/overlays/ov014/symbols.txt b/config/usa/arm9/overlays/ov014/symbols.txt
index f4991334..735d3e12 100644
--- a/config/usa/arm9/overlays/ov014/symbols.txt
+++ b/config/usa/arm9/overlays/ov014/symbols.txt
@@ -1061,76 +1061,76 @@ func_ov014_02144750 kind:function(arm,size=0x38) addr:0x021446ac
 func_ov014_02144788 kind:function(arm,size=0x38) addr:0x021446e4
 func_ov014_021447c0 kind:function(arm,size=0x1c) addr:0x0214471c
 func_ov014_021447dc kind:function(arm,size=0x1c) addr:0x02144738
-func_ov014_021447f8 kind:function(arm,size=0x14) addr:0x02144754
-func_ov014_0214480c kind:function(arm,size=0x14) addr:0x02144768
-func_ov014_02144820 kind:function(arm,size=0x14) addr:0x0214477c
-func_ov014_02144834 kind:function(arm,size=0x14) addr:0x02144790
-func_ov014_02144848 kind:function(arm,size=0x8c) addr:0x021447a4
-func_ov014_021448d4 kind:function(arm,size=0x8) addr:0x02144830
-func_ov014_021448dc kind:function(arm,size=0x8) addr:0x02144838
-func_ov014_021448e4 kind:function(arm,size=0x8) addr:0x02144840
-func_ov014_021448ec kind:function(arm,size=0x8) addr:0x02144848
-func_ov014_021448f4 kind:function(arm,size=0xc) addr:0x02144850
-func_ov014_02144900 kind:function(arm,size=0x4c) addr:0x0214485c
-func_ov014_0214494c kind:function(arm,size=0x48) addr:0x021448a8
-func_ov014_02144994 kind:function(arm,size=0x50) addr:0x021448f0
-func_ov014_021449e4 kind:function(arm,size=0x48) addr:0x02144940
-func_ov014_02144a2c kind:function(arm,size=0x64) addr:0x02144988
-func_ov014_02144a90 kind:function(arm,size=0x6c) addr:0x021449ec
-func_ov014_02144afc kind:function(arm,size=0x68) addr:0x02144a58
-func_ov014_02144b64 kind:function(arm,size=0x19c) addr:0x02144ac0
-func_ov014_02144d00 kind:function(arm,size=0x8) addr:0x02144c5c
-func_ov014_02144d08 kind:function(arm,size=0x2c) addr:0x02144c64
-func_ov014_02144d34 kind:function(arm,size=0x18) addr:0x02144c90
-func_ov014_02144d4c kind:function(arm,size=0xc) addr:0x02144ca8
-func_ov014_02144d58 kind:function(arm,size=0xc) addr:0x02144cb4
-func_ov014_02144d64 kind:function(arm,size=0x4) addr:0x02144cc0
-func_ov014_02144d68 kind:function(arm,size=0x4) addr:0x02144cc4
-func_ov014_02144d6c kind:function(arm,size=0x4) addr:0x02144cc8
-func_ov014_02144d70 kind:function(arm,size=0x4) addr:0x02144ccc
-func_ov014_02144d74 kind:function(arm,size=0x20) addr:0x02144cd0
-func_ov014_02144d94 kind:function(arm,size=0x58) addr:0x02144cf0
-func_ov014_02144dec kind:function(arm,size=0x28) addr:0x02144d48
-func_ov014_02144e14 kind:function(arm,size=0x14) addr:0x02144d70
-func_ov014_02144e28 kind:function(arm,size=0x14) addr:0x02144d84
-func_ov014_02144e3c kind:function(arm,size=0x1c) addr:0x02144d98
-func_ov014_02144e58 kind:function(arm,size=0x1c) addr:0x02144db4
-func_ov014_02144e74 kind:function(arm,size=0x28) addr:0x02144dd0
-func_ov014_02144e9c kind:function(arm,size=0x14) addr:0x02144df8
-func_ov014_02144eb0 kind:function(arm,size=0x28) addr:0x02144e0c
-func_ov014_02144ed8 kind:function(arm,size=0x138) addr:0x02144e34
-func_ov014_02145010 kind:function(arm,size=0x48) addr:0x02144f6c
-func_ov014_02145058 kind:function(arm,size=0x50) addr:0x02144fb4
-func_ov014_021450a8 kind:function(arm,size=0x48) addr:0x02145004
-func_ov014_021450f0 kind:function(arm,size=0x10) addr:0x0214504c
-func_ov014_02145100 kind:function(arm,size=0x78) addr:0x0214505c
-func_ov014_02145178 kind:function(arm,size=0x78) addr:0x021450d4
-func_ov014_021451f0 kind:function(arm,size=0x68) addr:0x0214514c
-func_ov014_02145258 kind:function(arm,size=0x58) addr:0x021451b4
-func_ov014_021452b0 kind:function(arm,size=0x68) addr:0x0214520c
-func_ov014_02145318 kind:function(arm,size=0xdc) addr:0x02145274
-func_ov014_021453f4 kind:function(arm,size=0x20) addr:0x02145350
-func_ov014_02145414 kind:function(arm,size=0x78) addr:0x02145370
-func_ov014_0214548c kind:function(arm,size=0x7c) addr:0x021453e8
-func_ov014_02145508 kind:function(arm,size=0x18) addr:0x02145464
-func_ov014_02145520 kind:function(arm,size=0xc) addr:0x0214547c
-func_ov014_0214552c kind:function(arm,size=0x4c) addr:0x02145488
-func_ov014_02145578 kind:function(arm,size=0x38) addr:0x021454d4
-func_ov014_021455b0 kind:function(arm,size=0x34) addr:0x0214550c
-func_ov014_021455e4 kind:function(arm,size=0x94) addr:0x02145540
-func_ov014_02145678 kind:function(arm,size=0x18) addr:0x021455d4
-func_ov014_02145690 kind:function(arm,size=0x8) addr:0x021455ec
-func_ov014_02145698 kind:function(arm,size=0xa4) addr:0x021455f4
-func_ov014_0214573c kind:function(arm,size=0x24) addr:0x02145698
-func_ov014_02145760 kind:function(arm,size=0xb4) addr:0x021456bc
-func_ov014_02145814 kind:function(arm,size=0x60) addr:0x02145770
-func_ov014_02145874 kind:function(arm,size=0x2c) addr:0x021457d0
-func_ov014_021458a0 kind:function(arm,size=0x10) addr:0x021457fc
-func_ov014_021458b0 kind:function(arm,size=0x1c) addr:0x0214580c
-func_ov014_021458cc kind:function(arm,size=0x34) addr:0x02145828
-func_ov014_02145900 kind:function(arm,size=0x1c) addr:0x0214585c
-func_ov014_0214591c kind:function(arm,size=0x58) addr:0x02145878
-func_ov014_02145974 kind:function(arm,size=0x100) addr:0x021458d0
+_Z19func_ov014_021447f8P18ActorCharacterBase kind:function(arm,size=0x14) addr:0x02144754
+_Z19func_ov014_0214480cP18ActorCharacterBase kind:function(arm,size=0x14) addr:0x02144768
+_Z19func_ov014_02144820P18ActorCharacterBase kind:function(arm,size=0x14) addr:0x0214477c
+_Z19func_ov014_02144834P18ActorCharacterBase kind:function(arm,size=0x14) addr:0x02144790
+_Z19func_ov014_02144848PiiP18ActorCharacterBase kind:function(arm,size=0x8c) addr:0x021447a4
+_ZN18ActorCharacterBase8vfunc_d8Ev kind:function(arm,size=0x8) addr:0x02144830
+_ZN18ActorCharacterBase8vfunc_dcEv kind:function(arm,size=0x8) addr:0x02144838
+_ZN18ActorCharacterBase8vfunc_e0Ev kind:function(arm,size=0x8) addr:0x02144840
+_ZN18ActorCharacterBase8vfunc_e4Ev kind:function(arm,size=0x8) addr:0x02144848
+_ZN18ActorCharacterBase8vfunc_e8Ev kind:function(arm,size=0xc) addr:0x02144850
+_ZN18ActorCharacterBaseC2Ev kind:function(arm,size=0x4c) addr:0x0214485c
+_ZN18ActorCharacterBaseD1Ev kind:function(arm,size=0x48) addr:0x021448a8
+_ZN18ActorCharacterBaseD0Ev kind:function(arm,size=0x50) addr:0x021448f0
+_ZN18ActorCharacterBaseD2Ev kind:function(arm,size=0x48) addr:0x02144940
+_ZN18ActorCharacterBase4InitEv kind:function(arm,size=0x64) addr:0x02144988
+_ZN18ActorCharacterBase8vfunc_14Ej kind:function(arm,size=0x6c) addr:0x021449ec
+_ZN18ActorCharacterBase8vfunc_c0Ev kind:function(arm,size=0x68) addr:0x02144a58
+_ZN18ActorCharacterBase8vfunc_18Ej kind:function(arm,size=0x19c) addr:0x02144ac0
+_ZN18ActorCharacterBase8vfunc_d4Ev kind:function(arm,size=0x8) addr:0x02144c5c
+_ZN18ActorCharacterBase8vfunc_b4Ev kind:function(arm,size=0x2c) addr:0x02144c64
+_ZN18ActorCharacterBase8vfunc_b8Ev kind:function(arm,size=0x18) addr:0x02144c90
+_ZN18ActorCharacterBase8vfunc_80Ev kind:function(arm,size=0xc) addr:0x02144ca8
+_ZN18ActorCharacterBase8vfunc_84Ev kind:function(arm,size=0xc) addr:0x02144cb4
+_ZN18ActorCharacterBase8vfunc_ccEv kind:function(arm,size=0x4) addr:0x02144cc0
+_ZN18ActorCharacterBase8vfunc_c8Ev kind:function(arm,size=0x4) addr:0x02144cc4
+_ZN18ActorCharacterBase8vfunc_d0Ev kind:function(arm,size=0x4) addr:0x02144cc8
+_ZN18ActorCharacterBase8vfunc_68Ev kind:function(arm,size=0x4) addr:0x02144ccc
+_ZN18ActorCharacterBase8vfunc_bcEv kind:function(arm,size=0x20) addr:0x02144cd0
+_ZN14ActorCharacter19func_ov014_02144d94Ev kind:function(arm,size=0x58) addr:0x02144cf0
+_ZN14ActorCharacter19func_ov014_02144decEv kind:function(arm,size=0x28) addr:0x02144d48
+_ZN14ActorCharacter19func_ov014_02144e14Ev kind:function(arm,size=0x14) addr:0x02144d70
+_ZN14ActorCharacter19func_ov014_02144e28Ev kind:function(arm,size=0x14) addr:0x02144d84
+_ZN14ActorCharacter19func_ov014_02144e3cEv kind:function(arm,size=0x1c) addr:0x02144d98
+_ZN14ActorCharacter19func_ov014_02144e58Ev kind:function(arm,size=0x1c) addr:0x02144db4
+_ZN14ActorCharacter19func_ov014_02144e74Ev kind:function(arm,size=0x28) addr:0x02144dd0
+_ZN19ActorCharacterModelD0Ev kind:function(arm,size=0x14) addr:0x02144df8
+_ZN18ActorCharacter_288C1Ev kind:function(arm,size=0x28) addr:0x02144e0c
+_ZN14ActorCharacterC2Ev kind:function(arm,size=0x138) addr:0x02144e34
+_ZN14ActorCharacterD1Ev kind:function(arm,size=0x48) addr:0x02144f6c
+_ZN14ActorCharacterD0Ev kind:function(arm,size=0x50) addr:0x02144fb4
+_ZN14ActorCharacterD2Ev kind:function(arm,size=0x48) addr:0x02145004
+_ZN14ActorCharacter4InitEv kind:function(arm,size=0x10) addr:0x0214504c
+_ZN14ActorCharacter8vfunc_20Eb kind:function(arm,size=0x78) addr:0x0214505c
+_ZN14ActorCharacter19func_ov014_02145178Ev kind:function(arm,size=0x78) addr:0x021450d4
+_ZN14ActorCharacter19func_ov014_021451f0EPi kind:function(arm,size=0x68) addr:0x0214514c
+_ZN14ActorCharacter19func_ov014_02145258Ev kind:function(arm,size=0x58) addr:0x021451b4
+_ZN14ActorCharacter19func_ov014_021452b0Ev kind:function(arm,size=0x68) addr:0x0214520c
+_ZN14ActorCharacter19func_ov014_02145318Ev kind:function(arm,size=0xdc) addr:0x02145274
+_ZN14ActorCharacter19func_ov014_021453f4Ev kind:function(arm,size=0x20) addr:0x02145350
+_ZN14ActorCharacter19func_ov014_02145414Ev kind:function(arm,size=0x78) addr:0x02145370
+_ZN14ActorCharacter19func_ov014_0214548cEv kind:function(arm,size=0x7c) addr:0x021453e8
+_ZN14ActorCharacter19func_ov014_02145508Ev kind:function(arm,size=0x18) addr:0x02145464
+_Z19func_ov014_02145520P14ActorCharacter kind:function(arm,size=0xc) addr:0x0214547c
+_ZN14ActorCharacter19func_ov014_0214552cEv kind:function(arm,size=0x4c) addr:0x02145488
+_ZN14ActorCharacter8vfunc_80Ev kind:function(arm,size=0x38) addr:0x021454d4
+_ZN14ActorCharacter8vfunc_84Ev kind:function(arm,size=0x34) addr:0x0214550c
+_ZN14ActorCharacter8vfunc_ccEv kind:function(arm,size=0x94) addr:0x02145540
+_ZN14ActorCharacter8vfunc_c8Ev kind:function(arm,size=0x18) addr:0x021455d4
+_ZN14ActorCharacter8vfunc_78Ev kind:function(arm,size=0x8) addr:0x021455ec
+_ZN14ActorCharacter8vfunc_74Ev kind:function(arm,size=0xa4) addr:0x021455f4
+_ZN14ActorCharacter8vfunc_7cEv kind:function(arm,size=0x24) addr:0x02145698
+_ZN14ActorCharacter8vfunc_90Ev kind:function(arm,size=0xb4) addr:0x021456bc
+_ZN14ActorCharacter8vfunc_94Ev kind:function(arm,size=0x60) addr:0x02145770
+_ZN14ActorCharacter8vfunc_98Ev kind:function(arm,size=0x2c) addr:0x021457d0
+_ZN14ActorCharacter8vfunc_d0Ev kind:function(arm,size=0x10) addr:0x021457fc
+_ZN14ActorCharacter8vfunc_9cEv kind:function(arm,size=0x1c) addr:0x0214580c
+_ZN14ActorCharacter8vfunc_ecEi kind:function(arm,size=0x34) addr:0x02145828
+_ZN14ActorCharacter8vfunc_f0Ei kind:function(arm,size=0x1c) addr:0x0214585c
+_ZN14ActorCharacter19func_ov014_0214591cEv kind:function(arm,size=0x58) addr:0x02145878
+_ZN14ActorCharacter15IsHitboxTouchedEb kind:function(arm,size=0x100) addr:0x021458d0
 func_ov014_02145a74 kind:function(arm,size=0x74) addr:0x021459d0
 func_ov014_02145ae8 kind:function(arm,size=0x30) addr:0x02145a44
 func_ov014_02145b18 kind:function(arm,size=0xb4) addr:0x02145a74
@@ -1178,44 +1178,44 @@ func_ov014_021474d8 kind:function(arm,size=0x70) addr:0x02147434
 func_ov014_02147548 kind:function(arm,size=0x3c) addr:0x021474a4
 func_ov014_02147584 kind:function(arm,size=0x108) addr:0x021474e0
 func_ov014_0214768c kind:function(arm,size=0x44) addr:0x021475e8
-func_ov014_021476d0 kind:function(arm,size=0x78) addr:0x0214762c
-func_ov014_02147748 kind:function(arm,size=0xe0) addr:0x021476a4
-func_ov014_02147828 kind:function(arm,size=0x18) addr:0x02147784
-func_ov014_02147840 kind:function(arm,size=0x30) addr:0x0214779c
-func_ov014_02147870 kind:function(arm,size=0xd0) addr:0x021477cc
-func_ov014_02147940 kind:function(arm,size=0x10) addr:0x0214789c
-func_ov014_02147950 kind:function(arm,size=0x114) addr:0x021478ac
-func_ov014_02147a64 kind:function(arm,size=0x44) addr:0x021479c0
-func_ov014_02147aa8 kind:function(arm,size=0x40) addr:0x02147a04
-func_ov014_02147ae8 kind:function(arm,size=0x30) addr:0x02147a44
-func_ov014_02147b18 kind:function(arm,size=0x88) addr:0x02147a74
-func_ov014_02147ba0 kind:function(arm,size=0x10) addr:0x02147afc
-func_ov014_02147bb0 kind:function(arm,size=0x28) addr:0x02147b0c
-func_ov014_02147bd8 kind:function(arm,size=0x28) addr:0x02147b34
-func_ov014_02147c00 kind:function(arm,size=0x64) addr:0x02147b5c
-func_ov014_02147c64 kind:function(arm,size=0x1c) addr:0x02147bc0
-func_ov014_02147c80 kind:function(arm,size=0x14) addr:0x02147bdc
-func_ov014_02147c94 kind:function(arm,size=0x4) addr:0x02147bf0
-func_ov014_02147c98 kind:function(arm,size=0x50) addr:0x02147bf4
-func_ov014_02147ce8 kind:function(arm,size=0x5c) addr:0x02147c44
-func_ov014_02147d44 kind:function(arm,size=0xac) addr:0x02147ca0
-func_ov014_02147df0 kind:function(arm,size=0xc) addr:0x02147d4c
-func_ov014_02147dfc kind:function(arm,size=0x20) addr:0x02147d58
-func_ov014_02147e1c kind:function(arm,size=0x48) addr:0x02147d78
-func_ov014_02147e64 kind:function(arm,size=0x58) addr:0x02147dc0
-func_ov014_02147ebc kind:function(arm,size=0x1c) addr:0x02147e18
-func_ov014_02147ed8 kind:function(arm,size=0xc) addr:0x02147e34
-func_ov014_02147ee4 kind:function(arm,size=0xd8) addr:0x02147e40
-func_ov014_02147fbc kind:function(arm,size=0x10) addr:0x02147f18
-func_ov014_02147fcc kind:function(arm,size=0x108) addr:0x02147f28
-func_ov014_021480d4 kind:function(arm,size=0x5c) addr:0x02148030
-func_ov014_02148130 kind:function(arm,size=0xc) addr:0x0214808c
-func_ov014_0214813c kind:function(arm,size=0x2c) addr:0x02148098
-func_ov014_02148168 kind:function(arm,size=0x30) addr:0x021480c4
-func_ov014_02148198 kind:function(arm,size=0x34) addr:0x021480f4
-func_ov014_021481cc kind:function(arm,size=0x30) addr:0x02148128
-func_ov014_021481fc kind:function(arm,size=0x2c) addr:0x02148158
-func_ov014_02148228 kind:function(arm,size=0xc) addr:0x02148184
+_ZN21ActorGenericCharacterC2Ev kind:function(arm,size=0x78) addr:0x0214762c
+_ZN21ActorGenericCharacter4InitEv kind:function(arm,size=0xe0) addr:0x021476a4
+_ZN21ActorGenericCharacter8vfunc_68Ev kind:function(arm,size=0x18) addr:0x02147784
+_ZN21ActorGenericCharacter8vfunc_c0Ev kind:function(arm,size=0x30) addr:0x0214779c
+_ZN21ActorGenericCharacter8vfunc_c4Ev kind:function(arm,size=0xd0) addr:0x021477cc
+_ZN21ActorGenericCharacter19func_ov014_02147940Ev kind:function(arm,size=0x10) addr:0x0214789c
+_ZN21ActorGenericCharacter19func_ov014_02147950Ev kind:function(arm,size=0x114) addr:0x021478ac
+_ZN21ActorGenericCharacter8vfunc_80Ev kind:function(arm,size=0x44) addr:0x021479c0
+_ZN21ActorGenericCharacter8vfunc_84Ev kind:function(arm,size=0x40) addr:0x02147a04
+_ZN21ActorGenericCharacter19func_ov014_02147ae8Ev kind:function(arm,size=0x30) addr:0x02147a44
+_ZN21ActorGenericCharacter19func_ov014_02147b18Ev kind:function(arm,size=0x88) addr:0x02147a74
+_ZN21ActorGenericCharacter19func_ov014_02147ba0Ev kind:function(arm,size=0x10) addr:0x02147afc
+_ZN21ActorGenericCharacter19func_ov014_02147bb0Ev kind:function(arm,size=0x28) addr:0x02147b0c
+_ZN21ActorGenericCharacter19func_ov014_02147bd8Ev kind:function(arm,size=0x28) addr:0x02147b34
+_ZN21ActorGenericCharacter19func_ov014_02147c00Ev kind:function(arm,size=0x64) addr:0x02147b5c
+_ZN21ActorGenericCharacterD1Ev kind:function(arm,size=0x1c) addr:0x02147bc0
+_ZN21ActorGenericCharacterD0Ev kind:function(arm,size=0x14) addr:0x02147bdc
+_ZN21ActorGenericCharacter8vfunc_f8Ev kind:function(arm,size=0x4) addr:0x02147bf0
+_ZN21ActorGenericCharacter19func_ov014_02147c98Ev kind:function(arm,size=0x50) addr:0x02147bf4
+_ZN21ActorGenericCharacter19func_ov014_02147ce8Ei kind:function(arm,size=0x5c) addr:0x02147c44
+_ZN21ActorGenericCharacter19func_ov014_02147d44Ei kind:function(arm,size=0xac) addr:0x02147ca0
+_Z19func_ov014_02147df0P21ActorGenericCharacter kind:function(arm,size=0xc) addr:0x02147d4c
+_ZN21ActorGenericCharacter19func_ov014_02147dfcEv kind:function(arm,size=0x20) addr:0x02147d58
+_ZN21ActorGenericCharacter19func_ov014_02147e1cEv kind:function(arm,size=0x48) addr:0x02147d78
+_ZN21ActorGenericCharacter19func_ov014_02147e64Ev kind:function(arm,size=0x58) addr:0x02147dc0
+_ZN21ActorGenericCharacter19func_ov014_02147ebcEv kind:function(arm,size=0x1c) addr:0x02147e18
+_Z19func_ov014_02147ed8P21ActorGenericCharacter kind:function(arm,size=0xc) addr:0x02147e34
+_ZN21ActorGenericCharacter19func_ov014_02147ee4Ev kind:function(arm,size=0xd8) addr:0x02147e40
+_ZN21ActorGenericCharacter19func_ov014_02147fbcEv kind:function(arm,size=0x10) addr:0x02147f18
+_ZN21ActorGenericCharacter19func_ov014_02147fccEv kind:function(arm,size=0x108) addr:0x02147f28
+_ZN21ActorGenericCharacter19func_ov014_021480dcEv kind:function(arm,size=0x5c) addr:0x02148030
+_ZN21ActorGenericCharacter19func_ov014_02148130Ev kind:function(arm,size=0xc) addr:0x0214808c
+_ZN21ActorGenericCharacter19func_ov014_0214813cEv kind:function(arm,size=0x2c) addr:0x02148098
+_ZN21ActorGenericCharacter19func_ov014_02148168Ev kind:function(arm,size=0x30) addr:0x021480c4
+_ZN21ActorGenericCharacter19func_ov014_02148198Ev kind:function(arm,size=0x34) addr:0x021480f4
+_ZN21ActorGenericCharacter19func_ov014_021481ccEv kind:function(arm,size=0x30) addr:0x02148128
+_ZN21ActorGenericCharacter19func_ov014_021481fcEv kind:function(arm,size=0x2c) addr:0x02148158
+_Z19func_ov014_02148228P21ActorGenericCharacter kind:function(arm,size=0xc) addr:0x02148184
 func_ov014_02148234 kind:function(arm,size=0x38) addr:0x02148190
 func_ov014_0214826c kind:function(arm,size=0x14) addr:0x021481c8
 func_ov014_02148280 kind:function(arm,size=0x1c) addr:0x021481dc
diff --git a/config/usa/arm9/overlays/ov031/delinks.txt b/config/usa/arm9/overlays/ov031/delinks.txt
index 14857467..3020c7c3 100644
--- a/config/usa/arm9/overlays/ov031/delinks.txt
+++ b/config/usa/arm9/overlays/ov031/delinks.txt
@@ -5,6 +5,9 @@
     .data       start:0x02182000 end:0x02183de0 kind:data align:32
     .bss        start:0x02183de0 end:0x02184160 kind:bss align:32
 
+src/31_Shop/Actor/ActorItemSellerBase.cpp:
+    .text       start:0x0217ce8c end:0x0217db3c
+
 src/31_Shop/Actor/ActorShopItem.cpp:
     .text       start:0x0217db3c end:0x02180668
     .rodata     start:0x02181848 end:0x021819e8
@@ -12,3 +15,12 @@ src/31_Shop/Actor/ActorShopItem.cpp:
     .ctor       start:0x02181fe0 end:0x02181fe4
     .data       start:0x021821f0 end:0x021839f8
     .bss        start:0x02183de8 end:0x021840b4
+
+src/31_Shop/Actor/ActorItemSeller.cpp:
+    .text       start:0x02180668 end:0x021809e4
+
+src/31_Shop/Actor/ActorBeedle.cpp:
+    .text       start:0x021809e4 end:0x021813a8
+
+src/31_Shop/Actor/ActorTetra.cpp:
+    .text       start:0x021813a8 end:0x02181800
diff --git a/config/usa/arm9/overlays/ov031/symbols.txt b/config/usa/arm9/overlays/ov031/symbols.txt
index d5c2da62..0906e73f 100644
--- a/config/usa/arm9/overlays/ov031/symbols.txt
+++ b/config/usa/arm9/overlays/ov031/symbols.txt
@@ -35,40 +35,40 @@ HasFreebieCard kind:function(arm,size=0x30) addr:0x0217cdf0
 _ZN24UnkStruct_ov031_02183e8019func_ov031_0217cec0Ev kind:function(arm,size=0x40) addr:0x0217ce20
 func_ov031_0217cf00 kind:function(arm,size=0x1c) addr:0x0217ce60
 _Z19func_ov031_0217cf1cv kind:function(arm,size=0x10) addr:0x0217ce7c
-func_ov031_0217cf2c kind:function(arm,size=0x34) addr:0x0217ce8c
-func_ov031_0217cf60 kind:function(arm,size=0x24) addr:0x0217cec0
-func_ov031_0217cf84 kind:function(arm,size=0x2c) addr:0x0217cee4
-func_ov031_0217cfb0 kind:function(arm,size=0x24) addr:0x0217cf10
-func_ov031_0217cfd4 kind:function(arm,size=0x440) addr:0x0217cf34
-func_ov031_0217d414 kind:function(arm,size=0x30) addr:0x0217d374
-func_ov031_0217d444 kind:function(arm,size=0x2c) addr:0x0217d3a4
-func_ov031_0217d470 kind:function(arm,size=0x118) addr:0x0217d3d0
-func_ov031_0217d588 kind:function(arm,size=0x38) addr:0x0217d4e8
-func_ov031_0217d5c0 kind:function(arm,size=0x4) addr:0x0217d520
-func_ov031_0217d5c4 kind:function(arm,size=0x24) addr:0x0217d524
-func_ov031_0217d5e8 kind:function(arm,size=0x28) addr:0x0217d548
-func_ov031_0217d610 kind:function(arm,size=0x1c) addr:0x0217d570
-func_ov031_0217d62c kind:function(arm,size=0xc) addr:0x0217d58c
-func_ov031_0217d638 kind:function(arm,size=0x74) addr:0x0217d598
-func_ov031_0217d6ac kind:function(arm,size=0x24) addr:0x0217d60c
-func_ov031_0217d6d0 kind:function(arm,size=0x90) addr:0x0217d630
-func_ov031_0217d760 kind:function(arm,size=0x24) addr:0x0217d6c0
-func_ov031_0217d784 kind:function(arm,size=0x28) addr:0x0217d6e4
-func_ov031_0217d7ac kind:function(arm,size=0x84) addr:0x0217d70c
-func_ov031_0217d830 kind:function(arm,size=0x28) addr:0x0217d790
-func_ov031_0217d858 kind:function(arm,size=0x38) addr:0x0217d7b8
-func_ov031_0217d890 kind:function(arm,size=0x40) addr:0x0217d7f0
-func_ov031_0217d8d0 kind:function(arm,size=0xc) addr:0x0217d830
-func_ov031_0217d8dc kind:function(arm,size=0x60) addr:0x0217d83c
-func_ov031_0217d93c kind:function(arm,size=0x38) addr:0x0217d89c
-func_ov031_0217d974 kind:function(arm,size=0x14) addr:0x0217d8d4
-func_ov031_0217d988 kind:function(arm,size=0xc) addr:0x0217d8e8
-func_ov031_0217d994 kind:function(arm,size=0x8c) addr:0x0217d8f4
-func_ov031_0217da20 kind:function(arm,size=0x60) addr:0x0217d980
-func_ov031_0217da80 kind:function(arm,size=0x38) addr:0x0217d9e0
-func_ov031_0217dab8 kind:function(arm,size=0x90) addr:0x0217da18
-func_ov031_0217db48 kind:function(arm,size=0x8) addr:0x0217daa8
-func_ov031_0217db50 kind:function(arm,size=0x8c) addr:0x0217dab0
+_ZN19ActorItemSellerBaseC2Ev kind:function(arm,size=0x34) addr:0x0217ce8c
+_ZN19ActorItemSellerBaseD1Ev kind:function(arm,size=0x24) addr:0x0217cec0
+_ZN19ActorItemSellerBaseD0Ev kind:function(arm,size=0x2c) addr:0x0217cee4
+_ZN19ActorItemSellerBaseD2Ev kind:function(arm,size=0x24) addr:0x0217cf10
+_ZN19ActorItemSellerBase4InitEv kind:function(arm,size=0x440) addr:0x0217cf34
+_ZN19ActorItemSellerBase8vfunc_20Eb kind:function(arm,size=0x30) addr:0x0217d374
+_ZN19ActorItemSellerBase8vfunc_c0Ev kind:function(arm,size=0x2c) addr:0x0217d3a4
+_ZN19ActorItemSellerBase8vfunc_c4Ev kind:function(arm,size=0x118) addr:0x0217d3d0
+_ZN19ActorItemSellerBase19func_ov031_0217d588Ev kind:function(arm,size=0x38) addr:0x0217d4e8
+_ZN19ActorItemSellerBase19func_ov031_0217d5c0Ev kind:function(arm,size=0x4) addr:0x0217d520
+_ZN19ActorItemSellerBase19func_ov031_0217d5c4Ev kind:function(arm,size=0x24) addr:0x0217d524
+_ZN19ActorItemSellerBase19func_ov031_0217d5e8Ev kind:function(arm,size=0x28) addr:0x0217d548
+_ZN19ActorItemSellerBase19func_ov031_0217d610Ev kind:function(arm,size=0x1c) addr:0x0217d570
+_ZN19ActorItemSellerBase19func_ov031_0217d62cEv kind:function(arm,size=0xc) addr:0x0217d58c
+_ZN19ActorItemSellerBase19func_ov031_0217d638Ev kind:function(arm,size=0x74) addr:0x0217d598
+_ZN19ActorItemSellerBase19func_ov031_0217d6acEv kind:function(arm,size=0x24) addr:0x0217d60c
+_ZN19ActorItemSellerBase19func_ov031_0217d6d0Ev kind:function(arm,size=0x90) addr:0x0217d630
+_ZN19ActorItemSellerBase19func_ov031_0217d760Ev kind:function(arm,size=0x24) addr:0x0217d6c0
+_ZN19ActorItemSellerBase19func_ov031_0217d784Ev kind:function(arm,size=0x28) addr:0x0217d6e4
+_ZN19ActorItemSellerBase19func_ov031_0217d7acEv kind:function(arm,size=0x84) addr:0x0217d70c
+_ZN19ActorItemSellerBase19func_ov031_0217d830Ev kind:function(arm,size=0x28) addr:0x0217d790
+_ZN19ActorItemSellerBase19func_ov031_0217d858Ev kind:function(arm,size=0x38) addr:0x0217d7b8
+_ZN19ActorItemSellerBase19func_ov031_0217d890Ev kind:function(arm,size=0x40) addr:0x0217d7f0
+_ZN19ActorItemSellerBase19func_ov031_0217d8d0Ev kind:function(arm,size=0xc) addr:0x0217d830
+_ZN19ActorItemSellerBase19func_ov031_0217d8dcEv kind:function(arm,size=0x60) addr:0x0217d83c
+_ZN19ActorItemSellerBase19func_ov031_0217d93cEv kind:function(arm,size=0x38) addr:0x0217d89c
+_ZN19ActorItemSellerBase19func_ov031_0217d974Ev kind:function(arm,size=0x14) addr:0x0217d8d4
+_ZN19ActorItemSellerBase8vfunc_d4Ev kind:function(arm,size=0xc) addr:0x0217d8e8
+_ZN19ActorItemSellerBase8vfunc_8cEv kind:function(arm,size=0x8c) addr:0x0217d8f4
+_ZN19ActorItemSellerBase19func_ov031_0217da20Ei kind:function(arm,size=0x60) addr:0x0217d980
+_ZN19ActorItemSellerBase8vfunc_68Ev kind:function(arm,size=0x38) addr:0x0217d9e0
+_ZN19ActorItemSellerBase16CollidesWithLinkEv kind:function(arm,size=0x90) addr:0x0217da18
+_ZN19ActorItemSellerBase9vfunc_11cEv kind:function(arm,size=0x8) addr:0x0217daa8
+_ZN19ActorItemSellerBase15IsHitboxTouchedEb kind:function(arm,size=0x8c) addr:0x0217dab0
 _ZN15ActorShopItemDM6CreateEv kind:function(arm,size=0x40) addr:0x0217db3c
 _ZN20ActorShopItemSoldOut6CreateEv kind:function(arm,size=0x40) addr:0x0217db7c
 _ZN27ActorShopItemHeartContainer6CreateEv kind:function(arm,size=0x40) addr:0x0217dbbc
@@ -238,57 +238,57 @@ _ZN27ActorShopItemHeartContainerD0Ev kind:function(arm,size=0x1c) addr:0x0218060
 _ZN27ActorShopItemHeartContainerD1Ev kind:function(arm,size=0x14) addr:0x02180624
 _ZN15ActorShopItemDMD0Ev kind:function(arm,size=0x1c) addr:0x02180638
 _ZN15ActorShopItemDMD1Ev kind:function(arm,size=0x14) addr:0x02180654
-func_ov031_02180708 kind:function(arm,size=0x44) addr:0x02180668
-func_ov031_0218074c kind:function(arm,size=0x44) addr:0x021806ac
-func_ov031_02180790 kind:function(arm,size=0x44) addr:0x021806f0
-func_ov031_021807d4 kind:function(arm,size=0x84) addr:0x02180734
-func_ov031_02180858 kind:function(arm,size=0x108) addr:0x021807b8
-func_ov031_02180960 kind:function(arm,size=0xc) addr:0x021808c0
-func_ov031_0218096c kind:function(arm,size=0xc) addr:0x021808cc
-func_ov031_02180978 kind:function(arm,size=0xc) addr:0x021808d8
-func_ov031_02180984 kind:function(arm,size=0xc) addr:0x021808e4
-func_ov031_02180990 kind:function(arm,size=0xc) addr:0x021808f0
-func_ov031_0218099c kind:function(arm,size=0x18) addr:0x021808fc
-func_ov031_021809b4 kind:function(arm,size=0xc) addr:0x02180914
-func_ov031_021809c0 kind:function(arm,size=0x18) addr:0x02180920
-func_ov031_021809d8 kind:function(arm,size=0x2c) addr:0x02180938
-func_ov031_02180a04 kind:function(arm,size=0x50) addr:0x02180964
-func_ov031_02180a54 kind:function(arm,size=0x1c) addr:0x021809b4
-func_ov031_02180a70 kind:function(arm,size=0x14) addr:0x021809d0
-func_ov031_02180a84 kind:function(arm,size=0x44) addr:0x021809e4
-func_ov031_02180ac8 kind:function(arm,size=0x108) addr:0x02180a28
-func_ov031_02180bd0 kind:function(arm,size=0x118) addr:0x02180b30
-func_ov031_02180ce8 kind:function(arm,size=0xf4) addr:0x02180c48
-func_ov031_02180ddc kind:function(arm,size=0x68) addr:0x02180d3c
-func_ov031_02180e44 kind:function(arm,size=0x8) addr:0x02180da4
-func_ov031_02180e4c kind:function(arm,size=0x4c) addr:0x02180dac
-func_ov031_02180e98 kind:function(arm,size=0x4c) addr:0x02180df8
-func_ov031_02180ee4 kind:function(arm,size=0x1c) addr:0x02180e44
-func_ov031_02180f00 kind:function(arm,size=0x1c) addr:0x02180e60
-func_ov031_02180f1c kind:function(arm,size=0x1c) addr:0x02180e7c
-func_ov031_02180f38 kind:function(arm,size=0x190) addr:0x02180e98
-func_ov031_021810c8 kind:function(arm,size=0x2c) addr:0x02181028
-func_ov031_021810f4 kind:function(arm,size=0x38) addr:0x02181054
-func_ov031_0218112c kind:function(arm,size=0x74) addr:0x0218108c
-func_ov031_021811a0 kind:function(arm,size=0xc8) addr:0x02181100
-func_ov031_02181268 kind:function(arm,size=0x18) addr:0x021811c8
-func_ov031_02181280 kind:function(arm,size=0x14) addr:0x021811e0
-func_ov031_02181294 kind:function(arm,size=0x50) addr:0x021811f4
-func_ov031_021812e4 kind:function(arm,size=0x48) addr:0x02181244
-func_ov031_0218132c kind:function(arm,size=0x8c) addr:0x0218128c
-func_ov031_021813b8 kind:function(arm,size=0x40) addr:0x02181318
-func_ov031_021813f8 kind:function(arm,size=0x20) addr:0x02181358
-func_ov031_02181418 kind:function(arm,size=0x1c) addr:0x02181378
-func_ov031_02181434 kind:function(arm,size=0x14) addr:0x02181394
-func_ov031_02181448 kind:function(arm,size=0x70) addr:0x021813a8
-func_ov031_021814b8 kind:function(arm,size=0x100) addr:0x02181418
-func_ov031_021815b8 kind:function(arm,size=0x28) addr:0x02181518
-func_ov031_021815e0 kind:function(arm,size=0x30) addr:0x02181540
-func_ov031_02181610 kind:function(arm,size=0x188) addr:0x02181570
-func_ov031_02181798 kind:function(arm,size=0xd4) addr:0x021816f8
-func_ov031_0218186c kind:function(arm,size=0x1c) addr:0x021817cc
-func_ov031_02181888 kind:function(arm,size=0x14) addr:0x021817e8
-func_ov031_0218189c kind:function(arm,size=0x4) addr:0x021817fc
+_ZN16ActorItemSeller16CreateEv kind:function(arm,size=0x44) addr:0x02180668
+_ZN16ActorItemSeller26CreateEv kind:function(arm,size=0x44) addr:0x021806ac
+_ZN16ActorItemSeller36CreateEv kind:function(arm,size=0x44) addr:0x021806f0
+_ZN15ActorItemSeller4InitEv kind:function(arm,size=0x84) addr:0x02180734
+_ZN15ActorItemSeller9vfunc_114Ev kind:function(arm,size=0x108) addr:0x021807b8
+_ZN15ActorItemSeller8vfunc_f4Ev kind:function(arm,size=0xc) addr:0x021808c0
+_ZN15ActorItemSeller8vfunc_f8Ev kind:function(arm,size=0xc) addr:0x021808cc
+_ZN15ActorItemSeller8vfunc_fcEv kind:function(arm,size=0xc) addr:0x021808d8
+_ZN15ActorItemSeller9vfunc_100Ev kind:function(arm,size=0xc) addr:0x021808e4
+_ZN15ActorItemSeller9vfunc_104Ev kind:function(arm,size=0xc) addr:0x021808f0
+_ZN15ActorItemSeller9vfunc_118Ev kind:function(arm,size=0x18) addr:0x021808fc
+_ZN15ActorItemSeller8vfunc_d4Ev kind:function(arm,size=0xc) addr:0x02180914
+_ZN15ActorItemSeller9vfunc_108Ev kind:function(arm,size=0x18) addr:0x02180920
+_ZN15ActorItemSeller9vfunc_10cEv kind:function(arm,size=0x2c) addr:0x02180938
+_ZN15ActorItemSeller9vfunc_110Ev kind:function(arm,size=0x50) addr:0x02180964
+_ZN15ActorItemSellerD1Ev kind:function(arm,size=0x1c) addr:0x021809b4
+_ZN15ActorItemSellerD0Ev kind:function(arm,size=0x14) addr:0x021809d0
+_ZN11ActorBeedle6CreateEv kind:function(arm,size=0x44) addr:0x021809e4
+_ZN11ActorBeedle4InitEv kind:function(arm,size=0x108) addr:0x02180a28
+_ZN11ActorBeedle8vfunc_c4Ev kind:function(arm,size=0x118) addr:0x02180b30
+_ZN11ActorBeedle9vfunc_114Ev kind:function(arm,size=0xf4) addr:0x02180c48
+_ZN11ActorBeedle8vfunc_d4Ev kind:function(arm,size=0x68) addr:0x02180d3c
+_Z19func_ov031_02180e44ii kind:function(arm,size=0x8) addr:0x02180da4
+_ZN11ActorBeedle8vfunc_f4Ev kind:function(arm,size=0x4c) addr:0x02180dac
+_ZN11ActorBeedle8vfunc_f8Ev kind:function(arm,size=0x4c) addr:0x02180df8
+_ZN11ActorBeedle8vfunc_fcEv kind:function(arm,size=0x1c) addr:0x02180e44
+_ZN11ActorBeedle9vfunc_100Ev kind:function(arm,size=0x1c) addr:0x02180e60
+_ZN11ActorBeedle9vfunc_104Ev kind:function(arm,size=0x1c) addr:0x02180e7c
+_ZN11ActorBeedle8vfunc_d8Ev kind:function(arm,size=0x190) addr:0x02180e98
+_ZN11ActorBeedle8vfunc_dcEv kind:function(arm,size=0x2c) addr:0x02181028
+_ZN11ActorBeedle8vfunc_e0Ev kind:function(arm,size=0x38) addr:0x02181054
+_ZN11ActorBeedle8vfunc_70Ev kind:function(arm,size=0x74) addr:0x0218108c
+_ZN11ActorBeedle8vfunc_6cEv kind:function(arm,size=0xc8) addr:0x02181100
+_ZN11ActorBeedle9vfunc_108Ev kind:function(arm,size=0x18) addr:0x021811c8
+_ZN11ActorBeedle9vfunc_10cEv kind:function(arm,size=0x14) addr:0x021811e0
+_ZN11ActorBeedle9vfunc_110Ev kind:function(arm,size=0x50) addr:0x021811f4
+_ZN11ActorBeedle19func_ov031_021812e4Ei kind:function(arm,size=0x48) addr:0x02181244
+_ZN11ActorBeedle19func_ov031_0218132cEi kind:function(arm,size=0x8c) addr:0x0218128c
+_ZN11ActorBeedle9vfunc_11cEv kind:function(arm,size=0x40) addr:0x02181318
+_ZN11ActorBeedle9vfunc_118Ev kind:function(arm,size=0x20) addr:0x02181358
+_ZN11ActorBeedleD1Ev kind:function(arm,size=0x1c) addr:0x02181378
+_ZN11ActorBeedleD0Ev kind:function(arm,size=0x14) addr:0x02181394
+_ZN10ActorTetra6CreateEv kind:function(arm,size=0x70) addr:0x021813a8
+_ZN10ActorTetra8vfunc_f4Ev kind:function(arm,size=0x100) addr:0x02181418
+_ZN10ActorTetra8vfunc_c4Ev kind:function(arm,size=0x28) addr:0x02181518
+_ZN10ActorTetra8vfunc_20Eb kind:function(arm,size=0x30) addr:0x02181540
+_ZN14ActorTetra_4b019func_ov031_02181610Eiiiit kind:function(arm,size=0x188) addr:0x02181570
+_ZN14ActorTetra_4b019func_ov031_02181798Ev kind:function(arm,size=0xd4) addr:0x021816f8
+_ZN10ActorTetraD1Ev kind:function(arm,size=0x1c) addr:0x021817cc
+_ZN10ActorTetraD0Ev kind:function(arm,size=0x14) addr:0x021817e8
+_ZN10ActorTetra8vfunc_f8Ev kind:function(arm,size=0x4) addr:0x021817fc
 data_ov031_021818a0 kind:data(any) addr:0x02181800
 sShopItemBaseNames kind:data(any) addr:0x02181848
 unk$1534 kind:data(any) addr:0x021819b8 local