diff --git a/config/eur/arm9/overlays/ov014/symbols.txt b/config/eur/arm9/overlays/ov014/symbols.txt index 2b0034c8..4046d529 100644 --- a/config/eur/arm9/overlays/ov014/symbols.txt +++ b/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_0211fd04i kind:function(thumb,size=0x4c) addr:0x211fd04 +_Z19func_ov014_0211fd04Pi kind:function(thumb,size=0x4c) addr:0x211fd04 func_ov014_0211fd50 kind:function(arm,size=0x30) addr:0x211fd50 func_ov014_0211fd80 kind:function(arm,size=0x10) addr:0x211fd80 func_ov014_0211fd90 kind:function(arm,size=0x14) addr:0x211fd90 diff --git a/config/usa/arm9/overlays/ov014/symbols.txt b/config/usa/arm9/overlays/ov014/symbols.txt index a9587106..8456081e 100644 --- a/config/usa/arm9/overlays/ov014/symbols.txt +++ b/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_0211fd04i kind:function(thumb,size=0x4c) addr:0x211fc84 +_Z19func_ov014_0211fd04Pi kind:function(thumb,size=0x4c) addr:0x211fc84 func_ov014_0211fd50 kind:function(arm,size=0x30) addr:0x211fcd0 func_ov014_0211fd80 kind:function(arm,size=0x10) addr:0x211fd00 func_ov014_0211fd90 kind:function(arm,size=0x14) addr:0x211fd10 diff --git a/src/00_Core/Player/LinkStateItem.cpp b/src/00_Core/Player/LinkStateItem.cpp index 30643a87..f61c14b0 100644 --- a/src/00_Core/Player/LinkStateItem.cpp +++ b/src/00_Core/Player/LinkStateItem.cpp @@ -10,9 +10,12 @@ extern unk32 func_ov000_020cf01c(s32 *param1); 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_ov014_0211fd04(s32 *param1); extern void func_ov000_020b7e6c(s32 *param1); +extern s32 *data_027e103c; +extern s32 *data_027e1098; + THUMB void LinkStateItem::vfunc_00() {} ARM LinkStateId LinkStateItem::GetId() { @@ -40,11 +43,11 @@ ARM void LinkStateItem::OnStateLeave(s32 param1) { switch (this->mEquipId) { case 7: /* bombchu */ - iVar3 = func_ov000_020cf01c((s32 *) (*(s32 *) 0x20abf44)); + iVar3 = func_ov000_020cf01c(data_027e103c); if (*(u8 *) (iVar3 + 0xe0) == '\0') { func_ov014_0213ec64((s32) GetEquipBombchu()); } - func_ov014_0211fd04(*(s32 *) (0x20abf48)); + func_ov014_0211fd04(data_027e1098); break; case 0: break; case 1: break; @@ -55,8 +58,8 @@ ARM void LinkStateItem::OnStateLeave(s32 param1) { case 8: EquipHammer::StopUsing(this); break; case 9: case 10: - iVar3 = *(int *) (0x20abf44); - *(unk8 *) (iVar3 + 0x2a) = 0; + iVar3 = (int ) (data_027e103c); + *(unk8 *) ((s16*)data_027e103c + 0x15) = 0; func_ov000_020cf9dc(iVar3, 0, 0); break; case 3: EquipScoop::StopUsing(this); break;