mirror/ph
1
0
Fork 0
mirror of https://github.com/zeldaret/ph synced 2026-09-06 18:51:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Decomp ActorRefill 94%

Browse Source
This commit is contained in:
Aetias
2025-05-27 22:00:27 +02:00
parent 9f8ead4aeb
commit 0b6e5d042b
12 changed files with 402 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Actor/Actor.hpp
+6 -4
View File
@@ -64,6 +64,7 @@ struct Actor_UnkStruct_0a4 {
/* 14 */
Actor_UnkStruct_0a4(q20 x, q20 y, q20 z, s32 unk_10);
void func_ov000_0207a1c8(unk32 param1, Vec3p *param2);
};
class KillPickupsFilter : FilterActorReturn, public FilterActorBase {
@@ -83,7 +84,8 @@ enum PlayerCollide_ {
PlayerCollide_Gongoron = 0x8,
PlayerCollide_Hammer = 0x10,
PlayerCollide_PickupFlags = PlayerCollide_Hammer | PlayerCollide_Gongoron | PlayerCollide_Sword | PlayerCollide_Player,
/* 0x1b */ PlayerCollide_PickupFlags =
PlayerCollide_Hammer | PlayerCollide_Gongoron | PlayerCollide_Sword | PlayerCollide_Player,
};
struct Knockback {
@@ -136,10 +138,10 @@ public:
/* 108 */ unk8 mUnk_108;
/* 109 */ unk8 mUnk_109;
/* 10a */ unk8 mUnk_10a[0x6];
/* 110 */ unk8 mUnk_110;
/* 110 */ bool mUnk_110;
/* 111 */ bool mUnk_111;
/* 112 */ unk8 mUnk_112;
/* 113 */ unk8 mUnk_113;
/* 112 */ bool mUnk_112;
/* 113 */ bool mUnk_113;
/* 114 */ unk8 mUnk_114;
/* 115 */ unk8 mUnk_115;
/* 116 */ unk8 mUnk_116;
include/Actor/ActorType.hpp
+7 -2
View File
@@ -25,8 +25,13 @@ enum ActorTypeId_ {
ActorTypeId_ShopItemShield = 'ITSL',
ActorTypeId_ShopItemSoldOut = 'ITSO',
ActorTypeId_Heart = 'HART',
ActorTypeId_Rupee = 'RUPY',
ActorTypeId_RefillArrows = 'FLAL',
ActorTypeId_RefillBombs = 'FLBM',
ActorTypeId_RefillBombchus = 'FLBT',
ActorTypeId_RefillTime = 'FLTM',
ActorTypeId_Heart = 'HART',
ActorTypeId_LSTM = 'LSTM',
ActorTypeId_Rupee = 'RUPY',
ActorTypeId_Arrow = 'ARRW',
ActorTypeId_Blast = 'BLST',
include/Actor/Player/ActorRefill.hpp
+8 -8
View File
@@ -12,18 +12,18 @@ public:
/* 158 */ unk32 mUnk_158;
/* 15c */ unk32 mUnk_15c;
/* 160 */ unk32 mUnk_160;
/* 164 */ unk8 mUnk_164;
/* 164 */ u8 mUnk_164;
/* 165 */ unk8 mUnk_165[0x3];
/* 168 */
public:
ActorRefill();
ActorRefill(unk32 param1);
/* 00 */ virtual ~ActorRefill() override;
/* 08 */ virtual bool vfunc_08() override;
/* 14 */ virtual void vfunc_14(u32 param1) override;
/* 20 */ virtual void vfunc_20(bool param1) override;
/* b4 */ virtual unk32 vfunc_b4() = 0;
/* b4 */ virtual ItemFlag vfunc_b4() = 0;
/* b8 */
bool func_ov014_02135364(unk32 param1);
@@ -42,7 +42,7 @@ public:
static ActorRefillBombs *Create();
/* 00 */ virtual ~ActorRefillBombs() override;
/* b4 */ virtual unk32 vfunc_b4() override;
/* b4 */ virtual ItemFlag vfunc_b4() override;
/* b8 */
};
@@ -58,7 +58,7 @@ public:
static ActorRefillBombchus *Create();
/* 00 */ virtual ~ActorRefillBombchus() override;
/* b4 */ virtual unk32 vfunc_b4() override;
/* b4 */ virtual ItemFlag vfunc_b4() override;
/* b8 */
};
@@ -74,7 +74,7 @@ public:
static ActorRefillArrows *Create();
/* 00 */ virtual ~ActorRefillArrows() override;
/* b4 */ virtual unk32 vfunc_b4() override;
/* b4 */ virtual ItemFlag vfunc_b4() override;
/* b8 */
};
@@ -91,7 +91,7 @@ public:
/* 00 */ virtual ~ActorRefillTime() override;
/* 08 */ virtual bool vfunc_08() override;
/* b4 */ virtual unk32 vfunc_b4() override;
/* b4 */ virtual ItemFlag vfunc_b4() override;
/* b8 */
};
@@ -108,6 +108,6 @@ public:
/* 00 */ virtual ~ActorLSTM() override;
/* 08 */ virtual bool vfunc_08() override;
/* b4 */ virtual unk32 vfunc_b4() override;
/* b4 */ virtual ItemFlag vfunc_b4() override;
/* b8 */
};
include/Item/ItemManager.hpp
+1 -1
View File
@@ -134,7 +134,7 @@ public:
// Ammo
u16 GetAmmo(ItemFlag equipId) const;
void GiveAmmo(ItemFlag equipId, u16 amount);
void GiveAmmo(ItemFlag equipId, u32 amount);
u16 GetMaxAmmo(ItemFlag equipId) const;
void UpgradeQuiver();
void UpgradeBombBag();