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

Merge branch 'main' into decomp/MapManager

Browse Source
This commit is contained in:
SammygoodTunes
2025-06-03 23:52:44 +02:00
committed by GitHub
parent 088f7b4771 21aaec6b40
commit 920023d800
68 changed files with 2393 additions and 390 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Actor/Actor.hpp
+7 -5
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;
@@ -173,7 +175,7 @@ public:
/* 00 */ virtual ~Actor();
/* 08 */ virtual bool vfunc_08();
/* 0c */ virtual void vfunc_0c();
/* 0c */ virtual bool vfunc_0c();
/* 10 */ virtual void vfunc_10(u32 param1);
/* 14 */ virtual void vfunc_14(u32 param1);
/* 18 */ virtual void vfunc_18(u32 param1);
include/Actor/ActorRef.hpp
+1 -3
View File
@@ -8,9 +8,7 @@ struct ActorRef {
/* 4 */ s32 index;
/* 8 */
inline ActorRef() {
Reset();
}
inline ActorRef() {}
inline ActorRef(s32 id, s32 index) :
id(id),
index(index) {}
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/Dungeon/ActorSwitchObject.hpp
+1 -1
View File
@@ -22,7 +22,7 @@ public:
/* 00 */ virtual ~ActorSwitchObject() override;
/* 08 */ virtual bool vfunc_08() override;
/* 0c */ virtual void vfunc_0c() override;
/* 0c */ virtual bool vfunc_0c() override;
/* 14 */ virtual void vfunc_14(u32 param1) override;
/* 18 */ virtual void vfunc_18(u32 param1) override;
/* b4 */
include/Actor/Navi/ActorNaviBase.hpp
+1 -1
View File
@@ -21,7 +21,7 @@ class ActorNaviBase_Unk1 {};
class ActorNaviBase : public Actor {
public:
/* 000 (base) */
/* 158 */ Vec3p mUnk_158;
/* 158 */ Vec3p mOffsetPos;
/* 164 */ unk32 mUnk_164;
/* 168 */ ModelRender mUnk_168;
/* 1c4 */ unk8 mUnk_1c4[0xc];
include/Actor/Player/ActorRefill.hpp
+113
View File
@@ -0,0 +1,113 @@
#pragma once
#include "global.h"
#include "types.h"
#include "Actor/Actor.hpp"
#include "Actor/ActorType.hpp"
class ActorRefill : public Actor {
public:
/* 000 (base) */
/* 158 */ unk32 mUnk_158;
/* 15c */ unk32 mUnk_15c;
/* 160 */ unk32 mUnk_160;
/* 164 */ u8 mUnk_164;
/* 165 */ unk8 mUnk_165[0x3];
/* 168 */
public:
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 ItemFlag vfunc_b4() = 0;
/* b8 */
bool func_ov014_02135364(unk32 param1);
void func_ov014_02135474();
};
class ActorRefillBombs : public ActorRefill {
public:
static ActorType gType;
/* 000 (base) */
/* 168 */
public:
ActorRefillBombs();
static ActorRefillBombs *Create();
/* 00 */ virtual ~ActorRefillBombs() override;
/* b4 */ virtual ItemFlag vfunc_b4() override;
/* b8 */
};
class ActorRefillBombchus : public ActorRefill {
public:
static ActorType gType;
/* 000 (base) */
/* 168 */
public:
ActorRefillBombchus();
static ActorRefillBombchus *Create();
/* 00 */ virtual ~ActorRefillBombchus() override;
/* b4 */ virtual ItemFlag vfunc_b4() override;
/* b8 */
};
class ActorRefillArrows : public ActorRefill {
public:
static ActorType gType;
/* 000 (base) */
/* 168 */
public:
ActorRefillArrows();
static ActorRefillArrows *Create();
/* 00 */ virtual ~ActorRefillArrows() override;
/* b4 */ virtual ItemFlag vfunc_b4() override;
/* b8 */
};
class ActorRefillTime : public ActorRefill {
public:
static ActorType gType;
/* 000 (base) */
/* 168 */
public:
ActorRefillTime();
static ActorRefillTime *Create();
/* 00 */ virtual ~ActorRefillTime() override;
/* 08 */ virtual bool vfunc_08() override;
/* b4 */ virtual ItemFlag vfunc_b4() override;
/* b8 */
};
class ActorLSTM : public ActorRefill {
public:
static ActorType gType;
/* 000 (base) */
/* 168 */
public:
ActorLSTM();
static ActorLSTM *Create();
/* 00 */ virtual ~ActorLSTM() override;
/* 08 */ virtual bool vfunc_08() override;
/* b4 */ virtual ItemFlag vfunc_b4() override;
/* b8 */
};