diff options
Diffstat (limited to 'src/object/smallIceBlock.c')
| -rw-r--r-- | src/object/smallIceBlock.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/object/smallIceBlock.c b/src/object/smallIceBlock.c index 1c5e048a..bc1754d4 100644 --- a/src/object/smallIceBlock.c +++ b/src/object/smallIceBlock.c @@ -87,7 +87,7 @@ void SmallIceBlock_Action1(SmallIceBlockEntity* this) { } } else { if (!sub_0800442E(super)) { - tileType = GetTileType(this->unk_70, super->collisionLayer); + tileType = GetMetaTileType(this->unk_70, super->collisionLayer); if (tileType != 0x405a) { switch (sub_08099618(tileType)) { case 1: @@ -102,7 +102,7 @@ void SmallIceBlock_Action1(SmallIceBlockEntity* this) { if (obj != NULL) { CopyPosition(super, obj); } - SetTile(this->unk_6c, this->unk_70, super->collisionLayer); + SetMetaTile(this->unk_6c, this->unk_70, super->collisionLayer); DeleteEntity(super); break; @@ -161,7 +161,7 @@ void SmallIceBlock_Action4(SmallIceBlockEntity* this) { DeleteThisEntity(); } else { if (super->timer == 0x30) { - SetTile(this->unk_6c, this->unk_70, super->collisionLayer); + SetMetaTile(this->unk_6c, this->unk_70, super->collisionLayer); } SetAffineInfo(super, 0x100, (0x3c - super->timer) * 0x20 + 0x100, 0); if ((super->timer & 1) != 0) { @@ -179,19 +179,19 @@ void SmallIceBlock_Action4(SmallIceBlockEntity* this) { void sub_08099468(SmallIceBlockEntity* this) { this->unk_70 = COORD_TO_TILE(super); - this->unk_6c = GetTileIndex(this->unk_70, super->collisionLayer); - SetTile(0x405a, this->unk_70, super->collisionLayer); + this->unk_6c = GetMetaTileIndex(this->unk_70, super->collisionLayer); + SetMetaTile(0x405a, this->unk_70, super->collisionLayer); } void sub_080994B8(SmallIceBlockEntity* this) { u16 tileType; EnqueueSFX(SFX_ICE_BLOCK_SLIDE); - SetTile(this->unk_6c, this->unk_70, super->collisionLayer); - if ((super->collisionLayer == 2) && (GetTileType(this->unk_70, 1) == 0x405a)) { + SetMetaTile(this->unk_6c, this->unk_70, super->collisionLayer); + if ((super->collisionLayer == 2) && (GetMetaTileType(this->unk_70, 1) == 0x405a)) { CloneTile(0x310, this->unk_70, 1); } - tileType = GetTileType(this->unk_70 + gUnk_080B4488[super->direction >> 3], super->collisionLayer); + tileType = GetMetaTileType(this->unk_70 + gUnk_080B4488[super->direction >> 3], super->collisionLayer); if (tileType == 0x79 || tileType == 0x77) { super->spriteOffsetY = -2; } |
