From 2aa4c6763945ac6b9d3268ff20ef8ba153ca89ab Mon Sep 17 00:00:00 2001
From: Aetias <aetias@outlook.com>
Date: Wed, 2 Jul 2025 00:17:59 +0200
Subject: [PATCH] Fix build

---
 config/eur/arm9/overlays/ov000/symbols.txt |   2 +-
 config/eur/arm9/overlays/ov005/relocs.txt  |   2 +-
 config/eur/arm9/overlays/ov005/symbols.txt |   2 +-
 config/eur/arm9/overlays/ov014/relocs.txt  | 116 ++++++++++-----------
 config/eur/arm9/overlays/ov059/delinks.txt |   4 +-
 config/eur/arm9/overlays/ov059/symbols.txt |  28 ++---
 config/usa/arm9/overlays/ov000/symbols.txt |   2 +-
 config/usa/arm9/overlays/ov005/relocs.txt  |   2 +-
 config/usa/arm9/overlays/ov005/symbols.txt |   2 +-
 config/usa/arm9/overlays/ov014/relocs.txt  | 112 ++++++++++----------
 config/usa/arm9/overlays/ov059/delinks.txt |   4 +-
 config/usa/arm9/overlays/ov059/symbols.txt |  28 ++---
 include/Player/EquipHammer.hpp             |   6 +-
 include/Player/LinkStateBase.hpp           |   8 +-
 src/00_Core/Player/LinkStateBase.cpp       |   2 +-
 src/59_Hammer/Actor/Navi/ActorNaviBase.cpp |   4 +-
 src/59_Hammer/Player/EquipHammer.cpp       |  35 ++-----
 17 files changed, 176 insertions(+), 183 deletions(-)

diff --git a/config/eur/arm9/overlays/ov000/symbols.txt b/config/eur/arm9/overlays/ov000/symbols.txt
index 3a9aa5ef..29f2daa7 100644
--- a/config/eur/arm9/overlays/ov000/symbols.txt
+++ b/config/eur/arm9/overlays/ov000/symbols.txt
@@ -1921,7 +1921,7 @@ _ZN13LinkStateBase18func_ov00_020a8774EP5Vec3pi kind:function(arm,size=0xd0) add
 _ZN13LinkStateBase18func_ov00_020a8844EP5Vec3pbb kind:function(arm,size=0x110) addr:0x20a8844
 _ZN13LinkStateBase18func_ov00_020a8954EbPi kind:function(arm,size=0x40) addr:0x20a8954
 _ZN13LinkStateBase18func_ov00_020a8994Ev kind:function(arm,size=0x28) addr:0x20a8994
-_ZN13LinkStateBase18func_ov00_020a89bcEPii kind:function(arm,size=0x4c) addr:0x20a89bc
+_ZN13LinkStateBase18func_ov00_020a89bcEP24LinkStateBase_UnkStruct1i kind:function(arm,size=0x4c) addr:0x20a89bc
 _ZN13LinkStateBase18func_ov00_020a8a08Ei kind:function(arm,size=0x44) addr:0x20a8a08
 _ZN13LinkStateBase18func_ov00_020a8a4cEPKvi kind:function(arm,size=0x44) addr:0x20a8a4c
 _ZN13LinkStateBase18func_ov00_020a8a90Ei kind:function(arm,size=0x20) addr:0x20a8a90
diff --git a/config/eur/arm9/overlays/ov005/relocs.txt b/config/eur/arm9/overlays/ov005/relocs.txt
index aaf7b5ff..3c32e51f 100644
--- a/config/eur/arm9/overlays/ov005/relocs.txt
+++ b/config/eur/arm9/overlays/ov005/relocs.txt
@@ -2519,7 +2519,7 @@ from:0x0211266c kind:load to:0x02199020 module:overlays(40,53,55)
 from:0x02112674 kind:load to:0x0219911c module:overlays(40,56)
 from:0x0211267c kind:load to:0x02199edc module:overlays(40,57)
 from:0x02112684 kind:load to:0x0219a47c module:overlays(53,58)
-from:0x0211268c kind:load to:0x021990a4 module:overlays(40,59)
+from:0x0211268c kind:load to:0x021990a4 module:overlay(59)
 from:0x02112694 kind:load to:0x02199654 module:overlays(40,55)
 from:0x0211269c kind:load to:0x02199654 module:overlays(40,55)
 from:0x021126a4 kind:load to:0x02105dac module:overlay(5)
diff --git a/config/eur/arm9/overlays/ov005/symbols.txt b/config/eur/arm9/overlays/ov005/symbols.txt
index a0c2e66b..05f10939 100644
--- a/config/eur/arm9/overlays/ov005/symbols.txt
+++ b/config/eur/arm9/overlays/ov005/symbols.txt
@@ -154,7 +154,7 @@ _ZN13LinkStateRoll19func_ov005_02107208Ej kind:function(arm,size=0xc) addr:0x210
 _ZN13LinkStateRoll19func_ov005_02107214Ev kind:function(arm,size=0x1a4) addr:0x2107214
 _ZN13LinkStateRoll19func_ov005_021073b8Ev kind:function(arm,size=0x204) addr:0x21073b8
 _ZN13LinkStateRoll19func_ov005_021075bcEv kind:function(arm,size=0x2b4) addr:0x21075bc
-_Z16GetLinkStateItemv kind:function(arm,size=0x10) addr:0x2107870
+_Z16GetLinkStateItemv kind:function(arm,size=0x10) addr:0x2107870 local
 _ZN13LinkStateRoll19func_ov005_02107880Ev kind:function(arm,size=0xd4) addr:0x2107880
 _ZN13LinkStateRoll19func_ov005_02107954Eiii kind:function(arm,size=0x220) addr:0x2107954
 _ZN13LinkStateRoll19func_ov005_02107b74EPiss kind:function(arm,size=0x60) addr:0x2107b74
diff --git a/config/eur/arm9/overlays/ov014/relocs.txt b/config/eur/arm9/overlays/ov014/relocs.txt
index 32eaed4d..99f8055c 100644
--- a/config/eur/arm9/overlays/ov014/relocs.txt
+++ b/config/eur/arm9/overlays/ov014/relocs.txt
@@ -5848,7 +5848,7 @@ from:0x02150524 kind:arm_call to:0x0208ccdc module:overlay(0)
 from:0x02150604 kind:load to:0x02050f54 module:main
 from:0x02150608 kind:load to:0x027e0f68 module:dtcm
 from:0x02150624 kind:load to:0x027e1058 module:dtcm
-from:0x02150628 kind:load to:0x0211c0a4 module:overlays(9,12)
+from:0x02150628 kind:load to:0x0211c0a4 module:overlay(9)
 from:0x02150632 kind:thumb_call to:0x020fab28 module:overlay(3)
 from:0x02150648 kind:thumb_call_arm to:0x0204f614 module:main
 from:0x02150654 kind:thumb_call to:0x0211cebc module:overlay(9)
@@ -7145,7 +7145,7 @@ from:0x02155cec kind:load to:0x02155cb8 module:overlay(14)
 from:0x02155cf0 kind:load to:0x02155cb4 module:overlay(14)
 from:0x02155cfc kind:load to:0x0212319c module:overlay(14)
 from:0x02155d00 kind:load to:0x0212315c module:overlay(14)
-from:0x02155d04 kind:load to:0x02199b94 module:overlays(40,53)
+from:0x02155d04 kind:load to:0x02199b94 module:overlay(53)
 from:0x02155d08 kind:load to:0x020c173c module:overlay(0)
 from:0x02155d0c kind:load to:0x021237ec module:overlay(14)
 from:0x02155d10 kind:load to:0x02123254 module:overlay(14)
@@ -7198,7 +7198,7 @@ from:0x02155de8 kind:load to:0x02155db4 module:overlay(14)
 from:0x02155dec kind:load to:0x02155db0 module:overlay(14)
 from:0x02155df8 kind:load to:0x021238a8 module:overlay(14)
 from:0x02155dfc kind:load to:0x02123858 module:overlay(14)
-from:0x02155e00 kind:load to:0x0219a568 module:overlays(53,57)
+from:0x02155e00 kind:load to:0x0219a568 module:overlay(57)
 from:0x02155e04 kind:load to:0x020c173c module:overlay(0)
 from:0x02155e08 kind:load to:0x02123ff1 module:overlay(14)
 from:0x02155e0c kind:load to:0x02123994 module:overlay(14)
@@ -9888,25 +9888,25 @@ from:0x02158d40 kind:load to:0x0211bd14 module:overlay(9)
 from:0x02158d44 kind:load to:0x0211bd58 module:overlay(9)
 from:0x02158d48 kind:load to:0x0213c505 module:overlay(14)
 from:0x02158d4c kind:load to:0x0213c5bc module:overlay(14)
-from:0x02158d58 kind:load to:0x02198d00 module:overlays(40,53,54,55,56,57,58,59)
+from:0x02158d58 kind:load to:0x02198d00 module:overlay(54)
 from:0x02158d5c kind:load to:0x0213cf9d module:overlay(14)
 from:0x02158d60 kind:load to:0x0213cfa9 module:overlay(14)
 from:0x02158d64 kind:load to:0x0213cfbc module:overlay(14)
-from:0x02158d68 kind:load to:0x0210ba89 module:overlays(4,7)
-from:0x02158d6c kind:load to:0x02198d68 module:overlays(40,54)
-from:0x02158d70 kind:load to:0x02198d2c module:overlays(40,54,55)
+from:0x02158d68 kind:load to:0x0210ba89 module:overlay(4)
+from:0x02158d6c kind:load to:0x02198d68 module:overlay(54)
+from:0x02158d70 kind:load to:0x02198d2c module:overlay(54)
 from:0x02158d74 kind:load to:0x020be8e0 module:overlay(0)
 from:0x02158d78 kind:load to:0x020beb5c module:overlay(0)
 from:0x02158d7c kind:load to:0x020be8fc module:overlay(0)
 from:0x02158d80 kind:load to:0x020be904 module:overlay(0)
 from:0x02158d84 kind:load to:0x020be964 module:overlay(0)
-from:0x02158d88 kind:load to:0x02198e04 module:overlays(40,54)
+from:0x02158d88 kind:load to:0x02198e04 module:overlay(54)
 from:0x02158d8c kind:load to:0x020be96c module:overlay(0)
-from:0x02158d90 kind:load to:0x02198e4c module:overlays(40,54)
+from:0x02158d90 kind:load to:0x02198e4c module:overlay(54)
 from:0x02158d94 kind:load to:0x020beb90 module:overlay(0)
-from:0x02158d98 kind:load to:0x02198d30 module:overlays(40,54)
+from:0x02158d98 kind:load to:0x02198d30 module:overlay(54)
 from:0x02158d9c kind:load to:0x02198d38 module:overlays(40,54)
-from:0x02158da0 kind:load to:0x02198d48 module:overlays(40,54)
+from:0x02158da0 kind:load to:0x02198d48 module:overlay(54)
 from:0x02158da4 kind:load to:0x020be988 module:overlay(0)
 from:0x02158dc8 kind:load to:0x02158dc4 module:overlay(14)
 from:0x02158dcc kind:load to:0x02158dc0 module:overlay(14)
@@ -9921,36 +9921,36 @@ from:0x02158df4 kind:load to:0x0213d011 module:overlay(14)
 from:0x02158df8 kind:load to:0x0213d03d module:overlay(14)
 from:0x02158dfc kind:load to:0x0213d17c module:overlay(14)
 from:0x02158e00 kind:load to:0x0213d079 module:overlay(14)
-from:0x02158e04 kind:load to:0x021993e8 module:overlays(40,53,56)
-from:0x02158e08 kind:load to:0x02199064 module:overlays(40,53)
-from:0x02158e0c kind:load to:0x021990d0 module:overlays(40,53)
+from:0x02158e04 kind:load to:0x021993e8 module:overlay(53)
+from:0x02158e08 kind:load to:0x02199064 module:overlay(53)
+from:0x02158e0c kind:load to:0x021990d0 module:overlay(53)
 from:0x02158e10 kind:load to:0x020beb5c module:overlay(0)
 from:0x02158e14 kind:load to:0x020be8fc module:overlay(0)
 from:0x02158e18 kind:load to:0x0213d06c module:overlay(14)
 from:0x02158e1c kind:load to:0x020be964 module:overlay(0)
-from:0x02158e20 kind:load to:0x0219913c module:overlays(40,53)
+from:0x02158e20 kind:load to:0x0219913c module:overlay(53)
 from:0x02158e24 kind:load to:0x020be96c module:overlay(0)
-from:0x02158e28 kind:load to:0x02199318 module:overlays(40,53)
+from:0x02158e28 kind:load to:0x02199318 module:overlay(53)
 from:0x02158e2c kind:load to:0x020beb90 module:overlay(0)
 from:0x02158e30 kind:load to:0x020be970 module:overlay(0)
 from:0x02158e34 kind:load to:0x020be978 module:overlay(0)
 from:0x02158e38 kind:load to:0x020be980 module:overlay(0)
 from:0x02158e3c kind:load to:0x020be988 module:overlay(0)
-from:0x02158e48 kind:load to:0x02198d00 module:overlays(40,53,54,55,56,57,58,59)
+from:0x02158e48 kind:load to:0x02198d00 module:overlay(55)
 from:0x02158e4c kind:load to:0x0213d214 module:overlay(14)
 from:0x02158e50 kind:load to:0x0213d1f8 module:overlay(14)
 from:0x02158e54 kind:load to:0x0213d1f0 module:overlay(14)
-from:0x02158e58 kind:load to:0x0210ba89 module:overlays(4,7)
-from:0x02158e5c kind:load to:0x02198d2c module:overlays(40,54,55)
-from:0x02158e60 kind:load to:0x02198d8c module:overlays(40,55)
+from:0x02158e58 kind:load to:0x0210ba89 module:overlay(4)
+from:0x02158e5c kind:load to:0x02198d2c module:overlay(55)
+from:0x02158e60 kind:load to:0x02198d8c module:overlay(55)
 from:0x02158e64 kind:load to:0x020be8e0 module:overlay(0)
 from:0x02158e68 kind:load to:0x020beb5c module:overlay(0)
 from:0x02158e6c kind:load to:0x020be8fc module:overlay(0)
 from:0x02158e70 kind:load to:0x020be904 module:overlay(0)
 from:0x02158e74 kind:load to:0x020be964 module:overlay(0)
-from:0x02158e78 kind:load to:0x02198da4 module:overlays(40,55)
+from:0x02158e78 kind:load to:0x02198da4 module:overlay(55)
 from:0x02158e7c kind:load to:0x020be96c module:overlay(0)
-from:0x02158e80 kind:load to:0x02198df8 module:overlays(40,55,56)
+from:0x02158e80 kind:load to:0x02198df8 module:overlay(55)
 from:0x02158e84 kind:load to:0x020beb90 module:overlay(0)
 from:0x02158e88 kind:load to:0x020be970 module:overlay(0)
 from:0x02158e8c kind:load to:0x020be978 module:overlay(0)
@@ -9970,36 +9970,36 @@ from:0x02158ee8 kind:load to:0x0213d315 module:overlay(14)
 from:0x02158eec kind:load to:0x0213d359 module:overlay(14)
 from:0x02158ef0 kind:load to:0x0213d3cc module:overlay(14)
 from:0x02158ef4 kind:load to:0x0213d3a1 module:overlay(14)
-from:0x02158ef8 kind:load to:0x021990b4 module:overlays(40,57)
-from:0x02158efc kind:load to:0x021992f4 module:overlays(40,57)
-from:0x02158f00 kind:load to:0x0219935c module:overlays(40,57)
+from:0x02158ef8 kind:load to:0x021990b4 module:overlay(57)
+from:0x02158efc kind:load to:0x021992f4 module:overlay(57)
+from:0x02158f00 kind:load to:0x0219935c module:overlay(57)
 from:0x02158f04 kind:load to:0x020beb5c module:overlay(0)
 from:0x02158f08 kind:load to:0x020be8fc module:overlay(0)
 from:0x02158f0c kind:load to:0x020be904 module:overlay(0)
 from:0x02158f10 kind:load to:0x020be964 module:overlay(0)
-from:0x02158f14 kind:load to:0x02199744 module:overlays(40,57)
+from:0x02158f14 kind:load to:0x02199744 module:overlay(57)
 from:0x02158f18 kind:load to:0x020be96c module:overlay(0)
-from:0x02158f1c kind:load to:0x021998f0 module:overlays(40,55,57)
+from:0x02158f1c kind:load to:0x021998f0 module:overlay(57)
 from:0x02158f20 kind:load to:0x020beb90 module:overlay(0)
 from:0x02158f24 kind:load to:0x020be970 module:overlay(0)
 from:0x02158f28 kind:load to:0x020be978 module:overlay(0)
 from:0x02158f2c kind:load to:0x020be980 module:overlay(0)
 from:0x02158f30 kind:load to:0x020be988 module:overlay(0)
-from:0x02158f3c kind:load to:0x02198d00 module:overlays(40,53,54,55,56,57,58,59)
+from:0x02158f3c kind:load to:0x02198d00 module:overlay(56)
 from:0x02158f40 kind:load to:0x0213ead5 module:overlay(14)
 from:0x02158f44 kind:load to:0x0213eae1 module:overlay(14)
 from:0x02158f48 kind:load to:0x0213eaf4 module:overlay(14)
-from:0x02158f4c kind:load to:0x0210ba89 module:overlays(4,7)
-from:0x02158f50 kind:load to:0x02198d4c module:overlays(40,56)
-from:0x02158f54 kind:load to:0x02198d84 module:overlays(40,56)
+from:0x02158f4c kind:load to:0x0210ba89 module:overlay(4)
+from:0x02158f50 kind:load to:0x02198d4c module:overlay(56)
+from:0x02158f54 kind:load to:0x02198d84 module:overlay(56)
 from:0x02158f58 kind:load to:0x020be8e0 module:overlay(0)
 from:0x02158f5c kind:load to:0x020beb5c module:overlay(0)
 from:0x02158f60 kind:load to:0x020be8fc module:overlay(0)
 from:0x02158f64 kind:load to:0x020be904 module:overlay(0)
 from:0x02158f68 kind:load to:0x020be964 module:overlay(0)
-from:0x02158f6c kind:load to:0x02198de4 module:overlays(40,53,56)
+from:0x02158f6c kind:load to:0x02198de4 module:overlay(56)
 from:0x02158f70 kind:load to:0x020be96c module:overlay(0)
-from:0x02158f74 kind:load to:0x02198df8 module:overlays(40,55,56)
+from:0x02158f74 kind:load to:0x02198df8 module:overlay(56)
 from:0x02158f78 kind:load to:0x020beb90 module:overlay(0)
 from:0x02158f7c kind:load to:0x020be970 module:overlay(0)
 from:0x02158f80 kind:load to:0x020be978 module:overlay(0)
@@ -10009,10 +10009,10 @@ from:0x02158f94 kind:load to:0x02198fc1 module:overlay(58)
 from:0x02158f98 kind:load to:0x0213eb5d module:overlay(14)
 from:0x02158f9c kind:load to:0x0213eb7d module:overlay(14)
 from:0x02158fa0 kind:load to:0x0213ecac module:overlay(14)
-from:0x02158fa4 kind:load to:0x0210ba89 module:overlays(4,7)
-from:0x02158fa8 kind:load to:0x02199284 module:overlays(40,58)
-from:0x02158fac kind:load to:0x0219903d module:overlays(40,58)
-from:0x02158fb0 kind:load to:0x02199061 module:overlays(40,58)
+from:0x02158fa4 kind:load to:0x0210ba89 module:overlay(4)
+from:0x02158fa8 kind:load to:0x02199284 module:overlay(58)
+from:0x02158fac kind:load to:0x0219903d module:overlay(58)
+from:0x02158fb0 kind:load to:0x02199061 module:overlay(58)
 from:0x02158fb4 kind:load to:0x020beb5c module:overlay(0)
 from:0x02158fb8 kind:load to:0x020be8fc module:overlay(0)
 from:0x02158fbc kind:load to:0x020be904 module:overlay(0)
@@ -10030,16 +10030,16 @@ from:0x02158ff0 kind:load to:0x0213ede5 module:overlay(14)
 from:0x02158ff4 kind:load to:0x0213edf1 module:overlay(14)
 from:0x02158ff8 kind:load to:0x0213ee08 module:overlay(14)
 from:0x02158ffc kind:load to:0x0213ee05 module:overlay(14)
-from:0x02159000 kind:load to:0x02198d00 module:overlays(40,53,54,55,56,57,58,59)
-from:0x02159004 kind:load to:0x02198e3c module:overlays(40,59)
-from:0x02159008 kind:load to:0x02198e58 module:overlays(40,59)
+from:0x02159000 kind:load to:0x02198d00 module:overlay(59)
+from:0x02159004 kind:load to:0x02198e3c module:overlay(59)
+from:0x02159008 kind:load to:0x02198e58 module:overlay(59)
 from:0x0215900c kind:load to:0x020beb5c module:overlay(0)
 from:0x02159010 kind:load to:0x020be8fc module:overlay(0)
 from:0x02159014 kind:load to:0x020be904 module:overlay(0)
-from:0x02159018 kind:load to:0x02198fcc module:overlays(40,59)
-from:0x0215901c kind:load to:0x02198e6c module:overlays(40,59)
+from:0x02159018 kind:load to:0x02198fcc module:overlay(59)
+from:0x0215901c kind:load to:0x02198e6c module:overlay(59)
 from:0x02159020 kind:load to:0x020be96c module:overlay(0)
-from:0x02159024 kind:load to:0x02198fc8 module:overlays(40,59)
+from:0x02159024 kind:load to:0x02198fc8 module:overlay(59)
 from:0x02159028 kind:load to:0x0213ee10 module:overlay(14)
 from:0x0215902c kind:load to:0x020be970 module:overlay(0)
 from:0x02159030 kind:load to:0x020be978 module:overlay(0)
@@ -10061,9 +10061,9 @@ from:0x02159094 kind:load to:0x020bb46c module:overlay(0)
 from:0x02159098 kind:load to:0x020bb4dc module:overlay(0)
 from:0x0215909c kind:load to:0x020bba60 module:overlay(0)
 from:0x021590a0 kind:load to:0x0213efd1 module:overlay(14)
-from:0x021590a4 kind:load to:0x0210ab21 module:overlays(4,7)
+from:0x021590a4 kind:load to:0x0210ab21 module:overlay(4)
 from:0x021590a8 kind:load to:0x0213f334 module:overlay(14)
-from:0x021590ac kind:load to:0x0210eaa0 module:overlays(5,7)
+from:0x021590ac kind:load to:0x0210eaa0 module:overlay(5)
 from:0x021590b0 kind:load to:0x0213f104 module:overlay(14)
 from:0x021590b4 kind:load to:0x020bbed4 module:overlay(0)
 from:0x021590b8 kind:load to:0x020bcad8 module:overlay(0)
@@ -10107,7 +10107,7 @@ from:0x021591ac kind:load to:0x02183744 module:overlay(40)
 from:0x021591b0 kind:load to:0x02141b30 module:overlay(14)
 from:0x021591b4 kind:load to:0x0213ff34 module:overlay(14)
 from:0x021591b8 kind:load to:0x0213fee5 module:overlay(14)
-from:0x021591bc kind:load to:0x0210b679 module:overlays(4,7)
+from:0x021591bc kind:load to:0x0210b679 module:overlay(4)
 from:0x021591c0 kind:load to:0x021400c0 module:overlay(14)
 from:0x021591c4 kind:load to:0x020b471c module:overlay(0)
 from:0x021591c8 kind:load to:0x021402c0 module:overlay(14)
@@ -11338,41 +11338,41 @@ from:0x0215a7b0 kind:load to:0x0215a78c module:overlay(14)
 from:0x0215a7b4 kind:load to:0x0215a788 module:overlay(14)
 from:0x0215a7b8 kind:load to:0x0215a784 module:overlay(14)
 from:0x0215a7bc kind:load to:0x0215a780 module:overlay(14)
-from:0x0215a7c8 kind:load to:0x021991a8 module:overlays(40,55)
+from:0x0215a7c8 kind:load to:0x021991a8 module:overlay(55)
 from:0x0215a7cc kind:load to:0x021515e9 module:overlay(14)
 from:0x0215a7d0 kind:load to:0x021515f5 module:overlay(14)
 from:0x0215a7d4 kind:load to:0x02151608 module:overlay(14)
-from:0x0215a7d8 kind:load to:0x0210ba89 module:overlays(4,7)
+from:0x0215a7d8 kind:load to:0x0210ba89 module:overlay(4)
 from:0x0215a7dc kind:load to:0x02151610 module:overlay(14)
-from:0x0215a7e0 kind:load to:0x021991ac module:overlays(40,55)
-from:0x0215a7e4 kind:load to:0x021991b0 module:overlays(40,55)
+from:0x0215a7e0 kind:load to:0x021991ac module:overlay(55)
+from:0x0215a7e4 kind:load to:0x021991b0 module:overlay(55)
 from:0x0215a7e8 kind:load to:0x020beb5c module:overlay(0)
 from:0x0215a7ec kind:load to:0x020be8fc module:overlay(0)
 from:0x0215a7f0 kind:load to:0x020be904 module:overlay(0)
 from:0x0215a7f4 kind:load to:0x020be964 module:overlay(0)
-from:0x0215a7f8 kind:load to:0x02199274 module:overlays(40,55)
+from:0x0215a7f8 kind:load to:0x02199274 module:overlay(55)
 from:0x0215a7fc kind:load to:0x020be96c module:overlay(0)
-from:0x0215a800 kind:load to:0x02199278 module:overlays(40,55)
+from:0x0215a800 kind:load to:0x02199278 module:overlay(55)
 from:0x0215a804 kind:load to:0x020beb90 module:overlay(0)
 from:0x0215a808 kind:load to:0x020be970 module:overlay(0)
 from:0x0215a80c kind:load to:0x020be978 module:overlay(0)
 from:0x0215a810 kind:load to:0x020be980 module:overlay(0)
 from:0x0215a814 kind:load to:0x020be988 module:overlay(0)
-from:0x0215a820 kind:load to:0x021991a8 module:overlays(40,55)
+from:0x0215a820 kind:load to:0x021991a8 module:overlay(55)
 from:0x0215a824 kind:load to:0x021515a9 module:overlay(14)
 from:0x0215a828 kind:load to:0x021515b5 module:overlay(14)
 from:0x0215a82c kind:load to:0x021515c8 module:overlay(14)
-from:0x0215a830 kind:load to:0x0210ba89 module:overlays(4,7)
+from:0x0215a830 kind:load to:0x0210ba89 module:overlay(4)
 from:0x0215a834 kind:load to:0x02151610 module:overlay(14)
-from:0x0215a838 kind:load to:0x021991ac module:overlays(40,55)
-from:0x0215a83c kind:load to:0x021991b0 module:overlays(40,55)
+from:0x0215a838 kind:load to:0x021991ac module:overlay(55)
+from:0x0215a83c kind:load to:0x021991b0 module:overlay(55)
 from:0x0215a840 kind:load to:0x020beb5c module:overlay(0)
 from:0x0215a844 kind:load to:0x020be8fc module:overlay(0)
 from:0x0215a848 kind:load to:0x020be904 module:overlay(0)
 from:0x0215a84c kind:load to:0x020be964 module:overlay(0)
-from:0x0215a850 kind:load to:0x02199274 module:overlays(40,55)
+from:0x0215a850 kind:load to:0x02199274 module:overlay(55)
 from:0x0215a854 kind:load to:0x020be96c module:overlay(0)
-from:0x0215a858 kind:load to:0x02199278 module:overlays(40,55)
+from:0x0215a858 kind:load to:0x02199278 module:overlay(55)
 from:0x0215a85c kind:load to:0x020beb90 module:overlay(0)
 from:0x0215a860 kind:load to:0x020be970 module:overlay(0)
 from:0x0215a864 kind:load to:0x020be978 module:overlay(0)
diff --git a/config/eur/arm9/overlays/ov059/delinks.txt b/config/eur/arm9/overlays/ov059/delinks.txt
index 69f9561e..630335cc 100644
--- a/config/eur/arm9/overlays/ov059/delinks.txt
+++ b/config/eur/arm9/overlays/ov059/delinks.txt
@@ -6,10 +6,10 @@
 
 
 src/59_Hammer/Player/EquipHammer.cpp:
+    complete
     .text        start:0x02198d00 end:0x0219933c
-    .data        start:0x0219b140 end:0x0219b180
+    .data        start:0x0219b140 end:0x0219b1c0
 
 src/59_Hammer/Actor/Navi/ActorNaviBase.cpp:
     .text        start:0x0219933c end:0x0219b110
     .rodata      start:0x0219b110 end:0x0219b124
-    .ctor       start:0x0219b124 end:0x0219b128
diff --git a/config/eur/arm9/overlays/ov059/symbols.txt b/config/eur/arm9/overlays/ov059/symbols.txt
index 73a25090..6cb01a6f 100644
--- a/config/eur/arm9/overlays/ov059/symbols.txt
+++ b/config/eur/arm9/overlays/ov059/symbols.txt
@@ -1,5 +1,5 @@
 _ZNK11EquipHammer8IsUsableEi kind:function(arm,size=0x12c) addr:0x2198d00
-_Z16GetLinkStateItemv kind:function(arm,size=0x10) addr:0x2198e2c local
+_ZN11EquipHammer16GetLinkStateItemEv kind:function(arm,size=0x10) addr:0x2198e2c
 _ZN11EquipHammer8vfunc_18Ev kind:function(arm,size=0x1c) addr:0x2198e3c
 _ZN11EquipHammer8vfunc_1cEv kind:function(arm,size=0x14) addr:0x2198e58
 _ZN11EquipHammer8vfunc_30Ev kind:function(arm,size=0x24) addr:0x2198e6c
@@ -24,16 +24,16 @@ _ZN9ActorNavi19func_ov059_0219af14Ev kind:function(arm,size=0xb0) addr:0x219af14
 _ZN9ActorNavi19func_ov059_0219afc4Ev kind:function(arm,size=0x5c) addr:0x219afc4
 _ZN9ActorNavi19func_ov059_0219b020Ev kind:function(arm,size=0xf0) addr:0x219b020
 data_ov059_0219b110 kind:data(any) addr:0x219b110
-data_ov059_0219b140 kind:data(any) addr:0x219b140
-data_ov059_0219b144 kind:data(any) addr:0x219b144
-data_ov059_0219b148 kind:data(any) addr:0x219b148
-data_ov059_0219b14c kind:data(any) addr:0x219b14c
-data_ov059_0219b150 kind:data(any) addr:0x219b150
-data_ov059_0219b154 kind:data(any) addr:0x219b154
-data_ov059_0219b158 kind:data(any) addr:0x219b158
-data_ov059_0219b15c kind:data(any) addr:0x219b15c
-data_ov059_0219b160 kind:data(any) addr:0x219b160
-data_ov059_0219b180 kind:data(any) addr:0x219b180
-data_ov059_0219b190 kind:data(any) addr:0x219b190
-data_ov059_0219b1a0 kind:data(any) addr:0x219b1a0
-data_ov059_0219b1b0 kind:data(any) addr:0x219b1b0
+@1761 kind:data(any) addr:0x219b140 local
+@1760 kind:data(any) addr:0x219b144 local
+@1759 kind:data(any) addr:0x219b148 local
+@1758 kind:data(any) addr:0x219b14c local
+@1757 kind:data(any) addr:0x219b150 local
+@1756 kind:data(any) addr:0x219b154 local
+@1755 kind:data(any) addr:0x219b158 local
+@1754 kind:data(any) addr:0x219b15c local
+gShipParts kind:data(any) addr:0x219b160 local
+data_ov059_0219b180 kind:data(any) addr:0x219b180 local
+data_ov059_0219b190 kind:data(any) addr:0x219b190 local
+data_ov059_0219b1a0 kind:data(any) addr:0x219b1a0 local
+data_ov059_0219b1b0 kind:data(any) addr:0x219b1b0 local
diff --git a/config/usa/arm9/overlays/ov000/symbols.txt b/config/usa/arm9/overlays/ov000/symbols.txt
index 5448d534..0ed21e2d 100644
--- a/config/usa/arm9/overlays/ov000/symbols.txt
+++ b/config/usa/arm9/overlays/ov000/symbols.txt
@@ -1921,7 +1921,7 @@ _ZN13LinkStateBase18func_ov00_020a8774EP5Vec3pi kind:function(arm,size=0xd0) add
 _ZN13LinkStateBase18func_ov00_020a8844EP5Vec3pbb kind:function(arm,size=0x110) addr:0x20a87e4
 _ZN13LinkStateBase18func_ov00_020a8954EbPi kind:function(arm,size=0x40) addr:0x20a88f4
 _ZN13LinkStateBase18func_ov00_020a8994Ev kind:function(arm,size=0x28) addr:0x20a8934
-_ZN13LinkStateBase18func_ov00_020a89bcEPii kind:function(arm,size=0x4c) addr:0x20a895c
+_ZN13LinkStateBase18func_ov00_020a89bcEP24LinkStateBase_UnkStruct1i kind:function(arm,size=0x4c) addr:0x20a895c
 _ZN13LinkStateBase18func_ov00_020a8a08Ei kind:function(arm,size=0x44) addr:0x20a89a8
 _ZN13LinkStateBase18func_ov00_020a8a4cEPKvi kind:function(arm,size=0x44) addr:0x20a89ec
 _ZN13LinkStateBase18func_ov00_020a8a90Ei kind:function(arm,size=0x20) addr:0x20a8a30
diff --git a/config/usa/arm9/overlays/ov005/relocs.txt b/config/usa/arm9/overlays/ov005/relocs.txt
index eeed1b5e..fe57d0e2 100644
--- a/config/usa/arm9/overlays/ov005/relocs.txt
+++ b/config/usa/arm9/overlays/ov005/relocs.txt
@@ -2519,7 +2519,7 @@ from:0x021125ec kind:load to:0x02198f80 module:overlays(40,53,55)
 from:0x021125f4 kind:load to:0x0219907c module:overlays(40,56)
 from:0x021125fc kind:load to:0x02199e3c module:overlays(40,57)
 from:0x02112604 kind:load to:0x0219a3dc module:overlays(53,58)
-from:0x0211260c kind:load to:0x02199004 module:overlays(40,59)
+from:0x0211260c kind:load to:0x02199004 module:overlay(59)
 from:0x02112614 kind:load to:0x021995b4 module:overlays(40,55)
 from:0x0211261c kind:load to:0x021995b4 module:overlays(40,55)
 from:0x02112624 kind:load to:0x02105d2c module:overlay(5)
diff --git a/config/usa/arm9/overlays/ov005/symbols.txt b/config/usa/arm9/overlays/ov005/symbols.txt
index 26670bd8..603d9a2e 100644
--- a/config/usa/arm9/overlays/ov005/symbols.txt
+++ b/config/usa/arm9/overlays/ov005/symbols.txt
@@ -154,7 +154,7 @@ _ZN13LinkStateRoll19func_ov005_02107208Ej kind:function(arm,size=0xc) addr:0x210
 _ZN13LinkStateRoll19func_ov005_02107214Ev kind:function(arm,size=0x1a4) addr:0x2107194
 _ZN13LinkStateRoll19func_ov005_021073b8Ev kind:function(arm,size=0x204) addr:0x2107338
 _ZN13LinkStateRoll19func_ov005_021075bcEv kind:function(arm,size=0x2b4) addr:0x210753c
-_Z16GetLinkStateItemv kind:function(arm,size=0x10) addr:0x21077f0
+_Z16GetLinkStateItemv kind:function(arm,size=0x10) addr:0x21077f0 local
 _ZN13LinkStateRoll19func_ov005_02107880Ev kind:function(arm,size=0xd4) addr:0x2107800
 _ZN13LinkStateRoll19func_ov005_02107954Eiii kind:function(arm,size=0x220) addr:0x21078d4
 _ZN13LinkStateRoll19func_ov005_02107b74EPiss kind:function(arm,size=0x60) addr:0x2107af4
diff --git a/config/usa/arm9/overlays/ov014/relocs.txt b/config/usa/arm9/overlays/ov014/relocs.txt
index 46843a25..42a2431a 100644
--- a/config/usa/arm9/overlays/ov014/relocs.txt
+++ b/config/usa/arm9/overlays/ov014/relocs.txt
@@ -5848,7 +5848,7 @@ from:0x02150480 kind:arm_call to:0x0208cc7c module:overlay(0)
 from:0x02150560 kind:load to:0x02050f10 module:main
 from:0x02150564 kind:load to:0x027e0f68 module:dtcm
 from:0x02150580 kind:load to:0x027e1058 module:dtcm
-from:0x02150584 kind:load to:0x0211c024 module:overlays(9,12)
+from:0x02150584 kind:load to:0x0211c024 module:overlay(9)
 from:0x0215058e kind:thumb_call to:0x020faa9c module:overlay(3)
 from:0x021505a4 kind:thumb_call_arm to:0x0204f5d0 module:main
 from:0x021505b0 kind:thumb_call to:0x0211ce3c module:overlay(9)
@@ -7145,7 +7145,7 @@ from:0x02155c4c kind:load to:0x02155c18 module:overlay(14)
 from:0x02155c50 kind:load to:0x02155c14 module:overlay(14)
 from:0x02155c5c kind:load to:0x0212311c module:overlay(14)
 from:0x02155c60 kind:load to:0x021230dc module:overlay(14)
-from:0x02155c64 kind:load to:0x02199af4 module:overlays(40,53)
+from:0x02155c64 kind:load to:0x02199af4 module:overlay(53)
 from:0x02155c68 kind:load to:0x020c16dc module:overlay(0)
 from:0x02155c6c kind:load to:0x0212376c module:overlay(14)
 from:0x02155c70 kind:load to:0x021231d4 module:overlay(14)
@@ -7198,7 +7198,7 @@ from:0x02155d48 kind:load to:0x02155d14 module:overlay(14)
 from:0x02155d4c kind:load to:0x02155d10 module:overlay(14)
 from:0x02155d58 kind:load to:0x02123828 module:overlay(14)
 from:0x02155d5c kind:load to:0x021237d8 module:overlay(14)
-from:0x02155d60 kind:load to:0x0219a4c8 module:overlays(53,57)
+from:0x02155d60 kind:load to:0x0219a4c8 module:overlay(57)
 from:0x02155d64 kind:load to:0x020c16dc module:overlay(0)
 from:0x02155d68 kind:load to:0x02123f71 module:overlay(14)
 from:0x02155d6c kind:load to:0x02123914 module:overlay(14)
@@ -9888,25 +9888,25 @@ from:0x02158ca0 kind:load to:0x0211bc94 module:overlay(9)
 from:0x02158ca4 kind:load to:0x0211bcd8 module:overlay(9)
 from:0x02158ca8 kind:load to:0x0213c461 module:overlay(14)
 from:0x02158cac kind:load to:0x0213c518 module:overlay(14)
-from:0x02158cb8 kind:load to:0x02198c60 module:overlays(40,53,54,55,56,57,58,59)
+from:0x02158cb8 kind:load to:0x02198c60 module:overlay(54)
 from:0x02158cbc kind:load to:0x0213cef9 module:overlay(14)
 from:0x02158cc0 kind:load to:0x0213cf05 module:overlay(14)
 from:0x02158cc4 kind:load to:0x0213cf18 module:overlay(14)
-from:0x02158cc8 kind:load to:0x0210ba09 module:overlays(4,7)
-from:0x02158ccc kind:load to:0x02198cc8 module:overlays(40,54)
-from:0x02158cd0 kind:load to:0x02198c8c module:overlays(40,54,55)
+from:0x02158cc8 kind:load to:0x0210ba09 module:overlay(4)
+from:0x02158ccc kind:load to:0x02198cc8 module:overlay(54)
+from:0x02158cd0 kind:load to:0x02198c8c module:overlay(54)
 from:0x02158cd4 kind:load to:0x020be880 module:overlay(0)
 from:0x02158cd8 kind:load to:0x020beafc module:overlay(0)
 from:0x02158cdc kind:load to:0x020be89c module:overlay(0)
 from:0x02158ce0 kind:load to:0x020be8a4 module:overlay(0)
 from:0x02158ce4 kind:load to:0x020be904 module:overlay(0)
-from:0x02158ce8 kind:load to:0x02198d64 module:overlays(40,54)
+from:0x02158ce8 kind:load to:0x02198d64 module:overlay(54)
 from:0x02158cec kind:load to:0x020be90c module:overlay(0)
-from:0x02158cf0 kind:load to:0x02198dac module:overlays(40,54)
+from:0x02158cf0 kind:load to:0x02198dac module:overlay(54)
 from:0x02158cf4 kind:load to:0x020beb30 module:overlay(0)
-from:0x02158cf8 kind:load to:0x02198c90 module:overlays(40,54)
+from:0x02158cf8 kind:load to:0x02198c90 module:overlay(54)
 from:0x02158cfc kind:load to:0x02198c98 module:overlays(40,54)
-from:0x02158d00 kind:load to:0x02198ca8 module:overlays(40,54)
+from:0x02158d00 kind:load to:0x02198ca8 module:overlay(54)
 from:0x02158d04 kind:load to:0x020be928 module:overlay(0)
 from:0x02158d28 kind:load to:0x02158d24 module:overlay(14)
 from:0x02158d2c kind:load to:0x02158d20 module:overlay(14)
@@ -9921,36 +9921,36 @@ from:0x02158d54 kind:load to:0x0213cf6d module:overlay(14)
 from:0x02158d58 kind:load to:0x0213cf99 module:overlay(14)
 from:0x02158d5c kind:load to:0x0213d0d8 module:overlay(14)
 from:0x02158d60 kind:load to:0x0213cfd5 module:overlay(14)
-from:0x02158d64 kind:load to:0x02199348 module:overlays(40,53,56)
-from:0x02158d68 kind:load to:0x02198fc4 module:overlays(40,53)
-from:0x02158d6c kind:load to:0x02199030 module:overlays(40,53)
+from:0x02158d64 kind:load to:0x02199348 module:overlay(53)
+from:0x02158d68 kind:load to:0x02198fc4 module:overlay(53)
+from:0x02158d6c kind:load to:0x02199030 module:overlay(53)
 from:0x02158d70 kind:load to:0x020beafc module:overlay(0)
 from:0x02158d74 kind:load to:0x020be89c module:overlay(0)
 from:0x02158d78 kind:load to:0x0213cfc8 module:overlay(14)
 from:0x02158d7c kind:load to:0x020be904 module:overlay(0)
-from:0x02158d80 kind:load to:0x0219909c module:overlays(40,53)
+from:0x02158d80 kind:load to:0x0219909c module:overlay(53)
 from:0x02158d84 kind:load to:0x020be90c module:overlay(0)
-from:0x02158d88 kind:load to:0x02199278 module:overlays(40,53)
+from:0x02158d88 kind:load to:0x02199278 module:overlay(53)
 from:0x02158d8c kind:load to:0x020beb30 module:overlay(0)
 from:0x02158d90 kind:load to:0x020be910 module:overlay(0)
 from:0x02158d94 kind:load to:0x020be918 module:overlay(0)
 from:0x02158d98 kind:load to:0x020be920 module:overlay(0)
 from:0x02158d9c kind:load to:0x020be928 module:overlay(0)
-from:0x02158da8 kind:load to:0x02198c60 module:overlays(40,53,54,55,56,57,58,59)
+from:0x02158da8 kind:load to:0x02198c60 module:overlay(55)
 from:0x02158dac kind:load to:0x0213d170 module:overlay(14)
 from:0x02158db0 kind:load to:0x0213d154 module:overlay(14)
 from:0x02158db4 kind:load to:0x0213d14c module:overlay(14)
-from:0x02158db8 kind:load to:0x0210ba09 module:overlays(4,7)
-from:0x02158dbc kind:load to:0x02198c8c module:overlays(40,54,55)
-from:0x02158dc0 kind:load to:0x02198cec module:overlays(40,55)
+from:0x02158db8 kind:load to:0x0210ba09 module:overlay(4)
+from:0x02158dbc kind:load to:0x02198c8c module:overlay(55)
+from:0x02158dc0 kind:load to:0x02198cec module:overlay(55)
 from:0x02158dc4 kind:load to:0x020be880 module:overlay(0)
 from:0x02158dc8 kind:load to:0x020beafc module:overlay(0)
 from:0x02158dcc kind:load to:0x020be89c module:overlay(0)
 from:0x02158dd0 kind:load to:0x020be8a4 module:overlay(0)
 from:0x02158dd4 kind:load to:0x020be904 module:overlay(0)
-from:0x02158dd8 kind:load to:0x02198d04 module:overlays(40,55)
+from:0x02158dd8 kind:load to:0x02198d04 module:overlay(55)
 from:0x02158ddc kind:load to:0x020be90c module:overlay(0)
-from:0x02158de0 kind:load to:0x02198d58 module:overlays(40,55,56)
+from:0x02158de0 kind:load to:0x02198d58 module:overlay(55)
 from:0x02158de4 kind:load to:0x020beb30 module:overlay(0)
 from:0x02158de8 kind:load to:0x020be910 module:overlay(0)
 from:0x02158dec kind:load to:0x020be918 module:overlay(0)
@@ -9970,36 +9970,36 @@ from:0x02158e48 kind:load to:0x0213d271 module:overlay(14)
 from:0x02158e4c kind:load to:0x0213d2b5 module:overlay(14)
 from:0x02158e50 kind:load to:0x0213d328 module:overlay(14)
 from:0x02158e54 kind:load to:0x0213d2fd module:overlay(14)
-from:0x02158e58 kind:load to:0x02199014 module:overlays(40,57)
-from:0x02158e5c kind:load to:0x02199254 module:overlays(40,57)
-from:0x02158e60 kind:load to:0x021992bc module:overlays(40,57)
+from:0x02158e58 kind:load to:0x02199014 module:overlay(57)
+from:0x02158e5c kind:load to:0x02199254 module:overlay(57)
+from:0x02158e60 kind:load to:0x021992bc module:overlay(57)
 from:0x02158e64 kind:load to:0x020beafc module:overlay(0)
 from:0x02158e68 kind:load to:0x020be89c module:overlay(0)
 from:0x02158e6c kind:load to:0x020be8a4 module:overlay(0)
 from:0x02158e70 kind:load to:0x020be904 module:overlay(0)
-from:0x02158e74 kind:load to:0x021996a4 module:overlays(40,57)
+from:0x02158e74 kind:load to:0x021996a4 module:overlay(57)
 from:0x02158e78 kind:load to:0x020be90c module:overlay(0)
-from:0x02158e7c kind:load to:0x02199850 module:overlays(40,55,57)
+from:0x02158e7c kind:load to:0x02199850 module:overlay(57)
 from:0x02158e80 kind:load to:0x020beb30 module:overlay(0)
 from:0x02158e84 kind:load to:0x020be910 module:overlay(0)
 from:0x02158e88 kind:load to:0x020be918 module:overlay(0)
 from:0x02158e8c kind:load to:0x020be920 module:overlay(0)
 from:0x02158e90 kind:load to:0x020be928 module:overlay(0)
-from:0x02158e9c kind:load to:0x02198c60 module:overlays(40,53,54,55,56,57,58,59)
+from:0x02158e9c kind:load to:0x02198c60 module:overlay(56)
 from:0x02158ea0 kind:load to:0x0213ea31 module:overlay(14)
 from:0x02158ea4 kind:load to:0x0213ea3d module:overlay(14)
 from:0x02158ea8 kind:load to:0x0213ea50 module:overlay(14)
-from:0x02158eac kind:load to:0x0210ba09 module:overlays(4,7)
-from:0x02158eb0 kind:load to:0x02198cac module:overlays(40,56)
-from:0x02158eb4 kind:load to:0x02198ce4 module:overlays(40,56)
+from:0x02158eac kind:load to:0x0210ba09 module:overlay(4)
+from:0x02158eb0 kind:load to:0x02198cac module:overlay(56)
+from:0x02158eb4 kind:load to:0x02198ce4 module:overlay(56)
 from:0x02158eb8 kind:load to:0x020be880 module:overlay(0)
 from:0x02158ebc kind:load to:0x020beafc module:overlay(0)
 from:0x02158ec0 kind:load to:0x020be89c module:overlay(0)
 from:0x02158ec4 kind:load to:0x020be8a4 module:overlay(0)
 from:0x02158ec8 kind:load to:0x020be904 module:overlay(0)
-from:0x02158ecc kind:load to:0x02198d44 module:overlays(40,53,56)
+from:0x02158ecc kind:load to:0x02198d44 module:overlay(56)
 from:0x02158ed0 kind:load to:0x020be90c module:overlay(0)
-from:0x02158ed4 kind:load to:0x02198d58 module:overlays(40,55,56)
+from:0x02158ed4 kind:load to:0x02198d58 module:overlay(56)
 from:0x02158ed8 kind:load to:0x020beb30 module:overlay(0)
 from:0x02158edc kind:load to:0x020be910 module:overlay(0)
 from:0x02158ee0 kind:load to:0x020be918 module:overlay(0)
@@ -10009,8 +10009,8 @@ from:0x02158ef4 kind:load to:0x02198f21 module:overlay(58)
 from:0x02158ef8 kind:load to:0x0213eab9 module:overlay(14)
 from:0x02158efc kind:load to:0x0213ead9 module:overlay(14)
 from:0x02158f00 kind:load to:0x0213ec08 module:overlay(14)
-from:0x02158f04 kind:load to:0x0210ba09 module:overlays(4,7)
-from:0x02158f08 kind:load to:0x021991e4 module:overlays(40,58)
+from:0x02158f04 kind:load to:0x0210ba09 module:overlay(4)
+from:0x02158f08 kind:load to:0x021991e4 module:overlay(58)
 from:0x02158f0c kind:load to:0x02198f9d module:overlay(58)
 from:0x02158f10 kind:load to:0x02198fc1 module:overlay(58)
 from:0x02158f14 kind:load to:0x020beafc module:overlay(0)
@@ -10030,16 +10030,16 @@ from:0x02158f50 kind:load to:0x0213ed41 module:overlay(14)
 from:0x02158f54 kind:load to:0x0213ed4d module:overlay(14)
 from:0x02158f58 kind:load to:0x0213ed64 module:overlay(14)
 from:0x02158f5c kind:load to:0x0213ed61 module:overlay(14)
-from:0x02158f60 kind:load to:0x02198c60 module:overlays(40,53,54,55,56,57,58,59)
-from:0x02158f64 kind:load to:0x02198d9c module:overlays(40,59)
-from:0x02158f68 kind:load to:0x02198db8 module:overlays(40,59)
+from:0x02158f60 kind:load to:0x02198c60 module:overlay(59)
+from:0x02158f64 kind:load to:0x02198d9c module:overlay(59)
+from:0x02158f68 kind:load to:0x02198db8 module:overlay(59)
 from:0x02158f6c kind:load to:0x020beafc module:overlay(0)
 from:0x02158f70 kind:load to:0x020be89c module:overlay(0)
 from:0x02158f74 kind:load to:0x020be8a4 module:overlay(0)
-from:0x02158f78 kind:load to:0x02198f2c module:overlays(40,59)
-from:0x02158f7c kind:load to:0x02198dcc module:overlays(40,59)
+from:0x02158f78 kind:load to:0x02198f2c module:overlay(59)
+from:0x02158f7c kind:load to:0x02198dcc module:overlay(59)
 from:0x02158f80 kind:load to:0x020be90c module:overlay(0)
-from:0x02158f84 kind:load to:0x02198f28 module:overlays(40,59)
+from:0x02158f84 kind:load to:0x02198f28 module:overlay(59)
 from:0x02158f88 kind:load to:0x0213ed6c module:overlay(14)
 from:0x02158f8c kind:load to:0x020be910 module:overlay(0)
 from:0x02158f90 kind:load to:0x020be918 module:overlay(0)
@@ -10061,9 +10061,9 @@ from:0x02158ff4 kind:load to:0x020bb40c module:overlay(0)
 from:0x02158ff8 kind:load to:0x020bb47c module:overlay(0)
 from:0x02158ffc kind:load to:0x020bba00 module:overlay(0)
 from:0x02159000 kind:load to:0x0213ef2d module:overlay(14)
-from:0x02159004 kind:load to:0x0210aaa1 module:overlays(4,7)
+from:0x02159004 kind:load to:0x0210aaa1 module:overlay(4)
 from:0x02159008 kind:load to:0x0213f290 module:overlay(14)
-from:0x0215900c kind:load to:0x0210ea20 module:overlays(5,7)
+from:0x0215900c kind:load to:0x0210ea20 module:overlay(5)
 from:0x02159010 kind:load to:0x0213f060 module:overlay(14)
 from:0x02159014 kind:load to:0x020bbe74 module:overlay(0)
 from:0x02159018 kind:load to:0x020bca78 module:overlay(0)
@@ -10107,7 +10107,7 @@ from:0x0215910c kind:load to:0x021836a4 module:overlay(40)
 from:0x02159110 kind:load to:0x02141a8c module:overlay(14)
 from:0x02159114 kind:load to:0x0213fe90 module:overlay(14)
 from:0x02159118 kind:load to:0x0213fe41 module:overlay(14)
-from:0x0215911c kind:load to:0x0210b5f9 module:overlays(4,7)
+from:0x0215911c kind:load to:0x0210b5f9 module:overlay(4)
 from:0x02159120 kind:load to:0x0214001c module:overlay(14)
 from:0x02159124 kind:load to:0x020b46bc module:overlay(0)
 from:0x02159128 kind:load to:0x0214021c module:overlay(14)
@@ -11338,41 +11338,41 @@ from:0x0215a710 kind:load to:0x0215a6ec module:overlay(14)
 from:0x0215a714 kind:load to:0x0215a6e8 module:overlay(14)
 from:0x0215a718 kind:load to:0x0215a6e4 module:overlay(14)
 from:0x0215a71c kind:load to:0x0215a6e0 module:overlay(14)
-from:0x0215a728 kind:load to:0x02199108 module:overlays(40,55)
+from:0x0215a728 kind:load to:0x02199108 module:overlay(55)
 from:0x0215a72c kind:load to:0x02151545 module:overlay(14)
 from:0x0215a730 kind:load to:0x02151551 module:overlay(14)
 from:0x0215a734 kind:load to:0x02151564 module:overlay(14)
-from:0x0215a738 kind:load to:0x0210ba09 module:overlays(4,7)
+from:0x0215a738 kind:load to:0x0210ba09 module:overlay(4)
 from:0x0215a73c kind:load to:0x0215156c module:overlay(14)
-from:0x0215a740 kind:load to:0x0219910c module:overlays(40,55)
-from:0x0215a744 kind:load to:0x02199110 module:overlays(40,55)
+from:0x0215a740 kind:load to:0x0219910c module:overlay(55)
+from:0x0215a744 kind:load to:0x02199110 module:overlay(55)
 from:0x0215a748 kind:load to:0x020beafc module:overlay(0)
 from:0x0215a74c kind:load to:0x020be89c module:overlay(0)
 from:0x0215a750 kind:load to:0x020be8a4 module:overlay(0)
 from:0x0215a754 kind:load to:0x020be904 module:overlay(0)
-from:0x0215a758 kind:load to:0x021991d4 module:overlays(40,55)
+from:0x0215a758 kind:load to:0x021991d4 module:overlay(55)
 from:0x0215a75c kind:load to:0x020be90c module:overlay(0)
-from:0x0215a760 kind:load to:0x021991d8 module:overlays(40,55)
+from:0x0215a760 kind:load to:0x021991d8 module:overlay(55)
 from:0x0215a764 kind:load to:0x020beb30 module:overlay(0)
 from:0x0215a768 kind:load to:0x020be910 module:overlay(0)
 from:0x0215a76c kind:load to:0x020be918 module:overlay(0)
 from:0x0215a770 kind:load to:0x020be920 module:overlay(0)
 from:0x0215a774 kind:load to:0x020be928 module:overlay(0)
-from:0x0215a780 kind:load to:0x02199108 module:overlays(40,55)
+from:0x0215a780 kind:load to:0x02199108 module:overlay(55)
 from:0x0215a784 kind:load to:0x02151505 module:overlay(14)
 from:0x0215a788 kind:load to:0x02151511 module:overlay(14)
 from:0x0215a78c kind:load to:0x02151524 module:overlay(14)
-from:0x0215a790 kind:load to:0x0210ba09 module:overlays(4,7)
+from:0x0215a790 kind:load to:0x0210ba09 module:overlay(4)
 from:0x0215a794 kind:load to:0x0215156c module:overlay(14)
-from:0x0215a798 kind:load to:0x0219910c module:overlays(40,55)
-from:0x0215a79c kind:load to:0x02199110 module:overlays(40,55)
+from:0x0215a798 kind:load to:0x0219910c module:overlay(55)
+from:0x0215a79c kind:load to:0x02199110 module:overlay(55)
 from:0x0215a7a0 kind:load to:0x020beafc module:overlay(0)
 from:0x0215a7a4 kind:load to:0x020be89c module:overlay(0)
 from:0x0215a7a8 kind:load to:0x020be8a4 module:overlay(0)
 from:0x0215a7ac kind:load to:0x020be904 module:overlay(0)
-from:0x0215a7b0 kind:load to:0x021991d4 module:overlays(40,55)
+from:0x0215a7b0 kind:load to:0x021991d4 module:overlay(55)
 from:0x0215a7b4 kind:load to:0x020be90c module:overlay(0)
-from:0x0215a7b8 kind:load to:0x021991d8 module:overlays(40,55)
+from:0x0215a7b8 kind:load to:0x021991d8 module:overlay(55)
 from:0x0215a7bc kind:load to:0x020beb30 module:overlay(0)
 from:0x0215a7c0 kind:load to:0x020be910 module:overlay(0)
 from:0x0215a7c4 kind:load to:0x020be918 module:overlay(0)
diff --git a/config/usa/arm9/overlays/ov059/delinks.txt b/config/usa/arm9/overlays/ov059/delinks.txt
index 9e1114d5..febe3396 100644
--- a/config/usa/arm9/overlays/ov059/delinks.txt
+++ b/config/usa/arm9/overlays/ov059/delinks.txt
@@ -5,10 +5,10 @@
     .bss        start:0x0219b120 end:0x0219b120 kind:bss align:32
 
 src/59_Hammer/Player/EquipHammer.cpp:
+    complete
     .text        start:0x02198c60 end:0x0219929c
-    .data        start:0x0219b0a0 end:0x0219b0e0
+    .data        start:0x0219b0a0 end:0x0219b120
 
 src/59_Hammer/Actor/Navi/ActorNaviBase.cpp:
     .text        start:0x0219929c end:0x0219b070
     .rodata      start:0x0219b070 end:0x0219b084
-    .ctor        start:0x0219b084 end:0x0219b088
diff --git a/config/usa/arm9/overlays/ov059/symbols.txt b/config/usa/arm9/overlays/ov059/symbols.txt
index 246e951a..849721d4 100644
--- a/config/usa/arm9/overlays/ov059/symbols.txt
+++ b/config/usa/arm9/overlays/ov059/symbols.txt
@@ -1,5 +1,5 @@
 _ZNK11EquipHammer8IsUsableEi kind:function(arm,size=0x12c) addr:0x2198c60
-_Z16GetLinkStateItemv kind:function(arm,size=0x10) addr:0x2198d8c local
+_ZN11EquipHammer16GetLinkStateItemEv kind:function(arm,size=0x10) addr:0x2198d8c
 _ZN11EquipHammer8vfunc_18Ev kind:function(arm,size=0x1c) addr:0x2198d9c
 _ZN11EquipHammer8vfunc_1cEv kind:function(arm,size=0x14) addr:0x2198db8
 _ZN11EquipHammer8vfunc_30Ev kind:function(arm,size=0x24) addr:0x2198dcc
@@ -24,16 +24,16 @@ _ZN13ActorNaviBase19func_ov059_0219af14Ev kind:function(arm,size=0xb0) addr:0x21
 _ZN13ActorNaviBase19func_ov059_0219afc4Ev kind:function(arm,size=0x5c) addr:0x219af24
 _ZN13ActorNaviBase19func_ov059_0219b020Ev kind:function(arm,size=0xf0) addr:0x219af80
 data_ov059_0219b110 kind:data(any) addr:0x219b070
-data_ov059_0219b140 kind:data(any) addr:0x219b0a0
-data_ov059_0219b144 kind:data(any) addr:0x219b0a4
-data_ov059_0219b148 kind:data(any) addr:0x219b0a8
-data_ov059_0219b14c kind:data(any) addr:0x219b0ac
-data_ov059_0219b150 kind:data(any) addr:0x219b0b0
-data_ov059_0219b154 kind:data(any) addr:0x219b0b4
-data_ov059_0219b158 kind:data(any) addr:0x219b0b8
-data_ov059_0219b15c kind:data(any) addr:0x219b0bc
-data_ov059_0219b160 kind:data(any) addr:0x219b0c0
-data_ov059_0219b180 kind:data(any) addr:0x219b0e0
-data_ov059_0219b190 kind:data(any) addr:0x219b0f0
-data_ov059_0219b1a0 kind:data(any) addr:0x219b100
-data_ov059_0219b1b0 kind:data(any) addr:0x219b110
+@1761 kind:data(any) addr:0x219b0a0 local
+@1760 kind:data(any) addr:0x219b0a4 local
+@1759 kind:data(any) addr:0x219b0a8 local
+@1758 kind:data(any) addr:0x219b0ac local
+@1757 kind:data(any) addr:0x219b0b0 local
+@1756 kind:data(any) addr:0x219b0b4 local
+@1755 kind:data(any) addr:0x219b0b8 local
+@1754 kind:data(any) addr:0x219b0bc local
+gShipParts kind:data(any) addr:0x219b0c0 local
+data_ov059_0219b180 kind:data(any) addr:0x219b0e0 local
+data_ov059_0219b190 kind:data(any) addr:0x219b0f0 local
+data_ov059_0219b1a0 kind:data(any) addr:0x219b100 local
+data_ov059_0219b1b0 kind:data(any) addr:0x219b110 local
diff --git a/include/Player/EquipHammer.hpp b/include/Player/EquipHammer.hpp
index 81543dbc..2ac0322a 100644
--- a/include/Player/EquipHammer.hpp
+++ b/include/Player/EquipHammer.hpp
@@ -14,6 +14,8 @@ typedef enum EquipHammerState {
     /* 0x20000 */ EQUIP_HAMMER_STATE_CHARGED  = (2 << 16),
 } EquipHammerState;
 
+class LinkStateItem;
+
 class EquipHammer : public EquipItem {
 private:
     /* 00 (base) */
@@ -44,6 +46,7 @@ public:
 
     EquipHammer();
 
+    static LinkStateItem *GetLinkStateItem();
     void func_ov059_02198e90();
     bool func_ov059_02198ebc();
     bool func_ov059_02198ed4();
@@ -64,7 +67,4 @@ public:
     }
 };
 
-class LinkStateItem;
-
-extern LinkStateItem *GetLinkStateItem();
 extern EquipHammer *GetEquipHammer();
diff --git a/include/Player/LinkStateBase.hpp b/include/Player/LinkStateBase.hpp
index 2c3891db..8f5ebd6c 100644
--- a/include/Player/LinkStateBase.hpp
+++ b/include/Player/LinkStateBase.hpp
@@ -24,6 +24,12 @@ enum LinkStateId_ {
     LinkStateId_COUNT
 };
 
+struct LinkStateBase_UnkStruct1 {
+    /* 00 */ unk32 mUnk_00;
+    /* 04 */ Vec3p mUnk_04;
+    /* 10 */
+};
+
 class LinkStateItem;
 
 class LinkStateBase : public SysObject {
@@ -88,7 +94,7 @@ public:
     void func_ov00_020a8844(Vec3p *param1, bool param2, bool param3);
     void func_ov00_020a8954(bool param1, unk32 *param2);
     void func_ov00_020a8994();
-    void func_ov00_020a89bc(unk32 *param1, unk32 param2);
+    void func_ov00_020a89bc(LinkStateBase_UnkStruct1 *param1, unk32 param2);
     void func_ov00_020a8a08(unk32 param1);
     void func_ov00_020a8a4c(const void *param1, unk32 param2);
     void func_ov00_020a8a90(unk32 param1);
diff --git a/src/00_Core/Player/LinkStateBase.cpp b/src/00_Core/Player/LinkStateBase.cpp
index 5db80967..a750d276 100644
--- a/src/00_Core/Player/LinkStateBase.cpp
+++ b/src/00_Core/Player/LinkStateBase.cpp
@@ -44,7 +44,7 @@ bool LinkStateBase::func_ov00_020a8774(Vec3p *param1, s32 angle) {}
 void LinkStateBase::func_ov00_020a8844(Vec3p *param1, bool param2, bool param3) {}
 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_020a89bc(LinkStateBase_UnkStruct1 *param1, unk32 param2) {}
 void LinkStateBase::func_ov00_020a8a08(unk32 param1) {}
 void LinkStateBase::func_ov00_020a8a4c(const void *param1, unk32 param2) {}
 void LinkStateBase::func_ov00_020a8a90(unk32 param1) {}
diff --git a/src/59_Hammer/Actor/Navi/ActorNaviBase.cpp b/src/59_Hammer/Actor/Navi/ActorNaviBase.cpp
index 84f4913c..840da600 100644
--- a/src/59_Hammer/Actor/Navi/ActorNaviBase.cpp
+++ b/src/59_Hammer/Actor/Navi/ActorNaviBase.cpp
@@ -132,7 +132,7 @@ ARM void ActorNavi::func_ov059_0219aba8(u32 param1) {
 
     switch (param1) {
         case 3:
-            uVar1 = GetLinkStateItem();
+            uVar1 = EquipHammer::GetLinkStateItem();
 
             if (uVar1->mUnk_25[2] != 0 && uVar1->mUnk_25[3] != 0) {
                 break;
@@ -185,7 +185,7 @@ ARM void ActorNavi::func_ov059_0219aba8(u32 param1) {
             }
             break;
         case 4:
-            uVar1 = GetLinkStateItem();
+            uVar1 = EquipHammer::GetLinkStateItem();
 
             if (uVar1->mUnk_25[2] != 0 && uVar1->mUnk_25[3] != 0) {
                 break;
diff --git a/src/59_Hammer/Player/EquipHammer.cpp b/src/59_Hammer/Player/EquipHammer.cpp
index f9edd1e4..cfccec9b 100644
--- a/src/59_Hammer/Player/EquipHammer.cpp
+++ b/src/59_Hammer/Player/EquipHammer.cpp
@@ -8,28 +8,10 @@
 #include "Player/PlayerControl.hpp"
 #include "Player/PlayerLink.hpp"
 
-char *gShipParts[8] = {"anc", "bow", "hul", "can", "dco", "pdl", "fnl", "brg"};
+static char *gShipParts[8] = {"anc", "bow", "hul", "can", "dco", "pdl", "fnl", "brg"};
 
 extern "C" void ApproachAngle_thunk(s16 *src, s16 dst, u32 param3);
 
-struct EquipHammer_UnkStruct {
-    /* 00 */ unk8 mUnk_00[0x20];
-    /* 20 */ unk32 mUnk_20;
-    /* 24 */ unk8 mUnk_24[0xC];
-    /* 30 */ unk32 mUnk_30;
-    /* 34 */ unk8 mUnk_34[0xC];
-    /* 40 */ unk32 mUnk_40;
-    /* 44 */ unk8 mUnk_44[0xC];
-    /* 50 */ unk32 mUnk_50;
-    /* 54 */
-};
-
-extern EquipHammer_UnkStruct data_ov059_0219b160;
-extern unk32 data_ov059_0219b180;
-extern unk32 data_ov059_0219b190;
-extern unk32 data_ov059_0219b1a0;
-extern unk32 data_ov059_0219b1b0;
-
 ARM bool EquipHammer::IsUsable(unk32 param1) const {
     ActorNavi *pAVar3;
 
@@ -74,7 +56,12 @@ ARM bool EquipHammer::IsUsable(unk32 param1) const {
     return true;
 }
 
-ARM LinkStateItem *GetLinkStateItem() {
+static LinkStateBase_UnkStruct1 data_ov059_0219b180 = {0x39, {FLOAT_TO_Q20(1.0), 0, FLOAT_TO_Q20(64.0)}};
+static LinkStateBase_UnkStruct1 data_ov059_0219b190 = {0x3c, {FLOAT_TO_Q20(1.0), 0, FLOAT_TO_Q20(5.0)}};
+static LinkStateBase_UnkStruct1 data_ov059_0219b1a0 = {0x3d, {FLOAT_TO_Q20(1.0), 0, FLOAT_TO_Q20(3.0)}};
+static LinkStateBase_UnkStruct1 data_ov059_0219b1b0 = {0x3e, {FLOAT_TO_Q20(1.2), 0, FLOAT_TO_Q20(6.0)}};
+
+ARM LinkStateItem *EquipHammer::GetLinkStateItem() {
     return (LinkStateItem *) GetLinkState(LinkStateId_Item);
 }
 
@@ -197,7 +184,7 @@ ARM void LinkStateItem::func_ov059_021990a4() {
     pEVar4 = GetEquipHammer();
     pAVar5 = (ActorNavi *) gItemManager->GetFairy(FairyId_Courage);
 
-    if (CHECK_0219b160(data_ov059_0219b160.mUnk_20)) {
+    if (CHECK_0219b160(data_ov059_0219b180.mUnk_00)) {
         this->mUnk_38 = gPlayerControl->mAimWorld;
 
         if (pAVar5->mUnk_3c0[0] != 0 && gPlayerControl->UpdateAimWorld(&this->mUnk_38) && pEVar4->GetState() <= 0) {
@@ -210,11 +197,11 @@ ARM void LinkStateItem::func_ov059_021990a4() {
             this->func_ov00_020a89bc(&data_ov059_0219b190, 1);
         }
     } else {
-        if (CHECK_0219b160(data_ov059_0219b160.mUnk_50)) {
+        if (CHECK_0219b160(data_ov059_0219b1b0.mUnk_00)) {
             if (this->func_ov00_020a8b3c(1) != 0 || gPlayerControl->UpdateAimWorld(&this->mUnk_38)) {
                 this->func_ov00_020a89bc(&data_ov059_0219b180, 1);
             }
-        } else if (CHECK_0219b160(data_ov059_0219b160.mUnk_30) || CHECK_0219b160(data_ov059_0219b160.mUnk_40)) {
+        } else if (CHECK_0219b160(data_ov059_0219b190.mUnk_00) || CHECK_0219b160(data_ov059_0219b1a0.mUnk_00)) {
             gPlayerControl->UpdateAimWorld(&this->mUnk_38);
             pEVar4->func_ov059_02198e90();
 
@@ -227,7 +214,7 @@ ARM void LinkStateItem::func_ov059_021990a4() {
                     pEVar4->func_ov059_02198ebc();
                     this->func_ov00_020a89bc(&data_ov059_0219b1b0, 1);
                 }
-            } else if (!CHECK_0219b160(data_ov059_0219b160.mUnk_40) && pEVar4->GetChargeTimer() <= 0) {
+            } else if (!CHECK_0219b160(data_ov059_0219b1a0.mUnk_00) && pEVar4->GetChargeTimer() <= 0) {
                 this->func_ov00_020a89bc(&data_ov059_0219b1a0, 1);
             }
         } else {