13 files changed, 392 insertions, 386 deletions
diff --git a/config/usa/arm9/overlays/ov000/relocs.txt b/config/usa/arm9/overlays/ov000/relocs.txt
index f346ec9b..00718f4d 100644
--- a/config/usa/arm9/overlays/ov000/relocs.txt
+++ b/config/usa/arm9/overlays/ov000/relocs.txt
@@ -3349,12 +3349,12 @@ from:0x0209bacc kind:arm_call to:0x0204f5d0 module:main
 from:0x0209bae4 kind:arm_call to:0x020a5ad8 module:overlay(0)
 from:0x0209bb38 kind:arm_call to:0x02080f04 module:overlay(0)
 from:0x0209bb48 kind:load to:0x027e0ce0 module:dtcm
-from:0x0209bb4c kind:load to:0x02057830 module:main
-from:0x0209bb50 kind:load to:0x02057814 module:main
+from:0x0209bb4c kind:load to:0x02057828 add:0x8 module:main
+from:0x0209bb50 kind:load to:0x0205780c add:0x8 module:main
 from:0x0209bb54 kind:load to:0x02030109 module:main
 from:0x0209bb58 kind:load to:0x0209bb60 module:overlay(0)
 from:0x0209bb5c kind:load to:0x020daff8 module:overlay(0)
-from:0x0209bb80 kind:load to:0x02057830 module:main
+from:0x0209bb80 kind:load to:0x02057828 add:0x8 module:main
 from:0x0209bb84 kind:load to:0x020577f8 module:main
 from:0x0209bbb8 kind:arm_call to:0x020a5d14 module:overlay(0)
 from:0x0209bc08 kind:arm_call to:0x020a5da8 module:overlay(0)
@@ -4288,9 +4288,9 @@ from:0x020a5728 kind:arm_call to:0x020c0dfc module:overlay(0)
 from:0x020a5794 kind:load to:0x020dc234 module:overlay(0)
 from:0x020a5798 kind:load to:0x027e0ce0 module:dtcm
 from:0x020a579c kind:load to:0x020dc2f4 module:overlay(0)
-from:0x020a57a0 kind:load to:0x02057830 module:main
+from:0x020a57a0 kind:load to:0x02057828 add:0x8 module:main
 from:0x020a57a4 kind:load to:0x0209bb60 module:overlay(0)
-from:0x020a57a8 kind:load to:0x02057814 module:main
+from:0x020a57a8 kind:load to:0x0205780c add:0x8 module:main
 from:0x020a57ac kind:load to:0x02030109 module:main
 from:0x020a57b0 kind:load to:0x020dc264 module:overlay(0)
 from:0x020a57b4 kind:load to:0x020dc2c4 module:overlay(0)
@@ -7721,10 +7721,10 @@ from:0x020c426c kind:load to:0x027e0fe4 module:dtcm
 from:0x020c4274 kind:load to:0x027e0e60 module:dtcm
 from:0x020c4288 kind:load to:0x020ddf40 module:overlay(0)
 from:0x020c42b8 kind:load to:0x020dda78 module:overlay(0)
-from:0x020c4318 kind:load to:0x02057830 module:main
+from:0x020c4318 kind:load to:0x02057828 add:0x8 module:main
 from:0x020c431c kind:load to:0x020577f8 module:main
 from:0x020c4320 kind:load to:0x020e82fc module:overlay(0)
-from:0x020c4324 kind:load to:0x02057814 module:main
+from:0x020c4324 kind:load to:0x0205780c add:0x8 module:main
 from:0x020c434c kind:arm_call_thumb to:0x0202d5d8 module:main
 from:0x020c4388 kind:arm_call to:0x020c4278 module:overlay(0)
 from:0x020c439c kind:arm_call to:0x02046fe0 module:main
@@ -11220,10 +11220,10 @@ from:0x020e18bc kind:arm_call to:0x0204f890 module:main
 from:0x020e18e8 kind:arm_call to:0x0204f890 module:main
 from:0x020e1914 kind:arm_call to:0x0204f890 module:main
 from:0x020e1944 kind:arm_call to:0x0204f890 module:main
-from:0x020e194c kind:load to:0x02057830 module:main
+from:0x020e194c kind:load to:0x02057828 add:0x8 module:main
 from:0x020e1950 kind:load to:0x020ee19c module:overlay(0)
 from:0x020e1954 kind:load to:0x020e693c module:overlay(0)
-from:0x020e1958 kind:load to:0x02057814 module:main
+from:0x020e1958 kind:load to:0x0205780c add:0x8 module:main
 from:0x020e195c kind:load to:0x020ee3a8 module:overlay(0)
 from:0x020e1960 kind:load to:0x02030059 module:main
 from:0x020e1964 kind:load to:0x020ee274 module:overlay(0)
diff --git a/config/usa/arm9/overlays/ov000/symbols.txt b/config/usa/arm9/overlays/ov000/symbols.txt
index 3b5b344d..dc43fb71 100644
--- a/config/usa/arm9/overlays/ov000/symbols.txt
+++ b/config/usa/arm9/overlays/ov000/symbols.txt
@@ -137,10 +137,10 @@ func_ov000_02079e04 kind:function(arm,size=0x38) addr:0x02079da4
 _Z19func_ov000_02079e3cv kind:function(arm,size=0x2c) addr:0x02079ddc
 _ZN18UnkStruct_020e936019func_ov000_02079e68Ei kind:function(arm,size=0x4c) addr:0x02079e08
 func_ov000_02079eb4 kind:function(arm,size=0x24) addr:0x02079e54
-func_ov000_02079ed8 kind:function(thumb,size=0x22) addr:0x02079e78
+_ZN29ActorShopItemCollectable_Unk1C1Ev kind:function(thumb,size=0x22) addr:0x02079e78
 func_ov000_02079efc kind:function(thumb,size=0x3e) addr:0x02079e9c
-func_ov000_02079f3c kind:function(thumb,size=0x20) addr:0x02079edc
-func_ov000_02079f5c kind:function(thumb,size=0xa0) addr:0x02079efc
+_ZN29ActorShopItemCollectable_Unk1D1Ev kind:function(thumb,size=0x20) addr:0x02079edc
+_ZN29ActorShopItemCollectable_Unk119func_ov000_02079f5cEiiiihi kind:function(thumb,size=0xa0) addr:0x02079efc
 LoadNsbTexturedModel kind:function(thumb,size=0x3a) addr:0x02079f9c
 func_ov000_0207a038 kind:function(thumb,size=0x102) addr:0x02079fd8
 _ZN19Actor_UnkStruct_012C1Ev kind:function(arm,size=0x4c) addr:0x0207a0dc
@@ -223,7 +223,7 @@ func_ov000_0207bb14 kind:function(arm,size=0x4) addr:0x0207bab4
 func_ov000_0207bb18 kind:function(arm,size=0x4) addr:0x0207bab8
 _ZN18UnkStruct_027e0de419func_ov000_0207bb1cEiPFvPvES0_ kind:function(arm,size=0x30) addr:0x0207babc
 func_ov000_0207bb4c kind:function(arm,size=0xfc) addr:0x0207baec
-func_ov000_0207bc48 kind:function(arm,size=0x20) addr:0x0207bbe8
+_ZN17UnkClass_027e0e2819func_ov000_0207bc48Ev kind:function(arm,size=0x20) addr:0x0207bbe8
 func_ov000_0207bc68 kind:function(arm,size=0x14) addr:0x0207bc08
 func_ov000_0207bc7c kind:function(thumb,size=0x1e) addr:0x0207bc1c
 func_ov000_0207bc9c kind:function(arm,size=0x18) addr:0x0207bc3c
diff --git a/config/usa/arm9/overlays/ov003/symbols.txt b/config/usa/arm9/overlays/ov003/symbols.txt
index 105805cd..94cd1206 100644
--- a/config/usa/arm9/overlays/ov003/symbols.txt
+++ b/config/usa/arm9/overlays/ov003/symbols.txt
@@ -117,7 +117,7 @@ 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
 _ZN18UnkStruct_027e0dbc19func_ov003_020f3d5cEi kind:function(thumb,size=0x16) addr:0x020f3cfc
-func_ov003_020f3d74 kind:function(thumb,size=0xc) addr:0x020f3d14
+_ZN18UnkStruct_027e0dbc19func_ov003_020f3d74Ei 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
 func_ov003_020f3d94 kind:function(thumb,size=0x6) addr:0x020f3d34
diff --git a/config/usa/arm9/overlays/ov004/relocs.txt b/config/usa/arm9/overlays/ov004/relocs.txt
index be093516..2cd5e266 100644
--- a/config/usa/arm9/overlays/ov004/relocs.txt
+++ b/config/usa/arm9/overlays/ov004/relocs.txt
@@ -137,9 +137,9 @@ from:0x02101370 kind:thumb_call to:0x0210143c module:overlay(4)
 from:0x0210137c kind:thumb_call_arm to:0x0202e9d8 module:main
 from:0x02101386 kind:thumb_call to:0x0210160c module:overlay(4)
 from:0x02101390 kind:load to:0x027e0ce0 module:dtcm
-from:0x02101394 kind:load to:0x02057830 module:main
+from:0x02101394 kind:load to:0x02057828 add:0x8 module:main
 from:0x02101398 kind:load to:0x0210fd20 module:overlay(4)
-from:0x0210139c kind:load to:0x02057814 module:main
+from:0x0210139c kind:load to:0x0205780c add:0x8 module:main
 from:0x021013ae kind:thumb_call to:0x02101640 module:overlay(4)
 from:0x021013b4 kind:thumb_call_arm to:0x0202ea08 module:main
 from:0x021013de kind:thumb_call_arm to:0x0202ea14 module:main
@@ -181,9 +181,9 @@ from:0x02101856 kind:thumb_call_arm to:0x02007908 module:main
 from:0x02101866 kind:thumb_call_arm to:0x02007908 module:main
 from:0x021018bc kind:thumb_call_arm to:0x0204f710 module:main
 from:0x021018d8 kind:thumb_call to:0x02030058 module:main
-from:0x021018e0 kind:load to:0x02057830 module:main
+from:0x021018e0 kind:load to:0x02057828 add:0x8 module:main
 from:0x021018e4 kind:load to:0x0210fd34 module:overlay(4)
-from:0x021018e8 kind:load to:0x02057814 module:main
+from:0x021018e8 kind:load to:0x0205780c add:0x8 module:main
 from:0x021018f4 kind:load to:0x020eaa38 module:overlay(0)
 from:0x021018f8 kind:load to:0x020eaa98 module:overlay(0)
 from:0x021018fc kind:load to:0x020eaad4 module:overlay(0)
@@ -333,8 +333,8 @@ from:0x02102414 kind:thumb_call_arm to:0x0209d824 module:overlay(0)
 from:0x0210241c kind:load to:0x027e0ce0 module:dtcm
 from:0x02102420 kind:load to:0x020e24a8 module:overlay(0)
 from:0x02102424 kind:load to:0x020e24ac module:overlay(0)
-from:0x02102428 kind:load to:0x02057830 module:main
-from:0x0210242c kind:load to:0x02057814 module:main
+from:0x02102428 kind:load to:0x02057828 add:0x8 module:main
+from:0x0210242c kind:load to:0x0205780c add:0x8 module:main
 from:0x02102430 kind:load to:0x027e0f68 module:dtcm
 from:0x02102434 kind:load to:0x027e0fe4 module:dtcm
 from:0x02102438 kind:load to:0x027e0fec module:dtcm
@@ -2043,9 +2043,9 @@ from:0x0210a0f6 kind:thumb_call_arm to:0x0202e9d8 module:main
 from:0x0210a0fe kind:thumb_call to:0x02030270 module:main
 from:0x0210a3e0 kind:load to:0x020e6c28 module:overlay(0)
 from:0x0210a3e4 kind:load to:0x027e0ce0 module:dtcm
-from:0x0210a3e8 kind:load to:0x02057830 module:main
+from:0x0210a3e8 kind:load to:0x02057828 add:0x8 module:main
 from:0x0210a3ec kind:load to:0x021108b4 module:overlay(4)
-from:0x0210a3f0 kind:load to:0x02057814 module:main
+from:0x0210a3f0 kind:load to:0x0205780c add:0x8 module:main
 from:0x0210a3f4 kind:load to:0x02110420 module:overlay(4)
 from:0x0210a3f8 kind:load to:0x027e0fc8 module:dtcm
 from:0x0210a3fc kind:load to:0x027e0fcc module:dtcm
@@ -2520,8 +2520,8 @@ from:0x0210c45a kind:thumb_call_arm to:0x02097614 module:overlay(0)
 from:0x0210c460 kind:thumb_call to:0x02030058 module:main
 from:0x0210c466 kind:thumb_call to:0x02030058 module:main
 from:0x0210c470 kind:load to:0x027e0d44 module:dtcm
-from:0x0210c478 kind:load to:0x02057830 module:main
-from:0x0210c47c kind:load to:0x02057814 module:main
+from:0x0210c478 kind:load to:0x02057828 add:0x8 module:main
+from:0x0210c47c kind:load to:0x0205780c add:0x8 module:main
 from:0x0210c480 kind:load to:0x027e0f68 module:dtcm
 from:0x0210c484 kind:load to:0x027e0fec module:dtcm
 from:0x0210c488 kind:load to:0x027e0c68 module:dtcm
@@ -2572,8 +2572,8 @@ from:0x0210c748 kind:thumb_call_arm to:0x0201b3c4 module:main
 from:0x0210c752 kind:thumb_call_arm to:0x0201e4cc module:main
 from:0x0210c770 kind:load to:0x020ec7c0 module:overlay(0)
 from:0x0210c774 kind:load to:0x027e0ce0 module:dtcm
-from:0x0210c778 kind:load to:0x02057830 module:main
-from:0x0210c77c kind:load to:0x02057814 module:main
+from:0x0210c778 kind:load to:0x02057828 add:0x8 module:main
+from:0x0210c77c kind:load to:0x0205780c add:0x8 module:main
 from:0x0210c7a0 kind:thumb_call_arm to:0x02046fe0 module:main
 from:0x0210c7a6 kind:thumb_call to:0x020bd6b8 module:overlay(0)
 from:0x0210c7ca kind:thumb_call_arm to:0x02018f78 module:main
@@ -2593,7 +2593,7 @@ from:0x0210c9ec kind:load to:0x027e0ce0 module:dtcm
 from:0x0210c9f0 kind:load to:0x0210f948 module:overlay(4)
 from:0x0210c9f4 kind:load to:0x0210f94c module:overlay(4)
 from:0x0210c9f8 kind:load to:0x02110c8c module:overlay(4)
-from:0x0210c9fc kind:load to:0x02057830 module:main
+from:0x0210c9fc kind:load to:0x02057828 add:0x8 module:main
 from:0x0210ca00 kind:load to:0x020577f8 module:main
 from:0x0210ca6e kind:thumb_call to:0x0202d5d8 module:main
 from:0x0210ca90 kind:thumb_call to:0x02102670 module:overlay(4)
@@ -2856,7 +2856,7 @@ from:0x0210e248 kind:thumb_call to:0x0210ddc8 module:overlay(4)
 from:0x0210e268 kind:load to:0x027e0d38 module:dtcm
 from:0x0210e26c kind:load to:0x027e1060 module:dtcm
 from:0x0210e270 kind:load to:0x02110fd8 module:overlay(4)
-from:0x0210e274 kind:load to:0x02057830 module:main
+from:0x0210e274 kind:load to:0x02057828 add:0x8 module:main
 from:0x0210e278 kind:load to:0x020577f8 module:main
 from:0x0210e282 kind:thumb_call to:0x02030148 module:main
 from:0x0210e2b2 kind:thumb_call_arm to:0x0202e9d8 module:main
@@ -2901,7 +2901,7 @@ from:0x0210e640 kind:thumb_call_arm to:0x020c0b7c module:overlay(0)
 from:0x0210e648 kind:load to:0x027e0ce0 module:dtcm
 from:0x0210e64c kind:load to:0x02111020 module:overlay(4)
 from:0x0210e650 kind:load to:0x02111008 module:overlay(4)
-from:0x0210e654 kind:load to:0x02057830 module:main
+from:0x0210e654 kind:load to:0x02057828 add:0x8 module:main
 from:0x0210e658 kind:load to:0x020577f8 module:main
 from:0x0210e65c kind:load to:0x0210fc78 module:overlay(4)
 from:0x0210e660 kind:load to:0x02110ff0 module:overlay(4)
@@ -2949,7 +2949,7 @@ from:0x0210e9e8 kind:thumb_call_arm to:0x020c0b7c module:overlay(0)
 from:0x0210e9f0 kind:load to:0x027e0d38 module:dtcm
 from:0x0210e9f4 kind:load to:0x027e0900 module:dtcm
 from:0x0210e9fc kind:load to:0x0216d878 module:overlay(29)
-from:0x0210ea00 kind:load to:0x02057830 module:main
+from:0x0210ea00 kind:load to:0x02057828 add:0x8 module:main
 from:0x0210ea04 kind:load to:0x020577c0 module:main
 from:0x0210ea08 kind:load to:0x02111020 module:overlay(4)
 from:0x0210ea0c kind:load to:0x027e0ce0 module:dtcm
@@ -2988,9 +2988,9 @@ from:0x0210ec72 kind:thumb_call to:0x02101c08 module:overlay(4)
 from:0x0210ec7c kind:thumb_call to:0x020300c8 module:main
 from:0x0210ec82 kind:thumb_call to:0x020300c8 module:main
 from:0x0210ec88 kind:thumb_call to:0x02030058 module:main
-from:0x0210ec90 kind:load to:0x02057830 module:main
+from:0x0210ec90 kind:load to:0x02057828 add:0x8 module:main
 from:0x0210ec94 kind:load to:0x02110fa4 module:overlay(4)
-from:0x0210ec98 kind:load to:0x02057814 module:main
+from:0x0210ec98 kind:load to:0x0205780c add:0x8 module:main
 from:0x0210ed3c kind:thumb_call_arm to:0x0202e9d8 module:main
 from:0x0210ed44 kind:thumb_call_arm to:0x020a339c module:overlay(0)
 from:0x0210ed64 kind:thumb_call_arm to:0x020078f4 module:main
@@ -3010,8 +3010,8 @@ from:0x0210eeee kind:thumb_call to:0x0210ef90 module:overlay(4)
 from:0x0210eef4 kind:thumb_call to:0x02030058 module:main
 from:0x0210ef00 kind:load to:0x027e0d38 module:dtcm
 from:0x0210ef04 kind:load to:0x027e0f7c module:dtcm
-from:0x0210ef08 kind:load to:0x02057830 module:main
-from:0x0210ef0c kind:load to:0x02057814 module:main
+from:0x0210ef08 kind:load to:0x02057828 add:0x8 module:main
+from:0x0210ef0c kind:load to:0x0205780c add:0x8 module:main
 from:0x0210ef1c kind:thumb_call_arm to:0x0207cd14 module:overlay(0)
 from:0x0210ef3a kind:thumb_call to:0x02030098 module:main
 from:0x0210ef4c kind:thumb_call_arm to:0x0209d6b0 module:overlay(0)
@@ -3019,8 +3019,8 @@ from:0x0210ef5c kind:thumb_call to:0x02101c7c module:overlay(4)
 from:0x0210ef66 kind:thumb_call to:0x02030058 module:main
 from:0x0210ef74 kind:thumb_call_arm to:0x020a3468 module:overlay(0)
 from:0x0210ef7a kind:thumb_call to:0x02030058 module:main
-from:0x0210ef84 kind:load to:0x02057830 module:main
-from:0x0210ef88 kind:load to:0x02057814 module:main
+from:0x0210ef84 kind:load to:0x02057828 add:0x8 module:main
+from:0x0210ef88 kind:load to:0x0205780c add:0x8 module:main
 from:0x0210ef8c kind:load to:0x027e0f7c module:dtcm
 from:0x0210efc0 kind:thumb_call_arm to:0x020078f4 module:main
 from:0x0210efdc kind:thumb_call_arm to:0x020972f4 module:overlay(0)
diff --git a/config/usa/arm9/overlays/ov009/relocs.txt b/config/usa/arm9/overlays/ov009/relocs.txt
index fac38039..81578eb6 100644
--- a/config/usa/arm9/overlays/ov009/relocs.txt
+++ b/config/usa/arm9/overlays/ov009/relocs.txt
@@ -1999,10 +1999,10 @@ from:0x0211e434 kind:load to:0x0211f4b0 module:overlay(9)
 from:0x0211e478 kind:arm_call to:0x0204f890 module:main
 from:0x0211e4b8 kind:arm_call to:0x0204f890 module:main
 from:0x0211e4f4 kind:arm_call to:0x0204f890 module:main
-from:0x0211e4fc kind:load to:0x02057830 module:main
+from:0x0211e4fc kind:load to:0x02057828 add:0x8 module:main
 from:0x0211e500 kind:load to:0x0211f4b8 module:overlay(9)
 from:0x0211e504 kind:load to:0x0211e9d0 module:overlay(9)
-from:0x0211e508 kind:load to:0x02057814 module:main
+from:0x0211e508 kind:load to:0x0205780c add:0x8 module:main
 from:0x0211e50c kind:load to:0x0211f4c4 module:overlay(9)
 from:0x0211e510 kind:load to:0x02030059 module:main
 from:0x0211e514 kind:load to:0x0211f4b8 module:overlay(9)
diff --git a/config/usa/arm9/overlays/ov015/relocs.txt b/config/usa/arm9/overlays/ov015/relocs.txt
index a26a50d5..b698719e 100644
--- a/config/usa/arm9/overlays/ov015/relocs.txt
+++ b/config/usa/arm9/overlays/ov015/relocs.txt
@@ -1331,8 +1331,8 @@ from:0x0212a1c0 kind:arm_call to:0x0212b55c module:overlay(15)
 from:0x0212a1d4 kind:arm_call to:0x0202e9f0 module:main
 from:0x0212a1f0 kind:arm_call to:0x0212b774 module:overlay(15)
 from:0x0212a1f8 kind:arm_call_thumb to:0x02030108 module:main
-from:0x0212a208 kind:load to:0x02057830 module:main
-from:0x0212a20c kind:load to:0x02057814 module:main
+from:0x0212a208 kind:load to:0x02057828 add:0x8 module:main
+from:0x0212a20c kind:load to:0x0205780c add:0x8 module:main
 from:0x0212a210 kind:load to:0x020577f8 module:main
 from:0x0212a214 kind:load to:0x0218a2c8 module:overlay(15)
 from:0x0212a218 kind:load to:0x027e0ce0 module:dtcm
@@ -11767,12 +11767,12 @@ from:0x02184f04 kind:arm_call to:0x0202e9d8 module:main
 from:0x02184f18 kind:arm_call to:0x020a5cb0 module:overlay(0)
 from:0x02184f24 kind:arm_call_thumb to:0x020a9528 module:overlay(0)
 from:0x02184f44 kind:load to:0x027e0ce0 module:dtcm
-from:0x02184f48 kind:load to:0x02057830 module:main
-from:0x02184f4c kind:load to:0x02057814 module:main
+from:0x02184f48 kind:load to:0x02057828 add:0x8 module:main
+from:0x02184f4c kind:load to:0x0205780c add:0x8 module:main
 from:0x02184f50 kind:load to:0x02030109 module:main
 from:0x02184f54 kind:load to:0x02184f5c module:overlay(15)
 from:0x02184f58 kind:load to:0x021871ec module:overlay(15)
-from:0x02184f7c kind:load to:0x02057830 module:main
+from:0x02184f7c kind:load to:0x02057828 add:0x8 module:main
 from:0x02184f80 kind:load to:0x020577f8 module:main
 from:0x02184fdc kind:arm_call to:0x020a5c6c module:overlay(0)
 from:0x02184ff0 kind:arm_call to:0x0204f710 module:main
@@ -12185,7 +12185,7 @@ from:0x02187d50 kind:arm_call to:0x0204f890 module:main
 from:0x02187d88 kind:arm_call to:0x0204f890 module:main
 from:0x02187dc4 kind:arm_call to:0x0204f890 module:main
 from:0x02187e04 kind:arm_call to:0x0204f890 module:main
-from:0x02187e0c kind:load to:0x02057830 module:main
+from:0x02187e0c kind:load to:0x02057828 add:0x8 module:main
 from:0x02187e10 kind:load to:0x0218f4dc module:overlay(15)
 from:0x02187e14 kind:load to:0x0218b87c module:overlay(15)
 from:0x02187e18 kind:load to:0x020577f8 module:main
@@ -12196,7 +12196,7 @@ from:0x02187e28 kind:load to:0x0218b88c module:overlay(15)
 from:0x02187e2c kind:load to:0x0218f508 module:overlay(15)
 from:0x02187e30 kind:load to:0x0218f4fc module:overlay(15)
 from:0x02187e34 kind:load to:0x0218b89c module:overlay(15)
-from:0x02187e38 kind:load to:0x02057814 module:main
+from:0x02187e38 kind:load to:0x0205780c add:0x8 module:main
 from:0x02187e3c kind:load to:0x0218f524 module:overlay(15)
 from:0x02187e40 kind:load to:0x02030059 module:main
 from:0x02187e44 kind:load to:0x0218f518 module:overlay(15)
diff --git a/config/usa/arm9/overlays/ov018/relocs.txt b/config/usa/arm9/overlays/ov018/relocs.txt
index 58be9719..d62f08d0 100644
--- a/config/usa/arm9/overlays/ov018/relocs.txt
+++ b/config/usa/arm9/overlays/ov018/relocs.txt
@@ -127,7 +127,7 @@ from:0x0215c854 kind:arm_call_thumb to:0x02030058 module:main
 from:0x0215c85c kind:arm_call_thumb to:0x02030108 module:main
 from:0x0215c868 kind:load to:0x0216c020 module:overlay(18)
 from:0x0215c86c kind:load to:0x020577f8 module:main
-from:0x0215c870 kind:load to:0x02057814 module:main
+from:0x0215c870 kind:load to:0x0205780c add:0x8 module:main
 from:0x0215c874 kind:load to:0x027e0ce0 module:dtcm
 from:0x0215c878 kind:load to:0x0216b3bc module:overlay(18)
 from:0x0215c890 kind:arm_call_thumb to:0x020c0ba8 module:overlay(0)
diff --git a/config/usa/arm9/overlays/ov031/delinks.txt b/config/usa/arm9/overlays/ov031/delinks.txt
index e9049fd1..14857467 100644
--- a/config/usa/arm9/overlays/ov031/delinks.txt
+++ b/config/usa/arm9/overlays/ov031/delinks.txt
@@ -7,3 +7,8 @@
 
 src/31_Shop/Actor/ActorShopItem.cpp:
     .text       start:0x0217db3c end:0x02180668
+    .rodata     start:0x02181848 end:0x021819e8
+    .init       start:0x02181acc end:0x02181eb8
+    .ctor       start:0x02181fe0 end:0x02181fe4
+    .data       start:0x021821f0 end:0x021839f8
+    .bss        start:0x02183de8 end:0x021840b4
diff --git a/config/usa/arm9/overlays/ov031/relocs.txt b/config/usa/arm9/overlays/ov031/relocs.txt
index 05d27eb6..45729ad7 100644
--- a/config/usa/arm9/overlays/ov031/relocs.txt
+++ b/config/usa/arm9/overlays/ov031/relocs.txt
@@ -283,39 +283,39 @@ from:0x0217db14 kind:arm_call to:0x0202b87c module:main
 from:0x0217db54 kind:arm_call to:0x0202e9d8 module:main
 from:0x0217db60 kind:arm_call to:0x0217e36c module:overlay(31)
 from:0x0217db74 kind:load to:0x027e0fe0 module:dtcm
-from:0x0217db78 kind:load to:0x02183234 module:overlay(31)
+from:0x0217db78 kind:load to:0x0218322c module:overlay(31) add:0x8
 from:0x0217db94 kind:arm_call to:0x0202e9d8 module:main
 from:0x0217dba0 kind:arm_call to:0x0217e36c module:overlay(31)
 from:0x0217dbb4 kind:load to:0x027e0fe0 module:dtcm
-from:0x0217dbb8 kind:load to:0x02183148 module:overlay(31)
+from:0x0217dbb8 kind:load to:0x02183140 module:overlay(31) add:0x8
 from:0x0217dbd4 kind:arm_call to:0x0202e9d8 module:main
 from:0x0217dbe0 kind:arm_call to:0x0217e36c module:overlay(31)
 from:0x0217dbf4 kind:load to:0x027e0fe0 module:dtcm
-from:0x0217dbf8 kind:load to:0x0218305c module:overlay(31)
+from:0x0217dbf8 kind:load to:0x02183054 module:overlay(31) add:0x8
 from:0x0217dc14 kind:arm_call to:0x0202e9d8 module:main
 from:0x0217dc20 kind:arm_call to:0x0217e36c module:overlay(31)
 from:0x0217dc34 kind:load to:0x027e0fe0 module:dtcm
-from:0x0217dc38 kind:load to:0x02182f70 module:overlay(31)
+from:0x0217dc38 kind:load to:0x02182f68 module:overlay(31) add:0x8
 from:0x0217dc54 kind:arm_call to:0x0202e9d8 module:main
 from:0x0217dc60 kind:arm_call to:0x0217e36c module:overlay(31)
 from:0x0217dc74 kind:load to:0x027e0fe0 module:dtcm
-from:0x0217dc78 kind:load to:0x02182d98 module:overlay(31)
+from:0x0217dc78 kind:load to:0x02182d90 module:overlay(31) add:0x8
 from:0x0217dc94 kind:arm_call to:0x0202e9d8 module:main
 from:0x0217dca0 kind:arm_call to:0x0217e36c module:overlay(31)
 from:0x0217dcb4 kind:load to:0x027e0fe0 module:dtcm
-from:0x0217dcb8 kind:load to:0x02182bc0 module:overlay(31)
+from:0x0217dcb8 kind:load to:0x02182bb8 module:overlay(31) add:0x8
 from:0x0217dcd4 kind:arm_call to:0x0202e9d8 module:main
 from:0x0217dce0 kind:arm_call to:0x0217e36c module:overlay(31)
 from:0x0217dcf4 kind:load to:0x027e0fe0 module:dtcm
-from:0x0217dcf8 kind:load to:0x02182e84 module:overlay(31)
+from:0x0217dcf8 kind:load to:0x02182e7c module:overlay(31) add:0x8
 from:0x0217dd14 kind:arm_call to:0x0202e9d8 module:main
 from:0x0217dd20 kind:arm_call to:0x0217e36c module:overlay(31)
 from:0x0217dd34 kind:load to:0x027e0fe0 module:dtcm
-from:0x0217dd38 kind:load to:0x02182cac module:overlay(31)
+from:0x0217dd38 kind:load to:0x02182ca4 module:overlay(31) add:0x8
 from:0x0217dd54 kind:arm_call to:0x0202e9d8 module:main
 from:0x0217dd60 kind:arm_call to:0x0217e36c module:overlay(31)
 from:0x0217dd74 kind:load to:0x027e0fe0 module:dtcm
-from:0x0217dd78 kind:load to:0x02182ad4 module:overlay(31)
+from:0x0217dd78 kind:load to:0x02182acc module:overlay(31) add:0x8
 from:0x0217dd94 kind:arm_call to:0x0202e9d8 module:main
 from:0x0217dda0 kind:arm_call to:0x0217e454 module:overlay(31)
 from:0x0217dda8 kind:load to:0x027e0fe0 module:dtcm
@@ -325,23 +325,23 @@ from:0x0217ddd8 kind:load to:0x027e0fe0 module:dtcm
 from:0x0217ddf4 kind:arm_call to:0x0202e9d8 module:main
 from:0x0217de00 kind:arm_call to:0x0217e36c module:overlay(31)
 from:0x0217de14 kind:load to:0x027e0fe0 module:dtcm
-from:0x0217de18 kind:load to:0x02182810 module:overlay(31)
+from:0x0217de18 kind:load to:0x02182808 module:overlay(31) add:0x8
 from:0x0217de34 kind:arm_call to:0x0202e9d8 module:main
 from:0x0217de40 kind:arm_call to:0x0217e36c module:overlay(31)
 from:0x0217de54 kind:load to:0x027e0fe0 module:dtcm
-from:0x0217de58 kind:load to:0x02182724 module:overlay(31)
+from:0x0217de58 kind:load to:0x0218271c module:overlay(31) add:0x8
 from:0x0217de74 kind:arm_call to:0x0202e9d8 module:main
 from:0x0217de80 kind:arm_call to:0x0217e36c module:overlay(31)
 from:0x0217de94 kind:load to:0x027e0fe0 module:dtcm
-from:0x0217de98 kind:load to:0x02182638 module:overlay(31)
+from:0x0217de98 kind:load to:0x02182630 module:overlay(31) add:0x8
 from:0x0217deb4 kind:arm_call to:0x0202e9d8 module:main
 from:0x0217dec0 kind:arm_call to:0x0217e4e8 module:overlay(31)
 from:0x0217ded4 kind:load to:0x027e0fe0 module:dtcm
-from:0x0217ded8 kind:load to:0x021824b0 module:overlay(31)
+from:0x0217ded8 kind:load to:0x021824a8 module:overlay(31) add:0x8
 from:0x0217def4 kind:arm_call to:0x0202e9d8 module:main
 from:0x0217df00 kind:arm_call to:0x0217e4e8 module:overlay(31)
 from:0x0217df14 kind:load to:0x027e0fe0 module:dtcm
-from:0x0217df18 kind:load to:0x021823ec module:overlay(31)
+from:0x0217df18 kind:load to:0x021823e4 module:overlay(31) add:0x8
 from:0x0217df34 kind:arm_call to:0x0202e9d8 module:main
 from:0x0217df40 kind:arm_call to:0x0217e518 module:overlay(31)
 from:0x0217df48 kind:load to:0x027e0fe0 module:dtcm
@@ -357,8 +357,8 @@ from:0x0217e0f4 kind:arm_call to:0x0202e9d8 module:main
 from:0x0217e13c kind:arm_call to:0x0202e9d8 module:main
 from:0x0217e184 kind:arm_call to:0x0202e9d8 module:main
 from:0x0217e1c8 kind:arm_call to:0x0217df4c module:overlay(31)
-from:0x0217e1d8 kind:load to:0x02057830 module:main
-from:0x0217e1dc kind:load to:0x02057814 module:main
+from:0x0217e1d8 kind:load to:0x02057828 add:0x8 module:main
+from:0x0217e1dc kind:load to:0x0205780c add:0x8 module:main
 from:0x0217e1e0 kind:load to:0x027e0fb4 module:dtcm
 from:0x0217e1e4 kind:load to:0x02182210 module:overlay(31)
 from:0x0217e1e8 kind:load to:0x027e0ce0 module:dtcm
@@ -371,71 +371,71 @@ from:0x0217e200 kind:load to:0x02183de8 module:overlay(31)
 from:0x0217e204 kind:load to:0x021839a4 module:overlay(31)
 from:0x0217e208 kind:load to:0x021839c0 module:overlay(31)
 from:0x0217e20c kind:load to:0x021839dc module:overlay(31)
-from:0x0217e210 kind:load to:0x02181858 module:overlay(31)
+from:0x0217e210 kind:load to:0x02181848 add:0x10 module:overlay(31)
 from:0x0217e32c kind:load to:0x02184008 module:overlay(31)
 from:0x0217e330 kind:load to:0x02184050 module:overlay(31)
 from:0x0217e334 kind:load to:0x02183de8 module:overlay(31)
 from:0x0217e340 kind:arm_call to:0x020c14f4 module:overlay(0)
-from:0x0217e368 kind:load to:0x0218340c module:overlay(31)
+from:0x0217e368 kind:load to:0x02183404 add:0x8 module:overlay(31)
 from:0x0217e374 kind:arm_call to:0x0217e338 module:overlay(31)
-from:0x0217e3bc kind:load to:0x02183320 module:overlay(31)
+from:0x0217e3bc kind:load to:0x02183318 module:overlay(31) add:0x8
 from:0x0217e3cc kind:arm_call to:0x0217e36c module:overlay(31)
 from:0x0217e3f8 kind:arm_call to:0x0202e9d8 module:main
 from:0x0217e404 kind:arm_call_thumb to:0x02079e78 module:overlay(0)
 from:0x0217e438 kind:arm_call_thumb to:0x02079efc module:overlay(0)
-from:0x0217e448 kind:load to:0x021829e8 module:overlay(31)
+from:0x0217e448 kind:load to:0x021829e0 module:overlay(31) add:0x8
 from:0x0217e44c kind:load to:0x027e0ce0 module:dtcm
 from:0x0217e450 kind:load to:0x02181848 module:overlay(31)
 from:0x0217e460 kind:arm_call to:0x0217e36c module:overlay(31)
 from:0x0217e48c kind:arm_call to:0x0202e9d8 module:main
 from:0x0217e498 kind:arm_call_thumb to:0x02079e78 module:overlay(0)
 from:0x0217e4cc kind:arm_call_thumb to:0x02079efc module:overlay(0)
-from:0x0217e4dc kind:load to:0x021828fc module:overlay(31)
+from:0x0217e4dc kind:load to:0x021828f4 module:overlay(31) add:0x8
 from:0x0217e4e0 kind:load to:0x027e0ce0 module:dtcm
 from:0x0217e4e4 kind:load to:0x02181848 module:overlay(31)
 from:0x0217e4f0 kind:arm_call to:0x0217e338 module:overlay(31)
-from:0x0217e514 kind:load to:0x02182574 module:overlay(31)
+from:0x0217e514 kind:load to:0x0218256c module:overlay(31) add:0x8
 from:0x0217e520 kind:arm_call to:0x0217e4e8 module:overlay(31)
-from:0x0217e534 kind:load to:0x02182328 module:overlay(31)
+from:0x0217e534 kind:load to:0x02182320 module:overlay(31) add:0x8
 from:0x0217e540 kind:arm_call to:0x020c16d0 module:overlay(0)
 from:0x0217e554 kind:arm_call to:0x020c16d0 module:overlay(0)
 from:0x0217e55c kind:arm_call to:0x0202ea08 module:main
 from:0x0217e570 kind:arm_call to:0x020c16d0 module:overlay(0)
 from:0x0217e5b4 kind:arm_call to:0x0217e568 module:overlay(31)
-from:0x0217e5c0 kind:load to:0x02183320 module:overlay(31)
+from:0x0217e5c0 kind:load to:0x02183318 module:overlay(31) add:0x8
 from:0x0217e5fc kind:arm_call to:0x0217e568 module:overlay(31)
 from:0x0217e604 kind:arm_call to:0x0202ea08 module:main
-from:0x0217e610 kind:load to:0x02183320 module:overlay(31)
+from:0x0217e610 kind:load to:0x02183318 module:overlay(31) add:0x8
 from:0x0217e64c kind:arm_call to:0x0217e568 module:overlay(31)
-from:0x0217e658 kind:load to:0x02183320 module:overlay(31)
+from:0x0217e658 kind:load to:0x02183318 module:overlay(31) add:0x8
 from:0x0217e66c kind:arm_call to:0x0217e614 module:overlay(31)
 from:0x0217e688 kind:arm_call to:0x0217e614 module:overlay(31)
 from:0x0217e690 kind:arm_call to:0x0202ea08 module:main
 from:0x0217e6bc kind:arm_call_thumb to:0x02079edc module:overlay(0)
 from:0x0217e6c4 kind:arm_call to:0x0202ea08 module:main
 from:0x0217e758 kind:arm_call to:0x0217e614 module:overlay(31)
-from:0x0217e764 kind:load to:0x021829e8 module:overlay(31)
+from:0x0217e764 kind:load to:0x021829e0 module:overlay(31) add:0x8
 from:0x0217e768 kind:load to:0x02183de8 module:overlay(31)
 from:0x0217e78c kind:arm_call_thumb to:0x02079edc module:overlay(0)
 from:0x0217e794 kind:arm_call to:0x0202ea08 module:main
 from:0x0217e828 kind:arm_call to:0x0217e614 module:overlay(31)
 from:0x0217e830 kind:arm_call to:0x0202ea08 module:main
-from:0x0217e83c kind:load to:0x021829e8 module:overlay(31)
+from:0x0217e83c kind:load to:0x021829e0 module:overlay(31) add:0x8
 from:0x0217e840 kind:load to:0x02183de8 module:overlay(31)
 from:0x0217e864 kind:arm_call_thumb to:0x02079edc module:overlay(0)
 from:0x0217e86c kind:arm_call to:0x0202ea08 module:main
 from:0x0217e87c kind:arm_call to:0x0217e614 module:overlay(31)
-from:0x0217e888 kind:load to:0x021828fc module:overlay(31)
+from:0x0217e888 kind:load to:0x021828f4 module:overlay(31) add:0x8
 from:0x0217e8ac kind:arm_call_thumb to:0x02079edc module:overlay(0)
 from:0x0217e8b4 kind:arm_call to:0x0202ea08 module:main
 from:0x0217e8c4 kind:arm_call to:0x0217e614 module:overlay(31)
 from:0x0217e8cc kind:arm_call to:0x0202ea08 module:main
-from:0x0217e8d8 kind:load to:0x021828fc module:overlay(31)
+from:0x0217e8d8 kind:load to:0x021828f4 module:overlay(31) add:0x8
 from:0x0217e960 kind:arm_call to:0x0217df4c module:overlay(31)
 from:0x0217e96c kind:load to:0x027e0fb4 module:dtcm
-from:0x0217e970 kind:load to:0x02181968 module:overlay(31)
-from:0x0217e974 kind:load to:0x02181978 module:overlay(31)
-from:0x0217e978 kind:load to:0x02181988 module:overlay(31)
+from:0x0217e970 kind:load to:0x02181848 add:0x120 module:overlay(31)
+from:0x0217e974 kind:load to:0x02181848 add:0x130 module:overlay(31)
+from:0x0217e978 kind:load to:0x02181848 add:0x140 module:overlay(31)
 from:0x0217e97c kind:load to:0x02181848 module:overlay(31)
 from:0x0217e980 kind:load to:0x02184008 module:overlay(31)
 from:0x0217e984 kind:load to:0x02184050 module:overlay(31)
@@ -450,8 +450,8 @@ from:0x0217ea70 kind:arm_call to:0x0217df4c module:overlay(31)
 from:0x0217ea80 kind:load to:0x027e1058 module:dtcm
 from:0x0217ea84 kind:load to:0x027e0ce0 module:dtcm
 from:0x0217ea88 kind:load to:0x02183de8 module:overlay(31)
-from:0x0217ea8c kind:load to:0x02181998 module:overlay(31)
-from:0x0217ea90 kind:load to:0x021819a8 module:overlay(31)
+from:0x0217ea8c kind:load to:0x02181848 add:0x150 module:overlay(31)
+from:0x0217ea90 kind:load to:0x02181848 add:0x160 module:overlay(31)
 from:0x0217eaa4 kind:arm_call to:0x021801d8 module:overlay(31)
 from:0x0217eab8 kind:arm_call_thumb to:0x0211c0c4 module:overlay(9)
 from:0x0217ead0 kind:arm_call to:0x0202e9d8 module:main
@@ -573,7 +573,7 @@ from:0x0217fbd4 kind:arm_call to:0x0217fb68 module:overlay(31)
 from:0x0217fc0c kind:arm_call to:0x021801a8 module:overlay(31)
 from:0x0217fc18 kind:arm_call to:0x021801c0 module:overlay(31)
 from:0x0217fc24 kind:arm_call_thumb to:0x0211c900 module:overlay(9)
-from:0x0217fc3c kind:load to:0x02181948 module:overlay(31)
+from:0x0217fc3c kind:load to:0x02181848 add:0x100 module:overlay(31)
 from:0x0217fc48 kind:arm_call to:0x0217bd18 module:overlay(31)
 from:0x0217fc6c kind:arm_call to:0x0217bd18 module:overlay(31)
 from:0x0217fc70 kind:arm_call to:0x0217cdcc module:overlay(31)
diff --git a/config/usa/arm9/overlays/ov031/symbols.txt b/config/usa/arm9/overlays/ov031/symbols.txt
index 7c07e509..d5c2da62 100644
--- a/config/usa/arm9/overlays/ov031/symbols.txt
+++ b/config/usa/arm9/overlays/ov031/symbols.txt
@@ -1,4 +1,4 @@
-func_ov031_0217bd80 kind:function(arm,size=0x8) addr:0x0217bce0
+_ZN24UnkStruct_ov031_02183e8019func_ov031_0217bd80Ev kind:function(arm,size=0x8) addr:0x0217bce0
 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
@@ -31,10 +31,10 @@ func_ov031_0217cdd8 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
 func_ov031_0217ce6c kind:function(arm,size=0x24) addr:0x0217cdcc
-func_ov031_0217ce90 kind:function(arm,size=0x30) addr:0x0217cdf0
-func_ov031_0217cec0 kind:function(arm,size=0x40) addr:0x0217ce20
+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
-func_ov031_0217cf1c kind:function(arm,size=0x10) addr:0x0217ce7c
+_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
@@ -69,175 +69,175 @@ 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
-func_ov031_0217dbdc kind:function(arm,size=0x40) addr:0x0217db3c
-func_ov031_0217dc1c kind:function(arm,size=0x40) addr:0x0217db7c
-func_ov031_0217dc5c kind:function(arm,size=0x40) addr:0x0217dbbc
-func_ov031_0217dc9c kind:function(arm,size=0x40) addr:0x0217dbfc
-func_ov031_0217dcdc kind:function(arm,size=0x40) addr:0x0217dc3c
-func_ov031_0217dd1c kind:function(arm,size=0x40) addr:0x0217dc7c
-func_ov031_0217dd5c kind:function(arm,size=0x40) addr:0x0217dcbc
-func_ov031_0217dd9c kind:function(arm,size=0x40) addr:0x0217dcfc
-func_ov031_0217dddc kind:function(arm,size=0x40) addr:0x0217dd3c
-func_ov031_0217de1c kind:function(arm,size=0x30) addr:0x0217dd7c
-func_ov031_0217de4c kind:function(arm,size=0x30) addr:0x0217ddac
-func_ov031_0217de7c kind:function(arm,size=0x40) addr:0x0217dddc
-func_ov031_0217debc kind:function(arm,size=0x40) addr:0x0217de1c
-func_ov031_0217defc kind:function(arm,size=0x40) addr:0x0217de5c
-func_ov031_0217df3c kind:function(arm,size=0x40) addr:0x0217de9c
-func_ov031_0217df7c kind:function(arm,size=0x40) addr:0x0217dedc
-func_ov031_0217dfbc kind:function(arm,size=0x30) addr:0x0217df1c
-func_ov031_0217dfec kind:function(arm,size=0x54) addr:0x0217df4c
-func_ov031_0217e040 kind:function(arm,size=0x274) addr:0x0217dfa0
-func_ov031_0217e2b4 kind:function(arm,size=0x124) addr:0x0217e214
-func_ov031_0217e3d8 kind:function(arm,size=0x34) addr:0x0217e338
-func_ov031_0217e40c kind:function(arm,size=0x54) addr:0x0217e36c
-func_ov031_0217e460 kind:function(arm,size=0x94) addr:0x0217e3c0
-func_ov031_0217e4f4 kind:function(arm,size=0x94) addr:0x0217e454
-func_ov031_0217e588 kind:function(arm,size=0x30) addr:0x0217e4e8
-func_ov031_0217e5b8 kind:function(arm,size=0x20) addr:0x0217e518
-func_ov031_0217e5d8 kind:function(arm,size=0x14) addr:0x0217e538
-func_ov031_0217e5ec kind:function(arm,size=0x1c) addr:0x0217e54c
-func_ov031_0217e608 kind:function(arm,size=0x14) addr:0x0217e568
-func_ov031_0217e61c kind:function(arm,size=0x48) addr:0x0217e57c
-func_ov031_0217e664 kind:function(arm,size=0x50) addr:0x0217e5c4
-func_ov031_0217e6b4 kind:function(arm,size=0x48) addr:0x0217e614
-func_ov031_0217e6fc kind:function(arm,size=0x1c) addr:0x0217e65c
-func_ov031_0217e718 kind:function(arm,size=0x24) addr:0x0217e678
-func_ov031_0217e73c kind:function(arm,size=0xd0) addr:0x0217e69c
-func_ov031_0217e80c kind:function(arm,size=0xd8) addr:0x0217e76c
-func_ov031_0217e8e4 kind:function(arm,size=0x48) addr:0x0217e844
-func_ov031_0217e92c kind:function(arm,size=0x50) addr:0x0217e88c
-func_ov031_0217e97c kind:function(arm,size=0xac) addr:0x0217e8dc
-func_ov031_0217ea28 kind:function(arm,size=0x18) addr:0x0217e988
-func_ov031_0217ea40 kind:function(arm,size=0x1c) addr:0x0217e9a0
-func_ov031_0217ea5c kind:function(arm,size=0xd8) addr:0x0217e9bc
-func_ov031_0217eb34 kind:function(arm,size=0x60) addr:0x0217ea94
-func_ov031_0217eb94 kind:function(arm,size=0xc) addr:0x0217eaf4
-func_ov031_0217eba0 kind:function(arm,size=0x20) addr:0x0217eb00
-func_ov031_0217ebc0 kind:function(arm,size=0x14) addr:0x0217eb20
-func_ov031_0217ebd4 kind:function(arm,size=0x14) addr:0x0217eb34
-func_ov031_0217ebe8 kind:function(arm,size=0x1c) addr:0x0217eb48
-func_ov031_0217ec04 kind:function(arm,size=0x14) addr:0x0217eb64
-func_ov031_0217ec18 kind:function(arm,size=0x1c) addr:0x0217eb78
-func_ov031_0217ec34 kind:function(arm,size=0x14) addr:0x0217eb94
-func_ov031_0217ec48 kind:function(arm,size=0x1c) addr:0x0217eba8
-func_ov031_0217ec64 kind:function(arm,size=0x14) addr:0x0217ebc4
-func_ov031_0217ec78 kind:function(arm,size=0x1c) addr:0x0217ebd8
-func_ov031_0217ec94 kind:function(arm,size=0x24) addr:0x0217ebf4
-func_ov031_0217ecb8 kind:function(arm,size=0x30) addr:0x0217ec18
-func_ov031_0217ece8 kind:function(arm,size=0x64) addr:0x0217ec48
-func_ov031_0217ed4c kind:function(arm,size=0x1c) addr:0x0217ecac
-func_ov031_0217ed68 kind:function(arm,size=0x60) addr:0x0217ecc8
-func_ov031_0217edc8 kind:function(arm,size=0x14) addr:0x0217ed28
-func_ov031_0217eddc kind:function(arm,size=0x98) addr:0x0217ed3c
-func_ov031_0217ee74 kind:function(arm,size=0x154) addr:0x0217edd4
-func_ov031_0217efc8 kind:function(arm,size=0x68) addr:0x0217ef28
-func_ov031_0217f030 kind:function(arm,size=0x60) addr:0x0217ef90
-func_ov031_0217f090 kind:function(arm,size=0x14) addr:0x0217eff0
-func_ov031_0217f0a4 kind:function(arm,size=0xc) addr:0x0217f004
-func_ov031_0217f0b0 kind:function(arm,size=0x4) addr:0x0217f010
-func_ov031_0217f0b4 kind:function(arm,size=0x38) addr:0x0217f014
-func_ov031_0217f0ec kind:function(arm,size=0x20) addr:0x0217f04c
-func_ov031_0217f10c kind:function(arm,size=0x8) addr:0x0217f06c
-func_ov031_0217f114 kind:function(arm,size=0xc) addr:0x0217f074
-func_ov031_0217f120 kind:function(arm,size=0x334) addr:0x0217f080
-func_ov031_0217f454 kind:function(arm,size=0x50) addr:0x0217f3b4
-func_ov031_0217f4a4 kind:function(arm,size=0x194) addr:0x0217f404
-func_ov031_0217f638 kind:function(arm,size=0x4) addr:0x0217f598
-func_ov031_0217f63c kind:function(arm,size=0x4) addr:0x0217f59c
-func_ov031_0217f640 kind:function(arm,size=0xb8) addr:0x0217f5a0
-func_ov031_0217f6f8 kind:function(arm,size=0xb8) addr:0x0217f658
-func_ov031_0217f7b0 kind:function(arm,size=0xb8) addr:0x0217f710
-func_ov031_0217f868 kind:function(arm,size=0x24) addr:0x0217f7c8
-func_ov031_0217f88c kind:function(arm,size=0x8) addr:0x0217f7ec
-func_ov031_0217f894 kind:function(arm,size=0xc) addr:0x0217f7f4
-func_ov031_0217f8a0 kind:function(arm,size=0x24) addr:0x0217f800
-func_ov031_0217f8c4 kind:function(arm,size=0xc) addr:0x0217f824
-func_ov031_0217f8d0 kind:function(arm,size=0xc) addr:0x0217f830
-func_ov031_0217f8dc kind:function(arm,size=0xc) addr:0x0217f83c
-func_ov031_0217f8e8 kind:function(arm,size=0x38) addr:0x0217f848
-func_ov031_0217f920 kind:function(arm,size=0xc) addr:0x0217f880
-func_ov031_0217f92c kind:function(arm,size=0x48) addr:0x0217f88c
-func_ov031_0217f974 kind:function(arm,size=0x98) addr:0x0217f8d4
-func_ov031_0217fa0c kind:function(arm,size=0x98) addr:0x0217f96c
-func_ov031_0217faa4 kind:function(arm,size=0x60) addr:0x0217fa04
-func_ov031_0217fb04 kind:function(arm,size=0xc) addr:0x0217fa64
-func_ov031_0217fb10 kind:function(arm,size=0xf8) addr:0x0217fa70
-func_ov031_0217fc08 kind:function(arm,size=0x14) addr:0x0217fb68
-func_ov031_0217fc1c kind:function(arm,size=0x28) addr:0x0217fb7c
-func_ov031_0217fc44 kind:function(arm,size=0x38) addr:0x0217fba4
-func_ov031_0217fc7c kind:function(arm,size=0x64) addr:0x0217fbdc
-func_ov031_0217fce0 kind:function(arm,size=0x18) addr:0x0217fc40
-func_ov031_0217fcf8 kind:function(arm,size=0x5c) addr:0x0217fc58
-func_ov031_0217fd54 kind:function(arm,size=0x30) addr:0x0217fcb4
-func_ov031_0217fd84 kind:function(arm,size=0x7c) addr:0x0217fce4
-func_ov031_0217fe00 kind:function(arm,size=0x2c) addr:0x0217fd60
-func_ov031_0217fe2c kind:function(arm,size=0x2c) addr:0x0217fd8c
-func_ov031_0217fe58 kind:function(arm,size=0x2c) addr:0x0217fdb8
-func_ov031_0217fe84 kind:function(arm,size=0x2c) addr:0x0217fde4
-func_ov031_0217feb0 kind:function(arm,size=0x2c) addr:0x0217fe10
-func_ov031_0217fedc kind:function(arm,size=0x2c) addr:0x0217fe3c
-func_ov031_0217ff08 kind:function(arm,size=0x54) addr:0x0217fe68
-func_ov031_0217ff5c kind:function(arm,size=0x40) addr:0x0217febc
-func_ov031_0217ff9c kind:function(arm,size=0x7c) addr:0x0217fefc
-func_ov031_02180018 kind:function(arm,size=0xc) addr:0x0217ff78
-func_ov031_02180024 kind:function(arm,size=0xc) addr:0x0217ff84
-func_ov031_02180030 kind:function(arm,size=0x40) addr:0x0217ff90
-func_ov031_02180070 kind:function(arm,size=0x54) addr:0x0217ffd0
-func_ov031_021800c4 kind:function(arm,size=0x54) addr:0x02180024
-func_ov031_02180118 kind:function(arm,size=0x54) addr:0x02180078
-func_ov031_0218016c kind:function(arm,size=0x40) addr:0x021800cc
-func_ov031_021801ac kind:function(arm,size=0x34) addr:0x0218010c
-func_ov031_021801e0 kind:function(arm,size=0x34) addr:0x02180140
-func_ov031_02180214 kind:function(arm,size=0x34) addr:0x02180174
-func_ov031_02180248 kind:function(arm,size=0x18) addr:0x021801a8
-func_ov031_02180260 kind:function(arm,size=0x18) addr:0x021801c0
-func_ov031_02180278 kind:function(arm,size=0x18) addr:0x021801d8
-func_ov031_02180290 kind:function(arm,size=0x8) addr:0x021801f0
-func_ov031_02180298 kind:function(arm,size=0x8) addr:0x021801f8
-func_ov031_021802a0 kind:function(arm,size=0x8) addr:0x02180200
-func_ov031_021802a8 kind:function(arm,size=0x3c) addr:0x02180208
-func_ov031_021802e4 kind:function(arm,size=0x8) addr:0x02180244
-func_ov031_021802ec kind:function(arm,size=0x3c) addr:0x0218024c
-func_ov031_02180328 kind:function(arm,size=0x8) addr:0x02180288
-func_ov031_02180330 kind:function(arm,size=0x3c) addr:0x02180290
-func_ov031_0218036c kind:function(arm,size=0x8) addr:0x021802cc
-func_ov031_02180374 kind:function(arm,size=0x50) addr:0x021802d4
-func_ov031_021803c4 kind:function(arm,size=0x3c) addr:0x02180324
-func_ov031_02180400 kind:function(arm,size=0x8) addr:0x02180360
-func_ov031_02180408 kind:function(arm,size=0x8) addr:0x02180368
-func_ov031_02180410 kind:function(arm,size=0x8) addr:0x02180370
-func_ov031_02180418 kind:function(arm,size=0x20) addr:0x02180378
-func_ov031_02180438 kind:function(arm,size=0x1c) addr:0x02180398
-func_ov031_02180454 kind:function(arm,size=0x14) addr:0x021803b4
-func_ov031_02180468 kind:function(arm,size=0x1c) addr:0x021803c8
-func_ov031_02180484 kind:function(arm,size=0x14) addr:0x021803e4
-func_ov031_02180498 kind:function(arm,size=0x1c) addr:0x021803f8
-func_ov031_021804b4 kind:function(arm,size=0x14) addr:0x02180414
-func_ov031_021804c8 kind:function(arm,size=0x1c) addr:0x02180428
-func_ov031_021804e4 kind:function(arm,size=0x14) addr:0x02180444
-func_ov031_021804f8 kind:function(arm,size=0x1c) addr:0x02180458
-func_ov031_02180514 kind:function(arm,size=0x14) addr:0x02180474
-func_ov031_02180528 kind:function(arm,size=0x1c) addr:0x02180488
-func_ov031_02180544 kind:function(arm,size=0x14) addr:0x021804a4
-func_ov031_02180558 kind:function(arm,size=0x1c) addr:0x021804b8
-func_ov031_02180574 kind:function(arm,size=0x14) addr:0x021804d4
-func_ov031_02180588 kind:function(arm,size=0x1c) addr:0x021804e8
-func_ov031_021805a4 kind:function(arm,size=0x14) addr:0x02180504
-func_ov031_021805b8 kind:function(arm,size=0x1c) addr:0x02180518
-func_ov031_021805d4 kind:function(arm,size=0x14) addr:0x02180534
-func_ov031_021805e8 kind:function(arm,size=0x1c) addr:0x02180548
-func_ov031_02180604 kind:function(arm,size=0x14) addr:0x02180564
-func_ov031_02180618 kind:function(arm,size=0x1c) addr:0x02180578
-func_ov031_02180634 kind:function(arm,size=0x14) addr:0x02180594
-func_ov031_02180648 kind:function(arm,size=0x1c) addr:0x021805a8
-func_ov031_02180664 kind:function(arm,size=0x14) addr:0x021805c4
-func_ov031_02180678 kind:function(arm,size=0x1c) addr:0x021805d8
-func_ov031_02180694 kind:function(arm,size=0x14) addr:0x021805f4
-func_ov031_021806a8 kind:function(arm,size=0x1c) addr:0x02180608
-func_ov031_021806c4 kind:function(arm,size=0x14) addr:0x02180624
-func_ov031_021806d8 kind:function(arm,size=0x1c) addr:0x02180638
-func_ov031_021806f4 kind:function(arm,size=0x14) addr:0x02180654
+_ZN15ActorShopItemDM6CreateEv kind:function(arm,size=0x40) addr:0x0217db3c
+_ZN20ActorShopItemSoldOut6CreateEv kind:function(arm,size=0x40) addr:0x0217db7c
+_ZN27ActorShopItemHeartContainer6CreateEv kind:function(arm,size=0x40) addr:0x0217dbbc
+_ZN19ActorShopItemArrows6CreateEv kind:function(arm,size=0x40) addr:0x0217dbfc
+_ZN18ActorShopItemBombs6CreateEv kind:function(arm,size=0x40) addr:0x0217dc3c
+_ZN21ActorShopItemBombchus6CreateEv kind:function(arm,size=0x40) addr:0x0217dc7c
+_ZN19ActorShopItemQuiver6CreateEv kind:function(arm,size=0x40) addr:0x0217dcbc
+_ZN20ActorShopItemBombBag6CreateEv kind:function(arm,size=0x40) addr:0x0217dcfc
+_ZN23ActorShopItemBombchuBag6CreateEv kind:function(arm,size=0x40) addr:0x0217dd3c
+_ZN21ActorShopItemTreasure6CreateEv kind:function(arm,size=0x30) addr:0x0217dd7c
+_ZN21ActorShopItemShipPart6CreateEv kind:function(arm,size=0x30) addr:0x0217ddac
+_ZN16ActorShopItemGem6CreateEv kind:function(arm,size=0x40) addr:0x0217dddc
+_ZN19ActorShopItemShield6CreateEv kind:function(arm,size=0x40) addr:0x0217de1c
+_ZN19ActorShopItemPotion6CreateEv kind:function(arm,size=0x40) addr:0x0217de5c
+_ZN15ActorShopItemBK6CreateEv kind:function(arm,size=0x40) addr:0x0217de9c
+_ZN15ActorShopItemCC6CreateEv kind:function(arm,size=0x40) addr:0x0217dedc
+_ZN15ActorShopItemBY6CreateEv kind:function(arm,size=0x30) addr:0x0217df1c
+_Z19func_ov031_0217dfecP9FileEntryS0_PKc kind:function(arm,size=0x54) addr:0x0217df4c
+_Z19func_ov031_0217e040v kind:function(arm,size=0x274) addr:0x0217dfa0
+_Z19func_ov031_0217e2b4v kind:function(arm,size=0x124) addr:0x0217e214
+_ZN17ActorShopItemBaseC1Ev kind:function(arm,size=0x34) addr:0x0217e338
+_ZN13ActorShopItemC2Ev kind:function(arm,size=0x54) addr:0x0217e36c
+_ZN21ActorShopItemShipPartC1Ev kind:function(arm,size=0x94) addr:0x0217e3c0
+_ZN21ActorShopItemTreasureC1Ev kind:function(arm,size=0x94) addr:0x0217e454
+_ZN16ActorShopItemUnkC2Ev kind:function(arm,size=0x30) addr:0x0217e4e8
+_ZN15ActorShopItemBYC1Ev kind:function(arm,size=0x20) addr:0x0217e518
+_ZN17ActorShopItemBaseD1Ev kind:function(arm,size=0x14) addr:0x0217e538
+_ZN17ActorShopItemBaseD0Ev kind:function(arm,size=0x1c) addr:0x0217e54c
+_ZN17ActorShopItemBaseD2Ev kind:function(arm,size=0x14) addr:0x0217e568
+_ZN13ActorShopItemD1Ev kind:function(arm,size=0x48) addr:0x0217e57c
+_ZN13ActorShopItemD0Ev kind:function(arm,size=0x50) addr:0x0217e5c4
+_ZN13ActorShopItemD2Ev kind:function(arm,size=0x48) addr:0x0217e614
+_ZN20ActorShopItemSoldOutD1Ev kind:function(arm,size=0x1c) addr:0x0217e65c
+_ZN20ActorShopItemSoldOutD0Ev kind:function(arm,size=0x24) addr:0x0217e678
+_ZN21ActorShopItemShipPartD1Ev kind:function(arm,size=0xd0) addr:0x0217e69c
+_ZN21ActorShopItemShipPartD0Ev kind:function(arm,size=0xd8) addr:0x0217e76c
+_ZN21ActorShopItemTreasureD1Ev kind:function(arm,size=0x48) addr:0x0217e844
+_ZN21ActorShopItemTreasureD0Ev kind:function(arm,size=0x50) addr:0x0217e88c
+_ZN13ActorShopItem8vfunc_d4Ev kind:function(arm,size=0xac) addr:0x0217e8dc
+_ZN15ActorShopItemDM8vfunc_d4Ev kind:function(arm,size=0x18) addr:0x0217e988
+_ZN20ActorShopItemSoldOut8vfunc_d4Ev kind:function(arm,size=0x1c) addr:0x0217e9a0
+_ZN21ActorShopItemShipPart8vfunc_d4Ev kind:function(arm,size=0xd8) addr:0x0217e9bc
+_ZN21ActorShopItemTreasure8vfunc_d4Ev kind:function(arm,size=0x60) addr:0x0217ea94
+_ZN17ActorShopItemBase4InitEv kind:function(arm,size=0xc) addr:0x0217eaf4
+_ZN13ActorShopItem4InitEv kind:function(arm,size=0x20) addr:0x0217eb00
+_ZN15ActorShopItemDM4InitEv kind:function(arm,size=0x14) addr:0x0217eb20
+_ZN20ActorShopItemSoldOut4InitEv kind:function(arm,size=0x14) addr:0x0217eb34
+_ZN27ActorShopItemHeartContainer4InitEv kind:function(arm,size=0x1c) addr:0x0217eb48
+_ZN19ActorShopItemArrows4InitEv kind:function(arm,size=0x14) addr:0x0217eb64
+_ZN19ActorShopItemQuiver4InitEv kind:function(arm,size=0x1c) addr:0x0217eb78
+_ZN18ActorShopItemBombs4InitEv kind:function(arm,size=0x14) addr:0x0217eb94
+_ZN20ActorShopItemBombBag4InitEv kind:function(arm,size=0x1c) addr:0x0217eba8
+_ZN21ActorShopItemBombchus4InitEv kind:function(arm,size=0x14) addr:0x0217ebc4
+_ZN23ActorShopItemBombchuBag4InitEv kind:function(arm,size=0x1c) addr:0x0217ebd8
+_ZN21ActorShopItemShipPart4InitEv kind:function(arm,size=0x24) addr:0x0217ebf4
+_ZN21ActorShopItemTreasure4InitEv kind:function(arm,size=0x30) addr:0x0217ec18
+_ZN16ActorShopItemGem4InitEv kind:function(arm,size=0x64) addr:0x0217ec48
+_ZN19ActorShopItemShield4InitEv kind:function(arm,size=0x1c) addr:0x0217ecac
+_ZN19ActorShopItemPotion4InitEv kind:function(arm,size=0x60) addr:0x0217ecc8
+_ZN16ActorShopItemUnk4InitEv kind:function(arm,size=0x14) addr:0x0217ed28
+_ZN17ActorShopItemBase8vfunc_14Ej kind:function(arm,size=0x98) addr:0x0217ed3c
+_ZN13ActorShopItem8vfunc_14Ej kind:function(arm,size=0x154) addr:0x0217edd4
+_ZN21ActorShopItemShipPart8vfunc_14Ej kind:function(arm,size=0x68) addr:0x0217ef28
+_ZN16ActorShopItemUnk8vfunc_14Ej kind:function(arm,size=0x60) addr:0x0217ef90
+_ZN17ActorShopItemBase8vfunc_18Ej kind:function(arm,size=0x14) addr:0x0217eff0
+_ZN13ActorShopItem8vfunc_c8Ev kind:function(arm,size=0xc) addr:0x0217f004
+_ZN13ActorShopItem8vfunc_ccEv kind:function(arm,size=0x4) addr:0x0217f010
+_ZN13ActorShopItem19func_ov031_0217f0b4Ev kind:function(arm,size=0x38) addr:0x0217f014
+_ZN13ActorShopItem8GetPitchEv kind:function(arm,size=0x20) addr:0x0217f04c
+_ZN13ActorShopItem6GetYawEv kind:function(arm,size=0x8) addr:0x0217f06c
+_Z19func_ov031_0217f114Pv kind:function(arm,size=0xc) addr:0x0217f074
+_ZN13ActorShopItem19func_ov031_0217f120Ev kind:function(arm,size=0x334) addr:0x0217f080
+_ZN13ActorShopItem8vfunc_20Eb kind:function(arm,size=0x50) addr:0x0217f3b4
+_ZN21ActorShopItemShipPart8vfunc_20Eb kind:function(arm,size=0x194) addr:0x0217f404
+_ZN15ActorShopItemDM8vfunc_20Eb kind:function(arm,size=0x4) addr:0x0217f598
+_ZN16ActorShopItemUnk8vfunc_20Eb kind:function(arm,size=0x4) addr:0x0217f59c
+_ZN15ActorShopItemBK8vfunc_1cEPt kind:function(arm,size=0xb8) addr:0x0217f5a0
+_ZN15ActorShopItemCC8vfunc_1cEPt kind:function(arm,size=0xb8) addr:0x0217f658
+_ZN15ActorShopItemBY8vfunc_1cEPt kind:function(arm,size=0xb8) addr:0x0217f710
+_ZN13ActorShopItem19GetSoldOutMessageIdEv kind:function(arm,size=0x24) addr:0x0217f7c8
+_ZN15ActorShopItemDM12GetMessageIdEv kind:function(arm,size=0x8) addr:0x0217f7ec
+_ZN20ActorShopItemSoldOut12GetMessageIdEv kind:function(arm,size=0xc) addr:0x0217f7f4
+_ZN27ActorShopItemHeartContainer12GetMessageIdEv kind:function(arm,size=0x24) addr:0x0217f800
+_ZN19ActorShopItemArrows12GetMessageIdEv kind:function(arm,size=0xc) addr:0x0217f824
+_ZN19ActorShopItemQuiver12GetMessageIdEv kind:function(arm,size=0xc) addr:0x0217f830
+_ZN18ActorShopItemBombs12GetMessageIdEv kind:function(arm,size=0xc) addr:0x0217f83c
+_ZN20ActorShopItemBombBag12GetMessageIdEv kind:function(arm,size=0x38) addr:0x0217f848
+_ZN21ActorShopItemBombchus12GetMessageIdEv kind:function(arm,size=0xc) addr:0x0217f880
+_ZN23ActorShopItemBombchuBag12GetMessageIdEv kind:function(arm,size=0x48) addr:0x0217f88c
+_ZN21ActorShopItemShipPart12GetMessageIdEv kind:function(arm,size=0x98) addr:0x0217f8d4
+_ZN21ActorShopItemTreasure12GetMessageIdEv kind:function(arm,size=0x98) addr:0x0217f96c
+_ZN16ActorShopItemGem12GetMessageIdEv kind:function(arm,size=0x60) addr:0x0217fa04
+_ZN19ActorShopItemShield12GetMessageIdEv kind:function(arm,size=0xc) addr:0x0217fa64
+_ZN19ActorShopItemPotion12GetMessageIdEv kind:function(arm,size=0xf8) addr:0x0217fa70
+_ZN13ActorShopItem8GetPriceEv kind:function(arm,size=0x14) addr:0x0217fb68
+_ZN27ActorShopItemHeartContainer8GetPriceEv kind:function(arm,size=0x28) addr:0x0217fb7c
+_ZN19ActorShopItemPotion8GetPriceEv kind:function(arm,size=0x38) addr:0x0217fba4
+_ZN21ActorShopItemShipPart8GetPriceEv kind:function(arm,size=0x64) addr:0x0217fbdc
+_ZN21ActorShopItemTreasure8GetPriceEv kind:function(arm,size=0x18) addr:0x0217fc40
+_ZN13ActorShopItem8vfunc_c0Ev kind:function(arm,size=0x5c) addr:0x0217fc58
+_ZN13ActorShopItem8vfunc_c4Ev kind:function(arm,size=0x30) addr:0x0217fcb4
+_ZN27ActorShopItemHeartContainer8vfunc_c4Ev kind:function(arm,size=0x7c) addr:0x0217fce4
+_ZN19ActorShopItemArrows8vfunc_c4Ev kind:function(arm,size=0x2c) addr:0x0217fd60
+_ZN19ActorShopItemQuiver8vfunc_c4Ev kind:function(arm,size=0x2c) addr:0x0217fd8c
+_ZN18ActorShopItemBombs8vfunc_c4Ev kind:function(arm,size=0x2c) addr:0x0217fdb8
+_ZN20ActorShopItemBombBag8vfunc_c4Ev kind:function(arm,size=0x2c) addr:0x0217fde4
+_ZN21ActorShopItemBombchus8vfunc_c4Ev kind:function(arm,size=0x2c) addr:0x0217fe10
+_ZN23ActorShopItemBombchuBag8vfunc_c4Ev kind:function(arm,size=0x2c) addr:0x0217fe3c
+_ZN21ActorShopItemShipPart8vfunc_c4Ev kind:function(arm,size=0x54) addr:0x0217fe68
+_ZN21ActorShopItemTreasure8vfunc_c4Ev kind:function(arm,size=0x40) addr:0x0217febc
+_ZN16ActorShopItemGem8vfunc_c4Ev kind:function(arm,size=0x7c) addr:0x0217fefc
+_ZN19ActorShopItemShield8vfunc_c4Ev kind:function(arm,size=0xc) addr:0x0217ff78
+_ZN19ActorShopItemPotion8vfunc_c4Ev kind:function(arm,size=0xc) addr:0x0217ff84
+_ZN17ActorShopItemBase8vfunc_b4Ev kind:function(arm,size=0x40) addr:0x0217ff90
+_ZN15ActorShopItemBK8vfunc_b4Ev kind:function(arm,size=0x54) addr:0x0217ffd0
+_ZN15ActorShopItemCC8vfunc_b4Ev kind:function(arm,size=0x54) addr:0x02180024
+_ZN15ActorShopItemBY8vfunc_b4Ev kind:function(arm,size=0x54) addr:0x02180078
+_ZN17ActorShopItemBase8vfunc_b8Ev kind:function(arm,size=0x40) addr:0x021800cc
+_ZN15ActorShopItemBK8vfunc_b8Ev kind:function(arm,size=0x34) addr:0x0218010c
+_ZN15ActorShopItemCC8vfunc_b8Ev kind:function(arm,size=0x34) addr:0x02180140
+_ZN15ActorShopItemBY8vfunc_b8Ev kind:function(arm,size=0x34) addr:0x02180174
+_ZN21ActorShopItemShipPart19func_ov031_02180248Ev kind:function(arm,size=0x18) addr:0x021801a8
+_ZN21ActorShopItemShipPart19func_ov031_02180260Ev kind:function(arm,size=0x18) addr:0x021801c0
+_ZN21ActorShopItemTreasure19func_ov031_02180278Ev kind:function(arm,size=0x18) addr:0x021801d8
+_ZN15ActorShopItemDM8vfunc_d0Ev kind:function(arm,size=0x8) addr:0x021801f0
+_ZN20ActorShopItemSoldOut8vfunc_d0Ev kind:function(arm,size=0x8) addr:0x021801f8
+_ZN27ActorShopItemHeartContainer8vfunc_d0Ev kind:function(arm,size=0x8) addr:0x02180200
+_ZN19ActorShopItemArrows8vfunc_d0Ev kind:function(arm,size=0x3c) addr:0x02180208
+_ZN19ActorShopItemQuiver8vfunc_d0Ev kind:function(arm,size=0x8) addr:0x02180244
+_ZN18ActorShopItemBombs8vfunc_d0Ev kind:function(arm,size=0x3c) addr:0x0218024c
+_ZN20ActorShopItemBombBag8vfunc_d0Ev kind:function(arm,size=0x8) addr:0x02180288
+_ZN21ActorShopItemBombchus8vfunc_d0Ev kind:function(arm,size=0x3c) addr:0x02180290
+_ZN23ActorShopItemBombchuBag8vfunc_d0Ev kind:function(arm,size=0x8) addr:0x021802cc
+_ZN21ActorShopItemShipPart8vfunc_d0Ev kind:function(arm,size=0x50) addr:0x021802d4
+_ZN21ActorShopItemTreasure8vfunc_d0Ev kind:function(arm,size=0x3c) addr:0x02180324
+_ZN16ActorShopItemGem8vfunc_d0Ev kind:function(arm,size=0x8) addr:0x02180360
+_ZN19ActorShopItemShield8vfunc_d0Ev kind:function(arm,size=0x8) addr:0x02180368
+_ZN19ActorShopItemPotion8vfunc_d0Ev kind:function(arm,size=0x8) addr:0x02180370
+_ZN16ActorShopItemUnk19func_ov031_02180418Ev kind:function(arm,size=0x20) addr:0x02180378
+_ZN15ActorShopItemBYD0Ev kind:function(arm,size=0x1c) addr:0x02180398
+_ZN15ActorShopItemBYD1Ev kind:function(arm,size=0x14) addr:0x021803b4
+_ZN15ActorShopItemCCD0Ev kind:function(arm,size=0x1c) addr:0x021803c8
+_ZN15ActorShopItemCCD1Ev kind:function(arm,size=0x14) addr:0x021803e4
+_ZN15ActorShopItemBKD0Ev kind:function(arm,size=0x1c) addr:0x021803f8
+_ZN15ActorShopItemBKD1Ev kind:function(arm,size=0x14) addr:0x02180414
+_ZN16ActorShopItemUnkD0Ev kind:function(arm,size=0x1c) addr:0x02180428
+_ZN16ActorShopItemUnkD1Ev kind:function(arm,size=0x14) addr:0x02180444
+_ZN19ActorShopItemPotionD0Ev kind:function(arm,size=0x1c) addr:0x02180458
+_ZN19ActorShopItemPotionD1Ev kind:function(arm,size=0x14) addr:0x02180474
+_ZN19ActorShopItemShieldD0Ev kind:function(arm,size=0x1c) addr:0x02180488
+_ZN19ActorShopItemShieldD1Ev kind:function(arm,size=0x14) addr:0x021804a4
+_ZN16ActorShopItemGemD0Ev kind:function(arm,size=0x1c) addr:0x021804b8
+_ZN16ActorShopItemGemD1Ev kind:function(arm,size=0x14) addr:0x021804d4
+_ZN23ActorShopItemBombchuBagD0Ev kind:function(arm,size=0x1c) addr:0x021804e8
+_ZN23ActorShopItemBombchuBagD1Ev kind:function(arm,size=0x14) addr:0x02180504
+_ZN21ActorShopItemBombchusD0Ev kind:function(arm,size=0x1c) addr:0x02180518
+_ZN21ActorShopItemBombchusD1Ev kind:function(arm,size=0x14) addr:0x02180534
+_ZN20ActorShopItemBombBagD0Ev kind:function(arm,size=0x1c) addr:0x02180548
+_ZN20ActorShopItemBombBagD1Ev kind:function(arm,size=0x14) addr:0x02180564
+_ZN18ActorShopItemBombsD0Ev kind:function(arm,size=0x1c) addr:0x02180578
+_ZN18ActorShopItemBombsD1Ev kind:function(arm,size=0x14) addr:0x02180594
+_ZN19ActorShopItemQuiverD0Ev kind:function(arm,size=0x1c) addr:0x021805a8
+_ZN19ActorShopItemQuiverD1Ev kind:function(arm,size=0x14) addr:0x021805c4
+_ZN19ActorShopItemArrowsD0Ev kind:function(arm,size=0x1c) addr:0x021805d8
+_ZN19ActorShopItemArrowsD1Ev kind:function(arm,size=0x14) addr:0x021805f4
+_ZN27ActorShopItemHeartContainerD0Ev kind:function(arm,size=0x1c) addr:0x02180608
+_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
@@ -290,14 +290,10 @@ 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
 data_ov031_021818a0 kind:data(any) addr:0x02181800
-data_ov031_021818e8 kind:data(any) addr:0x02181848
-data_ov031_021818f8 kind:data(any) addr:0x02181858
-data_ov031_021819e8 kind:data(any) addr:0x02181948
-data_ov031_02181a08 kind:data(any) addr:0x02181968
-data_ov031_02181a18 kind:data(any) addr:0x02181978
-data_ov031_02181a28 kind:data(any) addr:0x02181988
-data_ov031_02181a38 kind:data(any) addr:0x02181998
-data_ov031_02181a48 kind:data(any) addr:0x021819a8
+sShopItemBaseNames kind:data(any) addr:0x02181848
+unk$1534 kind:data(any) addr:0x021819b8 local
+unk$1554 kind:data(any) addr:0x021819cc local
+@2460 kind:data(any) addr:0x021819e0 local
 data_ov031_02181a88 kind:data(any) addr:0x021819e8
 data_ov031_02181a94 kind:data(any) addr:0x021819f4
 data_ov031_02181abc kind:data(any) addr:0x02181a1c
@@ -306,11 +302,11 @@ data_ov031_02181ad4 kind:data(any) addr:0x02181a34
 data_ov031_02181b10 kind:data(any) addr:0x02181a70
 data_ov031_02181b24 kind:data(any) addr:0x02181a84
 data_ov031_02181b30 kind:data(any) addr:0x02181a90
-__sinit_ov031_02181b6c kind:function(arm,size=0x3ec) addr:0x02181acc
+__sinit_ActorShopItem.cpp kind:function(arm,size=0x3ec) addr:0x02181acc local
 __sinit_ov031_02181f58 kind:function(arm,size=0xa8) addr:0x02181eb8
 __sinit_ov031_02182000 kind:function(arm,size=0x40) addr:0x02181f60
 __sinit_ov031_02182040 kind:function(arm,size=0x40) addr:0x02181fa0
-.p__sinit_ov031_02181b6c kind:data(word) addr:0x02181fe0
+.p__sinit_ActorShopItem.cpp kind:data(word) addr:0x02181fe0 local
 .p__sinit_ov031_02181f58 kind:data(word) addr:0x02181fe4
 .p__sinit_ov031_02182000 kind:data(word) addr:0x02181fe8
 .p__sinit_ov031_02182040 kind:data(word) addr:0x02181fec
@@ -332,84 +328,84 @@ 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
-data_ov031_02182290 kind:data(any) addr:0x021821f0
-data_ov031_02182294 kind:data(any) addr:0x021821f4
-data_ov031_02182298 kind:data(any) addr:0x021821f8
-data_ov031_0218229c kind:data(any) addr:0x021821fc
-data_ov031_021822a0 kind:data(any) addr:0x02182200
-data_ov031_021822a4 kind:data(any) addr:0x02182204
-data_ov031_021822a8 kind:data(any) addr:0x02182208
-data_ov031_021822ac kind:data(any) addr:0x0218220c
-data_ov031_021822b0 kind:data(any) addr:0x02182210
-data_ov031_021822d0 kind:data(any) addr:0x02182230
-data_ov031_02182318 kind:data(any) addr:0x02182278
-data_ov031_0218236c kind:data(any) addr:0x021822cc
-data_ov031_021823c8 kind:data(any) addr:0x02182328
-data_ov031_0218248c kind:data(any) addr:0x021823ec
-data_ov031_02182550 kind:data(any) addr:0x021824b0
-data_ov031_02182614 kind:data(any) addr:0x02182574
-data_ov031_021826d8 kind:data(any) addr:0x02182638
-data_ov031_021827c4 kind:data(any) addr:0x02182724
-data_ov031_021828b0 kind:data(any) addr:0x02182810
-data_ov031_0218299c kind:data(any) addr:0x021828fc
-data_ov031_02182a88 kind:data(any) addr:0x021829e8
-data_ov031_02182b74 kind:data(any) addr:0x02182ad4
-data_ov031_02182c60 kind:data(any) addr:0x02182bc0
-data_ov031_02182d4c kind:data(any) addr:0x02182cac
-data_ov031_02182e38 kind:data(any) addr:0x02182d98
-data_ov031_02182f24 kind:data(any) addr:0x02182e84
-data_ov031_02183010 kind:data(any) addr:0x02182f70
-data_ov031_021830fc kind:data(any) addr:0x0218305c
-data_ov031_021831e8 kind:data(any) addr:0x02183148
-data_ov031_021832d4 kind:data(any) addr:0x02183234
-data_ov031_021833c0 kind:data(any) addr:0x02183320
-data_ov031_021834ac kind:data(any) addr:0x0218340c
-data_ov031_02183568 kind:data(any) addr:0x021834c8
-data_ov031_02183584 kind:data(any) addr:0x021834e4
-data_ov031_021835a0 kind:data(any) addr:0x02183500
-data_ov031_021835bc kind:data(any) addr:0x0218351c
-data_ov031_021835dc kind:data(any) addr:0x0218353c
-data_ov031_021835f8 kind:data(any) addr:0x02183558
-data_ov031_02183618 kind:data(any) addr:0x02183578
-data_ov031_02183634 kind:data(any) addr:0x02183594
-data_ov031_02183654 kind:data(any) addr:0x021835b4
-data_ov031_02183670 kind:data(any) addr:0x021835d0
-data_ov031_0218368c kind:data(any) addr:0x021835ec
-data_ov031_021836a8 kind:data(any) addr:0x02183608
-data_ov031_021836c4 kind:data(any) addr:0x02183624
-data_ov031_021836e0 kind:data(any) addr:0x02183640
-data_ov031_021836fc kind:data(any) addr:0x0218365c
-data_ov031_02183714 kind:data(any) addr:0x02183674
-data_ov031_02183730 kind:data(any) addr:0x02183690
-data_ov031_02183750 kind:data(any) addr:0x021836b0
-data_ov031_02183770 kind:data(any) addr:0x021836d0
-data_ov031_0218378c kind:data(any) addr:0x021836ec
-data_ov031_021837ac kind:data(any) addr:0x0218370c
-data_ov031_021837c8 kind:data(any) addr:0x02183728
-data_ov031_021837e4 kind:data(any) addr:0x02183744
-data_ov031_02183800 kind:data(any) addr:0x02183760
-data_ov031_0218381c kind:data(any) addr:0x0218377c
-data_ov031_0218383c kind:data(any) addr:0x0218379c
-data_ov031_02183858 kind:data(any) addr:0x021837b8
-data_ov031_02183878 kind:data(any) addr:0x021837d8
-data_ov031_02183894 kind:data(any) addr:0x021837f4
-data_ov031_021838b4 kind:data(any) addr:0x02183814
-data_ov031_021838d0 kind:data(any) addr:0x02183830
-data_ov031_021838ec kind:data(any) addr:0x0218384c
-data_ov031_02183908 kind:data(any) addr:0x02183868
-data_ov031_02183924 kind:data(any) addr:0x02183884
-data_ov031_02183940 kind:data(any) addr:0x021838a0
-data_ov031_0218395c kind:data(any) addr:0x021838bc
-data_ov031_02183974 kind:data(any) addr:0x021838d4
-data_ov031_02183990 kind:data(any) addr:0x021838f0
-data_ov031_021839b0 kind:data(any) addr:0x02183910
-data_ov031_021839d0 kind:data(any) addr:0x02183930
-data_ov031_021839ec kind:data(any) addr:0x0218394c
-data_ov031_02183a0c kind:data(any) addr:0x0218396c
-data_ov031_02183a28 kind:data(any) addr:0x02183988
-data_ov031_02183a44 kind:data(any) addr:0x021839a4
-data_ov031_02183a60 kind:data(any) addr:0x021839c0
-data_ov031_02183a7c kind:data(any) addr:0x021839dc
+@1183 kind:data(any) addr:0x021821f0 local
+@1184 kind:data(any) addr:0x021821f4 local
+@1185 kind:data(any) addr:0x021821f8 local
+@1186 kind:data(any) addr:0x021821fc local
+@1187 kind:data(any) addr:0x02182200 local
+@1188 kind:data(any) addr:0x02182204 local
+@1189 kind:data(any) addr:0x02182208 local
+@1190 kind:data(any) addr:0x0218220c local
+sShipTypes kind:data(any) addr:0x02182210 local
+sShopItemPrices kind:data(any) addr:0x02182230
+sShopItemModelPaths kind:data(any) addr:0x02182278
+sShopItemTexturePaths kind:data(any) addr:0x021822cc
+_ZTV15ActorShopItemBY kind:data(any) addr:0x02182320
+_ZTV15ActorShopItemCC kind:data(any) addr:0x021823e4
+_ZTV15ActorShopItemBK kind:data(any) addr:0x021824a8
+_ZTV16ActorShopItemUnk kind:data(any) addr:0x0218256c
+_ZTV19ActorShopItemPotion kind:data(any) addr:0x02182630
+_ZTV19ActorShopItemShield kind:data(any) addr:0x0218271c
+_ZTV16ActorShopItemGem kind:data(any) addr:0x02182808
+_ZTV21ActorShopItemTreasure kind:data(any) addr:0x021828f4
+_ZTV21ActorShopItemShipPart kind:data(any) addr:0x021829e0
+_ZTV23ActorShopItemBombchuBag kind:data(any) addr:0x02182acc
+_ZTV21ActorShopItemBombchus kind:data(any) addr:0x02182bb8
+_ZTV20ActorShopItemBombBag kind:data(any) addr:0x02182ca4
+_ZTV18ActorShopItemBombs kind:data(any) addr:0x02182d90
+_ZTV19ActorShopItemQuiver kind:data(any) addr:0x02182e7c
+_ZTV19ActorShopItemArrows kind:data(any) addr:0x02182f68
+_ZTV27ActorShopItemHeartContainer kind:data(any) addr:0x02183054
+_ZTV20ActorShopItemSoldOut kind:data(any) addr:0x02183140
+_ZTV15ActorShopItemDM kind:data(any) addr:0x0218322c
+_ZTV13ActorShopItem kind:data(any) addr:0x02183318
+_ZTV17ActorShopItemBase kind:data(any) addr:0x02183404
+@1266 kind:data(any) addr:0x021834c8 local
+@1267 kind:data(any) addr:0x021834e4 local
+@1268 kind:data(any) addr:0x02183500 local
+@1269 kind:data(any) addr:0x0218351c local
+@1270 kind:data(any) addr:0x0218353c local
+@1271 kind:data(any) addr:0x02183558 local
+@1272 kind:data(any) addr:0x02183578 local
+@1273 kind:data(any) addr:0x02183594 local
+@1274 kind:data(any) addr:0x021835b4 local
+@1275 kind:data(any) addr:0x021835d0 local
+@1276 kind:data(any) addr:0x021835ec local
+@1277 kind:data(any) addr:0x02183608 local
+@1278 kind:data(any) addr:0x02183624 local
+@1279 kind:data(any) addr:0x02183640 local
+@1280 kind:data(any) addr:0x0218365c local
+@1281 kind:data(any) addr:0x02183674 local
+@1282 kind:data(any) addr:0x02183690 local
+@1283 kind:data(any) addr:0x021836b0 local
+@1284 kind:data(any) addr:0x021836d0 local
+@1285 kind:data(any) addr:0x021836ec local
+@1286 kind:data(any) addr:0x0218370c local
+@1287 kind:data(any) addr:0x02183728 local
+@1288 kind:data(any) addr:0x02183744 local
+@1289 kind:data(any) addr:0x02183760 local
+@1290 kind:data(any) addr:0x0218377c local
+@1291 kind:data(any) addr:0x0218379c local
+@1292 kind:data(any) addr:0x021837b8 local
+@1293 kind:data(any) addr:0x021837d8 local
+@1294 kind:data(any) addr:0x021837f4 local
+@1295 kind:data(any) addr:0x02183814 local
+@1296 kind:data(any) addr:0x02183830 local
+@1297 kind:data(any) addr:0x0218384c local
+@1298 kind:data(any) addr:0x02183868 local
+@1299 kind:data(any) addr:0x02183884 local
+@1300 kind:data(any) addr:0x021838a0 local
+@1301 kind:data(any) addr:0x021838bc local
+@1302 kind:data(any) addr:0x021838d4 local
+@1303 kind:data(any) addr:0x021838f0 local
+@1304 kind:data(any) addr:0x02183910 local
+@1305 kind:data(any) addr:0x02183930 local
+@1306 kind:data(any) addr:0x0218394c local
+@1307 kind:data(any) addr:0x0218396c local
+@1261 kind:data(any) addr:0x02183988 local
+@1262 kind:data(any) addr:0x021839a4 local
+@1263 kind:data(any) addr:0x021839c0 local
+@1264 kind:data(any) addr:0x021839dc local
 data_ov031_02183a98 kind:data(any) addr:0x021839f8
 data_ov031_02183a9c kind:data(any) addr:0x021839fc
 data_ov031_02183aa0 kind:data(any) addr:0x02183a00
@@ -433,44 +429,49 @@ 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
-data_ov031_02183e88 kind:bss addr:0x02183de8
-data_ov031_02183e94 kind:bss addr:0x02183df4
-data_ov031_02183ea8 kind:bss addr:0x02183e08
-data_ov031_02183eb4 kind:bss addr:0x02183e14
-data_ov031_02183ec8 kind:bss addr:0x02183e28
-data_ov031_02183ed4 kind:bss addr:0x02183e34
-data_ov031_02183ee8 kind:bss addr:0x02183e48
-data_ov031_02183ef4 kind:bss addr:0x02183e54
-data_ov031_02183f08 kind:bss addr:0x02183e68
-data_ov031_02183f14 kind:bss addr:0x02183e74
-data_ov031_02183f28 kind:bss addr:0x02183e88
-data_ov031_02183f34 kind:bss addr:0x02183e94
-data_ov031_02183f48 kind:bss addr:0x02183ea8
-data_ov031_02183f54 kind:bss addr:0x02183eb4
-data_ov031_02183f68 kind:bss addr:0x02183ec8
-data_ov031_02183f74 kind:bss addr:0x02183ed4
-data_ov031_02183f78 kind:bss addr:0x02183ed8 ambiguous
-data_ov031_02183f84 kind:bss addr:0x02183ee4 ambiguous
-data_ov031_02183f88 kind:bss addr:0x02183ee8
-data_ov031_02183f94 kind:bss addr:0x02183ef4
-data_ov031_02183fa8 kind:bss addr:0x02183f08
-data_ov031_02183fb4 kind:bss addr:0x02183f14
-data_ov031_02183fc8 kind:bss addr:0x02183f28
-data_ov031_02183fd4 kind:bss addr:0x02183f34
-data_ov031_02183fe8 kind:bss addr:0x02183f48
-data_ov031_02183ff4 kind:bss addr:0x02183f54
-data_ov031_02184008 kind:bss addr:0x02183f68
-data_ov031_02184014 kind:bss addr:0x02183f74
-data_ov031_02184028 kind:bss addr:0x02183f88
-data_ov031_02184034 kind:bss addr:0x02183f94
-data_ov031_02184048 kind:bss addr:0x02183fa8
-data_ov031_02184054 kind:bss addr:0x02183fb4
-data_ov031_02184068 kind:bss addr:0x02183fc8
-data_ov031_02184074 kind:bss addr:0x02183fd4
-data_ov031_02184088 kind:bss addr:0x02183fe8
-data_ov031_02184094 kind:bss addr:0x02183ff4
-data_ov031_021840a8 kind:bss addr:0x02184008
-data_ov031_021840f0 kind:bss addr:0x02184050
+@792 kind:bss addr:0x02183de8
+_ZN15ActorShopItemDM5gTypeE kind:bss addr:0x02183df4
+@794 kind:bss addr:0x02183e08
+_ZN20ActorShopItemSoldOut5gTypeE kind:bss addr:0x02183e14
+@796 kind:bss addr:0x02183e28
+_ZN27ActorShopItemHeartContainer5gTypeE kind:bss addr:0x02183e34
+@798 kind:bss addr:0x02183e48
+_ZN19ActorShopItemArrows5gTypeE kind:bss addr:0x02183e54
+@800 kind:bss addr:0x02183e68
+_ZN18ActorShopItemBombs5gTypeE kind:bss addr:0x02183e74
+@802 kind:bss addr:0x02183e88
+_ZN21ActorShopItemBombchus5gTypeE kind:bss addr:0x02183e94
+@804 kind:bss addr:0x02183ea8
+_ZN19ActorShopItemQuiver5gTypeE kind:bss addr:0x02183eb4
+@806 kind:bss addr:0x02183ec8
+_ZN20ActorShopItemBombBag5gTypeE kind:bss addr:0x02183ed4
+@808 kind:bss addr:0x02183ee8
+_ZN23ActorShopItemBombchuBag5gTypeE kind:bss addr:0x02183ef4
+@810 kind:bss addr:0x02183f08
+_ZN21ActorShopItemTreasure5gTypeE kind:bss addr:0x02183f14
+@812 kind:bss addr:0x02183f28
+_ZN21ActorShopItemShipPart5gTypeE kind:bss addr:0x02183f34
+@814 kind:bss addr:0x02183f48
+_ZN16ActorShopItemGem5gTypeE kind:bss addr:0x02183f54
+@816 kind:bss addr:0x02183f68
+_ZN19ActorShopItemShield5gTypeE kind:bss addr:0x02183f74
+@818 kind:bss addr:0x02183f88
+_ZN19ActorShopItemPotion5gTypeE kind:bss addr:0x02183f94
+@820 kind:bss addr:0x02183fa8
+_ZN15ActorShopItemBK5gTypeE kind:bss addr:0x02183fb4
+@822 kind:bss addr:0x02183fc8
+_ZN15ActorShopItemCC5gTypeE kind:bss addr:0x02183fd4
+@824 kind:bss addr:0x02183fe8
+_ZN15ActorShopItemBY5gTypeE kind:bss addr:0x02183ff4
+sShopItemModelFiles kind:bss addr:0x02184008 local
+sShopItemTextureFiles kind:bss addr:0x02184050 local
+sShopItemShipModelFile kind:bss addr:0x02184098 local
+sShopItemShip2ModelFile kind:bss addr:0x0218409c local
+sShopItemShipTextureFile kind:bss addr:0x021840a0 local
+sShopItemShip2TextureFile kind:bss addr:0x021840a4 local
+sSoldOutModel kind:bss addr:0x021840a8 local
+sShipModel kind:bss addr:0x021840ac local
+sShip2Model kind:bss addr:0x021840b0 local
 data_ov031_02184154 kind:bss addr:0x021840b4
 data_ov031_02184160 kind:bss addr:0x021840c0
 data_ov031_02184174 kind:bss addr:0x021840d4
diff --git a/config/usa/arm9/overlays/ov040/relocs.txt b/config/usa/arm9/overlays/ov040/relocs.txt
index b62510fe..42e0fd7a 100644
--- a/config/usa/arm9/overlays/ov040/relocs.txt
+++ b/config/usa/arm9/overlays/ov040/relocs.txt
@@ -697,7 +697,7 @@ from:0x02182fa0 kind:arm_call to:0x0217e0f0 module:overlay(40)
 from:0x02182fac kind:arm_call to:0x02182d88 module:overlay(40)
 from:0x02182fe4 kind:arm_call to:0x02182eec module:overlay(40)
 from:0x02183034 kind:arm_call to:0x0217df64 module:overlay(40)
-from:0x02183070 kind:load to:0x02057830 module:main
+from:0x02183070 kind:load to:0x02057828 add:0x8 module:main
 from:0x02183074 kind:load to:0x020577f8 module:main
 from:0x02183080 kind:arm_call to:0x02183120 module:overlay(40)
 from:0x02183088 kind:arm_call_thumb to:0x02030108 module:main
diff --git a/config/usa/arm9/relocs.txt b/config/usa/arm9/relocs.txt
index e9fe2eaa..eb560ea2 100644
--- a/config/usa/arm9/relocs.txt
+++ b/config/usa/arm9/relocs.txt
@@ -3851,10 +3851,10 @@ from:0x02030030 kind:overlay_id to:7
 from:0x02030034 kind:load to:0x027e0ce0 module:dtcm
 from:0x02030040 kind:thumb_call_arm to:0x0202ea08 module:main
 from:0x02030068 kind:thumb_call to:0x02030048 module:main
-from:0x02030070 kind:load to:0x02057814 module:main
+from:0x02030070 kind:load to:0x0205780c add:0x8 module:main
 from:0x02030084 kind:thumb_call to:0x02030048 module:main
 from:0x0203008a kind:thumb_call_arm to:0x0202ea08 module:main
-from:0x02030094 kind:load to:0x02057814 module:main
+from:0x02030094 kind:load to:0x0205780c add:0x8 module:main
 from:0x020300b6 kind:thumb_call to:0x0202d54c module:main
 from:0x020300c4 kind:load to:0x027e0ce0 module:dtcm
 from:0x020300d4 kind:thumb_call to:0x0202d58c module:main
diff --git a/config/usa/arm9/symbols.txt b/config/usa/arm9/symbols.txt
index 3c77a5a0..d85e0d19 100644
--- a/config/usa/arm9/symbols.txt
+++ b/config/usa/arm9/symbols.txt
@@ -2699,8 +2699,8 @@ data_020577f0 kind:data(any) addr:0x020577a8
 data_020577f8 kind:data(any) addr:0x020577b0
 data_02057808 kind:data(any) addr:0x020577c0
 data_02057840 kind:data(any) addr:0x020577f8
-data_0205785c kind:data(any) addr:0x02057814
-data_02057878 kind:data(any) addr:0x02057830
+_ZTV13FileEntryFlag kind:data(any) addr:0x0205780c
+_ZTV9FileEntry kind:data(any) addr:0x02057828
 _ZTV8BhioBase kind:data(any) addr:0x0205784c
 data_020578d4 kind:data(any) addr:0x0205788c
 data_020578d8 kind:data(any) addr:0x02057890