diff options
| author | Aetias <aetias@outlook.com> | 2025-02-04 21:30:00 +0100 |
|---|---|---|
| committer | Aetias <aetias@outlook.com> | 2025-02-04 21:30:00 +0100 |
| commit | c380ac51a48d17348b1cdcbb615ce22be22f409e (patch) | |
| tree | 6713ed5a1cd172f665e52ea0f995fc905ca3db2d /src/00_Core/Player/LinkStateItem.cpp | |
| parent | 8cda3ca2d7f5fe424cc1a649baec2ff992368e62 (diff) | |
| parent | 3f7197110627adbbe7ff1f69db1f5a15f9b6c598 (diff) | |
Merge remote-tracking branch 'zeldaret/main' into decomp-PlayerControl
Diffstat (limited to 'src/00_Core/Player/LinkStateItem.cpp')
| -rw-r--r-- | src/00_Core/Player/LinkStateItem.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/00_Core/Player/LinkStateItem.cpp b/src/00_Core/Player/LinkStateItem.cpp index 56b6bc37..9e42961f 100644 --- a/src/00_Core/Player/LinkStateItem.cpp +++ b/src/00_Core/Player/LinkStateItem.cpp @@ -43,17 +43,17 @@ ARM void LinkStateItem::OnStateLeave(s32 param1) { case ItemFlag_OshusSword: break; case ItemFlag_WoodenShield: break; case ItemFlag_Boomerang: break; - case ItemFlag_BombBag: EquipBomb::StopUsing(this, param1); break; + case ItemFlag_BombBag: this->StopUsingBomb(param1); break; case ItemFlag_Bow: break; - case ItemFlag_GrapplingHook: EquipRope::StopUsing(this); break; - case ItemFlag_Hammer: EquipHammer::StopUsing(this); break; + case ItemFlag_GrapplingHook: this->StopUsingRope(); break; + case ItemFlag_Hammer: this->StopUsingHammer(); break; case ItemFlag_PotionA: case ItemFlag_PotionB: - UnkStruct_027e103c *unk = data_027e103c; - unk->mUnk_2a = 0; - unk->func_ov000_020cf9dc(0, 0); + UnkStruct_027e103c *pData_027e103c = data_027e103c; + pData_027e103c->mUnk_2a = 0; + pData_027e103c->func_ov000_020cf9dc(0, 0); break; - case ItemFlag_Shovel: EquipScoop::StopUsing(this); break; + case ItemFlag_Shovel: this->StopUsingScoop(); break; } if (this->mEquipId != ItemFlag_None) { |