ActorItemSellerBase OK (#163)

* ActorItemSellerBase OK

* Fix broken matches

7 files changed, 25 insertions, 21 deletions

diff --git a/config/usa/arm9/overlays/ov000/symbols.txt b/config/usa/arm9/overlays/ov000/symbols.txt
index af5a5991..b488f850 100644
--- a/config/usa/arm9/overlays/ov000/symbols.txt
+++ b/config/usa/arm9/overlays/ov000/symbols.txt
@@ -215,7 +215,7 @@ func_ov000_0207b90c kind:function(arm,size=0x7c) addr:0x0207b8ac
 _ZN18UnkStruct_027e0dbc19func_ov000_0207b988Ei kind:function(thumb,size=0x40) addr:0x0207b928
 _ZN18UnkStruct_027e0dbc19func_ov000_0207b9c8Ev kind:function(thumb,size=0x14) addr:0x0207b968
 _ZN18UnkStruct_027e0dbc19func_ov000_0207b9dcEv kind:function(arm,size=0xb4) addr:0x0207b97c
-func_ov000_0207ba90 kind:function(thumb,size=0x4) addr:0x0207ba30
+_ZN18UnkStruct_027e0dbc9GetUnk_24Ev kind:function(thumb,size=0x4) addr:0x0207ba30
 func_ov000_0207ba94 kind:function(thumb,size=0x20) addr:0x0207ba34
 func_ov000_0207bab4 kind:function(arm,size=0x5c) addr:0x0207ba54
 func_ov000_0207bb10 kind:function(arm,size=0x4) addr:0x0207bab0
@@ -696,7 +696,7 @@ func_ov000_0208708c kind:function(arm,size=0x14) addr:0x0208702c
 func_ov000_020870a0 kind:function(arm,size=0x24) addr:0x02087040
 func_ov000_020870c4 kind:function(arm,size=0xc) addr:0x02087064
 func_ov000_020870d0 kind:function(arm,size=0x19c) addr:0x02087070
-func_ov000_0208726c kind:function(arm,size=0x7c) addr:0x0208720c
+_ZN21UnkStruct_027e0f64_0419func_ov000_0208726cEi kind:function(arm,size=0x7c) addr:0x0208720c
 func_ov000_020872e8 kind:function(arm,size=0x50) addr:0x02087288
 func_ov000_02087338 kind:function(arm,size=0xc8) addr:0x020872d8
 func_ov000_02087400 kind:function(arm,size=0x184) addr:0x020873a0
@@ -2752,7 +2752,7 @@ _ZN5Actor4DropEP5Vec3p kind:function(arm,size=0x38) addr:0x020c1864
 _ZN5Actor8vfunc_60Ev kind:function(arm,size=0x8) addr:0x020c189c
 _ZN5Actor8vfunc_64Ev kind:function(arm,size=0x4) addr:0x020c18a4
 _ZN5Actor10SetUnk_11cEb kind:function(arm,size=0x8) addr:0x020c18a8
-_ZN5Actor8vfunc_68Ev kind:function(arm,size=0x4) addr:0x020c18b0
+_ZN5Actor8vfunc_68EiP18UnkStruct_020397f8 kind:function(arm,size=0x4) addr:0x020c18b0
 _ZN5Actor8vfunc_6cEv kind:function(arm,size=0x8) addr:0x020c18b4
 _ZN5Actor8vfunc_70Ev kind:function(arm,size=0x8) addr:0x020c18bc
 _ZN5Actor8vfunc_74EP8ActorRef kind:function(arm,size=0x4) addr:0x020c18c4
diff --git a/config/usa/arm9/overlays/ov014/symbols.txt b/config/usa/arm9/overlays/ov014/symbols.txt
index c8730b51..12439e82 100644
--- a/config/usa/arm9/overlays/ov014/symbols.txt
+++ b/config/usa/arm9/overlays/ov014/symbols.txt
@@ -1087,7 +1087,7 @@ _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_68EiP18UnkStruct_020397f8 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
@@ -1137,7 +1137,7 @@ func_ov014_02145b18 kind:function(arm,size=0xb4) addr:0x02145a74
 func_ov014_02145bcc kind:function(arm,size=0xb0) addr:0x02145b28
 func_ov014_02145c7c kind:function(arm,size=0x30) addr:0x02145bd8
 _ZN18ActorCharacter_1d819func_ov014_02145cacEv kind:function(arm,size=0x19c) addr:0x02145c08
-func_ov014_02145e48 kind:function(arm,size=0xc4) addr:0x02145da4
+_ZN18ActorCharacter_1d819func_ov014_02145e48Ei kind:function(arm,size=0xc4) addr:0x02145da4
 _ZN18ActorCharacter_1d819func_ov014_02145f0cEi kind:function(arm,size=0x1ac) addr:0x02145e68
 func_ov014_021460b8 kind:function(arm,size=0x54) addr:0x02146014
 func_ov014_0214610c kind:function(arm,size=0x14) addr:0x02146068
diff --git a/config/usa/arm9/overlays/ov018/symbols.txt b/config/usa/arm9/overlays/ov018/symbols.txt
index dd47a49e..ad671c78 100644
--- a/config/usa/arm9/overlays/ov018/symbols.txt
+++ b/config/usa/arm9/overlays/ov018/symbols.txt
@@ -155,7 +155,7 @@ func_ov018_02160958 kind:function(arm,size=0x10) addr:0x021608b8
 func_ov018_02160968 kind:function(arm,size=0xa8) addr:0x021608c8
 func_ov018_02160a10 kind:function(arm,size=0x44) addr:0x02160970
 func_ov018_02160a54 kind:function(arm,size=0x10) addr:0x021609b4
-func_ov018_02160a64 kind:function(arm,size=0x10) addr:0x021609c4
+_ZN17UnkClass_027e0e2819func_ov018_02160a64Eii kind:function(arm,size=0x10) addr:0x021609c4
 func_ov018_02160a74 kind:function(arm,size=0x10) addr:0x021609d4
 func_ov018_02160a84 kind:function(arm,size=0x1c) addr:0x021609e4
 func_ov018_02160aa0 kind:function(arm,size=0x38) addr:0x02160a00
diff --git a/config/usa/arm9/overlays/ov031/delinks.txt b/config/usa/arm9/overlays/ov031/delinks.txt
index 3020c7c3..e38623a9 100644
--- a/config/usa/arm9/overlays/ov031/delinks.txt
+++ b/config/usa/arm9/overlays/ov031/delinks.txt
@@ -6,7 +6,11 @@
     .bss        start:0x02183de0 end:0x02184160 kind:bss align:32
 
 src/31_Shop/Actor/ActorItemSellerBase.cpp:
-    .text       start:0x0217ce8c end:0x0217db3c
+    complete
+    .text       start:0x0217ce7c end:0x0217db3c
+    .rodata     start:0x02181800 end:0x02181848
+    .data       start:0x021820c8 end:0x021821f0
+    .bss        start:0x02183de4 end:0x02183de8
 
 src/31_Shop/Actor/ActorShopItem.cpp:
     .text       start:0x0217db3c end:0x02180668
diff --git a/config/usa/arm9/overlays/ov031/relocs.txt b/config/usa/arm9/overlays/ov031/relocs.txt
index 45729ad7..b6672951 100644
--- a/config/usa/arm9/overlays/ov031/relocs.txt
+++ b/config/usa/arm9/overlays/ov031/relocs.txt
@@ -177,7 +177,7 @@ from:0x0217ce68 kind:arm_call_thumb to:0x02030290 module:main
 from:0x0217ce70 kind:arm_call to:0x0202ea08 module:main
 from:0x0217ce88 kind:load to:0x02183de4 module:overlay(31)
 from:0x0217ce94 kind:arm_call to:0x02144e34 module:overlay(14)
-from:0x0217ceb8 kind:load to:0x021820d0 module:overlay(31)
+from:0x0217ceb8 kind:load to:0x021820c8 module:overlay(31) add:0x8
 from:0x0217cebc kind:load to:0x02183de4 module:overlay(31)
 from:0x0217ced4 kind:arm_call to:0x02145004 module:overlay(14)
 from:0x0217cee0 kind:load to:0x02183de4 module:overlay(31)
diff --git a/config/usa/arm9/overlays/ov031/symbols.txt b/config/usa/arm9/overlays/ov031/symbols.txt
index 0906e73f..2ce790e2 100644
--- a/config/usa/arm9/overlays/ov031/symbols.txt
+++ b/config/usa/arm9/overlays/ov031/symbols.txt
@@ -3,7 +3,7 @@ func_ov031_0217bd88 kind:function(arm,size=0x18) addr:0x0217bce8
 func_ov031_0217bda0 kind:function(arm,size=0xc) addr:0x0217bd00
 func_ov031_0217bdac kind:function(arm,size=0x8) addr:0x0217bd0c
 func_ov031_0217bdb4 kind:function(arm,size=0x4) addr:0x0217bd14
-func_ov031_0217bdb8 kind:function(arm,size=0x10) addr:0x0217bd18
+_ZN24UnkStruct_ov031_02183e8011GetInstanceEv kind:function(arm,size=0x10) addr:0x0217bd18
 func_ov031_0217bdc8 kind:function(arm,size=0x194) addr:0x0217bd28
 func_ov031_0217bf5c kind:function(arm,size=0x14) addr:0x0217bebc
 func_ov031_0217bf70 kind:function(arm,size=0x44) addr:0x0217bed0
@@ -27,14 +27,14 @@ func_ov031_0217ca10 kind:function(arm,size=0x160) addr:0x0217c970
 func_ov031_0217cb70 kind:function(arm,size=0x1a0) addr:0x0217cad0
 func_ov031_0217cd10 kind:function(arm,size=0x74) addr:0x0217cc70
 func_ov031_0217cd84 kind:function(arm,size=0x54) addr:0x0217cce4
-func_ov031_0217cdd8 kind:function(arm,size=0x20) addr:0x0217cd38
+_ZN24UnkStruct_ov031_02183e8019func_ov031_0217cdd8Ei kind:function(arm,size=0x20) addr:0x0217cd38
 func_ov031_0217cdf8 kind:function(arm,size=0x20) addr:0x0217cd58
-func_ov031_0217ce18 kind:function(arm,size=0x54) addr:0x0217cd78
+_ZN24UnkStruct_ov031_02183e8019func_ov031_0217ce18Ev kind:function(arm,size=0x54) addr:0x0217cd78
 func_ov031_0217ce6c kind:function(arm,size=0x24) addr:0x0217cdcc
 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
+_ZN19ActorItemSellerBase16GetCurrentSellerEv kind:function(arm,size=0x10) addr:0x0217ce7c
 _ZN19ActorItemSellerBaseC2Ev kind:function(arm,size=0x34) addr:0x0217ce8c
 _ZN19ActorItemSellerBaseD1Ev kind:function(arm,size=0x24) addr:0x0217cec0
 _ZN19ActorItemSellerBaseD0Ev kind:function(arm,size=0x2c) addr:0x0217cee4
@@ -65,7 +65,7 @@ _ZN19ActorItemSellerBase19func_ov031_0217d974Ev kind:function(arm,size=0x14) add
 _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
+_ZN19ActorItemSellerBase8vfunc_68EiP18UnkStruct_020397f8 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
@@ -289,8 +289,8 @@ _ZN14ActorTetra_4b019func_ov031_02181798Ev kind:function(arm,size=0xd4) addr:0x0
 _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
+sShopItemActorTypes kind:data(any) addr:0x02181800 local
+sShopItemBaseNames kind:data(any) addr:0x02181848 local
 unk$1534 kind:data(any) addr:0x021819b8 local
 unk$1554 kind:data(any) addr:0x021819cc local
 @2460 kind:data(any) addr:0x021819e0 local
@@ -327,7 +327,7 @@ data_ov031_02182138 kind:data(any) addr:0x02182098
 data_ov031_0218213c kind:data(any) addr:0x0218209c
 data_ov031_02182140 kind:data(any) addr:0x021820a0
 data_ov031_02182144 kind:data(any) addr:0x021820a4
-data_ov031_02182170 kind:data(any) addr:0x021820d0
+_ZTV19ActorItemSellerBase kind:data(any) addr:0x021820c8
 @1183 kind:data(any) addr:0x021821f0 local
 @1184 kind:data(any) addr:0x021821f4 local
 @1185 kind:data(any) addr:0x021821f8 local
@@ -428,7 +428,7 @@ data_ov031_02183d68 kind:data(any) addr:0x02183cc8
 data_ov031_02183d6c kind:data(any) addr:0x02183ccc
 data_ov031_02183d7c kind:data(any) addr:0x02183cdc
 data_ov031_02183e80 kind:bss addr:0x02183de0
-data_ov031_02183e84 kind:bss addr:0x02183de4
+sCurrentSeller kind:bss addr:0x02183de4 local
 @792 kind:bss addr:0x02183de8
 _ZN15ActorShopItemDM5gTypeE kind:bss addr:0x02183df4
 @794 kind:bss addr:0x02183e08
diff --git a/config/usa/arm9/symbols.txt b/config/usa/arm9/symbols.txt
index 9e3cbdd4..f46857bd 100644
--- a/config/usa/arm9/symbols.txt
+++ b/config/usa/arm9/symbols.txt
@@ -1806,14 +1806,14 @@ _ZN14MessageManager13func_020368f4EP18UnkStruct_02037750 kind:function(arm,size=
 _ZN14MessageManager13func_0203690cEi kind:function(arm,size=0x2b0) addr:0x020368c8
 _ZN14MessageManager13func_02036bbcEv kind:function(arm,size=0x94) addr:0x02036b78
 _ZN14MessageManager13func_02036c50EPt kind:function(arm,size=0x54) addr:0x02036c0c
-_ZN14MessageManager13func_02036ca4Ei kind:function(arm,size=0x40) addr:0x02036c60
+_ZN14MessageManager13func_02036ca4EPt kind:function(arm,size=0x40) addr:0x02036c60
 _ZN14MessageManager13func_02036ce4EP18UnkStruct_02037750i kind:function(arm,size=0x4c) addr:0x02036ca0
 _ZN14MessageManager13func_02036d30EP18UnkStruct_02037750 kind:function(arm,size=0x1c) addr:0x02036cec
 _ZN14MessageManager13func_02036d4cEP18UnkStruct_02037750 kind:function(arm,size=0x20) addr:0x02036d08
 _ZN14MessageManager13func_02036d6cEv kind:function(arm,size=0x3c) addr:0x02036d28
 _ZN14MessageManager13func_02036da8EjPs kind:function(arm,size=0x134) addr:0x02036d64
 _ZN14MessageManager13func_02036edcEjh kind:function(arm,size=0x8c) addr:0x02036e98
-_ZN14MessageManager13func_02036f68EjPh kind:function(arm,size=0x168) addr:0x02036f24
+_ZN14MessageManager13func_02036f68EjP18UnkStruct_02037628P24UnkStruct_ov000_020d18f4 kind:function(arm,size=0x168) addr:0x02036f24
 _ZN14MessageManager13func_020370d0Eii kind:function(arm,size=0x18) addr:0x0203708c
 _ZN14MessageManager13func_020370e8Eissi kind:function(arm,size=0x70) addr:0x020370a4
 _ZN14MessageManager13func_02037158EP21UnkSubClass1_02256FF8 kind:function(arm,size=0x20) addr:0x02037114
@@ -1834,8 +1834,8 @@ func_020374b4 kind:function(arm,size=0x74) addr:0x02037470
 func_02037528 kind:function(arm,size=0x74) addr:0x020374e4
 func_0203759c kind:function(arm,size=0x68) addr:0x02037558
 func_02037604 kind:function(arm,size=0x24) addr:0x020375c0
-func_02037628 kind:function(arm,size=0x98) addr:0x020375e4
-func_020376c0 kind:function(arm,size=0x64) addr:0x0203767c
+_ZN18UnkStruct_0203762813func_02037628Ev kind:function(arm,size=0x98) addr:0x020375e4
+_ZN18UnkStruct_0203762813func_020376c0EP5Vec3p kind:function(arm,size=0x64) addr:0x0203767c
 func_02037724 kind:function(arm,size=0x2c) addr:0x020376e0
 _ZN18UnkStruct_02037750C2EiPv kind:function(arm,size=0x44) addr:0x0203770c
 _ZN18UnkStruct_02037750D1Ev kind:function(arm,size=0x38) addr:0x02037750