Rename metaTiles

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

1 files changed, 76 insertions, 76 deletions

diff --git a/src/object/bigIceBlock.c b/src/object/bigIceBlock.c
index c53150ff..a4398c99 100644
--- a/src/object/bigIceBlock.c
+++ b/src/object/bigIceBlock.c
@@ -129,127 +129,127 @@ void sub_08099910(BigIceBlockEntity* this) {
     u32 uVar2;
     s32 vvv;
     u32 tileIndex;
-    u32 metaTilePos;
+    u32 tilePos;
 
-    metaTilePos = COORD_TO_TILE(super);
-    this->unk_6e = metaTilePos;
+    tilePos = COORD_TO_TILE(super);
+    this->unk_6e = tilePos;
     uVar2 = (((super->x.HALF.HI & 8)) >> 0x3) + ((super->y.HALF.HI & 8) >> 2);
     this->unk_6c = uVar2;
 
     switch (uVar2) {
         default:
-            SetMetaTile(SPECIAL_META_TILE_34, metaTilePos - 0x41, super->collisionLayer);
-            SetMetaTile(SPECIAL_META_TILE_34, metaTilePos - 0x40, super->collisionLayer);
-            SetMetaTile(SPECIAL_META_TILE_34, metaTilePos - 1, super->collisionLayer);
-            SetMetaTile(SPECIAL_META_TILE_34, metaTilePos, super->collisionLayer);
+            SetTile(SPECIAL_TILE_34, tilePos - 0x41, super->collisionLayer);
+            SetTile(SPECIAL_TILE_34, tilePos - 0x40, super->collisionLayer);
+            SetTile(SPECIAL_TILE_34, tilePos - 1, super->collisionLayer);
+            SetTile(SPECIAL_TILE_34, tilePos, super->collisionLayer);
             break;
         case 1:
-            vvv = GetVvvAtMetaTilePos(metaTilePos - 0x41, super->collisionLayer);
-            tileIndex = SPECIAL_META_TILE_36;
+            vvv = GetVvvAtTilePos(tilePos - 0x41, super->collisionLayer);
+            tileIndex = SPECIAL_TILE_36;
             if (vvv == VVV_18) {
-                tileIndex = SPECIAL_META_TILE_121;
+                tileIndex = SPECIAL_TILE_121;
             }
-            SetMetaTile(tileIndex, metaTilePos - 0x41, super->collisionLayer);
-            SetMetaTile(SPECIAL_META_TILE_34, metaTilePos - 0x40, super->collisionLayer);
-            vvv = GetVvvAtMetaTilePos(metaTilePos - 0x3f, super->collisionLayer);
-            tileIndex = SPECIAL_META_TILE_37;
+            SetTile(tileIndex, tilePos - 0x41, super->collisionLayer);
+            SetTile(SPECIAL_TILE_34, tilePos - 0x40, super->collisionLayer);
+            vvv = GetVvvAtTilePos(tilePos - 0x3f, super->collisionLayer);
+            tileIndex = SPECIAL_TILE_37;
             if (vvv == VVV_18) {
-                tileIndex = SPECIAL_META_TILE_123;
+                tileIndex = SPECIAL_TILE_123;
             }
-            SetMetaTile(tileIndex, metaTilePos - 0x3f, super->collisionLayer);
-            vvv = GetVvvAtMetaTilePos(metaTilePos - 1, super->collisionLayer);
-            tileIndex = SPECIAL_META_TILE_36;
+            SetTile(tileIndex, tilePos - 0x3f, super->collisionLayer);
+            vvv = GetVvvAtTilePos(tilePos - 1, super->collisionLayer);
+            tileIndex = SPECIAL_TILE_36;
             if (vvv == VVV_18) {
-                tileIndex = SPECIAL_META_TILE_121;
+                tileIndex = SPECIAL_TILE_121;
             }
-            SetMetaTile(tileIndex, metaTilePos - 1, super->collisionLayer);
-            SetMetaTile(SPECIAL_META_TILE_34, metaTilePos, super->collisionLayer);
-            vvv = GetVvvAtMetaTilePos(metaTilePos + 1, super->collisionLayer);
-            tileIndex = SPECIAL_META_TILE_37;
+            SetTile(tileIndex, tilePos - 1, super->collisionLayer);
+            SetTile(SPECIAL_TILE_34, tilePos, super->collisionLayer);
+            vvv = GetVvvAtTilePos(tilePos + 1, super->collisionLayer);
+            tileIndex = SPECIAL_TILE_37;
             if (vvv == VVV_18) {
-                tileIndex = SPECIAL_META_TILE_123;
+                tileIndex = SPECIAL_TILE_123;
             }
-            SetMetaTile(tileIndex, metaTilePos + 1, super->collisionLayer);
+            SetTile(tileIndex, tilePos + 1, super->collisionLayer);
             return;
             break;
         case 2:
-            vvv = GetVvvAtMetaTilePos(metaTilePos - 0x41, super->collisionLayer);
-            tileIndex = SPECIAL_META_TILE_35;
+            vvv = GetVvvAtTilePos(tilePos - 0x41, super->collisionLayer);
+            tileIndex = SPECIAL_TILE_35;
             if (vvv == VVV_18) {
-                tileIndex = SPECIAL_META_TILE_119;
+                tileIndex = SPECIAL_TILE_119;
             }
-            SetMetaTile(tileIndex, metaTilePos - 0x41, super->collisionLayer);
-            vvv = GetVvvAtMetaTilePos(metaTilePos - 0x40, super->collisionLayer);
-            tileIndex = SPECIAL_META_TILE_35;
+            SetTile(tileIndex, tilePos - 0x41, super->collisionLayer);
+            vvv = GetVvvAtTilePos(tilePos - 0x40, super->collisionLayer);
+            tileIndex = SPECIAL_TILE_35;
             if (vvv == VVV_18) {
-                tileIndex = SPECIAL_META_TILE_119;
+                tileIndex = SPECIAL_TILE_119;
             }
-            SetMetaTile(tileIndex, metaTilePos - 0x40, super->collisionLayer);
-            SetMetaTile(SPECIAL_META_TILE_34, metaTilePos - 1, super->collisionLayer);
-            SetMetaTile(SPECIAL_META_TILE_34, metaTilePos, super->collisionLayer);
-            vvv = GetVvvAtMetaTilePos(metaTilePos + 0x3f, super->collisionLayer);
-            tileIndex = SPECIAL_META_TILE_38;
+            SetTile(tileIndex, tilePos - 0x40, super->collisionLayer);
+            SetTile(SPECIAL_TILE_34, tilePos - 1, super->collisionLayer);
+            SetTile(SPECIAL_TILE_34, tilePos, super->collisionLayer);
+            vvv = GetVvvAtTilePos(tilePos + 0x3f, super->collisionLayer);
+            tileIndex = SPECIAL_TILE_38;
             if (vvv == VVV_18) {
-                tileIndex = SPECIAL_META_TILE_124;
+                tileIndex = SPECIAL_TILE_124;
             }
-            SetMetaTile(tileIndex, metaTilePos + 0x3f, super->collisionLayer);
-            vvv = GetVvvAtMetaTilePos(metaTilePos + 0x40, super->collisionLayer);
-            tileIndex = SPECIAL_META_TILE_38;
+            SetTile(tileIndex, tilePos + 0x3f, super->collisionLayer);
+            vvv = GetVvvAtTilePos(tilePos + 0x40, super->collisionLayer);
+            tileIndex = SPECIAL_TILE_38;
             if (vvv == VVV_18) {
-                tileIndex = SPECIAL_META_TILE_124;
+                tileIndex = SPECIAL_TILE_124;
             }
-            SetMetaTile(tileIndex, metaTilePos + 0x40, super->collisionLayer);
+            SetTile(tileIndex, tilePos + 0x40, super->collisionLayer);
             break;
         case 3:
-            vvv = GetVvvAtMetaTilePos(metaTilePos - 0x41, super->collisionLayer);
-            tileIndex = SPECIAL_META_TILE_39;
+            vvv = GetVvvAtTilePos(tilePos - 0x41, super->collisionLayer);
+            tileIndex = SPECIAL_TILE_39;
             if (vvv == VVV_18) {
-                tileIndex = SPECIAL_META_TILE_117;
+                tileIndex = SPECIAL_TILE_117;
             }
-            SetMetaTile(tileIndex, metaTilePos - 0x41, super->collisionLayer);
-            vvv = GetVvvAtMetaTilePos(metaTilePos - 0x40, super->collisionLayer);
-            tileIndex = SPECIAL_META_TILE_35;
+            SetTile(tileIndex, tilePos - 0x41, super->collisionLayer);
+            vvv = GetVvvAtTilePos(tilePos - 0x40, super->collisionLayer);
+            tileIndex = SPECIAL_TILE_35;
             if (vvv == VVV_18) {
-                tileIndex = SPECIAL_META_TILE_119;
+                tileIndex = SPECIAL_TILE_119;
             }
-            SetMetaTile(tileIndex, metaTilePos - 0x40, super->collisionLayer);
-            vvv = GetVvvAtMetaTilePos(metaTilePos - 0x3f, super->collisionLayer);
-            tileIndex = SPECIAL_META_TILE_40;
+            SetTile(tileIndex, tilePos - 0x40, super->collisionLayer);
+            vvv = GetVvvAtTilePos(tilePos - 0x3f, super->collisionLayer);
+            tileIndex = SPECIAL_TILE_40;
             if (vvv == VVV_18) {
-                tileIndex = SPECIAL_META_TILE_118;
+                tileIndex = SPECIAL_TILE_118;
             }
-            SetMetaTile(tileIndex, metaTilePos - 0x3f, super->collisionLayer);
-            vvv = GetVvvAtMetaTilePos(metaTilePos - 1, super->collisionLayer);
-            tileIndex = SPECIAL_META_TILE_36;
+            SetTile(tileIndex, tilePos - 0x3f, super->collisionLayer);
+            vvv = GetVvvAtTilePos(tilePos - 1, super->collisionLayer);
+            tileIndex = SPECIAL_TILE_36;
             if (vvv == VVV_18) {
-                tileIndex = SPECIAL_META_TILE_121;
+                tileIndex = SPECIAL_TILE_121;
             }
-            SetMetaTile(tileIndex, metaTilePos - 1, super->collisionLayer);
-            SetMetaTile(SPECIAL_META_TILE_34, metaTilePos, super->collisionLayer);
-            vvv = GetVvvAtMetaTilePos(metaTilePos + 1, super->collisionLayer);
-            tileIndex = SPECIAL_META_TILE_37;
+            SetTile(tileIndex, tilePos - 1, super->collisionLayer);
+            SetTile(SPECIAL_TILE_34, tilePos, super->collisionLayer);
+            vvv = GetVvvAtTilePos(tilePos + 1, super->collisionLayer);
+            tileIndex = SPECIAL_TILE_37;
             if (vvv == VVV_18) {
-                tileIndex = SPECIAL_META_TILE_123;
+                tileIndex = SPECIAL_TILE_123;
             }
-            SetMetaTile(tileIndex, metaTilePos + 1, super->collisionLayer);
-            vvv = GetVvvAtMetaTilePos(metaTilePos + 0x3f, super->collisionLayer);
-            tileIndex = SPECIAL_META_TILE_41;
+            SetTile(tileIndex, tilePos + 1, super->collisionLayer);
+            vvv = GetVvvAtTilePos(tilePos + 0x3f, super->collisionLayer);
+            tileIndex = SPECIAL_TILE_41;
             if (vvv == VVV_18) {
-                tileIndex = SPECIAL_META_TILE_120;
+                tileIndex = SPECIAL_TILE_120;
             }
-            SetMetaTile(tileIndex, metaTilePos + 0x3f, super->collisionLayer);
-            vvv = GetVvvAtMetaTilePos(metaTilePos + 0x40, super->collisionLayer);
-            tileIndex = SPECIAL_META_TILE_38;
+            SetTile(tileIndex, tilePos + 0x3f, super->collisionLayer);
+            vvv = GetVvvAtTilePos(tilePos + 0x40, super->collisionLayer);
+            tileIndex = SPECIAL_TILE_38;
             if (vvv == VVV_18) {
-                tileIndex = SPECIAL_META_TILE_124;
+                tileIndex = SPECIAL_TILE_124;
             }
-            SetMetaTile(tileIndex, metaTilePos + 0x40, super->collisionLayer);
-            vvv = GetVvvAtMetaTilePos(metaTilePos + 0x41, super->collisionLayer);
-            tileIndex = SPECIAL_META_TILE_42;
+            SetTile(tileIndex, tilePos + 0x40, super->collisionLayer);
+            vvv = GetVvvAtTilePos(tilePos + 0x41, super->collisionLayer);
+            tileIndex = SPECIAL_TILE_42;
             if (vvv == VVV_18) {
-                tileIndex = SPECIAL_META_TILE_122;
+                tileIndex = SPECIAL_TILE_122;
             }
-            SetMetaTile(tileIndex, metaTilePos + 0x41, super->collisionLayer);
+            SetTile(tileIndex, tilePos + 0x41, super->collisionLayer);
             break;
     }
 }