summaryrefslogtreecommitdiff
path: root/src/object/furniture.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/object/furniture.c')
-rw-r--r--src/object/furniture.c56
1 files changed, 28 insertions, 28 deletions
diff --git a/src/object/furniture.c b/src/object/furniture.c
index 31d06f14..7a185287 100644
--- a/src/object/furniture.c
+++ b/src/object/furniture.c
@@ -217,14 +217,14 @@ static void FurnitureInit(FurnitureEntity* this) {
break;
case 0x40:
super->y.HALF.HI = (super->y.HALF.HI & ~0xF) | 4;
- SetTile(0x4017, this->tile - 128, 1);
- SetTile(0x4017, this->tile - 64, 1);
+ SetBottomTile(0x4017, this->tile - 128, 1);
+ SetBottomTile(0x4017, this->tile - 64, 1);
break;
case 0x80:
super->frameIndex = 0;
super->y.HALF.HI = (super->y.HALF.HI & ~0xF) | 6;
this->tile = COORD_TO_TILE(super);
- SetTile(0x4026, this->tile, super->collisionLayer);
+ SetBottomTile(0x4026, this->tile, super->collisionLayer);
break;
case 0x200:
break;
@@ -260,8 +260,8 @@ static void FurnitureInit(FurnitureEntity* this) {
tile = this->tile - 129;
cnt = super->type != 26 ? 3 : 2;
for (i = 0; i < cnt; ++i, ++tile) {
- SetTile(0x4026, tile, 2);
- SetTile(0x4026, tile, 1);
+ SetBottomTile(0x4026, tile, 2);
+ SetBottomTile(0x4026, tile, 1);
sub_080001D0(0, tile + 64, 1);
}
break;
@@ -287,22 +287,22 @@ static void FurnitureInit(FurnitureEntity* this) {
case STAIRCASE:
super->collisionLayer = 1;
super->spriteOrientation.flipY = 2;
- SetTile(0x4074, this->tile - 64, super->collisionLayer);
+ SetBottomTile(0x4074, this->tile - 64, super->collisionLayer);
sub_080001D0(63, this->tile - 64, super->collisionLayer);
- SetTile(0x4017, this->tile, super->collisionLayer);
- SetTile(0x4017, this->tile + 64, super->collisionLayer);
+ SetBottomTile(0x4017, this->tile, super->collisionLayer);
+ SetBottomTile(0x4017, this->tile + 64, super->collisionLayer);
break;
case MINISH_CHEESE:
if (super->type2 != 0)
super->spriteOffsetX = -4;
break;
case WOODEN_TABLE:
- SetTile(0x4023, this->tile - 65, super->collisionLayer);
- SetTile(0x4023, this->tile - 64, super->collisionLayer);
- SetTile(0x4023, this->tile - 63, super->collisionLayer);
+ SetBottomTile(0x4023, this->tile - 65, super->collisionLayer);
+ SetBottomTile(0x4023, this->tile - 64, super->collisionLayer);
+ SetBottomTile(0x4023, this->tile - 63, super->collisionLayer);
break;
case LOW_BOOKSHELF:
- SetTile(0x4022, this->tile + 65, super->collisionLayer);
+ SetBottomTile(0x4022, this->tile + 65, super->collisionLayer);
}
}
@@ -340,9 +340,9 @@ static void FurnitureUpdate(FurnitureEntity* this) {
case 0x80:
if (gPlayerEntity.base.y.HALF.HI < super->y.HALF.HI + 8) {
if (gPlayerState.floor_type != SURFACE_LADDER && GetTileTypeByEntity(super) == 0x4017) {
- SetTile(0x4026, this->tile, super->collisionLayer);
- SetTile(0x403D, this->tile - 64, super->collisionLayer);
- SetTile(0x403D, this->tile - 128, super->collisionLayer);
+ SetBottomTile(0x4026, this->tile, super->collisionLayer);
+ SetBottomTile(0x403D, this->tile - 64, super->collisionLayer);
+ SetBottomTile(0x403D, this->tile - 128, super->collisionLayer);
}
} else {
if (gPlayerEntity.base.collisionLayer & 2) {
@@ -350,9 +350,9 @@ static void FurnitureUpdate(FurnitureEntity* this) {
UpdateSpriteForCollisionLayer(&gPlayerEntity.base);
}
if (GetTileTypeByEntity(super) != 0x4017) {
- SetTile(0x4017, this->tile, super->collisionLayer);
- SetTile(0x4017, this->tile - 64, super->collisionLayer);
- SetTile(0x4014, this->tile - 128, super->collisionLayer);
+ SetBottomTile(0x4017, this->tile, super->collisionLayer);
+ SetBottomTile(0x4017, this->tile - 64, super->collisionLayer);
+ SetBottomTile(0x4014, this->tile - 128, super->collisionLayer);
}
}
break;
@@ -377,28 +377,28 @@ static void sub_08090B6C(FurnitureEntity* this) {
num = 2;
}
for (i = -num; i <= num; ++i) {
- SetTile(0x4022, tile + i, cl);
+ SetBottomTile(0x4022, tile + i, cl);
}
if (px & 8) {
sub_08090CDC(0x4024, tile - i, cl);
sub_08090CDC(0x4025, tile + i, cl);
} else {
- SetTile(0x4022, tile - i, cl);
+ SetBottomTile(0x4022, tile - i, cl);
}
break;
case 1:
num = w2 / 8;
for (i = -num; i <= num; i++) {
- SetTile(0x4022, tile + i, cl);
+ SetBottomTile(0x4022, tile + i, cl);
}
if (px & 8) {
sub_08090CDC(0x4024, tile - i, cl);
if (i != 0) {
- SetTile(0x4022, tile + i, cl);
+ SetBottomTile(0x4022, tile + i, cl);
}
} else {
if (i != 0) {
- SetTile(0x4022, tile - i, cl);
+ SetBottomTile(0x4022, tile - i, cl);
}
sub_08090CDC(0x4025, tile + i, cl);
}
@@ -406,10 +406,10 @@ static void sub_08090B6C(FurnitureEntity* this) {
case 2:
num = w2 / 4;
for (i = -num; i < num; ++i) {
- SetTile(0x4022, tile + i, cl);
+ SetBottomTile(0x4022, tile + i, cl);
}
if (px & 8) {
- SetTile(0x4022, tile + i, cl);
+ SetBottomTile(0x4022, tile + i, cl);
} else {
sub_08090CDC(0x4024, tile - i - 1, cl);
sub_08090CDC(0x4025, tile + i, cl);
@@ -418,7 +418,7 @@ static void sub_08090B6C(FurnitureEntity* this) {
case 3:
num = w2 / 4;
for (i = -num; i <= num; ++i) {
- SetTile(0x4022, tile + i, cl);
+ SetBottomTile(0x4022, tile + i, cl);
}
if (px & 8) {
sub_08090CDC(0x4025, tile + i, cl);
@@ -436,7 +436,7 @@ static void sub_08090CDC(u32 id, u32 pos, u32 layer) {
u32 id2;
if ((cur & 0x4000) == 0) {
- SetTile(id, pos, layer);
+ SetBottomTile(id, pos, layer);
} else {
switch (cur) {
case 0x4025:
@@ -474,7 +474,7 @@ static void sub_08090CDC(u32 id, u32 pos, u32 layer) {
default:
return;
}
- SetTile(next, pos, layer);
+ SetBottomTile(next, pos, layer);
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 03:20:44 +0000