Merge pull request #743 from garakmon/metatile_labels

Name Metatiles

9 files changed, 300 insertions, 247 deletions

diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c
index 7f26f0a9b..e217de503 100644
--- a/src/braille_puzzles.c
+++ b/src/braille_puzzles.c
@@ -17,6 +17,7 @@
 #include "constants/maps.h"
 #include "constants/songs.h"
 #include "constants/species.h"
+#include "constants/metatile_labels.h"
 
 extern u8 gPlayerPartyCount;
 extern u8 gLastFieldPokeMenuOpened;
@@ -42,12 +43,12 @@ bool8 ShouldDoBrailleDigEffect(void)
 
 void DoBrailleDigEffect(void)
 {
-    MapGridSetMetatileIdAt(16, 8, 554);
-    MapGridSetMetatileIdAt(17, 8, 555);
-    MapGridSetMetatileIdAt(18, 8, 556);
-    MapGridSetMetatileIdAt(16, 9, 3634);
-    MapGridSetMetatileIdAt(17, 9, 563);
-    MapGridSetMetatileIdAt(18, 9, 3636);
+    MapGridSetMetatileIdAt(16, 8, METATILE_ID(Cave, SealedChamberEntrance_TopLeft));
+    MapGridSetMetatileIdAt(17, 8, METATILE_ID(Cave, SealedChamberEntrance_TopMid));
+    MapGridSetMetatileIdAt(18, 8, METATILE_ID(Cave, SealedChamberEntrance_TopRight));
+    MapGridSetMetatileIdAt(16, 9, METATILE_ID(Cave, SealedChamberEntrance_BottomLeft) | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT));
+    MapGridSetMetatileIdAt(17, 9, METATILE_ID(Cave, SealedChamberEntrance_BottomMid));
+    MapGridSetMetatileIdAt(18, 9, METATILE_ID(Cave, SealedChamberEntrance_BottomRight) | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT));
     DrawWholeMapView();
     PlaySE(SE_BAN);
     FlagSet(FLAG_SYS_BRAILLE_DIG);
@@ -85,12 +86,12 @@ bool8 ShouldDoBrailleStrengthEffect(void)
 void DoBrailleStrengthEffect(void)
 {
     FieldEffectActiveListRemove(FLDEFF_USE_STRENGTH);
-    MapGridSetMetatileIdAt(14, 26, 554);
-    MapGridSetMetatileIdAt(15, 26, 555);
-    MapGridSetMetatileIdAt(16, 26, 556);
-    MapGridSetMetatileIdAt(14, 27, 3634);
-    MapGridSetMetatileIdAt(15, 27, 563);
-    MapGridSetMetatileIdAt(16, 27, 3636);
+    MapGridSetMetatileIdAt(14, 26, METATILE_ID(Cave, SealedChamberEntrance_TopLeft));
+    MapGridSetMetatileIdAt(15, 26, METATILE_ID(Cave, SealedChamberEntrance_TopMid));
+    MapGridSetMetatileIdAt(16, 26, METATILE_ID(Cave, SealedChamberEntrance_TopRight));
+    MapGridSetMetatileIdAt(14, 27, METATILE_ID(Cave, SealedChamberEntrance_BottomLeft) | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT));
+    MapGridSetMetatileIdAt(15, 27, METATILE_ID(Cave, SealedChamberEntrance_BottomMid));
+    MapGridSetMetatileIdAt(16, 27, METATILE_ID(Cave, SealedChamberEntrance_BottomRight) | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT));
     DrawWholeMapView();
     PlaySE(SE_BAN);
     FlagSet(FLAG_SYS_BRAILLE_STRENGTH);
@@ -131,12 +132,12 @@ void UseFlyAncientTomb_Callback(void)
 
 void UseFlyAncientTomb_Finish(void)
 {
-    MapGridSetMetatileIdAt(14, 26, 554);
-    MapGridSetMetatileIdAt(15, 26, 555);
-    MapGridSetMetatileIdAt(16, 26, 556);
-    MapGridSetMetatileIdAt(14, 27, 3634);
-    MapGridSetMetatileIdAt(15, 27, 563);
-    MapGridSetMetatileIdAt(16, 27, 3636);
+    MapGridSetMetatileIdAt(14, 26, METATILE_ID(Cave, SealedChamberEntrance_TopLeft));
+    MapGridSetMetatileIdAt(15, 26, METATILE_ID(Cave, SealedChamberEntrance_TopMid));
+    MapGridSetMetatileIdAt(16, 26, METATILE_ID(Cave, SealedChamberEntrance_TopRight));
+    MapGridSetMetatileIdAt(14, 27, METATILE_ID(Cave, SealedChamberEntrance_BottomLeft) | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT));
+    MapGridSetMetatileIdAt(15, 27, METATILE_ID(Cave, SealedChamberEntrance_BottomMid));
+    MapGridSetMetatileIdAt(16, 27, METATILE_ID(Cave, SealedChamberEntrance_BottomRight) | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT));
     DrawWholeMapView();
     PlaySE(SE_BAN);
     FlagSet(FLAG_SYS_BRAILLE_FLY);
diff --git a/src/field_special_scene.c b/src/field_special_scene.c
index cf67aa361..8f98d8187 100644
--- a/src/field_special_scene.c
+++ b/src/field_special_scene.c
@@ -12,6 +12,7 @@
 #include "script.h"
 #include "script_movement.h"
 #include "constants/songs.h"
+#include "constants/metatile_labels.h"
 #include "sound.h"
 #include "sprite.h"
 #include "task.h"
@@ -239,9 +240,9 @@ void Task_HandleTruckSequence(u8 taskId)
         data[1]++;
         if (data[1] == 120)
         {
-            MapGridSetMetatileIdAt(11, 8, 520);
-            MapGridSetMetatileIdAt(11, 9, 528);
-            MapGridSetMetatileIdAt(11, 10, 536);
+            MapGridSetMetatileIdAt(11, 8, METATILE_ID(InsideOfTruck, ExitLight_Top));
+            MapGridSetMetatileIdAt(11, 9, METATILE_ID(InsideOfTruck, ExitLight_Mid));
+            MapGridSetMetatileIdAt(11, 10, METATILE_ID(InsideOfTruck, ExitLight_Bottom));
             DrawWholeMapView();
             PlaySE(SE_TRACK_DOOR);
             DestroyTask(taskId);
@@ -253,9 +254,9 @@ void Task_HandleTruckSequence(u8 taskId)
 
 void ExecuteTruckSequence(void)
 {
-    MapGridSetMetatileIdAt(11, 8, 525);
-    MapGridSetMetatileIdAt(11, 9, 533);
-    MapGridSetMetatileIdAt(11, 10, 541);
+    MapGridSetMetatileIdAt(11, 8, METATILE_ID(InsideOfTruck, DoorClosedFloor_Top));
+    MapGridSetMetatileIdAt(11, 9, METATILE_ID(InsideOfTruck, DoorClosedFloor_Mid));
+    MapGridSetMetatileIdAt(11, 10, METATILE_ID(InsideOfTruck, DoorClosedFloor_Bottom));
     DrawWholeMapView();
     ScriptContext2_Enable();
     CpuFastFill(0, gPlttBufferFaded, 0x400);
diff --git a/src/field_specials.c b/src/field_specials.c
index 0e8fe06d9..c23a8c44c 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -34,6 +34,7 @@
 #include "random.h"
 #include "constants/abilities.h"
 #include "constants/event_object_movement_constants.h"
+#include "constants/metatile_labels.h"
 #include "constants/moves.h"
 #include "constants/species.h"
 #include "constants/weather.h"
@@ -379,7 +380,7 @@ struct Coords8 {
     u8 y;
 };
 
-const struct Coords8 gUnknown_083F8364[3] = {
+const struct Coords8 sMauvilleGymSwitchCoords[3] = {
     { 7, 16},
     {15, 18},
     {11, 22}
@@ -388,15 +389,15 @@ const struct Coords8 gUnknown_083F8364[3] = {
 void MauvilleGymSpecial1(void)
 {
     u8 i;
-    for (i=0; i<3; i++)
+    for (i = 0; i < ARRAY_COUNT(sMauvilleGymSwitchCoords); i++)
     {
         if (i == gSpecialVar_0x8004)
         {
-            MapGridSetMetatileIdAt(gUnknown_083F8364[i].x, gUnknown_083F8364[i].y, 0x206);
+            MapGridSetMetatileIdAt(sMauvilleGymSwitchCoords[i].x, sMauvilleGymSwitchCoords[i].y, METATILE_ID(MauvilleGym, PressedSwitch));
         }
         else
         {
-            MapGridSetMetatileIdAt(gUnknown_083F8364[i].x, gUnknown_083F8364[i].y, 0x205);
+            MapGridSetMetatileIdAt(sMauvilleGymSwitchCoords[i].x, sMauvilleGymSwitchCoords[i].y, METATILE_ID(MauvilleGym, RaisedSwitch));
         }
     }
 }
@@ -404,93 +405,93 @@ void MauvilleGymSpecial1(void)
 void MauvilleGymSpecial2(void)
 {
     int x, y;
-    for (y=12; y<24; y++)
+    for (y = 12; y < 24; y++)
     {
-        for (x=7; x<16; x++)
+        for (x = 7; x < 16; x++)
         {
             switch (MapGridGetMetatileIdAt(x, y))
             {
-                case 0x220:
-                    MapGridSetMetatileIdAt(x, y, 0x230);
+                case METATILE_ID(MauvilleGym, GreenBeamH1_On):
+                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, GreenBeamH1_Off));
                     break;
-                case 0x221:
-                    MapGridSetMetatileIdAt(x, y, 0x231);
+                case METATILE_ID(MauvilleGym, GreenBeamH2_On):
+                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, GreenBeamH2_Off));
                     break;
-                case 0x228:
-                    MapGridSetMetatileIdAt(x, y, 0x238);
+                case METATILE_ID(MauvilleGym, GreenBeamH3_On):
+                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, GreenBeamH3_Off));
                     break;
-                case 0x229:
-                    MapGridSetMetatileIdAt(x, y, 0x239);
+                case METATILE_ID(MauvilleGym, GreenBeamH4_On):
+                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, GreenBeamH4_Off));
                     break;
-                case 0x230:
-                    MapGridSetMetatileIdAt(x, y, 0x220);
+                case METATILE_ID(MauvilleGym, GreenBeamH1_Off):
+                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, GreenBeamH1_On));
                     break;
-                case 0x231:
-                    MapGridSetMetatileIdAt(x, y, 0x221);
+                case METATILE_ID(MauvilleGym, GreenBeamH2_Off):
+                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, GreenBeamH2_On));
                     break;
-                case 0x238:
-                    MapGridSetMetatileIdAt(x, y, 0xe28);
+                case METATILE_ID(MauvilleGym, GreenBeamH3_Off):
+                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, GreenBeamH3_On) | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT));
                     break;
-                case 0x239:
-                    MapGridSetMetatileIdAt(x, y, 0xe29);
+                case METATILE_ID(MauvilleGym, GreenBeamH4_Off):
+                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, GreenBeamH4_On) | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT));
                     break;
-                case 0x222:
-                    MapGridSetMetatileIdAt(x, y, 0x232);
+                case METATILE_ID(MauvilleGym, RedBeamH1_On):
+                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, RedBeamH1_Off));
                     break;
-                case 0x223:
-                    MapGridSetMetatileIdAt(x, y, 0x233);
+                case METATILE_ID(MauvilleGym, RedBeamH2_On):
+                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, RedBeamH2_Off));
                     break;
-                case 0x22a:
-                    MapGridSetMetatileIdAt(x, y, 0x23a);
+                case METATILE_ID(MauvilleGym, RedBeamH3_On):
+                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, RedBeamH3_Off));
                     break;
-                case 0x22b:
-                    MapGridSetMetatileIdAt(x, y, 0x23b);
+                case METATILE_ID(MauvilleGym, RedBeamH4_On):
+                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, RedBeamH4_Off));
                     break;
-                case 0x232:
-                    MapGridSetMetatileIdAt(x, y, 0x222);
+                case METATILE_ID(MauvilleGym, RedBeamH1_Off):
+                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, RedBeamH1_On));
                     break;
-                case 0x233:
-                    MapGridSetMetatileIdAt(x, y, 0x223);
+                case METATILE_ID(MauvilleGym, RedBeamH2_Off):
+                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, RedBeamH2_On));
                     break;
-                case 0x23a:
-                    MapGridSetMetatileIdAt(x, y, 0xe2a);
+                case METATILE_ID(MauvilleGym, RedBeamH3_Off):
+                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, RedBeamH3_On) | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT));
                     break;
-                case 0x23b:
-                    MapGridSetMetatileIdAt(x, y, 0xe2b);
+                case METATILE_ID(MauvilleGym, RedBeamH4_Off):
+                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, RedBeamH4_On) | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT));
                     break;
-                case 0x240:
-                    MapGridSetMetatileIdAt(x, y, 0xe42);
+                case METATILE_ID(MauvilleGym, GreenBeamV1_On):
+                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, PoleBottom_On) | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT));
                     break;
-                case 0x248:
-                    MapGridSetMetatileIdAt(x, y, 0x21a);
+                case METATILE_ID(MauvilleGym, GreenBeamV2_On):
+                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, FloorTile));
                     break;
-                case 0x241:
-                    MapGridSetMetatileIdAt(x, y, 0xe43);
+                case METATILE_ID(MauvilleGym, RedBeamV1_On):
+                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, PoleBottom_Off) | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT));
                     break;
-                case 0x249:
-                    MapGridSetMetatileIdAt(x, y, 0x21a);
+                case METATILE_ID(MauvilleGym, RedBeamV2_On):
+                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, FloorTile));
                     break;
-                case 0x242:
-                    MapGridSetMetatileIdAt(x, y, 0xe40);
+                case METATILE_ID(MauvilleGym, PoleBottom_On):
+                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, GreenBeamV1_On) | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT));
                     break;
-                case 0x21a:
-                    if (MapGridGetMetatileIdAt(x, y - 1) == 0x240)
+                case METATILE_ID(MauvilleGym, FloorTile):
+                    if (MapGridGetMetatileIdAt(x, y - 1) == METATILE_ID(MauvilleGym, GreenBeamV1_On))
                     {
-                        MapGridSetMetatileIdAt(x, y, 0xe48);
+                        MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, GreenBeamV2_On) | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT));
                     }
                     else
                     {
-                        MapGridSetMetatileIdAt(x, y, 0xe49);
+                        MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, RedBeamV2_On) | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT));
                     }
                     break;
-                case 0x243:
-                    MapGridSetMetatileIdAt(x, y, 0xe41);
+                case METATILE_ID(MauvilleGym, PoleBottom_Off):
+                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, RedBeamV1_On) | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT));
                     break;
-                case 0x251:
-                    MapGridSetMetatileIdAt(x, y, 0xe50);
+                case METATILE_ID(MauvilleGym, PoleTop_Off):
+                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, PoleTop_On) | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT));
                     break;
-                case 0x250:
-                    MapGridSetMetatileIdAt(x, y, 0x251);
+                case METATILE_ID(MauvilleGym, PoleTop_On):
+                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, PoleTop_Off));
                     break;
             }
         }
@@ -500,54 +501,54 @@ void MauvilleGymSpecial2(void)
 void MauvilleGymSpecial3(void)
 {
     int i, x, y;
-    const struct Coords8 *switchCoords = gUnknown_083F8364;
-    for (i=ARRAY_COUNT(gUnknown_083F8364)-1; i>=0; i--)
+    const struct Coords8 *switchCoords = sMauvilleGymSwitchCoords;
+    for (i = ARRAY_COUNT(sMauvilleGymSwitchCoords) - 1; i >= 0; i--)
     {
-        MapGridSetMetatileIdAt(switchCoords->x, switchCoords->y, 0x206);
+        MapGridSetMetatileIdAt(switchCoords->x, switchCoords->y, METATILE_ID(MauvilleGym, PressedSwitch));
         switchCoords++;
     }
-    for (y=12; y<24; y++)
+    for (y = 12; y < 24; y++)
     {
-        for (x=7; x<16; x++)
+        for (x = 7; x < 16; x++)
         {
             switch (MapGridGetMetatileIdAt(x, y))
             {
-                case 0x220:
-                    MapGridSetMetatileIdAt(x, y, 0x230);
+                case METATILE_ID(MauvilleGym, GreenBeamH1_On):
+                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, GreenBeamH1_Off));
                     break;
-                case 0x221:
-                    MapGridSetMetatileIdAt(x, y, 0x231);
+                case METATILE_ID(MauvilleGym, GreenBeamH2_On):
+                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, GreenBeamH2_Off));
                     break;
-                case 0x228:
-                    MapGridSetMetatileIdAt(x, y, 0x238);
+                case METATILE_ID(MauvilleGym, GreenBeamH3_On):
+                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, GreenBeamH3_Off));
                     break;
-                case 0x229:
-                    MapGridSetMetatileIdAt(x, y, 0x239);
+                case METATILE_ID(MauvilleGym, GreenBeamH4_On):
+                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, GreenBeamH4_Off));
                     break;
-                case 0x222:
-                    MapGridSetMetatileIdAt(x, y, 0x232);
+                case METATILE_ID(MauvilleGym, RedBeamH1_On):
+                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, RedBeamH1_Off));
                     break;
-                case 0x223:
-                    MapGridSetMetatileIdAt(x, y, 0x233);
+                case METATILE_ID(MauvilleGym, RedBeamH2_On):
+                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, RedBeamH2_Off));
                     break;
-                case 0x22a:
-                    MapGridSetMetatileIdAt(x, y, 0x23a);
+                case METATILE_ID(MauvilleGym, RedBeamH3_On):
+                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, RedBeamH3_Off));
                     break;
-                case 0x22b:
-                    MapGridSetMetatileIdAt(x, y, 0x23b);
+                case METATILE_ID(MauvilleGym, RedBeamH4_On):
+                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, RedBeamH4_Off));
                     break;
-                case 0x240:
-                    MapGridSetMetatileIdAt(x, y, 0xe42);
+                case METATILE_ID(MauvilleGym, GreenBeamV1_On):
+                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, PoleBottom_On) | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT));
                     break;
-                case 0x241:
-                    MapGridSetMetatileIdAt(x, y, 0xe43);
+                case METATILE_ID(MauvilleGym, RedBeamV1_On):
+                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, PoleBottom_Off) | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT));
                     break;
-                case 0x248:
-                case 0x249:
-                    MapGridSetMetatileIdAt(x, y, 0x21a);
+                case METATILE_ID(MauvilleGym, GreenBeamV2_On):
+                case METATILE_ID(MauvilleGym, RedBeamV2_On):
+                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, FloorTile));
                     break;
-                case 0x250:
-                    MapGridSetMetatileIdAt(x, y, 0x251);
+                case METATILE_ID(MauvilleGym, PoleTop_On):
+                    MapGridSetMetatileIdAt(x, y, METATILE_ID(MauvilleGym, PoleTop_Off));
                     break;
             }
         }
@@ -557,7 +558,14 @@ void MauvilleGymSpecial3(void)
 static void Task_SlideOpenPetalburgGymDoors(u8);
 static void SetPetalburgGymDoorTiles(u8, u16);
 const u8 gUnknown_083F8370[] = {0, 1, 1, 1, 1};
-const u16 gPetalburgGymSlidingDoorMetatiles[] = {0x218, 0x219, 0x21a, 0x21b, 0x21c};
+
+const u16 gPetalburgGymSlidingDoorMetatiles[] = {
+    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),
+};
 
 void PetalburgGymSlideOpenDoors(void)
 {
@@ -838,30 +846,30 @@ static void PCTurnOffEffect_1(s16 flag, s8 dx, s8 dy)
     {
         if (gSpecialVar_0x8004 == 0)
         {
-            tileId = 0x4;
+            tileId = METATILE_ID(Building, PC_Off);
         }
         else if (gSpecialVar_0x8004 == 1)
         {
-            tileId = 0x25a;
+            tileId = METATILE_ID(BrendansMaysHouse, BrendanPC_Off);
         }
         else if (gSpecialVar_0x8004 == 2)
         {
-            tileId = 0x259;
+            tileId = METATILE_ID(BrendansMaysHouse, MayPC_Off);
         }
     }
     else
     {
         if (gSpecialVar_0x8004 == 0)
         {
-            tileId = 0x5;
+            tileId = METATILE_ID(Building, PC_On);
         }
         else if (gSpecialVar_0x8004 == 1)
         {
-            tileId = 0x27f;
+            tileId = METATILE_ID(BrendansMaysHouse, BrendanPC_On);
         }
         else if (gSpecialVar_0x8004 == 2)
         {
-            tileId = 0x27e;
+            tileId = METATILE_ID(BrendansMaysHouse, MayPC_On);
         }
     }
     MapGridSetMetatileIdAt(gSaveBlock1.pos.x + dx + 7, gSaveBlock1.pos.y + dy + 7, tileId | 0xc00);
@@ -895,17 +903,17 @@ static void PCTurnOffEffect(void)
     }
     if (gSpecialVar_0x8004 == 0)
     {
-        tileId = 0x4;
+        tileId = METATILE_ID(Building, PC_Off);
     }
     else if (gSpecialVar_0x8004 == 1)
     {
-        tileId = 0x25a;
+        tileId = METATILE_ID(BrendansMaysHouse, BrendanPC_Off);
     }
     else if (gSpecialVar_0x8004 == 2)
     {
-        tileId = 0x259;
+        tileId = METATILE_ID(BrendansMaysHouse, MayPC_Off);
     }
-    MapGridSetMetatileIdAt(gSaveBlock1.pos.x + dx + 7, gSaveBlock1.pos.y + dy + 7, tileId | 0xc00);
+    MapGridSetMetatileIdAt(gSaveBlock1.pos.x + dx + 7, gSaveBlock1.pos.y + dy + 7, tileId | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT));
     DrawWholeMapView();
 }
 
@@ -941,13 +949,13 @@ static void LotteryCornerComputerEffect(struct Task *task)
         task->data[3] = 0;
         if (task->data[4] != 0)
         {
-            MapGridSetMetatileIdAt(18, 8, 0xe9d);
-            MapGridSetMetatileIdAt(18, 9, 0xea5);
+            MapGridSetMetatileIdAt(18, 8, METATILE_ID(Shop, Laptop1_Normal) | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT));
+            MapGridSetMetatileIdAt(18, 9, METATILE_ID(Shop, Laptop2_Normal) | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT));
         }
         else
         {
-            MapGridSetMetatileIdAt(18, 8, 0xe58);
-            MapGridSetMetatileIdAt(18, 9, 0xe60);
+            MapGridSetMetatileIdAt(18, 8, METATILE_ID(Shop, Laptop1_Flash) | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT));
+            MapGridSetMetatileIdAt(18, 9, METATILE_ID(Shop, Laptop2_Flash) | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT));
         }
         DrawWholeMapView();
         task->data[4] ^= 1;
@@ -961,8 +969,8 @@ static void LotteryCornerComputerEffect(struct Task *task)
 
 void EndLotteryCornerComputerEffect(void)
 {
-    MapGridSetMetatileIdAt(18, 8, 0xe9d);
-    MapGridSetMetatileIdAt(18, 9, 0xea5);
+    MapGridSetMetatileIdAt(18, 8, METATILE_ID(Shop, Laptop1_Normal) | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT));
+    MapGridSetMetatileIdAt(18, 9, METATILE_ID(Shop, Laptop2_Normal) | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT));
     DrawWholeMapView();
 }
 
@@ -1035,7 +1043,7 @@ void ScriptAddElevatorMenuItem(u8 a0, u8 a1, u8 a2, u8 a3)
     u8 i;
     if (gSpecialVar_0x8004 == 0)
     {
-        for (i=0; i<20; i++)
+        for (i = 0; i < 20; i++)
         {
             gUnknown_03000760[i].var0 = 16;
         }
@@ -1294,33 +1302,33 @@ void sub_810ED60(struct Task *task)
         task->data[3] = 0;
         if (task->data[4] != 0)
         {
-            MapGridSetMetatileIdAt( 7,  7, 0xe68);
-            MapGridSetMetatileIdAt( 8,  7, 0xe69);
-            MapGridSetMetatileIdAt( 9,  7, 0xe69);
-            MapGridSetMetatileIdAt(10,  7, 0xe6a);
-            MapGridSetMetatileIdAt( 7,  8, 0xe70);
-            MapGridSetMetatileIdAt( 8,  8, 0xe71);
-            MapGridSetMetatileIdAt( 9,  8, 0xe71);
-            MapGridSetMetatileIdAt(10,  8, 0xe72);
-            MapGridSetMetatileIdAt( 7,  9, 0xe78);
-            MapGridSetMetatileIdAt( 8,  9, 0xe79);
-            MapGridSetMetatileIdAt( 9,  9, 0xe79);
-            MapGridSetMetatileIdAt(10,  9, 0xe7a);
+            MapGridSetMetatileIdAt( 7,  7, METATILE_BattleTower_Elevator_Top0 | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT));
+            MapGridSetMetatileIdAt( 8,  7, METATILE_BattleTower_Elevator_Top1 | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT));
+            MapGridSetMetatileIdAt( 9,  7, METATILE_BattleTower_Elevator_Top1 | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT));
+            MapGridSetMetatileIdAt(10,  7, METATILE_BattleTower_Elevator_Top2 | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT));
+            MapGridSetMetatileIdAt( 7,  8, METATILE_BattleTower_Elevator_Mid0 | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT));
+            MapGridSetMetatileIdAt( 8,  8, METATILE_BattleTower_Elevator_Mid1 | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT));
+            MapGridSetMetatileIdAt( 9,  8, METATILE_BattleTower_Elevator_Mid1 | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT));
+            MapGridSetMetatileIdAt(10,  8, METATILE_BattleTower_Elevator_Mid2 | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT));
+            MapGridSetMetatileIdAt( 7,  9, METATILE_BattleTower_Elevator_Bottom0 | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT));
+            MapGridSetMetatileIdAt( 8,  9, METATILE_BattleTower_Elevator_Bottom1 | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT));
+            MapGridSetMetatileIdAt( 9,  9, METATILE_BattleTower_Elevator_Bottom1 | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT));
+            MapGridSetMetatileIdAt(10,  9, METATILE_BattleTower_Elevator_Bottom2 | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT));
         }
         else
         {
-            MapGridSetMetatileIdAt( 7,  7, 0xe6b);
-            MapGridSetMetatileIdAt( 8,  7, 0xe6c);
-            MapGridSetMetatileIdAt( 9,  7, 0xe6c);
-            MapGridSetMetatileIdAt(10,  7, 0xe6d);
-            MapGridSetMetatileIdAt( 7,  8, 0xe73);
-            MapGridSetMetatileIdAt( 8,  8, 0xe74);
-            MapGridSetMetatileIdAt( 9,  8, 0xe74);
-            MapGridSetMetatileIdAt(10,  8, 0xe75);
-            MapGridSetMetatileIdAt( 7,  9, 0xe7b);
-            MapGridSetMetatileIdAt( 8,  9, 0xe7c);
-            MapGridSetMetatileIdAt( 9,  9, 0xe7c);
-            MapGridSetMetatileIdAt(10,  9, 0xe7d);
+            MapGridSetMetatileIdAt( 7,  7, (METATILE_BattleTower_Elevator_Top0 + 3) | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT));
+            MapGridSetMetatileIdAt( 8,  7, (METATILE_BattleTower_Elevator_Top1 + 3) | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT));
+            MapGridSetMetatileIdAt( 9,  7, (METATILE_BattleTower_Elevator_Top1 + 3) | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT));
+            MapGridSetMetatileIdAt(10,  7, (METATILE_BattleTower_Elevator_Top2 + 3) | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT));
+            MapGridSetMetatileIdAt( 7,  8, (METATILE_BattleTower_Elevator_Mid0 + 3) | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT));
+            MapGridSetMetatileIdAt( 8,  8, (METATILE_BattleTower_Elevator_Mid1 + 3) | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT));
+            MapGridSetMetatileIdAt( 9,  8, (METATILE_BattleTower_Elevator_Mid1 + 3) | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT));
+            MapGridSetMetatileIdAt(10,  8, (METATILE_BattleTower_Elevator_Mid2 + 3) | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT));
+            MapGridSetMetatileIdAt( 7,  9, (METATILE_BattleTower_Elevator_Bottom0 + 3) | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT));
+            MapGridSetMetatileIdAt( 8,  9, (METATILE_BattleTower_Elevator_Bottom1 + 3) | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT));
+            MapGridSetMetatileIdAt( 9,  9, (METATILE_BattleTower_Elevator_Bottom1 + 3) | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT));
+            MapGridSetMetatileIdAt(10,  9, (METATILE_BattleTower_Elevator_Bottom2 + 3) | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT));
         }
         DrawWholeMapView();
         task->data[4] ^= 1;
diff --git a/src/field_tasks.c b/src/field_tasks.c
index 12167eb85..a56de5746 100644
--- a/src/field_tasks.c
+++ b/src/field_tasks.c
@@ -17,6 +17,7 @@
 #include "field_player_avatar.h"
 #include "field_camera.h"
 #include "constants/songs.h"
+#include "constants/metatile_labels.h"
 #include "sound.h"
 #include "field_tasks.h"
 
@@ -147,24 +148,24 @@ void ResetFieldTasksArgs(void)
 }
 
 const struct MetatileOffset gUnknown_08376384[][2] = {
-    {{  0,  0,0x259}, {  0,  1,0x261}},
-    {{  0, -1,0x259}, {  0,  0,0x261}},
-    {{  0,  0,0x252}, {  1,  0,0x253}},
-    {{ -1,  0,0x252}, {  0,  0,0x253}}
+    {{  0,  0, METATILE_ID(Pacifidlog, HalfSubmergedLogs_Vertical0)}, {  0,  1, METATILE_ID(Pacifidlog, HalfSubmergedLogs_Vertical1)}},
+    {{  0, -1, METATILE_ID(Pacifidlog, HalfSubmergedLogs_Vertical0)}, {  0,  0, METATILE_ID(Pacifidlog, HalfSubmergedLogs_Vertical1)}},
+    {{  0,  0, METATILE_ID(Pacifidlog, HalfSubmergedLogs_Horizontal0)}, {  1,  0, METATILE_ID(Pacifidlog, HalfSubmergedLogs_Horizontal1)}},
+    {{ -1,  0, METATILE_ID(Pacifidlog, HalfSubmergedLogs_Horizontal0)}, {  0,  0, METATILE_ID(Pacifidlog, HalfSubmergedLogs_Horizontal1)}}
 };
 
 const struct MetatileOffset gUnknown_083763A4[][2] = {
-    {{  0,  0,0x25A}, {  0,  1,0x262}},
-    {{  0, -1,0x25A}, {  0,  0,0x262}},
-    {{  0,  0,0x254}, {  1,  0,0x255}},
-    {{ -1,  0,0x254}, {  0,  0,0x255}}
+    {{  0,  0, METATILE_ID(Pacifidlog, SubmergedLogs_Vertical0)}, {  0,  1, METATILE_ID(Pacifidlog, SubmergedLogs_Vertical1)}},
+    {{  0, -1, METATILE_ID(Pacifidlog, SubmergedLogs_Vertical0)}, {  0,  0, METATILE_ID(Pacifidlog, SubmergedLogs_Vertical1)}},
+    {{  0,  0, METATILE_ID(Pacifidlog, SubmergedLogs_Horizontal0)}, {  1,  0, METATILE_ID(Pacifidlog, SubmergedLogs_Horizontal1)}},
+    {{ -1,  0, METATILE_ID(Pacifidlog, SubmergedLogs_Horizontal0)}, {  0,  0, METATILE_ID(Pacifidlog, SubmergedLogs_Horizontal1)}}
 };
 
 const struct MetatileOffset gUnknown_083763C4[][2] = {
-    {{  0,  0,0x258}, {  0,  1,0x260}},
-    {{  0, -1,0x258}, {  0,  0,0x260}},
-    {{  0,  0,0x250}, {  1,  0,0x251}},
-    {{ -1,  0,0x250}, {  0,  0,0x251}}
+    {{  0,  0, METATILE_ID(Pacifidlog, FloatingLogs_Vertical0)}, {  0,  1, METATILE_ID(Pacifidlog, FloatingLogs_Vertical1)}},
+    {{  0, -1, METATILE_ID(Pacifidlog, FloatingLogs_Vertical0)}, {  0,  0, METATILE_ID(Pacifidlog, FloatingLogs_Vertical1)}},
+    {{  0,  0, METATILE_ID(Pacifidlog, FloatingLogs_Horizontal0)}, {  1,  0, METATILE_ID(Pacifidlog, FloatingLogs_Horizontal1)}},
+    {{ -1,  0, METATILE_ID(Pacifidlog, FloatingLogs_Horizontal0)}, {  0,  0, METATILE_ID(Pacifidlog, FloatingLogs_Horizontal1)}}
 };
 
 void DummyPerStepCallback(u8 taskId) {}
@@ -432,11 +433,11 @@ void sub_80699D8(s16 x, s16 y)
     {
         switch (MapGridGetMetatileIdAt(x, y))
         {
-            case 0x24e:
-                MapGridSetMetatileIdAt(x, y, 0x24f);
+            case METATILE_ID(Fortree, BridgeOverGrass_Raised):
+                MapGridSetMetatileIdAt(x, y, METATILE_ID(Fortree, BridgeOverGrass_Lowered));
                 break;
-            case 0x256:
-                MapGridSetMetatileIdAt(x, y, 0x257);
+            case METATILE_ID(Fortree, BridgeOverTrees_Raised):
+                MapGridSetMetatileIdAt(x, y, METATILE_ID(Fortree, BridgeOverTrees_Lowered));
                 break;
         }
     }
@@ -449,11 +450,11 @@ void sub_8069A3C(s16 x, s16 y)
     {
         switch (MapGridGetMetatileIdAt(x, y))
         {
-            case 0x24f:
-                MapGridSetMetatileIdAt(x, y, 0x24e);
+            case METATILE_ID(Fortree, BridgeOverGrass_Lowered):
+                MapGridSetMetatileIdAt(x, y, METATILE_ID(Fortree, BridgeOverGrass_Raised));
                 break;
-            case 0x257:
-                MapGridSetMetatileIdAt(x, y, 0x256);
+            case METATILE_ID(Fortree, BridgeOverTrees_Lowered):
+                MapGridSetMetatileIdAt(x, y, METATILE_ID(Fortree, BridgeOverTrees_Raised));
                 break;
         }
     }
@@ -619,7 +620,7 @@ void SetSootopolisGymCrackedIceMetatiles(void)
         {
             if (sub_8069D34(x, y) == TRUE)
             {
-                MapGridSetMetatileIdAt(x + 7, y + 7, 0x20e);
+                MapGridSetMetatileIdAt(x + 7, y + 7, METATILE_ID(SootopolisGym, Ice_Cracked));
             }
         }
     }
@@ -675,7 +676,7 @@ void PerStepCallback_8069DD4(u8 taskId)
                 x = data[4];
                 y = data[5];
                 PlaySE(SE_RU_BARI);
-                MapGridSetMetatileIdAt(x, y, 0x20e);
+                MapGridSetMetatileIdAt(x, y, METATILE_ID(SootopolisGym, Ice_Cracked));
                 CurrentMapDrawMetatileAt(x, y);
                 sub_8069CFC(x - 7, y - 7);
                 data[1] = 1;
@@ -691,7 +692,7 @@ void PerStepCallback_8069DD4(u8 taskId)
                 x = data[4];
                 y = data[5];
                 PlaySE(SE_RU_GASYAN);
-                MapGridSetMetatileIdAt(x, y, 0x206);
+                MapGridSetMetatileIdAt(x, y, METATILE_ID(SootopolisGym, Ice_Broken));
                 CurrentMapDrawMetatileAt(x, y);
                 data[1] = 1;
             }
@@ -711,13 +712,13 @@ void PerStepCallback_8069F64(u8 taskId)
         data[2] = y;
         if (MetatileBehavior_IsAshGrass(MapGridGetMetatileBehaviorAt(x, y)))
         {
-            if (MapGridGetMetatileIdAt(x, y) == 0x20a)
+            if (MapGridGetMetatileIdAt(x, y) == METATILE_ID(Fallarbor, AshGrass))
             {
-                StartAshFieldEffect(x, y, 0x212, 4);
+                StartAshFieldEffect(x, y, METATILE_ID(Fallarbor, NormalGrass), 4);
             }
             else
             {
-                StartAshFieldEffect(x, y, 0x206, 4);
+                StartAshFieldEffect(x, y, METATILE_ID(Lavaridge, NormalGrass), 4);
             }
             if (CheckBagHasItem(ITEM_SOOT_SACK, 1))
             {
@@ -782,13 +783,18 @@ void PerStepCallback_806A07C(u8 taskId)
     }
 }
 
-static const u16 sMuddySlopeAnimationMetatiles[] = {0xe8, 0xeb, 0xea, 0xe9};
+static const u16 sMuddySlopeAnimationMetatiles[] = {
+    METATILE_ID(General, MuddySlope_Frame0),
+    METATILE_ID(General, MuddySlope_Frame3),
+    METATILE_ID(General, MuddySlope_Frame2),
+    METATILE_ID(General, MuddySlope_Frame1)
+};
 
 static void SetMuddySlopeAnimatedMetatile(s16 *counter, s16 x, s16 y)
 {
     u16 tile;
     if (--(*counter) == 0)
-        tile = 0xe8;
+        tile = METATILE_ID(General, MuddySlope_Frame0);
     else
         tile = sMuddySlopeAnimationMetatiles[*counter / 8];
 
@@ -798,7 +804,7 @@ static void SetMuddySlopeAnimatedMetatile(s16 *counter, s16 x, s16 y)
     // Immediately set the metatile back to the original muddy slope metatile
     // but don't actualy draw it on the screen. This is so the underlying metatile
     // behvior on the map is not changed.
-    MapGridSetMetatileIdAt(x, y, 0xe8);
+    MapGridSetMetatileIdAt(x, y, METATILE_ID(General, MuddySlope_Frame0));
 }
 
 // Checks for the player traversing on muddy slope metatiles.
diff --git a/src/fieldmap.c b/src/fieldmap.c
index f9f857f89..f9b81a173 100644
--- a/src/fieldmap.c
+++ b/src/fieldmap.c
@@ -382,13 +382,13 @@ u8 MapGridIsImpassableAt(int x, int y)
         i = (x + 1) & 1;
         i += ((y + 1) & 1) * 2;
         block = gMapHeader.mapLayout->border[i];
-        block |= 0xc00;
+        block |= METATILE_COLLISION_MASK;
     }
-    if (block == 0x3ff)
+    if (block == METATILE_ID_UNDEFINED)
     {
         return 1;
     }
-    return (block & 0xc00) >> 10;
+    return (block & METATILE_COLLISION_MASK) >> 10;
 }
 
 u32 MapGridGetMetatileIdAt(int x, int y)
diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c
index 0a8c252e0..8d76ecccb 100644
--- a/src/fldeff_cut.c
+++ b/src/fldeff_cut.c
@@ -18,6 +18,7 @@
 #include "constants/field_effects.h"
 #include "constants/event_objects.h"
 #include "constants/metatile_behaviors.h"
+#include "constants/metatile_labels.h"
 #include "constants/songs.h"
 
 extern void (*gFieldCallback)(void);
@@ -251,36 +252,36 @@ static void SetCutGrassMetatile(s16 x, s16 y)
 
     switch(metatileId)
     {
-    case 0x208:
-    case 0x15:
-    case 0xD:
-        MapGridSetMetatileIdAt(x, y, 0x1);
+    case METATILE_ID(Fortree, LongGrass_Root):
+    case METATILE_ID(General, LongGrass):
+    case METATILE_ID(General, TallGrass):
+        MapGridSetMetatileIdAt(x, y, METATILE_ID(General, Grass));
         break;
-    case 0x1C6:
-        MapGridSetMetatileIdAt(x, y, 0x1CE);
+    case METATILE_ID(General, TallGrass_TreeLeft):
+        MapGridSetMetatileIdAt(x, y, METATILE_ID(General, Grass_TreeLeft));
         break;
-    case 0x1C7:
-        MapGridSetMetatileIdAt(x, y, 0x1CF);
+    case METATILE_ID(General, TallGrass_TreeRight):
+        MapGridSetMetatileIdAt(x, y, METATILE_ID(General, Grass_TreeRight));
         break;
-    case 0x281:
-        MapGridSetMetatileIdAt(x, y, 0x279);
+    case METATILE_ID(Fortree, SecretBase_LongGrass_BottomLeft):
+        MapGridSetMetatileIdAt(x, y, METATILE_ID(Fortree, SecretBase_LongGrass_TopLeft));
         break;
-    case 0x282:
-        MapGridSetMetatileIdAt(x, y, 0x27A);
+    case METATILE_ID(Fortree, SecretBase_LongGrass_BottomMid):
+        MapGridSetMetatileIdAt(x, y, METATILE_ID(Fortree, SecretBase_LongGrass_TopMid));
         break;
-    case 0x283:
-        MapGridSetMetatileIdAt(x, y, 0x27B);
+    case METATILE_ID(Fortree, SecretBase_LongGrass_BottomRight):
+        MapGridSetMetatileIdAt(x, y, METATILE_ID(Fortree, SecretBase_LongGrass_TopRight));
         break;
-    case 0x206:
-    case 0x207:
-        MapGridSetMetatileIdAt(x, y, 0x271);
+    case METATILE_ID(Lavaridge, NormalGrass):
+    case METATILE_ID(Lavaridge, AshGrass):
+        MapGridSetMetatileIdAt(x, y, METATILE_ID(Lavaridge, LavaField));
         break;
-    case 0x212:
-    case 0x20A:
-        MapGridSetMetatileIdAt(x, y, 0x218);
+    case METATILE_ID(Fallarbor, NormalGrass):
+    case METATILE_ID(Fallarbor, AshGrass):
+        MapGridSetMetatileIdAt(x, y, METATILE_ID(Fallarbor, AshField));
         break;
-    case 0x25:
-        MapGridSetMetatileIdAt(x, y, 0xE);
+    case METATILE_ID(General, TallGrass_TreeUp):
+        MapGridSetMetatileIdAt(x, y, METATILE_ID(General, Grass_TreeUp));
         break;
     }
 }
@@ -289,13 +290,13 @@ static s32 sub_80A28A0(s16 x, s16 y)
 {
     u16 metatileId = MapGridGetMetatileIdAt(x, y);
 
-    if(metatileId == 1)
+    if(metatileId == METATILE_ID(General, Grass))
         return 1;
-    else if(metatileId == 633)
+    else if(metatileId == METATILE_ID(Fortree, SecretBase_LongGrass_TopLeft))
         return 2;
-    else if(metatileId == 634)
+    else if(metatileId == METATILE_ID(Fortree, SecretBase_LongGrass_TopMid))
         return 3;
-    else if(metatileId == 635)
+    else if(metatileId == METATILE_ID(Fortree, SecretBase_LongGrass_TopRight))
         return 4;
     else
         return 0;
@@ -310,34 +311,34 @@ static void SetCutGrassMetatiles(s16 x, s16 y)
     {
         u16 currentX = x + i;
         s16 currentXsigned = x + i;
-        if (MapGridGetMetatileIdAt(currentXsigned, y) == 21)
+        if (MapGridGetMetatileIdAt(currentXsigned, y) == METATILE_ID(General, LongGrass))
         {
             switch ((u8)sub_80A28A0(currentXsigned, y + 1))
             {
             case 1:
-                MapGridSetMetatileIdAt(currentXsigned, y + 1, 0x208);
+                MapGridSetMetatileIdAt(currentXsigned, y + 1, METATILE_ID(Fortree, LongGrass_Root));
                 break;
             case 2:
-                MapGridSetMetatileIdAt(currentXsigned, y + 1, 0x281);
+                MapGridSetMetatileIdAt(currentXsigned, y + 1, METATILE_ID(Fortree, SecretBase_LongGrass_BottomLeft));
                 break;
             case 3:
-                MapGridSetMetatileIdAt(currentXsigned, y + 1, 0x282);
+                MapGridSetMetatileIdAt(currentXsigned, y + 1, METATILE_ID(Fortree, SecretBase_LongGrass_BottomMid));
                 break;
             case 4:
-                MapGridSetMetatileIdAt(currentXsigned, y + 1, 0x283);
+                MapGridSetMetatileIdAt(currentXsigned, y + 1, METATILE_ID(Fortree, SecretBase_LongGrass_BottomRight));
                 break;
             }
         }
         if (MapGridGetMetatileIdAt((s16)currentX, (s16)lowerY) == 1)
         {
-            if (MapGridGetMetatileIdAt((s16)currentX, (s16)lowerY + 1) == 0x208)
-                MapGridSetMetatileIdAt((s16)currentX, (s16)lowerY + 1, 0x1);
-            if (MapGridGetMetatileIdAt((s16)currentX, (s16)lowerY + 1) == 0x281)
-                MapGridSetMetatileIdAt((s16)currentX, (s16)lowerY + 1, 0x279);
-            if (MapGridGetMetatileIdAt((s16)currentX, (s16)lowerY + 1) == 0x282)
-                MapGridSetMetatileIdAt((s16)currentX, (s16)lowerY + 1, 0x27A);
-            if (MapGridGetMetatileIdAt((s16)currentX, (s16)lowerY + 1) == 0x283)
-                MapGridSetMetatileIdAt((s16)currentX, (s16)lowerY + 1, 0x27B);
+            if (MapGridGetMetatileIdAt((s16)currentX, (s16)lowerY + 1) == METATILE_ID(Fortree, LongGrass_Root))
+                MapGridSetMetatileIdAt((s16)currentX, (s16)lowerY + 1, METATILE_ID(General, Grass));
+            if (MapGridGetMetatileIdAt((s16)currentX, (s16)lowerY + 1) == METATILE_ID(Fortree, SecretBase_LongGrass_BottomLeft))
+                MapGridSetMetatileIdAt((s16)currentX, (s16)lowerY + 1, METATILE_ID(Fortree, SecretBase_LongGrass_TopLeft));
+            if (MapGridGetMetatileIdAt((s16)currentX, (s16)lowerY + 1) == METATILE_ID(Fortree, SecretBase_LongGrass_BottomMid))
+                MapGridSetMetatileIdAt((s16)currentX, (s16)lowerY + 1, METATILE_ID(Fortree, SecretBase_LongGrass_TopMid));
+            if (MapGridGetMetatileIdAt((s16)currentX, (s16)lowerY + 1) == METATILE_ID(Fortree, SecretBase_LongGrass_BottomRight))
+                MapGridSetMetatileIdAt((s16)currentX, (s16)lowerY + 1, METATILE_ID(Fortree, SecretBase_LongGrass_TopRight));
         }
     }
 }
diff --git a/src/fldeff_escalator.c b/src/fldeff_escalator.c
index 981233480..d2c9fe3c7 100644
--- a/src/fldeff_escalator.c
+++ b/src/fldeff_escalator.c
@@ -3,6 +3,7 @@
 #include "fieldmap.h"
 #include "field_camera.h"
 #include "field_player_avatar.h"
+#include "constants/metatile_labels.h"
 
 extern u8 gUnknown_02038731;
 
@@ -52,13 +53,47 @@ void sub_80B45B4(u8 taskId, const s16 *list, u16 c)
     }
 }
 
-const u16 gUnknown_083CC714[] = {0x284, 0x282, 0x280};
-const u16 gUnknown_083CC71A[] = {0x285, 0x283, 0x281};
-const u16 gUnknown_083CC720[] = {0x28C, 0x28A, 0x288};
-const u16 gUnknown_083CC726[] = {0x28D, 0x28B, 0x289};
-const u16 gUnknown_083CC72C[] = {0x2A0, 0x2A2, 0x2A4};
-const u16 gUnknown_083CC732[] = {0x2A1, 0x2A3, 0x2A5};
-const u16 gUnknown_083CC738[] = {0x2A8, 0x2AA, 0x2AC};
+const u16 sEscalatorMetatiles_1F_0[] = {
+    METATILE_ID(PokemonCenter, Escalator1F_Tile0_Frame2),
+    METATILE_ID(PokemonCenter, Escalator1F_Tile0_Frame1),
+    METATILE_ID(PokemonCenter, Escalator1F_Tile0_Frame0)
+};
+
+const u16 sEscalatorMetatiles_1F_1[] = {
+    METATILE_ID(PokemonCenter, Escalator1F_Tile1_Frame2),
+    METATILE_ID(PokemonCenter, Escalator1F_Tile1_Frame1),
+    METATILE_ID(PokemonCenter, Escalator1F_Tile1_Frame0)
+};
+
+const u16 sEscalatorMetatiles_1F_2[] = {
+    METATILE_ID(PokemonCenter, Escalator1F_Tile2_Frame2),
+    METATILE_ID(PokemonCenter, Escalator1F_Tile2_Frame1),
+    METATILE_ID(PokemonCenter, Escalator1F_Tile2_Frame0)
+};
+
+const u16 sEscalatorMetatiles_1F_3[] = {
+    METATILE_ID(PokemonCenter, Escalator1F_Tile3_Frame2),
+    METATILE_ID(PokemonCenter, Escalator1F_Tile3_Frame1),
+    METATILE_ID(PokemonCenter, Escalator1F_Tile3_Frame0)
+};
+
+const u16 sEscalatorMetatiles_2F_0[] = {
+    METATILE_ID(PokemonCenter, Escalator2F_Tile0_Frame0),
+    METATILE_ID(PokemonCenter, Escalator2F_Tile0_Frame1),
+    METATILE_ID(PokemonCenter, Escalator2F_Tile0_Frame2)
+};
+
+const u16 sEscalatorMetatiles_2F_1[] = {
+    METATILE_ID(PokemonCenter, Escalator2F_Tile1_Frame0),
+    METATILE_ID(PokemonCenter, Escalator2F_Tile1_Frame1),
+    METATILE_ID(PokemonCenter, Escalator2F_Tile1_Frame2)
+};
+
+const u16 sEscalatorMetatiles_2F_2[] = {
+    METATILE_ID(PokemonCenter, Escalator2F_Tile2_Frame0),
+    METATILE_ID(PokemonCenter, Escalator2F_Tile2_Frame1),
+    METATILE_ID(PokemonCenter, Escalator2F_Tile2_Frame2)
+};
 
 void sub_80B4710(u8 taskId)
 {
@@ -69,25 +104,25 @@ void sub_80B4710(u8 taskId)
     switch (data[0])
     {
         case 0:
-            sub_80B45B4(taskId, gUnknown_083CC714, 0);
+            sub_80B45B4(taskId, sEscalatorMetatiles_1F_0, 0);
             break;
         case 1:
-            sub_80B45B4(taskId, gUnknown_083CC71A, 0);
+            sub_80B45B4(taskId, sEscalatorMetatiles_1F_1, 0);
             break;
         case 2:
-            sub_80B45B4(taskId, gUnknown_083CC720, 0xC00);
+            sub_80B45B4(taskId, sEscalatorMetatiles_1F_2, (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT));
             break;
         case 3:
-            sub_80B45B4(taskId, gUnknown_083CC726, 0);
+            sub_80B45B4(taskId, sEscalatorMetatiles_1F_3, 0);
             break;
         case 4:
-            sub_80B45B4(taskId, gUnknown_083CC72C, 0xC00);
+            sub_80B45B4(taskId, sEscalatorMetatiles_2F_0, (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT));
             break;
         case 5:
-            sub_80B45B4(taskId, gUnknown_083CC732, 0);
+            sub_80B45B4(taskId, sEscalatorMetatiles_2F_1, 0);
             break;
         case 6:
-            sub_80B45B4(taskId, gUnknown_083CC738, 0);
+            sub_80B45B4(taskId, sEscalatorMetatiles_2F_2, 0);
             break;
     }
 
diff --git a/src/scrcmd.c b/src/scrcmd.c
index d37e1180d..6084cfc5d 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -1902,14 +1902,14 @@ bool8 ScrCmd_setmetatile(struct ScriptContext *ctx)
     u16 x = VarGet(ScriptReadHalfword(ctx));
     u16 y = VarGet(ScriptReadHalfword(ctx));
     u16 metatileId = VarGet(ScriptReadHalfword(ctx));
-    u16 v8 = VarGet(ScriptReadHalfword(ctx));
+    u16 impassable = VarGet(ScriptReadHalfword(ctx));
 
     x += 7;
     y += 7;
-    if (!v8)
+    if (!impassable)
         MapGridSetMetatileIdAt(x, y, metatileId);
     else
-        MapGridSetMetatileIdAt(x, y, metatileId | 0xC00);
+        MapGridSetMetatileIdAt(x, y, metatileId | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT));
     return FALSE;
 }
 
diff --git a/src/tv.c b/src/tv.c
index fa5b0f4d4..9cd8d7eea 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -42,6 +42,7 @@
 #include "ewram.h"
 #include "constants/moves.h"
 #include "constants/region_map_sections.h"
+#include "constants/metatile_labels.h"
 
 struct UnkTvStruct
 {
@@ -536,7 +537,7 @@ void UpdateTVScreensOnMap(int width, int height)
     switch (CheckForBigMovieOrEmergencyNewsOnTV())
     {
     case 1:
-        SetTVMetatilesOnMap(width, height, 0x3);
+        SetTVMetatilesOnMap(width, height, METATILE_ID(Building, TV_On));
         break;
     case 2:
         break;
@@ -544,12 +545,12 @@ void UpdateTVScreensOnMap(int width, int height)
         if (gSaveBlock1.location.mapGroup == MAP_GROUP(LILYCOVE_CITY_COVE_LILY_MOTEL_1F)
          && gSaveBlock1.location.mapNum == MAP_NUM(LILYCOVE_CITY_COVE_LILY_MOTEL_1F))
         {
-            SetTVMetatilesOnMap(width, height, 0x3);
+            SetTVMetatilesOnMap(width, height, METATILE_ID(Building, TV_On));
         }
         else if (FlagGet(FLAG_SYS_TV_START) && (sub_80BD8B8() != 0xff || FindAnyTVNewsOnTheAir() != 0xff || IsTVShowInSearchOfTrainersAiring()))
         {
             FlagClear(FLAG_SYS_TV_WATCH);
-            SetTVMetatilesOnMap(width, height, 0x3);
+            SetTVMetatilesOnMap(width, height, METATILE_ID(Building, TV_On));
         }
         break;
     }
@@ -565,14 +566,14 @@ void SetTVMetatilesOnMap(int width, int height, u16 tileId)
         for (x=0; x<width; x++)
         {
             if (MapGridGetMetatileBehaviorAt(x, y) == 0x86)
-                MapGridSetMetatileIdAt(x, y, tileId | 0xc00);
+                MapGridSetMetatileIdAt(x, y, tileId | (COLLISION_DIR_ALL << METATILE_COLLISION_SHIFT));
         }
     }
 }
 
 void TurnOffTVScreen(void)
 {
-    SetTVMetatilesOnMap(gUnknown_03004870.width, gUnknown_03004870.height, 0x2);
+    SetTVMetatilesOnMap(gUnknown_03004870.width, gUnknown_03004870.height, METATILE_ID(Building, TV_Off));
     DrawWholeMapView();
 }