diff options
| author | Theo <65437533+notyourav@users.noreply.github.com> | 2023-12-31 17:36:15 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-31 17:36:15 -0800 |
| commit | 48fdf9d8277d2bd2e071cb30fc6284c58645e343 (patch) | |
| tree | f5364bb3cdb41fe41512d767c1de44f73963e498 /src/object/pushableStatue.c | |
| parent | 72c27b5393372081f558a4c610bab7d5c88d3e89 (diff) | |
| parent | 37ac9cb0fb2d9ccb64286bab2cdf648e6f2541c5 (diff) | |
Merge pull request #684 from notyourav/tiles
Tiles documentation
Diffstat (limited to 'src/object/pushableStatue.c')
| -rw-r--r-- | src/object/pushableStatue.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/object/pushableStatue.c b/src/object/pushableStatue.c index 1755dc5b..5da8d0e8 100644 --- a/src/object/pushableStatue.c +++ b/src/object/pushableStatue.c @@ -155,7 +155,7 @@ void PushableStatue_Action4(PushableStatueEntity* this) { } else { super->spriteSettings.draw = 1; super->action = 1; - SetTile(0x400b, this->unk_84, super->collisionLayer); + SetBottomTile(0x400b, this->unk_84, super->collisionLayer); sub_080894C8(this); } } @@ -163,9 +163,9 @@ void PushableStatue_Action4(PushableStatueEntity* this) { void sub_08089454(PushableStatueEntity* this) { this->unk_84 = COORD_TO_TILE(super); this->unk_80 = GetTileIndex(this->unk_84, super->collisionLayer); - SetTile(0x400b, this->unk_84, super->collisionLayer); + SetBottomTile(0x400b, this->unk_84, super->collisionLayer); if (super->collisionLayer == 2 && GetTileType(this->unk_84, 1) == 0x310) { - SetTile(0x400b, this->unk_84, 1); + SetBottomTile(0x400b, this->unk_84, 1); } } @@ -194,7 +194,7 @@ void sub_08089538(PushableStatueEntity* this) { u16 tileType; this->unk_86 = 0x20; EnqueueSFX(SFX_10F); - SetTile(this->unk_80, this->unk_84, super->collisionLayer); + SetBottomTile(this->unk_80, this->unk_84, super->collisionLayer); if ((super->collisionLayer == 2) && (GetTileType(this->unk_84, 1) == 0x400b)) { CloneTile(0x310, this->unk_84, 1); } @@ -264,7 +264,7 @@ bool32 sub_080896B0(void) { uVar4 = COORD_TO_TILE_OFFSET(&gPlayerEntity.base, -ptr[0], -ptr[1]) - uVar1; val = sub_080B1AE0(uVar4, gPlayerEntity.base.collisionLayer); if ((val - 0x26 > 1) && (val != 0x29)) { - layer = GetLayerByIndex(gPlayerEntity.base.collisionLayer); + layer = GetTileBuffer(gPlayerEntity.base.collisionLayer); iVar2 = (uVar4 * 0x10000) >> 0x10; tmp1 = layer->collisionData[iVar2]; tmp2 = layer->collisionData[(iVar2 - uVar1)]; |