Eliminate METATILE_ID() macro

2020-07-02 00:17:14 -04:00
parent c84f98a7ff
commit 8589e138a8
7 changed files with 214 additions and 214 deletions
@@ -656,9 +656,9 @@ void MauvilleGymPressSwitch(void)
    for (i = 0; i < ARRAY_COUNT(sMauvilleGymSwitchCoords); i++)
    {
        if (i == gSpecialVar_0x8004)
-            MapGridSetMetatileIdAt(sMauvilleGymSwitchCoords[i].x, sMauvilleGymSwitchCoords[i].y, METATILE_ID(MauvilleGym, PressedSwitch));
+            MapGridSetMetatileIdAt(sMauvilleGymSwitchCoords[i].x, sMauvilleGymSwitchCoords[i].y, METATILE_MauvilleGym_PressedSwitch);
        else
-            MapGridSetMetatileIdAt(sMauvilleGymSwitchCoords[i].x, sMauvilleGymSwitchCoords[i].y, METATILE_ID(MauvilleGym, RaisedSwitch));
+            MapGridSetMetatileIdAt(sMauvilleGymSwitchCoords[i].x, sMauvilleGymSwitchCoords[i].y, METATILE_MauvilleGym_RaisedSwitch);
    }
 }

@@ -673,83 +673,83 @@ void MauvilleGymSetDefaultBarriers(void)
        {
            switch (MapGridGetMetatileIdAt(x, y))
            {
-                case METATILE_ID(MauvilleGym, GreenBeamH1_On):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, GreenBeamH1_Off));
+                case METATILE_MauvilleGym_GreenBeamH1_On:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_GreenBeamH1_Off);
                    break;
-                case METATILE_ID(MauvilleGym, GreenBeamH2_On):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, GreenBeamH2_Off));
+                case METATILE_MauvilleGym_GreenBeamH2_On:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_GreenBeamH2_Off);
                    break;
-                case METATILE_ID(MauvilleGym, GreenBeamH3_On):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, GreenBeamH3_Off));
+                case METATILE_MauvilleGym_GreenBeamH3_On:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_GreenBeamH3_Off);
                    break;
-                case METATILE_ID(MauvilleGym, GreenBeamH4_On):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, GreenBeamH4_Off));
+                case METATILE_MauvilleGym_GreenBeamH4_On:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_GreenBeamH4_Off);
                    break;
-                case METATILE_ID(MauvilleGym, GreenBeamH1_Off):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, GreenBeamH1_On));
+                case METATILE_MauvilleGym_GreenBeamH1_Off:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_GreenBeamH1_On);
                    break;
-                case METATILE_ID(MauvilleGym, GreenBeamH2_Off):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, GreenBeamH2_On));
+                case METATILE_MauvilleGym_GreenBeamH2_Off:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_GreenBeamH2_On);
                    break;
-                case METATILE_ID(MauvilleGym, GreenBeamH3_Off):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, GreenBeamH3_On) | METATILE_COLLISION_MASK);
+                case METATILE_MauvilleGym_GreenBeamH3_Off:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_GreenBeamH3_On | METATILE_COLLISION_MASK);
                    break;
-                case METATILE_ID(MauvilleGym, GreenBeamH4_Off):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, GreenBeamH4_On) | METATILE_COLLISION_MASK);
+                case METATILE_MauvilleGym_GreenBeamH4_Off:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_GreenBeamH4_On | METATILE_COLLISION_MASK);
                    break;
-                case METATILE_ID(MauvilleGym, RedBeamH1_On):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, RedBeamH1_Off));
+                case METATILE_MauvilleGym_RedBeamH1_On:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_RedBeamH1_Off);
                    break;
-                case METATILE_ID(MauvilleGym, RedBeamH2_On):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, RedBeamH2_Off));
+                case METATILE_MauvilleGym_RedBeamH2_On:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_RedBeamH2_Off);
                    break;
-                case METATILE_ID(MauvilleGym, RedBeamH3_On):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, RedBeamH3_Off));
+                case METATILE_MauvilleGym_RedBeamH3_On:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_RedBeamH3_Off);
                    break;
-                case METATILE_ID(MauvilleGym, RedBeamH4_On):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, RedBeamH4_Off));
+                case METATILE_MauvilleGym_RedBeamH4_On:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_RedBeamH4_Off);
                    break;
-                case METATILE_ID(MauvilleGym, RedBeamH1_Off):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, RedBeamH1_On));
+                case METATILE_MauvilleGym_RedBeamH1_Off:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_RedBeamH1_On);
                    break;
-                case METATILE_ID(MauvilleGym, RedBeamH2_Off):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, RedBeamH2_On));
+                case METATILE_MauvilleGym_RedBeamH2_Off:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_RedBeamH2_On);
                    break;
-                case METATILE_ID(MauvilleGym, RedBeamH3_Off):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, RedBeamH3_On) | METATILE_COLLISION_MASK);
+                case METATILE_MauvilleGym_RedBeamH3_Off:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_RedBeamH3_On | METATILE_COLLISION_MASK);
                    break;
-                case METATILE_ID(MauvilleGym, RedBeamH4_Off):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, RedBeamH4_On) | METATILE_COLLISION_MASK);
+                case METATILE_MauvilleGym_RedBeamH4_Off:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_RedBeamH4_On | METATILE_COLLISION_MASK);
                    break;
-                case METATILE_ID(MauvilleGym, GreenBeamV1_On):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, PoleBottom_On) | METATILE_COLLISION_MASK);
+                case METATILE_MauvilleGym_GreenBeamV1_On:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_PoleBottom_On | METATILE_COLLISION_MASK);
                    break;
-                case METATILE_ID(MauvilleGym, GreenBeamV2_On):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, FloorTile));
+                case METATILE_MauvilleGym_GreenBeamV2_On:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_FloorTile);
                    break;
-                case METATILE_ID(MauvilleGym, RedBeamV1_On):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, PoleBottom_Off) | METATILE_COLLISION_MASK);
+                case METATILE_MauvilleGym_RedBeamV1_On:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_PoleBottom_Off | METATILE_COLLISION_MASK);
                    break;
-                case METATILE_ID(MauvilleGym, RedBeamV2_On):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, FloorTile));
+                case METATILE_MauvilleGym_RedBeamV2_On:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_FloorTile);
                    break;
-                case METATILE_ID(MauvilleGym, PoleBottom_On):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, GreenBeamV1_On) | METATILE_COLLISION_MASK);
+                case METATILE_MauvilleGym_PoleBottom_On:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_GreenBeamV1_On | METATILE_COLLISION_MASK);
                    break;
-                case METATILE_ID(MauvilleGym, FloorTile):
-                    if (MapGridGetMetatileIdAt(x, y - 1) == METATILE_ID(MauvilleGym, GreenBeamV1_On))
-                        MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, GreenBeamV2_On) | METATILE_COLLISION_MASK);
+                case METATILE_MauvilleGym_FloorTile:
+                    if (MapGridGetMetatileIdAt(x, y - 1) == METATILE_MauvilleGym_GreenBeamV1_On)
+                        MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_GreenBeamV2_On | METATILE_COLLISION_MASK);
                    else
-                        MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, RedBeamV2_On) | METATILE_COLLISION_MASK);
+                        MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_RedBeamV2_On | METATILE_COLLISION_MASK);
                    break;
-                case METATILE_ID(MauvilleGym, PoleBottom_Off):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, RedBeamV1_On) | METATILE_COLLISION_MASK);
+                case METATILE_MauvilleGym_PoleBottom_Off:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_RedBeamV1_On | METATILE_COLLISION_MASK);
                    break;
-                case METATILE_ID(MauvilleGym, PoleTop_Off):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, PoleTop_On) | METATILE_COLLISION_MASK);
+                case METATILE_MauvilleGym_PoleTop_Off:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_PoleTop_On | METATILE_COLLISION_MASK);
                    break;
-                case METATILE_ID(MauvilleGym, PoleTop_On):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, PoleTop_Off));
+                case METATILE_MauvilleGym_PoleTop_On:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_PoleTop_Off);
                    break;
            }
        }
@@ -763,7 +763,7 @@ void MauvilleGymDeactivatePuzzle(void)
    const struct UCoords8 *switchCoords = sMauvilleGymSwitchCoords;
    for (i = ARRAY_COUNT(sMauvilleGymSwitchCoords) - 1; i >= 0; i--)
    {
-        MapGridSetMetatileIdAt(switchCoords->x, switchCoords->y, METATILE_ID(MauvilleGym, PressedSwitch));
+        MapGridSetMetatileIdAt(switchCoords->x, switchCoords->y, METATILE_MauvilleGym_PressedSwitch);
        switchCoords++;
    }
    for (y = 12; y < 24; y++)
@@ -772,42 +772,42 @@ void MauvilleGymDeactivatePuzzle(void)
        {
            switch (MapGridGetMetatileIdAt(x, y))
            {
-                case METATILE_ID(MauvilleGym, GreenBeamH1_On):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, GreenBeamH1_Off));
+                case METATILE_MauvilleGym_GreenBeamH1_On:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_GreenBeamH1_Off);
                    break;
-                case METATILE_ID(MauvilleGym, GreenBeamH2_On):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, GreenBeamH2_Off));
+                case METATILE_MauvilleGym_GreenBeamH2_On:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_GreenBeamH2_Off);
                    break;
-                case METATILE_ID(MauvilleGym, GreenBeamH3_On):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, GreenBeamH3_Off));
+                case METATILE_MauvilleGym_GreenBeamH3_On:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_GreenBeamH3_Off);
                    break;
-                case METATILE_ID(MauvilleGym, GreenBeamH4_On):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, GreenBeamH4_Off));
+                case METATILE_MauvilleGym_GreenBeamH4_On:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_GreenBeamH4_Off);
                    break;
-                case METATILE_ID(MauvilleGym, RedBeamH1_On):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, RedBeamH1_Off));
+                case METATILE_MauvilleGym_RedBeamH1_On:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_RedBeamH1_Off);
                    break;
-                case METATILE_ID(MauvilleGym, RedBeamH2_On):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, RedBeamH2_Off));
+                case METATILE_MauvilleGym_RedBeamH2_On:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_RedBeamH2_Off);
                    break;
-                case METATILE_ID(MauvilleGym, RedBeamH3_On):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, RedBeamH3_Off));
+                case METATILE_MauvilleGym_RedBeamH3_On:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_RedBeamH3_Off);
                    break;
-                case METATILE_ID(MauvilleGym, RedBeamH4_On):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, RedBeamH4_Off));
+                case METATILE_MauvilleGym_RedBeamH4_On:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_RedBeamH4_Off);
                    break;
-                case METATILE_ID(MauvilleGym, GreenBeamV1_On):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, PoleBottom_On) | METATILE_COLLISION_MASK);
+                case METATILE_MauvilleGym_GreenBeamV1_On:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_PoleBottom_On | METATILE_COLLISION_MASK);
                    break;
-                case METATILE_ID(MauvilleGym, RedBeamV1_On):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, PoleBottom_Off) | METATILE_COLLISION_MASK);
+                case METATILE_MauvilleGym_RedBeamV1_On:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_PoleBottom_Off | METATILE_COLLISION_MASK);
                    break;
-                case METATILE_ID(MauvilleGym, GreenBeamV2_On):
-                case METATILE_ID(MauvilleGym, RedBeamV2_On):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, FloorTile));
+                case METATILE_MauvilleGym_GreenBeamV2_On:
+                case METATILE_MauvilleGym_RedBeamV2_On:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_FloorTile);
                    break;
-                case METATILE_ID(MauvilleGym, PoleTop_On):
-                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, PoleTop_Off));
+                case METATILE_MauvilleGym_PoleTop_On:
+                    MapGridSetMetatileIdAt(x, y, METATILE_MauvilleGym_PoleTop_Off);
                    break;
            }
        }
@@ -817,11 +817,11 @@ void MauvilleGymDeactivatePuzzle(void)
 static const bool8 sSlidingDoorNextFrameDelay[] = {0, 1, 1, 1, 1};

 static const u16 sPetalburgGymSlidingDoorMetatiles[] = {
-    METATILE_ID(PetalburgGym, SlidingDoor_Frame0),
-    METATILE_ID(PetalburgGym, SlidingDoor_Frame1),
-    METATILE_ID(PetalburgGym, SlidingDoor_Frame2),
-    METATILE_ID(PetalburgGym, SlidingDoor_Frame3),
-    METATILE_ID(PetalburgGym, SlidingDoor_Frame4),
+    METATILE_PetalburgGym_SlidingDoor_Frame0,
+    METATILE_PetalburgGym_SlidingDoor_Frame1,
+    METATILE_PetalburgGym_SlidingDoor_Frame2,
+    METATILE_PetalburgGym_SlidingDoor_Frame3,
+    METATILE_PetalburgGym_SlidingDoor_Frame4,
 };

 void PetalburgGymSlideOpenRoomDoors(void)
@@ -1096,30 +1096,30 @@ static void PCTurnOnEffect_1(s16 isPcTurnedOn, s8 dx, s8 dy)
    {
        if (gSpecialVar_0x8004 == PC_LOCATION_OTHER)
        {
-            tileId = METATILE_ID(Building, PC_Off);
+            tileId = METATILE_Building_PC_Off;
        }
        else if (gSpecialVar_0x8004 == PC_LOCATION_BRENDANS_HOUSE)
        {
-            tileId = METATILE_ID(BrendansMaysHouse, BrendanPC_Off);
+            tileId = METATILE_BrendansMaysHouse_BrendanPC_Off;
        }
        else if (gSpecialVar_0x8004 == PC_LOCATION_MAYS_HOUSE)
        {
-            tileId = METATILE_ID(BrendansMaysHouse, MayPC_Off);
+            tileId = METATILE_BrendansMaysHouse_MayPC_Off;
        }
    }
    else
    {
        if (gSpecialVar_0x8004 == PC_LOCATION_OTHER)
        {
-            tileId = METATILE_ID(Building, PC_On);
+            tileId = METATILE_Building_PC_On;
        }
        else if (gSpecialVar_0x8004 == PC_LOCATION_BRENDANS_HOUSE)
        {
-            tileId = METATILE_ID(BrendansMaysHouse, BrendanPC_On);
+            tileId = METATILE_BrendansMaysHouse_BrendanPC_On;
        }
        else if (gSpecialVar_0x8004 == PC_LOCATION_MAYS_HOUSE)
        {
-            tileId = METATILE_ID(BrendansMaysHouse, MayPC_On);
+            tileId = METATILE_BrendansMaysHouse_MayPC_On;
        }
    }
    MapGridSetMetatileIdAt(gSaveBlock1Ptr->pos.x + dx + 7, gSaveBlock1Ptr->pos.y + dy + 7, tileId | METATILE_COLLISION_MASK);
@@ -1153,15 +1153,15 @@ static void PCTurnOffEffect(void)
    }
    if (gSpecialVar_0x8004 == 0)
    {
-        tileId = METATILE_ID(Building, PC_Off);
+        tileId = METATILE_Building_PC_Off;
    }
    else if (gSpecialVar_0x8004 == 1)
    {
-        tileId = METATILE_ID(BrendansMaysHouse, BrendanPC_Off);
+        tileId = METATILE_BrendansMaysHouse_BrendanPC_Off;
    }
    else if (gSpecialVar_0x8004 == 2)
    {
-        tileId = METATILE_ID(BrendansMaysHouse, MayPC_Off);
+        tileId = METATILE_BrendansMaysHouse_MayPC_Off;
    }
    MapGridSetMetatileIdAt(gSaveBlock1Ptr->pos.x + dx + 7, gSaveBlock1Ptr->pos.y + dy + 7, tileId | METATILE_COLLISION_MASK);
    DrawWholeMapView();
@@ -1196,13 +1196,13 @@ static void LotteryCornerComputerEffect(struct Task *task)
        task->data[3] = 0;
        if (task->data[4] != 0)
        {
-            MapGridSetMetatileIdAt(18, 8, METATILE_ID(Shop, Laptop1_Normal) | METATILE_COLLISION_MASK);
-            MapGridSetMetatileIdAt(18, 9, METATILE_ID(Shop, Laptop2_Normal) | METATILE_COLLISION_MASK);
+            MapGridSetMetatileIdAt(18, 8, METATILE_Shop_Laptop1_Normal | METATILE_COLLISION_MASK);
+            MapGridSetMetatileIdAt(18, 9, METATILE_Shop_Laptop2_Normal | METATILE_COLLISION_MASK);
        }
        else
        {
-            MapGridSetMetatileIdAt(18, 8, METATILE_ID(Shop, Laptop1_Flash) | METATILE_COLLISION_MASK);
-            MapGridSetMetatileIdAt(18, 9, METATILE_ID(Shop, Laptop2_Flash) | METATILE_COLLISION_MASK);
+            MapGridSetMetatileIdAt(18, 8, METATILE_Shop_Laptop1_Flash | METATILE_COLLISION_MASK);
+            MapGridSetMetatileIdAt(18, 9, METATILE_Shop_Laptop2_Flash | METATILE_COLLISION_MASK);
        }
        DrawWholeMapView();
        task->data[4] ^= 1;
@@ -1216,8 +1216,8 @@ static void LotteryCornerComputerEffect(struct Task *task)

 void EndLotteryCornerComputerEffect(void)
 {
-    MapGridSetMetatileIdAt(18, 8, METATILE_ID(Shop, Laptop1_Normal) | METATILE_COLLISION_MASK);
-    MapGridSetMetatileIdAt(18, 9, METATILE_ID(Shop, Laptop2_Normal) | METATILE_COLLISION_MASK);
+    MapGridSetMetatileIdAt(18, 8, METATILE_Shop_Laptop1_Normal | METATILE_COLLISION_MASK);
+    MapGridSetMetatileIdAt(18, 9, METATILE_Shop_Laptop2_Normal | METATILE_COLLISION_MASK);
    DrawWholeMapView();
 }

@@ -1751,38 +1751,38 @@ const u8 *const gDeptStoreFloorNames[] =
 static const u16 sElevatorWindowTiles_Ascending[][3] =
 {
    {
-        METATILE_ID(BattleFrontier, Elevator_Top0),
-        METATILE_ID(BattleFrontier, Elevator_Top1),
-        METATILE_ID(BattleFrontier, Elevator_Top2)
+        METATILE_BattleFrontier_Elevator_Top0,
+        METATILE_BattleFrontier_Elevator_Top1,
+        METATILE_BattleFrontier_Elevator_Top2
    },
    {
-        METATILE_ID(BattleFrontier, Elevator_Mid0),
-        METATILE_ID(BattleFrontier, Elevator_Mid1),
-        METATILE_ID(BattleFrontier, Elevator_Mid2)
+        METATILE_BattleFrontier_Elevator_Mid0,
+        METATILE_BattleFrontier_Elevator_Mid1,
+        METATILE_BattleFrontier_Elevator_Mid2
    },
    {
-        METATILE_ID(BattleFrontier, Elevator_Bottom0),
-        METATILE_ID(BattleFrontier, Elevator_Bottom1),
-        METATILE_ID(BattleFrontier, Elevator_Bottom2)
+        METATILE_BattleFrontier_Elevator_Bottom0,
+        METATILE_BattleFrontier_Elevator_Bottom1,
+        METATILE_BattleFrontier_Elevator_Bottom2
    },
 };

 static const u16 sElevatorWindowTiles_Descending[][3] =
 {
    {
-        METATILE_ID(BattleFrontier, Elevator_Top0),
-        METATILE_ID(BattleFrontier, Elevator_Top2),
-        METATILE_ID(BattleFrontier, Elevator_Top1)
+        METATILE_BattleFrontier_Elevator_Top0,
+        METATILE_BattleFrontier_Elevator_Top2,
+        METATILE_BattleFrontier_Elevator_Top1
    },
    {
-        METATILE_ID(BattleFrontier, Elevator_Mid0),
-        METATILE_ID(BattleFrontier, Elevator_Mid2),
-        METATILE_ID(BattleFrontier, Elevator_Mid1)
+        METATILE_BattleFrontier_Elevator_Mid0,
+        METATILE_BattleFrontier_Elevator_Mid2,
+        METATILE_BattleFrontier_Elevator_Mid1
    },
    {
-        METATILE_ID(BattleFrontier, Elevator_Bottom0),
-        METATILE_ID(BattleFrontier, Elevator_Bottom2),
-        METATILE_ID(BattleFrontier, Elevator_Bottom1)
+        METATILE_BattleFrontier_Elevator_Bottom0,
+        METATILE_BattleFrontier_Elevator_Bottom2,
+        METATILE_BattleFrontier_Elevator_Bottom1
    },
 };