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/objectA.c | |
| parent | 73901a0a012d55ebb66a4627dcb246d19737fcb5 (diff) | |
| parent | 5b2cafdc894823d57beee8f3947a391d881d91de (diff) | |
Various code cleanup changes
Diffstat (limited to 'src/object/objectA.c')
| -rw-r--r-- | src/object/objectA.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/object/objectA.c b/src/object/objectA.c index ac45f99f..c0af01b5 100644 --- a/src/object/objectA.c +++ b/src/object/objectA.c @@ -6,11 +6,12 @@ */ #include "entity.h" #include "flags.h" -#include "functions.h" #include "game.h" #include "hitbox.h" #include "object.h" +#include "effects.h" #include "room.h" +#include "player.h" #include "tiles.h" typedef struct { @@ -18,7 +19,7 @@ typedef struct { /*0x68*/ u8 unused1[8]; /*0x70*/ u16 unk_70; /*0x72*/ u8 unused2[20]; - /*0x86*/ u16 unk_86; + /*0x86*/ u16 flag; } ObjectAEntity; extern u8 gUpdateVisibleTiles; @@ -35,7 +36,7 @@ void ObjectA(ObjectAEntity* this) { uVar2 = TILE_TYPE_52; } this->unk_70 = uVar2; - if (CheckFlags(this->unk_86) != 0) { + if (CheckFlags(this->flag) != 0) { SetTileType(this->unk_70, COORD_TO_TILE(super), super->collisionLayer); if ((gRoomControls.reload_flags & 1) != 0) { gUpdateVisibleTiles = 0; @@ -46,8 +47,8 @@ void ObjectA(ObjectAEntity* this) { } } else if (super->interactType != INTERACTION_NONE) { SetTileType(this->unk_70, COORD_TO_TILE(super), super->collisionLayer); - SetFlag(this->unk_86); - CreateDust(super); + SetFlag(this->flag); + CreateDeathFx(super); ModDungeonKeys(-1); DeleteThisEntity(); } |