diff options
| author | Henny022p <73211432+Henny022p@users.noreply.github.com> | 2026-02-08 18:32:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-02-08 18:32:38 +0100 |
| commit | 5ab63f00e522ff69c5bc987e379f0163943f2833 (patch) | |
| tree | 53622222ac729c6ab6dc75ef7f9bafa8031daf18 /src/object/mask.c | |
| parent | 73901a0a012d55ebb66a4627dcb246d19737fcb5 (diff) | |
| parent | 5b2cafdc894823d57beee8f3947a391d881d91de (diff) | |
Various code cleanup changes
Diffstat (limited to 'src/object/mask.c')
| -rw-r--r-- | src/object/mask.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/object/mask.c b/src/object/mask.c index 9246fda1..0c961656 100644 --- a/src/object/mask.c +++ b/src/object/mask.c @@ -4,9 +4,16 @@ * * @brief Mask object */ -#include "functions.h" #include "object.h" +#include "asm.h" +#include "sound.h" +#include "flags.h" +#include "effects.h" +#include "room.h" +#include "player.h" #include "tiles.h" +#include "item.h" +#include "map.h" typedef struct { /*0x00*/ Entity base; @@ -16,7 +23,7 @@ typedef struct { /*0x7c*/ u16 unk_7c; /*0x7e*/ u16 unk_7e; /*0x80*/ u8 unused2[6]; - /*0x86*/ u16 unk_86; + /*0x86*/ u16 flag; } MaskEntity; void Mask_Init(MaskEntity* this); @@ -36,7 +43,7 @@ void Mask(MaskEntity* this) { void Mask_Init(MaskEntity* this) { if (super->type2 & 0xC0) { - if (CheckFlags(this->unk_86)) { + if (CheckFlags(this->flag)) { s32 field_0x0a; switch (super->type2 & 0xC0) { @@ -49,7 +56,7 @@ void Mask_Init(MaskEntity* this) { DeleteThisEntity(); break; default: - ClearFlag(this->unk_86); + ClearFlag(this->flag); } break; @@ -122,7 +129,7 @@ void Mask_Action2(MaskEntity* this) { case 0x80: EnqueueSFX(SFX_SECRET); case 0x40: - SetFlag(this->unk_86); + SetFlag(this->flag); break; } |