diff options
Diffstat (limited to 'src/object/smallIceBlock.c')
| -rw-r--r-- | src/object/smallIceBlock.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/object/smallIceBlock.c b/src/object/smallIceBlock.c index 8aab1f91..dfde7891 100644 --- a/src/object/smallIceBlock.c +++ b/src/object/smallIceBlock.c @@ -9,6 +9,12 @@ #include "hitbox.h" #include "item.h" #include "object.h" +#include "asm.h" +#include "sound.h" +#include "flags.h" +#include "effects.h" +#include "room.h" +#include "physics.h" #include "tiles.h" typedef struct { @@ -18,7 +24,7 @@ typedef struct { /*0x6e*/ u8 unk_6e[0x2]; /*0x70*/ u16 tilePos; /*0x72*/ u8 unk_72[0x14]; - /*0x86*/ u16 unk_86; + /*0x86*/ u16 flag; } SmallIceBlockEntity; extern const s16 gUnk_080B4488[]; @@ -51,7 +57,7 @@ void SmallIceBlock_Init(SmallIceBlockEntity* this) { case 0: case 1: case 2: - if (CheckFlags(this->unk_86)) { + if (CheckFlags(this->flag)) { DeleteThisEntity(); } } @@ -81,7 +87,7 @@ void SmallIceBlock_Action1(SmallIceBlockEntity* this) { EnqueueSFX(SFX_ICE_BLOCK_MELT); SmallIceBlock_Action3(this); if (super->type == 0) { - SetFlag(this->unk_86); + SetFlag(this->flag); } } else { if (!sub_0800442E(super)) { @@ -138,10 +144,10 @@ void SmallIceBlock_Action3(SmallIceBlockEntity* this) { } SetAffineInfo(super, 0x100, gUnk_08123748[super->timer >> 5], 0); if (super->type == 1) { - CreateGroundItemWithFlags(super, ITEM_SMALL_KEY, 0, this->unk_86); + CreateGroundItemWithFlags(super, ITEM_SMALL_KEY, 0, this->flag); SoundReq(SFX_SECRET); } else if (super->type == 2) { - CreateGroundItemWithFlags(super, ITEM_BIG_KEY, 0, this->unk_86); + CreateGroundItemWithFlags(super, ITEM_BIG_KEY, 0, this->flag); SoundReq(SFX_SECRET); } super->action = 4; |