LinkStateInteract (#135)

* Map symbol in Game

* LinkStateInteract 19%

* DebugHierarchy -> Bhio

* LinkStateInteract 89%

* LinkStateInteract 93%

* Japanese strings

* Fix build

* Fix regression

* Fix regressions

* Rename BhioBase.cpp

Author: AetiasHax

.gitignore

@@ -18,3 +18,4 @@ build.ninja
 .ninja_lock
 .ninja_deps
 /wibo
+/sjiswrap.exe

config/eur/arm9/itcm/symbols.txt

@@ -82,7 +82,7 @@ func_01ffbbcc kind:function(arm,size=0x2c) addr:0x01ffbbcc
 func_01ffbbf8 kind:function(arm,size=0x1d8) addr:0x01ffbbf8
 func_01ffbdd0 kind:function(arm,size=0x64) addr:0x01ffbdd0
 func_01ffbe34 kind:function(arm,size=0x44) addr:0x01ffbe34
-_ZN10MapManager13func_01ffbe78EP5Vec3pS1_S1_P5Vec4p kind:function(arm,size=0xe4) addr:0x01ffbe78
+_ZN10MapManager13func_01ffbe78EP9UnkStructP5Vec3pS3_P6Sphereitii kind:function(arm,size=0xe4) addr:0x01ffbe78
 _ZN10MapManager13func_01ffbf5cEP9UnkStructP5Vec3pS3_iiiP24UnkStruct_ov000_020beba8i kind:function(arm,size=0x1bc) addr:0x01ffbf5c
 _ZN10MapManager13func_01ffc118EPiP5Vec3pS2_iS0_jS0_ kind:function(arm,size=0x10c8) addr:0x01ffc118
 _ZN10MapManager13func_01ffd1e0EPiP5Vec3pS2_iS0_jS0_ kind:function(arm,size=0xfec) addr:0x01ffd1e0

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

@@ -106,7 +106,7 @@ src/00_Core/Player/LinkStateBase.cpp:
 
 src/00_Core/Player/LinkStateDamage.cpp:
     .text       start:0x020abfa4 end:0x020ad020
-    .rodata     start:0x020dc560 end:0x020dc574
+    .rodata     start:0x020dc528 end:0x020dc574
     .data       start:0x020e5a8c end:0x020e5c58
 
 src/00_Core/Player/LinkStateFollow.cpp:
@@ -115,7 +115,6 @@ src/00_Core/Player/LinkStateFollow.cpp:
 
 src/00_Core/Player/LinkStateInteract.cpp:
     .text       start:0x020aa32c end:0x020abd78
-    .rodata     start:0x020dc528 end:0x020dc560
     .data       start:0x020e58e8 end:0x020e5a40
 
 src/00_Core/Player/LinkStateItem.cpp:

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

@@ -4970,17 +4970,17 @@ from:0x020aa4b8 kind:thumb_call_arm to:0x020a8dec module:overlay(0)
 from:0x020aa4c6 kind:thumb_call_arm to:0x020a8dec module:overlay(0)
 from:0x020aa4e6 kind:thumb_call_arm to:0x020a8dec module:overlay(0)
 from:0x020aa4f0 kind:load to:0x020e59b8 module:overlay(0)
-from:0x020aa4f8 kind:load to:0x020e5940 module:overlay(0)
+from:0x020aa4f8 kind:load to:0x020e593c add:0x4 module:overlay(0)
 from:0x020aa4fc kind:load to:0x020e5908 module:overlay(0)
 from:0x020aa500 kind:load to:0x020e59cc module:overlay(0)
-from:0x020aa504 kind:load to:0x020e5944 module:overlay(0)
+from:0x020aa504 kind:load to:0x020e593c add:0x8 module:overlay(0)
 from:0x020aa508 kind:load to:0x020e59e4 module:overlay(0)
-from:0x020aa50c kind:load to:0x020e5948 module:overlay(0)
+from:0x020aa50c kind:load to:0x020e593c add:0xc module:overlay(0)
 from:0x020aa510 kind:load to:0x020e59fc module:overlay(0)
-from:0x020aa514 kind:load to:0x020e5960 module:overlay(0)
-from:0x020aa518 kind:load to:0x020e5964 module:overlay(0)
+from:0x020aa514 kind:load to:0x020e595c add:0x4 module:overlay(0)
+from:0x020aa518 kind:load to:0x020e595c add:0x8 module:overlay(0)
 from:0x020aa51c kind:load to:0x020e5a0c module:overlay(0)
-from:0x020aa520 kind:load to:0x020e5968 module:overlay(0)
+from:0x020aa520 kind:load to:0x020e595c add:0xc module:overlay(0)
 from:0x020aa524 kind:load to:0x020e5a20 module:overlay(0)
 from:0x020aa528 kind:load to:0x020e5a34 module:overlay(0)
 from:0x020aa52c kind:load to:0x020e5928 module:overlay(0)

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

@@ -682,7 +682,7 @@ _ZN10MapManager18func_ov00_02085594EP5Vec3p kind:function(arm,size=0x2a8) addr:0
 _ZN10MapManager18func_ov00_0208583cEPS_P5Vec3pi kind:function(arm,size=0x74) addr:0x0208583c
 _ZN10MapManager18func_ov00_020858b0EPS_P5Vec3pi kind:function(arm,size=0x184) addr:0x020858b0
 _ZN10MapManager18func_ov00_02085a34EP5Vec3pi kind:function(arm,size=0x22c) addr:0x02085a34
-_ZN10MapManager18func_ov00_02085c60EP5Vec3pPiS2_j kind:function(arm,size=0x3e4) addr:0x02085c60
+_ZN10MapManager18func_ov00_02085c60EP9UnkStructPiS2_j kind:function(arm,size=0x3e4) addr:0x02085c60
 _ZN10MapManager18func_ov00_02086044EP5Vec3pS1_i kind:function(arm,size=0x240) addr:0x02086044
 _ZN10MapManager18func_ov00_02086284EPiP5Vec3pS2_itS2_S2_ kind:function(arm,size=0x800) addr:0x02086284
 _ZN10MapManager18func_ov00_02086a84EPiP5Vec3pS2_iiiS2_S2_ kind:function(arm,size=0x24c) addr:0x02086a84
@@ -1890,7 +1890,7 @@ _ZN13LinkStateBase15ChangeLinkStateEi kind:function(arm,size=0x10) addr:0x020a81
 _ZN13LinkStateBase18ChangeLinkSubStateEii kind:function(arm,size=0x10) addr:0x020a8148
 _ZN13LinkStateBase18EquipItem_vfunc_28Ev kind:function(arm,size=0x48) addr:0x020a8158
 _ZN13LinkStateBase22UpdateSwordShieldInUseEv kind:function(arm,size=0x18) addr:0x020a81a0
-_ZN13LinkStateBase18func_ov00_020a81b8Eii kind:function(arm,size=0x24) addr:0x020a81b8
+_ZN13LinkStateBase18func_ov00_020a81b8EiP5Vec3p kind:function(arm,size=0x24) addr:0x020a81b8
 _ZN13LinkStateBase16GetLinkItemStateEv kind:function(arm,size=0x10) addr:0x020a81dc
 _ZN13LinkStateBase6LookAtEP5Vec3p kind:function(arm,size=0x10) addr:0x020a81ec
 _ZN13LinkStateBase18func_ov00_020a81fcEP5Vec3pi kind:function(arm,size=0x10) addr:0x020a81fc
@@ -1958,11 +1958,11 @@ _ZN13LinkStateBase26PlayerControlData_vfunc_14Ei kind:function(arm,size=0x30) ad
 _ZN13LinkStateBase28Get_PlayerControlData_Unk100Ev kind:function(arm,size=0x14) addr:0x020a8db8
 _ZN13LinkStateBase28Get_PlayerControlData_Unk120Ev kind:function(arm,size=0x14) addr:0x020a8dcc
 _ZN13LinkStateBase24Get_PlayerLinkBase_Unk38Ev kind:function(arm,size=0xc) addr:0x020a8de0
-_ZN13LinkStateBase18GetDebugHierarchy0Ev kind:function(arm,size=0xc) addr:0x020a8dec
-_ZN13LinkStateBase18GetDebugHierarchy1Ev kind:function(arm,size=0xc) addr:0x020a8df8
+_ZN13LinkStateBase8GetBhio0Ev kind:function(arm,size=0xc) addr:0x020a8dec
+_ZN13LinkStateBase8GetBhio1Ev kind:function(arm,size=0xc) addr:0x020a8df8
 _ZN13LinkStateMove8vfunc_00Ev kind:function(thumb,size=0x2) addr:0x020a8e04
 _ZN13LinkStateMove5GetIdEv kind:function(arm,size=0x8) addr:0x020a8e08
-_ZN13LinkStateMove20CreateDebugHierarchyEv kind:function(thumb,size=0x48) addr:0x020a8e10
+_ZN13LinkStateMove8LoadBhioEv kind:function(thumb,size=0x48) addr:0x020a8e10
 _ZN13LinkStateMove12OnStateEnterEv kind:function(arm,size=0x74) addr:0x020a8e58
 _ZN13LinkStateMove12OnStateLeaveEi kind:function(arm,size=0x20) addr:0x020a8ecc
 _ZN13LinkStateMove8vfunc_24Ei kind:function(arm,size=0x40) addr:0x020a8eec
@@ -2048,8 +2048,8 @@ func_ov000_020aa0f0 kind:function(arm,size=0x34) addr:0x020aa0f0
 func_ov000_020aa124 kind:function(arm,size=0x208) addr:0x020aa124
 _ZN17LinkStateInteract8vfunc_00Ev kind:function(thumb,size=0x2) addr:0x020aa32c
 _ZN17LinkStateInteract5GetIdEv kind:function(arm,size=0x8) addr:0x020aa330
-_ZN17LinkStateInteract20CreateDebugHierarchyEv kind:function(arm,size=0x24) addr:0x020aa338
-_ZN17LinkStateInteract14GetGrabActorIdEv kind:function(thumb,size=0x1d8) addr:0x020aa35c
+_ZN17LinkStateInteract14GetGrabActorIdEv kind:function(arm,size=0x24) addr:0x020aa338
+_ZN17LinkStateInteract8LoadBhioEv kind:function(thumb,size=0x1d8) addr:0x020aa35c
 _ZN17LinkStateInteract12OnStateEnterEv kind:function(arm,size=0x27c) addr:0x020aa534
 _ZN17LinkStateInteract12OnStateLeaveEi kind:function(arm,size=0x68) addr:0x020aa7b0
 _ZN17LinkStateInteract18func_ov00_020aa818Ev kind:function(arm,size=0x2c) addr:0x020aa818
@@ -2083,7 +2083,7 @@ _ZN13LinkStateItem16GetLinkStateMoveEv kind:function(arm,size=0x10) addr:0x020ab
 _ZN13LinkStateItem18func_ov00_020abf70Ev kind:function(arm,size=0x20) addr:0x020abf70
 _ZN13LinkStateItem8vfunc_28Ev kind:function(arm,size=0x14) addr:0x020abf90
 _ZN15LinkStateDamage8vfunc_00Ev kind:function(thumb,size=0x2) addr:0x020abfa4
-_ZN15LinkStateDamage20CreateDebugHierarchyEv kind:function(thumb,size=0x218) addr:0x020abfa8
+_ZN15LinkStateDamage8LoadBhioEv kind:function(thumb,size=0x218) addr:0x020abfa8
 _ZN15LinkStateDamage12OnStateEnterEv kind:function(arm,size=0x630) addr:0x020ac1c0
 _ZN15LinkStateDamage12OnStateLeaveEi kind:function(arm,size=0x1f4) addr:0x020ac7f0
 _ZN15LinkStateDamage18func_ov00_020ac9e4Ei kind:function(arm,size=0x6c) addr:0x020ac9e4
@@ -2172,7 +2172,7 @@ _ZNK11ItemManager21HasTreasurePriceShownEj kind:function(thumb,size=0x26) addr:0
 _ZN11ItemManager21AddTreasurePriceShownEj kind:function(thumb,size=0x22) addr:0x020ae76c
 _ZN13LinkStateRoll8vfunc_00Ev kind:function(thumb,size=0x2) addr:0x020ae790
 _ZN13LinkStateRoll5GetIdEv kind:function(arm,size=0x8) addr:0x020ae794
-_ZN13LinkStateRoll20CreateDebugHierarchyEv kind:function(thumb,size=0x8) addr:0x020ae79c
+_ZN13LinkStateRoll8LoadBhioEv kind:function(thumb,size=0x8) addr:0x020ae79c
 _ZN13LinkStateRoll12OnStateEnterEv kind:function(arm,size=0x394) addr:0x020ae7a4
 _ZN13LinkStateRoll12OnStateLeaveEi kind:function(arm,size=0xd8) addr:0x020aeb38
 _ZN13LinkStateRoll8vfunc_20Ei kind:function(arm,size=0x180) addr:0x020aec10
@@ -2257,7 +2257,7 @@ _ZN24UnkStruct_ov004_0210abb88vfunc_08Ei kind:function(arm,size=0x28) addr:0x020
 _ZN17LinkStateCutscene19func_ov000_020b1e98Ei kind:function(arm,size=0x20) addr:0x020b1e98
 _ZN17LinkStateCutscene19func_ov000_020b1eb8Ev kind:function(arm,size=0x34) addr:0x020b1eb8
 _ZN17LinkStateCutscene19func_ov000_020b1eecEv kind:function(arm,size=0x58) addr:0x020b1eec
-_ZN17LinkStateCutscene20CreateDebugHierarchyEv kind:function(thumb,size=0x168) addr:0x020b1f44
+_ZN17LinkStateCutscene8LoadBhioEv kind:function(thumb,size=0x168) addr:0x020b1f44
 _ZN17LinkStateCutscene12OnStateEnterEv kind:function(arm,size=0x3f4) addr:0x020b20ac
 _ZN17LinkStateCutscene12OnStateLeaveEi kind:function(arm,size=0x60) addr:0x020b24a0
 _ZN17LinkStateCutscene5GetIdEv kind:function(arm,size=0x8) addr:0x020b2500
@@ -3613,9 +3613,9 @@ func_ov000_020d75dc kind:function(arm,size=0x208) addr:0x020d75dc
 _ZN18UnkStruct_020eec9c19func_ov000_020d77e4Ei kind:function(arm,size=0x9c) addr:0x020d77e4
 func_ov000_020d7880 kind:function(arm,size=0x20) addr:0x020d7880
 func_ov000_020d78a0 kind:function(arm,size=0x1e4) addr:0x020d78a0
-func_ov000_020d7a84 kind:function(arm,size=0x50) addr:0x020d7a84
+_ZN18UnkStruct_020eec9c19func_ov000_020d7a84EiP5Vec3p kind:function(arm,size=0x50) addr:0x020d7a84
 _ZN18UnkStruct_020eec9c19func_ov000_020d7ad4Ei kind:function(arm,size=0x4c) addr:0x020d7ad4
-func_ov000_020d7b20 kind:function(arm,size=0x40) addr:0x020d7b20
+_ZN18UnkStruct_020eec9c19func_ov000_020d7b20EiP5Vec3p kind:function(arm,size=0x40) addr:0x020d7b20
 func_ov000_020d7b60 kind:function(arm,size=0x20) addr:0x020d7b60
 func_ov000_020d7b80 kind:function(arm,size=0xec) addr:0x020d7b80
 func_ov000_020d7c6c kind:function(arm,size=0x20) addr:0x020d7c6c
@@ -4821,13 +4821,13 @@ data_ov000_020e5960 kind:data(any) addr:0x020e5960
 data_ov000_020e5964 kind:data(any) addr:0x020e5964
 data_ov000_020e5968 kind:data(any) addr:0x020e5968
 _ZTV17LinkStateInteract kind:data(any) addr:0x020e5974
-data_ov000_020e59b8 kind:data(any) addr:0x020e59b8
-data_ov000_020e59cc kind:data(any) addr:0x020e59cc
-data_ov000_020e59e4 kind:data(any) addr:0x020e59e4
-data_ov000_020e59fc kind:data(any) addr:0x020e59fc
-data_ov000_020e5a0c kind:data(any) addr:0x020e5a0c
-data_ov000_020e5a20 kind:data(any) addr:0x020e5a20
-data_ov000_020e5a34 kind:data(any) addr:0x020e5a34
+@1235 kind:data(any) addr:0x020e59b8 local
+@1236 kind:data(any) addr:0x020e59cc local
+@1237 kind:data(any) addr:0x020e59e4 local
+@1238 kind:data(any) addr:0x020e59fc local
+@1239 kind:data(any) addr:0x020e5a0c local
+@1240 kind:data(any) addr:0x020e5a20 local
+@1241 kind:data(any) addr:0x020e5a34 local
 _ZTV13LinkStateItem kind:data(any) addr:0x020e5a40
 @1126 kind:data(any) addr:0x020e5a8c
 @1125 kind:data(any) addr:0x020e5a90

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

@@ -100,8 +100,8 @@ func_ov004_0210372c kind:function(thumb,size=0x12) addr:0x0210372c
 func_ov004_02103740 kind:function(thumb,size=0x12) addr:0x02103740
 func_ov004_02103754 kind:function(thumb,size=0xc94) addr:0x02103754
 func_ov004_021043e8 kind:function(thumb,size=0x2) addr:0x021043e8
-_ZN14DebugHierarchyD0Ev kind:function(arm,size=0x1c) addr:0x021043ec
-_ZN14DebugHierarchyD1Ev kind:function(arm,size=0x14) addr:0x02104408
+_ZN4BhioD0Ev kind:function(arm,size=0x1c) addr:0x021043ec
+_ZN4BhioD1Ev kind:function(arm,size=0x14) addr:0x02104408
 _ZN14AdventureFlagsC1Ev kind:function(thumb,size=0x4c) addr:0x0210441c
 _ZN14AdventureFlagsD1Ev kind:function(thumb,size=0x3e) addr:0x02104468
 _ZN14AdventureFlags6CreateEv kind:function(thumb,size=0x2c) addr:0x021044a8
@@ -293,7 +293,7 @@ _ZN13LinkStateBaseC2EP14PlayerLinkBase kind:function(thumb,size=0x10) addr:0x021
 _ZN13LinkStateBaseD1Ev kind:function(thumb,size=0x2) addr:0x0210ade4
 _ZN13LinkStateBaseD0Ev kind:function(thumb,size=0xc) addr:0x0210ade8
 _ZN13LinkStateBaseD2Ev kind:function(thumb,size=0x2) addr:0x0210adf4
-_ZN13LinkStateBase20CreateDebugHierarchyEv kind:function(thumb,size=0x2) addr:0x0210adf8
+_ZN13LinkStateBase8LoadBhioEv kind:function(thumb,size=0x2) addr:0x0210adf8
 _ZN13LinkStateRollC2EP14PlayerLinkBase kind:function(thumb,size=0x84) addr:0x0210adfc
 _ZN13LinkStateRollD1Ev kind:function(thumb,size=0x28) addr:0x0210ae80
 _ZN13LinkStateRollD0Ev kind:function(thumb,size=0x2c) addr:0x0210aea8
@@ -587,7 +587,7 @@ data_ov004_02110468 kind:data(any) addr:0x02110468
 data_ov004_0211047c kind:data(any) addr:0x0211047c
 data_ov004_02110484 kind:data(any) addr:0x02110484
 data_ov004_0211048c kind:data(any) addr:0x0211048c
-_ZTV14DebugHierarchy kind:data(any) addr:0x021104a0
+_ZTV4Bhio kind:data(any) addr:0x021104a0
 data_ov004_021104e0 kind:data(any) addr:0x021104e0
 data_ov004_021104f0 kind:data(any) addr:0x021104f0
 data_ov004_021104f8 kind:data(any) addr:0x021104f8

config/eur/arm9/symbols.txt

@@ -1520,25 +1520,25 @@ func_02030204 kind:function(arm,size=0x1c) addr:0x02030204
 func_02030220 kind:function(arm,size=0x14) addr:0x02030220
 CopyDebugNodeDescription kind:function(arm,size=0x10) addr:0x02030234
 DebugNodeDescriptionEquals kind:function(arm,size=0x30) addr:0x02030244
-_ZN18DebugHierarchyBaseC2Ev kind:function(thumb,size=0x10) addr:0x02030274
-_ZN18DebugHierarchyBaseD1Ev kind:function(thumb,size=0x2) addr:0x02030284
-_ZN18DebugHierarchyBaseD0Ev kind:function(thumb,size=0xc) addr:0x02030288
-_ZN18DebugHierarchyBaseD2Ev kind:function(thumb,size=0x2) addr:0x02030294
-_ZN18DebugHierarchyBase8FindNodeEj kind:function(thumb,size=0x3c) addr:0x02030298
-_ZN18DebugHierarchyBase12GetChildNodeEiPKcjPi kind:function(thumb,size=0x4c) addr:0x020302d4
-_ZN18DebugHierarchyBase8vfunc_08Ev kind:function(thumb,size=0x2) addr:0x02030320
-_ZN18DebugHierarchyBase8vfunc_0cEv kind:function(thumb,size=0x2) addr:0x02030324
-_ZN18DebugHierarchyBase8vfunc_10Ev kind:function(thumb,size=0x2) addr:0x02030328
-_ZN18DebugHierarchyBase8vfunc_14Ev kind:function(thumb,size=0x2) addr:0x0203032c
-_ZN18DebugHierarchyBase8vfunc_18Ev kind:function(thumb,size=0x2) addr:0x02030330
-_ZN18DebugHierarchyBase8vfunc_1cEv kind:function(thumb,size=0x2) addr:0x02030334
-_ZN18DebugHierarchyBase8vfunc_20Ev kind:function(thumb,size=0x4) addr:0x02030338
-_ZN18DebugHierarchyBase8vfunc_24Ev kind:function(thumb,size=0x2) addr:0x0203033c
-_ZN18DebugHierarchyBase8vfunc_28Ev kind:function(thumb,size=0x2) addr:0x02030340
-_ZN18DebugHierarchyBase8vfunc_2cEv kind:function(thumb,size=0x2) addr:0x02030344
-_ZN18DebugHierarchyBase8vfunc_30Ev kind:function(thumb,size=0x2) addr:0x02030348
-_ZN18DebugHierarchyBase8vfunc_38Ev kind:function(thumb,size=0x2) addr:0x0203034c
-_ZN18DebugHierarchyBase8vfunc_3cEv kind:function(thumb,size=0x2) addr:0x02030350
+_ZN8BhioBaseC2Ev kind:function(thumb,size=0x10) addr:0x02030274
+_ZN8BhioBaseD1Ev kind:function(thumb,size=0x2) addr:0x02030284
+_ZN8BhioBaseD0Ev kind:function(thumb,size=0xc) addr:0x02030288
+_ZN8BhioBaseD2Ev kind:function(thumb,size=0x2) addr:0x02030294
+_ZN8BhioBase9FindGroupEj kind:function(thumb,size=0x3c) addr:0x02030298
+_ZN8BhioBase8GetFieldEbPKcjPiiiii kind:function(thumb,size=0x4c) addr:0x020302d4
+_ZN8BhioBase8vfunc_08Ev kind:function(thumb,size=0x2) addr:0x02030320
+_ZN8BhioBase8vfunc_0cEv kind:function(thumb,size=0x2) addr:0x02030324
+_ZN8BhioBase8vfunc_10Ev kind:function(thumb,size=0x2) addr:0x02030328
+_ZN8BhioBase8vfunc_14Ev kind:function(thumb,size=0x2) addr:0x0203032c
+_ZN8BhioBase8vfunc_18Ev kind:function(thumb,size=0x2) addr:0x02030330
+_ZN8BhioBase8vfunc_1cEv kind:function(thumb,size=0x2) addr:0x02030334
+_ZN8BhioBase8vfunc_20EiPKciiii kind:function(thumb,size=0x4) addr:0x02030338
+_ZN8BhioBase8vfunc_24Ev kind:function(thumb,size=0x2) addr:0x0203033c
+_ZN8BhioBase8vfunc_28Ev kind:function(thumb,size=0x2) addr:0x02030340
+_ZN8BhioBase8vfunc_2cEv kind:function(thumb,size=0x2) addr:0x02030344
+_ZN8BhioBase8vfunc_30Ev kind:function(thumb,size=0x2) addr:0x02030348
+_ZN8BhioBase8vfunc_38Ev kind:function(thumb,size=0x2) addr:0x0203034c
+_ZN8BhioBase8vfunc_3cEjPi kind:function(thumb,size=0x2) addr:0x02030350
 _ZN18UnkStruct_0206322c13func_02030354Ebb kind:function(thumb,size=0xb4) addr:0x02030354
 _ZN18UnkStruct_0206322c13func_02030408Ev kind:function(thumb,size=0x16) addr:0x02030408
 func_02030420 kind:function(thumb,size=0x44) addr:0x02030420
@@ -2710,7 +2710,7 @@ data_02057808 kind:data(any) addr:0x02057808
 data_02057840 kind:data(any) addr:0x02057840
 data_0205785c kind:data(any) addr:0x0205785c
 data_02057878 kind:data(any) addr:0x02057878
-_ZTV18DebugHierarchyBase kind:data(any) addr:0x02057894
+_ZTV8BhioBase kind:data(any) addr:0x02057894
 data_020578d4 kind:data(any) addr:0x020578d4
 data_020578d8 kind:data(any) addr:0x020578d8
 data_020578ec kind:data(any) addr:0x020578ec

config/usa/arm9/itcm/symbols.txt

@@ -82,7 +82,7 @@ func_01ffbbcc kind:function(arm,size=0x2c) addr:0x01ffbbcc
 func_01ffbbf8 kind:function(arm,size=0x1d8) addr:0x01ffbbf8
 func_01ffbdd0 kind:function(arm,size=0x64) addr:0x01ffbdd0
 func_01ffbe34 kind:function(arm,size=0x44) addr:0x01ffbe34
-_ZN10MapManager13func_01ffbe78EP5Vec3pS1_S1_P5Vec4p kind:function(arm,size=0xe4) addr:0x01ffbe78
+_ZN10MapManager13func_01ffbe78EP9UnkStructP5Vec3pS3_P6Sphereitii kind:function(arm,size=0xe4) addr:0x01ffbe78
 _ZN10MapManager13func_01ffbf5cEP9UnkStructP5Vec3pS3_iiiP24UnkStruct_ov000_020beba8i kind:function(arm,size=0x1bc) addr:0x01ffbf5c
 _ZN10MapManager13func_01ffc118EPiP5Vec3pS2_iS0_jS0_ kind:function(arm,size=0x10c8) addr:0x01ffc118
 _ZN10MapManager13func_01ffd1e0EPiP5Vec3pS2_iS0_jS0_ kind:function(arm,size=0xfec) addr:0x01ffd1e0

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

@@ -106,7 +106,7 @@ src/00_Core/Player/LinkStateBase.cpp:
 
 src/00_Core/Player/LinkStateDamage.cpp:
     .text       start:0x020abf44 end:0x020acfc0
-    .rodata     start:0x020dc500 end:0x020dc514
+    .rodata     start:0x020dc4c8 end:0x020dc514
     .data       start:0x020e5a2c end:0x020e5bf8
 
 src/00_Core/Player/LinkStateFollow.cpp:
@@ -115,7 +115,6 @@ src/00_Core/Player/LinkStateFollow.cpp:
 
 src/00_Core/Player/LinkStateInteract.cpp:
     .text       start:0x020aa2cc end:0x020abd18
-    .rodata     start:0x020dc4c8 end:0x020dc500
     .data       start:0x020e5888 end:0x020e59e0
 
 src/00_Core/Player/LinkStateItem.cpp:

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

@@ -4970,17 +4970,17 @@ from:0x020aa458 kind:thumb_call_arm to:0x020a8d8c module:overlay(0)
 from:0x020aa466 kind:thumb_call_arm to:0x020a8d8c module:overlay(0)
 from:0x020aa486 kind:thumb_call_arm to:0x020a8d8c module:overlay(0)
 from:0x020aa490 kind:load to:0x020e5958 module:overlay(0)
-from:0x020aa498 kind:load to:0x020e58e0 module:overlay(0)
+from:0x020aa498 kind:load to:0x020e58dc add:0x4 module:overlay(0)
 from:0x020aa49c kind:load to:0x020e58a8 module:overlay(0)
 from:0x020aa4a0 kind:load to:0x020e596c module:overlay(0)
-from:0x020aa4a4 kind:load to:0x020e58e4 module:overlay(0)
+from:0x020aa4a4 kind:load to:0x020e58dc add:0x8 module:overlay(0)
 from:0x020aa4a8 kind:load to:0x020e5984 module:overlay(0)
-from:0x020aa4ac kind:load to:0x020e58e8 module:overlay(0)
+from:0x020aa4ac kind:load to:0x020e58dc add:0xc module:overlay(0)
 from:0x020aa4b0 kind:load to:0x020e599c module:overlay(0)
-from:0x020aa4b4 kind:load to:0x020e5900 module:overlay(0)
-from:0x020aa4b8 kind:load to:0x020e5904 module:overlay(0)
+from:0x020aa4b4 kind:load to:0x020e58fc add:0x4 module:overlay(0)
+from:0x020aa4b8 kind:load to:0x020e58fc add:0x8 module:overlay(0)
 from:0x020aa4bc kind:load to:0x020e59ac module:overlay(0)
-from:0x020aa4c0 kind:load to:0x020e5908 module:overlay(0)
+from:0x020aa4c0 kind:load to:0x020e58fc add:0xc module:overlay(0)
 from:0x020aa4c4 kind:load to:0x020e59c0 module:overlay(0)
 from:0x020aa4c8 kind:load to:0x020e59d4 module:overlay(0)
 from:0x020aa4cc kind:load to:0x020e58c8 module:overlay(0)