From 5697dceffab334023cbb4cf76e85eca6467cc337 Mon Sep 17 00:00:00 2001 From: Aetias Date: Sun, 18 Feb 2024 11:35:07 +0100 Subject: [PATCH] Update `EquipItem::IsUsable` --- include/Player/EquipBomb.hpp | 2 +- include/Player/EquipBombchu.hpp | 2 +- include/Player/EquipBoomerang.hpp | 2 +- include/Player/EquipBow.hpp | 2 +- include/Player/EquipHammer.hpp | 2 +- include/Player/EquipItem.hpp | 2 +- include/Player/EquipPotion.hpp | 2 +- include/Player/EquipRope.hpp | 2 +- include/Player/EquipScoop.hpp | 2 +- include/Player/EquipShield.hpp | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/Player/EquipBomb.hpp b/include/Player/EquipBomb.hpp index 52075aa7..033755b2 100644 --- a/include/Player/EquipBomb.hpp +++ b/include/Player/EquipBomb.hpp @@ -18,7 +18,7 @@ public: /* 04 */ virtual ~EquipBomb() override; /* 0c */ virtual ItemFlag GetId() const override; - /* 14 */ virtual bool IsUsable(unk32 param1, unk32 param2) const override; + /* 14 */ virtual bool IsUsable(unk32 param1) const override; /* 18 */ virtual void vfunc_18() override; // func_ov55_02198d8c /* 30 */ virtual void vfunc_30() override; // func_ov55_02198da4 diff --git a/include/Player/EquipBombchu.hpp b/include/Player/EquipBombchu.hpp index 99f55dc3..609fd317 100644 --- a/include/Player/EquipBombchu.hpp +++ b/include/Player/EquipBombchu.hpp @@ -32,7 +32,7 @@ public: /* 0c */ virtual ItemFlag GetId() const override; bool CheckUsable(unk32 param1) const; - /* 14 */ virtual bool IsUsable(unk32 param1, unk32 param2) const override; + /* 14 */ virtual bool IsUsable(unk32 param1) const override; /* 18 */ virtual void vfunc_18() override; // func_ov58_0219903c /* 1c */ virtual void vfunc_1c() override; // func_ov58_02199060 diff --git a/include/Player/EquipBoomerang.hpp b/include/Player/EquipBoomerang.hpp index 4a17f51d..9b17f103 100644 --- a/include/Player/EquipBoomerang.hpp +++ b/include/Player/EquipBoomerang.hpp @@ -22,7 +22,7 @@ public: /* 0c */ virtual ItemFlag GetId() const override; /* 10 */ virtual void vfunc_10() override; // func_ov14_0213d078 - /* 14 */ virtual bool IsUsable(unk32 param1, unk32 param2) const override; + /* 14 */ virtual bool IsUsable(unk32 param1) const override; /* 18 */ virtual void vfunc_18() override; // func_ov53_02199064 /* 1c */ virtual void vfunc_1c() override; // func_ov53_021990d0 diff --git a/include/Player/EquipBow.hpp b/include/Player/EquipBow.hpp index 74c9415b..e3280d7f 100644 --- a/include/Player/EquipBow.hpp +++ b/include/Player/EquipBow.hpp @@ -20,7 +20,7 @@ public: /* 04 */ virtual ~EquipBow() override; /* 0c */ virtual ItemFlag GetId() const override; - /* 14 */ virtual bool IsUsable(unk32 param1, unk32 param2) const override; + /* 14 */ virtual bool IsUsable(unk32 param1) const override; /* 18 */ virtual void vfunc_18() override; // func_ov56_02198d84 /* 30 */ virtual void vfunc_30() override; // func_ov56_02198de4 diff --git a/include/Player/EquipHammer.hpp b/include/Player/EquipHammer.hpp index 8ea2364e..8015d5f4 100644 --- a/include/Player/EquipHammer.hpp +++ b/include/Player/EquipHammer.hpp @@ -24,7 +24,7 @@ public: /* 0c */ virtual ItemFlag GetId() const override; /* 10 */ virtual void vfunc_10() override; // func_ov14_0213ee04 - /* 14 */ virtual bool IsUsable(unk32 param1, unk32 param2) const override; + /* 14 */ virtual bool IsUsable(unk32 param1) const override; /* 18 */ virtual void vfunc_18() override; // func_ov59_02198e3c /* 1c */ virtual void vfunc_1c() override; // func_ov59_02198e58 diff --git a/include/Player/EquipItem.hpp b/include/Player/EquipItem.hpp index 4ab0c8ea..1108d23f 100644 --- a/include/Player/EquipItem.hpp +++ b/include/Player/EquipItem.hpp @@ -21,7 +21,7 @@ public: /* 10 */ virtual void vfunc_10(); // func_ov04_0210ba88 u16 GetAmmo(); - /* 14 */ virtual bool IsUsable(unk32 param1, unk32 param2) const; + /* 14 */ virtual bool IsUsable(unk32 param1) const; /* 18 */ virtual void vfunc_18() = 0; /* 1c */ virtual void vfunc_1c(); // func_ov00_020be8e0 /* 20 */ virtual void GiveAmmo(u32 amount); diff --git a/include/Player/EquipPotion.hpp b/include/Player/EquipPotion.hpp index 9e2cf635..9cb35c6e 100644 --- a/include/Player/EquipPotion.hpp +++ b/include/Player/EquipPotion.hpp @@ -16,7 +16,7 @@ public: /* 00 */ virtual void vfunc_00() override; // func_ov55_021991a8 /* 04 */ virtual ~EquipPotion() override; - /* 14 */ virtual bool IsUsable(unk32 param1, unk32 param2) const override; + /* 14 */ virtual bool IsUsable(unk32 param1) const override; /* 18 */ virtual void vfunc_18() override; // func_ov55_021991ac /* 1c */ virtual void vfunc_1c() override; // func_ov55_021991b0 diff --git a/include/Player/EquipRope.hpp b/include/Player/EquipRope.hpp index de6ce69d..994cc1b2 100644 --- a/include/Player/EquipRope.hpp +++ b/include/Player/EquipRope.hpp @@ -29,7 +29,7 @@ public: /* 10 */ virtual void vfunc_10() override; // func_ov14_0213d3a0 u16 GetAmmo(); - /* 14 */ virtual bool IsUsable(unk32 param1, unk32 param2) const override; + /* 14 */ virtual bool IsUsable(unk32 param1) const override; /* 18 */ virtual void vfunc_18() override; // func_ov57_021992f4 /* 1c */ virtual void vfunc_1c() override; // func_ov57_0219935c diff --git a/include/Player/EquipScoop.hpp b/include/Player/EquipScoop.hpp index 452a1a16..778f99ba 100644 --- a/include/Player/EquipScoop.hpp +++ b/include/Player/EquipScoop.hpp @@ -14,7 +14,7 @@ public: /* 04 */ virtual ~EquipScoop() override; /* 0c */ virtual ItemFlag GetId() const override; - /* 14 */ virtual bool IsUsable(unk32 param1, unk32 param2) const override; + /* 14 */ virtual bool IsUsable(unk32 param1) const override; /* 18 */ virtual void vfunc_18() override; // func_0v54_02198d2c /* 30 */ virtual void vfunc_30() override; // func_ov54_02198e04 diff --git a/include/Player/EquipShield.hpp b/include/Player/EquipShield.hpp index 3eb47d83..a66da083 100644 --- a/include/Player/EquipShield.hpp +++ b/include/Player/EquipShield.hpp @@ -24,7 +24,7 @@ public: /* 0c */ virtual ItemFlag GetId() const override; /* 10 */ virtual void vfunc_10() override; // func_ov00_020c076c - /* 14 */ virtual bool IsUsable(unk32 param1, unk32 param2) const override; + /* 14 */ virtual bool IsUsable(unk32 param1) const override; /* 18 */ virtual void vfunc_18() override; // func_ov00_020c0770 /* 1c */ virtual void vfunc_1c(); // func_ov00_020c07f8