Merge branch 'main' into decomp/MapManager

config/eur/arm9/dtcm/symbols.txt

@@ -72,7 +72,7 @@ data_027e06d8 kind:bss addr:0x27e06d8
 data_027e06e4 kind:bss addr:0x27e06e4
 data_027e0718 kind:bss addr:0x27e0718
 data_027e071c kind:bss addr:0x27e071c
-gRandom kind:bss addr:0x27e0764
+gRandom kind:bss(size=0x18) addr:0x27e0764
 data_027e077c kind:bss addr:0x27e077c
 data_027e080c kind:bss addr:0x27e080c
 data_027e081c kind:bss addr:0x27e081c

config/eur/arm9/overlays/ov000/symbols.txt

@@ -146,7 +146,7 @@ func_ov000_0207a038 kind:function(thumb,size=0x102) addr:0x207a038
 _ZN19Actor_UnkStruct_012C1Ev kind:function(arm,size=0x4c) addr:0x207a13c
 _ZN19Actor_UnkStruct_0a4C1Eiiii kind:function(thumb,size=0x1c) addr:0x207a188
 func_ov000_0207a1a4 kind:function(arm,size=0x24) addr:0x207a1a4
-func_ov000_0207a1c8 kind:function(arm,size=0xcc) addr:0x207a1c8
+_ZN19Actor_UnkStruct_0a419func_ov000_0207a1c8EiP5Vec3p kind:function(arm,size=0xcc) addr:0x207a1c8
 func_ov000_0207a294 kind:function(thumb,size=0x44) addr:0x207a294
 func_ov000_0207a2d8 kind:function(arm,size=0x10) addr:0x207a2d8
 func_ov000_0207a2e8 kind:function(thumb,size=0x14) addr:0x207a2e8
@@ -779,7 +779,7 @@ func_ov000_0208aed8 kind:function(arm,size=0x244) addr:0x208aed8
 func_ov000_0208b11c kind:function(arm,size=0x20) addr:0x208b11c
 func_ov000_0208b13c kind:function(arm,size=0x1c) addr:0x208b13c
 func_ov000_0208b158 kind:function(arm,size=0x28) addr:0x208b158
-_Z19func_ov000_0208b180Pi kind:function(arm,size=0x28) addr:0x208b180
+_ZN18UnkStruct_027e0f6419func_ov000_0208b180Ev kind:function(arm,size=0x28) addr:0x208b180
 func_ov000_0208b1a8 kind:function(arm,size=0x28) addr:0x208b1a8
 func_ov000_0208b1d0 kind:function(arm,size=0x28) addr:0x208b1d0
 func_ov000_0208b1f8 kind:function(arm,size=0x28) addr:0x208b1f8
@@ -1893,7 +1893,7 @@ _ZN13LinkStateBase22UpdateSwordShieldInUseEv kind:function(arm,size=0x18) addr:0
 _ZN13LinkStateBase18func_ov00_020a81b8Eii kind:function(arm,size=0x24) addr:0x20a81b8
 _ZN13LinkStateBase16GetLinkItemStateEv kind:function(arm,size=0x10) addr:0x20a81dc
 _ZN13LinkStateBase6LookAtEP5Vec3p kind:function(arm,size=0x10) addr:0x20a81ec
-_ZN13LinkStateBase18func_ov00_020a81fcEv kind:function(arm,size=0x10) addr:0x20a81fc
+_ZN13LinkStateBase18func_ov00_020a81fcEP5Vec3pi kind:function(arm,size=0x10) addr:0x20a81fc
 _ZN13LinkStateBase9AddHealthEs kind:function(arm,size=0x18) addr:0x20a820c
 _ZN13LinkStateBase18func_ov00_020a8224Ei kind:function(arm,size=0x14) addr:0x20a8224
 _ZN13LinkStateBase6TurnToEsii kind:function(arm,size=0x44) addr:0x20a8238
@@ -1915,7 +1915,7 @@ _ZN13LinkStateBase18func_ov00_020a8638Ei kind:function(arm,size=0x30) addr:0x20a
 _ZN13LinkStateBase26Clear_PlayerLinkBase_Unk48Et kind:function(arm,size=0x18) addr:0x20a8668
 _ZN13LinkStateBase18func_ov00_020a8680Eisb kind:function(arm,size=0x5c) addr:0x20a8680
 _ZN13LinkStateBase33PlayerLinkBase_func_ov00_020bccc8Ev kind:function(arm,size=0x10) addr:0x20a86dc
-_ZN13LinkStateBase23PlayerLinkBase_vfunc_58Ev kind:function(arm,size=0x18) addr:0x20a86ec
+_ZN13LinkStateBase23PlayerLinkBase_vfunc_58EiP8ActorRef kind:function(arm,size=0x18) addr:0x20a86ec
 _ZN13LinkStateBase18func_ov00_020a8704EPs kind:function(arm,size=0x70) addr:0x20a8704
 _ZN13LinkStateBase18func_ov00_020a8774EP5Vec3pi kind:function(arm,size=0xd0) addr:0x20a8774
 _ZN13LinkStateBase18func_ov00_020a8844EP5Vec3pbb kind:function(arm,size=0x110) addr:0x20a8844
@@ -1923,7 +1923,7 @@ _ZN13LinkStateBase18func_ov00_020a8954EbPi kind:function(arm,size=0x40) addr:0x2
 _ZN13LinkStateBase18func_ov00_020a8994Ev kind:function(arm,size=0x28) addr:0x20a8994
 _ZN13LinkStateBase18func_ov00_020a89bcEii kind:function(arm,size=0x4c) addr:0x20a89bc
 _ZN13LinkStateBase18func_ov00_020a8a08Ei kind:function(arm,size=0x44) addr:0x20a8a08
-_ZN13LinkStateBase18func_ov00_020a8a4cEii kind:function(arm,size=0x44) addr:0x20a8a4c
+_ZN13LinkStateBase18func_ov00_020a8a4cEPKvi kind:function(arm,size=0x44) addr:0x20a8a4c
 _ZN13LinkStateBase18func_ov00_020a8a90Ei kind:function(arm,size=0x20) addr:0x20a8a90
 _ZN13LinkStateBase18func_ov00_020a8ab0Ei kind:function(arm,size=0x20) addr:0x20a8ab0
 _ZN13LinkStateBase18func_ov00_020a8ad0Ei kind:function(arm,size=0x34) addr:0x20a8ad0
@@ -2119,7 +2119,7 @@ _ZN11ItemManager17EquipCollidesWithEP8Cylinderi kind:function(arm,size=0x80) add
 _ZN11ItemManager18EquipItem_vfunc_2cEi kind:function(arm,size=0x1c) addr:0x20ad6f8
 _ZN11ItemManager12GetEquipItemEi kind:function(arm,size=0x18) addr:0x20ad714
 _ZNK11ItemManager7GetAmmoEi kind:function(arm,size=0x10) addr:0x20ad72c
-_ZN11ItemManager8GiveAmmoEit kind:function(arm,size=0x54) addr:0x20ad73c
+_ZN11ItemManager8GiveAmmoEij kind:function(arm,size=0x54) addr:0x20ad73c
 _ZN11ItemManager18func_ov00_020ad790Ei kind:function(arm,size=0x150) addr:0x20ad790
 _ZNK11ItemManager19GetEquippedShipPartEj kind:function(thumb,size=0x8) addr:0x20ad8e0
 _ZN11ItemManager13EquipShipPartEjj kind:function(thumb,size=0x8) addr:0x20ad8e8
@@ -2179,12 +2179,12 @@ _ZN13LinkStateRoll8vfunc_20Ei kind:function(arm,size=0x180) addr:0x20aec10
 _ZN13LinkStateRoll8vfunc_24Ei kind:function(arm,size=0xc8) addr:0x20aed90
 _ZN13LinkStateRoll18func_ov00_020aee58Est kind:function(arm,size=0x2c) addr:0x20aee58
 _ZN13LinkStateRoll18func_ov00_020aee84Ev kind:function(arm,size=0x28) addr:0x20aee84
-_ZN13PlayerControl18_ZN13PlayerControl18func_ov00_020aeeacEvEv kind:function(arm,size=0x4c) addr:0x20aeeac
+_ZN13PlayerControl18func_ov00_020aeeacEv kind:function(arm,size=0x4c) addr:0x20aeeac
 _ZN13PlayerControl18func_ov00_020aeef8Ev kind:function(arm,size=0x38) addr:0x20aeef8
 _ZN13PlayerControl18func_ov00_020aef30Ev kind:function(thumb,size=0x38) addr:0x20aef30
 _ZN13PlayerControl9UpdateAimEv kind:function(thumb,size=0x94) addr:0x20aef68
 _ZN13PlayerControl14GetFollowActorEv kind:function(arm,size=0x20) addr:0x20aeffc
-_ZN13PlayerControl18func_ov00_020af01cEPc kind:function(arm,size=0x28) addr:0x20af01c
+_ZN13PlayerControl18func_ov00_020af01cEP5Vec2b kind:function(arm,size=0x28) addr:0x20af01c
 _ZN13PlayerControl9SetUnk_80Ev kind:function(arm,size=0xc) addr:0x20af044
 _ZN13PlayerControl13StopFollowingEv kind:function(arm,size=0x1c) addr:0x20af050
 _ZN13PlayerControl18func_ov00_020af06cEv kind:function(arm,size=0x22c) addr:0x20af06c
@@ -2195,24 +2195,24 @@ _ZN13PlayerControl17CheckUntouchedNowEj kind:function(arm,size=0x30) addr:0x20af
 _ZN13PlayerControl13CheckTouchingEj kind:function(arm,size=0x28) addr:0x20af42c
 _ZN13PlayerControl14CheckTouchFastEj kind:function(arm,size=0x50) addr:0x20af454
 _ZN13PlayerControl18func_ov00_020af4a4Ev kind:function(arm,size=0x94) addr:0x20af4a4
-_ZN13PlayerControl18func_ov00_020af538Ev kind:function(arm,size=0x1ac) addr:0x20af538
+_ZN13PlayerControl18func_ov00_020af538Ebh kind:function(arm,size=0x1ac) addr:0x20af538
 _ZN13PlayerControl18func_ov00_020af6e4EP5Vec3pii kind:function(arm,size=0x94) addr:0x20af6e4
 _ZN13PlayerControl18func_ov00_020af778Ev kind:function(arm,size=0x360) addr:0x20af778
 _ZN13PlayerControl18func_ov00_020afad8EP5Vec3p kind:function(arm,size=0x94) addr:0x20afad8
 _ZN13PlayerControl18func_ov00_020afb6cEv kind:function(arm,size=0x31c) addr:0x20afb6c
 _ZN13PlayerControl18func_ov00_020afe88Eib kind:function(arm,size=0x64) addr:0x20afe88
 _ZN13PlayerControl18func_ov00_020afeecEib kind:function(arm,size=0xa4) addr:0x20afeec
-_ZN13PlayerControl18func_ov00_020aff90Eii kind:function(arm,size=0x5c) addr:0x20aff90
+_ZN13PlayerControl18func_ov00_020aff90EP5Vec3pi kind:function(arm,size=0x5c) addr:0x20aff90
 _ZN13PlayerControl18func_ov00_020affecEP5Vec3piiS1_ kind:function(arm,size=0x160) addr:0x20affec
-_ZN13PlayerControl18func_ov00_020b014cEv kind:function(arm,size=0xd0) addr:0x20b014c
-_ZN13PlayerControl6SetAimEv kind:function(arm,size=0x24) addr:0x20b021c
+_ZN13PlayerControl18func_ov00_020b014cEP5Vec3p kind:function(arm,size=0xd0) addr:0x20b014c
+_ZN13PlayerControl8ResetAimEv kind:function(arm,size=0x24) addr:0x20b021c
 _ZN13PlayerControl14UpdateAimWorldEP5Vec3p kind:function(arm,size=0xe8) addr:0x20b0240
 _ZN13PlayerControl13GetTouchAngleEv kind:function(arm,size=0x24) addr:0x20b0328
 _ZN13PlayerControl18func_ov00_020b034cEv kind:function(arm,size=0xcc) addr:0x20b034c
 _ZN13PlayerControl18func_ov00_020b0418Ev kind:function(arm,size=0x84) addr:0x20b0418
 _ZN13PlayerControl18func_ov00_020b049cEP5Vec3pb kind:function(arm,size=0x14c) addr:0x20b049c
 _ZN13PlayerControl18func_ov00_020b05e8EP5Vec3p kind:function(arm,size=0x190) addr:0x20b05e8
-_ZN13PlayerControl18func_ov00_020b0778EP5Vec3pji kind:function(arm,size=0x33c) addr:0x20b0778
+_ZN13PlayerControl18func_ov00_020b0778EP5Vec3pjPi kind:function(arm,size=0x33c) addr:0x20b0778
 _ZN13PlayerControl16CheckNotTouchingEv kind:function(arm,size=0x1c) addr:0x20b0ab4
 _ZN13PlayerControl18func_ov00_020b0ad0EP5Actor kind:function(arm,size=0x3c) addr:0x20b0ad0
 _ZN13PlayerControl18func_ov00_020b0b0cEPsPiS1_Pb kind:function(arm,size=0x2dc) addr:0x20b0b0c
@@ -2640,7 +2640,7 @@ _ZN9EquipItem8vfunc_2cEv kind:function(arm,size=0x8) addr:0x20be964
 _ZN9EquipItem8vfunc_34EPs kind:function(arm,size=0x4) addr:0x20be96c
 _ZNK9EquipItem8vfunc_40Ev kind:function(arm,size=0x8) addr:0x20be970
 _ZNK9EquipItem8vfunc_44Ei kind:function(arm,size=0x8) addr:0x20be978
-_ZNK9EquipItem8vfunc_48Ei kind:function(arm,size=0x8) addr:0x20be980
+_ZNK9EquipItem8vfunc_48Eii kind:function(arm,size=0x8) addr:0x20be980
 _ZNK9EquipItem8vfunc_4cEv kind:function(arm,size=0x8) addr:0x20be988
 _ZN9EquipItem12GetPlayerPosEv kind:function(arm,size=0xc) addr:0x20be990
 _ZN9EquipItem19func_ov000_020be99cEP5Vec3p kind:function(arm,size=0x48) addr:0x20be99c
@@ -3222,12 +3222,12 @@ func_ov000_020cea3c kind:function(arm,size=0x44) addr:0x20cea3c
 func_ov000_020cea80 kind:function(arm,size=0x4c) addr:0x20cea80
 func_ov000_020ceacc kind:function(arm,size=0x58) addr:0x20ceacc
 func_ov000_020ceb24 kind:function(arm,size=0xa8) addr:0x20ceb24
-func_ov000_020cebcc kind:function(arm,size=0x3c) addr:0x20cebcc
+_ZN18UnkStruct_027e0ffc19func_ov000_020cebccEjsi kind:function(arm,size=0x3c) addr:0x20cebcc
 func_ov000_020cec08 kind:function(arm,size=0x58) addr:0x20cec08
 func_ov000_020cec60 kind:function(arm,size=0x78) addr:0x20cec60
 func_ov000_020cecd8 kind:function(arm,size=0x8c) addr:0x20cecd8
-func_ov000_020ced64 kind:function(arm,size=0x18) addr:0x20ced64
-func_ov000_020ced7c kind:function(arm,size=0x40) addr:0x20ced7c
+_ZN18UnkStruct_027e0ffc19func_ov000_020ced64EP8Cylinderjj kind:function(arm,size=0x18) addr:0x20ced64
+_ZN18UnkStruct_027e0ffc19func_ov000_020ced7cEP5Vec3piii kind:function(arm,size=0x40) addr:0x20ced7c
 func_ov000_020cedbc kind:function(arm,size=0x54) addr:0x20cedbc
 func_ov000_020cee10 kind:function(arm,size=0x48) addr:0x20cee10
 func_ov000_020cee58 kind:function(arm,size=0x88) addr:0x20cee58
@@ -4723,7 +4723,7 @@ data_ov000_020e5674 kind:data(any) addr:0x20e5674
 data_ov000_020e5684 kind:data(any) addr:0x20e5684
 data_ov000_020e5694 kind:data(any) addr:0x20e5694
 _ZTV13LinkStateBase kind:data(any) addr:0x20e56ac
-data_ov000_020e56f0 kind:data(any) addr:0x20e56f0
+_ZN13LinkStateMove19data_ov000_020e56f0E kind:data(any) addr:0x20e56f0
 data_ov000_020e56f4$964 kind:data(any) addr:0x20e56f4 local
 _ZTV13LinkStateMove kind:data(any) addr:0x20e56f8
 @922 kind:data(any) addr:0x20e5744 local
@@ -4896,16 +4896,17 @@ data_ov000_020e6088 kind:data(any) addr:0x20e6088
 data_ov000_020e6098 kind:data(any) addr:0x20e6098
 data_ov000_020e60a8 kind:data(any) addr:0x20e60a8
 _ZTV13LinkStateRoll kind:data(any) addr:0x20e60c0
-data_ov000_020e6104 kind:data(any) addr:0x20e6104
-data_ov000_020e6108 kind:data(any) addr:0x20e6108
-data_ov000_020e610c kind:data(any) addr:0x20e610c
-data_ov000_020e6110 kind:data(any) addr:0x20e6110
-data_ov000_020e6114 kind:data(any) addr:0x20e6114
-data_ov000_020e6118 kind:data(any) addr:0x20e6118
-data_ov000_020e611c kind:data(any) addr:0x20e611c
-data_ov000_020e6120 kind:data(any) addr:0x20e6120
-data_ov000_020e6124 kind:data(any) addr:0x20e6124
-data_ov000_020e6148 kind:data(any) addr:0x20e6148
+@1505 kind:data(any) addr:0x20e6104
+@1504 kind:data(any) addr:0x20e6108
+@1503 kind:data(any) addr:0x20e610c
+@1502 kind:data(any) addr:0x20e6110
+@1501 kind:data(any) addr:0x20e6114
+@1500 kind:data(any) addr:0x20e6118
+@1499 kind:data(any) addr:0x20e611c
+@1498 kind:data(any) addr:0x20e6120
+sShipTypes kind:data(any) addr:0x20e6124 local
+data_ov000_020e6144 kind:data(any) addr:0x20e6144
+@1556 kind:data(any) addr:0x20e6148
 data_ov000_020e6158 kind:data(any) addr:0x20e6158
 data_ov000_020e6174 kind:data(any) addr:0x20e6174
 data_ov000_020e6178 kind:data(any) addr:0x20e6178
@@ -5876,6 +5877,7 @@ data_ov000_020ee16c kind:bss addr:0x20ee16c
 data_ov000_020ee178 kind:bss addr:0x20ee178
 data_ov000_020ee184 kind:bss addr:0x20ee184
 data_ov000_020ee198 kind:bss addr:0x20ee198
+data_ov000_020ee19c kind:bss addr:0x20ee19c
 @418 kind:bss addr:0x20ee1a0 local
 _ZN9ActorNavi5gTypeE kind:bss addr:0x20ee1ac
 @419 kind:bss addr:0x20ee1c0 local

config/eur/arm9/overlays/ov004/delinks.txt

@@ -5,3 +5,6 @@
     .data       start:0x0210fda0 end:0x021113e0 kind:data align:32
     .bss        start:0x021113e0 end:0x021113e0 kind:bss align:32
 
+src/04_Load/Player/LinkStateMove.cpp:
+    complete
+    .text       start:0x0210aed4 end:0x0210af14

config/eur/arm9/overlays/ov005/delinks.txt

@@ -5,3 +5,8 @@
     .data       start:0x02112480 end:0x02112c20 kind:data align:32
     .bss        start:0x02112c20 end:0x02112c20 kind:bss align:32
 
+src/05/Player/LinkStateMove.cpp:
+    complete
+    .text       start:0x021113d0 end:0x02111bc0
+    .rodata     start:0x021123ac end:0x021123bc
+    .data       start:0x02112be4 end:0x02112c20

config/eur/arm9/overlays/ov005/relocs.txt

@@ -2426,7 +2426,7 @@ from:0x02111a64 kind:load to:0x027e0618 module:dtcm
 from:0x02111a68 kind:load to:0x027e0fb8 module:dtcm
 from:0x02111a6c kind:load to:0x02112be4 module:overlay(5)
 from:0x02111a70 kind:load to:0x020e56f0 module:overlay(0)
-from:0x02111a78 kind:load to:0x02112c04 module:overlay(5)
+from:0x02111a78 kind:load to:0x02112bfc add:8 module:overlay(5)
 from:0x02111a7c kind:load to:0x027e0fe4 module:dtcm
 from:0x02111a88 kind:load to:0x027e0ffc module:dtcm
 from:0x02111a90 kind:load to:0x021123ac module:overlay(5)

config/eur/arm9/overlays/ov005/symbols.txt

@@ -308,7 +308,7 @@ _ZN13LinkStateBase19func_ov005_021113c4Eb kind:function(arm,size=0xc) addr:0x211
 _ZN13LinkStateMove19func_ov005_021113d0Ev kind:function(arm,size=0xc) addr:0x21113d0
 _ZN13LinkStateMove8vfunc_1cEv kind:function(arm,size=0x6bc) addr:0x21113dc
 _ZN13LinkStateMove8vfunc_3cEv kind:function(arm,size=0x60) addr:0x2111a98
-func_ov005_02111af8 kind:function(arm,size=0xc8) addr:0x2111af8
+_ZN14UnkFilterActor6FilterEP5Actor kind:function(arm,size=0xc8) addr:0x2111af8
 _ZN7MapBase8vfunc_1cEb kind:function(arm,size=0x40) addr:0x2111bc0
 _ZN7MapBase8vfunc_20Ei kind:function(arm,size=0x6c) addr:0x2111c00
 _ZN7MapBase8vfunc_24Ev kind:function(arm,size=0x4) addr:0x2111c6c
@@ -329,7 +329,8 @@ data_ov005_02112308 kind:data(any) addr:0x2112308
 data_ov005_02112324 kind:data(any) addr:0x2112324
 data_ov005_02112360 kind:data(any) addr:0x2112360
 data_ov005_021123a0 kind:data(any) addr:0x21123a0
-data_ov005_021123ac kind:data(any) addr:0x21123ac
+data_ov005_021123ac kind:data(any) addr:0x21123ac local
+data_ov005_021123b8 kind:data(any) addr:0x21123b8 local
 __sinit_ov005_021123bc kind:function(arm,size=0x24) addr:0x21123bc
 __sinit_ov005_021123e0 kind:function(arm,size=0x1c) addr:0x21123e0
 __sinit_ov005_021123fc kind:function(arm,size=0x24) addr:0x21123fc
@@ -452,5 +453,8 @@ data_ov005_02112ba4 kind:data(any) addr:0x2112ba4
 data_ov005_02112bb4 kind:data(any) addr:0x2112bb4
 data_ov005_02112bc4 kind:data(any) addr:0x2112bc4
 data_ov005_02112bd4 kind:data(any) addr:0x2112bd4
-data_ov005_02112be4 kind:data(any) addr:0x2112be4
-data_ov005_02112c04 kind:data(any) addr:0x2112c04
+data_ov005_02112be4 kind:data(any) addr:0x2112be4 local
+data_ov005_02112be8 kind:data(any) addr:0x2112be8 local
+data_ov005_02112bec kind:data(any) addr:0x2112bec local
+data_ov005_02112bf0 kind:data(any) addr:0x2112bf0 local
+_ZTV14UnkFilterActor kind:data(any) addr:0x2112bfc

config/eur/arm9/overlays/ov014/delinks.txt

@@ -12,3 +12,11 @@ src/14_Land/Actor/ActorRupee.cpp:
     .ctor       start:0x0215591c end:0x02155920
     .data       start:0x02158994 end:0x02158a94
     .bss        start:0x0215b1f4 end:0x0215b214
+
+src/14_Land/Actor/Player/ActorRefill.cpp:
+    complete
+    .text       start:0x02134e24 end:0x02135940
+    .init       start:0x02154c14 end:0x02154d24
+    .ctor       start:0x021558ec end:0x021558f0
+    .data       start:0x021578b0 end:0x02157d70
+    .bss        start:0x0215af94 end:0x0215b034

config/eur/arm9/overlays/ov014/relocs.txt

@@ -2474,7 +2474,7 @@ from:0x02134efc kind:arm_call to:0x0202e9dc module:main
 from:0x02134f08 kind:arm_call to:0x021357bc module:overlay(14)
 from:0x02134f10 kind:load to:0x027e0fe0 module:dtcm
 from:0x02134f20 kind:arm_call to:0x020c1554 module:overlay(0)
-from:0x02134f50 kind:load to:0x02157cb8 module:overlay(14)
+from:0x02134f50 kind:load to:0x02157cb0 add:8 module:overlay(14)
 from:0x02134f5c kind:arm_call to:0x020c1730 module:overlay(0)
 from:0x02134f70 kind:arm_call to:0x020c1730 module:overlay(0)
 from:0x02134f78 kind:arm_call to:0x0202ea0c module:main
@@ -2527,29 +2527,29 @@ from:0x021354b4 kind:arm_call to:0x0207c1b0 module:overlay(0)
 from:0x021354d8 kind:arm_call to:0x0207c1b0 module:overlay(0)
 from:0x021354ec kind:load to:0x027e0e58 module:dtcm
 from:0x02135504 kind:arm_call to:0x02134f14 module:overlay(14)
-from:0x02135528 kind:load to:0x02157bf8 module:overlay(14)
+from:0x02135528 kind:load to:0x02157bf0 add:8 module:overlay(14)
 from:0x02135534 kind:arm_call to:0x02134f84 module:overlay(14)
 from:0x02135548 kind:arm_call to:0x02134f84 module:overlay(14)
 from:0x02135550 kind:arm_call to:0x0202ea0c module:main
 from:0x02135570 kind:arm_call to:0x02134f14 module:overlay(14)
-from:0x02135594 kind:load to:0x02157b38 module:overlay(14)
+from:0x02135594 kind:load to:0x02157b30 add:8 module:overlay(14)
 from:0x021355a0 kind:arm_call to:0x02134f84 module:overlay(14)
 from:0x021355b4 kind:arm_call to:0x02134f84 module:overlay(14)
 from:0x021355bc kind:arm_call to:0x0202ea0c module:main
 from:0x021355dc kind:arm_call to:0x02134f14 module:overlay(14)
-from:0x02135600 kind:load to:0x02157a78 module:overlay(14)
+from:0x02135600 kind:load to:0x02157a70 add:8 module:overlay(14)
 from:0x0213560c kind:arm_call to:0x02134f84 module:overlay(14)
 from:0x02135620 kind:arm_call to:0x02134f84 module:overlay(14)
 from:0x02135628 kind:arm_call to:0x0202ea0c module:main
 from:0x02135648 kind:arm_call to:0x02134f14 module:overlay(14)
-from:0x0213566c kind:load to:0x021579b8 module:overlay(14)
+from:0x0213566c kind:load to:0x021579b0 add:8 module:overlay(14)
 from:0x02135678 kind:arm_call to:0x02134f84 module:overlay(14)
 from:0x0213568c kind:arm_call to:0x02134f84 module:overlay(14)
 from:0x02135694 kind:arm_call to:0x0202ea0c module:main
 from:0x021356a8 kind:arm_call to:0x02134f98 module:overlay(14)
 from:0x021357b0 kind:load to:0x027e0764 module:dtcm
 from:0x021357c8 kind:arm_call to:0x02134f14 module:overlay(14)
-from:0x021357ec kind:load to:0x021578f8 module:overlay(14)
+from:0x021357ec kind:load to:0x021578f0 add:8 module:overlay(14)
 from:0x021357f8 kind:arm_call to:0x02134f84 module:overlay(14)
 from:0x0213580c kind:arm_call to:0x02134f84 module:overlay(14)
 from:0x02135814 kind:arm_call to:0x0202ea0c module:main

config/eur/arm9/overlays/ov014/symbols.txt

@@ -8,7 +8,7 @@ func_ov014_0211f980 kind:function(arm,size=0x130) addr:0x211f980
 func_ov014_0211fab0 kind:function(arm,size=0x1dc) addr:0x211fab0
 func_ov014_0211fc8c kind:function(arm,size=0x50) addr:0x211fc8c
 func_ov014_0211fcdc kind:function(thumb,size=0x28) addr:0x211fcdc
-_Z19func_ov014_0211fd04Pi kind:function(thumb,size=0x4c) addr:0x211fd04
+_ZN18UnkStruct_027e109819func_ov014_0211fd04Ev kind:function(thumb,size=0x4c) addr:0x211fd04
 _ZN10ActorArrow6CreateEv kind:function(arm,size=0x30) addr:0x211fd50
 _ZN10ActorArrow19func_ov014_0211fd80Ei kind:function(arm,size=0x10) addr:0x211fd80
 _ZN10ActorArrow19func_ov014_0211fd90Ev kind:function(arm,size=0x14) addr:0x211fd90
@@ -586,42 +586,42 @@ func_ov014_02134c04 kind:function(arm,size=0x8) addr:0x2134c04
 func_ov014_02134c0c kind:function(arm,size=0x8) addr:0x2134c0c
 func_ov014_02134c14 kind:function(arm,size=0x200) addr:0x2134c14
 func_ov014_02134e14 kind:function(arm,size=0x10) addr:0x2134e14
-func_ov014_02134e24 kind:function(arm,size=0x30) addr:0x2134e24
-func_ov014_02134e54 kind:function(arm,size=0x30) addr:0x2134e54
-func_ov014_02134e84 kind:function(arm,size=0x30) addr:0x2134e84
-func_ov014_02134eb4 kind:function(arm,size=0x30) addr:0x2134eb4
-func_ov014_02134ee4 kind:function(arm,size=0x30) addr:0x2134ee4
-func_ov014_02134f14 kind:function(arm,size=0x40) addr:0x2134f14
-func_ov014_02134f54 kind:function(arm,size=0x14) addr:0x2134f54
-func_ov014_02134f68 kind:function(arm,size=0x1c) addr:0x2134f68
-func_ov014_02134f84 kind:function(arm,size=0x14) addr:0x2134f84
-func_ov014_02134f98 kind:function(arm,size=0xf4) addr:0x2134f98
-func_ov014_0213508c kind:function(arm,size=0x2d8) addr:0x213508c
-func_ov014_02135364 kind:function(arm,size=0x54) addr:0x2135364
-func_ov014_021353b8 kind:function(arm,size=0xbc) addr:0x21353b8
-func_ov014_02135474 kind:function(arm,size=0x84) addr:0x2135474
-func_ov014_021354f8 kind:function(arm,size=0x34) addr:0x21354f8
-func_ov014_0213552c kind:function(arm,size=0x14) addr:0x213552c
-func_ov014_02135540 kind:function(arm,size=0x1c) addr:0x2135540
-func_ov014_0213555c kind:function(arm,size=0x8) addr:0x213555c
-func_ov014_02135564 kind:function(arm,size=0x34) addr:0x2135564
-func_ov014_02135598 kind:function(arm,size=0x14) addr:0x2135598
-func_ov014_021355ac kind:function(arm,size=0x1c) addr:0x21355ac
-func_ov014_021355c8 kind:function(arm,size=0x8) addr:0x21355c8
-func_ov014_021355d0 kind:function(arm,size=0x34) addr:0x21355d0
-func_ov014_02135604 kind:function(arm,size=0x14) addr:0x2135604
-func_ov014_02135618 kind:function(arm,size=0x1c) addr:0x2135618
-func_ov014_02135634 kind:function(arm,size=0x8) addr:0x2135634
-func_ov014_0213563c kind:function(arm,size=0x34) addr:0x213563c
-func_ov014_02135670 kind:function(arm,size=0x14) addr:0x2135670
-func_ov014_02135684 kind:function(arm,size=0x1c) addr:0x2135684
-func_ov014_021356a0 kind:function(arm,size=0x114) addr:0x21356a0
-func_ov014_021357b4 kind:function(arm,size=0x8) addr:0x21357b4
-func_ov014_021357bc kind:function(arm,size=0x34) addr:0x21357bc
-func_ov014_021357f0 kind:function(arm,size=0x14) addr:0x21357f0
-func_ov014_02135804 kind:function(arm,size=0x1c) addr:0x2135804
-func_ov014_02135820 kind:function(arm,size=0x118) addr:0x2135820
-func_ov014_02135938 kind:function(arm,size=0x8) addr:0x2135938
+_ZN16ActorRefillBombs6CreateEv kind:function(arm,size=0x30) addr:0x2134e24
+_ZN19ActorRefillBombchus6CreateEv kind:function(arm,size=0x30) addr:0x2134e54
+_ZN17ActorRefillArrows6CreateEv kind:function(arm,size=0x30) addr:0x2134e84
+_ZN15ActorRefillTime6CreateEv kind:function(arm,size=0x30) addr:0x2134eb4
+_ZN9ActorLSTM6CreateEv kind:function(arm,size=0x30) addr:0x2134ee4
+_ZN11ActorRefillC2Ei kind:function(arm,size=0x40) addr:0x2134f14
+_ZN11ActorRefillD1Ev kind:function(arm,size=0x14) addr:0x2134f54
+_ZN11ActorRefillD0Ev kind:function(arm,size=0x1c) addr:0x2134f68
+_ZN11ActorRefillD2Ev kind:function(arm,size=0x14) addr:0x2134f84
+_ZN11ActorRefill8vfunc_08Ev kind:function(arm,size=0xf4) addr:0x2134f98
+_ZN11ActorRefill8vfunc_14Ej kind:function(arm,size=0x2d8) addr:0x213508c
+_ZN11ActorRefill19func_ov014_02135364Ei kind:function(arm,size=0x54) addr:0x2135364
+_ZN11ActorRefill8vfunc_20Eb kind:function(arm,size=0xbc) addr:0x21353b8
+_ZN11ActorRefill19func_ov014_02135474Ev kind:function(arm,size=0x84) addr:0x2135474
+_ZN16ActorRefillBombsC1Ev kind:function(arm,size=0x34) addr:0x21354f8
+_ZN16ActorRefillBombsD1Ev kind:function(arm,size=0x14) addr:0x213552c
+_ZN16ActorRefillBombsD0Ev kind:function(arm,size=0x1c) addr:0x2135540
+_ZN16ActorRefillBombs8vfunc_b4Ev kind:function(arm,size=0x8) addr:0x213555c
+_ZN19ActorRefillBombchusC1Ev kind:function(arm,size=0x34) addr:0x2135564
+_ZN19ActorRefillBombchusD1Ev kind:function(arm,size=0x14) addr:0x2135598
+_ZN19ActorRefillBombchusD0Ev kind:function(arm,size=0x1c) addr:0x21355ac
+_ZN19ActorRefillBombchus8vfunc_b4Ev kind:function(arm,size=0x8) addr:0x21355c8
+_ZN17ActorRefillArrowsC1Ev kind:function(arm,size=0x34) addr:0x21355d0
+_ZN17ActorRefillArrowsD1Ev kind:function(arm,size=0x14) addr:0x2135604
+_ZN17ActorRefillArrowsD0Ev kind:function(arm,size=0x1c) addr:0x2135618
+_ZN17ActorRefillArrows8vfunc_b4Ev kind:function(arm,size=0x8) addr:0x2135634
+_ZN15ActorRefillTimeC1Ev kind:function(arm,size=0x34) addr:0x213563c
+_ZN15ActorRefillTimeD1Ev kind:function(arm,size=0x14) addr:0x2135670
+_ZN15ActorRefillTimeD0Ev kind:function(arm,size=0x1c) addr:0x2135684
+_ZN15ActorRefillTime8vfunc_08Ev kind:function(arm,size=0x114) addr:0x21356a0
+_ZN15ActorRefillTime8vfunc_b4Ev kind:function(arm,size=0x8) addr:0x21357b4
+_ZN9ActorLSTMC1Ev kind:function(arm,size=0x34) addr:0x21357bc
+_ZN9ActorLSTMD1Ev kind:function(arm,size=0x14) addr:0x21357f0
+_ZN9ActorLSTMD0Ev kind:function(arm,size=0x1c) addr:0x2135804
+_ZN9ActorLSTM8vfunc_08Ev kind:function(arm,size=0x118) addr:0x2135820
+_ZN9ActorLSTM8vfunc_b4Ev kind:function(arm,size=0x8) addr:0x2135938
 func_ov014_02135940 kind:function(arm,size=0x34) addr:0x2135940
 func_ov014_02135974 kind:function(arm,size=0xc4) addr:0x2135974
 func_ov014_02135a38 kind:function(arm,size=0xc4) addr:0x2135a38
@@ -846,7 +846,7 @@ func_ov014_0213ccd8 kind:function(arm,size=0xe8) addr:0x213ccd8
 func_ov014_0213cdc0 kind:function(arm,size=0x3c) addr:0x213cdc0
 func_ov014_0213cdfc kind:function(arm,size=0x5c) addr:0x213cdfc
 func_ov014_0213ce58 kind:function(arm,size=0x18) addr:0x213ce58
-func_ov014_0213ce70 kind:function(arm,size=0xbc) addr:0x213ce70
+_ZN24UnkStruct_ov015_0213ce4c11GetInstanceEv kind:function(arm,size=0xbc) addr:0x213ce70 local
 func_ov014_0213cf2c kind:function(arm,size=0x5c) addr:0x213cf2c
 _ZN10EquipScoopC2Ev kind:function(thumb,size=0x14) addr:0x213cf88
 _ZN10EquipScoopD1Ev kind:function(thumb,size=0xc) addr:0x213cf9c
@@ -1672,7 +1672,7 @@ __sinit_ov014_02154b34 kind:function(arm,size=0x38) addr:0x2154b34
 __sinit_ov014_02154b6c kind:function(arm,size=0x38) addr:0x2154b6c
 __sinit_ov014_02154ba4 kind:function(arm,size=0x38) addr:0x2154ba4
 __sinit_ov014_02154bdc kind:function(arm,size=0x38) addr:0x2154bdc
-__sinit_ov014_02154c14 kind:function(arm,size=0x110) addr:0x2154c14
+__sinit_ActorRefill.cpp kind:function(arm,size=0x110) addr:0x2154c14 local
 __sinit_ov014_02154d24 kind:function(arm,size=0x1d8) addr:0x2154d24
 __sinit_ov014_02154efc kind:function(arm,size=0x40) addr:0x2154efc
 __sinit_ov014_02154f3c kind:function(arm,size=0x40) addr:0x2154f3c
@@ -1846,20 +1846,21 @@ data_ov014_02157768 kind:data(any) addr:0x2157768
 data_ov014_0215777c kind:data(any) addr:0x215777c
 data_ov014_02157790 kind:data(any) addr:0x2157790
 data_ov014_02157824 kind:data(any) addr:0x2157824
-data_ov014_021578b0 kind:data(any) addr:0x21578b0
-data_ov014_021578b4 kind:data(any) addr:0x21578b4
-data_ov014_021578b8 kind:data(any) addr:0x21578b8
-data_ov014_021578bc kind:data(any) addr:0x21578bc
-data_ov014_021578c0 kind:data(any) addr:0x21578c0
-data_ov014_021578c4 kind:data(any) addr:0x21578c4
-data_ov014_021578c8 kind:data(any) addr:0x21578c8
-data_ov014_021578cc kind:data(any) addr:0x21578cc
-data_ov014_021578f8 kind:data(any) addr:0x21578f8
-data_ov014_021579b8 kind:data(any) addr:0x21579b8
-data_ov014_02157a78 kind:data(any) addr:0x2157a78
-data_ov014_02157b38 kind:data(any) addr:0x2157b38
-data_ov014_02157bf8 kind:data(any) addr:0x2157bf8
-data_ov014_02157cb8 kind:data(any) addr:0x2157cb8
+@570 kind:data(any) addr:0x21578b0 local
+@569 kind:data(any) addr:0x21578b4 local
+@568 kind:data(any) addr:0x21578b8 local
+@567 kind:data(any) addr:0x21578bc local
+@566 kind:data(any) addr:0x21578c0 local
+@565 kind:data(any) addr:0x21578c4 local
+@564 kind:data(any) addr:0x21578c8 local
+@563 kind:data(any) addr:0x21578cc local
+sShipTypes kind:data(any) addr:0x21578d0 local
+_ZTV9ActorLSTM kind:data(any) addr:0x21578f0
+_ZTV15ActorRefillTime kind:data(any) addr:0x21579b0
+_ZTV17ActorRefillArrows kind:data(any) addr:0x2157a70
+_ZTV19ActorRefillBombchus kind:data(any) addr:0x2157b30
+_ZTV16ActorRefillBombs kind:data(any) addr:0x2157bf0
+_ZTV11ActorRefill kind:data(any) addr:0x2157cb0
 data_ov014_02157d70 kind:data(any) addr:0x2157d70
 data_ov014_02157d7c kind:data(any) addr:0x2157d7c
 data_ov014_02157d88 kind:data(any) addr:0x2157d88
@@ -2195,16 +2196,16 @@ data_ov014_0215af6c kind:bss addr:0x215af6c
 data_ov014_0215af74 kind:bss addr:0x215af74
 data_ov014_0215af80 kind:bss addr:0x215af80
 data_ov014_0215af88 kind:bss addr:0x215af88
-data_ov014_0215af94 kind:bss addr:0x215af94
-data_ov014_0215afa0 kind:bss addr:0x215afa0
-data_ov014_0215afb4 kind:bss addr:0x215afb4
-data_ov014_0215afc0 kind:bss addr:0x215afc0
-data_ov014_0215afd4 kind:bss addr:0x215afd4
-data_ov014_0215afe0 kind:bss addr:0x215afe0
-data_ov014_0215aff4 kind:bss addr:0x215aff4
-data_ov014_0215b000 kind:bss addr:0x215b000
-data_ov014_0215b014 kind:bss addr:0x215b014
-data_ov014_0215b020 kind:bss addr:0x215b020
+@363 kind:bss addr:0x215af94 local
+_ZN16ActorRefillBombs5gTypeE kind:bss addr:0x215afa0
+@361 kind:bss addr:0x215afb4 local
+_ZN19ActorRefillBombchus5gTypeE kind:bss addr:0x215afc0
+@364 kind:bss addr:0x215afd4 local
+_ZN17ActorRefillArrows5gTypeE kind:bss addr:0x215afe0
+@360 kind:bss addr:0x215aff4 local
+_ZN15ActorRefillTime5gTypeE kind:bss addr:0x215b000
+@362 kind:bss addr:0x215b014 local
+_ZN9ActorLSTM5gTypeE kind:bss addr:0x215b020
 data_ov014_0215b034 kind:bss addr:0x215b034
 data_ov014_0215b040 kind:bss addr:0x215b040
 data_ov014_0215b054 kind:bss addr:0x215b054

config/eur/arm9/overlays/ov015/symbols.txt

@@ -613,7 +613,7 @@ func_ov015_0213cc98 kind:function(arm,size=0x14) addr:0x213cc98
 func_ov015_0213ccac kind:function(arm,size=0x38) addr:0x213ccac
 func_ov015_0213cce4 kind:function(arm,size=0x78) addr:0x213cce4
 func_ov015_0213cd5c kind:function(arm,size=0xf0) addr:0x213cd5c
-func_ov015_0213ce4c kind:function(arm,size=0x10) addr:0x213ce4c
+_ZN24UnkStruct_ov015_0213ce4c11GetInstanceEv kind:function(arm,size=0x10) addr:0x213ce4c
 func_ov015_0213ce5c kind:function(arm,size=0xb4) addr:0x213ce5c
 func_ov015_0213cf10 kind:function(arm,size=0x20) addr:0x213cf10
 func_ov015_0213cf30 kind:function(arm,size=0x48) addr:0x213cf30
@@ -640,8 +640,8 @@ func_ov015_0213d87c kind:function(arm,size=0x28c) addr:0x213d87c
 func_ov015_0213db08 kind:function(arm,size=0xb0) addr:0x213db08
 func_ov015_0213dbb8 kind:function(arm,size=0xb0) addr:0x213dbb8
 func_ov015_0213dc68 kind:function(arm,size=0x48) addr:0x213dc68
-func_ov015_0213dcb0 kind:function(arm,size=0x8) addr:0x213dcb0
-func_ov015_0213dcb8 kind:function(arm,size=0x8) addr:0x213dcb8
+_ZN24UnkStruct_ov015_0213ce4c8GetUnk3fEv kind:function(arm,size=0x8) addr:0x213dcb0
+_ZN24UnkStruct_ov015_0213ce4c8GetUnk40Ev kind:function(arm,size=0x8) addr:0x213dcb8
 func_ov015_0213dcc0 kind:function(arm,size=0x4) addr:0x213dcc0
 func_ov015_0213dcc4 kind:function(arm,size=0x8c) addr:0x213dcc4
 func_ov015_0213dd50 kind:function(arm,size=0x24) addr:0x213dd50

config/eur/arm9/overlays/ov024/symbols.txt

@@ -286,7 +286,7 @@ func_ov024_02178204 kind:function(arm,size=0x30) addr:0x2178204
 func_ov024_02178234 kind:function(arm,size=0xec) addr:0x2178234
 func_ov024_02178320 kind:function(arm,size=0x20) addr:0x2178320
 func_ov024_02178340 kind:function(arm,size=0x8) addr:0x2178340
-func_ov024_02178348 kind:function(arm,size=0x358) addr:0x2178348
+_ZN13PlayerControl19func_ov024_02178348EP5Vec3p kind:function(arm,size=0x358) addr:0x2178348
 func_ov024_021786a0 kind:function(arm,size=0x10) addr:0x21786a0
 func_ov024_021786b0 kind:function(arm,size=0x30) addr:0x21786b0
 func_ov024_021786e0 kind:function(arm,size=0x20) addr:0x21786e0

config/eur/arm9/symbols.txt

@@ -56,7 +56,7 @@ func_020029fc kind:function(arm,size=0x1b0) addr:0x20029fc
 func_02002bac kind:function(arm,size=0xc) addr:0x2002bac
 func_02002bb8 kind:function(arm,size=0x3c) addr:0x2002bb8
 func_02002bf4 kind:function(arm,size=0x20) addr:0x2002bf4
-SoftDivideMod kind:function(arm,size=0x20c) addr:0x2002c14
+_s32_div_f kind:function(arm,size=0x20c) addr:0x2002c14
 SoftDivide kind:function(arm,size=0x1e4) addr:0x2002e20
 .L_02002e28 kind:label(arm) addr:0x2002e28
 func_0200301c kind:function(arm,size=0x544) addr:0x200301c
@@ -1331,7 +1331,7 @@ func_0202b2e8 kind:function(arm,size=0x10) addr:0x202b2e8
 func_0202b2f8 kind:function(arm,size=0x10) addr:0x202b2f8
 Vec3p_Lerp kind:function(arm,size=0xb4) addr:0x202b308
 func_0202b3bc kind:function(arm,size=0x5c) addr:0x202b3bc
-func_0202b418 kind:function(arm,size=0xcc) addr:0x202b418
+Lerp kind:function(arm,size=0xcc) addr:0x202b418
 func_0202b4e4 kind:function(arm,size=0x188) addr:0x202b4e4
 func_0202b66c kind:function(arm,size=0xc8) addr:0x202b66c
 func_0202b734 kind:function(arm,size=0xb0) addr:0x202b734
@@ -2581,7 +2581,7 @@ data_02056af8 kind:data(any) addr:0x2056af8
 data_02056afd kind:data(any) addr:0x2056afd
 data_02056afe kind:data(any) addr:0x2056afe
 data_02056b00 kind:data(any) addr:0x2056b00
-data_02056be4 kind:data(any) addr:0x2056be4
+data_02056be4 kind:data(byte[64]) addr:0x2056be4
 data_02056c24 kind:data(any) addr:0x2056c24
 data_02056c25 kind:data(any) addr:0x2056c25
 gpBuildDate kind:data(any) addr:0x2056c30

config/usa/arm9/overlays/ov000/symbols.txt

@@ -146,7 +146,7 @@ func_ov000_0207a038 kind:function(thumb,size=0x102) addr:0x2079fd8
 _ZN19Actor_UnkStruct_012C1Ev kind:function(arm,size=0x4c) addr:0x207a0dc
 _ZN19Actor_UnkStruct_0a4C1Eiiii kind:function(thumb,size=0x1c) addr:0x207a128
 func_ov000_0207a1a4 kind:function(arm,size=0x24) addr:0x207a144
-func_ov000_0207a1c8 kind:function(arm,size=0xcc) addr:0x207a168
+_ZN19Actor_UnkStruct_0a419func_ov000_0207a1c8EiP5Vec3p kind:function(arm,size=0xcc) addr:0x207a168
 func_ov000_0207a294 kind:function(thumb,size=0x44) addr:0x207a234
 func_ov000_0207a2d8 kind:function(arm,size=0x10) addr:0x207a278
 func_ov000_0207a2e8 kind:function(thumb,size=0x14) addr:0x207a288
@@ -601,7 +601,7 @@ _ZN10MapManager18func_ov00_020839b4Ei kind:function(arm,size=0x10) addr:0x208395
 _ZN10MapManager18func_ov00_020839c4Ei kind:function(arm,size=0x10) addr:0x2083964
 _ZN10MapManager18func_ov00_020839d4Ev kind:function(arm,size=0x24) addr:0x2083974
 _ZN10MapManager18func_ov00_020839f8Ev kind:function(arm,size=0x24) addr:0x2083998
-_ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p kind:function(arm,size=0x38) addr:0x20839bc
+_ZN10MapManager18func_ov00_02083a1cEP5Vec2bPS_P5Vec3p kind:function(arm,size=0x38) addr:0x20839bc
 _ZN10MapManager18func_ov00_02083a54EiPS_iii kind:function(arm,size=0x130) addr:0x20839f4
 _ZN10MapManager18func_ov00_02083b84Ev kind:function(arm,size=0x28) addr:0x2083b24
 _ZN10MapManager18func_ov00_02083bacEv kind:function(arm,size=0x28) addr:0x2083b4c
@@ -609,7 +609,7 @@ _ZN10MapManager18func_ov00_02083bd4Ev kind:function(arm,size=0x28) addr:0x2083b7
 _ZN10MapManager18func_ov00_02083bfcEv kind:function(arm,size=0x28) addr:0x2083b9c
 _ZN10MapManager18func_ov00_02083c24Ei kind:function(arm,size=0x2c) addr:0x2083bc4
 _ZN10MapManager18func_ov00_02083c50Ei kind:function(arm,size=0x2c) addr:0x2083bf0
-_ZN10MapManager18func_ov00_02083c7cEP5Vec3pi kind:function(arm,size=0x6c) addr:0x2083c1c
+_ZN10MapManager18func_ov00_02083c7cEP5Vec3p5Vec2b kind:function(arm,size=0x6c) addr:0x2083c1c
 _ZN10MapManager18func_ov00_02083ce8Ecccci kind:function(arm,size=0x14c) addr:0x2083c88
 _ZN10MapManager18func_ov00_02083e34Ecci kind:function(arm,size=0x24) addr:0x2083dd4
 _ZN10MapManager16MapData_vfunc_60Ev kind:function(arm,size=0x18) addr:0x2083df8
@@ -623,7 +623,7 @@ _ZN10MapManager18func_ov00_02083fb0EPjPS_P5Vec3p kind:function(arm,size=0x74) ad
 _ZN10MapManager18GetTileWorldBoundsEP5Vec2bP4AABB kind:function(arm,size=0x64) addr:0x2083fc4
 _ZN10MapManager16MapData_vfunc_54Ev kind:function(arm,size=0x18) addr:0x2084028
 _ZN10MapManager18func_ov00_020840a0Ecci kind:function(arm,size=0x24) addr:0x2084040
-_ZN10MapManager16MapData_vfunc_78Ev kind:function(arm,size=0x18) addr:0x2084064
+_ZN10MapManager16MapData_vfunc_78EP5Vec2b kind:function(arm,size=0x18) addr:0x2084064
 _ZN10MapManager18func_ov00_020840dcEv kind:function(arm,size=0x24) addr:0x208407c
 _ZN10MapManager18func_ov00_02084100EiPS_ kind:function(arm,size=0x14) addr:0x20840a0
 _ZN10MapManager17GetMapData_Unk_48Ev kind:function(arm,size=0xc) addr:0x20840b4
@@ -675,10 +675,10 @@ _ZN10MapManager17GetMapData_Unk_09Ev kind:function(arm,size=0xc) addr:0x2084cb8
 _ZN10MapManager18func_ov00_02084d24Ecci kind:function(arm,size=0x28) addr:0x2084cc4
 _ZN10MapManager18func_ov00_02084d4cEiiP5Vec3p kind:function(arm,size=0x170) addr:0x2084cec
 _ZN10MapManager18func_ov00_02084ebcEi kind:function(arm,size=0x24c) addr:0x2084e5c
-_ZN10MapManager18func_ov00_02085108EPi kind:function(arm,size=0x174) addr:0x20850a8
+_ZN10MapManager18func_ov00_02085108EP5Vec3p kind:function(arm,size=0x174) addr:0x20850a8
 _ZN10MapManager18func_ov00_0208527cEv kind:function(arm,size=0x180) addr:0x208521c
 _ZN10MapManager18func_ov00_020853fcEv kind:function(arm,size=0x198) addr:0x208539c
-_ZN10MapManager18func_ov00_02085594Ev kind:function(arm,size=0x2a8) addr:0x2085534
+_ZN10MapManager18func_ov00_02085594EP5Vec3p kind:function(arm,size=0x2a8) addr:0x2085534
 _ZN10MapManager18func_ov00_0208583cEiP5Vec3pi kind:function(arm,size=0x74) addr:0x20857dc
 _ZN10MapManager18func_ov00_020858b0Ev kind:function(arm,size=0x184) addr:0x2085850
 _ZN10MapManager18func_ov00_02085a34Eii kind:function(arm,size=0x22c) addr:0x20859d4
@@ -779,7 +779,7 @@ func_ov000_0208aed8 kind:function(arm,size=0x244) addr:0x208ae78
 func_ov000_0208b11c kind:function(arm,size=0x20) addr:0x208b0bc
 func_ov000_0208b13c kind:function(arm,size=0x1c) addr:0x208b0dc
 func_ov000_0208b158 kind:function(arm,size=0x28) addr:0x208b0f8
-func_ov000_0208b180 kind:function(arm,size=0x28) addr:0x208b120
+_ZN18UnkStruct_027e0f6419func_ov000_0208b180Ev kind:function(arm,size=0x28) addr:0x208b120
 func_ov000_0208b1a8 kind:function(arm,size=0x28) addr:0x208b148
 func_ov000_0208b1d0 kind:function(arm,size=0x28) addr:0x208b170
 func_ov000_0208b1f8 kind:function(arm,size=0x28) addr:0x208b198
@@ -1893,7 +1893,7 @@ _ZN13LinkStateBase22UpdateSwordShieldInUseEv kind:function(arm,size=0x18) addr:0
 _ZN13LinkStateBase18func_ov00_020a81b8Eii kind:function(arm,size=0x24) addr:0x20a8158
 _ZN13LinkStateBase16GetLinkItemStateEv kind:function(arm,size=0x10) addr:0x20a817c
 _ZN13LinkStateBase6LookAtEP5Vec3p kind:function(arm,size=0x10) addr:0x20a818c
-_ZN13LinkStateBase18func_ov00_020a81fcEv kind:function(arm,size=0x10) addr:0x20a819c
+_ZN13LinkStateBase18func_ov00_020a81fcEP5Vec3pi kind:function(arm,size=0x10) addr:0x20a819c
 _ZN13LinkStateBase9AddHealthEs kind:function(arm,size=0x18) addr:0x20a81ac
 _ZN13LinkStateBase18func_ov00_020a8224Ei kind:function(arm,size=0x14) addr:0x20a81c4
 _ZN13LinkStateBase6TurnToEsii kind:function(arm,size=0x44) addr:0x20a81d8
@@ -1915,7 +1915,7 @@ _ZN13LinkStateBase18func_ov00_020a8638Ei kind:function(arm,size=0x30) addr:0x20a
 _ZN13LinkStateBase26Clear_PlayerLinkBase_Unk48Et kind:function(arm,size=0x18) addr:0x20a8608
 _ZN13LinkStateBase18func_ov00_020a8680Eisb kind:function(arm,size=0x5c) addr:0x20a8620
 _ZN13LinkStateBase33PlayerLinkBase_func_ov00_020bccc8Ev kind:function(arm,size=0x10) addr:0x20a867c
-_ZN13LinkStateBase23PlayerLinkBase_vfunc_58Ev kind:function(arm,size=0x18) addr:0x20a868c
+_ZN13LinkStateBase23PlayerLinkBase_vfunc_58EiP8ActorRef kind:function(arm,size=0x18) addr:0x20a868c
 _ZN13LinkStateBase18func_ov00_020a8704EPs kind:function(arm,size=0x70) addr:0x20a86a4
 _ZN13LinkStateBase18func_ov00_020a8774EP5Vec3pi kind:function(arm,size=0xd0) addr:0x20a8714
 _ZN13LinkStateBase18func_ov00_020a8844EP5Vec3pbb kind:function(arm,size=0x110) addr:0x20a87e4
@@ -1923,7 +1923,7 @@ _ZN13LinkStateBase18func_ov00_020a8954EbPi kind:function(arm,size=0x40) addr:0x2
 _ZN13LinkStateBase18func_ov00_020a8994Ev kind:function(arm,size=0x28) addr:0x20a8934
 _ZN13LinkStateBase18func_ov00_020a89bcEii kind:function(arm,size=0x4c) addr:0x20a895c
 _ZN13LinkStateBase18func_ov00_020a8a08Ei kind:function(arm,size=0x44) addr:0x20a89a8
-_ZN13LinkStateBase18func_ov00_020a8a4cEii kind:function(arm,size=0x44) addr:0x20a89ec
+_ZN13LinkStateBase18func_ov00_020a8a4cEPKvi kind:function(arm,size=0x44) addr:0x20a89ec
 _ZN13LinkStateBase18func_ov00_020a8a90Ei kind:function(arm,size=0x20) addr:0x20a8a30
 _ZN13LinkStateBase18func_ov00_020a8ab0Ei kind:function(arm,size=0x20) addr:0x20a8a50
 _ZN13LinkStateBase18func_ov00_020a8ad0Ei kind:function(arm,size=0x34) addr:0x20a8a70
@@ -2119,7 +2119,7 @@ _ZN11ItemManager17EquipCollidesWithEP8Cylinderi kind:function(arm,size=0x80) add
 _ZN11ItemManager18EquipItem_vfunc_2cEi kind:function(arm,size=0x1c) addr:0x20ad698
 _ZN11ItemManager12GetEquipItemEi kind:function(arm,size=0x18) addr:0x20ad6b4
 _ZNK11ItemManager7GetAmmoEi kind:function(arm,size=0x10) addr:0x20ad6cc
-_ZN11ItemManager8GiveAmmoEit kind:function(arm,size=0x54) addr:0x20ad6dc
+_ZN11ItemManager8GiveAmmoEij kind:function(arm,size=0x54) addr:0x20ad6dc
 _ZN11ItemManager18func_ov00_020ad790Ei kind:function(arm,size=0x150) addr:0x20ad730
 _ZNK11ItemManager19GetEquippedShipPartEj kind:function(thumb,size=0x8) addr:0x20ad880
 _ZN11ItemManager13EquipShipPartEjj kind:function(thumb,size=0x8) addr:0x20ad888
@@ -2179,12 +2179,12 @@ _ZN13LinkStateRoll8vfunc_20Ei kind:function(arm,size=0x180) addr:0x20aebb0
 _ZN13LinkStateRoll8vfunc_24Ei kind:function(arm,size=0xc8) addr:0x20aed30
 _ZN13LinkStateRoll18func_ov00_020aee58Est kind:function(arm,size=0x2c) addr:0x20aedf8
 _ZN13LinkStateRoll18func_ov00_020aee84Ev kind:function(arm,size=0x28) addr:0x20aee24
-_ZN13PlayerControl18_ZN13PlayerControl18func_ov00_020aeeacEvEv kind:function(arm,size=0x4c) addr:0x20aee4c
+_ZN13PlayerControl18func_ov00_020aeeacEv kind:function(arm,size=0x4c) addr:0x20aee4c
 _ZN13PlayerControl18func_ov00_020aeef8Ev kind:function(arm,size=0x38) addr:0x20aee98
 _ZN13PlayerControl18func_ov00_020aef30Ev kind:function(thumb,size=0x38) addr:0x20aeed0
 _ZN13PlayerControl9UpdateAimEv kind:function(thumb,size=0x94) addr:0x20aef08
 _ZN13PlayerControl14GetFollowActorEv kind:function(arm,size=0x20) addr:0x20aef9c
-_ZN13PlayerControl18func_ov00_020af01cEPc kind:function(arm,size=0x28) addr:0x20aefbc
+_ZN13PlayerControl18func_ov00_020af01cEP5Vec2b kind:function(arm,size=0x28) addr:0x20aefbc
 _ZN13PlayerControl9SetUnk_80Ev kind:function(arm,size=0xc) addr:0x20aefe4
 _ZN13PlayerControl13StopFollowingEv kind:function(arm,size=0x1c) addr:0x20aeff0
 _ZN13PlayerControl18func_ov00_020af06cEv kind:function(arm,size=0x22c) addr:0x20af00c
@@ -2195,24 +2195,24 @@ _ZN13PlayerControl17CheckUntouchedNowEj kind:function(arm,size=0x30) addr:0x20af
 _ZN13PlayerControl13CheckTouchingEj kind:function(arm,size=0x28) addr:0x20af3cc
 _ZN13PlayerControl14CheckTouchFastEj kind:function(arm,size=0x50) addr:0x20af3f4
 _ZN13PlayerControl18func_ov00_020af4a4Ev kind:function(arm,size=0x94) addr:0x20af444
-_ZN13PlayerControl18func_ov00_020af538Ev kind:function(arm,size=0x1ac) addr:0x20af4d8
+_ZN13PlayerControl18func_ov00_020af538Ebh kind:function(arm,size=0x1ac) addr:0x20af4d8
 _ZN13PlayerControl18func_ov00_020af6e4EP5Vec3pii kind:function(arm,size=0x94) addr:0x20af684
 _ZN13PlayerControl18func_ov00_020af778Ev kind:function(arm,size=0x360) addr:0x20af718
 _ZN13PlayerControl18func_ov00_020afad8EP5Vec3p kind:function(arm,size=0x94) addr:0x20afa78
 _ZN13PlayerControl18func_ov00_020afb6cEv kind:function(arm,size=0x31c) addr:0x20afb0c
 _ZN13PlayerControl18func_ov00_020afe88Eib kind:function(arm,size=0x64) addr:0x20afe28
 _ZN13PlayerControl18func_ov00_020afeecEib kind:function(arm,size=0xa4) addr:0x20afe8c
-_ZN13PlayerControl18func_ov00_020aff90Eii kind:function(arm,size=0x5c) addr:0x20aff30
+_ZN13PlayerControl18func_ov00_020aff90EP5Vec3pi kind:function(arm,size=0x5c) addr:0x20aff30
 _ZN13PlayerControl18func_ov00_020affecEP5Vec3piiS1_ kind:function(arm,size=0x160) addr:0x20aff8c
-_ZN13PlayerControl18func_ov00_020b014cEv kind:function(arm,size=0xd0) addr:0x20b00ec
-_ZN13PlayerControl6SetAimEv kind:function(arm,size=0x24) addr:0x20b01bc
+_ZN13PlayerControl18func_ov00_020b014cEP5Vec3p kind:function(arm,size=0xd0) addr:0x20b00ec
+_ZN13PlayerControl8ResetAimEv kind:function(arm,size=0x24) addr:0x20b01bc
 _ZN13PlayerControl14UpdateAimWorldEP5Vec3p kind:function(arm,size=0xe8) addr:0x20b01e0
 _ZN13PlayerControl13GetTouchAngleEv kind:function(arm,size=0x24) addr:0x20b02c8
 _ZN13PlayerControl18func_ov00_020b034cEv kind:function(arm,size=0xcc) addr:0x20b02ec
 _ZN13PlayerControl18func_ov00_020b0418Ev kind:function(arm,size=0x84) addr:0x20b03b8
 _ZN13PlayerControl18func_ov00_020b049cEP5Vec3pb kind:function(arm,size=0x14c) addr:0x20b043c
 _ZN13PlayerControl18func_ov00_020b05e8EP5Vec3p kind:function(arm,size=0x190) addr:0x20b0588
-_ZN13PlayerControl18func_ov00_020b0778EP5Vec3pji kind:function(arm,size=0x33c) addr:0x20b0718
+_ZN13PlayerControl18func_ov00_020b0778EP5Vec3pjPi kind:function(arm,size=0x33c) addr:0x20b0718
 _ZN13PlayerControl16CheckNotTouchingEv kind:function(arm,size=0x1c) addr:0x20b0a54
 _ZN13PlayerControl18func_ov00_020b0ad0EP5Actor kind:function(arm,size=0x3c) addr:0x20b0a70
 _ZN13PlayerControl18func_ov00_020b0b0cEPsPiS1_Pb kind:function(arm,size=0x2dc) addr:0x20b0aac
@@ -2640,7 +2640,7 @@ _ZN9EquipItem8vfunc_2cEv kind:function(arm,size=0x8) addr:0x20be904
 _ZN9EquipItem8vfunc_34EPs kind:function(arm,size=0x4) addr:0x20be90c
 _ZNK9EquipItem8vfunc_40Ev kind:function(arm,size=0x8) addr:0x20be910
 _ZNK9EquipItem8vfunc_44Ei kind:function(arm,size=0x8) addr:0x20be918
-_ZNK9EquipItem8vfunc_48Ei kind:function(arm,size=0x8) addr:0x20be920
+_ZNK9EquipItem8vfunc_48Eii kind:function(arm,size=0x8) addr:0x20be920
 _ZNK9EquipItem8vfunc_4cEv kind:function(arm,size=0x8) addr:0x20be928
 _ZN9EquipItem12GetPlayerPosEv kind:function(arm,size=0xc) addr:0x20be930
 _ZN9EquipItem19func_ov000_020be99cEP5Vec3p kind:function(arm,size=0x48) addr:0x20be93c
@@ -3222,12 +3222,12 @@ func_ov000_020cea3c kind:function(arm,size=0x44) addr:0x20ce9dc
 func_ov000_020cea80 kind:function(arm,size=0x4c) addr:0x20cea20
 func_ov000_020ceacc kind:function(arm,size=0x58) addr:0x20cea6c
 func_ov000_020ceb24 kind:function(arm,size=0xa8) addr:0x20ceac4
-func_ov000_020cebcc kind:function(arm,size=0x3c) addr:0x20ceb6c
+_ZN18UnkStruct_027e0ffc19func_ov000_020cebccEjsi kind:function(arm,size=0x3c) addr:0x20ceb6c
 func_ov000_020cec08 kind:function(arm,size=0x58) addr:0x20ceba8
 func_ov000_020cec60 kind:function(arm,size=0x78) addr:0x20cec00
 func_ov000_020cecd8 kind:function(arm,size=0x8c) addr:0x20cec78
-func_ov000_020ced64 kind:function(arm,size=0x18) addr:0x20ced04
-func_ov000_020ced7c kind:function(arm,size=0x40) addr:0x20ced1c
+_ZN18UnkStruct_027e0ffc19func_ov000_020ced64EP8Cylinderjj kind:function(arm,size=0x18) addr:0x20ced04
+_ZN18UnkStruct_027e0ffc19func_ov000_020ced7cEP5Vec3piii kind:function(arm,size=0x40) addr:0x20ced1c
 func_ov000_020cedbc kind:function(arm,size=0x54) addr:0x20ced5c
 func_ov000_020cee10 kind:function(arm,size=0x48) addr:0x20cedb0
 func_ov000_020cee58 kind:function(arm,size=0x88) addr:0x20cedf8
@@ -4723,7 +4723,7 @@ data_ov000_020e5674 kind:data(any) addr:0x20e5614
 data_ov000_020e5684 kind:data(any) addr:0x20e5624
 data_ov000_020e5694 kind:data(any) addr:0x20e5634
 _ZTV13LinkStateBase kind:data(any) addr:0x20e564c
-data_ov000_020e56f0 kind:data(any) addr:0x20e5690
+_ZN13LinkStateMove19data_ov000_020e56f0E kind:data(any) addr:0x20e5690
 data_ov000_020e56f4$964 kind:data(any) addr:0x20e5694 local
 _ZTV13LinkStateMove kind:data(any) addr:0x20e5698
 @922 kind:data(any) addr:0x20e56e4 local
@@ -4896,16 +4896,17 @@ data_ov000_020e6088 kind:data(any) addr:0x20e6028
 data_ov000_020e6098 kind:data(any) addr:0x20e6038
 data_ov000_020e60a8 kind:data(any) addr:0x20e6048
 _ZTV13LinkStateRoll kind:data(any) addr:0x20e6060
-data_ov000_020e6104 kind:data(any) addr:0x20e60a4
-data_ov000_020e6108 kind:data(any) addr:0x20e60a8
-data_ov000_020e610c kind:data(any) addr:0x20e60ac
-data_ov000_020e6110 kind:data(any) addr:0x20e60b0
-data_ov000_020e6114 kind:data(any) addr:0x20e60b4
-data_ov000_020e6118 kind:data(any) addr:0x20e60b8
-data_ov000_020e611c kind:data(any) addr:0x20e60bc
-data_ov000_020e6120 kind:data(any) addr:0x20e60c0
-data_ov000_020e6124 kind:data(any) addr:0x20e60c4
-data_ov000_020e6148 kind:data(any) addr:0x20e60e8
+@1505 kind:data(any) addr:0x20e60a4
+@1504 kind:data(any) addr:0x20e60a8
+@1503 kind:data(any) addr:0x20e60ac
+@1502 kind:data(any) addr:0x20e60b0
+@1501 kind:data(any) addr:0x20e60b4
+@1500 kind:data(any) addr:0x20e60b8
+@1499 kind:data(any) addr:0x20e60bc
+@1498 kind:data(any) addr:0x20e60c0
+sShipTypes kind:data(any) addr:0x20e60c4 local
+data_ov000_020e6144 kind:data(any) addr:0x20e6144
+@1556 kind:data(any) addr:0x20e60e8
 data_ov000_020e6158 kind:data(any) addr:0x20e60f8
 data_ov000_020e6174 kind:data(any) addr:0x20e6114
 data_ov000_020e6178 kind:data(any) addr:0x20e6118

config/usa/arm9/overlays/ov004/delinks.txt

@@ -5,3 +5,6 @@
     .data       start:0x0210fd20 end:0x02111360 kind:data align:32
     .bss        start:0x02111360 end:0x02111360 kind:bss align:32
 
+src/04_Load/Player/LinkStateMove.cpp:
+    complete
+    .text       start:0x0210ae54 end:0x0210ae94

config/usa/arm9/overlays/ov005/delinks.txt

@@ -5,3 +5,9 @@
     .data       start:0x02112400 end:0x02112ba0 kind:data align:32
     .bss        start:0x02112ba0 end:0x02112ba0 kind:bss align:32
 
+src/05/Player/LinkStateMove.cpp:
+    complete
+    .text       start:0x02111350 end:0x02111b40
+    .rodata     start:0x0211232c end:0x0211233c
+    .data       start:0x02112b64 end:0x02112ba0
+

config/usa/arm9/overlays/ov005/relocs.txt

@@ -2426,7 +2426,7 @@ from:0x021119e4 kind:load to:0x027e0618 module:dtcm
 from:0x021119e8 kind:load to:0x027e0fb8 module:dtcm
 from:0x021119ec kind:load to:0x02112b64 module:overlay(5)
 from:0x021119f0 kind:load to:0x020e5690 module:overlay(0)
-from:0x021119f8 kind:load to:0x02112b84 module:overlay(5)
+from:0x021119f8 kind:load to:0x02112b7c add:8 module:overlay(5)
 from:0x021119fc kind:load to:0x027e0fe4 module:dtcm
 from:0x02111a08 kind:load to:0x027e0ffc module:dtcm
 from:0x02111a10 kind:load to:0x0211232c module:overlay(5)

config/usa/arm9/overlays/ov005/symbols.txt

@@ -308,7 +308,7 @@ _ZN13LinkStateBase19func_ov005_021113c4Eb kind:function(arm,size=0xc) addr:0x211
 _ZN13LinkStateMove19func_ov005_021113d0Ev kind:function(arm,size=0xc) addr:0x2111350
 _ZN13LinkStateMove8vfunc_1cEv kind:function(arm,size=0x6bc) addr:0x211135c
 _ZN13LinkStateMove8vfunc_3cEv kind:function(arm,size=0x60) addr:0x2111a18
-func_ov005_02111af8 kind:function(arm,size=0xc8) addr:0x2111a78
+_ZN14UnkFilterActor6FilterEP5Actor kind:function(arm,size=0xc8) addr:0x2111a78
 _ZN7MapBase8vfunc_1cEb kind:function(arm,size=0x40) addr:0x2111b40
 _ZN7MapBase8vfunc_20Ei kind:function(arm,size=0x6c) addr:0x2111b80
 _ZN7MapBase8vfunc_24Ev kind:function(arm,size=0x4) addr:0x2111bec
@@ -329,7 +329,8 @@ data_ov005_02112308 kind:data(any) addr:0x2112288
 data_ov005_02112324 kind:data(any) addr:0x21122a4
 data_ov005_02112360 kind:data(any) addr:0x21122e0
 data_ov005_021123a0 kind:data(any) addr:0x2112320
-data_ov005_021123ac kind:data(any) addr:0x211232c
+data_ov005_021123ac kind:data(any) addr:0x211232c local
+data_ov005_021123b8 kind:data(any) addr:0x2112338 local
 __sinit_ov005_021123bc kind:function(arm,size=0x24) addr:0x211233c
 __sinit_ov005_021123e0 kind:function(arm,size=0x1c) addr:0x2112360
 __sinit_ov005_021123fc kind:function(arm,size=0x24) addr:0x211237c
@@ -452,5 +453,8 @@ data_ov005_02112ba4 kind:data(any) addr:0x2112b24
 data_ov005_02112bb4 kind:data(any) addr:0x2112b34
 data_ov005_02112bc4 kind:data(any) addr:0x2112b44
 data_ov005_02112bd4 kind:data(any) addr:0x2112b54
-data_ov005_02112be4 kind:data(any) addr:0x2112b64
-data_ov005_02112c04 kind:data(any) addr:0x2112b84
+data_ov005_02112be4 kind:data(any) addr:0x2112b64 local
+data_ov005_02112be8 kind:data(any) addr:0x2112b68 local
+data_ov005_02112bec kind:data(any) addr:0x2112b6c local
+data_ov005_02112bf0 kind:data(any) addr:0x2112b70 local
+_ZTV14UnkFilterActor kind:data(any) addr:0x2112b7c

config/usa/arm9/overlays/ov014/delinks.txt

@@ -12,3 +12,11 @@ src/14_Land/Actor/ActorRupee.cpp:
     .ctor       start:0x02155878 end:0x0215587c
     .data       start:0x021588f4 end:0x021589f8
     .bss        start:0x0215b154 end:0x0215b174
+
+src/14_Land/Actor/Player/ActorRefill.cpp:
+    complete
+    .text       start:0x02134d80 end:0x0213589c
+    .init       start:0x02154b70 end:0x02154c80
+    .ctor       start:0x02155848 end:0x0215584c
+    .data       start:0x02157810 end:0x02157cd0
+    .bss        start:0x0215aef4 end:0x0215af94

config/usa/arm9/overlays/ov014/relocs.txt

@@ -2474,7 +2474,7 @@ from:0x02134e58 kind:arm_call to:0x0202e9d8 module:main
 from:0x02134e64 kind:arm_call to:0x02135718 module:overlay(14)
 from:0x02134e6c kind:load to:0x027e0fe0 module:dtcm
 from:0x02134e7c kind:arm_call to:0x020c14f4 module:overlay(0)
-from:0x02134eac kind:load to:0x02157c18 module:overlay(14)
+from:0x02134eac kind:load to:0x02157c10 add:8 module:overlay(14)
 from:0x02134eb8 kind:arm_call to:0x020c16d0 module:overlay(0)
 from:0x02134ecc kind:arm_call to:0x020c16d0 module:overlay(0)
 from:0x02134ed4 kind:arm_call to:0x0202ea08 module:main
@@ -2527,29 +2527,29 @@ from:0x02135410 kind:arm_call to:0x0207c150 module:overlay(0)
 from:0x02135434 kind:arm_call to:0x0207c150 module:overlay(0)
 from:0x02135448 kind:load to:0x027e0e58 module:dtcm
 from:0x02135460 kind:arm_call to:0x02134e70 module:overlay(14)
-from:0x02135484 kind:load to:0x02157b58 module:overlay(14)
+from:0x02135484 kind:load to:0x02157b50 add:8 module:overlay(14)
 from:0x02135490 kind:arm_call to:0x02134ee0 module:overlay(14)
 from:0x021354a4 kind:arm_call to:0x02134ee0 module:overlay(14)
 from:0x021354ac kind:arm_call to:0x0202ea08 module:main
 from:0x021354cc kind:arm_call to:0x02134e70 module:overlay(14)
-from:0x021354f0 kind:load to:0x02157a98 module:overlay(14)
+from:0x021354f0 kind:load to:0x02157a90 add:8 module:overlay(14)
 from:0x021354fc kind:arm_call to:0x02134ee0 module:overlay(14)
 from:0x02135510 kind:arm_call to:0x02134ee0 module:overlay(14)
 from:0x02135518 kind:arm_call to:0x0202ea08 module:main
 from:0x02135538 kind:arm_call to:0x02134e70 module:overlay(14)
-from:0x0213555c kind:load to:0x021579d8 module:overlay(14)
+from:0x0213555c kind:load to:0x021579d0 add:8 module:overlay(14)
 from:0x02135568 kind:arm_call to:0x02134ee0 module:overlay(14)
 from:0x0213557c kind:arm_call to:0x02134ee0 module:overlay(14)
 from:0x02135584 kind:arm_call to:0x0202ea08 module:main
 from:0x021355a4 kind:arm_call to:0x02134e70 module:overlay(14)
-from:0x021355c8 kind:load to:0x02157918 module:overlay(14)
+from:0x021355c8 kind:load to:0x02157910 add:8 module:overlay(14)
 from:0x021355d4 kind:arm_call to:0x02134ee0 module:overlay(14)
 from:0x021355e8 kind:arm_call to:0x02134ee0 module:overlay(14)
 from:0x021355f0 kind:arm_call to:0x0202ea08 module:main
 from:0x02135604 kind:arm_call to:0x02134ef4 module:overlay(14)
 from:0x0213570c kind:load to:0x027e0764 module:dtcm
 from:0x02135724 kind:arm_call to:0x02134e70 module:overlay(14)
-from:0x02135748 kind:load to:0x02157858 module:overlay(14)
+from:0x02135748 kind:load to:0x02157850 add:8 module:overlay(14)
 from:0x02135754 kind:arm_call to:0x02134ee0 module:overlay(14)
 from:0x02135768 kind:arm_call to:0x02134ee0 module:overlay(14)
 from:0x02135770 kind:arm_call to:0x0202ea08 module:main

config/usa/arm9/overlays/ov014/symbols.txt

@@ -8,7 +8,7 @@ func_ov014_0211f980 kind:function(arm,size=0x130) addr:0x211f900
 func_ov014_0211fab0 kind:function(arm,size=0x1dc) addr:0x211fa30
 func_ov014_0211fc8c kind:function(arm,size=0x50) addr:0x211fc0c
 func_ov014_0211fcdc kind:function(thumb,size=0x28) addr:0x211fc5c
-_Z19func_ov014_0211fd04Pi kind:function(thumb,size=0x4c) addr:0x211fc84
+_ZN18UnkStruct_027e109819func_ov014_0211fd04Ev kind:function(thumb,size=0x4c) addr:0x211fc84
 _ZN10ActorArrow6CreateEv kind:function(arm,size=0x30) addr:0x211fcd0
 _ZN10ActorArrow19func_ov014_0211fd80Ei kind:function(arm,size=0x10) addr:0x211fd00
 _ZN10ActorArrow19func_ov014_0211fd90Ev kind:function(arm,size=0x14) addr:0x211fd10
@@ -586,42 +586,42 @@ func_ov014_02134c04 kind:function(arm,size=0x8) addr:0x2134b60
 func_ov014_02134c0c kind:function(arm,size=0x8) addr:0x2134b68
 func_ov014_02134c14 kind:function(arm,size=0x200) addr:0x2134b70
 func_ov014_02134e14 kind:function(arm,size=0x10) addr:0x2134d70
-func_ov014_02134e24 kind:function(arm,size=0x30) addr:0x2134d80
-func_ov014_02134e54 kind:function(arm,size=0x30) addr:0x2134db0
-func_ov014_02134e84 kind:function(arm,size=0x30) addr:0x2134de0
-func_ov014_02134eb4 kind:function(arm,size=0x30) addr:0x2134e10
-func_ov014_02134ee4 kind:function(arm,size=0x30) addr:0x2134e40
-func_ov014_02134f14 kind:function(arm,size=0x40) addr:0x2134e70
-func_ov014_02134f54 kind:function(arm,size=0x14) addr:0x2134eb0
-func_ov014_02134f68 kind:function(arm,size=0x1c) addr:0x2134ec4
-func_ov014_02134f84 kind:function(arm,size=0x14) addr:0x2134ee0
-func_ov014_02134f98 kind:function(arm,size=0xf4) addr:0x2134ef4
-func_ov014_0213508c kind:function(arm,size=0x2d8) addr:0x2134fe8
-func_ov014_02135364 kind:function(arm,size=0x54) addr:0x21352c0
-func_ov014_021353b8 kind:function(arm,size=0xbc) addr:0x2135314
-func_ov014_02135474 kind:function(arm,size=0x84) addr:0x21353d0
-func_ov014_021354f8 kind:function(arm,size=0x34) addr:0x2135454
-func_ov014_0213552c kind:function(arm,size=0x14) addr:0x2135488
-func_ov014_02135540 kind:function(arm,size=0x1c) addr:0x213549c
-func_ov014_0213555c kind:function(arm,size=0x8) addr:0x21354b8
-func_ov014_02135564 kind:function(arm,size=0x34) addr:0x21354c0
-func_ov014_02135598 kind:function(arm,size=0x14) addr:0x21354f4
-func_ov014_021355ac kind:function(arm,size=0x1c) addr:0x2135508
-func_ov014_021355c8 kind:function(arm,size=0x8) addr:0x2135524
-func_ov014_021355d0 kind:function(arm,size=0x34) addr:0x213552c
-func_ov014_02135604 kind:function(arm,size=0x14) addr:0x2135560
-func_ov014_02135618 kind:function(arm,size=0x1c) addr:0x2135574
-func_ov014_02135634 kind:function(arm,size=0x8) addr:0x2135590
-func_ov014_0213563c kind:function(arm,size=0x34) addr:0x2135598
-func_ov014_02135670 kind:function(arm,size=0x14) addr:0x21355cc
-func_ov014_02135684 kind:function(arm,size=0x1c) addr:0x21355e0
-func_ov014_021356a0 kind:function(arm,size=0x114) addr:0x21355fc
-func_ov014_021357b4 kind:function(arm,size=0x8) addr:0x2135710
-func_ov014_021357bc kind:function(arm,size=0x34) addr:0x2135718
-func_ov014_021357f0 kind:function(arm,size=0x14) addr:0x213574c
-func_ov014_02135804 kind:function(arm,size=0x1c) addr:0x2135760
-func_ov014_02135820 kind:function(arm,size=0x118) addr:0x213577c
-func_ov014_02135938 kind:function(arm,size=0x8) addr:0x2135894
+_ZN16ActorRefillBombs6CreateEv kind:function(arm,size=0x30) addr:0x2134d80
+_ZN19ActorRefillBombchus6CreateEv kind:function(arm,size=0x30) addr:0x2134db0
+_ZN17ActorRefillArrows6CreateEv kind:function(arm,size=0x30) addr:0x2134de0
+_ZN15ActorRefillTime6CreateEv kind:function(arm,size=0x30) addr:0x2134e10
+_ZN9ActorLSTM6CreateEv kind:function(arm,size=0x30) addr:0x2134e40
+_ZN11ActorRefillC2Ei kind:function(arm,size=0x40) addr:0x2134e70
+_ZN11ActorRefillD1Ev kind:function(arm,size=0x14) addr:0x2134eb0
+_ZN11ActorRefillD0Ev kind:function(arm,size=0x1c) addr:0x2134ec4
+_ZN11ActorRefillD2Ev kind:function(arm,size=0x14) addr:0x2134ee0
+_ZN11ActorRefill8vfunc_08Ev kind:function(arm,size=0xf4) addr:0x2134ef4
+_ZN11ActorRefill8vfunc_14Ej kind:function(arm,size=0x2d8) addr:0x2134fe8
+_ZN11ActorRefill19func_ov014_02135364Ei kind:function(arm,size=0x54) addr:0x21352c0
+_ZN11ActorRefill8vfunc_20Eb kind:function(arm,size=0xbc) addr:0x2135314
+_ZN11ActorRefill19func_ov014_02135474Ev kind:function(arm,size=0x84) addr:0x21353d0
+_ZN16ActorRefillBombsC1Ev kind:function(arm,size=0x34) addr:0x2135454
+_ZN16ActorRefillBombsD1Ev kind:function(arm,size=0x14) addr:0x2135488
+_ZN16ActorRefillBombsD0Ev kind:function(arm,size=0x1c) addr:0x213549c
+_ZN16ActorRefillBombs8vfunc_b4Ev kind:function(arm,size=0x8) addr:0x21354b8
+_ZN19ActorRefillBombchusC1Ev kind:function(arm,size=0x34) addr:0x21354c0
+_ZN19ActorRefillBombchusD1Ev kind:function(arm,size=0x14) addr:0x21354f4
+_ZN19ActorRefillBombchusD0Ev kind:function(arm,size=0x1c) addr:0x2135508
+_ZN19ActorRefillBombchus8vfunc_b4Ev kind:function(arm,size=0x8) addr:0x2135524
+_ZN17ActorRefillArrowsC1Ev kind:function(arm,size=0x34) addr:0x213552c
+_ZN17ActorRefillArrowsD1Ev kind:function(arm,size=0x14) addr:0x2135560
+_ZN17ActorRefillArrowsD0Ev kind:function(arm,size=0x1c) addr:0x2135574
+_ZN17ActorRefillArrows8vfunc_b4Ev kind:function(arm,size=0x8) addr:0x2135590
+_ZN15ActorRefillTimeC1Ev kind:function(arm,size=0x34) addr:0x2135598
+_ZN15ActorRefillTimeD1Ev kind:function(arm,size=0x14) addr:0x21355cc
+_ZN15ActorRefillTimeD0Ev kind:function(arm,size=0x1c) addr:0x21355e0
+_ZN15ActorRefillTime8vfunc_08Ev kind:function(arm,size=0x114) addr:0x21355fc
+_ZN15ActorRefillTime8vfunc_b4Ev kind:function(arm,size=0x8) addr:0x2135710
+_ZN9ActorLSTMC1Ev kind:function(arm,size=0x34) addr:0x2135718
+_ZN9ActorLSTMD1Ev kind:function(arm,size=0x14) addr:0x213574c
+_ZN9ActorLSTMD0Ev kind:function(arm,size=0x1c) addr:0x2135760
+_ZN9ActorLSTM8vfunc_08Ev kind:function(arm,size=0x118) addr:0x213577c
+_ZN9ActorLSTM8vfunc_b4Ev kind:function(arm,size=0x8) addr:0x2135894
 func_ov014_02135940 kind:function(arm,size=0x34) addr:0x213589c
 func_ov014_02135974 kind:function(arm,size=0xc4) addr:0x21358d0
 func_ov014_02135a38 kind:function(arm,size=0xc4) addr:0x2135994
@@ -846,7 +846,7 @@ func_ov014_0213ccd8 kind:function(arm,size=0xe8) addr:0x213cc34
 func_ov014_0213cdc0 kind:function(arm,size=0x3c) addr:0x213cd1c
 func_ov014_0213cdfc kind:function(arm,size=0x5c) addr:0x213cd58
 func_ov014_0213ce58 kind:function(arm,size=0x18) addr:0x213cdb4
-func_ov014_0213ce70 kind:function(arm,size=0xbc) addr:0x213cdcc
+_ZN24UnkStruct_ov015_0213ce4c11GetInstanceEv kind:function(arm,size=0xbc) addr:0x213cdcc local
 func_ov014_0213cf2c kind:function(arm,size=0x5c) addr:0x213ce88
 _ZN10EquipScoopC2Ev kind:function(thumb,size=0x14) addr:0x213cee4
 _ZN10EquipScoopD1Ev kind:function(thumb,size=0xc) addr:0x213cef8
@@ -1672,7 +1672,7 @@ __sinit_ov014_02154b34 kind:function(arm,size=0x38) addr:0x2154a90
 __sinit_ov014_02154b6c kind:function(arm,size=0x38) addr:0x2154ac8
 __sinit_ov014_02154ba4 kind:function(arm,size=0x38) addr:0x2154b00
 __sinit_ov014_02154bdc kind:function(arm,size=0x38) addr:0x2154b38
-__sinit_ov014_02154c14 kind:function(arm,size=0x110) addr:0x2154b70
+__sinit_ActorRefill.cpp kind:function(arm,size=0x110) addr:0x2154b70 local
 __sinit_ov014_02154d24 kind:function(arm,size=0x1d8) addr:0x2154c80
 __sinit_ov014_02154efc kind:function(arm,size=0x40) addr:0x2154e58
 __sinit_ov014_02154f3c kind:function(arm,size=0x40) addr:0x2154e98
@@ -1846,20 +1846,21 @@ data_ov014_02157768 kind:data(any) addr:0x21576c8
 data_ov014_0215777c kind:data(any) addr:0x21576dc
 data_ov014_02157790 kind:data(any) addr:0x21576f0
 data_ov014_02157824 kind:data(any) addr:0x2157784
-data_ov014_021578b0 kind:data(any) addr:0x2157810
-data_ov014_021578b4 kind:data(any) addr:0x2157814
-data_ov014_021578b8 kind:data(any) addr:0x2157818
-data_ov014_021578bc kind:data(any) addr:0x215781c
-data_ov014_021578c0 kind:data(any) addr:0x2157820
-data_ov014_021578c4 kind:data(any) addr:0x2157824
-data_ov014_021578c8 kind:data(any) addr:0x2157828
-data_ov014_021578cc kind:data(any) addr:0x215782c
-data_ov014_021578f8 kind:data(any) addr:0x2157858
-data_ov014_021579b8 kind:data(any) addr:0x2157918
-data_ov014_02157a78 kind:data(any) addr:0x21579d8
-data_ov014_02157b38 kind:data(any) addr:0x2157a98
-data_ov014_02157bf8 kind:data(any) addr:0x2157b58
-data_ov014_02157cb8 kind:data(any) addr:0x2157c18
+@570 kind:data(any) addr:0x2157810 local
+@569 kind:data(any) addr:0x2157814 local
+@568 kind:data(any) addr:0x2157818 local
+@567 kind:data(any) addr:0x215781c local
+@566 kind:data(any) addr:0x2157820 local
+@565 kind:data(any) addr:0x2157824 local
+@564 kind:data(any) addr:0x2157828 local
+@563 kind:data(any) addr:0x215782c local
+sShipTypes kind:data(any) addr:0x2157830 local
+_ZTV9ActorLSTM kind:data(any) addr:0x2157850
+_ZTV15ActorRefillTime kind:data(any) addr:0x2157910
+_ZTV17ActorRefillArrows kind:data(any) addr:0x21579d0
+_ZTV19ActorRefillBombchus kind:data(any) addr:0x2157a90
+_ZTV16ActorRefillBombs kind:data(any) addr:0x2157b50
+_ZTV11ActorRefill kind:data(any) addr:0x2157c10
 data_ov014_02157d70 kind:data(any) addr:0x2157cd0
 data_ov014_02157d7c kind:data(any) addr:0x2157cdc
 data_ov014_02157d88 kind:data(any) addr:0x2157ce8
@@ -2195,16 +2196,16 @@ data_ov014_0215af6c kind:bss addr:0x215aecc
 data_ov014_0215af74 kind:bss addr:0x215aed4
 data_ov014_0215af80 kind:bss addr:0x215aee0
 data_ov014_0215af88 kind:bss addr:0x215aee8
-data_ov014_0215af94 kind:bss addr:0x215aef4
-data_ov014_0215afa0 kind:bss addr:0x215af00
-data_ov014_0215afb4 kind:bss addr:0x215af14
-data_ov014_0215afc0 kind:bss addr:0x215af20
-data_ov014_0215afd4 kind:bss addr:0x215af34
-data_ov014_0215afe0 kind:bss addr:0x215af40
-data_ov014_0215aff4 kind:bss addr:0x215af54
-data_ov014_0215b000 kind:bss addr:0x215af60
-data_ov014_0215b014 kind:bss addr:0x215af74
-data_ov014_0215b020 kind:bss addr:0x215af80
+@363 kind:bss addr:0x215aef4 local
+_ZN16ActorRefillBombs5gTypeE kind:bss addr:0x215af00
+@361 kind:bss addr:0x215af14 local
+_ZN19ActorRefillBombchus5gTypeE kind:bss addr:0x215af20
+@364 kind:bss addr:0x215af34 local
+_ZN17ActorRefillArrows5gTypeE kind:bss addr:0x215af40
+@360 kind:bss addr:0x215af54 local
+_ZN15ActorRefillTime5gTypeE kind:bss addr:0x215af60
+@362 kind:bss addr:0x215af74 local
+_ZN9ActorLSTM5gTypeE kind:bss addr:0x215af80
 data_ov014_0215b034 kind:bss addr:0x215af94
 data_ov014_0215b040 kind:bss addr:0x215afa0
 data_ov014_0215b054 kind:bss addr:0x215afb4

config/usa/arm9/overlays/ov015/symbols.txt

@@ -613,7 +613,7 @@ func_ov015_0213cc98 kind:function(arm,size=0x14) addr:0x213cc18
 func_ov015_0213ccac kind:function(arm,size=0x38) addr:0x213cc2c
 func_ov015_0213cce4 kind:function(arm,size=0x78) addr:0x213cc64
 func_ov015_0213cd5c kind:function(arm,size=0xf0) addr:0x213ccdc
-func_ov015_0213ce4c kind:function(arm,size=0x10) addr:0x213cdcc
+_ZN24UnkStruct_ov015_0213ce4c11GetInstanceEv kind:function(arm,size=0x10) addr:0x213cdcc
 func_ov015_0213ce5c kind:function(arm,size=0xb4) addr:0x213cddc
 func_ov015_0213cf10 kind:function(arm,size=0x20) addr:0x213ce90
 func_ov015_0213cf30 kind:function(arm,size=0x48) addr:0x213ceb0
@@ -640,8 +640,8 @@ func_ov015_0213d87c kind:function(arm,size=0x28c) addr:0x213d7fc
 func_ov015_0213db08 kind:function(arm,size=0xb0) addr:0x213da88
 func_ov015_0213dbb8 kind:function(arm,size=0xb0) addr:0x213db38
 func_ov015_0213dc68 kind:function(arm,size=0x48) addr:0x213dbe8
-func_ov015_0213dcb0 kind:function(arm,size=0x8) addr:0x213dc30
-func_ov015_0213dcb8 kind:function(arm,size=0x8) addr:0x213dc38
+_ZN24UnkStruct_ov015_0213ce4c8GetUnk3fEv kind:function(arm,size=0x8) addr:0x213dc30
+_ZN24UnkStruct_ov015_0213ce4c8GetUnk40Ev kind:function(arm,size=0x8) addr:0x213dc38
 func_ov015_0213dcc0 kind:function(arm,size=0x4) addr:0x213dc40
 func_ov015_0213dcc4 kind:function(arm,size=0x8c) addr:0x213dc44
 func_ov015_0213dd50 kind:function(arm,size=0x24) addr:0x213dcd0

config/usa/arm9/overlays/ov024/symbols.txt

@@ -286,7 +286,7 @@ func_ov024_02178204 kind:function(arm,size=0x30) addr:0x2178164
 func_ov024_02178234 kind:function(arm,size=0xec) addr:0x2178194
 func_ov024_02178320 kind:function(arm,size=0x20) addr:0x2178280
 func_ov024_02178340 kind:function(arm,size=0x8) addr:0x21782a0
-func_ov024_02178348 kind:function(arm,size=0x358) addr:0x21782a8
+_ZN13PlayerControl19func_ov024_02178348EP5Vec3p kind:function(arm,size=0x358) addr:0x21782a8
 func_ov024_021786a0 kind:function(arm,size=0x10) addr:0x2178600
 func_ov024_021786b0 kind:function(arm,size=0x30) addr:0x2178610
 func_ov024_021786e0 kind:function(arm,size=0x20) addr:0x2178640

config/usa/arm9/symbols.txt

@@ -56,7 +56,7 @@ func_020029fc kind:function(arm,size=0x1b0) addr:0x20029fc
 func_02002bac kind:function(arm,size=0xc) addr:0x2002bac
 func_02002bb8 kind:function(arm,size=0x3c) addr:0x2002bb8
 func_02002bf4 kind:function(arm,size=0x20) addr:0x2002bf4
-SoftDivideMod kind:function(arm,size=0x20c) addr:0x2002c14
+_s32_div_f kind:function(arm,size=0x20c) addr:0x2002c14
 SoftDivide kind:function(arm,size=0x1e4) addr:0x2002e20
 .L_02002e28 kind:label(arm) addr:0x2002e28
 func_0200301c kind:function(arm,size=0x544) addr:0x200301c
@@ -1331,7 +1331,7 @@ func_0202b2e8 kind:function(arm,size=0x10) addr:0x202b2d0
 func_0202b2f8 kind:function(arm,size=0x10) addr:0x202b2e0
 Vec3p_Lerp kind:function(arm,size=0xb4) addr:0x202b2f0
 func_0202b3bc kind:function(arm,size=0x5c) addr:0x202b3a4
-func_0202b418 kind:function(arm,size=0xcc) addr:0x202b400
+Lerp kind:function(arm,size=0xcc) addr:0x202b400
 func_0202b4e4 kind:function(arm,size=0x188) addr:0x202b4cc
 func_0202b66c kind:function(arm,size=0xc8) addr:0x202b654
 func_0202b734 kind:function(arm,size=0xb0) addr:0x202b71c

docs/actors.md

@@ -80,6 +80,8 @@ translations. Feel free to contribute to this list!
 `PSBA` | Pushable Armos | Armos statue
 `PSBL` | Push Block
 `RFLR` | Repeating? Floor | Moves repetetively along a set path
+`RLST` | Rolling Stone
+`RLSG` | Rolling Stone Generator
 `SPRL` | Spike Roller
 `WBLK` | Wind Block | The blocks in the Wind Temple that blow air
 `WPHL` | Warp Hole | Blue warp
@@ -101,7 +103,7 @@ translations. Feel free to contribute to this list!
 `CHUC` | ChuChu
 `CROW` | Crow | Bird that steals rupees
 `EGST` | Escape Ghost | Poe
-`FLTB` | Floating ??? | Flying pot
+`FLTB` | Flying Tsubo (つぼ) | Flying pot
 `FSHB` | Fish Bullet | Geozard bullet
 `FSHM` | Fishman | Geozard
 `GELL` | Gel
@@ -116,7 +118,7 @@ translations. Feel free to contribute to this list!
 `OCSH` | Octa Shell | Octorok bullet
 `OCTA` | Octarock | Octorok
 `PBLN` | Petit Blin | Miniblin
-`PB ` | | Eye Slug
+`PBZK` | | Eye Slug
 `PLSV` | Pols Voice
 `POON` | Pōn (ポーン) | Hardhat beetle
 `RAT0` | Rat
@@ -124,11 +126,15 @@ translations. Feel free to contribute to this list!
 `RAT1`
 `SNAK` | Snake | Rope, the purple snake enemy
 `SPDR` | Spider | Skulltula
+`STLB` | Stalfos bone | Projectile thrown by Stalfos
 `STLF` | Stalfos
+`STLH` | Stalfos head
+`STLP` | Stalfos | Stationary, throws bones constantly
 `STLW` | Stalfos Warrior
 `TAIL` | Tail | Moldorm head
 `TALB` | Tail Body | One of Moldorm's 3 body parts
 `TEKT` | Tektite
+`UBLN` | Umi (うみ) Blin | Pirate miniblin
 `WTCR` | Watcher | Phantom eye
 `YETI` | Yook
 
@@ -167,6 +173,7 @@ translations. Feel free to contribute to this list!
 `CMNC` | Character Man C | Doudo, man in blue of Mercay Island
 `COMA` | Character Old A | Tuzi, woman in brown of Mercay Island
 `COBS` | Character Old B/Shared | Maltza, man at the bar of Mercay Island
+`CPSK` | Carpenter Spirit Knight? | Cobble spirit (Brant, Bremeur, Doylan, Max)
 `CRPS` | Corpse | Non-moving skeleton with a blue spirit
 `CSTM` | Character Standard Man | Adult Male NPC
 `CWIF` | Character Wife | Maronie, woman in purple of Molida Island
@@ -220,7 +227,10 @@ translations. Feel free to contribute to this list!
 `FSRL` | Fish Reel | Roaming fish
 `GFIS` | Golden Frog ???
 `GSIP` | Ghost Ship
+`GYRG` | Gyorg
+`GYMG` | Gyorg monster generator
 `HRCN` | Hurricane | Stops you from going to other seas
+`KMGA` | Kamome (カモメ) Generator | Seagull generator
 `KMME` | Kamome (カモメ) | Seagull
 `LOND` | | Explosive barrel
 `PLSP` | Pirate Lady Ship | Jolene's ship
@@ -231,6 +241,7 @@ translations. Feel free to contribute to this list!
 `SLTR` | Salvage ??? | Salvage arm
 `SLOC` | Salvage Octorok
 `SLRC` | Salvage Rupee ???
+`SNGA` | Sea NPC Generator | Spawns sea monsters
 `SNAV` | Sea Navi | Shows proximity to the Ghost Ship
 `SPKN` | Sea Plant ??? | Eye Plant
 `SROP` | Sea Rope | Sea Trap rope, jump over to avoid damage

include/Actor/Actor.hpp

@@ -64,6 +64,7 @@ struct Actor_UnkStruct_0a4 {
     /* 14 */
 
     Actor_UnkStruct_0a4(q20 x, q20 y, q20 z, s32 unk_10);
+    void func_ov000_0207a1c8(unk32 param1, Vec3p *param2);
 };
 
 class KillPickupsFilter : FilterActorReturn, public FilterActorBase {
@@ -83,7 +84,8 @@ enum PlayerCollide_ {
     PlayerCollide_Gongoron = 0x8,
     PlayerCollide_Hammer   = 0x10,
 
-    PlayerCollide_PickupFlags = PlayerCollide_Hammer | PlayerCollide_Gongoron | PlayerCollide_Sword | PlayerCollide_Player,
+    /* 0x1b */ PlayerCollide_PickupFlags =
+        PlayerCollide_Hammer | PlayerCollide_Gongoron | PlayerCollide_Sword | PlayerCollide_Player,
 };
 
 struct Knockback {
@@ -136,10 +138,10 @@ public:
     /* 108 */ unk8 mUnk_108;
     /* 109 */ unk8 mUnk_109;
     /* 10a */ unk8 mUnk_10a[0x6];
-    /* 110 */ unk8 mUnk_110;
+    /* 110 */ bool mUnk_110;
     /* 111 */ bool mUnk_111;
-    /* 112 */ unk8 mUnk_112;
-    /* 113 */ unk8 mUnk_113;
+    /* 112 */ bool mUnk_112;
+    /* 113 */ bool mUnk_113;
     /* 114 */ unk8 mUnk_114;
     /* 115 */ unk8 mUnk_115;
     /* 116 */ unk8 mUnk_116;
@@ -173,7 +175,7 @@ public:
 
     /* 00 */ virtual ~Actor();
     /* 08 */ virtual bool vfunc_08();
-    /* 0c */ virtual void vfunc_0c();
+    /* 0c */ virtual bool vfunc_0c();
     /* 10 */ virtual void vfunc_10(u32 param1);
     /* 14 */ virtual void vfunc_14(u32 param1);
     /* 18 */ virtual void vfunc_18(u32 param1);

include/Actor/ActorRef.hpp

@@ -8,9 +8,7 @@ struct ActorRef {
     /* 4 */ s32 index;
     /* 8 */
 
-    inline ActorRef() {
-        Reset();
-    }
+    inline ActorRef() {}
     inline ActorRef(s32 id, s32 index) :
         id(id),
         index(index) {}

include/Actor/ActorType.hpp

@@ -25,8 +25,13 @@ enum ActorTypeId_ {
     ActorTypeId_ShopItemShield         = 'ITSL',
     ActorTypeId_ShopItemSoldOut        = 'ITSO',
 
-    ActorTypeId_Heart = 'HART',
-    ActorTypeId_Rupee = 'RUPY',
+    ActorTypeId_RefillArrows   = 'FLAL',
+    ActorTypeId_RefillBombs    = 'FLBM',
+    ActorTypeId_RefillBombchus = 'FLBT',
+    ActorTypeId_RefillTime     = 'FLTM',
+    ActorTypeId_Heart          = 'HART',
+    ActorTypeId_LSTM           = 'LSTM',
+    ActorTypeId_Rupee          = 'RUPY',
 
     ActorTypeId_Arrow         = 'ARRW',
     ActorTypeId_Blast         = 'BLST',

include/Actor/Dungeon/ActorSwitchObject.hpp

@@ -22,7 +22,7 @@ public:
 
     /* 00 */ virtual ~ActorSwitchObject() override;
     /* 08 */ virtual bool vfunc_08() override;
-    /* 0c */ virtual void vfunc_0c() override;
+    /* 0c */ virtual bool vfunc_0c() override;
     /* 14 */ virtual void vfunc_14(u32 param1) override;
     /* 18 */ virtual void vfunc_18(u32 param1) override;
     /* b4 */

include/Actor/Navi/ActorNaviBase.hpp

@@ -21,7 +21,7 @@ class ActorNaviBase_Unk1 {};
 class ActorNaviBase : public Actor {
 public:
     /* 000 (base) */
-    /* 158 */ Vec3p mUnk_158;
+    /* 158 */ Vec3p mOffsetPos;
     /* 164 */ unk32 mUnk_164;
     /* 168 */ ModelRender mUnk_168;
     /* 1c4 */ unk8 mUnk_1c4[0xc];

include/Actor/Player/ActorRefill.hpp

@@ -0,0 +1,113 @@
+#pragma once
+
+#include "global.h"
+#include "types.h"
+
+#include "Actor/Actor.hpp"
+#include "Actor/ActorType.hpp"
+
+class ActorRefill : public Actor {
+public:
+    /* 000 (base) */
+    /* 158 */ unk32 mUnk_158;
+    /* 15c */ unk32 mUnk_15c;
+    /* 160 */ unk32 mUnk_160;
+    /* 164 */ u8 mUnk_164;
+    /* 165 */ unk8 mUnk_165[0x3];
+    /* 168 */
+
+public:
+    ActorRefill(unk32 param1);
+
+    /* 00 */ virtual ~ActorRefill() override;
+    /* 08 */ virtual bool vfunc_08() override;
+    /* 14 */ virtual void vfunc_14(u32 param1) override;
+    /* 20 */ virtual void vfunc_20(bool param1) override;
+    /* b4 */ virtual ItemFlag vfunc_b4() = 0;
+    /* b8 */
+
+    bool func_ov014_02135364(unk32 param1);
+    void func_ov014_02135474();
+};
+
+class ActorRefillBombs : public ActorRefill {
+public:
+    static ActorType gType;
+
+    /* 000 (base) */
+    /* 168 */
+
+public:
+    ActorRefillBombs();
+    static ActorRefillBombs *Create();
+
+    /* 00 */ virtual ~ActorRefillBombs() override;
+    /* b4 */ virtual ItemFlag vfunc_b4() override;
+    /* b8 */
+};
+
+class ActorRefillBombchus : public ActorRefill {
+public:
+    static ActorType gType;
+
+    /* 000 (base) */
+    /* 168 */
+
+public:
+    ActorRefillBombchus();
+    static ActorRefillBombchus *Create();
+
+    /* 00 */ virtual ~ActorRefillBombchus() override;
+    /* b4 */ virtual ItemFlag vfunc_b4() override;
+    /* b8 */
+};
+
+class ActorRefillArrows : public ActorRefill {
+public:
+    static ActorType gType;
+
+    /* 000 (base) */
+    /* 168 */
+
+public:
+    ActorRefillArrows();
+    static ActorRefillArrows *Create();
+
+    /* 00 */ virtual ~ActorRefillArrows() override;
+    /* b4 */ virtual ItemFlag vfunc_b4() override;
+    /* b8 */
+};
+
+class ActorRefillTime : public ActorRefill {
+public:
+    static ActorType gType;
+
+    /* 000 (base) */
+    /* 168 */
+
+public:
+    ActorRefillTime();
+    static ActorRefillTime *Create();
+
+    /* 00 */ virtual ~ActorRefillTime() override;
+    /* 08 */ virtual bool vfunc_08() override;
+    /* b4 */ virtual ItemFlag vfunc_b4() override;
+    /* b8 */
+};
+
+class ActorLSTM : public ActorRefill {
+public:
+    static ActorType gType;
+
+    /* 000 (base) */
+    /* 168 */
+
+public:
+    ActorLSTM();
+    static ActorLSTM *Create();
+
+    /* 00 */ virtual ~ActorLSTM() override;
+    /* 08 */ virtual bool vfunc_08() override;
+    /* b4 */ virtual ItemFlag vfunc_b4() override;
+    /* b8 */
+};

include/DTCM/UnkStruct_027e05f8.hpp

@@ -4,7 +4,10 @@
 #include "types.h"
 
 struct UnkStruct_027e05f8 {
-    // TODO: Add fields
+    /* 0 */ u16 mUnk_0;
+    /* 2 */ u16 mUnk_2;
+    /* 4 */ unk16 mUnk_4;
+    /* 6 */
 
     void func_0202adf4(unk32 param1, s32 param2);
     ~UnkStruct_027e05f8();
@@ -15,3 +18,5 @@ struct UnkStruct_027e05f8 {
     void func_02037480();
     static unk32 func_02037490(unk32 param1);
 };
+
+extern UnkStruct_027e05f8 data_027e05f8;

include/DTCM/UnkStruct_027e077c.hpp

@@ -4,8 +4,26 @@
 #include "types.h"
 
 struct UnkStruct_027e077c {
-    // TODO: Add fields
+private:
+    /* 0 */ unk32 mUnk_0;
+    /* 4 */ unk32 mUnk_4;
+
+public:
+    /* 8 */ unk16 mUnk_8;
+    /* a */ unk8 mUnk_a;
+    /* b */
 
     UnkStruct_027e077c(unk32 param1);
     bool func_0202e740(unk32 param1);
+
+    inline volatile unk32 GetUnk0() const {
+        return mUnk_0;
+    }
+
+    inline unk32 GetUnk4() const {
+        return mUnk_4;
+    }
 };
+
+extern UnkStruct_027e077c data_027e077c;
+extern volatile u8 data_02056be4[];

include/DTCM/UnkStruct_027e0c68.hpp

@@ -0,0 +1,27 @@
+#pragma once
+
+#include "global.h"
+#include "types.h"
+
+#include "Debug/DebugHierarchyBase.hpp"
+
+struct UnkStruct_027e0c68 {
+    /* 00 */ unk8 mUnk_00[4];
+    /* 04 */ u8 mUnk_04;
+    /* 05 */ unk8 mUnk_05[3];
+    /* 08 */ unk32 mUnk_08;
+    /* 0c */ unk8 mUnk_0c[4];
+    /* 10 */ unk16 mUnk_10;
+    /* 12 */ unk8 mUnk_12[2];
+    /* 14 */ unk32 mUnk_14;
+    /* 18 */ s32 mUnk_18;
+    /* 1c */ s32 mUnk_1c;
+    /* 20 */ s32 *mUnk_20;
+    /* 24 */ unk32 mUnk_24;
+    /* 28 */ s32 *mUnk_28;
+    /* 2c */ unk8 mUnk_2c[0x1c];
+    /* 48 */ DebugHierarchyBase *mDebug;
+    /* 4c */
+};
+
+extern UnkStruct_027e0c68 data_027e0c68;

include/DTCM/UnkStruct_027e0d38.hpp

@@ -3,6 +3,12 @@
 #include "global.h"
 #include "types.h"
 
+struct UnkStruct_027e0d38_Unk28 {
+    /* 00 */ unk8 mUnk_00[0x34];
+    /* 34 */ bool mUnk_34;
+    /* 35 */
+};
+
 struct UnkStruct_027e0d38 {
     /* 00 */ unk8 mUnk_00;
     /* 01 */ unk8 mUnk_01[3]; // padding?
@@ -19,10 +25,10 @@ struct UnkStruct_027e0d38 {
     /* 21 */ unk8 mUnk_21;
     /* 22 */ unk8 mUnk_22[2]; // padding?
     /* 24 */ void *mUnk_24;
-    /* 28 */ void *mUnk_28;
+    /* 28 */ UnkStruct_027e0d38_Unk28 *mUnk_28;
     /* 2c */
 
-    unk32 func_ov000_02078b40();
+    s32 func_ov000_02078b40();
     unk8 func_ov000_02078b64();
     bool func_ov000_02078b88();
 };

include/DTCM/UnkStruct_027e0e2c.hpp

@@ -0,0 +1,22 @@
+#pragma once
+
+#include "global.h"
+#include "types.h"
+
+struct UnkStruct_027e0e2c {
+    /* 00 */ unk32 mUnk_00;
+    /* 04 */ unk32 mUnk_04;
+    /* 08 */ unk32 mUnk_08;
+    /* 0c */ unk32 mUnk_0c;
+    /* 10 */ unk32 mUnk_10;
+    /* 14 */ unk16 mUnk_14;
+    /* 16 */ unk16 mUnk_16;
+    /* 18 */ unk32 mUnk_18;
+    /* 1c */ unk32 mUnk_1c;
+    /* 20 */ unk32 mUnk_20;
+    /* 24 */ unk32 mUnk_24;
+    /* 28 */ unk32 mUnk_28;
+    /* 2c */
+};
+
+extern UnkStruct_027e0e2c data_027e0e2c;

include/DTCM/UnkStruct_027e0f64.hpp

@@ -0,0 +1,15 @@
+#pragma once
+
+#include "global.h"
+#include "types.h"
+
+struct UnkStruct_027e0f64 {
+    /* 0 */ DebugHierarchyBase *mUnk_0;
+    /* 4 */ void *mUnk_4;
+    /* 8 */ void *mUnk_8;
+    /* c */
+
+    unk32 func_ov000_0208b180();
+};
+
+extern UnkStruct_027e0f64 *data_027e0f64;

include/DTCM/UnkStruct_027e0ffc.hpp

@@ -0,0 +1,27 @@
+#pragma once
+
+#include "global.h"
+#include "types.h"
+
+struct UnkStruct_027e0ffc {
+    /* 00 */ unk32 mUnk_00;
+    /* 04 */ unk32 mUnk_04[0x4];
+    /* 14 */ unk32 mUnk_14;
+    /* 18 */ unk32 mUnk_18;
+    /* 1c */ unk32 mUnk_1c;
+    /* 20 */ unk32 mUnk_20;
+    /* 24 */ unk8 mUnk_24;
+    /* 25 */ unk8 mUnk_25[0x3];
+    /* 28 */ unk32 mUnk_28;
+    /* 2c */ unk32 mUnk_2c;
+    /* 30 */ unk32 mUnk_30;
+    /* 34 */ unk32 mUnk_34;
+    /* 38 */ unk8 mUnk_38;
+    /* 39 */
+
+    void func_ov000_020cebcc(u32 param1, unk16 param2, unk32 param3);
+    void func_ov000_020ced64(Cylinder *param1, u32 param2, u32 param3);
+    void func_ov000_020ced7c(Vec3p *param1, s32 param2, s32 param3, unk32 param4);
+};
+
+extern UnkStruct_027e0ffc data_027e0ffc;

include/DTCM/UnkStruct_027e1098.hpp

@@ -0,0 +1,21 @@
+#pragma once
+
+#include "types.h"
+
+struct UnkStruct_027e1098 {
+    /* 00 */ unk8 mUnk_00[0x38];
+    /* 38 */ unk32 mUnk_38;
+    /* 3c */ unk32 mUnk_3c;
+    /* 40 */ unk32 mUnk_40;
+    /* 44 */ unk32 mUnk_44;
+    /* 48 */ unk8 mUnk_48;
+    /* 49 */ unk8 mUnk_49;
+    /* 4a */ unk8 mUnk_4a;
+    /* 4b */ unk8 mUnk_4b;
+    /* 4c */ unk32 mUnk_4c;
+    /* 50 */
+
+    void func_ov014_0211fd04();
+};
+
+extern UnkStruct_027e1098 *data_027e1098;

include/Debug/DebugHierarchyBase.hpp

@@ -19,7 +19,7 @@ public:
     /* 14 */ virtual void vfunc_14();
     /* 18 */ virtual void vfunc_18();
     /* 1c */ virtual void vfunc_1c();
-    /* 20 */ virtual void vfunc_20();
+    /* 20 */ virtual void vfunc_20(unk32 param1, const char *param2, unk32 param3, unk32 param4, unk32 param5, unk32 param6);
     /* 24 */ virtual void vfunc_24();
     /* 28 */ virtual void vfunc_28();
     /* 2c */ virtual void vfunc_2c();

include/Item/ItemManager.hpp

@@ -51,7 +51,7 @@ enum DungeonItemModelId_ {
 };
 
 class ItemManager : public SysObject {
-private:
+public:
     /* 000 */ ItemFlag mEquippedItem;
     /* 004 */ ItemFlag mPrevEquippedItem;
     /* 008 */ ItemFlag mForcedItem; // game crashes when any item besides this one is equipped
@@ -92,7 +92,6 @@ private:
     /* 14e */ unk8 mUnk_14e[0x2]; // padding?
     /* 150 */
 
-public:
     static ItemManager *Create();
     static void Destroy();
     ItemManager();
@@ -135,7 +134,7 @@ public:
 
     // Ammo
     u16 GetAmmo(ItemFlag equipId) const;
-    void GiveAmmo(ItemFlag equipId, u16 amount);
+    void GiveAmmo(ItemFlag equipId, u32 amount);
     u16 GetMaxAmmo(ItemFlag equipId) const;
     void UpgradeQuiver();
     void UpgradeBombBag();

include/Player/LinkStateBase.hpp

@@ -14,13 +14,13 @@
 
 typedef unk32 LinkStateId;
 enum LinkStateId_ {
-    LinkStateId_Move    = 0,
-    LinkStateId_Item    = 1,
-    LinkStateId_Grab    = 2,
-    LinkStateId_Unk3    = 3,
-    LinkStateId_Unk4    = 4,
-    LinkStateId_Damage  = 5,
-    LinkStateId_ItemGet = 6,
+    LinkStateId_Move     = 0,
+    LinkStateId_Item     = 1,
+    LinkStateId_Interact = 2,
+    LinkStateId_Follow   = 3,
+    LinkStateId_Roll     = 4,
+    LinkStateId_Damage   = 5,
+    LinkStateId_Cutscene = 6,
     LinkStateId_COUNT
 };
 
@@ -60,7 +60,7 @@ public:
     void func_ov00_020a81b8(unk32 param1, unk32 param2);
     LinkStateItem *GetLinkItemState();
     void LookAt(Vec3p *target);
-    void func_ov00_020a81fc();
+    void func_ov00_020a81fc(Vec3p *param1, unk32 param2);
     void AddHealth(s16 amount);
     void func_ov00_020a8224(unk32 param1);
     void TurnTo(s16 angle, unk32 param2, unk32 speed);
@@ -82,7 +82,7 @@ public:
     void Clear_PlayerLinkBase_Unk48(u16 flags);
     void func_ov00_020a8680(unk32 param1, unk16 param2, bool param3);
     void PlayerLinkBase_func_ov00_020bccc8();
-    bool PlayerLinkBase_vfunc_58();
+    bool PlayerLinkBase_vfunc_58(unk32 param1, ActorRef *param2);
     bool func_ov00_020a8704(s16 *pAngle);
     bool func_ov00_020a8774(Vec3p *param1, s32 angle);
     void func_ov00_020a8844(Vec3p *param1, bool param2, bool param3);
@@ -90,7 +90,7 @@ public:
     void func_ov00_020a8994();
     void func_ov00_020a89bc(unk32 param1, unk32 param2);
     void func_ov00_020a8a08(unk32 param1);
-    void func_ov00_020a8a4c(unk32 param1, unk32 param2);
+    void func_ov00_020a8a4c(const void *param1, unk32 param2);
     void func_ov00_020a8a90(unk32 param1);
     void func_ov00_020a8ab0(unk32 param1);
     void func_ov00_020a8ad0(unk32 param1);
@@ -152,6 +152,6 @@ public:
     void func_ov005_021113c4(bool param1);
 };
 
-LinkStateBase *GetLinkState(s32 index);
+LinkStateBase *GetLinkState(LinkStateId index);
 
 extern LinkStateBase **gLinkStates;

include/Player/LinkStateDamage.hpp

@@ -8,6 +8,7 @@
 #include "Render/ModelRender.hpp"
 
 class LinkStateDamage : public LinkStateBase {
+public:
     /* 00 (base) */
     /* 0c */ void *mUnk_0c;
     /* 10 */ unk32 mUnk_10;

include/Player/LinkStateMove.hpp

@@ -7,6 +7,8 @@
 
 class LinkStateMove : public LinkStateBase {
 public:
+    static unk32 data_ov000_020e56f0;
+
     /* 00 (base) */
     /* 0c */ s32 mUnk_0c;
     /* 10 */ unk16 mUnk_10;

include/Player/PlayerBase.hpp

@@ -64,4 +64,4 @@ public:
 extern PlayerBase *gPlayer;
 extern Vec3p gPlayerPos;
 extern Vec3p gPlayerVel;
-extern s16 gPlayerAngle;
+extern u16 gPlayerAngle;

include/Player/PlayerControl.hpp

@@ -11,7 +11,7 @@
 #include "Player/TouchControl.hpp"
 #include "Player/TouchGesture.hpp"
 
-typedef u16 TouchEdge;
+typedef s16 TouchEdge;
 enum TouchEdge_ {
     TouchEdge_Right  = 0,
     TouchEdge_Left   = 1,
@@ -28,7 +28,7 @@ public:
     /* 50 */ q20 mTouchSpeedX; // how fast the stylus moves
     /* 54 */ q20 mTouchSpeedY;
     /* 58 */ q20 mTouchDist; // pixel distance from touch to link, deadzone is 20 pixels
-    /* 5c */ unk32 mUnk_5c;
+    /* 5c */ q20 mTouchSpeed;
     /* 60 */ s16 mTouchDuration;
     /* 62 */ s16 mTouchSlowDuration; // resets to 0 if stylus is fast enough
     /* 64 */ s16 mTouchFastTime; // gets set to mTouchDuration if stylus is fast enough
@@ -46,24 +46,23 @@ public:
     /* 79 */ bool mUsingEquipItem;
     /* 7a */ bool mUnk_7a;
     /* 7b */ bool mUnk_7b;
-    /* 7c */ s8 mUnk_7c;
+    /* 7c */ u8 mUnk_7c;
     /* 7d */ bool mUnk_7d;
-    /* 7e */ s8 mUnk_7e;
+    /* 7e */ u8 mUnk_7e;
     /* 7f */ bool mUnk_7f;
     /* 80 */ bool mUnk_80;
     /* 81 */ bool mFollowing;
-    /* 82 */ unk8 mUnk_82;
+    /* 82 */ bool mUnk_82;
     /* 83 */ bool mUnk_83;
     /* 84 */ ActorRef mFollowRef;
     /* 8c */ ActorRef mNextFollowRef;
     /* 94 */ ActorRef mLastFollowRef;
-    /* 9c */ unk8 mUnk_9c;
-    /* 9d */ unk8 mUnk_9d;
+    /* 9c */ Vec2b mUnk_9c;
     /* 9e */ unk8 mUnk_9e[2];
-    /* a0 */ void *mFollowActor;
+    /* a0 */ void *mFollowObject;
     /* a4 */ q20 mFollowDist;
-    /* a8 */ u16 mFollowStuckTimer;
-    /* aa */ u16 mCutsceneEndTimer;
+    /* a8 */ s16 mFollowStuckTimer;
+    /* aa */ s16 mCutsceneEndTimer;
     /* ac */ s16 mUnk_ac;
     /* ae */ unk16 mUnk_ae;
     /* b0 */ Vec3p mAim; // used by boomerang, bow and rope
@@ -75,11 +74,11 @@ public:
     /* d8 */
 
     static bool func_ov00_020aeeac();
-    void func_ov00_020aeef8();
+    static bool func_ov00_020aeef8();
     void func_ov00_020aef30();
     void UpdateAim();
     Actor *GetFollowActor();
-    bool func_ov00_020af01c(unk8 *param1);
+    bool func_ov00_020af01c(Vec2b *param1);
     void SetUnk_80();
     void StopFollowing();
     void func_ov00_020af06c();
@@ -90,30 +89,30 @@ public:
     bool CheckTouching(u32 param1);
     bool CheckTouchFast(u32 param1);
     bool func_ov00_020af4a4();
-    void func_ov00_020af538();
+    void func_ov00_020af538(bool param1, u8 param2);
     void func_ov00_020af6e4(Vec3p *param1, s32 param3, s32 param4);
     bool func_ov00_020af778();
     bool func_ov00_020afad8(Vec3p *param1);
     void func_ov00_020afb6c();
     bool func_ov00_020afe88(s32 param1, bool param2);
     bool func_ov00_020afeec(unk32 param1, bool param2);
-    void func_ov00_020aff90(unk32 param1, unk32 param2);
+    void func_ov00_020aff90(Vec3p *param1, unk32 param2);
     void func_ov00_020affec(Vec3p *param1, s32 y, s32 param3, Vec3p *param4);
-    void func_ov00_020b014c();
-    void SetAim();
+    void func_ov00_020b014c(Vec3p *param1);
+    void ResetAim();
     bool UpdateAimWorld(Vec3p *param1);
     s16 GetTouchAngle();
     u32 func_ov00_020b034c();
     s32 func_ov00_020b0418();
     bool func_ov00_020b049c(Vec3p *param1, bool param2);
     bool func_ov00_020b05e8(Vec3p *param1);
-    bool func_ov00_020b0778(Vec3p *param1, u32 param2, unk32 param3);
+    bool func_ov00_020b0778(Vec3p *param1, u32 param2, unk32 *param3);
     bool CheckNotTouching();
     bool func_ov00_020b0ad0(Actor *actor);
     bool func_ov00_020b0b0c(s16 *pAngle, ItemFlag *pEquipId, unk32 *pCardinal, bool *pFast);
     bool func_ov00_020b0de8(Vec3p *param1);
     bool func_ov00_020b0e54(Vec3p *param1, Vec3p *param2);
-    bool func_ov00_020b0f88(Vec3p *param1, unk32 param2, Vec3p *param3);
+    bool func_ov00_020b0f88(Vec3p *param1, unk32 scale, Vec3p *param3);
     bool func_ov00_020b1058(Vec3p *param1, unk32 param2, Vec3p *param3, Vec3p *param4);
     bool IsUntouchedNow();
     bool IsNotUntouchedNow();
@@ -138,6 +137,8 @@ public:
     void Init();
     void func_ov004_0210b1d0();
     static void func_ov004_0210b1f0();
+
+    bool func_ov024_02178348(Vec3p *param1);
 };
 
 extern PlayerControl *gPlayerControl;

include/Player/PlayerControlData.hpp

@@ -87,8 +87,8 @@ public:
     /* 68 */ virtual void vfunc_68(unk32 param1, unk32 param2);
     /* 6c */ virtual void vfunc_6c(s32 param1, Vec3p *param2);
     /* 70 */ virtual void vfunc_70(s32 param1);
-    /* 74 */ virtual unk32 vfunc_74();
-    /* 78 */ virtual unk32 vfunc_78();
+    /* 74 */ virtual unk32 vfunc_74(s32 param1);
+    /* 78 */ virtual unk32 vfunc_78(s32 param1);
     /* 7c */ virtual unk32 vfunc_7c();
     /* 80 */
 
@@ -105,3 +105,5 @@ public:
 
     PlayerControlData();
 };
+
+extern PlayerControlData *gPlayerControlData;

include/Player/TouchGesture.hpp

@@ -22,7 +22,8 @@ public:
 class TouchGesture : public TouchGestureBase {
 public:
     /* 00 (base) */
-    /* 05 */ unk8 mUnk_05[7];
+    /* 05 */ unk8 mUnk_05[3];
+    /* 08 */ s32 mUnk_08;
     /* 0c */ u16 mIndex;
     /* 0e */ unk16 mUnk_0e;
     /* 10 */ u16 mUnk_10[GESTURE_BUFFER_LENGTH];

include/System/Random.hpp

@@ -19,4 +19,4 @@ struct Random {
     }
 };
 
-extern Random *gRandom;
+extern Random gRandom;

include/Unknown/UnkStruct_02037750.hpp

@@ -31,7 +31,7 @@ public:
     /* 34 */
 
     UnkStruct_02037750(unk32 param1, unk32 param2);
-    LinkStateInteract *GetLinkStateInteract();
+    static LinkStateInteract *GetLinkStateInteract();
     void func_020385d0(s32 param1, unk32 *param2);
 };
 

libs/nds/include/nds/math.h

@@ -8,6 +8,8 @@
 extern "C" {
 #endif
 
+#define ABS(x) ((x) < 0 ? -(x) : (x))
+
 // Q20.12 fixed point number
 typedef s32 q20;
 // Q4.12 fixed point number
@@ -19,6 +21,7 @@ typedef s16 q4;
 #define FLOAT_TO_Q19(n) ((s32) (((n) * 8192 + 1)))
 #define ROUND_Q20(n) (((s32) (n) + 0x800) >> 12)
 #define MUL_Q20(a, b) (q20)((((s64) (a)) * ((s64) (b)) + 0x800) >> 12)
+#define DIV_Q20(a, b) (((a) << 12) / (b))
 
 #define DEG_TO_ANG(n) ((n) * 0x10000 / 360)
 #define SIN(n) (gSinCosTable[2 * ((n) >> 4)])
@@ -31,7 +34,7 @@ u32 SoftDivide(u32 a, u32 b);
 u32 CoDivide64By32(u32 a, u32 b);
 u32 func_01ff98f0(u32 a, u32 b);
 u32 CoReciprocal(u32 x);
-u32 func_01ff992c(u32 x);
+u64 func_01ff992c(u32 x);
 u32 CoSqrt(u32 x);
 u32 CoInvSqrt(u32 x);
 u32 AwaitDivisionResult();
@@ -49,8 +52,8 @@ bool Approach_thunk(unk32 *src, unk32 dest, unk32 step);
 extern q4 gSinCosTable[];
 
 typedef struct {
-    /* 0 */ s8 x;
-    /* 1 */ s8 y;
+    /* 0 */ u8 x;
+    /* 1 */ u8 y;
     /* 2 */
 } Vec2b;
 

libs/nds/src/itcm/math_1.c

@@ -37,7 +37,7 @@ void Mat4p_Multiply(Mat4p *a, Mat4p *b, Mat4p *out) {}
 u32 CoDivide64By32(u32 a, u32 b) {}
 u32 func_01ff98f0(u32 a, u32 b) {}
 u32 CoReciprocal(u32 x) {}
-u32 func_01ff992c(u32 x) {}
+u64 func_01ff992c(u32 x) {}
 u32 CoSqrt(u32 x) {}
 u32 CoInvSqrt(u32 x) {}
 u32 AwaitDivisionResult() {}

src/00_Core/Actor/Actor.cpp

@@ -5,6 +5,8 @@ extern "C" {
 #include "Actor/Actor.hpp"
 #include "Actor/ActorManager.hpp"
 #include "Actor/ActorPlayerDummy.hpp"
+#include "DTCM/UnkStruct_027e077c.hpp"
+#include "DTCM/UnkStruct_027e103c.hpp"
 #include "Item/ItemManager.hpp"
 #include "Map/MapManager.hpp"
 #include "Player/EquipSword.hpp"
@@ -115,7 +117,7 @@ ARM bool Actor::vfunc_08() {
     return true;
 }
 
-ARM void Actor::vfunc_0c() {}
+ARM bool Actor::vfunc_0c() {}
 ARM void Actor::vfunc_10(u32 param1) {}
 ARM void Actor::vfunc_24() {}
 ARM void Actor::vfunc_28() {}
@@ -255,20 +257,9 @@ ARM bool Actor::func_ov00_020c195c() {
     return true;
 }
 
-struct UnkStruct2 {
-    /* 0 */ u32 mUnk_0;
-    /* 4 */ u32 mUnk_4;
-    /* 8 */
-};
-extern UnkStruct2 data_027e077c;
-extern u8 data_02056be4[];
-extern "C" bool func_ov05_02103f4c(s32 param1);
-extern s32 data_027e103c;
 ARM bool Actor::func_ov00_020c198c() {
-    u32 unk1 = data_027e077c.mUnk_0;
-    u32 unk2 = data_027e077c.mUnk_4;
-    if (data_027e077c.mUnk_0 != data_027e077c.mUnk_4 || (data_02056be4[unk1] & 1) != 0 || (data_02056be4[unk2] & 4) != 0 ||
-        func_ov05_02103f4c(data_027e103c) || gPlayer->mHealth <= 0)
+    if (data_027e077c.GetUnk0() != data_027e077c.GetUnk4() || (data_02056be4[data_027e077c.GetUnk0()] & 1) != 0 ||
+        (data_02056be4[data_027e077c.GetUnk4()] & 4) != 0 || data_027e103c->func_ov005_02103f4c() || gPlayer->mHealth <= 0)
     {
         return false;
     }

src/00_Core/Actor/ActorManager.cpp

@@ -1,4 +1,5 @@
 #include "Actor/ActorManager.hpp"
+#include "DTCM/UnkStruct_027e077c.hpp"
 #include "DTCM/UnkStruct_027e103c.hpp"
 #include "Map/MapManager.hpp"
 
@@ -8,8 +9,6 @@ extern "C" Cylinder *func_ov000_020c3ef0(void *, u32 index);
 extern "C" bool func_ov000_020c3f08(void *, u32 index);
 extern "C" void func_ov000_020c3f3c(void *, u32 index, Cylinder *cylinder);
 extern "C" void func_ov000_020c3f54(void *, u32 param2);
-extern s32 data_027e077c;
-extern u8 data_02056be4[];
 
 ARM void ActorManager::DeleteActor(u32 index, bool param2) {
     if (!param2) {
@@ -52,7 +51,7 @@ ARM void ActorManager::func_ov00_020c3484(ActorRef *ref, ActorManager *actorMgr,
 
     q20 minDistance       = 0x7fffffff;
     Actor **actorIter     = actorMgr->mActorTable;
-    u8 unkByte            = data_02056be4[data_027e077c];
+    u8 unkByte            = data_02056be4[data_027e077c.GetUnk0()];
     bool unk1             = (unkByte & 1) != 0;
     Actor **actorTableEnd = actorIter + actorMgr->mMaxActorIndex;
 

src/00_Core/Actor/Dungeon/ActorSwitchObject.cpp

@@ -1,15 +1,110 @@
 #include "Actor/Dungeon/ActorSwitchObject.hpp"
+#include "Map/MapManager.hpp"
 
 ActorType ActorSwitchObject::gType = ActorType(ActorTypeId_SwitchObject, (ActorCreateFunc) ActorSwitchObject::Create, NULL);
 
 ActorSwitchObject *ActorSwitchObject::Create() {}
-bool ActorSwitchObject::vfunc_08() {}
-void ActorSwitchObject::vfunc_0c() {}
-void ActorSwitchObject::vfunc_14(u32 param1) {}
-void ActorSwitchObject::vfunc_18(u32 param1) {}
-bool ActorSwitchObject::func_ov000_0208fc10(s32 param1) {}
-void ActorSwitchObject::func_ov000_0208fc7c() {}
+
+bool ActorSwitchObject::vfunc_08() {
+    Actor::vfunc_08();
+    this->func_ov000_0208fc7c();
+    this->mUnk_130 = 0;
+    return true;
+}
+
+bool ActorSwitchObject::vfunc_0c() {
+    return this->func_ov00_020c1bfc(0) ? this->func_ov000_0208fc10(1) : this->func_ov000_0208fc10(0);
+}
+
+void ActorSwitchObject::vfunc_14(u32 param1) {
+    bool bVar1;
+    u32 uVar2;
+    u32 uVar3;
+    s32 iVar4;
+    s32 iVar5;
+
+    bVar1 = this->func_ov00_020c313c(param1);
+    if (bVar1 == NULL) {
+        return;
+    }
+    uVar2 = this->mUnk_130;
+    switch (uVar2) {
+        default:
+            if (uVar2 == 2) {
+                break;
+            }
+            return;
+        case 0:
+            uVar3 = this->func_ov000_0208fcb4();
+            switch (uVar3) {
+                case 1: this->func_ov000_0208fc10(1); return;
+                case 2: this->func_ov000_0208fc10(2); return;
+                default: return;
+            }
+            bVar1 = this->func_ov000_0208fc10(2);
+            return;
+        case 1:
+            iVar4 = this->func_ov000_0208fcb4();
+            if (iVar4 == 1) {
+                return;
+            }
+            bVar1 = this->func_ov000_0208fc10(0);
+            return;
+    }
+
+    iVar5               = this->mActiveFrames + 1;
+    this->mActiveFrames = iVar5;
+    if (iVar5 < 0x1e) {
+        return;
+    }
+
+    this->func_ov000_0209032c();
+    bVar1 = this->func_ov000_0208fc10(0);
+
+    return;
+}
+
+void ActorSwitchObject::vfunc_18(u32 param1) {
+    this->vfunc_14(param1);
+}
+
+bool ActorSwitchObject::func_ov000_0208fc10(s32 param1) {
+    this->mUnk_130 = param1;
+
+    switch (param1) {
+        case 0: this->func_ov00_020c1c20(0, 0); break;
+        case 1:
+            this->func_ov00_020c1c20(0, 1);
+            if (this->mUnk_158 == 0) {
+                this->mAlive = false;
+            }
+            break;
+        case 2:
+            this->func_ov000_0208fef8();
+            this->mActiveFrames = 0;
+            break;
+    }
+
+    return true;
+}
+
+void ActorSwitchObject::func_ov000_0208fc7c() {
+    this->mUnk_158 = this->mUnk_020.mUnk_00[1];
+    this->mUnk_15c = this->mUnk_020.mUnk_00[2];
+    this->mUnk_164 = this->mUnk_020.mUnk_0a[1];
+    this->mUnk_168 = this->mUnk_164 + this->mUnk_020.mUnk_00[0];
+    this->mUnk_16c = this->mUnk_020.mUnk_08[1];
+    this->mUnk_160 = this->mUnk_164;
+}
+
 bool ActorSwitchObject::func_ov000_0208fcb4() {}
 void ActorSwitchObject::func_ov000_0208fef8() {}
-void ActorSwitchObject::func_ov000_0209032c() {}
+
+void ActorSwitchObject::func_ov000_0209032c() {
+    unk32 i;
+    for (i = this->mUnk_164; i < this->mUnk_168; i++) {
+        gMapManager->func_ov00_02084b38(i, this->mUnk_16c, 0);
+    }
+}
+
 ActorSwitchObject::~ActorSwitchObject() {}

src/00_Core/Item/ItemManager.cpp

@@ -231,7 +231,7 @@ ARM u16 ItemManager::GetAmmo(ItemFlag equipId) const {
     return (*mAmmo)[equipId];
 }
 
-ARM void ItemManager::GiveAmmo(ItemFlag equipId, u16 amount) {
+ARM void ItemManager::GiveAmmo(ItemFlag equipId, u32 amount) {
     (*mAmmo)[equipId] += amount;
     if ((*mAmmo)[equipId] <= this->GetMaxAmmo(equipId)) return;
     (*mAmmo)[equipId] = this->GetMaxAmmo(equipId);
@@ -240,9 +240,6 @@ ARM void ItemManager::GiveAmmo(ItemFlag equipId, u16 amount) {
 extern void *data_027e10a4;
 extern "C" bool func_ov015_02136670(void *param1);
 extern u8 data_ov022_0217a4ac[];
-extern "C" bool _ZN14PlayerLinkBase18func_ov00_020bbd80Ei(unk32 param1, unk32 param2);
-extern "C" bool _ZNK11ItemManager7HasItemEi();
-extern "C" void _ZN11ItemManager12GetEquipItemEi();
 ARM bool ItemManager::func_ov00_020ad790(unk32 param1) {
     unk32 unk1 = data_027e0d38->func_ov000_02078b40();
     if (unk1 == 2) return func_ov015_02136670(data_027e10a4);

src/00_Core/Player/LinkStateBase.cpp

@@ -16,7 +16,7 @@ void LinkStateBase::UpdateSwordShieldInUse() {}
 void LinkStateBase::func_ov00_020a81b8(unk32 param1, unk32 param2) {}
 LinkStateItem *LinkStateBase::GetLinkItemState() {}
 void LinkStateBase::LookAt(Vec3p *target) {}
-void LinkStateBase::func_ov00_020a81fc() {}
+void LinkStateBase::func_ov00_020a81fc(Vec3p *param1, unk32 param2) {}
 void LinkStateBase::AddHealth(s16 amount) {}
 void LinkStateBase::func_ov00_020a8224(unk32 param1) {}
 void LinkStateBase::TurnTo(s16 angle, unk32 param2, unk32 speed) {}
@@ -38,7 +38,7 @@ bool LinkStateBase::func_ov00_020a8638(unk32 param1) {}
 void LinkStateBase::Clear_PlayerLinkBase_Unk48(u16 flags) {}
 void LinkStateBase::func_ov00_020a8680(unk32 param1, unk16 param2, bool param3) {}
 void LinkStateBase::PlayerLinkBase_func_ov00_020bccc8() {}
-bool LinkStateBase::PlayerLinkBase_vfunc_58() {}
+bool LinkStateBase::PlayerLinkBase_vfunc_58(unk32 param1, ActorRef *param2) {}
 bool LinkStateBase::func_ov00_020a8704(s16 *pAngle) {}
 bool LinkStateBase::func_ov00_020a8774(Vec3p *param1, s32 angle) {}
 void LinkStateBase::func_ov00_020a8844(Vec3p *param1, bool param2, bool param3) {}
@@ -46,7 +46,7 @@ void LinkStateBase::func_ov00_020a8954(bool param1, unk32 *param2) {}
 void LinkStateBase::func_ov00_020a8994() {}
 void LinkStateBase::func_ov00_020a89bc(unk32 param1, unk32 param2) {}
 void LinkStateBase::func_ov00_020a8a08(unk32 param1) {}
-void LinkStateBase::func_ov00_020a8a4c(unk32 param1, unk32 param2) {}
+void LinkStateBase::func_ov00_020a8a4c(const void *param1, unk32 param2) {}
 void LinkStateBase::func_ov00_020a8a90(unk32 param1) {}
 void LinkStateBase::func_ov00_020a8ab0(unk32 param1) {}
 void LinkStateBase::func_ov00_020a8ad0(unk32 param1) {}

src/00_Core/Player/LinkStateItem.cpp

@@ -1,5 +1,6 @@
 #include "Player/LinkStateItem.hpp"
 #include "DTCM/UnkStruct_027e103c.hpp"
+#include "DTCM/UnkStruct_027e1098.hpp"
 #include "Item/ItemManager.hpp"
 #include "Player/EquipBomb.hpp"
 #include "Player/EquipHammer.hpp"
@@ -8,13 +9,8 @@
 #include "Player/PlayerControl.hpp"
 #include "Save/AdventureFlags.hpp"
 
-extern void func_ov000_020cf9dc(s32 param1, s32 param2, s32 param3);
-extern void func_ov014_0213ec64(s32 param1);
-extern void func_ov014_0211fd04(s32 *param1);
 extern void func_ov000_020b7e6c(s32 *param1);
 
-extern s32 *data_027e1098;
-
 THUMB void LinkStateItem::vfunc_00() {}
 
 ARM LinkStateId LinkStateItem::GetId() {
@@ -42,7 +38,7 @@ ARM void LinkStateItem::OnStateLeave(s32 param1) {
             if (*(u8 *) (iVar3 + 0xe0) == '\0') {
                 GetEquipBombchu()->func_ov014_0213ec64();
             }
-            func_ov014_0211fd04(data_027e1098);
+            data_027e1098->func_ov014_0211fd04();
             break;
         case ItemFlag_OshusSword: break;
         case ItemFlag_WoodenShield: break;

src/00_Core/Player/LinkStateMove.cpp

@@ -1,6 +1,6 @@
 #include "Player/LinkStateMove.hpp"
 
-unk32 data_ov000_020e56f0 = 0x800;
+unk32 LinkStateMove::data_ov000_020e56f0 = 0x800;
 
 THUMB void LinkStateMove::vfunc_00() {}
 

src/00_Core/Player/PlayerControlData.cpp

@@ -18,8 +18,8 @@ void PlayerControlData::vfunc_2c() {}
 void PlayerControlData::vfunc_30() {}
 void PlayerControlData::vfunc_34() {}
 unk32 PlayerControlData::vfunc_7c() {}
-unk32 PlayerControlData::vfunc_74() {}
-unk32 PlayerControlData::vfunc_78() {}
+unk32 PlayerControlData::vfunc_74(s32 param1) {}
+unk32 PlayerControlData::vfunc_78(s32 param1) {}
 void PlayerControlData::func_ov000_020b484c(s32 param1, s32 param2, s32 param3) {}
 void PlayerControlData::vfunc_6c(s32 param1, Vec3p *param2) {}
 void PlayerControlData::vfunc_5c() {}

src/04_Load/Player/LinkStateMove.cpp

@@ -1,5 +1,10 @@
 #include "Player/LinkStateMove.hpp"
 
-LinkStateMove::LinkStateMove(PlayerLinkBase *link) :
-    LinkStateBase(link) {}
-LinkStateMove::~LinkStateMove() {}
+THUMB LinkStateMove::LinkStateMove(PlayerLinkBase *link) :
+    LinkStateBase(link),
+    mUnk_0c(0),
+    mUnk_14(false),
+    mUnk_15(false),
+    mUnk_16(false) {}
+
+THUMB LinkStateMove::~LinkStateMove() {}

src/05/Player/LinkStateMove.cpp

@@ -1,5 +1,247 @@
 #include "Player/LinkStateMove.hpp"
+#include "DTCM/UnkStruct_027e0d38.hpp"
+#include "Player/LinkStateDamage.hpp"
+#include "Player/LinkStateFollow.hpp"
+#include "Player/LinkStateInteract.hpp"
+#include "Player/LinkStateItem.hpp"
+#include "Player/LinkStateRoll.hpp"
+#include "Player/PlayerControl.hpp"
+#include "Save/AdventureFlags.hpp"
+#include "Unknown/UnkStruct_02037750.hpp"
 
-void LinkStateMove::func_ov005_021113d0() {}
-void LinkStateMove::vfunc_1c() {}
-bool LinkStateMove::vfunc_3c() {}
+class UnkFilterActor : public FilterActorBase {
+public:
+    /* 00 (base) */
+    /* 04 */ Actor *mActor;
+    /* 08 */ q20 mUnk_08;
+    /* 0c */ Vec3p mPos;
+    /* 18 */ s16 mAngle;
+    /* 1a */
+
+    /* 0 */ virtual bool Filter(Actor *actor) override;
+    /* 4 */
+};
+
+struct UnkStruct_ov005_021123ac {
+    /* 00 */ unk32 mUnk_00;
+    /* 04 */ unk32 mUnk_04;
+    /* 08 */ unk32 mUnk_08;
+    /* 0c */ unk32 mUnk_0c;
+    /* 10 */
+};
+
+ARM void LinkStateMove::func_ov005_021113d0() {
+    mUnk_12 = 10;
+}
+
+static q4 data_ov005_02112be4          = FLOAT_TO_Q20(16 / 15.0);
+static q20 data_ov005_02112be8         = FLOAT_TO_Q20(1 / 64.0);
+static q20 data_ov005_02112bec         = FLOAT_TO_Q20(1 / 3.0);
+static const Vec3p data_ov005_021123ac = {
+    FLOAT_TO_Q20(0.0122),
+    FLOAT_TO_Q20(1.0),
+    FLOAT_TO_Q20(0.0),
+};
+static Vec3p data_ov005_02112bf0 = {
+    FLOAT_TO_Q20(0.3),
+    FLOAT_TO_Q20(0.25),
+    FLOAT_TO_Q20(0.01),
+};
+static const volatile q20 data_ov005_021123b8 = FLOAT_TO_Q20(15.0);
+
+extern LinkStateFollow *GetLinkStateFollow();
+extern unk32 data_027e0618;
+extern "C" bool Lerp(s32 *pValue, s32 dest, s32 factor, unk32 param4, u32 step);
+extern unk32 data_027e0ffc;
+extern "C" void func_ov000_020ceacc(unk32 *param1, unk32 param2, Vec3p *param3, unk32 param4);
+ARM void LinkStateMove::vfunc_1c() {
+    Actor *grabActor = this->GetGrabActor();
+    Vec3p sp4C;
+    s32 temp_r7 = GetLinkStateFollow()->func_ov00_020a9180(&sp4C);
+    s32 temp_r0 = UnkStruct_02037750::GetLinkStateInteract()->func_ov00_020ab770(&sp4C);
+    bool var_r9;
+    if ((temp_r0 == 0) && (temp_r7 == 0)) {
+        var_r9 = false;
+    } else {
+        var_r9 = true;
+    }
+    LinkStateDamage *damage = (LinkStateDamage *) GetLinkState(LinkStateId_Damage);
+    if (damage->vfunc_20(var_r9) != 0) {
+        this->ChangeLinkState(LinkStateId_Damage);
+        return;
+    }
+    if ((gAdventureFlags->func_ov00_02097738() == 0) && (data_027e0d38->mUnk_14 != 1)) {
+        LinkStateInteract *interact = (LinkStateInteract *) GetLinkState(LinkStateId_Interact);
+        if (interact->vfunc_20(var_r9) != 0) {
+            this->ChangeLinkState(LinkStateId_Interact);
+            return;
+        }
+        LinkStateFollow *follow = (LinkStateFollow *) GetLinkState(LinkStateId_Follow);
+        if (follow->vfunc_20(var_r9) != 0) {
+            this->ChangeLinkState(LinkStateId_Follow);
+            return;
+        }
+        LinkStateRoll *roll = (LinkStateRoll *) GetLinkState(LinkStateId_Roll);
+        if (roll->vfunc_20(var_r9) != 0) {
+            this->ChangeLinkState(LinkStateId_Roll);
+            return;
+        }
+        LinkStateItem *item = (LinkStateItem *) GetLinkState(LinkStateId_Item);
+        if (item->vfunc_20(var_r9) != 0) {
+            this->ChangeLinkState(LinkStateId_Item);
+            return;
+        }
+    }
+    if ((temp_r0 == 2) || (temp_r7 == 8)) {
+        this->UpdateSwordShieldInUse();
+    } else {
+        if ((temp_r0 == 3) || (temp_r0 == 4) || (temp_r0 == 5) || (temp_r7 == 3) || (temp_r7 == 4) || (temp_r7 == 5) ||
+            (temp_r7 == 9) || ((temp_r7 - 0xD) <= 1U))
+        {
+            this->EquipItem_vfunc_28();
+        }
+    }
+    if (data_027e0618 != 6) {
+        s32 temp_r7_2 = gPlayerControl->func_ov00_020b0418();
+        if ((this->func_ov00_020a8f2c() == 0) && (temp_r7_2 > 0)) {
+            mUnk_0c = temp_r7_2;
+        }
+        if (mUnk_0c > 0) {
+
+            q4 temp_r8  = data_ov005_02112be4;
+            s16 temp_r1 = *this->GetPlayerAngle() + this->Get_PlayerControlData_Unk32();
+            this->TurnTo(temp_r1, temp_r1, temp_r8);
+            s32 temp_r1_2 = mUnk_0c;
+            if (temp_r7_2 > temp_r1_2) {
+                temp_r1_2 = temp_r7_2 - temp_r1_2;
+                Lerp(&mUnk_0c, temp_r7_2 + temp_r1_2, data_ov005_02112bec, MUL_Q20(data_ov005_02112be8, data_ov005_02112bec),
+                     0x7FFFFFFF);
+                if (mUnk_0c > FLOAT_TO_Q20(1.0)) {
+                    mUnk_0c = FLOAT_TO_Q20(1.0);
+                }
+            } else {
+                Lerp(&mUnk_0c, temp_r7_2, data_ov000_020e56f0, MUL_Q20(data_ov005_02112be8, data_ov000_020e56f0), 0x7FFFFFFF);
+            }
+        }
+    }
+    s32 var_r4;
+    if (mUnk_16 != 1) {
+        if (var_r9 != 0) {
+            Vec3p sp40 = {0, 0, 0};
+            sp40.x     = sp4C.x - this->GetPlayerPos()->x;
+            sp40.z     = sp4C.z - this->GetPlayerPos()->z;
+            if (Vec3p_Length(&sp40) > FLOAT_TO_Q20(0.2)) {
+                var_r4 = this->func_ov005_0210f808(FLOAT_TO_Q20(1.0), &sp4C, grabActor != NULL);
+            } else {
+                gPlayerControl->StopFollowing();
+            }
+        } else {
+            s32 temp_r1_3 = gPlayerControl->func_ov00_020b034c();
+            var_r4        = this->func_ov005_0210f808(temp_r1_3, NULL, grabActor != NULL);
+            if (gAdventureFlags->func_ov00_02097750() == 0) {
+                UnkFilterActor filter;
+                filter.mActor  = NULL;
+                filter.mUnk_08 = FLOAT_TO_Q20(4.0);
+                Vec3p pos      = *this->GetPlayerPos();
+                filter.mPos    = pos;
+                filter.mAngle  = *this->GetPlayerAngle();
+                if (gActorManager->FilterActors(&filter, NULL) > 0) {
+                    q20 temp_r1_4 = FLOAT_TO_Q20(4.0) - filter.mUnk_08;
+                    Vec3p spC     = filter.mActor->mPos;
+                    spC.y += filter.mActor->mYOffset;
+                    q20 var_r2 = MUL_Q20(temp_r1_4, FLOAT_TO_Q20(0.25)) + FLOAT_TO_Q20(0.1);
+                    if (var_r2 >= FLOAT_TO_Q20(1.0)) {
+                        var_r2 = FLOAT_TO_Q20(1.0);
+                    }
+                    this->func_ov00_020a81fc(&spC, var_r2);
+                    this->func_ov005_021113d0();
+                }
+            }
+            if (mUnk_12 > 0) {
+                this->func_ov005_021107fc();
+                mUnk_12 -= 1;
+            } else if ((this->Get_PlayerLinkBase_Unk5e() != 0) && (var_r4 == 0)) {
+                this->func_ov00_020a8294(0, FLOAT_TO_Q20(0.2));
+                this->func_ov00_020a827c(0, FLOAT_TO_Q20(0.2));
+            }
+            if ((grabActor != NULL) && (grabActor->mType == ActorTypeId_Cucco)) {
+                if (this->func_ov00_020a8b80() != 0) {
+                    mUnk_10 = 0x19;
+                } else if (mUnk_10 > 0) {
+                    *(unk16 *) ((u32) this->func_ov00_020a8d40() + 0xa8) = 0x4CD;
+                    if (mUnk_10 == 0x19) {
+                        func_ov000_020ceacc(&data_027e0ffc, 0x23D, this->GetPlayerPos(), 0);
+                    }
+                    mUnk_10 -= 1;
+                } else {
+                    LinkStateInteract *interact = UnkStruct_02037750::GetLinkStateInteract();
+                    interact->SetGrabActorVelocity(this->GetPlayerVel());
+                }
+            }
+        }
+    }
+    if (this->GetGrabActor() == NULL) {
+        if (var_r4 <= data_ov005_02112bf0.x) {
+            this->func_ov005_021112ec();
+        }
+        if (mUnk_15) {
+            if (!mUnk_16) {
+                this->func_ov00_020a8a4c(&data_ov005_021123ac, 0);
+                this->func_ov00_020a8ad0(0);
+                mUnk_16 = true;
+            } else if (mUnk_0c > 0) {
+                q20 temp_r4 = data_ov005_021123b8;
+                if (this->func_ov00_020a8d6c() >= temp_r4) {
+                    this->func_ov00_020a8ad0(this->func_ov00_020a8d6c() - (temp_r4 - FLOAT_TO_Q20(7.0)));
+                }
+            } else {
+                mUnk_15 = false;
+                mUnk_16 = false;
+            }
+        }
+        ActorRef sp4;
+        sp4.Reset();
+        this->PlayerLinkBase_vfunc_58(0, &sp4);
+        return;
+    }
+    this->PlayerLinkBase_vfunc_58(1, this->GetGrabActorRef());
+}
+
+ARM bool LinkStateMove::vfunc_3c() {
+    if ((gPlayerControl->GetFollowActor() == NULL) && (gPlayerControl->mFollowObject == NULL) &&
+        (this->Get_PlayerControlData_Unk120() != 2) && (this->Get_PlayerControlData_Unk120() != 3))
+    {
+        return true;
+    }
+    return false;
+}
+
+ARM bool UnkFilterActor::Filter(Actor *actor) {
+    if (!actor->mVisible) {
+        return false;
+    }
+
+    s32 temp_r0 = actor->mUnk_12c;
+    if ((temp_r0 != 2) && (temp_r0 != 5)) {
+        return false;
+    }
+
+    Vec3p sp0;
+    Vec3p_Sub(&actor->mPos, &mPos, &sp0);
+    s16 angle2 = mAngle;
+    s16 angle1 = (s16) Atan2(sp0.x, sp0.z);
+    s32 var_r6 = (s16) (angle1 - angle2) >> 3;
+    if (var_r6 < 0) {
+        var_r6 = -var_r6;
+    }
+
+    q20 length  = Vec3p_Length(&sp0);
+    s32 temp_r2 = length + MUL_Q20(var_r6, FLOAT_TO_Q20(4.0));
+    if (temp_r2 < mUnk_08) {
+        mActor  = actor;
+        mUnk_08 = temp_r2;
+        return true;
+    }
+
+    return false;
+}

src/14_Land/Actor/ActorRupee.cpp

@@ -5,7 +5,6 @@
 #include "System/Random.hpp"
 
 extern "C" {
-void func_ov000_0207a1c8(bool *param_1, unk32 param_2, Vec3p *param_3);
 void func_0202bc38(unk32 param_1, Vec3p *param_2, u32 param_3, Actor_UnkStruct_012 *param_4, bool);
 void func_ov005_02102c2c(u32 *param_1, int param_2, Vec3p *param_3, int param_4, int param_5, u32 param_6, int param_7,
                          char param_8, char param_9, char param_10);
@@ -71,9 +70,9 @@ bool ActorRupee::vfunc_08() {
                 func_ov14_0213b204(0);
                 break;
             case 1:
-                q20 x = gRandom->Next(FLOAT_TO_Q20(0.1335));
-                q20 y = gRandom->Next(FLOAT_TO_Q20(0.2));
-                q20 z = gRandom->Next(FLOAT_TO_Q20(0.1335));
+                q20 x = gRandom.Next(FLOAT_TO_Q20(0.1335));
+                q20 y = gRandom.Next(FLOAT_TO_Q20(0.2));
+                q20 z = gRandom.Next(FLOAT_TO_Q20(0.1335));
 
                 mVel.x = x - FLOAT_TO_Q20(0.0666);
                 mVel.y = y + FLOAT_TO_Q20(0.3333);
@@ -263,14 +262,14 @@ void ActorRupee::vfunc_14(u32 param1) {
     if (func_ov00_020c313c(param1)) {
         Update(false);
     }
-    func_ov000_0207a1c8(&mUnk_0a4.mUnk_00, param1, &mPos);
+    mUnk_0a4.func_ov000_0207a1c8(param1, &mPos);
 }
 
 void ActorRupee::vfunc_18(u32 param1) {
     if (func_ov00_020c313c(param1)) {
         Update(true);
     }
-    func_ov000_0207a1c8(&mUnk_0a4.mUnk_00, param1, &mPos);
+    mUnk_0a4.func_ov000_0207a1c8(param1, &mPos);
 }
 
 #define VFUNC20_COND (param1 ? mUnk_0a4.mUnk_01 : mUnk_0a4.mUnk_00)

src/14_Land/Actor/Player/ActorRefill.cpp

@@ -0,0 +1,340 @@
+#include "Actor/Player/ActorRefill.hpp"
+#include "DTCM/UnkStruct_027e0d38.hpp"
+#include "DTCM/UnkStruct_027e103c.hpp"
+#include "Item/ItemManager.hpp"
+#include "System/Random.hpp"
+
+static char *sShipTypes[8] = {"anc", "bow", "hul", "can", "dco", "pdl", "fnl", "brg"};
+
+extern u32 **data_027e0fe0[];
+ARM ActorRefillBombs *ActorRefillBombs::Create() {
+    return new(*data_027e0fe0[0], 4) ActorRefillBombs();
+}
+ActorType ActorRefillBombs::gType = ActorType(ActorTypeId_RefillBombs, (ActorCreateFunc) ActorRefillBombs::Create, NULL);
+
+ARM ActorRefillBombchus *ActorRefillBombchus::Create() {
+    return new(*data_027e0fe0[0], 4) ActorRefillBombchus();
+}
+ActorType ActorRefillBombchus::gType =
+    ActorType(ActorTypeId_RefillBombchus, (ActorCreateFunc) ActorRefillBombchus::Create, NULL);
+
+ARM ActorRefillArrows *ActorRefillArrows::Create() {
+    return new(*data_027e0fe0[0], 4) ActorRefillArrows();
+}
+ActorType ActorRefillArrows::gType = ActorType(ActorTypeId_RefillArrows, (ActorCreateFunc) ActorRefillArrows::Create, NULL);
+
+ARM ActorRefillTime *ActorRefillTime::Create() {
+    return new(*data_027e0fe0[0], 4) ActorRefillTime();
+}
+ActorType ActorRefillTime::gType = ActorType(ActorTypeId_RefillTime, (ActorCreateFunc) ActorRefillTime::Create, NULL);
+
+ARM ActorLSTM *ActorLSTM::Create() {
+    return new(*data_027e0fe0[0], 4) ActorLSTM();
+}
+ActorType ActorLSTM::gType = ActorType(ActorTypeId_LSTM, (ActorCreateFunc) ActorLSTM::Create, NULL);
+
+ARM ActorRefill::ActorRefill(unk32 param1) :
+    mUnk_158(0),
+    mUnk_15c(0x56),
+    mUnk_160(param1),
+    mUnk_164(0x1f) {}
+
+ARM ActorRefill::~ActorRefill() {}
+
+ARM bool ActorRefill::vfunc_08() {
+    ItemManager *itemManager;
+
+    if (this->vfunc_b4() == ItemFlag_None) {
+        if (data_027e0d38->func_ov000_02078b40() != 3) {
+            return false;
+        }
+    } else {
+        ItemManager *itemManager = gItemManager;
+        ItemFlag item            = this->vfunc_b4();
+        if (!itemManager->HasItem(item)) {
+            return false;
+        }
+    }
+    mHitbox.pos.x      = 0;
+    mHitbox.pos.y      = FLOAT_TO_Q20(0.3);
+    mHitbox.pos.z      = 0;
+    mHitbox.size       = FLOAT_TO_Q20(0.3);
+    mUnk_08c.pos.x     = mHitbox.pos.x;
+    mUnk_08c.pos.y     = mHitbox.pos.y;
+    mUnk_08c.pos.z     = mHitbox.pos.z;
+    mUnk_08c.size      = mHitbox.size;
+    mUnk_0a4.mUnk_04.x = 0;
+    mUnk_0a4.mUnk_04.y = FLOAT_TO_Q20(0.3);
+    mUnk_0a4.mUnk_04.z = 0;
+    mUnk_0a4.mUnk_10   = FLOAT_TO_Q20(1.3);
+    mUnk_09c.mUnk_0 &= ~0xa4;
+    mUnk_09c.mUnk_3 = 1;
+    mMaxFall        = mUnk_08c.size + -1;
+    this->func_ov014_02135364(0);
+    return true;
+}
+
+extern unk32 data_ov000_020eec9c;
+extern "C" void func_ov000_020d7ad4(unk32 *param1, unk32 param2);
+ARM void ActorRefill::vfunc_14(u32 param1) {
+    s32 temp_r0_4;
+    s32 temp_r6;
+    s8 var_r0;
+    u32 temp_r0;
+    u32 temp_r0_3;
+    u32 temp_r1;
+    Vec3p *temp_r0_2;
+
+    if (this->func_ov00_020c313c(param1) != 0) {
+        this->IncreaseActiveFrames();
+        temp_r0 = mUnk_130;
+        switch (temp_r0) {
+            case 0:
+                this->ApplyGravity();
+                temp_r0_2 = &mPos;
+                Vec3p_Add(temp_r0_2, &mVel, temp_r0_2);
+                this->func_01fffd04(0);
+                if (mUnk_110 || mUnk_112 || mUnk_113) {
+                    mVel.x = 0;
+                    mVel.z = 0;
+                }
+                if (mUnk_111) {
+                    this->func_ov014_02135364(1);
+                } else if (this->func_ov00_020c2c0c()) {
+                    this->func_ov014_02135364(4);
+                } else if (this->func_ov00_020c2d54()) {
+                    this->func_ov014_02135364(5);
+                }
+                break;
+            case 1:
+            case 2:
+            case 4:
+            case 5:
+                if (this->CollidesWithPlayer(PlayerCollide_PickupFlags) != 0) {
+                    if (this->vfunc_b4() == -1) {
+                        data_027e103c->func_ov000_020cfbf0(mUnk_158 * 60, 1, 0);
+                    } else {
+                        ItemManager *itemManager = gItemManager;
+                        itemManager->GiveAmmo(this->vfunc_b4(), mUnk_158);
+                    }
+                    func_ov000_020d7ad4(&data_ov000_020eec9c, 0x100);
+                    this->func_ov014_02135364(3);
+                } else {
+                    temp_r0_3 = mUnk_130;
+                    switch (temp_r0_3) {
+                        case 0:
+                        case 3: break;
+                        case 1:
+                            if (this->func_ov00_020c2c0c()) {
+                                this->func_ov014_02135364(4);
+                            } else if (this->func_ov00_020c2d54()) {
+                                this->func_ov014_02135364(5);
+                            } else if (mActiveFrames >= 180) {
+                                this->func_ov014_02135364(2);
+                            }
+                            break;
+                        case 2:
+                            if (mActiveFrames % 8 < 4) {
+                                mUnk_164 = 0;
+                            } else {
+                                mUnk_164 = 31;
+                            }
+                            if (this->func_ov00_020c2c0c()) {
+                                this->func_ov014_02135364(4);
+                            } else if (this->func_ov00_020c2d54()) {
+                                this->func_ov014_02135364(5);
+                            } else if (mActiveFrames >= 60) {
+                                this->func_ov014_02135364(3);
+                            }
+                            break;
+                        case 4:
+                            if (!this->func_ov00_020c2c70()) {
+                                this->func_ov014_02135364(1);
+                            }
+                            break;
+                        case 5:
+                            if (!this->func_ov00_020c2de4()) {
+                                this->func_ov014_02135364(1);
+                            }
+                            break;
+                    }
+                }
+                break;
+        }
+        this->KillInBounds();
+    }
+    mUnk_0a4.func_ov000_0207a1c8(param1, &mPos);
+}
+
+ARM bool ActorRefill::func_ov014_02135364(unk32 param1) {
+    mUnk_130      = param1;
+    mUnk_164      = 31;
+    mActiveFrames = 0;
+    switch (mUnk_130) {
+        case 0:
+        case 2: break;
+        case 1:
+            mVel.x = 0;
+            mVel.y = 0;
+            mVel.z = 0;
+            break;
+        case 3: this->Kill(); break;
+    }
+    return true;
+}
+
+extern "C" void func_0202bc38(bool param1, Vec3p *pos, unk32 param2, Actor_UnkStruct_012 *param3, unk32 param4);
+extern u32 data_ov000_020e9370[];
+extern "C" void func_ov005_02102c2c(u32 *param_1, int param_2, Vec3p *param_3, int param_4, int param_5, u32 param_6,
+                                    int param_7, char param_8, char param_9, char param_10);
+ARM void ActorRefill::vfunc_20(bool param1) {
+    bool var_r0;
+
+    if (param1) {
+        var_r0 = mUnk_0a4.mUnk_01;
+    } else {
+        var_r0 = mUnk_0a4.mUnk_00;
+    }
+    if (var_r0 && mUnk_164 != 0) {
+        Actor_UnkStruct_012 sp18;
+        sp18.mUnk_04 = 5;
+        sp18.mUnk_08 = 2;
+        sp18.mUnk_0c = 2;
+        sp18.mUnk_14 = 0x800;
+        sp18.mUnk_18 = 0x1000;
+        sp18.mUnk_02 = mUnk_164;
+        func_0202bc38(param1, &mPos, mUnk_15c, &sp18, 0);
+        func_ov005_02102c2c(&data_ov000_020e9370[0], 0, &mPos, 0x400, 0x400, 0, mUnk_164, 0, 0, 1);
+    }
+}
+
+extern unk32 *data_027e0e58;
+extern "C" void func_ov000_0207c1b0(unk32 *param1, unk32 param2, Vec3p *param3, unk32 param4, unk32 param5, unk32 param6);
+ARM void ActorRefill::func_ov014_02135474() {
+    s32 iVar1 = mUnk_130;
+    if (iVar1 != 4 && iVar1 != 5) {
+        func_ov000_0207c1b0(data_027e0e58, 0x241, &mPos, 2, 0, 0);
+        func_ov000_0207c1b0(data_027e0e58, 0x242, &mPos, 2, 0, 0);
+        mAlive = false;
+    }
+}
+
+ARM ActorRefillBombs::ActorRefillBombs() :
+    ActorRefill(0) {
+    mUnk_158 = 3;
+    mUnk_15c = 0x2e;
+}
+
+ARM ActorRefillBombs::~ActorRefillBombs() {}
+
+ARM ItemFlag ActorRefillBombs::vfunc_b4() {
+    return ItemFlag_BombBag;
+}
+
+ARM ActorRefillBombchus::ActorRefillBombchus() :
+    ActorRefill(1) {
+    mUnk_158 = 3;
+    mUnk_15c = 0x2f;
+}
+
+ARM ActorRefillBombchus::~ActorRefillBombchus() {}
+
+ARM ItemFlag ActorRefillBombchus::vfunc_b4() {
+    return ItemFlag_BombchuBag;
+}
+
+ARM ActorRefillArrows::ActorRefillArrows() :
+    ActorRefill(2) {
+    mUnk_158 = 5;
+    mUnk_15c = 0x2d;
+}
+
+ARM ActorRefillArrows::~ActorRefillArrows() {}
+
+ARM ItemFlag ActorRefillArrows::vfunc_b4() {
+    return ItemFlag_Bow;
+}
+
+ARM ActorRefillTime::ActorRefillTime() :
+    ActorRefill(3) {
+    mUnk_158 = 5;
+    mUnk_15c = 0x44;
+}
+
+ARM ActorRefillTime::~ActorRefillTime() {}
+
+ARM bool ActorRefillTime::vfunc_08() {
+    if (!ActorRefill::vfunc_08()) {
+        return false;
+    }
+    switch (mUnk_020.mUnk_00[0]) {
+        case 2: mUnk_158 = 5; break;
+        case 4: mUnk_158 = 15; break;
+        case 5: mUnk_158 = 30; break;
+        default:
+        case 0:
+        case 1:
+        case 3:
+            s32 temp_ip = gRandom.Next(10);
+            if (temp_ip >= 9) {
+                mUnk_158 = 30;
+            } else if (temp_ip >= 6) {
+                mUnk_158 = 15;
+            } else {
+                mUnk_158 = 5;
+            }
+            break;
+    }
+    switch (mUnk_158) {
+        case 15: mUnk_15c = 0x45; break;
+        case 30: mUnk_15c = 0x46; break;
+        default: mUnk_15c = 0x44; break;
+    }
+    return true;
+}
+
+ARM ItemFlag ActorRefillTime::vfunc_b4() {
+    return ItemFlag_None;
+}
+
+ARM ActorLSTM::ActorLSTM() :
+    ActorRefill(3) {
+    mUnk_158 = -5;
+    mUnk_15c = 0x47;
+}
+
+ARM ActorLSTM::~ActorLSTM() {}
+
+ARM bool ActorLSTM::vfunc_08() {
+    if (!ActorRefill::vfunc_08()) {
+        return false;
+    }
+    switch (mUnk_020.mUnk_00[0]) {
+        case 2: mUnk_158 = -5; break;
+        case 4: mUnk_158 = -15; break;
+        case 5: mUnk_158 = -30; break;
+        default:
+        case 0:
+        case 1:
+        case 3:
+            s32 temp_ip = gRandom.Next(10);
+            if (temp_ip >= 9) {
+                mUnk_158 = -30;
+            } else if (temp_ip >= 6) {
+                mUnk_158 = -15;
+            } else {
+                mUnk_158 = -5;
+            }
+            break;
+    }
+    switch (mUnk_158) {
+        case -15: mUnk_15c = 0x48; break;
+        case -30: mUnk_15c = 0x49; break;
+        default: mUnk_15c = 0x47; break;
+    }
+    return true;
+}
+
+ARM ItemFlag ActorLSTM::vfunc_b4() {
+    return ItemFlag_None;
+}

src/Main/Debug/DebugHierarchyBase.cpp

@@ -11,7 +11,7 @@ void DebugHierarchyBase::vfunc_10() {}
 void DebugHierarchyBase::vfunc_14() {}
 void DebugHierarchyBase::vfunc_18() {}
 void DebugHierarchyBase::vfunc_1c() {}
-void DebugHierarchyBase::vfunc_20() {}
+void DebugHierarchyBase::vfunc_20(unk32 param1, const char *param2, unk32 param3, unk32 param4, unk32 param5, unk32 param6) {}
 void DebugHierarchyBase::vfunc_24() {}
 void DebugHierarchyBase::vfunc_28() {}
 void DebugHierarchyBase::vfunc_2c() {}

src/Main/Player/LinkState.cpp

@@ -1,5 +1,5 @@
 #include "Player/LinkStateBase.hpp"
 
-LinkStateBase *GetLinkState(s32 index) {
+LinkStateBase *GetLinkState(LinkStateId index) {
     return gLinkStates[index];
 }

tools/configure.py

@@ -26,7 +26,7 @@ args = parser.parse_args()
 
 # Config
 GAME = "ph"
-DSD_VERSION = 'v0.9.0'
+DSD_VERSION = 'v0.9.1'
 WIBO_VERSION = '0.6.16'
 OBJDIFF_VERSION = 'v2.7.1'
 MWCC_VERSION = "2.0/sp1p5"

tools/m2ctx.py

@@ -36,7 +36,7 @@ INCLUDE_REGEX = r'^\s*#\s*include\s*([<"][\S ]+[>"])\s*$'
 # Finds all line comments and multiline comments
 COMMENT_REGEX = r'\/\/.*$|\/\*(?:.|\r|\n)+?\*\/'
 
-with open(args.file, 'r', encoding="utf8") as f:
+with open(args.file, 'r', encoding=args.encoding) as f:
     contents = f.read()
 contents = re.sub(COMMENT_REGEX, '', contents, count=0, flags=re.MULTILINE)
 includes = re.findall(INCLUDE_REGEX, contents, flags=re.MULTILINE)