Rename metaTiles

Now the 16x16 tiles are just called tiles and the 8x8 tiles are called subTiles.

1 files changed, 25 insertions, 25 deletions

diff --git a/src/object/objectBlockingStairs.c b/src/object/objectBlockingStairs.c
index 204ba0e1..2e00c122 100644
--- a/src/object/objectBlockingStairs.c
+++ b/src/object/objectBlockingStairs.c
@@ -108,14 +108,14 @@ void ObjectBlockingStairs_Action1(ObjectBlockingStairsEntity* this) {
     }
 
     if (this->unk7b & 0x40) {
-        tileType = (u32)GetMetaTileType(this->tilePos - 1, super->collisionLayer);
+        tileType = (u32)GetTileType(this->tilePos - 1, super->collisionLayer);
     } else {
-        tileType = (u32)GetMetaTileType(this->tilePos + 1, super->collisionLayer);
+        tileType = (u32)GetTileType(this->tilePos + 1, super->collisionLayer);
     }
 
     switch (tileType) {
-        case SPECIAL_META_TILE_48:
-        case SPECIAL_META_TILE_49:
+        case SPECIAL_TILE_48:
+        case SPECIAL_TILE_49:
             super->action = 3;
             super->direction = Direction8FromAnimationState(gPlayerEntity.base.animationState);
             super->speed = 0x80;
@@ -134,23 +134,23 @@ void ObjectBlockingStairs_Action1(ObjectBlockingStairsEntity* this) {
     if (this->unk7b & 0x80) {
         this->unk7b &= ~0x80;
         if ((this->unk7b & 0x40) != 0) {
-            SetMetaTile(SPECIAL_META_TILE_44, this->tilePos - 1, super->collisionLayer);
-            SetMetaTile(SPECIAL_META_TILE_61, this->tilePos + 1, super->collisionLayer);
+            SetTile(SPECIAL_TILE_44, this->tilePos - 1, super->collisionLayer);
+            SetTile(SPECIAL_TILE_61, this->tilePos + 1, super->collisionLayer);
         } else {
-            SetMetaTile(SPECIAL_META_TILE_61, this->tilePos - 1, super->collisionLayer);
-            SetMetaTile(SPECIAL_META_TILE_45, this->tilePos + 1, super->collisionLayer);
+            SetTile(SPECIAL_TILE_61, this->tilePos - 1, super->collisionLayer);
+            SetTile(SPECIAL_TILE_45, this->tilePos + 1, super->collisionLayer);
         }
     } else if (this->unk7b & 0x40) {
         if (xDist >= 5) {
             this->unk7b &= ~(0x40 | 0x80);
-            SetMetaTile(SPECIAL_META_TILE_61, this->tilePos - 1, super->collisionLayer);
-            SetMetaTile(SPECIAL_META_TILE_45, this->tilePos + 1, super->collisionLayer);
+            SetTile(SPECIAL_TILE_61, this->tilePos - 1, super->collisionLayer);
+            SetTile(SPECIAL_TILE_45, this->tilePos + 1, super->collisionLayer);
         }
     } else {
         if (-xDist > 4) {
             this->unk7b |= 0x40;
-            SetMetaTile(SPECIAL_META_TILE_44, this->tilePos - 1, super->collisionLayer);
-            SetMetaTile(SPECIAL_META_TILE_61, this->tilePos + 1, super->collisionLayer);
+            SetTile(SPECIAL_TILE_44, this->tilePos - 1, super->collisionLayer);
+            SetTile(SPECIAL_TILE_61, this->tilePos + 1, super->collisionLayer);
         }
     }
 }
@@ -191,18 +191,18 @@ void ObjectBlockingStairs_Action4(ObjectBlockingStairsEntity* this) {
 }
 
 void sub_080931A4(ObjectBlockingStairsEntity* this, u32 param_2) {
-    static const u16 gUnk_08122850[] = { SPECIAL_META_TILE_39, SPECIAL_META_TILE_35, SPECIAL_META_TILE_40,
-                                         SPECIAL_META_TILE_44, SPECIAL_META_TILE_43, SPECIAL_META_TILE_45,
-                                         SPECIAL_META_TILE_41, SPECIAL_META_TILE_38, SPECIAL_META_TILE_42 };
-    static const u16 gUnk_08122862[] = { SPECIAL_META_TILE_39, SPECIAL_META_TILE_35, SPECIAL_META_TILE_40,
-                                         SPECIAL_META_TILE_36, SPECIAL_META_TILE_34, SPECIAL_META_TILE_37,
-                                         SPECIAL_META_TILE_41, SPECIAL_META_TILE_38, SPECIAL_META_TILE_42 };
-    static const u16 gUnk_08122874[] = { SPECIAL_META_TILE_39, SPECIAL_META_TILE_35, SPECIAL_META_TILE_35,
-                                         SPECIAL_META_TILE_36, SPECIAL_META_TILE_34, SPECIAL_META_TILE_34,
-                                         SPECIAL_META_TILE_41, SPECIAL_META_TILE_38, SPECIAL_META_TILE_38 };
-    static const u16 gUnk_08122886[] = { SPECIAL_META_TILE_35, SPECIAL_META_TILE_35, SPECIAL_META_TILE_40,
-                                         SPECIAL_META_TILE_34, SPECIAL_META_TILE_34, SPECIAL_META_TILE_37,
-                                         SPECIAL_META_TILE_38, SPECIAL_META_TILE_38, SPECIAL_META_TILE_42 };
+    static const u16 gUnk_08122850[] = { SPECIAL_TILE_39, SPECIAL_TILE_35, SPECIAL_TILE_40,
+                                         SPECIAL_TILE_44, SPECIAL_TILE_43, SPECIAL_TILE_45,
+                                         SPECIAL_TILE_41, SPECIAL_TILE_38, SPECIAL_TILE_42 };
+    static const u16 gUnk_08122862[] = { SPECIAL_TILE_39, SPECIAL_TILE_35, SPECIAL_TILE_40,
+                                         SPECIAL_TILE_36, SPECIAL_TILE_34, SPECIAL_TILE_37,
+                                         SPECIAL_TILE_41, SPECIAL_TILE_38, SPECIAL_TILE_42 };
+    static const u16 gUnk_08122874[] = { SPECIAL_TILE_39, SPECIAL_TILE_35, SPECIAL_TILE_35,
+                                         SPECIAL_TILE_36, SPECIAL_TILE_34, SPECIAL_TILE_34,
+                                         SPECIAL_TILE_41, SPECIAL_TILE_38, SPECIAL_TILE_38 };
+    static const u16 gUnk_08122886[] = { SPECIAL_TILE_35, SPECIAL_TILE_35, SPECIAL_TILE_40,
+                                         SPECIAL_TILE_34, SPECIAL_TILE_34, SPECIAL_TILE_37,
+                                         SPECIAL_TILE_38, SPECIAL_TILE_38, SPECIAL_TILE_42 };
 
     u32 collisionLayer;
     const u16* pTileTypes;
@@ -232,7 +232,7 @@ void sub_080931A4(ObjectBlockingStairsEntity* this, u32 param_2) {
 
     for (index = 0, iVar5 = 0; index < 9; index++) {
         u32 pos = tilePos + iVar5 + index - 1;
-        SetMetaTile(pTileTypes[index], pos, collisionLayer);
+        SetTile(pTileTypes[index], pos, collisionLayer);
         switch (index) {
             case 2:
                 iVar5 = 0x3d;