summaryrefslogtreecommitdiff
path: root/src/object/objectA.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/object/objectA.c')
-rw-r--r--src/object/objectA.c11
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();
}