summaryrefslogtreecommitdiff
path: root/src/manager/miscManager.c
diff options
context:
space:
mode:
authoroctorock <79596758+octorock@users.noreply.github.com>2024-01-06 14:59:48 +0100
committeroctorock <79596758+octorock@users.noreply.github.com>2024-01-06 15:01:44 +0100
commitaced0bef691dbc41bdd39b6e62662d2436877a4b (patch)
treee90f9fd8e4c4c3471c2fb246bb1372974294b469 /src/manager/miscManager.c
parentc3b771a20923b335bbea2ab97a68ac29d04fcc43 (diff)
Rename metaTiles
Now the 16x16 tiles are just called tiles and the 8x8 tiles are called subTiles.
Diffstat (limited to 'src/manager/miscManager.c')
-rw-r--r--src/manager/miscManager.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/manager/miscManager.c b/src/manager/miscManager.c
index d8e28e97..d5432970 100644
--- a/src/manager/miscManager.c
+++ b/src/manager/miscManager.c
@@ -121,9 +121,9 @@ void MiscManager_Type0(MiscManager* this) {
void sub_08058F44(u32 x, u32 y, u32 flag) {
if (CheckRoomFlag(flag))
return;
- if (sub_080B1A48(x, y, LAYER_BOTTOM) != META_TILE_TYPE_97)
+ if (sub_080B1A48(x, y, LAYER_BOTTOM) != TILE_TYPE_97)
return;
- SetMetaTileType(META_TILE_TYPE_38, ((x >> 4) & 0x3F) | (((y >> 4) & 0x3F) << 6), LAYER_BOTTOM);
+ SetTileType(TILE_TYPE_38, ((x >> 4) & 0x3F) | (((y >> 4) & 0x3F) << 6), LAYER_BOTTOM);
sub_08058F84(x, y);
}
@@ -240,7 +240,7 @@ void MiscManager_Type5(MiscManager* this) {
DeleteThisEntity();
}
super->action = 1;
- SetMetaTileType(META_TILE_TYPE_869, TILE_LOCAL(this->x, this->y), super->type2);
+ SetTileType(TILE_TYPE_869, TILE_LOCAL(this->x, this->y), super->type2);
break;
case 1:
if (CheckFlags(this->flags)) {
@@ -338,10 +338,10 @@ void sub_0805930C(MiscManager* this) {
tmp->collisionLayer = 1;
}
-void SetDirtTile(u32 metaTilePos) {
- SetMetaTileType(META_TILE_TYPE_29, metaTilePos, LAYER_BOTTOM);
- SetMetaTileType(META_TILE_TYPE_0, metaTilePos, LAYER_TOP);
- SetMetaTileType(META_TILE_TYPE_0, metaTilePos + TILE_POS(0, -1), LAYER_TOP);
+void SetDirtTile(u32 tilePos) {
+ SetTileType(TILE_TYPE_29, tilePos, LAYER_BOTTOM);
+ SetTileType(TILE_TYPE_0, tilePos, LAYER_TOP);
+ SetTileType(TILE_TYPE_0, tilePos + TILE_POS(0, -1), LAYER_TOP);
}
void MiscManager_TypeA(MiscManager* this) {