diff options
| author | Aetias <144526980+AetiasHax@users.noreply.github.com> | 2025-05-29 08:58:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-05-29 08:58:56 +0200 |
| commit | a65e5547da4894b8d9aceaee2a81dbebd671ae3e (patch) | |
| tree | 39fd662766c4eae30755694bdd8dc9c376ca3de4 /include/Actor/Actor.hpp | |
| parent | 59a5cc5da29bd84680ceeaf2c2eeabe9effb6b6d (diff) | |
| parent | 2c27f6cb3d98b3a8fe94d631c47767dea4daeda8 (diff) | |
Merge pull request #96 from AetiasHax/delink-ActorRefill
Decomp `ActorRefill`
Diffstat (limited to 'include/Actor/Actor.hpp')
| -rw-r--r-- | include/Actor/Actor.hpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/Actor/Actor.hpp b/include/Actor/Actor.hpp index c22f086e..f82d34ab 100644 --- a/include/Actor/Actor.hpp +++ b/include/Actor/Actor.hpp @@ -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; |