From dc09e23c6068913ec96708e0e49597252043cdb6 Mon Sep 17 00:00:00 2001 From: mike8699 Date: Tue, 31 Dec 2024 16:09:11 -0500 Subject: [PATCH] Add `StopUsing` methods to several classes These are used in `LinkStateItem::OnStateLeave` --- config/eur/arm9/overlays/ov054/symbols.txt | 2 +- config/eur/arm9/overlays/ov055/symbols.txt | 2 +- config/eur/arm9/overlays/ov057/symbols.txt | 2 +- config/eur/arm9/overlays/ov059/symbols.txt | 2 +- config/usa/arm9/overlays/ov054/symbols.txt | 2 +- config/usa/arm9/overlays/ov055/symbols.txt | 2 +- config/usa/arm9/overlays/ov057/symbols.txt | 2 +- config/usa/arm9/overlays/ov059/symbols.txt | 2 +- include/Player/EquipBomb.hpp | 4 ++++ include/Player/EquipHammer.hpp | 6 +++++- include/Player/EquipRope.hpp | 3 +++ include/Player/EquipScoop.hpp | 4 ++++ 12 files changed, 24 insertions(+), 9 deletions(-) diff --git a/config/eur/arm9/overlays/ov054/symbols.txt b/config/eur/arm9/overlays/ov054/symbols.txt index 8414c258..3284e7c3 100644 --- a/config/eur/arm9/overlays/ov054/symbols.txt +++ b/config/eur/arm9/overlays/ov054/symbols.txt @@ -13,7 +13,7 @@ func_ov054_02198eec kind:function(arm,size=0x10) addr:0x2198eec func_ov054_02198efc kind:function(arm,size=0x3cc) addr:0x2198efc func_ov054_021992c8 kind:function(arm,size=0x518) addr:0x21992c8 func_ov054_021997e0 kind:function(arm,size=0x10) addr:0x21997e0 -func_ov054_021997f0 kind:function(arm,size=0xe4) addr:0x21997f0 +_ZN10EquipScoop9StopUsingEP13LinkStateItem kind:function(arm,size=0xe4) addr:0x21997f0 func_ov054_021998d4 kind:function(arm,size=0x40) addr:0x21998d4 data_ov054_02199914 kind:data(any) addr:0x2199914 func_ov054_02199924 kind:function(arm,size=0x30) addr:0x2199924 diff --git a/config/eur/arm9/overlays/ov055/symbols.txt b/config/eur/arm9/overlays/ov055/symbols.txt index 6c67528d..6a9914c3 100644 --- a/config/eur/arm9/overlays/ov055/symbols.txt +++ b/config/eur/arm9/overlays/ov055/symbols.txt @@ -5,7 +5,7 @@ func_ov055_02198da4 kind:function(arm,size=0x54) addr:0x2198da4 func_ov055_02198df8 kind:function(arm,size=0x68) addr:0x2198df8 func_ov055_02198e60 kind:function(arm,size=0x118) addr:0x2198e60 func_ov055_02198f78 kind:function(arm,size=0x18) addr:0x2198f78 -func_ov055_02198f90 kind:function(arm,size=0x80) addr:0x2198f90 +_ZN9EquipBomb9StopUsingEP13LinkStateItem kind:function(arm,size=0x80) addr:0x2198f90 func_ov055_02199010 kind:function(arm,size=0x10) addr:0x2199010 func_ov055_02199020 kind:function(arm,size=0x188) addr:0x2199020 func_ov055_021991a8 kind:function(arm,size=0x4) addr:0x21991a8 diff --git a/config/eur/arm9/overlays/ov057/symbols.txt b/config/eur/arm9/overlays/ov057/symbols.txt index 2acb6748..9b95976e 100644 --- a/config/eur/arm9/overlays/ov057/symbols.txt +++ b/config/eur/arm9/overlays/ov057/symbols.txt @@ -31,7 +31,7 @@ func_ov057_02199e64 kind:function(arm,size=0x68) addr:0x2199e64 func_ov057_02199ecc kind:function(arm,size=0x10) addr:0x2199ecc func_ov057_02199edc kind:function(arm,size=0x32c) addr:0x2199edc func_ov057_0219a208 kind:function(arm,size=0x124) addr:0x219a208 -func_ov057_0219a32c kind:function(arm,size=0x38) addr:0x219a32c +_ZN9EquipRope9StopUsingEP13LinkStateItem kind:function(arm,size=0x38) addr:0x219a32c func_ov057_0219a364 kind:function(arm,size=0x4c) addr:0x219a364 func_ov057_0219a3b0 kind:function(arm,size=0x4c) addr:0x219a3b0 func_ov057_0219a3fc kind:function(arm,size=0x64) addr:0x219a3fc diff --git a/config/eur/arm9/overlays/ov059/symbols.txt b/config/eur/arm9/overlays/ov059/symbols.txt index 67794c81..754f0f57 100644 --- a/config/eur/arm9/overlays/ov059/symbols.txt +++ b/config/eur/arm9/overlays/ov059/symbols.txt @@ -15,7 +15,7 @@ func_ov059_02198ffc kind:function(arm,size=0x80) addr:0x2198ffc func_ov059_0219907c kind:function(arm,size=0x28) addr:0x219907c func_ov059_021990a4 kind:function(arm,size=0x268) addr:0x21990a4 func_ov059_0219930c kind:function(arm,size=0x10) addr:0x219930c -func_ov059_0219931c kind:function(arm,size=0x20) addr:0x219931c +_ZN11EquipHammer9StopUsingEP13LinkStateItem kind:function(arm,size=0x20) addr:0x219931c func_ov059_0219933c kind:function(arm,size=0xd70) addr:0x219933c func_ov059_0219a0ac kind:function(arm,size=0x95c) addr:0x219a0ac func_ov059_0219aa08 kind:function(arm,size=0x1a0) addr:0x219aa08 diff --git a/config/usa/arm9/overlays/ov054/symbols.txt b/config/usa/arm9/overlays/ov054/symbols.txt index 91290893..0a781ca3 100644 --- a/config/usa/arm9/overlays/ov054/symbols.txt +++ b/config/usa/arm9/overlays/ov054/symbols.txt @@ -13,7 +13,7 @@ func_ov054_02198eec kind:function(arm,size=0x10) addr:0x2198e4c func_ov054_02198efc kind:function(arm,size=0x3cc) addr:0x2198e5c func_ov054_021992c8 kind:function(arm,size=0x518) addr:0x2199228 func_ov054_021997e0 kind:function(arm,size=0x10) addr:0x2199740 -func_ov054_021997f0 kind:function(arm,size=0xe4) addr:0x2199750 +_ZN10EquipScoop9StopUsingEP13LinkStateItem kind:function(arm,size=0xe4) addr:0x2199750 func_ov054_021998d4 kind:function(arm,size=0x40) addr:0x2199834 data_ov054_02199914 kind:data(any) addr:0x2199874 func_ov054_02199924 kind:function(arm,size=0x30) addr:0x2199884 diff --git a/config/usa/arm9/overlays/ov055/symbols.txt b/config/usa/arm9/overlays/ov055/symbols.txt index f0f12c91..79e0c8fe 100644 --- a/config/usa/arm9/overlays/ov055/symbols.txt +++ b/config/usa/arm9/overlays/ov055/symbols.txt @@ -5,7 +5,7 @@ func_ov055_02198da4 kind:function(arm,size=0x54) addr:0x2198d04 func_ov055_02198df8 kind:function(arm,size=0x68) addr:0x2198d58 func_ov055_02198e60 kind:function(arm,size=0x118) addr:0x2198dc0 func_ov055_02198f78 kind:function(arm,size=0x18) addr:0x2198ed8 -func_ov055_02198f90 kind:function(arm,size=0x80) addr:0x2198ef0 +_ZN9EquipBomb9StopUsingEP13LinkStateItem kind:function(arm,size=0x80) addr:0x2198ef0 func_ov055_02199010 kind:function(arm,size=0x10) addr:0x2198f70 func_ov055_02199020 kind:function(arm,size=0x188) addr:0x2198f80 func_ov055_021991a8 kind:function(arm,size=0x4) addr:0x2199108 diff --git a/config/usa/arm9/overlays/ov057/symbols.txt b/config/usa/arm9/overlays/ov057/symbols.txt index d846c004..de0bc77e 100644 --- a/config/usa/arm9/overlays/ov057/symbols.txt +++ b/config/usa/arm9/overlays/ov057/symbols.txt @@ -31,7 +31,7 @@ func_ov057_02199e64 kind:function(arm,size=0x68) addr:0x2199dc4 func_ov057_02199ecc kind:function(arm,size=0x10) addr:0x2199e2c func_ov057_02199edc kind:function(arm,size=0x32c) addr:0x2199e3c func_ov057_0219a208 kind:function(arm,size=0x124) addr:0x219a168 -func_ov057_0219a32c kind:function(arm,size=0x38) addr:0x219a28c +_ZN9EquipRope9StopUsingEP13LinkStateItem kind:function(arm,size=0x38) addr:0x219a28c func_ov057_0219a364 kind:function(arm,size=0x4c) addr:0x219a2c4 func_ov057_0219a3b0 kind:function(arm,size=0x4c) addr:0x219a310 func_ov057_0219a3fc kind:function(arm,size=0x64) addr:0x219a35c diff --git a/config/usa/arm9/overlays/ov059/symbols.txt b/config/usa/arm9/overlays/ov059/symbols.txt index 30043ecc..58b1b5f3 100644 --- a/config/usa/arm9/overlays/ov059/symbols.txt +++ b/config/usa/arm9/overlays/ov059/symbols.txt @@ -15,7 +15,7 @@ func_ov059_02198ffc kind:function(arm,size=0x80) addr:0x2198f5c func_ov059_0219907c kind:function(arm,size=0x28) addr:0x2198fdc func_ov059_021990a4 kind:function(arm,size=0x268) addr:0x2199004 func_ov059_0219930c kind:function(arm,size=0x10) addr:0x219926c -func_ov059_0219931c kind:function(arm,size=0x20) addr:0x219927c +_ZN11EquipHammer9StopUsingEP13LinkStateItem kind:function(arm,size=0x20) addr:0x219927c func_ov059_0219933c kind:function(arm,size=0xd70) addr:0x219929c func_ov059_0219a0ac kind:function(arm,size=0x95c) addr:0x219a00c func_ov059_0219aa08 kind:function(arm,size=0x1a0) addr:0x219a968 diff --git a/include/Player/EquipBomb.hpp b/include/Player/EquipBomb.hpp index d21e12f1..8b5fde65 100644 --- a/include/Player/EquipBomb.hpp +++ b/include/Player/EquipBomb.hpp @@ -4,6 +4,8 @@ #include "Player/EquipItem.hpp" +class LinkStateItem; + class EquipBomb : public EquipItem { private: /* 00 (base) */ @@ -26,4 +28,6 @@ public: /* 38 */ virtual void vfunc_38(unk32 param1) override; // func_ov55_2198df8 /* 50 */ virtual void vfunc_50(); // func_ov14_0213d228 /* 54 */ + + static void StopUsing(LinkStateItem *param1); }; diff --git a/include/Player/EquipHammer.hpp b/include/Player/EquipHammer.hpp index 4cf56a21..9d3f0394 100644 --- a/include/Player/EquipHammer.hpp +++ b/include/Player/EquipHammer.hpp @@ -4,6 +4,8 @@ #include "Player/EquipItem.hpp" +class LinkStateItem; + class EquipHammer : public EquipItem { private: /* 00 (base) */ @@ -29,10 +31,12 @@ public: /* 18 */ virtual void vfunc_18() override; // func_ov59_02198e3c /* 1c */ virtual void vfunc_1c() override; // func_ov59_02198e58 - /* 2c */ virtual unk32 vfunc_2c() override; // func_ov59_02198fcc + /* 2c */ virtual u32 vfunc_2c() override; // func_ov59_02198fcc /* 30 */ virtual void vfunc_30() override; // func_ov59_02198e6c /* 38 */ virtual void vfunc_38(unk32 param1) override; // func_0v59_02198fc8 /* 3c */ virtual bool GetHitbox(Cylinder *hitbox) const override; // func_ov14_0213ee10 /* 4c */ virtual s32 vfunc_4c() const override; // func_ov14_0213eea8 /* 50 */ + + static void StopUsing(LinkStateItem *param1); }; diff --git a/include/Player/EquipRope.hpp b/include/Player/EquipRope.hpp index 9eb7cdec..127eb974 100644 --- a/include/Player/EquipRope.hpp +++ b/include/Player/EquipRope.hpp @@ -15,6 +15,7 @@ struct EquipRope_Unk_18 { }; class Actor; +class LinkStateItem; class EquipRope : public EquipItem { public: @@ -59,4 +60,6 @@ public: bool func_ov14_0213dadc(s32 index, Cylinder *cylinder); s32 func_ov14_0213ddd4(Actor *actor); bool func_ov14_0213defc(Actor *actor); + + static void StopUsing(LinkStateItem *param1); }; diff --git a/include/Player/EquipScoop.hpp b/include/Player/EquipScoop.hpp index f0958df5..8c4694bc 100644 --- a/include/Player/EquipScoop.hpp +++ b/include/Player/EquipScoop.hpp @@ -4,6 +4,8 @@ #include "Player/EquipItem.hpp" +class LinkStateItem; + class EquipScoop : public EquipItem { private: /* 0 (base) */ @@ -24,4 +26,6 @@ public: /* 44 */ virtual unk32 vfunc_44(unk32 param1) const override; // func_ov54_02198d38 /* 48 */ virtual unk32 vfunc_48(unk32 param1) const override; // func_ov54_02198d48 /* 50 */ + + static void StopUsing(LinkStateItem *param1); };