continue labeling metatiles for scripts

23 files changed, 286 insertions, 286 deletions

diff --git a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc
index e69666120..1012ebce7 100644
--- a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc
+++ b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc
@@ -13,11 +13,11 @@ AbandonedShip_Corridors_B1F_MapScript1_237D98: @ 8237D98
 	end
 
 AbandonedShip_Corridors_B1F_EventScript_237DAB:: @ 8237DAB
-	setmetatile 11, 4, 563, 1
+	setmetatile 11, 4, METATILE_InsideShip_InTactDoor0_Bottom, 1
 	return
 
 AbandonedShip_Corridors_B1F_EventScript_237DB5:: @ 8237DB5
-	setmetatile 11, 4, 555, 1
+	setmetatile 11, 4, METATILE_InsideShip_InTactDoor1_Bottom, 1
 	return
 
 AbandonedShip_Corridors_B1F_EventScript_237DBF:: @ 8237DBF
diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc
index 1c495c377..9c6474b6f 100644
--- a/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc
+++ b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc
@@ -19,35 +19,35 @@ AbandonedShip_HiddenFloorCorridors_MapScript1_238980: @ 8238980
 	end
 
 AbandonedShip_HiddenFloorCorridors_EventScript_2389C9:: @ 82389C9
-	setmetatile 3, 8, 555, 1
+	setmetatile 3, 8, METATILE_InsideShip_InTactDoor1_Bottom, 1
 	return
 
 AbandonedShip_HiddenFloorCorridors_EventScript_2389D3:: @ 82389D3
-	setmetatile 6, 8, 555, 1
+	setmetatile 6, 8, METATILE_InsideShip_InTactDoor1_Bottom, 1
 	return
 
 AbandonedShip_HiddenFloorCorridors_EventScript_2389DD:: @ 82389DD
-	setmetatile 3, 3, 538, 0
+	setmetatile 3, 3, METATILE_InsideShip_DoorIndent1, 0
 	return
 
 AbandonedShip_HiddenFloorCorridors_EventScript_2389E7:: @ 82389E7
-	setmetatile 9, 3, 538, 0
+	setmetatile 9, 3, METATILE_InsideShip_DoorIndent1, 0
 	return
 
 AbandonedShip_HiddenFloorCorridors_EventScript_2389F1:: @ 82389F1
-	setmetatile 3, 8, 563, 1
+	setmetatile 3, 8, METATILE_InsideShip_InTactDoor0_Bottom, 1
 	return
 
 AbandonedShip_HiddenFloorCorridors_EventScript_2389FB:: @ 82389FB
-	setmetatile 6, 8, 563, 1
+	setmetatile 6, 8, METATILE_InsideShip_InTactDoor0_Bottom, 1
 	return
 
 AbandonedShip_HiddenFloorCorridors_EventScript_238A05:: @ 8238A05
-	setmetatile 3, 3, 564, 0
+	setmetatile 3, 3, METATILE_InsideShip_DoorIndent0, 0
 	return
 
 AbandonedShip_HiddenFloorCorridors_EventScript_238A0F:: @ 8238A0F
-	setmetatile 9, 3, 564, 0
+	setmetatile 9, 3, METATILE_InsideShip_DoorIndent0, 0
 	return
 
 AbandonedShip_HiddenFloorCorridors_EventScript_238A19:: @ 8238A19
diff --git a/data/maps/AncientTomb/scripts.inc b/data/maps/AncientTomb/scripts.inc
index ad8e683bb..9bc404af6 100644
--- a/data/maps/AncientTomb/scripts.inc
+++ b/data/maps/AncientTomb/scripts.inc
@@ -29,12 +29,12 @@ AncientTomb_MapScript1_238FF2: @ 8238FF2
 	end
 
 AncientTomb_EventScript_238FFC:: @ 8238FFC
-	setmetatile 7, 19, 553, 1
-	setmetatile 8, 19, 553, 1
-	setmetatile 9, 19, 553, 1
-	setmetatile 7, 20, 565, 1
-	setmetatile 8, 20, 565, 1
-	setmetatile 9, 20, 565, 1
+	setmetatile 7, 19, METATILE_Cave_EntranceCover, 1
+	setmetatile 8, 19, METATILE_Cave_EntranceCover, 1
+	setmetatile 9, 19, METATILE_Cave_EntranceCover, 1
+	setmetatile 7, 20, METATILE_Cave_SealedChamberBraille_Mid, 1
+	setmetatile 8, 20, METATILE_Cave_SealedChamberBraille_Mid, 1
+	setmetatile 9, 20, METATILE_Cave_SealedChamberBraille_Mid, 1
 	return
 
 AncientTomb_EventScript_239033:: @ 8239033
diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc
index 87f83371c..ea959387b 100644
--- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc
@@ -645,46 +645,46 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D:: @ 825D88D
 	end
 
 BattleFrontier_BattlePikeRandomRoom1_EventScript_25D8A4:: @ 825D8A4
-	setmetatile 4, 1, 554, 1
-	setmetatile 3, 2, 561, 1
-	setmetatile 4, 2, 562, 1
-	setmetatile 5, 2, 563, 1
-	setmetatile 3, 3, 569, 1
-	setmetatile 4, 3, 570, 0
-	setmetatile 5, 3, 571, 1
+	setmetatile 4, 1, METATILE_BattlePike_Curtain_Stage1_Tile0, 1
+	setmetatile 3, 2, METATILE_BattlePike_Curtain_Stage1_Tile1, 1
+	setmetatile 4, 2, METATILE_BattlePike_Curtain_Stage1_Tile2, 1
+	setmetatile 5, 2, METATILE_BattlePike_Curtain_Stage1_Tile3, 1
+	setmetatile 3, 3, METATILE_BattlePike_Curtain_Stage1_Tile4, 1
+	setmetatile 4, 3, METATILE_BattlePike_Curtain_Stage1_Tile5, 0
+	setmetatile 5, 3, METATILE_BattlePike_Curtain_Stage1_Tile6, 1
 	special DrawWholeMapView
 	return
 
 BattleFrontier_BattlePikeRandomRoom1_EventScript_25D8E7:: @ 825D8E7
-	setmetatile 4, 1, 522, 1
-	setmetatile 3, 2, 529, 1
-	setmetatile 4, 2, 530, 1
-	setmetatile 5, 2, 531, 1
-	setmetatile 3, 3, 537, 1
-	setmetatile 4, 3, 538, 0
-	setmetatile 5, 3, 539, 1
+	setmetatile 4, 1, METATILE_BattlePike_Curtain_Stage2_Tile0, 1
+	setmetatile 3, 2, METATILE_BattlePike_Curtain_Stage2_Tile1, 1
+	setmetatile 4, 2, METATILE_BattlePike_Curtain_Stage2_Tile2, 1
+	setmetatile 5, 2, METATILE_BattlePike_Curtain_Stage2_Tile3, 1
+	setmetatile 3, 3, METATILE_BattlePike_Curtain_Stage2_Tile4, 1
+	setmetatile 4, 3, METATILE_BattlePike_Curtain_Stage2_Tile5, 0
+	setmetatile 5, 3, METATILE_BattlePike_Curtain_Stage2_Tile6, 1
 	special DrawWholeMapView
 	return
 
 BattleFrontier_BattlePikeRandomRoom1_EventScript_25D92A:: @ 825D92A
-	setmetatile 4, 1, 683, 1
-	setmetatile 3, 2, 690, 1
-	setmetatile 4, 2, 691, 1
-	setmetatile 5, 2, 692, 1
-	setmetatile 3, 3, 698, 1
-	setmetatile 4, 3, 699, 0
-	setmetatile 5, 3, 700, 1
+	setmetatile 4, 1, METATILE_BattlePike_Curtain_Stage3_Tile0, 1
+	setmetatile 3, 2, METATILE_BattlePike_Curtain_Stage3_Tile1, 1
+	setmetatile 4, 2, METATILE_BattlePike_Curtain_Stage3_Tile2, 1
+	setmetatile 5, 2, METATILE_BattlePike_Curtain_Stage3_Tile3, 1
+	setmetatile 3, 3, METATILE_BattlePike_Curtain_Stage3_Tile4, 1
+	setmetatile 4, 3, METATILE_BattlePike_Curtain_Stage3_Tile5, 0
+	setmetatile 5, 3, METATILE_BattlePike_Curtain_Stage3_Tile6, 1
 	special DrawWholeMapView
 	return
 
 BattleFrontier_BattlePikeRandomRoom1_EventScript_25D96D:: @ 825D96D
-	setmetatile 4, 1, 586, 1
-	setmetatile 3, 2, 593, 1
-	setmetatile 4, 2, 594, 1
-	setmetatile 5, 2, 595, 1
-	setmetatile 3, 3, 601, 1
-	setmetatile 4, 3, 602, 0
-	setmetatile 5, 3, 603, 1
+	setmetatile 4, 1, METATILE_BattlePike_Curtain_Stage0_Tile0, 1
+	setmetatile 3, 2, METATILE_BattlePike_Curtain_Stage0_Tile1, 1
+	setmetatile 4, 2, METATILE_BattlePike_Curtain_Stage0_Tile2, 1
+	setmetatile 5, 2, METATILE_BattlePike_Curtain_Stage0_Tile3, 1
+	setmetatile 3, 3, METATILE_BattlePike_Curtain_Stage0_Tile4, 1
+	setmetatile 4, 3, METATILE_BattlePike_Curtain_Stage0_Tile5, 0
+	setmetatile 5, 3, METATILE_BattlePike_Curtain_Stage0_Tile6, 1
 	special DrawWholeMapView
 	return
 
diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc b/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc
index cf0a50e98..a72961562 100644
--- a/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc
@@ -6,13 +6,13 @@ BattleFrontier_BattleTowerCorridor_MapScripts:: @ 8241AAA
 BattleFrontier_BattleTowerCorridor_MapScript1_241AB5: @ 8241AB5
 	compare VAR_0x8006, 1
 	goto_if_eq BattleFrontier_BattleTowerCorridor_EventScript_241AD3
-	setmetatile 12, 0, 519, 0
-	setmetatile 12, 1, 527, 0
+	setmetatile 12, 0, METATILE_BattleFrontier_CorridorOpenDoor_Top, 0
+	setmetatile 12, 1, METATILE_BattleFrontier_CorridorOpenDoor_Bottom, 0
 	end
 
 BattleFrontier_BattleTowerCorridor_EventScript_241AD3:: @ 8241AD3
-	setmetatile 15, 0, 519, 0
-	setmetatile 15, 1, 527, 0
+	setmetatile 15, 0, METATILE_BattleFrontier_CorridorOpenDoor_Top, 0
+	setmetatile 15, 1, METATILE_BattleFrontier_CorridorOpenDoor_Bottom, 0
 	end
 
 BattleFrontier_BattleTowerCorridor_MapScript2_241AE6: @ 8241AE6
diff --git a/data/maps/DesertRuins/scripts.inc b/data/maps/DesertRuins/scripts.inc
index e796b1668..5cadf3ec0 100644
--- a/data/maps/DesertRuins/scripts.inc
+++ b/data/maps/DesertRuins/scripts.inc
@@ -20,12 +20,12 @@ DesertRuins_MapScript1_22D989: @ 822D989
 	end
 
 DesertRuins_EventScript_22D993:: @ 822D993
-	setmetatile 7, 19, 553, 1
-	setmetatile 8, 19, 553, 1
-	setmetatile 9, 19, 553, 1
-	setmetatile 7, 20, 565, 1
-	setmetatile 8, 20, 565, 1
-	setmetatile 9, 20, 565, 1
+	setmetatile 7, 19, METATILE_Cave_EntranceCover, 1
+	setmetatile 8, 19, METATILE_Cave_EntranceCover, 1
+	setmetatile 9, 19, METATILE_Cave_EntranceCover, 1
+	setmetatile 7, 20, METATILE_Cave_SealedChamberBraille_Mid, 1
+	setmetatile 8, 20, METATILE_Cave_SealedChamberBraille_Mid, 1
+	setmetatile 9, 20, METATILE_Cave_SealedChamberBraille_Mid, 1
 	return
 
 DesertRuins_OnTransition: @ 822D9CA
diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
index 72c5cc916..88d02b29b 100644
--- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
+++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
@@ -46,8 +46,8 @@ EverGrandeCity_ChampionsRoom_EventScript_228A45:: @ 8228A45
 
 EverGrandeCity_ChampionsRoom_EventScript_228A61:: @ 8228A61
 	playse SE_DOOR
-	setmetatile 6, 1, 838, 0
-	setmetatile 6, 2, 839, 0
+	setmetatile 6, 1, METATILE_EliteFour_OpenDoorChampion_Frame, 0
+	setmetatile 6, 2, METATILE_EliteFour_OpenDoorChampion_Opening, 0
 	special DrawWholeMapView
 	msgbox EverGrandeCity_ChampionsRoom_Text_228F66, MSGBOX_DEFAULT
 	closemessage
diff --git a/data/maps/InsideOfTruck/scripts.inc b/data/maps/InsideOfTruck/scripts.inc
index 0f7f5447d..043c8a8d8 100644
--- a/data/maps/InsideOfTruck/scripts.inc
+++ b/data/maps/InsideOfTruck/scripts.inc
@@ -4,9 +4,9 @@ InsideOfTruck_MapScripts:: @ 823BEDA
 	.byte 0
 
 InsideOfTruck_MapScript1_23BEE5: @ 823BEE5
-	setmetatile 4, 1, 520, 0
-	setmetatile 4, 2, 528, 0
-	setmetatile 4, 3, 536, 0
+	setmetatile 4, 1, METATILE_InsideOfTruck_ExitLight_Top, 0
+	setmetatile 4, 2, METATILE_InsideOfTruck_ExitLight_Mid, 0
+	setmetatile 4, 3, METATILE_InsideOfTruck_ExitLight_Bottom, 0
 	end
 
 InsideOfTruck_MapScript1_23BF01: @ 823BF01
diff --git a/data/maps/IslandCave/scripts.inc b/data/maps/IslandCave/scripts.inc
index 4f5339b1a..911e882f2 100644
--- a/data/maps/IslandCave/scripts.inc
+++ b/data/maps/IslandCave/scripts.inc
@@ -20,12 +20,12 @@ IslandCave_MapScript1_238E58: @ 8238E58
 	end
 
 IslandCave_EventScript_238E62:: @ 8238E62
-	setmetatile 7, 19, 553, 1
-	setmetatile 8, 19, 553, 1
-	setmetatile 9, 19, 553, 1
-	setmetatile 7, 20, 565, 1
-	setmetatile 8, 20, 565, 1
-	setmetatile 9, 20, 565, 1
+	setmetatile 7, 19, METATILE_Cave_EntranceCover, 1
+	setmetatile 8, 19, METATILE_Cave_EntranceCover, 1
+	setmetatile 9, 19, METATILE_Cave_EntranceCover, 1
+	setmetatile 7, 20, METATILE_Cave_SealedChamberBraille_Mid, 1
+	setmetatile 8, 20, METATILE_Cave_SealedChamberBraille_Mid, 1
+	setmetatile 9, 20, METATILE_Cave_SealedChamberBraille_Mid, 1
 	return
 
 IslandCave_OnTransition: @ 8238E99
@@ -39,12 +39,12 @@ IslandCave_EventScript_238EAB:: @ 8238EAB
 	return
 
 IslandCave_EventScript_238EAF:: @ 8238EAF
-	setmetatile 7, 19, 554, 1
-	setmetatile 8, 19, 555, 1
-	setmetatile 9, 19, 556, 1
-	setmetatile 7, 20, 562, 1
-	setmetatile 8, 20, 563, 0
-	setmetatile 9, 20, 564, 1
+	setmetatile 7, 19, METATILE_Cave_SealedChamberEntrance_TopLeft, 1
+	setmetatile 8, 19, METATILE_Cave_SealedChamberEntrance_TopMid, 1
+	setmetatile 9, 19, METATILE_Cave_SealedChamberEntrance_TopRight, 1
+	setmetatile 7, 20, METATILE_Cave_SealedChamberEntrance_BottomLeft, 1
+	setmetatile 8, 20, METATILE_Cave_SealedChamberEntrance_BottomMid, 0
+	setmetatile 9, 20, METATILE_Cave_SealedChamberEntrance_BottomRight, 1
 	special DrawWholeMapView
 	playse SE_BAN
 	setflag FLAG_SYS_BRAILLE_REGICE_COMPLETED
diff --git a/data/maps/JaggedPass/scripts.inc b/data/maps/JaggedPass/scripts.inc
index 34ff367ae..1bb9e82a2 100644
--- a/data/maps/JaggedPass/scripts.inc
+++ b/data/maps/JaggedPass/scripts.inc
@@ -36,8 +36,8 @@ JaggedPass_MapScript1_23069C: @ 823069C
 	end
 
 JaggedPass_EventScript_2306A8:: @ 82306A8
-	setmetatile 16, 17, 628, 1
-	setmetatile 16, 18, 628, 1
+	setmetatile 16, 17, METATILE_Lavaridge_RockWall, 1
+	setmetatile 16, 18, METATILE_Lavaridge_RockWall, 1
 	end
 
 JaggedPass_EventScript_2306BB:: @ 82306BB
@@ -57,8 +57,8 @@ JaggedPass_EventScript_2306BB:: @ 82306BB
 	special sub_8139560
 	waitstate
 	playse SE_KOUKA_M
-	setmetatile 16, 17, 598, 1
-	setmetatile 16, 18, 606, 0
+	setmetatile 16, 17, METATILE_Lavaridge_CaveEntrance_Top, 1
+	setmetatile 16, 18, METATILE_Lavaridge_CaveEntrance_Bottom, 0
 	special DrawWholeMapView
 	delay 30
 	setvar VAR_JAGGED_PASS_STATE, 2
diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc
index 68ffd5f99..9a777e551 100644
--- a/data/maps/LilycoveCity/scripts.inc
+++ b/data/maps/LilycoveCity/scripts.inc
@@ -16,18 +16,18 @@ LilycoveCity_MapScript1_1E2B61: @ 81E2B61
 	end
 
 LilycoveCity_EventScript_1E2B6B:: @ 81E2B6B
-	setmetatile 76, 12, 656, 1
-	setmetatile 77, 12, 657, 1
-	setmetatile 76, 13, 672, 1
-	setmetatile 77, 13, 673, 1
-	setmetatile 76, 14, 664, 1
-	setmetatile 77, 14, 665, 1
-	setmetatile 76, 15, 672, 1
-	setmetatile 77, 15, 673, 1
-	setmetatile 77, 16, 664, 1
-	setmetatile 78, 16, 665, 1
-	setmetatile 77, 17, 672, 1
-	setmetatile 78, 17, 673, 1
+	setmetatile 76, 12, METATILE_Lilycove_Wailmer0, 1
+	setmetatile 77, 12, METATILE_Lilycove_Wailmer1, 1
+	setmetatile 76, 13, METATILE_Lilycove_Wailmer2, 1
+	setmetatile 77, 13, METATILE_Lilycove_Wailmer3, 1
+	setmetatile 76, 14, METATILE_Lilycove_Wailmer0_Alt, 1
+	setmetatile 77, 14, METATILE_Lilycove_Wailmer1_Alt, 1
+	setmetatile 76, 15, METATILE_Lilycove_Wailmer2, 1
+	setmetatile 77, 15, METATILE_Lilycove_Wailmer3, 1
+	setmetatile 77, 16, METATILE_Lilycove_Wailmer0_Alt, 1
+	setmetatile 78, 16, METATILE_Lilycove_Wailmer1_Alt, 1
+	setmetatile 77, 17, METATILE_Lilycove_Wailmer2, 1
+	setmetatile 78, 17, METATILE_Lilycove_Wailmer3, 1
 	return
 
 LilycoveCity_EventScript_1E2BD8:: @ 81E2BD8
diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc
index 34afac0a5..cd4749bfc 100644
--- a/data/maps/LilycoveCity_ContestLobby/scripts.inc
+++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc
@@ -408,14 +408,14 @@ LilycoveCity_ContestLobby_EventScript_21A670:: @ 821A670
 	applymovement 1, LilycoveCity_ContestLobby_Movement_21A6F5
 	waitmovement 0
 	playse SE_HASHI
-	setmetatile 12, 2, 545, 1
-	setmetatile 12, 3, 609, 1
+	setmetatile 12, 2, METATILE_Contest_WallShadow, 1
+	setmetatile 12, 3, METATILE_Contest_FloorShadow, 1
 	special DrawWholeMapView
 	applymovement 1, LilycoveCity_ContestLobby_Movement_21A6F9
 	waitmovement 0
 	playse SE_HASHI
-	setmetatile 12, 2, 721, 1
-	setmetatile 12, 3, 729, 1
+	setmetatile 12, 2, METATILE_Contest_CounterFlap_Top, 1
+	setmetatile 12, 3, METATILE_Contest_CounterFlap_Bottom, 1
 	special DrawWholeMapView
 	delay 20
 	applymovement 1, LilycoveCity_ContestLobby_Movement_21A706
@@ -931,14 +931,14 @@ LilycoveCity_ContestLobby_EventScript_21AC49:: @ 821AC49
 	applymovement 2, LilycoveCity_ContestLobby_Movement_21ACDD
 	waitmovement 0
 	playse SE_HASHI
-	setmetatile 17, 2, 545, 1
-	setmetatile 17, 3, 609, 1
+	setmetatile 17, 2, METATILE_Contest_WallShadow, 1
+	setmetatile 17, 3, METATILE_Contest_FloorShadow, 1
 	special DrawWholeMapView
 	applymovement 2, LilycoveCity_ContestLobby_Movement_21ACE1
 	waitmovement 0
 	playse SE_HASHI
-	setmetatile 17, 2, 721, 1
-	setmetatile 17, 3, 729, 1
+	setmetatile 17, 2, METATILE_Contest_CounterFlap_Top, 1
+	setmetatile 17, 3, METATILE_Contest_CounterFlap_Bottom, 1
 	special DrawWholeMapView
 	delay 20
 	applymovement 2, LilycoveCity_ContestLobby_Movement_21ACEF
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc
index 3bbfa8a38..add7ef22f 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc
+++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc
@@ -28,32 +28,32 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_219781:: @ 8219781
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_21978B:: @ 821978B
-	setmetatile 10, 6, 606, 1
-	setmetatile 11, 6, 607, 1
+	setmetatile 10, 6, METATILE_LilycoveMuseum_Painting2_Left, 1
+	setmetatile 11, 6, METATILE_LilycoveMuseum_Painting2_Right, 1
 	goto LilycoveCity_LilycoveMuseum_2F_EventScript_219754
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_2197A3:: @ 82197A3
-	setmetatile 18, 6, 604, 1
-	setmetatile 19, 6, 605, 1
+	setmetatile 18, 6, METATILE_LilycoveMuseum_Painting1_Left, 1
+	setmetatile 19, 6, METATILE_LilycoveMuseum_Painting1_Right, 1
 	goto LilycoveCity_LilycoveMuseum_2F_EventScript_219763
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_2197BB:: @ 82197BB
-	setmetatile 14, 10, 608, 1
-	setmetatile 15, 10, 609, 1
+	setmetatile 14, 10, METATILE_LilycoveMuseum_Painting3_Left, 1
+	setmetatile 15, 10, METATILE_LilycoveMuseum_Painting3_Right, 1
 	goto LilycoveCity_LilycoveMuseum_2F_EventScript_219772
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_2197D3:: @ 82197D3
-	setmetatile 6, 10, 602, 1
-	setmetatile 7, 10, 603, 1
+	setmetatile 6, 10, METATILE_LilycoveMuseum_Painting0_Left, 1
+	setmetatile 7, 10, METATILE_LilycoveMuseum_Painting0_Right, 1
 	goto LilycoveCity_LilycoveMuseum_2F_EventScript_219781
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_2197EB:: @ 82197EB
-	setmetatile 2, 6, 610, 1
-	setmetatile 3, 6, 611, 1
+	setmetatile 2, 6, METATILE_LilycoveMuseum_Painting4_Left, 1
+	setmetatile 3, 6, METATILE_LilycoveMuseum_Painting4_Right, 1
 	end
 
 LilycoveCity_LilycoveMuseum_2F_MapScript2_2197FE: @ 82197FE
diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc
index 31a526a25..d81340c6c 100644
--- a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc
+++ b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc
@@ -11,8 +11,8 @@ LittlerootTown_BrendansHouse_1F_MapScript1_1F7765: @ 81F7765
 	end
 
 LittlerootTown_BrendansHouse_1F_EventScript_1F777A:: @ 81F777A
-	setmetatile 5, 4, 624, 1
-	setmetatile 5, 2, 616, 1
+	setmetatile 5, 4, METATILE_BrendansMaysHouse_MovingBox_Open, 1
+	setmetatile 5, 2, METATILE_BrendansMaysHouse_MovingBox_Closed, 1
 	return
 
 LittlerootTown_BrendansHouse_1F_EventScript_1F778D:: @ 81F778D
@@ -22,7 +22,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F778D:: @ 81F778D
 	return
 
 LittlerootTown_BrendansHouse_1F_EventScript_1F779A:: @ 81F779A
-	setmetatile 3, 7, 659, 1
+	setmetatile 3, 7, METATILE_BrendansMaysHouse_BookOnTable, 1
 	return
 
 LittlerootTown_BrendansHouse_1F_MapScript1_1F77A4: @ 81F77A4
diff --git a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc
index 6b226da24..0557330a8 100644
--- a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc
+++ b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc
@@ -11,8 +11,8 @@ LittlerootTown_MaysHouse_1F_MapScript1_1F88B5: @ 81F88B5
 	end
 
 LittlerootTown_MaysHouse_1F_EventScript_1F88CA:: @ 81F88CA
-	setmetatile 5, 4, 624, 1
-	setmetatile 5, 2, 616, 1
+	setmetatile 5, 4, METATILE_BrendansMaysHouse_MovingBox_Open, 1
+	setmetatile 5, 2, METATILE_BrendansMaysHouse_MovingBox_Closed, 1
 	return
 
 LittlerootTown_MaysHouse_1F_EventScript_1F88DD:: @ 81F88DD
@@ -22,7 +22,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F88DD:: @ 81F88DD
 	return
 
 LittlerootTown_MaysHouse_1F_EventScript_1F88EA:: @ 81F88EA
-	setmetatile 6, 7, 659, 1
+	setmetatile 6, 7, METATILE_BrendansMaysHouse_BookOnTable, 1
 	return
 
 LittlerootTown_MaysHouse_1F_MapScript1_1F88F4: @ 81F88F4
diff --git a/data/maps/MauvilleCity_Gym/scripts.inc b/data/maps/MauvilleCity_Gym/scripts.inc
index e23d48332..811cdc9de 100644
--- a/data/maps/MauvilleCity_Gym/scripts.inc
+++ b/data/maps/MauvilleCity_Gym/scripts.inc
@@ -17,32 +17,32 @@ MauvilleCity_Gym_EventScript_20DDBA:: @ 820DDBA
 	end
 
 MauvilleCity_Gym_EventScript_20DDC4:: @ 820DDC4
-	setmetatile 3, 11, 577, 1
-	setmetatile 3, 12, 585, 1
-	setmetatile 3, 13, 592, 1
-	setmetatile 4, 10, 546, 0
-	setmetatile 5, 10, 547, 0
-	setmetatile 4, 11, 554, 1
-	setmetatile 5, 11, 555, 1
-	setmetatile 7, 10, 546, 0
-	setmetatile 8, 10, 547, 0
-	setmetatile 7, 11, 554, 1
-	setmetatile 8, 11, 555, 1
-	setmetatile 4, 13, 560, 0
-	setmetatile 5, 13, 561, 0
-	setmetatile 4, 14, 568, 0
-	setmetatile 5, 14, 569, 0
-	setmetatile 1, 10, 560, 0
-	setmetatile 2, 10, 561, 0
-	setmetatile 1, 11, 568, 0
-	setmetatile 2, 11, 569, 0
-	setmetatile 6, 8, 578, 1
-	setmetatile 6, 9, 538, 0
-	setmetatile 6, 10, 593, 0
-	setmetatile 4, 6, 560, 0
-	setmetatile 5, 6, 561, 0
-	setmetatile 4, 7, 568, 0
-	setmetatile 5, 7, 569, 0
+	setmetatile 3, 11, METATILE_MauvilleGym_RedBeamV1_On, 1
+	setmetatile 3, 12, METATILE_MauvilleGym_RedBeamV2_On, 1
+	setmetatile 3, 13, METATILE_MauvilleGym_PoleTop_On, 1
+	setmetatile 4, 10, METATILE_MauvilleGym_RedBeamH1_On, 0
+	setmetatile 5, 10, METATILE_MauvilleGym_RedBeamH2_On, 0
+	setmetatile 4, 11, METATILE_MauvilleGym_RedBeamH3_On, 1
+	setmetatile 5, 11, METATILE_MauvilleGym_RedBeamH4_On, 1
+	setmetatile 7, 10, METATILE_MauvilleGym_RedBeamH1_On, 0
+	setmetatile 8, 10, METATILE_MauvilleGym_RedBeamH2_On, 0
+	setmetatile 7, 11, METATILE_MauvilleGym_RedBeamH3_On, 1
+	setmetatile 8, 11, METATILE_MauvilleGym_RedBeamH4_On, 1
+	setmetatile 4, 13, METATILE_MauvilleGym_GreenBeamH1_Off, 0
+	setmetatile 5, 13, METATILE_MauvilleGym_GreenBeamH2_Off, 0
+	setmetatile 4, 14, METATILE_MauvilleGym_GreenBeamH3_Off, 0
+	setmetatile 5, 14, METATILE_MauvilleGym_GreenBeamH4_Off, 0
+	setmetatile 1, 10, METATILE_MauvilleGym_GreenBeamH1_Off, 0
+	setmetatile 2, 10, METATILE_MauvilleGym_GreenBeamH2_Off, 0
+	setmetatile 1, 11, METATILE_MauvilleGym_GreenBeamH3_Off, 0
+	setmetatile 2, 11, METATILE_MauvilleGym_GreenBeamH4_Off, 0
+	setmetatile 6, 8, METATILE_MauvilleGym_PoleBottom_On, 1
+	setmetatile 6, 9, METATILE_MauvilleGym_FloorTile, 0
+	setmetatile 6, 10, METATILE_MauvilleGym_PoleTop_Off, 0
+	setmetatile 4, 6, METATILE_MauvilleGym_GreenBeamH1_Off, 0
+	setmetatile 5, 6, METATILE_MauvilleGym_GreenBeamH2_Off, 0
+	setmetatile 4, 7, METATILE_MauvilleGym_GreenBeamH3_Off, 0
+	setmetatile 5, 7, METATILE_MauvilleGym_GreenBeamH4_Off, 0
 	end
 
 MauvilleCity_Gym_EventScript_20DEAF:: @ 820DEAF
diff --git a/data/maps/MeteorFalls_1F_1R/scripts.inc b/data/maps/MeteorFalls_1F_1R/scripts.inc
index bd1b8d090..8211034a6 100644
--- a/data/maps/MeteorFalls_1F_1R/scripts.inc
+++ b/data/maps/MeteorFalls_1F_1R/scripts.inc
@@ -7,10 +7,10 @@ MeteorFalls_1F_1R_MapScript1_22BD30: @ 822BD30
 	end
 
 MeteorFalls_1F_1R_EventScript_22BD3A:: @ 822BD3A
-	setmetatile 4, 1, 582, 1
-	setmetatile 3, 2, 589, 1
-	setmetatile 4, 2, 590, 0
-	setmetatile 5, 2, 591, 1
+	setmetatile 4, 1, METATILE_MeteorFalls_CaveEntrance_Top, 1
+	setmetatile 3, 2, METATILE_MeteorFalls_CaveEntrance_Left, 1
+	setmetatile 4, 2, METATILE_MeteorFalls_CaveEntrance_Bottom, 0
+	setmetatile 5, 2, METATILE_MeteorFalls_CaveEntrance_Right, 1
 	return
 
 MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F
diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc
index 7fc98dc54..c0f092c6a 100644
--- a/data/maps/MossdeepCity_Gym/scripts.inc
+++ b/data/maps/MossdeepCity_Gym/scripts.inc
@@ -22,26 +22,26 @@ MossdeepCity_Gym_EventScript_220833:: @ 8220833
 	end
 
 MossdeepCity_Gym_EventScript_22083D:: @ 822083D
-	setmetatile 5, 5, 516, 0
-	setmetatile 2, 7, 569, 1
+	setmetatile 5, 5, METATILE_MossdeepGym_Obelisk_Top, 0
+	setmetatile 2, 7, METATILE_MossdeepGym_Empty1, 1
 	goto MossdeepCity_Gym_EventScript_220815
 	end
 
 MossdeepCity_Gym_EventScript_220855:: @ 8220855
-	setmetatile 8, 14, 516, 0
-	setmetatile 8, 10, 569, 1
+	setmetatile 8, 14, METATILE_MossdeepGym_Obelisk_Top, 0
+	setmetatile 8, 10, METATILE_MossdeepGym_Empty1, 1
 	goto MossdeepCity_Gym_EventScript_220824
 	end
 
 MossdeepCity_Gym_EventScript_22086D:: @ 822086D
-	setmetatile 15, 17, 524, 0
-	setmetatile 17, 15, 569, 1
+	setmetatile 15, 17, METATILE_MossdeepGym_Obelisk_Base, 0
+	setmetatile 17, 15, METATILE_MossdeepGym_Empty1, 1
 	goto MossdeepCity_Gym_EventScript_220833
 	end
 
 MossdeepCity_Gym_EventScript_220885:: @ 8220885
-	setmetatile 1, 23, 525, 0
-	setmetatile 5, 24, 569, 1
+	setmetatile 1, 23, METATILE_MossdeepGym_Wall_LeftCorner, 0
+	setmetatile 5, 24, METATILE_MossdeepGym_Empty1, 1
 	end
 
 MossdeepCity_Gym_EventScript_220898:: @ 8220898
@@ -114,8 +114,8 @@ MossdeepCity_Gym_EventScript_220999:: @ 8220999
 	setflag FLAG_MOSSDEEP_GYM_SWITCH_1
 	applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30
 	waitmovement 0
-	setmetatile 5, 5, 516, 0
-	setmetatile 2, 7, 569, 1
+	setmetatile 5, 5, METATILE_MossdeepGym_Obelisk_Top, 0
+	setmetatile 2, 7, METATILE_MossdeepGym_Empty1, 1
 	goto MossdeepCity_Gym_EventScript_2209C8
 	end
 
@@ -129,8 +129,8 @@ MossdeepCity_Gym_EventScript_2209D0:: @ 82209D0
 	clearflag FLAG_MOSSDEEP_GYM_SWITCH_1
 	applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30
 	waitmovement 0
-	setmetatile 5, 5, 524, 0
-	setmetatile 2, 7, 568, 1
+	setmetatile 5, 5, METATILE_MossdeepGym_Obelisk_Base, 0
+	setmetatile 2, 7, METATILE_MossdeepGym_Empty0, 1
 	goto MossdeepCity_Gym_EventScript_2209C8
 	end
 
@@ -140,8 +140,8 @@ MossdeepCity_Gym_EventScript_2209F5:: @ 82209F5
 	setflag FLAG_MOSSDEEP_GYM_SWITCH_2
 	applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30
 	waitmovement 0
-	setmetatile 8, 14, 516, 0
-	setmetatile 8, 10, 569, 1
+	setmetatile 8, 14, METATILE_MossdeepGym_Obelisk_Top, 0
+	setmetatile 8, 10, METATILE_MossdeepGym_Empty1, 1
 	goto MossdeepCity_Gym_EventScript_2209C8
 	end
 
@@ -149,8 +149,8 @@ MossdeepCity_Gym_EventScript_220A24:: @ 8220A24
 	clearflag FLAG_MOSSDEEP_GYM_SWITCH_2
 	applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30
 	waitmovement 0
-	setmetatile 8, 14, 517, 0
-	setmetatile 8, 10, 568, 1
+	setmetatile 8, 14, METATILE_MossdeepGym_OuterWall_RightCorner, 0
+	setmetatile 8, 10, METATILE_MossdeepGym_Empty0, 1
 	goto MossdeepCity_Gym_EventScript_2209C8
 	end
 
@@ -160,8 +160,8 @@ MossdeepCity_Gym_EventScript_220A49:: @ 8220A49
 	setflag FLAG_MOSSDEEP_GYM_SWITCH_3
 	applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30
 	waitmovement 0
-	setmetatile 15, 17, 524, 0
-	setmetatile 17, 15, 569, 1
+	setmetatile 15, 17, METATILE_MossdeepGym_Obelisk_Base, 0
+	setmetatile 17, 15, METATILE_MossdeepGym_Empty1, 1
 	goto MossdeepCity_Gym_EventScript_2209C8
 	end
 
@@ -169,8 +169,8 @@ MossdeepCity_Gym_EventScript_220A78:: @ 8220A78
 	clearflag FLAG_MOSSDEEP_GYM_SWITCH_3
 	applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30
 	waitmovement 0
-	setmetatile 15, 17, 516, 0
-	setmetatile 17, 15, 568, 1
+	setmetatile 15, 17, METATILE_MossdeepGym_Obelisk_Top, 0
+	setmetatile 17, 15, METATILE_MossdeepGym_Empty0, 1
 	goto MossdeepCity_Gym_EventScript_2209C8
 	end
 
@@ -180,8 +180,8 @@ MossdeepCity_Gym_EventScript_220A9D:: @ 8220A9D
 	setflag FLAG_MOSSDEEP_GYM_SWITCH_4
 	applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30
 	waitmovement 0
-	setmetatile 1, 23, 525, 0
-	setmetatile 5, 24, 569, 1
+	setmetatile 1, 23, METATILE_MossdeepGym_Wall_LeftCorner, 0
+	setmetatile 5, 24, METATILE_MossdeepGym_Empty1, 1
 	goto MossdeepCity_Gym_EventScript_2209C8
 	end
 
@@ -189,8 +189,8 @@ MossdeepCity_Gym_EventScript_220ACC:: @ 8220ACC
 	clearflag FLAG_MOSSDEEP_GYM_SWITCH_4
 	applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30
 	waitmovement 0
-	setmetatile 1, 23, 516, 0
-	setmetatile 5, 24, 568, 1
+	setmetatile 1, 23, METATILE_MossdeepGym_Obelisk_Top, 0
+	setmetatile 5, 24, METATILE_MossdeepGym_Empty0, 1
 	goto MossdeepCity_Gym_EventScript_2209C8
 	end
 
diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc
index bb60fc2f6..66fd663b1 100644
--- a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc
@@ -44,7 +44,7 @@ MossdeepCity_SpaceCenter_1F_MapScript1_222FC2: @ 8222FC2
 	end
 
 MossdeepCity_SpaceCenter_1F_EventScript_222FCE:: @ 8222FCE
-	setmetatile 2, 5, 996, 1
+	setmetatile 2, 5, METATILE_Facility_DataPad, 1
 	return
 
 MossdeepCity_SpaceCenter_1F_EventScript_222FD8:: @ 8222FD8
diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc
index f7dd18628..69b5a01d4 100644
--- a/data/maps/MossdeepCity_StevensHouse/scripts.inc
+++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc
@@ -9,7 +9,7 @@ MossdeepCity_StevensHouse_MapScript1_222794: @ 8222794
 	end
 
 MossdeepCity_StevensHouse_EventScript_22279E:: @ 822279E
-	setmetatile 6, 4, 753, 1
+	setmetatile 6, 4, METATILE_GenericBuilding_TableEdge, 1
 	return
 
 MossdeepCity_StevensHouse_OnTransition: @ 82227A8
diff --git a/data/maps/NewMauville_Entrance/scripts.inc b/data/maps/NewMauville_Entrance/scripts.inc
index 7adb2d7ce..1fadc7b7d 100644
--- a/data/maps/NewMauville_Entrance/scripts.inc
+++ b/data/maps/NewMauville_Entrance/scripts.inc
@@ -9,12 +9,12 @@ NewMauville_Entrance_MapScript1_2372B8: @ 82372B8
 	end
 
 NewMauville_Entrance_EventScript_2372C4:: @ 82372C4
-	setmetatile 3, 0, 788, 1
-	setmetatile 4, 0, 789, 1
-	setmetatile 5, 0, 790, 1
-	setmetatile 3, 1, 796, 1
-	setmetatile 4, 1, 797, 1
-	setmetatile 5, 1, 798, 1
+	setmetatile 3, 0, METATILE_Facility_NewMauvilleDoor_Closed_Tile0, 1
+	setmetatile 4, 0, METATILE_Facility_NewMauvilleDoor_Closed_Tile1, 1
+	setmetatile 5, 0, METATILE_Facility_NewMauvilleDoor_Closed_Tile2, 1
+	setmetatile 3, 1, METATILE_Facility_NewMauvilleDoor_Closed_Tile3, 1
+	setmetatile 4, 1, METATILE_Facility_NewMauvilleDoor_Closed_Tile4, 1
+	setmetatile 5, 1, METATILE_Facility_NewMauvilleDoor_Closed_Tile5, 1
 	return
 
 NewMauville_Entrance_OnTransition: @ 82372FB
@@ -33,12 +33,12 @@ NewMauville_Entrance_EventScript_2372FF:: @ 82372FF
 	compare VAR_RESULT, 0
 	goto_if_eq NewMauville_Entrance_EventScript_237380
 	msgbox NewMauville_Entrance_Text_2373AC, MSGBOX_DEFAULT
-	setmetatile 3, 0, 707, 0
-	setmetatile 4, 0, 708, 0
-	setmetatile 5, 0, 709, 0
-	setmetatile 3, 1, 715, 1
-	setmetatile 4, 1, 716, 0
-	setmetatile 5, 1, 717, 1
+	setmetatile 3, 0, METATILE_Facility_NewMauvilleDoor_Open_Tile0, 0
+	setmetatile 4, 0, METATILE_Facility_NewMauvilleDoor_Open_Tile1, 0
+	setmetatile 5, 0, METATILE_Facility_NewMauvilleDoor_Open_Tile2, 0
+	setmetatile 3, 1, METATILE_Facility_NewMauvilleDoor_Open_Tile3, 1
+	setmetatile 4, 1, METATILE_Facility_NewMauvilleDoor_Open_Tile4, 0
+	setmetatile 5, 1, METATILE_Facility_NewMauvilleDoor_Open_Tile5, 1
 	special DrawWholeMapView
 	playse SE_BAN
 	setvar VAR_NEW_MAUVILLE_STATE, 1
diff --git a/data/maps/NewMauville_Inside/scripts.inc b/data/maps/NewMauville_Inside/scripts.inc
index 0582e2a32..5d871f170 100644
--- a/data/maps/NewMauville_Inside/scripts.inc
+++ b/data/maps/NewMauville_Inside/scripts.inc
@@ -65,83 +65,83 @@ NewMauville_Inside_EventScript_237471:: @ 8237471
 	end
 
 NewMauville_Inside_EventScript_237489:: @ 8237489
-	setmetatile 23, 34, 617, 1
-	setmetatile 23, 35, 625, 1
-	setmetatile 23, 36, 621, 0
-	setmetatile 23, 37, 641, 0
-	setmetatile 10, 16, 617, 1
-	setmetatile 10, 17, 625, 1
-	setmetatile 10, 18, 621, 0
-	setmetatile 10, 19, 641, 0
-	setmetatile 10, 0, 617, 1
-	setmetatile 10, 1, 625, 1
-	setmetatile 10, 2, 621, 0
-	setmetatile 10, 3, 641, 0
-	setmetatile 37, 33, 694, 1
-	setmetatile 37, 34, 702, 1
-	setmetatile 37, 35, 710, 1
-	setmetatile 37, 36, 718, 1
-	setmetatile 28, 22, 694, 1
-	setmetatile 28, 23, 702, 1
-	setmetatile 28, 24, 710, 1
-	setmetatile 28, 25, 718, 1
-	setmetatile 10, 24, 694, 1
-	setmetatile 10, 25, 702, 1
-	setmetatile 10, 26, 710, 1
-	setmetatile 10, 27, 718, 1
-	setmetatile 21, 2, 694, 1
-	setmetatile 21, 3, 702, 1
-	setmetatile 21, 4, 710, 1
-	setmetatile 21, 5, 718, 1
-	setmetatile 6, 11, 591, 0
-	setmetatile 13, 10, 591, 0
-	setmetatile 16, 22, 591, 0
-	setmetatile 4, 26, 591, 0
-	setmetatile 30, 38, 591, 0
-	setmetatile 2, 11, 558, 0
-	setmetatile 17, 10, 558, 0
-	setmetatile 25, 18, 558, 0
-	setmetatile 18, 36, 558, 0
+	setmetatile 23, 34, METATILE_BikeShop_Barrier_Hidden_Top, 1
+	setmetatile 23, 35, METATILE_BikeShop_Barrier_Hidden_Bottom, 1
+	setmetatile 23, 36, METATILE_BikeShop_Floor_Shadow_Top, 0
+	setmetatile 23, 37, METATILE_BikeShop_Wall_Edge_Top, 0
+	setmetatile 10, 16, METATILE_BikeShop_Barrier_Hidden_Top, 1
+	setmetatile 10, 17, METATILE_BikeShop_Barrier_Hidden_Bottom, 1
+	setmetatile 10, 18, METATILE_BikeShop_Floor_Shadow_Top, 0
+	setmetatile 10, 19, METATILE_BikeShop_Wall_Edge_Top, 0
+	setmetatile 10, 0, METATILE_BikeShop_Barrier_Hidden_Top, 1
+	setmetatile 10, 1, METATILE_BikeShop_Barrier_Hidden_Bottom, 1
+	setmetatile 10, 2, METATILE_BikeShop_Floor_Shadow_Top, 0
+	setmetatile 10, 3, METATILE_BikeShop_Wall_Edge_Top, 0
+	setmetatile 37, 33, METATILE_BikeShop_Barrier_Green_Top, 1
+	setmetatile 37, 34, METATILE_BikeShop_Barrier_Green_TopMid, 1
+	setmetatile 37, 35, METATILE_BikeShop_Barrier_Green_BottomMid, 1
+	setmetatile 37, 36, METATILE_BikeShop_Barrier_Green_Bottom, 1
+	setmetatile 28, 22, METATILE_BikeShop_Barrier_Green_Top, 1
+	setmetatile 28, 23, METATILE_BikeShop_Barrier_Green_TopMid, 1
+	setmetatile 28, 24, METATILE_BikeShop_Barrier_Green_BottomMid, 1
+	setmetatile 28, 25, METATILE_BikeShop_Barrier_Green_Bottom, 1
+	setmetatile 10, 24, METATILE_BikeShop_Barrier_Green_Top, 1
+	setmetatile 10, 25, METATILE_BikeShop_Barrier_Green_TopMid, 1
+	setmetatile 10, 26, METATILE_BikeShop_Barrier_Green_BottomMid, 1
+	setmetatile 10, 27, METATILE_BikeShop_Barrier_Green_Bottom, 1
+	setmetatile 21, 2, METATILE_BikeShop_Barrier_Green_Top, 1
+	setmetatile 21, 3, METATILE_BikeShop_Barrier_Green_TopMid, 1
+	setmetatile 21, 4, METATILE_BikeShop_Barrier_Green_BottomMid, 1
+	setmetatile 21, 5, METATILE_BikeShop_Barrier_Green_Bottom, 1
+	setmetatile 6, 11, METATILE_BikeShop_Button_Pressed, 0
+	setmetatile 13, 10, METATILE_BikeShop_Button_Pressed, 0
+	setmetatile 16, 22, METATILE_BikeShop_Button_Pressed, 0
+	setmetatile 4, 26, METATILE_BikeShop_Button_Pressed, 0
+	setmetatile 30, 38, METATILE_BikeShop_Button_Pressed, 0
+	setmetatile 2, 11, METATILE_BikeShop_Button_Green, 0
+	setmetatile 17, 10, METATILE_BikeShop_Button_Green, 0
+	setmetatile 25, 18, METATILE_BikeShop_Button_Green, 0
+	setmetatile 18, 36, METATILE_BikeShop_Button_Green, 0
 	return
 
 NewMauville_Inside_EventScript_2375D7:: @ 82375D7
-	setmetatile 23, 34, 695, 1
-	setmetatile 23, 35, 703, 1
-	setmetatile 23, 36, 711, 1
-	setmetatile 23, 37, 719, 1
-	setmetatile 10, 16, 695, 1
-	setmetatile 10, 17, 703, 1
-	setmetatile 10, 18, 711, 1
-	setmetatile 10, 19, 719, 1
-	setmetatile 10, 0, 695, 1
-	setmetatile 10, 1, 703, 1
-	setmetatile 10, 2, 711, 1
-	setmetatile 10, 3, 719, 1
-	setmetatile 37, 33, 617, 1
-	setmetatile 37, 34, 625, 1
-	setmetatile 37, 35, 621, 0
-	setmetatile 37, 36, 641, 0
-	setmetatile 28, 22, 617, 1
-	setmetatile 28, 23, 625, 1
-	setmetatile 28, 24, 621, 0
-	setmetatile 28, 25, 641, 0
-	setmetatile 10, 24, 617, 1
-	setmetatile 10, 25, 625, 1
-	setmetatile 10, 26, 621, 0
-	setmetatile 10, 27, 641, 0
-	setmetatile 21, 2, 617, 1
-	setmetatile 21, 3, 625, 1
-	setmetatile 21, 4, 621, 0
-	setmetatile 21, 5, 641, 0
-	setmetatile 2, 11, 591, 0
-	setmetatile 17, 10, 591, 0
-	setmetatile 25, 18, 591, 0
-	setmetatile 18, 36, 591, 0
-	setmetatile 6, 11, 566, 0
-	setmetatile 13, 10, 566, 0
-	setmetatile 16, 22, 566, 0
-	setmetatile 4, 26, 566, 0
-	setmetatile 30, 38, 566, 0
+	setmetatile 23, 34, METATILE_BikeShop_Barrier_Blue_Top, 1
+	setmetatile 23, 35, METATILE_BikeShop_Barrier_Blue_TopMid, 1
+	setmetatile 23, 36, METATILE_BikeShop_Barrier_Blue_BottomMid, 1
+	setmetatile 23, 37, METATILE_BikeShop_Barrier_Blue_Bottom, 1
+	setmetatile 10, 16, METATILE_BikeShop_Barrier_Blue_Top, 1
+	setmetatile 10, 17, METATILE_BikeShop_Barrier_Blue_TopMid, 1
+	setmetatile 10, 18, METATILE_BikeShop_Barrier_Blue_BottomMid, 1
+	setmetatile 10, 19, METATILE_BikeShop_Barrier_Blue_Bottom, 1
+	setmetatile 10, 0, METATILE_BikeShop_Barrier_Blue_Top, 1
+	setmetatile 10, 1, METATILE_BikeShop_Barrier_Blue_TopMid, 1
+	setmetatile 10, 2, METATILE_BikeShop_Barrier_Blue_BottomMid, 1
+	setmetatile 10, 3, METATILE_BikeShop_Barrier_Blue_Bottom, 1
+	setmetatile 37, 33, METATILE_BikeShop_Barrier_Hidden_Top, 1
+	setmetatile 37, 34, METATILE_BikeShop_Barrier_Hidden_Bottom, 1
+	setmetatile 37, 35, METATILE_BikeShop_Floor_Shadow_Top, 0
+	setmetatile 37, 36, METATILE_BikeShop_Wall_Edge_Top, 0
+	setmetatile 28, 22, METATILE_BikeShop_Barrier_Hidden_Top, 1
+	setmetatile 28, 23, METATILE_BikeShop_Barrier_Hidden_Bottom, 1
+	setmetatile 28, 24, METATILE_BikeShop_Floor_Shadow_Top, 0
+	setmetatile 28, 25, METATILE_BikeShop_Wall_Edge_Top, 0
+	setmetatile 10, 24, METATILE_BikeShop_Barrier_Hidden_Top, 1
+	setmetatile 10, 25, METATILE_BikeShop_Barrier_Hidden_Bottom, 1
+	setmetatile 10, 26, METATILE_BikeShop_Floor_Shadow_Top, 0
+	setmetatile 10, 27, METATILE_BikeShop_Wall_Edge_Top, 0
+	setmetatile 21, 2, METATILE_BikeShop_Barrier_Hidden_Top, 1
+	setmetatile 21, 3, METATILE_BikeShop_Barrier_Hidden_Bottom, 1
+	setmetatile 21, 4, METATILE_BikeShop_Floor_Shadow_Top, 0
+	setmetatile 21, 5, METATILE_BikeShop_Wall_Edge_Top, 0
+	setmetatile 2, 11, METATILE_BikeShop_Button_Pressed, 0
+	setmetatile 17, 10, METATILE_BikeShop_Button_Pressed, 0
+	setmetatile 25, 18, METATILE_BikeShop_Button_Pressed, 0
+	setmetatile 18, 36, METATILE_BikeShop_Button_Pressed, 0
+	setmetatile 6, 11, METATILE_BikeShop_Button_Blue, 0
+	setmetatile 13, 10, METATILE_BikeShop_Button_Blue, 0
+	setmetatile 16, 22, METATILE_BikeShop_Button_Blue, 0
+	setmetatile 4, 26, METATILE_BikeShop_Button_Blue, 0
+	setmetatile 30, 38, METATILE_BikeShop_Button_Blue, 0
 	return
 
 NewMauville_Inside_EventScript_237725:: @ 8237725
@@ -153,15 +153,15 @@ NewMauville_Inside_EventScript_237725:: @ 8237725
 	end
 
 NewMauville_Inside_EventScript_23773A:: @ 823773A
-	setmetatile 33, 6, 591, 0
-	setmetatile 32, 2, 752, 1
-	setmetatile 33, 2, 753, 1
-	setmetatile 34, 2, 754, 1
-	setmetatile 35, 2, 755, 1
-	setmetatile 32, 3, 756, 1
-	setmetatile 33, 3, 757, 1
-	setmetatile 34, 3, 758, 1
-	setmetatile 35, 3, 759, 1
+	setmetatile 33, 6, METATILE_BikeShop_Button_Pressed, 0
+	setmetatile 32, 2, METATILE_BikeShop_Generator_Off_Tile0, 1
+	setmetatile 33, 2, METATILE_BikeShop_Generator_Off_Tile1, 1
+	setmetatile 34, 2, METATILE_BikeShop_Generator_Off_Tile2, 1
+	setmetatile 35, 2, METATILE_BikeShop_Generator_Off_Tile3, 1
+	setmetatile 32, 3, METATILE_BikeShop_Generator_Off_Tile4, 1
+	setmetatile 33, 3, METATILE_BikeShop_Generator_Off_Tile5, 1
+	setmetatile 34, 3, METATILE_BikeShop_Generator_Off_Tile6, 1
+	setmetatile 35, 3, METATILE_BikeShop_Generator_Off_Tile7, 1
 	special DrawWholeMapView
 	return
 
diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc
index f5d1f3ff6..d37bcfd91 100644
--- a/data/maps/PetalburgCity_Gym/scripts.inc
+++ b/data/maps/PetalburgCity_Gym/scripts.inc
@@ -1146,51 +1146,51 @@ PetalburgCity_Gym_EventScript_205645:: @ 8205645
 	return
 
 PetalburgCity_Gym_EventScript_205666:: @ 8205666
-	setmetatile 6, 85, 528, 0
-	setmetatile 7, 85, 529, 0
-	setmetatile 1, 98, 528, 0
-	setmetatile 2, 98, 529, 0
+	setmetatile 6, 85, METATILE_PetalburgGym_RoomEntrance_Left, 0
+	setmetatile 7, 85, METATILE_PetalburgGym_RoomEntrance_Right, 0
+	setmetatile 1, 98, METATILE_PetalburgGym_RoomEntrance_Left, 0
+	setmetatile 2, 98, METATILE_PetalburgGym_RoomEntrance_Right, 0
 	return
 
 PetalburgCity_Gym_EventScript_20568B:: @ 820568B
-	setmetatile 6, 46, 528, 0
-	setmetatile 7, 46, 529, 0
-	setmetatile 1, 59, 528, 0
-	setmetatile 2, 59, 529, 0
+	setmetatile 6, 46, METATILE_PetalburgGym_RoomEntrance_Left, 0
+	setmetatile 7, 46, METATILE_PetalburgGym_RoomEntrance_Right, 0
+	setmetatile 1, 59, METATILE_PetalburgGym_RoomEntrance_Left, 0
+	setmetatile 2, 59, METATILE_PetalburgGym_RoomEntrance_Right, 0
 	return
 
 PetalburgCity_Gym_EventScript_2056B0:: @ 82056B0
-	setmetatile 6, 59, 528, 0
-	setmetatile 7, 59, 529, 0
-	setmetatile 1, 72, 528, 0
-	setmetatile 2, 72, 529, 0
+	setmetatile 6, 59, METATILE_PetalburgGym_RoomEntrance_Left, 0
+	setmetatile 7, 59, METATILE_PetalburgGym_RoomEntrance_Right, 0
+	setmetatile 1, 72, METATILE_PetalburgGym_RoomEntrance_Left, 0
+	setmetatile 2, 72, METATILE_PetalburgGym_RoomEntrance_Right, 0
 	return
 
 PetalburgCity_Gym_EventScript_2056D5:: @ 82056D5
-	setmetatile 1, 20, 528, 0
-	setmetatile 2, 20, 529, 0
+	setmetatile 1, 20, METATILE_PetalburgGym_RoomEntrance_Left, 0
+	setmetatile 2, 20, METATILE_PetalburgGym_RoomEntrance_Right, 0
 	return
 
 PetalburgCity_Gym_EventScript_2056E8:: @ 82056E8
-	setmetatile 6, 20, 528, 0
-	setmetatile 7, 20, 529, 0
-	setmetatile 1, 33, 528, 0
-	setmetatile 2, 33, 529, 0
+	setmetatile 6, 20, METATILE_PetalburgGym_RoomEntrance_Left, 0
+	setmetatile 7, 20, METATILE_PetalburgGym_RoomEntrance_Right, 0
+	setmetatile 1, 33, METATILE_PetalburgGym_RoomEntrance_Left, 0
+	setmetatile 2, 33, METATILE_PetalburgGym_RoomEntrance_Right, 0
 	return
 
 PetalburgCity_Gym_EventScript_20570D:: @ 820570D
-	setmetatile 6, 33, 528, 0
-	setmetatile 7, 33, 529, 0
+	setmetatile 6, 33, METATILE_PetalburgGym_RoomEntrance_Left, 0
+	setmetatile 7, 33, METATILE_PetalburgGym_RoomEntrance_Right, 0
 	return
 
 PetalburgCity_Gym_EventScript_205720:: @ 8205720
-	setmetatile 1, 7, 528, 0
-	setmetatile 2, 7, 529, 0
+	setmetatile 1, 7, METATILE_PetalburgGym_RoomEntrance_Left, 0
+	setmetatile 2, 7, METATILE_PetalburgGym_RoomEntrance_Right, 0
 	return
 
 PetalburgCity_Gym_EventScript_205733:: @ 8205733
-	setmetatile 6, 7, 528, 0
-	setmetatile 7, 7, 529, 0
+	setmetatile 6, 7, METATILE_PetalburgGym_RoomEntrance_Left, 0
+	setmetatile 7, 7, METATILE_PetalburgGym_RoomEntrance_Right, 0
 	return
 
 PetalburgCity_Gym_EventScript_205746:: @ 8205746