mirror/ph
1
0
Fork 0
mirror of https://github.com/zeldaret/ph synced 2026-06-19 15:30:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update EquipItem virtual functions

Browse Source
This commit is contained in:
Aetias
2024-01-06 10:38:50 +01:00
parent cf9ba37018
commit e94f48ce0b
11 changed files with 22 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Player/EquipBomb.hpp
+2 -3
View File
@@ -14,9 +14,8 @@ private:
public:
EquipBomb();
/* 00 */ virtual void vfunc_00(unk32 param1, unk32 param2, unk32 param3) override; // func_ov55_02198d00
/* 04 */ virtual EquipItem* vfunc_04() override; // func_ov14_213d214
/* 08 */ virtual ~EquipBomb() override;
/* 00 */ virtual void vfunc_00() override; // func_ov55_02198d00
/* 04 */ virtual ~EquipBomb() override;
/* 0c */ virtual ItemFlag GetId() const override;
/* 14 */ virtual bool IsUsable(unk32 param1, unk32 param2) const override;
include/Player/EquipBombchu.hpp
+2 -3
View File
@@ -27,9 +27,8 @@ private:
public:
EquipBombchu();
/* 00 */ virtual void vfunc_00(unk32 param1, unk32 param2, unk32 param3) override; // func_ov58_02198fc0
/* 04 */ virtual EquipItem* vfunc_04() override; // func_ov14_0213eb5c
/* 08 */ virtual ~EquipBombchu() override;
/* 00 */ virtual void vfunc_00() override; // func_ov58_02198fc0
/* 04 */ virtual ~EquipBombchu() override;
/* 0c */ virtual ItemFlag GetId() const override;
bool CheckUsable(unk32 param1) const;
include/Player/EquipBoomerang.hpp
+1 -2
View File
@@ -18,8 +18,7 @@ private:
/* 30 */
public:
/* 04 */ virtual EquipItem* vfunc_04() override; // func_ov14_213d010
/* 08 */ virtual ~EquipBoomerang() override;
/* 04 */ virtual ~EquipBoomerang() override;
/* 0c */ virtual ItemFlag GetId() const override;
/* 10 */ virtual void vfunc_10() override; // func_ov14_0213d078
include/Player/EquipBow.hpp
+2 -3
View File
@@ -16,9 +16,8 @@ private:
public:
EquipBow();
/* 00 */ virtual void vfunc_00(unk32 param1, unk32 param2, unk32 param3) override; // func_ov56_02198d00
/* 04 */ virtual EquipItem* vfunc_04() override; // func_ov14_0213ead4
/* 08 */ virtual ~EquipBow() override;
/* 00 */ virtual void vfunc_00() override; // func_ov56_02198d00
/* 04 */ virtual ~EquipBow() override;
/* 0c */ virtual ItemFlag GetId() const override;
/* 14 */ virtual bool IsUsable(unk32 param1, unk32 param2) const override;
include/Player/EquipHammer.hpp
+1 -2
View File
@@ -20,8 +20,7 @@ private:
public:
EquipHammer();
/* 04 */ virtual EquipItem* vfunc_04() override; // func_ov14_0213ede4
/* 08 */ virtual ~EquipHammer() override;
/* 04 */ virtual ~EquipHammer() override;
/* 0c */ virtual ItemFlag GetId() const override;
/* 10 */ virtual void vfunc_10() override; // func_ov14_0213ee04
include/Player/EquipItem.hpp
+3 -3
View File
@@ -1,6 +1,7 @@
#pragma once
#include "types.h"
#include "global.h"
#include "Item.hpp"
#include "SysNew.hpp"
@@ -14,9 +15,8 @@ private:
public:
EquipItem();
/* 00 */ virtual void vfunc_00(unk32 param1, unk32 param2, unk32 param3); // func_ov00_020be8dc
/* 04 */ virtual EquipItem* vfunc_04(); // func_ov04_0210ba74
/* 08 */ virtual ~EquipItem();
/* 00 */ virtual void vfunc_00(); // func_ov00_020be8dc
/* 04 */ virtual ~EquipItem();
/* 0c */ virtual ItemFlag GetId() const = 0;
/* 10 */ virtual void vfunc_10(); // func_ov04_0210ba88
include/Player/EquipPotion.hpp
+4 -7
View File
@@ -13,9 +13,8 @@ private:
public:
EquipPotion();
/* 00 */ virtual void vfunc_00(unk32 param1, unk32 param2, unk32 param3) override; // func_ov55_021991a8
/* 04 */ virtual EquipItem* vfunc_04() override; // func_ov14_02151564
/* 08 */ virtual ~EquipPotion() override;
/* 00 */ virtual void vfunc_00() override; // func_ov55_021991a8
/* 04 */ virtual ~EquipPotion() override;
/* 14 */ virtual bool IsUsable(unk32 param1, unk32 param2) const override;
/* 18 */ virtual void vfunc_18() override; // func_ov55_021991ac
@@ -30,8 +29,7 @@ class EquipPotionA : public EquipPotion {
public:
EquipPotionA();
/* 04 */ virtual EquipItem* vfunc_04() override; // func_ov14_021515a8
/* 08 */ virtual ~EquipPotionA() override;
/* 04 */ virtual ~EquipPotionA() override;
/* 0c */ virtual ItemFlag GetId() const override;
/* 50 */
};
@@ -40,8 +38,7 @@ class EquipPotionB : public EquipPotion {
public:
EquipPotionB();
/* 04 */ virtual EquipItem* vfunc_04() override; // func_ov14_021515e8
/* 08 */ virtual ~EquipPotionB() override;
/* 04 */ virtual ~EquipPotionB() override;
/* 0c */ virtual ItemFlag GetId() const override;
/* 50 */
};
include/Player/EquipRope.hpp
+1 -2
View File
@@ -24,8 +24,7 @@ private:
public:
EquipRope();
/* 04 */ virtual EquipItem* vfunc_04() override; // func_ov14_0213d314
/* 08 */ virtual ~EquipRope() override;
/* 04 */ virtual ~EquipRope() override;
/* 0c */ virtual ItemFlag GetId() const override;
/* 10 */ virtual void vfunc_10() override; // func_ov14_0213d3a0
include/Player/EquipScoop.hpp
+2 -3
View File
@@ -10,9 +10,8 @@ private:
/* c */
public:
/* 00 */ virtual void vfunc_00(unk32 param1, unk32 param2, unk32 param3) override; // func_ov54_02198d00
/* 04 */ virtual EquipItem* vfunc_04() override; // func_ov14_0213cf9c
/* 08 */ virtual ~EquipScoop() override;
/* 00 */ virtual void vfunc_00() override; // func_ov54_02198d00
/* 04 */ virtual ~EquipScoop() override;
/* 0c */ virtual ItemFlag GetId() const override;
/* 14 */ virtual bool IsUsable(unk32 param1, unk32 param2) const override;
include/Player/EquipShield.hpp
+2 -3
View File
@@ -19,9 +19,8 @@ private:
public:
EquipShield();
/* 00 */ virtual void vfunc_00(unk32 param1, unk32 param2, unk32 param3) override; // func_ov00_020c06d4
/* 04 */ virtual EquipItem* vfunc_04() override; // func_ov04_0210bc28
/* 08 */ virtual ~EquipShield() override; // func_ov04_0210bc94
/* 00 */ virtual void vfunc_00() override; // func_ov00_020c06d4
/* 04 */ virtual ~EquipShield() override; // func_ov04_0210bc94
/* 0c */ virtual ItemFlag GetId() const override;
/* 10 */ virtual void vfunc_10() override; // func_ov00_020c076c
include/Player/EquipSword.hpp
+2 -3
View File
@@ -41,9 +41,8 @@ private:
public:
EquipSword();
/* 00 */ virtual void vfunc_00(unk32 param1, unk32 param2, unk32 param3) override; // func_ov00_020beffc
/* 04 */ virtual EquipItem* vfunc_04() override; // func_ov04_0210b918
/* 08 */ virtual ~EquipSword() override;
/* 00 */ virtual void vfunc_00() override; // func_ov00_020beffc
/* 04 */ virtual ~EquipSword() override;
/* 0c */ virtual ItemFlag GetId() const override;
/* 10 */ virtual void vfunc_10() override; // func_ov00_020bf18c