finish labeling metatiles

20 files changed, 425 insertions, 318 deletions

diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc
index 710f26e7c..0183d385b 100644
--- a/data/maps/Route103/scripts.inc
+++ b/data/maps/Route103/scripts.inc
@@ -13,8 +13,8 @@ Route103_MapScript1_1EC3A4: @ 81EC3A4
 	end
 
 Route103_EventScript_1EC3AE:: @ 81EC3AE
-	setmetatile 45, 5, 159, 1
-	setmetatile 45, 6, 167, 0
+	setmetatile 45, 5, METATILE_General_CaveEntrance_Top, 1
+	setmetatile 45, 6, METATILE_General_CaveEntrance_Bottom, 0
 	return
 
 Route103_EventScript_1EC3C1:: @ 81EC3C1
diff --git a/data/maps/Route105/scripts.inc b/data/maps/Route105/scripts.inc
index 041a64709..c95511397 100644
--- a/data/maps/Route105/scripts.inc
+++ b/data/maps/Route105/scripts.inc
@@ -13,8 +13,8 @@ Route105_MapScript1_1EE1EB: @ 81EE1EB
 	end
 
 Route105_EventScript_1EE20B:: @ 81EE20B
-	setmetatile 9, 19, 124, 1
-	setmetatile 9, 20, 145, 1
+	setmetatile 9, 19, METATILE_General_RockWall_RockBase, 1
+	setmetatile 9, 20, METATILE_General_RockWall_SandBase, 1
 	return
 
 Route105_OnTransition: @ 81EE21E
diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc
index 1c1aa76b4..52a0f19f5 100644
--- a/data/maps/Route110_TrickHouseEnd/scripts.inc
+++ b/data/maps/Route110_TrickHouseEnd/scripts.inc
@@ -37,7 +37,7 @@ Route110_TrickHouseEnd_EventScript_26ACFF:: @ 826ACFF
 	end
 
 Route110_TrickHouseEnd_EventScript_26AD0D:: @ 826AD0D
-	setmetatile 10, 1, 539, 1
+	setmetatile 10, 1, METATILE_GenericBuilding_TrickHouse_Door_Closed, 1
 	return
 
 Route110_TrickHouseEnd_EventScript_26AD17:: @ 826AD17
diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc
index aae615a62..9c2fc3aec 100644
--- a/data/maps/Route110_TrickHouseEntrance/scripts.inc
+++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc
@@ -503,7 +503,7 @@ Route110_TrickHouseEntrance_EventScript_26A110:: @ 826A110
 	end
 
 Route110_TrickHouseEntrance_EventScript_26A126:: @ 826A126
-	setmetatile 5, 1, 537, 0
+	setmetatile 5, 1, METATILE_GenericBuilding_TrickHouse_Stairs_Down, 0
 	special DrawWholeMapView
 	delay 20
 	applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEntrance_Movement_2725C9
@@ -609,7 +609,7 @@ Route110_TrickHouseEntrance_EventScript_26A289:: @ 826A289
 	msgbox Route110_TrickHousePuzzle1_Text_26B98D, MSGBOX_DEFAULT
 	playse SE_PIN
 	setvar VAR_TRICK_HOUSE_PUZZLE_1_STATE, 2
-	setmetatile 13, 1, 523, 0
+	setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0
 	special DrawWholeMapView
 	releaseall
 	end
@@ -620,7 +620,7 @@ Route110_TrickHouseEntrance_EventScript_26A2B2:: @ 826A2B2
 	msgbox Route110_TrickHousePuzzle2_Text_26BCBA, MSGBOX_DEFAULT
 	playse SE_PIN
 	setvar VAR_TRICK_HOUSE_PUZZLE_2_STATE, 2
-	setmetatile 13, 1, 523, 0
+	setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0
 	special DrawWholeMapView
 	releaseall
 	end
@@ -631,7 +631,7 @@ Route110_TrickHouseEntrance_EventScript_26A2DB:: @ 826A2DB
 	msgbox Route110_TrickHousePuzzle3_Text_26C609, MSGBOX_DEFAULT
 	playse SE_PIN
 	setvar VAR_TRICK_HOUSE_PUZZLE_3_STATE, 2
-	setmetatile 13, 1, 523, 0
+	setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0
 	special DrawWholeMapView
 	releaseall
 	end
@@ -642,7 +642,7 @@ Route110_TrickHouseEntrance_EventScript_26A304:: @ 826A304
 	msgbox Route110_TrickHousePuzzle4_Text_26C8C3, MSGBOX_DEFAULT
 	playse SE_PIN
 	setvar VAR_TRICK_HOUSE_PUZZLE_4_STATE, 2
-	setmetatile 13, 1, 523, 0
+	setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0
 	special DrawWholeMapView
 	releaseall
 	end
@@ -653,7 +653,7 @@ Route110_TrickHouseEntrance_EventScript_26A32D:: @ 826A32D
 	msgbox Route110_TrickHousePuzzle5_Text_26D660, MSGBOX_DEFAULT
 	playse SE_PIN
 	setvar VAR_TRICK_HOUSE_PUZZLE_5_STATE, 2
-	setmetatile 13, 1, 523, 0
+	setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0
 	special DrawWholeMapView
 	releaseall
 	end
@@ -664,7 +664,7 @@ Route110_TrickHouseEntrance_EventScript_26A356:: @ 826A356
 	msgbox Route110_TrickHousePuzzle6_Text_26DE26, MSGBOX_DEFAULT
 	playse SE_PIN
 	setvar VAR_TRICK_HOUSE_PUZZLE_6_STATE, 2
-	setmetatile 13, 1, 523, 0
+	setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0
 	special DrawWholeMapView
 	releaseall
 	end
@@ -675,7 +675,7 @@ Route110_TrickHouseEntrance_EventScript_26A37F:: @ 826A37F
 	msgbox Route110_TrickHousePuzzle7_EventScript_26E413, MSGBOX_DEFAULT
 	playse SE_PIN
 	setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE, 2
-	setmetatile 13, 1, 523, 0
+	setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0
 	special DrawWholeMapView
 	releaseall
 	end
@@ -686,7 +686,7 @@ Route110_TrickHouseEntrance_EventScript_26A3A8:: @ 826A3A8
 	msgbox Route110_TrickHousePuzzle8_EventScript_26E864, MSGBOX_DEFAULT
 	playse SE_PIN
 	setvar VAR_TRICK_HOUSE_PUZZLE_8_STATE, 2
-	setmetatile 13, 1, 523, 0
+	setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0
 	special DrawWholeMapView
 	releaseall
 	end
diff --git a/data/maps/Route110_TrickHousePuzzle1/scripts.inc b/data/maps/Route110_TrickHousePuzzle1/scripts.inc
index 73526d3ee..ef81b03cf 100644
--- a/data/maps/Route110_TrickHousePuzzle1/scripts.inc
+++ b/data/maps/Route110_TrickHousePuzzle1/scripts.inc
@@ -8,7 +8,7 @@ Route110_TrickHousePuzzle1_MapScript1_26B915: @ 826B915
 	end
 
 Route110_TrickHousePuzzle1_EventScript_26B921:: @ 826B921
-	setmetatile 13, 1, 523, 0
+	setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0
 	end
 
 Route110_TrickHousePuzzle1_EventScript_26B92B:: @ 826B92B
diff --git a/data/maps/Route110_TrickHousePuzzle2/scripts.inc b/data/maps/Route110_TrickHousePuzzle2/scripts.inc
index 057f6ea32..334637624 100644
--- a/data/maps/Route110_TrickHousePuzzle2/scripts.inc
+++ b/data/maps/Route110_TrickHousePuzzle2/scripts.inc
@@ -70,23 +70,23 @@ Route110_TrickHousePuzzle2_EventScript_26BC16:: @ 826BC16
 	end
 
 Route110_TrickHousePuzzle2_EventScript_26BC29:: @ 826BC29
-	setmetatile 11, 12, 601, 0
-	setmetatile 1, 13, 618, 0
+	setmetatile 11, 12, METATILE_TrickHousePuzzle_Button_Pressed, 0
+	setmetatile 1, 13, METATILE_TrickHousePuzzle_Door_Shuttered, 0
 	return
 
 Route110_TrickHousePuzzle2_EventScript_26BC3C:: @ 826BC3C
-	setmetatile 0, 4, 601, 0
-	setmetatile 5, 6, 618, 0
+	setmetatile 0, 4, METATILE_TrickHousePuzzle_Button_Pressed, 0
+	setmetatile 5, 6, METATILE_TrickHousePuzzle_Door_Shuttered, 0
 	return
 
 Route110_TrickHousePuzzle2_EventScript_26BC4F:: @ 826BC4F
-	setmetatile 14, 5, 601, 0
-	setmetatile 7, 15, 618, 0
+	setmetatile 14, 5, METATILE_TrickHousePuzzle_Button_Pressed, 0
+	setmetatile 7, 15, METATILE_TrickHousePuzzle_Door_Shuttered, 0
 	return
 
 Route110_TrickHousePuzzle2_EventScript_26BC62:: @ 826BC62
-	setmetatile 7, 11, 601, 0
-	setmetatile 14, 12, 618, 0
+	setmetatile 7, 11, METATILE_TrickHousePuzzle_Button_Pressed, 0
+	setmetatile 14, 12, METATILE_TrickHousePuzzle_Door_Shuttered, 0
 	return
 
 Route110_TrickHousePuzzle2_EventScript_26BC75:: @ 826BC75
diff --git a/data/maps/Route110_TrickHousePuzzle3/scripts.inc b/data/maps/Route110_TrickHousePuzzle3/scripts.inc
index 48b81e0cc..dfae2d359 100644
--- a/data/maps/Route110_TrickHousePuzzle3/scripts.inc
+++ b/data/maps/Route110_TrickHousePuzzle3/scripts.inc
@@ -21,10 +21,10 @@ Route110_TrickHousePuzzle3_OnTransition: @ 826BEFF
 	end
 
 Route110_TrickHousePuzzle3_EventScript_26BF1E:: @ 826BF1E
-	setmetatile 4, 14, 600, 0
-	setmetatile 3, 11, 600, 0
-	setmetatile 12, 5, 600, 0
-	setmetatile 8, 2, 600, 0
+	setmetatile 4, 14, METATILE_TrickHousePuzzle_Button_Up, 0
+	setmetatile 3, 11, METATILE_TrickHousePuzzle_Button_Up, 0
+	setmetatile 12, 5, METATILE_TrickHousePuzzle_Button_Up, 0
+	setmetatile 8, 2, METATILE_TrickHousePuzzle_Button_Up, 0
 	compare VAR_TEMP_8, 1
 	call_if_eq Route110_TrickHousePuzzle3_EventScript_26BF6F
 	compare VAR_TEMP_8, 2
@@ -36,173 +36,173 @@ Route110_TrickHousePuzzle3_EventScript_26BF1E:: @ 826BF1E
 	return
 
 Route110_TrickHousePuzzle3_EventScript_26BF6F:: @ 826BF6F
-	setmetatile 4, 14, 601, 0
+	setmetatile 4, 14, METATILE_TrickHousePuzzle_Button_Pressed, 0
 	return
 
 Route110_TrickHousePuzzle3_EventScript_26BF79:: @ 826BF79
-	setmetatile 3, 11, 601, 0
+	setmetatile 3, 11, METATILE_TrickHousePuzzle_Button_Pressed, 0
 	return
 
 Route110_TrickHousePuzzle3_EventScript_26BF83:: @ 826BF83
-	setmetatile 12, 5, 601, 0
+	setmetatile 12, 5, METATILE_TrickHousePuzzle_Button_Pressed, 0
 	return
 
 Route110_TrickHousePuzzle3_EventScript_26BF8D:: @ 826BF8D
-	setmetatile 8, 2, 601, 0
+	setmetatile 8, 2, METATILE_TrickHousePuzzle_Button_Pressed, 0
 	return
 
 Route110_TrickHousePuzzle3_EventScript_26BF97:: @ 826BF97
-	setmetatile 1, 6, 587, 0
-	setmetatile 2, 6, 588, 0
-	setmetatile 1, 7, 595, 0
-	setmetatile 2, 7, 596, 0
-	setmetatile 1, 9, 587, 0
-	setmetatile 2, 9, 588, 0
-	setmetatile 1, 10, 595, 0
-	setmetatile 2, 10, 596, 0
-	setmetatile 4, 15, 587, 0
-	setmetatile 5, 15, 588, 0
-	setmetatile 4, 16, 595, 0
-	setmetatile 5, 16, 596, 0
-	setmetatile 13, 9, 587, 0
-	setmetatile 14, 9, 588, 0
-	setmetatile 13, 10, 595, 0
-	setmetatile 14, 10, 596, 0
-	setmetatile 13, 15, 587, 0
-	setmetatile 14, 15, 588, 0
-	setmetatile 13, 16, 595, 0
-	setmetatile 14, 16, 596, 0
-	setmetatile 3, 7, 589, 1
-	setmetatile 3, 8, 597, 0
-	setmetatile 3, 13, 589, 1
-	setmetatile 3, 14, 597, 0
-	setmetatile 6, 4, 589, 1
-	setmetatile 6, 5, 597, 0
-	setmetatile 9, 16, 589, 1
-	setmetatile 9, 17, 597, 0
-	setmetatile 12, 7, 589, 1
-	setmetatile 12, 8, 597, 0
-	setmetatile 1, 3, 568, 0
-	setmetatile 2, 3, 569, 0
-	setmetatile 1, 4, 576, 1
-	setmetatile 2, 4, 577, 1
-	setmetatile 1, 12, 568, 0
-	setmetatile 2, 12, 569, 0
-	setmetatile 1, 13, 576, 1
-	setmetatile 2, 13, 577, 1
-	setmetatile 4, 6, 568, 0
-	setmetatile 5, 6, 569, 0
-	setmetatile 4, 7, 576, 1
-	setmetatile 5, 7, 577, 1
-	setmetatile 4, 12, 568, 0
-	setmetatile 5, 12, 569, 0
-	setmetatile 4, 13, 576, 1
-	setmetatile 5, 13, 577, 1
-	setmetatile 4, 18, 568, 0
-	setmetatile 5, 18, 569, 0
-	setmetatile 4, 19, 576, 1
-	setmetatile 5, 19, 577, 1
-	setmetatile 7, 9, 568, 0
-	setmetatile 8, 9, 569, 0
-	setmetatile 7, 10, 576, 1
-	setmetatile 8, 10, 577, 1
-	setmetatile 10, 6, 568, 0
-	setmetatile 11, 6, 569, 0
-	setmetatile 10, 7, 576, 1
-	setmetatile 11, 7, 577, 1
-	setmetatile 10, 12, 568, 0
-	setmetatile 11, 12, 569, 0
-	setmetatile 10, 13, 576, 1
-	setmetatile 11, 13, 577, 1
-	setmetatile 10, 18, 568, 0
-	setmetatile 11, 18, 569, 0
-	setmetatile 10, 19, 576, 1
-	setmetatile 11, 19, 577, 1
-	setmetatile 13, 3, 568, 0
-	setmetatile 14, 3, 569, 0
-	setmetatile 13, 4, 576, 1
-	setmetatile 14, 4, 577, 1
-	setmetatile 3, 16, 570, 1
-	setmetatile 3, 17, 578, 1
-	setmetatile 9, 4, 570, 1
-	setmetatile 9, 5, 578, 1
+	setmetatile 1, 6, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile0, 0
+	setmetatile 2, 6, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile1, 0
+	setmetatile 1, 7, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile2, 0
+	setmetatile 2, 7, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile3, 0
+	setmetatile 1, 9, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile0, 0
+	setmetatile 2, 9, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile1, 0
+	setmetatile 1, 10, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile2, 0
+	setmetatile 2, 10, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile3, 0
+	setmetatile 4, 15, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile0, 0
+	setmetatile 5, 15, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile1, 0
+	setmetatile 4, 16, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile2, 0
+	setmetatile 5, 16, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile3, 0
+	setmetatile 13, 9, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile0, 0
+	setmetatile 14, 9, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile1, 0
+	setmetatile 13, 10, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile2, 0
+	setmetatile 14, 10, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile3, 0
+	setmetatile 13, 15, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile0, 0
+	setmetatile 14, 15, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile1, 0
+	setmetatile 13, 16, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile2, 0
+	setmetatile 14, 16, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile3, 0
+	setmetatile 3, 7, METATILE_TrickHousePuzzle_BlueDoorV_Retracted, 1
+	setmetatile 3, 8, METATILE_TrickHousePuzzle_Floor_ShadowTop, 0
+	setmetatile 3, 13, METATILE_TrickHousePuzzle_BlueDoorV_Retracted, 1
+	setmetatile 3, 14, METATILE_TrickHousePuzzle_Floor_ShadowTop, 0
+	setmetatile 6, 4, METATILE_TrickHousePuzzle_BlueDoorV_Retracted, 1
+	setmetatile 6, 5, METATILE_TrickHousePuzzle_Floor_ShadowTop, 0
+	setmetatile 9, 16, METATILE_TrickHousePuzzle_BlueDoorV_Retracted, 1
+	setmetatile 9, 17, METATILE_TrickHousePuzzle_Floor_ShadowTop, 0
+	setmetatile 12, 7, METATILE_TrickHousePuzzle_BlueDoorV_Retracted, 1
+	setmetatile 12, 8, METATILE_TrickHousePuzzle_Floor_ShadowTop, 0
+	setmetatile 1, 3, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile0, 0
+	setmetatile 2, 3, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile1, 0
+	setmetatile 1, 4, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile2, 1
+	setmetatile 2, 4, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile3, 1
+	setmetatile 1, 12, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile0, 0
+	setmetatile 2, 12, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile1, 0
+	setmetatile 1, 13, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile2, 1
+	setmetatile 2, 13, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile3, 1
+	setmetatile 4, 6, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile0, 0
+	setmetatile 5, 6, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile1, 0
+	setmetatile 4, 7, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile2, 1
+	setmetatile 5, 7, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile3, 1
+	setmetatile 4, 12, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile0, 0
+	setmetatile 5, 12, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile1, 0
+	setmetatile 4, 13, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile2, 1
+	setmetatile 5, 13, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile3, 1
+	setmetatile 4, 18, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile0, 0
+	setmetatile 5, 18, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile1, 0
+	setmetatile 4, 19, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile2, 1
+	setmetatile 5, 19, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile3, 1
+	setmetatile 7, 9, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile0, 0
+	setmetatile 8, 9, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile1, 0
+	setmetatile 7, 10, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile2, 1
+	setmetatile 8, 10, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile3, 1
+	setmetatile 10, 6, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile0, 0
+	setmetatile 11, 6, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile1, 0
+	setmetatile 10, 7, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile2, 1
+	setmetatile 11, 7, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile3, 1
+	setmetatile 10, 12, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile0, 0
+	setmetatile 11, 12, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile1, 0
+	setmetatile 10, 13, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile2, 1
+	setmetatile 11, 13, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile3, 1
+	setmetatile 10, 18, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile0, 0
+	setmetatile 11, 18, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile1, 0
+	setmetatile 10, 19, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile2, 1
+	setmetatile 11, 19, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile3, 1
+	setmetatile 13, 3, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile0, 0
+	setmetatile 14, 3, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile1, 0
+	setmetatile 13, 4, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile2, 1
+	setmetatile 14, 4, METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile3, 1
+	setmetatile 3, 16, METATILE_TrickHousePuzzle_RedDoorV_Open0, 1
+	setmetatile 3, 17, METATILE_TrickHousePuzzle_RedDoorV_Open1, 1
+	setmetatile 9, 4, METATILE_TrickHousePuzzle_RedDoorV_Open0, 1
+	setmetatile 9, 5, METATILE_TrickHousePuzzle_RedDoorV_Open1, 1
 	return
 
 Route110_TrickHousePuzzle3_EventScript_26C232:: @ 826C232
-	setmetatile 1, 6, 571, 0
-	setmetatile 2, 6, 572, 0
-	setmetatile 1, 7, 579, 1
-	setmetatile 2, 7, 580, 1
-	setmetatile 1, 9, 571, 0
-	setmetatile 2, 9, 572, 0
-	setmetatile 1, 10, 579, 1
-	setmetatile 2, 10, 580, 1
-	setmetatile 4, 15, 571, 0
-	setmetatile 5, 15, 572, 0
-	setmetatile 4, 16, 579, 1
-	setmetatile 5, 16, 580, 1
-	setmetatile 13, 9, 571, 0
-	setmetatile 14, 9, 572, 0
-	setmetatile 13, 10, 579, 1
-	setmetatile 14, 10, 580, 1
-	setmetatile 13, 15, 571, 0
-	setmetatile 14, 15, 572, 0
-	setmetatile 13, 16, 579, 1
-	setmetatile 14, 16, 580, 1
-	setmetatile 3, 7, 573, 1
-	setmetatile 3, 8, 581, 1
-	setmetatile 3, 13, 573, 1
-	setmetatile 3, 14, 581, 1
-	setmetatile 6, 4, 573, 1
-	setmetatile 6, 5, 581, 1
-	setmetatile 9, 16, 573, 1
-	setmetatile 9, 17, 581, 1
-	setmetatile 12, 7, 573, 1
-	setmetatile 12, 8, 581, 1
-	setmetatile 1, 3, 584, 0
-	setmetatile 2, 3, 585, 0
-	setmetatile 1, 4, 592, 0
-	setmetatile 2, 4, 593, 0
-	setmetatile 1, 12, 584, 0
-	setmetatile 2, 12, 585, 0
-	setmetatile 1, 13, 592, 0
-	setmetatile 2, 13, 593, 0
-	setmetatile 4, 6, 584, 0
-	setmetatile 5, 6, 585, 0
-	setmetatile 4, 7, 592, 0
-	setmetatile 5, 7, 593, 0
-	setmetatile 4, 12, 584, 0
-	setmetatile 5, 12, 585, 0
-	setmetatile 4, 13, 592, 0
-	setmetatile 5, 13, 593, 0
-	setmetatile 4, 18, 584, 0
-	setmetatile 5, 18, 585, 0
-	setmetatile 4, 19, 592, 0
-	setmetatile 5, 19, 593, 0
-	setmetatile 7, 9, 584, 0
-	setmetatile 8, 9, 585, 0
-	setmetatile 7, 10, 592, 0
-	setmetatile 8, 10, 593, 0
-	setmetatile 10, 6, 584, 0
-	setmetatile 11, 6, 585, 0
-	setmetatile 10, 7, 592, 0
-	setmetatile 11, 7, 593, 0
-	setmetatile 10, 12, 584, 0
-	setmetatile 11, 12, 585, 0
-	setmetatile 10, 13, 592, 0
-	setmetatile 11, 13, 593, 0
-	setmetatile 10, 18, 584, 0
-	setmetatile 11, 18, 585, 0
-	setmetatile 10, 19, 592, 0
-	setmetatile 11, 19, 593, 0
-	setmetatile 13, 3, 584, 0
-	setmetatile 14, 3, 585, 0
-	setmetatile 13, 4, 592, 0
-	setmetatile 14, 4, 593, 0
-	setmetatile 3, 16, 586, 1
-	setmetatile 3, 17, 594, 0
-	setmetatile 9, 4, 586, 1
-	setmetatile 9, 5, 594, 0
+	setmetatile 1, 6, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile0, 0
+	setmetatile 2, 6, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile1, 0
+	setmetatile 1, 7, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile2, 1
+	setmetatile 2, 7, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile3, 1
+	setmetatile 1, 9, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile0, 0
+	setmetatile 2, 9, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile1, 0
+	setmetatile 1, 10, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile2, 1
+	setmetatile 2, 10, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile3, 1
+	setmetatile 4, 15, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile0, 0
+	setmetatile 5, 15, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile1, 0
+	setmetatile 4, 16, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile2, 1
+	setmetatile 5, 16, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile3, 1
+	setmetatile 13, 9, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile0, 0
+	setmetatile 14, 9, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile1, 0
+	setmetatile 13, 10, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile2, 1
+	setmetatile 14, 10, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile3, 1
+	setmetatile 13, 15, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile0, 0
+	setmetatile 14, 15, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile1, 0
+	setmetatile 13, 16, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile2, 1
+	setmetatile 14, 16, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile3, 1
+	setmetatile 3, 7, METATILE_TrickHousePuzzle_BlueDoorV_Open0, 1
+	setmetatile 3, 8, METATILE_TrickHousePuzzle_BlueDoorV_Open1, 1
+	setmetatile 3, 13, METATILE_TrickHousePuzzle_BlueDoorV_Open0, 1
+	setmetatile 3, 14, METATILE_TrickHousePuzzle_BlueDoorV_Open1, 1
+	setmetatile 6, 4, METATILE_TrickHousePuzzle_BlueDoorV_Open0, 1
+	setmetatile 6, 5, METATILE_TrickHousePuzzle_BlueDoorV_Open1, 1
+	setmetatile 9, 16, METATILE_TrickHousePuzzle_BlueDoorV_Open0, 1
+	setmetatile 9, 17, METATILE_TrickHousePuzzle_BlueDoorV_Open1, 1
+	setmetatile 12, 7, METATILE_TrickHousePuzzle_BlueDoorV_Open0, 1
+	setmetatile 12, 8, METATILE_TrickHousePuzzle_BlueDoorV_Open1, 1
+	setmetatile 1, 3, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile0, 0
+	setmetatile 2, 3, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile1, 0
+	setmetatile 1, 4, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile2, 0
+	setmetatile 2, 4, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile3, 0
+	setmetatile 1, 12, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile0, 0
+	setmetatile 2, 12, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile1, 0
+	setmetatile 1, 13, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile2, 0
+	setmetatile 2, 13, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile3, 0
+	setmetatile 4, 6, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile0, 0
+	setmetatile 5, 6, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile1, 0
+	setmetatile 4, 7, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile2, 0
+	setmetatile 5, 7, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile3, 0
+	setmetatile 4, 12, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile0, 0
+	setmetatile 5, 12, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile1, 0
+	setmetatile 4, 13, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile2, 0
+	setmetatile 5, 13, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile3, 0
+	setmetatile 4, 18, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile0, 0
+	setmetatile 5, 18, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile1, 0
+	setmetatile 4, 19, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile2, 0
+	setmetatile 5, 19, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile3, 0
+	setmetatile 7, 9, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile0, 0
+	setmetatile 8, 9, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile1, 0
+	setmetatile 7, 10, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile2, 0
+	setmetatile 8, 10, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile3, 0
+	setmetatile 10, 6, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile0, 0
+	setmetatile 11, 6, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile1, 0
+	setmetatile 10, 7, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile2, 0
+	setmetatile 11, 7, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile3, 0
+	setmetatile 10, 12, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile0, 0
+	setmetatile 11, 12, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile1, 0
+	setmetatile 10, 13, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile2, 0
+	setmetatile 11, 13, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile3, 0
+	setmetatile 10, 18, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile0, 0
+	setmetatile 11, 18, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile1, 0
+	setmetatile 10, 19, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile2, 0
+	setmetatile 11, 19, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile3, 0
+	setmetatile 13, 3, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile0, 0
+	setmetatile 14, 3, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile1, 0
+	setmetatile 13, 4, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile2, 0
+	setmetatile 14, 4, METATILE_TrickHousePuzzle_RedDoorH_Open_Tile3, 0
+	setmetatile 3, 16, METATILE_TrickHousePuzzle_RedDoorV_Retracted, 1
+	setmetatile 3, 17, METATILE_TrickHousePuzzle_Floor_ShadowTop_Alt, 0
+	setmetatile 9, 4, METATILE_TrickHousePuzzle_RedDoorV_Retracted, 1
+	setmetatile 9, 5, METATILE_TrickHousePuzzle_Floor_ShadowTop_Alt, 0
 	return
 
 Route110_TrickHousePuzzle3_EventScript_26C4CD:: @ 826C4CD
diff --git a/data/maps/Route110_TrickHousePuzzle7/scripts.inc b/data/maps/Route110_TrickHousePuzzle7/scripts.inc
index 27177ed22..db651d8ce 100644
--- a/data/maps/Route110_TrickHousePuzzle7/scripts.inc
+++ b/data/maps/Route110_TrickHousePuzzle7/scripts.inc
@@ -18,53 +18,53 @@ Route110_TrickHousePuzzle7_EventScript_26E0AC:: @ 826E0AC
 	return
 
 Route110_TrickHousePuzzle7_EventScript_26E0DA:: @ 826E0DA
-	setmetatile 13, 17, 610, 0
-	setmetatile 12, 16, 575, 1
+	setmetatile 13, 17, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Up, 0
+	setmetatile 12, 16, METATILE_TrickHousePuzzle_Lever_On, 1
 	return
 
 Route110_TrickHousePuzzle7_EventScript_26E0ED:: @ 826E0ED
-	setmetatile 12, 13, 610, 0
-	setmetatile 12, 11, 575, 1
+	setmetatile 12, 13, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Up, 0
+	setmetatile 12, 11, METATILE_TrickHousePuzzle_Lever_On, 1
 	return
 
 Route110_TrickHousePuzzle7_EventScript_26E100:: @ 826E100
-	setmetatile 7, 12, 610, 0
-	setmetatile 5, 10, 575, 1
+	setmetatile 7, 12, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Up, 0
+	setmetatile 5, 10, METATILE_TrickHousePuzzle_Lever_On, 1
 	return
 
 Route110_TrickHousePuzzle7_EventScript_26E113:: @ 826E113
-	setmetatile 6, 6, 636, 0
-	setmetatile 4, 4, 575, 1
+	setmetatile 6, 6, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Right_Alt, 0
+	setmetatile 4, 4, METATILE_TrickHousePuzzle_Lever_On, 1
 	return
 
 Route110_TrickHousePuzzle7_EventScript_26E126:: @ 826E126
-	setmetatile 8, 4, 609, 0
-	setmetatile 7, 5, 575, 1
+	setmetatile 8, 4, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Left, 0
+	setmetatile 7, 5, METATILE_TrickHousePuzzle_Lever_On, 1
 	return
 
 Route110_TrickHousePuzzle7_EventScript_26E139:: @ 826E139
-	setmetatile 13, 17, 611, 0
-	setmetatile 12, 16, 574, 1
+	setmetatile 13, 17, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Down, 0
+	setmetatile 12, 16, METATILE_TrickHousePuzzle_Lever_Off, 1
 	return
 
 Route110_TrickHousePuzzle7_EventScript_26E14C:: @ 826E14C
-	setmetatile 12, 13, 609, 0
-	setmetatile 12, 11, 574, 1
+	setmetatile 12, 13, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Left, 0
+	setmetatile 12, 11, METATILE_TrickHousePuzzle_Lever_Off, 1
 	return
 
 Route110_TrickHousePuzzle7_EventScript_26E15F:: @ 826E15F
-	setmetatile 7, 12, 611, 0
-	setmetatile 5, 10, 574, 1
+	setmetatile 7, 12, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Down, 0
+	setmetatile 5, 10, METATILE_TrickHousePuzzle_Lever_Off, 1
 	return
 
 Route110_TrickHousePuzzle7_EventScript_26E172:: @ 826E172
-	setmetatile 6, 6, 635, 0
-	setmetatile 4, 4, 574, 1
+	setmetatile 6, 6, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Left_Alt, 0
+	setmetatile 4, 4, METATILE_TrickHousePuzzle_Lever_Off, 1
 	return
 
 Route110_TrickHousePuzzle7_EventScript_26E185:: @ 826E185
-	setmetatile 8, 4, 608, 0
-	setmetatile 7, 5, 574, 1
+	setmetatile 8, 4, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Right, 0
+	setmetatile 7, 5, METATILE_TrickHousePuzzle_Lever_Off, 1
 	return
 
 Route110_TrickHousePuzzle7_OnTransition: @ 826E198
diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc
index 8371071da..bf79c5eee 100644
--- a/data/maps/Route111/scripts.inc
+++ b/data/maps/Route111/scripts.inc
@@ -12,29 +12,29 @@ Route111_MapScript1_1F0CBC: @ 81F0CBC
 	end
 
 Route111_EventScript_1F0CD1:: @ 81F0CD1
-	setmetatile 29, 86, 124, 1
-	setmetatile 29, 87, 145, 1
+	setmetatile 29, 86, METATILE_General_RockWall_RockBase, 1
+	setmetatile 29, 87, METATILE_General_RockWall_SandBase, 1
 	return
 
 Route111_EventScript_1F0CE4:: @ 81F0CE4
-	setmetatile 18, 53, 984, 0
-	setmetatile 19, 53, 985, 0
-	setmetatile 20, 53, 986, 0
-	setmetatile 18, 54, 992, 0
-	setmetatile 19, 54, 993, 0
-	setmetatile 20, 54, 994, 0
-	setmetatile 18, 55, 1000, 0
-	setmetatile 19, 55, 1001, 0
-	setmetatile 20, 55, 1002, 0
-	setmetatile 18, 56, 1008, 0
-	setmetatile 19, 56, 1009, 0
-	setmetatile 20, 56, 1010, 0
-	setmetatile 18, 57, 987, 0
-	setmetatile 19, 57, 988, 0
-	setmetatile 20, 57, 989, 0
-	setmetatile 18, 58, 995, 0
-	setmetatile 19, 58, 996, 0
-	setmetatile 20, 58, 997, 0
+	setmetatile 18, 53, METATILE_Mauville_MirageTower_Tile0, 0
+	setmetatile 19, 53, METATILE_Mauville_MirageTower_Tile1, 0
+	setmetatile 20, 53, METATILE_Mauville_MirageTower_Tile2, 0
+	setmetatile 18, 54, METATILE_Mauville_MirageTower_Tile3, 0
+	setmetatile 19, 54, METATILE_Mauville_MirageTower_Tile4, 0
+	setmetatile 20, 54, METATILE_Mauville_MirageTower_Tile5, 0
+	setmetatile 18, 55, METATILE_Mauville_MirageTower_Tile6, 0
+	setmetatile 19, 55, METATILE_Mauville_MirageTower_Tile7, 0
+	setmetatile 20, 55, METATILE_Mauville_MirageTower_Tile8, 0
+	setmetatile 18, 56, METATILE_Mauville_MirageTower_Tile9, 0
+	setmetatile 19, 56, METATILE_Mauville_MirageTower_TileA, 0
+	setmetatile 20, 56, METATILE_Mauville_MirageTower_TileB, 0
+	setmetatile 18, 57, METATILE_Mauville_MirageTower_TileC, 0
+	setmetatile 19, 57, METATILE_Mauville_MirageTower_TileD, 0
+	setmetatile 20, 57, METATILE_Mauville_MirageTower_TileE, 0
+	setmetatile 18, 58, METATILE_Mauville_MirageTower_TileF, 0
+	setmetatile 19, 58, METATILE_Mauville_MirageTower_Tile10, 0
+	setmetatile 20, 58, METATILE_Mauville_MirageTower_Tile11, 0
 	return
 
 Route111_OnTransition: @ 81F0D87
diff --git a/data/maps/Route114_FossilManiacsTunnel/scripts.inc b/data/maps/Route114_FossilManiacsTunnel/scripts.inc
index 8cfd754a3..3de7350ac 100644
--- a/data/maps/Route114_FossilManiacsTunnel/scripts.inc
+++ b/data/maps/Route114_FossilManiacsTunnel/scripts.inc
@@ -17,8 +17,8 @@ Route114_FossilManiacsTunnel_MapScript1_22AF49: @ 822AF49
 	end
 
 Route114_FossilManiacsTunnel_EventScript_22AF53:: @ 822AF53
-	setmetatile 6, 1, 617, 1
-	setmetatile 6, 2, 617, 1
+	setmetatile 6, 1, METATILE_Fallarbor_RedRockWall, 1
+	setmetatile 6, 2, METATILE_Fallarbor_RedRockWall, 1
 	return
 
 Route114_FossilManiacsTunnel_EventScript_22AF66:: @ 822AF66
diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc
index 1268b9965..fdd302fdb 100644
--- a/data/maps/Route120/scripts.inc
+++ b/data/maps/Route120/scripts.inc
@@ -45,15 +45,15 @@ Route120_MapScript1_1F5474: @ 81F5474
 	end
 
 Route120_EventScript_1F5490:: @ 81F5490
-	setmetatile 7, 54, 124, 1
-	setmetatile 7, 55, 145, 1
+	setmetatile 7, 54, METATILE_General_RockWall_RockBase, 1
+	setmetatile 7, 55, METATILE_General_RockWall_SandBase, 1
 	return
 
 Route120_EventScript_1F54A3:: @ 81F54A3
-	setmetatile 13, 15, 663, 0
-	setmetatile 12, 16, 671, 0
-	setmetatile 12, 17, 161, 0
-	setmetatile 13, 17, 161, 0
+	setmetatile 13, 15, METATILE_Fortree_WoodBridge_Kecleon0, 0
+	setmetatile 12, 16, METATILE_Fortree_WoodBridge_Kecleon1, 0
+	setmetatile 12, 17, METATILE_General_ReflectiveWater, 0
+	setmetatile 13, 17, METATILE_General_ReflectiveWater, 0
 	return
 
 Route120_EventScript_1F54C8:: @ 81F54C8
@@ -249,10 +249,10 @@ Route120_EventScript_1F572C:: @ 81F572C
 	delay 15
 	removeobject 31
 	waitfieldeffect FLDEFF_NPCFLY_OUT
-	setmetatile 13, 15, 663, 0
-	setmetatile 12, 16, 671, 0
-	setmetatile 12, 17, 161, 0
-	setmetatile 13, 17, 161, 0
+	setmetatile 13, 15, METATILE_Fortree_WoodBridge_Kecleon0, 0
+	setmetatile 12, 16, METATILE_Fortree_WoodBridge_Kecleon1, 0
+	setmetatile 12, 17, METATILE_General_ReflectiveWater, 0
+	setmetatile 13, 17, METATILE_General_ReflectiveWater, 0
 	special DrawWholeMapView
 	release
 	end
diff --git a/data/maps/SealedChamber_OuterRoom/scripts.inc b/data/maps/SealedChamber_OuterRoom/scripts.inc
index 30228fda0..865be8963 100644
--- a/data/maps/SealedChamber_OuterRoom/scripts.inc
+++ b/data/maps/SealedChamber_OuterRoom/scripts.inc
@@ -18,12 +18,12 @@ SealedChamber_OuterRoom_MapScript1_23912B: @ 823912B
 	end
 
 SealedChamber_OuterRoom_EventScript_239135:: @ 8239135
-	setmetatile 9, 1, 553, 1
-	setmetatile 10, 1, 553, 1
-	setmetatile 11, 1, 553, 1
-	setmetatile 9, 2, 565, 1
-	setmetatile 10, 2, 565, 1
-	setmetatile 11, 2, 565, 1
+	setmetatile 9, 1, METATILE_Cave_EntranceCover, 1
+	setmetatile 10, 1, METATILE_Cave_EntranceCover, 1
+	setmetatile 11, 1, METATILE_Cave_EntranceCover, 1
+	setmetatile 9, 2, METATILE_Cave_SealedChamberBraille_Mid, 1
+	setmetatile 10, 2, METATILE_Cave_SealedChamberBraille_Mid, 1
+	setmetatile 11, 2, METATILE_Cave_SealedChamberBraille_Mid, 1
 	return
 
 SealedChamber_OuterRoom_EventScript_23916C:: @ 823916C
diff --git a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc
index 300d06317..c7f296319 100644
--- a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc
+++ b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc
@@ -22,38 +22,38 @@ ShoalCave_LowTideInnerRoom_MapScript1_236F16: @ 8236F16
 ShoalCave_LowTideInnerRoom_EventScript_236F1C:: @ 8236F1C
 	goto_if_set FLAG_RECEIVED_SHOAL_SALT_1, ShoalCave_LowTideInnerRoom_EventScript_236F3D
 	goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_236F3D
-	setmetatile 31, 8, 856, 1
+	setmetatile 31, 8, METATILE_Cave_ShoalCave_DirtPile_Large, 1
 	goto ShoalCave_LowTideInnerRoom_EventScript_236F3D
 	end
 
 ShoalCave_LowTideInnerRoom_EventScript_236F3D:: @ 8236F3D
 	goto_if_set FLAG_RECEIVED_SHOAL_SALT_2, ShoalCave_LowTideInnerRoom_EventScript_236F5E
 	goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_236F5E
-	setmetatile 14, 26, 856, 1
+	setmetatile 14, 26, METATILE_Cave_ShoalCave_DirtPile_Large, 1
 	goto ShoalCave_LowTideInnerRoom_EventScript_236F5E
 	end
 
 ShoalCave_LowTideInnerRoom_EventScript_236F5E:: @ 8236F5E
 	goto_if_set FLAG_RECEIVED_SHOAL_SHELL_1, ShoalCave_LowTideInnerRoom_EventScript_236F76
-	setmetatile 41, 20, 857, 1
+	setmetatile 41, 20, METATILE_Cave_ShoalCave_BlueStone_Large, 1
 	goto ShoalCave_LowTideInnerRoom_EventScript_236F76
 	end
 
 ShoalCave_LowTideInnerRoom_EventScript_236F76:: @ 8236F76
 	goto_if_set FLAG_RECEIVED_SHOAL_SHELL_2, ShoalCave_LowTideInnerRoom_EventScript_236F8E
-	setmetatile 41, 10, 857, 1
+	setmetatile 41, 10, METATILE_Cave_ShoalCave_BlueStone_Large, 1
 	goto ShoalCave_LowTideInnerRoom_EventScript_236F8E
 	end
 
 ShoalCave_LowTideInnerRoom_EventScript_236F8E:: @ 8236F8E
 	goto_if_set FLAG_RECEIVED_SHOAL_SHELL_3, ShoalCave_LowTideInnerRoom_EventScript_236FA6
-	setmetatile 6, 9, 857, 1
+	setmetatile 6, 9, METATILE_Cave_ShoalCave_BlueStone_Large, 1
 	goto ShoalCave_LowTideInnerRoom_EventScript_236FA6
 	end
 
 ShoalCave_LowTideInnerRoom_EventScript_236FA6:: @ 8236FA6
 	goto_if_set FLAG_RECEIVED_SHOAL_SHELL_4, ShoalCave_LowTideInnerRoom_EventScript_236FB9
-	setmetatile 16, 13, 857, 1
+	setmetatile 16, 13, METATILE_Cave_ShoalCave_BlueStone_Large, 1
 	return
 
 ShoalCave_LowTideInnerRoom_EventScript_236FB9:: @ 8236FB9
@@ -65,7 +65,7 @@ ShoalCave_LowTideInnerRoom_EventScript_236FBA:: @ 8236FBA
 	giveitem_std ITEM_SHOAL_SHELL
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_ShowBagIsFull
-	setmetatile 41, 20, 859, 0
+	setmetatile 41, 20, METATILE_Cave_ShoalCave_BlueStone_Small, 0
 	special DrawWholeMapView
 	setflag FLAG_RECEIVED_SHOAL_SHELL_1
 	releaseall
@@ -82,7 +82,7 @@ ShoalCave_LowTideInnerRoom_EventScript_236FF6:: @ 8236FF6
 	giveitem_std ITEM_SHOAL_SHELL
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_ShowBagIsFull
-	setmetatile 41, 10, 859, 0
+	setmetatile 41, 10, METATILE_Cave_ShoalCave_BlueStone_Small, 0
 	special DrawWholeMapView
 	setflag FLAG_RECEIVED_SHOAL_SHELL_2
 	releaseall
@@ -94,7 +94,7 @@ ShoalCave_LowTideInnerRoom_EventScript_237028:: @ 8237028
 	giveitem_std ITEM_SHOAL_SHELL
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_ShowBagIsFull
-	setmetatile 6, 9, 859, 0
+	setmetatile 6, 9, METATILE_Cave_ShoalCave_BlueStone_Small, 0
 	special DrawWholeMapView
 	setflag FLAG_RECEIVED_SHOAL_SHELL_3
 	releaseall
@@ -106,7 +106,7 @@ ShoalCave_LowTideInnerRoom_EventScript_23705A:: @ 823705A
 	giveitem_std ITEM_SHOAL_SHELL
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_ShowBagIsFull
-	setmetatile 16, 13, 859, 0
+	setmetatile 16, 13, METATILE_Cave_ShoalCave_BlueStone_Small, 0
 	special DrawWholeMapView
 	setflag FLAG_RECEIVED_SHOAL_SHELL_4
 	releaseall
@@ -118,7 +118,7 @@ ShoalCave_LowTideInnerRoom_EventScript_23708C:: @ 823708C
 	giveitem_std ITEM_SHOAL_SALT
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_ShowBagIsFull
-	setmetatile 31, 8, 858, 0
+	setmetatile 31, 8, METATILE_Cave_ShoalCave_DirtPile_Small, 0
 	special DrawWholeMapView
 	setflag FLAG_RECEIVED_SHOAL_SALT_1
 	releaseall
@@ -135,7 +135,7 @@ ShoalCave_LowTideInnerRoom_EventScript_2370C8:: @ 82370C8
 	giveitem_std ITEM_SHOAL_SALT
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_ShowBagIsFull
-	setmetatile 14, 26, 858, 0
+	setmetatile 14, 26, METATILE_Cave_ShoalCave_DirtPile_Small, 0
 	special DrawWholeMapView
 	setflag FLAG_RECEIVED_SHOAL_SALT_2
 	releaseall
diff --git a/data/maps/SkyPillar_Outside/scripts.inc b/data/maps/SkyPillar_Outside/scripts.inc
index ffc581fd4..9ff7dd01e 100644
--- a/data/maps/SkyPillar_Outside/scripts.inc
+++ b/data/maps/SkyPillar_Outside/scripts.inc
@@ -24,8 +24,8 @@ SkyPillar_Outside_MapScript1_2392DD: @ 82392DD
 	end
 
 SkyPillar_Outside_EventScript_2392E7:: @ 82392E7
-	setmetatile 14, 4, 682, 0
-	setmetatile 14, 5, 690, 0
+	setmetatile 14, 4, METATILE_Pacifidlog_SkyPillar_DoorOpen_Top, 0
+	setmetatile 14, 5, METATILE_Pacifidlog_SkyPillar_DoorOpen_Bottom, 0
 	return
 
 SkyPillar_Outside_MapScript2_2392FA: @ 82392FA
diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc
index afad44536..ca562a87c 100644
--- a/data/maps/SootopolisCity/scripts.inc
+++ b/data/maps/SootopolisCity/scripts.inc
@@ -16,19 +16,19 @@ SootopolisCity_EventScript_1E5692:: @ 81E5692
 	end
 
 SootopolisCity_EventScript_1E5693:: @ 81E5693
-	setmetatile 9, 6, 584, 1
-	setmetatile 9, 17, 584, 1
-	setmetatile 9, 26, 584, 1
-	setmetatile 44, 17, 584, 1
-	setmetatile 8, 35, 584, 1
-	setmetatile 53, 28, 584, 1
-	setmetatile 45, 6, 584, 1
-	setmetatile 48, 25, 584, 1
-	setmetatile 51, 36, 584, 1
+	setmetatile 9, 6, METATILE_Sootopolis_Door_Closed, 1
+	setmetatile 9, 17, METATILE_Sootopolis_Door_Closed, 1
+	setmetatile 9, 26, METATILE_Sootopolis_Door_Closed, 1
+	setmetatile 44, 17, METATILE_Sootopolis_Door_Closed, 1
+	setmetatile 8, 35, METATILE_Sootopolis_Door_Closed, 1
+	setmetatile 53, 28, METATILE_Sootopolis_Door_Closed, 1
+	setmetatile 45, 6, METATILE_Sootopolis_Door_Closed, 1
+	setmetatile 48, 25, METATILE_Sootopolis_Door_Closed, 1
+	setmetatile 51, 36, METATILE_Sootopolis_Door_Closed, 1
 	return
 
 SootopolisCity_EventScript_1E56E5:: @ 81E56E5
-	setmetatile 31, 32, 592, 1
+	setmetatile 31, 32, METATILE_Sootopolis_GymDoor_Closed, 1
 	return
 
 SootopolisCity_OnTransition: @ 81E56EF
@@ -603,30 +603,30 @@ SootopolisCity_EventScript_1E5CCE:: @ 81E5CCE
 	end
 
 SootopolisCity_EventScript_1E5D82:: @ 81E5D82
-	setmetatile 27, 43, 656, 0
-	setmetatile 28, 43, 656, 0
-	setmetatile 29, 43, 656, 0
-	setmetatile 30, 43, 656, 0
-	setmetatile 27, 44, 656, 0
-	setmetatile 28, 44, 656, 0
-	setmetatile 29, 44, 656, 0
-	setmetatile 30, 44, 656, 0
-	setmetatile 27, 45, 656, 0
-	setmetatile 28, 45, 656, 0
-	setmetatile 29, 45, 656, 0
-	setmetatile 30, 45, 656, 0
-	setmetatile 32, 43, 656, 0
-	setmetatile 33, 43, 656, 0
-	setmetatile 34, 43, 656, 0
-	setmetatile 35, 43, 656, 0
-	setmetatile 32, 44, 656, 0
-	setmetatile 33, 44, 656, 0
-	setmetatile 34, 44, 656, 0
-	setmetatile 35, 44, 656, 0
-	setmetatile 32, 45, 656, 0
-	setmetatile 33, 45, 656, 0
-	setmetatile 34, 45, 656, 0
-	setmetatile 35, 45, 656, 0
+	setmetatile 27, 43, METATILE_Sootopolis_RoughWater, 0
+	setmetatile 28, 43, METATILE_Sootopolis_RoughWater, 0
+	setmetatile 29, 43, METATILE_Sootopolis_RoughWater, 0
+	setmetatile 30, 43, METATILE_Sootopolis_RoughWater, 0
+	setmetatile 27, 44, METATILE_Sootopolis_RoughWater, 0
+	setmetatile 28, 44, METATILE_Sootopolis_RoughWater, 0
+	setmetatile 29, 44, METATILE_Sootopolis_RoughWater, 0
+	setmetatile 30, 44, METATILE_Sootopolis_RoughWater, 0
+	setmetatile 27, 45, METATILE_Sootopolis_RoughWater, 0
+	setmetatile 28, 45, METATILE_Sootopolis_RoughWater, 0
+	setmetatile 29, 45, METATILE_Sootopolis_RoughWater, 0
+	setmetatile 30, 45, METATILE_Sootopolis_RoughWater, 0
+	setmetatile 32, 43, METATILE_Sootopolis_RoughWater, 0
+	setmetatile 33, 43, METATILE_Sootopolis_RoughWater, 0
+	setmetatile 34, 43, METATILE_Sootopolis_RoughWater, 0
+	setmetatile 35, 43, METATILE_Sootopolis_RoughWater, 0
+	setmetatile 32, 44, METATILE_Sootopolis_RoughWater, 0
+	setmetatile 33, 44, METATILE_Sootopolis_RoughWater, 0
+	setmetatile 34, 44, METATILE_Sootopolis_RoughWater, 0
+	setmetatile 35, 44, METATILE_Sootopolis_RoughWater, 0
+	setmetatile 32, 45, METATILE_Sootopolis_RoughWater, 0
+	setmetatile 33, 45, METATILE_Sootopolis_RoughWater, 0
+	setmetatile 34, 45, METATILE_Sootopolis_RoughWater, 0
+	setmetatile 35, 45, METATILE_Sootopolis_RoughWater, 0
 	return
 
 SootopolisCity_Movement_1E5E5B: @ 81E5E5B
diff --git a/data/maps/SootopolisCity_Gym_1F/scripts.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc
index e9b5d327f..2991cc482 100644
--- a/data/maps/SootopolisCity_Gym_1F/scripts.inc
+++ b/data/maps/SootopolisCity_Gym_1F/scripts.inc
@@ -25,16 +25,16 @@ SootopolisCity_Gym_1F_EventScript_224E73:: @ 8224E73
 	goto_if_lt SootopolisCity_Gym_1F_EventScript_224EB8
 	compare VAR_ICE_STEP_COUNT, 67
 	goto_if_lt SootopolisCity_Gym_1F_EventScript_224EA6
-	setmetatile 8, 4, 519, 0
-	setmetatile 8, 5, 519, 0
+	setmetatile 8, 4, METATILE_SootopolisGym_Stairs, 0
+	setmetatile 8, 5, METATILE_SootopolisGym_Stairs, 0
 
 SootopolisCity_Gym_1F_EventScript_224EA6:: @ 8224EA6
-	setmetatile 8, 10, 519, 0
-	setmetatile 8, 11, 519, 0
+	setmetatile 8, 10, METATILE_SootopolisGym_Stairs, 0
+	setmetatile 8, 11, METATILE_SootopolisGym_Stairs, 0
 
 SootopolisCity_Gym_1F_EventScript_224EB8:: @ 8224EB8
-	setmetatile 8, 15, 519, 0
-	setmetatile 8, 16, 519, 0
+	setmetatile 8, 15, METATILE_SootopolisGym_Stairs, 0
+	setmetatile 8, 16, METATILE_SootopolisGym_Stairs, 0
 
 SootopolisCity_Gym_1F_EventScript_224ECA:: @ 8224ECA
 	return
diff --git a/data/maps/TrainerHill_Entrance/scripts.inc b/data/maps/TrainerHill_Entrance/scripts.inc
index 60dc2149a..5be00aa9d 100644
--- a/data/maps/TrainerHill_Entrance/scripts.inc
+++ b/data/maps/TrainerHill_Entrance/scripts.inc
@@ -50,7 +50,7 @@ TrainerHill_Entrance_MapScript1_268128: @ 8268128
 	end
 
 TrainerHill_Entrance_EventScript_268134:: @ 8268134
-	setmetatile 17, 10, 775, 0
+	setmetatile 17, 10, METATILE_TrainerHill_GreenFloorTile, 0
 	return
 
 TrainerHill_Entrance_MapScript2_26813E: @ 826813E
@@ -64,7 +64,7 @@ TrainerHill_Entrance_EventScript_268160:: @ 8268160
 	lockall
 	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_268385
 	waitmovement 0
-	setmetatile 17, 10, 820, 1
+	setmetatile 17, 10, METATILE_TrainerHill_CounterDoor, 1
 	special DrawWholeMapView
 	playse SE_TK_KASYA
 	waitse
diff --git a/data/maps/Underwater_SeafloorCavern/scripts.inc b/data/maps/Underwater_SeafloorCavern/scripts.inc
index 3e7c1e22c..ca94964cf 100644
--- a/data/maps/Underwater_SeafloorCavern/scripts.inc
+++ b/data/maps/Underwater_SeafloorCavern/scripts.inc
@@ -18,18 +18,18 @@ Underwater_SeafloorCavern_MapScript1_23435C: @ 823435C
 	end
 
 Underwater_SeafloorCavern_EventScript_234366:: @ 8234366
-	setmetatile 5, 3, 542, 1
-	setmetatile 6, 3, 542, 1
-	setmetatile 7, 3, 542, 1
-	setmetatile 8, 3, 542, 1
-	setmetatile 5, 4, 552, 0
-	setmetatile 6, 4, 552, 0
-	setmetatile 7, 4, 552, 0
-	setmetatile 8, 4, 552, 0
-	setmetatile 5, 5, 552, 0
-	setmetatile 6, 5, 552, 0
-	setmetatile 7, 5, 552, 0
-	setmetatile 8, 5, 552, 0
+	setmetatile 5, 3, METATILE_Underwater_RockWall, 1
+	setmetatile 6, 3, METATILE_Underwater_RockWall, 1
+	setmetatile 7, 3, METATILE_Underwater_RockWall, 1
+	setmetatile 8, 3, METATILE_Underwater_RockWall, 1
+	setmetatile 5, 4, METATILE_Underwater_FloorShadow, 0
+	setmetatile 6, 4, METATILE_Underwater_FloorShadow, 0
+	setmetatile 7, 4, METATILE_Underwater_FloorShadow, 0
+	setmetatile 8, 4, METATILE_Underwater_FloorShadow, 0
+	setmetatile 5, 5, METATILE_Underwater_FloorShadow, 0
+	setmetatile 6, 5, METATILE_Underwater_FloorShadow, 0
+	setmetatile 7, 5, METATILE_Underwater_FloorShadow, 0
+	setmetatile 8, 5, METATILE_Underwater_FloorShadow, 0
 	return
 
 Underwater_SeafloorCavern_MapScript1_2343D3: @ 82343D3
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index fe3fa9fae..eeecf2d75 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -1390,34 +1390,34 @@ EventScript_277BB4:: @ 8277BB4
 	end
 
 OldaleTown_PokemonCenter_2F_EventScript_277BBE:: @ 8277BBE
-	setmetatile 5, 2, 732, 0
-	setmetatile 5, 3, 740, 0
+	setmetatile 5, 2, METATILE_PokemonCenter_Floor_ShadowTop_Alt, 0
+	setmetatile 5, 3, METATILE_PokemonCenter_Floor_Plain_Alt, 0
 	return
 
 OldaleTown_PokemonCenter_2F_EventScript_277BD1:: @ 8277BD1
-	setmetatile 5, 2, 542, 1
-	setmetatile 5, 3, 605, 1
+	setmetatile 5, 2, METATILE_PokemonCenter_Floor_ShadowTop, 1
+	setmetatile 5, 3, METATILE_PokemonCenter_CounterBarrier, 1
 	return
 
 OldaleTown_PokemonCenter_2F_EventScript_277BE4:: @ 8277BE4
-	setmetatile 9, 2, 732, 0
-	setmetatile 9, 3, 740, 0
+	setmetatile 9, 2, METATILE_PokemonCenter_Floor_ShadowTop_Alt, 0
+	setmetatile 9, 3, METATILE_PokemonCenter_Floor_Plain_Alt, 0
 	return
 
 OldaleTown_PokemonCenter_2F_EventScript_277BF7:: @ 8277BF7
-	setmetatile 9, 2, 542, 1
-	setmetatile 9, 3, 605, 1
+	setmetatile 9, 2, METATILE_PokemonCenter_Floor_ShadowTop, 1
+	setmetatile 9, 3, METATILE_PokemonCenter_CounterBarrier, 1
 	return
 
 MossdeepCity_GameCorner_1F_EventScript_277C0A:: @ 8277C0A
 OldaleTown_PokemonCenter_2F_EventScript_277C0A:: @ 8277C0A
-	setmetatile 5, 2, 556, 0
-	setmetatile 5, 3, 564, 0
+	setmetatile 5, 2, METATILE_MossdeepGameCorner_CounterOpen_Top, 0
+	setmetatile 5, 3, METATILE_MossdeepGameCorner_CounterOpen_Bottom, 0
 	return
 
 OldaleTown_PokemonCenter_2F_EventScript_277C1D:: @ 8277C1D
-	setmetatile 5, 2, 554, 1
-	setmetatile 5, 3, 562, 1
+	setmetatile 5, 2, METATILE_MossdeepGameCorner_CounterClosed_Top, 1
+	setmetatile 5, 3, METATILE_MossdeepGameCorner_CounterClosed_Bottom, 1
 	return
 
 BattleFrontier_PokemonCenter_1F_MapScript1_277C30: @ 8277C30
diff --git a/include/constants/metatile_labels.h b/include/constants/metatile_labels.h
index a3786533d..432d9de97 100644
--- a/include/constants/metatile_labels.h
+++ b/include/constants/metatile_labels.h
@@ -20,9 +20,11 @@
 #define METATILE_General_CaveEntrance_Bottom 0x0A7
 #define METATILE_General_RockWall_GrassBase  0x079
 #define METATILE_General_RockWall_RockBase   0x07C
+#define METATILE_General_RockWall_SandBase   0x091
 #define METATILE_General_CalmWater           0x170
 #define METATILE_General_RoughWater          0x14E
 #define METATILE_General_RoughDeepWater      0x14F
+#define METATILE_General_ReflectiveWater     0x0A1
 
 // gTileset_Building
 #define METATILE_Building_PC_Off 0x004
@@ -104,6 +106,11 @@
 #define METATILE_Cave_SealedChamberEntrance_BottomRight 0x234
 #define METATILE_Cave_SealedChamberBraille_Mid          0x235
 
+#define METATILE_Cave_ShoalCave_DirtPile_Large 0x358
+#define METATILE_Cave_ShoalCave_DirtPile_Small 0x35A
+#define METATILE_Cave_ShoalCave_BlueStone_Large 0x359
+#define METATILE_Cave_ShoalCave_BlueStone_Small 0x35B
+
 // gTileset_InsideOfTruck
 #define METATILE_InsideOfTruck_ExitLight_Top          0x208
 #define METATILE_InsideOfTruck_ExitLight_Mid          0x210
@@ -125,6 +132,8 @@
 #define METATILE_Pacifidlog_HalfSubmergedLogs_Vertical1   0x261
 #define METATILE_Pacifidlog_SubmergedLogs_Vertical0       0x25A
 #define METATILE_Pacifidlog_SubmergedLogs_Vertical1       0x262
+#define METATILE_Pacifidlog_SkyPillar_DoorOpen_Top        0x2AA
+#define METATILE_Pacifidlog_SkyPillar_DoorOpen_Bottom     0x2B2
 
 // gTileset_Fortree
 #define METATILE_Fortree_LongGrass_Root                   0x208
@@ -138,10 +147,18 @@
 #define METATILE_Fortree_SecretBase_LongGrass_BottomLeft  0x281
 #define METATILE_Fortree_SecretBase_LongGrass_BottomMid   0x282
 #define METATILE_Fortree_SecretBase_LongGrass_BottomRight 0x283
+#define METATILE_Fortree_WoodBridge_Kecleon0              0x297
+#define METATILE_Fortree_WoodBridge_Kecleon1              0x29F
+
+// gTileset_Sootopolis
+#define METATILE_Sootopolis_Door_Closed    0x248
+#define METATILE_Sootopolis_GymDoor_Closed 0x250
+#define METATILE_Sootopolis_RoughWater     0x290
 
 // gTileset_SootopolisGym
 #define METATILE_SootopolisGym_Ice_Cracked 0x20E
 #define METATILE_SootopolisGym_Ice_Broken  0x206
+#define METATILE_SootopolisGym_Stairs      0x207
 
 // gTileset_Fallarbor
 #define METATILE_Fallarbor_AshGrass                 0x20A
@@ -184,11 +201,40 @@
 #define METATILE_PokemonCenter_Elevator2F_Tile2_Frame0 0x2A8
 #define METATILE_PokemonCenter_Elevator2F_Tile2_Frame1 0x2AA
 #define METATILE_PokemonCenter_Elevator2F_Tile2_Frame2 0x2AC
+#define METATILE_PokemonCenter_Floor_ShadowTop_Alt     0x2DC
+#define METATILE_PokemonCenter_Floor_Plain_Alt         0x2E4
+#define METATILE_PokemonCenter_Floor_ShadowTop         0x21E
+#define METATILE_PokemonCenter_CounterBarrier          0x25D
+
+// gTileset_MossdeepGameCorner
+#define METATILE_MossdeepGameCorner_CounterOpen_Top      0x22C
+#define METATILE_MossdeepGameCorner_CounterOpen_Bottom   0x234
+#define METATILE_MossdeepGameCorner_CounterClosed_Top    0x22A
+#define METATILE_MossdeepGameCorner_CounterClosed_Bottom 0x232
 
 // gTileset_Mauville
 #define METATILE_Mauville_DeepSand_Center    0x251
 #define METATILE_Mauville_DeepSand_BottomMid 0x259
 
+#define METATILE_Mauville_MirageTower_Tile0 0x3D8
+#define METATILE_Mauville_MirageTower_Tile1 0x3D9
+#define METATILE_Mauville_MirageTower_Tile2 0x3DA
+#define METATILE_Mauville_MirageTower_Tile3 0x3E0
+#define METATILE_Mauville_MirageTower_Tile4 0x3E1
+#define METATILE_Mauville_MirageTower_Tile5 0x3E2
+#define METATILE_Mauville_MirageTower_Tile6 0x3E8
+#define METATILE_Mauville_MirageTower_Tile7 0x3E9
+#define METATILE_Mauville_MirageTower_Tile8 0x3EA
+#define METATILE_Mauville_MirageTower_Tile9 0x3F0
+#define METATILE_Mauville_MirageTower_TileA 0x3F1
+#define METATILE_Mauville_MirageTower_TileB 0x3F2
+#define METATILE_Mauville_MirageTower_TileC 0x3DB
+#define METATILE_Mauville_MirageTower_TileD 0x3DC
+#define METATILE_Mauville_MirageTower_TileE 0x3DD
+#define METATILE_Mauville_MirageTower_TileF 0x3E3
+#define METATILE_Mauville_MirageTower_Tile10 0x3E4
+#define METATILE_Mauville_MirageTower_Tile11 0x3E5
+
 // gTileset_EliteFour
 #define METATILE_EliteFour_OpenDoor_Frame           0x344
 #define METATILE_EliteFour_OpenDoor_Opening         0x345
@@ -292,6 +338,62 @@
 
 // gTileset_GenericBuilding
 #define METATILE_GenericBuilding_TableEdge 0x2F1
+#define METATILE_GenericBuilding_TrickHouse_Door_Closed 0x21B
+#define METATILE_GenericBuilding_TrickHouse_Stairs_Down 0x219
+
+
+// gTileset_TrickHousePuzzle
+#define METATILE_TrickHousePuzzle_Stairs_Down   0x20B
+#define METATILE_TrickHousePuzzle_Button_Up      0x258
+#define METATILE_TrickHousePuzzle_Button_Pressed 0x259
+#define METATILE_TrickHousePuzzle_Door_Shuttered 0x26A
+
+
+#define METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile0 0x24B
+#define METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile1 0x24C
+#define METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile2 0x253
+#define METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile3 0x254
+
+#define METATILE_TrickHousePuzzle_BlueDoorV_Retracted 0x24D
+#define METATILE_TrickHousePuzzle_RedDoorV_Retracted 0x24A
+
+#define METATILE_TrickHousePuzzle_Floor_ShadowTop_Alt 0x252
+
+#define METATILE_TrickHousePuzzle_Floor_ShadowTop 0x255
+
+#define METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile0 0x238
+#define METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile1 0x239
+#define METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile2 0x240
+#define METATILE_TrickHousePuzzle_RedDoorH_Closed_Tile3 0x241
+
+#define METATILE_TrickHousePuzzle_RedDoorV_Open0 0x23A
+#define METATILE_TrickHousePuzzle_RedDoorV_Open1 0x242
+
+#define METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile0 0x23B
+#define METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile1 0x23C
+#define METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile2 0x243
+#define METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile3 0x244
+
+#define METATILE_TrickHousePuzzle_BlueDoorV_Open0 0x23D
+#define METATILE_TrickHousePuzzle_BlueDoorV_Open1 0x245
+
+#define METATILE_TrickHousePuzzle_RedDoorH_Open_Tile0 0x248
+#define METATILE_TrickHousePuzzle_RedDoorH_Open_Tile1 0x249
+#define METATILE_TrickHousePuzzle_RedDoorH_Open_Tile2 0x250
+#define METATILE_TrickHousePuzzle_RedDoorH_Open_Tile3 0x251
+
+#define METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Up 0x262
+#define METATILE_TrickHousePuzzle_Lever_On 0x23F
+
+#define METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Right_Alt 0x27C
+#define METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Left 0x261
+#define METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Down 0x263
+
+#define METATILE_TrickHousePuzzle_Lever_Off 0x23E
+
+#define METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Left_Alt 0x27B
+#define METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Right 0x260
+
 
 // gTileset_BikeShop
 #define METATILE_BikeShop_Barrier_Hidden_Top 0x269
@@ -321,7 +423,12 @@
 #define METATILE_BikeShop_Generator_Off_Tile6 0x2F6
 #define METATILE_BikeShop_Generator_Off_Tile7 0x2F7
 
+// gTileset_TrainerHill
+#define METATILE_TrainerHill_GreenFloorTile 0x307
+#define METATILE_TrainerHill_CounterDoor 0x334
 
-
+// gTileset_Underwater
+#define METATILE_Underwater_RockWall 0x21E
+#define METATILE_Underwater_FloorShadow 0x228
 
 #endif // GUARD_METATILE_LABELS_H