Merge branch 'master' into doc-routes1

1739 files changed, 9324 insertions, 9542 deletions

diff --git a/data/berry_crush.s b/data/berry_crush.s
index cc7ae23fd..417347801 100644
--- a/data/berry_crush.s
+++ b/data/berry_crush.s
@@ -339,22 +339,28 @@ gUnknown_846F458:: @ 846F458
 gUnknown_846F470:: @ 846F470
 	spr_template 5, 5, gOamData_AffineDouble_ObjNormal_32x32, gUnknown_846F404, NULL, gUnknown_846F408, SpriteCallbackDummy
 
-gUnknown_846F488:: @ 846F488 struct UnkStruct3? perhaps not
-	.byte 9, 2, 8
+gUnknown_846F488:: @ 846F488 DigitObjUtilTemplate
+	@ strConvMode, shape, size, priority
+	.byte 1 | (2 /*ST_OAM_V_RECTANGLE*/ << 2) | (0 << 4) | (0 << 6) @ 9
+	.byte 2, 8 @ ndigits, width
 	.align 2
-	.2byte 0x9c, 0x00
-	.4byte gUnknown_846F2F8 + 0x18
-	.4byte gUnknown_846F320 + 0x10
-	.byte 8, 2, 8
+	.2byte 0x9c, 0x00 @ x, y
+	.4byte gUnknown_846F2F8 + 0x18 @ spriteSheet
+	.4byte gUnknown_846F320 + 0x10 @ spritePalette
+	@ strConvMode, shape, size, priority
+	.byte 0 | (2 /*ST_OAM_V_RECTANGLE*/ << 2) | (0 << 4) | (0 << 6) @ 8
+	.byte 2, 8 @ ndigits, width
 	.align 2
-	.2byte 0xb4, 0x00
-	.4byte gUnknown_846F2F8 + 0x18
-	.4byte gUnknown_846F320 + 0x10
-	.byte 8, 2, 8
+	.2byte 0xb4, 0x00 @ x, y
+	.4byte gUnknown_846F2F8 + 0x18 @ spriteSheet
+	.4byte gUnknown_846F320 + 0x10 @ spritePalette
+	@ strConvMode, shape, size, priority
+	.byte 0 | (2 /*ST_OAM_V_RECTANGLE*/ << 2) | (0 << 4) | (0 << 6) @ 8
+	.byte 2, 8 @ ndigits, width
 	.align 2
-	.2byte 0xcc, 0x00
-	.4byte gUnknown_846F2F8 + 0x18
-	.4byte gUnknown_846F320 + 0x10
+	.2byte 0xcc, 0x00 @ x, y
+	.4byte gUnknown_846F2F8 + 0x18 @ spriteSheet
+	.4byte gUnknown_846F320 + 0x10 @ spritePalette
 
 gUnknown_846F4B8:: @ 846F4B8
 	.4byte gUnknown_841D034
diff --git a/data/data_8479668.s b/data/data_8479668.s
index 393a5cc44..6d8a22898 100644
--- a/data/data_8479668.s
+++ b/data/data_8479668.s
@@ -174,52 +174,10 @@ gText_UnionRoomChatKeyboard_Emoji9::
 gText_UnionRoomChatKeyboard_Emoji10::
 	.string "{EXTRA 210}{EXTRA 208}ょ: $"
 
-	// trainer_tower (again?)
-
 	@ 847ABAC
 .align 2
 	.include "data/trainer_tower/trainers.inc"
 
-	.align 2
-gUnknown_84827AC:: @ 84827AC
-	.byte 0x08, 0x01
-	.align 2
-	.4byte 0
-
-gUnknown_84827B4:: @ 84827B4
-	.4byte gUnknown_847F16C
-	.4byte gUnknown_847D26C
-	.4byte gUnknown_84808AC
-	.4byte gUnknown_847ABAC
-	.4byte gUnknown_847CAAC
-	.4byte gUnknown_847E9AC
-	.4byte gUnknown_847AF8C
-	.4byte gUnknown_847CE8C
-	.4byte gUnknown_847DA2C
-	.4byte gUnknown_847BF0C
-	.4byte gUnknown_847D64C
-	.4byte gUnknown_847DE0C
-	.4byte gUnknown_847B74C
-	.4byte gUnknown_847BB2C
-	.4byte gUnknown_848182C
-	.4byte gUnknown_847F92C
-	.4byte gUnknown_847C2EC
-	.4byte gUnknown_847C6CC
-	.4byte gUnknown_847E5CC
-	.4byte gUnknown_84804CC
-	.4byte gUnknown_84823CC
-	.4byte gUnknown_8481FEC
-	.4byte gUnknown_84800EC
-	.4byte gUnknown_847E1EC
-	.4byte gUnknown_847ED8C
-	.4byte gUnknown_848106C
-	.4byte gUnknown_8480C8C
-	.4byte gUnknown_847F92C
-	.4byte gUnknown_847F54C
-	.4byte gUnknown_847E1EC
-	.4byte gUnknown_847D64C
-	.4byte gUnknown_847C6CC
-
 	.include "data/text/move_descriptions.inc"
 
 	.align 2, 0
diff --git a/data/event_object_80688E4.s b/data/event_object_80688E4.s
deleted file mode 100644
index 8d1917825..000000000
--- a/data/event_object_80688E4.s
+++ /dev/null
@@ -1,97 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-	.section .rodata
-	.align 2
-
-gUnknown_83A710C::
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-	.4byte little_step
-
-gUnknown_83A714C::
-	.4byte double_little_steps
-	.4byte double_little_steps
-	.4byte double_little_steps
-	.4byte double_little_steps
-	.4byte double_little_steps
-	.4byte double_little_steps
-	.4byte double_little_steps
-	.4byte double_little_steps
-
-gUnknown_83A716C::
-	.4byte double_little_steps
-	.4byte triple_little_steps
-	.4byte triple_little_steps
-	.4byte double_little_steps
-	.4byte triple_little_steps
-	.4byte triple_little_steps
-
-gUnknown_83A7184::
-	.4byte quad_little_steps
-	.4byte quad_little_steps
-	.4byte quad_little_steps
-	.4byte quad_little_steps
-
-gUnknown_83A7194::
-	.4byte oct_little_steps
-	.4byte oct_little_steps
-
-gUnknown_83A719C:: @ 83A719C
-	.4byte gUnknown_83A710C
-	.4byte gUnknown_83A714C
-	.4byte gUnknown_83A716C
-	.4byte gUnknown_83A7184
-	.4byte gUnknown_83A7194
-
-gUnknown_83A71B0:: @ 83A71B0
-	.2byte 0x0010, 0x0008, 0x0006, 0x0004, 0x0002
-
-gUnknown_83A71BA::
-	.byte 0xfc, 0xfa, 0xf8, 0xf6, 0xf5, 0xf4, 0xf4, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xfa, 0xfc, 0x00, 0x00
-
-gUnknown_83A71CA::
-	.byte 0x00, 0xfe, 0xfd, 0xfc, 0xfb, 0xfa, 0xfa, 0xfa, 0xfb, 0xfb, 0xfc, 0xfd, 0xfe, 0x00, 0x00, 0x00
-
-gUnknown_83A71DA::
-	.byte 0xfe, 0xfc, 0xfa, 0xf8, 0xf7, 0xf6, 0xf6, 0xf6, 0xf7, 0xf8, 0xfa, 0xfb, 0xfd, 0xfe, 0x00, 0x00
-
-	.align 2
-gUnknown_83A71EC:: @ 83A71EC
-	.4byte gUnknown_83A71BA
-	.4byte gUnknown_83A71CA
-	.4byte gUnknown_83A71DA
-
-	.align 1
-gUnknown_83A71F8:: @ 83A71F8
-	.2byte 0x10, 0x10, 0x20
-
-gUnknown_83A71FE:: @ 83A71FE
-	.byte 0, 0, 1
-
-	.align 1
-gUnknown_83A7202:: @ 83A7202
-	.2byte 0x20, 0x20, 0x40
-
-gUnknown_83A7208:: @ 83A7208
-	.byte 1, 1, 2
-
-	.align 2
-gUnknown_83A720C:: @ 83A720C
-	abspath "evobjmv.c"
-
-	.align 2
-gUnknown_83A7240:: @ 83A7240
-	.asciz "0"
diff --git a/data/event_scripts.s b/data/event_scripts.s
index e28093686..b787a52a5 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -17,19 +17,24 @@
 #include "constants/spawn_points.h"
 #include "constants/field_effects.h"
 #include "constants/trainers.h"
+#include "constants/trainer_tower.h"
 #include "constants/object_events.h"
 #include "constants/fame_checker.h"
 #include "constants/seagallop.h"
 #include "constants/game_stat.h"
+#include "constants/coins.h"
 #include "constants/menu.h"
 #include "constants/battle_setup.h"
 #include "constants/map_scripts.h"
 #include "constants/cable_club.h"
+#include "constants/field_tasks.h"
 #include "constants/field_weather.h"
+#include "constants/weather.h"
 #include "constants/union_room.h"
 #include "constants/trade.h"
 #include "constants/quest_log.h"
 #include "constants/daycare.h"
+#include "constants/easy_chat.h"
 	.include "asm/macros.inc"
 	.include "asm/macros/event.inc"
 	.set FALSE, 0
@@ -208,17 +213,17 @@ gStdScriptsEnd::
 	.include "data/maps/SixIsland_PatternBush/scripts.inc"
 	.include "data/maps/SixIsland_AlteringCave/scripts.inc"
 	.include "data/maps/NavelRock_Exterior/scripts.inc"
-	.include "data/maps/SevenIsland_TrainerTower_1F/scripts.inc"
-	.include "data/maps/SevenIsland_TrainerTower_2F/scripts.inc"
-	.include "data/maps/SevenIsland_TrainerTower_3F/scripts.inc"
-	.include "data/maps/SevenIsland_TrainerTower_4F/scripts.inc"
-	.include "data/maps/SevenIsland_TrainerTower_5F/scripts.inc"
-	.include "data/maps/SevenIsland_TrainerTower_6F/scripts.inc"
-	.include "data/maps/SevenIsland_TrainerTower_7F/scripts.inc"
-	.include "data/maps/SevenIsland_TrainerTower_8F/scripts.inc"
-	.include "data/maps/SevenIsland_TrainerTower_Roof/scripts.inc"
-	.include "data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc"
-	.include "data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc"
+	.include "data/maps/TrainerTower_1F/scripts.inc"
+	.include "data/maps/TrainerTower_2F/scripts.inc"
+	.include "data/maps/TrainerTower_3F/scripts.inc"
+	.include "data/maps/TrainerTower_4F/scripts.inc"
+	.include "data/maps/TrainerTower_5F/scripts.inc"
+	.include "data/maps/TrainerTower_6F/scripts.inc"
+	.include "data/maps/TrainerTower_7F/scripts.inc"
+	.include "data/maps/TrainerTower_8F/scripts.inc"
+	.include "data/maps/TrainerTower_Roof/scripts.inc"
+	.include "data/maps/TrainerTower_Lobby/scripts.inc"
+	.include "data/maps/TrainerTower_Elevator/scripts.inc"
 	.include "data/maps/FiveIsland_LostCave_Entrance/scripts.inc"
 	.include "data/maps/FiveIsland_LostCave_Room1/scripts.inc"
 	.include "data/maps/FiveIsland_LostCave_Room2/scripts.inc"
@@ -278,7 +283,7 @@ gStdScriptsEnd::
 	.include "data/maps/CinnabarIsland/scripts.inc"
 	.include "data/maps/IndigoPlateau_Exterior/scripts.inc"
 	.include "data/maps/SaffronCity/scripts.inc"
-	.include "data/maps/SaffronCity_Classic/scripts.inc"
+	.include "data/maps/SaffronCity_Connection/scripts.inc"
 	.include "data/maps/OneIsland/scripts.inc"
 	.include "data/maps/TwoIsland/scripts.inc"
 	.include "data/maps/ThreeIsland/scripts.inc"
@@ -317,10 +322,10 @@ gStdScriptsEnd::
 	.include "data/maps/TwoIsland_CapeBrink/scripts.inc"
 	.include "data/maps/ThreeIsland_BondBridge/scripts.inc"
 	.include "data/maps/ThreeIsland_Port/scripts.inc"
-	.include "data/maps/UnknownMap_03_50/scripts.inc"
-	.include "data/maps/UnknownMap_03_51/scripts.inc"
-	.include "data/maps/UnknownMap_03_52/scripts.inc"
-	.include "data/maps/UnknownMap_03_53/scripts.inc"
+	.include "data/maps/Prototype_SeviiIsle_6/scripts.inc"
+	.include "data/maps/Prototype_SeviiIsle_7/scripts.inc"
+	.include "data/maps/Prototype_SeviiIsle_8/scripts.inc"
+	.include "data/maps/Prototype_SeviiIsle_9/scripts.inc"
 	.include "data/maps/FiveIsland_ResortGorgeous/scripts.inc"
 	.include "data/maps/FiveIsland_WaterLabyrinth/scripts.inc"
 	.include "data/maps/FiveIsland_Meadow/scripts.inc"
@@ -415,15 +420,15 @@ gStdScriptsEnd::
 	.include "data/maps/CinnabarIsland_Mart/scripts.inc"
 	.include "data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc"
 	.include "data/maps/IndigoPlateau_PokemonCenter_2F/scripts.inc"
-	.include "data/maps/SaffronCity_House1_1F/scripts.inc"
-	.include "data/maps/SaffronCity_House1_2F/scripts.inc"
+	.include "data/maps/SaffronCity_CopycatsHouse_1F/scripts.inc"
+	.include "data/maps/SaffronCity_CopycatsHouse_2F/scripts.inc"
 	.include "data/maps/SaffronCity_Dojo/scripts.inc"
 	.include "data/maps/SaffronCity_Gym/scripts.inc"
-	.include "data/maps/SaffronCity_House2/scripts.inc"
+	.include "data/maps/SaffronCity_House/scripts.inc"
 	.include "data/maps/SaffronCity_Mart/scripts.inc"
 	.include "data/maps/SaffronCity_PokemonCenter_1F/scripts.inc"
 	.include "data/maps/SaffronCity_PokemonCenter_2F/scripts.inc"
-	.include "data/maps/SaffronCity_House3/scripts.inc"
+	.include "data/maps/SaffronCity_MrPsychicsHouse/scripts.inc"
 	.include "data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc"
 	.include "data/maps/Route2_ViridianForest_SouthEntrance/scripts.inc"
 	.include "data/maps/Route2_House/scripts.inc"
@@ -593,7 +598,7 @@ gStdScriptsEnd::
 	.include "data/maps/FiveIsland_RocketWarehouse/text.inc"
 	.include "data/maps/SixIsland_DottedHole_SapphireRoom/text.inc"
 	.include "data/maps/SixIsland_PatternBush/text.inc"
-	.include "data/maps/SevenIsland_TrainerTower_Lobby/text.inc"
+	.include "data/maps/TrainerTower_Lobby/text.inc"
 	.include "data/maps/FiveIsland_LostCave_Room1/text.inc"
 	.include "data/maps/FiveIsland_LostCave_Room4/text.inc"
 	.include "data/maps/FiveIsland_LostCave_Room10/text.inc"
@@ -658,6 +663,7 @@ gStdScriptsEnd::
 	.include "data/maps/SevenIsland_TrainerTower/text.inc"
 	.include "data/maps/SevenIsland_SevaultCanyon_Entrance/text.inc"
 	.include "data/maps/SevenIsland_SevaultCanyon/text.inc"
+	.include "data/maps/SevenIsland_TanobyRuins/text.inc"
 	.include "data/maps/PalletTown_PlayersHouse_1F/text.inc"
 	.include "data/maps/PalletTown_PlayersHouse_2F/text.inc"
 	.include "data/maps/PalletTown_GarysHouse/text.inc"
@@ -730,14 +736,14 @@ gStdScriptsEnd::
 	.include "data/maps/CinnabarIsland_PokemonCenter_1F/text.inc"
 	.include "data/maps/CinnabarIsland_Mart/text.inc"
 	.include "data/maps/IndigoPlateau_PokemonCenter_1F/text.inc"
-	.include "data/maps/SaffronCity_House1_1F/text.inc"
-	.include "data/maps/SaffronCity_House1_2F/text.inc"
+	.include "data/maps/SaffronCity_CopycatsHouse_1F/text.inc"
+	.include "data/maps/SaffronCity_CopycatsHouse_2F/text.inc"
 	.include "data/maps/SaffronCity_Dojo/text.inc"
 	.include "data/maps/SaffronCity_Gym/text.inc"
-	.include "data/maps/SaffronCity_House2/text.inc"
+	.include "data/maps/SaffronCity_House/text.inc"
 	.include "data/maps/SaffronCity_Mart/text.inc"
 	.include "data/maps/SaffronCity_PokemonCenter_1F/text.inc"
-	.include "data/maps/SaffronCity_House3/text.inc"
+	.include "data/maps/SaffronCity_MrPsychicsHouse/text.inc"
 	.include "data/maps/SaffronCity_PokemonTrainerFanClub/text.inc"
 	.include "data/maps/Route2_ViridianForest_SouthEntrance/text.inc"
 	.include "data/maps/Route2_House/text.inc"
@@ -966,7 +972,7 @@ Text_HavePokedexRated:: @ 81A5C03
 Text_ClosedLinkToProfOaksPC:: @ 81A5C2E
 	.string "Closed link to PROF. OAK's PC.$"
 
-Text_1A5C4D:: @ 81A5C4D
+Text_VoiceRangOutDontRunAway:: @ 81A5C4D
 	.string "Someone's voice rang out,\n"
 	.string "“Don't run away!”$"
 
@@ -1169,10 +1175,9 @@ EventScript_ResetEliteFour:: @ 81A6551
 	.include "data/scripts/obtain_item.inc"
 	.include "data/scripts/pc.inc"
 
-@ DoEasyChatScreen?
-EventScript_1A6AC0:: @ 81A6AC0
+Common_ShowEasyChatScreen:: @ 81A6AC0
 	fadescreen FADE_TO_BLACK
-	special sub_80FEE44
+	special ShowEasyChatScreen
 	fadescreen FADE_FROM_BLACK
 	return
 
@@ -1258,71 +1263,7 @@ EventScript_1A74F2:: @ 81A74F2
 	removeitem VAR_0x8004, 1
 	return
 
-EventScript_1A7506:: @ 81A7506
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_Delay32
-	waitmovement 0
-	playse SE_DOOR
-	call EventScript_1A7538
-	special DrawWholeMapView
-	setflag FLAG_TEMP_4
-	return
-
-EventScript_1A751F:: @ 81A751F
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkUp5
-	waitmovement 0
-	setflag FLAG_TEMP_2
-	playse SE_KI_GASYAN
-	call EventScript_1A759C
-	special DrawWholeMapView
-	return
-
-EventScript_1A7538:: @ 81A7538
-	setmetatile 6, 1, 654, 1
-	setmetatile 6, 2, 662, 0
-	return
-
-EventScript_1A754B:: @ 81A754B
-	lockall
-	textcolor 0
-	msgbox Text_1A5C4D
-	closemessage
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_1A75D3
-	waitmovement 0
-	releaseall
-	end
-
-EventScript_1A7563:: @ 81A7563
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_Delay32
-	waitmovement 0
-	playse SE_DOOR
-	setmetatile 6, 4, 654, 1
-	setmetatile 6, 5, 662, 0
-	special DrawWholeMapView
-	setflag FLAG_TEMP_4
-	return
-
-EventScript_1A7589:: @ 81A7589
-	setmetatile 6, 4, 654, 1
-	setmetatile 6, 5, 662, 0
-	return
-
-EventScript_1A759C:: @ 81A759C
-	setmetatile 5, 11, 669, 1
-	setmetatile 6, 11, 670, 1
-	setmetatile 7, 11, 671, 1
-	setmetatile 5, 12, 677, 1
-	setmetatile 6, 12, 678, 1
-	setmetatile 7, 12, 679, 1
-	return
-
-Movement_1A75D3:: @ 81A75D3
-	walk_up
-	step_end
-
-EventScript_1A75D5:: @ 81A75D5
-	special Special_PokemonLeagueLightingEffect
-	return
-
+	.include "data/scripts/pokemon_league.inc"
 	.include "data/scripts/movement.inc"	
 	.include "data/scripts/flavor_text.inc"
 
@@ -1332,8 +1273,8 @@ gUnknown_81A7702:: @ 81A7702
 	msgbox Text_FillOutQuestionnaire, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq EventScript_1A778A
-	setvar VAR_0x8004, 14
-	call EventScript_1A6AC0
+	setvar VAR_0x8004, EASY_CHAT_TYPE_QUESTIONNAIRE
+	call Common_ShowEasyChatScreen
 	lock
 	faceplayer
 	specialvar VAR_0x8008, Special_GetMartClerkObjectId
@@ -1407,7 +1348,7 @@ Route18_EastEntrance_1F_EventScript_1A77C1:: @ 81A77C1
 
 	.include "data/scripts/route23.inc"
 
-EventScript_1A7AB9:: @ 81A7AB9
+EventScript_GetElevatorFloor:: @ 81A7AB9
 	special Special_GetElevatorFloor
 	return
 
@@ -1648,9 +1589,9 @@ EventScript_1A8EC0:: @ 81A8EC0
 	.include "data/scripts/seagallop.inc"
 	.include "data/scripts/static_pokemon.inc"
 
-EventScript_1A925E:: @ 81A925E
+EventScript_TryDarkenRuins:: @ 81A925E
 	goto_if_set FLAG_SYS_UNLOCKED_TANOBY_RUINS, EventScript_Return
-	setweather 11
+	setweather WEATHER_SHADE
 	doweather
 	return
 
@@ -1680,419 +1621,35 @@ Text_1ACD45:: @ 81ACD45
 	.include "data/scripts/fame_checker.inc"
 	.include "data/text/fame_checker.inc"
 
-CeladonCity_GameCorner_EventScript_1B2867:: @ 81B2867
-	lockall
-	showmoneybox 0, 0, 0
-	msgbox gUnknown_81B1D7D, MSGBOX_YESNO
-	compare VAR_RESULT, NO
-	goto_if_eq EventScript_1B2926
-	checkmoney 50, 0
-	compare VAR_RESULT, FALSE
-	goto_if_eq EventScript_1B292B
-	playse SE_SHOP
-	removemoney 50, 0
-	updatemoneybox 0, 0, 0
-	waitse
-	message gUnknown_81B1E24
-	waitmessage
-	multichoice 21, 0, MULTICHOICE_TRAINER_CARD_ICON_TINT, TRUE
-	switch VAR_RESULT
-	case 0, EventScript_1B28DB
-	case 1, EventScript_1B28E6
-	case 2, EventScript_1B28F1
-	case 3, EventScript_1B28FC
-	end
-
-EventScript_1B28DB:: @ 81B28DB
-	setvar VAR_0x8004, 0
-	goto EventScript_1B2907
-
-EventScript_1B28E5:: @ 81B28E5
-	end
-
-EventScript_1B28E6:: @ 81B28E6
-	setvar VAR_0x8004, 1
-	goto EventScript_1B2907
-
-EventScript_1B28F0:: @ 81B28F0
-	end
-
-EventScript_1B28F1:: @ 81B28F1
-	setvar VAR_0x8004, 2
-	goto EventScript_1B2907
-
-EventScript_1B28FB:: @ 81B28FB
-	end
-
-EventScript_1B28FC:: @ 81B28FC
-	setvar VAR_0x8004, 3
-	goto EventScript_1B2907
-
-EventScript_1B2906:: @ 81B2906
-	end
-
-EventScript_1B2907:: @ 81B2907
-	message gUnknown_81B1E42
-	waitmessage
-	playse MUS_ME_PHOTO
-	dofieldeffect FLDEFF_UNK_45
-	delay 60
-	special Special_UpdateTrainerCardPhotoIcons
-	msgbox gUnknown_81B1E7D
-	hidemoneybox 0, 0
-	releaseall
-	end
-
-EventScript_1B2926:: @ 81B2926
-	hidemoneybox 0, 0
-	releaseall
-	end
-
-EventScript_1B292B:: @ 81B292B
-	msgbox gUnknown_81B1E07
-	hidemoneybox 0, 0
-	releaseall
-	end
-
-FourIsland_House2_EventScript_1B2938:: @ 81B2938
-	lock
-	specialvar VAR_0x8008, Special_StickerLadyGetBragFlags
-	goto_if_unset FLAG_MET_STICKER_LADY, EventScript_1B2951
-	goto_if_set FLAG_MET_STICKER_LADY, EventScript_1B2994
-	end
-
-EventScript_1B2951:: @ 81B2951
-	setflag FLAG_MET_STICKER_LADY
-	msgbox gUnknown_81B1EB3
-	applymovement 1, Movement_FacePlayer
-	waitmovement 0
-	playse SE_PIN
-	applymovement 1, Movement_ExclamationMark
-	waitmovement 0
-	applymovement 1, Movement_Delay48
-	waitmovement 0
-	compare VAR_0x8008, 0
-	goto_if_eq EventScript_1B2B8E
-	message gUnknown_81B1EF8
-	waitmessage
-	goto EventScript_1B29D0
-
-EventScript_1B2993:: @ 81B2993
-	end
-
-EventScript_1B2994:: @ 81B2994
-	applymovement 1, Movement_FacePlayer
-	waitmovement 0
-	goto_if_questlog EventScript_ReleaseEnd
-	special sub_8112364
-	compare VAR_0x8008, 0
-	goto_if_eq EventScript_1B29C6
-	message gUnknown_81B2025
-	waitmessage
-	goto EventScript_1B29D0
-
-EventScript_1B29C5:: @ 81B29C5
-	end
-
-EventScript_1B29C6:: @ 81B29C6
-	msgbox gUnknown_81B1FEF
-	release
-	end
-
-EventScript_1B29D0:: @ 81B29D0
-	switch VAR_0x8008
-	case 1, EventScript_1B2A23
-	case 2, EventScript_1B2A4F
-	case 4, EventScript_1B2A7B
-	case 3, EventScript_1B2AA7
-	case 5, EventScript_1B2ADE
-	case 6, EventScript_1B2B15
-	case 7, EventScript_1B2B4C
-	end
-
-EventScript_1B2A23:: @ 81B2A23
-	multichoice 15, 8, MULTICHOICE_HOF_QUIT, FALSE
-	switch VAR_RESULT
-	case 0, EventScript_1B2B98
-	case 1, EventScript_1B2DF6
-	case SCR_MENU_CANCEL, EventScript_1B2DF6
-	end
-
-EventScript_1B2A4F:: @ 81B2A4F
-	multichoice 16, 8, MULTICHOICE_EGGS_QUIT, FALSE
-	switch VAR_RESULT
-	case 0, EventScript_1B2C62
-	case 1, EventScript_1B2DF6
-	case SCR_MENU_CANCEL, EventScript_1B2DF6
-	end
-
-EventScript_1B2A7B:: @ 81B2A7B
-	multichoice 15, 8, MULTICHOICE_VICTORIES_QUIT, FALSE
-	switch VAR_RESULT
-	case 0, EventScript_1B2D2C
-	case 1, EventScript_1B2DF6
-	case SCR_MENU_CANCEL, EventScript_1B2DF6
-	end
-
-EventScript_1B2AA7:: @ 81B2AA7
-	multichoice 15, 6, MULTICHOICE_HOF_EGGS_QUIT, FALSE
-	switch VAR_RESULT
-	case 0, EventScript_1B2B98
-	case 1, EventScript_1B2C62
-	case 2, EventScript_1B2DF6
-	case SCR_MENU_CANCEL, EventScript_1B2DF6
-	end
-
-EventScript_1B2ADE:: @ 81B2ADE
-	multichoice 15, 6, MULTICHOICE_HOF_VICTORIES_QUIT, FALSE
-	switch VAR_RESULT
-	case 0, EventScript_1B2B98
-	case 1, EventScript_1B2D2C
-	case 2, EventScript_1B2DF6
-	case SCR_MENU_CANCEL, EventScript_1B2DF6
-	end
-
-EventScript_1B2B15:: @ 81B2B15
-	multichoice 15, 6, MULTICHOICE_EGGS_VICTORIES_QUIT, FALSE
-	switch VAR_RESULT
-	case 0, EventScript_1B2C62
-	case 1, EventScript_1B2D2C
-	case 2, EventScript_1B2DF6
-	case SCR_MENU_CANCEL, EventScript_1B2DF6
-	end
-
-EventScript_1B2B4C:: @ 81B2B4C
-	multichoice 15, 5, MULTICHOICE_HOF_EGGS_VICTORIES_QUIT, FALSE
-	switch VAR_RESULT
-	case 0, EventScript_1B2B98
-	case 1, EventScript_1B2C62
-	case 2, EventScript_1B2D2C
-	case 3, EventScript_1B2DF6
-	case SCR_MENU_CANCEL, EventScript_1B2DF6
-	end
-
-EventScript_1B2B8E:: @ 81B2B8E
-	msgbox gUnknown_81B1EF8
-	release
-	end
-
-EventScript_1B2B98:: @ 81B2B98
-	compare VAR_0x8004, 39
-	goto_if_le EventScript_1B2BC5
-	compare VAR_0x8004, 99
-	goto_if_le EventScript_1B2BE3
-	compare VAR_0x8004, 199
-	goto_if_le EventScript_1B2C01
-	compare VAR_0x8004, 200
-	goto_if_ge EventScript_1B2C1F
-	end
-
-EventScript_1B2BC5:: @ 81B2BC5
-	compare VAR_HOF_BRAG_STATE, 1
-	goto_if_eq EventScript_1B2C3D
-	setvar VAR_HOF_BRAG_STATE, 1
-	msgbox gUnknown_81B206E
-	goto EventScript_1B2C51
-
-EventScript_1B2BE2:: @ 81B2BE2
-	end
-
-EventScript_1B2BE3:: @ 81B2BE3
-	compare VAR_HOF_BRAG_STATE, 2
-	goto_if_eq EventScript_1B2C3D
-	setvar VAR_HOF_BRAG_STATE, 2
-	msgbox gUnknown_81B20CF
-	goto EventScript_1B2C51
-
-EventScript_1B2C00:: @ 81B2C00
-	end
-
-EventScript_1B2C01:: @ 81B2C01
-	compare VAR_HOF_BRAG_STATE, 3
-	goto_if_eq EventScript_1B2C3D
-	setvar VAR_HOF_BRAG_STATE, 3
-	msgbox gUnknown_81B2133
-	goto EventScript_1B2C51
-
-EventScript_1B2C1E:: @ 81B2C1E
-	end
-
-EventScript_1B2C1F:: @ 81B2C1F
-	compare VAR_HOF_BRAG_STATE, 4
-	goto_if_eq EventScript_1B2C47
-	setvar VAR_HOF_BRAG_STATE, 4
-	msgbox gUnknown_81B21C4
-	goto EventScript_1B2C51
-
-EventScript_1B2C3C:: @ 81B2C3C
-	end
-
-EventScript_1B2C3D:: @ 81B2C3D
-	msgbox gUnknown_81B227C
-	release
-	end
-
-EventScript_1B2C47:: @ 81B2C47
-	msgbox gUnknown_81B22B0
-	release
-	end
-
-EventScript_1B2C51:: @ 81B2C51
-	textcolor 3
-	playfanfare MUS_FANFA1
-	message gUnknown_81B2242
-	waitmessage
-	waitfanfare
-	delay 90
-	release
-	end
-
-EventScript_1B2C62:: @ 81B2C62
-	compare VAR_0x8005, 99
-	goto_if_le EventScript_1B2C8F
-	compare VAR_0x8005, 199
-	goto_if_le EventScript_1B2CAD
-	compare VAR_0x8005, 299
-	goto_if_le EventScript_1B2CCB
-	compare VAR_0x8005, 300
-	goto_if_ge EventScript_1B2CE9
-	end
-
-EventScript_1B2C8F:: @ 81B2C8F
-	compare VAR_EGG_BRAG_STATE, 1
-	goto_if_eq EventScript_1B2D07
-	setvar VAR_EGG_BRAG_STATE, 1
-	msgbox gUnknown_81B2308
-	goto EventScript_1B2D1B
-
-EventScript_1B2CAC:: @ 81B2CAC
-	end
-
-EventScript_1B2CAD:: @ 81B2CAD
-	compare VAR_EGG_BRAG_STATE, 2
-	goto_if_eq EventScript_1B2D07
-	setvar VAR_EGG_BRAG_STATE, 2
-	msgbox gUnknown_81B2372
-	goto EventScript_1B2D1B
-
-EventScript_1B2CCA:: @ 81B2CCA
-	end
-
-EventScript_1B2CCB:: @ 81B2CCB
-	compare VAR_EGG_BRAG_STATE, 3
-	goto_if_eq EventScript_1B2D07
-	setvar VAR_EGG_BRAG_STATE, 3
-	msgbox gUnknown_81B23E0
-	goto EventScript_1B2D1B
-
-EventScript_1B2CE8:: @ 81B2CE8
-	end
-
-EventScript_1B2CE9:: @ 81B2CE9
-	compare VAR_EGG_BRAG_STATE, 4
-	goto_if_eq EventScript_1B2D11
-	setvar VAR_EGG_BRAG_STATE, 4
-	msgbox gUnknown_81B2448
-	goto EventScript_1B2D1B
-
-EventScript_1B2D06:: @ 81B2D06
-	end
-
-EventScript_1B2D07:: @ 81B2D07
-	msgbox gUnknown_81B251B
-	release
-	end
-
-EventScript_1B2D11:: @ 81B2D11
-	msgbox gUnknown_81B254F
-	release
-	end
-
-EventScript_1B2D1B:: @ 81B2D1B
-	textcolor 3
-	playfanfare MUS_FANFA1
-	message gUnknown_81B24EA
-	waitmessage
-	waitfanfare
-	delay 90
-	release
-	end
-
-EventScript_1B2D2C:: @ 81B2D2C
-	compare VAR_0x8006, 19
-	goto_if_le EventScript_1B2D59
-	compare VAR_0x8006, 49
-	goto_if_le EventScript_1B2D77
-	compare VAR_0x8006, 99
-	goto_if_le EventScript_1B2D95
-	compare VAR_0x8006, 100
-	goto_if_ge EventScript_1B2DB3
-	end
-
-EventScript_1B2D59:: @ 81B2D59
-	compare VAR_LINK_WIN_BRAG_STATE, 1
-	goto_if_eq EventScript_1B2DD1
-	setvar VAR_LINK_WIN_BRAG_STATE, 1
-	msgbox gUnknown_81B25A7
-	goto EventScript_1B2DE5
-
-EventScript_1B2D76:: @ 81B2D76
-	end
-
-EventScript_1B2D77:: @ 81B2D77
-	compare VAR_LINK_WIN_BRAG_STATE, 2
-	goto_if_eq EventScript_1B2DD1
-	setvar VAR_LINK_WIN_BRAG_STATE, 2
-	msgbox gUnknown_81B2609
-	goto EventScript_1B2DE5
+gUnknown_81B1C8B:: @ 81B1C8B
+	.string "Hmm…\n"
+	.string "Is that right…$"
 
-EventScript_1B2D94:: @ 81B2D94
-	end
+gUnknown_81B1C9F:: @ 81B1C9F
+	.string "Oh!\n"
+	.string "Look, look!$"
 
-EventScript_1B2D95:: @ 81B2D95
-	compare VAR_LINK_WIN_BRAG_STATE, 3
-	goto_if_eq EventScript_1B2DD1
-	setvar VAR_LINK_WIN_BRAG_STATE, 3
-	msgbox gUnknown_81B267B
-	goto EventScript_1B2DE5
-
-EventScript_1B2DB2:: @ 81B2DB2
-	end
-
-EventScript_1B2DB3:: @ 81B2DB3
-	compare VAR_LINK_WIN_BRAG_STATE, 4
-	goto_if_eq EventScript_1B2DDB
-	setvar VAR_LINK_WIN_BRAG_STATE, 4
-	msgbox gUnknown_81B26F6
-	goto EventScript_1B2DE5
-
-EventScript_1B2DD0:: @ 81B2DD0
-	end
+gUnknown_81B1CAF:: @ 81B1CAF
+	.string "Read it, read it!$"
 
-EventScript_1B2DD1:: @ 81B2DD1
-	msgbox gUnknown_81B27DB
-	release
-	end
+gUnknown_81B1CC1:: @ 81B1CC1
+	.string "TRAINER TIPS\p"
+	.string "Press START to open the MENU!$"
 
-EventScript_1B2DDB:: @ 81B2DDB
-	msgbox gUnknown_81B280F
-	release
-	end
+gUnknown_81B1CEC:: @ 81B1CEC
+	.string "Signs are useful, aren't they?$"
 
-EventScript_1B2DE5:: @ 81B2DE5
-	textcolor 3
-	playfanfare MUS_FANFA1
-	message gUnknown_81B27A6
-	waitmessage
-	waitfanfare
-	delay 90
-	release
-	end
+gUnknown_81B1D0B:: @ 81B1D0B
+	.string "Look, look!\p"
+	.string "I copied what it said on one of\n"
+	.string "those TRAINER TIPS signs!$"
 
-EventScript_1B2DF6:: @ 81B2DF6
-	release
-	end
+gUnknown_81B1D51:: @ 81B1D51
+	.string "TRAINER TIPS!\p"
+	.string "Press START to open the MENU!$"
 
+	.include "data/text/trainer_card.inc"
+	.include "data/scripts/trainer_card.inc"
 	.include "data/text/help_system.inc"
 	.include "data/scripts/cable_club.inc"
 	.include "data/scripts/field_moves.inc"
diff --git a/data/graphics.s b/data/graphics.s
index 247a5d230..3ae4f8e8a 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -16387,26 +16387,26 @@ gUnionRoomChatIcons:: @ 8EA1A50
 	.incbin "graphics/interface/union_room_chat_icons.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_8EA1B68:: @ 8EA1B68
-	.incbin "data/tilesets/primary/82D4A94/palettes/0.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/1.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/2.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/3.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/4.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/5.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/6.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/7.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/8.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/9.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/10.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/11.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/12.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/13.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/14.gbapal"
-	.incbin "data/tilesets/primary/82D4A94/palettes/15.gbapal"
-
-gTilesetTiles_8EA1D68:: @ 8EA1D68
-	.incbin "data/tilesets/primary/82D4A94/tiles.4bpp.lz"
+gTilesetPalettes_General:: @ 8EA1B68
+	.incbin "data/tilesets/primary/general/palettes/0.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/1.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/2.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/3.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/4.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/5.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/6.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/7.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/8.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/9.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/10.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/11.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/12.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/13.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/14.gbapal"
+	.incbin "data/tilesets/primary/general/palettes/15.gbapal"
+
+gTilesetTiles_General:: @ 8EA1D68
+	.incbin "data/tilesets/primary/general/tiles.4bpp.lz"
 
 gBerryFixGameboy_Pal:: @ 8EA463C
 	.incbin "graphics/berry_fix/gba_small.gbapal"
@@ -16463,50 +16463,50 @@ gBerryFixWindow_Tilemap:: @ 8EA9588
 	.incbin "graphics/berry_fix/window.bin.lz"
 
 	.align 2
-gTilesetPalettes_8EA97F4:: @ 8EA97F4
-	.incbin "data/tilesets/secondary/82D4C74/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4C74/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8EA99F4:: @ 8EA99F4
-	.incbin "data/tilesets/secondary/82D4C74/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8EA9D88:: @ 8EA9D88
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4E6C/palettes/15.gbapal"
-
-
-gTilesetTiles_8EA9F88:: @ 8EA9F88
-	.incbin "data/tilesets/secondary/82D4E6C/tiles.4bpp.lz"
+gTilesetPalettes_GenericBuilding1:: @ 8EA97F4
+	.incbin "data/tilesets/secondary/generic_building1/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/generic_building1/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_GenericBuilding1:: @ 8EA99F4
+	.incbin "data/tilesets/secondary/generic_building1/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_DepartmentStore:: @ 8EA9D88
+	.incbin "data/tilesets/secondary/department_store/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/department_store/palettes/15.gbapal"
+
+
+gTilesetTiles_DepartmentStore:: @ 8EA9F88
+	.incbin "data/tilesets/secondary/department_store/tiles.4bpp.lz"
 
 gUnionRoomChatPanelBgPal_7:: @ 8EAA9F0
 	.incbin "graphics/interface/union_room_chat_panel.gbapal"
diff --git a/data/layouts/SaffronCity_House1_1F/border.bin b/data/layouts/CeladonCity_Hotel_Duplicate/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/SaffronCity_House1_1F/border.bin
+++ b/data/layouts/CeladonCity_Hotel_Duplicate/border.bin
diff --git a/data/layouts/UnusedLayout_833902C/map.bin b/data/layouts/CeladonCity_Hotel_Duplicate/map.bin
index 4573c1444..4573c1444 100644
--- a/data/layouts/UnusedLayout_833902C/map.bin
+++ b/data/layouts/CeladonCity_Hotel_Duplicate/map.bin
diff --git a/data/layouts/SaffronCity_House1_2F/border.bin b/data/layouts/CeladonCity_Restaurant_Duplicate/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/SaffronCity_House1_2F/border.bin
+++ b/data/layouts/CeladonCity_Restaurant_Duplicate/border.bin
diff --git a/data/layouts/UnusedLayout_8338E90/map.bin b/data/layouts/CeladonCity_Restaurant_Duplicate/map.bin
index a5391187c..a5391187c 100644
--- a/data/layouts/UnusedLayout_8338E90/map.bin
+++ b/data/layouts/CeladonCity_Restaurant_Duplicate/map.bin
diff --git a/data/layouts/UnusedLayout_82D6144/border.bin b/data/layouts/EverGrandeCity_HallOfFame/border.bin
index f496f458e..f496f458e 100644
--- a/data/layouts/UnusedLayout_82D6144/border.bin
+++ b/data/layouts/EverGrandeCity_HallOfFame/border.bin
diff --git a/data/layouts/UnusedLayout_82DCA70/map.bin b/data/layouts/EverGrandeCity_HallOfFame/map.bin
index 1df9e4804..1df9e4804 100644
--- a/data/layouts/UnusedLayout_82DCA70/map.bin
+++ b/data/layouts/EverGrandeCity_HallOfFame/map.bin
diff --git a/data/layouts/UnusedLayout_82D6654/border.bin b/data/layouts/FortreeCity_DecorationShop/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnusedLayout_82D6654/border.bin
+++ b/data/layouts/FortreeCity_DecorationShop/border.bin
diff --git a/data/layouts/UnusedLayout_82DB4F0/map.bin b/data/layouts/FortreeCity_DecorationShop/map.bin
index 6ca8b4e61..6ca8b4e61 100644
--- a/data/layouts/UnusedLayout_82DB4F0/map.bin
+++ b/data/layouts/FortreeCity_DecorationShop/map.bin
diff --git a/data/layouts/UnusedLayout_82D672C/border.bin b/data/layouts/FortreeCity_House1/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnusedLayout_82D672C/border.bin
+++ b/data/layouts/FortreeCity_House1/border.bin
diff --git a/data/layouts/UnusedLayout_82D7674/map.bin b/data/layouts/FortreeCity_House1/map.bin
index 5a3ac8cb6..5a3ac8cb6 100644
--- a/data/layouts/UnusedLayout_82D7674/map.bin
+++ b/data/layouts/FortreeCity_House1/map.bin
diff --git a/data/layouts/UnusedLayout_82D75F0/border.bin b/data/layouts/FortreeCity_House2/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnusedLayout_82D75F0/border.bin
+++ b/data/layouts/FortreeCity_House2/border.bin
diff --git a/data/layouts/UnusedLayout_82D7CC8/map.bin b/data/layouts/FortreeCity_House2/map.bin
index 3fbcd6043..3fbcd6043 100644
--- a/data/layouts/UnusedLayout_82D7CC8/map.bin
+++ b/data/layouts/FortreeCity_House2/map.bin
diff --git a/data/layouts/UnusedLayout_82D88C8/border.bin b/data/layouts/LavaridgeTown_HerbShop/border.bin
index f496f458e..f496f458e 100644
--- a/data/layouts/UnusedLayout_82D88C8/border.bin
+++ b/data/layouts/LavaridgeTown_HerbShop/border.bin
diff --git a/data/layouts/UnusedLayout_82D6144/map.bin b/data/layouts/LavaridgeTown_HerbShop/map.bin
index cc0294a80..cc0294a80 100644
--- a/data/layouts/UnusedLayout_82D6144/map.bin
+++ b/data/layouts/LavaridgeTown_HerbShop/map.bin
diff --git a/data/layouts/UnusedLayout_82D54D8/border.bin b/data/layouts/LittlerootTown_MaysHouse_2F/border.bin
index c1b82435c..c1b82435c 100644
--- a/data/layouts/UnusedLayout_82D54D8/border.bin
+++ b/data/layouts/LittlerootTown_MaysHouse_2F/border.bin
diff --git a/data/layouts/UnusedLayout_82D54D8/map.bin b/data/layouts/LittlerootTown_MaysHouse_2F/map.bin
index b51210332..b51210332 100644
--- a/data/layouts/UnusedLayout_82D54D8/map.bin
+++ b/data/layouts/LittlerootTown_MaysHouse_2F/map.bin
diff --git a/data/layouts/UnusedLayout_82DCA70/border.bin b/data/layouts/MossdeepCity_EReaderTrainerHouse_1F/border.bin
index f496f458e..f496f458e 100644
--- a/data/layouts/UnusedLayout_82DCA70/border.bin
+++ b/data/layouts/MossdeepCity_EReaderTrainerHouse_1F/border.bin
diff --git a/data/layouts/UnusedLayout_82DCB44/map.bin b/data/layouts/MossdeepCity_EReaderTrainerHouse_1F/map.bin
index bad63f412..bad63f412 100644
--- a/data/layouts/UnusedLayout_82DCB44/map.bin
+++ b/data/layouts/MossdeepCity_EReaderTrainerHouse_1F/map.bin
diff --git a/data/layouts/UnusedLayout_82DCB44/border.bin b/data/layouts/MossdeepCity_EReaderTrainerHouse_2F/border.bin
index f496f458e..f496f458e 100644
--- a/data/layouts/UnusedLayout_82DCB44/border.bin
+++ b/data/layouts/MossdeepCity_EReaderTrainerHouse_2F/border.bin
diff --git a/data/layouts/UnusedLayout_82DCC40/map.bin b/data/layouts/MossdeepCity_EReaderTrainerHouse_2F/map.bin
index 399d05705..399d05705 100644
--- a/data/layouts/UnusedLayout_82DCC40/map.bin
+++ b/data/layouts/MossdeepCity_EReaderTrainerHouse_2F/map.bin
diff --git a/data/layouts/UnusedLayout_82D7674/border.bin b/data/layouts/PacifidlogTown_House1/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnusedLayout_82D7674/border.bin
+++ b/data/layouts/PacifidlogTown_House1/border.bin
diff --git a/data/layouts/UnusedLayout_82D6654/map.bin b/data/layouts/PacifidlogTown_House1/map.bin
index 7865fdc7c..7865fdc7c 100644
--- a/data/layouts/UnusedLayout_82D6654/map.bin
+++ b/data/layouts/PacifidlogTown_House1/map.bin
diff --git a/data/layouts/UnusedLayout_82D7CC8/border.bin b/data/layouts/PacifidlogTown_House2/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnusedLayout_82D7CC8/border.bin
+++ b/data/layouts/PacifidlogTown_House2/border.bin
diff --git a/data/layouts/UnusedLayout_82D672C/map.bin b/data/layouts/PacifidlogTown_House2/map.bin
index 617346322..617346322 100644
--- a/data/layouts/UnusedLayout_82D672C/map.bin
+++ b/data/layouts/PacifidlogTown_House2/map.bin
diff --git a/data/layouts/UnknownMap_03_50/border.bin b/data/layouts/Prototype_SeviiIsle_22/border.bin
index d9994d6cd..d9994d6cd 100644
--- a/data/layouts/UnknownMap_03_50/border.bin
+++ b/data/layouts/Prototype_SeviiIsle_22/border.bin
diff --git a/data/layouts/UnusedLayout_833614C/map.bin b/data/layouts/Prototype_SeviiIsle_22/map.bin
index a4b5b8b85..a4b5b8b85 100644
--- a/data/layouts/UnusedLayout_833614C/map.bin
+++ b/data/layouts/Prototype_SeviiIsle_22/map.bin
diff --git a/data/layouts/UnknownMap_03_51/border.bin b/data/layouts/Prototype_SeviiIsle_23_East/border.bin
index d9994d6cd..d9994d6cd 100644
--- a/data/layouts/UnknownMap_03_51/border.bin
+++ b/data/layouts/Prototype_SeviiIsle_23_East/border.bin
diff --git a/data/layouts/UnusedLayout_83377F0/map.bin b/data/layouts/Prototype_SeviiIsle_23_East/map.bin
index 5bc807eea..5bc807eea 100644
--- a/data/layouts/UnusedLayout_83377F0/map.bin
+++ b/data/layouts/Prototype_SeviiIsle_23_East/map.bin
diff --git a/data/layouts/UnknownMap_03_52/border.bin b/data/layouts/Prototype_SeviiIsle_23_West/border.bin
index d9994d6cd..d9994d6cd 100644
--- a/data/layouts/UnknownMap_03_52/border.bin
+++ b/data/layouts/Prototype_SeviiIsle_23_West/border.bin
diff --git a/data/layouts/UnusedLayout_8338354/map.bin b/data/layouts/Prototype_SeviiIsle_23_West/map.bin
index 667f4a779..667f4a779 100644
--- a/data/layouts/UnusedLayout_8338354/map.bin
+++ b/data/layouts/Prototype_SeviiIsle_23_West/map.bin
diff --git a/data/layouts/UnknownMap_03_53/border.bin b/data/layouts/Prototype_SeviiIsle_24/border.bin
index d9994d6cd..d9994d6cd 100644
--- a/data/layouts/UnknownMap_03_53/border.bin
+++ b/data/layouts/Prototype_SeviiIsle_24/border.bin
diff --git a/data/layouts/UnusedLayout_8338738/map.bin b/data/layouts/Prototype_SeviiIsle_24/map.bin
index ce93426c5..ce93426c5 100644
--- a/data/layouts/UnusedLayout_8338738/map.bin
+++ b/data/layouts/Prototype_SeviiIsle_24/map.bin
diff --git a/data/layouts/UnusedLayout_833614C/border.bin b/data/layouts/Prototype_SeviiIsle_6/border.bin
index d9994d6cd..d9994d6cd 100644
--- a/data/layouts/UnusedLayout_833614C/border.bin
+++ b/data/layouts/Prototype_SeviiIsle_6/border.bin
diff --git a/data/layouts/UnknownMap_03_50/map.bin b/data/layouts/Prototype_SeviiIsle_6/map.bin
index cbd97e361..cbd97e361 100644
--- a/data/layouts/UnknownMap_03_50/map.bin
+++ b/data/layouts/Prototype_SeviiIsle_6/map.bin
diff --git a/data/layouts/UnusedLayout_83377F0/border.bin b/data/layouts/Prototype_SeviiIsle_7/border.bin
index d9994d6cd..d9994d6cd 100644
--- a/data/layouts/UnusedLayout_83377F0/border.bin
+++ b/data/layouts/Prototype_SeviiIsle_7/border.bin
diff --git a/data/layouts/UnknownMap_03_51/map.bin b/data/layouts/Prototype_SeviiIsle_7/map.bin
index e6859e745..e6859e745 100644
--- a/data/layouts/UnknownMap_03_51/map.bin
+++ b/data/layouts/Prototype_SeviiIsle_7/map.bin
diff --git a/data/layouts/UnusedLayout_8338354/border.bin b/data/layouts/Prototype_SeviiIsle_8/border.bin
index d9994d6cd..d9994d6cd 100644
--- a/data/layouts/UnusedLayout_8338354/border.bin
+++ b/data/layouts/Prototype_SeviiIsle_8/border.bin
diff --git a/data/layouts/UnknownMap_03_52/map.bin b/data/layouts/Prototype_SeviiIsle_8/map.bin
index 7f730c596..7f730c596 100644
--- a/data/layouts/UnknownMap_03_52/map.bin
+++ b/data/layouts/Prototype_SeviiIsle_8/map.bin
diff --git a/data/layouts/UnusedLayout_8338738/border.bin b/data/layouts/Prototype_SeviiIsle_9/border.bin
index d9994d6cd..d9994d6cd 100644
--- a/data/layouts/UnusedLayout_8338738/border.bin
+++ b/data/layouts/Prototype_SeviiIsle_9/border.bin
diff --git a/data/layouts/UnknownMap_03_53/map.bin b/data/layouts/Prototype_SeviiIsle_9/map.bin
index 616f50967..616f50967 100644
--- a/data/layouts/UnknownMap_03_53/map.bin
+++ b/data/layouts/Prototype_SeviiIsle_9/map.bin
diff --git a/data/layouts/UnusedLayout_82DBBE0/border.bin b/data/layouts/RS_BattleTower/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/layouts/UnusedLayout_82DBBE0/border.bin
+++ b/data/layouts/RS_BattleTower/border.bin
diff --git a/data/layouts/UnusedLayout_82DBBE0/map.bin b/data/layouts/RS_BattleTower/map.bin
index 6e9f6adb6..6e9f6adb6 100644
--- a/data/layouts/UnusedLayout_82DBBE0/map.bin
+++ b/data/layouts/RS_BattleTower/map.bin
diff --git a/data/layouts/UnusedLayout_82D6490/border.bin b/data/layouts/RS_PokemonCenter_1F/border.bin
index efef023e6..efef023e6 100644
--- a/data/layouts/UnusedLayout_82D6490/border.bin
+++ b/data/layouts/RS_PokemonCenter_1F/border.bin
diff --git a/data/layouts/UnusedLayout_82D6490/map.bin b/data/layouts/RS_PokemonCenter_1F/map.bin
index f84061f08..f84061f08 100644
--- a/data/layouts/UnusedLayout_82D6490/map.bin
+++ b/data/layouts/RS_PokemonCenter_1F/map.bin
diff --git a/data/layouts/UnusedLayout_82DCC40/border.bin b/data/layouts/RS_SafariZone_Entrance/border.bin
index f496f458e..f496f458e 100644
--- a/data/layouts/UnusedLayout_82DCC40/border.bin
+++ b/data/layouts/RS_SafariZone_Entrance/border.bin
diff --git a/data/layouts/UnusedLayout_82D88C8/map.bin b/data/layouts/RS_SafariZone_Entrance/map.bin
index 35c1badac..35c1badac 100644
--- a/data/layouts/UnusedLayout_82D88C8/map.bin
+++ b/data/layouts/RS_SafariZone_Entrance/map.bin
diff --git a/data/layouts/UnusedLayout_82D9B24/border.bin b/data/layouts/RS_SafariZone_Northeast/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/layouts/UnusedLayout_82D9B24/border.bin
+++ b/data/layouts/RS_SafariZone_Northeast/border.bin
diff --git a/data/layouts/UnusedLayout_82D9B24/map.bin b/data/layouts/RS_SafariZone_Northeast/map.bin
index d5e7fd825..d5e7fd825 100644
--- a/data/layouts/UnusedLayout_82D9B24/map.bin
+++ b/data/layouts/RS_SafariZone_Northeast/map.bin
diff --git a/data/layouts/UnusedLayout_82DD0DC/border.bin b/data/layouts/RS_SafariZone_RestHouse/border.bin
index f496f458e..f496f458e 100644
--- a/data/layouts/UnusedLayout_82DD0DC/border.bin
+++ b/data/layouts/RS_SafariZone_RestHouse/border.bin
diff --git a/data/layouts/UnusedLayout_82DD0DC/map.bin b/data/layouts/RS_SafariZone_RestHouse/map.bin
index c57c99c7b..c57c99c7b 100644
--- a/data/layouts/UnusedLayout_82DD0DC/map.bin
+++ b/data/layouts/RS_SafariZone_RestHouse/map.bin
diff --git a/data/layouts/UnusedLayout_82DA7C8/border.bin b/data/layouts/RS_SafariZone_Southeast/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/layouts/UnusedLayout_82DA7C8/border.bin
+++ b/data/layouts/RS_SafariZone_Southeast/border.bin
diff --git a/data/layouts/UnusedLayout_82DB46C/map.bin b/data/layouts/RS_SafariZone_Southeast/map.bin
index 540798144..540798144 100644
--- a/data/layouts/UnusedLayout_82DB46C/map.bin
+++ b/data/layouts/RS_SafariZone_Southeast/map.bin
diff --git a/data/layouts/UnusedLayout_82DB46C/border.bin b/data/layouts/RS_SafariZone_Southwest/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/layouts/UnusedLayout_82DB46C/border.bin
+++ b/data/layouts/RS_SafariZone_Southwest/border.bin
diff --git a/data/layouts/UnusedLayout_82DA7C8/map.bin b/data/layouts/RS_SafariZone_Southwest/map.bin
index 0074b6e55..0074b6e55 100644
--- a/data/layouts/UnusedLayout_82DA7C8/map.bin
+++ b/data/layouts/RS_SafariZone_Southwest/map.bin
diff --git a/data/layouts/UnusedLayout_82DB4F0/border.bin b/data/layouts/RustboroCity_CuttersHouse/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnusedLayout_82DB4F0/border.bin
+++ b/data/layouts/RustboroCity_CuttersHouse/border.bin
diff --git a/data/layouts/UnusedLayout_82D75F0/map.bin b/data/layouts/RustboroCity_CuttersHouse/map.bin
index 5515d00cf..5515d00cf 100644
--- a/data/layouts/UnusedLayout_82D75F0/map.bin
+++ b/data/layouts/RustboroCity_CuttersHouse/map.bin
diff --git a/data/layouts/UnusedLayout_82DBDD8/border.bin b/data/layouts/RustboroCity_Flat1_1F/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnusedLayout_82DBDD8/border.bin
+++ b/data/layouts/RustboroCity_Flat1_1F/border.bin
diff --git a/data/layouts/UnusedLayout_82DCF00/map.bin b/data/layouts/RustboroCity_Flat1_1F/map.bin
index 017298e71..017298e71 100644
--- a/data/layouts/UnusedLayout_82DCF00/map.bin
+++ b/data/layouts/RustboroCity_Flat1_1F/map.bin
diff --git a/data/layouts/UnusedLayout_82DBFB8/border.bin b/data/layouts/RustboroCity_Flat1_2F/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnusedLayout_82DBFB8/border.bin
+++ b/data/layouts/RustboroCity_Flat1_2F/border.bin
diff --git a/data/layouts/UnusedLayout_82DD004/map.bin b/data/layouts/RustboroCity_Flat1_2F/map.bin
index 17a611343..17a611343 100644
--- a/data/layouts/UnusedLayout_82DD004/map.bin
+++ b/data/layouts/RustboroCity_Flat1_2F/map.bin
diff --git a/data/layouts/UnusedLayout_82DC4EC/border.bin b/data/layouts/RustboroCity_Flat2_1F/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnusedLayout_82DC4EC/border.bin
+++ b/data/layouts/RustboroCity_Flat2_1F/border.bin
diff --git a/data/layouts/UnusedLayout_82DC60C/map.bin b/data/layouts/RustboroCity_Flat2_1F/map.bin
index 0f6829f9c..0f6829f9c 100644
--- a/data/layouts/UnusedLayout_82DC60C/map.bin
+++ b/data/layouts/RustboroCity_Flat2_1F/map.bin
diff --git a/data/layouts/UnusedLayout_82DC60C/border.bin b/data/layouts/RustboroCity_Flat2_2F/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnusedLayout_82DC60C/border.bin
+++ b/data/layouts/RustboroCity_Flat2_2F/border.bin
diff --git a/data/layouts/UnusedLayout_82DC72C/map.bin b/data/layouts/RustboroCity_Flat2_2F/map.bin
index 9f3750fb4..9f3750fb4 100644
--- a/data/layouts/UnusedLayout_82DC72C/map.bin
+++ b/data/layouts/RustboroCity_Flat2_2F/map.bin
diff --git a/data/layouts/UnusedLayout_82DC72C/border.bin b/data/layouts/RustboroCity_Flat2_3F/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnusedLayout_82DC72C/border.bin
+++ b/data/layouts/RustboroCity_Flat2_3F/border.bin
diff --git a/data/layouts/UnusedLayout_82DC84C/map.bin b/data/layouts/RustboroCity_Flat2_3F/map.bin
index 2112fe799..2112fe799 100644
--- a/data/layouts/UnusedLayout_82DC84C/map.bin
+++ b/data/layouts/RustboroCity_Flat2_3F/map.bin
diff --git a/data/layouts/UnusedLayout_82DC84C/border.bin b/data/layouts/SSTidal_Corridor/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnusedLayout_82DC84C/border.bin
+++ b/data/layouts/SSTidal_Corridor/border.bin
diff --git a/data/layouts/UnusedLayout_82DBDD8/map.bin b/data/layouts/SSTidal_Corridor/map.bin
index f8cf1725d..f8cf1725d 100644
--- a/data/layouts/UnusedLayout_82DBDD8/map.bin
+++ b/data/layouts/SSTidal_Corridor/map.bin
diff --git a/data/layouts/UnusedLayout_82DCCD4/border.bin b/data/layouts/SSTidal_LowerDeck/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnusedLayout_82DCCD4/border.bin
+++ b/data/layouts/SSTidal_LowerDeck/border.bin
diff --git a/data/layouts/UnusedLayout_82DBFB8/map.bin b/data/layouts/SSTidal_LowerDeck/map.bin
index 059ce30fe..059ce30fe 100644
--- a/data/layouts/UnusedLayout_82DBFB8/map.bin
+++ b/data/layouts/SSTidal_LowerDeck/map.bin
diff --git a/data/layouts/UnusedLayout_82DCD68/border.bin b/data/layouts/SSTidal_Rooms/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnusedLayout_82DCD68/border.bin
+++ b/data/layouts/SSTidal_Rooms/border.bin
diff --git a/data/layouts/UnusedLayout_82DC4EC/map.bin b/data/layouts/SSTidal_Rooms/map.bin
index 6103ad0c2..6103ad0c2 100644
--- a/data/layouts/UnusedLayout_82DC4EC/map.bin
+++ b/data/layouts/SSTidal_Rooms/map.bin
diff --git a/data/layouts/SaffronCity_Classic/border.bin b/data/layouts/SaffronCity_Connection/border.bin
index a701312cf..a701312cf 100644
--- a/data/layouts/SaffronCity_Classic/border.bin
+++ b/data/layouts/SaffronCity_Connection/border.bin
diff --git a/data/layouts/SaffronCity_Classic/map.bin b/data/layouts/SaffronCity_Connection/map.bin
index dd7aea1cf..dd7aea1cf 100644
--- a/data/layouts/SaffronCity_Classic/map.bin
+++ b/data/layouts/SaffronCity_Connection/map.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_1F/border.bin b/data/layouts/SaffronCity_CopycatsHouse_1F/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/SevenIsland_TrainerTower_1F/border.bin
+++ b/data/layouts/SaffronCity_CopycatsHouse_1F/border.bin
diff --git a/data/layouts/SaffronCity_House1_1F/map.bin b/data/layouts/SaffronCity_CopycatsHouse_1F/map.bin
index 6db070ab7..6db070ab7 100644
--- a/data/layouts/SaffronCity_House1_1F/map.bin
+++ b/data/layouts/SaffronCity_CopycatsHouse_1F/map.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_2F/border.bin b/data/layouts/SaffronCity_CopycatsHouse_2F/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/SevenIsland_TrainerTower_2F/border.bin
+++ b/data/layouts/SaffronCity_CopycatsHouse_2F/border.bin
diff --git a/data/layouts/SaffronCity_House1_2F/map.bin b/data/layouts/SaffronCity_CopycatsHouse_2F/map.bin
index c3090f485..c3090f485 100644
--- a/data/layouts/SaffronCity_House1_2F/map.bin
+++ b/data/layouts/SaffronCity_CopycatsHouse_2F/map.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_3F/border.bin b/data/layouts/SevenIsland_House_Room1_DoorOpen/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/SevenIsland_TrainerTower_3F/border.bin
+++ b/data/layouts/SevenIsland_House_Room1_DoorOpen/border.bin
diff --git a/data/layouts/UnusedLayout_8338B4C/map.bin b/data/layouts/SevenIsland_House_Room1_DoorOpen/map.bin
index b9381326f..b9381326f 100644
--- a/data/layouts/UnusedLayout_8338B4C/map.bin
+++ b/data/layouts/SevenIsland_House_Room1_DoorOpen/map.bin
diff --git a/data/layouts/UnusedLayout_82DCDFC/border.bin b/data/layouts/SootopolisCity_House1/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnusedLayout_82DCDFC/border.bin
+++ b/data/layouts/SootopolisCity_House1/border.bin
diff --git a/data/layouts/UnusedLayout_82DCCD4/map.bin b/data/layouts/SootopolisCity_House1/map.bin
index 43f11b194..43f11b194 100644
--- a/data/layouts/UnusedLayout_82DCCD4/map.bin
+++ b/data/layouts/SootopolisCity_House1/map.bin
diff --git a/data/layouts/UnusedLayout_82DCF00/border.bin b/data/layouts/SootopolisCity_House2/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnusedLayout_82DCF00/border.bin
+++ b/data/layouts/SootopolisCity_House2/border.bin
diff --git a/data/layouts/UnusedLayout_82DCD68/map.bin b/data/layouts/SootopolisCity_House2/map.bin
index 632e1e36a..632e1e36a 100644
--- a/data/layouts/UnusedLayout_82DCD68/map.bin
+++ b/data/layouts/SootopolisCity_House2/map.bin
diff --git a/data/layouts/UnusedLayout_82DD004/border.bin b/data/layouts/SootopolisCity_House3/border.bin
index 19d906679..19d906679 100644
--- a/data/layouts/UnusedLayout_82DD004/border.bin
+++ b/data/layouts/SootopolisCity_House3/border.bin
diff --git a/data/layouts/UnusedLayout_82DCDFC/map.bin b/data/layouts/SootopolisCity_House3/map.bin
index 8bbd6c517..8bbd6c517 100644
--- a/data/layouts/UnusedLayout_82DCDFC/map.bin
+++ b/data/layouts/SootopolisCity_House3/map.bin
diff --git a/data/layouts/UnusedLayout_83453C0/border.bin b/data/layouts/ThreeIsland_DunsparceTunnel_DugOut/border.bin
index a021ddd4e..a021ddd4e 100644
--- a/data/layouts/UnusedLayout_83453C0/border.bin
+++ b/data/layouts/ThreeIsland_DunsparceTunnel_DugOut/border.bin
diff --git a/data/layouts/UnusedLayout_83453C0/map.bin b/data/layouts/ThreeIsland_DunsparceTunnel_DugOut/map.bin
index ffc668ba5..ffc668ba5 100644
--- a/data/layouts/UnusedLayout_83453C0/map.bin
+++ b/data/layouts/ThreeIsland_DunsparceTunnel_DugOut/map.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_4F/border.bin b/data/layouts/TrainerTower_1F/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/SevenIsland_TrainerTower_4F/border.bin
+++ b/data/layouts/TrainerTower_1F/border.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_1F/map.bin b/data/layouts/TrainerTower_1F/map.bin
index 812cea451..812cea451 100644
--- a/data/layouts/SevenIsland_TrainerTower_1F/map.bin
+++ b/data/layouts/TrainerTower_1F/map.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_5F/border.bin b/data/layouts/TrainerTower_1F_Doubles/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/SevenIsland_TrainerTower_5F/border.bin
+++ b/data/layouts/TrainerTower_1F_Doubles/border.bin
diff --git a/data/layouts/UnusedLayout_834BC2C/map.bin b/data/layouts/TrainerTower_1F_Doubles/map.bin
index 891ae066e..891ae066e 100644
--- a/data/layouts/UnusedLayout_834BC2C/map.bin
+++ b/data/layouts/TrainerTower_1F_Doubles/map.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_6F/border.bin b/data/layouts/TrainerTower_1F_Knockout/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/SevenIsland_TrainerTower_6F/border.bin
+++ b/data/layouts/TrainerTower_1F_Knockout/border.bin
diff --git a/data/layouts/UnusedLayout_834D06C/map.bin b/data/layouts/TrainerTower_1F_Knockout/map.bin
index 3e3ebcc94..3e3ebcc94 100644
--- a/data/layouts/UnusedLayout_834D06C/map.bin
+++ b/data/layouts/TrainerTower_1F_Knockout/map.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_7F/border.bin b/data/layouts/TrainerTower_2F/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/SevenIsland_TrainerTower_7F/border.bin
+++ b/data/layouts/TrainerTower_2F/border.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_2F/map.bin b/data/layouts/TrainerTower_2F/map.bin
index 7ae889af1..7ae889af1 100644
--- a/data/layouts/SevenIsland_TrainerTower_2F/map.bin
+++ b/data/layouts/TrainerTower_2F/map.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_8F/border.bin b/data/layouts/TrainerTower_2F_Doubles/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/SevenIsland_TrainerTower_8F/border.bin
+++ b/data/layouts/TrainerTower_2F_Doubles/border.bin
diff --git a/data/layouts/UnusedLayout_834BEB4/map.bin b/data/layouts/TrainerTower_2F_Doubles/map.bin
index ab44abb18..ab44abb18 100644
--- a/data/layouts/UnusedLayout_834BEB4/map.bin
+++ b/data/layouts/TrainerTower_2F_Doubles/map.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_Elevator/border.bin b/data/layouts/TrainerTower_2F_Knockout/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/SevenIsland_TrainerTower_Elevator/border.bin
+++ b/data/layouts/TrainerTower_2F_Knockout/border.bin
diff --git a/data/layouts/UnusedLayout_834D2F4/map.bin b/data/layouts/TrainerTower_2F_Knockout/map.bin
index cfc96995c..cfc96995c 100644
--- a/data/layouts/UnusedLayout_834D2F4/map.bin
+++ b/data/layouts/TrainerTower_2F_Knockout/map.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_Lobby/border.bin b/data/layouts/TrainerTower_3F/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/SevenIsland_TrainerTower_Lobby/border.bin
+++ b/data/layouts/TrainerTower_3F/border.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_3F/map.bin b/data/layouts/TrainerTower_3F/map.bin
index c01e70c2f..c01e70c2f 100644
--- a/data/layouts/SevenIsland_TrainerTower_3F/map.bin
+++ b/data/layouts/TrainerTower_3F/map.bin
diff --git a/data/layouts/UnusedLayout_82D6C34/border.bin b/data/layouts/TrainerTower_3F_Doubles/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/UnusedLayout_82D6C34/border.bin
+++ b/data/layouts/TrainerTower_3F_Doubles/border.bin
diff --git a/data/layouts/UnusedLayout_834C13C/map.bin b/data/layouts/TrainerTower_3F_Doubles/map.bin
index 514cb7239..514cb7239 100644
--- a/data/layouts/UnusedLayout_834C13C/map.bin
+++ b/data/layouts/TrainerTower_3F_Doubles/map.bin
diff --git a/data/layouts/UnusedLayout_8338B4C/border.bin b/data/layouts/TrainerTower_3F_Knockout/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/UnusedLayout_8338B4C/border.bin
+++ b/data/layouts/TrainerTower_3F_Knockout/border.bin
diff --git a/data/layouts/UnusedLayout_834D57C/map.bin b/data/layouts/TrainerTower_3F_Knockout/map.bin
index da9cc3f75..da9cc3f75 100644
--- a/data/layouts/UnusedLayout_834D57C/map.bin
+++ b/data/layouts/TrainerTower_3F_Knockout/map.bin
diff --git a/data/layouts/UnusedLayout_8338E90/border.bin b/data/layouts/TrainerTower_4F/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/UnusedLayout_8338E90/border.bin
+++ b/data/layouts/TrainerTower_4F/border.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_4F/map.bin b/data/layouts/TrainerTower_4F/map.bin
index 057d7f955..057d7f955 100644
--- a/data/layouts/SevenIsland_TrainerTower_4F/map.bin
+++ b/data/layouts/TrainerTower_4F/map.bin
diff --git a/data/layouts/UnusedLayout_833902C/border.bin b/data/layouts/TrainerTower_4F_Doubles/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/UnusedLayout_833902C/border.bin
+++ b/data/layouts/TrainerTower_4F_Doubles/border.bin
diff --git a/data/layouts/UnusedLayout_834C3C4/map.bin b/data/layouts/TrainerTower_4F_Doubles/map.bin
index d9a50b7a1..d9a50b7a1 100644
--- a/data/layouts/UnusedLayout_834C3C4/map.bin
+++ b/data/layouts/TrainerTower_4F_Doubles/map.bin
diff --git a/data/layouts/UnusedLayout_834BC2C/border.bin b/data/layouts/TrainerTower_4F_Knockout/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/UnusedLayout_834BC2C/border.bin
+++ b/data/layouts/TrainerTower_4F_Knockout/border.bin
diff --git a/data/layouts/UnusedLayout_834D804/map.bin b/data/layouts/TrainerTower_4F_Knockout/map.bin
index cf5e1e94e..cf5e1e94e 100644
--- a/data/layouts/UnusedLayout_834D804/map.bin
+++ b/data/layouts/TrainerTower_4F_Knockout/map.bin
diff --git a/data/layouts/UnusedLayout_834BEB4/border.bin b/data/layouts/TrainerTower_5F/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/UnusedLayout_834BEB4/border.bin
+++ b/data/layouts/TrainerTower_5F/border.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_5F/map.bin b/data/layouts/TrainerTower_5F/map.bin
index d580e7d2d..d580e7d2d 100644
--- a/data/layouts/SevenIsland_TrainerTower_5F/map.bin
+++ b/data/layouts/TrainerTower_5F/map.bin
diff --git a/data/layouts/UnusedLayout_834C13C/border.bin b/data/layouts/TrainerTower_5F_Doubles/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/UnusedLayout_834C13C/border.bin
+++ b/data/layouts/TrainerTower_5F_Doubles/border.bin
diff --git a/data/layouts/UnusedLayout_834C64C/map.bin b/data/layouts/TrainerTower_5F_Doubles/map.bin
index 37b4aba85..37b4aba85 100644
--- a/data/layouts/UnusedLayout_834C64C/map.bin
+++ b/data/layouts/TrainerTower_5F_Doubles/map.bin
diff --git a/data/layouts/UnusedLayout_834C3C4/border.bin b/data/layouts/TrainerTower_5F_Knockout/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/UnusedLayout_834C3C4/border.bin
+++ b/data/layouts/TrainerTower_5F_Knockout/border.bin
diff --git a/data/layouts/UnusedLayout_834DA8C/map.bin b/data/layouts/TrainerTower_5F_Knockout/map.bin
index 1f10bfff1..1f10bfff1 100644
--- a/data/layouts/UnusedLayout_834DA8C/map.bin
+++ b/data/layouts/TrainerTower_5F_Knockout/map.bin
diff --git a/data/layouts/UnusedLayout_834C64C/border.bin b/data/layouts/TrainerTower_6F/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/UnusedLayout_834C64C/border.bin
+++ b/data/layouts/TrainerTower_6F/border.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_6F/map.bin b/data/layouts/TrainerTower_6F/map.bin
index 3c2c3165c..3c2c3165c 100644
--- a/data/layouts/SevenIsland_TrainerTower_6F/map.bin
+++ b/data/layouts/TrainerTower_6F/map.bin
diff --git a/data/layouts/UnusedLayout_834C8D4/border.bin b/data/layouts/TrainerTower_6F_Doubles/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/UnusedLayout_834C8D4/border.bin
+++ b/data/layouts/TrainerTower_6F_Doubles/border.bin
diff --git a/data/layouts/UnusedLayout_834C8D4/map.bin b/data/layouts/TrainerTower_6F_Doubles/map.bin
index 2df5cd891..2df5cd891 100644
--- a/data/layouts/UnusedLayout_834C8D4/map.bin
+++ b/data/layouts/TrainerTower_6F_Doubles/map.bin
diff --git a/data/layouts/UnusedLayout_834CB5C/border.bin b/data/layouts/TrainerTower_6F_Knockout/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/UnusedLayout_834CB5C/border.bin
+++ b/data/layouts/TrainerTower_6F_Knockout/border.bin
diff --git a/data/layouts/UnusedLayout_834DD14/map.bin b/data/layouts/TrainerTower_6F_Knockout/map.bin
index fe3d6f908..fe3d6f908 100644
--- a/data/layouts/UnusedLayout_834DD14/map.bin
+++ b/data/layouts/TrainerTower_6F_Knockout/map.bin
diff --git a/data/layouts/UnusedLayout_834CDE4/border.bin b/data/layouts/TrainerTower_7F/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/UnusedLayout_834CDE4/border.bin
+++ b/data/layouts/TrainerTower_7F/border.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_7F/map.bin b/data/layouts/TrainerTower_7F/map.bin
index d9bb110cf..d9bb110cf 100644
--- a/data/layouts/SevenIsland_TrainerTower_7F/map.bin
+++ b/data/layouts/TrainerTower_7F/map.bin
diff --git a/data/layouts/UnusedLayout_834D06C/border.bin b/data/layouts/TrainerTower_7F_Doubles/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/UnusedLayout_834D06C/border.bin
+++ b/data/layouts/TrainerTower_7F_Doubles/border.bin
diff --git a/data/layouts/UnusedLayout_834CB5C/map.bin b/data/layouts/TrainerTower_7F_Doubles/map.bin
index e977b7e26..e977b7e26 100644
--- a/data/layouts/UnusedLayout_834CB5C/map.bin
+++ b/data/layouts/TrainerTower_7F_Doubles/map.bin
diff --git a/data/layouts/UnusedLayout_834D2F4/border.bin b/data/layouts/TrainerTower_7F_Knockout/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/UnusedLayout_834D2F4/border.bin
+++ b/data/layouts/TrainerTower_7F_Knockout/border.bin
diff --git a/data/layouts/UnusedLayout_834DF9C/map.bin b/data/layouts/TrainerTower_7F_Knockout/map.bin
index 241077797..241077797 100644
--- a/data/layouts/UnusedLayout_834DF9C/map.bin
+++ b/data/layouts/TrainerTower_7F_Knockout/map.bin
diff --git a/data/layouts/UnusedLayout_834D57C/border.bin b/data/layouts/TrainerTower_8F/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/UnusedLayout_834D57C/border.bin
+++ b/data/layouts/TrainerTower_8F/border.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_8F/map.bin b/data/layouts/TrainerTower_8F/map.bin
index 6ba6588be..6ba6588be 100644
--- a/data/layouts/SevenIsland_TrainerTower_8F/map.bin
+++ b/data/layouts/TrainerTower_8F/map.bin
diff --git a/data/layouts/UnusedLayout_834D804/border.bin b/data/layouts/TrainerTower_8F_Doubles/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/UnusedLayout_834D804/border.bin
+++ b/data/layouts/TrainerTower_8F_Doubles/border.bin
diff --git a/data/layouts/UnusedLayout_834CDE4/map.bin b/data/layouts/TrainerTower_8F_Doubles/map.bin
index e358d2f3d..e358d2f3d 100644
--- a/data/layouts/UnusedLayout_834CDE4/map.bin
+++ b/data/layouts/TrainerTower_8F_Doubles/map.bin
diff --git a/data/layouts/UnusedLayout_834DA8C/border.bin b/data/layouts/TrainerTower_8F_Knockout/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/UnusedLayout_834DA8C/border.bin
+++ b/data/layouts/TrainerTower_8F_Knockout/border.bin
diff --git a/data/layouts/UnusedLayout_834E224/map.bin b/data/layouts/TrainerTower_8F_Knockout/map.bin
index bb5ccf05c..bb5ccf05c 100644
--- a/data/layouts/UnusedLayout_834E224/map.bin
+++ b/data/layouts/TrainerTower_8F_Knockout/map.bin
diff --git a/data/layouts/UnusedLayout_834DD14/border.bin b/data/layouts/TrainerTower_Elevator/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/UnusedLayout_834DD14/border.bin
+++ b/data/layouts/TrainerTower_Elevator/border.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_Elevator/map.bin b/data/layouts/TrainerTower_Elevator/map.bin
index 42e08c38d..42e08c38d 100644
--- a/data/layouts/SevenIsland_TrainerTower_Elevator/map.bin
+++ b/data/layouts/TrainerTower_Elevator/map.bin
diff --git a/data/layouts/UnusedLayout_834DF9C/border.bin b/data/layouts/TrainerTower_Lobby/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/UnusedLayout_834DF9C/border.bin
+++ b/data/layouts/TrainerTower_Lobby/border.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_Lobby/map.bin b/data/layouts/TrainerTower_Lobby/map.bin
index b98077279..b98077279 100644
--- a/data/layouts/SevenIsland_TrainerTower_Lobby/map.bin
+++ b/data/layouts/TrainerTower_Lobby/map.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_Roof/border.bin b/data/layouts/TrainerTower_Roof/border.bin
index f94adee61..f94adee61 100644
--- a/data/layouts/SevenIsland_TrainerTower_Roof/border.bin
+++ b/data/layouts/TrainerTower_Roof/border.bin
diff --git a/data/layouts/SevenIsland_TrainerTower_Roof/map.bin b/data/layouts/TrainerTower_Roof/map.bin
index 37d57f3fe..37d57f3fe 100644
--- a/data/layouts/SevenIsland_TrainerTower_Roof/map.bin
+++ b/data/layouts/TrainerTower_Roof/map.bin
diff --git a/data/layouts/UnusedLayout_834E224/border.bin b/data/layouts/Unused1/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/UnusedLayout_834E224/border.bin
+++ b/data/layouts/Unused1/border.bin
diff --git a/data/layouts/UnusedLayout_82D6C34/map.bin b/data/layouts/Unused1/map.bin
index 35968a7fd..35968a7fd 100644
--- a/data/layouts/UnusedLayout_82D6C34/map.bin
+++ b/data/layouts/Unused1/map.bin
diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json
index 63fc06562..a9911aed4 100644
--- a/data/layouts/layouts.json
+++ b/data/layouts/layouts.json
@@ -8,8 +8,8 @@
       "height": 10,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C74",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding1",
       "border_filepath": "data/layouts/PalletTown_PlayersHouse_1F/border.bin",
       "blockdata_filepath": "data/layouts/PalletTown_PlayersHouse_1F/map.bin"
     },
@@ -20,8 +20,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C74",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding1",
       "border_filepath": "data/layouts/PalletTown_PlayersHouse_2F/border.bin",
       "blockdata_filepath": "data/layouts/PalletTown_PlayersHouse_2F/map.bin"
     },
@@ -32,22 +32,22 @@
       "height": 10,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E84",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding2",
       "border_filepath": "data/layouts/PalletTown_GarysHouse/border.bin",
       "blockdata_filepath": "data/layouts/PalletTown_GarysHouse/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82D54D8",
-      "name": "UnusedLayout_82D54D8_Layout",
+      "id": "LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_2F",
+      "name": "LittlerootTown_MaysHouse_2F_Layout",
       "width": 9,
       "height": 8,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C74",
-      "border_filepath": "data/layouts/UnusedLayout_82D54D8/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82D54D8/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding1",
+      "border_filepath": "data/layouts/LittlerootTown_MaysHouse_2F/border.bin",
+      "blockdata_filepath": "data/layouts/LittlerootTown_MaysHouse_2F/map.bin"
     },
     {
       "id": "LAYOUT_PALLET_TOWN_PROFESSOR_OAKS_LAB",
@@ -56,8 +56,8 @@
       "height": 14,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C8C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Lab",
       "border_filepath": "data/layouts/PalletTown_ProfessorOaksLab/border.bin",
       "blockdata_filepath": "data/layouts/PalletTown_ProfessorOaksLab/map.bin"
     },
@@ -68,8 +68,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C74",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding1",
       "border_filepath": "data/layouts/House1/border.bin",
       "blockdata_filepath": "data/layouts/House1/map.bin"
     },
@@ -80,8 +80,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E84",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding2",
       "border_filepath": "data/layouts/House2/border.bin",
       "blockdata_filepath": "data/layouts/House2/map.bin"
     },
@@ -92,8 +92,8 @@
       "height": 10,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4BE4",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonCenter",
       "border_filepath": "data/layouts/PokemonCenter_1F/border.bin",
       "blockdata_filepath": "data/layouts/PokemonCenter_1F/map.bin"
     },
@@ -104,8 +104,8 @@
       "height": 10,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4BE4",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonCenter",
       "border_filepath": "data/layouts/PokemonCenter_2F/border.bin",
       "blockdata_filepath": "data/layouts/PokemonCenter_2F/map.bin"
     },
@@ -116,8 +116,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4BCC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Mart",
       "border_filepath": "data/layouts/Mart/border.bin",
       "blockdata_filepath": "data/layouts/Mart/map.bin"
     },
@@ -128,8 +128,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E84",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding2",
       "border_filepath": "data/layouts/House3/border.bin",
       "blockdata_filepath": "data/layouts/House3/map.bin"
     },
@@ -140,8 +140,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4D1C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_CeruleanGym",
       "border_filepath": "data/layouts/CeruleanCity_Gym/border.bin",
       "blockdata_filepath": "data/layouts/CeruleanCity_Gym/map.bin"
     },
@@ -152,22 +152,22 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E84",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding2",
       "border_filepath": "data/layouts/House4/border.bin",
       "blockdata_filepath": "data/layouts/House4/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82D6144",
-      "name": "UnusedLayout_82D6144_Layout",
+      "id": "LAYOUT_LAVARIDGE_TOWN_HERB_SHOP",
+      "name": "LavaridgeTown_HerbShop_Layout",
       "width": 11,
       "height": 8,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4BCC",
-      "border_filepath": "data/layouts/UnusedLayout_82D6144/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82D6144/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Mart",
+      "border_filepath": "data/layouts/LavaridgeTown_HerbShop/border.bin",
+      "blockdata_filepath": "data/layouts/LavaridgeTown_HerbShop/map.bin"
     },
     {
       "id": "LAYOUT_CELADON_CITY_GYM",
@@ -176,22 +176,22 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4D4C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_CeladonGym",
       "border_filepath": "data/layouts/CeladonCity_Gym/border.bin",
       "blockdata_filepath": "data/layouts/CeladonCity_Gym/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82D6490",
-      "name": "UnusedLayout_82D6490_Layout",
+      "id": "LAYOUT_RS_POKEMON_CENTER_1F",
+      "name": "RS_PokemonCenter_1F_Layout",
       "width": 14,
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4BE4",
-      "border_filepath": "data/layouts/UnusedLayout_82D6490/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82D6490/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonCenter",
+      "border_filepath": "data/layouts/RS_PokemonCenter_1F/border.bin",
+      "blockdata_filepath": "data/layouts/RS_PokemonCenter_1F/map.bin"
     },
     {
       "id": "LAYOUT_FIVE_ISLAND_RESORT_GORGEOUS_HOUSE",
@@ -200,34 +200,34 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C2C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Museum",
       "border_filepath": "data/layouts/FiveIsland_ResortGorgeous_House/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_ResortGorgeous_House/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82D6654",
-      "name": "UnusedLayout_82D6654_Layout",
+      "id": "LAYOUT_PACIFIDLOG_TOWN_HOUSE1",
+      "name": "PacifidlogTown_House1_Layout",
       "width": 10,
       "height": 9,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CD4",
-      "border_filepath": "data/layouts/UnusedLayout_82D6654/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82D6654/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_HoennBuilding",
+      "border_filepath": "data/layouts/PacifidlogTown_House1/border.bin",
+      "blockdata_filepath": "data/layouts/PacifidlogTown_House1/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82D672C",
-      "name": "UnusedLayout_82D672C_Layout",
+      "id": "LAYOUT_PACIFIDLOG_TOWN_HOUSE2",
+      "name": "PacifidlogTown_House2_Layout",
       "width": 10,
       "height": 9,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CD4",
-      "border_filepath": "data/layouts/UnusedLayout_82D672C/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82D672C/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_HoennBuilding",
+      "border_filepath": "data/layouts/PacifidlogTown_House2/border.bin",
+      "blockdata_filepath": "data/layouts/PacifidlogTown_House2/map.bin"
     },
     {
       "id": "LAYOUT_FUCHSIA_CITY_GYM",
@@ -236,8 +236,8 @@
       "height": 23,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CA4",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_FuchsiaGym",
       "border_filepath": "data/layouts/FuchsiaCity_Gym/border.bin",
       "blockdata_filepath": "data/layouts/FuchsiaCity_Gym/map.bin"
     },
@@ -248,24 +248,24 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C74",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding1",
       "border_filepath": "data/layouts/House5/border.bin",
       "blockdata_filepath": "data/layouts/House5/map.bin"
     },
     {},
     {},
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82D6C34",
-      "name": "UnusedLayout_82D6C34_Layout",
+      "id": "LAYOUT_UNUSED1",
+      "name": "Unused1_Layout",
       "width": 12,
       "height": 12,
       "border_width": 2,
       "border_height": 2,
       "primary_tileset": "NULL",
-      "secondary_tileset": "gTileset_82D4C14",
-      "border_filepath": "data/layouts/UnusedLayout_82D6C34/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82D6C34/map.bin"
+      "secondary_tileset": "gTileset_Dummy1",
+      "border_filepath": "data/layouts/Unused1/border.bin",
+      "blockdata_filepath": "data/layouts/Unused1/map.bin"
     },
     {
       "id": "LAYOUT_VERMILION_CITY_GYM",
@@ -274,8 +274,8 @@
       "height": 21,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4D34",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_VermilionGym",
       "border_filepath": "data/layouts/VermilionCity_Gym/border.bin",
       "blockdata_filepath": "data/layouts/VermilionCity_Gym/map.bin"
     },
@@ -286,8 +286,8 @@
       "height": 10,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C5C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BikeShop",
       "border_filepath": "data/layouts/CeruleanCity_BikeShop/border.bin",
       "blockdata_filepath": "data/layouts/CeruleanCity_BikeShop/map.bin"
     },
@@ -298,8 +298,8 @@
       "height": 15,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CEC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GameCorner",
       "border_filepath": "data/layouts/CeladonCity_GameCorner/border.bin",
       "blockdata_filepath": "data/layouts/CeladonCity_GameCorner/map.bin"
     },
@@ -310,8 +310,8 @@
       "height": 16,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4D04",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PewterGym",
       "border_filepath": "data/layouts/PewterCity_Gym/border.bin",
       "blockdata_filepath": "data/layouts/PewterCity_Gym/map.bin"
     },
@@ -323,8 +323,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F14",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SafariZoneBuilding",
       "border_filepath": "data/layouts/FourIsland_LoreleisHouse/border.bin",
       "blockdata_filepath": "data/layouts/FourIsland_LoreleisHouse/map.bin"
     },
@@ -335,34 +335,34 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C8C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Lab",
       "border_filepath": "data/layouts/ThreeIsland_House1/border.bin",
       "blockdata_filepath": "data/layouts/ThreeIsland_House1/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82D75F0",
-      "name": "UnusedLayout_82D75F0_Layout",
+      "id": "LAYOUT_RUSTBORO_CITY_CUTTERS_HOUSE",
+      "name": "RustboroCity_CuttersHouse_Layout",
       "width": 11,
       "height": 9,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CD4",
-      "border_filepath": "data/layouts/UnusedLayout_82D75F0/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82D75F0/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_HoennBuilding",
+      "border_filepath": "data/layouts/RustboroCity_CuttersHouse/border.bin",
+      "blockdata_filepath": "data/layouts/RustboroCity_CuttersHouse/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82D7674",
-      "name": "UnusedLayout_82D7674_Layout",
+      "id": "LAYOUT_FORTREE_CITY_HOUSE1",
+      "name": "FortreeCity_House1_Layout",
       "width": 8,
       "height": 6,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CD4",
-      "border_filepath": "data/layouts/UnusedLayout_82D7674/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82D7674/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_HoennBuilding",
+      "border_filepath": "data/layouts/FortreeCity_House1/border.bin",
+      "blockdata_filepath": "data/layouts/FortreeCity_House1/map.bin"
     },
     {
       "id": "LAYOUT_SAFFRON_CITY_GYM",
@@ -371,22 +371,22 @@
       "height": 25,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4D64",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SaffronGym",
       "border_filepath": "data/layouts/SaffronCity_Gym/border.bin",
       "blockdata_filepath": "data/layouts/SaffronCity_Gym/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82D7CC8",
-      "name": "UnusedLayout_82D7CC8_Layout",
+      "id": "LAYOUT_FORTREE_CITY_HOUSE2",
+      "name": "FortreeCity_House2_Layout",
       "width": 8,
       "height": 6,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CD4",
-      "border_filepath": "data/layouts/UnusedLayout_82D7CC8/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82D7CC8/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_HoennBuilding",
+      "border_filepath": "data/layouts/FortreeCity_House2/border.bin",
+      "blockdata_filepath": "data/layouts/FortreeCity_House2/map.bin"
     },
     {
       "id": "LAYOUT_CINNABAR_ISLAND_GYM",
@@ -395,8 +395,8 @@
       "height": 25,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4D7C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_CinnabarGym",
       "border_filepath": "data/layouts/CinnabarIsland_Gym/border.bin",
       "blockdata_filepath": "data/layouts/CinnabarIsland_Gym/map.bin"
     },
@@ -407,8 +407,8 @@
       "height": 24,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CBC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_ViridianGym",
       "border_filepath": "data/layouts/ViridianCity_Gym/border.bin",
       "blockdata_filepath": "data/layouts/ViridianCity_Gym/map.bin"
     },
@@ -421,16 +421,16 @@
     {},
     {},
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82D88C8",
-      "name": "UnusedLayout_82D88C8_Layout",
+      "id": "LAYOUT_RS_SAFARI_ZONE_ENTRANCE",
+      "name": "RS_SafariZone_Entrance_Layout",
       "width": 18,
       "height": 14,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4BCC",
-      "border_filepath": "data/layouts/UnusedLayout_82D88C8/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82D88C8/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Mart",
+      "border_filepath": "data/layouts/RS_SafariZone_Entrance/border.bin",
+      "blockdata_filepath": "data/layouts/RS_SafariZone_Entrance/map.bin"
     },
     {
       "id": "LAYOUT_BATTLE_COLOSSEUM_2P",
@@ -439,8 +439,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C44",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_CableClub",
       "border_filepath": "data/layouts/BattleColosseum_2P/border.bin",
       "blockdata_filepath": "data/layouts/BattleColosseum_2P/map.bin"
     },
@@ -451,8 +451,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C44",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_CableClub",
       "border_filepath": "data/layouts/TradeCenter/border.bin",
       "blockdata_filepath": "data/layouts/TradeCenter/map.bin"
     },
@@ -463,8 +463,8 @@
       "height": 10,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C44",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_CableClub",
       "border_filepath": "data/layouts/RecordCenter/border.bin",
       "blockdata_filepath": "data/layouts/RecordCenter/map.bin"
     },
@@ -475,8 +475,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C44",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_CableClub",
       "border_filepath": "data/layouts/BattleColosseum_4P/border.bin",
       "blockdata_filepath": "data/layouts/BattleColosseum_4P/map.bin"
     },
@@ -487,256 +487,256 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F14",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SafariZoneBuilding",
       "border_filepath": "data/layouts/FuchsiaCity_SafariZone_Entrance/border.bin",
       "blockdata_filepath": "data/layouts/FuchsiaCity_SafariZone_Entrance/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82D9B24",
-      "name": "UnusedLayout_82D9B24_Layout",
+      "id": "LAYOUT_RS_SAFARI_ZONE_NORTHEAST",
+      "name": "RS_SafariZone_Northeast_Layout",
       "width": 40,
       "height": 40,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B6C",
-      "border_filepath": "data/layouts/UnusedLayout_82D9B24/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82D9B24/map.bin"
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CinnabarIsland",
+      "border_filepath": "data/layouts/RS_SafariZone_Northeast/border.bin",
+      "blockdata_filepath": "data/layouts/RS_SafariZone_Northeast/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82DA7C8",
-      "name": "UnusedLayout_82DA7C8_Layout",
+      "id": "LAYOUT_RS_SAFARI_ZONE_SOUTHWEST",
+      "name": "RS_SafariZone_Southwest_Layout",
       "width": 40,
       "height": 40,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B6C",
-      "border_filepath": "data/layouts/UnusedLayout_82DA7C8/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82DA7C8/map.bin"
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CinnabarIsland",
+      "border_filepath": "data/layouts/RS_SafariZone_Southwest/border.bin",
+      "blockdata_filepath": "data/layouts/RS_SafariZone_Southwest/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82DB46C",
-      "name": "UnusedLayout_82DB46C_Layout",
+      "id": "LAYOUT_RS_SAFARI_ZONE_SOUTHEAST",
+      "name": "RS_SafariZone_Southeast_Layout",
       "width": 40,
       "height": 40,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B6C",
-      "border_filepath": "data/layouts/UnusedLayout_82DB46C/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82DB46C/map.bin"
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CinnabarIsland",
+      "border_filepath": "data/layouts/RS_SafariZone_Southeast/border.bin",
+      "blockdata_filepath": "data/layouts/RS_SafariZone_Southeast/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82DB4F0",
-      "name": "UnusedLayout_82DB4F0_Layout",
+      "id": "LAYOUT_FORTREE_CITY_DECORATION_SHOP",
+      "name": "FortreeCity_DecorationShop_Layout",
       "width": 8,
       "height": 6,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CD4",
-      "border_filepath": "data/layouts/UnusedLayout_82DB4F0/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82DB4F0/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_HoennBuilding",
+      "border_filepath": "data/layouts/FortreeCity_DecorationShop/border.bin",
+      "blockdata_filepath": "data/layouts/FortreeCity_DecorationShop/map.bin"
     },
     {},
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82DBBE0",
-      "name": "UnusedLayout_82DBBE0_Layout",
+      "id": "LAYOUT_RS_BATTLE_TOWER",
+      "name": "RS_BattleTower_Layout",
       "width": 29,
       "height": 30,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4ADC",
-      "border_filepath": "data/layouts/UnusedLayout_82DBBE0/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82DBBE0/map.bin"
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_PewterCity",
+      "border_filepath": "data/layouts/RS_BattleTower/border.bin",
+      "blockdata_filepath": "data/layouts/RS_BattleTower/map.bin"
     },
     {},
     {},
     {},
     {},
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82DBDD8",
-      "name": "UnusedLayout_82DBDD8_Layout",
+      "id": "LAYOUT_SS_TIDAL_CORRIDOR",
+      "name": "SSTidal_Corridor_Layout",
       "width": 18,
       "height": 13,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4D94",
-      "border_filepath": "data/layouts/UnusedLayout_82DBDD8/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82DBDD8/map.bin"
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SSAnne",
+      "border_filepath": "data/layouts/SSTidal_Corridor/border.bin",
+      "blockdata_filepath": "data/layouts/SSTidal_Corridor/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82DBFB8",
-      "name": "UnusedLayout_82DBFB8_Layout",
+      "id": "LAYOUT_SS_TIDAL_LOWER_DECK",
+      "name": "SSTidal_LowerDeck_Layout",
       "width": 17,
       "height": 13,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4D94",
-      "border_filepath": "data/layouts/UnusedLayout_82DBFB8/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82DBFB8/map.bin"
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SSAnne",
+      "border_filepath": "data/layouts/SSTidal_LowerDeck/border.bin",
+      "blockdata_filepath": "data/layouts/SSTidal_LowerDeck/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82DC4EC",
-      "name": "UnusedLayout_82DC4EC_Layout",
+      "id": "LAYOUT_SS_TIDAL_ROOMS",
+      "name": "SSTidal_Rooms_Layout",
       "width": 36,
       "height": 18,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4D94",
-      "border_filepath": "data/layouts/UnusedLayout_82DC4EC/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82DC4EC/map.bin"
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SSAnne",
+      "border_filepath": "data/layouts/SSTidal_Rooms/border.bin",
+      "blockdata_filepath": "data/layouts/SSTidal_Rooms/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82DC60C",
-      "name": "UnusedLayout_82DC60C_Layout",
+      "id": "LAYOUT_RUSTBORO_CITY_FLAT2_1F",
+      "name": "RustboroCity_Flat2_1F_Layout",
       "width": 14,
       "height": 9,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CD4",
-      "border_filepath": "data/layouts/UnusedLayout_82DC60C/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82DC60C/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_HoennBuilding",
+      "border_filepath": "data/layouts/RustboroCity_Flat2_1F/border.bin",
+      "blockdata_filepath": "data/layouts/RustboroCity_Flat2_1F/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82DC72C",
-      "name": "UnusedLayout_82DC72C_Layout",
+      "id": "LAYOUT_RUSTBORO_CITY_FLAT2_2F",
+      "name": "RustboroCity_Flat2_2F_Layout",
       "width": 14,
       "height": 9,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CD4",
-      "border_filepath": "data/layouts/UnusedLayout_82DC72C/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82DC72C/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_HoennBuilding",
+      "border_filepath": "data/layouts/RustboroCity_Flat2_2F/border.bin",
+      "blockdata_filepath": "data/layouts/RustboroCity_Flat2_2F/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82DC84C",
-      "name": "UnusedLayout_82DC84C_Layout",
+      "id": "LAYOUT_RUSTBORO_CITY_FLAT2_3F",
+      "name": "RustboroCity_Flat2_3F_Layout",
       "width": 14,
       "height": 9,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CD4",
-      "border_filepath": "data/layouts/UnusedLayout_82DC84C/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82DC84C/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_HoennBuilding",
+      "border_filepath": "data/layouts/RustboroCity_Flat2_3F/border.bin",
+      "blockdata_filepath": "data/layouts/RustboroCity_Flat2_3F/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82DCA70",
-      "name": "UnusedLayout_82DCA70_Layout",
+      "id": "LAYOUT_EVER_GRANDE_CITY_HALL_OF_FAME",
+      "name": "EverGrandeCity_HallOfFame_Layout",
       "width": 15,
       "height": 17,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C44",
-      "border_filepath": "data/layouts/UnusedLayout_82DCA70/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82DCA70/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_CableClub",
+      "border_filepath": "data/layouts/EverGrandeCity_HallOfFame/border.bin",
+      "blockdata_filepath": "data/layouts/EverGrandeCity_HallOfFame/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82DCB44",
-      "name": "UnusedLayout_82DCB44_Layout",
+      "id": "LAYOUT_MOSSDEEP_CITY_EREADER_TRAINER_HOUSE_1F",
+      "name": "MossdeepCity_EReaderTrainerHouse_1F_Layout",
       "width": 11,
       "height": 8,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CD4",
-      "border_filepath": "data/layouts/UnusedLayout_82DCB44/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82DCB44/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_HoennBuilding",
+      "border_filepath": "data/layouts/MossdeepCity_EReaderTrainerHouse_1F/border.bin",
+      "blockdata_filepath": "data/layouts/MossdeepCity_EReaderTrainerHouse_1F/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82DCC40",
-      "name": "UnusedLayout_82DCC40_Layout",
+      "id": "LAYOUT_MOSSDEEP_CITY_EREADER_TRAINER_HOUSE_2F",
+      "name": "MossdeepCity_EReaderTrainerHouse_2F_Layout",
       "width": 12,
       "height": 9,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CD4",
-      "border_filepath": "data/layouts/UnusedLayout_82DCC40/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82DCC40/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_HoennBuilding",
+      "border_filepath": "data/layouts/MossdeepCity_EReaderTrainerHouse_2F/border.bin",
+      "blockdata_filepath": "data/layouts/MossdeepCity_EReaderTrainerHouse_2F/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82DCCD4",
-      "name": "UnusedLayout_82DCCD4_Layout",
+      "id": "LAYOUT_SOOTOPOLIS_CITY_HOUSE1",
+      "name": "SootopolisCity_House1_Layout",
       "width": 8,
       "height": 7,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CD4",
-      "border_filepath": "data/layouts/UnusedLayout_82DCCD4/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82DCCD4/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_HoennBuilding",
+      "border_filepath": "data/layouts/SootopolisCity_House1/border.bin",
+      "blockdata_filepath": "data/layouts/SootopolisCity_House1/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82DCD68",
-      "name": "UnusedLayout_82DCD68_Layout",
+      "id": "LAYOUT_SOOTOPOLIS_CITY_HOUSE2",
+      "name": "SootopolisCity_House2_Layout",
       "width": 8,
       "height": 7,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CD4",
-      "border_filepath": "data/layouts/UnusedLayout_82DCD68/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82DCD68/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_HoennBuilding",
+      "border_filepath": "data/layouts/SootopolisCity_House2/border.bin",
+      "blockdata_filepath": "data/layouts/SootopolisCity_House2/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82DCDFC",
-      "name": "UnusedLayout_82DCDFC_Layout",
+      "id": "LAYOUT_SOOTOPOLIS_CITY_HOUSE3",
+      "name": "SootopolisCity_House3_Layout",
       "width": 8,
       "height": 7,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CD4",
-      "border_filepath": "data/layouts/UnusedLayout_82DCDFC/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82DCDFC/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_HoennBuilding",
+      "border_filepath": "data/layouts/SootopolisCity_House3/border.bin",
+      "blockdata_filepath": "data/layouts/SootopolisCity_House3/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82DCF00",
-      "name": "UnusedLayout_82DCF00_Layout",
+      "id": "LAYOUT_RUSTBORO_CITY_FLAT1_1F",
+      "name": "RustboroCity_Flat1_1F_Layout",
       "width": 14,
       "height": 8,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CD4",
-      "border_filepath": "data/layouts/UnusedLayout_82DCF00/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82DCF00/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_HoennBuilding",
+      "border_filepath": "data/layouts/RustboroCity_Flat1_1F/border.bin",
+      "blockdata_filepath": "data/layouts/RustboroCity_Flat1_1F/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82DD004",
-      "name": "UnusedLayout_82DD004_Layout",
+      "id": "LAYOUT_RUSTBORO_CITY_FLAT1_2F",
+      "name": "RustboroCity_Flat1_2F_Layout",
       "width": 14,
       "height": 8,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CD4",
-      "border_filepath": "data/layouts/UnusedLayout_82DD004/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82DD004/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_HoennBuilding",
+      "border_filepath": "data/layouts/RustboroCity_Flat1_2F/border.bin",
+      "blockdata_filepath": "data/layouts/RustboroCity_Flat1_2F/map.bin"
     },
     {},
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_82DD0DC",
-      "name": "UnusedLayout_82DD0DC_Layout",
+      "id": "LAYOUT_RS_SAFARI_ZONE_REST_HOUSE",
+      "name": "RS_SafariZone_RestHouse_Layout",
       "width": 10,
       "height": 9,
       "border_width": 0,
       "border_height": 0,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CD4",
-      "border_filepath": "data/layouts/UnusedLayout_82DD0DC/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_82DD0DC/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_HoennBuilding",
+      "border_filepath": "data/layouts/RS_SafariZone_RestHouse/border.bin",
+      "blockdata_filepath": "data/layouts/RS_SafariZone_RestHouse/map.bin"
     },
     {
       "id": "LAYOUT_PALLET_TOWN",
@@ -745,8 +745,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4AAC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_PalletTown",
       "border_filepath": "data/layouts/PalletTown/border.bin",
       "blockdata_filepath": "data/layouts/PalletTown/map.bin"
     },
@@ -757,8 +757,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4AC4",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_ViridianCity",
       "border_filepath": "data/layouts/ViridianCity/border.bin",
       "blockdata_filepath": "data/layouts/ViridianCity/map.bin"
     },
@@ -769,8 +769,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4ADC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_PewterCity",
       "border_filepath": "data/layouts/PewterCity/border.bin",
       "blockdata_filepath": "data/layouts/PewterCity/map.bin"
     },
@@ -781,8 +781,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4AF4",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CeruleanCity",
       "border_filepath": "data/layouts/CeruleanCity/border.bin",
       "blockdata_filepath": "data/layouts/CeruleanCity/map.bin"
     },
@@ -793,8 +793,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B0C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_LavenderTown",
       "border_filepath": "data/layouts/LavenderTown/border.bin",
       "blockdata_filepath": "data/layouts/LavenderTown/map.bin"
     },
@@ -805,8 +805,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B24",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_VermilionCity",
       "border_filepath": "data/layouts/VermilionCity/border.bin",
       "blockdata_filepath": "data/layouts/VermilionCity/map.bin"
     },
@@ -817,8 +817,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B3C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CeladonCity",
       "border_filepath": "data/layouts/CeladonCity/border.bin",
       "blockdata_filepath": "data/layouts/CeladonCity/map.bin"
     },
@@ -829,8 +829,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B54",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_FuchsiaCity",
       "border_filepath": "data/layouts/FuchsiaCity/border.bin",
       "blockdata_filepath": "data/layouts/FuchsiaCity/map.bin"
     },
@@ -841,8 +841,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B6C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CinnabarIsland",
       "border_filepath": "data/layouts/CinnabarIsland/border.bin",
       "blockdata_filepath": "data/layouts/CinnabarIsland/map.bin"
     },
@@ -853,22 +853,22 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B84",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_IndigoPlateau",
       "border_filepath": "data/layouts/IndigoPlateau_Exterior/border.bin",
       "blockdata_filepath": "data/layouts/IndigoPlateau_Exterior/map.bin"
     },
     {
-      "id": "LAYOUT_SAFFRON_CITY_CLASSIC",
-      "name": "SaffronCity_Classic_Layout",
+      "id": "LAYOUT_SAFFRON_CITY_CONNECTION",
+      "name": "SaffronCity_Connection_Layout",
       "width": 48,
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B9C",
-      "border_filepath": "data/layouts/SaffronCity_Classic/border.bin",
-      "blockdata_filepath": "data/layouts/SaffronCity_Classic/map.bin"
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SaffronCity",
+      "border_filepath": "data/layouts/SaffronCity_Connection/border.bin",
+      "blockdata_filepath": "data/layouts/SaffronCity_Connection/map.bin"
     },
     {
       "id": "LAYOUT_ROUTE1",
@@ -877,8 +877,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4AAC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_PalletTown",
       "border_filepath": "data/layouts/Route1/border.bin",
       "blockdata_filepath": "data/layouts/Route1/map.bin"
     },
@@ -889,8 +889,8 @@
       "height": 80,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4AC4",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_ViridianCity",
       "border_filepath": "data/layouts/Route2/border.bin",
       "blockdata_filepath": "data/layouts/Route2/map.bin"
     },
@@ -901,8 +901,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4ADC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_PewterCity",
       "border_filepath": "data/layouts/Route3/border.bin",
       "blockdata_filepath": "data/layouts/Route3/map.bin"
     },
@@ -913,8 +913,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4AF4",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CeruleanCity",
       "border_filepath": "data/layouts/Route4/border.bin",
       "blockdata_filepath": "data/layouts/Route4/map.bin"
     },
@@ -925,8 +925,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4AF4",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CeruleanCity",
       "border_filepath": "data/layouts/Route5/border.bin",
       "blockdata_filepath": "data/layouts/Route5/map.bin"
     },
@@ -937,8 +937,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B24",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_VermilionCity",
       "border_filepath": "data/layouts/Route6/border.bin",
       "blockdata_filepath": "data/layouts/Route6/map.bin"
     },
@@ -949,8 +949,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B3C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CeladonCity",
       "border_filepath": "data/layouts/Route7/border.bin",
       "blockdata_filepath": "data/layouts/Route7/map.bin"
     },
@@ -961,8 +961,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B0C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_LavenderTown",
       "border_filepath": "data/layouts/Route8/border.bin",
       "blockdata_filepath": "data/layouts/Route8/map.bin"
     },
@@ -973,8 +973,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4AF4",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CeruleanCity",
       "border_filepath": "data/layouts/Route9/border.bin",
       "blockdata_filepath": "data/layouts/Route9/map.bin"
     },
@@ -985,8 +985,8 @@
       "height": 80,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B0C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_LavenderTown",
       "border_filepath": "data/layouts/Route10/border.bin",
       "blockdata_filepath": "data/layouts/Route10/map.bin"
     },
@@ -997,8 +997,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B24",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_VermilionCity",
       "border_filepath": "data/layouts/Route11/border.bin",
       "blockdata_filepath": "data/layouts/Route11/map.bin"
     },
@@ -1009,8 +1009,8 @@
       "height": 120,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B0C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_LavenderTown",
       "border_filepath": "data/layouts/Route12/border.bin",
       "blockdata_filepath": "data/layouts/Route12/map.bin"
     },
@@ -1021,8 +1021,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B0C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_LavenderTown",
       "border_filepath": "data/layouts/Route13/border.bin",
       "blockdata_filepath": "data/layouts/Route13/map.bin"
     },
@@ -1033,8 +1033,8 @@
       "height": 60,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B0C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_LavenderTown",
       "border_filepath": "data/layouts/Route14/border.bin",
       "blockdata_filepath": "data/layouts/Route14/map.bin"
     },
@@ -1045,8 +1045,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B54",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_FuchsiaCity",
       "border_filepath": "data/layouts/Route15/border.bin",
       "blockdata_filepath": "data/layouts/Route15/map.bin"
     },
@@ -1057,8 +1057,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B3C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CeladonCity",
       "border_filepath": "data/layouts/Route16/border.bin",
       "blockdata_filepath": "data/layouts/Route16/map.bin"
     },
@@ -1069,8 +1069,8 @@
       "height": 160,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B3C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CeladonCity",
       "border_filepath": "data/layouts/Route17/border.bin",
       "blockdata_filepath": "data/layouts/Route17/map.bin"
     },
@@ -1081,8 +1081,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B3C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CeladonCity",
       "border_filepath": "data/layouts/Route18/border.bin",
       "blockdata_filepath": "data/layouts/Route18/map.bin"
     },
@@ -1093,8 +1093,8 @@
       "height": 60,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B54",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_FuchsiaCity",
       "border_filepath": "data/layouts/Route19/border.bin",
       "blockdata_filepath": "data/layouts/Route19/map.bin"
     },
@@ -1105,8 +1105,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B6C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CinnabarIsland",
       "border_filepath": "data/layouts/Route20/border.bin",
       "blockdata_filepath": "data/layouts/Route20/map.bin"
     },
@@ -1117,8 +1117,8 @@
       "height": 50,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4AAC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_PalletTown",
       "border_filepath": "data/layouts/Route21_North/border.bin",
       "blockdata_filepath": "data/layouts/Route21_North/map.bin"
     },
@@ -1129,8 +1129,8 @@
       "height": 24,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4AC4",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_ViridianCity",
       "border_filepath": "data/layouts/Route22/border.bin",
       "blockdata_filepath": "data/layouts/Route22/map.bin"
     },
@@ -1141,8 +1141,8 @@
       "height": 160,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B84",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_IndigoPlateau",
       "border_filepath": "data/layouts/Route23/border.bin",
       "blockdata_filepath": "data/layouts/Route23/map.bin"
     },
@@ -1153,8 +1153,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4AF4",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CeruleanCity",
       "border_filepath": "data/layouts/Route24/border.bin",
       "blockdata_filepath": "data/layouts/Route24/map.bin"
     },
@@ -1165,8 +1165,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4AF4",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CeruleanCity",
       "border_filepath": "data/layouts/Route25/border.bin",
       "blockdata_filepath": "data/layouts/Route25/map.bin"
     },
@@ -1177,8 +1177,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/MtMoon_1F/border.bin",
       "blockdata_filepath": "data/layouts/MtMoon_1F/map.bin"
     },
@@ -1189,8 +1189,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/MtMoon_B1F/border.bin",
       "blockdata_filepath": "data/layouts/MtMoon_B1F/map.bin"
     },
@@ -1201,8 +1201,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/MtMoon_B2F/border.bin",
       "blockdata_filepath": "data/layouts/MtMoon_B2F/map.bin"
     },
@@ -1213,8 +1213,8 @@
       "height": 69,
       "border_width": 3,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4DC4",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_ViridianForest",
       "border_filepath": "data/layouts/ViridianForest/border.bin",
       "blockdata_filepath": "data/layouts/ViridianForest/map.bin"
     },
@@ -1225,8 +1225,8 @@
       "height": 32,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B24",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_VermilionCity",
       "border_filepath": "data/layouts/SSAnne_Exterior/border.bin",
       "blockdata_filepath": "data/layouts/SSAnne_Exterior/map.bin"
     },
@@ -1237,8 +1237,8 @@
       "height": 21,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4D94",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SSAnne",
       "border_filepath": "data/layouts/SSAnne_1F_Corridor/border.bin",
       "blockdata_filepath": "data/layouts/SSAnne_1F_Corridor/map.bin"
     },
@@ -1249,8 +1249,8 @@
       "height": 16,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4D94",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SSAnne",
       "border_filepath": "data/layouts/SSAnne_2F_Corridor/border.bin",
       "blockdata_filepath": "data/layouts/SSAnne_2F_Corridor/map.bin"
     },
@@ -1261,8 +1261,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4D94",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SSAnne",
       "border_filepath": "data/layouts/SSAnne_3F_Corridor/border.bin",
       "blockdata_filepath": "data/layouts/SSAnne_3F_Corridor/map.bin"
     },
@@ -1273,8 +1273,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4D94",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SSAnne",
       "border_filepath": "data/layouts/SSAnne_B1F_Corridor/border.bin",
       "blockdata_filepath": "data/layouts/SSAnne_B1F_Corridor/map.bin"
     },
@@ -1285,8 +1285,8 @@
       "height": 19,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4D94",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SSAnne",
       "border_filepath": "data/layouts/SSAnne_Deck/border.bin",
       "blockdata_filepath": "data/layouts/SSAnne_Deck/map.bin"
     },
@@ -1297,8 +1297,8 @@
       "height": 80,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4E0C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_DiglettsCave",
       "border_filepath": "data/layouts/DiglettsCave_B1F/border.bin",
       "blockdata_filepath": "data/layouts/DiglettsCave_B1F/map.bin"
     },
@@ -1309,8 +1309,8 @@
       "height": 22,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/VictoryRoad_1F/border.bin",
       "blockdata_filepath": "data/layouts/VictoryRoad_1F/map.bin"
     },
@@ -1321,8 +1321,8 @@
       "height": 22,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/VictoryRoad_2F/border.bin",
       "blockdata_filepath": "data/layouts/VictoryRoad_2F/map.bin"
     },
@@ -1333,8 +1333,8 @@
       "height": 22,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/VictoryRoad_3F/border.bin",
       "blockdata_filepath": "data/layouts/VictoryRoad_3F/map.bin"
     },
@@ -1345,8 +1345,8 @@
       "height": 34,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4ECC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SilphCo",
       "border_filepath": "data/layouts/RocketHideout_B1F/border.bin",
       "blockdata_filepath": "data/layouts/RocketHideout_B1F/map.bin"
     },
@@ -1357,8 +1357,8 @@
       "height": 22,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4ECC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SilphCo",
       "border_filepath": "data/layouts/RocketHideout_B2F/border.bin",
       "blockdata_filepath": "data/layouts/RocketHideout_B2F/map.bin"
     },
@@ -1369,8 +1369,8 @@
       "height": 27,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4ECC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SilphCo",
       "border_filepath": "data/layouts/RocketHideout_B3F/border.bin",
       "blockdata_filepath": "data/layouts/RocketHideout_B3F/map.bin"
     },
@@ -1381,8 +1381,8 @@
       "height": 26,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4ECC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SilphCo",
       "border_filepath": "data/layouts/RocketHideout_B4F/border.bin",
       "blockdata_filepath": "data/layouts/RocketHideout_B4F/map.bin"
     },
@@ -1393,8 +1393,8 @@
       "height": 22,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4ECC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SilphCo",
       "border_filepath": "data/layouts/SilphCo_1F/border.bin",
       "blockdata_filepath": "data/layouts/SilphCo_1F/map.bin"
     },
@@ -1405,8 +1405,8 @@
       "height": 22,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4ECC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SilphCo",
       "border_filepath": "data/layouts/SilphCo_2F/border.bin",
       "blockdata_filepath": "data/layouts/SilphCo_2F/map.bin"
     },
@@ -1417,8 +1417,8 @@
       "height": 22,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4ECC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SilphCo",
       "border_filepath": "data/layouts/SilphCo_3F/border.bin",
       "blockdata_filepath": "data/layouts/SilphCo_3F/map.bin"
     },
@@ -1429,8 +1429,8 @@
       "height": 22,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4ECC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SilphCo",
       "border_filepath": "data/layouts/SilphCo_4F/border.bin",
       "blockdata_filepath": "data/layouts/SilphCo_4F/map.bin"
     },
@@ -1441,8 +1441,8 @@
       "height": 22,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4ECC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SilphCo",
       "border_filepath": "data/layouts/SilphCo_5F/border.bin",
       "blockdata_filepath": "data/layouts/SilphCo_5F/map.bin"
     },
@@ -1453,8 +1453,8 @@
       "height": 19,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4ECC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SilphCo",
       "border_filepath": "data/layouts/SilphCo_6F/border.bin",
       "blockdata_filepath": "data/layouts/SilphCo_6F/map.bin"
     },
@@ -1465,8 +1465,8 @@
       "height": 19,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4ECC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SilphCo",
       "border_filepath": "data/layouts/SilphCo_7F/border.bin",
       "blockdata_filepath": "data/layouts/SilphCo_7F/map.bin"
     },
@@ -1477,8 +1477,8 @@
       "height": 19,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4ECC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SilphCo",
       "border_filepath": "data/layouts/SilphCo_8F/border.bin",
       "blockdata_filepath": "data/layouts/SilphCo_8F/map.bin"
     },
@@ -1489,8 +1489,8 @@
       "height": 19,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4ECC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SilphCo",
       "border_filepath": "data/layouts/SilphCo_9F/border.bin",
       "blockdata_filepath": "data/layouts/SilphCo_9F/map.bin"
     },
@@ -1501,8 +1501,8 @@
       "height": 19,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4ECC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SilphCo",
       "border_filepath": "data/layouts/SilphCo_10F/border.bin",
       "blockdata_filepath": "data/layouts/SilphCo_10F/map.bin"
     },
@@ -1513,8 +1513,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4ECC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SilphCo",
       "border_filepath": "data/layouts/SilphCo_11F/border.bin",
       "blockdata_filepath": "data/layouts/SilphCo_11F/map.bin"
     },
@@ -1525,8 +1525,8 @@
       "height": 35,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F2C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonMansion",
       "border_filepath": "data/layouts/PokemonMansion_1F/border.bin",
       "blockdata_filepath": "data/layouts/PokemonMansion_1F/map.bin"
     },
@@ -1537,8 +1537,8 @@
       "height": 38,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F2C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonMansion",
       "border_filepath": "data/layouts/PokemonMansion_2F/border.bin",
       "blockdata_filepath": "data/layouts/PokemonMansion_2F/map.bin"
     },
@@ -1549,8 +1549,8 @@
       "height": 35,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F2C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonMansion",
       "border_filepath": "data/layouts/PokemonMansion_3F/border.bin",
       "blockdata_filepath": "data/layouts/PokemonMansion_3F/map.bin"
     },
@@ -1561,8 +1561,8 @@
       "height": 35,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F2C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonMansion",
       "border_filepath": "data/layouts/PokemonMansion_B1F/border.bin",
       "blockdata_filepath": "data/layouts/PokemonMansion_B1F/map.bin"
     },
@@ -1573,8 +1573,8 @@
       "height": 36,
       "border_width": 3,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B54",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_FuchsiaCity",
       "border_filepath": "data/layouts/SafariZone_Center/border.bin",
       "blockdata_filepath": "data/layouts/SafariZone_Center/map.bin"
     },
@@ -1585,8 +1585,8 @@
       "height": 35,
       "border_width": 3,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B54",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_FuchsiaCity",
       "border_filepath": "data/layouts/SafariZone_East/border.bin",
       "blockdata_filepath": "data/layouts/SafariZone_East/map.bin"
     },
@@ -1597,8 +1597,8 @@
       "height": 40,
       "border_width": 3,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B54",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_FuchsiaCity",
       "border_filepath": "data/layouts/SafariZone_North/border.bin",
       "blockdata_filepath": "data/layouts/SafariZone_North/map.bin"
     },
@@ -1609,8 +1609,8 @@
       "height": 36,
       "border_width": 3,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B54",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_FuchsiaCity",
       "border_filepath": "data/layouts/SafariZone_West/border.bin",
       "blockdata_filepath": "data/layouts/SafariZone_West/map.bin"
     },
@@ -1621,8 +1621,8 @@
       "height": 23,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4E54",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CeruleanCave",
       "border_filepath": "data/layouts/CeruleanCave_1F/border.bin",
       "blockdata_filepath": "data/layouts/CeruleanCave_1F/map.bin"
     },
@@ -1633,8 +1633,8 @@
       "height": 23,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4E54",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CeruleanCave",
       "border_filepath": "data/layouts/CeruleanCave_2F/border.bin",
       "blockdata_filepath": "data/layouts/CeruleanCave_2F/map.bin"
     },
@@ -1645,8 +1645,8 @@
       "height": 23,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4E54",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CeruleanCave",
       "border_filepath": "data/layouts/CeruleanCave_B1F/border.bin",
       "blockdata_filepath": "data/layouts/CeruleanCave_B1F/map.bin"
     },
@@ -1657,8 +1657,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4DF4",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_RockTunnel",
       "border_filepath": "data/layouts/RockTunnel_1F/border.bin",
       "blockdata_filepath": "data/layouts/RockTunnel_1F/map.bin"
     },
@@ -1669,8 +1669,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4DF4",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_RockTunnel",
       "border_filepath": "data/layouts/RockTunnel_B1F/border.bin",
       "blockdata_filepath": "data/layouts/RockTunnel_B1F/map.bin"
     },
@@ -1681,8 +1681,8 @@
       "height": 24,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4E24",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeafoamIslands",
       "border_filepath": "data/layouts/SeafoamIslands_1F/border.bin",
       "blockdata_filepath": "data/layouts/SeafoamIslands_1F/map.bin"
     },
@@ -1693,8 +1693,8 @@
       "height": 23,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4E24",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeafoamIslands",
       "border_filepath": "data/layouts/SeafoamIslands_B1F/border.bin",
       "blockdata_filepath": "data/layouts/SeafoamIslands_B1F/map.bin"
     },
@@ -1705,8 +1705,8 @@
       "height": 24,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4E24",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeafoamIslands",
       "border_filepath": "data/layouts/SeafoamIslands_B2F/border.bin",
       "blockdata_filepath": "data/layouts/SeafoamIslands_B2F/map.bin"
     },
@@ -1717,8 +1717,8 @@
       "height": 24,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4E24",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeafoamIslands",
       "border_filepath": "data/layouts/SeafoamIslands_B3F/border.bin",
       "blockdata_filepath": "data/layouts/SeafoamIslands_B3F/map.bin"
     },
@@ -1729,8 +1729,8 @@
       "height": 24,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4E24",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeafoamIslands",
       "border_filepath": "data/layouts/SeafoamIslands_B4F/border.bin",
       "blockdata_filepath": "data/layouts/SeafoamIslands_B4F/map.bin"
     },
@@ -1741,8 +1741,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4EFC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonTower",
       "border_filepath": "data/layouts/PokemonTower_1F/border.bin",
       "blockdata_filepath": "data/layouts/PokemonTower_1F/map.bin"
     },
@@ -1753,8 +1753,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4EFC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonTower",
       "border_filepath": "data/layouts/PokemonTower_2F/border.bin",
       "blockdata_filepath": "data/layouts/PokemonTower_2F/map.bin"
     },
@@ -1765,8 +1765,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4EFC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonTower",
       "border_filepath": "data/layouts/PokemonTower_3F/border.bin",
       "blockdata_filepath": "data/layouts/PokemonTower_3F/map.bin"
     },
@@ -1777,8 +1777,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4EFC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonTower",
       "border_filepath": "data/layouts/PokemonTower_4F/border.bin",
       "blockdata_filepath": "data/layouts/PokemonTower_4F/map.bin"
     },
@@ -1789,8 +1789,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4EFC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonTower",
       "border_filepath": "data/layouts/PokemonTower_5F/border.bin",
       "blockdata_filepath": "data/layouts/PokemonTower_5F/map.bin"
     },
@@ -1801,8 +1801,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4EFC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonTower",
       "border_filepath": "data/layouts/PokemonTower_6F/border.bin",
       "blockdata_filepath": "data/layouts/PokemonTower_6F/map.bin"
     },
@@ -1813,8 +1813,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4EFC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonTower",
       "border_filepath": "data/layouts/PokemonTower_7F/border.bin",
       "blockdata_filepath": "data/layouts/PokemonTower_7F/map.bin"
     },
@@ -1825,8 +1825,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E9C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PowerPlant",
       "border_filepath": "data/layouts/PowerPlant/border.bin",
       "blockdata_filepath": "data/layouts/PowerPlant/map.bin"
     },
@@ -1837,8 +1837,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4EB4",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SeaCottage",
       "border_filepath": "data/layouts/Route25_SeaCottage/border.bin",
       "blockdata_filepath": "data/layouts/Route25_SeaCottage/map.bin"
     },
@@ -1849,8 +1849,8 @@
       "height": 14,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4D94",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SSAnne",
       "border_filepath": "data/layouts/SSAnne_Kitchen/border.bin",
       "blockdata_filepath": "data/layouts/SSAnne_Kitchen/map.bin"
     },
@@ -1861,8 +1861,8 @@
       "height": 10,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4D94",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SSAnne",
       "border_filepath": "data/layouts/SSAnne_CaptainsOffice/border.bin",
       "blockdata_filepath": "data/layouts/SSAnne_CaptainsOffice/map.bin"
     },
@@ -1873,8 +1873,8 @@
       "height": 10,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E84",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding2",
       "border_filepath": "data/layouts/UndergroundPath_Entrance/border.bin",
       "blockdata_filepath": "data/layouts/UndergroundPath_Entrance/map.bin"
     },
@@ -1885,8 +1885,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4EE4",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_UndergroundPath",
       "border_filepath": "data/layouts/UndergroundPath_EastWestTunnel/border.bin",
       "blockdata_filepath": "data/layouts/UndergroundPath_EastWestTunnel/map.bin"
     },
@@ -1897,8 +1897,8 @@
       "height": 63,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4EE4",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_UndergroundPath",
       "border_filepath": "data/layouts/UndergroundPath_NorthSouthTunnel/border.bin",
       "blockdata_filepath": "data/layouts/UndergroundPath_NorthSouthTunnel/map.bin"
     },
@@ -1910,8 +1910,8 @@
       "height": 13,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E84",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding2",
       "border_filepath": "data/layouts/Route12_NorthEntrance_1F/border.bin",
       "blockdata_filepath": "data/layouts/Route12_NorthEntrance_1F/map.bin"
     },
@@ -1922,8 +1922,8 @@
       "height": 8,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4D94",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SSAnne",
       "border_filepath": "data/layouts/SSAnne_Room1/border.bin",
       "blockdata_filepath": "data/layouts/SSAnne_Room1/map.bin"
     },
@@ -1934,8 +1934,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4D94",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SSAnne",
       "border_filepath": "data/layouts/SSAnne_Room2/border.bin",
       "blockdata_filepath": "data/layouts/SSAnne_Room2/map.bin"
     },
@@ -1946,8 +1946,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4ECC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SilphCo",
       "border_filepath": "data/layouts/CeladonCity_DepartmentStore_Elevator/border.bin",
       "blockdata_filepath": "data/layouts/CeladonCity_DepartmentStore_Elevator/map.bin"
     },
@@ -1958,8 +1958,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C2C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Museum",
       "border_filepath": "data/layouts/PewterCity_Museum_1F/border.bin",
       "blockdata_filepath": "data/layouts/PewterCity_Museum_1F/map.bin"
     },
@@ -1970,8 +1970,8 @@
       "height": 10,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C2C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Museum",
       "border_filepath": "data/layouts/PewterCity_Museum_2F/border.bin",
       "blockdata_filepath": "data/layouts/PewterCity_Museum_2F/map.bin"
     },
@@ -1982,8 +1982,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4FA4",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_BurgledHouse",
       "border_filepath": "data/layouts/CeruleanCity_House2/border.bin",
       "blockdata_filepath": "data/layouts/CeruleanCity_House2/map.bin"
     },
@@ -1994,8 +1994,8 @@
       "height": 10,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E84",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding2",
       "border_filepath": "data/layouts/CeruleanCity_House1/border.bin",
       "blockdata_filepath": "data/layouts/CeruleanCity_House1/map.bin"
     },
@@ -2006,8 +2006,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F8C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Condominiums",
       "border_filepath": "data/layouts/CeladonCity_Condominiums_1F/border.bin",
       "blockdata_filepath": "data/layouts/CeladonCity_Condominiums_1F/map.bin"
     },
@@ -2018,8 +2018,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F8C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Condominiums",
       "border_filepath": "data/layouts/CeladonCity_Condominiums_2F/border.bin",
       "blockdata_filepath": "data/layouts/CeladonCity_Condominiums_2F/map.bin"
     },
@@ -2030,8 +2030,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F8C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Condominiums",
       "border_filepath": "data/layouts/CeladonCity_Condominiums_3F/border.bin",
       "blockdata_filepath": "data/layouts/CeladonCity_Condominiums_3F/map.bin"
     },
@@ -2042,8 +2042,8 @@
       "height": 23,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F8C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Condominiums",
       "border_filepath": "data/layouts/CeladonCity_Condominiums_Roof/border.bin",
       "blockdata_filepath": "data/layouts/CeladonCity_Condominiums_Roof/map.bin"
     },
@@ -2054,8 +2054,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F5C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_School",
       "border_filepath": "data/layouts/CeladonCity_Condominiums_RoofRoom/border.bin",
       "blockdata_filepath": "data/layouts/CeladonCity_Condominiums_RoofRoom/map.bin"
     },
@@ -2066,8 +2066,8 @@
       "height": 10,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CEC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GameCorner",
       "border_filepath": "data/layouts/CeladonCity_GameCorner_PrizeRoom/border.bin",
       "blockdata_filepath": "data/layouts/CeladonCity_GameCorner_PrizeRoom/map.bin"
     },
@@ -2078,8 +2078,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F44",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_RestaurantHotel",
       "border_filepath": "data/layouts/CeladonCity_Restaurant/border.bin",
       "blockdata_filepath": "data/layouts/CeladonCity_Restaurant/map.bin"
     },
@@ -2090,8 +2090,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F44",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_RestaurantHotel",
       "border_filepath": "data/layouts/CeladonCity_Hotel/border.bin",
       "blockdata_filepath": "data/layouts/CeladonCity_Hotel/map.bin"
     },
@@ -2102,8 +2102,8 @@
       "height": 16,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E6C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_DepartmentStore",
       "border_filepath": "data/layouts/CeladonCity_DepartmentStore_1F/border.bin",
       "blockdata_filepath": "data/layouts/CeladonCity_DepartmentStore_1F/map.bin"
     },
@@ -2114,8 +2114,8 @@
       "height": 15,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E6C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_DepartmentStore",
       "border_filepath": "data/layouts/CeladonCity_DepartmentStore_2F/border.bin",
       "blockdata_filepath": "data/layouts/CeladonCity_DepartmentStore_2F/map.bin"
     },
@@ -2126,8 +2126,8 @@
       "height": 15,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E6C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_DepartmentStore",
       "border_filepath": "data/layouts/CeladonCity_DepartmentStore_3F/border.bin",
       "blockdata_filepath": "data/layouts/CeladonCity_DepartmentStore_3F/map.bin"
     },
@@ -2138,8 +2138,8 @@
       "height": 15,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E6C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_DepartmentStore",
       "border_filepath": "data/layouts/CeladonCity_DepartmentStore_4F/border.bin",
       "blockdata_filepath": "data/layouts/CeladonCity_DepartmentStore_4F/map.bin"
     },
@@ -2150,8 +2150,8 @@
       "height": 15,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E6C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_DepartmentStore",
       "border_filepath": "data/layouts/CeladonCity_DepartmentStore_5F/border.bin",
       "blockdata_filepath": "data/layouts/CeladonCity_DepartmentStore_5F/map.bin"
     },
@@ -2162,8 +2162,8 @@
       "height": 14,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E6C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_DepartmentStore",
       "border_filepath": "data/layouts/CeladonCity_DepartmentStore_Roof/border.bin",
       "blockdata_filepath": "data/layouts/CeladonCity_DepartmentStore_Roof/map.bin"
     },
@@ -2174,8 +2174,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F14",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SafariZoneBuilding",
       "border_filepath": "data/layouts/SafariZone_RestHouse/border.bin",
       "blockdata_filepath": "data/layouts/SafariZone_RestHouse/map.bin"
     },
@@ -2186,8 +2186,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F14",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SafariZoneBuilding",
       "border_filepath": "data/layouts/SafariZone_SecretHouse/border.bin",
       "blockdata_filepath": "data/layouts/SafariZone_SecretHouse/map.bin"
     },
@@ -2198,8 +2198,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F14",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SafariZoneBuilding",
       "border_filepath": "data/layouts/FuchsiaCity_SafariZone_Office/border.bin",
       "blockdata_filepath": "data/layouts/FuchsiaCity_SafariZone_Office/map.bin"
     },
@@ -2210,8 +2210,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C2C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Museum",
       "border_filepath": "data/layouts/FuchsiaCity_WardensHouse/border.bin",
       "blockdata_filepath": "data/layouts/FuchsiaCity_WardensHouse/map.bin"
     },
@@ -2222,8 +2222,8 @@
       "height": 10,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C2C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Museum",
       "border_filepath": "data/layouts/FuchsiaCity_House2/border.bin",
       "blockdata_filepath": "data/layouts/FuchsiaCity_House2/map.bin"
     },
@@ -2234,8 +2234,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C8C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Lab",
       "border_filepath": "data/layouts/CinnabarIsland_PokemonLab_Entrance/border.bin",
       "blockdata_filepath": "data/layouts/CinnabarIsland_PokemonLab_Entrance/map.bin"
     },
@@ -2246,8 +2246,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C8C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Lab",
       "border_filepath": "data/layouts/CinnabarIsland_PokemonLab_Lounge/border.bin",
       "blockdata_filepath": "data/layouts/CinnabarIsland_PokemonLab_Lounge/map.bin"
     },
@@ -2258,8 +2258,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C8C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Lab",
       "border_filepath": "data/layouts/CinnabarIsland_PokemonLab_ResearchRoom/border.bin",
       "blockdata_filepath": "data/layouts/CinnabarIsland_PokemonLab_ResearchRoom/map.bin"
     },
@@ -2270,8 +2270,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C8C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Lab",
       "border_filepath": "data/layouts/CinnabarIsland_PokemonLab_ExperimentRoom/border.bin",
       "blockdata_filepath": "data/layouts/CinnabarIsland_PokemonLab_ExperimentRoom/map.bin"
     },
@@ -2282,8 +2282,8 @@
       "height": 55,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B9C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SaffronCity",
       "border_filepath": "data/layouts/SaffronCity/border.bin",
       "blockdata_filepath": "data/layouts/SaffronCity/map.bin"
     },
@@ -2294,8 +2294,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E84",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding2",
       "border_filepath": "data/layouts/SaffronCity_NorthSouthEntrance/border.bin",
       "blockdata_filepath": "data/layouts/SaffronCity_NorthSouthEntrance/map.bin"
     },
@@ -2306,8 +2306,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E84",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding2",
       "border_filepath": "data/layouts/SaffronCity_EastWestEntrance/border.bin",
       "blockdata_filepath": "data/layouts/SaffronCity_EastWestEntrance/map.bin"
     },
@@ -2318,8 +2318,8 @@
       "height": 8,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4E0C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_DiglettsCave",
       "border_filepath": "data/layouts/DiglettsCave_NorthEntrance/border.bin",
       "blockdata_filepath": "data/layouts/DiglettsCave_NorthEntrance/map.bin"
     },
@@ -2330,8 +2330,8 @@
       "height": 8,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4E0C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_DiglettsCave",
       "border_filepath": "data/layouts/DiglettsCave_SouthEntrance/border.bin",
       "blockdata_filepath": "data/layouts/DiglettsCave_SouthEntrance/map.bin"
     },
@@ -2342,8 +2342,8 @@
       "height": 18,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4BE4",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonCenter",
       "border_filepath": "data/layouts/IndigoPlateau_PokemonCenter_1F/border.bin",
       "blockdata_filepath": "data/layouts/IndigoPlateau_PokemonCenter_1F/map.bin"
     },
@@ -2354,8 +2354,8 @@
       "height": 13,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D50C4",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonLeague",
       "border_filepath": "data/layouts/PokemonLeague_LoreleisRoom/border.bin",
       "blockdata_filepath": "data/layouts/PokemonLeague_LoreleisRoom/map.bin"
     },
@@ -2366,8 +2366,8 @@
       "height": 13,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D50C4",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonLeague",
       "border_filepath": "data/layouts/PokemonLeague_BrunosRoom/border.bin",
       "blockdata_filepath": "data/layouts/PokemonLeague_BrunosRoom/map.bin"
     },
@@ -2378,8 +2378,8 @@
       "height": 13,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D50C4",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonLeague",
       "border_filepath": "data/layouts/PokemonLeague_AgathasRoom/border.bin",
       "blockdata_filepath": "data/layouts/PokemonLeague_AgathasRoom/map.bin"
     },
@@ -2390,8 +2390,8 @@
       "height": 24,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D50C4",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonLeague",
       "border_filepath": "data/layouts/PokemonLeague_LancesRoom/border.bin",
       "blockdata_filepath": "data/layouts/PokemonLeague_LancesRoom/map.bin"
     },
@@ -2402,8 +2402,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D50C4",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonLeague",
       "border_filepath": "data/layouts/PokemonLeague_ChampionsRoom/border.bin",
       "blockdata_filepath": "data/layouts/PokemonLeague_ChampionsRoom/map.bin"
     },
@@ -2414,8 +2414,8 @@
       "height": 13,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D50DC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_HallOfFame",
       "border_filepath": "data/layouts/PokemonLeague_HallOfFame/border.bin",
       "blockdata_filepath": "data/layouts/PokemonLeague_HallOfFame/map.bin"
     },
@@ -2426,8 +2426,8 @@
       "height": 50,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B6C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CinnabarIsland",
       "border_filepath": "data/layouts/Route21_South/border.bin",
       "blockdata_filepath": "data/layouts/Route21_South/map.bin"
     },
@@ -2438,8 +2438,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E84",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding2",
       "border_filepath": "data/layouts/Entrance_2F/border.bin",
       "blockdata_filepath": "data/layouts/Entrance_2F/map.bin"
     },
@@ -2450,8 +2450,8 @@
       "height": 12,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E84",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding2",
       "border_filepath": "data/layouts/Route2_Entrance/border.bin",
       "blockdata_filepath": "data/layouts/Route2_Entrance/map.bin"
     },
@@ -2462,8 +2462,8 @@
       "height": 12,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E84",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding2",
       "border_filepath": "data/layouts/Route22_NorthEntrance/border.bin",
       "blockdata_filepath": "data/layouts/Route22_NorthEntrance/map.bin"
     },
@@ -2474,8 +2474,8 @@
       "height": 18,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E84",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding2",
       "border_filepath": "data/layouts/Route16_NorthEntrance_1F/border.bin",
       "blockdata_filepath": "data/layouts/Route16_NorthEntrance_1F/map.bin"
     },
@@ -2486,8 +2486,8 @@
       "height": 12,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E84",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding2",
       "border_filepath": "data/layouts/Entrance_1F/border.bin",
       "blockdata_filepath": "data/layouts/Entrance_1F/map.bin"
     },
@@ -2498,34 +2498,34 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4ECC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SilphCo",
       "border_filepath": "data/layouts/RocketHideout_Elevator/border.bin",
       "blockdata_filepath": "data/layouts/RocketHideout_Elevator/map.bin"
     },
     {
-      "id": "LAYOUT_SAFFRON_CITY_HOUSE1_1F",
-      "name": "SaffronCity_House1_1F_Layout",
+      "id": "LAYOUT_SAFFRON_CITY_COPYCATS_HOUSE_1F",
+      "name": "SaffronCity_CopycatsHouse_1F_Layout",
       "width": 13,
       "height": 10,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C74",
-      "border_filepath": "data/layouts/SaffronCity_House1_1F/border.bin",
-      "blockdata_filepath": "data/layouts/SaffronCity_House1_1F/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding1",
+      "border_filepath": "data/layouts/SaffronCity_CopycatsHouse_1F/border.bin",
+      "blockdata_filepath": "data/layouts/SaffronCity_CopycatsHouse_1F/map.bin"
     },
     {
-      "id": "LAYOUT_SAFFRON_CITY_HOUSE1_2F",
-      "name": "SaffronCity_House1_2F_Layout",
+      "id": "LAYOUT_SAFFRON_CITY_COPYCATS_HOUSE_2F",
+      "name": "SaffronCity_CopycatsHouse_2F_Layout",
       "width": 12,
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4C74",
-      "border_filepath": "data/layouts/SaffronCity_House1_2F/border.bin",
-      "blockdata_filepath": "data/layouts/SaffronCity_House1_2F/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding1",
+      "border_filepath": "data/layouts/SaffronCity_CopycatsHouse_2F/border.bin",
+      "blockdata_filepath": "data/layouts/SaffronCity_CopycatsHouse_2F/map.bin"
     },
     {
       "id": "LAYOUT_SAFFRON_CITY_DOJO",
@@ -2534,8 +2534,8 @@
       "height": 16,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4D04",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PewterGym",
       "border_filepath": "data/layouts/SaffronCity_Dojo/border.bin",
       "blockdata_filepath": "data/layouts/SaffronCity_Dojo/map.bin"
     },
@@ -2546,8 +2546,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4ECC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SilphCo",
       "border_filepath": "data/layouts/SilphCo_Elevator/border.bin",
       "blockdata_filepath": "data/layouts/SilphCo_Elevator/map.bin"
     },
@@ -2558,8 +2558,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D504C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands123",
       "border_filepath": "data/layouts/OneIsland/border.bin",
       "blockdata_filepath": "data/layouts/OneIsland/map.bin"
     },
@@ -2570,8 +2570,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D504C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands123",
       "border_filepath": "data/layouts/TwoIsland/border.bin",
       "blockdata_filepath": "data/layouts/TwoIsland/map.bin"
     },
@@ -2582,8 +2582,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D504C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands123",
       "border_filepath": "data/layouts/ThreeIsland/border.bin",
       "blockdata_filepath": "data/layouts/ThreeIsland/map.bin"
     },
@@ -2594,8 +2594,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D5064",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands45",
       "border_filepath": "data/layouts/FourIsland/border.bin",
       "blockdata_filepath": "data/layouts/FourIsland/map.bin"
     },
@@ -2606,8 +2606,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D5064",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands45",
       "border_filepath": "data/layouts/FiveIsland/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland/map.bin"
     },
@@ -2618,8 +2618,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D507C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands67",
       "border_filepath": "data/layouts/SevenIsland/border.bin",
       "blockdata_filepath": "data/layouts/SevenIsland/map.bin"
     },
@@ -2630,8 +2630,8 @@
       "height": 30,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D507C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands67",
       "border_filepath": "data/layouts/SixIsland/border.bin",
       "blockdata_filepath": "data/layouts/SixIsland/map.bin"
     },
@@ -2642,8 +2642,8 @@
       "height": 140,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D504C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands123",
       "border_filepath": "data/layouts/OneIsland_KindleRoad/border.bin",
       "blockdata_filepath": "data/layouts/OneIsland_KindleRoad/map.bin"
     },
@@ -2654,8 +2654,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D504C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands123",
       "border_filepath": "data/layouts/OneIsland_TreasureBeach/border.bin",
       "blockdata_filepath": "data/layouts/OneIsland_TreasureBeach/map.bin"
     },
@@ -2666,8 +2666,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D504C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands123",
       "border_filepath": "data/layouts/TwoIsland_CapeBrink/border.bin",
       "blockdata_filepath": "data/layouts/TwoIsland_CapeBrink/map.bin"
     },
@@ -2678,8 +2678,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D504C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands123",
       "border_filepath": "data/layouts/ThreeIsland_BondBridge/border.bin",
       "blockdata_filepath": "data/layouts/ThreeIsland_BondBridge/map.bin"
     },
@@ -2690,58 +2690,58 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D504C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands123",
       "border_filepath": "data/layouts/ThreeIsland_Port/border.bin",
       "blockdata_filepath": "data/layouts/ThreeIsland_Port/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_03_50",
-      "name": "UnknownMap_03_50_Layout",
+      "id": "LAYOUT_PROTOTYPE_SEVII_ISLE_6",
+      "name": "Prototype_SeviiIsle_6_Layout",
       "width": 1,
       "height": 1,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B3C",
-      "border_filepath": "data/layouts/UnknownMap_03_50/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_03_50/map.bin"
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CeladonCity",
+      "border_filepath": "data/layouts/Prototype_SeviiIsle_6/border.bin",
+      "blockdata_filepath": "data/layouts/Prototype_SeviiIsle_6/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_03_51",
-      "name": "UnknownMap_03_51_Layout",
+      "id": "LAYOUT_PROTOTYPE_SEVII_ISLE_7",
+      "name": "Prototype_SeviiIsle_7_Layout",
       "width": 1,
       "height": 1,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B3C",
-      "border_filepath": "data/layouts/UnknownMap_03_51/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_03_51/map.bin"
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CeladonCity",
+      "border_filepath": "data/layouts/Prototype_SeviiIsle_7/border.bin",
+      "blockdata_filepath": "data/layouts/Prototype_SeviiIsle_7/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_03_52",
-      "name": "UnknownMap_03_52_Layout",
+      "id": "LAYOUT_PROTOTYPE_SEVII_ISLE_8",
+      "name": "Prototype_SeviiIsle_8_Layout",
       "width": 84,
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B3C",
-      "border_filepath": "data/layouts/UnknownMap_03_52/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_03_52/map.bin"
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CeladonCity",
+      "border_filepath": "data/layouts/Prototype_SeviiIsle_8/border.bin",
+      "blockdata_filepath": "data/layouts/Prototype_SeviiIsle_8/map.bin"
     },
     {
-      "id": "LAYOUT_UNKNOWN_MAP_03_53",
-      "name": "UnknownMap_03_53_Layout",
+      "id": "LAYOUT_PROTOTYPE_SEVII_ISLE_9",
+      "name": "Prototype_SeviiIsle_9_Layout",
       "width": 24,
       "height": 60,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4B3C",
-      "border_filepath": "data/layouts/UnknownMap_03_53/border.bin",
-      "blockdata_filepath": "data/layouts/UnknownMap_03_53/map.bin"
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_CeladonCity",
+      "border_filepath": "data/layouts/Prototype_SeviiIsle_9/border.bin",
+      "blockdata_filepath": "data/layouts/Prototype_SeviiIsle_9/map.bin"
     },
     {
       "id": "LAYOUT_FIVE_ISLAND_RESORT_GORGEOUS",
@@ -2750,8 +2750,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D5064",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands45",
       "border_filepath": "data/layouts/FiveIsland_ResortGorgeous/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_ResortGorgeous/map.bin"
     },
@@ -2762,8 +2762,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D5064",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands45",
       "border_filepath": "data/layouts/FiveIsland_WaterLabyrinth/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_WaterLabyrinth/map.bin"
     },
@@ -2774,8 +2774,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D5064",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands45",
       "border_filepath": "data/layouts/FiveIsland_Meadow/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_Meadow/map.bin"
     },
@@ -2786,8 +2786,8 @@
       "height": 60,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D5064",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands45",
       "border_filepath": "data/layouts/FiveIsland_MemorialPillar/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_MemorialPillar/map.bin"
     },
@@ -2798,8 +2798,8 @@
       "height": 80,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D507C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands67",
       "border_filepath": "data/layouts/SixIsland_OutcastIsland/border.bin",
       "blockdata_filepath": "data/layouts/SixIsland_OutcastIsland/map.bin"
     },
@@ -2810,8 +2810,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D507C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands67",
       "border_filepath": "data/layouts/SixIsland_GreenPath/border.bin",
       "blockdata_filepath": "data/layouts/SixIsland_GreenPath/map.bin"
     },
@@ -2822,8 +2822,8 @@
       "height": 100,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D507C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands67",
       "border_filepath": "data/layouts/SixIsland_WaterPath/border.bin",
       "blockdata_filepath": "data/layouts/SixIsland_WaterPath/map.bin"
     },
@@ -2834,8 +2834,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D507C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands67",
       "border_filepath": "data/layouts/SixIsland_RuinValley/border.bin",
       "blockdata_filepath": "data/layouts/SixIsland_RuinValley/map.bin"
     },
@@ -2846,8 +2846,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D507C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands67",
       "border_filepath": "data/layouts/SevenIsland_TrainerTower/border.bin",
       "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower/map.bin"
     },
@@ -2858,8 +2858,8 @@
       "height": 40,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D507C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands67",
       "border_filepath": "data/layouts/SevenIsland_SevaultCanyon_Entrance/border.bin",
       "blockdata_filepath": "data/layouts/SevenIsland_SevaultCanyon_Entrance/map.bin"
     },
@@ -2870,8 +2870,8 @@
       "height": 80,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D507C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands67",
       "border_filepath": "data/layouts/SevenIsland_SevaultCanyon/border.bin",
       "blockdata_filepath": "data/layouts/SevenIsland_SevaultCanyon/map.bin"
     },
@@ -2882,58 +2882,58 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D507C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands67",
       "border_filepath": "data/layouts/SevenIsland_TanobyRuins/border.bin",
       "blockdata_filepath": "data/layouts/SevenIsland_TanobyRuins/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_833614C",
-      "name": "UnusedLayout_833614C_Layout",
+      "id": "LAYOUT_PROTOTYPE_SEVII_ISLE_22",
+      "name": "Prototype_SeviiIsle_22_Layout",
       "width": 24,
       "height": 60,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4AAC",
-      "border_filepath": "data/layouts/UnusedLayout_833614C/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_833614C/map.bin"
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_PalletTown",
+      "border_filepath": "data/layouts/Prototype_SeviiIsle_22/border.bin",
+      "blockdata_filepath": "data/layouts/Prototype_SeviiIsle_22/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_83377F0",
-      "name": "UnusedLayout_83377F0_Layout",
+      "id": "LAYOUT_PROTOTYPE_SEVII_ISLE_23_EAST",
+      "name": "Prototype_SeviiIsle_23_East_Layout",
       "width": 144,
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4AAC",
-      "border_filepath": "data/layouts/UnusedLayout_83377F0/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_83377F0/map.bin"
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_PalletTown",
+      "border_filepath": "data/layouts/Prototype_SeviiIsle_23_East/border.bin",
+      "blockdata_filepath": "data/layouts/Prototype_SeviiIsle_23_East/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_8338354",
-      "name": "UnusedLayout_8338354_Layout",
+      "id": "LAYOUT_PROTOTYPE_SEVII_ISLE_23_WEST",
+      "name": "Prototype_SeviiIsle_23_West_Layout",
       "width": 24,
       "height": 60,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4AAC",
-      "border_filepath": "data/layouts/UnusedLayout_8338354/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_8338354/map.bin"
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_PalletTown",
+      "border_filepath": "data/layouts/Prototype_SeviiIsle_23_West/border.bin",
+      "blockdata_filepath": "data/layouts/Prototype_SeviiIsle_23_West/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_8338738",
-      "name": "UnusedLayout_8338738_Layout",
+      "id": "LAYOUT_PROTOTYPE_SEVII_ISLE_24",
+      "name": "Prototype_SeviiIsle_24_Layout",
       "width": 24,
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4AAC",
-      "border_filepath": "data/layouts/UnusedLayout_8338738/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_8338738/map.bin"
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_PalletTown",
+      "border_filepath": "data/layouts/Prototype_SeviiIsle_24/border.bin",
+      "blockdata_filepath": "data/layouts/Prototype_SeviiIsle_24/map.bin"
     },
     {
       "id": "LAYOUT_UNION_ROOM",
@@ -2942,8 +2942,8 @@
       "height": 12,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D50DC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_HallOfFame",
       "border_filepath": "data/layouts/UnionRoom/border.bin",
       "blockdata_filepath": "data/layouts/UnionRoom/map.bin"
     },
@@ -2954,22 +2954,22 @@
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F74",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_FanClubDaycare",
       "border_filepath": "data/layouts/SaffronCity_PokemonTrainerFanClub/border.bin",
       "blockdata_filepath": "data/layouts/SaffronCity_PokemonTrainerFanClub/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_8338B4C",
-      "name": "UnusedLayout_8338B4C_Layout",
+      "id": "LAYOUT_SEVEN_ISLAND_HOUSE_ROOM1_DOOR_OPEN",
+      "name": "SevenIsland_House_Room1_DoorOpen_Layout",
       "width": 11,
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E84",
-      "border_filepath": "data/layouts/UnusedLayout_8338B4C/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_8338B4C/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding2",
+      "border_filepath": "data/layouts/SevenIsland_House_Room1_DoorOpen/border.bin",
+      "blockdata_filepath": "data/layouts/SevenIsland_House_Room1_DoorOpen/map.bin"
     },
     {
       "id": "LAYOUT_SEVEN_ISLAND_HOUSE_ROOM2",
@@ -2978,8 +2978,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E84",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding2",
       "border_filepath": "data/layouts/SevenIsland_House_Room2/border.bin",
       "blockdata_filepath": "data/layouts/SevenIsland_House_Room2/map.bin"
     },
@@ -2990,34 +2990,34 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F5C",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_School",
       "border_filepath": "data/layouts/ViridianCity_House2/border.bin",
       "blockdata_filepath": "data/layouts/ViridianCity_House2/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_8338E90",
-      "name": "UnusedLayout_8338E90_Layout",
+      "id": "LAYOUT_CELADON_CITY_RESTAURANT_DUPLICATE",
+      "name": "CeladonCity_Restaurant_Duplicate_Layout",
       "width": 15,
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F44",
-      "border_filepath": "data/layouts/UnusedLayout_8338E90/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_8338E90/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_RestaurantHotel",
+      "border_filepath": "data/layouts/CeladonCity_Restaurant_Duplicate/border.bin",
+      "blockdata_filepath": "data/layouts/CeladonCity_Restaurant_Duplicate/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_833902C",
-      "name": "UnusedLayout_833902C_Layout",
+      "id": "LAYOUT_CELADON_CITY_HOTEL_DUPLICATE",
+      "name": "CeladonCity_Hotel_Duplicate_Layout",
       "width": 17,
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F44",
-      "border_filepath": "data/layouts/UnusedLayout_833902C/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_833902C/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_RestaurantHotel",
+      "border_filepath": "data/layouts/CeladonCity_Hotel_Duplicate/border.bin",
+      "blockdata_filepath": "data/layouts/CeladonCity_Hotel_Duplicate/map.bin"
     },
     {
       "id": "LAYOUT_MT_EMBER_RUBY_PATH_B4F",
@@ -3026,8 +3026,8 @@
       "height": 16,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4FEC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_MtEmber",
       "border_filepath": "data/layouts/MtEmber_RubyPath_B4F/border.bin",
       "blockdata_filepath": "data/layouts/MtEmber_RubyPath_B4F/map.bin"
     },
@@ -3038,8 +3038,8 @@
       "height": 47,
       "border_width": 3,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D5004",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_BerryForest",
       "border_filepath": "data/layouts/ThreeIsland_BerryForest/border.bin",
       "blockdata_filepath": "data/layouts/ThreeIsland_BerryForest/map.bin"
     },
@@ -3050,8 +3050,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4BE4",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonCenter",
       "border_filepath": "data/layouts/OneIsland_PokemonCenter_1F/border.bin",
       "blockdata_filepath": "data/layouts/OneIsland_PokemonCenter_1F/map.bin"
     },
@@ -3062,8 +3062,8 @@
       "height": 10,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4CEC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GameCorner",
       "border_filepath": "data/layouts/TwoIsland_JoyfulGameCorner/border.bin",
       "blockdata_filepath": "data/layouts/TwoIsland_JoyfulGameCorner/map.bin"
     },
@@ -3074,8 +3074,8 @@
       "height": 12,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F74",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_FanClubDaycare",
       "border_filepath": "data/layouts/VermilionCity_PokemonFanClub/border.bin",
       "blockdata_filepath": "data/layouts/VermilionCity_PokemonFanClub/map.bin"
     },
@@ -3086,8 +3086,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F74",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_FanClubDaycare",
       "border_filepath": "data/layouts/LavenderTown_VolunteerPokemonHouse/border.bin",
       "blockdata_filepath": "data/layouts/LavenderTown_VolunteerPokemonHouse/map.bin"
     },
@@ -3098,8 +3098,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F74",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_FanClubDaycare",
       "border_filepath": "data/layouts/Route5_PokemonDayCare/border.bin",
       "blockdata_filepath": "data/layouts/Route5_PokemonDayCare/map.bin"
     },
@@ -3110,8 +3110,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E84",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding2",
       "border_filepath": "data/layouts/ViridianCity_House1/border.bin",
       "blockdata_filepath": "data/layouts/ViridianCity_House1/map.bin"
     },
@@ -3122,8 +3122,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4F74",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_FanClubDaycare",
       "border_filepath": "data/layouts/FourIsland_PokemonDayCare/border.bin",
       "blockdata_filepath": "data/layouts/FourIsland_PokemonDayCare/map.bin"
     },
@@ -3134,8 +3134,8 @@
       "height": 24,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4E24",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeafoamIslands",
       "border_filepath": "data/layouts/SeafoamIslands_B3F_CurrentStopped/border.bin",
       "blockdata_filepath": "data/layouts/SeafoamIslands_B3F_CurrentStopped/map.bin"
     },
@@ -3146,8 +3146,8 @@
       "height": 24,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4E24",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeafoamIslands",
       "border_filepath": "data/layouts/SeafoamIslands_B4F_CurrentStopped/border.bin",
       "blockdata_filepath": "data/layouts/SeafoamIslands_B4F_CurrentStopped/map.bin"
     },
@@ -3158,8 +3158,8 @@
       "height": 54,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D504C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands123",
       "border_filepath": "data/layouts/MtEmber_Exterior/border.bin",
       "blockdata_filepath": "data/layouts/MtEmber_Exterior/map.bin"
     },
@@ -3170,8 +3170,8 @@
       "height": 22,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D504C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands123",
       "border_filepath": "data/layouts/MtEmber_Summit/border.bin",
       "blockdata_filepath": "data/layouts/MtEmber_Summit/map.bin"
     },
@@ -3182,8 +3182,8 @@
       "height": 18,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4FEC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_MtEmber",
       "border_filepath": "data/layouts/MtEmber_SummitPath_1F/border.bin",
       "blockdata_filepath": "data/layouts/MtEmber_SummitPath_1F/map.bin"
     },
@@ -3194,8 +3194,8 @@
       "height": 46,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4FEC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_MtEmber",
       "border_filepath": "data/layouts/MtEmber_SummitPath_2F/border.bin",
       "blockdata_filepath": "data/layouts/MtEmber_SummitPath_2F/map.bin"
     },
@@ -3206,8 +3206,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4FEC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_MtEmber",
       "border_filepath": "data/layouts/MtEmber_SummitPath_3F/border.bin",
       "blockdata_filepath": "data/layouts/MtEmber_SummitPath_3F/map.bin"
     },
@@ -3218,8 +3218,8 @@
       "height": 19,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4FEC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_MtEmber",
       "border_filepath": "data/layouts/MtEmber_RubyPath_1F/border.bin",
       "blockdata_filepath": "data/layouts/MtEmber_RubyPath_1F/map.bin"
     },
@@ -3230,8 +3230,8 @@
       "height": 23,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4FEC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_MtEmber",
       "border_filepath": "data/layouts/MtEmber_RubyPath_B1F/border.bin",
       "blockdata_filepath": "data/layouts/MtEmber_RubyPath_B1F/map.bin"
     },
@@ -3242,8 +3242,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4FEC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_MtEmber",
       "border_filepath": "data/layouts/MtEmber_RubyPath_B2F/border.bin",
       "blockdata_filepath": "data/layouts/MtEmber_RubyPath_B2F/map.bin"
     },
@@ -3254,8 +3254,8 @@
       "height": 23,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4FEC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_MtEmber",
       "border_filepath": "data/layouts/MtEmber_RubyPath_B3F/border.bin",
       "blockdata_filepath": "data/layouts/MtEmber_RubyPath_B3F/map.bin"
     },
@@ -3266,8 +3266,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4FEC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_MtEmber",
       "border_filepath": "data/layouts/MtEmber_RubyPath_B1F_Stairs/border.bin",
       "blockdata_filepath": "data/layouts/MtEmber_RubyPath_B1F_Stairs/map.bin"
     },
@@ -3278,8 +3278,8 @@
       "height": 6,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4FEC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_MtEmber",
       "border_filepath": "data/layouts/MtEmber_RubyPath_B2F_Stairs/border.bin",
       "blockdata_filepath": "data/layouts/MtEmber_RubyPath_B2F_Stairs/map.bin"
     },
@@ -3290,8 +3290,8 @@
       "height": 15,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4FEC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_MtEmber",
       "border_filepath": "data/layouts/MtEmber_RubyPath_B5F/border.bin",
       "blockdata_filepath": "data/layouts/MtEmber_RubyPath_B5F/map.bin"
     },
@@ -3302,8 +3302,8 @@
       "height": 27,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4ECC",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SilphCo",
       "border_filepath": "data/layouts/FiveIsland_RocketWarehouse/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_RocketWarehouse/map.bin"
     },
@@ -3314,8 +3314,8 @@
       "height": 36,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4E24",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeafoamIslands",
       "border_filepath": "data/layouts/FourIsland_IcefallCave_Entrance/border.bin",
       "blockdata_filepath": "data/layouts/FourIsland_IcefallCave_Entrance/map.bin"
     },
@@ -3326,8 +3326,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4E24",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeafoamIslands",
       "border_filepath": "data/layouts/FourIsland_IcefallCave_1F/border.bin",
       "blockdata_filepath": "data/layouts/FourIsland_IcefallCave_1F/map.bin"
     },
@@ -3338,8 +3338,8 @@
       "height": 20,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4E24",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeafoamIslands",
       "border_filepath": "data/layouts/FourIsland_IcefallCave_B1F/border.bin",
       "blockdata_filepath": "data/layouts/FourIsland_IcefallCave_B1F/map.bin"
     },
@@ -3350,142 +3350,142 @@
       "height": 26,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4E24",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeafoamIslands",
       "border_filepath": "data/layouts/FourIsland_IcefallCave_Back/border.bin",
       "blockdata_filepath": "data/layouts/FourIsland_IcefallCave_Back/map.bin"
     },
     {
-      "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_LOBBY",
-      "name": "SevenIsland_TrainerTower_Lobby_Layout",
+      "id": "LAYOUT_TRAINER_TOWER_LOBBY",
+      "name": "TrainerTower_Lobby_Layout",
       "width": 19,
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
-      "border_filepath": "data/layouts/SevenIsland_TrainerTower_Lobby/border.bin",
-      "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_Lobby/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
+      "border_filepath": "data/layouts/TrainerTower_Lobby/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerTower_Lobby/map.bin"
     },
     {
-      "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_1F",
-      "name": "SevenIsland_TrainerTower_1F_Layout",
+      "id": "LAYOUT_TRAINER_TOWER_1F",
+      "name": "TrainerTower_1F_Layout",
       "width": 18,
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
-      "border_filepath": "data/layouts/SevenIsland_TrainerTower_1F/border.bin",
-      "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_1F/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
+      "border_filepath": "data/layouts/TrainerTower_1F/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerTower_1F/map.bin"
     },
     {
-      "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_2F",
-      "name": "SevenIsland_TrainerTower_2F_Layout",
+      "id": "LAYOUT_TRAINER_TOWER_2F",
+      "name": "TrainerTower_2F_Layout",
       "width": 18,
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
-      "border_filepath": "data/layouts/SevenIsland_TrainerTower_2F/border.bin",
-      "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_2F/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
+      "border_filepath": "data/layouts/TrainerTower_2F/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerTower_2F/map.bin"
     },
     {
-      "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_3F",
-      "name": "SevenIsland_TrainerTower_3F_Layout",
+      "id": "LAYOUT_TRAINER_TOWER_3F",
+      "name": "TrainerTower_3F_Layout",
       "width": 18,
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
-      "border_filepath": "data/layouts/SevenIsland_TrainerTower_3F/border.bin",
-      "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_3F/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
+      "border_filepath": "data/layouts/TrainerTower_3F/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerTower_3F/map.bin"
     },
     {
-      "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_4F",
-      "name": "SevenIsland_TrainerTower_4F_Layout",
+      "id": "LAYOUT_TRAINER_TOWER_4F",
+      "name": "TrainerTower_4F_Layout",
       "width": 18,
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
-      "border_filepath": "data/layouts/SevenIsland_TrainerTower_4F/border.bin",
-      "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_4F/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
+      "border_filepath": "data/layouts/TrainerTower_4F/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerTower_4F/map.bin"
     },
     {
-      "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_5F",
-      "name": "SevenIsland_TrainerTower_5F_Layout",
+      "id": "LAYOUT_TRAINER_TOWER_5F",
+      "name": "TrainerTower_5F_Layout",
       "width": 18,
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
-      "border_filepath": "data/layouts/SevenIsland_TrainerTower_5F/border.bin",
-      "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_5F/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
+      "border_filepath": "data/layouts/TrainerTower_5F/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerTower_5F/map.bin"
     },
     {
-      "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_6F",
-      "name": "SevenIsland_TrainerTower_6F_Layout",
+      "id": "LAYOUT_TRAINER_TOWER_6F",
+      "name": "TrainerTower_6F_Layout",
       "width": 18,
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
-      "border_filepath": "data/layouts/SevenIsland_TrainerTower_6F/border.bin",
-      "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_6F/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
+      "border_filepath": "data/layouts/TrainerTower_6F/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerTower_6F/map.bin"
     },
     {
-      "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_7F",
-      "name": "SevenIsland_TrainerTower_7F_Layout",
+      "id": "LAYOUT_TRAINER_TOWER_7F",
+      "name": "TrainerTower_7F_Layout",
       "width": 18,
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
-      "border_filepath": "data/layouts/SevenIsland_TrainerTower_7F/border.bin",
-      "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_7F/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
+      "border_filepath": "data/layouts/TrainerTower_7F/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerTower_7F/map.bin"
     },
     {
-      "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_8F",
-      "name": "SevenIsland_TrainerTower_8F_Layout",
+      "id": "LAYOUT_TRAINER_TOWER_8F",
+      "name": "TrainerTower_8F_Layout",
       "width": 18,
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
-      "border_filepath": "data/layouts/SevenIsland_TrainerTower_8F/border.bin",
-      "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_8F/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
+      "border_filepath": "data/layouts/TrainerTower_8F/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerTower_8F/map.bin"
     },
     {
-      "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_ROOF",
-      "name": "SevenIsland_TrainerTower_Roof_Layout",
+      "id": "LAYOUT_TRAINER_TOWER_ROOF",
+      "name": "TrainerTower_Roof_Layout",
       "width": 18,
       "height": 16,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
-      "border_filepath": "data/layouts/SevenIsland_TrainerTower_Roof/border.bin",
-      "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_Roof/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
+      "border_filepath": "data/layouts/TrainerTower_Roof/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerTower_Roof/map.bin"
     },
     {
-      "id": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR",
-      "name": "SevenIsland_TrainerTower_Elevator_Layout",
+      "id": "LAYOUT_TRAINER_TOWER_ELEVATOR",
+      "name": "TrainerTower_Elevator_Layout",
       "width": 5,
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4ECC",
-      "border_filepath": "data/layouts/SevenIsland_TrainerTower_Elevator/border.bin",
-      "blockdata_filepath": "data/layouts/SevenIsland_TrainerTower_Elevator/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SilphCo",
+      "border_filepath": "data/layouts/TrainerTower_Elevator/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerTower_Elevator/map.bin"
     },
     {
       "id": "LAYOUT_CERULEAN_CITY_HOUSE5",
@@ -3494,8 +3494,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E84",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_GenericBuilding2",
       "border_filepath": "data/layouts/CeruleanCity_House5/border.bin",
       "blockdata_filepath": "data/layouts/CeruleanCity_House5/map.bin"
     },
@@ -3506,8 +3506,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/SixIsland_DottedHole_1F/border.bin",
       "blockdata_filepath": "data/layouts/SixIsland_DottedHole_1F/map.bin"
     },
@@ -3518,8 +3518,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/SixIsland_DottedHole_B1F/border.bin",
       "blockdata_filepath": "data/layouts/SixIsland_DottedHole_B1F/map.bin"
     },
@@ -3530,8 +3530,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/SixIsland_DottedHole_B2F/border.bin",
       "blockdata_filepath": "data/layouts/SixIsland_DottedHole_B2F/map.bin"
     },
@@ -3542,8 +3542,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/SixIsland_DottedHole_B3F/border.bin",
       "blockdata_filepath": "data/layouts/SixIsland_DottedHole_B3F/map.bin"
     },
@@ -3554,8 +3554,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/SixIsland_DottedHole_B4F/border.bin",
       "blockdata_filepath": "data/layouts/SixIsland_DottedHole_B4F/map.bin"
     },
@@ -3566,8 +3566,8 @@
       "height": 15,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/SixIsland_DottedHole_SapphireRoom/border.bin",
       "blockdata_filepath": "data/layouts/SixIsland_DottedHole_SapphireRoom/map.bin"
     },
@@ -3578,8 +3578,8 @@
       "height": 13,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D50AC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_IslandHarbor",
       "border_filepath": "data/layouts/Island_Harbor/border.bin",
       "blockdata_filepath": "data/layouts/Island_Harbor/map.bin"
     },
@@ -3590,8 +3590,8 @@
       "height": 10,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4BE4",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonCenter",
       "border_filepath": "data/layouts/OneIsland_PokemonCenter_2F/border.bin",
       "blockdata_filepath": "data/layouts/OneIsland_PokemonCenter_2F/map.bin"
     },
@@ -3602,8 +3602,8 @@
       "height": 32,
       "border_width": 3,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4DC4",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_ViridianForest",
       "border_filepath": "data/layouts/SixIsland_PatternBush/border.bin",
       "blockdata_filepath": "data/layouts/SixIsland_PatternBush/map.bin"
     },
@@ -3614,22 +3614,22 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/ThreeIsland_DunsparceTunnel/border.bin",
       "blockdata_filepath": "data/layouts/ThreeIsland_DunsparceTunnel/map.bin"
     },
     {
-      "id": "LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL_2",
-      "name": "UnusedLayout_83453C0_Layout",
+      "id": "LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL_DUG_OUT",
+      "name": "ThreeIsland_DunsparceTunnel_DugOut_Layout",
       "width": 30,
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
-      "border_filepath": "data/layouts/UnusedLayout_83453C0/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_83453C0/map.bin"
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/ThreeIsland_DunsparceTunnel_DugOut/border.bin",
+      "blockdata_filepath": "data/layouts/ThreeIsland_DunsparceTunnel_DugOut/map.bin"
     },
     {
       "id": "LAYOUT_FIVE_ISLAND_LOST_CAVE_ENTRANCE",
@@ -3638,8 +3638,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/FiveIsland_LostCave_Entrance/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Entrance/map.bin"
     },
@@ -3650,8 +3650,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/FiveIsland_LostCave_Room1/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room1/map.bin"
     },
@@ -3662,8 +3662,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/FiveIsland_LostCave_Room2/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room2/map.bin"
     },
@@ -3674,8 +3674,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/FiveIsland_LostCave_Room3/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room3/map.bin"
     },
@@ -3686,8 +3686,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/FiveIsland_LostCave_Room4/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room4/map.bin"
     },
@@ -3698,8 +3698,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/FiveIsland_LostCave_Room5/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room5/map.bin"
     },
@@ -3710,8 +3710,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/FiveIsland_LostCave_Room6/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room6/map.bin"
     },
@@ -3722,8 +3722,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/FiveIsland_LostCave_Room7/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room7/map.bin"
     },
@@ -3734,8 +3734,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/FiveIsland_LostCave_Room8/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room8/map.bin"
     },
@@ -3746,8 +3746,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/FiveIsland_LostCave_Room9/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room9/map.bin"
     },
@@ -3758,8 +3758,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/FiveIsland_LostCave_Room10/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room10/map.bin"
     },
@@ -3770,8 +3770,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/FiveIsland_LostCave_Room11/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room11/map.bin"
     },
@@ -3782,8 +3782,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/FiveIsland_LostCave_Room12/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room12/map.bin"
     },
@@ -3794,8 +3794,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/FiveIsland_LostCave_Room13/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room13/map.bin"
     },
@@ -3806,8 +3806,8 @@
       "height": 11,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4BFC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
       "border_filepath": "data/layouts/FiveIsland_LostCave_Room14/border.bin",
       "blockdata_filepath": "data/layouts/FiveIsland_LostCave_Room14/map.bin"
     },
@@ -3818,8 +3818,8 @@
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5034",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TanobyRuins",
       "border_filepath": "data/layouts/SevenIsland_TanobyRuins_MoneanChamber/border.bin",
       "blockdata_filepath": "data/layouts/SevenIsland_TanobyRuins_MoneanChamber/map.bin"
     },
@@ -3830,8 +3830,8 @@
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5034",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TanobyRuins",
       "border_filepath": "data/layouts/SevenIsland_TanobyRuins_LiptooChamber/border.bin",
       "blockdata_filepath": "data/layouts/SevenIsland_TanobyRuins_LiptooChamber/map.bin"
     },
@@ -3842,8 +3842,8 @@
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5034",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TanobyRuins",
       "border_filepath": "data/layouts/SevenIsland_TanobyRuins_WeepthChamber/border.bin",
       "blockdata_filepath": "data/layouts/SevenIsland_TanobyRuins_WeepthChamber/map.bin"
     },
@@ -3854,8 +3854,8 @@
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5034",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TanobyRuins",
       "border_filepath": "data/layouts/SevenIsland_TanobyRuins_DilfordChamber/border.bin",
       "blockdata_filepath": "data/layouts/SevenIsland_TanobyRuins_DilfordChamber/map.bin"
     },
@@ -3866,8 +3866,8 @@
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5034",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TanobyRuins",
       "border_filepath": "data/layouts/SevenIsland_TanobyRuins_ScufibChamber/border.bin",
       "blockdata_filepath": "data/layouts/SevenIsland_TanobyRuins_ScufibChamber/map.bin"
     },
@@ -3878,8 +3878,8 @@
       "height": 24,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4DF4",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_RockTunnel",
       "border_filepath": "data/layouts/SixIsland_AlteringCave/border.bin",
       "blockdata_filepath": "data/layouts/SixIsland_AlteringCave/map.bin"
     },
@@ -3890,8 +3890,8 @@
       "height": 16,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4E0C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_DiglettsCave",
       "border_filepath": "data/layouts/SevenIsland_SevaultCanyon_TanobyKey/border.bin",
       "blockdata_filepath": "data/layouts/SevenIsland_SevaultCanyon_TanobyKey/map.bin"
     },
@@ -3902,8 +3902,8 @@
       "height": 30,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D507C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands67",
       "border_filepath": "data/layouts/BirthIsland_Exterior/border.bin",
       "blockdata_filepath": "data/layouts/BirthIsland_Exterior/map.bin"
     },
@@ -3914,8 +3914,8 @@
       "height": 23,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D504C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_SeviiIslands123",
       "border_filepath": "data/layouts/NavelRock_Exterior/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_Exterior/map.bin"
     },
@@ -3926,8 +3926,8 @@
       "height": 26,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/NavelRock_1F/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_1F/map.bin"
     },
@@ -3938,8 +3938,8 @@
       "height": 25,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/NavelRock_Summit/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_Summit/map.bin"
     },
@@ -3950,8 +3950,8 @@
       "height": 23,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/NavelRock_Base/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_Base/map.bin"
     },
@@ -3962,8 +3962,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/NavelRock_SummitPath_2F/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_SummitPath_2F/map.bin"
     },
@@ -3974,8 +3974,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/NavelRock_SummitPath_3F/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_SummitPath_3F/map.bin"
     },
@@ -3986,8 +3986,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/NavelRock_SummitPath_4F/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_SummitPath_4F/map.bin"
     },
@@ -3998,8 +3998,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/NavelRock_SummitPath_5F/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_SummitPath_5F/map.bin"
     },
@@ -4010,8 +4010,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/NavelRock_BasePath_B1F/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_BasePath_B1F/map.bin"
     },
@@ -4022,8 +4022,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/NavelRock_BasePath_B2F/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_BasePath_B2F/map.bin"
     },
@@ -4034,8 +4034,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/NavelRock_BasePath_B3F/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_BasePath_B3F/map.bin"
     },
@@ -4046,8 +4046,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/NavelRock_BasePath_B4F/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_BasePath_B4F/map.bin"
     },
@@ -4058,8 +4058,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/NavelRock_BasePath_B5F/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_BasePath_B5F/map.bin"
     },
@@ -4070,8 +4070,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/NavelRock_BasePath_B6F/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_BasePath_B6F/map.bin"
     },
@@ -4082,8 +4082,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/NavelRock_BasePath_B7F/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_BasePath_B7F/map.bin"
     },
@@ -4094,8 +4094,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/NavelRock_BasePath_B8F/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_BasePath_B8F/map.bin"
     },
@@ -4106,8 +4106,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/NavelRock_BasePath_B9F/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_BasePath_B9F/map.bin"
     },
@@ -4118,8 +4118,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/NavelRock_BasePath_B10F/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_BasePath_B10F/map.bin"
     },
@@ -4130,8 +4130,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/NavelRock_BasePath_B11F/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_BasePath_B11F/map.bin"
     },
@@ -4142,8 +4142,8 @@
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5034",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TanobyRuins",
       "border_filepath": "data/layouts/SevenIsland_TanobyRuins_RixyChamber/border.bin",
       "blockdata_filepath": "data/layouts/SevenIsland_TanobyRuins_RixyChamber/map.bin"
     },
@@ -4154,8 +4154,8 @@
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5034",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TanobyRuins",
       "border_filepath": "data/layouts/SevenIsland_TanobyRuins_ViapoisChamber/border.bin",
       "blockdata_filepath": "data/layouts/SevenIsland_TanobyRuins_ViapoisChamber/map.bin"
     },
@@ -4166,8 +4166,8 @@
       "height": 7,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/NavelRock_B1F/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_B1F/map.bin"
     },
@@ -4178,202 +4178,202 @@
       "height": 100,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D501C",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_NavelRock",
       "border_filepath": "data/layouts/NavelRock_Fork/border.bin",
       "blockdata_filepath": "data/layouts/NavelRock_Fork/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_834BC2C",
-      "name": "UnusedLayout_834BC2C_Layout",
+      "id": "LAYOUT_TRAINER_TOWER_1F_DOUBLES",
+      "name": "TrainerTower_1F_Doubles_Layout",
       "width": 18,
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
-      "border_filepath": "data/layouts/UnusedLayout_834BC2C/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_834BC2C/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
+      "border_filepath": "data/layouts/TrainerTower_1F_Doubles/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerTower_1F_Doubles/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_834BEB4",
-      "name": "UnusedLayout_834BEB4_Layout",
+      "id": "LAYOUT_TRAINER_TOWER_2F_DOUBLES",
+      "name": "TrainerTower_2F_Doubles_Layout",
       "width": 18,
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
-      "border_filepath": "data/layouts/UnusedLayout_834BEB4/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_834BEB4/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
+      "border_filepath": "data/layouts/TrainerTower_2F_Doubles/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerTower_2F_Doubles/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_834C13C",
-      "name": "UnusedLayout_834C13C_Layout",
+      "id": "LAYOUT_TRAINER_TOWER_3F_DOUBLES",
+      "name": "TrainerTower_3F_Doubles_Layout",
       "width": 18,
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
-      "border_filepath": "data/layouts/UnusedLayout_834C13C/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_834C13C/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
+      "border_filepath": "data/layouts/TrainerTower_3F_Doubles/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerTower_3F_Doubles/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_834C3C4",
-      "name": "UnusedLayout_834C3C4_Layout",
+      "id": "LAYOUT_TRAINER_TOWER_4F_DOUBLES",
+      "name": "TrainerTower_4F_Doubles_Layout",
       "width": 18,
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
-      "border_filepath": "data/layouts/UnusedLayout_834C3C4/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_834C3C4/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
+      "border_filepath": "data/layouts/TrainerTower_4F_Doubles/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerTower_4F_Doubles/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_834C64C",
-      "name": "UnusedLayout_834C64C_Layout",
+      "id": "LAYOUT_TRAINER_TOWER_5F_DOUBLES",
+      "name": "TrainerTower_5F_Doubles_Layout",
       "width": 18,
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
-      "border_filepath": "data/layouts/UnusedLayout_834C64C/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_834C64C/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
+      "border_filepath": "data/layouts/TrainerTower_5F_Doubles/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerTower_5F_Doubles/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_834C8D4",
-      "name": "UnusedLayout_834C8D4_Layout",
+      "id": "LAYOUT_TRAINER_TOWER_6F_DOUBLES",
+      "name": "TrainerTower_6F_Doubles_Layout",
       "width": 18,
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
-      "border_filepath": "data/layouts/UnusedLayout_834C8D4/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_834C8D4/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
+      "border_filepath": "data/layouts/TrainerTower_6F_Doubles/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerTower_6F_Doubles/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_834CB5C",
-      "name": "UnusedLayout_834CB5C_Layout",
+      "id": "LAYOUT_TRAINER_TOWER_7F_DOUBLES",
+      "name": "TrainerTower_7F_Doubles_Layout",
       "width": 18,
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
-      "border_filepath": "data/layouts/UnusedLayout_834CB5C/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_834CB5C/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
+      "border_filepath": "data/layouts/TrainerTower_7F_Doubles/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerTower_7F_Doubles/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_834CDE4",
-      "name": "UnusedLayout_834CDE4_Layout",
+      "id": "LAYOUT_TRAINER_TOWER_8F_DOUBLES",
+      "name": "TrainerTower_8F_Doubles_Layout",
       "width": 18,
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
-      "border_filepath": "data/layouts/UnusedLayout_834CDE4/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_834CDE4/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
+      "border_filepath": "data/layouts/TrainerTower_8F_Doubles/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerTower_8F_Doubles/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_834D06C",
-      "name": "UnusedLayout_834D06C_Layout",
+      "id": "LAYOUT_TRAINER_TOWER_1F_KNOCKOUT",
+      "name": "TrainerTower_1F_Knockout_Layout",
       "width": 18,
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
-      "border_filepath": "data/layouts/UnusedLayout_834D06C/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_834D06C/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
+      "border_filepath": "data/layouts/TrainerTower_1F_Knockout/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerTower_1F_Knockout/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_834D2F4",
-      "name": "UnusedLayout_834D2F4_Layout",
+      "id": "LAYOUT_TRAINER_TOWER_2F_KNOCKOUT",
+      "name": "TrainerTower_2F_Knockout_Layout",
       "width": 18,
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
-      "border_filepath": "data/layouts/UnusedLayout_834D2F4/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_834D2F4/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
+      "border_filepath": "data/layouts/TrainerTower_2F_Knockout/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerTower_2F_Knockout/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_834D57C",
-      "name": "UnusedLayout_834D57C_Layout",
+      "id": "LAYOUT_TRAINER_TOWER_3F_KNOCKOUT",
+      "name": "TrainerTower_3F_Knockout_Layout",
       "width": 18,
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
-      "border_filepath": "data/layouts/UnusedLayout_834D57C/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_834D57C/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
+      "border_filepath": "data/layouts/TrainerTower_3F_Knockout/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerTower_3F_Knockout/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_834D804",
-      "name": "UnusedLayout_834D804_Layout",
+      "id": "LAYOUT_TRAINER_TOWER_4F_KNOCKOUT",
+      "name": "TrainerTower_4F_Knockout_Layout",
       "width": 18,
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
-      "border_filepath": "data/layouts/UnusedLayout_834D804/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_834D804/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
+      "border_filepath": "data/layouts/TrainerTower_4F_Knockout/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerTower_4F_Knockout/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_834DA8C",
-      "name": "UnusedLayout_834DA8C_Layout",
+      "id": "LAYOUT_TRAINER_TOWER_5F_KNOCKOUT",
+      "name": "TrainerTower_5F_Knockout_Layout",
       "width": 18,
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
-      "border_filepath": "data/layouts/UnusedLayout_834DA8C/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_834DA8C/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
+      "border_filepath": "data/layouts/TrainerTower_5F_Knockout/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerTower_5F_Knockout/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_834DD14",
-      "name": "UnusedLayout_834DD14_Layout",
+      "id": "LAYOUT_TRAINER_TOWER_6F_KNOCKOUT",
+      "name": "TrainerTower_6F_Knockout_Layout",
       "width": 18,
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
-      "border_filepath": "data/layouts/UnusedLayout_834DD14/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_834DD14/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
+      "border_filepath": "data/layouts/TrainerTower_6F_Knockout/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerTower_6F_Knockout/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_834DF9C",
-      "name": "UnusedLayout_834DF9C_Layout",
+      "id": "LAYOUT_TRAINER_TOWER_7F_KNOCKOUT",
+      "name": "TrainerTower_7F_Knockout_Layout",
       "width": 18,
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
-      "border_filepath": "data/layouts/UnusedLayout_834DF9C/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_834DF9C/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
+      "border_filepath": "data/layouts/TrainerTower_7F_Knockout/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerTower_7F_Knockout/map.bin"
     },
     {
-      "id": "LAYOUT_UNUSED_LAYOUT_834E224",
-      "name": "UnusedLayout_834E224_Layout",
+      "id": "LAYOUT_TRAINER_TOWER_8F_KNOCKOUT",
+      "name": "TrainerTower_8F_Knockout_Layout",
       "width": 18,
       "height": 17,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D5094",
-      "border_filepath": "data/layouts/UnusedLayout_834E224/border.bin",
-      "blockdata_filepath": "data/layouts/UnusedLayout_834E224/map.bin"
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_TrainerTower",
+      "border_filepath": "data/layouts/TrainerTower_8F_Knockout/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerTower_8F_Knockout/map.bin"
     },
     {
       "id": "LAYOUT_SEVEN_ISLAND_HOUSE_ROOM1",
@@ -4382,8 +4382,8 @@
       "height": 9,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4BB4",
-      "secondary_tileset": "gTileset_82D4E24",
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_SeafoamIslands",
       "border_filepath": "data/layouts/SevenIsland_House_Room1/border.bin",
       "blockdata_filepath": "data/layouts/SevenIsland_House_Room1/map.bin"
     },
@@ -4394,8 +4394,8 @@
       "height": 39,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_82D4A94",
-      "secondary_tileset": "gTileset_82D4FEC",
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_MtEmber",
       "border_filepath": "data/layouts/OneIsland_KindleRoad_EmberSpa/border.bin",
       "blockdata_filepath": "data/layouts/OneIsland_KindleRoad_EmberSpa/map.bin"
     }
diff --git a/data/maps/CeladonCity/map.json b/data/maps/CeladonCity/map.json
index 5a4644854..706d9fa35 100644
--- a/data/maps/CeladonCity/map.json
+++ b/data/maps/CeladonCity/map.json
@@ -34,7 +34,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_EventScript_166CFA",
+      "script": "CeladonCity_EventScript_RocketGrunt1",
       "flag": "FLAG_HIDE_CELADON_ROCKETS"
     },
     {
@@ -47,7 +47,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_EventScript_166CC5",
+      "script": "CeladonCity_EventScript_FatMan",
       "flag": "0"
     },
     {
@@ -60,7 +60,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_EventScript_166CDC",
+      "script": "CeladonCity_EventScript_Poliwrath",
       "flag": "0"
     },
     {
@@ -73,7 +73,7 @@
       "movement_range_y": 4,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_EventScript_166C99",
+      "script": "CeladonCity_EventScript_LittleGirl",
       "flag": "0"
     },
     {
@@ -86,7 +86,7 @@
       "movement_range_y": 5,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_EventScript_166CAD",
+      "script": "CeladonCity_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -99,7 +99,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_EventScript_166CB6",
+      "script": "CeladonCity_EventScript_OldMan2",
       "flag": "0"
     },
     {
@@ -125,7 +125,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_EventScript_166D03",
+      "script": "CeladonCity_EventScript_RocketGrunt2",
       "flag": "FLAG_HIDE_CELADON_ROCKETS"
     },
     {
@@ -138,7 +138,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_EventScript_166CA2",
+      "script": "CeladonCity_EventScript_OldMan1",
       "flag": "0"
     },
     {
@@ -177,7 +177,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_EventScript_166D0C",
+      "script": "CeladonCity_EventScript_Boy",
       "flag": "0"
     },
     {
@@ -216,7 +216,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_EventScript_166D15",
+      "script": "CeladonCity_EventScript_SilphCoScientist",
       "flag": "FLAG_HIDE_CELADON_ROCKETS"
     }
   ],
@@ -320,56 +320,56 @@
       "x": 45,
       "y": 23,
       "elevation": 0,
-      "script": "CeladonCity_EventScript_166D5A"
+      "script": "CeladonCity_EventScript_TrainerTips2"
     },
     {
       "type": "bg_event_type_0",
       "x": 38,
       "y": 23,
       "elevation": 0,
-      "script": "CeladonCity_EventScript_166D63"
+      "script": "CeladonCity_EventScript_PrizeExchangeSign"
     },
     {
       "type": "bg_event_type_0",
       "x": 33,
       "y": 23,
       "elevation": 0,
-      "script": "CeladonCity_EventScript_166D6C"
+      "script": "CeladonCity_EventScript_GameCornerSign"
     },
     {
       "type": "bg_event_type_0",
       "x": 22,
       "y": 18,
       "elevation": 3,
-      "script": "CeladonCity_EventScript_166D27"
+      "script": "CeladonCity_EventScript_CitySign"
     },
     {
       "type": "bg_event_type_0",
       "x": 26,
       "y": 11,
       "elevation": 0,
-      "script": "CeladonCity_EventScript_166D48"
+      "script": "CeladonCity_EventScript_MansionSign"
     },
     {
       "type": "bg_event_type_0",
       "x": 33,
       "y": 16,
       "elevation": 0,
-      "script": "CeladonCity_EventScript_166D1E"
+      "script": "CeladonCity_EventScript_TrainerTips1"
     },
     {
       "type": "bg_event_type_0",
       "x": 18,
       "y": 14,
       "elevation": 3,
-      "script": "CeladonCity_EventScript_166D51"
+      "script": "CeladonCity_EventScript_DeptStoreSign"
     },
     {
       "type": "bg_event_type_0",
       "x": 16,
       "y": 31,
       "elevation": 0,
-      "script": "CeladonCity_EventScript_166D30"
+      "script": "CeladonCity_EventScript_GymSign"
     },
     {
       "type": "hidden_item",
diff --git a/data/maps/CeladonCity/scripts.inc b/data/maps/CeladonCity/scripts.inc
index b27d12178..a7d7eddc4 100644
--- a/data/maps/CeladonCity/scripts.inc
+++ b/data/maps/CeladonCity/scripts.inc
@@ -6,44 +6,44 @@ CeladonCity_OnTransition:: @ 8166C95
 	setworldmapflag FLAG_WORLD_MAP_CELADON_CITY
 	end
 
-CeladonCity_EventScript_166C99:: @ 8166C99
-	msgbox gUnknown_817FEC3, MSGBOX_NPC
+CeladonCity_EventScript_LittleGirl:: @ 8166C99
+	msgbox CeladonCity_Text_GotMyKoffingInCinnabar, MSGBOX_NPC
 	end
 
-CeladonCity_EventScript_166CA2:: @ 8166CA2
+CeladonCity_EventScript_OldMan1:: @ 8166CA2
 	lock
-	msgbox gUnknown_817FF1C
+	msgbox CeladonCity_Text_GymIsGreatFullOfWomen
 	release
 	end
 
-CeladonCity_EventScript_166CAD:: @ 8166CAD
-	msgbox gUnknown_817FF4A, MSGBOX_NPC
+CeladonCity_EventScript_Woman:: @ 8166CAD
+	msgbox CeladonCity_Text_GameCornerIsBadForCitysImage, MSGBOX_NPC
 	end
 
-CeladonCity_EventScript_166CB6:: @ 8166CB6
-	msgbox gUnknown_817FFC5, MSGBOX_NPC
+CeladonCity_EventScript_OldMan2:: @ 8166CB6
+	msgbox CeladonCity_Text_BlewItAllAtSlots, MSGBOX_NPC
 	end
 
 CeladonCity_EventScript_SoftboiledTutor:: @ 8166CBF
 	goto EventScript_SoftboiledTutor
 	end
 
-CeladonCity_EventScript_166CC5:: @ 8166CC5
+CeladonCity_EventScript_FatMan:: @ 8166CC5
 	lock
 	faceplayer
-	msgbox gUnknown_818001B
+	msgbox CeladonCity_Text_MyTrustedPalPoliwrath
 	closemessage
 	applymovement 2, Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-CeladonCity_EventScript_166CDC:: @ 8166CDC
+CeladonCity_EventScript_Poliwrath:: @ 8166CDC
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_POLIWRATH, 0
-	msgbox gUnknown_8180075
+	msgbox CeladonCity_Text_Poliwrath
 	closemessage
 	waitmoncry
 	applymovement 3, Movement_FaceOriginalDirection
@@ -51,53 +51,53 @@ CeladonCity_EventScript_166CDC:: @ 8166CDC
 	release
 	end
 
-CeladonCity_EventScript_166CFA:: @ 8166CFA
-	msgbox gUnknown_81800C2, MSGBOX_NPC
+CeladonCity_EventScript_RocketGrunt1:: @ 8166CFA
+	msgbox CeladonCity_Text_KeepOutOfTeamRocketsWay, MSGBOX_NPC
 	end
 
-CeladonCity_EventScript_166D03:: @ 8166D03
-	msgbox gUnknown_818008C, MSGBOX_NPC
+CeladonCity_EventScript_RocketGrunt2:: @ 8166D03
+	msgbox CeladonCity_Text_GetLostOrIllPunchYou, MSGBOX_NPC
 	end
 
-CeladonCity_EventScript_166D0C:: @ 8166D0C
-	msgbox gUnknown_8180300, MSGBOX_NPC
+CeladonCity_EventScript_Boy:: @ 8166D0C
+	msgbox CeladonCity_Text_ScaldedTongueOnTea, MSGBOX_NPC
 	end
 
-CeladonCity_EventScript_166D15:: @ 8166D15
-	msgbox gUnknown_81804E1, MSGBOX_NPC
+CeladonCity_EventScript_SilphCoScientist:: @ 8166D15
+	msgbox CeladonCity_Text_SomeoneStoleSilphScope, MSGBOX_NPC
 	end
 
-CeladonCity_EventScript_166D1E:: @ 8166D1E
-	msgbox gUnknown_81800E1, MSGBOX_SIGN
+CeladonCity_EventScript_TrainerTips1:: @ 8166D1E
+	msgbox CeladonCity_Text_ExplainXAccuracyDireHit, MSGBOX_SIGN
 	end
 
-CeladonCity_EventScript_166D27:: @ 8166D27
-	msgbox gUnknown_818017A, MSGBOX_SIGN
+CeladonCity_EventScript_CitySign:: @ 8166D27
+	msgbox CeladonCity_Text_CitySign, MSGBOX_SIGN
 	end
 
-CeladonCity_EventScript_166D30:: @ 8166D30
+CeladonCity_EventScript_GymSign:: @ 8166D30
 	lockall
 	famechecker FAMECHECKER_ERIKA, 0
-	msgbox gUnknown_81801A2
+	msgbox CeladonCity_Text_GymSign
 	releaseall
 	end
 
-CeladonCity_EventScript_166D48:: @ 8166D48
-	msgbox gUnknown_81801E5, MSGBOX_SIGN
+CeladonCity_EventScript_MansionSign:: @ 8166D48
+	msgbox CeladonCity_Text_MansionSign, MSGBOX_SIGN
 	end
 
-CeladonCity_EventScript_166D51:: @ 8166D51
-	msgbox gUnknown_81801F5, MSGBOX_SIGN
+CeladonCity_EventScript_DeptStoreSign:: @ 8166D51
+	msgbox CeladonCity_Text_DeptStoreSign, MSGBOX_SIGN
 	end
 
-CeladonCity_EventScript_166D5A:: @ 8166D5A
-	msgbox gUnknown_8180224, MSGBOX_SIGN
+CeladonCity_EventScript_TrainerTips2:: @ 8166D5A
+	msgbox CeladonCity_Text_GuardSpecProtectsFromStatus, MSGBOX_SIGN
 	end
 
-CeladonCity_EventScript_166D63:: @ 8166D63
-	msgbox gUnknown_81802A4, MSGBOX_SIGN
+CeladonCity_EventScript_PrizeExchangeSign:: @ 8166D63
+	msgbox CeladonCity_Text_PrizeExchangeSign, MSGBOX_SIGN
 	end
 
-CeladonCity_EventScript_166D6C:: @ 8166D6C
-	msgbox gUnknown_81802CF, MSGBOX_SIGN
+CeladonCity_EventScript_GameCornerSign:: @ 8166D6C
+	msgbox CeladonCity_Text_GameCornerSign, MSGBOX_SIGN
 	end
diff --git a/data/maps/CeladonCity/text.inc b/data/maps/CeladonCity/text.inc
index 40f489e3c..a61cdba6d 100644
--- a/data/maps/CeladonCity/text.inc
+++ b/data/maps/CeladonCity/text.inc
@@ -1,40 +1,40 @@
-gUnknown_817FEC3:: @ 817FEC3
+CeladonCity_Text_GotMyKoffingInCinnabar:: @ 817FEC3
     .string "I got my KOFFING in CINNABAR.\p"
     .string "It's usually nice, but it breathes\n"
     .string "poison when it's angry.$"
 
-gUnknown_817FF1C:: @ 817FF1C
+CeladonCity_Text_GymIsGreatFullOfWomen:: @ 817FF1C
     .string "Heheh! This GYM is great!\n"
     .string "It's full of women!$"
 
-gUnknown_817FF4A:: @ 817FF4A
+CeladonCity_Text_GameCornerIsBadForCitysImage:: @ 817FF4A
     .string "CELADON takes pride in its efforts\n"
     .string "to keep the city beautiful.\p"
     .string "That's why the new GAME CORNER is\n"
     .string "bad for our city's image.$"
 
-gUnknown_817FFC5:: @ 817FFC5
+CeladonCity_Text_BlewItAllAtSlots:: @ 817FFC5
     .string "Moan…\n"
     .string "I blew it all at the slots!\p"
     .string "I knew I should have cashed in my\n"
     .string "COINS for prizes!$"
 
-gUnknown_818001B:: @ 818001B
+CeladonCity_Text_MyTrustedPalPoliwrath:: @ 818001B
     .string "This is my trusted pal, POLIWRATH.\p"
     .string "It evolved from a POLIWHIRL when\n"
     .string "I used a WATER STONE.$"
 
-gUnknown_8180075:: @ 8180075
+CeladonCity_Text_Poliwrath:: @ 8180075
     .string "POLIWRATH: Ribi ribit!$"
 
-gUnknown_818008C:: @ 818008C
+CeladonCity_Text_GetLostOrIllPunchYou:: @ 818008C
     .string "What are you staring at?\n"
     .string "Get lost, or I'll punch you.$"
 
-gUnknown_81800C2:: @ 81800C2
+CeladonCity_Text_KeepOutOfTeamRocketsWay:: @ 81800C2
     .string "Keep out of TEAM ROCKET's way!$"
 
-gUnknown_81800E1:: @ 81800E1
+CeladonCity_Text_ExplainXAccuracyDireHit:: @ 81800E1
     .string "TRAINER TIPS\p"
     .string "X ACCURACY boosts the accuracy of\n"
     .string "techniques.\p"
@@ -43,23 +43,23 @@ gUnknown_81800E1:: @ 81800E1
     .string "Get your items at the CELADON\n"
     .string "DEPT. STORE!$"
 
-gUnknown_818017A:: @ 818017A
+CeladonCity_Text_CitySign:: @ 818017A
     .string "CELADON CITY\n"
     .string "The City of Rainbow Dreams$"
 
-gUnknown_81801A2:: @ 81801A2
+CeladonCity_Text_GymSign:: @ 81801A2
     .string "CELADON CITY POKéMON GYM\n"
     .string "LEADER: ERIKA\l"
     .string "The Nature-Loving Princess!$"
 
-gUnknown_81801E5:: @ 81801E5
+CeladonCity_Text_MansionSign:: @ 81801E5
     .string "CELADON MANSION$"
 
-gUnknown_81801F5:: @ 81801F5
+CeladonCity_Text_DeptStoreSign:: @ 81801F5
     .string "Find what you need at the\n"
     .string "CELADON DEPT. STORE!$"
 
-gUnknown_8180224:: @ 8180224
+CeladonCity_Text_GuardSpecProtectsFromStatus:: @ 8180224
     .string "TRAINER TIPS\p"
     .string "GUARD SPEC. protects POKéMON\n"
     .string "from status-reduction moves during\l"
@@ -67,15 +67,15 @@ gUnknown_8180224:: @ 8180224
     .string "Get your items at the\n"
     .string "CELADON DEPT. STORE!$"
 
-gUnknown_81802A4:: @ 81802A4
+CeladonCity_Text_PrizeExchangeSign:: @ 81802A4
     .string "COINS exchanged for prizes!\n"
     .string "PRIZE EXCHANGE$"
 
-gUnknown_81802CF:: @ 81802CF
+CeladonCity_Text_GameCornerSign:: @ 81802CF
     .string "ROCKET GAME CORNER\n"
     .string "The playground for grown-ups!$"
 
-gUnknown_8180300:: @ 8180300
+CeladonCity_Text_ScaldedTongueOnTea:: @ 8180300
     .string "Aaaagh, ow…\n"
     .string "I scalded my tongue!\p"
     .string "This nice old lady in the MANSION\n"
@@ -104,7 +104,7 @@ Text_SoftboiledWhichMon:: @ 8180484
 Text_SoftboiledTaught:: @ 81804C4
     .string "I wish you the best of luck!$"
 
-gUnknown_81804E1:: @ 81804E1
+CeladonCity_Text_SomeoneStoleSilphScope:: @ 81804E1
     .string "Oh, what am I to do…\p"
     .string "Someone stole our SILPH SCOPE.\p"
     .string "The thief came running this way,\n"
diff --git a/data/maps/CeladonCity_Condominiums_1F/map.json b/data/maps/CeladonCity_Condominiums_1F/map.json
index a6f29e9d7..bcb4f815c 100644
--- a/data/maps/CeladonCity_Condominiums_1F/map.json
+++ b/data/maps/CeladonCity_Condominiums_1F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_Condominiums_1F_EventScript_16C38E",
+      "script": "CeladonCity_Condominiums_1F_EventScript_Meowth",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_Condominiums_1F_EventScript_16C3A1",
+      "script": "CeladonCity_Condominiums_1F_EventScript_Clefairy",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_Condominiums_1F_EventScript_16C3B4",
+      "script": "CeladonCity_Condominiums_1F_EventScript_Nidoran",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_Condominiums_1F_EventScript_16C321",
+      "script": "CeladonCity_Condominiums_1F_EventScript_TeaWoman",
       "flag": "0"
     }
   ],
@@ -117,14 +117,14 @@
       "x": 8,
       "y": 12,
       "elevation": 0,
-      "script": "CeladonCity_Condominiums_1F_EventScript_16C3C7"
+      "script": "CeladonCity_Condominiums_1F_EventScript_SuiteSign"
     },
     {
       "type": "bg_event_type_0",
       "x": 7,
       "y": 12,
       "elevation": 0,
-      "script": "CeladonCity_Condominiums_1F_EventScript_16C3C7"
+      "script": "CeladonCity_Condominiums_1F_EventScript_SuiteSign"
     }
   ]
 }
diff --git a/data/maps/CeladonCity_Condominiums_1F/scripts.inc b/data/maps/CeladonCity_Condominiums_1F/scripts.inc
index 41912748b..0703d8cc4 100644
--- a/data/maps/CeladonCity_Condominiums_1F/scripts.inc
+++ b/data/maps/CeladonCity_Condominiums_1F/scripts.inc
@@ -1,63 +1,63 @@
 CeladonCity_Condominiums_1F_MapScripts:: @ 816C320
 	.byte 0
 
-CeladonCity_Condominiums_1F_EventScript_16C321:: @ 816C321
+CeladonCity_Condominiums_1F_EventScript_TeaWoman:: @ 816C321
 	lock
 	faceplayer
-	goto_if_set FLAG_TALKED_TO_TEA_LADY_AFTER_HOF, EventScript_16C36A
-	goto_if_set FLAG_SYS_GAME_CLEAR, EventScript_16C374
-	goto_if_set FLAG_GOT_TEA, EventScript_16C36A
-	msgbox gUnknown_81960C9
+	goto_if_set FLAG_TALKED_TO_TEA_LADY_AFTER_HOF, CeladonCity_Condominiums_1F_EventScript_TeaWomanAfterTea
+	goto_if_set FLAG_SYS_GAME_CLEAR, CeladonCity_Condominiums_1F_EventScript_TeaWomanMentionDaisy
+	goto_if_set FLAG_GOT_TEA, CeladonCity_Condominiums_1F_EventScript_TeaWomanAfterTea
+	msgbox CeladonCity_Condominiums_1F_Text_TryThisDrinkInstead
 	setflag FLAG_GOT_TEA
 	giveitem ITEM_TEA
 	compare VAR_RESULT, FALSE
 	goto_if_eq EventScript_BagIsFull
-	msgbox gUnknown_8196109
+	msgbox CeladonCity_Condominiums_1F_Text_NothingBeatsThirstLikeTea
 	release
 	end
 
-EventScript_16C36A:: @ 816C36A
-	msgbox gUnknown_8196148
+CeladonCity_Condominiums_1F_EventScript_TeaWomanAfterTea:: @ 816C36A
+	msgbox CeladonCity_Condominiums_1F_Text_MyDearMonsKeepMeCompany
 	release
 	end
 
-EventScript_16C374:: @ 816C374
+CeladonCity_Condominiums_1F_EventScript_TeaWomanMentionDaisy:: @ 816C374
 	famechecker FAMECHECKER_DAISY, 4
 	setflag FLAG_TALKED_TO_TEA_LADY_AFTER_HOF
-	msgbox gUnknown_8196188
+	msgbox CeladonCity_Condominiums_1F_Text_DaisyComesToBuyTea
 	release
 	end
 
-CeladonCity_Condominiums_1F_EventScript_16C38E:: @ 816C38E
+CeladonCity_Condominiums_1F_EventScript_Meowth:: @ 816C38E
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_MEOWTH, 0
-	msgbox gUnknown_81960BB
+	msgbox CeladonCity_Condominiums_1F_Text_Meowth
 	waitmoncry
 	release
 	end
 
-CeladonCity_Condominiums_1F_EventScript_16C3A1:: @ 816C3A1
+CeladonCity_Condominiums_1F_EventScript_Clefairy:: @ 816C3A1
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_CLEFAIRY, 0
-	msgbox gUnknown_819625B
+	msgbox CeladonCity_Condominiums_1F_Text_Clefairy
 	waitmoncry
 	release
 	end
 
-CeladonCity_Condominiums_1F_EventScript_16C3B4:: @ 816C3B4
+CeladonCity_Condominiums_1F_EventScript_Nidoran:: @ 816C3B4
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_NIDORAN_F, 0
-	msgbox gUnknown_8196272
+	msgbox CeladonCity_Condominiums_1F_Text_Nidoran
 	waitmoncry
 	release
 	end
 
-CeladonCity_Condominiums_1F_EventScript_16C3C7:: @ 816C3C7
-	msgbox gUnknown_8196287, MSGBOX_SIGN
+CeladonCity_Condominiums_1F_EventScript_SuiteSign:: @ 816C3C7
+	msgbox CeladonCity_Condominiums_1F_Text_ManagersSuite, MSGBOX_SIGN
 	end
diff --git a/data/maps/CeladonCity_Condominiums_1F/text.inc b/data/maps/CeladonCity_Condominiums_1F/text.inc
index 7cfb9c2a1..fa0512f76 100644
--- a/data/maps/CeladonCity_Condominiums_1F/text.inc
+++ b/data/maps/CeladonCity_Condominiums_1F/text.inc
@@ -1,21 +1,21 @@
-gUnknown_81960BB:: @ 81960BB
+CeladonCity_Condominiums_1F_Text_Meowth:: @ 81960BB
     .string "MEOWTH: Meow!$"
 
-gUnknown_81960C9:: @ 81960C9
+CeladonCity_Condominiums_1F_Text_TryThisDrinkInstead:: @ 81960C9
     .string "You shouldn't spend all your money\n"
     .string "on drinks.\p"
     .string "Try this instead.$"
 
-gUnknown_8196109:: @ 8196109
+CeladonCity_Condominiums_1F_Text_NothingBeatsThirstLikeTea:: @ 8196109
     .string "Nothing beats thirst like some hot\n"
     .string "TEA.\p"
     .string "It really is the best.$"
 
-gUnknown_8196148:: @ 8196148
+CeladonCity_Condominiums_1F_Text_MyDearMonsKeepMeCompany:: @ 8196148
     .string "My dear POKéMON keep me company.\n"
     .string "MEOWTH even brings money home!$"
 
-gUnknown_8196188:: @ 8196188
+CeladonCity_Condominiums_1F_Text_DaisyComesToBuyTea:: @ 8196188
     .string "Oh, hello, dearie.\n"
     .string "Did you enjoy my TEA?\p"
     .string "By the way, dear. Are you, by any\n"
@@ -25,13 +25,13 @@ gUnknown_8196188:: @ 8196188
     .string "She visits the CELADON DEPT. STORE\n"
     .string "to buy some TEA.$"
 
-gUnknown_819625B:: @ 819625B
+CeladonCity_Condominiums_1F_Text_Clefairy:: @ 819625B
     .string "CLEFAIRY: Pi pippippi!$"
 
-gUnknown_8196272:: @ 8196272
+CeladonCity_Condominiums_1F_Text_Nidoran:: @ 8196272
     .string "NIDORAN♀: Kya kyaoo!$"
 
-gUnknown_8196287:: @ 8196287
+CeladonCity_Condominiums_1F_Text_ManagersSuite:: @ 8196287
     .string "CELADON MANSION\n"
     .string "Manager's Suite$"
 
diff --git a/data/maps/CeladonCity_Condominiums_2F/map.json b/data/maps/CeladonCity_Condominiums_2F/map.json
index 33248a953..10e5eb1c6 100644
--- a/data/maps/CeladonCity_Condominiums_2F/map.json
+++ b/data/maps/CeladonCity_Condominiums_2F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_Condominiums_2F_EventScript_1ACE9D",
+      "script": "CeladonCity_Condominiums_2F_EventScript_PokemonJournalErika",
       "flag": "FLAG_HIDE_FAME_CHECKER_ERIKA_JOURNALS"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_Condominiums_2F_EventScript_1ACE9D",
+      "script": "CeladonCity_Condominiums_2F_EventScript_PokemonJournalErika",
       "flag": "FLAG_HIDE_FAME_CHECKER_ERIKA_JOURNALS"
     }
   ],
@@ -77,14 +77,14 @@
       "x": 8,
       "y": 12,
       "elevation": 0,
-      "script": "CeladonCity_Condominiums_2F_EventScript_16C3D1"
+      "script": "CeladonCity_Condominiums_2F_EventScript_MeetingRoomSign"
     },
     {
       "type": "bg_event_type_0",
       "x": 7,
       "y": 12,
       "elevation": 0,
-      "script": "CeladonCity_Condominiums_2F_EventScript_16C3D1"
+      "script": "CeladonCity_Condominiums_2F_EventScript_MeetingRoomSign"
     }
   ]
 }
diff --git a/data/maps/CeladonCity_Condominiums_2F/scripts.inc b/data/maps/CeladonCity_Condominiums_2F/scripts.inc
index 53c0a90c0..9d952f2d7 100644
--- a/data/maps/CeladonCity_Condominiums_2F/scripts.inc
+++ b/data/maps/CeladonCity_Condominiums_2F/scripts.inc
@@ -1,6 +1,6 @@
 CeladonCity_Condominiums_2F_MapScripts:: @ 816C3D0
 	.byte 0
 
-CeladonCity_Condominiums_2F_EventScript_16C3D1:: @ 816C3D1
-	msgbox gUnknown_81962A7, MSGBOX_SIGN
+CeladonCity_Condominiums_2F_EventScript_MeetingRoomSign:: @ 816C3D1
+	msgbox CeladonCity_Condominiums_2F_Text_GameFreakMeetingRoom, MSGBOX_SIGN
 	end
diff --git a/data/maps/CeladonCity_Condominiums_2F/text.inc b/data/maps/CeladonCity_Condominiums_2F/text.inc
index 1913e1529..30ab60a1d 100644
--- a/data/maps/CeladonCity_Condominiums_2F/text.inc
+++ b/data/maps/CeladonCity_Condominiums_2F/text.inc
@@ -1,3 +1,3 @@
-gUnknown_81962A7:: @ 81962A7
+CeladonCity_Condominiums_2F_Text_GameFreakMeetingRoom:: @ 81962A7
     .string "GAME FREAK Meeting Room$"
 
diff --git a/data/maps/CeladonCity_Condominiums_3F/map.json b/data/maps/CeladonCity_Condominiums_3F/map.json
index e491e8112..4a1fb023c 100644
--- a/data/maps/CeladonCity_Condominiums_3F/map.json
+++ b/data/maps/CeladonCity_Condominiums_3F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_Condominiums_3F_EventScript_16C3DB",
+      "script": "CeladonCity_Condominiums_3F_EventScript_Programmer",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_Condominiums_3F_EventScript_16C3F6",
+      "script": "CeladonCity_Condominiums_3F_EventScript_Designer",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_Condominiums_3F_EventScript_16C3E4",
+      "script": "CeladonCity_Condominiums_3F_EventScript_GraphicArtist",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_Condominiums_3F_EventScript_16C3ED",
+      "script": "CeladonCity_Condominiums_3F_EventScript_Writer",
       "flag": "0"
     }
   ],
@@ -103,56 +103,56 @@
       "x": 8,
       "y": 12,
       "elevation": 0,
-      "script": "CeladonCity_Condominiums_3F_EventScript_16C435"
+      "script": "CeladonCity_Condominiums_3F_EventScript_DevelopmentRoomSign"
     },
     {
       "type": "bg_event_type_1",
       "x": 1,
       "y": 9,
       "elevation": 0,
-      "script": "CeladonCity_Condominiums_3F_EventScript_16C43E"
+      "script": "CeladonCity_Condominiums_3F_EventScript_Computer1"
     },
     {
       "type": "bg_event_type_1",
       "x": 5,
       "y": 9,
       "elevation": 0,
-      "script": "CeladonCity_Condominiums_3F_EventScript_16C447"
+      "script": "CeladonCity_Condominiums_3F_EventScript_Computer2"
     },
     {
       "type": "bg_event_type_1",
       "x": 1,
       "y": 12,
       "elevation": 0,
-      "script": "CeladonCity_Condominiums_3F_EventScript_16C450"
+      "script": "CeladonCity_Condominiums_3F_EventScript_Computer3"
     },
     {
       "type": "bg_event_type_0",
       "x": 7,
       "y": 12,
       "elevation": 0,
-      "script": "CeladonCity_Condominiums_3F_EventScript_16C435"
+      "script": "CeladonCity_Condominiums_3F_EventScript_DevelopmentRoomSign"
     },
     {
       "type": "bg_event_type_1",
       "x": 0,
       "y": 12,
       "elevation": 0,
-      "script": "CeladonCity_Condominiums_3F_EventScript_16C450"
+      "script": "CeladonCity_Condominiums_3F_EventScript_Computer3"
     },
     {
       "type": "bg_event_type_1",
       "x": 0,
       "y": 9,
       "elevation": 0,
-      "script": "CeladonCity_Condominiums_3F_EventScript_16C43E"
+      "script": "CeladonCity_Condominiums_3F_EventScript_Computer1"
     },
     {
       "type": "bg_event_type_1",
       "x": 4,
       "y": 9,
       "elevation": 0,
-      "script": "CeladonCity_Condominiums_3F_EventScript_16C447"
+      "script": "CeladonCity_Condominiums_3F_EventScript_Computer2"
     }
   ]
 }
diff --git a/data/maps/CeladonCity_Condominiums_3F/scripts.inc b/data/maps/CeladonCity_Condominiums_3F/scripts.inc
index d7bb14293..878ed63e8 100644
--- a/data/maps/CeladonCity_Condominiums_3F/scripts.inc
+++ b/data/maps/CeladonCity_Condominiums_3F/scripts.inc
@@ -1,34 +1,34 @@
 CeladonCity_Condominiums_3F_MapScripts:: @ 816C3DA
 	.byte 0
 
-CeladonCity_Condominiums_3F_EventScript_16C3DB:: @ 816C3DB
-	msgbox gUnknown_81962BF, MSGBOX_NPC
+CeladonCity_Condominiums_3F_EventScript_Programmer:: @ 816C3DB
+	msgbox CeladonCity_Condominiums_3F_Text_ImTheProgrammer, MSGBOX_NPC
 	end
 
-CeladonCity_Condominiums_3F_EventScript_16C3E4:: @ 816C3E4
-	msgbox gUnknown_81962D7, MSGBOX_NPC
+CeladonCity_Condominiums_3F_EventScript_GraphicArtist:: @ 816C3E4
+	msgbox CeladonCity_Condominiums_3F_Text_ImTheGraphicArtist, MSGBOX_NPC
 	end
 
-CeladonCity_Condominiums_3F_EventScript_16C3ED:: @ 816C3ED
-	msgbox gUnknown_81962FB, MSGBOX_NPC
+CeladonCity_Condominiums_3F_EventScript_Writer:: @ 816C3ED
+	msgbox CeladonCity_Condominiums_3F_Text_IWroteTheStory, MSGBOX_NPC
 	end
 
-CeladonCity_Condominiums_3F_EventScript_16C3F6:: @ 816C3F6
+CeladonCity_Condominiums_3F_EventScript_Designer:: @ 816C3F6
 	lock
 	faceplayer
 	specialvar VAR_RESULT, HasAllKantoMons
-	compare VAR_RESULT, 1
-	goto_if_eq EventScript_16C412
-	msgbox gUnknown_8196356
+	compare VAR_RESULT, TRUE
+	goto_if_eq CeladonCity_Condominiums_3F_EventScript_CompletedPokedex
+	msgbox CeladonCity_Condominiums_3F_Text_ImGameDesignerShowMeFinishedPokedex
 	release
 	end
 
-EventScript_16C412:: @ 816C412
-	goto EventScript_16C418
+CeladonCity_Condominiums_3F_EventScript_CompletedPokedex:: @ 816C412
+	goto CeladonCity_Condominiums_3F_EventScript_ShowDiploma
 	end
 
-EventScript_16C418:: @ 816C418
-	message Text_1963CD
+CeladonCity_Condominiums_3F_EventScript_ShowDiploma:: @ 816C418
+	message CeladonCity_Condominiums_3F_Text_CompletedPokedexCongratulations
 	waitmessage
 	delay 60
 	goto_if_questlog EventScript_ReleaseEnd
@@ -37,18 +37,18 @@ EventScript_16C418:: @ 816C418
 	release
 	end
 
-CeladonCity_Condominiums_3F_EventScript_16C435:: @ 816C435
-	msgbox gUnknown_81964A8, MSGBOX_SIGN
+CeladonCity_Condominiums_3F_EventScript_DevelopmentRoomSign:: @ 816C435
+	msgbox CeladonCity_Condominiums_3F_Text_GameFreakDevelopmentRoom, MSGBOX_SIGN
 	end
 
-CeladonCity_Condominiums_3F_EventScript_16C43E:: @ 816C43E
-	msgbox gUnknown_819640C, MSGBOX_SIGN
+CeladonCity_Condominiums_3F_EventScript_Computer1:: @ 816C43E
+	msgbox CeladonCity_Condominiums_3F_Text_ItsTheGameProgram, MSGBOX_SIGN
 	end
 
-CeladonCity_Condominiums_3F_EventScript_16C447:: @ 816C447
-	msgbox gUnknown_819644B, MSGBOX_SIGN
+CeladonCity_Condominiums_3F_EventScript_Computer2:: @ 816C447
+	msgbox CeladonCity_Condominiums_3F_Text_SomeonesPlayingGame, MSGBOX_SIGN
 	end
 
-CeladonCity_Condominiums_3F_EventScript_16C450:: @ 816C450
-	msgbox gUnknown_8196478, MSGBOX_SIGN
+CeladonCity_Condominiums_3F_EventScript_Computer3:: @ 816C450
+	msgbox CeladonCity_Condominiums_3F_Text_ItsScriptBetterNotLookAtEnding, MSGBOX_SIGN
 	end
diff --git a/data/maps/CeladonCity_Condominiums_3F/text.inc b/data/maps/CeladonCity_Condominiums_3F/text.inc
index 3f7179dfe..d4f91594a 100644
--- a/data/maps/CeladonCity_Condominiums_3F/text.inc
+++ b/data/maps/CeladonCity_Condominiums_3F/text.inc
@@ -1,42 +1,42 @@
-gUnknown_81962BF:: @ 81962BF
+CeladonCity_Condominiums_3F_Text_ImTheProgrammer:: @ 81962BF
     .string "Me?\n"
     .string "I'm the programmer!$"
 
-gUnknown_81962D7:: @ 81962D7
+CeladonCity_Condominiums_3F_Text_ImTheGraphicArtist:: @ 81962D7
     .string "I'm the graphic artist!\n"
     .string "I drew you!$"
 
-gUnknown_81962FB:: @ 81962FB
+CeladonCity_Condominiums_3F_Text_IWroteTheStory:: @ 81962FB
     .string "I wrote the story!\n"
     .string "Isn't ERIKA cute?\p"
     .string "I like MISTY a lot, too!\n"
     .string "Oh, and SABRINA, I like her!$"
 
-gUnknown_8196356:: @ 8196356
+CeladonCity_Condominiums_3F_Text_ImGameDesignerShowMeFinishedPokedex:: @ 8196356
     .string "Is that right?\p"
     .string "I'm the game designer!\p"
     .string "Filling up your POKéDEX is tough,\n"
     .string "but don't quit!\p"
     .string "When you finish, come tell me!$"
 
-Text_1963CD:: @ 81963CD
+CeladonCity_Condominiums_3F_Text_CompletedPokedexCongratulations:: @ 81963CD
     .string "Wow! Excellent!\n"
     .string "You completed your POKéDEX!\l"
     .string "Congratulations!\l"
     .string "…$"
 
-gUnknown_819640C:: @ 819640C
+CeladonCity_Condominiums_3F_Text_ItsTheGameProgram:: @ 819640C
     .string "It's the game program! Messing with\n"
     .string "it could bug out the game!$"
 
-gUnknown_819644B:: @ 819644B
+CeladonCity_Condominiums_3F_Text_SomeonesPlayingGame:: @ 819644B
     .string "Someone's playing a game instead of\n"
     .string "working!$"
 
-gUnknown_8196478:: @ 8196478
+CeladonCity_Condominiums_3F_Text_ItsScriptBetterNotLookAtEnding:: @ 8196478
     .string "It's the script!\n"
     .string "Better not look at the ending!$"
 
-gUnknown_81964A8:: @ 81964A8
+CeladonCity_Condominiums_3F_Text_GameFreakDevelopmentRoom:: @ 81964A8
     .string "GAME FREAK Development Room$"
 
diff --git a/data/maps/CeladonCity_Condominiums_Roof/map.json b/data/maps/CeladonCity_Condominiums_Roof/map.json
index 7680f5f68..c929b62fc 100644
--- a/data/maps/CeladonCity_Condominiums_Roof/map.json
+++ b/data/maps/CeladonCity_Condominiums_Roof/map.json
@@ -43,14 +43,14 @@
       "x": 4,
       "y": 12,
       "elevation": 0,
-      "script": "CeladonCity_Condominiums_Roof_EventScript_16C45A"
+      "script": "CeladonCity_Condominiums_Roof_EventScript_Sign"
     },
     {
       "type": "bg_event_type_0",
       "x": 3,
       "y": 12,
       "elevation": 0,
-      "script": "CeladonCity_Condominiums_Roof_EventScript_16C45A"
+      "script": "CeladonCity_Condominiums_Roof_EventScript_Sign"
     }
   ]
 }
diff --git a/data/maps/CeladonCity_Condominiums_Roof/scripts.inc b/data/maps/CeladonCity_Condominiums_Roof/scripts.inc
index 59631d86c..98013e38f 100644
--- a/data/maps/CeladonCity_Condominiums_Roof/scripts.inc
+++ b/data/maps/CeladonCity_Condominiums_Roof/scripts.inc
@@ -1,6 +1,6 @@
 CeladonCity_Condominiums_Roof_MapScripts:: @ 816C459
 	.byte 0
 
-CeladonCity_Condominiums_Roof_EventScript_16C45A:: @ 816C45A
-	msgbox gUnknown_81964C4, MSGBOX_SIGN
+CeladonCity_Condominiums_Roof_EventScript_Sign:: @ 816C45A
+	msgbox CeladonCity_Condominiums_Roof_Text_IKnowEverything, MSGBOX_SIGN
 	end
diff --git a/data/maps/CeladonCity_Condominiums_Roof/text.inc b/data/maps/CeladonCity_Condominiums_Roof/text.inc
index 02398e70b..f3012fd31 100644
--- a/data/maps/CeladonCity_Condominiums_Roof/text.inc
+++ b/data/maps/CeladonCity_Condominiums_Roof/text.inc
@@ -1,3 +1,3 @@
-gUnknown_81964C4:: @ 81964C4
+CeladonCity_Condominiums_Roof_Text_IKnowEverything:: @ 81964C4
     .string "I KNOW EVERYTHING!$"
 
diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json
index 717bfc4a1..d229e7fdd 100644
--- a/data/maps/CeladonCity_Condominiums_RoofRoom/map.json
+++ b/data/maps/CeladonCity_Condominiums_RoofRoom/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_Condominiums_RoofRoom_EventScript_16C464",
+      "script": "CeladonCity_Condominiums_RoofRoom_EventScript_BlackBelt",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_Condominiums_RoofRoom_EventScript_16C46D",
+      "script": "CeladonCity_Condominiums_RoofRoom_EventScript_EeveeBall",
       "flag": "FLAG_HIDE_EEVEE_BALL"
     }
   ],
@@ -70,21 +70,21 @@
       "x": 4,
       "y": 1,
       "elevation": 0,
-      "script": "CeladonCity_Condominiums_RoofRoom_EventScript_16C522"
+      "script": "CeladonCity_Condominiums_RoofRoom_EventScript_Blackboard"
     },
     {
       "type": "bg_event_type_0",
       "x": 5,
       "y": 1,
       "elevation": 0,
-      "script": "CeladonCity_Condominiums_RoofRoom_EventScript_16C522"
+      "script": "CeladonCity_Condominiums_RoofRoom_EventScript_Blackboard"
     },
     {
       "type": "bg_event_type_0",
       "x": 4,
       "y": 4,
       "elevation": 0,
-      "script": "CeladonCity_Condominiums_RoofRoom_EventScript_16C519"
+      "script": "CeladonCity_Condominiums_RoofRoom_EventScript_TMsPamphlet"
     }
   ]
 }
diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc
index 73c55afd8..3f3363674 100644
--- a/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc
+++ b/data/maps/CeladonCity_Condominiums_RoofRoom/scripts.inc
@@ -1,109 +1,109 @@
 CeladonCity_Condominiums_RoofRoom_MapScripts:: @ 816C463
 	.byte 0
 
-CeladonCity_Condominiums_RoofRoom_EventScript_16C464:: @ 816C464
-	msgbox gUnknown_81964D7, MSGBOX_NPC
+CeladonCity_Condominiums_RoofRoom_EventScript_BlackBelt:: @ 816C464
+	msgbox CeladonCity_Condominiums_RoofRoom_Text_TheresNothingIDontKnow, MSGBOX_NPC
 	end
 
-CeladonCity_Condominiums_RoofRoom_EventScript_16C46D:: @ 816C46D
+CeladonCity_Condominiums_RoofRoom_EventScript_EeveeBall:: @ 816C46D
 	lock
 	faceplayer
 	setvar VAR_TEMP_1, SPECIES_EEVEE
 	givemon SPECIES_EEVEE, 25, ITEM_NONE
 	compare VAR_RESULT, 0
-	goto_if_eq EventScript_16C4A6
+	goto_if_eq CeladonCity_Condominiums_RoofRoom_EventScript_GetEeeveeParty
 	compare VAR_RESULT, 1
-	goto_if_eq EventScript_16C4DA
+	goto_if_eq CeladonCity_Condominiums_RoofRoom_EventScript_GetEeeveePC
 	compare VAR_RESULT, 2
 	goto_if_eq EventScript_NoMoreRoomForPokemon
 	release
 	end
 
-EventScript_16C4A6:: @ 816C4A6
+CeladonCity_Condominiums_RoofRoom_EventScript_GetEeeveeParty:: @ 816C4A6
 	removeobject 2
 	playfanfare MUS_FANFA1
-	message Text_196591
+	message CeladonCity_Condominiums_RoofRoom_Text_ObtainedAnEevee
 	waitmessage
 	waitfanfare
 	getspeciesname 0, SPECIES_EEVEE
 	msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_16C514
+	goto_if_eq CeladonCity_Condominiums_RoofRoom_EventScript_SetGotEevee
 	call EventScript_GetGiftMonPartySlot
 	call EventScript_ChangePokemonNickname
-	goto EventScript_16C514
+	goto CeladonCity_Condominiums_RoofRoom_EventScript_SetGotEevee
 	end
 
-EventScript_16C4DA:: @ 816C4DA
+CeladonCity_Condominiums_RoofRoom_EventScript_GetEeeveePC:: @ 816C4DA
 	removeobject 2
 	playfanfare MUS_FANFA1
-	message Text_196591
+	message CeladonCity_Condominiums_RoofRoom_Text_ObtainedAnEevee
 	waitmessage
 	waitfanfare
 	getspeciesname 0, SPECIES_EEVEE
 	msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_16C509
+	goto_if_eq CeladonCity_Condominiums_RoofRoom_EventScript_TransferEeveeToPC
 	call EventScript_NameReceivedBoxMon
-	goto EventScript_16C509
+	goto CeladonCity_Condominiums_RoofRoom_EventScript_TransferEeveeToPC
 	end
 
-EventScript_16C509:: @ 816C509
+CeladonCity_Condominiums_RoofRoom_EventScript_TransferEeveeToPC:: @ 816C509
 	call EventScript_TransferredToPC
-	goto EventScript_16C514
+	goto CeladonCity_Condominiums_RoofRoom_EventScript_SetGotEevee
 	end
 
-EventScript_16C514:: @ 816C514
+CeladonCity_Condominiums_RoofRoom_EventScript_SetGotEevee:: @ 816C514
 	setflag FLAG_GOT_EEVEE
 	release
 	end
 
-CeladonCity_Condominiums_RoofRoom_EventScript_16C519:: @ 816C519
-	msgbox gUnknown_81967E3, MSGBOX_SIGN
+CeladonCity_Condominiums_RoofRoom_EventScript_TMsPamphlet:: @ 816C519
+	msgbox CeladonCity_Condominiums_RoofRoom_Text_PamphletOnTMs, MSGBOX_SIGN
 	end
 
-CeladonCity_Condominiums_RoofRoom_EventScript_16C522:: @ 816C522
+CeladonCity_Condominiums_RoofRoom_EventScript_Blackboard:: @ 816C522
 	lockall
-	msgbox gUnknown_81965C2
-	message Text_1965F4
+	msgbox CeladonCity_Condominiums_RoofRoom_Text_WirelessAdapterLecture
+	message CeladonCity_Condominiums_RoofRoom_Text_ReadWhichHeading
 	waitmessage
 	setvar VAR_0x8004, 4
 	multichoice 0, 0, MULTICHOICE_LINKED_DIRECT_UNION, FALSE
 	switch VAR_RESULT
-	case 0, EventScript_16C5C0
-	case 1, EventScript_16C5CE
-	case 2, EventScript_16C5DC
-	case 3, EventScript_16C5EA
-	case 127, EventScript_16C5EA
+	case 0, CeladonCity_Condominiums_RoofRoom_EventScript_WirelessClub
+	case 1, CeladonCity_Condominiums_RoofRoom_EventScript_DirectCorner
+	case 2, CeladonCity_Condominiums_RoofRoom_EventScript_UnionRoom
+	case 3, CeladonCity_Condominiums_RoofRoom_EventScript_ExitBlackboard
+	case 127, CeladonCity_Condominiums_RoofRoom_EventScript_ExitBlackboard
 	end
 
-EventScript_16C578:: @ 816C578
-	message Text_1965F4
+CeladonCity_Condominiums_RoofRoom_EventScript_ReadAnotherHeading:: @ 816C578
+	message CeladonCity_Condominiums_RoofRoom_Text_ReadWhichHeading
 	waitmessage
 	multichoice 0, 0, MULTICHOICE_LINKED_DIRECT_UNION, FALSE
 	switch VAR_RESULT
-	case 0, EventScript_16C5C0
-	case 1, EventScript_16C5CE
-	case 2, EventScript_16C5DC
-	case 3, EventScript_16C5EA
-	case 127, EventScript_16C5EA
+	case 0, CeladonCity_Condominiums_RoofRoom_EventScript_WirelessClub
+	case 1, CeladonCity_Condominiums_RoofRoom_EventScript_DirectCorner
+	case 2, CeladonCity_Condominiums_RoofRoom_EventScript_UnionRoom
+	case 3, CeladonCity_Condominiums_RoofRoom_EventScript_ExitBlackboard
+	case 127, CeladonCity_Condominiums_RoofRoom_EventScript_ExitBlackboard
 	end
 
-EventScript_16C5C0:: @ 816C5C0
-	msgbox gUnknown_8196617
-	goto EventScript_16C578
+CeladonCity_Condominiums_RoofRoom_EventScript_WirelessClub:: @ 816C5C0
+	msgbox CeladonCity_Condominiums_RoofRoom_Text_ExplainWirelessClub
+	goto CeladonCity_Condominiums_RoofRoom_EventScript_ReadAnotherHeading
 	end
 
-EventScript_16C5CE:: @ 816C5CE
-	msgbox gUnknown_8196695
-	goto EventScript_16C578
+CeladonCity_Condominiums_RoofRoom_EventScript_DirectCorner:: @ 816C5CE
+	msgbox CeladonCity_Condominiums_RoofRoom_Text_ExplainDirectCorner
+	goto CeladonCity_Condominiums_RoofRoom_EventScript_ReadAnotherHeading
 	end
 
-EventScript_16C5DC:: @ 816C5DC
-	msgbox gUnknown_819673C
-	goto EventScript_16C578
+CeladonCity_Condominiums_RoofRoom_EventScript_UnionRoom:: @ 816C5DC
+	msgbox CeladonCity_Condominiums_RoofRoom_Text_ExplainUnionRoom
+	goto CeladonCity_Condominiums_RoofRoom_EventScript_ReadAnotherHeading
 	end
 
-EventScript_16C5EA:: @ 816C5EA
+CeladonCity_Condominiums_RoofRoom_EventScript_ExitBlackboard:: @ 816C5EA
 	releaseall
 	end
diff --git a/data/maps/CeladonCity_Condominiums_RoofRoom/text.inc b/data/maps/CeladonCity_Condominiums_RoofRoom/text.inc
index bb09c8ce3..9e43f06ce 100644
--- a/data/maps/CeladonCity_Condominiums_RoofRoom/text.inc
+++ b/data/maps/CeladonCity_Condominiums_RoofRoom/text.inc
@@ -1,4 +1,4 @@
-gUnknown_81964D7:: @ 81964D7
+CeladonCity_Condominiums_RoofRoom_Text_TheresNothingIDontKnow:: @ 81964D7
     .string "There is nothing that I don't know,\n"
     .string "like I wrote on the blackboard.\p"
     .string "I know about the world of POKéMON\n"
@@ -6,27 +6,27 @@ gUnknown_81964D7:: @ 81964D7
     .string "Get together with your friends and\n"
     .string "enjoy trading POKéMON!$"
 
-Text_196591:: @ 8196591
+CeladonCity_Condominiums_RoofRoom_Text_ObtainedAnEevee:: @ 8196591
     .string "{PLAYER} obtained an EEVEE!$"
 
-Text_1965A7:: @ 81965A7
+CeladonCity_Condominiums_RoofRoom_Text_BoxIsFull:: @ 81965A7
     .string "ポケモンが　いっぱいだ\n"
     .string "ボックスを　かえて　きなさい$"
 
-gUnknown_81965C2:: @ 81965C2
+CeladonCity_Condominiums_RoofRoom_Text_WirelessAdapterLecture:: @ 81965C2
     .string "POKéMON Lecture\p"
     .string "Playing with the Wireless Adapter$"
 
-Text_1965F4:: @ 81965F4
+CeladonCity_Condominiums_RoofRoom_Text_ReadWhichHeading:: @ 81965F4
     .string "Which heading do you want to read?$"
 
-gUnknown_8196617:: @ 8196617
+CeladonCity_Condominiums_RoofRoom_Text_ExplainWirelessClub:: @ 8196617
     .string "The POKéMON WIRELESS CLUB is\n"
     .string "upstairs at any POKéMON CENTER.\p"
     .string "Visit one to link up with friend(s)\n"
     .string "using your Wireless Adapter.$"
 
-gUnknown_8196695:: @ 8196695
+CeladonCity_Condominiums_RoofRoom_Text_ExplainDirectCorner:: @ 8196695
     .string "To link only with a friend, go to\n"
     .string "the DIRECT CORNER.\p"
     .string "It is the right counter at the\n"
@@ -34,7 +34,7 @@ gUnknown_8196695:: @ 8196695
     .string "Go into the TRADE CORNER or the\n"
     .string "COLOSSEUM with your friend.$"
 
-gUnknown_819673C:: @ 819673C
+CeladonCity_Condominiums_RoofRoom_Text_ExplainUnionRoom:: @ 819673C
     .string "To link and communicate with\n"
     .string "anyone, go to the UNION ROOM.\p"
     .string "It is the left counter at the\n"
@@ -42,7 +42,7 @@ gUnknown_819673C:: @ 819673C
     .string "Go to the UNION ROOM and enjoy\n"
     .string "meeting other TRAINERS.$"
 
-gUnknown_81967E3:: @ 81967E3
+CeladonCity_Condominiums_RoofRoom_Text_PamphletOnTMs:: @ 81967E3
     .string "It's a pamphlet on TMs.\p"
     .string "… …\p"
     .string "There are fifty TMs in all.\p"
diff --git a/data/maps/CeladonCity_DepartmentStore_1F/map.json b/data/maps/CeladonCity_DepartmentStore_1F/map.json
index afa57c1aa..d4e20b168 100644
--- a/data/maps/CeladonCity_DepartmentStore_1F/map.json
+++ b/data/maps/CeladonCity_DepartmentStore_1F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_DepartmentStore_1F_EventScript_16BAD9",
+      "script": "CeladonCity_DepartmentStore_1F_EventScript_Receptionist",
       "flag": "0"
     }
   ],
@@ -92,14 +92,14 @@
       "x": 9,
       "y": 11,
       "elevation": 0,
-      "script": "CeladonCity_DepartmentStore_1F_EventScript_16BAE2"
+      "script": "CeladonCity_DepartmentStore_1F_EventScript_LayoutSign"
     },
     {
       "type": "bg_event_type_0",
       "x": 8,
       "y": 1,
       "elevation": 0,
-      "script": "CeladonCity_DepartmentStore_1F_EventScript_16BAEB"
+      "script": "CeladonCity_DepartmentStore_1F_EventScript_FloorSign"
     }
   ]
 }
diff --git a/data/maps/CeladonCity_DepartmentStore_1F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_1F/scripts.inc
index 4e5bcc05e..08aa687f8 100644
--- a/data/maps/CeladonCity_DepartmentStore_1F/scripts.inc
+++ b/data/maps/CeladonCity_DepartmentStore_1F/scripts.inc
@@ -1,14 +1,14 @@
 CeladonCity_DepartmentStore_1F_MapScripts:: @ 816BAD8
 	.byte 0
 
-CeladonCity_DepartmentStore_1F_EventScript_16BAD9:: @ 816BAD9
-	msgbox gUnknown_81954DD, MSGBOX_NPC
+CeladonCity_DepartmentStore_1F_EventScript_Receptionist:: @ 816BAD9
+	msgbox CeladonCity_DepartmentStore_1F_Text_WelcomeToDeptStore, MSGBOX_NPC
 	end
 
-CeladonCity_DepartmentStore_1F_EventScript_16BAE2:: @ 816BAE2
-	msgbox gUnknown_8195537, MSGBOX_SIGN
+CeladonCity_DepartmentStore_1F_EventScript_LayoutSign:: @ 816BAE2
+	msgbox CeladonCity_DepartmentStore_1F_Text_FloorDescriptions, MSGBOX_SIGN
 	end
 
-CeladonCity_DepartmentStore_1F_EventScript_16BAEB:: @ 816BAEB
-	msgbox gUnknown_81955B3, MSGBOX_SIGN
+CeladonCity_DepartmentStore_1F_EventScript_FloorSign:: @ 816BAEB
+	msgbox CeladonCity_DepartmentStore_1F_Text_ServiceCounter, MSGBOX_SIGN
 	end
diff --git a/data/maps/CeladonCity_DepartmentStore_1F/text.inc b/data/maps/CeladonCity_DepartmentStore_1F/text.inc
index e78a8c6d2..f1d1877e4 100644
--- a/data/maps/CeladonCity_DepartmentStore_1F/text.inc
+++ b/data/maps/CeladonCity_DepartmentStore_1F/text.inc
@@ -1,10 +1,10 @@
-gUnknown_81954DD:: @ 81954DD
+CeladonCity_DepartmentStore_1F_Text_WelcomeToDeptStore:: @ 81954DD
     .string "Hello!\n"
     .string "Welcome to CELADON DEPT. STORE.\p"
     .string "The board on the right describes\n"
     .string "the store layout.$"
 
-gUnknown_8195537:: @ 8195537
+CeladonCity_DepartmentStore_1F_Text_FloorDescriptions:: @ 8195537
     .string "1F: SERVICE COUNTER\p"
     .string "2F: TRAINER'S MARKET\p"
     .string "3F: TV GAME SHOP\p"
@@ -12,6 +12,6 @@ gUnknown_8195537:: @ 8195537
     .string "5F: DRUGSTORE\p"
     .string "ROOFTOP SQUARE: VENDING MACHINES$"
 
-gUnknown_81955B3:: @ 81955B3
+CeladonCity_DepartmentStore_1F_Text_ServiceCounter:: @ 81955B3
     .string "1F: SERVICE COUNTER$"
 
diff --git a/data/maps/CeladonCity_DepartmentStore_2F/map.json b/data/maps/CeladonCity_DepartmentStore_2F/map.json
index fdb27ab7e..e4e6f2f29 100644
--- a/data/maps/CeladonCity_DepartmentStore_2F/map.json
+++ b/data/maps/CeladonCity_DepartmentStore_2F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_DepartmentStore_2F_EventScript_16BAFE",
+      "script": "CeladonCity_DepartmentStore_2F_EventScript_Lass",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_DepartmentStore_2F_EventScript_16BB10",
+      "script": "CeladonCity_DepartmentStore_2F_EventScript_ClerkItems",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_DepartmentStore_2F_EventScript_16BB4E",
+      "script": "CeladonCity_DepartmentStore_2F_EventScript_ClerkTMs",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_DepartmentStore_2F_EventScript_1AD053",
+      "script": "CeladonCity_DepartmentStore_2F_EventScript_Woman",
       "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
     }
   ],
@@ -96,7 +96,7 @@
       "x": 4,
       "y": 1,
       "elevation": 0,
-      "script": "CeladonCity_DepartmentStore_2F_EventScript_16BB07"
+      "script": "CeladonCity_DepartmentStore_2F_EventScript_FloorSign"
     }
   ]
 }
diff --git a/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc
index 24d4771b2..f7e89886d 100644
--- a/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc
+++ b/data/maps/CeladonCity_DepartmentStore_2F/scripts.inc
@@ -1,31 +1,31 @@
 CeladonCity_DepartmentStore_2F_MapScripts:: @ 816BAF4
 	.byte 0
 
-CeladonCity_DepartmentStore_2F_EventScript_16BAF5:: @ 816BAF5
-	msgbox gUnknown_81955C7, MSGBOX_NPC
+CeladonCity_DepartmentStore_2F_EventScript_UnusedNPC:: @ 816BAF5
+	msgbox CeladonCity_DepartmentStore_2F_Text_SuperRepelMorePowerfulRepel, MSGBOX_NPC
 	end
 
-CeladonCity_DepartmentStore_2F_EventScript_16BAFE:: @ 816BAFE
-	msgbox gUnknown_819560F, MSGBOX_NPC
+CeladonCity_DepartmentStore_2F_EventScript_Lass:: @ 816BAFE
+	msgbox CeladonCity_DepartmentStore_2F_Text_BuyReviveForLongOutings, MSGBOX_NPC
 	end
 
-CeladonCity_DepartmentStore_2F_EventScript_16BB07:: @ 816BB07
-	msgbox gUnknown_8195638, MSGBOX_SIGN
+CeladonCity_DepartmentStore_2F_EventScript_FloorSign:: @ 816BB07
+	msgbox CeladonCity_DepartmentStore_2F_Text_FloorSign, MSGBOX_SIGN
 	end
 
-CeladonCity_DepartmentStore_2F_EventScript_16BB10:: @ 816BB10
+CeladonCity_DepartmentStore_2F_EventScript_ClerkItems:: @ 816BB10
 	goto_if_questlog EventScript_ReleaseEnd
 	lock
 	faceplayer
 	message Text_MayIHelpYou
 	waitmessage
-	pokemart Items_16BB38
+	pokemart CeladonCity_DepartmentStore_2F_Items
 	msgbox Text_PleaseComeAgain
 	release
 	end
 
 	.align 2
-Items_16BB38:: @ 816BB38
+CeladonCity_DepartmentStore_2F_Items:: @ 816BB38
 	.2byte ITEM_GREAT_BALL
 	.2byte ITEM_SUPER_POTION
 	.2byte ITEM_REVIVE
@@ -39,19 +39,19 @@ Items_16BB38:: @ 816BB38
 	release
 	end
 
-CeladonCity_DepartmentStore_2F_EventScript_16BB4E:: @ 816BB4E
+CeladonCity_DepartmentStore_2F_EventScript_ClerkTMs:: @ 816BB4E
 	goto_if_questlog EventScript_ReleaseEnd
 	lock
 	faceplayer
 	message Text_MayIHelpYou
 	waitmessage
-	pokemart Items_16BB74
+	pokemart CeladonCity_DepartmentStore_2F_TMs
 	msgbox Text_PleaseComeAgain
 	release
 	end
 
 	.align 2
-Items_16BB74:: @ 816BB74
+CeladonCity_DepartmentStore_2F_TMs:: @ 816BB74
 	.2byte ITEM_TM05
 	.2byte ITEM_TM15
 	.2byte ITEM_TM28
diff --git a/data/maps/CeladonCity_DepartmentStore_2F/text.inc b/data/maps/CeladonCity_DepartmentStore_2F/text.inc
index 22bf6b36c..77466521a 100644
--- a/data/maps/CeladonCity_DepartmentStore_2F/text.inc
+++ b/data/maps/CeladonCity_DepartmentStore_2F/text.inc
@@ -1,13 +1,19 @@
-gUnknown_81955C7:: @ 81955C7
+CeladonCity_DepartmentStore_2F_Text_SuperRepelMorePowerfulRepel:: @ 81955C7
     .string "SUPER REPEL keeps weak POKéMON at\n"
     .string "bay…\p"
     .string "Hmm, it's a more powerful REPEL.$"
 
-gUnknown_819560F:: @ 819560F
+CeladonCity_DepartmentStore_2F_Text_BuyReviveForLongOutings:: @ 819560F
     .string "For long outings, you should buy\n"
     .string "REVIVE.$"
 
-gUnknown_8195638:: @ 8195638
+CeladonCity_DepartmentStore_2F_Text_FloorSign:: @ 8195638
     .string "Top-Grade Items for TRAINERS!\p"
     .string "2F: TRAINER'S MARKET$"
 
+CeladonCity_DepartmentStore_2F_Text_LanceComesToBuyCapes:: @ 819566B
+    .string "We have a customer, LANCE, who\n"
+    .string "occasionally comes.\p"
+    .string "He always buys capes.\p"
+    .string "I wonder… Does he have many\n"
+    .string "identical capes at home?$"
diff --git a/data/maps/CeladonCity_DepartmentStore_3F/map.json b/data/maps/CeladonCity_DepartmentStore_3F/map.json
index 76bc95d25..37132845e 100644
--- a/data/maps/CeladonCity_DepartmentStore_3F/map.json
+++ b/data/maps/CeladonCity_DepartmentStore_3F/map.json
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_DepartmentStore_3F_EventScript_16BB8B",
+      "script": "CeladonCity_DepartmentStore_3F_EventScript_GBAKid1",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_DepartmentStore_3F_EventScript_16BB9D",
+      "script": "CeladonCity_DepartmentStore_3F_EventScript_GBAKid3",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_DepartmentStore_3F_EventScript_16BB94",
+      "script": "CeladonCity_DepartmentStore_3F_EventScript_GBAKid2",
       "flag": "0"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBA6",
+      "script": "CeladonCity_DepartmentStore_3F_EventScript_LittleGirl",
       "flag": "0"
     }
   ],
@@ -109,77 +109,77 @@
       "x": 8,
       "y": 1,
       "elevation": 0,
-      "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBDC"
+      "script": "CeladonCity_DepartmentStore_3F_EventScript_FloorSign"
     },
     {
       "type": "bg_event_type_1",
       "x": 2,
       "y": 8,
       "elevation": 0,
-      "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBB8"
+      "script": "CeladonCity_DepartmentStore_3F_EventScript_TV1"
     },
     {
       "type": "bg_event_type_1",
       "x": 5,
       "y": 8,
       "elevation": 0,
-      "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBC1"
+      "script": "CeladonCity_DepartmentStore_3F_EventScript_TV2"
     },
     {
       "type": "bg_event_type_1",
       "x": 2,
       "y": 11,
       "elevation": 0,
-      "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBCA"
+      "script": "CeladonCity_DepartmentStore_3F_EventScript_TV3"
     },
     {
       "type": "bg_event_type_1",
       "x": 5,
       "y": 11,
       "elevation": 0,
-      "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBD3"
+      "script": "CeladonCity_DepartmentStore_3F_EventScript_TV4"
     },
     {
       "type": "bg_event_type_0",
       "x": 1,
       "y": 8,
       "elevation": 0,
-      "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBAF"
+      "script": "CeladonCity_DepartmentStore_3F_EventScript_SuperNES"
     },
     {
       "type": "bg_event_type_0",
       "x": 1,
       "y": 11,
       "elevation": 0,
-      "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBAF"
+      "script": "CeladonCity_DepartmentStore_3F_EventScript_SuperNES"
     },
     {
       "type": "bg_event_type_0",
       "x": 4,
       "y": 8,
       "elevation": 0,
-      "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBAF"
+      "script": "CeladonCity_DepartmentStore_3F_EventScript_SuperNES"
     },
     {
       "type": "bg_event_type_0",
       "x": 4,
       "y": 11,
       "elevation": 0,
-      "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBAF"
+      "script": "CeladonCity_DepartmentStore_3F_EventScript_SuperNES"
     },
     {
       "type": "bg_event_type_1",
       "x": 2,
       "y": 4,
       "elevation": 0,
-      "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBE5"
+      "script": "CeladonCity_DepartmentStore_3F_EventScript_Poster"
     },
     {
       "type": "bg_event_type_1",
       "x": 0,
       "y": 4,
       "elevation": 0,
-      "script": "CeladonCity_DepartmentStore_3F_EventScript_16BBE5"
+      "script": "CeladonCity_DepartmentStore_3F_EventScript_Poster"
     }
   ]
 }
diff --git a/data/maps/CeladonCity_DepartmentStore_3F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_3F/scripts.inc
index f4faca037..e7af53078 100644
--- a/data/maps/CeladonCity_DepartmentStore_3F/scripts.inc
+++ b/data/maps/CeladonCity_DepartmentStore_3F/scripts.inc
@@ -5,46 +5,46 @@ CeladonCity_DepartmentStore_3F_EventScript_CounterTutor:: @ 816BB85
 	goto EventScript_CounterTutor
 	end
 
-CeladonCity_DepartmentStore_3F_EventScript_16BB8B:: @ 816BB8B
-	msgbox gUnknown_81956E9, MSGBOX_NPC
+CeladonCity_DepartmentStore_3F_EventScript_GBAKid1:: @ 816BB8B
+	msgbox CeladonCity_DepartmentStore_3F_Text_OTStandsForOriginalTrainer, MSGBOX_NPC
 	end
 
-CeladonCity_DepartmentStore_3F_EventScript_16BB94:: @ 816BB94
-	msgbox gUnknown_8195769, MSGBOX_NPC
+CeladonCity_DepartmentStore_3F_EventScript_GBAKid2:: @ 816BB94
+	msgbox CeladonCity_DepartmentStore_3F_Text_BuddyTradingKangaskhanForHaunter, MSGBOX_NPC
 	end
 
-CeladonCity_DepartmentStore_3F_EventScript_16BB9D:: @ 816BB9D
-	msgbox gUnknown_81957B0, MSGBOX_NPC
+CeladonCity_DepartmentStore_3F_EventScript_GBAKid3:: @ 816BB9D
+	msgbox CeladonCity_DepartmentStore_3F_Text_HaunterEvolvedOnTrade, MSGBOX_NPC
 	end
 
-CeladonCity_DepartmentStore_3F_EventScript_16BBA6:: @ 816BBA6
-	msgbox gUnknown_8195823, MSGBOX_NPC
+CeladonCity_DepartmentStore_3F_EventScript_LittleGirl:: @ 816BBA6
+	msgbox CeladonCity_DepartmentStore_3F_Text_CanIdentifyTradeMonsByID, MSGBOX_NPC
 	end
 
-CeladonCity_DepartmentStore_3F_EventScript_16BBAF:: @ 816BBAF
-	msgbox gUnknown_8195863, MSGBOX_SIGN
+CeladonCity_DepartmentStore_3F_EventScript_SuperNES:: @ 816BBAF
+	msgbox CeladonCity_DepartmentStore_3F_Text_ItsSuperNES, MSGBOX_SIGN
 	end
 
-CeladonCity_DepartmentStore_3F_EventScript_16BBB8:: @ 816BBB8
-	msgbox gUnknown_8195875, MSGBOX_SIGN
+CeladonCity_DepartmentStore_3F_EventScript_TV1:: @ 816BBB8
+	msgbox CeladonCity_DepartmentStore_3F_Text_AnRPG, MSGBOX_SIGN
 	end
 
-CeladonCity_DepartmentStore_3F_EventScript_16BBC1:: @ 816BBC1
-	msgbox gUnknown_8195897, MSGBOX_SIGN
+CeladonCity_DepartmentStore_3F_EventScript_TV2:: @ 816BBC1
+	msgbox CeladonCity_DepartmentStore_3F_Text_SportsGame, MSGBOX_SIGN
 	end
 
-CeladonCity_DepartmentStore_3F_EventScript_16BBCA:: @ 816BBCA
-	msgbox gUnknown_81958B8, MSGBOX_SIGN
+CeladonCity_DepartmentStore_3F_EventScript_TV3:: @ 816BBCA
+	msgbox CeladonCity_DepartmentStore_3F_Text_PuzzleGame, MSGBOX_SIGN
 	end
 
-CeladonCity_DepartmentStore_3F_EventScript_16BBD3:: @ 816BBD3
-	msgbox gUnknown_81958D8, MSGBOX_SIGN
+CeladonCity_DepartmentStore_3F_EventScript_TV4:: @ 816BBD3
+	msgbox CeladonCity_DepartmentStore_3F_Text_FightingGame, MSGBOX_SIGN
 	end
 
-CeladonCity_DepartmentStore_3F_EventScript_16BBDC:: @ 816BBDC
-	msgbox gUnknown_81958F6, MSGBOX_SIGN
+CeladonCity_DepartmentStore_3F_EventScript_FloorSign:: @ 816BBDC
+	msgbox CeladonCity_DepartmentStore_3F_Text_TVGameShop, MSGBOX_SIGN
 	end
 
-CeladonCity_DepartmentStore_3F_EventScript_16BBE5:: @ 816BBE5
-	msgbox gUnknown_8195907, MSGBOX_SIGN
+CeladonCity_DepartmentStore_3F_EventScript_Poster:: @ 816BBE5
+	msgbox CeladonCity_DepartmentStore_3F_Text_RedGreenBothArePokemon, MSGBOX_SIGN
 	end
diff --git a/data/maps/CeladonCity_DepartmentStore_3F/text.inc b/data/maps/CeladonCity_DepartmentStore_3F/text.inc
index 7d4db12cc..3533884a5 100644
--- a/data/maps/CeladonCity_DepartmentStore_3F/text.inc
+++ b/data/maps/CeladonCity_DepartmentStore_3F/text.inc
@@ -1,22 +1,15 @@
-Text_19566B:: @ 819566B
-    .string "We have a customer, LANCE, who\n"
-    .string "occasionally comes.\p"
-    .string "He always buys capes.\p"
-    .string "I wonder… Does he have many\n"
-    .string "identical capes at home?$"
-
-gUnknown_81956E9:: @ 81956E9
+CeladonCity_DepartmentStore_3F_Text_OTStandsForOriginalTrainer:: @ 81956E9
     .string "Captured POKéMON are registered\n"
     .string "with an ID No. and the OT.\p"
     .string "OT stands for “Original TRAINER” -\n"
     .string "the TRAINER that caught it first.$"
 
-gUnknown_8195769:: @ 8195769
+CeladonCity_DepartmentStore_3F_Text_BuddyTradingKangaskhanForHaunter:: @ 8195769
     .string "All right!\p"
     .string "My buddy's going to trade me his\n"
     .string "KANGASKHAN for my HAUNTER!$"
 
-gUnknown_81957B0:: @ 81957B0
+CeladonCity_DepartmentStore_3F_Text_HaunterEvolvedOnTrade:: @ 81957B0
     .string "Come on, HAUNTER!\p"
     .string "I love HAUNTER!\n"
     .string "I collect them!\p"
@@ -24,33 +17,54 @@ gUnknown_81957B0:: @ 81957B0
     .string "HAUNTER turned into a different\n"
     .string "POKéMON while being traded!$"
 
-gUnknown_8195823:: @ 8195823
+CeladonCity_DepartmentStore_3F_Text_CanIdentifyTradeMonsByID:: @ 8195823
     .string "You can identify POKéMON you get\n"
     .string "in trades by their ID Numbers.$"
 
-gUnknown_8195863:: @ 8195863
+CeladonCity_DepartmentStore_3F_Text_ItsSuperNES:: @ 8195863
     .string "It's a Super NES.$"
 
-gUnknown_8195875:: @ 8195875
+CeladonCity_DepartmentStore_3F_Text_AnRPG:: @ 8195875
     .string "An RPG!\n"
     .string "There's no time for that!$"
 
-gUnknown_8195897:: @ 8195897
+CeladonCity_DepartmentStore_3F_Text_SportsGame:: @ 8195897
     .string "A sports game!\n"
     .string "Dad'll like that!$"
 
-gUnknown_81958B8:: @ 81958B8
+CeladonCity_DepartmentStore_3F_Text_PuzzleGame:: @ 81958B8
     .string "A puzzle game!\n"
     .string "Looks addictive!$"
 
-gUnknown_81958D8:: @ 81958D8
+CeladonCity_DepartmentStore_3F_Text_FightingGame:: @ 81958D8
     .string "A fighting game!\n"
     .string "Looks tough!$"
 
-gUnknown_81958F6:: @ 81958F6
+CeladonCity_DepartmentStore_3F_Text_TVGameShop:: @ 81958F6
     .string "3F: TV GAME SHOP$"
 
-gUnknown_8195907:: @ 8195907
+CeladonCity_DepartmentStore_3F_Text_RedGreenBothArePokemon:: @ 8195907
     .string "Red and Green!\n"
     .string "Both are POKéMON!$"
 
+Text_CounterTeach:: @ 8195928
+    .string "Oh, hi!\n"
+    .string "I finally finished POKéMON.\p"
+    .string "Not done yet? How about I teach\n"
+    .string "you a good move?\p"
+    .string "The move I have in mind is\n"
+    .string "COUNTER.\p"
+    .string "Not like the one I'm leaning on,\n"
+    .string "mind you!$"
+
+Text_CounterDeclined:: @ 81959CC
+    .string "You're not interested? Come see\n"
+    .string "me if you change your mind.$"
+
+Text_CounterWhichMon:: @ 8195A08
+    .string "Which POKéMON should I teach\n"
+    .string "COUNTER to?$"
+
+Text_CounterTaught:: @ 8195A31
+    .string "Are you using that COUNTER move\n"
+    .string "I taught your POKéMON?$"
diff --git a/data/maps/CeladonCity_DepartmentStore_4F/map.json b/data/maps/CeladonCity_DepartmentStore_4F/map.json
index 059ff30e3..d1130b058 100644
--- a/data/maps/CeladonCity_DepartmentStore_4F/map.json
+++ b/data/maps/CeladonCity_DepartmentStore_4F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_DepartmentStore_4F_EventScript_16BBEF",
+      "script": "CeladonCity_DepartmentStore_4F_EventScript_Man",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_DepartmentStore_4F_EventScript_16BBF8",
+      "script": "CeladonCity_DepartmentStore_4F_EventScript_Youngster",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_DepartmentStore_4F_EventScript_16BC0A",
+      "script": "CeladonCity_DepartmentStore_4F_EventScript_Clerk",
       "flag": "0"
     }
   ],
@@ -83,7 +83,7 @@
       "x": 4,
       "y": 1,
       "elevation": 0,
-      "script": "CeladonCity_DepartmentStore_4F_EventScript_16BC01"
+      "script": "CeladonCity_DepartmentStore_4F_EventScript_FloorSign"
     }
   ]
 }
diff --git a/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc
index f04968b1e..e9aba025a 100644
--- a/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc
+++ b/data/maps/CeladonCity_DepartmentStore_4F/scripts.inc
@@ -1,31 +1,31 @@
 CeladonCity_DepartmentStore_4F_MapScripts:: @ 816BBEE
 	.byte 0
 
-CeladonCity_DepartmentStore_4F_EventScript_16BBEF:: @ 816BBEF
-	msgbox gUnknown_8195A68, MSGBOX_NPC
+CeladonCity_DepartmentStore_4F_EventScript_Man:: @ 816BBEF
+	msgbox CeladonCity_DepartmentStore_4F_Text_GettingPokeDollAsPresent, MSGBOX_NPC
 	end
 
-CeladonCity_DepartmentStore_4F_EventScript_16BBF8:: @ 816BBF8
-	msgbox gUnknown_8195AC9, MSGBOX_NPC
+CeladonCity_DepartmentStore_4F_EventScript_Youngster:: @ 816BBF8
+	msgbox CeladonCity_DepartmentStore_4F_Text_CanRunAwayWithPokeDoll, MSGBOX_NPC
 	end
 
-CeladonCity_DepartmentStore_4F_EventScript_16BC01:: @ 816BC01
-	msgbox gUnknown_8195B5B, MSGBOX_SIGN
+CeladonCity_DepartmentStore_4F_EventScript_FloorSign:: @ 816BC01
+	msgbox CeladonCity_DepartmentStore_4F_Text_FloorSign, MSGBOX_SIGN
 	end
 
-CeladonCity_DepartmentStore_4F_EventScript_16BC0A:: @ 816BC0A
+CeladonCity_DepartmentStore_4F_EventScript_Clerk:: @ 816BC0A
 	goto_if_questlog EventScript_ReleaseEnd
 	lock
 	faceplayer
 	message Text_MayIHelpYou
 	waitmessage
-	pokemart Items_16BC30
+	pokemart CeladonCity_DepartmentStore_4F_Items
 	msgbox Text_PleaseComeAgain
 	release
 	end
 
 	.align 2
-Items_16BC30:: @ 816BC30
+CeladonCity_DepartmentStore_4F_Items:: @ 816BC30
 	.2byte ITEM_POKE_DOLL
 	.2byte ITEM_RETRO_MAIL
 	.2byte ITEM_FIRE_STONE
diff --git a/data/maps/CeladonCity_DepartmentStore_4F/text.inc b/data/maps/CeladonCity_DepartmentStore_4F/text.inc
index 426cc2c82..80121023e 100644
--- a/data/maps/CeladonCity_DepartmentStore_4F/text.inc
+++ b/data/maps/CeladonCity_DepartmentStore_4F/text.inc
@@ -1,41 +1,18 @@
-Text_CounterTeach:: @ 8195928
-    .string "Oh, hi!\n"
-    .string "I finally finished POKéMON.\p"
-    .string "Not done yet? How about I teach\n"
-    .string "you a good move?\p"
-    .string "The move I have in mind is\n"
-    .string "COUNTER.\p"
-    .string "Not like the one I'm leaning on,\n"
-    .string "mind you!$"
-
-Text_CounterDeclined:: @ 81959CC
-    .string "You're not interested? Come see\n"
-    .string "me if you change your mind.$"
-
-Text_CounterWhichMon:: @ 8195A08
-    .string "Which POKéMON should I teach\n"
-    .string "COUNTER to?$"
-
-Text_CounterTaught:: @ 8195A31
-    .string "Are you using that COUNTER move\n"
-    .string "I taught your POKéMON?$"
-
-gUnknown_8195A68:: @ 8195A68
+CeladonCity_DepartmentStore_4F_Text_GettingPokeDollAsPresent:: @ 8195A68
     .string "I'm getting a present for my\n"
     .string "girlfriend.\p"
     .string "I guess a POKé DOLL will be it.\n"
     .string "It's the popular thing.$"
 
-gUnknown_8195AC9:: @ 8195AC9
+CeladonCity_DepartmentStore_4F_Text_CanRunAwayWithPokeDoll:: @ 8195AC9
     .string "I heard something useful.\p"
     .string "If a wild POKéMON appears, you can\n"
     .string "distract it with a POKé DOLL.\p"
     .string "You can run away while the wild\n"
     .string "POKéMON is distracted.$"
 
-gUnknown_8195B5B:: @ 8195B5B
+CeladonCity_DepartmentStore_4F_Text_FloorSign:: @ 8195B5B
     .string "Express yourself with gifts!\n"
     .string "4F: WISE MAN GIFTS\p"
     .string "Evolution Special!\n"
     .string "Element STONES on sale now!$"
-
diff --git a/data/maps/CeladonCity_DepartmentStore_5F/map.json b/data/maps/CeladonCity_DepartmentStore_5F/map.json
index 65b0fe9bc..b90f5f8e9 100644
--- a/data/maps/CeladonCity_DepartmentStore_5F/map.json
+++ b/data/maps/CeladonCity_DepartmentStore_5F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_DepartmentStore_5F_EventScript_16BC41",
+      "script": "CeladonCity_DepartmentStore_5F_EventScript_Gentleman",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_DepartmentStore_5F_EventScript_16BC4A",
+      "script": "CeladonCity_DepartmentStore_5F_EventScript_Sailor",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_DepartmentStore_5F_EventScript_16BC5C",
+      "script": "CeladonCity_DepartmentStore_5F_EventScript_ClerkXItems",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_DepartmentStore_5F_EventScript_16BC96",
+      "script": "CeladonCity_DepartmentStore_5F_EventScript_ClerkVitamins",
       "flag": "0"
     }
   ],
@@ -96,7 +96,7 @@
       "x": 8,
       "y": 1,
       "elevation": 0,
-      "script": "CeladonCity_DepartmentStore_5F_EventScript_16BC53"
+      "script": "CeladonCity_DepartmentStore_5F_EventScript_FloorSign"
     }
   ]
 }
diff --git a/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc b/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc
index 9056d2b2d..e854a6a65 100644
--- a/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc
+++ b/data/maps/CeladonCity_DepartmentStore_5F/scripts.inc
@@ -1,31 +1,31 @@
 CeladonCity_DepartmentStore_5F_MapScripts:: @ 816BC40
 	.byte 0
 
-CeladonCity_DepartmentStore_5F_EventScript_16BC41:: @ 816BC41
-	msgbox gUnknown_8195BBA, MSGBOX_NPC
+CeladonCity_DepartmentStore_5F_EventScript_Gentleman:: @ 816BC41
+	msgbox CeladonCity_DepartmentStore_5F_Text_ExplainStatEnhancers, MSGBOX_NPC
 	end
 
-CeladonCity_DepartmentStore_5F_EventScript_16BC4A:: @ 816BC4A
-	msgbox gUnknown_8195CA0, MSGBOX_NPC
+CeladonCity_DepartmentStore_5F_EventScript_Sailor:: @ 816BC4A
+	msgbox CeladonCity_DepartmentStore_5F_Text_HereForStatEnhancers, MSGBOX_NPC
 	end
 
-CeladonCity_DepartmentStore_5F_EventScript_16BC53:: @ 816BC53
-	msgbox gUnknown_8195D14, MSGBOX_SIGN
+CeladonCity_DepartmentStore_5F_EventScript_FloorSign:: @ 816BC53
+	msgbox CeladonCity_DepartmentStore_5F_Text_Drugstore, MSGBOX_SIGN
 	end
 
-CeladonCity_DepartmentStore_5F_EventScript_16BC5C:: @ 816BC5C
+CeladonCity_DepartmentStore_5F_EventScript_ClerkXItems:: @ 816BC5C
 	goto_if_questlog EventScript_ReleaseEnd
 	lock
 	faceplayer
 	message Text_MayIHelpYou
 	waitmessage
-	pokemart Items_16BC84
+	pokemart CeladonCity_DepartmentStore_5F_XItems
 	msgbox Text_PleaseComeAgain
 	release
 	end
 
 	.align 2
-Items_16BC84:: @ 816BC84
+CeladonCity_DepartmentStore_5F_XItems:: @ 816BC84
 	.2byte ITEM_X_ATTACK
 	.2byte ITEM_X_DEFEND
 	.2byte ITEM_X_SPEED
@@ -37,19 +37,19 @@ Items_16BC84:: @ 816BC84
 	release
 	end
 
-CeladonCity_DepartmentStore_5F_EventScript_16BC96:: @ 816BC96
+CeladonCity_DepartmentStore_5F_EventScript_ClerkVitamins:: @ 816BC96
 	goto_if_questlog EventScript_ReleaseEnd
 	lock
 	faceplayer
 	message Text_MayIHelpYou
 	waitmessage
-	pokemart Items_16BCBC
+	pokemart CeladonCity_DepartmentStore_5F_Vitamins
 	msgbox Text_PleaseComeAgain
 	release
 	end
 
 	.align 2
-Items_16BCBC:: @ 816BCBC
+CeladonCity_DepartmentStore_5F_Vitamins:: @ 816BCBC
 	.2byte ITEM_HP_UP
 	.2byte ITEM_PROTEIN
 	.2byte ITEM_IRON
diff --git a/data/maps/CeladonCity_DepartmentStore_5F/text.inc b/data/maps/CeladonCity_DepartmentStore_5F/text.inc
index b8cee5afa..638f07320 100644
--- a/data/maps/CeladonCity_DepartmentStore_5F/text.inc
+++ b/data/maps/CeladonCity_DepartmentStore_5F/text.inc
@@ -1,4 +1,4 @@
-gUnknown_8195BBA:: @ 8195BBA
+CeladonCity_DepartmentStore_5F_Text_ExplainStatEnhancers:: @ 8195BBA
     .string "POKéMON stat enhancers can be\n"
     .string "bought only here.\p"
     .string "HP UP increases the base HP of a\n"
@@ -10,7 +10,7 @@ gUnknown_8195BBA:: @ 8195BBA
     .string "CARBOS enhances the base SPEED\n"
     .string "stat.$"
 
-gUnknown_8195CA0:: @ 8195CA0
+CeladonCity_DepartmentStore_5F_Text_HereForStatEnhancers:: @ 8195CA0
     .string "I'm here for POKéMON stat\n"
     .string "enhancers.\p"
     .string "PROTEIN increases the base ATTACK\n"
@@ -18,6 +18,6 @@ gUnknown_8195CA0:: @ 8195CA0
     .string "IRON increases the base DEFENSE\n"
     .string "stat.$"
 
-gUnknown_8195D14:: @ 8195D14
+CeladonCity_DepartmentStore_5F_Text_Drugstore:: @ 8195D14
     .string "5F: DRUGSTORE$"
 
diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/map.json b/data/maps/CeladonCity_DepartmentStore_Elevator/map.json
index a2a7d1b48..5fe6f9885 100644
--- a/data/maps/CeladonCity_DepartmentStore_Elevator/map.json
+++ b/data/maps/CeladonCity_DepartmentStore_Elevator/map.json
@@ -36,14 +36,14 @@
       "x": 0,
       "y": 2,
       "elevation": 0,
-      "script": "CeladonCity_DepartmentStore_Elevator_EventScript_16C153"
+      "script": "CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelect"
     },
     {
       "type": "bg_event_type_0",
       "x": 4,
       "y": 1,
       "elevation": 0,
-      "script": "CeladonCity_DepartmentStore_Elevator_EventScript_16C153"
+      "script": "CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelect"
     }
   ]
 }
diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc
index 14198db2f..9469abce4 100644
--- a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc
+++ b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc
@@ -1,10 +1,10 @@
 CeladonCity_DepartmentStore_Elevator_MapScripts:: @ 816C152
 	.byte 0
 
-CeladonCity_DepartmentStore_Elevator_EventScript_16C153:: @ 816C153
+CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelect:: @ 816C153
 	lockall
 	setvar VAR_0x8004, 3
-	call_if_unset FLAG_TEMP_2, EventScript_1A7AB9
+	call_if_unset FLAG_TEMP_2, EventScript_GetElevatorFloor
 	copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR
 	special Special_DrawElevatorCurrentFloorWindow
 	message Text_WantWhichFloor
@@ -12,107 +12,105 @@ CeladonCity_DepartmentStore_Elevator_EventScript_16C153:: @ 816C153
 	setvar VAR_0x8004, 3
 	specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos
 	switch VAR_RESULT
-	case 0, EventScript_16C1B7
-	case 1, EventScript_16C1C3
-	case 2, EventScript_16C1CF
-	case 3, EventScript_16C1DB
-	case 4, EventScript_16C1E7
+	case 0, CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom5F
+	case 1, CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom4F
+	case 2, CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom3F
+	case 3, CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom2F
+	case 4, CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom1F
 	end
 
-EventScript_16C1B7:: @ 816C1B7
+CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom5F:: @ 816C1B7
 	multichoicedefault 0, 0, MULTICHOICE_DEPT_STORE_ELEVATOR, 0, FALSE
-	goto EventScript_16C1F3
-
-EventScript_16C1C2:: @ 816C1C2
+	goto CeladonCity_DepartmentStore_Elevator_EventScript_ChooseFloor
 	end
 
-EventScript_16C1C3:: @ 816C1C3
+CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom4F:: @ 816C1C3
 	multichoicedefault 0, 0, MULTICHOICE_DEPT_STORE_ELEVATOR, 1, FALSE
-	goto EventScript_16C1F3
+	goto CeladonCity_DepartmentStore_Elevator_EventScript_ChooseFloor
 	end
 
-EventScript_16C1CF:: @ 816C1CF
+CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom3F:: @ 816C1CF
 	multichoicedefault 0, 0, MULTICHOICE_DEPT_STORE_ELEVATOR, 2, FALSE
-	goto EventScript_16C1F3
+	goto CeladonCity_DepartmentStore_Elevator_EventScript_ChooseFloor
 	end
 
-EventScript_16C1DB:: @ 816C1DB
+CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom2F:: @ 816C1DB
 	multichoicedefault 0, 0, MULTICHOICE_DEPT_STORE_ELEVATOR, 3, FALSE
-	goto EventScript_16C1F3
+	goto CeladonCity_DepartmentStore_Elevator_EventScript_ChooseFloor
 	end
 
-EventScript_16C1E7:: @ 816C1E7
+CeladonCity_DepartmentStore_Elevator_EventScript_FloorSelectFrom1F:: @ 816C1E7
 	multichoicedefault 0, 0, MULTICHOICE_DEPT_STORE_ELEVATOR, 4, FALSE
-	goto EventScript_16C1F3
+	goto CeladonCity_DepartmentStore_Elevator_EventScript_ChooseFloor
 	end
 
-EventScript_16C1F3:: @ 816C1F3
+CeladonCity_DepartmentStore_Elevator_EventScript_ChooseFloor:: @ 816C1F3
 	switch VAR_RESULT
-	case 0, EventScript_16C2E6
-	case 1, EventScript_16C2BE
-	case 2, EventScript_16C296
-	case 3, EventScript_16C26E
-	case 4, EventScript_16C246
-	case 5, EventScript_16C30E
-	case 127, EventScript_16C30E
+	case 0, CeladonCity_DepartmentStore_Elevator_EventScript_To5F
+	case 1, CeladonCity_DepartmentStore_Elevator_EventScript_To4F
+	case 2, CeladonCity_DepartmentStore_Elevator_EventScript_To3F
+	case 3, CeladonCity_DepartmentStore_Elevator_EventScript_To2F
+	case 4, CeladonCity_DepartmentStore_Elevator_EventScript_To1F
+	case 5, CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect
+	case 127, CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect
 	end
 
-EventScript_16C246:: @ 816C246
+CeladonCity_DepartmentStore_Elevator_EventScript_To1F:: @ 816C246
 	setvar VAR_0x8006, 4
 	setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_1F, 255, 6, 1
 	compare VAR_ELEVATOR_FLOOR, 4
-	goto_if_eq EventScript_16C30E
-	call EventScript_16C313
+	goto_if_eq CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect
+	call CeladonCity_DepartmentStore_Elevator_EventScript_MoveElevator
 	setvar VAR_ELEVATOR_FLOOR, 4
-	goto EventScript_16C30E
+	goto CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect
 	end
 
-EventScript_16C26E:: @ 816C26E
+CeladonCity_DepartmentStore_Elevator_EventScript_To2F:: @ 816C26E
 	setvar VAR_0x8006, 5
 	setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_2F, 255, 6, 1
 	compare VAR_ELEVATOR_FLOOR, 5
-	goto_if_eq EventScript_16C30E
-	call EventScript_16C313
+	goto_if_eq CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect
+	call CeladonCity_DepartmentStore_Elevator_EventScript_MoveElevator
 	setvar VAR_ELEVATOR_FLOOR, 5
-	goto EventScript_16C30E
+	goto CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect
 	end
 
-EventScript_16C296:: @ 816C296
+CeladonCity_DepartmentStore_Elevator_EventScript_To3F:: @ 816C296
 	setvar VAR_0x8006, 6
 	setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_3F, 255, 6, 1
 	compare VAR_ELEVATOR_FLOOR, 6
-	goto_if_eq EventScript_16C30E
-	call EventScript_16C313
+	goto_if_eq CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect
+	call CeladonCity_DepartmentStore_Elevator_EventScript_MoveElevator
 	setvar VAR_ELEVATOR_FLOOR, 6
-	goto EventScript_16C30E
+	goto CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect
 	end
 
-EventScript_16C2BE:: @ 816C2BE
+CeladonCity_DepartmentStore_Elevator_EventScript_To4F:: @ 816C2BE
 	setvar VAR_0x8006, 7
 	setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_4F, 255, 6, 1
 	compare VAR_ELEVATOR_FLOOR, 7
-	goto_if_eq EventScript_16C30E
-	call EventScript_16C313
+	goto_if_eq CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect
+	call CeladonCity_DepartmentStore_Elevator_EventScript_MoveElevator
 	setvar VAR_ELEVATOR_FLOOR, 7
-	goto EventScript_16C30E
+	goto CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect
 	end
 
-EventScript_16C2E6:: @ 816C2E6
+CeladonCity_DepartmentStore_Elevator_EventScript_To5F:: @ 816C2E6
 	setvar VAR_0x8006, 8
 	setdynamicwarp MAP_CELADON_CITY_DEPARTMENT_STORE_5F, 255, 6, 1
 	compare VAR_ELEVATOR_FLOOR, 8
-	goto_if_eq EventScript_16C30E
-	call EventScript_16C313
+	goto_if_eq CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect
+	call CeladonCity_DepartmentStore_Elevator_EventScript_MoveElevator
 	setvar VAR_ELEVATOR_FLOOR, 8
-	goto EventScript_16C30E
+	goto CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect
 	end
 
-EventScript_16C30E:: @ 816C30E
+CeladonCity_DepartmentStore_Elevator_EventScript_ExitFloorSelect:: @ 816C30E
 	special Special_CloseElevatorCurrentFloorWindow
 	releaseall
 	end
 
-EventScript_16C313:: @ 816C313
+CeladonCity_DepartmentStore_Elevator_EventScript_MoveElevator:: @ 816C313
 	special Special_CloseElevatorCurrentFloorWindow
 	closemessage
 	waitse
diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/map.json b/data/maps/CeladonCity_DepartmentStore_Roof/map.json
index 71eea9cee..17077ebbd 100644
--- a/data/maps/CeladonCity_DepartmentStore_Roof/map.json
+++ b/data/maps/CeladonCity_DepartmentStore_Roof/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_DepartmentStore_Roof_EventScript_16C022",
+      "script": "CeladonCity_DepartmentStore_Roof_EventScript_CooltrainerM",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_DepartmentStore_Roof_EventScript_16BCCD",
+      "script": "CeladonCity_DepartmentStore_Roof_EventScript_ThirstyGirl",
       "flag": "0"
     }
   ],
@@ -56,28 +56,28 @@
       "x": 14,
       "y": 3,
       "elevation": 0,
-      "script": "CeladonCity_DepartmentStore_Roof_EventScript_16C02B"
+      "script": "CeladonCity_DepartmentStore_Roof_EventScript_FloorSign"
     },
     {
       "type": "bg_event_type_0",
       "x": 10,
       "y": 3,
       "elevation": 0,
-      "script": "CeladonCity_DepartmentStore_Roof_EventScript_16C034"
+      "script": "CeladonCity_DepartmentStore_Roof_EventScript_VendingMachine"
     },
     {
       "type": "bg_event_type_0",
       "x": 11,
       "y": 3,
       "elevation": 0,
-      "script": "CeladonCity_DepartmentStore_Roof_EventScript_16C034"
+      "script": "CeladonCity_DepartmentStore_Roof_EventScript_VendingMachine"
     },
     {
       "type": "bg_event_type_0",
       "x": 12,
       "y": 3,
       "elevation": 0,
-      "script": "CeladonCity_DepartmentStore_Roof_EventScript_16C034"
+      "script": "CeladonCity_DepartmentStore_Roof_EventScript_VendingMachine"
     }
   ]
 }
diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc
index 48f682567..bd05d824d 100644
--- a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc
+++ b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc
@@ -1,152 +1,152 @@
 CeladonCity_DepartmentStore_Roof_MapScripts:: @ 816BCCC
 	.byte 0
 
-CeladonCity_DepartmentStore_Roof_EventScript_16BCCD:: @ 816BCCD
+CeladonCity_DepartmentStore_Roof_EventScript_ThirstyGirl:: @ 816BCCD
 	goto_if_questlog EventScript_ReleaseEnd
 	special sub_8112364
 	lock
 	faceplayer
-	call EventScript_16BCF6
+	call CeladonCity_DepartmentStore_Roof_EventScript_CheckPlayerHasDrinks
 	compare VAR_TEMP_1, 0
-	goto_if_eq EventScript_16C00E
-	goto EventScript_16BD3E
+	goto_if_eq CeladonCity_DepartmentStore_Roof_EventScript_IWantDrink
+	goto CeladonCity_DepartmentStore_Roof_EventScript_AskGiveDrink
 	end
 
-EventScript_16BCF6:: @ 816BCF6
+CeladonCity_DepartmentStore_Roof_EventScript_CheckPlayerHasDrinks:: @ 816BCF6
 	setvar VAR_TEMP_1, 0
 	checkitem ITEM_FRESH_WATER, 1
 	compare VAR_RESULT, TRUE
-	call_if_eq EventScript_16BD2C
+	call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_SetHasFreshWater
 	checkitem ITEM_SODA_POP, 1
 	compare VAR_RESULT, TRUE
-	call_if_eq EventScript_16BD32
+	call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_SetHasSodaPop
 	checkitem ITEM_LEMONADE, 1
 	compare VAR_RESULT, TRUE
-	call_if_eq EventScript_16BD38
+	call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_SetHasLemonade
 	return
 
-EventScript_16BD2C:: @ 816BD2C
+CeladonCity_DepartmentStore_Roof_EventScript_SetHasFreshWater:: @ 816BD2C
 	addvar VAR_TEMP_1, 1
 	return
 
-EventScript_16BD32:: @ 816BD32
+CeladonCity_DepartmentStore_Roof_EventScript_SetHasSodaPop:: @ 816BD32
 	addvar VAR_TEMP_1, 2
 	return
 
-EventScript_16BD38:: @ 816BD38
+CeladonCity_DepartmentStore_Roof_EventScript_SetHasLemonade:: @ 816BD38
 	addvar VAR_TEMP_1, 4
 	return
 
-EventScript_16BD3E:: @ 816BD3E
-	msgbox gUnknown_8195D22, MSGBOX_YESNO
+CeladonCity_DepartmentStore_Roof_EventScript_AskGiveDrink:: @ 816BD3E
+	msgbox CeladonCity_DepartmentStore_Roof_Text_ImThirstyGiveHerDrink, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_16C00C
+	goto_if_eq CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink
 	textcolor 3
-	message Text_195D5F
+	message CeladonCity_DepartmentStore_Roof_Text_GiveWhichDrink
 	waitmessage
 	textcolor 1
 	switch VAR_TEMP_1
-	case 1, EventScript_16BDAE
-	case 2, EventScript_16BDDA
-	case 3, EventScript_16BE06
-	case 4, EventScript_16BE3D
-	case 5, EventScript_16BE69
-	case 6, EventScript_16BEA0
-	case 7, EventScript_16BED7
+	case 1, CeladonCity_DepartmentStore_Roof_EventScript_AskGiveFreshWater
+	case 2, CeladonCity_DepartmentStore_Roof_EventScript_AskGiveSodaPop
+	case 3, CeladonCity_DepartmentStore_Roof_EventScript_AskGiveFreshWaterSodaPop
+	case 4, CeladonCity_DepartmentStore_Roof_EventScript_AskGiveLemonade
+	case 5, CeladonCity_DepartmentStore_Roof_EventScript_AskGiveFreshWaterLemonade
+	case 6, CeladonCity_DepartmentStore_Roof_EventScript_AskGiveSodaPopLemonade
+	case 7, CeladonCity_DepartmentStore_Roof_EventScript_AskGiveAllDrinks
 	end
 
-EventScript_16BDAE:: @ 816BDAE
+CeladonCity_DepartmentStore_Roof_EventScript_AskGiveFreshWater:: @ 816BDAE
 	multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_FRESH_WATER, FALSE
 	switch VAR_RESULT
-	case 0, EventScript_16BF19
-	case 1, EventScript_16C00C
-	case 127, EventScript_16C00C
+	case 0, CeladonCity_DepartmentStore_Roof_EventScript_GiveFreshWater
+	case 1, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink
+	case 127, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink
 	end
 
-EventScript_16BDDA:: @ 816BDDA
+CeladonCity_DepartmentStore_Roof_EventScript_AskGiveSodaPop:: @ 816BDDA
 	multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_SODA_POP, FALSE
 	switch VAR_RESULT
-	case 0, EventScript_16BF3A
-	case 1, EventScript_16C00C
-	case 127, EventScript_16C00C
+	case 0, CeladonCity_DepartmentStore_Roof_EventScript_GiveSodaPop
+	case 1, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink
+	case 127, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink
 	end
 
-EventScript_16BE06:: @ 816BE06
+CeladonCity_DepartmentStore_Roof_EventScript_AskGiveFreshWaterSodaPop:: @ 816BE06
 	multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_FRESH_WATER_SODA_POP, FALSE
 	switch VAR_RESULT
-	case 0, EventScript_16BF19
-	case 1, EventScript_16BF3A
-	case 2, EventScript_16C00C
-	case 127, EventScript_16C00C
+	case 0, CeladonCity_DepartmentStore_Roof_EventScript_GiveFreshWater
+	case 1, CeladonCity_DepartmentStore_Roof_EventScript_GiveSodaPop
+	case 2, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink
+	case 127, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink
 	end
 
-EventScript_16BE3D:: @ 816BE3D
+CeladonCity_DepartmentStore_Roof_EventScript_AskGiveLemonade:: @ 816BE3D
 	multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_LEMONADE, FALSE
 	switch VAR_RESULT
-	case 0, EventScript_16BF5B
-	case 1, EventScript_16C00C
-	case 127, EventScript_16C00C
+	case 0, CeladonCity_DepartmentStore_Roof_EventScript_GiveLemonade
+	case 1, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink
+	case 127, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink
 	end
 
-EventScript_16BE69:: @ 816BE69
+CeladonCity_DepartmentStore_Roof_EventScript_AskGiveFreshWaterLemonade:: @ 816BE69
 	multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_FRESH_WATER_LEMONADE, FALSE
 	switch VAR_RESULT
-	case 0, EventScript_16BF19
-	case 1, EventScript_16BF5B
-	case 2, EventScript_16C00C
-	case 127, EventScript_16C00C
+	case 0, CeladonCity_DepartmentStore_Roof_EventScript_GiveFreshWater
+	case 1, CeladonCity_DepartmentStore_Roof_EventScript_GiveLemonade
+	case 2, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink
+	case 127, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink
 	end
 
-EventScript_16BEA0:: @ 816BEA0
+CeladonCity_DepartmentStore_Roof_EventScript_AskGiveSodaPopLemonade:: @ 816BEA0
 	multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_SODA_POP_LEMONADE, FALSE
 	switch VAR_RESULT
-	case 0, EventScript_16BF3A
-	case 1, EventScript_16BF5B
-	case 2, EventScript_16C00C
-	case 127, EventScript_16C00C
+	case 0, CeladonCity_DepartmentStore_Roof_EventScript_GiveSodaPop
+	case 1, CeladonCity_DepartmentStore_Roof_EventScript_GiveLemonade
+	case 2, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink
+	case 127, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink
 	end
 
-EventScript_16BED7:: @ 816BED7
+CeladonCity_DepartmentStore_Roof_EventScript_AskGiveAllDrinks:: @ 816BED7
 	multichoice 0, 0, MULTICHOICE_THIRSTY_GIRL_FRESH_WATER_SODA_POP_LEMONADE, FALSE
 	switch VAR_RESULT
-	case 0, EventScript_16BF19
-	case 1, EventScript_16BF3A
-	case 2, EventScript_16BF5B
-	case 3, EventScript_16C00C
-	case 127, EventScript_16C00C
+	case 0, CeladonCity_DepartmentStore_Roof_EventScript_GiveFreshWater
+	case 1, CeladonCity_DepartmentStore_Roof_EventScript_GiveSodaPop
+	case 2, CeladonCity_DepartmentStore_Roof_EventScript_GiveLemonade
+	case 3, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink
+	case 127, CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink
 	end
 
-EventScript_16BF19:: @ 816BF19
+CeladonCity_DepartmentStore_Roof_EventScript_GiveFreshWater:: @ 816BF19
 	setvar VAR_0x8008, ITEM_FRESH_WATER
 	setvar VAR_0x8009, ITEM_TM16
-	goto_if_set FLAG_GOT_TM16_FROM_THIRSTY_GIRL, EventScript_16C018
-	msgbox gUnknown_8195D75
-	goto EventScript_16BF7C
+	goto_if_set FLAG_GOT_TM16_FROM_THIRSTY_GIRL, CeladonCity_DepartmentStore_Roof_EventScript_NotThirstyAfterAll
+	msgbox CeladonCity_DepartmentStore_Roof_Text_YayFreshWaterHaveThis
+	goto CeladonCity_DepartmentStore_Roof_EventScript_GiveDrink
 	end
 
-EventScript_16BF3A:: @ 816BF3A
+CeladonCity_DepartmentStore_Roof_EventScript_GiveSodaPop:: @ 816BF3A
 	setvar VAR_0x8008, ITEM_SODA_POP
 	setvar VAR_0x8009, ITEM_TM20
-	goto_if_set FLAG_GOT_TM20_FROM_THIRSTY_GIRL, EventScript_16C018
-	msgbox gUnknown_8195E33
-	goto EventScript_16BF7C
+	goto_if_set FLAG_GOT_TM20_FROM_THIRSTY_GIRL, CeladonCity_DepartmentStore_Roof_EventScript_NotThirstyAfterAll
+	msgbox CeladonCity_DepartmentStore_Roof_Text_YaySodaPopHaveThis
+	goto CeladonCity_DepartmentStore_Roof_EventScript_GiveDrink
 	end
 
-EventScript_16BF5B:: @ 816BF5B
+CeladonCity_DepartmentStore_Roof_EventScript_GiveLemonade:: @ 816BF5B
 	setvar VAR_0x8008, ITEM_LEMONADE
 	setvar VAR_0x8009, ITEM_TM33
-	goto_if_set FLAG_GOT_TM33_FROM_THIRSTY_GIRL, EventScript_16C018
-	msgbox gUnknown_8195EBF
-	goto EventScript_16BF7C
+	goto_if_set FLAG_GOT_TM33_FROM_THIRSTY_GIRL, CeladonCity_DepartmentStore_Roof_EventScript_NotThirstyAfterAll
+	msgbox CeladonCity_DepartmentStore_Roof_Text_YayLemonadeHaveThis
+	goto CeladonCity_DepartmentStore_Roof_EventScript_GiveDrink
 	end
 
-EventScript_16BF7C:: @ 816BF7C
+CeladonCity_DepartmentStore_Roof_EventScript_GiveDrink:: @ 816BF7C
 	getitemname 0, VAR_0x8008
 	getitemname 1, VAR_0x8009
 	removeitem VAR_0x8008, 1
 	checkitemspace VAR_0x8009, 1
 	compare VAR_RESULT, FALSE
-	goto_if_eq EventScript_16C002
+	goto_if_eq CeladonCity_DepartmentStore_Roof_EventScript_NoRoomForReward
 	additem VAR_0x8009
 	textcolor 3
 	playfanfare MUS_FANFA1
@@ -156,142 +156,142 @@ EventScript_16BF7C:: @ 816BF7C
 	putitemaway VAR_0x8009
 	call EventScript_1A6675
 	compare VAR_0x8008, ITEM_FRESH_WATER
-	call_if_eq EventScript_16BFDE
+	call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_ExplainTM16
 	compare VAR_0x8008, ITEM_SODA_POP
-	call_if_eq EventScript_16BFEA
+	call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_ExplainTM20
 	compare VAR_0x8008, ITEM_LEMONADE
-	call_if_eq EventScript_16BFF6
+	call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_ExplainTM33
 	release
 	end
 
-EventScript_16BFDE:: @ 816BFDE
+CeladonCity_DepartmentStore_Roof_EventScript_ExplainTM16:: @ 816BFDE
 	setflag FLAG_GOT_TM16_FROM_THIRSTY_GIRL
-	msgbox gUnknown_8195DD4
+	msgbox CeladonCity_DepartmentStore_Roof_Text_ExplainTM16
 	return
 
-EventScript_16BFEA:: @ 816BFEA
+CeladonCity_DepartmentStore_Roof_EventScript_ExplainTM20:: @ 816BFEA
 	setflag FLAG_GOT_TM20_FROM_THIRSTY_GIRL
-	msgbox gUnknown_8195E68
+	msgbox CeladonCity_DepartmentStore_Roof_Text_ExplainTM20
 	return
 
-EventScript_16BFF6:: @ 816BFF6
+CeladonCity_DepartmentStore_Roof_EventScript_ExplainTM33:: @ 816BFF6
 	setflag FLAG_GOT_TM33_FROM_THIRSTY_GIRL
-	msgbox gUnknown_8195EF4
+	msgbox CeladonCity_DepartmentStore_Roof_Text_ExplainTM33
 	return
 
-EventScript_16C002:: @ 816C002
-	msgbox gUnknown_8195F4F
+CeladonCity_DepartmentStore_Roof_EventScript_NoRoomForReward:: @ 816C002
+	msgbox CeladonCity_DepartmentStore_Roof_Text_DontHaveSpaceForThis
 	release
 	end
 
-EventScript_16C00C:: @ 816C00C
+CeladonCity_DepartmentStore_Roof_EventScript_DontGiveDrink:: @ 816C00C
 	release
 	end
 
-EventScript_16C00E:: @ 816C00E
-	msgbox gUnknown_8195FEF
+CeladonCity_DepartmentStore_Roof_EventScript_IWantDrink:: @ 816C00E
+	msgbox CeladonCity_DepartmentStore_Roof_Text_ImThirstyIWantDrink
 	release
 	end
 
-EventScript_16C018:: @ 816C018
-	msgbox gUnknown_8195F6E
+CeladonCity_DepartmentStore_Roof_EventScript_NotThirstyAfterAll:: @ 816C018
+	msgbox CeladonCity_DepartmentStore_Roof_Text_ImNotThirstyAfterAll
 	release
 	end
 
-CeladonCity_DepartmentStore_Roof_EventScript_16C022:: @ 816C022
-	msgbox gUnknown_8195F98, MSGBOX_NPC
+CeladonCity_DepartmentStore_Roof_EventScript_CooltrainerM:: @ 816C022
+	msgbox CeladonCity_DepartmentStore_Roof_Text_MySisterIsImmature, MSGBOX_NPC
 	end
 
-CeladonCity_DepartmentStore_Roof_EventScript_16C02B:: @ 816C02B
-	msgbox gUnknown_8196017, MSGBOX_SIGN
+CeladonCity_DepartmentStore_Roof_EventScript_FloorSign:: @ 816C02B
+	msgbox CeladonCity_DepartmentStore_Roof_Text_FloorSign, MSGBOX_SIGN
 	end
 
-CeladonCity_DepartmentStore_Roof_EventScript_16C034:: @ 816C034
+CeladonCity_DepartmentStore_Roof_EventScript_VendingMachine:: @ 816C034
 	lockall
-	message Text_196038
+	message CeladonCity_DepartmentStore_Roof_Text_VendingMachineWhatDoesItHave
 	waitmessage
 	showmoneybox 0, 0, 0
-	goto EventScript_16C045
+	goto CeladonCity_DepartmentStore_Roof_EventScript_ChooseDrink
 	end
 
-EventScript_16C045:: @ 816C045
+CeladonCity_DepartmentStore_Roof_EventScript_ChooseDrink:: @ 816C045
 	multichoice 12, 0, MULTICHOICE_CELADON_VENDING_MACHINE, FALSE
 	copyvar VAR_TEMP_1, VAR_RESULT
 	switch VAR_TEMP_1
-	case 0, EventScript_16C083
-	case 1, EventScript_16C094
-	case 2, EventScript_16C0A5
-	msgbox gUnknown_81960AE
-	goto EventScript_16C14D
+	case 0, CeladonCity_DepartmentStore_Roof_EventScript_BuyFreshWater
+	case 1, CeladonCity_DepartmentStore_Roof_EventScript_BuySodaPop
+	case 2, CeladonCity_DepartmentStore_Roof_EventScript_BuyLemonade
+	msgbox CeladonCity_DepartmentStore_Roof_Text_NotThirsty
+	goto CeladonCity_DepartmentStore_Roof_EventScript_ExitVendingMachine
 	end
 
-EventScript_16C083:: @ 816C083
+CeladonCity_DepartmentStore_Roof_EventScript_BuyFreshWater:: @ 816C083
 	setvar VAR_TEMP_0, ITEM_FRESH_WATER
 	checkmoney 200, 0
-	goto EventScript_16C0CB
+	goto CeladonCity_DepartmentStore_Roof_EventScript_TryBuyDrink
 	end
 
-EventScript_16C094:: @ 816C094
+CeladonCity_DepartmentStore_Roof_EventScript_BuySodaPop:: @ 816C094
 	setvar VAR_TEMP_0, ITEM_SODA_POP
 	checkmoney 300, 0
-	goto EventScript_16C0CB
+	goto CeladonCity_DepartmentStore_Roof_EventScript_TryBuyDrink
 	end
 
-EventScript_16C0A5:: @ 816C0A5
+CeladonCity_DepartmentStore_Roof_EventScript_BuyLemonade:: @ 816C0A5
 	setvar VAR_TEMP_0, ITEM_LEMONADE
 	checkmoney 350, 0
-	goto EventScript_16C0CB
+	goto CeladonCity_DepartmentStore_Roof_EventScript_TryBuyDrink
 	end
 
-EventScript_16C0B6:: @ 816C0B6
+CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneyFreshWater:: @ 816C0B6
 	removemoney 200, 0
 	return
 
-EventScript_16C0BD:: @ 816C0BD
+CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneySodaPop:: @ 816C0BD
 	removemoney 300, 0
 	return
 
-EventScript_16C0C4:: @ 816C0C4
+CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneyLemonade:: @ 816C0C4
 	removemoney 350, 0
 	return
 
-EventScript_16C0CB:: @ 816C0CB
+CeladonCity_DepartmentStore_Roof_EventScript_TryBuyDrink:: @ 816C0CB
 	compare VAR_RESULT, FALSE
-	goto_if_eq EventScript_16C131
+	goto_if_eq CeladonCity_DepartmentStore_Roof_EventScript_NotEnoughMoney
 	checkitemspace VAR_TEMP_0, 1
 	compare VAR_RESULT, FALSE
-	goto_if_eq EventScript_16C13F
+	goto_if_eq CeladonCity_DepartmentStore_Roof_EventScript_NoRoomForDrink
 	compare VAR_TEMP_1, 0
-	call_if_eq EventScript_16C0B6
+	call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneyFreshWater
 	compare VAR_TEMP_1, 1
-	call_if_eq EventScript_16C0BD
+	call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneySodaPop
 	compare VAR_TEMP_1, 2
-	call_if_eq EventScript_16C0C4
+	call_if_eq CeladonCity_DepartmentStore_Roof_EventScript_RemoveMoneyLemonade
 	updatemoneybox 0, 0, 0
 	getitemname 0, VAR_TEMP_0
 	playse SE_JIHANKI
-	msgbox gUnknown_8196076
+	msgbox CeladonCity_DepartmentStore_Roof_Text_DrinkCanPoppedOut
 	additem VAR_TEMP_0
-	goto EventScript_16C125
+	goto CeladonCity_DepartmentStore_Roof_EventScript_ChooseNewDrink
 	end
 
-EventScript_16C125:: @ 816C125
-	message Text_196038
+CeladonCity_DepartmentStore_Roof_EventScript_ChooseNewDrink:: @ 816C125
+	message CeladonCity_DepartmentStore_Roof_Text_VendingMachineWhatDoesItHave
 	waitmessage
-	goto EventScript_16C045
+	goto CeladonCity_DepartmentStore_Roof_EventScript_ChooseDrink
 	end
 
-EventScript_16C131:: @ 816C131
-	msgbox gUnknown_819605E
-	goto EventScript_16C14D
+CeladonCity_DepartmentStore_Roof_EventScript_NotEnoughMoney:: @ 816C131
+	msgbox CeladonCity_DepartmentStore_Roof_Text_NotEnoughMoney
+	goto CeladonCity_DepartmentStore_Roof_EventScript_ExitVendingMachine
 	end
 
-EventScript_16C13F:: @ 816C13F
-	msgbox gUnknown_819608E
-	goto EventScript_16C14D
+CeladonCity_DepartmentStore_Roof_EventScript_NoRoomForDrink:: @ 816C13F
+	msgbox CeladonCity_DepartmentStore_Roof_Text_NoMoreRoomForStuff
+	goto CeladonCity_DepartmentStore_Roof_EventScript_ExitVendingMachine
 	end
 
-EventScript_16C14D:: @ 816C14D
+CeladonCity_DepartmentStore_Roof_EventScript_ExitVendingMachine:: @ 816C14D
 	hidemoneybox 0, 0
 	releaseall
 	end
diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/text.inc b/data/maps/CeladonCity_DepartmentStore_Roof/text.inc
index 65b9a3162..2c6944373 100644
--- a/data/maps/CeladonCity_DepartmentStore_Roof/text.inc
+++ b/data/maps/CeladonCity_DepartmentStore_Roof/text.inc
@@ -1,12 +1,12 @@
-gUnknown_8195D22:: @ 8195D22
+CeladonCity_DepartmentStore_Roof_Text_ImThirstyGiveHerDrink:: @ 8195D22
     .string "I'm thirsty!\n"
     .string "I want something to drink!\p"
     .string "{SIZE}ÁGive her a drink?$"
 
-Text_195D5F:: @ 8195D5F
+CeladonCity_DepartmentStore_Roof_Text_GiveWhichDrink:: @ 8195D5F
     .string "Give her which drink?$"
 
-gUnknown_8195D75:: @ 8195D75
+CeladonCity_DepartmentStore_Roof_Text_YayFreshWaterHaveThis:: @ 8195D75
     .string "Yay!\p"
     .string "FRESH WATER!\p"
     .string "Thank you!\n"
@@ -16,67 +16,67 @@ Text_ReceivedItemFromLittleGirl:: @ 8195DAD
     .string "{PLAYER} received a {STR_VAR_2}\n"
     .string "from the little girl.$"
 
-gUnknown_8195DD4:: @ 8195DD4
+CeladonCity_DepartmentStore_Roof_Text_ExplainTM16:: @ 8195DD4
     .string "TM16 contains LIGHT SCREEN.\p"
     .string "It's a move that weakens the power\n"
     .string "of special attacks by your foe.$"
 
-gUnknown_8195E33:: @ 8195E33
+CeladonCity_DepartmentStore_Roof_Text_YaySodaPopHaveThis:: @ 8195E33
     .string "Yay!\p"
     .string "SODA POP!\p"
     .string "Thank you!\n"
     .string "You can have this from me!$"
 
-gUnknown_8195E68:: @ 8195E68
+CeladonCity_DepartmentStore_Roof_Text_ExplainTM20:: @ 8195E68
     .string "TM20 contains SAFEGUARD.\p"
     .string "It's a move that prevents status\n"
     .string "problems among your POKéMON.$"
 
-gUnknown_8195EBF:: @ 8195EBF
+CeladonCity_DepartmentStore_Roof_Text_YayLemonadeHaveThis:: @ 8195EBF
     .string "Yay!\p"
     .string "LEMONADE!\p"
     .string "Thank you!\n"
     .string "You can have this from me!$"
 
-gUnknown_8195EF4:: @ 8195EF4
+CeladonCity_DepartmentStore_Roof_Text_ExplainTM33:: @ 8195EF4
     .string "TM33 contains REFLECT.\p"
     .string "It's a move that weakens the power\n"
     .string "of physical attacks by your foe.$"
 
-gUnknown_8195F4F:: @ 8195F4F
+CeladonCity_DepartmentStore_Roof_Text_DontHaveSpaceForThis:: @ 8195F4F
     .string "You don't have space for this!$"
 
-gUnknown_8195F6E:: @ 8195F6E
+CeladonCity_DepartmentStore_Roof_Text_ImNotThirstyAfterAll:: @ 8195F6E
     .string "No, thank you!\n"
     .string "I'm not thirsty after all!$"
 
-gUnknown_8195F98:: @ 8195F98
+CeladonCity_DepartmentStore_Roof_Text_MySisterIsImmature:: @ 8195F98
     .string "My sister is a TRAINER, believe it\n"
     .string "or not.\p"
     .string "But, she's so immature, she drives\n"
     .string "me nuts!$"
 
-gUnknown_8195FEF:: @ 8195FEF
+CeladonCity_DepartmentStore_Roof_Text_ImThirstyIWantDrink:: @ 8195FEF
     .string "I'm thirsty!\n"
     .string "I want something to drink!$"
 
-gUnknown_8196017:: @ 8196017
+CeladonCity_DepartmentStore_Roof_Text_FloorSign:: @ 8196017
     .string "ROOFTOP SQUARE:\n"
     .string "VENDING MACHINES$"
 
-Text_196038:: @ 8196038
+CeladonCity_DepartmentStore_Roof_Text_VendingMachineWhatDoesItHave:: @ 8196038
     .string "A vending machine!\n"
     .string "What does it have?$"
 
-gUnknown_819605E:: @ 819605E
+CeladonCity_DepartmentStore_Roof_Text_NotEnoughMoney:: @ 819605E
     .string "Oops, not enough money!$"
 
-gUnknown_8196076:: @ 8196076
+CeladonCity_DepartmentStore_Roof_Text_DrinkCanPoppedOut:: @ 8196076
     .string "A can of {STR_VAR_1} popped out!$"
 
-gUnknown_819608E:: @ 819608E
+CeladonCity_DepartmentStore_Roof_Text_NoMoreRoomForStuff:: @ 819608E
     .string "There's no more room for stuff!$"
 
-gUnknown_81960AE:: @ 81960AE
+CeladonCity_DepartmentStore_Roof_Text_NotThirsty:: @ 81960AE
     .string "Not thirsty!$"
 
diff --git a/data/maps/CeladonCity_GameCorner/map.json b/data/maps/CeladonCity_GameCorner/map.json
index 081d3fac9..79ba87c7f 100644
--- a/data/maps/CeladonCity_GameCorner/map.json
+++ b/data/maps/CeladonCity_GameCorner/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16C684",
+      "script": "CeladonCity_GameCorner_EventScript_InfoClerk",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16C68D",
+      "script": "CeladonCity_GameCorner_EventScript_CoinsClerk",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16C7BA",
+      "script": "CeladonCity_GameCorner_EventScript_BaldingMan",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16C7D7",
+      "script": "CeladonCity_GameCorner_EventScript_Woman1",
       "flag": "0"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16C7E7",
+      "script": "CeladonCity_GameCorner_EventScript_Fisher",
       "flag": "0"
     },
     {
@@ -88,7 +88,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16C857",
+      "script": "CeladonCity_GameCorner_EventScript_GymGuy",
       "flag": "0"
     },
     {
@@ -101,7 +101,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16C87E",
+      "script": "CeladonCity_GameCorner_EventScript_Woman2",
       "flag": "0"
     },
     {
@@ -114,7 +114,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16C88E",
+      "script": "CeladonCity_GameCorner_EventScript_OldMan",
       "flag": "0"
     },
     {
@@ -127,7 +127,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16C89E",
+      "script": "CeladonCity_GameCorner_EventScript_Scientist",
       "flag": "0"
     },
     {
@@ -140,7 +140,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16C8FE",
+      "script": "CeladonCity_GameCorner_EventScript_Gentleman",
       "flag": "0"
     },
     {
@@ -153,7 +153,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16CAF5",
+      "script": "CeladonCity_GameCorner_EventScript_RocketGrunt",
       "flag": "FLAG_HIDE_GAME_CORNER_ROCKET"
     }
   ],
@@ -314,168 +314,168 @@
       "x": 0,
       "y": 7,
       "elevation": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16C95E"
+      "script": "CeladonCity_GameCorner_EventScript_SlotMachine0"
     },
     {
       "type": "bg_event_type_4",
       "x": 0,
       "y": 9,
       "elevation": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16C9A4"
+      "script": "CeladonCity_GameCorner_EventScript_SlotMachine1"
     },
     {
       "type": "bg_event_type_4",
       "x": 0,
       "y": 10,
       "elevation": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16C9B0"
+      "script": "CeladonCity_GameCorner_EventScript_SlotMachine2"
     },
     {
       "type": "bg_event_type_3",
       "x": 5,
       "y": 6,
       "elevation": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16C9BC"
+      "script": "CeladonCity_GameCorner_EventScript_SlotMachine3"
     },
     {
       "type": "bg_event_type_3",
       "x": 5,
       "y": 8,
       "elevation": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16CB5A"
+      "script": "CeladonCity_GameCorner_EventScript_UnusableSlotMachine1"
     },
     {
       "type": "bg_event_type_3",
       "x": 5,
       "y": 9,
       "elevation": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16C9D4"
+      "script": "CeladonCity_GameCorner_EventScript_SlotMachine5"
     },
     {
       "type": "bg_event_type_3",
       "x": 5,
       "y": 10,
       "elevation": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16C9E0"
+      "script": "CeladonCity_GameCorner_EventScript_SlotMachine6"
     },
     {
       "type": "bg_event_type_4",
       "x": 6,
       "y": 6,
       "elevation": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16C9EC"
+      "script": "CeladonCity_GameCorner_EventScript_SlotMachine7"
     },
     {
       "type": "bg_event_type_4",
       "x": 6,
       "y": 7,
       "elevation": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16C9F8"
+      "script": "CeladonCity_GameCorner_EventScript_SlotMachine8"
     },
     {
       "type": "bg_event_type_4",
       "x": 6,
       "y": 9,
       "elevation": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16CA04"
+      "script": "CeladonCity_GameCorner_EventScript_SlotMachine9"
     },
     {
       "type": "bg_event_type_3",
       "x": 11,
       "y": 6,
       "elevation": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16CA10"
+      "script": "CeladonCity_GameCorner_EventScript_SlotMachine10"
     },
     {
       "type": "bg_event_type_3",
       "x": 11,
       "y": 7,
       "elevation": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16CA1C"
+      "script": "CeladonCity_GameCorner_EventScript_SlotMachine11"
     },
     {
       "type": "bg_event_type_3",
       "x": 11,
       "y": 8,
       "elevation": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16CA28"
+      "script": "CeladonCity_GameCorner_EventScript_SlotMachine12"
     },
     {
       "type": "bg_event_type_3",
       "x": 11,
       "y": 10,
       "elevation": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16CA34"
+      "script": "CeladonCity_GameCorner_EventScript_SlotMachine13"
     },
     {
       "type": "bg_event_type_4",
       "x": 12,
       "y": 6,
       "elevation": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16CA40"
+      "script": "CeladonCity_GameCorner_EventScript_SlotMachine14"
     },
     {
       "type": "bg_event_type_4",
       "x": 12,
       "y": 8,
       "elevation": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16CB63"
+      "script": "CeladonCity_GameCorner_EventScript_UnusableSlotMachine2"
     },
     {
       "type": "bg_event_type_4",
       "x": 12,
       "y": 9,
       "elevation": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16CA58"
+      "script": "CeladonCity_GameCorner_EventScript_SlotMachine16"
     },
     {
       "type": "bg_event_type_4",
       "x": 12,
       "y": 10,
       "elevation": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16CA64"
+      "script": "CeladonCity_GameCorner_EventScript_SlotMachine17"
     },
     {
       "type": "bg_event_type_3",
       "x": 17,
       "y": 6,
       "elevation": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16CB6C"
+      "script": "CeladonCity_GameCorner_EventScript_UnusableSlotMachine3"
     },
     {
       "type": "bg_event_type_3",
       "x": 17,
       "y": 7,
       "elevation": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16CA7C"
+      "script": "CeladonCity_GameCorner_EventScript_SlotMachine19"
     },
     {
       "type": "bg_event_type_3",
       "x": 17,
       "y": 8,
       "elevation": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16CA88"
+      "script": "CeladonCity_GameCorner_EventScript_SlotMachine20"
     },
     {
       "type": "bg_event_type_3",
       "x": 17,
       "y": 9,
       "elevation": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16CA94"
+      "script": "CeladonCity_GameCorner_EventScript_SlotMachine21"
     },
     {
       "type": "bg_event_type_0",
       "x": 11,
       "y": 1,
       "elevation": 0,
-      "script": "CeladonCity_GameCorner_EventScript_16CAAA"
+      "script": "CeladonCity_GameCorner_EventScript_Poster"
     },
     {
       "type": "bg_event_type_3",
       "x": 17,
       "y": 13,
       "elevation": 0,
-      "script": "CeladonCity_GameCorner_EventScript_1B2867"
+      "script": "CeladonCity_GameCorner_EventScript_PhotoPrinter"
     }
   ]
 }
diff --git a/data/maps/CeladonCity_GameCorner/scripts.inc b/data/maps/CeladonCity_GameCorner/scripts.inc
index 20b2ba04c..c206f38b4 100644
--- a/data/maps/CeladonCity_GameCorner/scripts.inc
+++ b/data/maps/CeladonCity_GameCorner/scripts.inc
@@ -3,443 +3,443 @@ CeladonCity_GameCorner_MapScripts:: @ 816C646
 	.byte 0
 
 CeladonCity_GameCorner_OnLoad:: @ 816C64C
-	call_if_unset FLAG_OPENED_ROCKET_HIDEOUT, EventScript_16C656
+	call_if_unset FLAG_OPENED_ROCKET_HIDEOUT, CeladonCity_GameCorner_EventScript_HideRocketHideout
 	end
 
-EventScript_16C656:: @ 816C656
-	setmetatile 15, 2, 658, 0
-	setmetatile 16, 2, 658, 0
-	setmetatile 17, 2, 658, 0
-	setmetatile 16, 3, 719, 1
-	setmetatile 17, 3, 719, 1
+CeladonCity_GameCorner_EventScript_HideRocketHideout:: @ 816C656
+	setmetatile 15, 2, METATILE_GameCorner_Floor_ShadeFull, 0
+	setmetatile 16, 2, METATILE_GameCorner_Floor_ShadeFull, 0
+	setmetatile 17, 2, METATILE_GameCorner_Floor_ShadeFull, 0
+	setmetatile 16, 3, METATILE_GameCorner_PurpleWall_Floor, 1
+	setmetatile 17, 3, METATILE_GameCorner_PurpleWall_Floor, 1
 	return
 
-CeladonCity_GameCorner_EventScript_16C684:: @ 816C684
-	msgbox gUnknown_8196940, MSGBOX_NPC
+CeladonCity_GameCorner_EventScript_InfoClerk:: @ 816C684
+	msgbox CeladonCity_GameCorner_Text_CanExchangeCoinsNextDoor, MSGBOX_NPC
 	end
 
-CeladonCity_GameCorner_EventScript_16C68D:: @ 816C68D
+CeladonCity_GameCorner_EventScript_CoinsClerk:: @ 816C68D
 	goto_if_questlog EventScript_ReleaseEnd
 	lock
 	faceplayer
 	showmoneybox 0, 0, 0
 	showcoinsbox 0, 5
-	message Text_196984
+	message CeladonCity_GameCorner_Text_WelcomeBuySomeCoins
 	waitmessage
 	multichoice 13, 0, MULTICHOICE_GAME_CORNER_COIN_PURCHASE_COUNTER, FALSE
 	copyvar VAR_0x8009, VAR_RESULT
 	switch VAR_RESULT
-	case 0, EventScript_16C6E6
-	case 1, EventScript_16C6E6
-	case 2, EventScript_16C782
-	case 127, EventScript_16C782
+	case 0, CeladonCity_GameCorner_EventScript_BuyCoins
+	case 1, CeladonCity_GameCorner_EventScript_BuyCoins
+	case 2, CeladonCity_GameCorner_EventScript_ClerkDeclineBuy
+	case 127, CeladonCity_GameCorner_EventScript_ClerkDeclineBuy
 	end
 
-EventScript_16C6E6:: @ 816C6E6
-	goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16C790
+CeladonCity_GameCorner_EventScript_BuyCoins:: @ 816C6E6
+	goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_EventScript_ClerkNoCoinCase
 	compare VAR_0x8009, 0
-	goto_if_eq EventScript_16C734
+	goto_if_eq CeladonCity_GameCorner_EventScript_Buy50Coins
 	compare VAR_0x8009, 1
-	goto_if_eq EventScript_16C706
+	goto_if_eq CeladonCity_GameCorner_EventScript_Buy500Coins
 	end
 
-EventScript_16C706:: @ 816C706
+CeladonCity_GameCorner_EventScript_Buy500Coins:: @ 816C706
 	checkcoins VAR_TEMP_1
-	compare VAR_TEMP_1, 9500
-	goto_if_ge EventScript_16C79E
+	compare VAR_TEMP_1, (MAX_COINS + 1) - 500
+	goto_if_ge CeladonCity_GameCorner_EventScript_ClerkNoRoomForCoins
 	checkmoney 10000, 0
 	compare VAR_RESULT, FALSE
-	goto_if_eq EventScript_16C7AC
+	goto_if_eq CeladonCity_GameCorner_EventScript_ClerkNotEnoughMoney
 	addcoins 500
 	removemoney 10000, 0
-	goto EventScript_16C762
+	goto CeladonCity_GameCorner_EventScript_BoughtCoins
 	end
 
-EventScript_16C734:: @ 816C734
+CeladonCity_GameCorner_EventScript_Buy50Coins:: @ 816C734
 	checkcoins VAR_TEMP_1
-	compare VAR_TEMP_1, 9950
-	goto_if_ge EventScript_16C79E
+	compare VAR_TEMP_1, (MAX_COINS + 1) - 50
+	goto_if_ge CeladonCity_GameCorner_EventScript_ClerkNoRoomForCoins
 	checkmoney 1000, 0
 	compare VAR_RESULT, FALSE
-	goto_if_eq EventScript_16C7AC
+	goto_if_eq CeladonCity_GameCorner_EventScript_ClerkNotEnoughMoney
 	addcoins 50
 	removemoney 1000, 0
-	goto EventScript_16C762
+	goto CeladonCity_GameCorner_EventScript_BoughtCoins
 	end
 
-EventScript_16C762:: @ 816C762
+CeladonCity_GameCorner_EventScript_BoughtCoins:: @ 816C762
 	updatemoneybox 0, 0, 0
 	updatecoinsbox 0, 5
 	playse SE_SHOP
-	msgbox gUnknown_8196A62
-	goto EventScript_16C77A
+	msgbox CeladonCity_GameCorner_Text_HereAreYourCoins
+	goto CeladonCity_GameCorner_EventScript_ClerkEnd
 	end
 
-EventScript_16C77A:: @ 816C77A
+CeladonCity_GameCorner_EventScript_ClerkEnd:: @ 816C77A
 	hidemoneybox 0, 0
 	hidecoinsbox 0, 5
 	release
 	end
 
-EventScript_16C782:: @ 816C782
-	msgbox gUnknown_81969DC
-	goto EventScript_16C77A
+CeladonCity_GameCorner_EventScript_ClerkDeclineBuy:: @ 816C782
+	msgbox CeladonCity_GameCorner_Text_ComePlaySometime
+	goto CeladonCity_GameCorner_EventScript_ClerkEnd
 	end
 
-EventScript_16C790:: @ 816C790
-	msgbox gUnknown_81969FB
-	goto EventScript_16C77A
+CeladonCity_GameCorner_EventScript_ClerkNoCoinCase:: @ 816C790
+	msgbox CeladonCity_GameCorner_Text_SorryDontHaveCoinCase
+	goto CeladonCity_GameCorner_EventScript_ClerkEnd
 	end
 
-EventScript_16C79E:: @ 816C79E
-	msgbox gUnknown_8196A26
-	goto EventScript_16C77A
+CeladonCity_GameCorner_EventScript_ClerkNoRoomForCoins:: @ 816C79E
+	msgbox CeladonCity_GameCorner_Text_CoinCaseIsFull
+	goto CeladonCity_GameCorner_EventScript_ClerkEnd
 	end
 
-EventScript_16C7AC:: @ 816C7AC
-	msgbox gUnknown_8196A46
-	goto EventScript_16C77A
+CeladonCity_GameCorner_EventScript_ClerkNotEnoughMoney:: @ 816C7AC
+	msgbox CeladonCity_GameCorner_Text_CantAffordCoins
+	goto CeladonCity_GameCorner_EventScript_ClerkEnd
 	end
 
-CeladonCity_GameCorner_EventScript_16C7BA:: @ 816C7BA
+CeladonCity_GameCorner_EventScript_BaldingMan:: @ 816C7BA
 	lock
 	faceplayer
-	msgbox gUnknown_8196A82
-	goto EventScript_16C7CA
+	msgbox CeladonCity_GameCorner_Text_RumoredTeamRocketRunsThisPlace
+	goto CeladonCity_GameCorner_EventScript_FaceSlotMachine
 	end
 
-EventScript_16C7CA:: @ 816C7CA
+CeladonCity_GameCorner_EventScript_FaceSlotMachine:: @ 816C7CA
 	closemessage
 	applymovement VAR_LAST_TALKED, Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-CeladonCity_GameCorner_EventScript_16C7D7:: @ 816C7D7
+CeladonCity_GameCorner_EventScript_Woman1:: @ 816C7D7
 	lock
 	faceplayer
-	msgbox gUnknown_8196AC7
-	goto EventScript_16C7CA
+	msgbox CeladonCity_GameCorner_Text_ThinkMachinesHaveDifferentOdds
+	goto CeladonCity_GameCorner_EventScript_FaceSlotMachine
 	end
 
-CeladonCity_GameCorner_EventScript_16C7E7:: @ 816C7E7
+CeladonCity_GameCorner_EventScript_Fisher:: @ 816C7E7
 	lock
 	faceplayer
-	goto_if_set FLAG_GOT_10_COINS_FROM_GAMBLER, EventScript_16C849
-	msgbox gUnknown_8196AF3
-	goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16C839
+	goto_if_set FLAG_GOT_10_COINS_FROM_GAMBLER, CeladonCity_GameCorner_EventScript_FisherAlreadyGotCoins
+	msgbox CeladonCity_GameCorner_Text_DoYouWantToPlay
+	goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_EventScript_GamblerNoCoinCase
 	checkcoins VAR_TEMP_1
-	compare VAR_TEMP_1, 9990
-	goto_if_ge EventScript_16C82B
+	compare VAR_TEMP_1, (MAX_COINS + 1) - 10
+	goto_if_ge CeladonCity_GameCorner_EventScript_FisherNoRoomForCoins
 	addcoins 10
 	textcolor 3
-	msgbox gUnknown_8196B0D
+	msgbox CeladonCity_GameCorner_Text_Received10CoinsFromMan
 	playse SE_SHOP
 	waitse
 	setflag FLAG_GOT_10_COINS_FROM_GAMBLER
-	goto EventScript_16C7CA
+	goto CeladonCity_GameCorner_EventScript_FaceSlotMachine
 	end
 
-EventScript_16C82B:: @ 816C82B
-	msgbox gUnknown_8196B30
-	goto EventScript_16C7CA
+CeladonCity_GameCorner_EventScript_FisherNoRoomForCoins:: @ 816C82B
+	msgbox CeladonCity_GameCorner_Text_DontNeedMyCoins
+	goto CeladonCity_GameCorner_EventScript_FaceSlotMachine
 	end
 
-EventScript_16C839:: @ 816C839
+CeladonCity_GameCorner_EventScript_GamblerNoCoinCase:: @ 816C839
 	textcolor 3
-	msgbox gUnknown_8196F26
-	goto EventScript_16C7CA
+	msgbox CeladonCity_GameCorner_Text_DontHaveCoinCase
+	goto CeladonCity_GameCorner_EventScript_FaceSlotMachine
 	end
 
-EventScript_16C849:: @ 816C849
-	msgbox gUnknown_8196B49
-	goto EventScript_16C7CA
+CeladonCity_GameCorner_EventScript_FisherAlreadyGotCoins:: @ 816C849
+	msgbox CeladonCity_GameCorner_Text_WinsComeAndGo
+	goto CeladonCity_GameCorner_EventScript_FaceSlotMachine
 	end
 
-CeladonCity_GameCorner_EventScript_16C857:: @ 816C857
+CeladonCity_GameCorner_EventScript_GymGuy:: @ 816C857
 	lock
 	faceplayer
-	goto_if_set FLAG_DEFEATED_ERIKA, EventScript_16C870
-	msgbox gUnknown_8196BAD
-	goto EventScript_16C7CA
+	goto_if_set FLAG_DEFEATED_ERIKA, CeladonCity_GameCorner_EventScript_GymGuyPostVictory
+	msgbox CeladonCity_GameCorner_Text_GymGuyAdvice
+	goto CeladonCity_GameCorner_EventScript_FaceSlotMachine
 	end
 
-EventScript_16C870:: @ 816C870
-	msgbox gUnknown_8196CA1
-	goto EventScript_16C7CA
+CeladonCity_GameCorner_EventScript_GymGuyPostVictory:: @ 816C870
+	msgbox CeladonCity_GameCorner_Text_RareMonsForCoins
+	goto CeladonCity_GameCorner_EventScript_FaceSlotMachine
 	end
 
-CeladonCity_GameCorner_EventScript_16C87E:: @ 816C87E
+CeladonCity_GameCorner_EventScript_Woman2:: @ 816C87E
 	lock
 	faceplayer
-	msgbox gUnknown_8196B7B
-	goto EventScript_16C7CA
+	msgbox CeladonCity_GameCorner_Text_WinOrLoseItsOnlyLuck
+	goto CeladonCity_GameCorner_EventScript_FaceSlotMachine
 	end
 
-CeladonCity_GameCorner_EventScript_16C88E:: @ 816C88E
+CeladonCity_GameCorner_EventScript_OldMan:: @ 816C88E
 	lock
 	faceplayer
-	msgbox gUnknown_8196CFE
-	goto EventScript_16C7CA
+	msgbox CeladonCity_GameCorner_Text_SoEasyToGetHooked
+	goto CeladonCity_GameCorner_EventScript_FaceSlotMachine
 	end
 
-CeladonCity_GameCorner_EventScript_16C89E:: @ 816C89E
+CeladonCity_GameCorner_EventScript_Scientist:: @ 816C89E
 	lock
 	faceplayer
-	goto_if_set FLAG_GOT_20_COINS_FROM_GAMBLER, EventScript_16C8F0
-	msgbox gUnknown_8196D2B
-	goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16C839
+	goto_if_set FLAG_GOT_20_COINS_FROM_GAMBLER, CeladonCity_GameCorner_EventScript_ScientistAlreadyGotCoins
+	msgbox CeladonCity_GameCorner_Text_WantSomeCoins
+	goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_EventScript_GamblerNoCoinCase
 	checkcoins VAR_TEMP_1
-	compare VAR_TEMP_1, 9980
-	goto_if_ge EventScript_16C8E2
+	compare VAR_TEMP_1, (MAX_COINS + 1) - 20
+	goto_if_ge CeladonCity_GameCorner_EventScript_ScientistNoRoomForCoins
 	addcoins 20
 	textcolor 3
-	msgbox gUnknown_8196D47
+	msgbox CeladonCity_GameCorner_Text_Received20CoinsFromNiceGuy
 	playse SE_SHOP
 	waitse
 	setflag FLAG_GOT_20_COINS_FROM_GAMBLER
-	goto EventScript_16C7CA
+	goto CeladonCity_GameCorner_EventScript_FaceSlotMachine
 	end
 
-EventScript_16C8E2:: @ 816C8E2
-	msgbox gUnknown_8196D6F
-	goto EventScript_16C7CA
+CeladonCity_GameCorner_EventScript_ScientistNoRoomForCoins:: @ 816C8E2
+	msgbox CeladonCity_GameCorner_Text_YouHaveLotsOfCoins
+	goto CeladonCity_GameCorner_EventScript_FaceSlotMachine
 	end
 
-EventScript_16C8F0:: @ 816C8F0
-	msgbox gUnknown_8196D87
-	goto EventScript_16C7CA
+CeladonCity_GameCorner_EventScript_ScientistAlreadyGotCoins:: @ 816C8F0
+	msgbox CeladonCity_GameCorner_Text_NeedMoreCoinsForMonIWant
+	goto CeladonCity_GameCorner_EventScript_FaceSlotMachine
 	end
 
-CeladonCity_GameCorner_EventScript_16C8FE:: @ 816C8FE
+CeladonCity_GameCorner_EventScript_Gentleman:: @ 816C8FE
 	lock
 	faceplayer
-	goto_if_set FLAG_GOT_20_COINS_FROM_GAMBLER_2, EventScript_16C950
-	msgbox gUnknown_8196DB7
-	goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16C839
+	goto_if_set FLAG_GOT_20_COINS_FROM_GAMBLER_2, CeladonCity_GameCorner_EventScript_GentlemanAlreadyGotCoins
+	msgbox CeladonCity_GameCorner_Text_HereAreSomeCoinsShoo
+	goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_EventScript_GamblerNoCoinCase
 	checkcoins VAR_TEMP_1
-	compare VAR_TEMP_1, 9980
-	goto_if_ge EventScript_16C942
+	compare VAR_TEMP_1, (MAX_COINS + 1) - 20
+	goto_if_ge CeladonCity_GameCorner_EventScript_GentlemanNoRoomForCoins
 	addcoins 20
 	textcolor 3
-	msgbox gUnknown_8196DF8
+	msgbox CeladonCity_GameCorner_Text_Received20CoinsFromMan
 	playse SE_SHOP
 	waitse
 	setflag FLAG_GOT_20_COINS_FROM_GAMBLER_2
-	goto EventScript_16C7CA
+	goto CeladonCity_GameCorner_EventScript_FaceSlotMachine
 	end
 
-EventScript_16C942:: @ 816C942
-	msgbox gUnknown_8196E1B
-	goto EventScript_16C7CA
+CeladonCity_GameCorner_EventScript_GentlemanNoRoomForCoins:: @ 816C942
+	msgbox CeladonCity_GameCorner_Text_YouveGotPlentyCoins
+	goto CeladonCity_GameCorner_EventScript_FaceSlotMachine
 	end
 
-EventScript_16C950:: @ 816C950
-	msgbox gUnknown_8196E40
-	goto EventScript_16C7CA
+CeladonCity_GameCorner_EventScript_GentlemanAlreadyGotCoins:: @ 816C950
+	msgbox CeladonCity_GameCorner_Text_WatchReelsClosely
+	goto CeladonCity_GameCorner_EventScript_FaceSlotMachine
 	end
 
-CeladonCity_GameCorner_EventScript_16C95E:: @ 816C95E
+CeladonCity_GameCorner_EventScript_SlotMachine0:: @ 816C95E
 	lockall
 	setvar VAR_0x8004, 0
-	goto EventScript_16C96C
+	goto CeladonCity_GameCorner_EventScript_SlotMachine
 	end
 
-EventScript_16C96A:: @ 816C96A
+CeladonCity_GameCorner_EventScript_DontPlaySlotMachine:: @ 816C96A
 	releaseall
 	end
 
-EventScript_16C96C:: @ 816C96C
-	goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16CAA0
-	msgbox gUnknown_8196F46, MSGBOX_YESNO
+CeladonCity_GameCorner_EventScript_SlotMachine:: @ 816C96C
+	goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_EventScript_SlotMachineNoCoinCase
+	msgbox CeladonCity_GameCorner_Text_SlotMachineWantToPlay, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_16C96A
+	goto_if_eq CeladonCity_GameCorner_EventScript_DontPlaySlotMachine
 	setfieldeffectarg 0, 255
 	setfieldeffectarg 1, 10
 	setfieldeffectarg 2, 14
-	dofieldeffect 64
-	waitfieldeffect 64
+	dofieldeffect FLDEFF_UNK_40
+	waitfieldeffect FLDEFF_UNK_40  @ Smile icon?
 	specialvar VAR_RESULT, Special_GetRandomSlotMachine
 	playslotmachine VAR_RESULT
 	releaseall
 	end
 
-CeladonCity_GameCorner_EventScript_16C9A4:: @ 816C9A4
+CeladonCity_GameCorner_EventScript_SlotMachine1:: @ 816C9A4
 	lockall
 	setvar VAR_0x8004, 1
-	goto EventScript_16C96C
+	goto CeladonCity_GameCorner_EventScript_SlotMachine
 	end
 
-CeladonCity_GameCorner_EventScript_16C9B0:: @ 816C9B0
+CeladonCity_GameCorner_EventScript_SlotMachine2:: @ 816C9B0
 	lockall
 	setvar VAR_0x8004, 2
-	goto EventScript_16C96C
+	goto CeladonCity_GameCorner_EventScript_SlotMachine
 	end
 
-CeladonCity_GameCorner_EventScript_16C9BC:: @ 816C9BC
+CeladonCity_GameCorner_EventScript_SlotMachine3:: @ 816C9BC
 	lockall
 	setvar VAR_0x8004, 3
-	goto EventScript_16C96C
+	goto CeladonCity_GameCorner_EventScript_SlotMachine
 	end
 
-EventScript_16C9C8:: @ 816C9C8
+CeladonCity_GameCorner_EventScript_SlotMachine4:: @ 816C9C8
 	lockall
 	setvar VAR_0x8004, 4
-	goto EventScript_16C96C
+	goto CeladonCity_GameCorner_EventScript_SlotMachine
 	end
 
-CeladonCity_GameCorner_EventScript_16C9D4:: @ 816C9D4
+CeladonCity_GameCorner_EventScript_SlotMachine5:: @ 816C9D4
 	lockall
 	setvar VAR_0x8004, 5
-	goto EventScript_16C96C
+	goto CeladonCity_GameCorner_EventScript_SlotMachine
 	end
 
-CeladonCity_GameCorner_EventScript_16C9E0:: @ 816C9E0
+CeladonCity_GameCorner_EventScript_SlotMachine6:: @ 816C9E0
 	lockall
 	setvar VAR_0x8004, 6
-	goto EventScript_16C96C
+	goto CeladonCity_GameCorner_EventScript_SlotMachine
 	end
 
-CeladonCity_GameCorner_EventScript_16C9EC:: @ 816C9EC
+CeladonCity_GameCorner_EventScript_SlotMachine7:: @ 816C9EC
 	lockall
 	setvar VAR_0x8004, 7
-	goto EventScript_16C96C
+	goto CeladonCity_GameCorner_EventScript_SlotMachine
 	end
 
-CeladonCity_GameCorner_EventScript_16C9F8:: @ 816C9F8
+CeladonCity_GameCorner_EventScript_SlotMachine8:: @ 816C9F8
 	lockall
 	setvar VAR_0x8004, 8
-	goto EventScript_16C96C
+	goto CeladonCity_GameCorner_EventScript_SlotMachine
 	end
 
-CeladonCity_GameCorner_EventScript_16CA04:: @ 816CA04
+CeladonCity_GameCorner_EventScript_SlotMachine9:: @ 816CA04
 	lockall
 	setvar VAR_0x8004, 9
-	goto EventScript_16C96C
+	goto CeladonCity_GameCorner_EventScript_SlotMachine
 	end
 
-CeladonCity_GameCorner_EventScript_16CA10:: @ 816CA10
+CeladonCity_GameCorner_EventScript_SlotMachine10:: @ 816CA10
 	lockall
 	setvar VAR_0x8004, 10
-	goto EventScript_16C96C
+	goto CeladonCity_GameCorner_EventScript_SlotMachine
 	end
 
-CeladonCity_GameCorner_EventScript_16CA1C:: @ 816CA1C
+CeladonCity_GameCorner_EventScript_SlotMachine11:: @ 816CA1C
 	lockall
 	setvar VAR_0x8004, 11
-	goto EventScript_16C96C
+	goto CeladonCity_GameCorner_EventScript_SlotMachine
 	end
 
-CeladonCity_GameCorner_EventScript_16CA28:: @ 816CA28
+CeladonCity_GameCorner_EventScript_SlotMachine12:: @ 816CA28
 	lockall
 	setvar VAR_0x8004, 12
-	goto EventScript_16C96C
+	goto CeladonCity_GameCorner_EventScript_SlotMachine
 	end
 
-CeladonCity_GameCorner_EventScript_16CA34:: @ 816CA34
+CeladonCity_GameCorner_EventScript_SlotMachine13:: @ 816CA34
 	lockall
 	setvar VAR_0x8004, 13
-	goto EventScript_16C96C
+	goto CeladonCity_GameCorner_EventScript_SlotMachine
 	end
 
-CeladonCity_GameCorner_EventScript_16CA40:: @ 816CA40
+CeladonCity_GameCorner_EventScript_SlotMachine14:: @ 816CA40
 	lockall
 	setvar VAR_0x8004, 14
-	goto EventScript_16C96C
+	goto CeladonCity_GameCorner_EventScript_SlotMachine
 	end
 
-EventScript_16CA4C:: @ 816CA4C
+CeladonCity_GameCorner_EventScript_SlotMachine15:: @ 816CA4C
 	lockall
 	setvar VAR_0x8004, 15
-	goto EventScript_16C96C
+	goto CeladonCity_GameCorner_EventScript_SlotMachine
 	end
 
-CeladonCity_GameCorner_EventScript_16CA58:: @ 816CA58
+CeladonCity_GameCorner_EventScript_SlotMachine16:: @ 816CA58
 	lockall
 	setvar VAR_0x8004, 16
-	goto EventScript_16C96C
+	goto CeladonCity_GameCorner_EventScript_SlotMachine
 	end
 
-CeladonCity_GameCorner_EventScript_16CA64:: @ 816CA64
+CeladonCity_GameCorner_EventScript_SlotMachine17:: @ 816CA64
 	lockall
 	setvar VAR_0x8004, 17
-	goto EventScript_16C96C
+	goto CeladonCity_GameCorner_EventScript_SlotMachine
 	end
 
-EventScript_16CA70:: @ 816CA70
+CeladonCity_GameCorner_EventScript_SlotMachine18:: @ 816CA70
 	lockall
 	setvar VAR_0x8004, 18
-	goto EventScript_16C96C
+	goto CeladonCity_GameCorner_EventScript_SlotMachine
 	end
 
-CeladonCity_GameCorner_EventScript_16CA7C:: @ 816CA7C
+CeladonCity_GameCorner_EventScript_SlotMachine19:: @ 816CA7C
 	lockall
 	setvar VAR_0x8004, 19
-	goto EventScript_16C96C
+	goto CeladonCity_GameCorner_EventScript_SlotMachine
 	end
 
-CeladonCity_GameCorner_EventScript_16CA88:: @ 816CA88
+CeladonCity_GameCorner_EventScript_SlotMachine20:: @ 816CA88
 	lockall
 	setvar VAR_0x8004, 20
-	goto EventScript_16C96C
+	goto CeladonCity_GameCorner_EventScript_SlotMachine
 	end
 
-CeladonCity_GameCorner_EventScript_16CA94:: @ 816CA94
+CeladonCity_GameCorner_EventScript_SlotMachine21:: @ 816CA94
 	lockall
 	setvar VAR_0x8004, 21
-	goto EventScript_16C96C
+	goto CeladonCity_GameCorner_EventScript_SlotMachine
 	end
 
-EventScript_16CAA0:: @ 816CAA0
-	msgbox gUnknown_8196F0D
+CeladonCity_GameCorner_EventScript_SlotMachineNoCoinCase:: @ 816CAA0
+	msgbox CeladonCity_GameCorner_Text_CoinCaseIsRequired
 	releaseall
 	end
 
-CeladonCity_GameCorner_EventScript_16CAAA:: @ 816CAAA
+CeladonCity_GameCorner_EventScript_Poster:: @ 816CAAA
 	lockall
-	msgbox gUnknown_8196EDC
-	call_if_unset FLAG_OPENED_ROCKET_HIDEOUT, EventScript_16CABE
+	msgbox CeladonCity_GameCorner_Text_SwitchBehindPosterPushIt
+	call_if_unset FLAG_OPENED_ROCKET_HIDEOUT, CeladonCity_GameCorner_EventScript_OpenRocketHideout
 	releaseall
 	end
 
-EventScript_16CABE:: @ 816CABE
+CeladonCity_GameCorner_EventScript_OpenRocketHideout:: @ 816CABE
 	playse SE_KI_GASYAN
-	setmetatile 15, 2, 669, 0
-	setmetatile 16, 2, 670, 1
-	setmetatile 17, 2, 671, 1
-	setmetatile 16, 3, 678, 1
-	setmetatile 17, 3, 679, 1
+	setmetatile 15, 2, METATILE_GameCorner_Floor_StairsTop, 0
+	setmetatile 16, 2, METATILE_GameCorner_StairsTop, 1
+	setmetatile 17, 2, METATILE_GameCorner_StairsBottom, 1
+	setmetatile 16, 3, METATILE_GameCorner_PurpleWall_StairsTop, 1
+	setmetatile 17, 3, METATILE_GameCorner_PurpleWall_stairsBottom, 1
 	special DrawWholeMapView
 	setflag FLAG_OPENED_ROCKET_HIDEOUT
 	return
 
-CeladonCity_GameCorner_EventScript_16CAF5:: @ 816CAF5
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_7, Text_196E69, Text_196E95, EventScript_16CB10
-	msgbox gUnknown_8196E9B, MSGBOX_AUTOCLOSE
+CeladonCity_GameCorner_EventScript_RocketGrunt:: @ 816CAF5
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_7, CeladonCity_GameCorner_Text_GruntIntro, CeladonCity_GameCorner_Text_GruntDefeat, CeladonCity_GameCorner_Text_DefeatedGrunt
+	msgbox CeladonCity_GameCorner_Text_GruntPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_16CB10:: @ 816CB10
-	msgbox gUnknown_8196E9B
+CeladonCity_GameCorner_Text_DefeatedGrunt:: @ 816CB10
+	msgbox CeladonCity_GameCorner_Text_GruntPostBattle
 	closemessage
 	compare VAR_FACING, DIR_WEST
-	call_if_eq EventScript_16CB34
+	call_if_eq CeladonCity_GameCorner_Text_GruntExitWest
 	compare VAR_FACING, DIR_WEST
-	call_if_ne EventScript_16CB3F
+	call_if_ne CeladonCity_GameCorner_Text_GruntExit
 	removeobject 11
 	release
 	end
 
-EventScript_16CB34:: @ 816CB34
-	applymovement 11, Movement_16CB4A
+CeladonCity_GameCorner_Text_GruntExitWest:: @ 816CB34
+	applymovement 11, CeladonCity_GameCorner_Movement_GruntExitWest
 	waitmovement 0
 	return
 
-EventScript_16CB3F:: @ 816CB3F
-	applymovement 11, Movement_16CB53
+CeladonCity_GameCorner_Text_GruntExit:: @ 816CB3F
+	applymovement 11, CeladonCity_GameCorner_Movement_GruntExit
 	waitmovement 0
 	return
 
-Movement_16CB4A:: @ 816CB4A
+CeladonCity_GameCorner_Movement_GruntExitWest:: @ 816CB4A
 	walk_down
 	walk_right
 	walk_right
@@ -450,7 +450,7 @@ Movement_16CB4A:: @ 816CB4A
 	walk_right
 	step_end
 
-Movement_16CB53:: @ 816CB53
+CeladonCity_GameCorner_Movement_GruntExit:: @ 816CB53
 	walk_right
 	walk_right
 	walk_right
@@ -459,14 +459,14 @@ Movement_16CB53:: @ 816CB53
 	walk_right
 	step_end
 
-CeladonCity_GameCorner_EventScript_16CB5A:: @ 816CB5A
-	msgbox gUnknown_8196F64, MSGBOX_SIGN
+CeladonCity_GameCorner_EventScript_UnusableSlotMachine1:: @ 816CB5A
+	msgbox CeladonCity_GameCorner_Text_OutOfOrder, MSGBOX_SIGN
 	end
 
-CeladonCity_GameCorner_EventScript_16CB63:: @ 816CB63
-	msgbox gUnknown_8196F81, MSGBOX_SIGN
+CeladonCity_GameCorner_EventScript_UnusableSlotMachine2:: @ 816CB63
+	msgbox CeladonCity_GameCorner_Text_OutToLunch, MSGBOX_SIGN
 	end
 
-CeladonCity_GameCorner_EventScript_16CB6C:: @ 816CB6C
-	msgbox gUnknown_8196FA0, MSGBOX_SIGN
+CeladonCity_GameCorner_EventScript_UnusableSlotMachine3:: @ 816CB6C
+	msgbox CeladonCity_GameCorner_Text_SomeonesKeys, MSGBOX_SIGN
 	end
diff --git a/data/maps/CeladonCity_GameCorner/text.inc b/data/maps/CeladonCity_GameCorner/text.inc
index a388a736f..6813330ab 100644
--- a/data/maps/CeladonCity_GameCorner/text.inc
+++ b/data/maps/CeladonCity_GameCorner/text.inc
@@ -1,60 +1,60 @@
-gUnknown_8196940:: @ 8196940
+CeladonCity_GameCorner_Text_CanExchangeCoinsNextDoor:: @ 8196940
     .string "Welcome!\p"
     .string "You can exchange your COINS for\n"
     .string "fabulous prizes next door.$"
 
-Text_196984:: @ 8196984
+CeladonCity_GameCorner_Text_WelcomeBuySomeCoins:: @ 8196984
     .string "Welcome to ROCKET GAME CORNER!\p"
     .string "Do you need some game COINS?\n"
     .string "Would you like to buy some?$"
 
-gUnknown_81969DC:: @ 81969DC
+CeladonCity_GameCorner_Text_ComePlaySometime:: @ 81969DC
     .string "No?\n"
     .string "Please come play sometime!$"
 
-gUnknown_81969FB:: @ 81969FB
+CeladonCity_GameCorner_Text_SorryDontHaveCoinCase:: @ 81969FB
     .string "Oh, I'm sorry.\n"
     .string "You don't have a COIN CASE.$"
 
-gUnknown_8196A26:: @ 8196A26
+CeladonCity_GameCorner_Text_CoinCaseIsFull:: @ 8196A26
     .string "Whoops!\n"
     .string "Your COIN CASE is full.$"
 
-gUnknown_8196A46:: @ 8196A46
+CeladonCity_GameCorner_Text_CantAffordCoins:: @ 8196A46
     .string "You can't afford the COINS.$"
 
-gUnknown_8196A62:: @ 8196A62
+CeladonCity_GameCorner_Text_HereAreYourCoins:: @ 8196A62
     .string "Thank you.\n"
     .string "Here are your COINS!$"
 
-gUnknown_8196A82:: @ 8196A82
+CeladonCity_GameCorner_Text_RumoredTeamRocketRunsThisPlace:: @ 8196A82
     .string "Keep this quiet.\p"
     .string "It's rumored that this place is run\n"
     .string "by TEAM ROCKET.$"
 
-gUnknown_8196AC7:: @ 8196AC7
+CeladonCity_GameCorner_Text_ThinkMachinesHaveDifferentOdds:: @ 8196AC7
     .string "I think these machines have\n"
     .string "different odds.$"
 
-gUnknown_8196AF3:: @ 8196AF3
+CeladonCity_GameCorner_Text_DoYouWantToPlay:: @ 8196AF3
     .string "Kid, do you want to play?$"
 
-gUnknown_8196B0D:: @ 8196B0D
+CeladonCity_GameCorner_Text_Received10CoinsFromMan:: @ 8196B0D
     .string "{PLAYER} received 10 COINS\n"
     .string "from the man.$"
 
-gUnknown_8196B30:: @ 8196B30
+CeladonCity_GameCorner_Text_DontNeedMyCoins:: @ 8196B30
     .string "You don't need my COINS!$"
 
-gUnknown_8196B49:: @ 8196B49
+CeladonCity_GameCorner_Text_WinsComeAndGo:: @ 8196B49
     .string "Wins seem to come and go.\n"
     .string "Nothing's a sure thing.$"
 
-gUnknown_8196B7B:: @ 8196B7B
+CeladonCity_GameCorner_Text_WinOrLoseItsOnlyLuck:: @ 8196B7B
     .string "These slot games…\n"
     .string "Win or lose, it's only by luck.$"
 
-gUnknown_8196BAD:: @ 8196BAD
+CeladonCity_GameCorner_Text_GymGuyAdvice:: @ 8196BAD
     .string "Hey!\p"
     .string "You have better things to do,\n"
     .string "champ in the making!\p"
@@ -66,83 +66,83 @@ gUnknown_8196BAD:: @ 8196BAD
     .string "But she's not one to be taken\n"
     .string "lightly!$"
 
-gUnknown_8196CA1:: @ 8196CA1
+CeladonCity_GameCorner_Text_RareMonsForCoins:: @ 8196CA1
     .string "They offer rare POKéMON that can\n"
     .string "be exchanged for your COINS.\p"
     .string "But, I just can't seem to win!$"
 
-gUnknown_8196CFE:: @ 8196CFE
+CeladonCity_GameCorner_Text_SoEasyToGetHooked:: @ 8196CFE
     .string "Games are scary!\n"
     .string "It's so easy to get hooked!$"
 
-gUnknown_8196D2B:: @ 8196D2B
+CeladonCity_GameCorner_Text_WantSomeCoins:: @ 8196D2B
     .string "What's up?\n"
     .string "Want some COINS?$"
 
-gUnknown_8196D47:: @ 8196D47
+CeladonCity_GameCorner_Text_Received20CoinsFromNiceGuy:: @ 8196D47
     .string "{PLAYER} received 20 COINS\n"
     .string "from the nice guy.$"
 
-gUnknown_8196D6F:: @ 8196D6F
+CeladonCity_GameCorner_Text_YouHaveLotsOfCoins:: @ 8196D6F
     .string "You have lots of COINS!$"
 
-gUnknown_8196D87:: @ 8196D87
+CeladonCity_GameCorner_Text_NeedMoreCoinsForMonIWant:: @ 8196D87
     .string "Darn! I need more COINS for the\n"
     .string "POKéMON I want!$"
 
-gUnknown_8196DB7:: @ 8196DB7
+CeladonCity_GameCorner_Text_HereAreSomeCoinsShoo:: @ 8196DB7
     .string "Hey, what? You're throwing me off!\n"
     .string "Here are some COINS, so shoo!$"
 
-gUnknown_8196DF8:: @ 8196DF8
+CeladonCity_GameCorner_Text_Received20CoinsFromMan:: @ 8196DF8
     .string "{PLAYER} received 20 COINS\n"
     .string "from the man.$"
 
-gUnknown_8196E1B:: @ 8196E1B
+CeladonCity_GameCorner_Text_YouveGotPlentyCoins:: @ 8196E1B
     .string "You've got plenty of your own\n"
     .string "COINS!$"
 
-gUnknown_8196E40:: @ 8196E40
+CeladonCity_GameCorner_Text_WatchReelsClosely:: @ 8196E40
     .string "The trick is to watch the reels\n"
     .string "closely.$"
 
-Text_196E69:: @ 8196E69
+CeladonCity_GameCorner_Text_GruntIntro:: @ 8196E69
     .string "I'm guarding this poster!\n"
     .string "Go away, or else!$"
 
-Text_196E95:: @ 8196E95
+CeladonCity_GameCorner_Text_GruntDefeat:: @ 8196E95
     .string "Dang!$"
 
-gUnknown_8196E9B:: @ 8196E9B
+CeladonCity_GameCorner_Text_GruntPostBattle:: @ 8196E9B
     .string "The TEAM ROCKET HIDEOUT might\n"
     .string "be discovered!\p"
     .string "I better tell BOSS!$"
 
-gUnknown_8196EDC:: @ 8196EDC
+CeladonCity_GameCorner_Text_SwitchBehindPosterPushIt:: @ 8196EDC
     .string "Hey!\p"
     .string "A switch behind the poster!?\n"
     .string "Let's push it!$"
 
-gUnknown_8196F0D:: @ 8196F0D
+CeladonCity_GameCorner_Text_CoinCaseIsRequired:: @ 8196F0D
     .string "A COIN CASE is required…$"
 
-gUnknown_8196F26:: @ 8196F26
+CeladonCity_GameCorner_Text_DontHaveCoinCase:: @ 8196F26
     .string "Oops!\n"
     .string "Don't have the COIN CASE!$"
 
-gUnknown_8196F46:: @ 8196F46
+CeladonCity_GameCorner_Text_SlotMachineWantToPlay:: @ 8196F46
     .string "A slot machine!\n"
     .string "Want to play?$"
 
-gUnknown_8196F64:: @ 8196F64
+CeladonCity_GameCorner_Text_OutOfOrder:: @ 8196F64
     .string "OUT OF ORDER\n"
     .string "This is broken.$"
 
-gUnknown_8196F81:: @ 8196F81
+CeladonCity_GameCorner_Text_OutToLunch:: @ 8196F81
     .string "OUT TO LUNCH\n"
     .string "This is reserved.$"
 
-gUnknown_8196FA0:: @ 8196FA0
+CeladonCity_GameCorner_Text_SomeonesKeys:: @ 8196FA0
     .string "Someone's keys!\n"
     .string "They'll be back.$"
 
diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json
index c873cd0bb..99a1a54d4 100644
--- a/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json
+++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_16CB76",
+      "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_BaldingMan",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_16CB7F",
+      "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_OldMan",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_16CB88",
+      "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_PrizeClerkMons",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_16CE1D",
+      "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_PrizeClerkTMs",
       "flag": "0"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_16CF88",
+      "script": "CeladonCity_GameCorner_PrizeRoom_EventScript_PrizeClerkItems",
       "flag": "0"
     }
   ],
diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc
index 329f829d3..ca8119594 100644
--- a/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc
+++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/scripts.inc
@@ -1,44 +1,44 @@
 CeladonCity_GameCorner_PrizeRoom_MapScripts:: @ 816CB75
 	.byte 0
 
-CeladonCity_GameCorner_PrizeRoom_EventScript_16CB76:: @ 816CB76
-	msgbox gUnknown_8196FC1, MSGBOX_NPC
+CeladonCity_GameCorner_PrizeRoom_EventScript_BaldingMan:: @ 816CB76
+	msgbox CeladonCity_GameCorner_PrizeRoom_Text_FancyThatPorygon, MSGBOX_NPC
 	end
 
-CeladonCity_GameCorner_PrizeRoom_EventScript_16CB7F:: @ 816CB7F
-	msgbox gUnknown_8196FFF, MSGBOX_NPC
+CeladonCity_GameCorner_PrizeRoom_EventScript_OldMan:: @ 816CB7F
+	msgbox CeladonCity_GameCorner_PrizeRoom_Text_RakedItInToday, MSGBOX_NPC
 	end
 
-CeladonCity_GameCorner_PrizeRoom_EventScript_16CB88:: @ 816CB88
+CeladonCity_GameCorner_PrizeRoom_EventScript_PrizeClerkMons:: @ 816CB88
 	lock
 	faceplayer
-	goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16CD99
+	goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_PrizeRoom_EventScript_NeedCoinCase
 	goto_if_questlog EventScript_ReleaseEnd
 	showcoinsbox 0, 0
-	msgbox gUnknown_8197057
-	goto EventScript_16CBB2
+	msgbox CeladonCity_GameCorner_PrizeRoom_Text_WeExchangeCoinsForPrizes
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_ChoosePrizeMon
 	end
 
-EventScript_16CBB2:: @ 816CBB2
-	message Text_19707A
+CeladonCity_GameCorner_PrizeRoom_EventScript_ChoosePrizeMon:: @ 816CBB2
+	message CeladonCity_GameCorner_PrizeRoom_Text_WhichPrize
 	waitmessage
 	multichoice 11, 0, MULTICHOICE_GAME_CORNER_POKEMON_PRIZES, FALSE
 	switch VAR_RESULT
-	case 0, EventScript_16CC15
-	case 1, EventScript_16CC25
-	case 2, EventScript_16CC35
-	case 3, EventScript_16CC45
-	case 4, EventScript_16CC55
-	case 5, EventScript_16CC10
-	case 127, EventScript_16CC10
+	case 0, CeladonCity_GameCorner_PrizeRoom_EventScript_Abra
+	case 1, CeladonCity_GameCorner_PrizeRoom_EventScript_Clefairy
+	case 2, CeladonCity_GameCorner_PrizeRoom_EventScript_DratiniPinsir
+	case 3, CeladonCity_GameCorner_PrizeRoom_EventScript_ScytherDratini
+	case 4, CeladonCity_GameCorner_PrizeRoom_EventScript_Porygon
+	case 5, CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange
+	case 127, CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange
 	end
 
-EventScript_16CC10:: @ 816CC10
+CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange:: @ 816CC10
 	hidecoinsbox 0, 0
 	release
 	end
 
-EventScript_16CC15:: @ 816CC15
+CeladonCity_GameCorner_PrizeRoom_EventScript_Abra:: @ 816CC15
 	.ifdef FIRERED
 	setvar VAR_TEMP_1, SPECIES_ABRA
 	setvar VAR_TEMP_2, 180
@@ -48,10 +48,10 @@ EventScript_16CC15:: @ 816CC15
 	setvar VAR_TEMP_2, 120
 	.endif
 	.endif
-	goto EventScript_16CC65
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeMon
 	end
 
-EventScript_16CC25:: @ 816CC25
+CeladonCity_GameCorner_PrizeRoom_EventScript_Clefairy:: @ 816CC25
 	.ifdef FIRERED
 	setvar VAR_TEMP_1, SPECIES_CLEFAIRY
 	setvar VAR_TEMP_2, 500
@@ -61,10 +61,10 @@ EventScript_16CC25:: @ 816CC25
 	setvar VAR_TEMP_2, 750
 	.endif
 	.endif
-	goto EventScript_16CC65
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeMon
 	end
 
-EventScript_16CC35:: @ 816CC35
+CeladonCity_GameCorner_PrizeRoom_EventScript_DratiniPinsir:: @ 816CC35
 	.ifdef FIRERED
 	setvar VAR_TEMP_1, SPECIES_DRATINI
 	setvar VAR_TEMP_2, 2800
@@ -74,10 +74,10 @@ EventScript_16CC35:: @ 816CC35
 	setvar VAR_TEMP_2, 2500
 	.endif
 	.endif
-	goto EventScript_16CC65
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeMon
 	end
 
-EventScript_16CC45:: @ 816CC45
+CeladonCity_GameCorner_PrizeRoom_EventScript_ScytherDratini:: @ 816CC45
 	.ifdef FIRERED
 	setvar VAR_TEMP_1, SPECIES_SCYTHER
 	setvar VAR_TEMP_2, 5500
@@ -87,10 +87,10 @@ EventScript_16CC45:: @ 816CC45
 	setvar VAR_TEMP_2, 4600
 	.endif
 	.endif
-	goto EventScript_16CC65
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeMon
 	end
 
-EventScript_16CC55:: @ 816CC55
+CeladonCity_GameCorner_PrizeRoom_EventScript_Porygon:: @ 816CC55
 	.ifdef FIRERED
 	setvar VAR_TEMP_1, SPECIES_PORYGON
 	setvar VAR_TEMP_2, 9999
@@ -100,28 +100,28 @@ EventScript_16CC55:: @ 816CC55
 	setvar VAR_TEMP_2, 6500
 	.endif
 	.endif
-	goto EventScript_16CC65
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeMon
 	end
 
-EventScript_16CC65:: @ 816CC65
+CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeMon:: @ 816CC65
 	getspeciesname 0, VAR_TEMP_1
-	msgbox gUnknown_819709D, MSGBOX_YESNO
+	msgbox CeladonCity_GameCorner_PrizeRoom_Text_YouWantPrize, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_16CC10
+	goto_if_eq CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange
 	checkcoins VAR_RESULT
 	compare VAR_RESULT, VAR_TEMP_2
-	goto_if_lt EventScript_16CDA5
+	goto_if_lt CeladonCity_GameCorner_PrizeRoom_EventScript_NotEnoughCoins
 	textcolor 3
 	switch VAR_TEMP_1
-	case SPECIES_ABRA, EventScript_16CCD4
-	case SPECIES_CLEFAIRY, EventScript_16CCE9
-	case SPECIES_DRATINI, EventScript_16CCFE
-	case SPECIES_SCYTHER, EventScript_16CD13
-	case SPECIES_PORYGON, EventScript_16CD28
-	case SPECIES_PINSIR, EventScript_16CD3D
+	case SPECIES_ABRA,     CeladonCity_GameCorner_PrizeRoom_EventScript_GiveAbra
+	case SPECIES_CLEFAIRY, CeladonCity_GameCorner_PrizeRoom_EventScript_GiveClefairy
+	case SPECIES_DRATINI,  CeladonCity_GameCorner_PrizeRoom_EventScript_GiveDratini
+	case SPECIES_SCYTHER,  CeladonCity_GameCorner_PrizeRoom_EventScript_GiveScyther
+	case SPECIES_PORYGON,  CeladonCity_GameCorner_PrizeRoom_EventScript_GivePorygon
+	case SPECIES_PINSIR,   CeladonCity_GameCorner_PrizeRoom_EventScript_GivePinsir
 	end
 
-EventScript_16CCD4:: @ 816CCD4
+CeladonCity_GameCorner_PrizeRoom_EventScript_GiveAbra:: @ 816CCD4
 	.ifdef FIRERED
 	givemon VAR_TEMP_1, 9, ITEM_NONE
 	.else
@@ -129,10 +129,10 @@ EventScript_16CCD4:: @ 816CCD4
 	givemon VAR_TEMP_1, 7, ITEM_NONE
 	.endif
 	.endif
-	goto EventScript_16CD52
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_CheckReceivedMon
 	end
 
-EventScript_16CCE9:: @ 816CCE9
+CeladonCity_GameCorner_PrizeRoom_EventScript_GiveClefairy:: @ 816CCE9
 	.ifdef FIRERED
 	givemon VAR_TEMP_1, 8, ITEM_NONE
 	.else
@@ -140,10 +140,10 @@ EventScript_16CCE9:: @ 816CCE9
 	givemon VAR_TEMP_1, 12, ITEM_NONE
 	.endif
 	.endif
-	goto EventScript_16CD52
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_CheckReceivedMon
 	end
 
-EventScript_16CCFE:: @ 816CCFE
+CeladonCity_GameCorner_PrizeRoom_EventScript_GiveDratini:: @ 816CCFE
 	.ifdef FIRERED
 	givemon VAR_TEMP_1, 18, ITEM_NONE
 	.else
@@ -151,15 +151,15 @@ EventScript_16CCFE:: @ 816CCFE
 	givemon VAR_TEMP_1, 24, ITEM_NONE
 	.endif
 	.endif
-	goto EventScript_16CD52
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_CheckReceivedMon
 	end
 
-EventScript_16CD13:: @ 816CD13
+CeladonCity_GameCorner_PrizeRoom_EventScript_GiveScyther:: @ 816CD13
 	givemon VAR_TEMP_1, 25, ITEM_NONE
-	goto EventScript_16CD52
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_CheckReceivedMon
 	end
 
-EventScript_16CD28:: @ 816CD28
+CeladonCity_GameCorner_PrizeRoom_EventScript_GivePorygon:: @ 816CD28
 	.ifdef FIRERED
 	givemon VAR_TEMP_1, 26, ITEM_NONE
 	.else
@@ -167,50 +167,50 @@ EventScript_16CD28:: @ 816CD28
 	givemon VAR_TEMP_1, 18, ITEM_NONE
 	.endif
 	.endif
-	goto EventScript_16CD52
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_CheckReceivedMon
 	end
 
-EventScript_16CD3D:: @ 816CD3D
+CeladonCity_GameCorner_PrizeRoom_EventScript_GivePinsir:: @ 816CD3D
 	givemon VAR_TEMP_1, 18, ITEM_NONE
-	goto EventScript_16CD52
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_CheckReceivedMon
 	end
 
-EventScript_16CD52:: @ 816CD52
+CeladonCity_GameCorner_PrizeRoom_EventScript_CheckReceivedMon:: @ 816CD52
 	compare VAR_RESULT, 0
-	goto_if_eq EventScript_16CDB3
+	goto_if_eq CeladonCity_GameCorner_PrizeRoom_EventScript_ReceivedMonParty
 	compare VAR_RESULT, 1
-	goto_if_eq EventScript_16CDE0
+	goto_if_eq CeladonCity_GameCorner_PrizeRoom_EventScript_ReceivedMonPC
 	compare VAR_RESULT, 2
-	goto_if_eq EventScript_16CD74
+	goto_if_eq CeladonCity_GameCorner_PrizeRoom_EventScript_PartyFull
 	end
 
-EventScript_16CD74:: @ 816CD74
+CeladonCity_GameCorner_PrizeRoom_EventScript_PartyFull:: @ 816CD74
 	textcolor 3
 	msgbox Text_NoMoreRoomForPokemon
 	hidecoinsbox 0, 0
 	release
 	end
 
-EventScript_16CD83:: @ 816CD83
+CeladonCity_GameCorner_PrizeRoom_EventScript_NicknamePartyMon:: @ 816CD83
 	getpartysize
 	subvar VAR_RESULT, 1
 	copyvar VAR_0x8004, VAR_RESULT
 	call EventScript_ChangePokemonNickname
-	goto EventScript_16CC10
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange
 	end
 
-EventScript_16CD99:: @ 816CD99
+CeladonCity_GameCorner_PrizeRoom_EventScript_NeedCoinCase:: @ 816CD99
 	textcolor 3
-	msgbox gUnknown_819703E
+	msgbox CeladonCity_GameCorner_PrizeRoom_Text_CoinCaseRequired
 	release
 	end
 
-EventScript_16CDA5:: @ 816CDA5
-	msgbox gUnknown_81970D5
-	goto EventScript_16CC10
+CeladonCity_GameCorner_PrizeRoom_EventScript_NotEnoughCoins:: @ 816CDA5
+	msgbox CeladonCity_GameCorner_PrizeRoom_Text_NeedMoreCoins
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange
 	end
 
-EventScript_16CDB3:: @ 816CDB3
+CeladonCity_GameCorner_PrizeRoom_EventScript_ReceivedMonParty:: @ 816CDB3
 	removecoins VAR_TEMP_2
 	updatecoinsbox 0, 5
 	getspeciesname 0, VAR_TEMP_1
@@ -220,11 +220,11 @@ EventScript_16CDB3:: @ 816CDB3
 	waitfanfare
 	msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO
 	compare VAR_RESULT, YES
-	goto_if_eq EventScript_16CD83
-	goto EventScript_16CC10
+	goto_if_eq CeladonCity_GameCorner_PrizeRoom_EventScript_NicknamePartyMon
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange
 	end
 
-EventScript_16CDE0:: @ 816CDE0
+CeladonCity_GameCorner_PrizeRoom_EventScript_ReceivedMonPC:: @ 816CDE0
 	removecoins VAR_TEMP_2
 	updatecoinsbox 0, 5
 	getspeciesname 0, VAR_TEMP_1
@@ -234,161 +234,161 @@ EventScript_16CDE0:: @ 816CDE0
 	waitfanfare
 	msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_16CE12
+	goto_if_eq CeladonCity_GameCorner_PrizeRoom_EventScript_TransferredToPC
 	call EventScript_NameReceivedBoxMon
-	goto EventScript_16CE12
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_TransferredToPC
 	end
 
-EventScript_16CE12:: @ 816CE12
+CeladonCity_GameCorner_PrizeRoom_EventScript_TransferredToPC:: @ 816CE12
 	call EventScript_TransferredToPC
-	goto EventScript_16CC10
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange
 	end
 
-CeladonCity_GameCorner_PrizeRoom_EventScript_16CE1D:: @ 816CE1D
+CeladonCity_GameCorner_PrizeRoom_EventScript_PrizeClerkTMs:: @ 816CE1D
 	lock
 	faceplayer
-	goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16CD99
+	goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_PrizeRoom_EventScript_NeedCoinCase
 	goto_if_questlog EventScript_ReleaseEnd
 	showcoinsbox 0, 0
-	msgbox gUnknown_8197057
-	goto EventScript_16CE47
+	msgbox CeladonCity_GameCorner_PrizeRoom_Text_WeExchangeCoinsForPrizes
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_ChoosePrizeTM
 	end
 
-EventScript_16CE47:: @ 816CE47
-	message Text_19707A
+CeladonCity_GameCorner_PrizeRoom_EventScript_ChoosePrizeTM:: @ 816CE47
+	message CeladonCity_GameCorner_PrizeRoom_Text_WhichPrize
 	waitmessage
 	multichoice 11, 0, MULTICHOICE_GAME_CORNER_TMPRIZES, FALSE
 	switch VAR_RESULT
-	case 0, EventScript_16CEA5
-	case 1, EventScript_16CEB9
-	case 2, EventScript_16CECD
-	case 3, EventScript_16CEE1
-	case 4, EventScript_16CEF5
-	case 5, EventScript_16CC10
-	case 127, EventScript_16CC10
+	case 0, CeladonCity_GameCorner_PrizeRoom_EventScript_TM13
+	case 1, CeladonCity_GameCorner_PrizeRoom_EventScript_TM23
+	case 2, CeladonCity_GameCorner_PrizeRoom_EventScript_TM24
+	case 3, CeladonCity_GameCorner_PrizeRoom_EventScript_TM30
+	case 4, CeladonCity_GameCorner_PrizeRoom_EventScript_TM35
+	case 5, CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange
+	case 127, CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange
 	end
 
-EventScript_16CEA5:: @ 816CEA5
+CeladonCity_GameCorner_PrizeRoom_EventScript_TM13:: @ 816CEA5
 	setvar VAR_TEMP_1, ITEM_TM13
 	setvar VAR_TEMP_2, 4000
 	getmovename 1, MOVE_ICE_BEAM
-	goto EventScript_16CF09
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeTM
 	end
 
-EventScript_16CEB9:: @ 816CEB9
+CeladonCity_GameCorner_PrizeRoom_EventScript_TM23:: @ 816CEB9
 	setvar VAR_TEMP_1, ITEM_TM23
 	setvar VAR_TEMP_2, 3500
 	getmovename 1, MOVE_IRON_TAIL
-	goto EventScript_16CF09
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeTM
 	end
 
-EventScript_16CECD:: @ 816CECD
+CeladonCity_GameCorner_PrizeRoom_EventScript_TM24:: @ 816CECD
 	setvar VAR_TEMP_1, ITEM_TM24
 	setvar VAR_TEMP_2, 4000
 	getmovename 1, MOVE_THUNDERBOLT
-	goto EventScript_16CF09
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeTM
 	end
 
-EventScript_16CEE1:: @ 816CEE1
+CeladonCity_GameCorner_PrizeRoom_EventScript_TM30:: @ 816CEE1
 	setvar VAR_TEMP_1, ITEM_TM30
 	setvar VAR_TEMP_2, 4500
 	getmovename 1, MOVE_SHADOW_BALL
-	goto EventScript_16CF09
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeTM
 	end
 
-EventScript_16CEF5:: @ 816CEF5
+CeladonCity_GameCorner_PrizeRoom_EventScript_TM35:: @ 816CEF5
 	setvar VAR_TEMP_1, ITEM_TM35
 	setvar VAR_TEMP_2, 4000
 	getmovename 1, MOVE_FLAMETHROWER
-	goto EventScript_16CF09
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeTM
 	end
 
-EventScript_16CF09:: @ 816CF09
-	msgbox gUnknown_81970B2, MSGBOX_YESNO
+CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeTM:: @ 816CF09
+	msgbox CeladonCity_GameCorner_PrizeRoom_Text_YouWantTM, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_16CC10
-	goto EventScript_16CF3F
+	goto_if_eq CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_TryGivePrize
 	end
 
-EventScript_16CF22:: @ 816CF22
+CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeItem:: @ 816CF22
 	getitemname 0, VAR_TEMP_1
-	msgbox gUnknown_819709D, MSGBOX_YESNO
+	msgbox CeladonCity_GameCorner_PrizeRoom_Text_YouWantPrize, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_16CC10
-	goto EventScript_16CF3F
+	goto_if_eq CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_TryGivePrize
 	end
 
-EventScript_16CF3F:: @ 816CF3F
+CeladonCity_GameCorner_PrizeRoom_EventScript_TryGivePrize:: @ 816CF3F
 	getitemname 0, VAR_TEMP_1
 	checkcoins VAR_RESULT
 	compare VAR_RESULT, VAR_TEMP_2
-	goto_if_lt EventScript_16CDA5
+	goto_if_lt CeladonCity_GameCorner_PrizeRoom_EventScript_NotEnoughCoins
 	checkitemspace VAR_TEMP_1, 1
 	compare VAR_RESULT, FALSE
-	goto_if_eq EventScript_16CF79
+	goto_if_eq CeladonCity_GameCorner_PrizeRoom_EventScript_BagFull
 	removecoins VAR_TEMP_2
 	updatecoinsbox 0, 5
 	giveitem VAR_TEMP_1
-	goto EventScript_16CC10
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange
 	end
 
-EventScript_16CF79:: @ 816CF79
+CeladonCity_GameCorner_PrizeRoom_EventScript_BagFull:: @ 816CF79
 	textcolor 3
 	msgbox Text_TooBadBagFull
 	hidecoinsbox 0, 0
 	release
 	end
 
-CeladonCity_GameCorner_PrizeRoom_EventScript_16CF88:: @ 816CF88
+CeladonCity_GameCorner_PrizeRoom_EventScript_PrizeClerkItems:: @ 816CF88
 	lock
 	faceplayer
-	goto_if_unset FLAG_GOT_COIN_CASE, EventScript_16CD99
+	goto_if_unset FLAG_GOT_COIN_CASE, CeladonCity_GameCorner_PrizeRoom_EventScript_NeedCoinCase
 	goto_if_questlog EventScript_ReleaseEnd
 	showcoinsbox 0, 0
-	msgbox gUnknown_8197057
-	goto EventScript_16CFB2
+	msgbox CeladonCity_GameCorner_PrizeRoom_Text_WeExchangeCoinsForPrizes
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_ChoosePrizeItem
 	end
 
-EventScript_16CFB2:: @ 816CFB2
-	message Text_19707A
+CeladonCity_GameCorner_PrizeRoom_EventScript_ChoosePrizeItem:: @ 816CFB2
+	message CeladonCity_GameCorner_PrizeRoom_Text_WhichPrize
 	waitmessage
 	multichoice 10, 0, MULTICHOICE_GAME_CORNER_BATTLE_ITEM_PRIZES, FALSE
 	switch VAR_RESULT
-	case 0, EventScript_16D010
-	case 1, EventScript_16D020
-	case 2, EventScript_16D030
-	case 3, EventScript_16D040
-	case 4, EventScript_16D050
-	case 5, EventScript_16CC10
-	case 127, EventScript_16CC10
+	case 0, CeladonCity_GameCorner_PrizeRoom_EventScript_SmokeBall
+	case 1, CeladonCity_GameCorner_PrizeRoom_EventScript_MiracleSeed
+	case 2, CeladonCity_GameCorner_PrizeRoom_EventScript_Charcoal
+	case 3, CeladonCity_GameCorner_PrizeRoom_EventScript_MysticWater
+	case 4, CeladonCity_GameCorner_PrizeRoom_EventScript_YellowFlute
+	case 5, CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange
+	case 127, CeladonCity_GameCorner_PrizeRoom_EventScript_EndPrizeExchange
 	end
 
-EventScript_16D010:: @ 816D010
+CeladonCity_GameCorner_PrizeRoom_EventScript_SmokeBall:: @ 816D010
 	setvar VAR_TEMP_1, ITEM_SMOKE_BALL
 	setvar VAR_TEMP_2, 800
-	goto EventScript_16CF22
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeItem
 	end
 
-EventScript_16D020:: @ 816D020
+CeladonCity_GameCorner_PrizeRoom_EventScript_MiracleSeed:: @ 816D020
 	setvar VAR_TEMP_1, ITEM_MIRACLE_SEED
 	setvar VAR_TEMP_2, 1000
-	goto EventScript_16CF22
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeItem
 	end
 
-EventScript_16D030:: @ 816D030
+CeladonCity_GameCorner_PrizeRoom_EventScript_Charcoal:: @ 816D030
 	setvar VAR_TEMP_1, ITEM_CHARCOAL
 	setvar VAR_TEMP_2, 1000
-	goto EventScript_16CF22
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeItem
 	end
 
-EventScript_16D040:: @ 816D040
+CeladonCity_GameCorner_PrizeRoom_EventScript_MysticWater:: @ 816D040
 	setvar VAR_TEMP_1, ITEM_MYSTIC_WATER
 	setvar VAR_TEMP_2, 1000
-	goto EventScript_16CF22
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeItem
 	end
 
-EventScript_16D050:: @ 816D050
+CeladonCity_GameCorner_PrizeRoom_EventScript_YellowFlute:: @ 816D050
 	setvar VAR_TEMP_1, ITEM_YELLOW_FLUTE
 	setvar VAR_TEMP_2, 1600
-	goto EventScript_16CF22
+	goto CeladonCity_GameCorner_PrizeRoom_EventScript_ConfirmPrizeItem
 	end
diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/text.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/text.inc
index a5a21b9bc..140c98958 100644
--- a/data/maps/CeladonCity_GameCorner_PrizeRoom/text.inc
+++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/text.inc
@@ -1,31 +1,31 @@
-gUnknown_8196FC1:: @ 8196FC1
+CeladonCity_GameCorner_PrizeRoom_Text_FancyThatPorygon:: @ 8196FC1
     .string "I sure do fancy that PORYGON!\n"
     .string "But, it's hard to win at slots!$"
 
-gUnknown_8196FFF:: @ 8196FFF
+CeladonCity_GameCorner_PrizeRoom_Text_RakedItInToday:: @ 8196FFF
     .string "Gahaha! I raked it in today!\n"
     .string "If only every day were like this…$"
 
-gUnknown_819703E:: @ 819703E
+CeladonCity_GameCorner_PrizeRoom_Text_CoinCaseRequired:: @ 819703E
     .string "A COIN CASE is required…$"
 
-gUnknown_8197057:: @ 8197057
+CeladonCity_GameCorner_PrizeRoom_Text_WeExchangeCoinsForPrizes:: @ 8197057
     .string "We exchange your COINS for prizes.$"
 
-Text_19707A:: @ 819707A
+CeladonCity_GameCorner_PrizeRoom_Text_WhichPrize:: @ 819707A
     .string "Which prize would you like?$"
 
-gUnknown_8197096:: @ 8197096
+CeladonCity_GameCorner_PrizeRoom_Text_HereYouGo:: @ 8197096
     .string "はい どうぞ$"
 
-gUnknown_819709D:: @ 819709D
+CeladonCity_GameCorner_PrizeRoom_Text_YouWantPrize:: @ 819709D
     .string "So, you want the {STR_VAR_1}?$"
 
-gUnknown_81970B2:: @ 81970B2
+CeladonCity_GameCorner_PrizeRoom_Text_YouWantTM:: @ 81970B2
     .string "Okay, a TM of {STR_VAR_2}\n"
     .string "is what you want?$"
 
-gUnknown_81970D5:: @ 81970D5
+CeladonCity_GameCorner_PrizeRoom_Text_NeedMoreCoins:: @ 81970D5
     .string "Sorry, you'll need more COINS\n"
     .string "than that.$"
 
diff --git a/data/maps/CeladonCity_Gym/map.json b/data/maps/CeladonCity_Gym/map.json
index 88187cdc9..f0a86b8e5 100644
--- a/data/maps/CeladonCity_Gym/map.json
+++ b/data/maps/CeladonCity_Gym/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "CeladonCity_Gym_EventScript_16D111",
+      "script": "CeladonCity_Gym_EventScript_Kay",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "CeladonCity_Gym_EventScript_16D163",
+      "script": "CeladonCity_Gym_EventScript_Bridget",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "CeladonCity_Gym_EventScript_16D14C",
+      "script": "CeladonCity_Gym_EventScript_Tina",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "CeladonCity_Gym_EventScript_16D17A",
+      "script": "CeladonCity_Gym_EventScript_Tamia",
       "flag": "0"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "CeladonCity_Gym_EventScript_16D19E",
+      "script": "CeladonCity_Gym_EventScript_Lori",
       "flag": "0"
     },
     {
@@ -88,7 +88,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "CeladonCity_Gym_EventScript_16D128",
+      "script": "CeladonCity_Gym_EventScript_Lisa",
       "flag": "0"
     },
     {
@@ -101,7 +101,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_Gym_EventScript_16D061",
+      "script": "CeladonCity_Gym_EventScript_Erika",
       "flag": "0"
     },
     {
@@ -114,7 +114,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "CeladonCity_Gym_EventScript_16D1B5",
+      "script": "CeladonCity_Gym_EventScript_Mary",
       "flag": "0"
     },
     {
@@ -187,14 +187,14 @@
       "x": 4,
       "y": 16,
       "elevation": 0,
-      "script": "CeladonCity_Gym_EventScript_16D1CC"
+      "script": "CeladonCity_Gym_EventScript_GymStatue"
     },
     {
       "type": "bg_event_type_0",
       "x": 8,
       "y": 16,
       "elevation": 0,
-      "script": "CeladonCity_Gym_EventScript_16D1CC"
+      "script": "CeladonCity_Gym_EventScript_GymStatue"
     }
   ]
 }
diff --git a/data/maps/CeladonCity_Gym/scripts.inc b/data/maps/CeladonCity_Gym/scripts.inc
index 60a945e21..8291ad757 100644
--- a/data/maps/CeladonCity_Gym/scripts.inc
+++ b/data/maps/CeladonCity_Gym/scripts.inc
@@ -1,85 +1,85 @@
 CeladonCity_Gym_MapScripts:: @ 816D060
 	.byte 0
 
-CeladonCity_Gym_EventScript_16D061:: @ 816D061
+CeladonCity_Gym_EventScript_Erika:: @ 816D061
 	famechecker FAMECHECKER_ERIKA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
-	trainerbattle_single TRAINER_LEADER_ERIKA, Text_197114, Text_197260, EventScript_16D0A0, NO_MUSIC
-	goto_if_unset FLAG_GOT_TM19_FROM_ERIKA, EventScript_16D0C6
+	trainerbattle_single TRAINER_LEADER_ERIKA, CeladonCity_Gym_Text_ErikaIntro, CeladonCity_Gym_Text_ErikaDefeat, CeladonCity_Gym_EventScript_DefeatedErika, NO_MUSIC
+	goto_if_unset FLAG_GOT_TM19_FROM_ERIKA, CeladonCity_Gym_EventScript_GiveTM19
 	famechecker FAMECHECKER_ERIKA, 4
-	msgbox gUnknown_81972B8
+	msgbox CeladonCity_Gym_Text_ErikaPostBattle
 	release
 	end
 
-EventScript_16D0A0:: @ 816D0A0
+CeladonCity_Gym_EventScript_DefeatedErika:: @ 816D0A0
 	famechecker FAMECHECKER_ERIKA, 1
 	clearflag FLAG_HIDE_FAME_CHECKER_ERIKA_JOURNALS
 	setflag FLAG_DEFEATED_ERIKA
 	setflag FLAG_BADGE04_GET
 	set_gym_trainers 4
-	goto EventScript_16D0C6
+	goto CeladonCity_Gym_EventScript_GiveTM19
 	end
 
-EventScript_16D0C6:: @ 816D0C6
-	msgbox gUnknown_8197327
+CeladonCity_Gym_EventScript_GiveTM19:: @ 816D0C6
+	msgbox CeladonCity_Gym_Text_ExplainRainbowBadgeTakeThis
 	checkitemspace ITEM_TM19, 1
 	compare VAR_RESULT, FALSE
-	goto_if_eq EventScript_16D107
-	giveitem_msg gUnknown_81973BA, ITEM_TM19
+	goto_if_eq CeladonCity_Gym_EventScript_NoRoomForTM19
+	giveitem_msg CeladonCity_Gym_Text_ReceivedTM19FromErika, ITEM_TM19
 	setflag FLAG_GOT_TM19_FROM_ERIKA
-	msgbox gUnknown_81973D7
+	msgbox CeladonCity_Gym_Text_ExplainTM19
 	release
 	end
 
-EventScript_16D107:: @ 816D107
-	msgbox gUnknown_819745D
+CeladonCity_Gym_EventScript_NoRoomForTM19:: @ 816D107
+	msgbox CeladonCity_Gym_Text_ShouldMakeRoomForThis
 	release
 	end
 
-CeladonCity_Gym_EventScript_16D111:: @ 816D111
-	trainerbattle_single TRAINER_LASS_KAY, Text_19747C, Text_1974C4
-	msgbox gUnknown_81974D6, MSGBOX_AUTOCLOSE
+CeladonCity_Gym_EventScript_Kay:: @ 816D111
+	trainerbattle_single TRAINER_LASS_KAY, CeladonCity_Gym_Text_KayIntro, CeladonCity_Gym_Text_KayDefeat
+	msgbox CeladonCity_Gym_Text_KayPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-CeladonCity_Gym_EventScript_16D128:: @ 816D128
-	trainerbattle_single TRAINER_LASS_LISA, Text_1976C5, Text_1976FF
+CeladonCity_Gym_EventScript_Lisa:: @ 816D128
+	trainerbattle_single TRAINER_LASS_LISA, CeladonCity_Gym_Text_LisaIntro, CeladonCity_Gym_Text_LisaDefeat
 	famechecker FAMECHECKER_ERIKA, 2
-	msgbox gUnknown_8197708, MSGBOX_AUTOCLOSE
+	msgbox CeladonCity_Gym_Text_LisaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-CeladonCity_Gym_EventScript_16D14C:: @ 816D14C
-	trainerbattle_single TRAINER_PICNICKER_TINA, Text_197595, Text_1975BB
-	msgbox gUnknown_81975D1, MSGBOX_AUTOCLOSE
+CeladonCity_Gym_EventScript_Tina:: @ 816D14C
+	trainerbattle_single TRAINER_PICNICKER_TINA, CeladonCity_Gym_Text_TinaIntro, CeladonCity_Gym_Text_TinaDefeat
+	msgbox CeladonCity_Gym_Text_TinaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-CeladonCity_Gym_EventScript_16D163:: @ 816D163
-	trainerbattle_single TRAINER_BEAUTY_BRIDGET, Text_1974FA, Text_19751C
-	msgbox gUnknown_8197527, MSGBOX_AUTOCLOSE
+CeladonCity_Gym_EventScript_Bridget:: @ 816D163
+	trainerbattle_single TRAINER_BEAUTY_BRIDGET, CeladonCity_Gym_Text_BridgetIntro, CeladonCity_Gym_Text_BridgetDefeat
+	msgbox CeladonCity_Gym_Text_BridgetPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-CeladonCity_Gym_EventScript_16D17A:: @ 816D17A
-	trainerbattle_single TRAINER_BEAUTY_TAMIA, Text_19760B, Text_197660
+CeladonCity_Gym_EventScript_Tamia:: @ 816D17A
+	trainerbattle_single TRAINER_BEAUTY_TAMIA, CeladonCity_Gym_Text_TamiaIntro, CeladonCity_Gym_Text_TamiaDefeat
 	famechecker FAMECHECKER_ERIKA, 3
-	msgbox gUnknown_8197664, MSGBOX_AUTOCLOSE
+	msgbox CeladonCity_Gym_Text_TamiaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-CeladonCity_Gym_EventScript_16D19E:: @ 816D19E
-	trainerbattle_single TRAINER_BEAUTY_LORI, Text_197747, Text_19777A
-	msgbox gUnknown_8197788, MSGBOX_AUTOCLOSE
+CeladonCity_Gym_EventScript_Lori:: @ 816D19E
+	trainerbattle_single TRAINER_BEAUTY_LORI, CeladonCity_Gym_Text_LoriIntro, CeladonCity_Gym_Text_LoriDefeat
+	msgbox CeladonCity_Gym_Text_LoriPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-CeladonCity_Gym_EventScript_16D1B5:: @ 816D1B5
-	trainerbattle_single TRAINER_COOLTRAINER_MARY, Text_1977E5, Text_197832
-	msgbox gUnknown_819783E, MSGBOX_AUTOCLOSE
+CeladonCity_Gym_EventScript_Mary:: @ 816D1B5
+	trainerbattle_single TRAINER_COOLTRAINER_MARY, CeladonCity_Gym_Text_MaryIntro, CeladonCity_Gym_Text_MaryDefeat
+	msgbox CeladonCity_Gym_Text_MaryPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-CeladonCity_Gym_EventScript_16D1CC:: @ 816D1CC
+CeladonCity_Gym_EventScript_GymStatue:: @ 816D1CC
 	lockall
-	goto_if_set FLAG_BADGE04_GET, EventScript_16D1E0
-	msgbox gUnknown_8197874
+	goto_if_set FLAG_BADGE04_GET, CeladonCity_Gym_EventScript_GymStatuePostVictory
+	msgbox CeladonCity_Gym_Text_GymStatue
 	releaseall
 	end
 
-EventScript_16D1E0:: @ 816D1E0
-	msgbox gUnknown_81978AB
+CeladonCity_Gym_EventScript_GymStatuePostVictory:: @ 816D1E0
+	msgbox CeladonCity_Gym_Text_GymStatuePlayerWon
 	releaseall
 	end
diff --git a/data/maps/CeladonCity_Gym/text.inc b/data/maps/CeladonCity_Gym/text.inc
index 02c39a95c..02ded4fb0 100644
--- a/data/maps/CeladonCity_Gym/text.inc
+++ b/data/maps/CeladonCity_Gym/text.inc
@@ -1,168 +1,156 @@
-gUnknown_81970FE:: @ 81970FE
-    .string "おきゃくさん もう もてないよ$" @ I'm sorry I don't have any more
+Text_SorryDontHaveAnyMore:: @ 81970FE
+    .string "おきゃくさん もう もてないよ$"
 
-gUnknown_819710E:: @ 819710E
-    .string "あっ そう$" @ I see
+Text_ISee:: @ 819710E
+    .string "あっ そう$"
 
-Text_197114:: @ 8197114
+CeladonCity_Gym_Text_ErikaIntro:: @ 8197114
     .string "Hello…\n"
     .string "Lovely weather, isn't it?\l"
     .string "It's so pleasant…\p"
-
     .string "…Oh, dear…\n"
     .string "I must have dozed off. Welcome.\p"
-
     .string "My name is ERIKA.\n"
     .string "I am the LEADER of CELADON GYM.\p"
-
     .string "I am a student of the art of\n"
     .string "flower arranging.\p"
-
     .string "My POKéMON are solely of the\n"
     .string "GRASS type.\p"
-
     .string "…Oh, I'm sorry, I had no idea that\n"
     .string "you wished to challenge me.\p"
-
     .string "Very well, but I shall not lose.{PLAY_BGM MUS_EXEYE}$"
 
-Text_197260:: @ 8197260
+CeladonCity_Gym_Text_ErikaDefeat:: @ 8197260
     .string "Oh!\n"
     .string "I concede defeat.\l"
     .string "You are remarkably strong.\p"
-
     .string "I must confer on you the\n"
     .string "RAINBOWBADGE.$"
 
-gUnknown_81972B8:: @ 81972B8
+CeladonCity_Gym_Text_ErikaPostBattle:: @ 81972B8
     .string "You are cataloging POKéMON?\n"
     .string "I must say I'm impressed.\p"
-
     .string "I would never collect POKéMON if\n"
     .string "they were unattractive.$"
 
-gUnknown_8197327:: @ 8197327
+CeladonCity_Gym_Text_ExplainRainbowBadgeTakeThis:: @ 8197327
     .string "The RAINBOWBADGE will make\n"
     .string "POKéMON up to Lv. 50 obey.\p"
-
     .string "It also allows POKéMON to use\n"
     .string "STRENGTH in and out of battle.\p"
-
     .string "Please also take this with you.$"
 
-gUnknown_81973BA:: @ 81973BA
+CeladonCity_Gym_Text_ReceivedTM19FromErika:: @ 81973BA
     .string "{PLAYER} received TM19\n"
     .string "from ERIKA.$"
 
-gUnknown_81973D7:: @ 81973D7
+CeladonCity_Gym_Text_ExplainTM19:: @ 81973D7
     .string "TM19 contains GIGA DRAIN.\p"
-
     .string "Half the damage it inflicts is\n"
     .string "drained to heal your POKéMON.\p"
-
     .string "Wouldn't you agree that it's a\n"
     .string "wonderful move?$"
 
-gUnknown_819745D:: @ 819745D
+CeladonCity_Gym_Text_ShouldMakeRoomForThis:: @ 819745D
     .string "You should make room for this.$"
 
-Text_19747C:: @ 819747C
+CeladonCity_Gym_Text_KayIntro:: @ 819747C
     .string "I should tell you about this GYM.\p"
     .string "Only real ladies are allowed in\n"
     .string "here!$"
 
-Text_1974C4:: @ 81974C4
+CeladonCity_Gym_Text_KayDefeat:: @ 81974C4
     .string "You're too rough!$"
 
-gUnknown_81974D6:: @ 81974D6
+CeladonCity_Gym_Text_KayPostBattle:: @ 81974D6
     .string "Bleaah!\n"
     .string "I hope ERIKA wipes you out!$"
 
-Text_1974FA:: @ 81974FA
+CeladonCity_Gym_Text_BridgetIntro:: @ 81974FA
     .string "Oh, welcome.\n"
     .string "I was getting bored.$"
 
-Text_19751C:: @ 819751C
+CeladonCity_Gym_Text_BridgetDefeat:: @ 819751C
     .string "My makeup!$"
 
-gUnknown_8197527:: @ 8197527
+CeladonCity_Gym_Text_BridgetPostBattle:: @ 8197527
     .string "GRASS-type POKéMON are tough\n"
     .string "against the WATER type.\p"
     .string "They also have an edge on ROCK-\n"
     .string "and GROUND-type POKéMON.$"
 
-Text_197595:: @ 8197595
+CeladonCity_Gym_Text_TinaIntro:: @ 8197595
     .string "…Weren't you peeking in here\n"
     .string "earlier?$"
 
-Text_1975BB:: @ 81975BB
+CeladonCity_Gym_Text_TinaDefeat:: @ 81975BB
     .string "You're an eye-opener!$"
 
-gUnknown_81975D1:: @ 81975D1
+CeladonCity_Gym_Text_TinaPostBattle:: @ 81975D1
     .string "Oh, you were looking at ERIKA…\n"
     .string "You weren't looking at me…$"
 
-Text_19760B:: @ 819760B
+CeladonCity_Gym_Text_TamiaIntro:: @ 819760B
     .string "Look, look!\n"
     .string "See my POKéMON!\p"
     .string "I like the GRASS type.\n"
     .string "I like how they're easy to raise.$"
 
-Text_197660:: @ 8197660
+CeladonCity_Gym_Text_TamiaDefeat:: @ 8197660
     .string "No!$"
 
-gUnknown_8197664:: @ 8197664
+CeladonCity_Gym_Text_TamiaPostBattle:: @ 8197664
     .string "We only use GRASS-type POKéMON at\n"
     .string "our GYM.\p"
     .string "Why? We also use them for making\n"
     .string "flower arrangements!$"
 
-Text_1976C5:: @ 81976C5
+CeladonCity_Gym_Text_LisaIntro:: @ 81976C5
     .string "Oh, hey!\p"
     .string "We don't like BUG- or FIRE-type\n"
     .string "POKéMON in here!$"
 
-Text_1976FF:: @ 81976FF
+CeladonCity_Gym_Text_LisaDefeat:: @ 81976FF
     .string "Oh!\n"
     .string "You!$"
 
-gUnknown_8197708:: @ 8197708
+CeladonCity_Gym_Text_LisaPostBattle:: @ 8197708
     .string "Our LEADER ERIKA might be quiet,\n"
     .string "but she's famous around here.$"
 
-Text_197747:: @ 8197747
+CeladonCity_Gym_Text_LoriIntro:: @ 8197747
     .string "Pleased to meet you.\n"
     .string "My hobby is POKéMON training.$"
 
-Text_19777A:: @ 819777A
+CeladonCity_Gym_Text_LoriDefeat:: @ 819777A
     .string "Oh!\n"
     .string "Splendid!$"
 
-gUnknown_8197788:: @ 8197788
+CeladonCity_Gym_Text_LoriPostBattle:: @ 8197788
     .string "I have a blind date coming up.\n"
     .string "I have to learn to be polite,\l"
     .string "especially if I have to battle.$"
 
-Text_1977E5:: @ 81977E5
+CeladonCity_Gym_Text_MaryIntro:: @ 81977E5
     .string "Welcome to CELADON GYM!\p"
     .string "You'd better not underestimate\n"
     .string "the nice ladies here.$"
 
-Text_197832:: @ 8197832
+CeladonCity_Gym_Text_MaryDefeat:: @ 8197832
     .string "Oh!\n"
     .string "Beaten!$"
 
-gUnknown_819783E:: @ 819783E
+CeladonCity_Gym_Text_MaryPostBattle:: @ 819783E
     .string "I didn't bring my best POKéMON.\n"
     .string "Wait until next time!$"
 
-gUnknown_8197874:: @ 8197874
+CeladonCity_Gym_Text_GymStatue:: @ 8197874
     .string "CELADON POKéMON GYM\n"
     .string "LEADER: ERIKA\p"
     .string "WINNING TRAINERS:\n"
     .string "{RIVAL}$"
 
-gUnknown_81978AB:: @ 81978AB
+CeladonCity_Gym_Text_GymStatuePlayerWon:: @ 81978AB
     .string "CELADON POKéMON GYM\n"
     .string "LEADER: ERIKA\p"
     .string "WINNING TRAINERS:\n"
diff --git a/data/maps/CeladonCity_Hotel/map.json b/data/maps/CeladonCity_Hotel/map.json
index 6ab82e945..80b4df1cd 100644
--- a/data/maps/CeladonCity_Hotel/map.json
+++ b/data/maps/CeladonCity_Hotel/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_Hotel_EventScript_16D284",
+      "script": "CeladonCity_Hotel_EventScript_Receptionist",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_Hotel_EventScript_16D28D",
+      "script": "CeladonCity_Hotel_EventScript_Beauty",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_Hotel_EventScript_16D296",
+      "script": "CeladonCity_Hotel_EventScript_BeautyBoyfriend",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_Hotel_EventScript_16D29F",
+      "script": "CeladonCity_Hotel_EventScript_BeautyBrother",
       "flag": "0"
     }
   ],
diff --git a/data/maps/CeladonCity_Hotel/scripts.inc b/data/maps/CeladonCity_Hotel/scripts.inc
index 4f136bad3..be366a705 100644
--- a/data/maps/CeladonCity_Hotel/scripts.inc
+++ b/data/maps/CeladonCity_Hotel/scripts.inc
@@ -1,18 +1,18 @@
 CeladonCity_Hotel_MapScripts:: @ 816D283
 	.byte 0
 
-CeladonCity_Hotel_EventScript_16D284:: @ 816D284
-	msgbox gUnknown_8197B77, MSGBOX_NPC
+CeladonCity_Hotel_EventScript_Receptionist:: @ 816D284
+	msgbox CeladonCity_Hotel_Text_ThisHotelIsForPeople, MSGBOX_NPC
 	end
 
-CeladonCity_Hotel_EventScript_16D28D:: @ 816D28D
-	msgbox gUnknown_8197BBE, MSGBOX_NPC
+CeladonCity_Hotel_EventScript_Beauty:: @ 816D28D
+	msgbox CeladonCity_Hotel_Text_OnVacationWithBrotherAndBoyfriend, MSGBOX_NPC
 	end
 
-CeladonCity_Hotel_EventScript_16D296:: @ 816D296
-	msgbox gUnknown_8197C0C, MSGBOX_NPC
+CeladonCity_Hotel_EventScript_BeautyBoyfriend:: @ 816D296
+	msgbox CeladonCity_Hotel_Text_WhyDidSheBringBrother, MSGBOX_NPC
 	end
 
-CeladonCity_Hotel_EventScript_16D29F:: @ 816D29F
-	msgbox gUnknown_8197C30, MSGBOX_NPC
+CeladonCity_Hotel_EventScript_BeautyBrother:: @ 816D29F
+	msgbox CeladonCity_Hotel_Text_SisBroughtMeOnVacation, MSGBOX_NPC
 	end
diff --git a/data/maps/CeladonCity_Hotel/text.inc b/data/maps/CeladonCity_Hotel/text.inc
index b1c989120..5ac6ac99c 100644
--- a/data/maps/CeladonCity_Hotel/text.inc
+++ b/data/maps/CeladonCity_Hotel/text.inc
@@ -1,21 +1,18 @@
-Text_197B6F:: @ 8197B6F
-    .string "ぶつだん　だ‥$"
-
-gUnknown_8197B77:: @ 8197B77
+CeladonCity_Hotel_Text_ThisHotelIsForPeople:: @ 8197B77
     .string "POKéMON?\n"
     .string "No, this is a hotel for people.\p"
     .string "We're full up, unfortunately.$"
 
-gUnknown_8197BBE:: @ 8197BBE
+CeladonCity_Hotel_Text_OnVacationWithBrotherAndBoyfriend:: @ 8197BBE
     .string "I'm on vacation with my brother and\n"
     .string "boyfriend.\p"
     .string "CELADON is such a pretty city!$"
 
-gUnknown_8197C0C:: @ 8197C0C
+CeladonCity_Hotel_Text_WhyDidSheBringBrother:: @ 8197C0C
     .string "Why?\n"
     .string "Why did she bring her brother?$"
 
-gUnknown_8197C30:: @ 8197C30
+CeladonCity_Hotel_Text_SisBroughtMeOnVacation:: @ 8197C30
     .string "Yippee! I'm on vacation!\n"
     .string "My sis brought me along! Awesome!$"
 
diff --git a/data/maps/CeladonCity_House1/map.json b/data/maps/CeladonCity_House1/map.json
index 455e9d836..0fccecd67 100644
--- a/data/maps/CeladonCity_House1/map.json
+++ b/data/maps/CeladonCity_House1/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_House1_EventScript_16D268",
+      "script": "CeladonCity_House1_EventScript_RocketChief",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 5,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_House1_EventScript_16D271",
+      "script": "CeladonCity_House1_EventScript_Rocket1",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 5,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_House1_EventScript_16D27A",
+      "script": "CeladonCity_House1_EventScript_Rocket2",
       "flag": "0"
     }
   ],
diff --git a/data/maps/CeladonCity_House1/scripts.inc b/data/maps/CeladonCity_House1/scripts.inc
index 6c8dab4ff..4a05ae97d 100644
--- a/data/maps/CeladonCity_House1/scripts.inc
+++ b/data/maps/CeladonCity_House1/scripts.inc
@@ -1,14 +1,14 @@
 CeladonCity_House1_MapScripts:: @ 816D267
 	.byte 0
 
-CeladonCity_House1_EventScript_16D268:: @ 816D268
-	msgbox gUnknown_8197A9F, MSGBOX_NPC
+CeladonCity_House1_EventScript_RocketChief:: @ 816D268
+	msgbox CeladonCity_House1_Text_SlotsReelInTheDough, MSGBOX_NPC
 	end
 
-CeladonCity_House1_EventScript_16D271:: @ 816D271
-	msgbox gUnknown_8197AD3, MSGBOX_NPC
+CeladonCity_House1_EventScript_Rocket1:: @ 816D271
+	msgbox CeladonCity_House1_Text_ShippedMonsAsSlotPrizes, MSGBOX_NPC
 	end
 
-CeladonCity_House1_EventScript_16D27A:: @ 816D27A
-	msgbox gUnknown_8197B20, MSGBOX_NPC
+CeladonCity_House1_EventScript_Rocket2:: @ 816D27A
+	msgbox CeladonCity_House1_Text_DontTouchGameCornerPoster, MSGBOX_NPC
 	end
diff --git a/data/maps/CeladonCity_House1/text.inc b/data/maps/CeladonCity_House1/text.inc
index df6acb986..d07d4a0e4 100644
--- a/data/maps/CeladonCity_House1/text.inc
+++ b/data/maps/CeladonCity_House1/text.inc
@@ -1,16 +1,20 @@
-gUnknown_8197A9F:: @ 8197A9F
+CeladonCity_House1_Text_SlotsReelInTheDough:: @ 8197A9F
     .string "Hehehe!\p"
     .string "The slots just reel in the dough,\n"
     .string "big-time!$"
 
-gUnknown_8197AD3:: @ 8197AD3
+CeladonCity_House1_Text_ShippedMonsAsSlotPrizes:: @ 8197AD3
     .string "CHIEF!\p"
     .string "We just shipped two thousand\n"
     .string "more POKéMON as slot prizes\l"
     .string "again today!$"
 
-gUnknown_8197B20:: @ 8197B20
+CeladonCity_House1_Text_DontTouchGameCornerPoster:: @ 8197B20
     .string "Don't touch the poster at the GAME\n"
     .string "CORNER!\p"
     .string "There's no secret switch behind it!$"
 
+@ Text for the replaced altars in the rocket chiefs house / celadon mansion
+@ In English RB, this is westernized as "It's a sculpture of DIGLETT.", and is removed altogether in FRLG
+Text_ItsABuddhistAltar:: @ 8197B6F
+    .string "ぶつだん　だ‥$"
diff --git a/data/maps/CeladonCity_PokemonCenter_1F/map.json b/data/maps/CeladonCity_PokemonCenter_1F/map.json
index 7d2af91a9..c37be2dc6 100644
--- a/data/maps/CeladonCity_PokemonCenter_1F/map.json
+++ b/data/maps/CeladonCity_PokemonCenter_1F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_PokemonCenter_1F_EventScript_16C5FB",
+      "script": "CeladonCity_PokemonCenter_1F_EventScript_Nurse",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_PokemonCenter_1F_EventScript_16C604",
+      "script": "CeladonCity_PokemonCenter_1F_EventScript_Gentleman",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_PokemonCenter_1F_EventScript_16C60D",
+      "script": "CeladonCity_PokemonCenter_1F_EventScript_CooltrainerF",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_PokemonCenter_1F_EventScript_16C616",
+      "script": "CeladonCity_PokemonCenter_1F_EventScript_Youngster",
       "flag": "0"
     }
   ],
diff --git a/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc b/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc
index 322968550..b98b49824 100644
--- a/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/CeladonCity_PokemonCenter_1F/scripts.inc
@@ -7,21 +7,21 @@ CeladonCity_PokemonCenter_1F_OnTransition:: @ 816C5F7
 	setrespawn SPAWN_CELADON_CITY
 	end
 
-CeladonCity_PokemonCenter_1F_EventScript_16C5FB:: @ 816C5FB
+CeladonCity_PokemonCenter_1F_EventScript_Nurse:: @ 816C5FB
 	lock
 	faceplayer
 	call EventScript_PkmnCenterNurse
 	release
 	end
 
-CeladonCity_PokemonCenter_1F_EventScript_16C604:: @ 816C604
-	msgbox gUnknown_819685B, MSGBOX_NPC
+CeladonCity_PokemonCenter_1F_EventScript_Gentleman:: @ 816C604
+	msgbox CeladonCity_PokemonCenter_1F_Text_PokeFluteAwakensSleepingMons, MSGBOX_NPC
 	end
 
-CeladonCity_PokemonCenter_1F_EventScript_16C60D:: @ 816C60D
-	msgbox gUnknown_81968C2, MSGBOX_NPC
+CeladonCity_PokemonCenter_1F_EventScript_CooltrainerF:: @ 816C60D
+	msgbox CeladonCity_PokemonCenter_1F_Text_RodeHereFromFuchsia, MSGBOX_NPC
 	end
 
-CeladonCity_PokemonCenter_1F_EventScript_16C616:: @ 816C616
-	msgbox gUnknown_8196913, MSGBOX_NPC
+CeladonCity_PokemonCenter_1F_EventScript_Youngster:: @ 816C616
+	msgbox CeladonCity_PokemonCenter_1F_Text_GoToCyclingRoadIfIHadBike, MSGBOX_NPC
 	end
diff --git a/data/maps/CeladonCity_PokemonCenter_1F/text.inc b/data/maps/CeladonCity_PokemonCenter_1F/text.inc
index 098582351..6aa628f39 100644
--- a/data/maps/CeladonCity_PokemonCenter_1F/text.inc
+++ b/data/maps/CeladonCity_PokemonCenter_1F/text.inc
@@ -1,15 +1,15 @@
-gUnknown_819685B:: @ 819685B
+CeladonCity_PokemonCenter_1F_Text_PokeFluteAwakensSleepingMons:: @ 819685B
     .string "A POKé FLUTE awakens sleeping\n"
     .string "POKéMON. You know that.\p"
     .string "It does so with a sound that only\n"
     .string "they can hear.$"
 
-gUnknown_81968C2:: @ 81968C2
+CeladonCity_PokemonCenter_1F_Text_RodeHereFromFuchsia:: @ 81968C2
     .string "I rode here from FUCHSIA.\p"
     .string "It's an uphill ride on CYCLING\n"
     .string "ROAD, so I'm exhausted.$"
 
-gUnknown_8196913:: @ 8196913
+CeladonCity_PokemonCenter_1F_Text_GoToCyclingRoadIfIHadBike:: @ 8196913
     .string "If I had a BIKE, I would go to\n"
     .string "CYCLING ROAD!$"
 
diff --git a/data/maps/CeladonCity_Restaurant/map.json b/data/maps/CeladonCity_Restaurant/map.json
index 9681ddfb2..dafc84778 100644
--- a/data/maps/CeladonCity_Restaurant/map.json
+++ b/data/maps/CeladonCity_Restaurant/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_Restaurant_EventScript_16D1EB",
+      "script": "CeladonCity_Restaurant_EventScript_Chef",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 2,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_Restaurant_EventScript_16D1F4",
+      "script": "CeladonCity_Restaurant_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_Restaurant_EventScript_16D25E",
+      "script": "CeladonCity_Restaurant_EventScript_FatMan",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_Restaurant_EventScript_16D1FD",
+      "script": "CeladonCity_Restaurant_EventScript_CoinCaseMan",
       "flag": "0"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "CeladonCity_Restaurant_EventScript_16D255",
+      "script": "CeladonCity_Restaurant_EventScript_WorkerM",
       "flag": "0"
     }
   ],
diff --git a/data/maps/CeladonCity_Restaurant/scripts.inc b/data/maps/CeladonCity_Restaurant/scripts.inc
index c8ab9469a..9613406e4 100644
--- a/data/maps/CeladonCity_Restaurant/scripts.inc
+++ b/data/maps/CeladonCity_Restaurant/scripts.inc
@@ -1,41 +1,41 @@
 CeladonCity_Restaurant_MapScripts:: @ 816D1EA
 	.byte 0
 
-CeladonCity_Restaurant_EventScript_16D1EB:: @ 816D1EB
-	msgbox gUnknown_81978E6, MSGBOX_NPC
+CeladonCity_Restaurant_EventScript_Chef:: @ 816D1EB
+	msgbox CeladonCity_Restaurant_Text_TakingBreakRightNow, MSGBOX_NPC
 	end
 
-CeladonCity_Restaurant_EventScript_16D1F4:: @ 816D1F4
-	msgbox gUnknown_8197915, MSGBOX_NPC
+CeladonCity_Restaurant_EventScript_Woman:: @ 816D1F4
+	msgbox CeladonCity_Restaurant_Text_OftenGoToDrugstore, MSGBOX_NPC
 	end
 
-CeladonCity_Restaurant_EventScript_16D1FD:: @ 816D1FD
+CeladonCity_Restaurant_EventScript_CoinCaseMan:: @ 816D1FD
 	lock
 	faceplayer
-	goto_if_set FLAG_GOT_COIN_CASE, EventScript_16D24B
-	msgbox gUnknown_81979C1
+	goto_if_set FLAG_GOT_COIN_CASE, CeladonCity_Restaurant_EventScript_AlreadyGotCoinCase
+	msgbox CeladonCity_Restaurant_Text_TakeThisImBusted
 	checkitemspace ITEM_COIN_CASE, 1
 	compare VAR_RESULT, FALSE
-	goto_if_eq EventScript_16D241
-	giveitem_msg gUnknown_8197A38, ITEM_COIN_CASE
+	goto_if_eq CeladonCity_Restaurant_EventScript_NoRoomForCoinCase
+	giveitem_msg CeladonCity_Restaurant_Text_ReceivedCoinCaseFromMan, ITEM_COIN_CASE
 	setflag FLAG_GOT_COIN_CASE
 	release
 	end
 
-EventScript_16D241:: @ 816D241
-	msgbox gUnknown_8197A5E
+CeladonCity_Restaurant_EventScript_NoRoomForCoinCase:: @ 816D241
+	msgbox CeladonCity_Restaurant_Text_MakeRoomForThis
 	release
 	end
 
-EventScript_16D24B:: @ 816D24B
-	msgbox gUnknown_8197A72
+CeladonCity_Restaurant_EventScript_AlreadyGotCoinCase:: @ 816D24B
+	msgbox CeladonCity_Restaurant_Text_ThoughtIdWinItBack
 	release
 	end
 
-CeladonCity_Restaurant_EventScript_16D255:: @ 816D255
-	msgbox gUnknown_8197952, MSGBOX_NPC
+CeladonCity_Restaurant_EventScript_WorkerM:: @ 816D255
+	msgbox CeladonCity_Restaurant_Text_PsstBasementUnderGameCorner, MSGBOX_NPC
 	end
 
-CeladonCity_Restaurant_EventScript_16D25E:: @ 816D25E
-	msgbox gUnknown_819798A, MSGBOX_NPC
+CeladonCity_Restaurant_EventScript_FatMan:: @ 816D25E
+	msgbox CeladonCity_Restaurant_Text_ManLostItAllAtSlots, MSGBOX_NPC
 	end
diff --git a/data/maps/CeladonCity_Restaurant/text.inc b/data/maps/CeladonCity_Restaurant/text.inc
index 87edeb186..e6c27c2bd 100644
--- a/data/maps/CeladonCity_Restaurant/text.inc
+++ b/data/maps/CeladonCity_Restaurant/text.inc
@@ -1,22 +1,22 @@
-gUnknown_81978E6:: @ 81978E6
+CeladonCity_Restaurant_Text_TakingBreakRightNow:: @ 81978E6
     .string "Hi!\p"
     .string "Sorry, but we're taking a break\n"
     .string "right now.$"
 
-gUnknown_8197915:: @ 8197915
+CeladonCity_Restaurant_Text_OftenGoToDrugstore:: @ 8197915
     .string "My POKéMON are weak, so I often\n"
     .string "have to go to the DRUGSTORE.$"
 
-gUnknown_8197952:: @ 8197952
+CeladonCity_Restaurant_Text_PsstBasementUnderGameCorner:: @ 8197952
     .string "Psst! There's a basement under the\n"
     .string "GAME CORNER, I hear.$"
 
-gUnknown_819798A:: @ 819798A
+CeladonCity_Restaurant_Text_ManLostItAllAtSlots:: @ 819798A
     .string "Munch…\p"
     .string "The man at that table lost it all\n"
     .string "at the slots.$"
 
-gUnknown_81979C1:: @ 81979C1
+CeladonCity_Restaurant_Text_TakeThisImBusted:: @ 81979C1
     .string "Go ahead! Laugh!\n"
     .string "I'm flat-out busted!\p"
     .string "No more slots for me!\n"
@@ -24,14 +24,14 @@ gUnknown_81979C1:: @ 81979C1
     .string "Here!\n"
     .string "I won't be needing this anymore!$"
 
-gUnknown_8197A38:: @ 8197A38
+CeladonCity_Restaurant_Text_ReceivedCoinCaseFromMan:: @ 8197A38
     .string "{PLAYER} received a COIN CASE\n"
     .string "from the man.$"
 
-gUnknown_8197A5E:: @ 8197A5E
+CeladonCity_Restaurant_Text_MakeRoomForThis:: @ 8197A5E
     .string "Make room for this!$"
 
-gUnknown_8197A72:: @ 8197A72
+CeladonCity_Restaurant_Text_ThoughtIdWinItBack:: @ 8197A72
     .string "I always thought I was going to\n"
     .string "win it back…$"
 
diff --git a/data/maps/FiveIsland_RocketWarehouse/map.json b/data/maps/FiveIsland_RocketWarehouse/map.json
index def5fa6fd..58ca4c535 100644
--- a/data/maps/FiveIsland_RocketWarehouse/map.json
+++ b/data/maps/FiveIsland_RocketWarehouse/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163FE6",
+      "script": "FiveIsland_RocketWarehouse_EventScript_Grunt2",
       "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163FFD",
+      "script": "FiveIsland_RocketWarehouse_EventScript_Grunt3",
       "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "FiveIsland_RocketWarehouse_EventScript_164087",
+      "script": "FiveIsland_RocketWarehouse_EventScript_Admin1",
       "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "FiveIsland_RocketWarehouse_EventScript_164014",
+      "script": "FiveIsland_RocketWarehouse_EventScript_Admin2",
       "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "FiveIsland_RocketWarehouse_EventScript_164070",
+      "script": "FiveIsland_RocketWarehouse_EventScript_Grunt1",
       "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
     },
     {
@@ -88,7 +88,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F93",
+      "script": "FiveIsland_RocketWarehouse_EventScript_Gideon",
       "flag": "0"
     },
     {
@@ -161,7 +161,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROCKET_WAREHOUSE",
       "var_value": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F81"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Admin2Trigger"
     },
     {
       "type": "trigger",
@@ -170,7 +170,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROCKET_WAREHOUSE",
       "var_value": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F81"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Admin2Trigger"
     },
     {
       "type": "trigger",
@@ -179,7 +179,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROCKET_WAREHOUSE",
       "var_value": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F81"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Admin2Trigger"
     }
   ],
   "bg_events": [
@@ -188,14 +188,14 @@
       "x": 11,
       "y": 2,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_3",
       "x": 26,
       "y": 11,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F78"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Computer"
     },
     {
       "type": "hidden_item",
@@ -222,147 +222,147 @@
       "x": 12,
       "y": 2,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_0",
       "x": 10,
       "y": 2,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_0",
       "x": 9,
       "y": 2,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_0",
       "x": 8,
       "y": 2,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_0",
       "x": 7,
       "y": 2,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_0",
       "x": 11,
       "y": 5,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_0",
       "x": 10,
       "y": 5,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_0",
       "x": 11,
       "y": 4,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_0",
       "x": 10,
       "y": 4,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_0",
       "x": 8,
       "y": 4,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_0",
       "x": 7,
       "y": 4,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_0",
       "x": 8,
       "y": 5,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_0",
       "x": 7,
       "y": 5,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_0",
       "x": 5,
       "y": 3,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_0",
       "x": 4,
       "y": 3,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_0",
       "x": 5,
       "y": 4,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_0",
       "x": 4,
       "y": 4,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_0",
       "x": 3,
       "y": 4,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_0",
       "x": 2,
       "y": 4,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_0",
       "x": 2,
       "y": 5,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_0",
       "x": 3,
       "y": 5,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     }
   ]
 }
diff --git a/data/maps/FiveIsland_RocketWarehouse/scripts.inc b/data/maps/FiveIsland_RocketWarehouse/scripts.inc
index 8382d4a72..dfcb6e43f 100644
--- a/data/maps/FiveIsland_RocketWarehouse/scripts.inc
+++ b/data/maps/FiveIsland_RocketWarehouse/scripts.inc
@@ -1,3 +1,12 @@
+.equ LOCALID_GRUNT1, 5
+.equ LOCALID_GRUNT2, 1
+.equ LOCALID_GRUNT3, 2
+.equ LOCALID_ADMIN1, 3
+.equ LOCALID_ADMIN2, 4
+
+.equ PLAYER_X_POS, VAR_0x8004
+.equ PLAYER_Y_POS, VAR_0x8005
+
 FiveIsland_RocketWarehouse_MapScripts:: @ 8163F2E
 	map_script MAP_SCRIPT_ON_LOAD, FiveIsland_RocketWarehouse_OnLoad
 	map_script MAP_SCRIPT_ON_TRANSITION, FiveIsland_RocketWarehouse_OnTransition
@@ -8,82 +17,82 @@ FiveIsland_RocketWarehouse_OnTransition:: @ 8163F39
 	end
 
 FiveIsland_RocketWarehouse_OnLoad:: @ 8163F3D
-	call_if_defeated TRAINER_TEAM_ROCKET_ADMIN, EventScript_163F47
+	call_if_defeated TRAINER_TEAM_ROCKET_ADMIN, FiveIsland_RocketWarehouse_EventScript_SetArrowsForReEntry
 	end
 
-EventScript_163F47:: @ 8163F47
-	setmetatile 26, 20, 672, 0
-	setmetatile 27, 20, 672, 0
+FiveIsland_RocketWarehouse_EventScript_SetArrowsForReEntry:: @ 8163F47
+	setmetatile 26, 20, METATILE_Hideout_Arrow_Up, 0
+	setmetatile 27, 20, METATILE_Hideout_Arrow_Up, 0
 	return
 
-FiveIsland_RocketWarehouse_EventScript_163F5A:: @ 8163F5A
+FiveIsland_RocketWarehouse_EventScript_Cage:: @ 8163F5A
 	lockall
-	goto_if_set FLAG_DEFEATED_ROCKETS_IN_WAREHOUSE, EventScript_163F6E
-	msgbox gUnknown_817B4E3
+	goto_if_set FLAG_DEFEATED_ROCKETS_IN_WAREHOUSE, FiveIsland_RocketWarehouse_EventScript_CageUnlocked
+	msgbox FiveIsland_RocketWarehouse_Text_ManyMonsLockedInPen
 	releaseall
 	end
 
-EventScript_163F6E:: @ 8163F6E
-	msgbox gUnknown_817B512
+FiveIsland_RocketWarehouse_EventScript_CageUnlocked:: @ 8163F6E
+	msgbox FiveIsland_RocketWarehouse_Text_PenUnlockedMonsFled
 	releaseall
 	end
 
-FiveIsland_RocketWarehouse_EventScript_163F78:: @ 8163F78
-	msgbox gUnknown_817BB15, MSGBOX_SIGN
+FiveIsland_RocketWarehouse_EventScript_Computer:: @ 8163F78
+	msgbox FiveIsland_RocketWarehouse_Text_ReportWithGraphsAndText, MSGBOX_SIGN
 	end
 
-FiveIsland_RocketWarehouse_EventScript_163F81:: @ 8163F81
+FiveIsland_RocketWarehouse_EventScript_Admin2Trigger:: @ 8163F81
 	lockall
-	applymovement 4, Movement_WalkInPlaceFastestLeft
+	applymovement LOCALID_ADMIN2, Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	setvar VAR_MAP_SCENE_ROCKET_WAREHOUSE, 1
 	releaseall
 	end
 
-FiveIsland_RocketWarehouse_EventScript_163F93:: @ 8163F93
-	trainerbattle_single TRAINER_SCIENTIST_GIDEON, Text_17BBAF, Text_17BC55, EventScript_163FCD
-	goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_163FB7
-	msgbox gUnknown_817BCA3, MSGBOX_AUTOCLOSE
+FiveIsland_RocketWarehouse_EventScript_Gideon:: @ 8163F93
+	trainerbattle_single TRAINER_SCIENTIST_GIDEON, FiveIsland_RocketWarehouse_Text_GideonIntro, FiveIsland_RocketWarehouse_Text_GideonDefeat, FiveIsland_RocketWarehouse_EventScript_DefeatedGideon
+	goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, FiveIsland_RocketWarehouse_EventScript_MentionGiovannisKid
+	msgbox FiveIsland_RocketWarehouse_Text_GetLostLeaveMeBe, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_163FB7:: @ 8163FB7
+FiveIsland_RocketWarehouse_EventScript_MentionGiovannisKid:: @ 8163FB7
 	famechecker FAMECHECKER_GIOVANNI, 5
-	msgbox gUnknown_817BCD7, MSGBOX_AUTOCLOSE
+	msgbox FiveIsland_RocketWarehouse_Text_GiovannisKidHasRedHair, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_163FCD:: @ 8163FCD
-	msgbox gUnknown_817BC6C
+FiveIsland_RocketWarehouse_EventScript_DefeatedGideon:: @ 8163FCD
+	msgbox FiveIsland_RocketWarehouse_Text_GideonPostBattle
 	setflag FLAG_RECOVERED_SAPPHIRE
 	giveitem ITEM_SAPPHIRE
 	release
 	end
 
-FiveIsland_RocketWarehouse_EventScript_163FE6:: @ 8163FE6
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_47, Text_17B54D, Text_17B585
-	msgbox gUnknown_817B5A6, MSGBOX_AUTOCLOSE
+FiveIsland_RocketWarehouse_EventScript_Grunt2:: @ 8163FE6
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_47, FiveIsland_RocketWarehouse_Text_Grunt2Intro, FiveIsland_RocketWarehouse_Text_Grunt2Defeat
+	msgbox FiveIsland_RocketWarehouse_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-FiveIsland_RocketWarehouse_EventScript_163FFD:: @ 8163FFD
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_48, Text_17B677, Text_17B6D9
-	msgbox gUnknown_817B6EF, MSGBOX_AUTOCLOSE
+FiveIsland_RocketWarehouse_EventScript_Grunt3:: @ 8163FFD
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_48, FiveIsland_RocketWarehouse_Text_Grunt3Intro, FiveIsland_RocketWarehouse_Text_Grunt3Defeat
+	msgbox FiveIsland_RocketWarehouse_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-FiveIsland_RocketWarehouse_EventScript_164014:: @ 8164014
-	trainerbattle_single TRAINER_TEAM_ROCKET_ADMIN_2, Text_17B8DA, Text_17B9FB, EventScript_16402F
-	msgbox gUnknown_817BA64, MSGBOX_AUTOCLOSE
+FiveIsland_RocketWarehouse_EventScript_Admin2:: @ 8164014
+	trainerbattle_single TRAINER_TEAM_ROCKET_ADMIN_2, FiveIsland_RocketWarehouse_Text_Admin2Intro, FiveIsland_RocketWarehouse_Text_Admin2Defeat, FiveIsland_RocketWarehouse_EventScript_DefeatedAdmin2
+	msgbox FiveIsland_RocketWarehouse_Text_Admin2PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_16402F:: @ 816402F
-	getplayerxy VAR_0x8004, VAR_0x8005
-	compare VAR_0x8004, 24
-	call_if_le EventScript_164065
-	msgbox gUnknown_817BA64
+FiveIsland_RocketWarehouse_EventScript_DefeatedAdmin2:: @ 816402F
+	getplayerxy PLAYER_X_POS, PLAYER_Y_POS
+	compare PLAYER_X_POS, 24
+	call_if_le FiveIsland_RocketWarehouse_EventScript_PlayerFaceAdmin2
+	msgbox FiveIsland_RocketWarehouse_Text_Admin2PostBattle
 	closemessage
 	fadescreen FADE_TO_BLACK
-	removeobject 1
-	removeobject 2
-	removeobject 4
-	removeobject 3
+	removeobject LOCALID_GRUNT2
+	removeobject LOCALID_GRUNT3
+	removeobject LOCALID_ADMIN2
+	removeobject LOCALID_ADMIN1
 	setflag FLAG_HIDE_FIVE_ISLAND_ROCKETS
 	fadescreen FADE_FROM_BLACK
 	setvar VAR_MAP_SCENE_ROCKET_WAREHOUSE, 1
@@ -91,91 +100,91 @@ EventScript_16402F:: @ 816402F
 	release
 	end
 
-EventScript_164065:: @ 8164065
+FiveIsland_RocketWarehouse_EventScript_PlayerFaceAdmin2:: @ 8164065
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
-FiveIsland_RocketWarehouse_EventScript_164070:: @ 8164070
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_42, Text_17B5D6, Text_17B62F
-	msgbox gUnknown_817B642, MSGBOX_AUTOCLOSE
+FiveIsland_RocketWarehouse_EventScript_Grunt1:: @ 8164070
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_42, FiveIsland_RocketWarehouse_Text_Grunt1Intro, FiveIsland_RocketWarehouse_Text_Grunt1Defeat
+	msgbox FiveIsland_RocketWarehouse_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-FiveIsland_RocketWarehouse_EventScript_164087:: @ 8164087
-	trainerbattle_single TRAINER_TEAM_ROCKET_ADMIN, Text_17B72D, Text_17B79C, EventScript_1640A2
-	msgbox gUnknown_817B7FA, MSGBOX_AUTOCLOSE
+FiveIsland_RocketWarehouse_EventScript_Admin1:: @ 8164087
+	trainerbattle_single TRAINER_TEAM_ROCKET_ADMIN, FiveIsland_RocketWarehouse_Text_Admin1Intro, FiveIsland_RocketWarehouse_Text_Admin1Defeat, FiveIsland_RocketWarehouse_EventScript_DefeatedAdmin1
+	msgbox FiveIsland_RocketWarehouse_Text_MadeItSoYouCanComeBackThrough, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1640A2:: @ 81640A2
-	getplayerxy VAR_0x8004, VAR_0x8005
+FiveIsland_RocketWarehouse_EventScript_DefeatedAdmin1:: @ 81640A2
+	getplayerxy PLAYER_X_POS, PLAYER_Y_POS
 	specialvar VAR_RESULT, GetPlayerFacingDirection
 	compare VAR_RESULT, DIR_NORTH
-	call_if_eq EventScript_16412E
-	msgbox gUnknown_817B7AE
+	call_if_eq FiveIsland_RocketWarehouse_EventScript_PlayerFaceAdmin1
+	msgbox FiveIsland_RocketWarehouse_Text_Admin1PostBattle
 	closemessage
-	compare VAR_0x8004, 24
-	call_if_le EventScript_164144
-	compare VAR_0x8004, 25
-	call_if_eq EventScript_16414F
-	compare VAR_0x8004, 26
-	call_if_eq EventScript_16415A
-	compare VAR_0x8004, 27
-	call_if_eq EventScript_16415A
+	compare PLAYER_X_POS, 24
+	call_if_le FiveIsland_RocketWarehouse_EventScript_AdminWalkToSwitchFar
+	compare PLAYER_X_POS, 25
+	call_if_eq FiveIsland_RocketWarehouse_EventScript_AdminWalkToSwitch
+	compare PLAYER_X_POS, 26
+	call_if_eq FiveIsland_RocketWarehouse_EventScript_AdminFaceSwitch
+	compare PLAYER_X_POS, 27
+	call_if_eq FiveIsland_RocketWarehouse_EventScript_AdminFaceSwitch
 	playse SE_PIN
-	call EventScript_163F47
+	call FiveIsland_RocketWarehouse_EventScript_SetArrowsForReEntry
 	special DrawWholeMapView
 	waitse
-	compare VAR_0x8004, 24
-	call_if_le EventScript_164165
-	compare VAR_0x8004, 25
-	call_if_eq EventScript_164165
-	compare VAR_0x8004, 26
-	call_if_eq EventScript_164165
-	compare VAR_0x8004, 27
-	call_if_eq EventScript_164170
-	msgbox gUnknown_817B7FA
+	compare PLAYER_X_POS, 24
+	call_if_le FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerLeft
+	compare PLAYER_X_POS, 25
+	call_if_eq FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerLeft
+	compare PLAYER_X_POS, 26
+	call_if_eq FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerLeft
+	compare PLAYER_X_POS, 27
+	call_if_eq FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerDown
+	msgbox FiveIsland_RocketWarehouse_Text_MadeItSoYouCanComeBackThrough
 	release
 	end
 
-EventScript_16412E:: @ 816412E
-	compare VAR_0x8004, 27
+FiveIsland_RocketWarehouse_EventScript_PlayerFaceAdmin1:: @ 816412E
+	compare PLAYER_X_POS, 27
 	goto_if_eq EventScript_Return
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
-EventScript_164144:: @ 8164144
-	applymovement 3, Movement_16417B
+FiveIsland_RocketWarehouse_EventScript_AdminWalkToSwitchFar:: @ 8164144
+	applymovement LOCALID_ADMIN1, FiveIsland_RocketWarehouse_Movement_AdminWalkToSwitchFar
 	waitmovement 0
 	return
 
-EventScript_16414F:: @ 816414F
-	applymovement 3, Movement_16417F
+FiveIsland_RocketWarehouse_EventScript_AdminWalkToSwitch:: @ 816414F
+	applymovement LOCALID_ADMIN1, FiveIsland_RocketWarehouse_Movement_AdminWalkToSwitch
 	waitmovement 0
 	return
 
-EventScript_16415A:: @ 816415A
-	applymovement 3, Movement_WalkInPlaceFastestUp
+FiveIsland_RocketWarehouse_EventScript_AdminFaceSwitch:: @ 816415A
+	applymovement LOCALID_ADMIN1, Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	return
 
-EventScript_164165:: @ 8164165
-	applymovement 3, Movement_WalkInPlaceFastestLeft
+FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerLeft:: @ 8164165
+	applymovement LOCALID_ADMIN1, Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
-EventScript_164170:: @ 8164170
-	applymovement 3, Movement_WalkInPlaceFastestDown
+FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerDown:: @ 8164170
+	applymovement LOCALID_ADMIN1, Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
-Movement_16417B:: @ 816417B
+FiveIsland_RocketWarehouse_Movement_AdminWalkToSwitchFar:: @ 816417B
 	walk_right
 	walk_right
 	walk_in_place_fastest_up
 	step_end
 
-Movement_16417F:: @ 816417F
+FiveIsland_RocketWarehouse_Movement_AdminWalkToSwitch:: @ 816417F
 	walk_right
 	walk_in_place_fastest_up
 	step_end
diff --git a/data/maps/FiveIsland_RocketWarehouse/text.inc b/data/maps/FiveIsland_RocketWarehouse/text.inc
index b77ebd7c8..de74a7e67 100644
--- a/data/maps/FiveIsland_RocketWarehouse/text.inc
+++ b/data/maps/FiveIsland_RocketWarehouse/text.inc
@@ -1,65 +1,65 @@
-gUnknown_817B4E3:: @ 817B4E3
+FiveIsland_RocketWarehouse_Text_ManyMonsLockedInPen:: @ 817B4E3
     .string "There are many POKéMON locked\n"
     .string "away in the pen…$"
 
-gUnknown_817B512:: @ 817B512
+FiveIsland_RocketWarehouse_Text_PenUnlockedMonsFled:: @ 817B512
     .string "The pen door is unlocked.\n"
     .string "The POKéMON appear to have fled.$"
 
-Text_17B54D:: @ 817B54D
+FiveIsland_RocketWarehouse_Text_Grunt2Intro:: @ 817B54D
     .string "Did you come here knowing it's\n"
     .string "TEAM ROCKET's WAREHOUSE?$"
 
-Text_17B585:: @ 817B585
+FiveIsland_RocketWarehouse_Text_Grunt2Defeat:: @ 817B585
     .string "What do you think you're doing?!$"
 
-gUnknown_817B5A6:: @ 817B5A6
+FiveIsland_RocketWarehouse_Text_Grunt2PostBattle:: @ 817B5A6
     .string "TEAM ROCKET broke up?\n"
     .string "What planet are you from?$"
 
-Text_17B5D6:: @ 817B5D6
+FiveIsland_RocketWarehouse_Text_Grunt1Intro:: @ 817B5D6
     .string "Oh, now your POKéMON look strong.\n"
     .string "You're willing to sell them?\p"
     .string "Oh?\n"
     .string "You wanted to battle?$"
 
-Text_17B62F:: @ 817B62F
+FiveIsland_RocketWarehouse_Text_Grunt1Defeat:: @ 817B62F
     .string "Oh, but…\n"
     .string "Too much!$"
 
-gUnknown_817B642:: @ 817B642
+FiveIsland_RocketWarehouse_Text_Grunt1PostBattle:: @ 817B642
     .string "We can give you a great price.\n"
     .string "Sell us your POKéMON!$"
 
-Text_17B677:: @ 817B677
+FiveIsland_RocketWarehouse_Text_Grunt3Intro:: @ 817B677
     .string "I got word about you from the\n"
     .string "others.\p"
     .string "But there's no way a kid like you'd\n"
     .string "know our BOSS GIOVANNI!$"
 
-Text_17B6D9:: @ 817B6D9
+FiveIsland_RocketWarehouse_Text_Grunt3Defeat:: @ 817B6D9
     .string "Don't…you…dare…laugh…$"
 
-gUnknown_817B6EF:: @ 817B6EF
+FiveIsland_RocketWarehouse_Text_Grunt3PostBattle:: @ 817B6EF
     .string "Don't mess in the doings of adults,\n"
     .string "you jumped-up pip-squeak!$"
 
-Text_17B72D:: @ 817B72D
+FiveIsland_RocketWarehouse_Text_Admin1Intro:: @ 817B72D
     .string "I don't know or care if what I'm\n"
     .string "doing is right or wrong…\p"
     .string "I just put my faith in GIOVANNI\n"
     .string "and do as I am told.$"
 
-Text_17B79C:: @ 817B79C
+FiveIsland_RocketWarehouse_Text_Admin1Defeat:: @ 817B79C
     .string "I…\n"
     .string "I'm shattered…$"
 
-gUnknown_817B7AE:: @ 817B7AE
+FiveIsland_RocketWarehouse_Text_Admin1PostBattle:: @ 817B7AE
     .string "You're doing things according to\n"
     .string "your beliefs and morals.\p"
     .string "I understand now…$"
 
-gUnknown_817B7FA:: @ 817B7FA
+FiveIsland_RocketWarehouse_Text_MadeItSoYouCanComeBackThrough:: @ 817B7FA
     .string "I've made it so you can come back\n"
     .string "in through there.\p"
     .string "Why don't you go get rested and\n"
@@ -69,7 +69,7 @@ gUnknown_817B7FA:: @ 817B7FA
     .string "You'd better steel yourself for one\n"
     .string "harsh challenge.$"
 
-Text_17B8DA:: @ 817B8DA
+FiveIsland_RocketWarehouse_Text_Admin2Intro:: @ 817B8DA
     .string "That's quite enough of you \n"
     .string "playing the hero, kid.\p"
     .string "Spreading lies about how TEAM\n"
@@ -81,7 +81,7 @@ Text_17B8DA:: @ 817B8DA
     .string "And now, I'll show you how scary\n"
     .string "an angry adult can be!$"
 
-Text_17B9FB:: @ 817B9FB
+FiveIsland_RocketWarehouse_Text_Admin2Defeat:: @ 817B9FB
     .string "Urgh…\n"
     .string "You were too strong…\p"
     .string "…\n"
@@ -89,7 +89,7 @@ Text_17B9FB:: @ 817B9FB
     .string "So it's true?\n"
     .string "TEAM ROCKET really has disbanded?$"
 
-gUnknown_817BA64:: @ 817BA64
+FiveIsland_RocketWarehouse_Text_Admin2PostBattle:: @ 817BA64
     .string "We will abandon this WAREHOUSE…\p"
     .string "But don't think this is over.\n"
     .string "I won't let this be the end.\p"
@@ -98,7 +98,7 @@ gUnknown_817BA64:: @ 817BA64
     .string "I will…\p"
     .string "Until then, farewell!$"
 
-gUnknown_817BB15:: @ 817BB15
+FiveIsland_RocketWarehouse_Text_ReportWithGraphsAndText:: @ 817BB15
     .string "A report with graphs and text is on\n"
     .string "the PC monitor.\p"
     .string "“The Influence of Magnetic Waves\n"
@@ -106,7 +106,7 @@ gUnknown_817BB15:: @ 817BB15
     .string "… … … … … …\p"
     .string "It's too difficult to understand…$"
 
-Text_17BBAF:: @ 817BBAF
+FiveIsland_RocketWarehouse_Text_GideonIntro:: @ 817BBAF
     .string "I almost managed to sell the\n"
     .string "SAPPHIRE for huge money…\p"
     .string "Then, you just had to come along\n"
@@ -114,19 +114,19 @@ Text_17BBAF:: @ 817BBAF
     .string "Fufu… Fufufufu…\n"
     .string "There's no forgiveness for you!$"
 
-Text_17BC55:: @ 817BC55
+FiveIsland_RocketWarehouse_Text_GideonDefeat:: @ 817BC55
     .string "Gah! Darn!\n"
     .string "Darn! Darn!$"
 
-gUnknown_817BC6C:: @ 817BC6C
+FiveIsland_RocketWarehouse_Text_GideonPostBattle:: @ 817BC6C
     .string "If I can't sell it, it's worthless!\n"
     .string "Go ahead, take it!$"
 
-gUnknown_817BCA3:: @ 817BCA3
+FiveIsland_RocketWarehouse_Text_GetLostLeaveMeBe:: @ 817BCA3
     .string "What do you want now?\n"
     .string "Go on, get lost, leave me be.$"
 
-gUnknown_817BCD7:: @ 817BCD7
+FiveIsland_RocketWarehouse_Text_GiovannisKidHasRedHair:: @ 817BCD7
     .string "What, you again?\p"
     .string "You… You're not GIOVANNI's kid,\n"
     .string "are you?\p"
diff --git a/data/maps/FourIsland_IcefallCave_1F/scripts.inc b/data/maps/FourIsland_IcefallCave_1F/scripts.inc
index c3e3eaff2..c976122a7 100644
--- a/data/maps/FourIsland_IcefallCave_1F/scripts.inc
+++ b/data/maps/FourIsland_IcefallCave_1F/scripts.inc
@@ -5,7 +5,7 @@ FourIsland_IcefallCave_1F_MapScripts:: @ 8163D44
 	.byte 0
 
 FourIsland_IcefallCave_1F_OnResume:: @ 8163D54
-	setstepcallback 4
+	setstepcallback STEP_CB_ICE
 	end
 
 FourIsland_IcefallCave_1F_OnLoad:: @ 8163D57
@@ -13,13 +13,13 @@ FourIsland_IcefallCave_1F_OnLoad:: @ 8163D57
 	end
 
 FourIsland_IcefallCave_1F_OnFrame:: @ 8163D5B
-	map_script_2 VAR_TEMP_1, 1, EventScript_163D65
+	map_script_2 VAR_TEMP_1, 1, FourIsland_IcefallCave_1F_EventScript_FallDownHole
 	.2byte 0
 
-EventScript_163D65:: @ 8163D65
+FourIsland_IcefallCave_1F_EventScript_FallDownHole:: @ 8163D65
 	lockall
 	delay 20
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_163D7F
+	applymovement OBJ_EVENT_ID_PLAYER, FourIsland_IcefallCave_1F_Movement_SetInvisible
 	waitmovement 0
 	playse SE_RU_HYUU
 	delay 60
@@ -28,6 +28,6 @@ EventScript_163D65:: @ 8163D65
 	releaseall
 	end
 
-Movement_163D7F:: @ 8163D7F
+FourIsland_IcefallCave_1F_Movement_SetInvisible:: @ 8163D7F
 	set_invisible
 	step_end
diff --git a/data/maps/FourIsland_IcefallCave_Back/map.json b/data/maps/FourIsland_IcefallCave_Back/map.json
index 9af9a6faf..32ca627ba 100644
--- a/data/maps/FourIsland_IcefallCave_Back/map.json
+++ b/data/maps/FourIsland_IcefallCave_Back/map.json
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "FourIsland_IcefallCave_Back_EventScript_163F25",
+      "script": "FourIsland_IcefallCave_Back_EventScript_Lorelei",
       "flag": "FLAG_HIDE_ICEFALL_CAVE_LORELEI"
     },
     {
@@ -83,7 +83,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ICEFALL_CAVE_BACK",
       "var_value": 0,
-      "script": "FourIsland_IcefallCave_Back_EventScript_163D98"
+      "script": "FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene"
     },
     {
       "type": "trigger",
@@ -92,7 +92,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ICEFALL_CAVE_BACK",
       "var_value": 0,
-      "script": "FourIsland_IcefallCave_Back_EventScript_163D98"
+      "script": "FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene"
     },
     {
       "type": "trigger",
@@ -101,7 +101,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ICEFALL_CAVE_BACK",
       "var_value": 0,
-      "script": "FourIsland_IcefallCave_Back_EventScript_163D98"
+      "script": "FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene"
     }
   ],
   "bg_events": []
diff --git a/data/maps/FourIsland_IcefallCave_Back/scripts.inc b/data/maps/FourIsland_IcefallCave_Back/scripts.inc
index 39eb3f0b4..a0a94d4be 100644
--- a/data/maps/FourIsland_IcefallCave_Back/scripts.inc
+++ b/data/maps/FourIsland_IcefallCave_Back/scripts.inc
@@ -1,100 +1,105 @@
+.equ LOCALID_ROCKET1, 1
+.equ LOCALID_ROCKET2, 2
+.equ LOCALID_LORELEI, 3
+.equ LOCALID_ROCKET3, 4
+
 FourIsland_IcefallCave_Back_MapScripts:: @ 8163D82
 	map_script MAP_SCRIPT_ON_TRANSITION, FourIsland_IcefallCave_Back_OnTransition
 	.byte 0
 
 FourIsland_IcefallCave_Back_OnTransition:: @ 8163D88
 	compare VAR_MAP_SCENE_ICEFALL_CAVE_BACK, 1
-	call_if_eq EventScript_163D94
+	call_if_eq FourIsland_IcefallCave_Back_EventScript_HideLorelei
 	end
 
-EventScript_163D94:: @ 8163D94
+FourIsland_IcefallCave_Back_EventScript_HideLorelei:: @ 8163D94
 	setflag FLAG_HIDE_ICEFALL_CAVE_LORELEI
 	return
 
-FourIsland_IcefallCave_Back_EventScript_163D98:: @ 8163D98
+FourIsland_IcefallCave_Back_EventScript_LoreleiRocketsScene:: @ 8163D98
 	lockall
 	textcolor 1
-	msgbox gUnknown_817B04F
-	applymovement 1, Movement_163EE8
+	msgbox FourIsland_IcefallCave_Back_Text_LoreleiKeepHandsOffMons
+	applymovement LOCALID_ROCKET1, FourIsland_IcefallCave_Back_Movement_WalkInPlaceDown
 	waitmovement 0
 	textcolor 0
-	msgbox gUnknown_817B0B9
+	msgbox FourIsland_IcefallCave_Back_Text_ShutItLadyLeaveUsBe
 	closemessage
 	playse SE_PIN
-	applymovement 3, Movement_ExclamationMark
+	applymovement LOCALID_LORELEI, Movement_ExclamationMark
 	waitmovement 0
-	applymovement 3, Movement_WalkInPlaceFastestDown
+	applymovement LOCALID_LORELEI, Movement_WalkInPlaceFastestDown
 	waitmovement 0
-	applymovement 3, Movement_Delay48
+	applymovement LOCALID_LORELEI, Movement_Delay48
 	waitmovement 0
 	textcolor 1
-	msgbox gUnknown_817B109
+	msgbox FourIsland_IcefallCave_Back_Text_LoreleiPlayerHelpMeKickPoachersOut
 	closemessage
-	applymovement 3, Movement_WalkInPlaceFastestRight
+	applymovement LOCALID_LORELEI, Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	delay 18
-	applymovement 3, Movement_WalkInPlaceFastestDown
+	applymovement LOCALID_LORELEI, Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	delay 35
-	applymovement 4, Movement_163F11
-	applymovement 3, Movement_163F18
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_163EDD
+	applymovement LOCALID_ROCKET3, FourIsland_IcefallCave_Back_Movement_Rocket3FaceLorelei
+	applymovement LOCALID_LORELEI, FourIsland_IcefallCave_Back_Movement_LoreleiToRockets
+	applymovement OBJ_EVENT_ID_PLAYER, FourIsland_IcefallCave_Back_Movement_PlayerToRockets
 	waitmovement 0
-	applymovement 2, Movement_163EE8
+	applymovement LOCALID_ROCKET2, FourIsland_IcefallCave_Back_Movement_WalkInPlaceDown
 	waitmovement 0
 	playbgm MUS_ROCKET, 0
 	textcolor 0
-	msgbox gUnknown_817B20B
-	setvar VAR_LAST_TALKED, 4
-	trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_45, Text_17B251
-	applymovement 3, Movement_163F1B
+	msgbox FourIsland_IcefallCave_Back_Text_GruntIntro
+	setvar VAR_LAST_TALKED, LOCALID_ROCKET3
+	trainerbattle_no_intro TRAINER_TEAM_ROCKET_GRUNT_45, FourIsland_IcefallCave_Back_Text_GruntDefeat
+	applymovement LOCALID_LORELEI, FourIsland_IcefallCave_Back_Movement_WalkInPlaceUp
 	waitmovement 0
 	textcolor 1
-	msgbox gUnknown_817B269
+	msgbox FourIsland_IcefallCave_Back_Text_LoreleiWhereHaveYouTakenMons
 	textcolor 0
-	msgbox gUnknown_817B2EF
+	msgbox FourIsland_IcefallCave_Back_Text_NotTellingYouThat
 	textcolor 1
-	message Text_17B313
+	message FourIsland_IcefallCave_Back_Text_LoreleiWellDeepFreezeYou
 	waitmessage
 	waitse
 	playmoncry SPECIES_LAPRAS, 2
 	waitbuttonpress
 	waitmoncry
-	applymovement 1, Movement_163EEE
+	applymovement LOCALID_ROCKET1, FourIsland_IcefallCave_Back_Movement_Rocket1ReactToThreat
 	waitmovement 0
 	textcolor 0
-	msgbox gUnknown_817B399
+	msgbox FourIsland_IcefallCave_Back_Text_OkayRocketWareHouseFiveIsland
 	closemessage
-	applymovement 3, Movement_163F1D
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_163EE2
-	applymovement 1, Movement_163EF0
-	applymovement 2, Movement_163EFA
-	applymovement 4, Movement_163F05
+	applymovement LOCALID_LORELEI, FourIsland_IcefallCave_Back_Movement_LoreleiWatchRocketsExit
+	applymovement OBJ_EVENT_ID_PLAYER, FourIsland_IcefallCave_Back_Movement_PlayerWatchRocketsExit
+	applymovement LOCALID_ROCKET1, FourIsland_IcefallCave_Back_Movement_Rocket1Exit
+	applymovement LOCALID_ROCKET2, FourIsland_IcefallCave_Back_Movement_Rocket2Exit
+	applymovement LOCALID_ROCKET3, FourIsland_IcefallCave_Back_Movement_Rocket3Exit
 	waitmovement 0
-	removeobject 1
-	removeobject 2
-	removeobject 4
+	removeobject LOCALID_ROCKET1
+	removeobject LOCALID_ROCKET2
+	removeobject LOCALID_ROCKET3
 	delay 50
-	applymovement 3, Movement_163F23
+	applymovement LOCALID_LORELEI, FourIsland_IcefallCave_Back_Movement_LoreleiWalkToPlayer
 	waitmovement 0
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	textcolor 1
-	msgbox gUnknown_817B457
+	msgbox FourIsland_IcefallCave_Back_Text_ThankYouThisIsAwful
 	setflag FLAG_HIDE_RUIN_VALLEY_SCIENTIST
 	clearflag FLAG_HIDE_LORELEI_IN_HER_HOUSE
 	setvar VAR_MAP_SCENE_ICEFALL_CAVE_BACK, 1
 	releaseall
 	end
 
-Movement_163EDD:: @ 8163EDD
+FourIsland_IcefallCave_Back_Movement_PlayerToRockets:: @ 8163EDD
 	walk_up
 	walk_up
 	walk_right
 	walk_up
 	step_end
 
-Movement_163EE2:: @ 8163EE2
+FourIsland_IcefallCave_Back_Movement_PlayerWatchRocketsExit:: @ 8163EE2
 	delay_16
 	walk_in_place_fastest_left
 	delay_16
@@ -102,21 +107,21 @@ Movement_163EE2:: @ 8163EE2
 	walk_in_place_fastest_down
 	step_end
 
-Movement_163EE8:: @ 8163EE8
+FourIsland_IcefallCave_Back_Movement_WalkInPlaceDown:: @ 8163EE8
 	walk_in_place_down
 	step_end
 
-gUnknown_163EEA:: @ 8163EEA
+FourIsland_IcefallCave_Back_Movement_UnusedPushRight:: @ 8163EEA
 	lock_facing_direction
 	walk_right
 	unlock_facing_direction
 	step_end
 
-Movement_163EEE:: @ 8163EEE
+FourIsland_IcefallCave_Back_Movement_Rocket1ReactToThreat:: @ 8163EEE
 	walk_in_place_fast_down
 	step_end
 
-Movement_163EF0:: @ 8163EF0
+FourIsland_IcefallCave_Back_Movement_Rocket1Exit:: @ 8163EF0
 	walk_right
 	walk_down
 	walk_fast_down
@@ -128,7 +133,7 @@ Movement_163EF0:: @ 8163EF0
 	walk_fast_down
 	step_end
 
-Movement_163EFA:: @ 8163EFA
+FourIsland_IcefallCave_Back_Movement_Rocket2Exit:: @ 8163EFA
 	delay_16
 	walk_left
 	walk_down
@@ -141,7 +146,7 @@ Movement_163EFA:: @ 8163EFA
 	walk_fast_down
 	step_end
 
-Movement_163F05:: @ 8163F05
+FourIsland_IcefallCave_Back_Movement_Rocket3Exit:: @ 8163F05
 	delay_16
 	walk_down
 	delay_16
@@ -155,27 +160,27 @@ Movement_163F05:: @ 8163F05
 	walk_fast_down
 	step_end
 
-Movement_163F11:: @ 8163F11
+FourIsland_IcefallCave_Back_Movement_Rocket3FaceLorelei:: @ 8163F11
 	delay_16
 	delay_8
 	walk_in_place_fastest_right
 	step_end
 
-Movement_163F15:: @ 8163F15
+FourIsland_IcefallCave_Back_Movement_UnusedWalkLeft:: @ 8163F15
 	walk_left
 	walk_left
 	step_end
 
-Movement_163F18:: @ 8163F18
+FourIsland_IcefallCave_Back_Movement_LoreleiToRockets:: @ 8163F18
 	walk_left
 	walk_up
 	step_end
 
-Movement_163F1B:: @ 8163F1B
+FourIsland_IcefallCave_Back_Movement_WalkInPlaceUp:: @ 8163F1B
 	walk_in_place_up
 	step_end
 
-Movement_163F1D:: @ 8163F1D
+FourIsland_IcefallCave_Back_Movement_LoreleiWatchRocketsExit:: @ 8163F1D
 	delay_8
 	walk_in_place_fastest_right
 	delay_16
@@ -183,10 +188,10 @@ Movement_163F1D:: @ 8163F1D
 	walk_in_place_fastest_down
 	step_end
 
-Movement_163F23:: @ 8163F23
+FourIsland_IcefallCave_Back_Movement_LoreleiWalkToPlayer:: @ 8163F23
 	walk_right
 	step_end
 
-FourIsland_IcefallCave_Back_EventScript_163F25:: @ 8163F25
-	msgbox gUnknown_817B457, MSGBOX_NPC
+FourIsland_IcefallCave_Back_EventScript_Lorelei:: @ 8163F25
+	msgbox FourIsland_IcefallCave_Back_Text_ThankYouThisIsAwful, MSGBOX_NPC
 	end
diff --git a/data/maps/FourIsland_IcefallCave_Back/text.inc b/data/maps/FourIsland_IcefallCave_Back/text.inc
index f65e95854..981041777 100644
--- a/data/maps/FourIsland_IcefallCave_Back/text.inc
+++ b/data/maps/FourIsland_IcefallCave_Back/text.inc
@@ -1,16 +1,16 @@
-gUnknown_817B04F:: @ 817B04F
+FourIsland_IcefallCave_Back_Text_LoreleiKeepHandsOffMons:: @ 817B04F
     .string "LORELEI: Keep your filthy hands\n"
     .string "off the POKéMON in the cave!\p"
     .string "Do as I say, or you'll have me to\n"
     .string "answer to!$"
 
-gUnknown_817B0B9:: @ 817B0B9
+FourIsland_IcefallCave_Back_Text_ShutItLadyLeaveUsBe:: @ 817B0B9
     .string "Aww, shut it, lady, and leave\n"
     .string "us be.\p"
     .string "Don't let your glasses get all\n"
     .string "steamed up!$"
 
-gUnknown_817B109:: @ 817B109
+FourIsland_IcefallCave_Back_Text_LoreleiPlayerHelpMeKickPoachersOut:: @ 817B109
     .string "LORELEI: {PLAYER}?!\n"
     .string "What are you doing here?\p"
     .string "No, we can catch up later.\n"
@@ -22,15 +22,15 @@ gUnknown_817B109:: @ 817B109
     .string "Are you ready?\n"
     .string "You take that one, please!$"
 
-gUnknown_817B20B:: @ 817B20B
+FourIsland_IcefallCave_Back_Text_GruntIntro:: @ 817B20B
     .string "W-what?!\p"
     .string "Who says we can't do what we want\n"
     .string "with the POKéMON we catch?$"
 
-Text_17B251:: @ 817B251
+FourIsland_IcefallCave_Back_Text_GruntDefeat:: @ 817B251
     .string "We didn't plan on this!$"
 
-gUnknown_817B269:: @ 817B269
+FourIsland_IcefallCave_Back_Text_LoreleiWhereHaveYouTakenMons:: @ 817B269
     .string "LORELEI: Humph.\n"
     .string "So despicably weak.\p"
     .string "You!\n"
@@ -40,11 +40,11 @@ gUnknown_817B269:: @ 817B269
     .string "I'm smashing your ring once and\n"
     .string "for all!$"
 
-gUnknown_817B2EF:: @ 817B2EF
+FourIsland_IcefallCave_Back_Text_NotTellingYouThat:: @ 817B2EF
     .string "N-no way!\n"
     .string "I'm not telling you that!$"
 
-Text_17B313:: @ 817B313
+FourIsland_IcefallCave_Back_Text_LoreleiWellDeepFreezeYou:: @ 817B313
     .string "LORELEI: If you won't confess,\n"
     .string "we'll deep-freeze you.\p"
     .string "My LAPRAS is furious for what\n"
@@ -52,7 +52,7 @@ Text_17B313:: @ 817B313
     .string "Go, LAPRAS!\n"
     .string "ICE BEAM…$"
 
-gUnknown_817B399:: @ 817B399
+FourIsland_IcefallCave_Back_Text_OkayRocketWareHouseFiveIsland:: @ 817B399
     .string "Wawaah! Okay!\n"
     .string "I'll talk!\p"
     .string "The POKéMON are in the ROCKET\n"
@@ -63,7 +63,7 @@ gUnknown_817B399:: @ 817B399
     .string "into the ROCKET WAREHOUSE!\p"
     .string "Heheheheh!$"
 
-gUnknown_817B457:: @ 817B457
+FourIsland_IcefallCave_Back_Text_ThankYouThisIsAwful:: @ 817B457
     .string "{PLAYER}, thank you.\n"
     .string "But this is awful…\p"
     .string "I was born and raised here on\n"
diff --git a/data/maps/IndigoPlateau_Exterior/scripts.inc b/data/maps/IndigoPlateau_Exterior/scripts.inc
index bc9827037..70831a754 100644
--- a/data/maps/IndigoPlateau_Exterior/scripts.inc
+++ b/data/maps/IndigoPlateau_Exterior/scripts.inc
@@ -1,3 +1,6 @@
+.equ LOCALID_RIVAL,    1
+.equ LOCALID_PROF_OAK, 2
+
 IndigoPlateau_Exterior_MapScripts:: @ 816723B
 	map_script MAP_SCRIPT_ON_TRANSITION, IndigoPlateau_Exterior_OnTransition
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, IndigoPlateau_Exterior_OnFrame
@@ -6,22 +9,23 @@ IndigoPlateau_Exterior_MapScripts:: @ 816723B
 IndigoPlateau_Exterior_OnTransition:: @ 8167246
 	setworldmapflag FLAG_WORLD_MAP_INDIGO_PLATEAU_EXTERIOR
 	compare VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 1
-	call_if_eq EventScript_IndigoPlateau_Exterior_PlayCreditsMusic
+	call_if_eq IndigoPlateau_Exterior_EventScript_PlayCreditsMusic
 	end
 
-EventScript_IndigoPlateau_Exterior_PlayCreditsMusic:: @ 8167255
+IndigoPlateau_Exterior_EventScript_PlayCreditsMusic:: @ 8167255
 	playbgm MUS_ENDING, 0
 	return
 
 IndigoPlateau_Exterior_OnFrame:: @ 816725A
-	map_script_2 VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 1, EventScript_IndigoPlateau_Exterior_Credits
+	map_script_2 VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 1, IndigoPlateau_Exterior_EventScript_Credits
 	.2byte 0
 
-EventScript_IndigoPlateau_Exterior_Credits:: @ 8167264
-	@ After beating the champion, you are warped to the main
-	@ entrance of Indigo Plateau. This script starts running
-	@ immediately after your walking animation.
-	@ The script is timed to the music.
+
+@ After beating the champion, you are warped to the main
+@ entrance of Indigo Plateau. This script starts running
+@ immediately after your walking animation.
+@ The script is timed to the music.
+IndigoPlateau_Exterior_EventScript_Credits:: @ 8167264
 	lockall
 	delay 105
 
@@ -29,60 +33,60 @@ EventScript_IndigoPlateau_Exterior_Credits:: @ 8167264
 	opendoor 11, 6
 	waitdooranim
 	special SpawnCameraObject
-	addobject 1
-	applymovement 1, Movement_167346
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_167337
+	addobject LOCALID_RIVAL
+	applymovement LOCALID_RIVAL, IndigoPlateau_Exterior_Movement_RivalExitBuilding
+	applymovement OBJ_EVENT_ID_PLAYER, IndigoPlateau_Exterior_Movement_PushPlayerOutOfWay
 	waitmovement 0
 	closedoor 11, 6
 	waitdooranim
 
 	@ Rival runs off
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_16731B
-	applymovement 1, Movement_16733E
+	applymovement OBJ_EVENT_ID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerWatchRivalLeave
+	applymovement LOCALID_RIVAL, IndigoPlateau_Exterior_Movement_RivalLeave
 	waitmovement 0
 	delay 100
 
 	@ Oak exits building
 	opendoor 11, 6
 	waitdooranim
-	addobject 2
-	applymovement 2, Movement_16735D
+	addobject LOCALID_PROF_OAK
+	applymovement LOCALID_PROF_OAK, IndigoPlateau_Exterior_Movement_OakExitBuilding
 	waitmovement 0
 	closedoor 11, 6
 	waitdooranim
 	delay 160
 
 	@ Oak looks at player, then walks off
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_16731F
-	applymovement 2, Movement_167348
+	applymovement OBJ_EVENT_ID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerWatchOakLeave
+	applymovement LOCALID_PROF_OAK, IndigoPlateau_Exterior_Movement_OakLeave
 	waitmovement 0
 	delay 100
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_16732E
+
+	@ Player begin to leave
+	applymovement OBJ_EVENT_ID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerBeginLeave
 	waitmovement 0
 	delay 155
-
-	@ Player turns to face the League
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_16733C
+	applymovement OBJ_EVENT_ID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerFaceLeague
 	waitmovement 0
 	delay 90
 
 	@ Player runs off
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_167335
+	applymovement OBJ_EVENT_ID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerTurnAround
 	waitmovement 0
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_167311
+	applymovement OBJ_EVENT_ID_PLAYER, IndigoPlateau_Exterior_Movement_PlayerLeave
 	waitmovement 0
 
 	@ Reset the map state and roll the credits
 	special RemoveCameraObject
 	setvar VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 0
-	removeobject 1
-	removeobject 2
+	removeobject LOCALID_RIVAL
+	removeobject LOCALID_PROF_OAK
 	special Special_Credits @ noreturn
 	waitstate
 	releaseall
 	end
 
-Movement_167311:: @ 8167311
+IndigoPlateau_Exterior_Movement_PlayerLeave:: @ 8167311
 	player_run_down
 	player_run_down
 	player_run_down
@@ -91,18 +95,19 @@ Movement_167311:: @ 8167311
 	player_run_down
 	step_end
 
-Movement_167318:: @ 8167318
+@ Unused
+IndigoPlateau_Exterior_Movement_PlayerExitBuilding:: @ 8167318
 	walk_down
 	walk_down
 	step_end
 
-Movement_16731B:: @ 816731B
+IndigoPlateau_Exterior_Movement_PlayerWatchRivalLeave:: @ 816731B
 	delay_16
 	delay_4
 	walk_in_place_fastest_down
 	step_end
 
-Movement_16731F:: @ 816731F
+IndigoPlateau_Exterior_Movement_PlayerWatchOakLeave:: @ 816731F
 	delay_8
 	walk_in_place_fastest_right
 	delay_16
@@ -119,7 +124,7 @@ Movement_16731F:: @ 816731F
 	walk_in_place_fastest_down
 	step_end
 
-Movement_16732E:: @ 816732E
+IndigoPlateau_Exterior_Movement_PlayerBeginLeave:: @ 816732E
 	walk_right
 	delay_16
 	walk_down
@@ -128,22 +133,22 @@ Movement_16732E:: @ 816732E
 	delay_16
 	step_end
 
-Movement_167335:: @ 8167335
+IndigoPlateau_Exterior_Movement_PlayerTurnAround:: @ 8167335
 	walk_in_place_fastest_down
 	step_end
 
-Movement_167337:: @ 8167337
+IndigoPlateau_Exterior_Movement_PushPlayerOutOfWay:: @ 8167337
 	face_right
 	lock_facing_direction
 	walk_left
 	unlock_facing_direction
 	step_end
 
-Movement_16733C:: @ 816733C
+IndigoPlateau_Exterior_Movement_PlayerFaceLeague:: @ 816733C
 	walk_in_place_fastest_up
 	step_end
 
-Movement_16733E:: @ 816733E
+IndigoPlateau_Exterior_Movement_RivalLeave:: @ 816733E
 	walk_fast_down
 	walk_fast_down
 	walk_fast_down
@@ -153,11 +158,11 @@ Movement_16733E:: @ 816733E
 	walk_fast_down
 	step_end
 
-Movement_167346:: @ 8167346
+IndigoPlateau_Exterior_Movement_RivalExitBuilding:: @ 8167346
 	walk_fast_down
 	step_end
 
-Movement_167348:: @ 8167348
+IndigoPlateau_Exterior_Movement_OakLeave:: @ 8167348
 	walk_in_place_fastest_left
 	delay_16
 	delay_16
@@ -180,6 +185,6 @@ Movement_167348:: @ 8167348
 	walk_down
 	step_end
 
-Movement_16735D:: @ 816735D
+IndigoPlateau_Exterior_Movement_OakExitBuilding:: @ 816735D
 	walk_down
 	step_end
diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json
index f214403c3..e862a372e 100644
--- a/data/maps/IndigoPlateau_PokemonCenter_1F/map.json
+++ b/data/maps/IndigoPlateau_PokemonCenter_1F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "IndigoPlateau_PokemonCenter_1F_EventScript_16EACC",
+      "script": "IndigoPlateau_PokemonCenter_1F_EventScript_Clerk",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "IndigoPlateau_PokemonCenter_1F_EventScript_16EB06",
+      "script": "IndigoPlateau_PokemonCenter_1F_EventScript_Nurse",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "IndigoPlateau_PokemonCenter_1F_EventScript_16EAC3",
+      "script": "IndigoPlateau_PokemonCenter_1F_EventScript_GymGuy",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "IndigoPlateau_PokemonCenter_1F_EventScript_16EA8A",
+      "script": "IndigoPlateau_PokemonCenter_1F_EventScript_DoorGuard",
       "flag": "0"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "IndigoPlateau_PokemonCenter_1F_EventScript_1ACFAE",
+      "script": "IndigoPlateau_PokemonCenter_1F_EventScript_BlackBelt",
       "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
     },
     {
@@ -88,7 +88,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "IndigoPlateau_PokemonCenter_1F_EventScript_1AD06C",
+      "script": "IndigoPlateau_PokemonCenter_1F_EventScript_PokemonJournal",
       "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
     },
     {
@@ -101,7 +101,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "IndigoPlateau_PokemonCenter_1F_EventScript_1AD087",
+      "script": "IndigoPlateau_PokemonCenter_1F_EventScript_CooltrainerM",
       "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
     },
     {
@@ -114,7 +114,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "IndigoPlateau_PokemonCenter_1F_EventScript_1AD06C",
+      "script": "IndigoPlateau_PokemonCenter_1F_EventScript_PokemonJournal",
       "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
     }
   ],
diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc
index 67a3e4f6a..e0523d2ee 100644
--- a/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc
+++ b/data/maps/IndigoPlateau_PokemonCenter_1F/scripts.inc
@@ -7,52 +7,52 @@ IndigoPlateau_PokemonCenter_1F_OnTransition:: @ 816EA65
 	setrespawn SPAWN_INDIGO_PLATEAU
 	specialvar VAR_RESULT, IsNationalPokedexEnabled
 	compare VAR_RESULT, TRUE
-	call_if_eq EventScript_16EA79
+	call_if_eq IndigoPlateau_PokemonCenter_1F_EventScript_CheckBlockDoor
 	end
 
-EventScript_16EA79:: @ 816EA79
+IndigoPlateau_PokemonCenter_1F_EventScript_CheckBlockDoor:: @ 816EA79
 	goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_Return
 	setobjectxyperm 4, 4, 2
 	return
 
-IndigoPlateau_PokemonCenter_1F_EventScript_16EA8A:: @ 816EA8A
+IndigoPlateau_PokemonCenter_1F_EventScript_DoorGuard:: @ 816EA8A
 	lock
 	faceplayer
 	specialvar VAR_RESULT, IsNationalPokedexEnabled
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_16EAA6
-	msgbox gUnknown_819A8D8
+	goto_if_eq IndigoPlateau_PokemonCenter_1F_EventScript_CheckSeviiIslandComplete
+	msgbox IndigoPlateau_PokemonCenter_1F_Text_FaceEliteFourGoodLuck
 	release
 	end
 
-EventScript_16EAA6:: @ 816EAA6
-	goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_16EAB9
-	msgbox gUnknown_819A943
+IndigoPlateau_PokemonCenter_1F_EventScript_CheckSeviiIslandComplete:: @ 816EAA6
+	goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, IndigoPlateau_PokemonCenter_1F_EventScript_SeviiIslandComplete
+	msgbox IndigoPlateau_PokemonCenter_1F_Text_LoreleiIsAbsentClosedForTimeBeing
 	release
 	end
 
-EventScript_16EAB9:: @ 816EAB9
-	msgbox gUnknown_819A8D8
+IndigoPlateau_PokemonCenter_1F_EventScript_SeviiIslandComplete:: @ 816EAB9
+	msgbox IndigoPlateau_PokemonCenter_1F_Text_FaceEliteFourGoodLuck
 	release
 	end
 
-IndigoPlateau_PokemonCenter_1F_EventScript_16EAC3:: @ 816EAC3
-	msgbox gUnknown_819A837, MSGBOX_NPC
+IndigoPlateau_PokemonCenter_1F_EventScript_GymGuy:: @ 816EAC3
+	msgbox IndigoPlateau_PokemonCenter_1F_Text_GymGuyAdvice, MSGBOX_NPC
 	end
 
-IndigoPlateau_PokemonCenter_1F_EventScript_16EACC:: @ 816EACC
+IndigoPlateau_PokemonCenter_1F_EventScript_Clerk:: @ 816EACC
 	goto_if_questlog EventScript_ReleaseEnd
 	lock
 	faceplayer
 	message Text_MayIHelpYou
 	waitmessage
-	pokemart Items_16EAF4
+	pokemart IndigoPlateau_PokemonCenter_1F_Items
 	msgbox Text_PleaseComeAgain
 	release
 	end
 
 	.align 2
-Items_16EAF4:: @ 816EAF4
+IndigoPlateau_PokemonCenter_1F_Items:: @ 816EAF4
 	.2byte ITEM_ULTRA_BALL
 	.2byte ITEM_GREAT_BALL
 	.2byte ITEM_FULL_RESTORE
@@ -64,7 +64,7 @@ Items_16EAF4:: @ 816EAF4
 	release
 	end
 
-IndigoPlateau_PokemonCenter_1F_EventScript_16EB06:: @ 816EB06
+IndigoPlateau_PokemonCenter_1F_EventScript_Nurse:: @ 816EB06
 	lock
 	faceplayer
 	call EventScript_PkmnCenterNurse
diff --git a/data/maps/IndigoPlateau_PokemonCenter_1F/text.inc b/data/maps/IndigoPlateau_PokemonCenter_1F/text.inc
index 7a4d158b3..192831d64 100644
--- a/data/maps/IndigoPlateau_PokemonCenter_1F/text.inc
+++ b/data/maps/IndigoPlateau_PokemonCenter_1F/text.inc
@@ -1,4 +1,4 @@
-gUnknown_819A837:: @ 819A837
+IndigoPlateau_PokemonCenter_1F_Text_GymGuyAdvice:: @ 819A837
     .string "Yo!\n"
     .string "Champ in the making!\p"
     .string "At the POKéMON LEAGUE, you will\n"
@@ -8,13 +8,13 @@ gUnknown_819A837:: @ 819A837
     .string "This is it!\n"
     .string "Go for it!$"
 
-gUnknown_819A8D8:: @ 819A8D8
+IndigoPlateau_PokemonCenter_1F_Text_FaceEliteFourGoodLuck:: @ 819A8D8
     .string "From here on, you face the\n"
     .string "ELITE FOUR one by one.\p"
     .string "If you win, a door opens to the\n"
     .string "next TRAINER. Good luck!$"
 
-gUnknown_819A943:: @ 819A943
+IndigoPlateau_PokemonCenter_1F_Text_LoreleiIsAbsentClosedForTimeBeing:: @ 819A943
     .string "I am so sorry, but you've wasted\n"
     .string "your time coming here.\p"
     .string "LORELEI of the ELITE FOUR is\n"
@@ -22,3 +22,22 @@ gUnknown_819A943:: @ 819A943
     .string "As a result, the POKéMON LEAGUE is\n"
     .string "closed for the time being.$"
 
+IndigoPlateau_PokemonCenter_1F_Text_AgathaWhuppedUs:: @ 819A9E7
+    .string "AGATHA's GHOST-type POKéMON are\n"
+    .string "horrifically terrifying in toughness.\p"
+    .string "I took my FIGHTING-type POKéMON\n"
+    .string "and raised them to the max.\p"
+    .string "I went at AGATHA feeling pretty\n"
+    .string "confident, but she whupped us.\p"
+    .string "That old lady's also got a really\n"
+    .string "short fuse, too.\p"
+    .string "It doesn't take anything to get\n"
+    .string "that scary lady hollering.$"
+
+IndigoPlateau_PokemonCenter_1F_Text_LancesCousinGymLeaderFarAway:: @ 819AB16
+    .string "Maybe becoming an ELITE FOUR\n"
+    .string "member is in the blood.\p"
+    .string "From what I've heard, LANCE has\n"
+    .string "a cousin who's a GYM LEADER\l"
+    .string "somewhere far away.$"
+
diff --git a/data/maps/MtMoon_1F/map.json b/data/maps/MtMoon_1F/map.json
index e32b5f379..b12af5aae 100644
--- a/data/maps/MtMoon_1F/map.json
+++ b/data/maps/MtMoon_1F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "MtMoon_1F_EventScript_16063C",
+      "script": "MtMoon_1F_EventScript_Iris",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "MtMoon_1F_EventScript_160681",
+      "script": "MtMoon_1F_EventScript_Robby",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "MtMoon_1F_EventScript_160653",
+      "script": "MtMoon_1F_EventScript_Jovan",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 3,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "MtMoon_1F_EventScript_160625",
+      "script": "MtMoon_1F_EventScript_Miriam",
       "flag": "0"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "MtMoon_1F_EventScript_16066A",
+      "script": "MtMoon_1F_EventScript_Kent",
       "flag": "0"
     },
     {
@@ -88,7 +88,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "MtMoon_1F_EventScript_16060E",
+      "script": "MtMoon_1F_EventScript_Josh",
       "flag": "0"
     },
     {
@@ -101,7 +101,7 @@
       "movement_range_y": 2,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "MtMoon_1F_EventScript_1605F7",
+      "script": "MtMoon_1F_EventScript_Macros",
       "flag": "0"
     },
     {
@@ -192,7 +192,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "MtMoon_1F_EventScript_1ACE03",
+      "script": "MtMoon_1F_EventScript_BaldingMan",
       "flag": "0"
     }
   ],
@@ -233,7 +233,7 @@
       "x": 19,
       "y": 26,
       "elevation": 0,
-      "script": "MtMoon_1F_EventScript_1605EE"
+      "script": "MtMoon_1F_EventScript_ZubatSign"
     }
   ]
 }
diff --git a/data/maps/MtMoon_1F/scripts.inc b/data/maps/MtMoon_1F/scripts.inc
index 4c80943d1..2ddfef089 100644
--- a/data/maps/MtMoon_1F/scripts.inc
+++ b/data/maps/MtMoon_1F/scripts.inc
@@ -6,41 +6,41 @@ MtMoon_1F_OnTransition:: @ 81605EA
 	setworldmapflag FLAG_WORLD_MAP_MT_MOON_1F
 	end
 
-MtMoon_1F_EventScript_1605EE:: @ 81605EE
-	msgbox gUnknown_8172AE0, MSGBOX_SIGN
+MtMoon_1F_EventScript_ZubatSign:: @ 81605EE
+	msgbox MtMoon_1F_Text_ZubatIsABloodsucker, MSGBOX_SIGN
 	end
 
-MtMoon_1F_EventScript_1605F7:: @ 81605F7
-	trainerbattle_single TRAINER_HIKER_MARCOS, Text_17279D, Text_1727CB
-	msgbox gUnknown_81727DF, MSGBOX_AUTOCLOSE
+MtMoon_1F_EventScript_Macros:: @ 81605F7
+	trainerbattle_single TRAINER_HIKER_MARCOS, MtMoon_1F_Text_MarcosIntro, MtMoon_1F_Text_MarcosDefeat
+	msgbox MtMoon_1F_Text_MarcosPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtMoon_1F_EventScript_16060E:: @ 816060E
-	trainerbattle_single TRAINER_YOUNGSTER_JOSH, Text_17281D, Text_172844
-	msgbox gUnknown_8172863, MSGBOX_AUTOCLOSE
+MtMoon_1F_EventScript_Josh:: @ 816060E
+	trainerbattle_single TRAINER_YOUNGSTER_JOSH, MtMoon_1F_Text_JoshIntro, MtMoon_1F_Text_JoshDefeat
+	msgbox MtMoon_1F_Text_JoshPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtMoon_1F_EventScript_160625:: @ 8160625
-	trainerbattle_single TRAINER_LASS_MIRIAM, Text_172896, Text_1728C3
-	msgbox gUnknown_81728D2, MSGBOX_AUTOCLOSE
+MtMoon_1F_EventScript_Miriam:: @ 8160625
+	trainerbattle_single TRAINER_LASS_MIRIAM, MtMoon_1F_Text_MiriamIntro, MtMoon_1F_Text_MiriamDefeat
+	msgbox MtMoon_1F_Text_MiriamPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtMoon_1F_EventScript_16063C:: @ 816063C
-	trainerbattle_single TRAINER_LASS_IRIS, Text_172972, Text_1729A4
-	msgbox gUnknown_81729AC, MSGBOX_AUTOCLOSE
+MtMoon_1F_EventScript_Iris:: @ 816063C
+	trainerbattle_single TRAINER_LASS_IRIS, MtMoon_1F_Text_IrisIntro, MtMoon_1F_Text_IrisDefeat
+	msgbox MtMoon_1F_Text_IrisPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtMoon_1F_EventScript_160653:: @ 8160653
-	trainerbattle_single TRAINER_SUPER_NERD_JOVAN, Text_17290B, Text_172927
-	msgbox gUnknown_817293C, MSGBOX_AUTOCLOSE
+MtMoon_1F_EventScript_Jovan:: @ 8160653
+	trainerbattle_single TRAINER_SUPER_NERD_JOVAN, MtMoon_1F_Text_JovanIntro, MtMoon_1F_Text_JovanDefeat
+	msgbox MtMoon_1F_Text_JovanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtMoon_1F_EventScript_16066A:: @ 816066A
-	trainerbattle_single TRAINER_BUG_CATCHER_KENT, Text_1729EA, Text_172A1A
-	msgbox gUnknown_8172A26, MSGBOX_AUTOCLOSE
+MtMoon_1F_EventScript_Kent:: @ 816066A
+	trainerbattle_single TRAINER_BUG_CATCHER_KENT, MtMoon_1F_Text_KentIntro, MtMoon_1F_Text_KentDefeat
+	msgbox MtMoon_1F_Text_KentPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtMoon_1F_EventScript_160681:: @ 8160681
-	trainerbattle_single TRAINER_BUG_CATCHER_ROBBY, Text_172A55, Text_172A8F
-	msgbox gUnknown_8172A97, MSGBOX_AUTOCLOSE
+MtMoon_1F_EventScript_Robby:: @ 8160681
+	trainerbattle_single TRAINER_BUG_CATCHER_ROBBY, MtMoon_1F_Text_RobbyIntro, MtMoon_1F_Text_RobbyDefeat
+	msgbox MtMoon_1F_Text_RobbyPostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/MtMoon_1F/text.inc b/data/maps/MtMoon_1F/text.inc
index 86028da5c..249c9dd50 100644
--- a/data/maps/MtMoon_1F/text.inc
+++ b/data/maps/MtMoon_1F/text.inc
@@ -1,87 +1,92 @@
-Text_17279D:: @ 817279D
+MtMoon_1F_Text_MarcosIntro:: @ 817279D
     .string "WHOA!\n"
     .string "You shocked me!\l"
     .string "…Oh, you're just a kid!$"
 
-Text_1727CB:: @ 81727CB
+MtMoon_1F_Text_MarcosDefeat:: @ 81727CB
     .string "Wow!\n"
     .string "Shocked again!$"
 
-gUnknown_81727DF:: @ 81727DF
+MtMoon_1F_Text_MarcosPostBattle:: @ 81727DF
     .string "Kids like you shouldn't be\n"
     .string "wandering around here in the dark.$"
 
-Text_17281D:: @ 817281D
+MtMoon_1F_Text_JoshIntro:: @ 817281D
     .string "Did you come to explore the cave,\n"
     .string "too?$"
 
-Text_172844:: @ 8172844
+MtMoon_1F_Text_JoshDefeat:: @ 8172844
     .string "Losing stinks!\n"
     .string "It's so uncool.$"
 
-gUnknown_8172863:: @ 8172863
+MtMoon_1F_Text_JoshPostBattle:: @ 8172863
     .string "I came all the way down here to\n"
     .string "show off to girls.$"
 
-Text_172896:: @ 8172896
+MtMoon_1F_Text_MiriamIntro:: @ 8172896
     .string "Wow! It's way bigger in here than\n"
     .string "I thought!$"
 
-Text_1728C3:: @ 81728C3
+MtMoon_1F_Text_MiriamDefeat:: @ 81728C3
     .string "Oh!\n"
     .string "I lost it!$"
 
-gUnknown_81728D2:: @ 81728D2
+MtMoon_1F_Text_MiriamPostBattle:: @ 81728D2
     .string "How do you get out of here?\n"
     .string "It's so big, I may get lost.$"
 
-Text_17290B:: @ 817290B
+MtMoon_1F_Text_JovanIntro:: @ 817290B
     .string "What!\n"
     .string "Don't sneak up on me!$"
 
-Text_172927:: @ 8172927
+MtMoon_1F_Text_JovanDefeat:: @ 8172927
     .string "My POKéMON won't do!$"
 
-gUnknown_817293C:: @ 817293C
+MtMoon_1F_Text_JovanPostBattle:: @ 817293C
     .string "I have to find stronger POKéMON.\n"
     .string "Where might they be?$"
 
-Text_172972:: @ 8172972
+MtMoon_1F_Text_IrisIntro:: @ 8172972
     .string "What?\n"
     .string "I'm waiting for my friends to find\l"
     .string "me here.$"
 
-Text_1729A4:: @ 81729A4
+MtMoon_1F_Text_IrisDefeat:: @ 81729A4
     .string "I lost?$"
 
-gUnknown_81729AC:: @ 81729AC
+MtMoon_1F_Text_IrisPostBattle:: @ 81729AC
     .string "I came because I heard there are\n"
     .string "some very rare fossils here.$"
 
-Text_1729EA:: @ 81729EA
+MtMoon_1F_Text_KentIntro:: @ 81729EA
     .string "Suspicious men are in the cave.\n"
     .string "What about you?$"
 
-Text_172A1A:: @ 8172A1A
+MtMoon_1F_Text_KentDefeat:: @ 8172A1A
     .string "You got me!$"
 
-gUnknown_8172A26:: @ 8172A26
+MtMoon_1F_Text_KentPostBattle:: @ 8172A26
     .string "I saw them!\n"
     .string "I'm sure they're from TEAM ROCKET!$"
 
-Text_172A55:: @ 8172A55
+MtMoon_1F_Text_RobbyIntro:: @ 8172A55
     .string "You need to go through this cave\n"
     .string "to get to CERULEAN CITY.$"
 
-Text_172A8F:: @ 8172A8F
+MtMoon_1F_Text_RobbyDefeat:: @ 8172A8F
     .string "I lost.$"
 
-gUnknown_8172A97:: @ 8172A97
+MtMoon_1F_Text_RobbyPostBattle:: @ 8172A97
     .string "ZUBAT is tough!\n"
     .string "But if you can catch one, you'll\l"
     .string "be able to count on it.$"
 
-gUnknown_8172AE0:: @ 8172AE0
+MtMoon_1F_Text_ZubatIsABloodsucker:: @ 8172AE0
     .string "Beware!\n"
     .string "ZUBAT is a bloodsucker!$"
 
+MtMoon_1F_Text_BrockHelpsExcavateFossils:: @ 8172B00
+    .string "Hi, I'm excavating for fossils here\n"
+    .string "under MT. MOON.\p"
+    .string "Sometimes, BROCK of PEWTER GYM\n"
+    .string "lends me a hand.$"
diff --git a/data/maps/MtMoon_B2F/map.json b/data/maps/MtMoon_B2F/map.json
index ac65802cb..f3c51828c 100644
--- a/data/maps/MtMoon_B2F/map.json
+++ b/data/maps/MtMoon_B2F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "MtMoon_B2F_EventScript_16071B",
+      "script": "MtMoon_B2F_EventScript_DomeFossil",
       "flag": "FLAG_HIDE_DOME_FOSSIL"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "MtMoon_B2F_EventScript_16077F",
+      "script": "MtMoon_B2F_EventScript_HelixFossil",
       "flag": "FLAG_HIDE_HELIX_FOSSIL"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "MtMoon_B2F_EventScript_1606C2",
+      "script": "MtMoon_B2F_EventScript_Miguel",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "MtMoon_B2F_EventScript_160829",
+      "script": "MtMoon_B2F_EventScript_Grunt4",
       "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "MtMoon_B2F_EventScript_1607E4",
+      "script": "MtMoon_B2F_EventScript_Grunt1",
       "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
     },
     {
@@ -88,7 +88,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "MtMoon_B2F_EventScript_160812",
+      "script": "MtMoon_B2F_EventScript_Grunt3",
       "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
     },
     {
@@ -101,7 +101,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "MtMoon_B2F_EventScript_1607FB",
+      "script": "MtMoon_B2F_EventScript_Grunt2",
       "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
     },
     {
@@ -195,7 +195,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_MT_MOON_B2F",
       "var_value": 0,
-      "script": "MtMoon_B2F_EventScript_1606B0"
+      "script": "MtMoon_B2F_EventScript_MiguelTrigger"
     }
   ],
   "bg_events": [
diff --git a/data/maps/MtMoon_B2F/scripts.inc b/data/maps/MtMoon_B2F/scripts.inc
index 71c458c12..515242568 100644
--- a/data/maps/MtMoon_B2F/scripts.inc
+++ b/data/maps/MtMoon_B2F/scripts.inc
@@ -1,138 +1,142 @@
+.equ LOCALID_DOME_FOSSIL,  1
+.equ LOCALID_HELIX_FOSSIL, 2
+.equ LOCALID_MIGUEL,       3
+
 MtMoon_B2F_MapScripts:: @ 8160699
 	map_script MAP_SCRIPT_ON_TRANSITION, MtMoon_B2F_OnTransition
 	.byte 0
 
 MtMoon_B2F_OnTransition:: @ 816069F
-	call_if_unset FLAG_GOT_FOSSIL_FROM_MT_MOON, EventScript_1606A9
+	call_if_unset FLAG_GOT_FOSSIL_FROM_MT_MOON, MtMoon_B2F_EventScript_ShowFossils
 	end
 
-EventScript_1606A9:: @ 81606A9
+MtMoon_B2F_EventScript_ShowFossils:: @ 81606A9
 	clearflag FLAG_HIDE_DOME_FOSSIL
 	clearflag FLAG_HIDE_HELIX_FOSSIL
 	return
 
-MtMoon_B2F_EventScript_1606B0:: @ 81606B0
+MtMoon_B2F_EventScript_MiguelTrigger:: @ 81606B0
 	lockall
-	applymovement 3, Movement_WalkInPlaceFastestRight
+	applymovement LOCALID_MIGUEL, Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	call EventScript_1606DD
+	call MtMoon_B2F_EventScript_BattleMiguel
 	releaseall
 	end
 
-MtMoon_B2F_EventScript_1606C2:: @ 81606C2
+MtMoon_B2F_EventScript_Miguel:: @ 81606C2
 	lock
 	faceplayer
-	goto_if_set FLAG_GOT_FOSSIL_FROM_MT_MOON, EventScript_160707
-	goto_if_defeated TRAINER_SUPER_NERD_MIGUEL, EventScript_160711
-	call EventScript_1606DD
+	goto_if_set FLAG_GOT_FOSSIL_FROM_MT_MOON, MtMoon_B2F_EventScript_MiguelFossilPicked
+	goto_if_defeated TRAINER_SUPER_NERD_MIGUEL, MtMoon_B2F_EventScript_MiguelGoPickFossil
+	call MtMoon_B2F_EventScript_BattleMiguel
 	release
 	end
 
-EventScript_1606DD:: @ 81606DD
+MtMoon_B2F_EventScript_BattleMiguel:: @ 81606DD
 	textcolor 0
-	message Text_172B64
+	message MtMoon_B2F_Text_MiguelIntro
 	waitmessage
 	playbgm MUS_EXEYE, 0
 	waitbuttonpress
-	setvar VAR_LAST_TALKED, 3
-	trainerbattle_no_intro TRAINER_SUPER_NERD_MIGUEL, Text_172B99
+	setvar VAR_LAST_TALKED, LOCALID_MIGUEL
+	trainerbattle_no_intro TRAINER_SUPER_NERD_MIGUEL, MtMoon_B2F_Text_MiguelDefeat
 	setvar VAR_MAP_SCENE_MT_MOON_B2F, 1
-	msgbox gUnknown_8172BAB
+	msgbox MtMoon_B2F_Text_WellEachTakeAFossil
 	return
 
-EventScript_160707:: @ 8160707
-	msgbox gUnknown_8172BFB
+MtMoon_B2F_EventScript_MiguelFossilPicked:: @ 8160707
+	msgbox MtMoon_B2F_Text_LabOnCinnabarRegeneratesFossils
 	release
 	end
 
-EventScript_160711:: @ 8160711
-	msgbox gUnknown_8172BAB
+MtMoon_B2F_EventScript_MiguelGoPickFossil:: @ 8160711
+	msgbox MtMoon_B2F_Text_WellEachTakeAFossil
 	release
 	end
 
-MtMoon_B2F_EventScript_16071B:: @ 816071B
+MtMoon_B2F_EventScript_DomeFossil:: @ 816071B
 	lock
 	faceplayer
-	msgbox gUnknown_8172E77, MSGBOX_YESNO
+	msgbox MtMoon_B2F_Text_YouWantDomeFossil, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_1607DE
-	removeobject 1
-	giveitem_msg gUnknown_8172ECD, ITEM_DOME_FOSSIL, 1, MUS_FAN5
+	goto_if_eq MtMoon_B2F_EventScript_DontTakeFossil
+	removeobject LOCALID_DOME_FOSSIL
+	giveitem_msg MtMoon_B2F_Text_ObtainedDomeFossil, ITEM_DOME_FOSSIL, 1, MUS_FAN5
 	closemessage
 	special sub_8112364
 	delay 10
-	applymovement 3, Movement_16077A
+	applymovement LOCALID_MIGUEL, MtMoon_B2F_Movement_MiguelToHelixFossil
 	waitmovement 0
-	moveobjectoffscreen 3
+	moveobjectoffscreen LOCALID_MIGUEL
 	textcolor 0
 	playfanfare MUS_FAN5
-	message Text_172BD6
+	message MtMoon_B2F_Text_ThenThisFossilIsMine
 	waitmessage
 	waitfanfare
-	removeobject 2
+	removeobject LOCALID_HELIX_FOSSIL
 	setflag FLAG_GOT_DOME_FOSSIL
 	setflag FLAG_GOT_FOSSIL_FROM_MT_MOON
 	release
 	end
 
-Movement_16077A:: @ 816077A
+MtMoon_B2F_Movement_MiguelToHelixFossil:: @ 816077A
 	walk_right
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-MtMoon_B2F_EventScript_16077F:: @ 816077F
+MtMoon_B2F_EventScript_HelixFossil:: @ 816077F
 	lock
 	faceplayer
-	msgbox gUnknown_8172E94, MSGBOX_YESNO
+	msgbox MtMoon_B2F_Text_YouWantHelixFossil, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_1607DE
-	removeobject 2
-	giveitem_msg gUnknown_8172EB2, ITEM_HELIX_FOSSIL, 1, MUS_FAN5
+	goto_if_eq MtMoon_B2F_EventScript_DontTakeFossil
+	removeobject LOCALID_HELIX_FOSSIL
+	giveitem_msg MtMoon_B2F_Text_ObtainedHelixFossil, ITEM_HELIX_FOSSIL, 1, MUS_FAN5
 	closemessage
 	special sub_8112364
 	delay 10
-	applymovement 3, Movement_1607E0
+	applymovement LOCALID_MIGUEL, MtMoon_B2F_Movement_MiguelToDomeFossil
 	waitmovement 0
-	moveobjectoffscreen 3
+	moveobjectoffscreen LOCALID_MIGUEL
 	textcolor 0
 	playfanfare MUS_FAN5
-	message Text_172BD6
+	message MtMoon_B2F_Text_ThenThisFossilIsMine
 	waitmessage
 	waitfanfare
-	removeobject 1
+	removeobject LOCALID_DOME_FOSSIL
 	setflag FLAG_GOT_HELIX_FOSSIL
 	setflag FLAG_GOT_FOSSIL_FROM_MT_MOON
 	release
 	end
 
-EventScript_1607DE:: @ 81607DE
+MtMoon_B2F_EventScript_DontTakeFossil:: @ 81607DE
 	release
 	end
 
-Movement_1607E0:: @ 81607E0
+MtMoon_B2F_Movement_MiguelToDomeFossil:: @ 81607E0
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-MtMoon_B2F_EventScript_1607E4:: @ 81607E4
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT, Text_172C5A, Text_172CB8
-	msgbox gUnknown_8172CCB, MSGBOX_AUTOCLOSE
+MtMoon_B2F_EventScript_Grunt1:: @ 81607E4
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT, MtMoon_B2F_Text_Grunt1Intro, MtMoon_B2F_Text_Grunt1Defeat
+	msgbox MtMoon_B2F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtMoon_B2F_EventScript_1607FB:: @ 81607FB
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_2, Text_172CFC, Text_172D46
-	msgbox gUnknown_8172D51, MSGBOX_AUTOCLOSE
+MtMoon_B2F_EventScript_Grunt2:: @ 81607FB
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_2, MtMoon_B2F_Text_Grunt2Intro, MtMoon_B2F_Text_Grunt2Defeat
+	msgbox MtMoon_B2F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtMoon_B2F_EventScript_160812:: @ 8160812
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_3, Text_172D82, Text_172DAF
-	msgbox gUnknown_8172DC1, MSGBOX_AUTOCLOSE
+MtMoon_B2F_EventScript_Grunt3:: @ 8160812
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_3, MtMoon_B2F_Text_Grunt3Intro, MtMoon_B2F_Text_Grunt3Defeat
+	msgbox MtMoon_B2F_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtMoon_B2F_EventScript_160829:: @ 8160829
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_4, Text_172DF0, Text_172E3E
-	msgbox gUnknown_8172E4B, MSGBOX_AUTOCLOSE
+MtMoon_B2F_EventScript_Grunt4:: @ 8160829
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_4, MtMoon_B2F_Text_Grunt4Intro, MtMoon_B2F_Text_Grunt4Defeat
+	msgbox MtMoon_B2F_Text_Grunt4PostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/MtMoon_B2F/text.inc b/data/maps/MtMoon_B2F/text.inc
index 2f27312db..fd4b564f0 100644
--- a/data/maps/MtMoon_B2F/text.inc
+++ b/data/maps/MtMoon_B2F/text.inc
@@ -1,90 +1,84 @@
-Text_172B00:: @ 8172B00
-    .string "Hi, I'm excavating for fossils here\n"
-    .string "under MT. MOON.\p"
-    .string "Sometimes, BROCK of PEWTER GYM\n"
-    .string "lends me a hand.$"
-
-Text_172B64:: @ 8172B64
+MtMoon_B2F_Text_MiguelIntro:: @ 8172B64
     .string "Hey, stop!\p"
     .string "I found these fossils!\n"
     .string "They're both mine!$"
 
-Text_172B99:: @ 8172B99
+MtMoon_B2F_Text_MiguelDefeat:: @ 8172B99
     .string "Okay!\n"
     .string "I'll share!$"
 
-gUnknown_8172BAB:: @ 8172BAB
+MtMoon_B2F_Text_WellEachTakeAFossil:: @ 8172BAB
     .string "We'll each take a fossil!\n"
     .string "No being greedy!$"
 
-Text_172BD6:: @ 8172BD6
+MtMoon_B2F_Text_ThenThisFossilIsMine:: @ 8172BD6
     .string "All right.\n"
     .string "Then this fossil is mine!$"
 
-gUnknown_8172BFB:: @ 8172BFB
+MtMoon_B2F_Text_LabOnCinnabarRegeneratesFossils:: @ 8172BFB
     .string "Far away, on CINNABAR ISLAND,\n"
     .string "there's a POKéMON LAB.\p"
     .string "They do research on regenerating\n"
     .string "fossils.$"
 
-Text_172C5A:: @ 8172C5A
+MtMoon_B2F_Text_Grunt1Intro:: @ 8172C5A
     .string "We, TEAM ROCKET, shall find the\n"
     .string "fossils!\p"
     .string "Reviving POKéMON from them will\n"
     .string "earn us huge riches!$"
 
-Text_172CB8:: @ 8172CB8
+MtMoon_B2F_Text_Grunt1Defeat:: @ 8172CB8
     .string "Urgh!\n"
     .string "Now I'm mad!$"
 
-gUnknown_8172CCB:: @ 8172CCB
+MtMoon_B2F_Text_Grunt1PostBattle:: @ 8172CCB
     .string "You made me mad!\n"
     .string "TEAM ROCKET will blacklist you!$"
 
-Text_172CFC:: @ 8172CFC
+MtMoon_B2F_Text_Grunt2Intro:: @ 8172CFC
     .string "We, TEAM ROCKET, are POKéMON\n"
     .string "gangsters!\l"
     .string "We strike fear with our strength!$"
 
-Text_172D46:: @ 8172D46
+MtMoon_B2F_Text_Grunt2Defeat:: @ 8172D46
     .string "I blew it!$"
 
-gUnknown_8172D51:: @ 8172D51
+MtMoon_B2F_Text_Grunt2PostBattle:: @ 8172D51
     .string "Darn it all!\n"
     .string "My associates won't stand for this!$"
 
-Text_172D82:: @ 8172D82
+MtMoon_B2F_Text_Grunt3Intro:: @ 8172D82
     .string "We're pulling a big job here!\n"
     .string "Get lost, kid!$"
 
-Text_172DAF:: @ 8172DAF
+MtMoon_B2F_Text_Grunt3Defeat:: @ 8172DAF
     .string "So, you are good…$"
 
-gUnknown_8172DC1:: @ 8172DC1
+MtMoon_B2F_Text_Grunt3PostBattle:: @ 8172DC1
     .string "If you find a fossil, give it to me\n"
     .string "and scram!$"
 
-Text_172DF0:: @ 8172DF0
+MtMoon_B2F_Text_Grunt4Intro:: @ 8172DF0
     .string "Little kids shouldn't be messing\n"
     .string "around with grown-ups!\p"
     .string "It could be bad news!$"
 
-Text_172E3E:: @ 8172E3E
+MtMoon_B2F_Text_Grunt4Defeat:: @ 8172E3E
     .string "I'm steamed!$"
 
-gUnknown_8172E4B:: @ 8172E4B
+MtMoon_B2F_Text_Grunt4PostBattle:: @ 8172E4B
     .string "POKéMON lived here long before\n"
     .string "people came.$"
 
-gUnknown_8172E77:: @ 8172E77
+MtMoon_B2F_Text_YouWantDomeFossil:: @ 8172E77
     .string "Do you want the DOME FOSSIL?$"
 
-gUnknown_8172E94:: @ 8172E94
+MtMoon_B2F_Text_YouWantHelixFossil:: @ 8172E94
     .string "Do you want the HELIX FOSSIL?$"
 
-gUnknown_8172EB2:: @ 8172EB2
+MtMoon_B2F_Text_ObtainedHelixFossil:: @ 8172EB2
     .string "Obtained the HELIX FOSSIL!$"
 
-gUnknown_8172ECD:: @ 8172ECD
+MtMoon_B2F_Text_ObtainedDomeFossil:: @ 8172ECD
     .string "Obtained the DOME FOSSIL!$"
 
diff --git a/data/maps/NavelRock_Summit/map.json b/data/maps/NavelRock_Summit/map.json
index 91981c25d..ef624c9c0 100644
--- a/data/maps/NavelRock_Summit/map.json
+++ b/data/maps/NavelRock_Summit/map.json
@@ -5,7 +5,7 @@
   "music": "MUS_NANADUNGEON",
   "region_map_section": "MAPSEC_NAVEL_ROCK",
   "requires_flash": false,
-  "weather": "WEATHER_CLOUDY",
+  "weather": "WEATHER_SHADE",
   "map_type": "MAP_TYPE_4",
   "unknown_18": 0,
   "unknown_19": 6,
diff --git a/data/maps/OneIsland/text.inc b/data/maps/OneIsland/text.inc
index aeccc1e47..d9a6e376a 100644
--- a/data/maps/OneIsland/text.inc
+++ b/data/maps/OneIsland/text.inc
@@ -1,12 +1,3 @@
-Text_181569:: @ 8181569
-    .string "This FAN CLUB…\n"
-    .string "No one here has a clue!\p"
-    .string "How could they not recognize\n"
-    .string "the brilliance that is LANCE?\p"
-    .string "He stands for justice!\n"
-    .string "He's cool, and yet passionate!\l"
-    .string "He's the greatest, LANCE!$"
-
 gUnknown_818161B:: @ 818161B
     .string "BILL: Here we are!\n"
     .string "This is ONE ISLAND.\p"
diff --git a/data/maps/PalletTown_PlayersHouse_1F/text.inc b/data/maps/PalletTown_PlayersHouse_1F/text.inc
index faa31c9d1..ba40d1729 100644
--- a/data/maps/PalletTown_PlayersHouse_1F/text.inc
+++ b/data/maps/PalletTown_PlayersHouse_1F/text.inc
@@ -1,65 +1,3 @@
-Text_18CF4D:: @ 818CF4D
-    .string "Training by oneself is certainly\n"
-    .string "not a bad thing.\p"
-    .string "But it's also not bad to aim for\n"
-    .string "the top with a partner.\p"
-    .string "Even BRUNO…\n"
-    .string "He trained with a fellow by the\l"
-    .string "name of BRAWLY before.$"
-
-Text_18CFFB:: @ 818CFFB
-    .string "Do you know anything about this\n"
-    .string "stone chamber?$"
-
-Text_18D02A:: @ 818D02A
-    .string "That was uncalled for.\n"
-    .string "You didn't have to be so rough.$"
-
-Text_18D061:: @ 818D061
-    .string "The TANOBY RUINS date back at\n"
-    .string "least 1,500 years.\p"
-    .string "But it's a baffling mystery as to\n"
-    .string "why it was built in the first place.$"
-
-Text_18D0D9:: @ 818D0D9
-    .string "A mystic POKéMON is said to sleep\n"
-    .string "inside here.$"
-
-Text_18D108:: @ 818D108
-    .string "I'm not much good in battle.$"
-
-Text_18D125:: @ 818D125
-    .string "I hear there are other ruins like\n"
-    .string "the one here.\p"
-    .string "Might they be the resting places\n"
-    .string "of other mystic POKéMON?$"
-
-Text_18D18F:: @ 818D18F
-    .string "CLIFFORD is teaching me how to\n"
-    .string "paint.$"
-
-Text_18D1B5:: @ 818D1B5
-    .string "We might get in trouble for being\n"
-    .string "noisy here.$"
-
-Text_18D1E3:: @ 818D1E3
-    .string "I said that I wanted to paint an\n"
-    .string "old building.\p"
-    .string "So CLIFFORD brought me here.$"
-
-Text_18D22F:: @ 818D22F
-    .string "Today, in addition to our lesson,\n"
-    .string "we came to see the chamber.$"
-
-Text_18D26D:: @ 818D26D
-    .string "My, how extraordinary.$"
-
-Text_18D284:: @ 818D284
-    .string "Ah, so you are studying POKéMON\n"
-    .string "on your own…\p"
-    .string "Yes, you certainly are quite the\n"
-    .string "extraordinary person, indeed.$"
-
 gUnknown_818D2F0:: @ 818D2F0
     .string "MOM: …Right.\n"
     .string "All boys leave home someday.\l"
diff --git a/data/maps/PokemonLeague_AgathasRoom/map.json b/data/maps/PokemonLeague_AgathasRoom/map.json
index 064480ba0..f71b81bf0 100644
--- a/data/maps/PokemonLeague_AgathasRoom/map.json
+++ b/data/maps/PokemonLeague_AgathasRoom/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "PokemonLeague_AgathasRoom_EventScript_162877",
+      "script": "PokemonLeague_AgathasRoom_EventScript_Agatha",
       "flag": "0"
     }
   ],
diff --git a/data/maps/PokemonLeague_AgathasRoom/scripts.inc b/data/maps/PokemonLeague_AgathasRoom/scripts.inc
index 62293c1ec..202b9fda4 100644
--- a/data/maps/PokemonLeague_AgathasRoom/scripts.inc
+++ b/data/maps/PokemonLeague_AgathasRoom/scripts.inc
@@ -7,86 +7,84 @@ PokemonLeague_AgathasRoom_MapScripts:: @ 8162810
 
 PokemonLeague_AgathasRoom_OnResume:: @ 8162825
 	setvar VAR_0x8004, 2
-	call EventScript_1A75D5
+	call PokemonLeague_EventScript_DoLightingEffect
 	end
 
 PokemonLeague_AgathasRoom_OnLoad:: @ 8162830
-	call_if_set FLAG_DEFEATED_AGATHA, EventScript_16284B
+	call_if_set FLAG_DEFEATED_AGATHA, PokemonLeague_AgathasRoom_EventScript_SetDoorOpen
 	compare VAR_MAP_SCENE_POKEMON_LEAGUE, 3
-	call_if_eq EventScript_162845
+	call_if_eq PokemonLeague_AgathasRoom_EventScript_CloseEntry
 	end
 
-EventScript_162845:: @ 8162845
-	call EventScript_1A759C
+PokemonLeague_AgathasRoom_EventScript_CloseEntry:: @ 8162845
+	call PokemonLeague_EventScript_CloseEntry
 	return
 
-EventScript_16284B:: @ 816284B
-	call EventScript_1A7538
+PokemonLeague_AgathasRoom_EventScript_SetDoorOpen:: @ 816284B
+	call PokemonLeague_EventScript_SetDoorOpen
 	return
 
 PokemonLeague_AgathasRoom_OnWarp:: @ 8162851
-	map_script_2 VAR_TEMP_1, 0, EventScript_16285B
+	map_script_2 VAR_TEMP_1, 0, PokemonLeague_AgathasRoom_EventScript_TurnPlayerNorth
 	.2byte 0
 
-EventScript_16285B:: @ 816285B
+PokemonLeague_AgathasRoom_EventScript_TurnPlayerNorth:: @ 816285B
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
 PokemonLeague_AgathasRoom_OnFrame:: @ 8162860
-	map_script_2 VAR_MAP_SCENE_POKEMON_LEAGUE, 2, EventScript_16286A
+	map_script_2 VAR_MAP_SCENE_POKEMON_LEAGUE, 2, PokemonLeague_AgathasRoom_EventScript_EnterRoom
 	.2byte 0
 
-EventScript_16286A:: @ 816286A
+PokemonLeague_AgathasRoom_EventScript_EnterRoom:: @ 816286A
 	lockall
-	call EventScript_1A751F
+	call PokemonLeague_EventScript_EnterRoom
 	setvar VAR_MAP_SCENE_POKEMON_LEAGUE, 3
 	releaseall
 	end
 
-PokemonLeague_AgathasRoom_EventScript_162877:: @ 8162877
+PokemonLeague_AgathasRoom_EventScript_Agatha:: @ 8162877
 	lock
 	faceplayer
 	famechecker FAMECHECKER_AGATHA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
-	goto_if_set FLAG_DEFEATED_AGATHA, EventScript_162911
+	goto_if_set FLAG_DEFEATED_AGATHA, PokemonLeague_AgathasRoom_EventScript_PostBattle
 	famechecker FAMECHECKER_AGATHA, 0
 	famechecker FAMECHECKER_AGATHA, 4
 	famechecker FAMECHECKER_OAK, 4
-	call_if_unset FLAG_SYS_GAME_CLEAR, EventScript_1628E9
-	call_if_set FLAG_SYS_GAME_CLEAR, EventScript_1628F2
+	call_if_unset FLAG_SYS_GAME_CLEAR, PokemonLeague_AgathasRoom_EventScript_Intro
+	call_if_set FLAG_SYS_GAME_CLEAR, PokemonLeague_AgathasRoom_EventScript_RematchIntro
 	setflag FLAG_TEMP_3
 	setflag FLAG_TEMP_5
-	call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, EventScript_1628FB
-	call_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_162906
+	call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, PokemonLeague_AgathasRoom_EventScript_Battle
+	call_if_set FLAG_SYS_CAN_LINK_WITH_RS, PokemonLeague_AgathasRoom_EventScript_Rematch
 	clearflag FLAG_TEMP_5
-	goto EventScript_16291B
-
-EventScript_1628E8:: @ 81628E8
+	goto PokemonLeague_AgathasRoom_EventScript_DefeatedAgatha
 	end
 
-EventScript_1628E9:: @ 81628E9
-	msgbox gUnknown_817844D
+PokemonLeague_AgathasRoom_EventScript_Intro:: @ 81628E9
+	msgbox PokemonLeague_AgathasRoom_Text_Intro
 	return
 
-EventScript_1628F2:: @ 81628F2
-	msgbox gUnknown_817858D
+PokemonLeague_AgathasRoom_EventScript_RematchIntro:: @ 81628F2
+	msgbox PokemonLeague_AgathasRoom_Text_RematchIntro
 	return
 
-EventScript_1628FB:: @ 81628FB
-	trainerbattle_no_intro TRAINER_ELITE_FOUR_AGATHA, Text_1786D7
+PokemonLeague_AgathasRoom_EventScript_Battle:: @ 81628FB
+	trainerbattle_no_intro TRAINER_ELITE_FOUR_AGATHA, PokemonLeague_AgathasRoom_Text_Defeat
 	return
 
-EventScript_162906:: @ 8162906
-	trainerbattle_no_intro TRAINER_ELITE_FOUR_AGATHA_2, Text_1786D7
+PokemonLeague_AgathasRoom_EventScript_Rematch:: @ 8162906
+	trainerbattle_no_intro TRAINER_ELITE_FOUR_AGATHA_2, PokemonLeague_AgathasRoom_Text_Defeat
 	return
 
-EventScript_162911:: @ 8162911
-	msgbox gUnknown_8178700
+PokemonLeague_AgathasRoom_EventScript_PostBattle:: @ 8162911
+	msgbox PokemonLeague_AgathasRoom_Text_PostBattle
 	release
 	end
 
-EventScript_16291B:: @ 816291B
+PokemonLeague_AgathasRoom_EventScript_DefeatedAgatha:: @ 816291B
 	setflag FLAG_DEFEATED_AGATHA
-	call EventScript_1A7506
-	msgbox gUnknown_8178700
+	call PokemonLeague_EventScript_OpenDoor
+	msgbox PokemonLeague_AgathasRoom_Text_PostBattle
 	release
 	end
diff --git a/data/maps/PokemonLeague_AgathasRoom/text.inc b/data/maps/PokemonLeague_AgathasRoom/text.inc
index 8a29f185d..06a8af142 100644
--- a/data/maps/PokemonLeague_AgathasRoom/text.inc
+++ b/data/maps/PokemonLeague_AgathasRoom/text.inc
@@ -1,4 +1,4 @@
-gUnknown_817844D:: @ 817844D
+PokemonLeague_AgathasRoom_Text_Intro:: @ 817844D
     .string "I am AGATHA of the ELITE FOUR.\p"
     .string "I hear OAK's taken a lot of\n"
     .string "interest in you, child.\p"
@@ -13,7 +13,7 @@ gUnknown_817844D:: @ 817844D
     .string "{PLAYER}! I'll show you how a real\n"
     .string "TRAINER battles!{PLAY_BGM}{MUS_EXEYE}$"
 
-gUnknown_817858D:: @ 817858D
+PokemonLeague_AgathasRoom_Text_RematchIntro:: @ 817858D
     .string "I am AGATHA of the ELITE FOUR.\p"
     .string "You're the child that OAK's taken\n"
     .string "under his wing, aren't you?\p"
@@ -28,11 +28,11 @@ gUnknown_817858D:: @ 817858D
     .string "{PLAYER}! I'll show you how a real\n"
     .string "TRAINER battles!{PLAY_BGM}{MUS_EXEYE}$"
 
-Text_1786D7:: @ 81786D7
+PokemonLeague_AgathasRoom_Text_Defeat:: @ 81786D7
     .string "Oh, my!\n"
     .string "You're something special, child!$"
 
-gUnknown_8178700:: @ 8178700
+PokemonLeague_AgathasRoom_Text_PostBattle:: @ 8178700
     .string "You win!\p"
     .string "I see what the old duff sees in\n"
     .string "you now.\p"
diff --git a/data/maps/PokemonLeague_BrunosRoom/map.json b/data/maps/PokemonLeague_BrunosRoom/map.json
index 29e23f75c..a84a63e19 100644
--- a/data/maps/PokemonLeague_BrunosRoom/map.json
+++ b/data/maps/PokemonLeague_BrunosRoom/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "PokemonLeague_BrunosRoom_EventScript_1626EC",
+      "script": "PokemonLeague_BrunosRoom_EventScript_Bruno",
       "flag": "0"
     }
   ],
diff --git a/data/maps/PokemonLeague_BrunosRoom/scripts.inc b/data/maps/PokemonLeague_BrunosRoom/scripts.inc
index 709b5ab03..123c73f51 100644
--- a/data/maps/PokemonLeague_BrunosRoom/scripts.inc
+++ b/data/maps/PokemonLeague_BrunosRoom/scripts.inc
@@ -7,118 +7,116 @@ PokemonLeague_BrunosRoom_MapScripts:: @ 8162685
 
 PokemonLeague_BrunosRoom_OnResume:: @ 816269A
 	setvar VAR_0x8004, 1
-	call EventScript_1A75D5
+	call PokemonLeague_EventScript_DoLightingEffect
 	end
 
 PokemonLeague_BrunosRoom_OnLoad:: @ 81626A5
-	call_if_set FLAG_DEFEATED_BRUNO, EventScript_1626C0
+	call_if_set FLAG_DEFEATED_BRUNO, PokemonLeague_BrunosRoom_EventScript_SetDoorOpen
 	compare VAR_MAP_SCENE_POKEMON_LEAGUE, 2
-	call_if_eq EventScript_1626BA
+	call_if_eq PokemonLeague_BrunosRoom_EventScript_CloseEntry
 	end
 
-EventScript_1626BA:: @ 81626BA
-	call EventScript_1A759C
+PokemonLeague_BrunosRoom_EventScript_CloseEntry:: @ 81626BA
+	call PokemonLeague_EventScript_CloseEntry
 	return
 
-EventScript_1626C0:: @ 81626C0
-	call EventScript_1A7538
+PokemonLeague_BrunosRoom_EventScript_SetDoorOpen:: @ 81626C0
+	call PokemonLeague_EventScript_SetDoorOpen
 	return
 
 PokemonLeague_BrunosRoom_OnWarp:: @ 81626C6
-	map_script_2 VAR_TEMP_1, 0, EventScript_1626D0
+	map_script_2 VAR_TEMP_1, 0, PokemonLeague_BrunosRoom_EventScript_TurnPlayerNorth
 	.2byte 0
 
-EventScript_1626D0:: @ 81626D0
+PokemonLeague_BrunosRoom_EventScript_TurnPlayerNorth:: @ 81626D0
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
 PokemonLeague_BrunosRoom_OnFrame:: @ 81626D5
-	map_script_2 VAR_MAP_SCENE_POKEMON_LEAGUE, 1, EventScript_1626DF
+	map_script_2 VAR_MAP_SCENE_POKEMON_LEAGUE, 1, PokemonLeague_BrunosRoom_EventScript_EnterRoom
 	.2byte 0
 
-EventScript_1626DF:: @ 81626DF
+PokemonLeague_BrunosRoom_EventScript_EnterRoom:: @ 81626DF
 	lockall
-	call EventScript_1A751F
+	call PokemonLeague_EventScript_EnterRoom
 	setvar VAR_MAP_SCENE_POKEMON_LEAGUE, 2
 	releaseall
 	end
 
-PokemonLeague_BrunosRoom_EventScript_1626EC:: @ 81626EC
+PokemonLeague_BrunosRoom_EventScript_Bruno:: @ 81626EC
 	lock
 	faceplayer
 	famechecker FAMECHECKER_BRUNO, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
-	goto_if_set FLAG_DEFEATED_BRUNO, EventScript_162779
+	goto_if_set FLAG_DEFEATED_BRUNO, PokemonLeague_BrunosRoom_EventScript_PostBattle
 	famechecker FAMECHECKER_BRUNO, 0
 	famechecker FAMECHECKER_BRUNO, 1
-	call_if_unset FLAG_SYS_GAME_CLEAR, EventScript_162751
-	call_if_set FLAG_SYS_GAME_CLEAR, EventScript_16275A
+	call_if_unset FLAG_SYS_GAME_CLEAR, PokemonLeague_BrunosRoom_EventScript_Intro
+	call_if_set FLAG_SYS_GAME_CLEAR, PokemonLeague_BrunosRoom_EventScript_RematchIntro
 	setflag FLAG_TEMP_3
 	setflag FLAG_TEMP_5
-	call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, EventScript_162763
-	call_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_16276E
+	call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, PokemonLeague_BrunosRoom_EventScript_Battle
+	call_if_set FLAG_SYS_CAN_LINK_WITH_RS, PokemonLeague_BrunosRoom_EventScript_Rematch
 	clearflag FLAG_TEMP_5
-	goto EventScript_1627B0
-
-EventScript_162750:: @ 8162750
+	goto PokemonLeague_BrunosRoom_EventScript_DefeatedBruno
 	end
 
-EventScript_162751:: @ 8162751
-	msgbox gUnknown_817820F
+PokemonLeague_BrunosRoom_EventScript_Intro:: @ 8162751
+	msgbox PokemonLeague_BrunosRoom_Text_Intro
 	return
 
-EventScript_16275A:: @ 816275A
-	msgbox gUnknown_817830C
+PokemonLeague_BrunosRoom_EventScript_RematchIntro:: @ 816275A
+	msgbox PokemonLeague_BrunosRoom_Text_RematchIntro
 	return
 
-EventScript_162763:: @ 8162763
-	trainerbattle_no_intro TRAINER_ELITE_FOUR_BRUNO, Text_178409
+PokemonLeague_BrunosRoom_EventScript_Battle:: @ 8162763
+	trainerbattle_no_intro TRAINER_ELITE_FOUR_BRUNO, PokemonLeague_BrunosRoom_Text_Defeat
 	return
 
-EventScript_16276E:: @ 816276E
-	trainerbattle_no_intro TRAINER_ELITE_FOUR_BRUNO_2, Text_178409
+PokemonLeague_BrunosRoom_EventScript_Rematch:: @ 816276E
+	trainerbattle_no_intro TRAINER_ELITE_FOUR_BRUNO_2, PokemonLeague_BrunosRoom_Text_Defeat
 	return
 
-EventScript_162779:: @ 8162779
-	msgbox gUnknown_8178420
+PokemonLeague_BrunosRoom_EventScript_PostBattle:: @ 8162779
+	msgbox PokemonLeague_BrunosRoom_Text_PostBattle
 	closemessage
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq EventScript_1627FA
+	call_if_eq PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayRight
 	compare VAR_FACING, DIR_SOUTH
-	call_if_eq EventScript_1627EF
+	call_if_eq PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayLeft
 	compare VAR_FACING, DIR_WEST
-	call_if_eq EventScript_162805
+	call_if_eq PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayDown
 	compare VAR_FACING, DIR_EAST
-	call_if_eq EventScript_162805
+	call_if_eq PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayDown
 	release
 	end
 
-EventScript_1627B0:: @ 81627B0
+PokemonLeague_BrunosRoom_EventScript_DefeatedBruno:: @ 81627B0
 	setflag FLAG_DEFEATED_BRUNO
-	call EventScript_1A7506
-	msgbox gUnknown_8178420
+	call PokemonLeague_EventScript_OpenDoor
+	msgbox PokemonLeague_BrunosRoom_Text_PostBattle
 	closemessage
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq EventScript_1627FA
+	call_if_eq PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayRight
 	compare VAR_FACING, DIR_SOUTH
-	call_if_eq EventScript_1627EF
+	call_if_eq PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayLeft
 	compare VAR_FACING, DIR_WEST
-	call_if_eq EventScript_162805
+	call_if_eq PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayDown
 	compare VAR_FACING, DIR_EAST
-	call_if_eq EventScript_162805
+	call_if_eq PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayDown
 	release
 	end
 
-EventScript_1627EF:: @ 81627EF
+PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayLeft:: @ 81627EF
 	applymovement 1, Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
-EventScript_1627FA:: @ 81627FA
+PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayRight:: @ 81627FA
 	applymovement 1, Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
-EventScript_162805:: @ 8162805
+PokemonLeague_BrunosRoom_EventScript_BrunoLookAwayDown:: @ 8162805
 	applymovement 1, Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
diff --git a/data/maps/PokemonLeague_BrunosRoom/text.inc b/data/maps/PokemonLeague_BrunosRoom/text.inc
index 57c66a96b..4c6cb4561 100644
--- a/data/maps/PokemonLeague_BrunosRoom/text.inc
+++ b/data/maps/PokemonLeague_BrunosRoom/text.inc
@@ -1,4 +1,4 @@
-gUnknown_817820F:: @ 817820F
+PokemonLeague_BrunosRoom_Text_Intro:: @ 817820F
     .string "I am BRUNO of the ELITE FOUR!\p"
     .string "Through rigorous training, people\n"
     .string "and POKéMON can become stronger\l"
@@ -11,7 +11,7 @@ gUnknown_817820F:: @ 817820F
     .string "superior power!\p"
     .string "Hoo hah!{PLAY_BGM}{MUS_EXEYE}$"
 
-gUnknown_817830C:: @ 817830C
+PokemonLeague_BrunosRoom_Text_RematchIntro:: @ 817830C
     .string "I am BRUNO of the ELITE FOUR!\p"
     .string "Through rigorous training, people\n"
     .string "and POKéMON can become stronger\l"
@@ -24,11 +24,11 @@ gUnknown_817830C:: @ 817830C
     .string "superior power!\p"
     .string "Hoo hah!{PLAY_BGM}{MUS_EXEYE}$"
 
-Text_178409:: @ 8178409
+PokemonLeague_BrunosRoom_Text_Defeat:: @ 8178409
     .string "Why?\n"
     .string "How could I lose?$"
 
-gUnknown_8178420:: @ 8178420
+PokemonLeague_BrunosRoom_Text_PostBattle:: @ 8178420
     .string "My job is done.\n"
     .string "Go face your next challenge.$"
 
diff --git a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc
index bf0283a1f..2821da205 100644
--- a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc
+++ b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc
@@ -1,3 +1,6 @@
+.equ LOCALID_RIVAL,    1
+.equ LOCALID_PROF_OAK, 2
+
 PokemonLeague_ChampionsRoom_MapScripts:: @ 8162AE2
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PokemonLeague_ChampionsRoom_OnWarp
 	map_script MAP_SCRIPT_ON_RESUME, PokemonLeague_ChampionsRoom_OnResume
@@ -6,91 +9,91 @@ PokemonLeague_ChampionsRoom_MapScripts:: @ 8162AE2
 
 PokemonLeague_ChampionsRoom_OnResume:: @ 8162AF2
 	setvar VAR_0x8004, 4
-	call EventScript_1A75D5
+	call PokemonLeague_EventScript_DoLightingEffect
 	compare VAR_STARTER_MON, 2
-	call_if_eq EventScript_162B1E
+	call_if_eq PokemonLeague_ChampionsRoom_EventScript_CheckStopTriggerSquirtle
 	compare VAR_STARTER_MON, 1
-	call_if_eq EventScript_162B31
+	call_if_eq PokemonLeague_ChampionsRoom_EventScript_CheckStopTriggerBulbasaur
 	compare VAR_STARTER_MON, 0
-	call_if_eq EventScript_162B44
+	call_if_eq PokemonLeague_ChampionsRoom_EventScript_CheckStopTriggerCharmander
 	end
 
-EventScript_162B1E:: @ 8162B1E
-	goto_if_defeated TRAINER_CHAMPION_FIRST_SQUIRTLE, EventScript_162B57
-	goto_if_defeated TRAINER_CHAMPION_REMATCH_SQUIRTLE, EventScript_162B57
+PokemonLeague_ChampionsRoom_EventScript_CheckStopTriggerSquirtle:: @ 8162B1E
+	goto_if_defeated TRAINER_CHAMPION_FIRST_SQUIRTLE, PokemonLeague_ChampionsRoom_EventScript_StopSceneTrigger
+	goto_if_defeated TRAINER_CHAMPION_REMATCH_SQUIRTLE, PokemonLeague_ChampionsRoom_EventScript_StopSceneTrigger
 	return
 
-EventScript_162B31:: @ 8162B31
-	goto_if_defeated TRAINER_CHAMPION_FIRST_BULBASAUR, EventScript_162B57
-	goto_if_defeated TRAINER_CHAMPION_REMATCH_BULBASAUR, EventScript_162B57
+PokemonLeague_ChampionsRoom_EventScript_CheckStopTriggerBulbasaur:: @ 8162B31
+	goto_if_defeated TRAINER_CHAMPION_FIRST_BULBASAUR, PokemonLeague_ChampionsRoom_EventScript_StopSceneTrigger
+	goto_if_defeated TRAINER_CHAMPION_REMATCH_BULBASAUR, PokemonLeague_ChampionsRoom_EventScript_StopSceneTrigger
 	return
 
-EventScript_162B44:: @ 8162B44
-	goto_if_defeated TRAINER_CHAMPION_FIRST_CHARMANDER, EventScript_162B57
-	goto_if_defeated TRAINER_CHAMPION_REMATCH_CHARMANDER, EventScript_162B57
+PokemonLeague_ChampionsRoom_EventScript_CheckStopTriggerCharmander:: @ 8162B44
+	goto_if_defeated TRAINER_CHAMPION_FIRST_CHARMANDER, PokemonLeague_ChampionsRoom_EventScript_StopSceneTrigger
+	goto_if_defeated TRAINER_CHAMPION_REMATCH_CHARMANDER, PokemonLeague_ChampionsRoom_EventScript_StopSceneTrigger
 	return
 
-EventScript_162B57:: @ 8162B57
+PokemonLeague_ChampionsRoom_EventScript_StopSceneTrigger:: @ 8162B57
 	setvar VAR_TEMP_1, 1
 	return
 
 PokemonLeague_ChampionsRoom_OnWarp:: @ 8162B5D
-	map_script_2 VAR_TEMP_1, 0, EventScript_162B67
+	map_script_2 VAR_TEMP_1, 0, PokemonLeague_ChampionsRoom_EventScript_TurnPlayerNorth
 	.2byte 0
 
-EventScript_162B67:: @ 8162B67
+PokemonLeague_ChampionsRoom_EventScript_TurnPlayerNorth:: @ 8162B67
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
 PokemonLeague_ChampionsRoom_OnFrame:: @ 8162B6C
-	map_script_2 VAR_TEMP_1, 0, EventScript_162B76
+	map_script_2 VAR_TEMP_1, 0, PokemonLeague_ChampionsRoom_EventScript_EnterRoom
 	.2byte 0
 
-EventScript_162B76:: @ 8162B76
+PokemonLeague_ChampionsRoom_EventScript_EnterRoom:: @ 8162B76
 	lockall
 	textcolor 0
 	setflag FLAG_TEMP_2
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_162D07
+	applymovement OBJ_EVENT_ID_PLAYER, PokemonLeague_ChampionsRoom_Movement_PlayerEnter
 	waitmovement 0
 	delay 20
-	call_if_unset FLAG_SYS_GAME_CLEAR, EventScript_162CB3
-	call_if_set FLAG_SYS_GAME_CLEAR, EventScript_162CBC
-	goto_if_questlog EventScript_162C68
+	call_if_unset FLAG_SYS_GAME_CLEAR, PokemonLeague_ChampionsRoom_EventScript_Intro
+	call_if_set FLAG_SYS_GAME_CLEAR, PokemonLeague_ChampionsRoom_EventScript_RematchIntro
+	goto_if_questlog PokemonLeague_ChampionsRoom_EventScript_QuestLogEnd
 	setflag FLAG_TEMP_3
 	setflag FLAG_TEMP_5
 	savebgm MUS_WIN_GYM
-	call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, EventScript_162C6F
-	call_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_162C91
+	call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, PokemonLeague_ChampionsRoom_EventScript_Battle
+	call_if_set FLAG_SYS_CAN_LINK_WITH_RS, PokemonLeague_ChampionsRoom_EventScript_Rematch
 	setflag FLAG_TEMP_4
 	clearflag FLAG_TEMP_5
 	setflag FLAG_DEFEATED_CHAMP
 	setflag FLAG_TEMP_4
-	msgbox gUnknown_8178F2F
+	msgbox PokemonLeague_ChampionsRoom_Text_PostBattle
 	playbgm MUS_SLOWMASARA, 0
-	addobject 2
-	msgbox gUnknown_8178FC6
+	addobject LOCALID_PROF_OAK
+	msgbox PokemonLeague_ChampionsRoom_Text_OakPlayer
 	closemessage
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_162D1F
-	applymovement 1, Movement_162D41
-	applymovement 2, Movement_162D2A
+	applymovement OBJ_EVENT_ID_PLAYER, PokemonLeague_ChampionsRoom_Movement_PlayerWatchOakEnter
+	applymovement LOCALID_RIVAL, PokemonLeague_ChampionsRoom_Movement_RivalWatchOakEnter
+	applymovement LOCALID_PROF_OAK, PokemonLeague_ChampionsRoom_Movement_OakEnter
 	waitmovement 0
 	delay 25
 	specialvar VAR_RESULT, ScrSpecial_GetStarter
 	getspeciesname 0, VAR_RESULT
-	msgbox gUnknown_8178FCF
-	applymovement 2, Movement_WalkInPlaceFastestRight
-	applymovement 1, Movement_WalkInPlaceFastestLeft
+	msgbox PokemonLeague_ChampionsRoom_Text_OakCongratulations
+	applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestRight
+	applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestLeft
 	waitmovement 0
-	msgbox gUnknown_817908F
+	msgbox PokemonLeague_ChampionsRoom_Text_OakImDisappointedRival
 	closemessage
-	applymovement 2, Movement_WalkInPlaceFastestDown
+	applymovement LOCALID_PROF_OAK, Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	delay 20
-	msgbox gUnknown_81791A3
+	msgbox PokemonLeague_ChampionsRoom_Text_OakPlayerComeWithMe
 	closemessage
 	delay 13
-	applymovement 2, Movement_162D37
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_162D12
+	applymovement LOCALID_PROF_OAK, PokemonLeague_ChampionsRoom_Movement_OakExit
+	applymovement OBJ_EVENT_ID_PLAYER, PokemonLeague_ChampionsRoom_Movement_PlayerExit
 	waitmovement 0
 	setvar VAR_TEMP_1, 1
 	warp MAP_POKEMON_LEAGUE_HALL_OF_FAME, 255, 5, 12
@@ -98,62 +101,62 @@ EventScript_162B76:: @ 8162B76
 	releaseall
 	end
 
-EventScript_162C68:: @ 8162C68
-	call EventScript_162B57
+PokemonLeague_ChampionsRoom_EventScript_QuestLogEnd:: @ 8162C68
+	call PokemonLeague_ChampionsRoom_EventScript_StopSceneTrigger
 	releaseall
 	end
 
-EventScript_162C6F:: @ 8162C6F
+PokemonLeague_ChampionsRoom_EventScript_Battle:: @ 8162C6F
 	compare VAR_STARTER_MON, 2
-	call_if_eq EventScript_162CC5
+	call_if_eq PokemonLeague_ChampionsRoom_EventScript_BattleSquirtle
 	compare VAR_STARTER_MON, 1
-	call_if_eq EventScript_162CD0
+	call_if_eq PokemonLeague_ChampionsRoom_EventScript_BattleBulbasaur
 	compare VAR_STARTER_MON, 0
-	call_if_eq EventScript_162CDB
+	call_if_eq PokemonLeague_ChampionsRoom_EventScript_BattleCharmander
 	return
 
-EventScript_162C91:: @ 8162C91
+PokemonLeague_ChampionsRoom_EventScript_Rematch:: @ 8162C91
 	compare VAR_STARTER_MON, 2
-	call_if_eq EventScript_162CE6
+	call_if_eq PokemonLeague_ChampionsRoom_EventScript_RematchSquirtle
 	compare VAR_STARTER_MON, 1
-	call_if_eq EventScript_162CF1
+	call_if_eq PokemonLeague_ChampionsRoom_EventScript_RematchBulbasaur
 	compare VAR_STARTER_MON, 0
-	call_if_eq EventScript_162CFC
+	call_if_eq PokemonLeague_ChampionsRoom_EventScript_RematchCharmander
 	return
 
-EventScript_162CB3:: @ 8162CB3
-	msgbox gUnknown_8178B6C
+PokemonLeague_ChampionsRoom_EventScript_Intro:: @ 8162CB3
+	msgbox PokemonLeague_ChampionsRoom_Text_Intro
 	return
 
-EventScript_162CBC:: @ 8162CBC
-	msgbox gUnknown_8178CD4
+PokemonLeague_ChampionsRoom_EventScript_RematchIntro:: @ 8162CBC
+	msgbox PokemonLeague_ChampionsRoom_Text_RematchIntro
 	return
 
-EventScript_162CC5:: @ 8162CC5
-	trainerbattle_no_intro TRAINER_CHAMPION_FIRST_SQUIRTLE, Text_178E3F
+PokemonLeague_ChampionsRoom_EventScript_BattleSquirtle:: @ 8162CC5
+	trainerbattle_no_intro TRAINER_CHAMPION_FIRST_SQUIRTLE, PokemonLeague_ChampionsRoom_Text_Defeat
 	return
 
-EventScript_162CD0:: @ 8162CD0
-	trainerbattle_no_intro TRAINER_CHAMPION_FIRST_BULBASAUR, Text_178E3F
+PokemonLeague_ChampionsRoom_EventScript_BattleBulbasaur:: @ 8162CD0
+	trainerbattle_no_intro TRAINER_CHAMPION_FIRST_BULBASAUR, PokemonLeague_ChampionsRoom_Text_Defeat
 	return
 
-EventScript_162CDB:: @ 8162CDB
-	trainerbattle_no_intro TRAINER_CHAMPION_FIRST_CHARMANDER, Text_178E3F
+PokemonLeague_ChampionsRoom_EventScript_BattleCharmander:: @ 8162CDB
+	trainerbattle_no_intro TRAINER_CHAMPION_FIRST_CHARMANDER, PokemonLeague_ChampionsRoom_Text_Defeat
 	return
 
-EventScript_162CE6:: @ 8162CE6
-	trainerbattle_no_intro TRAINER_CHAMPION_REMATCH_SQUIRTLE, Text_178E3F
+PokemonLeague_ChampionsRoom_EventScript_RematchSquirtle:: @ 8162CE6
+	trainerbattle_no_intro TRAINER_CHAMPION_REMATCH_SQUIRTLE, PokemonLeague_ChampionsRoom_Text_Defeat
 	return
 
-EventScript_162CF1:: @ 8162CF1
-	trainerbattle_no_intro TRAINER_CHAMPION_REMATCH_BULBASAUR, Text_178E3F
+PokemonLeague_ChampionsRoom_EventScript_RematchBulbasaur:: @ 8162CF1
+	trainerbattle_no_intro TRAINER_CHAMPION_REMATCH_BULBASAUR, PokemonLeague_ChampionsRoom_Text_Defeat
 	return
 
-EventScript_162CFC:: @ 8162CFC
-	trainerbattle_no_intro TRAINER_CHAMPION_REMATCH_CHARMANDER, Text_178E3F
+PokemonLeague_ChampionsRoom_EventScript_RematchCharmander:: @ 8162CFC
+	trainerbattle_no_intro TRAINER_CHAMPION_REMATCH_CHARMANDER, PokemonLeague_ChampionsRoom_Text_Defeat
 	return
 
-Movement_162D07:: @ 8162D07
+PokemonLeague_ChampionsRoom_Movement_PlayerEnter:: @ 8162D07
 	walk_up
 	walk_up
 	walk_up
@@ -166,7 +169,7 @@ Movement_162D07:: @ 8162D07
 	walk_up
 	step_end
 
-Movement_162D12:: @ 8162D12
+PokemonLeague_ChampionsRoom_Movement_PlayerExit:: @ 8162D12
 	delay_16
 	walk_left
 	walk_up
@@ -181,7 +184,7 @@ Movement_162D12:: @ 8162D12
 	set_invisible
 	step_end
 
-Movement_162D1F:: @ 8162D1F
+PokemonLeague_ChampionsRoom_Movement_PlayerWatchOakEnter:: @ 8162D1F
 	delay_8
 	walk_in_place_fastest_down
 	delay_16
@@ -194,7 +197,7 @@ Movement_162D1F:: @ 8162D1F
 	walk_in_place_fastest_left
 	step_end
 
-Movement_162D2A:: @ 8162D2A
+PokemonLeague_ChampionsRoom_Movement_OakEnter:: @ 8162D2A
 	delay_16
 	delay_16
 	walk_up
@@ -209,7 +212,7 @@ Movement_162D2A:: @ 8162D2A
 	delay_16
 	step_end
 
-Movement_162D37:: @ 8162D37
+PokemonLeague_ChampionsRoom_Movement_OakExit:: @ 8162D37
 	walk_up
 	walk_up
 	walk_right
@@ -221,7 +224,7 @@ Movement_162D37:: @ 8162D37
 	set_invisible
 	step_end
 
-Movement_162D41:: @ 8162D41
+PokemonLeague_ChampionsRoom_Movement_RivalWatchOakEnter:: @ 8162D41
 	delay_16
 	delay_16
 	delay_16
diff --git a/data/maps/PokemonLeague_ChampionsRoom/text.inc b/data/maps/PokemonLeague_ChampionsRoom/text.inc
index a99db09db..19ba16fa3 100644
--- a/data/maps/PokemonLeague_ChampionsRoom/text.inc
+++ b/data/maps/PokemonLeague_ChampionsRoom/text.inc
@@ -1,4 +1,4 @@
-gUnknown_8178B6C:: @ 8178B6C
+PokemonLeague_ChampionsRoom_Text_Intro:: @ 8178B6C
     .string "{RIVAL}: Hey, {PLAYER}!\p"
     .string "I was looking forward to seeing\n"
     .string "you, {PLAYER}.\p"
@@ -16,7 +16,7 @@ gUnknown_8178B6C:: @ 8178B6C
     .string "I am the most powerful TRAINER in\n"
     .string "the world!$"
 
-gUnknown_8178CD4:: @ 8178CD4
+PokemonLeague_ChampionsRoom_Text_RematchIntro:: @ 8178CD4
     .string "{RIVAL}: Hey, {PLAYER}!\p"
     .string "You came back, {PLAYER}!\n"
     .string "Hahah, that is so great!\p"
@@ -34,7 +34,7 @@ gUnknown_8178CD4:: @ 8178CD4
     .string "I am the most powerful TRAINER in\n"
     .string "the world!$"
 
-Text_178E3F:: @ 8178E3F
+PokemonLeague_ChampionsRoom_Text_Defeat:: @ 8178E3F
     .string "NO!\n"
     .string "That can't be!\l"
     .string "You beat me at my best!\p"
@@ -43,7 +43,7 @@ Text_178E3F:: @ 8178E3F
     .string "My reign is over already?\n"
     .string "It's not fair!$"
 
-Text_178EC3:: @ 8178EC3
+PokemonLeague_ChampionsRoom_Text_Victory:: @ 8178EC3
     .string "はーはッ！\n"
     .string "かった！　かった！　かった！\p"
     .string "{PLAYER}に　まける　ような\n"
@@ -54,7 +54,7 @@ Text_178EC3:: @ 8178EC3
     .string "ほめて　つかわす！\n"
     .string "はーッ！　はーはッはッ！$"
 
-gUnknown_8178F2F:: @ 8178F2F
+PokemonLeague_ChampionsRoom_Text_PostBattle:: @ 8178F2F
     .string "Why?\n"
     .string "Why did I lose?\p"
     .string "I never made any mistakes raising\n"
@@ -63,10 +63,10 @@ gUnknown_8178F2F:: @ 8178F2F
     .string "LEAGUE CHAMPION!\p"
     .string "Although I don't like to admit it…$"
 
-gUnknown_8178FC6:: @ 8178FC6
+PokemonLeague_ChampionsRoom_Text_OakPlayer:: @ 8178FC6
     .string "OAK: {PLAYER}!$"
 
-gUnknown_8178FCF:: @ 8178FCF
+PokemonLeague_ChampionsRoom_Text_OakCongratulations:: @ 8178FCF
     .string "OAK: So, you've won!\n"
     .string "Sincerely, congratulations!\p"
     .string "You're the new POKéMON LEAGUE\n"
@@ -76,7 +76,7 @@ gUnknown_8178FCF:: @ 8178FCF
     .string "on the POKéDEX.\p"
     .string "{PLAYER}, you have come of age!$"
 
-gUnknown_817908F:: @ 817908F
+PokemonLeague_ChampionsRoom_Text_OakImDisappointedRival:: @ 817908F
     .string "OAK: {RIVAL}…\n"
     .string "I'm disappointed in you.\p"
     .string "I came when I heard you'd beaten\n"
@@ -90,7 +90,7 @@ gUnknown_817908F:: @ 817908F
     .string "Without them, you will never\n"
     .string "become a CHAMP again!$"
 
-gUnknown_81791A3:: @ 81791A3
+PokemonLeague_ChampionsRoom_Text_OakPlayerComeWithMe:: @ 81791A3
     .string "OAK: {PLAYER}.\p"
     .string "You understand that your victory\n"
     .string "was not just your own doing.\p"
diff --git a/data/maps/PokemonLeague_HallOfFame/scripts.inc b/data/maps/PokemonLeague_HallOfFame/scripts.inc
index 080e65ece..de838a669 100644
--- a/data/maps/PokemonLeague_HallOfFame/scripts.inc
+++ b/data/maps/PokemonLeague_HallOfFame/scripts.inc
@@ -12,26 +12,26 @@ EventScript_162D61:: @ 8162D61
 	end
 
 PokemonLeague_HallOfFame_OnFrame:: @ 8162D66
-	map_script_2 VAR_TEMP_1, 0, EventScript_162D70
+	map_script_2 VAR_TEMP_1, 0, PokemonLeague_HallOfFame_EventScript_EnterRoom
 	.2byte 0
 
-EventScript_162D70:: @ 8162D70
+PokemonLeague_HallOfFame_EventScript_EnterRoom:: @ 8162D70
 	lockall
 	textcolor 0
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_162DCD
+	applymovement OBJ_EVENT_ID_PLAYER, PokemonLeague_HallOfFame_Movement_EnterRoom
 	waitmovement 0
 	applymovement 1, Movement_WalkInPlaceFastestLeft
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	delay 18
-	msgbox gUnknown_817922F
+	msgbox PokemonLeague_HallOfFame_Text_OakCongratulations
 	closemessage
 	applymovement 1, Movement_WalkInPlaceFastestUp
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	delay 20
-	dofieldeffect 62
-	waitfieldeffect 62
+	dofieldeffect FLDEFF_HALL_OF_FAME_RECORD
+	waitfieldeffect FLDEFF_HALL_OF_FAME_RECORD
 	delay 40
 	setvar VAR_TEMP_1, 1
 	call EventScript_1A651A
@@ -42,7 +42,7 @@ EventScript_162D70:: @ 8162D70
 	releaseall
 	end
 
-Movement_162DCD:: @ 8162DCD
+PokemonLeague_HallOfFame_Movement_EnterRoom:: @ 8162DCD
 	walk_up
 	walk_up
 	walk_up
diff --git a/data/maps/PokemonLeague_HallOfFame/text.inc b/data/maps/PokemonLeague_HallOfFame/text.inc
index 111f655cc..a5bc2e47a 100644
--- a/data/maps/PokemonLeague_HallOfFame/text.inc
+++ b/data/maps/PokemonLeague_HallOfFame/text.inc
@@ -1,4 +1,4 @@
-gUnknown_817922F:: @ 817922F
+PokemonLeague_HallOfFame_Text_OakCongratulations:: @ 817922F
     .string "OAK: Er-hem!\n"
     .string "Congratulations, {PLAYER}!\p"
     .string "This floor is the POKéMON HALL OF\n"
diff --git a/data/maps/PokemonLeague_LancesRoom/map.json b/data/maps/PokemonLeague_LancesRoom/map.json
index 3e9571b83..47f3651e5 100644
--- a/data/maps/PokemonLeague_LancesRoom/map.json
+++ b/data/maps/PokemonLeague_LancesRoom/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "PokemonLeague_LancesRoom_EventScript_162A14",
+      "script": "PokemonLeague_LancesRoom_EventScript_Lance",
       "flag": "0"
     }
   ],
diff --git a/data/maps/PokemonLeague_LancesRoom/scripts.inc b/data/maps/PokemonLeague_LancesRoom/scripts.inc
index 56619200c..2328a777c 100644
--- a/data/maps/PokemonLeague_LancesRoom/scripts.inc
+++ b/data/maps/PokemonLeague_LancesRoom/scripts.inc
@@ -7,41 +7,41 @@ PokemonLeague_LancesRoom_MapScripts:: @ 816292D
 
 PokemonLeague_LancesRoom_OnResume:: @ 8162942
 	setvar VAR_0x8004, 3
-	call EventScript_1A75D5
+	call PokemonLeague_EventScript_DoLightingEffect
 	end
 
 PokemonLeague_LancesRoom_OnLoad:: @ 816294D
 	compare VAR_MAP_SCENE_POKEMON_LEAGUE, 4
-	call_if_eq EventScript_162962
-	call_if_set FLAG_DEFEATED_LANCE, EventScript_162968
+	call_if_eq PokemonLeague_LancesRoom_EventScript_CloseEntry
+	call_if_set FLAG_DEFEATED_LANCE, PokemonLeague_LancesRoom_EventScript_SetDoorOpen
 	end
 
-EventScript_162962:: @ 8162962
-	call EventScript_1629A8
+PokemonLeague_LancesRoom_EventScript_CloseEntry:: @ 8162962
+	call PokemonLeague_LancesRoom_EventScript_SetEntryClosed
 	return
 
-EventScript_162968:: @ 8162968
-	call EventScript_1A7589
+PokemonLeague_LancesRoom_EventScript_SetDoorOpen:: @ 8162968
+	call PokemonLeague_EventScript_SetDoorOpenLance
 	return
 
 PokemonLeague_LancesRoom_OnWarp:: @ 816296E
-	map_script_2 VAR_TEMP_1, 0, EventScript_162978
+	map_script_2 VAR_TEMP_1, 0, PokemonLeague_LancesRoom_EventScript_TurnPlayerNorth
 	.2byte 0
 
-EventScript_162978:: @ 8162978
+PokemonLeague_LancesRoom_EventScript_TurnPlayerNorth:: @ 8162978
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
 PokemonLeague_LancesRoom_OnFrame:: @ 816297D
-	map_script_2 VAR_MAP_SCENE_POKEMON_LEAGUE, 3, EventScript_162987
+	map_script_2 VAR_MAP_SCENE_POKEMON_LEAGUE, 3, PokemonLeague_LancesRoom_EventScript_EnterRoom
 	.2byte 0
 
-EventScript_162987:: @ 8162987
+PokemonLeague_LancesRoom_EventScript_EnterRoom:: @ 8162987
 	lockall
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_1629F1
+	applymovement OBJ_EVENT_ID_PLAYER, PokemonLeague_LancesRoom_Movement_WalkThroughCorridor
 	waitmovement 0
 	setflag FLAG_TEMP_2
-	call EventScript_1629A8
+	call PokemonLeague_LancesRoom_EventScript_SetEntryClosed
 	playse SE_KI_GASYAN
 	special DrawWholeMapView
 	waitse
@@ -49,18 +49,18 @@ EventScript_162987:: @ 8162987
 	releaseall
 	end
 
-EventScript_1629A8:: @ 81629A8
-	setmetatile 5, 14, 669, 1
-	setmetatile 6, 14, 670, 1
-	setmetatile 7, 14, 671, 1
-	setmetatile 5, 15, 677, 1
-	setmetatile 6, 15, 678, 1
-	setmetatile 7, 15, 679, 1
-	setmetatile 6, 16, 785, 0
-	setmetatile 7, 16, 785, 0
+PokemonLeague_LancesRoom_EventScript_SetEntryClosed:: @ 81629A8
+	setmetatile 5, 14, METATILE_PokemonLeague_Entry_TopLeft_Closed, 1
+	setmetatile 6, 14, METATILE_PokemonLeague_Entry_TopMid_Closed, 1
+	setmetatile 7, 14, METATILE_PokemonLeague_Entry_TopRight_Closed, 1
+	setmetatile 5, 15, METATILE_PokemonLeague_Entry_BottomLeft_Closed, 1
+	setmetatile 6, 15, METATILE_PokemonLeague_Entry_BottomMid_Closed, 1
+	setmetatile 7, 15, METATILE_PokemonLeague_Entry_BottomRight_Closed, 1
+	setmetatile 6, 16, METATILE_PokemonLeague_Floor_ShadeFull_Lance, 0
+	setmetatile 7, 16, METATILE_PokemonLeague_Floor_ShadeFull_Lance, 0
 	return
 
-Movement_1629F1:: @ 81629F1
+PokemonLeague_LancesRoom_Movement_WalkThroughCorridor:: @ 81629F1
 	walk_up
 	walk_up
 	walk_left
@@ -97,72 +97,70 @@ Movement_1629F1:: @ 81629F1
 	walk_up
 	step_end
 
-PokemonLeague_LancesRoom_EventScript_162A14:: @ 8162A14
+PokemonLeague_LancesRoom_EventScript_Lance:: @ 8162A14
 	lock
 	faceplayer
 	famechecker FAMECHECKER_LANCE, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
-	goto_if_set FLAG_DEFEATED_LANCE, EventScript_162AA1
+	goto_if_set FLAG_DEFEATED_LANCE, PokemonLeague_LancesRoom_EventScript_PostBattle
 	famechecker FAMECHECKER_LANCE, 0
 	famechecker FAMECHECKER_LANCE, 1
-	call_if_unset FLAG_SYS_GAME_CLEAR, EventScript_162A79
-	call_if_set FLAG_SYS_GAME_CLEAR, EventScript_162A82
+	call_if_unset FLAG_SYS_GAME_CLEAR, PokemonLeague_LancesRoom_EventScript_Intro
+	call_if_set FLAG_SYS_GAME_CLEAR, PokemonLeague_LancesRoom_EventScript_RematchIntro
 	setflag FLAG_TEMP_3
 	setflag FLAG_TEMP_5
-	call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, EventScript_162A8B
-	call_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_162A96
+	call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, PokemonLeague_LancesRoom_EventScript_Battle
+	call_if_set FLAG_SYS_CAN_LINK_WITH_RS, PokemonLeague_LancesRoom_EventScript_Rematch
 	clearflag FLAG_TEMP_5
-	goto EventScript_162AAB
-
-EventScript_162A78:: @ 8162A78
+	goto PokemonLeague_LancesRoom_EventScript_DefeatedLance
 	end
 
-EventScript_162A79:: @ 8162A79
-	msgbox gUnknown_8178764
+PokemonLeague_LancesRoom_EventScript_Intro:: @ 8162A79
+	msgbox PokemonLeague_LancesRoom_Text_Intro
 	return
 
-EventScript_162A82:: @ 8162A82
-	msgbox gUnknown_81788BD
+PokemonLeague_LancesRoom_EventScript_RematchIntro:: @ 8162A82
+	msgbox PokemonLeague_LancesRoom_Text_RematchIntro
 	return
 
-EventScript_162A8B:: @ 8162A8B
-	trainerbattle_no_intro TRAINER_ELITE_FOUR_LANCE, Text_178A15
+PokemonLeague_LancesRoom_EventScript_Battle:: @ 8162A8B
+	trainerbattle_no_intro TRAINER_ELITE_FOUR_LANCE, PokemonLeague_LancesRoom_Text_Defeat
 	return
 
-EventScript_162A96:: @ 8162A96
-	trainerbattle_no_intro TRAINER_ELITE_FOUR_LANCE_2, Text_178A15
+PokemonLeague_LancesRoom_EventScript_Rematch:: @ 8162A96
+	trainerbattle_no_intro TRAINER_ELITE_FOUR_LANCE_2, PokemonLeague_LancesRoom_Text_Defeat
 	return
 
-EventScript_162AA1:: @ 8162AA1
-	msgbox gUnknown_8178A52
+PokemonLeague_LancesRoom_EventScript_PostBattle:: @ 8162AA1
+	msgbox PokemonLeague_LancesRoom_Text_PostBattle
 	release
 	end
 
-EventScript_162AAB:: @ 8162AAB
+PokemonLeague_LancesRoom_EventScript_DefeatedLance:: @ 8162AAB
 	setvar VAR_0x8004, 0
 	special Special_TryGainNewFanFromCounter
 	setflag FLAG_DEFEATED_LANCE
-	call EventScript_1A7563
-	msgbox gUnknown_8178A52
+	call PokemonLeague_EventScript_OpenDoorLance
+	msgbox PokemonLeague_LancesRoom_Text_PostBattle
 	closemessage
 	release
 	end
 
-EventScript_162AC6:: @ 8162AC6
-	applymovement 1, Movement_162ADC
+PokemonLeague_LancesRoom_EventScript_LanceMoveOutOfWayLeft:: @ 8162AC6
+	applymovement 1, PokemonLeague_LancesRoom_Movement_LanceMoveOutOfWayLeft
 	waitmovement 0
 	return
 
-EventScript_162AD1:: @ 8162AD1
-	applymovement 1, Movement_162ADF
+PokemonLeague_LancesRoom_EventScript_LanceMoveOutOfWayRight:: @ 8162AD1
+	applymovement 1, PokemonLeague_LancesRoom_Movement_LanceMoveOutOfWayRight
 	waitmovement 0
 	return
 
-Movement_162ADC:: @ 8162ADC
+PokemonLeague_LancesRoom_Movement_LanceMoveOutOfWayLeft:: @ 8162ADC
 	walk_left
 	walk_in_place_fastest_right
 	step_end
 
-Movement_162ADF:: @ 8162ADF
+PokemonLeague_LancesRoom_Movement_LanceMoveOutOfWayRight:: @ 8162ADF
 	walk_right
 	walk_in_place_fastest_left
 	step_end
diff --git a/data/maps/PokemonLeague_LancesRoom/text.inc b/data/maps/PokemonLeague_LancesRoom/text.inc
index 9565fd4d5..8c726875a 100644
--- a/data/maps/PokemonLeague_LancesRoom/text.inc
+++ b/data/maps/PokemonLeague_LancesRoom/text.inc
@@ -1,4 +1,4 @@
-gUnknown_8178764:: @ 8178764
+PokemonLeague_LancesRoom_Text_Intro:: @ 8178764
     .string "Ah! I've heard about you,\n"
     .string "{PLAYER}!\p"
     .string "I lead the ELITE FOUR.\p"
@@ -14,7 +14,7 @@ gUnknown_8178764:: @ 8178764
     .string "Your LEAGUE challenge ends with\n"
     .string "me, {PLAYER}!{PLAY_BGM}{MUS_EXEYE}$"
 
-gUnknown_81788BD:: @ 81788BD
+PokemonLeague_LancesRoom_Text_RematchIntro:: @ 81788BD
     .string "Ah!\n"
     .string "So, you've returned, {PLAYER}!\p"
     .string "I lead the ELITE FOUR.\p"
@@ -30,12 +30,12 @@ gUnknown_81788BD:: @ 81788BD
     .string "Your LEAGUE challenge ends with\n"
     .string "me, {PLAYER}!{PLAY_BGM}{MUS_EXEYE}$"
 
-Text_178A15:: @ 8178A15
+PokemonLeague_LancesRoom_Text_Defeat:: @ 8178A15
     .string "That's it!\p"
     .string "I hate to admit it, but you are a\n"
     .string "POKéMON master!$"
 
-gUnknown_8178A52:: @ 8178A52
+PokemonLeague_LancesRoom_Text_PostBattle:: @ 8178A52
     .string "I still can't believe my dragons\n"
     .string "lost to you, {PLAYER}.\p"
     .string "You are now the POKéMON LEAGUE\n"
diff --git a/data/maps/PokemonLeague_LoreleisRoom/map.json b/data/maps/PokemonLeague_LoreleisRoom/map.json
index 6801df803..f33c2a35b 100644
--- a/data/maps/PokemonLeague_LoreleisRoom/map.json
+++ b/data/maps/PokemonLeague_LoreleisRoom/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "PokemonLeague_LoreleisRoom_EventScript_1625DC",
+      "script": "PokemonLeague_LoreleisRoom_EventScript_Lorelei",
       "flag": "0"
     }
   ],
diff --git a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc
index e95ecfd98..422029153 100644
--- a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc
+++ b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc
@@ -8,21 +8,21 @@ PokemonLeague_LoreleisRoom_MapScripts:: @ 816256C
 
 PokemonLeague_LoreleisRoom_OnResume:: @ 8162586
 	setvar VAR_0x8004, 0
-	call EventScript_1A75D5
+	call PokemonLeague_EventScript_DoLightingEffect
 	end
 
 PokemonLeague_LoreleisRoom_OnLoad:: @ 8162591
-	call_if_set FLAG_DEFEATED_LORELEI, EventScript_1625AC
+	call_if_set FLAG_DEFEATED_LORELEI, PokemonLeague_LoreleisRoom_EventScript_SetDoorOpen
 	compare VAR_MAP_SCENE_POKEMON_LEAGUE, 1
-	call_if_eq EventScript_1625A6
+	call_if_eq PokemonLeague_LoreleisRoom_EventScript_CloseEntry
 	end
 
-EventScript_1625A6:: @ 81625A6
-	call EventScript_1A759C
+PokemonLeague_LoreleisRoom_EventScript_CloseEntry:: @ 81625A6
+	call PokemonLeague_EventScript_CloseEntry
 	return
 
-EventScript_1625AC:: @ 81625AC
-	call EventScript_1A7538
+PokemonLeague_LoreleisRoom_EventScript_SetDoorOpen:: @ 81625AC
+	call PokemonLeague_EventScript_SetDoorOpen
 	return
 
 PokemonLeague_LoreleisRoom_OnTransition:: @ 81625B2
@@ -30,67 +30,65 @@ PokemonLeague_LoreleisRoom_OnTransition:: @ 81625B2
 	end
 
 PokemonLeague_LoreleisRoom_OnWarp:: @ 81625B6
-	map_script_2 VAR_TEMP_1, 0, EventScript_1625C0
+	map_script_2 VAR_TEMP_1, 0, PokemonLeague_LoreleisRoom_EventScript_TurnPlayerNorth
 	.2byte 0
 
-EventScript_1625C0:: @ 81625C0
+PokemonLeague_LoreleisRoom_EventScript_TurnPlayerNorth:: @ 81625C0
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
 PokemonLeague_LoreleisRoom_OnFrame:: @ 81625C5
-	map_script_2 VAR_MAP_SCENE_POKEMON_LEAGUE, 0, EventScript_1625CF
+	map_script_2 VAR_MAP_SCENE_POKEMON_LEAGUE, 0, PokemonLeague_LoreleisRoom_EventScript_EnterRoom
 	.2byte 0
 
-EventScript_1625CF:: @ 81625CF
+PokemonLeague_LoreleisRoom_EventScript_EnterRoom:: @ 81625CF
 	lockall
-	call EventScript_1A751F
+	call PokemonLeague_EventScript_EnterRoom
 	setvar VAR_MAP_SCENE_POKEMON_LEAGUE, 1
 	releaseall
 	end
 
-PokemonLeague_LoreleisRoom_EventScript_1625DC:: @ 81625DC
+PokemonLeague_LoreleisRoom_EventScript_Lorelei:: @ 81625DC
 	lock
 	faceplayer
 	famechecker FAMECHECKER_LORELEI, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
-	goto_if_set FLAG_DEFEATED_LORELEI, EventScript_162669
+	goto_if_set FLAG_DEFEATED_LORELEI, PokemonLeague_LoreleisRoom_EventScript_PostBattle
 	famechecker FAMECHECKER_LORELEI, 0
 	famechecker FAMECHECKER_LORELEI, 1
-	call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, EventScript_162641
-	call_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_16264A
+	call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, PokemonLeague_LoreleisRoom_EventScript_Intro
+	call_if_set FLAG_SYS_CAN_LINK_WITH_RS, PokemonLeague_LoreleisRoom_EventScript_RematchIntro
 	setflag FLAG_TEMP_3
 	setflag FLAG_TEMP_5
-	call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, EventScript_162653
-	call_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_16265E
+	call_if_unset FLAG_SYS_CAN_LINK_WITH_RS, PokemonLeague_LoreleisRoom_EventScript_Battle
+	call_if_set FLAG_SYS_CAN_LINK_WITH_RS, PokemonLeague_LoreleisRoom_EventScript_Rematch
 	clearflag FLAG_TEMP_5
-	goto EventScript_162673
-
-EventScript_162640:: @ 8162640
+	goto PokemonLeague_LoreleisRoom_EventScript_DefeatedLorelei
 	end
 
-EventScript_162641:: @ 8162641
-	msgbox gUnknown_8177FA4
+PokemonLeague_LoreleisRoom_EventScript_Intro:: @ 8162641
+	msgbox PokemonLeague_LoreleisRoom_Text_Intro
 	return
 
-EventScript_16264A:: @ 816264A
-	msgbox gUnknown_8178089
+PokemonLeague_LoreleisRoom_EventScript_RematchIntro:: @ 816264A
+	msgbox PokemonLeague_LoreleisRoom_Text_RematchIntro
 	return
 
-EventScript_162653:: @ 8162653
-	trainerbattle_no_intro TRAINER_ELITE_FOUR_LORELEI, Text_178191
+PokemonLeague_LoreleisRoom_EventScript_Battle:: @ 8162653
+	trainerbattle_no_intro TRAINER_ELITE_FOUR_LORELEI, PokemonLeague_LoreleisRoom_Text_Defeat
 	return
 
-EventScript_16265E:: @ 816265E
-	trainerbattle_no_intro TRAINER_ELITE_FOUR_LORELEI_2, Text_178191
+PokemonLeague_LoreleisRoom_EventScript_Rematch:: @ 816265E
+	trainerbattle_no_intro TRAINER_ELITE_FOUR_LORELEI_2, PokemonLeague_LoreleisRoom_Text_Defeat
 	return
 
-EventScript_162669:: @ 8162669
-	msgbox gUnknown_81781B0
+PokemonLeague_LoreleisRoom_EventScript_PostBattle:: @ 8162669
+	msgbox PokemonLeague_LoreleisRoom_Text_PostBattle
 	release
 	end
 
-EventScript_162673:: @ 8162673
+PokemonLeague_LoreleisRoom_EventScript_DefeatedLorelei:: @ 8162673
 	setflag FLAG_DEFEATED_LORELEI
-	call EventScript_1A7506
-	msgbox gUnknown_81781B0
+	call PokemonLeague_EventScript_OpenDoor
+	msgbox PokemonLeague_LoreleisRoom_Text_PostBattle
 	release
 	end
diff --git a/data/maps/PokemonLeague_LoreleisRoom/text.inc b/data/maps/PokemonLeague_LoreleisRoom/text.inc
index 9619ab86b..55e67d764 100644
--- a/data/maps/PokemonLeague_LoreleisRoom/text.inc
+++ b/data/maps/PokemonLeague_LoreleisRoom/text.inc
@@ -1,4 +1,4 @@
-gUnknown_8177FA4:: @ 8177FA4
+PokemonLeague_LoreleisRoom_Text_Intro:: @ 8177FA4
     .string "Welcome to the POKéMON LEAGUE.\p"
     .string "I am LORELEI of the ELITE FOUR.\p"
     .string "No one can best me when it comes\n"
@@ -9,7 +9,7 @@ gUnknown_8177FA4:: @ 8177FA4
     .string "Hahaha!\n"
     .string "Are you ready?{PLAY_BGM}{MUS_EXEYE}$"
 
-gUnknown_8178089:: @ 8178089
+PokemonLeague_LoreleisRoom_Text_RematchIntro:: @ 8178089
     .string "Welcome to the POKéMON LEAGUE.\p"
     .string "I, LORELEI of the ELITE FOUR,\n"
     .string "have returned!\p"
@@ -22,10 +22,10 @@ gUnknown_8178089:: @ 8178089
     .string "Hahaha!\n"
     .string "Are you ready?{PLAY_BGM}{MUS_EXEYE}$"
 
-Text_178191:: @ 8178191
+PokemonLeague_LoreleisRoom_Text_Defeat:: @ 8178191
     .string "…Things shouldn't be this way!$"
 
-gUnknown_81781B0:: @ 81781B0
+PokemonLeague_LoreleisRoom_Text_PostBattle:: @ 81781B0
     .string "You're better than I thought.\n"
     .string "Go on ahead.\p"
     .string "You only got a taste of the\n"
diff --git a/data/maps/PokemonMansion_1F/map.json b/data/maps/PokemonMansion_1F/map.json
index 652ffd20b..6ea519092 100644
--- a/data/maps/PokemonMansion_1F/map.json
+++ b/data/maps/PokemonMansion_1F/map.json
@@ -5,7 +5,7 @@
   "music": "MUS_POKEYASHI",
   "region_map_section": "MAPSEC_POKEMON_MANSION",
   "requires_flash": false,
-  "weather": "WEATHER_CLOUDY",
+  "weather": "WEATHER_SHADE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 7,
diff --git a/data/maps/PokemonMansion_2F/map.json b/data/maps/PokemonMansion_2F/map.json
index bc8f10848..a3a9c556e 100644
--- a/data/maps/PokemonMansion_2F/map.json
+++ b/data/maps/PokemonMansion_2F/map.json
@@ -5,7 +5,7 @@
   "music": "MUS_POKEYASHI",
   "region_map_section": "MAPSEC_POKEMON_MANSION",
   "requires_flash": false,
-  "weather": "WEATHER_CLOUDY",
+  "weather": "WEATHER_SHADE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 7,
diff --git a/data/maps/PokemonMansion_3F/map.json b/data/maps/PokemonMansion_3F/map.json
index 1e4af29e2..9c0423004 100644
--- a/data/maps/PokemonMansion_3F/map.json
+++ b/data/maps/PokemonMansion_3F/map.json
@@ -5,7 +5,7 @@
   "music": "MUS_POKEYASHI",
   "region_map_section": "MAPSEC_POKEMON_MANSION",
   "requires_flash": false,
-  "weather": "WEATHER_CLOUDY",
+  "weather": "WEATHER_SHADE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 7,
diff --git a/data/maps/PokemonMansion_B1F/map.json b/data/maps/PokemonMansion_B1F/map.json
index 458740163..eea10cb2c 100644
--- a/data/maps/PokemonMansion_B1F/map.json
+++ b/data/maps/PokemonMansion_B1F/map.json
@@ -5,7 +5,7 @@
   "music": "MUS_POKEYASHI",
   "region_map_section": "MAPSEC_POKEMON_MANSION",
   "requires_flash": false,
-  "weather": "WEATHER_CLOUDY",
+  "weather": "WEATHER_SHADE",
   "map_type": "MAP_TYPE_8",
   "unknown_18": 0,
   "unknown_19": 7,
diff --git a/data/maps/UnknownMap_03_50/map.json b/data/maps/Prototype_SeviiIsle_6/map.json
index 25d12e137..3cc89f9f0 100644
--- a/data/maps/UnknownMap_03_50/map.json
+++ b/data/maps/Prototype_SeviiIsle_6/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_UNKNOWN_MAP_03_50",
-  "name": "UnknownMap_03_50",
-  "layout": "LAYOUT_UNKNOWN_MAP_03_50",
+  "id": "MAP_PROTOTYPE_SEVII_ISLE_6",
+  "name": "Prototype_SeviiIsle_6",
+  "layout": "LAYOUT_PROTOTYPE_SEVII_ISLE_6",
   "music": "MUS_NANASHIMA",
   "region_map_section": "MAPSEC_SEVII_ISLE_6",
   "requires_flash": false,
diff --git a/data/maps/Prototype_SeviiIsle_6/scripts.inc b/data/maps/Prototype_SeviiIsle_6/scripts.inc
new file mode 100644
index 000000000..459729f14
--- /dev/null
+++ b/data/maps/Prototype_SeviiIsle_6/scripts.inc
@@ -0,0 +1,2 @@
+Prototype_SeviiIsle_6_MapScripts:: @ 81687E0
+	.byte 0
diff --git a/data/maps/UnknownMap_03_51/map.json b/data/maps/Prototype_SeviiIsle_7/map.json
index 25c135de4..67a37d7e7 100644
--- a/data/maps/UnknownMap_03_51/map.json
+++ b/data/maps/Prototype_SeviiIsle_7/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_UNKNOWN_MAP_03_51",
-  "name": "UnknownMap_03_51",
-  "layout": "LAYOUT_UNKNOWN_MAP_03_51",
+  "id": "MAP_PROTOTYPE_SEVII_ISLE_7",
+  "name": "Prototype_SeviiIsle_7",
+  "layout": "LAYOUT_PROTOTYPE_SEVII_ISLE_7",
   "music": "MUS_NANASHIMA",
   "region_map_section": "MAPSEC_SEVII_ISLE_7",
   "requires_flash": false,
diff --git a/data/maps/Prototype_SeviiIsle_7/scripts.inc b/data/maps/Prototype_SeviiIsle_7/scripts.inc
new file mode 100644
index 000000000..b7eaa6bd5
--- /dev/null
+++ b/data/maps/Prototype_SeviiIsle_7/scripts.inc
@@ -0,0 +1,2 @@
+Prototype_SeviiIsle_7_MapScripts:: @ 81687E1
+	.byte 0
diff --git a/data/maps/UnknownMap_03_52/map.json b/data/maps/Prototype_SeviiIsle_8/map.json
index e38359999..0ed21e3f2 100644
--- a/data/maps/UnknownMap_03_52/map.json
+++ b/data/maps/Prototype_SeviiIsle_8/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_UNKNOWN_MAP_03_52",
-  "name": "UnknownMap_03_52",
-  "layout": "LAYOUT_UNKNOWN_MAP_03_52",
+  "id": "MAP_PROTOTYPE_SEVII_ISLE_8",
+  "name": "Prototype_SeviiIsle_8",
+  "layout": "LAYOUT_PROTOTYPE_SEVII_ISLE_8",
   "music": "MUS_NANASHIMA",
   "region_map_section": "MAPSEC_SEVII_ISLE_8",
   "requires_flash": false,
diff --git a/data/maps/Prototype_SeviiIsle_8/scripts.inc b/data/maps/Prototype_SeviiIsle_8/scripts.inc
new file mode 100644
index 000000000..411a66513
--- /dev/null
+++ b/data/maps/Prototype_SeviiIsle_8/scripts.inc
@@ -0,0 +1,2 @@
+Prototype_SeviiIsle_8_MapScripts:: @ 81687E2
+	.byte 0
diff --git a/data/maps/UnknownMap_03_53/map.json b/data/maps/Prototype_SeviiIsle_9/map.json
index e3001e6be..1fa4c73c4 100644
--- a/data/maps/UnknownMap_03_53/map.json
+++ b/data/maps/Prototype_SeviiIsle_9/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_UNKNOWN_MAP_03_53",
-  "name": "UnknownMap_03_53",
-  "layout": "LAYOUT_UNKNOWN_MAP_03_53",
+  "id": "MAP_PROTOTYPE_SEVII_ISLE_9",
+  "name": "Prototype_SeviiIsle_9",
+  "layout": "LAYOUT_PROTOTYPE_SEVII_ISLE_9",
   "music": "MUS_NANASHIMA",
   "region_map_section": "MAPSEC_SEVII_ISLE_9",
   "requires_flash": false,
diff --git a/data/maps/Prototype_SeviiIsle_9/scripts.inc b/data/maps/Prototype_SeviiIsle_9/scripts.inc
new file mode 100644
index 000000000..00b06c7f0
--- /dev/null
+++ b/data/maps/Prototype_SeviiIsle_9/scripts.inc
@@ -0,0 +1,2 @@
+Prototype_SeviiIsle_9_MapScripts:: @ 81687E3
+	.byte 0
diff --git a/data/maps/RockTunnel_1F/map.json b/data/maps/RockTunnel_1F/map.json
index c365ad26e..6dd117e8a 100644
--- a/data/maps/RockTunnel_1F/map.json
+++ b/data/maps/RockTunnel_1F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "RockTunnel_1F_EventScript_162E73",
+      "script": "RockTunnel_1F_EventScript_Dana",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "RockTunnel_1F_EventScript_162E5C",
+      "script": "RockTunnel_1F_EventScript_Ariana",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 5,
-      "script": "RockTunnel_1F_EventScript_162E45",
+      "script": "RockTunnel_1F_EventScript_Leah",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "RockTunnel_1F_EventScript_162E17",
+      "script": "RockTunnel_1F_EventScript_Lucas",
       "flag": "0"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "RockTunnel_1F_EventScript_162E00",
+      "script": "RockTunnel_1F_EventScript_Oliver",
       "flag": "0"
     },
     {
@@ -88,7 +88,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "RockTunnel_1F_EventScript_162DE9",
+      "script": "RockTunnel_1F_EventScript_Lenny",
       "flag": "0"
     },
     {
@@ -101,7 +101,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "RockTunnel_1F_EventScript_162E2E",
+      "script": "RockTunnel_1F_EventScript_Ashton",
       "flag": "0"
     },
     {
@@ -195,7 +195,7 @@
       "x": 14,
       "y": 33,
       "elevation": 3,
-      "script": "RockTunnel_1F_EventScript_162DE0"
+      "script": "RockTunnel_1F_EventScript_RouteSign"
     }
   ]
 }
diff --git a/data/maps/RockTunnel_1F/scripts.inc b/data/maps/RockTunnel_1F/scripts.inc
index 49daa21a7..f18e0cd3e 100644
--- a/data/maps/RockTunnel_1F/scripts.inc
+++ b/data/maps/RockTunnel_1F/scripts.inc
@@ -6,41 +6,41 @@ RockTunnel_1F_OnTransition:: @ 8162DDC
 	setworldmapflag FLAG_WORLD_MAP_ROCK_TUNNEL_1F
 	end
 
-RockTunnel_1F_EventScript_162DE0:: @ 8162DE0
-	msgbox gUnknown_817962D, MSGBOX_SIGN
+RockTunnel_1F_EventScript_RouteSign:: @ 8162DE0
+	msgbox RockTunnel_1F_Text_RouteSign, MSGBOX_SIGN
 	end
 
-RockTunnel_1F_EventScript_162DE9:: @ 8162DE9
-	trainerbattle_single TRAINER_HIKER_LENNY, Text_179366, Text_179388
-	msgbox gUnknown_8179396, MSGBOX_AUTOCLOSE
+RockTunnel_1F_EventScript_Lenny:: @ 8162DE9
+	trainerbattle_single TRAINER_HIKER_LENNY, RockTunnel_1F_Text_LennyIntro, RockTunnel_1F_Text_LennyDefeat
+	msgbox RockTunnel_1F_Text_LennyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-RockTunnel_1F_EventScript_162E00:: @ 8162E00
-	trainerbattle_single TRAINER_HIKER_OLIVER, Text_1793F1, Text_17940E
-	msgbox gUnknown_817943A, MSGBOX_AUTOCLOSE
+RockTunnel_1F_EventScript_Oliver:: @ 8162E00
+	trainerbattle_single TRAINER_HIKER_OLIVER, RockTunnel_1F_Text_OliverIntro, RockTunnel_1F_Text_OliverDefeat
+	msgbox RockTunnel_1F_Text_OliverPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-RockTunnel_1F_EventScript_162E17:: @ 8162E17
-	trainerbattle_single TRAINER_HIKER_LUCAS, Text_17947B, Text_1794AC
-	msgbox gUnknown_81794B4, MSGBOX_AUTOCLOSE
+RockTunnel_1F_EventScript_Lucas:: @ 8162E17
+	trainerbattle_single TRAINER_HIKER_LUCAS, RockTunnel_1F_Text_LucasIntro, RockTunnel_1F_Text_LucasDefeat
+	msgbox RockTunnel_1F_Text_LucasPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-RockTunnel_1F_EventScript_162E2E:: @ 8162E2E
-	trainerbattle_single TRAINER_POKEMANIAC_ASHTON, Text_1794D4, Text_1794EE
-	msgbox gUnknown_81794F9, MSGBOX_AUTOCLOSE
+RockTunnel_1F_EventScript_Ashton:: @ 8162E2E
+	trainerbattle_single TRAINER_POKEMANIAC_ASHTON, RockTunnel_1F_Text_AshtonIntro, RockTunnel_1F_Text_AshtonDefeat
+	msgbox RockTunnel_1F_Text_AshtonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-RockTunnel_1F_EventScript_162E45:: @ 8162E45
-	trainerbattle_single TRAINER_PICNICKER_LEAH, Text_17951C, Text_179547
-	msgbox gUnknown_8179558, MSGBOX_AUTOCLOSE
+RockTunnel_1F_EventScript_Leah:: @ 8162E45
+	trainerbattle_single TRAINER_PICNICKER_LEAH, RockTunnel_1F_Text_LeahIntro, RockTunnel_1F_Text_LeahDefeat
+	msgbox RockTunnel_1F_Text_LeahPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-RockTunnel_1F_EventScript_162E5C:: @ 8162E5C
-	trainerbattle_single TRAINER_PICNICKER_ARIANA, Text_1795E5, Text_179604
-	msgbox gUnknown_8179613, MSGBOX_AUTOCLOSE
+RockTunnel_1F_EventScript_Ariana:: @ 8162E5C
+	trainerbattle_single TRAINER_PICNICKER_ARIANA, RockTunnel_1F_Text_ArianaIntro, RockTunnel_1F_Text_ArianaDefeat
+	msgbox RockTunnel_1F_Text_ArianaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-RockTunnel_1F_EventScript_162E73:: @ 8162E73
-	trainerbattle_single TRAINER_PICNICKER_DANA, Text_179577, Text_1795A1
-	msgbox gUnknown_81795B5, MSGBOX_AUTOCLOSE
+RockTunnel_1F_EventScript_Dana:: @ 8162E73
+	trainerbattle_single TRAINER_PICNICKER_DANA, RockTunnel_1F_Text_DanaIntro, RockTunnel_1F_Text_DanaDefeat
+	msgbox RockTunnel_1F_Text_DanaPostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/RockTunnel_1F/text.inc b/data/maps/RockTunnel_1F/text.inc
index 56bc4ecbe..162e20f7d 100644
--- a/data/maps/RockTunnel_1F/text.inc
+++ b/data/maps/RockTunnel_1F/text.inc
@@ -1,83 +1,83 @@
-Text_179366:: @ 8179366
+RockTunnel_1F_Text_LennyIntro:: @ 8179366
     .string "This tunnel goes a long way, kid!$"
 
-Text_179388:: @ 8179388
+RockTunnel_1F_Text_LennyDefeat:: @ 8179388
     .string "Doh!\n"
     .string "You win!$"
 
-gUnknown_8179396:: @ 8179396
+RockTunnel_1F_Text_LennyPostBattle:: @ 8179396
     .string "Watch for ONIX.\n"
     .string "They appear only occasionally.\p"
     .string "High-level ones can put the\n"
     .string "squeeze on you!$"
 
-Text_1793F1:: @ 81793F1
+RockTunnel_1F_Text_OliverIntro:: @ 81793F1
     .string "Hmm.\n"
     .string "Maybe I'm lost in here…$"
 
-Text_17940E:: @ 817940E
+RockTunnel_1F_Text_OliverDefeat:: @ 817940E
     .string "Ease up!\n"
     .string "What am I doing?\l"
     .string "Which way is out?$"
 
-gUnknown_817943A:: @ 817943A
+RockTunnel_1F_Text_OliverPostBattle:: @ 817943A
     .string "That sleeping POKéMON on ROUTE 12\n"
     .string "forced me to take this detour.$"
 
-Text_17947B:: @ 817947B
+RockTunnel_1F_Text_LucasIntro:: @ 817947B
     .string "Outsiders like you need to show me\n"
     .string "some respect!$"
 
-Text_1794AC:: @ 81794AC
+RockTunnel_1F_Text_LucasDefeat:: @ 81794AC
     .string "I give!$"
 
-gUnknown_81794B4:: @ 81794B4
+RockTunnel_1F_Text_LucasPostBattle:: @ 81794B4
     .string "You're talented enough to hike!$"
 
-Text_1794D4:: @ 81794D4
+RockTunnel_1F_Text_AshtonIntro:: @ 81794D4
     .string "POKéMON fight!\n"
     .string "Ready, go!$"
 
-Text_1794EE:: @ 81794EE
+RockTunnel_1F_Text_AshtonDefeat:: @ 81794EE
     .string "Game over!$"
 
-gUnknown_81794F9:: @ 81794F9
+RockTunnel_1F_Text_AshtonPostBattle:: @ 81794F9
     .string "Oh well, I'll get a ZUBAT as I go!$"
 
-Text_17951C:: @ 817951C
+RockTunnel_1F_Text_LeahIntro:: @ 817951C
     .string "Eek!\p"
     .string "Don't try anything funny in the\n"
     .string "dark!$"
 
-Text_179547:: @ 8179547
+RockTunnel_1F_Text_LeahDefeat:: @ 8179547
     .string "It was too dark…$"
 
-gUnknown_8179558:: @ 8179558
+RockTunnel_1F_Text_LeahPostBattle:: @ 8179558
     .string "I saw a MACHOP in this tunnel.$"
 
-Text_179577:: @ 8179577
+RockTunnel_1F_Text_DanaIntro:: @ 8179577
     .string "I came this far looking for wild\n"
     .string "POKéMON.$"
 
-Text_1795A1:: @ 81795A1
+RockTunnel_1F_Text_DanaDefeat:: @ 81795A1
     .string "I'm out of POKéMON!$"
 
-gUnknown_81795B5:: @ 81795B5
+RockTunnel_1F_Text_DanaPostBattle:: @ 81795B5
     .string "You looked cute and harmless.\n"
     .string "Was I ever wrong!$"
 
-Text_1795E5:: @ 81795E5
+RockTunnel_1F_Text_ArianaIntro:: @ 81795E5
     .string "You have POKéMON!\n"
     .string "Let's start!$"
 
-Text_179604:: @ 8179604
+RockTunnel_1F_Text_ArianaDefeat:: @ 8179604
     .string "You play hard!$"
 
-gUnknown_8179613:: @ 8179613
+RockTunnel_1F_Text_ArianaPostBattle:: @ 8179613
     .string "Whew!\n"
     .string "I'm all sweaty now.$"
 
-gUnknown_817962D:: @ 817962D
+RockTunnel_1F_Text_RouteSign:: @ 817962D
     .string "ROCK TUNNEL\n"
     .string "CERULEAN CITY - LAVENDER TOWN$"
 
diff --git a/data/maps/RockTunnel_B1F/map.json b/data/maps/RockTunnel_B1F/map.json
index bbd3f59a7..b680bf4a1 100644
--- a/data/maps/RockTunnel_B1F/map.json
+++ b/data/maps/RockTunnel_B1F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "RockTunnel_B1F_EventScript_162EFE",
+      "script": "RockTunnel_B1F_EventScript_Cooper",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "RockTunnel_B1F_EventScript_162EB9",
+      "script": "RockTunnel_B1F_EventScript_Dudley",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "RockTunnel_B1F_EventScript_162E8B",
+      "script": "RockTunnel_B1F_EventScript_Sofia",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "RockTunnel_B1F_EventScript_162ED0",
+      "script": "RockTunnel_B1F_EventScript_Allen",
       "flag": "0"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "RockTunnel_B1F_EventScript_162EE7",
+      "script": "RockTunnel_B1F_EventScript_Eric",
       "flag": "0"
     },
     {
@@ -88,7 +88,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "RockTunnel_B1F_EventScript_162F15",
+      "script": "RockTunnel_B1F_EventScript_Steve",
       "flag": "0"
     },
     {
@@ -101,7 +101,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "RockTunnel_B1F_EventScript_162EA2",
+      "script": "RockTunnel_B1F_EventScript_Martha",
       "flag": "0"
     },
     {
@@ -114,7 +114,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "RockTunnel_B1F_EventScript_162F2C",
+      "script": "RockTunnel_B1F_EventScript_Winston",
       "flag": "0"
     },
     {
diff --git a/data/maps/RockTunnel_B1F/scripts.inc b/data/maps/RockTunnel_B1F/scripts.inc
index e2c34b53e..54d0e8153 100644
--- a/data/maps/RockTunnel_B1F/scripts.inc
+++ b/data/maps/RockTunnel_B1F/scripts.inc
@@ -1,42 +1,42 @@
 RockTunnel_B1F_MapScripts:: @ 8162E8A
 	.byte 0
 
-RockTunnel_B1F_EventScript_162E8B:: @ 8162E8B
-	trainerbattle_single TRAINER_PICNICKER_SOFIA, Text_179657, Text_1796B9
-	msgbox gUnknown_81796CE, MSGBOX_AUTOCLOSE
+RockTunnel_B1F_EventScript_Sofia:: @ 8162E8B
+	trainerbattle_single TRAINER_PICNICKER_SOFIA, RockTunnel_B1F_Text_SofiaIntro, RockTunnel_B1F_Text_SofiaDefeat
+	msgbox RockTunnel_B1F_Text_SofiaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-RockTunnel_B1F_EventScript_162EA2:: @ 8162EA2
-	trainerbattle_single TRAINER_PICNICKER_MARTHA, Text_1798AD, Text_1798DD
-	msgbox gUnknown_81798E9, MSGBOX_AUTOCLOSE
+RockTunnel_B1F_EventScript_Martha:: @ 8162EA2
+	trainerbattle_single TRAINER_PICNICKER_MARTHA, RockTunnel_B1F_Text_MarthaIntro, RockTunnel_B1F_Text_MarthaDefeat
+	msgbox RockTunnel_B1F_Text_MarthaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-RockTunnel_B1F_EventScript_162EB9:: @ 8162EB9
-	trainerbattle_single TRAINER_HIKER_DUDLEY, Text_1796E1, Text_179700
-	msgbox gUnknown_8179712, MSGBOX_AUTOCLOSE
+RockTunnel_B1F_EventScript_Dudley:: @ 8162EB9
+	trainerbattle_single TRAINER_HIKER_DUDLEY, RockTunnel_B1F_Text_DudleyIntro, RockTunnel_B1F_Text_DudleyDefeat
+	msgbox RockTunnel_B1F_Text_DudleyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-RockTunnel_B1F_EventScript_162ED0:: @ 8162ED0
-	trainerbattle_single TRAINER_HIKER_ALLEN, Text_179829, Text_179856
-	msgbox gUnknown_817987A, MSGBOX_AUTOCLOSE
+RockTunnel_B1F_EventScript_Allen:: @ 8162ED0
+	trainerbattle_single TRAINER_HIKER_ALLEN, RockTunnel_B1F_Text_AllenIntro, RockTunnel_B1F_Text_AllenDefeat
+	msgbox RockTunnel_B1F_Text_AllenPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-RockTunnel_B1F_EventScript_162EE7:: @ 8162EE7
-	trainerbattle_single TRAINER_HIKER_ERIC, Text_179916, Text_179932
-	msgbox gUnknown_817993E, MSGBOX_AUTOCLOSE
+RockTunnel_B1F_EventScript_Eric:: @ 8162EE7
+	trainerbattle_single TRAINER_HIKER_ERIC, RockTunnel_B1F_Text_EricIntro, RockTunnel_B1F_Text_EricDefeat
+	msgbox RockTunnel_B1F_Text_EricPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-RockTunnel_B1F_EventScript_162EFE:: @ 8162EFE
-	trainerbattle_single TRAINER_POKEMANIAC_COOPER, Text_17973A, Text_17975F
-	msgbox gUnknown_8179777, MSGBOX_AUTOCLOSE
+RockTunnel_B1F_EventScript_Cooper:: @ 8162EFE
+	trainerbattle_single TRAINER_POKEMANIAC_COOPER, RockTunnel_B1F_Text_CooperIntro, RockTunnel_B1F_Text_CooperDefeat
+	msgbox RockTunnel_B1F_Text_CooperPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-RockTunnel_B1F_EventScript_162F15:: @ 8162F15
-	trainerbattle_single TRAINER_POKEMANIAC_STEVE, Text_1797A4, Text_1797CB
-	msgbox gUnknown_81797DE, MSGBOX_AUTOCLOSE
+RockTunnel_B1F_EventScript_Steve:: @ 8162F15
+	trainerbattle_single TRAINER_POKEMANIAC_STEVE, RockTunnel_B1F_Text_SteveIntro, RockTunnel_B1F_Text_SteveDefeat
+	msgbox RockTunnel_B1F_Text_StevePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-RockTunnel_B1F_EventScript_162F2C:: @ 8162F2C
-	trainerbattle_single TRAINER_POKEMANIAC_WINSTON, Text_179968, Text_179997
-	msgbox gUnknown_81799AC, MSGBOX_AUTOCLOSE
+RockTunnel_B1F_EventScript_Winston:: @ 8162F2C
+	trainerbattle_single TRAINER_POKEMANIAC_WINSTON, RockTunnel_B1F_Text_WinstonIntro, RockTunnel_B1F_Text_WinstonDefeat
+	msgbox RockTunnel_B1F_Text_WinstonPostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/RockTunnel_B1F/text.inc b/data/maps/RockTunnel_B1F/text.inc
index b82f09657..1bf86a5eb 100644
--- a/data/maps/RockTunnel_B1F/text.inc
+++ b/data/maps/RockTunnel_B1F/text.inc
@@ -1,95 +1,95 @@
-Text_179657:: @ 8179657
+RockTunnel_B1F_Text_SofiaIntro:: @ 8179657
     .string "Do you know how you can avoid\n"
     .string "getting lost in the mountains?\p"
     .string "You can bend twigs as trail\n"
     .string "markers.$"
 
-Text_1796B9:: @ 81796B9
+RockTunnel_B1F_Text_SofiaDefeat:: @ 81796B9
     .string "Ohhh!\n"
     .string "I did my best!$"
 
-gUnknown_81796CE:: @ 81796CE
+RockTunnel_B1F_Text_SofiaPostBattle:: @ 81796CE
     .string "I want to go home!$"
 
-Text_1796E1:: @ 81796E1
+RockTunnel_B1F_Text_DudleyIntro:: @ 81796E1
     .string "Hahaha!\n"
     .string "Can you beat my power?$"
 
-Text_179700:: @ 8179700
+RockTunnel_B1F_Text_DudleyDefeat:: @ 8179700
     .string "Oops!\n"
     .string "Outmuscled!$"
 
-gUnknown_8179712:: @ 8179712
+RockTunnel_B1F_Text_DudleyPostBattle:: @ 8179712
     .string "I go for power because I hate\n"
     .string "thinking.$"
 
-Text_17973A:: @ 817973A
+RockTunnel_B1F_Text_CooperIntro:: @ 817973A
     .string "You have a POKéDEX?\n"
     .string "I want one, too.$"
 
-Text_17975F:: @ 817975F
+RockTunnel_B1F_Text_CooperDefeat:: @ 817975F
     .string "Shoot!\n"
     .string "I am so jealous!$"
 
-gUnknown_8179777:: @ 8179777
+RockTunnel_B1F_Text_CooperPostBattle:: @ 8179777
     .string "When you finish your POKéDEX,\n"
     .string "can I have it?$"
 
-Text_1797A4:: @ 81797A4
+RockTunnel_B1F_Text_SteveIntro:: @ 81797A4
     .string "Um… Do you know about POKéMON\n"
     .string "cosplay?$"
 
-Text_1797CB:: @ 81797CB
+RockTunnel_B1F_Text_SteveDefeat:: @ 81797CB
     .string "Well, that's that.$"
 
-gUnknown_81797DE:: @ 81797DE
+RockTunnel_B1F_Text_StevePostBattle:: @ 81797DE
     .string "POKéMON cosplay is dressing up as\n"
     .string "POKéMON for fun.\p"
     .string "CLEFAIRY is a favorite.$"
 
-Text_179829:: @ 8179829
+RockTunnel_B1F_Text_AllenIntro:: @ 8179829
     .string "My POKéMON techniques will leave\n"
     .string "you crying!$"
 
-Text_179856:: @ 8179856
+RockTunnel_B1F_Text_AllenDefeat:: @ 8179856
     .string "I give!\n"
     .string "You're a better technician!$"
 
-gUnknown_817987A:: @ 817987A
+RockTunnel_B1F_Text_AllenPostBattle:: @ 817987A
     .string "In mountains, you'll often find\n"
     .string "ROCK-type POKéMON.$"
 
-Text_1798AD:: @ 81798AD
+RockTunnel_B1F_Text_MarthaIntro:: @ 81798AD
     .string "I don't often come here, but I will\n"
     .string "battle you.$"
 
-Text_1798DD:: @ 81798DD
+RockTunnel_B1F_Text_MarthaDefeat:: @ 81798DD
     .string "Oh!\n"
     .string "I lost!$"
 
-gUnknown_81798E9:: @ 81798E9
+RockTunnel_B1F_Text_MarthaPostBattle:: @ 81798E9
     .string "I like tiny POKéMON.\n"
     .string "Big ones are too scary!$"
 
-Text_179916:: @ 8179916
+RockTunnel_B1F_Text_EricIntro:: @ 8179916
     .string "Hit me with your best shot!$"
 
-Text_179932:: @ 8179932
+RockTunnel_B1F_Text_EricDefeat:: @ 8179932
     .string "Fired away!$"
 
-gUnknown_817993E:: @ 817993E
+RockTunnel_B1F_Text_EricPostBattle:: @ 817993E
     .string "I'll raise my POKéMON to beat\n"
     .string "yours, kid.$"
 
-Text_179968:: @ 8179968
+RockTunnel_B1F_Text_WinstonIntro:: @ 8179968
     .string "I draw illustrations of POKéMON\n"
     .string "when I'm home.$"
 
-Text_179997:: @ 8179997
+RockTunnel_B1F_Text_WinstonDefeat:: @ 8179997
     .string "Whew…\n"
     .string "I'm exhausted…$"
 
-gUnknown_81799AC:: @ 81799AC
+RockTunnel_B1F_Text_WinstonPostBattle:: @ 81799AC
     .string "I'm an artist, not a fighter.\n"
     .string "I'll go home to draw.$"
 
diff --git a/data/maps/RocketHideout_B1F/map.json b/data/maps/RocketHideout_B1F/map.json
index 586bf0f0d..4314d758f 100644
--- a/data/maps/RocketHideout_B1F/map.json
+++ b/data/maps/RocketHideout_B1F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 5,
-      "script": "RocketHideout_B1F_EventScript_1611C5",
+      "script": "RocketHideout_B1F_EventScript_Grunt2",
       "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "RocketHideout_B1F_EventScript_1611AE",
+      "script": "RocketHideout_B1F_EventScript_Grunt1",
       "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "RocketHideout_B1F_EventScript_1611F3",
+      "script": "RocketHideout_B1F_EventScript_Grunt4",
       "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "RocketHideout_B1F_EventScript_1611DC",
+      "script": "RocketHideout_B1F_EventScript_Grunt3",
       "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "RocketHideout_B1F_EventScript_16120A",
+      "script": "RocketHideout_B1F_EventScript_Grunt5",
       "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
     },
     {
diff --git a/data/maps/RocketHideout_B1F/scripts.inc b/data/maps/RocketHideout_B1F/scripts.inc
index c27dd99f3..ac95862a2 100644
--- a/data/maps/RocketHideout_B1F/scripts.inc
+++ b/data/maps/RocketHideout_B1F/scripts.inc
@@ -4,60 +4,60 @@ RocketHideout_B1F_MapScripts:: @ 8161195
 	.byte 0
 
 RocketHideout_B1F_OnLoad:: @ 81611A0
-	call_if_not_defeated TRAINER_TEAM_ROCKET_GRUNT_12 EventScript_161233
+	call_if_not_defeated TRAINER_TEAM_ROCKET_GRUNT_12 RocketHideout_B1F_EventScript_SetBarrier
 	end
 
 RocketHideout_B1F_OnTransition:: @ 81611AA
 	setworldmapflag FLAG_WORLD_MAP_ROCKET_HIDEOUT_B1F
 	end
 
-RocketHideout_B1F_EventScript_1611AE:: @ 81611AE
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_8, Text_174ECA, Text_174EED
-	msgbox gUnknown_8174EFA, MSGBOX_AUTOCLOSE
+RocketHideout_B1F_EventScript_Grunt1:: @ 81611AE
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_8, RocketHideout_B1F_Text_Grunt1Intro, RocketHideout_B1F_Text_Grunt1Defeat
+	msgbox RocketHideout_B1F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-RocketHideout_B1F_EventScript_1611C5:: @ 81611C5
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_9, Text_174F2C, Text_174F60
-	msgbox gUnknown_8174F66, MSGBOX_AUTOCLOSE
+RocketHideout_B1F_EventScript_Grunt2:: @ 81611C5
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_9, RocketHideout_B1F_Text_Grunt2Intro, RocketHideout_B1F_Text_Grunt2Defeat
+	msgbox RocketHideout_B1F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-RocketHideout_B1F_EventScript_1611DC:: @ 81611DC
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_10, Text_174F94, Text_174FA4
-	msgbox gUnknown_8174FB3, MSGBOX_AUTOCLOSE
+RocketHideout_B1F_EventScript_Grunt3:: @ 81611DC
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_10, RocketHideout_B1F_Text_Grunt3Intro, RocketHideout_B1F_Text_Grunt3Defeat
+	msgbox RocketHideout_B1F_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-RocketHideout_B1F_EventScript_1611F3:: @ 81611F3
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_11, Text_174FE1, Text_174FF8
-	msgbox gUnknown_8175007, MSGBOX_AUTOCLOSE
+RocketHideout_B1F_EventScript_Grunt4:: @ 81611F3
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_11, RocketHideout_B1F_Text_Grunt4Intro, RocketHideout_B1F_Text_Grunt4Defeat
+	msgbox RocketHideout_B1F_Text_Grunt4PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-RocketHideout_B1F_EventScript_16120A:: @ 816120A
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_12, Text_17503A, Text_17505A, EventScript_161225
-	msgbox gUnknown_8175060, MSGBOX_AUTOCLOSE
+RocketHideout_B1F_EventScript_Grunt5:: @ 816120A
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_12, RocketHideout_B1F_Text_Grunt5Intro, RocketHideout_B1F_Text_Grunt5Defeat, RocketHideout_B1F_EventScript_DefeatedGrunt5
+	msgbox RocketHideout_B1F_Text_Grunt5PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_161225:: @ 8161225
-	call EventScript_16126A
+RocketHideout_B1F_EventScript_DefeatedGrunt5:: @ 8161225
+	call RocketHideout_B1F_EventScript_RemoveBarrier
 	playse SE_KI_GASYAN
 	special DrawWholeMapView
 	waitse
 	release
 	end
 
-EventScript_161233:: @ 8161233
-	setmetatile 20, 19, 718, 1
-	setmetatile 21, 19, 719, 1
-	setmetatile 20, 20, 726, 1
-	setmetatile 21, 20, 727, 1
-	setmetatile 20, 21, 642, 0
-	setmetatile 21, 21, 642, 0
+RocketHideout_B1F_EventScript_SetBarrier:: @ 8161233
+	setmetatile 20, 19, METATILE_Hideout_Barrier_TopLeft_Floor, 1
+	setmetatile 21, 19, METATILE_Hideout_Barrier_TopRight_Floor, 1
+	setmetatile 20, 20, METATILE_Hideout_Barrier_BottomLeft, 1
+	setmetatile 21, 20, METATILE_Hideout_Barrier_BottomRight, 1
+	setmetatile 20, 21, METATILE_Hideout_Floor_ShadeFull, 0
+	setmetatile 21, 21, METATILE_Hideout_Floor_ShadeFull, 0
 	return
 
-EventScript_16126A:: @ 816126A
-	setmetatile 20, 19, 642, 0
-	setmetatile 21, 19, 641, 0
-	setmetatile 20, 20, 642, 0
-	setmetatile 21, 20, 641, 0
-	setmetatile 20, 21, 642, 0
-	setmetatile 21, 21, 641, 0
+RocketHideout_B1F_EventScript_RemoveBarrier:: @ 816126A
+	setmetatile 20, 19, METATILE_Hideout_Floor_ShadeFull, 0
+	setmetatile 21, 19, METATILE_Hideout_Floor, 0
+	setmetatile 20, 20, METATILE_Hideout_Floor_ShadeFull, 0
+	setmetatile 21, 20, METATILE_Hideout_Floor, 0
+	setmetatile 20, 21, METATILE_Hideout_Floor_ShadeFull, 0
+	setmetatile 21, 21, METATILE_Hideout_Floor, 0
 	return
diff --git a/data/maps/RocketHideout_B1F/text.inc b/data/maps/RocketHideout_B1F/text.inc
index fd7647e2b..9dea66b16 100644
--- a/data/maps/RocketHideout_B1F/text.inc
+++ b/data/maps/RocketHideout_B1F/text.inc
@@ -1,53 +1,53 @@
-Text_174ECA:: @ 8174ECA
+RocketHideout_B1F_Text_Grunt1Intro:: @ 8174ECA
     .string "Who are you?\n"
     .string "How did you get here?$"
 
-Text_174EED:: @ 8174EED
+RocketHideout_B1F_Text_Grunt1Defeat:: @ 8174EED
     .string "Oww!\n"
     .string "Beaten!$"
 
-gUnknown_8174EFA:: @ 8174EFA
+RocketHideout_B1F_Text_Grunt1PostBattle:: @ 8174EFA
     .string "Blast it… You're dissing TEAM\n"
     .string "ROCKET, aren't you?$"
 
-Text_174F2C:: @ 8174F2C
+RocketHideout_B1F_Text_Grunt2Intro:: @ 8174F2C
     .string "You broke into TEAM ROCKET's\n"
     .string "operation? What nerve!$"
 
-Text_174F60:: @ 8174F60
+RocketHideout_B1F_Text_Grunt2Defeat:: @ 8174F60
     .string "Boom!$"
 
-gUnknown_8174F66:: @ 8174F66
+RocketHideout_B1F_Text_Grunt2PostBattle:: @ 8174F66
     .string "You're not going to get away with\n"
     .string "this, brat!$"
 
-Text_174F94:: @ 8174F94
+RocketHideout_B1F_Text_Grunt3Intro:: @ 8174F94
     .string "Intruder alert!$"
 
-Text_174FA4:: @ 8174FA4
+RocketHideout_B1F_Text_Grunt3Defeat:: @ 8174FA4
     .string "I can't do it!$"
 
-gUnknown_8174FB3:: @ 8174FB3
+RocketHideout_B1F_Text_Grunt3PostBattle:: @ 8174FB3
     .string "SILPH SCOPE? Humph!\n"
     .string "I don't know where it is.$"
 
-Text_174FE1:: @ 8174FE1
+RocketHideout_B1F_Text_Grunt4Intro:: @ 8174FE1
     .string "Why did you come here?$"
 
-Text_174FF8:: @ 8174FF8
+RocketHideout_B1F_Text_Grunt4Defeat:: @ 8174FF8
     .string "This won't do!$"
 
-gUnknown_8175007:: @ 8175007
+RocketHideout_B1F_Text_Grunt4PostBattle:: @ 8175007
     .string "Okay, I'll talk…\n"
     .string "Take the elevator to see my BOSS.$"
 
-Text_17503A:: @ 817503A
+RocketHideout_B1F_Text_Grunt5Intro:: @ 817503A
     .string "Are you lost, you little mouse?$"
 
-Text_17505A:: @ 817505A
+RocketHideout_B1F_Text_Grunt5Defeat:: @ 817505A
     .string "Why…?$"
 
-gUnknown_8175060:: @ 8175060
+RocketHideout_B1F_Text_Grunt5PostBattle:: @ 8175060
     .string "Uh-oh, that ruckus somehow opened\n"
     .string "the door!$"
 
diff --git a/data/maps/RocketHideout_B2F/map.json b/data/maps/RocketHideout_B2F/map.json
index bdc600f55..2c353b5c1 100644
--- a/data/maps/RocketHideout_B2F/map.json
+++ b/data/maps/RocketHideout_B2F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "RocketHideout_B2F_EventScript_1612A2",
+      "script": "RocketHideout_B2F_EventScript_Grunt",
       "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
     },
     {
diff --git a/data/maps/RocketHideout_B2F/scripts.inc b/data/maps/RocketHideout_B2F/scripts.inc
index 07916ad03..55e7f6a2a 100644
--- a/data/maps/RocketHideout_B2F/scripts.inc
+++ b/data/maps/RocketHideout_B2F/scripts.inc
@@ -1,7 +1,7 @@
 RocketHideout_B2F_MapScripts:: @ 81612A1
 	.byte 0
 
-RocketHideout_B2F_EventScript_1612A2:: @ 81612A2
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_13, Text_17508C, Text_1750BF
-	msgbox gUnknown_81750CC, MSGBOX_AUTOCLOSE
+RocketHideout_B2F_EventScript_Grunt:: @ 81612A2
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_13, RocketHideout_B2F_Text_GruntIntro, RocketHideout_B2F_Text_GruntDefeat
+	msgbox RocketHideout_B2F_Text_GruntPostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/RocketHideout_B2F/text.inc b/data/maps/RocketHideout_B2F/text.inc
index d21c21555..a27121152 100644
--- a/data/maps/RocketHideout_B2F/text.inc
+++ b/data/maps/RocketHideout_B2F/text.inc
@@ -1,11 +1,11 @@
-Text_17508C:: @ 817508C
+RocketHideout_B2F_Text_GruntIntro:: @ 817508C
     .string "BOSS said you can see ghosts with\n"
     .string "the SILPH SCOPE.$"
 
-Text_1750BF:: @ 81750BF
+RocketHideout_B2F_Text_GruntDefeat:: @ 81750BF
     .string "I surrender!$"
 
-gUnknown_81750CC:: @ 81750CC
+RocketHideout_B2F_Text_GruntPostBattle:: @ 81750CC
     .string "The TEAM ROCKET HQ has four\n"
     .string "underground floors.\p"
     .string "Think you can reach the BOSS?$"
diff --git a/data/maps/RocketHideout_B3F/map.json b/data/maps/RocketHideout_B3F/map.json
index be88faebf..a4c1a7c72 100644
--- a/data/maps/RocketHideout_B3F/map.json
+++ b/data/maps/RocketHideout_B3F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "RocketHideout_B3F_EventScript_1612D1",
+      "script": "RocketHideout_B3F_EventScript_Grunt2",
       "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "RocketHideout_B3F_EventScript_1612BA",
+      "script": "RocketHideout_B3F_EventScript_Grunt1",
       "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
     },
     {
diff --git a/data/maps/RocketHideout_B3F/scripts.inc b/data/maps/RocketHideout_B3F/scripts.inc
index d6a57ab77..ab1fd6bb3 100644
--- a/data/maps/RocketHideout_B3F/scripts.inc
+++ b/data/maps/RocketHideout_B3F/scripts.inc
@@ -1,12 +1,12 @@
 RocketHideout_B3F_MapScripts:: @ 81612B9
 	.byte 0
 
-RocketHideout_B3F_EventScript_1612BA:: @ 81612BA
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_14, Text_17511A, Text_17514A
-	msgbox gUnknown_817515B, MSGBOX_AUTOCLOSE
+RocketHideout_B3F_EventScript_Grunt1:: @ 81612BA
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_14, RocketHideout_B3F_Text_Grunt1Intro, RocketHideout_B3F_Text_Grunt1Defeat
+	msgbox RocketHideout_B3F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-RocketHideout_B3F_EventScript_1612D1:: @ 81612D1
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_15, Text_17519E, Text_1751CE
-	msgbox gUnknown_81751E0, MSGBOX_AUTOCLOSE
+RocketHideout_B3F_EventScript_Grunt2:: @ 81612D1
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_15, RocketHideout_B3F_Text_Grunt2Intro, RocketHideout_B3F_Text_Grunt2Defeat
+	msgbox RocketHideout_B3F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/RocketHideout_B3F/text.inc b/data/maps/RocketHideout_B3F/text.inc
index deedfce38..12a9c5a7e 100644
--- a/data/maps/RocketHideout_B3F/text.inc
+++ b/data/maps/RocketHideout_B3F/text.inc
@@ -1,25 +1,25 @@
-Text_17511A:: @ 817511A
+RocketHideout_B3F_Text_Grunt1Intro:: @ 817511A
     .string "Stop meddling in TEAM ROCKET's\n"
     .string "affairs or else!$"
 
-Text_17514A:: @ 817514A
+RocketHideout_B3F_Text_Grunt1Defeat:: @ 817514A
     .string "Oof!\n"
     .string "Taken down!$"
 
-gUnknown_817515B:: @ 817515B
+RocketHideout_B3F_Text_Grunt1PostBattle:: @ 817515B
     .string "SILPH SCOPE?\n"
     .string "Oh, that machine the BOSS stole.\p"
     .string "It's here somewhere.$"
 
-Text_17519E:: @ 817519E
+RocketHideout_B3F_Text_Grunt2Intro:: @ 817519E
     .string "We got word from upstairs that you\n"
     .string "were coming!$"
 
-Text_1751CE:: @ 81751CE
+RocketHideout_B3F_Text_Grunt2Defeat:: @ 81751CE
     .string "What?\n"
     .string "I lost? No!$"
 
-gUnknown_81751E0:: @ 81751E0
+RocketHideout_B3F_Text_Grunt2PostBattle:: @ 81751E0
     .string "Go ahead and go!\p"
     .string "But you can't run the elevator\n"
     .string "without the LIFT KEY.$"
diff --git a/data/maps/RocketHideout_B4F/map.json b/data/maps/RocketHideout_B4F/map.json
index 1790720b4..da6f7f569 100644
--- a/data/maps/RocketHideout_B4F/map.json
+++ b/data/maps/RocketHideout_B4F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "RocketHideout_B4F_EventScript_161317",
+      "script": "RocketHideout_B4F_EventScript_Giovanni",
       "flag": "FLAG_HIDE_HIDEOUT_GIOVANNI"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "RocketHideout_B4F_EventScript_161381",
+      "script": "RocketHideout_B4F_EventScript_Grunt1",
       "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "RocketHideout_B4F_EventScript_161418",
+      "script": "RocketHideout_B4F_EventScript_Grunt3",
       "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
     },
     {
@@ -88,7 +88,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "RocketHideout_B4F_EventScript_1613CE",
+      "script": "RocketHideout_B4F_EventScript_Grunt2",
       "flag": "FLAG_HIDE_MISC_KANTO_ROCKETS"
     },
     {
diff --git a/data/maps/RocketHideout_B4F/scripts.inc b/data/maps/RocketHideout_B4F/scripts.inc
index 68671a7a8..63fff7d82 100644
--- a/data/maps/RocketHideout_B4F/scripts.inc
+++ b/data/maps/RocketHideout_B4F/scripts.inc
@@ -1,33 +1,39 @@
+.equ LOCALID_GIOVANNI,    1
+.equ LOCALID_SILPH_SCOPE, 2
+.equ LOCALID_LIFT_KEY,    4
+
+.equ NUM_DOOR_GRUNTS_DEFEATED, VAR_TEMP_1
+
 RocketHideout_B4F_MapScripts:: @ 81612E8
 	map_script MAP_SCRIPT_ON_LOAD, RocketHideout_B4F_OnLoad
 	.byte 0
 
 RocketHideout_B4F_OnLoad:: @ 81612EE
-	setvar VAR_TEMP_1, 0
-	call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_16, EventScript_161311
-	call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_17, EventScript_161311
-	compare VAR_TEMP_1, 2
-	call_if_ne EventScript_16146A
+	setvar NUM_DOOR_GRUNTS_DEFEATED, 0
+	call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_16, RocketHideout_B4F_EventScript_CountGruntDefeated
+	call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_17, RocketHideout_B4F_EventScript_CountGruntDefeated
+	compare NUM_DOOR_GRUNTS_DEFEATED, 2
+	call_if_ne RocketHideout_B4F_EventScript_SetBarrier
 	end
 
-EventScript_161311:: @ 8161311
-	addvar VAR_TEMP_1, 1
+RocketHideout_B4F_EventScript_CountGruntDefeated:: @ 8161311
+	addvar NUM_DOOR_GRUNTS_DEFEATED, 1
 	return
 
-RocketHideout_B4F_EventScript_161317:: @ 8161317
+RocketHideout_B4F_EventScript_Giovanni:: @ 8161317
 	lock
 	faceplayer
 	famechecker FAMECHECKER_GIOVANNI, 0
-	message Text_175226
+	message RocketHideout_B4F_Text_GiovanniIntro
 	waitmessage
 	playbgm MUS_ROCKET, 0
 	waitbuttonpress
-	trainerbattle_no_intro TRAINER_BOSS_GIOVANNI, Text_175318
-	msgbox gUnknown_817532D
+	trainerbattle_no_intro TRAINER_BOSS_GIOVANNI, RocketHideout_B4F_Text_GiovanniDefeat
+	msgbox RocketHideout_B4F_Text_GiovanniPostBattle
 	fadescreen FADE_TO_BLACK
 	closemessage
-	removeobject 1
-	addobject 2
+	removeobject LOCALID_GIOVANNI
+	addobject LOCALID_SILPH_SCOPE
 	clearflag FLAG_HIDE_SILPH_SCOPE
 	setflag FLAG_HIDE_CELADON_ROCKETS
 	famechecker FAMECHECKER_GIOVANNI, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
@@ -38,22 +44,22 @@ RocketHideout_B4F_EventScript_161317:: @ 8161317
 RocketHideout_B4F_EventScript_SilphScope:: @ 8161363
 	lock
 	faceplayer
-	removeobject 2
+	removeobject LOCALID_SILPH_SCOPE
 	giveitem ITEM_SILPH_SCOPE
 	compare VAR_RESULT, FALSE
 	goto_if_eq EventScript_BagIsFull
 	release
 	end
 
-RocketHideout_B4F_EventScript_161381:: @ 8161381
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_18, Text_175488, Text_1754B9, EventScript_16139D
-	msgbox gUnknown_81754BD
+RocketHideout_B4F_EventScript_Grunt1:: @ 8161381
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_18, RocketHideout_B4F_Text_Grunt1Intro, RocketHideout_B4F_Text_Grunt1Defeat, RocketHideout_B4F_EventScript_DefeatedGrunt1
+	msgbox RocketHideout_B4F_Text_Grunt1PostBattle
 	release
 	end
 
-EventScript_16139D:: @ 816139D
-	msgbox gUnknown_81754BD
-	addobject 4
+RocketHideout_B4F_EventScript_DefeatedGrunt1:: @ 816139D
+	msgbox RocketHideout_B4F_Text_Grunt1PostBattle
+	addobject LOCALID_LIFT_KEY
 	clearflag FLAG_HIDE_LIFT_KEY
 	release
 	end
@@ -62,65 +68,65 @@ RocketHideout_B4F_EventScript_LiftKey:: @ 81613AD
 	lock
 	faceplayer
 	setflag FLAG_CAN_USE_ROCKET_HIDEOUT_LIFT
-	removeobject 4
+	removeobject LOCALID_LIFT_KEY
 	giveitem ITEM_LIFT_KEY
 	compare VAR_RESULT, FALSE
 	goto_if_eq EventScript_BagIsFull
 	release
 	end
 
-RocketHideout_B4F_EventScript_1613CE:: @ 81613CE
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_16, Text_1753D0, Text_1753FE, EventScript_1613E9
-	msgbox gUnknown_817540C, MSGBOX_AUTOCLOSE
+RocketHideout_B4F_EventScript_Grunt2:: @ 81613CE
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_16, RocketHideout_B4F_Text_Grunt2Intro, RocketHideout_B4F_Text_Grunt2Defeat, RocketHideout_B4F_EventScript_DefeatedGrunt2
+	msgbox RocketHideout_B4F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1613E9:: @ 81613E9
-	setvar VAR_TEMP_1, 0
-	call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_16, EventScript_161311
-	call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_17, EventScript_161311
-	compare VAR_TEMP_1, 2
-	call_if_eq EventScript_1614A1
-	compare VAR_TEMP_1, 2
-	call_if_eq EventScript_161462
+RocketHideout_B4F_EventScript_DefeatedGrunt2:: @ 81613E9
+	setvar NUM_DOOR_GRUNTS_DEFEATED, 0
+	call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_16, RocketHideout_B4F_EventScript_CountGruntDefeated
+	call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_17, RocketHideout_B4F_EventScript_CountGruntDefeated
+	compare NUM_DOOR_GRUNTS_DEFEATED, 2
+	call_if_eq RocketHideout_B4F_EventScript_RemoveBarrier
+	compare NUM_DOOR_GRUNTS_DEFEATED, 2
+	call_if_eq RocketHideout_B4F_EventScript_DrawMapForBarrierRemoval
 	release
 	end
 
-RocketHideout_B4F_EventScript_161418:: @ 8161418
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_17, Text_175437, Text_175463, EventScript_161433
-	msgbox gUnknown_817546A, MSGBOX_AUTOCLOSE
+RocketHideout_B4F_EventScript_Grunt3:: @ 8161418
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_17, RocketHideout_B4F_Text_Grunt3Intro, RocketHideout_B4F_Text_Grunt3Defeat, RocketHideout_B4F_EventScript_DefeatedGrunt3
+	msgbox RocketHideout_B4F_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_161433:: @ 8161433
-	setvar VAR_TEMP_1, 0
-	call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_16, EventScript_161311
-	call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_17, EventScript_161311
-	compare VAR_TEMP_1, 2
-	call_if_eq EventScript_1614A1
-	compare VAR_TEMP_1, 2
-	call_if_eq EventScript_161462
+RocketHideout_B4F_EventScript_DefeatedGrunt3:: @ 8161433
+	setvar NUM_DOOR_GRUNTS_DEFEATED, 0
+	call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_16, RocketHideout_B4F_EventScript_CountGruntDefeated
+	call_if_defeated TRAINER_TEAM_ROCKET_GRUNT_17, RocketHideout_B4F_EventScript_CountGruntDefeated
+	compare NUM_DOOR_GRUNTS_DEFEATED, 2
+	call_if_eq RocketHideout_B4F_EventScript_RemoveBarrier
+	compare NUM_DOOR_GRUNTS_DEFEATED, 2
+	call_if_eq RocketHideout_B4F_EventScript_DrawMapForBarrierRemoval
 	release
 	end
 
-EventScript_161462:: @ 8161462
+RocketHideout_B4F_EventScript_DrawMapForBarrierRemoval:: @ 8161462
 	playse SE_KI_GASYAN
 	special DrawWholeMapView
 	waitse
 	return
 
-EventScript_16146A:: @ 816146A
-	setmetatile 17, 12, 718, 1
-	setmetatile 18, 12, 719, 1
-	setmetatile 17, 13, 726, 1
-	setmetatile 18, 13, 727, 1
-	setmetatile 17, 14, 642, 0
-	setmetatile 18, 14, 642, 0
+RocketHideout_B4F_EventScript_SetBarrier:: @ 816146A
+	setmetatile 17, 12, METATILE_Hideout_Barrier_TopLeft_Floor, 1
+	setmetatile 18, 12, METATILE_Hideout_Barrier_TopRight_Floor, 1
+	setmetatile 17, 13, METATILE_Hideout_Barrier_BottomLeft, 1
+	setmetatile 18, 13, METATILE_Hideout_Barrier_BottomRight, 1
+	setmetatile 17, 14, METATILE_Hideout_Floor_ShadeFull, 0
+	setmetatile 18, 14, METATILE_Hideout_Floor_ShadeFull, 0
 	return
 
-EventScript_1614A1:: @ 81614A1
-	setmetatile 17, 12, 642, 0
-	setmetatile 18, 12, 641, 0
-	setmetatile 17, 13, 642, 0
-	setmetatile 18, 13, 641, 0
-	setmetatile 17, 14, 642, 0
-	setmetatile 18, 14, 641, 0
+RocketHideout_B4F_EventScript_RemoveBarrier:: @ 81614A1
+	setmetatile 17, 12, METATILE_Hideout_Floor_ShadeFull, 0
+	setmetatile 18, 12, METATILE_Hideout_Floor, 0
+	setmetatile 17, 13, METATILE_Hideout_Floor_ShadeFull, 0
+	setmetatile 18, 13, METATILE_Hideout_Floor, 0
+	setmetatile 17, 14, METATILE_Hideout_Floor_ShadeFull, 0
+	setmetatile 18, 14, METATILE_Hideout_Floor, 0
 	return
diff --git a/data/maps/RocketHideout_B4F/text.inc b/data/maps/RocketHideout_B4F/text.inc
index 4ceba8968..9d11d7502 100644
--- a/data/maps/RocketHideout_B4F/text.inc
+++ b/data/maps/RocketHideout_B4F/text.inc
@@ -1,4 +1,4 @@
-Text_175226:: @ 8175226
+RocketHideout_B4F_Text_GiovanniIntro:: @ 8175226
     .string "So! I must say, I am impressed you\n"
     .string "got here.\p"
     .string "TEAM ROCKET captures POKéMON from\n"
@@ -9,11 +9,11 @@ Text_175226:: @ 8175226
     .string "For your insolence, you will feel a\n"
     .string "world of pain!$"
 
-Text_175318:: @ 8175318
+RocketHideout_B4F_Text_GiovanniDefeat:: @ 8175318
     .string "WHAT!\n"
     .string "This can't be!$"
 
-gUnknown_817532D:: @ 817532D
+RocketHideout_B4F_Text_GiovanniPostBattle:: @ 817532D
     .string "I see that you raise POKéMON with\n"
     .string "utmost care.\p"
     .string "A child like you would never\n"
@@ -21,36 +21,36 @@ gUnknown_817532D:: @ 817532D
     .string "I shall step aside this time!\p"
     .string "I hope we meet again…$"
 
-Text_1753D0:: @ 81753D0
+RocketHideout_B4F_Text_Grunt2Intro:: @ 81753D0
     .string "I know you!\n"
     .string "You ruined our plans at MT. MOON!$"
 
-Text_1753FE:: @ 81753FE
+RocketHideout_B4F_Text_Grunt2Defeat:: @ 81753FE
     .string "Burned again!$"
 
-gUnknown_817540C:: @ 817540C
+RocketHideout_B4F_Text_Grunt2PostBattle:: @ 817540C
     .string "Do you have something against TEAM\n"
     .string "ROCKET?$"
 
-Text_175437:: @ 8175437
+RocketHideout_B4F_Text_Grunt3Intro:: @ 8175437
     .string "How can you not see the beauty of\n"
     .string "our evil?$"
 
-Text_175463:: @ 8175463
+RocketHideout_B4F_Text_Grunt3Defeat:: @ 8175463
     .string "Ayaya!$"
 
-gUnknown_817546A:: @ 817546A
+RocketHideout_B4F_Text_Grunt3PostBattle:: @ 817546A
     .string "BOSS!\n"
     .string "I'm sorry I failed you!$"
 
-Text_175488:: @ 8175488
+RocketHideout_B4F_Text_Grunt1Intro:: @ 8175488
     .string "The elevator doesn't work?\n"
     .string "Who has the LIFT KEY?$"
 
-Text_1754B9:: @ 81754B9
+RocketHideout_B4F_Text_Grunt1Defeat:: @ 81754B9
     .string "No!$"
 
-gUnknown_81754BD:: @ 81754BD
+RocketHideout_B4F_Text_Grunt1PostBattle:: @ 81754BD
     .string "Oh, no!\n"
     .string "I dropped the LIFT KEY!$"
 
diff --git a/data/maps/RocketHideout_Elevator/map.json b/data/maps/RocketHideout_Elevator/map.json
index dd2191b6d..307ef90df 100644
--- a/data/maps/RocketHideout_Elevator/map.json
+++ b/data/maps/RocketHideout_Elevator/map.json
@@ -36,7 +36,7 @@
       "x": 0,
       "y": 2,
       "elevation": 0,
-      "script": "RocketHideout_Elevator_EventScript_1614D9"
+      "script": "RocketHideout_Elevator_EventScript_FloorSelect"
     }
   ]
 }
diff --git a/data/maps/RocketHideout_Elevator/scripts.inc b/data/maps/RocketHideout_Elevator/scripts.inc
index f649e5c40..f9f210fc0 100644
--- a/data/maps/RocketHideout_Elevator/scripts.inc
+++ b/data/maps/RocketHideout_Elevator/scripts.inc
@@ -1,11 +1,11 @@
 RocketHideout_Elevator_MapScripts:: @ 81614D8
 	.byte 0
 
-RocketHideout_Elevator_EventScript_1614D9:: @ 81614D9
+RocketHideout_Elevator_EventScript_FloorSelect:: @ 81614D9
 	lockall
-	goto_if_unset FLAG_CAN_USE_ROCKET_HIDEOUT_LIFT, EventScript_16161B
+	goto_if_unset FLAG_CAN_USE_ROCKET_HIDEOUT_LIFT, RocketHideout_Elevator_EventScript_NeedKey
 	setvar VAR_0x8004, 2
-	call_if_unset FLAG_TEMP_2, EventScript_1A7AB9
+	call_if_unset FLAG_TEMP_2, EventScript_GetElevatorFloor
 	copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR
 	special Special_DrawElevatorCurrentFloorWindow
 	message Text_WantWhichFloor
@@ -13,83 +13,71 @@ RocketHideout_Elevator_EventScript_1614D9:: @ 81614D9
 	setvar VAR_0x8004, 2
 	specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos
 	switch VAR_RESULT
-	case 0, EventScript_161530
-	case 1, EventScript_16153C
-	case 2, EventScript_161548
+	case 0, RocketHideout_Elevator_EventScript_FloorSelectFromB1F
+	case 1, RocketHideout_Elevator_EventScript_FloorSelectFromB2F
+	case 2, RocketHideout_Elevator_EventScript_FloorSelectFromB4F
 	end
 
-EventScript_161530:: @ 8161530
+RocketHideout_Elevator_EventScript_FloorSelectFromB1F:: @ 8161530
 	multichoicedefault 0, 0, MULTICHOICE_ROCKET_HIDEOUT_ELEVATOR, 0, FALSE
-	goto EventScript_161554
-
-EventScript_16153B:: @ 816153B
+	goto RocketHideout_Elevator_EventScript_ChooseFloor
 	end
 
-EventScript_16153C:: @ 816153C
+RocketHideout_Elevator_EventScript_FloorSelectFromB2F:: @ 816153C
 	multichoicedefault 0, 0, MULTICHOICE_ROCKET_HIDEOUT_ELEVATOR, 1, FALSE
-	goto EventScript_161554
-
-EventScript_161547:: @ 8161547
+	goto RocketHideout_Elevator_EventScript_ChooseFloor
 	end
 
-EventScript_161548:: @ 8161548
+RocketHideout_Elevator_EventScript_FloorSelectFromB4F:: @ 8161548
 	multichoicedefault 0, 0, MULTICHOICE_ROCKET_HIDEOUT_ELEVATOR, 2, FALSE
-	goto EventScript_161554
-
-EventScript_161553:: @ 8161553
+	goto RocketHideout_Elevator_EventScript_ChooseFloor
 	end
 
-EventScript_161554:: @ 8161554
+RocketHideout_Elevator_EventScript_ChooseFloor:: @ 8161554
 	switch VAR_RESULT
-	case 0, EventScript_161591
-	case 1, EventScript_1615B9
-	case 2, EventScript_1615E1
-	case 3, EventScript_161609
-	case 127, EventScript_161609
+	case 0, RocketHideout_Elevator_EventScript_ToB1F
+	case 1, RocketHideout_Elevator_EventScript_ToB2F
+	case 2, RocketHideout_Elevator_EventScript_ToB4F
+	case 3, RocketHideout_Elevator_EventScript_ExitFloorSelect
+	case 127, RocketHideout_Elevator_EventScript_ExitFloorSelect
 	end
 
-EventScript_161591:: @ 8161591
+RocketHideout_Elevator_EventScript_ToB1F:: @ 8161591
 	setvar VAR_0x8006, 3
 	setdynamicwarp MAP_ROCKET_HIDEOUT_B1F, 255, 24, 25
 	compare VAR_ELEVATOR_FLOOR, 3
-	goto_if_eq EventScript_161609
-	call EventScript_16160E
+	goto_if_eq RocketHideout_Elevator_EventScript_ExitFloorSelect
+	call RocketHideout_Elevator_EventScript_MoveElevator
 	setvar VAR_ELEVATOR_FLOOR, 3
-	goto EventScript_161609
-
-EventScript_1615B8:: @ 81615B8
+	goto RocketHideout_Elevator_EventScript_ExitFloorSelect
 	end
 
-EventScript_1615B9:: @ 81615B9
+RocketHideout_Elevator_EventScript_ToB2F:: @ 81615B9
 	setvar VAR_0x8006, 2
 	setdynamicwarp MAP_ROCKET_HIDEOUT_B2F, 255, 28, 16
 	compare VAR_ELEVATOR_FLOOR, 2
-	goto_if_eq EventScript_161609
-	call EventScript_16160E
+	goto_if_eq RocketHideout_Elevator_EventScript_ExitFloorSelect
+	call RocketHideout_Elevator_EventScript_MoveElevator
 	setvar VAR_ELEVATOR_FLOOR, 2
-	goto EventScript_161609
-
-EventScript_1615E0:: @ 81615E0
+	goto RocketHideout_Elevator_EventScript_ExitFloorSelect
 	end
 
-EventScript_1615E1:: @ 81615E1
+RocketHideout_Elevator_EventScript_ToB4F:: @ 81615E1
 	setvar VAR_0x8006, 0
 	setdynamicwarp MAP_ROCKET_HIDEOUT_B4F, 255, 20, 23
 	compare VAR_ELEVATOR_FLOOR, 0
-	goto_if_eq EventScript_161609
-	call EventScript_16160E
+	goto_if_eq RocketHideout_Elevator_EventScript_ExitFloorSelect
+	call RocketHideout_Elevator_EventScript_MoveElevator
 	setvar VAR_ELEVATOR_FLOOR, 0
-	goto EventScript_161609
-
-EventScript_161608:: @ 8161608
+	goto RocketHideout_Elevator_EventScript_ExitFloorSelect
 	end
 
-EventScript_161609:: @ 8161609
+RocketHideout_Elevator_EventScript_ExitFloorSelect:: @ 8161609
 	special Special_CloseElevatorCurrentFloorWindow
 	releaseall
 	end
 
-EventScript_16160E:: @ 816160E
+RocketHideout_Elevator_EventScript_MoveElevator:: @ 816160E
 	special Special_CloseElevatorCurrentFloorWindow
 	closemessage
 	waitse
@@ -98,7 +86,7 @@ EventScript_16160E:: @ 816160E
 	setflag FLAG_TEMP_2
 	return
 
-EventScript_16161B:: @ 816161B
-	msgbox gUnknown_81754DD
+RocketHideout_Elevator_EventScript_NeedKey:: @ 816161B
+	msgbox RocketHideout_Elevator_Text_AppearsToNeedAKey
 	releaseall
 	end
diff --git a/data/maps/RocketHideout_Elevator/text.inc b/data/maps/RocketHideout_Elevator/text.inc
index 89de8f918..f0e5e09f8 100644
--- a/data/maps/RocketHideout_Elevator/text.inc
+++ b/data/maps/RocketHideout_Elevator/text.inc
@@ -1,3 +1,3 @@
-gUnknown_81754DD:: @ 81754DD
+RocketHideout_Elevator_Text_AppearsToNeedAKey:: @ 81754DD
     .string "It appears to need a key.$"
 
diff --git a/data/maps/Route5/map.json b/data/maps/Route5/map.json
index 585054ddd..39b175cc6 100644
--- a/data/maps/Route5/map.json
+++ b/data/maps/Route5/map.json
@@ -18,7 +18,7 @@
       "direction": "up"
     },
     {
-      "map": "MAP_SAFFRON_CITY_CLASSIC",
+      "map": "MAP_SAFFRON_CITY_CONNECTION",
       "offset": 0,
       "direction": "down"
     }
diff --git a/data/maps/Route5_PokemonDayCare/text.inc b/data/maps/Route5_PokemonDayCare/text.inc
index cada12ea5..b87ca2ca2 100644
--- a/data/maps/Route5_PokemonDayCare/text.inc
+++ b/data/maps/Route5_PokemonDayCare/text.inc
@@ -58,3 +58,11 @@ Route5_PokemonDayCare_Text_YouveGotNoRoomForIt:: @ 819DFC2
 
 Route5_PokemonDayCare_Text_DontHaveEnoughMoney:: @ 819E001
 	.string "You don't have enough money.$"
+
+Text_19E01E:: @ 819E01E
+    .string "きみの\n"
+    .string "みてみるかね？$"
+
+Text_19E02A:: @ 819E02A
+    .string "わるいけど　ひでんのわざを　もった\n"
+    .string "ポケモンは　あずかれないなぁ$"
diff --git a/data/maps/Route5_SouthEntrance/map.json b/data/maps/Route5_SouthEntrance/map.json
index a85de2522..e75bbbf85 100644
--- a/data/maps/Route5_SouthEntrance/map.json
+++ b/data/maps/Route5_SouthEntrance/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route5_SouthEntrance_EventScript_16F901",
+      "script": "Route5_SouthEntrance_EventScript_Guard",
       "flag": "0"
     }
   ],
@@ -65,7 +65,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES",
       "var_value": 0,
-      "script": "Route5_SouthEntrance_EventScript_16F90A"
+      "script": "Route5_SouthEntrance_EventScript_GuardTriggerLeft"
     },
     {
       "type": "trigger",
@@ -74,7 +74,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES",
       "var_value": 0,
-      "script": "Route5_SouthEntrance_EventScript_16F916"
+      "script": "Route5_SouthEntrance_EventScript_GuardTriggerMid"
     },
     {
       "type": "trigger",
@@ -83,7 +83,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES",
       "var_value": 0,
-      "script": "Route5_SouthEntrance_EventScript_16F922"
+      "script": "Route5_SouthEntrance_EventScript_GuardTriggerRight"
     }
   ],
   "bg_events": []
diff --git a/data/maps/Route5_SouthEntrance/scripts.inc b/data/maps/Route5_SouthEntrance/scripts.inc
index f20da71ae..b06a2aa2c 100644
--- a/data/maps/Route5_SouthEntrance/scripts.inc
+++ b/data/maps/Route5_SouthEntrance/scripts.inc
@@ -1,87 +1,87 @@
 Route5_SouthEntrance_MapScripts:: @ 816F900
 	.byte 0
 
-Route5_SouthEntrance_EventScript_16F901:: @ 816F901
-	msgbox gUnknown_819E16D, MSGBOX_NPC
+Route5_SouthEntrance_EventScript_Guard:: @ 816F901
+	msgbox Route5_SouthEntrance_Text_HiHowsItGoing, MSGBOX_NPC
 	end
 
-Route5_SouthEntrance_EventScript_16F90A:: @ 816F90A
+Route5_SouthEntrance_EventScript_GuardTriggerLeft:: @ 816F90A
 	lockall
 	setvar VAR_TEMP_1, 0
-	goto EventScript_16F92E
+	goto Route5_SouthEntrance_EventScript_GuardTrigger
 	end
 
-Route5_SouthEntrance_EventScript_16F916:: @ 816F916
+Route5_SouthEntrance_EventScript_GuardTriggerMid:: @ 816F916
 	lockall
 	setvar VAR_TEMP_1, 1
-	goto EventScript_16F92E
+	goto Route5_SouthEntrance_EventScript_GuardTrigger
 	end
 
-Route5_SouthEntrance_EventScript_16F922:: @ 816F922
+Route5_SouthEntrance_EventScript_GuardTriggerRight:: @ 816F922
 	lockall
 	setvar VAR_TEMP_1, 2
-	goto EventScript_16F92E
+	goto Route5_SouthEntrance_EventScript_GuardTrigger
 	end
 
-EventScript_16F92E:: @ 816F92E
+Route5_SouthEntrance_EventScript_GuardTrigger:: @ 816F92E
 	textcolor 0
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft
 	waitmovement 0
-	goto_if_set FLAG_GOT_TEA, EventScript_16F958
-	msgbox gUnknown_819E04B
+	goto_if_set FLAG_GOT_TEA, Route5_SouthEntrance_EventScript_GiveTea
+	msgbox Route5_SouthEntrance_Text_ThirstyOnGuardDuty
 	closemessage
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_16F9C4
+	applymovement OBJ_EVENT_ID_PLAYER, Route5_SouthEntrance_Movement_BlockPlayerEntry
 	waitmovement 0
 	releaseall
 	end
 
-EventScript_16F958:: @ 816F958
+Route5_SouthEntrance_EventScript_GiveTea:: @ 816F958
 	removeitem ITEM_TEA, 1
-	goto EventScript_16F963
+	goto Route5_SouthEntrance_EventScript_GuardDrinkTea
 	end
 
-EventScript_16F963:: @ 816F963
-	msgbox gUnknown_819E09B
+Route5_SouthEntrance_EventScript_GuardDrinkTea:: @ 816F963
+	msgbox Route5_SouthEntrance_Text_ThatTeaLooksTasty
 	closemessage
 	compare VAR_TEMP_1, 0
-	call_if_eq EventScript_16F99C
+	call_if_eq Route5_SouthEntrance_EventScript_WalkToGuardLeft
 	compare VAR_TEMP_1, 1
-	call_if_eq EventScript_16F9A7
+	call_if_eq Route5_SouthEntrance_EventScript_WalkToGuardMid
 	compare VAR_TEMP_1, 2
-	call_if_eq EventScript_16F9B2
-	msgbox gUnknown_819E0C1
+	call_if_eq Route5_SouthEntrance_EventScript_WalkToGuardRight
+	msgbox Route5_SouthEntrance_Text_ThanksIllShareTeaWithGuards
 	setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1
 	releaseall
 	end
 
-EventScript_16F99C:: @ 816F99C
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_16F9C2
+Route5_SouthEntrance_EventScript_WalkToGuardLeft:: @ 816F99C
+	applymovement OBJ_EVENT_ID_PLAYER, Route5_SouthEntrance_Movement_WalkToGuardLeft
 	waitmovement 0
 	return
 
-EventScript_16F9A7:: @ 816F9A7
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_16F9BD
+Route5_SouthEntrance_EventScript_WalkToGuardMid:: @ 816F9A7
+	applymovement OBJ_EVENT_ID_PLAYER, Route5_SouthEntrance_Movement_WalkToGuardMid
 	waitmovement 0
 	return
 
-EventScript_16F9B2:: @ 816F9B2
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_16F9BF
+Route5_SouthEntrance_EventScript_WalkToGuardRight:: @ 816F9B2
+	applymovement OBJ_EVENT_ID_PLAYER, Route5_SouthEntrance_Movement_WalkToGuardRight
 	waitmovement 0
 	return
 
-Movement_16F9BD:: @ 816F9BD
+Route5_SouthEntrance_Movement_WalkToGuardMid:: @ 816F9BD
 	walk_left
 	step_end
 
-Movement_16F9BF:: @ 816F9BF
+Route5_SouthEntrance_Movement_WalkToGuardRight:: @ 816F9BF
 	walk_left
 	walk_left
 	step_end
 
-Movement_16F9C2:: @ 816F9C2
+Route5_SouthEntrance_Movement_WalkToGuardLeft:: @ 816F9C2
 	walk_in_place_left
 	step_end
 
-Movement_16F9C4:: @ 816F9C4
+Route5_SouthEntrance_Movement_BlockPlayerEntry:: @ 816F9C4
 	walk_up
 	step_end
diff --git a/data/maps/Route5_SouthEntrance/text.inc b/data/maps/Route5_SouthEntrance/text.inc
index 749bcabe5..2b740e141 100644
--- a/data/maps/Route5_SouthEntrance/text.inc
+++ b/data/maps/Route5_SouthEntrance/text.inc
@@ -1,21 +1,13 @@
-Text_19E01E:: @ 819E01E
-    .string "きみの\n"
-    .string "みてみるかね？$"
-
-Text_19E02A:: @ 819E02A
-    .string "わるいけど　ひでんのわざを　もった\n"
-    .string "ポケモンは　あずかれないなぁ$"
-
-gUnknown_819E04B:: @ 819E04B
+Route5_SouthEntrance_Text_ThirstyOnGuardDuty:: @ 819E04B
     .string "I'm on guard duty.\n"
     .string "Gee, I'm thirsty, though!\p"
     .string "Oh, wait there, the road's closed.$"
 
-gUnknown_819E09B:: @ 819E09B
+Route5_SouthEntrance_Text_ThatTeaLooksTasty:: @ 819E09B
     .string "Oh, that TEA…\n"
     .string "It looks awfully tasty…$"
 
-gUnknown_819E0C1:: @ 819E0C1
+Route5_SouthEntrance_Text_ThanksIllShareTeaWithGuards:: @ 819E0C1
     .string "Huh? I can have this drink?\n"
     .string "Gee, thanks!\l"
     .string "… …\l"
@@ -29,6 +21,6 @@ gUnknown_819E0C1:: @ 819E0C1
     .string "I'll share this TEA with the other\n"
     .string "guards!$"
 
-gUnknown_819E16D:: @ 819E16D
+Route5_SouthEntrance_Text_HiHowsItGoing:: @ 819E16D
     .string "Hi, how's it going?$"
 
diff --git a/data/maps/Route6/map.json b/data/maps/Route6/map.json
index b827521ae..bce68d653 100644
--- a/data/maps/Route6/map.json
+++ b/data/maps/Route6/map.json
@@ -13,7 +13,7 @@
   "battle_scene": "BATTLE_SCENE_0",
   "connections": [
     {
-      "map": "MAP_SAFFRON_CITY_CLASSIC",
+      "map": "MAP_SAFFRON_CITY_CONNECTION",
       "offset": 0,
       "direction": "up"
     },
diff --git a/data/maps/Route6_NorthEntrance/map.json b/data/maps/Route6_NorthEntrance/map.json
index 8b49e226d..d44503ee4 100644
--- a/data/maps/Route6_NorthEntrance/map.json
+++ b/data/maps/Route6_NorthEntrance/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route6_NorthEntrance_EventScript_16F9C7",
+      "script": "Route6_NorthEntrance_EventScript_Guard",
       "flag": "0"
     }
   ],
@@ -65,7 +65,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES",
       "var_value": 0,
-      "script": "Route6_NorthEntrance_EventScript_16F9D0"
+      "script": "Route6_NorthEntrance_EventScript_GuardTriggerLeft"
     },
     {
       "type": "trigger",
@@ -74,7 +74,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES",
       "var_value": 0,
-      "script": "Route6_NorthEntrance_EventScript_16F9DC"
+      "script": "Route6_NorthEntrance_EventScript_GuardTriggerMid"
     },
     {
       "type": "trigger",
@@ -83,7 +83,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES",
       "var_value": 0,
-      "script": "Route6_NorthEntrance_EventScript_16F9E8"
+      "script": "Route6_NorthEntrance_EventScript_GuardTriggerRight"
     }
   ],
   "bg_events": []
diff --git a/data/maps/Route6_NorthEntrance/scripts.inc b/data/maps/Route6_NorthEntrance/scripts.inc
index d1b9a4555..5c7add642 100644
--- a/data/maps/Route6_NorthEntrance/scripts.inc
+++ b/data/maps/Route6_NorthEntrance/scripts.inc
@@ -1,87 +1,87 @@
 Route6_NorthEntrance_MapScripts:: @ 816F9C6
 	.byte 0
 
-Route6_NorthEntrance_EventScript_16F9C7:: @ 816F9C7
-	msgbox gUnknown_819E2A3, MSGBOX_NPC
+Route6_NorthEntrance_EventScript_Guard:: @ 816F9C7
+	msgbox Route6_NorthEntrance_Text_HiHowsItGoing, MSGBOX_NPC
 	end
 
-Route6_NorthEntrance_EventScript_16F9D0:: @ 816F9D0
+Route6_NorthEntrance_EventScript_GuardTriggerLeft:: @ 816F9D0
 	lockall
 	setvar VAR_TEMP_1, 0
-	goto EventScript_16F9F4
+	goto Route6_NorthEntrance_EventScript_GuardTrigger
 	end
 
-Route6_NorthEntrance_EventScript_16F9DC:: @ 816F9DC
+Route6_NorthEntrance_EventScript_GuardTriggerMid:: @ 816F9DC
 	lockall
 	setvar VAR_TEMP_1, 1
-	goto EventScript_16F9F4
+	goto Route6_NorthEntrance_EventScript_GuardTrigger
 	end
 
-Route6_NorthEntrance_EventScript_16F9E8:: @ 816F9E8
+Route6_NorthEntrance_EventScript_GuardTriggerRight:: @ 816F9E8
 	lockall
 	setvar VAR_TEMP_1, 2
-	goto EventScript_16F9F4
+	goto Route6_NorthEntrance_EventScript_GuardTrigger
 	end
 
-EventScript_16F9F4:: @ 816F9F4
+Route6_NorthEntrance_EventScript_GuardTrigger:: @ 816F9F4
 	textcolor 0
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	goto_if_set FLAG_GOT_TEA, EventScript_16FA1E
-	msgbox gUnknown_819E181
+	goto_if_set FLAG_GOT_TEA, Route6_NorthEntrance_EventScript_GiveTea
+	msgbox Route6_NorthEntrance_Text_ThirstyOnGuardDuty
 	closemessage
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_16FA8A
+	applymovement OBJ_EVENT_ID_PLAYER, Route6_NorthEntrance_Movement_BlockPlayerEntry
 	waitmovement 0
 	releaseall
 	end
 
-EventScript_16FA1E:: @ 816FA1E
+Route6_NorthEntrance_EventScript_GiveTea:: @ 816FA1E
 	removeitem ITEM_TEA, 1
-	goto EventScript_16FA29
+	goto Route6_NorthEntrance_EventScript_GuardDrinkTea
 	end
 
-EventScript_16FA29:: @ 816FA29
-	msgbox gUnknown_819E1D1
+Route6_NorthEntrance_EventScript_GuardDrinkTea:: @ 816FA29
+	msgbox Route6_NorthEntrance_Text_ThatTeaLooksTasty
 	closemessage
 	compare VAR_TEMP_1, 0
-	call_if_eq EventScript_16FA62
+	call_if_eq Route6_NorthEntrance_EventScript_WalkToGuardLeft
 	compare VAR_TEMP_1, 1
-	call_if_eq EventScript_16FA6D
+	call_if_eq Route6_NorthEntrance_EventScript_WalkToGuardMid
 	compare VAR_TEMP_1, 2
-	call_if_eq EventScript_16FA78
-	msgbox gUnknown_819E1F7
+	call_if_eq Route6_NorthEntrance_EventScript_WalkToGuardRight
+	msgbox Route6_NorthEntrance_Text_ThanksIllShareTeaWithGuards
 	setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1
 	releaseall
 	end
 
-EventScript_16FA62:: @ 816FA62
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_16FA83
+Route6_NorthEntrance_EventScript_WalkToGuardLeft:: @ 816FA62
+	applymovement OBJ_EVENT_ID_PLAYER, Route6_NorthEntrance_Movement_WalkToGuardLeft
 	waitmovement 0
 	return
 
-EventScript_16FA6D:: @ 816FA6D
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_16FA86
+Route6_NorthEntrance_EventScript_WalkToGuardMid:: @ 816FA6D
+	applymovement OBJ_EVENT_ID_PLAYER, Route6_NorthEntrance_Movement_WalkToGuardMid
 	waitmovement 0
 	return
 
-EventScript_16FA78:: @ 816FA78
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_16FA88
+Route6_NorthEntrance_EventScript_WalkToGuardRight:: @ 816FA78
+	applymovement OBJ_EVENT_ID_PLAYER, Route6_NorthEntrance_Movement_WalkToGuardRight
 	waitmovement 0
 	return
 
-Movement_16FA83:: @ 816FA83
+Route6_NorthEntrance_Movement_WalkToGuardLeft:: @ 816FA83
 	walk_right
 	walk_right
 	step_end
 
-Movement_16FA86:: @ 816FA86
+Route6_NorthEntrance_Movement_WalkToGuardMid:: @ 816FA86
 	walk_right
 	step_end
 
-Movement_16FA88:: @ 816FA88
+Route6_NorthEntrance_Movement_WalkToGuardRight:: @ 816FA88
 	walk_in_place_right
 	step_end
 
-Movement_16FA8A:: @ 816FA8A
+Route6_NorthEntrance_Movement_BlockPlayerEntry:: @ 816FA8A
 	walk_down
 	step_end
diff --git a/data/maps/Route6_NorthEntrance/text.inc b/data/maps/Route6_NorthEntrance/text.inc
index 3d581e1fb..09705517c 100644
--- a/data/maps/Route6_NorthEntrance/text.inc
+++ b/data/maps/Route6_NorthEntrance/text.inc
@@ -1,13 +1,13 @@
-gUnknown_819E181:: @ 819E181
+Route6_NorthEntrance_Text_ThirstyOnGuardDuty:: @ 819E181
     .string "I'm on guard duty.\n"
     .string "Gee, I'm thirsty, though!\p"
     .string "Oh, wait there, the road's closed.$"
 
-gUnknown_819E1D1:: @ 819E1D1
+Route6_NorthEntrance_Text_ThatTeaLooksTasty:: @ 819E1D1
     .string "Oh, that TEA…\n"
     .string "It looks awfully tasty…$"
 
-gUnknown_819E1F7:: @ 819E1F7
+Route6_NorthEntrance_Text_ThanksIllShareTeaWithGuards:: @ 819E1F7
     .string "Huh? I can have this drink?\n"
     .string "Gee, thanks!\l"
     .string "… …\l"
@@ -21,6 +21,6 @@ gUnknown_819E1F7:: @ 819E1F7
     .string "I'll share this TEA with the other\n"
     .string "guards!$"
 
-gUnknown_819E2A3:: @ 819E2A3
+Route6_NorthEntrance_Text_HiHowsItGoing:: @ 819E2A3
     .string "Hi, how's it going?$"
 
diff --git a/data/maps/Route7/map.json b/data/maps/Route7/map.json
index 66833b93b..145245c13 100644
--- a/data/maps/Route7/map.json
+++ b/data/maps/Route7/map.json
@@ -18,7 +18,7 @@
       "direction": "left"
     },
     {
-      "map": "MAP_SAFFRON_CITY_CLASSIC",
+      "map": "MAP_SAFFRON_CITY_CONNECTION",
       "offset": -10,
       "direction": "right"
     }
diff --git a/data/maps/Route7_EastEntrance/map.json b/data/maps/Route7_EastEntrance/map.json
index 8bd0e7498..fbb8a163d 100644
--- a/data/maps/Route7_EastEntrance/map.json
+++ b/data/maps/Route7_EastEntrance/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route7_EastEntrance_EventScript_16FA8E",
+      "script": "Route7_EastEntrance_EventScript_Guard",
       "flag": "0"
     }
   ],
@@ -65,7 +65,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES",
       "var_value": 0,
-      "script": "Route7_EastEntrance_EventScript_16FA97"
+      "script": "Route7_EastEntrance_EventScript_GuardTriggerTop"
     },
     {
       "type": "trigger",
@@ -74,7 +74,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES",
       "var_value": 0,
-      "script": "Route7_EastEntrance_EventScript_16FAA3"
+      "script": "Route7_EastEntrance_EventScript_GuardTriggerMid"
     },
     {
       "type": "trigger",
@@ -83,7 +83,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES",
       "var_value": 0,
-      "script": "Route7_EastEntrance_EventScript_16FAAF"
+      "script": "Route7_EastEntrance_EventScript_GuardTriggerBottom"
     }
   ],
   "bg_events": []
diff --git a/data/maps/Route7_EastEntrance/scripts.inc b/data/maps/Route7_EastEntrance/scripts.inc
index cac72463b..767601f49 100644
--- a/data/maps/Route7_EastEntrance/scripts.inc
+++ b/data/maps/Route7_EastEntrance/scripts.inc
@@ -1,87 +1,87 @@
 Route7_EastEntrance_MapScripts:: @ 816FA8D
 	.byte 0
 
-Route7_EastEntrance_EventScript_16FA8E:: @ 816FA8E
-	msgbox gUnknown_819E3D9, MSGBOX_NPC
+Route7_EastEntrance_EventScript_Guard:: @ 816FA8E
+	msgbox Route7_EastEntrance_Text_HiHowsItGoing, MSGBOX_NPC
 	end
 
-Route7_EastEntrance_EventScript_16FA97:: @ 816FA97
+Route7_EastEntrance_EventScript_GuardTriggerTop:: @ 816FA97
 	lockall
 	setvar VAR_TEMP_1, 0
-	goto EventScript_16FABB
+	goto Route7_EastEntrance_EventScript_GuardTrigger
 	end
 
-Route7_EastEntrance_EventScript_16FAA3:: @ 816FAA3
+Route7_EastEntrance_EventScript_GuardTriggerMid:: @ 816FAA3
 	lockall
 	setvar VAR_TEMP_1, 1
-	goto EventScript_16FABB
+	goto Route7_EastEntrance_EventScript_GuardTrigger
 	end
 
-Route7_EastEntrance_EventScript_16FAAF:: @ 816FAAF
+Route7_EastEntrance_EventScript_GuardTriggerBottom:: @ 816FAAF
 	lockall
 	setvar VAR_TEMP_1, 2
-	goto EventScript_16FABB
+	goto Route7_EastEntrance_EventScript_GuardTrigger
 	end
 
-EventScript_16FABB:: @ 816FABB
+Route7_EastEntrance_EventScript_GuardTrigger:: @ 816FABB
 	textcolor 0
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	goto_if_set FLAG_GOT_TEA, EventScript_16FAE5
-	msgbox gUnknown_819E2B7
+	goto_if_set FLAG_GOT_TEA, Route7_EastEntrance_EventScript_GiveTea
+	msgbox Route7_EastEntrance_Text_ThirstyOnGuardDuty
 	closemessage
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_16FB51
+	applymovement OBJ_EVENT_ID_PLAYER, Route7_EastEntrance_Movement_BlockPlayerEntry
 	waitmovement 0
 	releaseall
 	end
 
-EventScript_16FAE5:: @ 816FAE5
+Route7_EastEntrance_EventScript_GiveTea:: @ 816FAE5
 	removeitem ITEM_TEA, 1
-	goto EventScript_16FAF0
+	goto Route7_EastEntrance_EventScript_GuardDrinkTea
 	end
 
-EventScript_16FAF0:: @ 816FAF0
-	msgbox gUnknown_819E307
+Route7_EastEntrance_EventScript_GuardDrinkTea:: @ 816FAF0
+	msgbox Route7_EastEntrance_Text_ThatTeaLooksTasty
 	closemessage
 	compare VAR_TEMP_1, 0
-	call_if_eq EventScript_16FB29
+	call_if_eq Route7_EastEntrance_WalkToGuardTop
 	compare VAR_TEMP_1, 1
-	call_if_eq EventScript_16FB34
+	call_if_eq Route7_EastEntrance_WalkToGuardMid
 	compare VAR_TEMP_1, 2
-	call_if_eq EventScript_16FB3F
-	msgbox gUnknown_819E32D
+	call_if_eq Route7_EastEntrance_WalkToGuardBottom
+	msgbox Route7_EastEntrance_Text_ThanksIllShareTeaWithGuards
 	setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1
 	releaseall
 	end
 
-EventScript_16FB29:: @ 816FB29
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_16FB4F
+Route7_EastEntrance_WalkToGuardTop:: @ 816FB29
+	applymovement OBJ_EVENT_ID_PLAYER, Route7_EastEntrance_Movement_WalkToGuardTop
 	waitmovement 0
 	return
 
-EventScript_16FB34:: @ 816FB34
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_16FB4A
+Route7_EastEntrance_WalkToGuardMid:: @ 816FB34
+	applymovement OBJ_EVENT_ID_PLAYER, Route7_EastEntrance_Movement_WalkToGuardMid
 	waitmovement 0
 	return
 
-EventScript_16FB3F:: @ 816FB3F
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_16FB4C
+Route7_EastEntrance_WalkToGuardBottom:: @ 816FB3F
+	applymovement OBJ_EVENT_ID_PLAYER, Route7_EastEntrance_Movement_WalkToGuardBottom
 	waitmovement 0
 	return
 
-Movement_16FB4A:: @ 816FB4A
+Route7_EastEntrance_Movement_WalkToGuardMid:: @ 816FB4A
 	walk_up
 	step_end
 
-Movement_16FB4C:: @ 816FB4C
+Route7_EastEntrance_Movement_WalkToGuardBottom:: @ 816FB4C
 	walk_up
 	walk_up
 	step_end
 
-Movement_16FB4F:: @ 816FB4F
+Route7_EastEntrance_Movement_WalkToGuardTop:: @ 816FB4F
 	walk_in_place_up
 	step_end
 
-Movement_16FB51:: @ 816FB51
+Route7_EastEntrance_Movement_BlockPlayerEntry:: @ 816FB51
 	walk_left
 	step_end
diff --git a/data/maps/Route7_EastEntrance/text.inc b/data/maps/Route7_EastEntrance/text.inc
index 94db43e94..ec98a5867 100644
--- a/data/maps/Route7_EastEntrance/text.inc
+++ b/data/maps/Route7_EastEntrance/text.inc
@@ -1,13 +1,13 @@
-gUnknown_819E2B7:: @ 819E2B7
+Route7_EastEntrance_Text_ThirstyOnGuardDuty:: @ 819E2B7
     .string "I'm on guard duty.\n"
     .string "Gee, I'm thirsty, though!\p"
     .string "Oh, wait there, the road's closed.$"
 
-gUnknown_819E307:: @ 819E307
+Route7_EastEntrance_Text_ThatTeaLooksTasty:: @ 819E307
     .string "Oh, that TEA…\n"
     .string "It looks awfully tasty…$"
 
-gUnknown_819E32D:: @ 819E32D
+Route7_EastEntrance_Text_ThanksIllShareTeaWithGuards:: @ 819E32D
     .string "Huh? I can have this drink?\n"
     .string "Gee, thanks!\l"
     .string "… …\l"
@@ -21,6 +21,6 @@ gUnknown_819E32D:: @ 819E32D
     .string "I'll share this TEA with the other\n"
     .string "guards!$"
 
-gUnknown_819E3D9:: @ 819E3D9
+Route7_EastEntrance_Text_HiHowsItGoing:: @ 819E3D9
     .string "Hi, how's it going?$"
 
diff --git a/data/maps/Route8/map.json b/data/maps/Route8/map.json
index 92e0154a4..b777fced8 100644
--- a/data/maps/Route8/map.json
+++ b/data/maps/Route8/map.json
@@ -13,7 +13,7 @@
   "battle_scene": "BATTLE_SCENE_0",
   "connections": [
     {
-      "map": "MAP_SAFFRON_CITY_CLASSIC",
+      "map": "MAP_SAFFRON_CITY_CONNECTION",
       "offset": -10,
       "direction": "left"
     },
diff --git a/data/maps/Route8_WestEntrance/map.json b/data/maps/Route8_WestEntrance/map.json
index eb6b26e0f..3becdcbc2 100644
--- a/data/maps/Route8_WestEntrance/map.json
+++ b/data/maps/Route8_WestEntrance/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route8_WestEntrance_EventScript_16FB54",
+      "script": "Route8_WestEntrance_EventScript_Guard",
       "flag": "0"
     }
   ],
@@ -65,7 +65,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES",
       "var_value": 0,
-      "script": "Route8_WestEntrance_EventScript_16FB5D"
+      "script": "Route8_WestEntrance_EventScript_GuardTriggerTop"
     },
     {
       "type": "trigger",
@@ -74,7 +74,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES",
       "var_value": 0,
-      "script": "Route8_WestEntrance_EventScript_16FB69"
+      "script": "Route8_WestEntrance_EventScript_GuardTriggerMid"
     },
     {
       "type": "trigger",
@@ -83,7 +83,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES",
       "var_value": 0,
-      "script": "Route8_WestEntrance_EventScript_16FB75"
+      "script": "Route8_WestEntrance_EventScript_GuardTriggerBottom"
     }
   ],
   "bg_events": []
diff --git a/data/maps/Route8_WestEntrance/scripts.inc b/data/maps/Route8_WestEntrance/scripts.inc
index df9d1035c..1b36e9a15 100644
--- a/data/maps/Route8_WestEntrance/scripts.inc
+++ b/data/maps/Route8_WestEntrance/scripts.inc
@@ -1,97 +1,99 @@
 Route8_WestEntrance_MapScripts:: @ 816FB53
 	.byte 0
 
-Route8_WestEntrance_EventScript_16FB54:: @ 816FB54
-	msgbox gUnknown_819E50F, MSGBOX_NPC
+Route8_WestEntrance_EventScript_Guard:: @ 816FB54
+	msgbox Route8_WestEntrance_Text_HiHowsItGoing, MSGBOX_NPC
 	end
 
-Route8_WestEntrance_EventScript_16FB5D:: @ 816FB5D
+Route8_WestEntrance_EventScript_GuardTriggerTop:: @ 816FB5D
 	lockall
 	setvar VAR_TEMP_1, 0
-	goto EventScript_16FB81
+	goto Route8_WestEntrance_EventScript_GuardTrigger
 	end
 
-Route8_WestEntrance_EventScript_16FB69:: @ 816FB69
+Route8_WestEntrance_EventScript_GuardTriggerMid:: @ 816FB69
 	lockall
 	setvar VAR_TEMP_1, 1
-	goto EventScript_16FB81
+	goto Route8_WestEntrance_EventScript_GuardTrigger
 	end
 
-Route8_WestEntrance_EventScript_16FB75:: @ 816FB75
+Route8_WestEntrance_EventScript_GuardTriggerBottom:: @ 816FB75
 	lockall
 	setvar VAR_TEMP_1, 2
-	goto EventScript_16FB81
+	goto Route8_WestEntrance_EventScript_GuardTrigger
 	end
 
-EventScript_16FB81:: @ 816FB81
+Route8_WestEntrance_EventScript_GuardTrigger:: @ 816FB81
 	textcolor 0
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	goto_if_set FLAG_GOT_TEA, EventScript_16FBAB
-	msgbox gUnknown_819E3ED
+	goto_if_set FLAG_GOT_TEA, Route8_WestEntrance_EventScript_GiveTea
+	msgbox Route8_WestEntrance_Text_ThirstyOnGuardDuty
 	closemessage
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_16FC2D
+	applymovement OBJ_EVENT_ID_PLAYER, Route8_WestEntrance_Movement_BlockPlayerEntry
 	waitmovement 0
 	releaseall
 	end
 
-EventScript_16FBAB:: @ 816FBAB
+Route8_WestEntrance_EventScript_GiveTea:: @ 816FBAB
 	removeitem ITEM_TEA, 1
-	goto EventScript_16FBCC
+	goto Route8_WestEntrance_EventScript_GuardDrinkTea
 	end
 
-EventScript_16FBB6:: @ 816FBB6
+@ Unused
+Route8_WestEntrance_EventScript_GiveSodaPop:: @ 816FBB6
 	removeitem ITEM_SODA_POP, 1
-	goto EventScript_16FBCC
+	goto Route8_WestEntrance_EventScript_GuardDrinkTea
 	end
 
-EventScript_16FBC1:: @ 816FBC1
+@ Unused
+Route8_WestEntrance_EventScript_GiveLemonade:: @ 816FBC1
 	removeitem ITEM_LEMONADE, 1
-	goto EventScript_16FBCC
+	goto Route8_WestEntrance_EventScript_GuardDrinkTea
 	end
 
-EventScript_16FBCC:: @ 816FBCC
-	msgbox gUnknown_819E43D
+Route8_WestEntrance_EventScript_GuardDrinkTea:: @ 816FBCC
+	msgbox Route8_WestEntrance_Text_ThatTeaLooksTasty
 	closemessage
 	compare VAR_TEMP_1, 0
-	call_if_eq EventScript_16FC05
+	call_if_eq Route8_WestEntrance_EventScript_WalkToGuardTop
 	compare VAR_TEMP_1, 1
-	call_if_eq EventScript_16FC10
+	call_if_eq Route8_WestEntrance_EventScript_WalkToGuardMid
 	compare VAR_TEMP_1, 2
-	call_if_eq EventScript_16FC1B
-	msgbox gUnknown_819E463
+	call_if_eq Route8_WestEntrance_EventScript_WalkToGuardBottom
+	msgbox Route8_WestEntrance_Text_ThanksIllShareTeaWithGuards
 	setvar VAR_MAP_SCENE_ROUTE5_ROUTE6_ROUTE7_ROUTE8_GATES, 1
 	releaseall
 	end
 
-EventScript_16FC05:: @ 816FC05
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_16FC2B
+Route8_WestEntrance_EventScript_WalkToGuardTop:: @ 816FC05
+	applymovement OBJ_EVENT_ID_PLAYER, Route8_WestEntrance_Movement_WalkToGuardTop
 	waitmovement 0
 	return
 
-EventScript_16FC10:: @ 816FC10
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_16FC26
+Route8_WestEntrance_EventScript_WalkToGuardMid:: @ 816FC10
+	applymovement OBJ_EVENT_ID_PLAYER, Route8_WestEntrance_Movement_WalkToGuardMid
 	waitmovement 0
 	return
 
-EventScript_16FC1B:: @ 816FC1B
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_16FC28
+Route8_WestEntrance_EventScript_WalkToGuardBottom:: @ 816FC1B
+	applymovement OBJ_EVENT_ID_PLAYER, Route8_WestEntrance_Movement_WalkToGuardBottom
 	waitmovement 0
 	return
 
-Movement_16FC26:: @ 816FC26
+Route8_WestEntrance_Movement_WalkToGuardMid:: @ 816FC26
 	walk_up
 	step_end
 
-Movement_16FC28:: @ 816FC28
+Route8_WestEntrance_Movement_WalkToGuardBottom:: @ 816FC28
 	walk_up
 	walk_up
 	step_end
 
-Movement_16FC2B:: @ 816FC2B
+Route8_WestEntrance_Movement_WalkToGuardTop:: @ 816FC2B
 	walk_in_place_up
 	step_end
 
-Movement_16FC2D:: @ 816FC2D
+Route8_WestEntrance_Movement_BlockPlayerEntry:: @ 816FC2D
 	walk_right
 	step_end
diff --git a/data/maps/Route8_WestEntrance/text.inc b/data/maps/Route8_WestEntrance/text.inc
index 58e2ee8ef..3c0be19e1 100644
--- a/data/maps/Route8_WestEntrance/text.inc
+++ b/data/maps/Route8_WestEntrance/text.inc
@@ -1,13 +1,13 @@
-gUnknown_819E3ED:: @ 819E3ED
+Route8_WestEntrance_Text_ThirstyOnGuardDuty:: @ 819E3ED
     .string "I'm on guard duty.\n"
     .string "Gee, I'm thirsty, though!\p"
     .string "Oh, wait there, the road's closed.$"
 
-gUnknown_819E43D:: @ 819E43D
+Route8_WestEntrance_Text_ThatTeaLooksTasty:: @ 819E43D
     .string "Oh, that TEA…\n"
     .string "It looks awfully tasty…$"
 
-gUnknown_819E463:: @ 819E463
+Route8_WestEntrance_Text_ThanksIllShareTeaWithGuards:: @ 819E463
     .string "Huh? I can have this drink?\n"
     .string "Gee, thanks!\l"
     .string "… …\l"
@@ -21,6 +21,6 @@ gUnknown_819E463:: @ 819E463
     .string "I'll share this TEA with the other\n"
     .string "guards!$"
 
-gUnknown_819E50F:: @ 819E50F
+Route8_WestEntrance_Text_HiHowsItGoing:: @ 819E50F
     .string "Hi, how's it going?$"
 
diff --git a/data/maps/SaffronCity/map.json b/data/maps/SaffronCity/map.json
index 9ca5a540e..83dc3497f 100644
--- a/data/maps/SaffronCity/map.json
+++ b/data/maps/SaffronCity/map.json
@@ -45,7 +45,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_EventScript_16737A",
+      "script": "SaffronCity_EventScript_RocketGrunt1",
       "flag": "FLAG_HIDE_SAFFRON_ROCKETS"
     },
     {
@@ -58,7 +58,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_EventScript_167383",
+      "script": "SaffronCity_EventScript_RocketGrunt2",
       "flag": "FLAG_HIDE_SAFFRON_ROCKETS"
     },
     {
@@ -71,7 +71,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_EventScript_16738C",
+      "script": "SaffronCity_EventScript_RocketGrunt3",
       "flag": "FLAG_HIDE_SAFFRON_ROCKETS"
     },
     {
@@ -84,7 +84,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_EventScript_167395",
+      "script": "SaffronCity_EventScript_RocketGrunt4",
       "flag": "FLAG_HIDE_SAFFRON_ROCKETS"
     },
     {
@@ -97,7 +97,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_EventScript_16739E",
+      "script": "SaffronCity_EventScript_RocketGrunt5",
       "flag": "FLAG_HIDE_SAFFRON_ROCKETS"
     },
     {
@@ -110,7 +110,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_EventScript_1673B9",
+      "script": "SaffronCity_EventScript_DoorGuardGrunt",
       "flag": "FLAG_HIDE_SAFFRON_ROCKETS"
     },
     {
@@ -123,7 +123,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_EventScript_1673B0",
+      "script": "SaffronCity_EventScript_RocketGrunt7",
       "flag": "FLAG_HIDE_SAFFRON_ROCKETS"
     },
     {
@@ -136,7 +136,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_EventScript_1673A7",
+      "script": "SaffronCity_EventScript_RocketGrunt6",
       "flag": "FLAG_HIDE_SAFFRON_ROCKETS"
     },
     {
@@ -149,7 +149,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_EventScript_1673EC",
+      "script": "SaffronCity_EventScript_Youngster",
       "flag": "FLAG_HIDE_SAFFRON_CIVILIANS"
     },
     {
@@ -162,7 +162,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_EventScript_1673E3",
+      "script": "SaffronCity_EventScript_WorkerM",
       "flag": "FLAG_HIDE_SAFFRON_CIVILIANS"
     },
     {
@@ -175,7 +175,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_EventScript_16741A",
+      "script": "SaffronCity_EventScript_Man",
       "flag": "FLAG_HIDE_SAFFRON_CIVILIANS"
     },
     {
@@ -188,7 +188,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_EventScript_1673FE",
+      "script": "SaffronCity_EventScript_Boy",
       "flag": "FLAG_HIDE_SAFFRON_CIVILIANS"
     },
     {
@@ -201,7 +201,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_EventScript_167407",
+      "script": "SaffronCity_EventScript_Pidgeot",
       "flag": "FLAG_HIDE_SAFFRON_CIVILIANS"
     },
     {
@@ -214,7 +214,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_EventScript_1673F5",
+      "script": "SaffronCity_EventScript_Lass",
       "flag": "FLAG_HIDE_SAFFRON_CIVILIANS"
     },
     {
@@ -227,7 +227,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_EventScript_1AD03A",
+      "script": "SaffronCity_EventScript_BattleGirl",
       "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
     }
   ],
@@ -243,7 +243,7 @@
       "x": 22,
       "y": 14,
       "elevation": 0,
-      "dest_map": "MAP_SAFFRON_CITY_HOUSE1_1F",
+      "dest_map": "MAP_SAFFRON_CITY_COPYCATS_HOUSE_1F",
       "dest_warp_id": 1
     },
     {
@@ -264,7 +264,7 @@
       "x": 27,
       "y": 21,
       "elevation": 0,
-      "dest_map": "MAP_SAFFRON_CITY_HOUSE2",
+      "dest_map": "MAP_SAFFRON_CITY_HOUSE",
       "dest_warp_id": 1
     },
     {
@@ -285,7 +285,7 @@
       "x": 43,
       "y": 38,
       "elevation": 0,
-      "dest_map": "MAP_SAFFRON_CITY_HOUSE3",
+      "dest_map": "MAP_SAFFRON_CITY_MR_PSYCHICS_HOUSE",
       "dest_warp_id": 1
     },
     {
@@ -345,63 +345,63 @@
       "x": 29,
       "y": 14,
       "elevation": 0,
-      "script": "SaffronCity_EventScript_167423"
+      "script": "SaffronCity_EventScript_CitySign"
     },
     {
       "type": "bg_event_type_0",
       "x": 42,
       "y": 14,
       "elevation": 0,
-      "script": "SaffronCity_EventScript_16742C"
+      "script": "SaffronCity_EventScript_DojoSign"
     },
     {
       "type": "bg_event_type_0",
       "x": 13,
       "y": 25,
       "elevation": 0,
-      "script": "SaffronCity_EventScript_167471"
+      "script": "SaffronCity_EventScript_SilphProductSign"
     },
     {
       "type": "bg_event_type_0",
       "x": 18,
       "y": 30,
       "elevation": 0,
-      "script": "SaffronCity_EventScript_167456"
+      "script": "SaffronCity_EventScript_TrainerTips2"
     },
     {
       "type": "bg_event_type_0",
       "x": 29,
       "y": 31,
       "elevation": 0,
-      "script": "SaffronCity_EventScript_16745F"
+      "script": "SaffronCity_EventScript_SilphCoSign"
     },
     {
       "type": "bg_event_type_0",
       "x": 54,
       "y": 25,
       "elevation": 0,
-      "script": "SaffronCity_EventScript_16744D"
+      "script": "SaffronCity_EventScript_TrainerTips1"
     },
     {
       "type": "bg_event_type_0",
       "x": 50,
       "y": 14,
       "elevation": 0,
-      "script": "SaffronCity_EventScript_167435"
+      "script": "SaffronCity_EventScript_GymSign"
     },
     {
       "type": "bg_event_type_0",
       "x": 40,
       "y": 38,
       "elevation": 0,
-      "script": "SaffronCity_EventScript_167468"
+      "script": "SaffronCity_EventScript_MrPsychicsHouseSign"
     },
     {
       "type": "bg_event_type_0",
       "x": 49,
       "y": 22,
       "elevation": 0,
-      "script": "SaffronCity_EventScript_16747A"
+      "script": "SaffronCity_EventScript_TrainerFanClubSign"
     }
   ]
 }
diff --git a/data/maps/SaffronCity/scripts.inc b/data/maps/SaffronCity/scripts.inc
index 53d697ff0..4b74cd43d 100644
--- a/data/maps/SaffronCity/scripts.inc
+++ b/data/maps/SaffronCity/scripts.inc
@@ -4,121 +4,121 @@ SaffronCity_MapScripts:: @ 816735F
 
 SaffronCity_OnTransition:: @ 8167365
 	setworldmapflag FLAG_WORLD_MAP_SAFFRON_CITY
-	call_if_unset FLAG_RESCUED_MR_FUJI, EventScript_167372
+	call_if_unset FLAG_RESCUED_MR_FUJI, SaffronCity_EventScript_MoveDoorGuardGrunt
 	end
 
-EventScript_167372:: @ 8167372
+SaffronCity_EventScript_MoveDoorGuardGrunt:: @ 8167372
 	setobjectxyperm 6, 33, 31
 	return
 
-SaffronCity_EventScript_16737A:: @ 816737A
-	msgbox gUnknown_8181003, MSGBOX_NPC
+SaffronCity_EventScript_RocketGrunt1:: @ 816737A
+	msgbox SaffronCity_Text_WhatDoYouWantGetLost, MSGBOX_NPC
 	end
 
-SaffronCity_EventScript_167383:: @ 8167383
-	msgbox gUnknown_818101F, MSGBOX_NPC
+SaffronCity_EventScript_RocketGrunt2:: @ 8167383
+	msgbox SaffronCity_Text_BossTakeTownForTeamRocket, MSGBOX_NPC
 	end
 
-SaffronCity_EventScript_16738C:: @ 816738C
-	msgbox gUnknown_818105A, MSGBOX_NPC
+SaffronCity_EventScript_RocketGrunt3:: @ 816738C
+	msgbox SaffronCity_Text_DontGetDefiantOrIllHurtYou, MSGBOX_NPC
 	end
 
-SaffronCity_EventScript_167395:: @ 8167395
-	msgbox gUnknown_8181087, MSGBOX_NPC
+SaffronCity_EventScript_RocketGrunt4:: @ 8167395
+	msgbox SaffronCity_Text_SaffronBelongsToTeamRocket, MSGBOX_NPC
 	end
 
-SaffronCity_EventScript_16739E:: @ 816739E
-	msgbox gUnknown_81810A7, MSGBOX_NPC
+SaffronCity_EventScript_RocketGrunt5:: @ 816739E
+	msgbox SaffronCity_Text_CriminalLifeMakesMeFeelAlive, MSGBOX_NPC
 	end
 
-SaffronCity_EventScript_1673A7:: @ 81673A7
-	msgbox gUnknown_81810D5, MSGBOX_NPC
+SaffronCity_EventScript_RocketGrunt6:: @ 81673A7
+	msgbox SaffronCity_Text_WatchWhereYoureWalking, MSGBOX_NPC
 	end
 
-SaffronCity_EventScript_1673B0:: @ 81673B0
-	msgbox gUnknown_81810F5, MSGBOX_NPC
+SaffronCity_EventScript_RocketGrunt7:: @ 81673B0
+	msgbox SaffronCity_Text_WeCanExploitMonsAroundWorld, MSGBOX_NPC
 	end
 
-SaffronCity_EventScript_1673B9:: @ 81673B9
+SaffronCity_EventScript_DoorGuardGrunt:: @ 81673B9
 	lock
-	goto_if_set FLAG_RESCUED_MR_FUJI, EventScript_1673D7
+	goto_if_set FLAG_RESCUED_MR_FUJI, SaffronCity_EventScript_DoorGuardAsleep
 	applymovement 6, Movement_FacePlayer
 	waitmovement 0
-	msgbox gUnknown_81812CA
+	msgbox SaffronCity_Text_ImASecurityGuard
 	release
 	end
 
-EventScript_1673D7:: @ 81673D7
+SaffronCity_EventScript_DoorGuardAsleep:: @ 81673D7
 	textcolor 3
-	msgbox gUnknown_8181302
+	msgbox SaffronCity_Text_HesTakingASnooze
 	release
 	end
 
-SaffronCity_EventScript_1673E3:: @ 81673E3
-	msgbox gUnknown_8181159, MSGBOX_NPC
+SaffronCity_EventScript_WorkerM:: @ 81673E3
+	msgbox SaffronCity_Text_YouBeatTeamRocket, MSGBOX_NPC
 	end
 
-SaffronCity_EventScript_1673EC:: @ 81673EC
-	msgbox gUnknown_8181189, MSGBOX_NPC
+SaffronCity_EventScript_Youngster:: @ 81673EC
+	msgbox SaffronCity_Text_SafeToGoOutAgain, MSGBOX_NPC
 	end
 
-SaffronCity_EventScript_1673F5:: @ 81673F5
-	msgbox gUnknown_81811BF, MSGBOX_NPC
+SaffronCity_EventScript_Lass:: @ 81673F5
+	msgbox SaffronCity_Text_PeopleComingBackToSaffron, MSGBOX_NPC
 	end
 
-SaffronCity_EventScript_1673FE:: @ 81673FE
-	msgbox gUnknown_8181225, MSGBOX_NPC
+SaffronCity_EventScript_Boy:: @ 81673FE
+	msgbox SaffronCity_Text_FlewHereOnPidgeot, MSGBOX_NPC
 	end
 
-SaffronCity_EventScript_167407:: @ 8167407
+SaffronCity_EventScript_Pidgeot:: @ 8167407
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_PIDGEOT, 0
-	msgbox gUnknown_8181286
+	msgbox SaffronCity_Text_Pidgeot
 	waitmoncry
 	release
 	end
 
-SaffronCity_EventScript_16741A:: @ 816741A
-	msgbox gUnknown_8181299, MSGBOX_NPC
+SaffronCity_EventScript_Man:: @ 816741A
+	msgbox SaffronCity_Text_SawRocketBossEscaping, MSGBOX_NPC
 	end
 
-SaffronCity_EventScript_167423:: @ 8167423
-	msgbox gUnknown_8181326, MSGBOX_SIGN
+SaffronCity_EventScript_CitySign:: @ 8167423
+	msgbox SaffronCity_Text_CitySign, MSGBOX_SIGN
 	end
 
-SaffronCity_EventScript_16742C:: @ 816742C
-	msgbox gUnknown_8181354, MSGBOX_SIGN
+SaffronCity_EventScript_DojoSign:: @ 816742C
+	msgbox SaffronCity_Text_FightingDojo, MSGBOX_SIGN
 	end
 
-SaffronCity_EventScript_167435:: @ 8167435
+SaffronCity_EventScript_GymSign:: @ 8167435
 	lockall
 	famechecker FAMECHECKER_SABRINA, 0
-	msgbox gUnknown_8181362
+	msgbox SaffronCity_Text_GymSign
 	releaseall
 	end
 
-SaffronCity_EventScript_16744D:: @ 816744D
-	msgbox gUnknown_81813AA, MSGBOX_SIGN
+SaffronCity_EventScript_TrainerTips1:: @ 816744D
+	msgbox SaffronCity_Text_FullHealCuresStatus, MSGBOX_SIGN
 	end
 
-SaffronCity_EventScript_167456:: @ 8167456
-	msgbox gUnknown_8181452, MSGBOX_SIGN
+SaffronCity_EventScript_TrainerTips2:: @ 8167456
+	msgbox SaffronCity_Text_GreatBallImprovedCatchRate, MSGBOX_SIGN
 	end
 
-SaffronCity_EventScript_16745F:: @ 816745F
-	msgbox gUnknown_81814B9, MSGBOX_SIGN
+SaffronCity_EventScript_SilphCoSign:: @ 816745F
+	msgbox SaffronCity_Text_SilphCoSign, MSGBOX_SIGN
 	end
 
-SaffronCity_EventScript_167468:: @ 8167468
-	msgbox gUnknown_81814D3, MSGBOX_SIGN
+SaffronCity_EventScript_MrPsychicsHouseSign:: @ 8167468
+	msgbox SaffronCity_Text_MrPsychicsHouse, MSGBOX_SIGN
 	end
 
-SaffronCity_EventScript_167471:: @ 8167471
-	msgbox gUnknown_81814E7, MSGBOX_SIGN
+SaffronCity_EventScript_SilphProductSign:: @ 8167471
+	msgbox SaffronCity_Text_SilphsLatestProduct, MSGBOX_SIGN
 	end
 
-SaffronCity_EventScript_16747A:: @ 816747A
-	msgbox gUnknown_8181519, MSGBOX_SIGN
+SaffronCity_EventScript_TrainerFanClubSign:: @ 816747A
+	msgbox SaffronCity_Text_TrainerFanClubSign, MSGBOX_SIGN
 	end
diff --git a/data/maps/SaffronCity/text.inc b/data/maps/SaffronCity/text.inc
index aaa009647..d3044d14b 100644
--- a/data/maps/SaffronCity/text.inc
+++ b/data/maps/SaffronCity/text.inc
@@ -1,80 +1,80 @@
-gUnknown_8181003:: @ 8181003
+SaffronCity_Text_WhatDoYouWantGetLost:: @ 8181003
     .string "What do you want?\n"
     .string "Get lost!$"
 
-gUnknown_818101F:: @ 818101F
+SaffronCity_Text_BossTakeTownForTeamRocket:: @ 818101F
     .string "BOSS said he'll take this town\n"
     .string "in the name of TEAM ROCKET!$"
 
-gUnknown_818105A:: @ 818105A
+SaffronCity_Text_DontGetDefiantOrIllHurtYou:: @ 818105A
     .string "Don't get defiant!\n"
     .string "Or I'll have to hurt you!$"
 
-gUnknown_8181087:: @ 8181087
+SaffronCity_Text_SaffronBelongsToTeamRocket:: @ 8181087
     .string "SAFFRON belongs to TEAM ROCKET!$"
 
-gUnknown_81810A7:: @ 81810A7
+SaffronCity_Text_CriminalLifeMakesMeFeelAlive:: @ 81810A7
     .string "My life as a criminal makes me feel\n"
     .string "so alive!$"
 
-gUnknown_81810D5:: @ 81810D5
+SaffronCity_Text_WatchWhereYoureWalking:: @ 81810D5
     .string "Ow!\n"
     .string "Watch where you're walking!$"
 
-gUnknown_81810F5:: @ 81810F5
+SaffronCity_Text_WeCanExploitMonsAroundWorld:: @ 81810F5
     .string "With SILPH under control, we can\n"
     .string "exploit POKéMON around the world!\p"
     .string "We'll get stinking rich, yeahah!$"
 
-gUnknown_8181159:: @ 8181159
+SaffronCity_Text_YouBeatTeamRocket:: @ 8181159
     .string "You beat TEAM ROCKET all alone?\n"
     .string "That's amazing!$"
 
-gUnknown_8181189:: @ 8181189
+SaffronCity_Text_SafeToGoOutAgain:: @ 8181189
     .string "Yeah! TEAM ROCKET is gone!\n"
     .string "It's safe to go out again!$"
 
-gUnknown_81811BF:: @ 81811BF
+SaffronCity_Text_PeopleComingBackToSaffron:: @ 81811BF
     .string "People fled from here in droves\n"
     .string "when those ROCKETS came.\p"
     .string "They should be flocking back to\n"
     .string "SAFFRON now.$"
 
-gUnknown_8181225:: @ 8181225
+SaffronCity_Text_FlewHereOnPidgeot:: @ 8181225
     .string "I flew here on my PIDGEOT when\n"
     .string "I read about SILPH.\p"
     .string "It's already over?\n"
     .string "I missed the media action…$"
 
-gUnknown_8181286:: @ 8181286
+SaffronCity_Text_Pidgeot:: @ 8181286
     .string "PIDGEOT: Bi bibii!$"
 
-gUnknown_8181299:: @ 8181299
+SaffronCity_Text_SawRocketBossEscaping:: @ 8181299
     .string "I saw the ROCKET BOSS escaping\n"
     .string "SILPH's building.$"
 
-gUnknown_81812CA:: @ 81812CA
+SaffronCity_Text_ImASecurityGuard:: @ 81812CA
     .string "I'm a security guard.\p"
     .string "Suspicious kids I don't allow in!$"
 
-gUnknown_8181302:: @ 8181302
+SaffronCity_Text_HesTakingASnooze:: @ 8181302
     .string "…\n"
     .string "Snore…\p"
     .string "Hah! He's taking a snooze!$"
 
-gUnknown_8181326:: @ 8181326
+SaffronCity_Text_CitySign:: @ 8181326
     .string "SAFFRON CITY\n"
     .string "Shining, Golden Land of Commerce$"
 
-gUnknown_8181354:: @ 8181354
+SaffronCity_Text_FightingDojo:: @ 8181354
     .string "FIGHTING DOJO$"
 
-gUnknown_8181362:: @ 8181362
+SaffronCity_Text_GymSign:: @ 8181362
     .string "SAFFRON CITY POKéMON GYM\n"
     .string "LEADER: SABRINA\l"
     .string "The Master of PSYCHIC POKéMON!$"
 
-gUnknown_81813AA:: @ 81813AA
+SaffronCity_Text_FullHealCuresStatus:: @ 81813AA
     .string "TRAINER TIPS\p"
     .string "FULL HEAL cures all ailments like\n"
     .string "burns, paralysis, poisoning,\l"
@@ -82,25 +82,34 @@ gUnknown_81813AA:: @ 81813AA
     .string "It costs a bit more, but it's more\n"
     .string "convenient than buying other items.$"
 
-gUnknown_8181452:: @ 8181452
+SaffronCity_Text_GreatBallImprovedCatchRate:: @ 8181452
     .string "TRAINER TIPS\p"
     .string "The new GREAT BALL offers improved\n"
     .string "catching rates.\p"
     .string "Try it on those hard-to-catch\n"
     .string "POKéMON.$"
 
-gUnknown_81814B9:: @ 81814B9
+SaffronCity_Text_SilphCoSign:: @ 81814B9
     .string "SILPH CO. OFFICE BUILDING$"
 
-gUnknown_81814D3:: @ 81814D3
+SaffronCity_Text_MrPsychicsHouse:: @ 81814D3
     .string "MR. PSYCHIC'S HOUSE$"
 
-gUnknown_81814E7:: @ 81814E7
+SaffronCity_Text_SilphsLatestProduct:: @ 81814E7
     .string "SILPH's latest product!\n"
     .string "Release to be determined…$"
 
-gUnknown_8181519:: @ 8181519
+SaffronCity_Text_TrainerFanClubSign:: @ 8181519
     .string "POKéMON TRAINER FAN CLUB\p"
     .string "Many TRAINERS have scribbled their\n"
     .string "names on this sign.$"
 
+SaffronCity_Text_HowCanClubNotRecognizeLance:: @ 8181569
+    .string "This FAN CLUB…\n"
+    .string "No one here has a clue!\p"
+    .string "How could they not recognize\n"
+    .string "the brilliance that is LANCE?\p"
+    .string "He stands for justice!\n"
+    .string "He's cool, and yet passionate!\l"
+    .string "He's the greatest, LANCE!$"
+
diff --git a/data/maps/SaffronCity_Classic/scripts.inc b/data/maps/SaffronCity_Classic/scripts.inc
deleted file mode 100644
index 26470756d..000000000
--- a/data/maps/SaffronCity_Classic/scripts.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-SaffronCity_Classic_MapScripts:: @ 8167483
-	.byte 0
diff --git a/data/maps/SaffronCity_Classic/map.json b/data/maps/SaffronCity_Connection/map.json
index 0a5614975..718007c43 100644
--- a/data/maps/SaffronCity_Classic/map.json
+++ b/data/maps/SaffronCity_Connection/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_SAFFRON_CITY_CLASSIC",
-  "name": "SaffronCity_Classic",
-  "layout": "LAYOUT_SAFFRON_CITY_CLASSIC",
+  "id": "MAP_SAFFRON_CITY_CONNECTION",
+  "name": "SaffronCity_Connection",
+  "layout": "LAYOUT_SAFFRON_CITY_CONNECTION",
   "music": "MUS_NIBI",
   "region_map_section": "MAPSEC_SAFFRON_CITY",
   "requires_flash": false,
diff --git a/data/maps/SaffronCity_Connection/scripts.inc b/data/maps/SaffronCity_Connection/scripts.inc
new file mode 100644
index 000000000..94f49eb2d
--- /dev/null
+++ b/data/maps/SaffronCity_Connection/scripts.inc
@@ -0,0 +1,2 @@
+SaffronCity_Connection_MapScripts:: @ 8167483
+	.byte 0
diff --git a/data/maps/SaffronCity_House1_1F/map.json b/data/maps/SaffronCity_CopycatsHouse_1F/map.json
index 4f7e0a241..bb33e6ea3 100644
--- a/data/maps/SaffronCity_House1_1F/map.json
+++ b/data/maps/SaffronCity_CopycatsHouse_1F/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_SAFFRON_CITY_HOUSE1_1F",
-  "name": "SaffronCity_House1_1F",
-  "layout": "LAYOUT_SAFFRON_CITY_HOUSE1_1F",
+  "id": "MAP_SAFFRON_CITY_COPYCATS_HOUSE_1F",
+  "name": "SaffronCity_CopycatsHouse_1F",
+  "layout": "LAYOUT_SAFFRON_CITY_COPYCATS_HOUSE_1F",
   "music": "MUS_NIBI",
   "region_map_section": "MAPSEC_SAFFRON_CITY",
   "requires_flash": false,
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_House1_1F_EventScript_16EB40",
+      "script": "SaffronCity_CopycatsHouse_1F_EventScript_CopycatsDad",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_House1_1F_EventScript_16EB37",
+      "script": "SaffronCity_CopycatsHouse_1F_EventScript_CopycatsMom",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 2,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_House1_1F_EventScript_16EB49",
+      "script": "SaffronCity_CopycatsHouse_1F_EventScript_Chansey",
       "flag": "0"
     }
   ],
@@ -79,7 +79,7 @@
       "x": 10,
       "y": 2,
       "elevation": 3,
-      "dest_map": "MAP_SAFFRON_CITY_HOUSE1_2F",
+      "dest_map": "MAP_SAFFRON_CITY_COPYCATS_HOUSE_2F",
       "dest_warp_id": 0
     }
   ],
diff --git a/data/maps/SaffronCity_CopycatsHouse_1F/scripts.inc b/data/maps/SaffronCity_CopycatsHouse_1F/scripts.inc
new file mode 100644
index 000000000..e6f779e15
--- /dev/null
+++ b/data/maps/SaffronCity_CopycatsHouse_1F/scripts.inc
@@ -0,0 +1,20 @@
+SaffronCity_CopycatsHouse_1F_MapScripts:: @ 816EB36
+	.byte 0
+
+SaffronCity_CopycatsHouse_1F_EventScript_CopycatsMom:: @ 816EB37
+	msgbox SaffronCity_CopycatsHouse_1F_Text_DaughterIsSelfCentered, MSGBOX_NPC
+	end
+
+SaffronCity_CopycatsHouse_1F_EventScript_CopycatsDad:: @ 816EB40
+	msgbox SaffronCity_CopycatsHouse_1F_Text_DaughterLikesToMimicPeople, MSGBOX_NPC
+	end
+
+SaffronCity_CopycatsHouse_1F_EventScript_Chansey:: @ 816EB49
+	lock
+	faceplayer
+	waitse
+	playmoncry SPECIES_CHANSEY, 0
+	msgbox SaffronCity_CopycatsHouse_1F_Text_Chansey
+	waitmoncry
+	release
+	end
diff --git a/data/maps/SaffronCity_CopycatsHouse_1F/text.inc b/data/maps/SaffronCity_CopycatsHouse_1F/text.inc
new file mode 100644
index 000000000..d7efe0281
--- /dev/null
+++ b/data/maps/SaffronCity_CopycatsHouse_1F/text.inc
@@ -0,0 +1,13 @@
+SaffronCity_CopycatsHouse_1F_Text_DaughterIsSelfCentered:: @ 819AB9B
+    .string "My daughter is so self-centered.\n"
+    .string "She has but a few friends.$"
+
+SaffronCity_CopycatsHouse_1F_Text_DaughterLikesToMimicPeople:: @ 819ABD7
+    .string "My daughter likes to mimic people.\n"
+    .string "It's rather vexing.\p"
+    .string "Her mimicry has earned her the\n"
+    .string "nickname COPYCAT around here.$"
+
+SaffronCity_CopycatsHouse_1F_Text_Chansey:: @ 819AC4B
+    .string "CHANSEY: Chaan! Sii!$"
+
diff --git a/data/maps/SaffronCity_House1_2F/map.json b/data/maps/SaffronCity_CopycatsHouse_2F/map.json
index e7484dfae..ab920aa73 100644
--- a/data/maps/SaffronCity_House1_2F/map.json
+++ b/data/maps/SaffronCity_CopycatsHouse_2F/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_SAFFRON_CITY_HOUSE1_2F",
-  "name": "SaffronCity_House1_2F",
-  "layout": "LAYOUT_SAFFRON_CITY_HOUSE1_2F",
+  "id": "MAP_SAFFRON_CITY_COPYCATS_HOUSE_2F",
+  "name": "SaffronCity_CopycatsHouse_2F",
+  "layout": "LAYOUT_SAFFRON_CITY_COPYCATS_HOUSE_2F",
   "music": "MUS_NIBI",
   "region_map_section": "MAPSEC_SAFFRON_CITY",
   "requires_flash": false,
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_House1_2F_EventScript_16EB5D",
+      "script": "SaffronCity_CopycatsHouse_2F_EventScript_Doduo",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_House1_2F_EventScript_16EB70",
+      "script": "SaffronCity_CopycatsHouse_2F_EventScript_Doll",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_House1_2F_EventScript_16EB70",
+      "script": "SaffronCity_CopycatsHouse_2F_EventScript_Doll",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_House1_2F_EventScript_16EB7B",
+      "script": "SaffronCity_CopycatsHouse_2F_EventScript_Copycat",
       "flag": "0"
     }
   ],
@@ -71,7 +71,7 @@
       "x": 10,
       "y": 2,
       "elevation": 3,
-      "dest_map": "MAP_SAFFRON_CITY_HOUSE1_1F",
+      "dest_map": "MAP_SAFFRON_CITY_COPYCATS_HOUSE_1F",
       "dest_warp_id": 3
     }
   ],
@@ -82,14 +82,14 @@
       "x": 1,
       "y": 1,
       "elevation": 0,
-      "script": "SaffronCity_House1_2F_EventScript_16EBC9"
+      "script": "SaffronCity_CopycatsHouse_2F_EventScript_Computer"
     },
     {
       "type": "bg_event_type_0",
       "x": 3,
       "y": 5,
       "elevation": 0,
-      "script": "SaffronCity_House1_2F_EventScript_16EBD2"
+      "script": "SaffronCity_CopycatsHouse_2F_EventScript_Game"
     },
     {
       "type": "hidden_item",
@@ -97,7 +97,7 @@
       "y": 1,
       "elevation": 0,
       "item": "ITEM_NUGGET",
-      "flag": "HIDDEN_ITEM_SAFFRON_CITY_HOUSE1_2F_NUGGET",
+      "flag": "HIDDEN_ITEM_SAFFRON_CITY_COPYCATS_HOUSE_2F_NUGGET",
       "quantity": 1,
       "underfoot": false
     }
diff --git a/data/maps/SaffronCity_CopycatsHouse_2F/scripts.inc b/data/maps/SaffronCity_CopycatsHouse_2F/scripts.inc
new file mode 100644
index 000000000..a8e74c94b
--- /dev/null
+++ b/data/maps/SaffronCity_CopycatsHouse_2F/scripts.inc
@@ -0,0 +1,50 @@
+SaffronCity_CopycatsHouse_2F_MapScripts:: @ 816EB5C
+	.byte 0
+
+SaffronCity_CopycatsHouse_2F_EventScript_Doduo:: @ 816EB5D
+	lock
+	faceplayer
+	waitse
+	playmoncry SPECIES_DODUO, 0
+	msgbox SaffronCity_CopycatsHouse_2F_Text_Doduo
+	waitmoncry
+	release
+	end
+
+SaffronCity_CopycatsHouse_2F_EventScript_Doll:: @ 816EB70
+	lock
+	msgbox SaffronCity_CopycatsHouse_2F_Text_RareMonOnlyDoll
+	release
+	end
+
+SaffronCity_CopycatsHouse_2F_EventScript_Copycat:: @ 816EB7B
+	goto_if_questlog EventScript_ReleaseEnd
+	special sub_8112364
+	lock
+	faceplayer
+	checkitem ITEM_POKE_DOLL, 1
+	compare VAR_RESULT, TRUE
+	goto_if_eq EventScript_MimicTutor
+	checkplayergender
+	compare VAR_RESULT, MALE
+	call_if_eq SaffronCity_CopycatsHouse_2F_EventScript_MimicPlayerMale
+	compare VAR_RESULT, FEMALE
+	call_if_eq SaffronCity_CopycatsHouse_2F_EventScript_MimicPlayerFemale
+	release
+	end
+
+SaffronCity_CopycatsHouse_2F_EventScript_MimicPlayerMale:: @ 816EBB7
+	msgbox SaffronCity_CopycatsHouse_2F_Text_MimickingFavoriteHobbyMale
+	return
+
+SaffronCity_CopycatsHouse_2F_EventScript_MimicPlayerFemale:: @ 816EBC0
+	msgbox SaffronCity_CopycatsHouse_2F_Text_MimickingFavoriteHobbyFemale
+	return
+
+SaffronCity_CopycatsHouse_2F_EventScript_Computer:: @ 816EBC9
+	msgbox SaffronCity_CopycatsHouse_2F_Text_MySecrets, MSGBOX_SIGN
+	end
+
+SaffronCity_CopycatsHouse_2F_EventScript_Game:: @ 816EBD2
+	msgbox SaffronCity_CopycatsHouse_2F_Text_MarioWearingABucket, MSGBOX_SIGN
+	end
diff --git a/data/maps/SaffronCity_House1_2F/text.inc b/data/maps/SaffronCity_CopycatsHouse_2F/text.inc
index 32a666e18..978b660f5 100644
--- a/data/maps/SaffronCity_House1_2F/text.inc
+++ b/data/maps/SaffronCity_CopycatsHouse_2F/text.inc
@@ -1,4 +1,4 @@
-gUnknown_819AC60:: @ 819AC60
+SaffronCity_CopycatsHouse_2F_Text_MimickingFavoriteHobbyMale:: @ 819AC60
     .string "{PLAYER}: Hi!\n"
     .string "Do you like POKéMON?\p"
     .string "{PLAYER}: Uh, no, I just asked you.\p"
@@ -7,7 +7,7 @@ gUnknown_819AC60:: @ 819AC60
     .string "COPYCAT: Hmm? Quit mimicking?\n"
     .string "But, that's my favorite hobby!$"
 
-gUnknown_819ACF1:: @ 819ACF1
+SaffronCity_CopycatsHouse_2F_Text_MimickingFavoriteHobbyFemale:: @ 819ACF1
     .string "{PLAYER}: Hi.\n"
     .string "You must like POKéMON.\p"
     .string "{PLAYER}: No, not me.\n"
@@ -51,10 +51,10 @@ Text_MimicTaughtFemale:: @ 819AE90
     .string "COPYCAT: You bet!\n"
     .string "It's a scream!$"
 
-Text_19AF1A:: @ 819AF1A
+SaffronCity_CopycatsHouse_2F_Text_TooMuchInBag:: @ 819AF1A
     .string "にもつが　いっぱいね！$"
 
-Text_19AF26:: @ 819AF26
+SaffronCity_CopycatsHouse_2F_Text_MimickingFavoriteHobbyMaleJP:: @ 819AF26
     .string "{PLAYER}“やあ！　こんにちは！\n"
     .string "きみ　ポケモン　すきかい？\p"
     .string "{PLAYER}“ぼく　じゃなくって\n"
@@ -66,7 +66,7 @@ Text_19AF26:: @ 819AF26
     .string "だって　あたし　\n"
     .string "ものまね　しゅみ　なんだ　もん！”$"
 
-Text_19AFB0:: @ 819AFB0
+SaffronCity_CopycatsHouse_2F_Text_MimickingFavoriteHobbyFemaleJP:: @ 819AFB0
     .string "{PLAYER}“こんにちは！\n"
     .string "ポケモン　すきなのね？\p"
     .string "{PLAYER}“わたし　じゃなくって\n"
@@ -78,23 +78,25 @@ Text_19AFB0:: @ 819AFB0
     .string "だって　あたし\n"
     .string "ものまね　しゅみ　なんだ　もん！$"
 
-gUnknown_819B030:: @ 819B030
+SaffronCity_CopycatsHouse_2F_Text_Doduo:: @ 819B030
     .string "DODUO: Giiih!\p"
     .string "PRETTY MIRROR LOOK AT ME,\n"
     .string "SEE HOW PRETTY I CAN BE?$"
 
-gUnknown_819B071:: @ 819B071
+SaffronCity_CopycatsHouse_2F_Text_RareMonOnlyDoll:: @ 819B071
     .string "This is a rare POKéMON!\n"
     .string "Huh? It's only a doll!$"
 
-gUnknown_819B0A0:: @ 819B0A0
+SaffronCity_CopycatsHouse_2F_Text_MarioWearingABucket:: @ 819B0A0
     .string "A game with MARIO wearing a bucket\n"
     .string "on his head!$"
 
-gUnknown_819B0D0:: @ 819B0D0
+SaffronCity_CopycatsHouse_2F_Text_MySecrets:: @ 819B0D0
     .string "…\p"
     .string "My Secrets!\p"
     .string "Skill: Mimicry!\n"
     .string "Hobby: Collecting dolls!\l"
     .string "Favorite POKéMON: CLEFAIRY!$"
 
+SaffronCity_CopycatsHouse_2F_Text_HuhCantSee:: @ 819B123
+    .string "？　みえないぞ‥$"
diff --git a/data/maps/SaffronCity_Dojo/map.json b/data/maps/SaffronCity_Dojo/map.json
index d6e1d9d4d..699ead653 100644
--- a/data/maps/SaffronCity_Dojo/map.json
+++ b/data/maps/SaffronCity_Dojo/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 7,
-      "script": "SaffronCity_Dojo_EventScript_16ED46",
+      "script": "SaffronCity_Dojo_EventScript_Hitoshi",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 7,
-      "script": "SaffronCity_Dojo_EventScript_16ED5D",
+      "script": "SaffronCity_Dojo_EventScript_Hideki",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 7,
-      "script": "SaffronCity_Dojo_EventScript_16ED74",
+      "script": "SaffronCity_Dojo_EventScript_Aaron",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 7,
-      "script": "SaffronCity_Dojo_EventScript_16ED8B",
+      "script": "SaffronCity_Dojo_EventScript_Mike",
       "flag": "0"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "SaffronCity_Dojo_EventScript_16EDA2",
+      "script": "SaffronCity_Dojo_EventScript_MasterKoichi",
       "flag": "0"
     },
     {
@@ -88,7 +88,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_Dojo_EventScript_16EC00",
+      "script": "SaffronCity_Dojo_EventScript_HitmonleeBall",
       "flag": "FLAG_HIDE_DOJO_HITMONLEE_BALL"
     },
     {
@@ -101,7 +101,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_Dojo_EventScript_16EC46",
+      "script": "SaffronCity_Dojo_EventScript_HitmonchanBall",
       "flag": "FLAG_HIDE_DOJO_HITMONCHAN_BALL"
     }
   ],
@@ -136,7 +136,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_SAFFRON_CITY_DOJO",
       "var_value": 0,
-      "script": "SaffronCity_Dojo_EventScript_16EBDC"
+      "script": "SaffronCity_Dojo_EventScript_TriggerMasterBattleLeft"
     },
     {
       "type": "trigger",
@@ -145,7 +145,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_SAFFRON_CITY_DOJO",
       "var_value": 0,
-      "script": "SaffronCity_Dojo_EventScript_16EBEE"
+      "script": "SaffronCity_Dojo_EventScript_TriggerMasterBattleRight"
     }
   ],
   "bg_events": [
@@ -154,28 +154,28 @@
       "x": 3,
       "y": 13,
       "elevation": 0,
-      "script": "SaffronCity_Dojo_EventScript_16ED2B"
+      "script": "SaffronCity_Dojo_EventScript_Statue"
     },
     {
       "type": "bg_event_type_0",
       "x": 9,
       "y": 13,
       "elevation": 0,
-      "script": "SaffronCity_Dojo_EventScript_16ED2B"
+      "script": "SaffronCity_Dojo_EventScript_Statue"
     },
     {
       "type": "bg_event_type_0",
       "x": 5,
       "y": 2,
       "elevation": 0,
-      "script": "SaffronCity_Dojo_EventScript_16ED34"
+      "script": "SaffronCity_Dojo_EventScript_LeftScroll"
     },
     {
       "type": "bg_event_type_0",
       "x": 7,
       "y": 2,
       "elevation": 0,
-      "script": "SaffronCity_Dojo_EventScript_16ED3D"
+      "script": "SaffronCity_Dojo_EventScript_RightScroll"
     }
   ]
 }
diff --git a/data/maps/SaffronCity_Dojo/scripts.inc b/data/maps/SaffronCity_Dojo/scripts.inc
index d5c3e6603..88e53d64c 100644
--- a/data/maps/SaffronCity_Dojo/scripts.inc
+++ b/data/maps/SaffronCity_Dojo/scripts.inc
@@ -1,157 +1,159 @@
+.equ LOCALID_KARATE_MASTER, 5
+
 SaffronCity_Dojo_MapScripts:: @ 816EBDB
 	.byte 0
 
-SaffronCity_Dojo_EventScript_16EBDC:: @ 816EBDC
+SaffronCity_Dojo_EventScript_TriggerMasterBattleLeft:: @ 816EBDC
 	lockall
 	setvar VAR_MAP_SCENE_SAFFRON_CITY_DOJO, 1
-	applymovement 5, Movement_WalkInPlaceFastestLeft
+	applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	releaseall
 	end
 
-SaffronCity_Dojo_EventScript_16EBEE:: @ 816EBEE
+SaffronCity_Dojo_EventScript_TriggerMasterBattleRight:: @ 816EBEE
 	lockall
 	setvar VAR_MAP_SCENE_SAFFRON_CITY_DOJO, 1
-	applymovement 5, Movement_WalkInPlaceFastestRight
+	applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	releaseall
 	end
 
-SaffronCity_Dojo_EventScript_16EC00:: @ 816EC00
+SaffronCity_Dojo_EventScript_HitmonleeBall:: @ 816EC00
 	lock
 	faceplayer
-	goto_if_set FLAG_GOT_HITMON_FROM_DOJO, EventScript_16EC3C
+	goto_if_set FLAG_GOT_HITMON_FROM_DOJO, SaffronCity_Dojo_EventScript_AlreadyGotHitmon
 	drawmonpic SPECIES_HITMONLEE, 10, 3
 	setvar VAR_TEMP_1, SPECIES_HITMONLEE
-	applymovement 5, Movement_WalkInPlaceFastestUp
+	applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	textcolor 0
-	msgbox gUnknown_819B44E, MSGBOX_YESNO
+	msgbox SaffronCity_Dojo_Text_YouWantHitmonlee, MSGBOX_YESNO
 	call EventScript_1A6675
 	compare VAR_RESULT, YES
-	goto_if_eq EventScript_16EC82
+	goto_if_eq SaffronCity_Dojo_EventScript_GiveHitmon
 	erasemonpic
 	release
 	end
 
-EventScript_16EC3C:: @ 816EC3C
-	msgbox gUnknown_819B4E1
+SaffronCity_Dojo_EventScript_AlreadyGotHitmon:: @ 816EC3C
+	msgbox SaffronCity_Dojo_Text_BetterNotGetGreedy
 	release
 	end
 
-SaffronCity_Dojo_EventScript_16EC46:: @ 816EC46
+SaffronCity_Dojo_EventScript_HitmonchanBall:: @ 816EC46
 	lock
 	faceplayer
-	goto_if_set FLAG_GOT_HITMON_FROM_DOJO, EventScript_16EC3C
+	goto_if_set FLAG_GOT_HITMON_FROM_DOJO, SaffronCity_Dojo_EventScript_AlreadyGotHitmon
 	drawmonpic SPECIES_HITMONCHAN, 10, 3
 	setvar VAR_TEMP_1, SPECIES_HITMONCHAN
-	applymovement 5, Movement_WalkInPlaceFastestUp
+	applymovement LOCALID_KARATE_MASTER, Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	textcolor 0
-	msgbox gUnknown_819B49E, MSGBOX_YESNO
+	msgbox SaffronCity_Dojo_Text_YouWantHitmonchan, MSGBOX_YESNO
 	call EventScript_1A6675
 	compare VAR_RESULT, YES
-	goto_if_eq EventScript_16EC82
+	goto_if_eq SaffronCity_Dojo_EventScript_GiveHitmon
 	erasemonpic
 	release
 	end
 
-EventScript_16EC82:: @ 816EC82
+SaffronCity_Dojo_EventScript_GiveHitmon:: @ 816EC82
 	erasemonpic
 	givemon VAR_TEMP_1, 25, ITEM_NONE
 	compare VAR_RESULT, 0
-	goto_if_eq EventScript_16ECB5
+	goto_if_eq SaffronCity_Dojo_EventScript_ReceivedHitmonParty
 	compare VAR_RESULT, 1
-	goto_if_eq EventScript_16ECEC
+	goto_if_eq SaffronCity_Dojo_EventScript_ReceivedHitmonPC
 	compare VAR_RESULT, 2
 	goto_if_eq EventScript_NoMoreRoomForPokemon
 	release
 	end
 
-EventScript_16ECB5:: @ 816ECB5
+SaffronCity_Dojo_EventScript_ReceivedHitmonParty:: @ 816ECB5
 	removeobject VAR_LAST_TALKED
 	getspeciesname 0, VAR_TEMP_1
 	playfanfare MUS_FANFA1
-	message Text_19B473
+	message SaffronCity_Dojo_Text_ReceivedMonFromKarateMaster
 	waitmessage
 	waitfanfare
 	setflag FLAG_GOT_HITMON_FROM_DOJO
 	msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_16ED29
+	goto_if_eq SaffronCity_Dojo_EventScript_EndGiveMon
 	call EventScript_GetGiftMonPartySlot
 	call EventScript_ChangePokemonNickname
-	goto EventScript_16ED29
+	goto SaffronCity_Dojo_EventScript_EndGiveMon
 	end
 
-EventScript_16ECEC:: @ 816ECEC
+SaffronCity_Dojo_EventScript_ReceivedHitmonPC:: @ 816ECEC
 	removeobject VAR_LAST_TALKED
 	getspeciesname 0, VAR_TEMP_1
 	playfanfare MUS_FANFA1
-	message Text_19B473
+	message SaffronCity_Dojo_Text_ReceivedMonFromKarateMaster
 	waitmessage
 	waitfanfare
 	setflag FLAG_GOT_HITMON_FROM_DOJO
 	msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_16ED1E
+	goto_if_eq SaffronCity_Dojo_EventScript_TransferredHitmonToPC
 	call EventScript_NameReceivedBoxMon
-	goto EventScript_16ED1E
+	goto SaffronCity_Dojo_EventScript_TransferredHitmonToPC
 	end
 
-EventScript_16ED1E:: @ 816ED1E
+SaffronCity_Dojo_EventScript_TransferredHitmonToPC:: @ 816ED1E
 	call EventScript_TransferredToPC
-	goto EventScript_16ED29
+	goto SaffronCity_Dojo_EventScript_EndGiveMon
 	end
 
-EventScript_16ED29:: @ 816ED29
+SaffronCity_Dojo_EventScript_EndGiveMon:: @ 816ED29
 	release
 	end
 
-SaffronCity_Dojo_EventScript_16ED2B:: @ 816ED2B
-	msgbox gUnknown_819B52E, MSGBOX_SIGN
+SaffronCity_Dojo_EventScript_Statue:: @ 816ED2B
+	msgbox SaffronCity_Dojo_Text_FightingDojo, MSGBOX_SIGN
 	end
 
-SaffronCity_Dojo_EventScript_16ED34:: @ 816ED34
-	msgbox gUnknown_819B4F8, MSGBOX_SIGN
+SaffronCity_Dojo_EventScript_LeftScroll:: @ 816ED34
+	msgbox SaffronCity_Dojo_Text_EnemiesOnEverySide, MSGBOX_SIGN
 	end
 
-SaffronCity_Dojo_EventScript_16ED3D:: @ 816ED3D
-	msgbox gUnknown_819B50F, MSGBOX_SIGN
+SaffronCity_Dojo_EventScript_RightScroll:: @ 816ED3D
+	msgbox SaffronCity_Dojo_Text_GoesAroundComesAround, MSGBOX_SIGN
 	end
 
-SaffronCity_Dojo_EventScript_16ED46:: @ 816ED46
-	trainerbattle_single TRAINER_BLACK_BELT_HITOSHI, Text_19B3DF, Text_19B40F
-	msgbox gUnknown_819B41F, MSGBOX_AUTOCLOSE
+SaffronCity_Dojo_EventScript_Hitoshi:: @ 816ED46
+	trainerbattle_single TRAINER_BLACK_BELT_HITOSHI, SaffronCity_Dojo_Text_HitoshiIntro, SaffronCity_Dojo_Text_HitoshiDefeat
+	msgbox SaffronCity_Dojo_Text_HitoshiPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SaffronCity_Dojo_EventScript_16ED5D:: @ 816ED5D
-	trainerbattle_single TRAINER_BLACK_BELT_HIDEKI, Text_19B2E0, Text_19B2FD
-	msgbox gUnknown_819B30F, MSGBOX_AUTOCLOSE
+SaffronCity_Dojo_EventScript_Hideki:: @ 816ED5D
+	trainerbattle_single TRAINER_BLACK_BELT_HIDEKI, SaffronCity_Dojo_Text_HidekiIntro, SaffronCity_Dojo_Text_HidekiDefeat
+	msgbox SaffronCity_Dojo_Text_HidekiPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SaffronCity_Dojo_EventScript_16ED74:: @ 816ED74
-	trainerbattle_single TRAINER_BLACK_BELT_AARON, Text_19B341, Text_19B396
-	msgbox gUnknown_819B3AC, MSGBOX_AUTOCLOSE
+SaffronCity_Dojo_EventScript_Aaron:: @ 816ED74
+	trainerbattle_single TRAINER_BLACK_BELT_AARON, SaffronCity_Dojo_Text_AaronIntro, SaffronCity_Dojo_Text_AaronDefeat
+	msgbox SaffronCity_Dojo_Text_AaronPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SaffronCity_Dojo_EventScript_16ED8B:: @ 816ED8B
-	trainerbattle_single TRAINER_BLACK_BELT_MIKE, Text_19B275, Text_19B292
-	msgbox gUnknown_819B29D, MSGBOX_AUTOCLOSE
+SaffronCity_Dojo_EventScript_Mike:: @ 816ED8B
+	trainerbattle_single TRAINER_BLACK_BELT_MIKE, SaffronCity_Dojo_Text_MikeIntro, SaffronCity_Dojo_Text_MikeDefeat
+	msgbox SaffronCity_Dojo_Text_MikePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SaffronCity_Dojo_EventScript_16EDA2:: @ 816EDA2
-	trainerbattle_single TRAINER_BLACK_BELT_KOICHI, Text_19B12C, Text_19B193, EventScript_16EDD0
-	goto_if_set FLAG_GOT_HITMON_FROM_DOJO, EventScript_16EDC6
-	msgbox gUnknown_819B1A7, MSGBOX_AUTOCLOSE
+SaffronCity_Dojo_EventScript_MasterKoichi:: @ 816EDA2
+	trainerbattle_single TRAINER_BLACK_BELT_KOICHI, SaffronCity_Dojo_Text_MasterKoichiIntro, SaffronCity_Dojo_Text_MasterKoichiDefeat, SaffronCity_Dojo_EventScript_DefeatedMasterKoichi
+	goto_if_set FLAG_GOT_HITMON_FROM_DOJO, SaffronCity_Dojo_EventScript_MasterKoichiAlreadyGotHitmon
+	msgbox SaffronCity_Dojo_Text_ChoosePrizedFightingMon, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_16EDC6:: @ 816EDC6
-	msgbox gUnknown_819B24C
+SaffronCity_Dojo_EventScript_MasterKoichiAlreadyGotHitmon:: @ 816EDC6
+	msgbox SaffronCity_Dojo_Text_StayAndTrainWithUs
 	release
 	end
 
-EventScript_16EDD0:: @ 816EDD0
+SaffronCity_Dojo_EventScript_DefeatedMasterKoichi:: @ 816EDD0
 	setvar VAR_MAP_SCENE_SAFFRON_CITY_DOJO, 1
 	release
 	end
diff --git a/data/maps/SaffronCity_Dojo/text.inc b/data/maps/SaffronCity_Dojo/text.inc
index d85b5a843..9c73ffcb9 100644
--- a/data/maps/SaffronCity_Dojo/text.inc
+++ b/data/maps/SaffronCity_Dojo/text.inc
@@ -1,7 +1,4 @@
-Text_19B123:: @ 819B123
-    .string "？　みえないぞ‥$"
-
-Text_19B12C:: @ 819B12C
+SaffronCity_Dojo_Text_MasterKoichiIntro:: @ 819B12C
     .string "Grunt!\p"
     .string "I am the KARATE MASTER!\n"
     .string "I am the LEADER here!\p"
@@ -9,11 +6,11 @@ Text_19B12C:: @ 819B12C
     .string "Expect no mercy!\p"
     .string "Fwaaa!$"
 
-Text_19B193:: @ 819B193
+SaffronCity_Dojo_Text_MasterKoichiDefeat:: @ 819B193
     .string "Hwa!\n"
     .string "Arrgh! Beaten!$"
 
-gUnknown_819B1A7:: @ 819B1A7
+SaffronCity_Dojo_Text_ChoosePrizedFightingMon:: @ 819B1A7
     .string "Indeed, I have lost!\p"
     .string "But, I beseech you, do not take\n"
     .string "our emblem as your trophy!\p"
@@ -21,85 +18,85 @@ gUnknown_819B1A7:: @ 819B1A7
     .string "FIGHTING POKéMON!\p"
     .string "Choose whichever one you like!$"
 
-gUnknown_819B24C:: @ 819B24C
+SaffronCity_Dojo_Text_StayAndTrainWithUs:: @ 819B24C
     .string "Grunt!\n"
     .string "Stay and train at karate with us!$"
 
-Text_19B275:: @ 819B275
+SaffronCity_Dojo_Text_MikeIntro:: @ 819B275
     .string "Hoargh!\n"
     .string "Take your shoes off!$"
 
-Text_19B292:: @ 819B292
+SaffronCity_Dojo_Text_MikeDefeat:: @ 819B292
     .string "I give up!$"
 
-gUnknown_819B29D:: @ 819B29D
+SaffronCity_Dojo_Text_MikePostBattle:: @ 819B29D
     .string "You wait 'til you see our MASTER!\n"
     .string "I'm a small fry compared to him!$"
 
-Text_19B2E0:: @ 819B2E0
+SaffronCity_Dojo_Text_HidekiIntro:: @ 819B2E0
     .string "I hear you're good!\n"
     .string "Show me!$"
 
-Text_19B2FD:: @ 819B2FD
+SaffronCity_Dojo_Text_HidekiDefeat:: @ 819B2FD
     .string "Judge!\n"
     .string "One point!$"
 
-gUnknown_819B30F:: @ 819B30F
+SaffronCity_Dojo_Text_HidekiPostBattle:: @ 819B30F
     .string "Our MASTER is a pro fighter.\n"
     .string "Be prepared to lose!$"
 
-Text_19B341:: @ 819B341
+SaffronCity_Dojo_Text_AaronIntro:: @ 819B341
     .string "Hiyah!\n"
     .string "I have no fear for anything tough!\p"
     .string "I shatter boulders for training\n"
     .string "every day!$"
 
-Text_19B396:: @ 819B396
+SaffronCity_Dojo_Text_AaronDefeat:: @ 819B396
     .string "Yow!\n"
     .string "Stubbed fingers!$"
 
-gUnknown_819B3AC:: @ 819B3AC
+SaffronCity_Dojo_Text_AaronPostBattle:: @ 819B3AC
     .string "The only thing that frightens us is\n"
     .string "psychic power!$"
 
-Text_19B3DF:: @ 819B3DF
+SaffronCity_Dojo_Text_HitoshiIntro:: @ 819B3DF
     .string "Hwaah!\p"
     .string "You're trespassing in our\n"
     .string "FIGHTING DOJO!$"
 
-Text_19B40F:: @ 819B40F
+SaffronCity_Dojo_Text_HitoshiDefeat:: @ 819B40F
     .string "Oof!\n"
     .string "I give up!$"
 
-gUnknown_819B41F:: @ 819B41F
+SaffronCity_Dojo_Text_HitoshiPostBattle:: @ 819B41F
     .string "The prime fighters across the land\n"
     .string "train here.$"
 
-gUnknown_819B44E:: @ 819B44E
+SaffronCity_Dojo_Text_YouWantHitmonlee:: @ 819B44E
     .string "You want the hard-kicking\n"
     .string "HITMONLEE?$"
 
-Text_19B473:: @ 819B473
+SaffronCity_Dojo_Text_ReceivedMonFromKarateMaster:: @ 819B473
     .string "{PLAYER} received the {STR_VAR_1}\n"
     .string "from the KARATE MASTER.$"
 
-gUnknown_819B49E:: @ 819B49E
+SaffronCity_Dojo_Text_YouWantHitmonchan:: @ 819B49E
     .string "You want the piston-punching\n"
     .string "HITMONCHAN?$"
 
-Text_19B4C7:: @ 819B4C7
+SaffronCity_Dojo_Text_ReceivedMonFromKarateMaster2:: @ 819B4C7
     .string "{PLAYER}は　カラテ　だいおう　から\n"
     .string "{STR_VAR_1}を　もらった！$"
 
-gUnknown_819B4E1:: @ 819B4E1
+SaffronCity_Dojo_Text_BetterNotGetGreedy:: @ 819B4E1
     .string "Better not get greedy…$"
 
-gUnknown_819B4F8:: @ 819B4F8
+SaffronCity_Dojo_Text_EnemiesOnEverySide:: @ 819B4F8
     .string "Enemies on every side!$"
 
-gUnknown_819B50F:: @ 819B50F
+SaffronCity_Dojo_Text_GoesAroundComesAround:: @ 819B50F
     .string "What goes around comes around.$"
 
-gUnknown_819B52E:: @ 819B52E
+SaffronCity_Dojo_Text_FightingDojo:: @ 819B52E
     .string "FIGHTING DOJO$"
 
diff --git a/data/maps/SaffronCity_Gym/map.json b/data/maps/SaffronCity_Gym/map.json
index cfbf00b36..0ebd439e5 100644
--- a/data/maps/SaffronCity_Gym/map.json
+++ b/data/maps/SaffronCity_Gym/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "SaffronCity_Gym_EventScript_16EEC3",
+      "script": "SaffronCity_Gym_EventScript_Cameron",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "SaffronCity_Gym_EventScript_16EE88",
+      "script": "SaffronCity_Gym_EventScript_Johan",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "SaffronCity_Gym_EventScript_16EEDA",
+      "script": "SaffronCity_Gym_EventScript_Preston",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "SaffronCity_Gym_EventScript_16EEF1",
+      "script": "SaffronCity_Gym_EventScript_Amanda",
       "flag": "0"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "SaffronCity_Gym_EventScript_16EF08",
+      "script": "SaffronCity_Gym_EventScript_Stacy",
       "flag": "0"
     },
     {
@@ -88,7 +88,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "SaffronCity_Gym_EventScript_16EF1F",
+      "script": "SaffronCity_Gym_EventScript_Tasha",
       "flag": "0"
     },
     {
@@ -101,7 +101,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_Gym_EventScript_16EDD8",
+      "script": "SaffronCity_Gym_EventScript_Sabrina",
       "flag": "0"
     },
     {
@@ -114,7 +114,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "SaffronCity_Gym_EventScript_16EE9F",
+      "script": "SaffronCity_Gym_EventScript_Tyron",
       "flag": "0"
     },
     {
@@ -127,7 +127,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_Gym_EventScript_16EF36",
+      "script": "SaffronCity_Gym_EventScript_GymGuy",
       "flag": "0"
     }
   ],
@@ -371,14 +371,14 @@
       "x": 12,
       "y": 20,
       "elevation": 0,
-      "script": "SaffronCity_Gym_EventScript_16EF55"
+      "script": "SaffronCity_Gym_EventScript_GymStatue"
     },
     {
       "type": "bg_event_type_0",
       "x": 16,
       "y": 20,
       "elevation": 0,
-      "script": "SaffronCity_Gym_EventScript_16EF55"
+      "script": "SaffronCity_Gym_EventScript_GymStatue"
     }
   ]
 }
diff --git a/data/maps/SaffronCity_Gym/scripts.inc b/data/maps/SaffronCity_Gym/scripts.inc
index afe863e89..8b4542fab 100644
--- a/data/maps/SaffronCity_Gym/scripts.inc
+++ b/data/maps/SaffronCity_Gym/scripts.inc
@@ -1,97 +1,97 @@
 SaffronCity_Gym_MapScripts:: @ 816EDD7
 	.byte 0
 
-SaffronCity_Gym_EventScript_16EDD8:: @ 816EDD8
+SaffronCity_Gym_EventScript_Sabrina:: @ 816EDD8
 	famechecker FAMECHECKER_SABRINA, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
-	trainerbattle_single TRAINER_LEADER_SABRINA, Text_19B53C, Text_19B602, EventScript_16EE0A, NO_MUSIC
-	goto_if_unset FLAG_GOT_TM04_FROM_SABRINA, EventScript_16EE3D
-	msgbox gUnknown_819B7F2
+	trainerbattle_single TRAINER_LEADER_SABRINA, SaffronCity_Gym_Text_SabrinaIntro, SaffronCity_Gym_Text_SabrinaDefeat, SaffronCity_Gym_EventScript_DefeatedSabrina, NO_MUSIC
+	goto_if_unset FLAG_GOT_TM04_FROM_SABRINA, SaffronCity_Gym_EventScript_GiveTM04
+	msgbox SaffronCity_Gym_Text_ExplainTM04
 	release
 	end
 
-EventScript_16EE0A:: @ 816EE0A
+SaffronCity_Gym_EventScript_DefeatedSabrina:: @ 816EE0A
 	famechecker FAMECHECKER_SABRINA, 2
 	famechecker FAMECHECKER_SABRINA, 3
 	clearflag FLAG_HIDE_SAFFRON_CITY_POKECENTER_SABRINA_JOURNALS
 	setflag FLAG_DEFEATED_SABRINA
 	setflag FLAG_BADGE06_GET
 	set_gym_trainers 6
-	goto EventScript_16EE3D
+	goto SaffronCity_Gym_EventScript_GiveTM04
 	end
 
-EventScript_16EE3D:: @ 816EE3D
-	msgbox gUnknown_819B6FA
+SaffronCity_Gym_EventScript_GiveTM04:: @ 816EE3D
+	msgbox SaffronCity_Gym_Text_ExplainMarshBadgeTakeThis
 	checkitemspace ITEM_TM04, 1
 	compare VAR_RESULT, FALSE
-	goto_if_eq EventScript_16EE7E
-	giveitem_msg gUnknown_819B7D3, ITEM_TM04
+	goto_if_eq SaffronCity_Gym_EventScript_NoRoomForTM04
+	giveitem_msg SaffronCity_Gym_Text_ReceivedTM04FromSabrina, ITEM_TM04
 	setflag FLAG_GOT_TM04_FROM_SABRINA
-	msgbox gUnknown_819B685
+	msgbox SaffronCity_Gym_Text_SabrinaPostBattle
 	release
 	end
 
-EventScript_16EE7E:: @ 816EE7E
-	msgbox gUnknown_819B849
+SaffronCity_Gym_EventScript_NoRoomForTM04:: @ 816EE7E
+	msgbox SaffronCity_Gym_Text_BagFullOfOtherItems
 	release
 	end
 
-SaffronCity_Gym_EventScript_16EE88:: @ 816EE88
-	trainerbattle_single TRAINER_PSYCHIC_JOHAN, Text_19B936, Text_19B957
-	msgbox gUnknown_819B96D, MSGBOX_AUTOCLOSE
+SaffronCity_Gym_EventScript_Johan:: @ 816EE88
+	trainerbattle_single TRAINER_PSYCHIC_JOHAN, SaffronCity_Gym_Text_JohanIntro, SaffronCity_Gym_Text_JohanDefeat
+	msgbox SaffronCity_Gym_Text_JohanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SaffronCity_Gym_EventScript_16EE9F:: @ 816EE9F
-	trainerbattle_single TRAINER_PSYCHIC_TYRON, Text_19BA45, Text_19BA9E
+SaffronCity_Gym_EventScript_Tyron:: @ 816EE9F
+	trainerbattle_single TRAINER_PSYCHIC_TYRON, SaffronCity_Gym_Text_TyronIntro, SaffronCity_Gym_Text_TyronDefeat
 	famechecker FAMECHECKER_SABRINA, 5
-	msgbox gUnknown_819BAB4, MSGBOX_AUTOCLOSE
+	msgbox SaffronCity_Gym_Text_TyronPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SaffronCity_Gym_EventScript_16EEC3:: @ 816EEC3
-	trainerbattle_single TRAINER_PSYCHIC_CAMERON, Text_19BB49, Text_19BBA1
-	msgbox gUnknown_819BBB3, MSGBOX_AUTOCLOSE
+SaffronCity_Gym_EventScript_Cameron:: @ 816EEC3
+	trainerbattle_single TRAINER_PSYCHIC_CAMERON, SaffronCity_Gym_Text_CameronIntro, SaffronCity_Gym_Text_CameronDefeat
+	msgbox SaffronCity_Gym_Text_CameronPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SaffronCity_Gym_EventScript_16EEDA:: @ 816EEDA
-	trainerbattle_single TRAINER_PSYCHIC_PRESTON, Text_19BC57, Text_19BCBC
-	msgbox gUnknown_819BCC4, MSGBOX_AUTOCLOSE
+SaffronCity_Gym_EventScript_Preston:: @ 816EEDA
+	trainerbattle_single TRAINER_PSYCHIC_PRESTON, SaffronCity_Gym_Text_PrestonIntro, SaffronCity_Gym_Text_PrestonDefeat
+	msgbox SaffronCity_Gym_Text_PrestonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SaffronCity_Gym_EventScript_16EEF1:: @ 816EEF1
-	trainerbattle_single TRAINER_CHANNELER_AMANDA, Text_19B86A, Text_19B8A8
-	msgbox gUnknown_819B8B9, MSGBOX_AUTOCLOSE
+SaffronCity_Gym_EventScript_Amanda:: @ 816EEF1
+	trainerbattle_single TRAINER_CHANNELER_AMANDA, SaffronCity_Gym_Text_AmandaIntro, SaffronCity_Gym_Text_AmandaDefeat
+	msgbox SaffronCity_Gym_Text_AmandaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SaffronCity_Gym_EventScript_16EF08:: @ 816EF08
-	trainerbattle_single TRAINER_CHANNELER_STACY, Text_19B998, Text_19B9EC
-	msgbox gUnknown_819B9F7, MSGBOX_AUTOCLOSE
+SaffronCity_Gym_EventScript_Stacy:: @ 816EF08
+	trainerbattle_single TRAINER_CHANNELER_STACY, SaffronCity_Gym_Text_StacyIntro, SaffronCity_Gym_Text_StacyDefeat
+	msgbox SaffronCity_Gym_Text_StacyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SaffronCity_Gym_EventScript_16EF1F:: @ 816EF1F
-	trainerbattle_single TRAINER_CHANNELER_TASHA, Text_19BAE8, Text_19BB0D
-	msgbox gUnknown_819BB1F, MSGBOX_AUTOCLOSE
+SaffronCity_Gym_EventScript_Tasha:: @ 816EF1F
+	trainerbattle_single TRAINER_CHANNELER_TASHA, SaffronCity_Gym_Text_TashaIntro, SaffronCity_Gym_Text_TashaDefeat
+	msgbox SaffronCity_Gym_Text_TashaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SaffronCity_Gym_EventScript_16EF36:: @ 816EF36
+SaffronCity_Gym_EventScript_GymGuy:: @ 816EF36
 	lock
 	faceplayer
-	goto_if_set FLAG_DEFEATED_SABRINA, EventScript_16EF4B
-	msgbox gUnknown_819BCF6
+	goto_if_set FLAG_DEFEATED_SABRINA, SaffronCity_Gym_EventScript_GymGuyPostVictory
+	msgbox SaffronCity_Gym_Text_GymGuyAdvice
 	release
 	end
 
-EventScript_16EF4B:: @ 816EF4B
-	msgbox gUnknown_819BDBB
+SaffronCity_Gym_EventScript_GymGuyPostVictory:: @ 816EF4B
+	msgbox SaffronCity_Gym_Text_GymGuyPostVictory
 	release
 	end
 
-SaffronCity_Gym_EventScript_16EF55:: @ 816EF55
+SaffronCity_Gym_EventScript_GymStatue:: @ 816EF55
 	lockall
-	goto_if_set FLAG_BADGE06_GET, EventScript_16EF69
-	msgbox gUnknown_819BDFE
+	goto_if_set FLAG_BADGE06_GET, SaffronCity_Gym_EventScript_GymStatuePostVictory
+	msgbox SaffronCity_Gym_Text_GymStatue
 	releaseall
 	end
 
-EventScript_16EF69:: @ 816EF69
-	msgbox gUnknown_819BE37
+SaffronCity_Gym_EventScript_GymStatuePostVictory:: @ 816EF69
+	msgbox SaffronCity_Gym_Text_GymStatuePlayerWon
 	releaseall
 	end
diff --git a/data/maps/SaffronCity_Gym/text.inc b/data/maps/SaffronCity_Gym/text.inc
index ed48d983f..827d4bbd5 100644
--- a/data/maps/SaffronCity_Gym/text.inc
+++ b/data/maps/SaffronCity_Gym/text.inc
@@ -1,4 +1,4 @@
-Text_19B53C:: @ 819B53C
+SaffronCity_Gym_Text_SabrinaIntro:: @ 819B53C
     .string "I had a vision of your arrival.\p"
     .string "I have had psychic powers since\n"
     .string "I was a child.\p"
@@ -7,7 +7,7 @@ Text_19B53C:: @ 819B53C
     .string "I dislike battling, but if you wish,\n"
     .string "I will show you my powers!{PLAY_BGM}{MUS_EXEYE}$"
 
-Text_19B602:: @ 819B602
+SaffronCity_Gym_Text_SabrinaDefeat:: @ 819B602
     .string "This loss shocks me!\n"
     .string "But, a loss is a loss.\p"
     .string "I admit, I didn't work hard enough\n"
@@ -15,13 +15,13 @@ Text_19B602:: @ 819B602
     .string "Your victory has earned you the\n"
     .string "MARSHBADGE.$"
 
-gUnknown_819B685:: @ 819B685
+SaffronCity_Gym_Text_SabrinaPostBattle:: @ 819B685
     .string "Psychic power isn't something that\n"
     .string "only a few people have.\p"
     .string "Everyone has psychic power.\n"
     .string "People just don't realize it.$"
 
-gUnknown_819B6FA:: @ 819B6FA
+SaffronCity_Gym_Text_ExplainMarshBadgeTakeThis:: @ 819B6FA
     .string "The MARSHBADGE makes POKéMON up\n"
     .string "to Lv. 70 obey you.\p"
     .string "Stronger POKéMON will become wild,\n"
@@ -30,87 +30,87 @@ gUnknown_819B6FA:: @ 819B6FA
     .string "much to avoid that problem.\p"
     .string "Wait, please take this TM with you.$"
 
-gUnknown_819B7D3:: @ 819B7D3
+SaffronCity_Gym_Text_ReceivedTM04FromSabrina:: @ 819B7D3
     .string "{PLAYER} received TM04 from\n"
     .string "SABRINA.$"
 
-gUnknown_819B7F2:: @ 819B7F2
+SaffronCity_Gym_Text_ExplainTM04:: @ 819B7F2
     .string "TM04 is CALM MIND.\p"
     .string "It makes the POKéMON concentrate\n"
     .string "to raise both SP. ATK and SP. DEF.$"
 
-gUnknown_819B849:: @ 819B849
+SaffronCity_Gym_Text_BagFullOfOtherItems:: @ 819B849
     .string "Your BAG is full of other items.$"
 
-Text_19B86A:: @ 819B86A
+SaffronCity_Gym_Text_AmandaIntro:: @ 819B86A
     .string "SABRINA is far younger than I,\n"
     .string "but she has earned my respect.$"
 
-Text_19B8A8:: @ 819B8A8
+SaffronCity_Gym_Text_AmandaDefeat:: @ 819B8A8
     .string "Not good enough!$"
 
-gUnknown_819B8B9:: @ 819B8B9
+SaffronCity_Gym_Text_AmandaPostBattle:: @ 819B8B9
     .string "In a battle of equals, the one\n"
     .string "with the stronger will wins.\p"
     .string "If you wish to beat SABRINA, focus\n"
     .string "and will yourself to victory.$"
 
-Text_19B936:: @ 819B936
+SaffronCity_Gym_Text_JohanIntro:: @ 819B936
     .string "Does our unseen power scare you?$"
 
-Text_19B957:: @ 819B957
+SaffronCity_Gym_Text_JohanDefeat:: @ 819B957
     .string "I never foresaw this!$"
 
-gUnknown_819B96D:: @ 819B96D
+SaffronCity_Gym_Text_JohanPostBattle:: @ 819B96D
     .string "PSYCHIC POKéMON fear only ghosts\n"
     .string "and bugs!$"
 
-Text_19B998:: @ 819B998
+SaffronCity_Gym_Text_StacyIntro:: @ 819B998
     .string "POKéMON take on the appearance of\n"
     .string "their TRAINERS.\p"
     .string "Your POKéMON must be tough, then!$"
 
-Text_19B9EC:: @ 819B9EC
+SaffronCity_Gym_Text_StacyDefeat:: @ 819B9EC
     .string "I knew it!$"
 
-gUnknown_819B9F7:: @ 819B9F7
+SaffronCity_Gym_Text_StacyPostBattle:: @ 819B9F7
     .string "I have much to learn still…\p"
     .string "I must master PSYCHIC and teach it\n"
     .string "to my POKéMON…$"
 
-Text_19BA45:: @ 819BA45
+SaffronCity_Gym_Text_TyronIntro:: @ 819BA45
     .string "You understand, don't you?\p"
     .string "That power alone isn't enough to\n"
     .string "win in the world of POKéMON?$"
 
-Text_19BA9E:: @ 819BA9E
+SaffronCity_Gym_Text_TyronDefeat:: @ 819BA9E
     .string "I don't believe this!$"
 
-gUnknown_819BAB4:: @ 819BAB4
+SaffronCity_Gym_Text_TyronPostBattle:: @ 819BAB4
     .string "SABRINA just wiped out the KARATE\n"
     .string "MASTER next door.$"
 
-Text_19BAE8:: @ 819BAE8
+SaffronCity_Gym_Text_TashaIntro:: @ 819BAE8
     .string "You and I, our POKéMON shall\n"
     .string "battle!$"
 
-Text_19BB0D:: @ 819BB0D
+SaffronCity_Gym_Text_TashaDefeat:: @ 819BB0D
     .string "I lost after all!$"
 
-gUnknown_819BB1F:: @ 819BB1F
+SaffronCity_Gym_Text_TashaPostBattle:: @ 819BB1F
     .string "I knew that this was going to take\n"
     .string "place.$"
 
-Text_19BB49:: @ 819BB49
+SaffronCity_Gym_Text_CameronIntro:: @ 819BB49
     .string "SABRINA is young, but she's also\n"
     .string "our highly skilled LEADER.\p"
     .string "You won't reach her easily!$"
 
-Text_19BBA1:: @ 819BBA1
+SaffronCity_Gym_Text_CameronDefeat:: @ 819BBA1
     .string "Ow!\n"
     .string "Down and out!$"
 
-gUnknown_819BBB3:: @ 819BBB3
+SaffronCity_Gym_Text_CameronPostBattle:: @ 819BBB3
     .string "There used to be two POKéMON GYMS\n"
     .string "in SAFFRON.\p"
     .string "The FIGHTING DOJO next door lost\n"
@@ -118,20 +118,20 @@ gUnknown_819BBB3:: @ 819BBB3
     .string "We simply creamed them when we\n"
     .string "decided to have just one GYM.$"
 
-Text_19BC57:: @ 819BC57
+SaffronCity_Gym_Text_PrestonIntro:: @ 819BC57
     .string "SAFFRON POKéMON GYM is famous for\n"
     .string "training psychics.\p"
     .string "You want to see SABRINA, don't\n"
     .string "you? I can tell!$"
 
-Text_19BCBC:: @ 819BCBC
+SaffronCity_Gym_Text_PrestonDefeat:: @ 819BCBC
     .string "Arrrgh!$"
 
-gUnknown_819BCC4:: @ 819BCC4
+SaffronCity_Gym_Text_PrestonPostBattle:: @ 819BCC4
     .string "That's right! I used telepathy to\n"
     .string "read your mind!$"
 
-gUnknown_819BCF6:: @ 819BCF6
+SaffronCity_Gym_Text_GymGuyAdvice:: @ 819BCF6
     .string "Yo!\n"
     .string "Champ in the making!\p"
     .string "SABRINA's POKéMON use psychic\n"
@@ -141,18 +141,18 @@ gUnknown_819BCF6:: @ 819BCF6
     .string "They'll get destroyed before they\n"
     .string "can even aim a punch!$"
 
-gUnknown_819BDBB:: @ 819BDBB
+SaffronCity_Gym_Text_GymGuyPostVictory:: @ 819BDBB
     .string "Psychic power, huh?\p"
     .string "If I had that, I'd make a bundle\n"
     .string "at the slots!$"
 
-gUnknown_819BDFE:: @ 819BDFE
+SaffronCity_Gym_Text_GymStatue:: @ 819BDFE
     .string "SAFFRON POKéMON GYM\n"
     .string "LEADER: SABRINA\p"
     .string "WINNING TRAINERS:\n"
     .string "{RIVAL}$"
 
-gUnknown_819BE37:: @ 819BE37
+SaffronCity_Gym_Text_GymStatuePlayerWon:: @ 819BE37
     .string "SAFFRON POKéMON GYM\n"
     .string "LEADER: SABRINA\p"
     .string "WINNING TRAINERS:\n"
diff --git a/data/maps/SaffronCity_House2/map.json b/data/maps/SaffronCity_House/map.json
index 41fb0d809..48b569e5e 100644
--- a/data/maps/SaffronCity_House2/map.json
+++ b/data/maps/SaffronCity_House/map.json
@@ -1,6 +1,6 @@
 {
-  "id": "MAP_SAFFRON_CITY_HOUSE2",
-  "name": "SaffronCity_House2",
+  "id": "MAP_SAFFRON_CITY_HOUSE",
+  "name": "SaffronCity_House",
   "layout": "LAYOUT_HOUSE5",
   "music": "MUS_NIBI",
   "region_map_section": "MAPSEC_SAFFRON_CITY",
@@ -23,7 +23,7 @@
       "movement_range_y": 4,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_House2_EventScript_16EF86",
+      "script": "SaffronCity_House_EventScript_Pidgey",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_House2_EventScript_16EF74",
+      "script": "SaffronCity_House_EventScript_Lass",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_House2_EventScript_16EF7D",
+      "script": "SaffronCity_House_EventScript_Youngster",
       "flag": "0"
     },
     {
@@ -96,7 +96,7 @@
       "x": 5,
       "y": 4,
       "elevation": 3,
-      "script": "SaffronCity_House2_EventScript_16EF99"
+      "script": "SaffronCity_House_EventScript_Letter"
     }
   ]
 }
diff --git a/data/maps/SaffronCity_House/scripts.inc b/data/maps/SaffronCity_House/scripts.inc
new file mode 100644
index 000000000..d94baa8a0
--- /dev/null
+++ b/data/maps/SaffronCity_House/scripts.inc
@@ -0,0 +1,24 @@
+SaffronCity_House_MapScripts:: @ 816EF73
+	.byte 0
+
+SaffronCity_House_EventScript_Lass:: @ 816EF74
+	msgbox SaffronCity_House_Text_DontLookAtMyLetter, MSGBOX_NPC
+	end
+
+SaffronCity_House_EventScript_Youngster:: @ 816EF7D
+	msgbox SaffronCity_House_Text_GettingCopycatPokeDoll, MSGBOX_NPC
+	end
+
+SaffronCity_House_EventScript_Pidgey:: @ 816EF86
+	lock
+	faceplayer
+	waitse
+	playmoncry SPECIES_PIDGEY, 0
+	msgbox SaffronCity_House_Text_Pidgey
+	waitmoncry
+	release
+	end
+
+SaffronCity_House_EventScript_Letter:: @ 816EF99
+	msgbox SaffronCity_House_Text_ExplainPPUp, MSGBOX_SIGN
+	end
diff --git a/data/maps/SaffronCity_House2/text.inc b/data/maps/SaffronCity_House/text.inc
index 9558880b7..7d13c13fa 100644
--- a/data/maps/SaffronCity_House2/text.inc
+++ b/data/maps/SaffronCity_House/text.inc
@@ -1,17 +1,17 @@
-gUnknown_819BE74:: @ 819BE74
+SaffronCity_House_Text_DontLookAtMyLetter:: @ 819BE74
     .string "…Thank you for writing.\n"
     .string "I hope to see you soon!\p"
     .string "…Hey!\n"
     .string "Don't look at my letter!$"
 
-gUnknown_819BEC3:: @ 819BEC3
+SaffronCity_House_Text_Pidgey:: @ 819BEC3
     .string "PIDGEY: Kurukkoo!$"
 
-gUnknown_819BED5:: @ 819BED5
+SaffronCity_House_Text_GettingCopycatPokeDoll:: @ 819BED5
     .string "The COPYCAT is cute!\n"
     .string "I'm getting her a POKé DOLL.$"
 
-gUnknown_819BF07:: @ 819BF07
+SaffronCity_House_Text_ExplainPPUp:: @ 819BF07
     .string "I was given a PP UP as a gift.\p"
     .string "It's used to increase the PP of\n"
     .string "a POKéMON's move.\p"
diff --git a/data/maps/SaffronCity_House1_1F/scripts.inc b/data/maps/SaffronCity_House1_1F/scripts.inc
deleted file mode 100644
index 2f4e435fa..000000000
--- a/data/maps/SaffronCity_House1_1F/scripts.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-SaffronCity_House1_1F_MapScripts:: @ 816EB36
-	.byte 0
-
-SaffronCity_House1_1F_EventScript_16EB37:: @ 816EB37
-	msgbox gUnknown_819AB9B, MSGBOX_NPC
-	end
-
-SaffronCity_House1_1F_EventScript_16EB40:: @ 816EB40
-	msgbox gUnknown_819ABD7, MSGBOX_NPC
-	end
-
-SaffronCity_House1_1F_EventScript_16EB49:: @ 816EB49
-	lock
-	faceplayer
-	waitse
-	playmoncry SPECIES_CHANSEY, 0
-	msgbox gUnknown_819AC4B
-	waitmoncry
-	release
-	end
diff --git a/data/maps/SaffronCity_House1_1F/text.inc b/data/maps/SaffronCity_House1_1F/text.inc
deleted file mode 100644
index 04bedb057..000000000
--- a/data/maps/SaffronCity_House1_1F/text.inc
+++ /dev/null
@@ -1,32 +0,0 @@
-Text_19A9E7:: @ 819A9E7
-    .string "AGATHA's GHOST-type POKéMON are\n"
-    .string "horrifically terrifying in toughness.\p"
-    .string "I took my FIGHTING-type POKéMON\n"
-    .string "and raised them to the max.\p"
-    .string "I went at AGATHA feeling pretty\n"
-    .string "confident, but she whupped us.\p"
-    .string "That old lady's also got a really\n"
-    .string "short fuse, too.\p"
-    .string "It doesn't take anything to get\n"
-    .string "that scary lady hollering.$"
-
-Text_19AB16:: @ 819AB16
-    .string "Maybe becoming an ELITE FOUR\n"
-    .string "member is in the blood.\p"
-    .string "From what I've heard, LANCE has\n"
-    .string "a cousin who's a GYM LEADER\l"
-    .string "somewhere far away.$"
-
-gUnknown_819AB9B:: @ 819AB9B
-    .string "My daughter is so self-centered.\n"
-    .string "She has but a few friends.$"
-
-gUnknown_819ABD7:: @ 819ABD7
-    .string "My daughter likes to mimic people.\n"
-    .string "It's rather vexing.\p"
-    .string "Her mimicry has earned her the\n"
-    .string "nickname COPYCAT around here.$"
-
-gUnknown_819AC4B:: @ 819AC4B
-    .string "CHANSEY: Chaan! Sii!$"
-
diff --git a/data/maps/SaffronCity_House1_2F/scripts.inc b/data/maps/SaffronCity_House1_2F/scripts.inc
deleted file mode 100644
index 17714d816..000000000
--- a/data/maps/SaffronCity_House1_2F/scripts.inc
+++ /dev/null
@@ -1,50 +0,0 @@
-SaffronCity_House1_2F_MapScripts:: @ 816EB5C
-	.byte 0
-
-SaffronCity_House1_2F_EventScript_16EB5D:: @ 816EB5D
-	lock
-	faceplayer
-	waitse
-	playmoncry SPECIES_DODUO, 0
-	msgbox gUnknown_819B030
-	waitmoncry
-	release
-	end
-
-SaffronCity_House1_2F_EventScript_16EB70:: @ 816EB70
-	lock
-	msgbox gUnknown_819B071
-	release
-	end
-
-SaffronCity_House1_2F_EventScript_16EB7B:: @ 816EB7B
-	goto_if_questlog EventScript_ReleaseEnd
-	special sub_8112364
-	lock
-	faceplayer
-	checkitem ITEM_POKE_DOLL, 1
-	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_MimicTutor
-	checkplayergender
-	compare VAR_RESULT, MALE
-	call_if_eq EventScript_16EBB7
-	compare VAR_RESULT, FEMALE
-	call_if_eq EventScript_16EBC0
-	release
-	end
-
-EventScript_16EBB7:: @ 816EBB7
-	msgbox gUnknown_819AC60
-	return
-
-EventScript_16EBC0:: @ 816EBC0
-	msgbox gUnknown_819ACF1
-	return
-
-SaffronCity_House1_2F_EventScript_16EBC9:: @ 816EBC9
-	msgbox gUnknown_819B0D0, MSGBOX_SIGN
-	end
-
-SaffronCity_House1_2F_EventScript_16EBD2:: @ 816EBD2
-	msgbox gUnknown_819B0A0, MSGBOX_SIGN
-	end
diff --git a/data/maps/SaffronCity_House2/scripts.inc b/data/maps/SaffronCity_House2/scripts.inc
deleted file mode 100644
index 03afb1a4c..000000000
--- a/data/maps/SaffronCity_House2/scripts.inc
+++ /dev/null
@@ -1,24 +0,0 @@
-SaffronCity_House2_MapScripts:: @ 816EF73
-	.byte 0
-
-SaffronCity_House2_EventScript_16EF74:: @ 816EF74
-	msgbox gUnknown_819BE74, MSGBOX_NPC
-	end
-
-SaffronCity_House2_EventScript_16EF7D:: @ 816EF7D
-	msgbox gUnknown_819BED5, MSGBOX_NPC
-	end
-
-SaffronCity_House2_EventScript_16EF86:: @ 816EF86
-	lock
-	faceplayer
-	waitse
-	playmoncry SPECIES_PIDGEY, 0
-	msgbox gUnknown_819BEC3
-	waitmoncry
-	release
-	end
-
-SaffronCity_House2_EventScript_16EF99:: @ 816EF99
-	msgbox gUnknown_819BF07, MSGBOX_SIGN
-	end
diff --git a/data/maps/SaffronCity_House3/scripts.inc b/data/maps/SaffronCity_House3/scripts.inc
deleted file mode 100644
index 9e177cccb..000000000
--- a/data/maps/SaffronCity_House3/scripts.inc
+++ /dev/null
@@ -1,26 +0,0 @@
-SaffronCity_House3_MapScripts:: @ 816F05E
-	.byte 0
-
-SaffronCity_House3_EventScript_16F05F:: @ 816F05F
-	lock
-	faceplayer
-	goto_if_set FLAG_GOT_TM29_FROM_MR_PSYCHIC, EventScript_16F0B5
-	msgbox gUnknown_819C142
-	checkitemspace ITEM_TM29, 1
-	compare VAR_RESULT, FALSE
-	goto_if_eq EventScript_16F0AB
-	giveitem_msg gUnknown_819C16C, ITEM_TM29
-	msgbox gUnknown_819C18F
-	setflag FLAG_GOT_TM29_FROM_MR_PSYCHIC
-	release
-	end
-
-EventScript_16F0AB:: @ 816F0AB
-	msgbox gUnknown_819C1FC
-	release
-	end
-
-EventScript_16F0B5:: @ 816F0B5
-	msgbox gUnknown_819C18F
-	release
-	end
diff --git a/data/maps/SaffronCity_Mart/map.json b/data/maps/SaffronCity_Mart/map.json
index 8f3bd6718..ddce0c6d9 100644
--- a/data/maps/SaffronCity_Mart/map.json
+++ b/data/maps/SaffronCity_Mart/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_Mart_EventScript_16EFB5",
+      "script": "SaffronCity_Mart_EventScript_Clerk",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_Mart_EventScript_16EFAC",
+      "script": "SaffronCity_Mart_EventScript_Youngster",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_Mart_EventScript_16EFA3",
+      "script": "SaffronCity_Mart_EventScript_Lass",
       "flag": "0"
     }
   ],
diff --git a/data/maps/SaffronCity_Mart/scripts.inc b/data/maps/SaffronCity_Mart/scripts.inc
index 5361c07a8..c00a93776 100644
--- a/data/maps/SaffronCity_Mart/scripts.inc
+++ b/data/maps/SaffronCity_Mart/scripts.inc
@@ -1,27 +1,27 @@
 SaffronCity_Mart_MapScripts:: @ 816EFA2
 	.byte 0
 
-SaffronCity_Mart_EventScript_16EFA3:: @ 816EFA3
-	msgbox gUnknown_819BFF1, MSGBOX_NPC
+SaffronCity_Mart_EventScript_Lass:: @ 816EFA3
+	msgbox SaffronCity_Mart_Text_ReviveIsCostly, MSGBOX_NPC
 	end
 
-SaffronCity_Mart_EventScript_16EFAC:: @ 816EFAC
-	msgbox gUnknown_819BF8F, MSGBOX_NPC
+SaffronCity_Mart_EventScript_Youngster:: @ 816EFAC
+	msgbox SaffronCity_Mart_Text_MaxRepelMoreEffectiveThanSuper, MSGBOX_NPC
 	end
 
-SaffronCity_Mart_EventScript_16EFB5:: @ 816EFB5
+SaffronCity_Mart_EventScript_Clerk:: @ 816EFB5
 	goto_if_questlog EventScript_ReleaseEnd
 	lock
 	faceplayer
 	message Text_MayIHelpYou
 	waitmessage
-	pokemart Items_16EFDC
+	pokemart SaffronCity_Mart_Items
 	msgbox Text_PleaseComeAgain
 	release
 	end
 
 	.align 2
-Items_16EFDC:: @ 816EFDC
+SaffronCity_Mart_Items:: @ 816EFDC
 	.2byte ITEM_GREAT_BALL
 	.2byte ITEM_HYPER_POTION
 	.2byte ITEM_REVIVE
diff --git a/data/maps/SaffronCity_Mart/text.inc b/data/maps/SaffronCity_Mart/text.inc
index 5acbdbd9c..edf13f2fe 100644
--- a/data/maps/SaffronCity_Mart/text.inc
+++ b/data/maps/SaffronCity_Mart/text.inc
@@ -1,10 +1,10 @@
-gUnknown_819BF8F:: @ 819BF8F
+SaffronCity_Mart_Text_MaxRepelMoreEffectiveThanSuper:: @ 819BF8F
     .string "MAX REPEL keeps weaker POKéMON\n"
     .string "from appearing.\p"
     .string "MAX REPEL stays effective longer\n"
     .string "than SUPER REPEL.$"
 
-gUnknown_819BFF1:: @ 819BFF1
+SaffronCity_Mart_Text_ReviveIsCostly:: @ 819BFF1
     .string "REVIVE is costly, but it revives\n"
     .string "fainted POKéMON!$"
 
diff --git a/data/maps/SaffronCity_House3/map.json b/data/maps/SaffronCity_MrPsychicsHouse/map.json
index 3d3e7410e..f1d121850 100644
--- a/data/maps/SaffronCity_House3/map.json
+++ b/data/maps/SaffronCity_MrPsychicsHouse/map.json
@@ -1,6 +1,6 @@
 {
-  "id": "MAP_SAFFRON_CITY_HOUSE3",
-  "name": "SaffronCity_House3",
+  "id": "MAP_SAFFRON_CITY_MR_PSYCHICS_HOUSE",
+  "name": "SaffronCity_MrPsychicsHouse",
   "layout": "LAYOUT_HOUSE5",
   "music": "MUS_NIBI",
   "region_map_section": "MAPSEC_SAFFRON_CITY",
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_House3_EventScript_16F05F",
+      "script": "SaffronCity_MrPsychicsHouse_EventScript_MrPsychic",
       "flag": "0"
     }
   ],
diff --git a/data/maps/SaffronCity_MrPsychicsHouse/scripts.inc b/data/maps/SaffronCity_MrPsychicsHouse/scripts.inc
new file mode 100644
index 000000000..24bd51cc1
--- /dev/null
+++ b/data/maps/SaffronCity_MrPsychicsHouse/scripts.inc
@@ -0,0 +1,26 @@
+SaffronCity_MrPsychicsHouse_MapScripts:: @ 816F05E
+	.byte 0
+
+SaffronCity_MrPsychicsHouse_EventScript_MrPsychic:: @ 816F05F
+	lock
+	faceplayer
+	goto_if_set FLAG_GOT_TM29_FROM_MR_PSYCHIC, SaffronCity_MrPsychicsHouse_EventScript_AlreadyGotTM29
+	msgbox SaffronCity_MrPsychicsHouse_Text_YouWantedThis
+	checkitemspace ITEM_TM29, 1
+	compare VAR_RESULT, FALSE
+	goto_if_eq SaffronCity_MrPsychicsHouse_EventScript_NoRoomForTM29
+	giveitem_msg SaffronCity_MrPsychicsHouse_Text_ReceivedTM29FromMrPsychic, ITEM_TM29
+	msgbox SaffronCity_MrPsychicsHouse_Text_ExplainTM29
+	setflag FLAG_GOT_TM29_FROM_MR_PSYCHIC
+	release
+	end
+
+SaffronCity_MrPsychicsHouse_EventScript_NoRoomForTM29:: @ 816F0AB
+	msgbox SaffronCity_MrPsychicsHouse_Text_YouveNoRoom
+	release
+	end
+
+SaffronCity_MrPsychicsHouse_EventScript_AlreadyGotTM29:: @ 816F0B5
+	msgbox SaffronCity_MrPsychicsHouse_Text_ExplainTM29
+	release
+	end
diff --git a/data/maps/SaffronCity_House3/text.inc b/data/maps/SaffronCity_MrPsychicsHouse/text.inc
index 42699924f..31d220c69 100644
--- a/data/maps/SaffronCity_House3/text.inc
+++ b/data/maps/SaffronCity_MrPsychicsHouse/text.inc
@@ -1,18 +1,18 @@
-gUnknown_819C142:: @ 819C142
+SaffronCity_MrPsychicsHouse_Text_YouWantedThis:: @ 819C142
     .string "…Wait! Don't say a word!\p"
     .string "You wanted this!$"
 
-gUnknown_819C16C:: @ 819C16C
+SaffronCity_MrPsychicsHouse_Text_ReceivedTM29FromMrPsychic:: @ 819C16C
     .string "{PLAYER} received TM29\n"
     .string "from MR. PSYCHIC.$"
 
-gUnknown_819C18F:: @ 819C18F
+SaffronCity_MrPsychicsHouse_Text_ExplainTM29:: @ 819C18F
     .string "You already know, don't you?\n"
     .string "TM29 is PSYCHIC.\p"
     .string "It's an attack that may also lower\n"
     .string "the target's special stats.$"
 
-gUnknown_819C1FC:: @ 819C1FC
+SaffronCity_MrPsychicsHouse_Text_YouveNoRoom:: @ 819C1FC
     .string "Where do you plan to put this?\n"
     .string "You've no room.$"
 
diff --git a/data/maps/SaffronCity_PokemonCenter_1F/map.json b/data/maps/SaffronCity_PokemonCenter_1F/map.json
index bb78415b4..1d28ff69a 100644
--- a/data/maps/SaffronCity_PokemonCenter_1F/map.json
+++ b/data/maps/SaffronCity_PokemonCenter_1F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_PokemonCenter_1F_EventScript_16EFFB",
+      "script": "SaffronCity_PokemonCenter_1F_EventScript_Nurse",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_PokemonCenter_1F_EventScript_16F004",
+      "script": "SaffronCity_PokemonCenter_1F_EventScript_Gentleman",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_PokemonCenter_1F_EventScript_16F00D",
+      "script": "SaffronCity_PokemonCenter_1F_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_PokemonCenter_1F_EventScript_16F016",
+      "script": "SaffronCity_PokemonCenter_1F_EventScript_Youngster",
       "flag": "0"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_PokemonCenter_1F_EventScript_1ACEEC",
+      "script": "SaffronCity_PokemonCenter_1F_EventScript_PokemonJournalSabrina",
       "flag": "FLAG_HIDE_SAFFRON_CITY_POKECENTER_SABRINA_JOURNALS"
     },
     {
@@ -88,7 +88,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_PokemonCenter_1F_EventScript_1ACEEC",
+      "script": "SaffronCity_PokemonCenter_1F_EventScript_PokemonJournalSabrina",
       "flag": "FLAG_HIDE_SAFFRON_CITY_POKECENTER_SABRINA_JOURNALS"
     }
   ],
diff --git a/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc b/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc
index 8639de5af..b8e2385e6 100644
--- a/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/SaffronCity_PokemonCenter_1F/scripts.inc
@@ -7,31 +7,31 @@ SaffronCity_PokemonCenter_1F_OnTransition:: @ 816EFF7
 	setrespawn SPAWN_SAFFRON_CITY
 	end
 
-SaffronCity_PokemonCenter_1F_EventScript_16EFFB:: @ 816EFFB
+SaffronCity_PokemonCenter_1F_EventScript_Nurse:: @ 816EFFB
 	lock
 	faceplayer
 	call EventScript_PkmnCenterNurse
 	release
 	end
 
-SaffronCity_PokemonCenter_1F_EventScript_16F004:: @ 816F004
-	msgbox gUnknown_819C058, MSGBOX_NPC
+SaffronCity_PokemonCenter_1F_EventScript_Gentleman:: @ 816F004
+	msgbox SaffronCity_PokemonCenter_1F_Text_SilphCoVictimOfFame, MSGBOX_NPC
 	end
 
-SaffronCity_PokemonCenter_1F_EventScript_16F00D:: @ 816F00D
-	msgbox gUnknown_819C023, MSGBOX_NPC
+SaffronCity_PokemonCenter_1F_EventScript_Woman:: @ 816F00D
+	msgbox SaffronCity_PokemonCenter_1F_Text_GrowthRatesDifferBySpecies, MSGBOX_NPC
 	end
 
-SaffronCity_PokemonCenter_1F_EventScript_16F016:: @ 816F016
+SaffronCity_PokemonCenter_1F_EventScript_Youngster:: @ 816F016
 	lock
 	faceplayer
 	compare VAR_MAP_SCENE_SILPH_CO_11F, 1
-	goto_if_eq EventScript_16F02D
-	msgbox gUnknown_819C0B4
+	goto_if_eq SaffronCity_PokemonCenter_1F_EventScript_YoungsterRocketsGone
+	msgbox SaffronCity_PokemonCenter_1F_Text_GreatIfEliteFourCameBeatRockets
 	release
 	end
 
-EventScript_16F02D:: @ 816F02D
-	msgbox gUnknown_819C102
+SaffronCity_PokemonCenter_1F_EventScript_YoungsterRocketsGone:: @ 816F02D
+	msgbox SaffronCity_PokemonCenter_1F_Text_TeamRocketTookOff
 	release
 	end
diff --git a/data/maps/SaffronCity_PokemonCenter_1F/text.inc b/data/maps/SaffronCity_PokemonCenter_1F/text.inc
index 8a3e43a10..51d64d42c 100644
--- a/data/maps/SaffronCity_PokemonCenter_1F/text.inc
+++ b/data/maps/SaffronCity_PokemonCenter_1F/text.inc
@@ -1,19 +1,19 @@
-gUnknown_819C023:: @ 819C023
+SaffronCity_PokemonCenter_1F_Text_GrowthRatesDifferBySpecies:: @ 819C023
     .string "POKéMON growth rates differ from\n"
     .string "species to species.$"
 
-gUnknown_819C058:: @ 819C058
+SaffronCity_PokemonCenter_1F_Text_SilphCoVictimOfFame:: @ 819C058
     .string "SILPH CO. is widely known to all.\p"
     .string "It's a victim of its own fame - it\n"
     .string "attracted TEAM ROCKET.$"
 
-gUnknown_819C0B4:: @ 819C0B4
+SaffronCity_PokemonCenter_1F_Text_GreatIfEliteFourCameBeatRockets:: @ 819C0B4
     .string "Sigh…\n"
     .string "Wouldn't this be great?\p"
     .string "If the ELITE FOUR came and\n"
     .string "stomped TEAM ROCKET?$"
 
-gUnknown_819C102:: @ 819C102
+SaffronCity_PokemonCenter_1F_Text_TeamRocketTookOff:: @ 819C102
     .string "TEAM ROCKET took off!\n"
     .string "We can go out safely again!\l"
     .string "That's great!$"
diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json
index 979278cdb..f8f892dca 100644
--- a/data/maps/SaffronCity_PokemonTrainerFanClub/map.json
+++ b/data/maps/SaffronCity_PokemonTrainerFanClub/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F281",
+      "script": "SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirl",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F2F8",
+      "script": "SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirl",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F36F",
+      "script": "SaffronCity_PokemonTrainerFanClub_EventScript_Youngster",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F3E6",
+      "script": "SaffronCity_PokemonTrainerFanClub_EventScript_Gentleman",
       "flag": "0"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F45D",
+      "script": "SaffronCity_PokemonTrainerFanClub_EventScript_Woman",
       "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_WOMAN"
     },
     {
@@ -88,7 +88,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F4BF",
+      "script": "SaffronCity_PokemonTrainerFanClub_EventScript_Rocker",
       "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_ROCKER"
     },
     {
@@ -101,7 +101,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F521",
+      "script": "SaffronCity_PokemonTrainerFanClub_EventScript_Beauty",
       "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_BEAUTY"
     },
     {
@@ -114,7 +114,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_PokemonTrainerFanClub_EventScript_16F583",
+      "script": "SaffronCity_PokemonTrainerFanClub_EventScript_BlackBelt",
       "flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_BLACKBELT"
     },
     {
@@ -127,7 +127,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_PokemonTrainerFanClub_EventScript_1ACF7A",
+      "script": "SaffronCity_PokemonTrainerFanClub_EventScript_PokemonJournalBruno",
       "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
     },
     {
@@ -140,7 +140,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SaffronCity_PokemonTrainerFanClub_EventScript_1ACF7A",
+      "script": "SaffronCity_PokemonTrainerFanClub_EventScript_PokemonJournalBruno",
       "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
     }
   ],
diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc
index ffb4678b2..8df872d7e 100644
--- a/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc
+++ b/data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc
@@ -4,10 +4,10 @@ SaffronCity_PokemonTrainerFanClub_MapScripts:: @ 816F0BF
 	.byte 0
 
 SaffronCity_PokemonTrainerFanClub_OnFrame:: @ 816F0CA
-	map_script_2 VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 1, EventScript_16F0D4
+	map_script_2 VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 1, SaffronCity_PokemonTrainerFanClub_EventScript_MeetFirstFans
 	.2byte 0
 
-EventScript_16F0D4:: @ 816F0D4
+SaffronCity_PokemonTrainerFanClub_EventScript_MeetFirstFans:: @ 816F0D4
 	lockall
 	textcolor 1
 	applymovement 1, Movement_WalkInPlaceFastestDown
@@ -17,18 +17,18 @@ EventScript_16F0D4:: @ 816F0D4
 	waitmovement 0
 	applymovement 1, Movement_Delay48
 	waitmovement 0
-	msgbox gUnknown_819C22B
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_HuhYou
 	closemessage
-	applymovement 1, Movement_16F124
+	applymovement 1, SaffronCity_PokemonTrainerFanClub_Movement_FanApproachPlayer
 	waitmovement 0
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	msgbox gUnknown_819C235
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_YourePlayerWereYourFansNow
 	setvar VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 2
 	releaseall
 	end
 
-Movement_16F124:: @ 816F124
+SaffronCity_PokemonTrainerFanClub_Movement_FanApproachPlayer:: @ 816F124
 	delay_16
 	delay_8
 	walk_down
@@ -38,7 +38,8 @@ Movement_16F124:: @ 816F124
 	walk_left
 	step_end
 
-Movement_16F12C:: @ 816F12C
+@ Unused, leftover from RS
+LilycoveCity_PokemonTrainerFanClub_Movement_FanApproachPlayer:: @ 816F12C
 	delay_8
 	walk_in_place_fastest_down
 	walk_down
@@ -48,7 +49,8 @@ Movement_16F12C:: @ 816F12C
 	walk_left
 	step_end
 
-Movement_16F134:: @ 816F134
+@ Unused, leftover from RS
+LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlWatchPlayer:: @ 816F134
 	walk_fast_left
 	walk_fast_left
 	walk_fast_down
@@ -57,12 +59,14 @@ Movement_16F134:: @ 816F134
 	walk_fast_down
 	step_end
 
-Movement_16F13B:: @ 816F13B
+@ Unused, leftover from RS
+LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlMoveCloserToPlayer:: @ 816F13B
 	walk_down
 	walk_in_place_fastest_right
 	step_end
 
-Movement_16F13E:: @ 816F13E
+@ Unused, leftover from RS
+LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlHideFromPlayer:: @ 816F13E
 	jump_in_place_right
 	walk_fast_up
 	walk_fast_up
@@ -72,383 +76,383 @@ Movement_16F13E:: @ 816F13E
 
 SaffronCity_PokemonTrainerFanClub_OnTransition:: @ 816F144
 	compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 1
-	goto_if_eq EventScript_16F267
+	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_SetMemberPosForFirstMeeting
 	compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 2
-	goto_if_eq EventScript_16F15B
+	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_UpdateFanMemberPositions
 	end
 
-EventScript_16F15B:: @ 816F15B
+SaffronCity_PokemonTrainerFanClub_EventScript_UpdateFanMemberPositions:: @ 816F15B
 	special Special_TryLoseFansFromPlayTime
 	setvar VAR_0x8004, FANCLUB_MEMBER1
 	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
 	compare VAR_RESULT, FALSE
-	call_if_eq EventScript_16F207
+	call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember1ToFarTable
 	setvar VAR_0x8004, FANCLUB_MEMBER2
 	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
 	compare VAR_RESULT, FALSE
-	call_if_eq EventScript_16F213
+	call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember2ToFarTable
 	setvar VAR_0x8004, FANCLUB_MEMBER3
 	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
 	compare VAR_RESULT, FALSE
-	call_if_eq EventScript_16F21F
+	call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember3ToFarTable
 	setvar VAR_0x8004, FANCLUB_MEMBER4
 	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
 	compare VAR_RESULT, FALSE
-	call_if_eq EventScript_16F22B
+	call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember4ToFarTable
 	setvar VAR_0x8004, FANCLUB_MEMBER5
 	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
 	compare VAR_RESULT, FALSE
-	call_if_eq EventScript_16F237
+	call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember5ToFarTable
 	setvar VAR_0x8004, FANCLUB_MEMBER6
 	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
 	compare VAR_RESULT, FALSE
-	call_if_eq EventScript_16F243
+	call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember6ToFarTable
 	setvar VAR_0x8004, FANCLUB_MEMBER7
 	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
 	compare VAR_RESULT, FALSE
-	call_if_eq EventScript_16F24F
+	call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember7ToFarTable
 	setvar VAR_0x8004, FANCLUB_MEMBER8
 	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
 	compare VAR_RESULT, FALSE
-	call_if_eq EventScript_16F25B
+	call_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember8ToFarTable
 	end
 
-EventScript_16F207:: @ 816F207
+SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember1ToFarTable:: @ 816F207
 	setobjectxyperm 1, 5, 2
 	setobjectmovementtype 1, 7
 	return
 
-EventScript_16F213:: @ 816F213
+SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember2ToFarTable:: @ 816F213
 	setobjectxyperm 3, 7, 4
 	setobjectmovementtype 3, 9
 	return
 
-EventScript_16F21F:: @ 816F21F
+SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember3ToFarTable:: @ 816F21F
 	setobjectxyperm 4, 2, 2
 	setobjectmovementtype 4, 7
 	return
 
-EventScript_16F22B:: @ 816F22B
+SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember4ToFarTable:: @ 816F22B
 	setobjectxyperm 2, 3, 4
 	setobjectmovementtype 2, 10
 	return
 
-EventScript_16F237:: @ 816F237
+SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember5ToFarTable:: @ 816F237
 	setobjectxyperm 6, 4, 6
 	setobjectmovementtype 6, 7
 	return
 
-EventScript_16F243:: @ 816F243
+SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember6ToFarTable:: @ 816F243
 	setobjectxyperm 5, 10, 3
 	setobjectmovementtype 5, 7
 	return
 
-EventScript_16F24F:: @ 816F24F
+SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember7ToFarTable:: @ 816F24F
 	setobjectxyperm 7, 7, 5
 	setobjectmovementtype 7, 9
 	return
 
-EventScript_16F25B:: @ 816F25B
+SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember8ToFarTable:: @ 816F25B
 	setobjectxyperm 8, 9, 6
 	setobjectmovementtype 8, 9
 	return
 
-EventScript_16F267:: @ 816F267
-	call EventScript_16F22B
-	call EventScript_16F237
-	call EventScript_16F243
-	call EventScript_16F24F
-	call EventScript_16F25B
+SaffronCity_PokemonTrainerFanClub_EventScript_SetMemberPosForFirstMeeting:: @ 816F267
+	call SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember4ToFarTable
+	call SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember5ToFarTable
+	call SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember6ToFarTable
+	call SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember7ToFarTable
+	call SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember8ToFarTable
 	end
 
-SaffronCity_PokemonTrainerFanClub_EventScript_16F281:: @ 816F281
+SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirl:: @ 816F281
 	lock
 	faceplayer
 	setvar VAR_0x8004, FANCLUB_MEMBER1
 	special Special_BufferFanClubTrainerName
 	compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0
-	goto_if_eq EventScript_16F2EE
+	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlPlayerNotChampion
 	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_16F2C0
+	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlPlayersFan
 	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
-	goto_if_eq EventScript_16F2E4
-	msgbox gUnknown_819C420
+	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlOnlyNonFan
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_WasYourFanNotAnymore
 	release
 	end
 
-EventScript_16F2C0:: @ 816F2C0
+SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlPlayersFan:: @ 816F2C0
 	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, 1
-	goto_if_eq EventScript_16F2DA
-	msgbox gUnknown_819C390
+	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlOnlyFan
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_AlwaysCheerForYou
 	release
 	end
 
-EventScript_16F2DA:: @ 816F2DA
-	msgbox gUnknown_819C3BD
+SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlOnlyFan:: @ 816F2DA
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_IllAlwaysBelieveInYou
 	release
 	end
 
-EventScript_16F2E4:: @ 816F2E4
-	msgbox gUnknown_819C4A5
+SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlOnlyNonFan:: @ 816F2E4
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_EveryonesYourFanButICantBe
 	release
 	end
 
-EventScript_16F2EE:: @ 816F2EE
-	msgbox gUnknown_819C55C
+SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlPlayerNotChampion:: @ 816F2EE
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_TrainersCoolWhenBattling
 	release
 	end
 
-SaffronCity_PokemonTrainerFanClub_EventScript_16F2F8:: @ 816F2F8
+SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirl:: @ 816F2F8
 	lock
 	faceplayer
 	setvar VAR_0x8004, FANCLUB_MEMBER4
 	special Special_BufferFanClubTrainerName
 	compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0
-	goto_if_eq EventScript_16F365
+	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlPlayerNotChampion
 	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_16F337
+	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlPlayersFan
 	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
-	goto_if_eq EventScript_16F35B
-	msgbox gUnknown_819CBD3
+	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlOnlyNonFan
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_WantToBeLikeSabrina
 	release
 	end
 
-EventScript_16F337:: @ 816F337
+SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlPlayersFan:: @ 816F337
 	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, 1
-	goto_if_eq EventScript_16F351
-	msgbox gUnknown_819CB32
+	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlOnlyFan
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_WantToBeLikeYouOneDay
 	release
 	end
 
-EventScript_16F351:: @ 816F351
-	msgbox gUnknown_819CB62
+SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlOnlyFan:: @ 816F351
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_EveryoneButMeStoppedBeingYourFan
 	release
 	end
 
-EventScript_16F35B:: @ 816F35B
-	msgbox gUnknown_819CC2B
+SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlOnlyNonFan:: @ 816F35B
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_WontStopBeingSabrinasFan
 	release
 	end
 
-EventScript_16F365:: @ 816F365
-	msgbox gUnknown_819CCC2
+SaffronCity_PokemonTrainerFanClub_EventScript_LittleGirlPlayerNotChampion:: @ 816F365
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_CanIBecomeCoolTrainerOneDay
 	release
 	end
 
-SaffronCity_PokemonTrainerFanClub_EventScript_16F36F:: @ 816F36F
+SaffronCity_PokemonTrainerFanClub_EventScript_Youngster:: @ 816F36F
 	lock
 	faceplayer
 	setvar VAR_0x8004, FANCLUB_MEMBER2
 	special Special_BufferFanClubTrainerName
 	compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0
-	goto_if_eq EventScript_16F3DC
+	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterPlayerNotChampion
 	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_16F3AE
+	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterPlayersFan
 	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
-	goto_if_eq EventScript_16F3D2
-	msgbox gUnknown_819C6BA
+	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterOnlyNonFan
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_BrocksMyHero
 	release
 	end
 
-EventScript_16F3AE:: @ 816F3AE
+SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterPlayersFan:: @ 816F3AE
 	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, 1
-	goto_if_eq EventScript_16F3C8
-	msgbox gUnknown_819C5A9
+	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterOnlyFan
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_CanYouAutographShorts
 	release
 	end
 
-EventScript_16F3C8:: @ 816F3C8
-	msgbox gUnknown_819C600
+SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterOnlyFan:: @ 816F3C8
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_CountingOnYou
 	release
 	end
 
-EventScript_16F3D2:: @ 816F3D2
-	msgbox gUnknown_819C73A
+SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterOnlyNonFan:: @ 816F3D2
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_BrocksFanToBitterEnd
 	release
 	end
 
-EventScript_16F3DC:: @ 816F3DC
-	msgbox gUnknown_819C7C8
+SaffronCity_PokemonTrainerFanClub_EventScript_YoungsterPlayerNotChampion:: @ 816F3DC
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_BrocksLastWordOnCool
 	release
 	end
 
-SaffronCity_PokemonTrainerFanClub_EventScript_16F3E6:: @ 816F3E6
+SaffronCity_PokemonTrainerFanClub_EventScript_Gentleman:: @ 816F3E6
 	lock
 	faceplayer
 	setvar VAR_0x8004, FANCLUB_MEMBER3
 	special Special_BufferFanClubTrainerName
 	compare VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0
-	goto_if_eq EventScript_16F453
+	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanPlayerNotChampion
 	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_16F425
+	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanPlayersFan
 	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
-	goto_if_eq EventScript_16F449
-	msgbox gUnknown_819C986
+	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanOnlyNonFan
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_HmmAndYouAre
 	release
 	end
 
-EventScript_16F425:: @ 816F425
+SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanPlayersFan:: @ 816F425
 	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, 1
-	goto_if_eq EventScript_16F43F
-	msgbox gUnknown_819C81E
+	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanOnlyFan
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_HadPleasureOfWatchingYouBattle
 	release
 	end
 
-EventScript_16F43F:: @ 816F43F
-	msgbox gUnknown_819C8C1
+SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanOnlyFan:: @ 816F43F
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_NeverSeenTrainerOfYourMagnificence
 	release
 	end
 
-EventScript_16F449:: @ 816F449
-	msgbox gUnknown_819C9D5
+SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanOnlyNonFan:: @ 816F449
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_YouveStillAWaysToGo
 	release
 	end
 
-EventScript_16F453:: @ 816F453
-	msgbox gUnknown_819CA7C
+SaffronCity_PokemonTrainerFanClub_EventScript_GentlemanPlayerNotChampion:: @ 816F453
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_YoullBeTalkedAboutIfYouKeepWinning
 	release
 	end
 
-SaffronCity_PokemonTrainerFanClub_EventScript_16F45D:: @ 816F45D
+SaffronCity_PokemonTrainerFanClub_EventScript_Woman:: @ 816F45D
 	lock
 	faceplayer
 	setvar VAR_0x8004, FANCLUB_MEMBER6
 	special Special_BufferFanClubTrainerName
 	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_16F491
+	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_WomanPlayersFan
 	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
-	goto_if_eq EventScript_16F4B5
-	msgbox gUnknown_819D01F
+	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_WomanOnlyNonFan
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_TrainerHasBeenOnFire
 	release
 	end
 
-EventScript_16F491:: @ 816F491
+SaffronCity_PokemonTrainerFanClub_EventScript_WomanPlayersFan:: @ 816F491
 	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, 1
-	goto_if_eq EventScript_16F4AB
-	msgbox gUnknown_819CEDF
+	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_WomanOnlyFan
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_AdoreWayYouBattle
 	release
 	end
 
-EventScript_16F4AB:: @ 816F4AB
-	msgbox gUnknown_819CF6D
+SaffronCity_PokemonTrainerFanClub_EventScript_WomanOnlyFan:: @ 816F4AB
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_ImYourNumberOneFan
 	release
 	end
 
-EventScript_16F4B5:: @ 816F4B5
-	msgbox gUnknown_819D075
+SaffronCity_PokemonTrainerFanClub_EventScript_WomanOnlyNonFan:: @ 816F4B5
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_EveryoneTalksAboutYou
 	release
 	end
 
-SaffronCity_PokemonTrainerFanClub_EventScript_16F4BF:: @ 816F4BF
+SaffronCity_PokemonTrainerFanClub_EventScript_Rocker:: @ 816F4BF
 	lock
 	faceplayer
 	setvar VAR_0x8004, FANCLUB_MEMBER5
 	special Special_BufferFanClubTrainerName
 	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_16F4F3
+	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_RockerPlayersFan
 	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
-	goto_if_eq EventScript_16F517
-	msgbox gUnknown_819CDDA
+	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_RockerOnlyNonFan
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_LoveWayTrainerTalks
 	release
 	end
 
-EventScript_16F4F3:: @ 816F4F3
+SaffronCity_PokemonTrainerFanClub_EventScript_RockerPlayersFan:: @ 816F4F3
 	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, 1
-	goto_if_eq EventScript_16F50D
-	msgbox gUnknown_819CCF3
+	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_RockerOnlyFan
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_TheWayYouBattleIsCool
 	release
 	end
 
-EventScript_16F50D:: @ 816F50D
-	msgbox gUnknown_819CD4E
+SaffronCity_PokemonTrainerFanClub_EventScript_RockerOnlyFan:: @ 816F50D
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_ImOnlyOneLeftOfYourFans
 	release
 	end
 
-EventScript_16F517:: @ 816F517
-	msgbox gUnknown_819CE3A
+SaffronCity_PokemonTrainerFanClub_EventScript_RockerOnlyNonFan:: @ 816F517
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_ImLoneTrainerFan
 	release
 	end
 
-SaffronCity_PokemonTrainerFanClub_EventScript_16F521:: @ 816F521
+SaffronCity_PokemonTrainerFanClub_EventScript_Beauty:: @ 816F521
 	lock
 	faceplayer
 	setvar VAR_0x8004, FANCLUB_MEMBER7
 	special Special_BufferFanClubTrainerName
 	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_16F555
+	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BeautyPlayersFan
 	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
-	goto_if_eq EventScript_16F579
-	msgbox gUnknown_819D1AE
+	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BeautyOnlyNonFan
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_WhyCantOthersSeeMastersDignity
 	release
 	end
 
-EventScript_16F555:: @ 816F555
+SaffronCity_PokemonTrainerFanClub_EventScript_BeautyPlayersFan:: @ 816F555
 	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, 1
-	goto_if_eq EventScript_16F56F
-	msgbox gUnknown_819D0E3
+	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BeautyOnlyFan
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_YouReallyAreAmazing
 	release
 	end
 
-EventScript_16F56F:: @ 816F56F
-	msgbox gUnknown_819D148
+SaffronCity_PokemonTrainerFanClub_EventScript_BeautyOnlyFan:: @ 816F56F
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_ImYourOnlyFan
 	release
 	end
 
-EventScript_16F579:: @ 816F579
-	msgbox gUnknown_819D211
+SaffronCity_PokemonTrainerFanClub_EventScript_BeautyOnlyNonFan:: @ 816F579
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_BelieveInMasterWithAllMyHeart
 	release
 	end
 
-SaffronCity_PokemonTrainerFanClub_EventScript_16F583:: @ 816F583
+SaffronCity_PokemonTrainerFanClub_EventScript_BlackBelt:: @ 816F583
 	lock
 	faceplayer
 	setvar VAR_0x8004, FANCLUB_MEMBER8
 	special Special_BufferFanClubTrainerName
 	specialvar VAR_RESULT, Special_IsFanClubMemberFanOfPlayer
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_16F5B7
+	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BlackBeltPlayersFan
 	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1)
-	goto_if_eq EventScript_16F5DB
-	msgbox gUnknown_819D3D2
+	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BlackBeltOnlyNonFan
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_OnlyMasterHasMyRespect
 	release
 	end
 
-EventScript_16F5B7:: @ 816F5B7
+SaffronCity_PokemonTrainerFanClub_EventScript_BlackBeltPlayersFan:: @ 816F5B7
 	specialvar VAR_RESULT, Special_GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, 1
-	goto_if_eq EventScript_16F5D1
-	msgbox gUnknown_819D2B4
+	goto_if_eq SaffronCity_PokemonTrainerFanClub_EventScript_BlackBeltOnlyFan
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_YourBattleStyleIsEducational
 	release
 	end
 
-EventScript_16F5D1:: @ 816F5D1
-	msgbox gUnknown_819D31F
+SaffronCity_PokemonTrainerFanClub_EventScript_BlackBeltOnlyFan:: @ 816F5D1
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_WontStopBeingYourFan
 	release
 	end
 
-EventScript_16F5DB:: @ 816F5DB
-	msgbox gUnknown_819D477
+SaffronCity_PokemonTrainerFanClub_EventScript_BlackBeltOnlyNonFan:: @ 816F5DB
+	msgbox SaffronCity_PokemonTrainerFanClub_Text_NeverBeFanOfAnyoneButMaster
 	release
 	end
diff --git a/data/maps/SaffronCity_PokemonTrainerFanClub/text.inc b/data/maps/SaffronCity_PokemonTrainerFanClub/text.inc
index ecbf0b024..fb9358c70 100644
--- a/data/maps/SaffronCity_PokemonTrainerFanClub/text.inc
+++ b/data/maps/SaffronCity_PokemonTrainerFanClub/text.inc
@@ -1,8 +1,8 @@
-gUnknown_819C22B:: @ 819C22B
+SaffronCity_PokemonTrainerFanClub_Text_HuhYou:: @ 819C22B
     .string "Huh?\n"
     .string "You…$"
 
-gUnknown_819C235:: @ 819C235
+SaffronCity_PokemonTrainerFanClub_Text_YourePlayerWereYourFansNow:: @ 819C235
     .string "Are you maybe…\n"
     .string "… …\p"
     .string "You are!\n"
@@ -19,17 +19,17 @@ gUnknown_819C235:: @ 819C235
     .string "That way, maybe other people will\n"
     .string "become fans just like me.$"
 
-gUnknown_819C390:: @ 819C390
+SaffronCity_PokemonTrainerFanClub_Text_AlwaysCheerForYou:: @ 819C390
     .string "I'll always be cheering for you!\p"
     .string "Go, {PLAYER}, go!$"
 
-gUnknown_819C3BD:: @ 819C3BD
+SaffronCity_PokemonTrainerFanClub_Text_IllAlwaysBelieveInYou:: @ 819C3BD
     .string "I'll always believe in you,\n"
     .string "{PLAYER}.\p"
     .string "Please show the others what you're\n"
     .string "like when you battle seriously.$"
 
-gUnknown_819C420:: @ 819C420
+SaffronCity_PokemonTrainerFanClub_Text_WasYourFanNotAnymore:: @ 819C420
     .string "I'm sorry.\n"
     .string "I was your fan before.\p"
     .string "But now, you seem to have lost\n"
@@ -37,7 +37,7 @@ gUnknown_819C420:: @ 819C420
     .string "Lately, I think {STR_VAR_1} has been\n"
     .string "a lot cooler.$"
 
-gUnknown_819C4A5:: @ 819C4A5
+SaffronCity_PokemonTrainerFanClub_Text_EveryonesYourFanButICantBe:: @ 819C4A5
     .string "Oh!\n"
     .string "{PLAYER}!\p"
     .string "Everyone's been all excited about\n"
@@ -48,12 +48,12 @@ gUnknown_819C4A5:: @ 819C4A5
     .string "Once I became {STR_VAR_1}'s fan,\n"
     .string "I can't just stop being a fan.$"
 
-gUnknown_819C55C:: @ 819C55C
+SaffronCity_PokemonTrainerFanClub_Text_TrainersCoolWhenBattling:: @ 819C55C
     .string "I think TRAINERS are so cool when\n"
     .string "they're battling.\p"
     .string "Don't you think so, too?$"
 
-gUnknown_819C5A9:: @ 819C5A9
+SaffronCity_PokemonTrainerFanClub_Text_CanYouAutographShorts:: @ 819C5A9
     .string "Oh! It's {PLAYER}!\n"
     .string "Too cool!\p"
     .string "Oh!\n"
@@ -61,7 +61,7 @@ gUnknown_819C5A9:: @ 819C5A9
     .string "Can you autograph something?\n"
     .string "How about my shorts?$"
 
-gUnknown_819C600:: @ 819C600
+SaffronCity_PokemonTrainerFanClub_Text_CountingOnYou:: @ 819C600
     .string "However hot it's been…\p"
     .string "And however cold it may get…\p"
     .string "I've always believed in, and worn,\n"
@@ -71,7 +71,7 @@ gUnknown_819C600:: @ 819C600
     .string "I believe in you just as much as\n"
     .string "I believe in shorts!$"
 
-gUnknown_819C6BA:: @ 819C6BA
+SaffronCity_PokemonTrainerFanClub_Text_BrocksMyHero:: @ 819C6BA
     .string "BROCK's my hero!\n"
     .string "He's a man among men!\p"
     .string "Heheh, I got my mom to do\n"
@@ -79,7 +79,7 @@ gUnknown_819C6BA:: @ 819C6BA
     .string "I got her to embroider “BROCK”\n"
     .string "on my shorts!$"
 
-gUnknown_819C73A:: @ 819C73A
+SaffronCity_PokemonTrainerFanClub_Text_BrocksFanToBitterEnd:: @ 819C73A
     .string "…  …\p"
     .string "…  …\n"
     .string "I'm BROCK's fan!\p"
@@ -88,13 +88,13 @@ gUnknown_819C73A:: @ 819C73A
     .string "and on my shorts!\p"
     .string "I'll be his fan to the bitter end!$"
 
-gUnknown_819C7C8:: @ 819C7C8
+SaffronCity_PokemonTrainerFanClub_Text_BrocksLastWordOnCool:: @ 819C7C8
     .string "BROCK's the last word on cool,\n"
     .string "end of story!\p"
     .string "Now there's a guy who I want to\n"
     .string "be like!$"
 
-gUnknown_819C81E:: @ 819C81E
+SaffronCity_PokemonTrainerFanClub_Text_HadPleasureOfWatchingYouBattle:: @ 819C81E
     .string "{PLAYER}, I've had the pleasure of\n"
     .string "watching you battle.\p"
     .string "It brings back sweet memories of\n"
@@ -102,7 +102,7 @@ gUnknown_819C81E:: @ 819C81E
     .string "May you continue to find success.\n"
     .string "You have a fan in me!$"
 
-gUnknown_819C8C1:: @ 819C8C1
+SaffronCity_PokemonTrainerFanClub_Text_NeverSeenTrainerOfYourMagnificence:: @ 819C8C1
     .string "I have journeyed far and wide\n"
     .string "across the lands.\p"
     .string "But never have I seen a TRAINER\n"
@@ -112,13 +112,13 @@ gUnknown_819C8C1:: @ 819C8C1
     .string "Make that a promise to me,\n"
     .string "my young idol!$"
 
-gUnknown_819C986:: @ 819C986
+SaffronCity_PokemonTrainerFanClub_Text_HmmAndYouAre:: @ 819C986
     .string "Hmm…\n"
     .string "And you are?\p"
     .string "Were you hoping to sign up for\n"
     .string "a membership in our FAN CLUB?$"
 
-gUnknown_819C9D5:: @ 819C9D5
+SaffronCity_PokemonTrainerFanClub_Text_YouveStillAWaysToGo:: @ 819C9D5
     .string "Ah, so you are the much-\n"
     .string "talked-about {PLAYER}.\p"
     .string "You certainly do have the look of\n"
@@ -128,7 +128,7 @@ gUnknown_819C9D5:: @ 819C9D5
     .string "… …\p"
     .string "You've still a ways to go!$"
 
-gUnknown_819CA7C:: @ 819CA7C
+SaffronCity_PokemonTrainerFanClub_Text_YoullBeTalkedAboutIfYouKeepWinning:: @ 819CA7C
     .string "All of us gathered here are fans\n"
     .string "of POKéMON TRAINERS.\p"
     .string "The way they look in battle…\n"
@@ -136,12 +136,12 @@ gUnknown_819CA7C:: @ 819CA7C
     .string "Perhaps you will be talked about\n"
     .string "here, too, if you keep winning.$"
 
-gUnknown_819CB32:: @ 819CB32
+SaffronCity_PokemonTrainerFanClub_Text_WantToBeLikeYouOneDay:: @ 819CB32
     .string "It's {PLAYER}!\n"
     .string "It's {PLAYER}!\p"
     .string "I want to be like {PLAYER} one day!$"
 
-gUnknown_819CB62:: @ 819CB62
+SaffronCity_PokemonTrainerFanClub_Text_EveryoneButMeStoppedBeingYourFan:: @ 819CB62
     .string "Everyone stopped being {PLAYER}'s\n"
     .string "fan…\p"
     .string "But that means I can have {PLAYER}\n"
@@ -149,13 +149,13 @@ gUnknown_819CB62:: @ 819CB62
     .string "Yay! Go for it!\n"
     .string "My one and only {PLAYER}!$"
 
-gUnknown_819CBD3:: @ 819CBD3
+SaffronCity_PokemonTrainerFanClub_Text_WantToBeLikeSabrina:: @ 819CBD3
     .string "Do you know what?\n"
     .string "I want to be like SABRINA!\p"
     .string "I want to be a psychic girl just\n"
     .string "like her!$"
 
-gUnknown_819CC2B:: @ 819CC2B
+SaffronCity_PokemonTrainerFanClub_Text_WontStopBeingSabrinasFan:: @ 819CC2B
     .string "Even if I'm the only one, I won't\n"
     .string "stop being SABRINA's fan.\p"
     .string "My dream is to be like SABRINA,\n"
@@ -163,11 +163,11 @@ gUnknown_819CC2B:: @ 819CC2B
     .string "I want to be a psychic girl just\n"
     .string "like her!$"
 
-gUnknown_819CCC2:: @ 819CCC2
+SaffronCity_PokemonTrainerFanClub_Text_CanIBecomeCoolTrainerOneDay:: @ 819CCC2
     .string "I wonder if I can become a cool\n"
     .string "TRAINER one day?$"
 
-gUnknown_819CCF3:: @ 819CCF3
+SaffronCity_PokemonTrainerFanClub_Text_TheWayYouBattleIsCool:: @ 819CCF3
     .string "Oh, man, oh, man!\n"
     .string "Cool! Too cool!\p"
     .string "…Huh?\n"
@@ -175,7 +175,7 @@ gUnknown_819CCF3:: @ 819CCF3
     .string "Just the way you battle.\n"
     .string "That's cool.$"
 
-gUnknown_819CD4E:: @ 819CD4E
+SaffronCity_PokemonTrainerFanClub_Text_ImOnlyOneLeftOfYourFans:: @ 819CD4E
     .string "Yo, {PLAYER}!\p"
     .string "Looks like I'm the only one left\n"
     .string "out of your fans.\p"
@@ -183,13 +183,13 @@ gUnknown_819CD4E:: @ 819CD4E
     .string "fan… It's less stressful.\p"
     .string "Keep up and at it!$"
 
-gUnknown_819CDDA:: @ 819CDDA
+SaffronCity_PokemonTrainerFanClub_Text_LoveWayTrainerTalks:: @ 819CDDA
     .string "{STR_VAR_1}'s cool, huh?\n"
     .string "I love the way he talks.\p"
     .string "I'd really relish a chance to meet\n"
     .string "him in person once.$"
 
-gUnknown_819CE3A:: @ 819CE3A
+SaffronCity_PokemonTrainerFanClub_Text_ImLoneTrainerFan:: @ 819CE3A
     .string "Huh, can you believe it?\n"
     .string "Everyone turned into your fans.\p"
     .string "So after all we've been through,\n"
@@ -197,7 +197,7 @@ gUnknown_819CE3A:: @ 819CE3A
     .string "Eh, being the one and only\n"
     .string "{STR_VAR_1} fan's my style, anyway.$"
 
-gUnknown_819CEDF:: @ 819CEDF
+SaffronCity_PokemonTrainerFanClub_Text_AdoreWayYouBattle:: @ 819CEDF
     .string "Oh, my goodness!\n"
     .string "Is it really you, {PLAYER}?\p"
     .string "I have to tell you, I adore the\n"
@@ -205,7 +205,7 @@ gUnknown_819CEDF:: @ 819CEDF
     .string "I hope you'll keep at it.\n"
     .string "I'll be your number one fan!$"
 
-gUnknown_819CF6D:: @ 819CF6D
+SaffronCity_PokemonTrainerFanClub_Text_ImYourNumberOneFan:: @ 819CF6D
     .string "Oh, my goodness!\n"
     .string "If it isn't {PLAYER}!\p"
     .string "It's so disappointing… I realized\n"
@@ -214,13 +214,13 @@ gUnknown_819CF6D:: @ 819CF6D
     .string "Let me cheer you on, at least!\p"
     .string "Hurray, hurray, {PLAYER}!$"
 
-gUnknown_819D01F:: @ 819D01F
+SaffronCity_PokemonTrainerFanClub_Text_TrainerHasBeenOnFire:: @ 819D01F
     .string "Recently, {STR_VAR_1} has been on\n"
     .string "fire.\p"
     .string "The way he battles… It's just \n"
     .string "the way that I like it!$"
 
-gUnknown_819D075:: @ 819D075
+SaffronCity_PokemonTrainerFanClub_Text_EveryoneTalksAboutYou:: @ 819D075
     .string "Oh, hello!\n"
     .string "If it isn't {PLAYER}!\p"
     .string "Lately, all everyone talks about\n"
@@ -228,25 +228,25 @@ gUnknown_819D075:: @ 819D075
     .string "I'm feeling lonesome because I\n"
     .string "prefer {STR_VAR_1}.$"
 
-gUnknown_819D0E3:: @ 819D0E3
+SaffronCity_PokemonTrainerFanClub_Text_YouReallyAreAmazing:: @ 819D0E3
     .string "Amazing!\n"
     .string "{PLAYER}, you really are amazing!\p"
     .string "Instead of just watching, maybe\n"
     .string "I should become a TRAINER, too.$"
 
-gUnknown_819D148:: @ 819D148
+SaffronCity_PokemonTrainerFanClub_Text_ImYourOnlyFan:: @ 819D148
     .string "I'm your only fan…\n"
     .string "Sigh… This is lonely…\p"
     .string "Can't you try harder and make the\n"
     .string "others take notice of you?$"
 
-gUnknown_819D1AE:: @ 819D1AE
+SaffronCity_PokemonTrainerFanClub_Text_WhyCantOthersSeeMastersDignity:: @ 819D1AE
     .string "Master {STR_VAR_1} is so dignified…\n"
     .string "He is so my type.\p"
     .string "Why can't the others see the\n"
     .string "dignity he simply oozes?$"
 
-gUnknown_819D211:: @ 819D211
+SaffronCity_PokemonTrainerFanClub_Text_BelieveInMasterWithAllMyHeart:: @ 819D211
     .string "I believe in Master {STR_VAR_1}\n"
     .string "with all my heart.\p"
     .string "Even if I am the only one to\n"
@@ -255,14 +255,14 @@ gUnknown_819D211:: @ 819D211
     .string "Not if I keep thinking about Master\n"
     .string "{STR_VAR_1}.$"
 
-gUnknown_819D2B4:: @ 819D2B4
+SaffronCity_PokemonTrainerFanClub_Text_YourBattleStyleIsEducational:: @ 819D2B4
     .string "Hiyah!\p"
     .string "Your battling style is most\n"
     .string "educational.\p"
     .string "I hope that you will keep plugging\n"
     .string "away at success, hiyah!$"
 
-gUnknown_819D31F:: @ 819D31F
+SaffronCity_PokemonTrainerFanClub_Text_WontStopBeingYourFan:: @ 819D31F
     .string "Instead of just watching others\n"
     .string "battle, battle yourself!\p"
     .string "…My DOJO's MASTER chewed me out\n"
@@ -271,7 +271,7 @@ gUnknown_819D31F:: @ 819D31F
     .string "being your fan!\p"
     .string "I can't stop being your fan!$"
 
-gUnknown_819D3D2:: @ 819D3D2
+SaffronCity_PokemonTrainerFanClub_Text_OnlyMasterHasMyRespect:: @ 819D3D2
     .string "Hiyah! There is but one TRAINER\n"
     .string "who has my respect.\p"
     .string "And that is none other than my\n"
@@ -279,7 +279,7 @@ gUnknown_819D3D2:: @ 819D3D2
     .string "You should become a fan of my\n"
     .string "MASTER like me! Hiyah!$"
 
-gUnknown_819D477:: @ 819D477
+SaffronCity_PokemonTrainerFanClub_Text_NeverBeFanOfAnyoneButMaster:: @ 819D477
     .string "Hiyah! I respect my MASTER at the\n"
     .string "FIGHTING DOJO.\p"
     .string "I will never become a fan of\n"
diff --git a/data/maps/SevenIsland_House_Room1/scripts.inc b/data/maps/SevenIsland_House_Room1/scripts.inc
index 60183ed13..8875211f8 100644
--- a/data/maps/SevenIsland_House_Room1/scripts.inc
+++ b/data/maps/SevenIsland_House_Room1/scripts.inc
@@ -15,7 +15,7 @@ EventScript_1708AF:: @ 81708AF
 	setvar VAR_TEMP_1, 1
 	setobjectxyperm 1, 4, 2
 	setobjectmovementtype 1, 8
-	setmaplayoutindex LAYOUT_UNUSED_LAYOUT_8338B4C
+	setmaplayoutindex LAYOUT_SEVEN_ISLAND_HOUSE_ROOM1_DOOR_OPEN
 	return
 
 EventScript_1708C3:: @ 81708C3
diff --git a/data/maps/SevenIsland_SevaultCanyon/text.inc b/data/maps/SevenIsland_SevaultCanyon/text.inc
index 3d728797a..21c87dbc0 100644
--- a/data/maps/SevenIsland_SevaultCanyon/text.inc
+++ b/data/maps/SevenIsland_SevaultCanyon/text.inc
@@ -120,3 +120,11 @@ gUnknown_818CF2B:: @ 818CF2B
     .string "SEVAULT CANYON\n"
     .string "TANOBY RUINS AHEAD$"
 
+Text_18CF4D:: @ 818CF4D
+    .string "Training by oneself is certainly\n"
+    .string "not a bad thing.\p"
+    .string "But it's also not bad to aim for\n"
+    .string "the top with a partner.\p"
+    .string "Even BRUNO…\n"
+    .string "He trained with a fellow by the\l"
+    .string "name of BRAWLY before.$"
diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json
index b768509fb..6c16bf0c0 100644
--- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json
+++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/map.json
@@ -122,7 +122,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": 99,
-      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E39"
+      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch1"
     },
     {
       "type": "trigger",
@@ -131,7 +131,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_7",
       "var_value": 99,
-      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164F0B"
+      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch7"
     },
     {
       "type": "trigger",
@@ -140,7 +140,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_6",
       "var_value": 99,
-      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EE8"
+      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch6"
     },
     {
       "type": "trigger",
@@ -149,7 +149,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_5",
       "var_value": 99,
-      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EC5"
+      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch5"
     },
     {
       "type": "trigger",
@@ -158,7 +158,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_4",
       "var_value": 99,
-      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EA2"
+      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch4"
     },
     {
       "type": "trigger",
@@ -167,7 +167,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": 99,
-      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E7F"
+      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch3"
     },
     {
       "type": "trigger",
@@ -176,7 +176,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_2",
       "var_value": 99,
-      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E5C"
+      "script": "SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch2"
     }
   ],
   "bg_events": []
diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc
index 8758f8517..70ef487b8 100644
--- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc
+++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/scripts.inc
@@ -1,10 +1,12 @@
+.equ NUM_SWITCHES_PRESSED, VAR_TEMP_8
+
 SevenIsland_SevaultCanyon_TanobyKey_MapScripts:: @ 8164DCC
 	map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_SevaultCanyon_TanobyKey_OnTransition
 	.byte 0
 
 SevenIsland_SevaultCanyon_TanobyKey_OnTransition:: @ 8164DD2
 	setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_SEVAULT_CANYON_TANOBY_KEY
-	call_if_set FLAG_SYS_UNLOCKED_TANOBY_RUINS, EventScript_164E07
+	call_if_set FLAG_SYS_UNLOCKED_TANOBY_RUINS, SevenIsland_SevaultCanyon_TanobyKey_EventScript_MoveBouldersToSolvedPos
 	setvar VAR_TEMP_1, 0
 	setvar VAR_TEMP_2, 0
 	setvar VAR_TEMP_3, 0
@@ -12,10 +14,10 @@ SevenIsland_SevaultCanyon_TanobyKey_OnTransition:: @ 8164DD2
 	setvar VAR_TEMP_5, 0
 	setvar VAR_TEMP_6, 0
 	setvar VAR_TEMP_7, 0
-	setvar VAR_TEMP_8, 0
+	setvar NUM_SWITCHES_PRESSED, 0
 	end
 
-EventScript_164E07:: @ 8164E07
+SevenIsland_SevaultCanyon_TanobyKey_EventScript_MoveBouldersToSolvedPos:: @ 8164E07
 	setobjectxyperm 1, 7, 2
 	setobjectxyperm 2, 4, 4
 	setobjectxyperm 3, 10, 4
@@ -25,85 +27,85 @@ EventScript_164E07:: @ 8164E07
 	setobjectxyperm 7, 9, 8
 	return
 
-SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E39:: @ 8164E39
+SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch1:: @ 8164E39
 	lockall
 	compare VAR_TEMP_1, 100
-	goto_if_eq EventScript_164F8A
-	call EventScript_164F2E
+	goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed
+	call SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed
 	setvar VAR_TEMP_1, 100
-	compare VAR_TEMP_8, 7
-	goto_if_eq EventScript_164F8C
+	compare NUM_SWITCHES_PRESSED, 7
+	goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolved
 	releaseall
 	end
 
-SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E5C:: @ 8164E5C
+SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch2:: @ 8164E5C
 	lockall
 	compare VAR_TEMP_2, 100
-	goto_if_eq EventScript_164F8A
-	call EventScript_164F2E
+	goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed
+	call SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed
 	setvar VAR_TEMP_2, 100
-	compare VAR_TEMP_8, 7
-	goto_if_eq EventScript_164F8C
+	compare NUM_SWITCHES_PRESSED, 7
+	goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolved
 	releaseall
 	end
 
-SevenIsland_SevaultCanyon_TanobyKey_EventScript_164E7F:: @ 8164E7F
+SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch3:: @ 8164E7F
 	lockall
 	compare VAR_TEMP_3, 100
-	goto_if_eq EventScript_164F8A
-	call EventScript_164F2E
+	goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed
+	call SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed
 	setvar VAR_TEMP_3, 100
-	compare VAR_TEMP_8, 7
-	goto_if_eq EventScript_164F8C
+	compare NUM_SWITCHES_PRESSED, 7
+	goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolved
 	releaseall
 	end
 
-SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EA2:: @ 8164EA2
+SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch4:: @ 8164EA2
 	lockall
 	compare VAR_TEMP_4, 100
-	goto_if_eq EventScript_164F8A
-	call EventScript_164F2E
+	goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed
+	call SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed
 	setvar VAR_TEMP_4, 100
-	compare VAR_TEMP_8, 7
-	goto_if_eq EventScript_164F8C
+	compare NUM_SWITCHES_PRESSED, 7
+	goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolved
 	releaseall
 	end
 
-SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EC5:: @ 8164EC5
+SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch5:: @ 8164EC5
 	lockall
 	compare VAR_TEMP_5, 100
-	goto_if_eq EventScript_164F8A
-	call EventScript_164F2E
+	goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed
+	call SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed
 	setvar VAR_TEMP_5, 100
-	compare VAR_TEMP_8, 7
-	goto_if_eq EventScript_164F8C
+	compare NUM_SWITCHES_PRESSED, 7
+	goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolved
 	releaseall
 	end
 
-SevenIsland_SevaultCanyon_TanobyKey_EventScript_164EE8:: @ 8164EE8
+SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch6:: @ 8164EE8
 	lockall
 	compare VAR_TEMP_6, 100
-	goto_if_eq EventScript_164F8A
-	call EventScript_164F2E
+	goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed
+	call SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed
 	setvar VAR_TEMP_6, 100
-	compare VAR_TEMP_8, 7
-	goto_if_eq EventScript_164F8C
+	compare NUM_SWITCHES_PRESSED, 7
+	goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolved
 	releaseall
 	end
 
-SevenIsland_SevaultCanyon_TanobyKey_EventScript_164F0B:: @ 8164F0B
+SevenIsland_SevaultCanyon_TanobyKey_EventScript_Switch7:: @ 8164F0B
 	lockall
 	compare VAR_TEMP_7, 100
-	goto_if_eq EventScript_164F8A
-	call EventScript_164F2E
+	goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed
+	call SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed
 	setvar VAR_TEMP_7, 100
-	compare VAR_TEMP_8, 7
-	goto_if_eq EventScript_164F8C
+	compare NUM_SWITCHES_PRESSED, 7
+	goto_if_eq SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolved
 	releaseall
 	end
 
-EventScript_164F2E:: @ 8164F2E
-	addvar VAR_TEMP_8, 1
+SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchPressed:: @ 8164F2E
+	addvar NUM_SWITCHES_PRESSED, 1
 	playse SE_TRACK_MOVE
 	setvar VAR_0x8004, 1
 	setvar VAR_0x8005, 1
@@ -113,7 +115,7 @@ EventScript_164F2E:: @ 8164F2E
 	delay 60
 	return
 
-EventScript_164F51:: @ 8164F51
+SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolvedShakeScreen:: @ 8164F51
 	setvar VAR_0x8004, 2
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 10
@@ -130,13 +132,13 @@ EventScript_164F51:: @ 8164F51
 	waitse
 	return
 
-EventScript_164F8A:: @ 8164F8A
+SevenIsland_SevaultCanyon_TanobyKey_EventScript_SwitchAlreadyPressed:: @ 8164F8A
 	releaseall
 	end
 
-EventScript_164F8C:: @ 8164F8C
-	call EventScript_164F51
-	msgbox gUnknown_817D31B
+SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolved:: @ 8164F8C
+	call SevenIsland_SevaultCanyon_TanobyKey_EventScript_PuzzleSolvedShakeScreen
+	msgbox SevenIsland_SevaultCanyon_TanobyKey_Text_MysteriousRumbleFarAway
 	setflag FLAG_SYS_UNLOCKED_TANOBY_RUINS
 	releaseall
 	end
diff --git a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/text.inc b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/text.inc
index c6f137869..f86669ce4 100644
--- a/data/maps/SevenIsland_SevaultCanyon_TanobyKey/text.inc
+++ b/data/maps/SevenIsland_SevaultCanyon_TanobyKey/text.inc
@@ -1,4 +1,4 @@
-gUnknown_817D31B:: @ 817D31B
+SevenIsland_SevaultCanyon_TanobyKey_Text_MysteriousRumbleFarAway:: @ 817D31B
     .string "A mysterious rumble echoed\n"
     .string "somewhere far away.$"
 
diff --git a/data/maps/SevenIsland_TanobyRuins/map.json b/data/maps/SevenIsland_TanobyRuins/map.json
index 42c643af5..3f50db9fe 100644
--- a/data/maps/SevenIsland_TanobyRuins/map.json
+++ b/data/maps/SevenIsland_TanobyRuins/map.json
@@ -29,7 +29,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "SevenIsland_TanobyRuins_EventScript_1ACC4D",
+      "script": "SevenIsland_TanobyRuins_EventScript_Brandon",
       "flag": "0"
     },
     {
@@ -42,7 +42,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "SevenIsland_TanobyRuins_EventScript_1ACC8B",
+      "script": "SevenIsland_TanobyRuins_EventScript_Benjamin",
       "flag": "0"
     },
     {
@@ -55,7 +55,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "SevenIsland_TanobyRuins_EventScript_1ACCC9",
+      "script": "SevenIsland_TanobyRuins_EventScript_Edna",
       "flag": "0"
     },
     {
@@ -68,7 +68,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "SevenIsland_TanobyRuins_EventScript_1ACD07",
+      "script": "SevenIsland_TanobyRuins_EventScript_Clifford",
       "flag": "0"
     }
   ],
diff --git a/data/maps/SevenIsland_TanobyRuins/text.inc b/data/maps/SevenIsland_TanobyRuins/text.inc
new file mode 100644
index 000000000..a5453f527
--- /dev/null
+++ b/data/maps/SevenIsland_TanobyRuins/text.inc
@@ -0,0 +1,52 @@
+SevenIsland_TanobyRuins_Text_BrandonIntro:: @ 818CFFB
+    .string "Do you know anything about this\n"
+    .string "stone chamber?$"
+
+SevenIsland_TanobyRuins_Text_BrandonDefeat:: @ 818D02A
+    .string "That was uncalled for.\n"
+    .string "You didn't have to be so rough.$"
+
+SevenIsland_TanobyRuins_Text_BrandonPostBattle:: @ 818D061
+    .string "The TANOBY RUINS date back at\n"
+    .string "least 1,500 years.\p"
+    .string "But it's a baffling mystery as to\n"
+    .string "why it was built in the first place.$"
+
+SevenIsland_TanobyRuins_Text_BenjaminIntro:: @ 818D0D9
+    .string "A mystic POKéMON is said to sleep\n"
+    .string "inside here.$"
+
+SevenIsland_TanobyRuins_Text_BenjaminDefeat:: @ 818D108
+    .string "I'm not much good in battle.$"
+
+SevenIsland_TanobyRuins_Text_BenjaminPostBattle:: @ 818D125
+    .string "I hear there are other ruins like\n"
+    .string "the one here.\p"
+    .string "Might they be the resting places\n"
+    .string "of other mystic POKéMON?$"
+
+SevenIsland_TanobyRuins_Text_EdnaIntro:: @ 818D18F
+    .string "CLIFFORD is teaching me how to\n"
+    .string "paint.$"
+
+SevenIsland_TanobyRuins_Text_EdnaDefeat:: @ 818D1B5
+    .string "We might get in trouble for being\n"
+    .string "noisy here.$"
+
+SevenIsland_TanobyRuins_Text_EdnaPostBattle:: @ 818D1E3
+    .string "I said that I wanted to paint an\n"
+    .string "old building.\p"
+    .string "So CLIFFORD brought me here.$"
+
+SevenIsland_TanobyRuins_Text_CliffordIntro:: @ 818D22F
+    .string "Today, in addition to our lesson,\n"
+    .string "we came to see the chamber.$"
+
+SevenIsland_TanobyRuins_Text_CliffordDefeat:: @ 818D26D
+    .string "My, how extraordinary.$"
+
+SevenIsland_TanobyRuins_Text_CliffordPostBattle:: @ 818D284
+    .string "Ah, so you are studying POKéMON\n"
+    .string "on your own…\p"
+    .string "Yes, you certainly are quite the\n"
+    .string "extraordinary person, indeed.$"
diff --git a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/scripts.inc
index 847ae472a..0646e661d 100644
--- a/data/maps/SevenIsland_TanobyRuins_DilfordChamber/scripts.inc
+++ b/data/maps/SevenIsland_TanobyRuins_DilfordChamber/scripts.inc
@@ -3,5 +3,5 @@ SevenIsland_TanobyRuins_DilfordChamber_MapScripts:: @ 8164CF6
 	.byte 0
 
 SevenIsland_TanobyRuins_DilfordChamber_OnTransition:: @ 8164CFC
-	call EventScript_1A925E
+	call EventScript_TryDarkenRuins
 	end
diff --git a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/scripts.inc
index b982b77dd..8a606a2c3 100644
--- a/data/maps/SevenIsland_TanobyRuins_LiptooChamber/scripts.inc
+++ b/data/maps/SevenIsland_TanobyRuins_LiptooChamber/scripts.inc
@@ -3,5 +3,5 @@ SevenIsland_TanobyRuins_LiptooChamber_MapScripts:: @ 8164CDE
 	.byte 0
 
 SevenIsland_TanobyRuins_LiptooChamber_OnTransition:: @ 8164CE4
-	call EventScript_1A925E
+	call EventScript_TryDarkenRuins
 	end
diff --git a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/scripts.inc
index d467f79ef..819b2bbc1 100644
--- a/data/maps/SevenIsland_TanobyRuins_MoneanChamber/scripts.inc
+++ b/data/maps/SevenIsland_TanobyRuins_MoneanChamber/scripts.inc
@@ -4,5 +4,5 @@ SevenIsland_TanobyRuins_MoneanChamber_MapScripts:: @ 8164CCF
 
 SevenIsland_TanobyRuins_MoneanChamber_OnTransition:: @ 8164CD5
 	setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_TANOBY_RUINS_MONEAN_CHAMBER
-	call EventScript_1A925E
+	call EventScript_TryDarkenRuins
 	end
diff --git a/data/maps/SevenIsland_TanobyRuins_RixyChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_RixyChamber/scripts.inc
index 2f3d604c3..e29694d8f 100644
--- a/data/maps/SevenIsland_TanobyRuins_RixyChamber/scripts.inc
+++ b/data/maps/SevenIsland_TanobyRuins_RixyChamber/scripts.inc
@@ -3,5 +3,5 @@ SevenIsland_TanobyRuins_RixyChamber_MapScripts:: @ 8164D0E
 	.byte 0
 
 SevenIsland_TanobyRuins_RixyChamber_OnTransition:: @ 8164D14
-	call EventScript_1A925E
+	call EventScript_TryDarkenRuins
 	end
diff --git a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/scripts.inc
index dd1a73f83..4917ecdf8 100644
--- a/data/maps/SevenIsland_TanobyRuins_ScufibChamber/scripts.inc
+++ b/data/maps/SevenIsland_TanobyRuins_ScufibChamber/scripts.inc
@@ -3,5 +3,5 @@ SevenIsland_TanobyRuins_ScufibChamber_MapScripts:: @ 8164D02
 	.byte 0
 
 SevenIsland_TanobyRuins_ScufibChamber_OnTransition:: @ 8164D08
-	call EventScript_1A925E
+	call EventScript_TryDarkenRuins
 	end
diff --git a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/scripts.inc
index 131a6ecca..f1a13adcb 100644
--- a/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/scripts.inc
+++ b/data/maps/SevenIsland_TanobyRuins_ViapoisChamber/scripts.inc
@@ -3,5 +3,5 @@ SevenIsland_TanobyRuins_ViapoisChamber_MapScripts:: @ 8164D1A
 	.byte 0
 
 SevenIsland_TanobyRuins_ViapoisChamber_OnTransition:: @ 8164D20
-	call EventScript_1A925E
+	call EventScript_TryDarkenRuins
 	end
diff --git a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/scripts.inc b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/scripts.inc
index ff6c851ee..3a7720b4c 100644
--- a/data/maps/SevenIsland_TanobyRuins_WeepthChamber/scripts.inc
+++ b/data/maps/SevenIsland_TanobyRuins_WeepthChamber/scripts.inc
@@ -3,5 +3,5 @@ SevenIsland_TanobyRuins_WeepthChamber_MapScripts:: @ 8164CEA
 	.byte 0
 
 SevenIsland_TanobyRuins_WeepthChamber_OnTransition:: @ 8164CF0
-	call EventScript_1A925E
+	call EventScript_TryDarkenRuins
 	end
diff --git a/data/maps/SevenIsland_TrainerTower/map.json b/data/maps/SevenIsland_TrainerTower/map.json
index 47fb5fa98..31a250297 100644
--- a/data/maps/SevenIsland_TrainerTower/map.json
+++ b/data/maps/SevenIsland_TrainerTower/map.json
@@ -51,7 +51,7 @@
       "x": 58,
       "y": 7,
       "elevation": 3,
-      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY",
+      "dest_map": "MAP_TRAINER_TOWER_LOBBY",
       "dest_warp_id": 1
     }
   ],
diff --git a/data/maps/SevenIsland_TrainerTower_1F/scripts.inc b/data/maps/SevenIsland_TrainerTower_1F/scripts.inc
deleted file mode 100644
index 4987c1142..000000000
--- a/data/maps/SevenIsland_TrainerTower_1F/scripts.inc
+++ /dev/null
@@ -1,60 +0,0 @@
-SevenIsland_TrainerTower_1F_MapScripts:: @ 81646B8
-	map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_1F_MapScript1_1C4F54
-	map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_1F_MapScript2_1C4F62
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_1F_MapScript3_1C5046
-	.byte 0
-
-SevenIsland_TrainerTower_2F_EventScript_1646C8:: @ 81646C8
-SevenIsland_TrainerTower_4F_EventScript_1646C8:: @ 81646C8
-SevenIsland_TrainerTower_6F_EventScript_1646C8:: @ 81646C8
-SevenIsland_TrainerTower_8F_EventScript_1646C8:: @ 81646C8
-SevenIsland_TrainerTower_5F_EventScript_1646C8:: @ 81646C8
-SevenIsland_TrainerTower_7F_EventScript_1646C8:: @ 81646C8
-SevenIsland_TrainerTower_3F_EventScript_1646C8:: @ 81646C8
-SevenIsland_TrainerTower_1F_EventScript_1646C8:: @ 81646C8
-	call EventScript_1C52F4
-	end
-
-SevenIsland_TrainerTower_2F_EventScript_1646CE:: @ 81646CE
-SevenIsland_TrainerTower_4F_EventScript_1646CE:: @ 81646CE
-SevenIsland_TrainerTower_6F_EventScript_1646CE:: @ 81646CE
-SevenIsland_TrainerTower_8F_EventScript_1646CE:: @ 81646CE
-SevenIsland_TrainerTower_5F_EventScript_1646CE:: @ 81646CE
-SevenIsland_TrainerTower_7F_EventScript_1646CE:: @ 81646CE
-SevenIsland_TrainerTower_3F_EventScript_1646CE:: @ 81646CE
-SevenIsland_TrainerTower_1F_EventScript_1646CE:: @ 81646CE
-	call EventScript_1C533B
-	end
-
-SevenIsland_TrainerTower_2F_EventScript_1646D4:: @ 81646D4
-SevenIsland_TrainerTower_4F_EventScript_1646D4:: @ 81646D4
-SevenIsland_TrainerTower_6F_EventScript_1646D4:: @ 81646D4
-SevenIsland_TrainerTower_8F_EventScript_1646D4:: @ 81646D4
-SevenIsland_TrainerTower_5F_EventScript_1646D4:: @ 81646D4
-SevenIsland_TrainerTower_7F_EventScript_1646D4:: @ 81646D4
-SevenIsland_TrainerTower_3F_EventScript_1646D4:: @ 81646D4
-SevenIsland_TrainerTower_1F_EventScript_1646D4:: @ 81646D4
-	call EventScript_1C5382
-	end
-
-SevenIsland_TrainerTower_2F_EventScript_1646DA:: @ 81646DA
-SevenIsland_TrainerTower_4F_EventScript_1646DA:: @ 81646DA
-SevenIsland_TrainerTower_6F_EventScript_1646DA:: @ 81646DA
-SevenIsland_TrainerTower_8F_EventScript_1646DA:: @ 81646DA
-SevenIsland_TrainerTower_5F_EventScript_1646DA:: @ 81646DA
-SevenIsland_TrainerTower_7F_EventScript_1646DA:: @ 81646DA
-SevenIsland_TrainerTower_3F_EventScript_1646DA:: @ 81646DA
-SevenIsland_TrainerTower_1F_EventScript_1646DA:: @ 81646DA
-	call EventScript_1C538C
-	end
-
-SevenIsland_TrainerTower_2F_EventScript_1646E0:: @ 81646E0
-SevenIsland_TrainerTower_4F_EventScript_1646E0:: @ 81646E0
-SevenIsland_TrainerTower_6F_EventScript_1646E0:: @ 81646E0
-SevenIsland_TrainerTower_8F_EventScript_1646E0:: @ 81646E0
-SevenIsland_TrainerTower_7F_EventScript_1646E0:: @ 81646E0
-SevenIsland_TrainerTower_Roof_EventScript_1646E0:: @ 81646E0
-SevenIsland_TrainerTower_5F_EventScript_1646E0:: @ 81646E0
-SevenIsland_TrainerTower_3F_EventScript_1646E0:: @ 81646E0
-	call EventScript_1C53AA
-	end
diff --git a/data/maps/SevenIsland_TrainerTower_2F/scripts.inc b/data/maps/SevenIsland_TrainerTower_2F/scripts.inc
deleted file mode 100644
index 9e61d0dfd..000000000
--- a/data/maps/SevenIsland_TrainerTower_2F/scripts.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-SevenIsland_TrainerTower_2F_MapScripts:: @ 81646E6
-	map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_2F_MapScript1_1C4F54
-	map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_2F_MapScript2_1C4F62
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_2F_MapScript3_1C5046
-	.byte 0
-
-SevenIsland_TrainerTower_2F_EventScript_1646F6:: @ 81646F6
-	call EventScript_1C52F4
-	end
-
-EventScript_1646FC:: @ 81646FC
-	call EventScript_1C533B
-	end
-
-EventScript_164702:: @ 8164702
-	call EventScript_1C5382
-	end
-
-EventScript_164708:: @ 8164708
-	call EventScript_1C538C
-	end
-
-EventScript_16470E:: @ 816470E
-	call EventScript_1C53AA
-	end
diff --git a/data/maps/SevenIsland_TrainerTower_3F/scripts.inc b/data/maps/SevenIsland_TrainerTower_3F/scripts.inc
deleted file mode 100644
index e9afcff6c..000000000
--- a/data/maps/SevenIsland_TrainerTower_3F/scripts.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-SevenIsland_TrainerTower_3F_MapScripts:: @ 8164714
-	map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_3F_MapScript1_1C4F54
-	map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_3F_MapScript2_1C4F62
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_3F_MapScript3_1C5046
-	.byte 0
-
-SevenIsland_TrainerTower_3F_EventScript_164724:: @ 8164724
-	call EventScript_1C52F4
-	end
-
-EventScript_16472A:: @ 816472A
-	call EventScript_1C533B
-	end
-
-EventScript_164730:: @ 8164730
-	call EventScript_1C5382
-	end
-
-EventScript_164736:: @ 8164736
-	call EventScript_1C538C
-	end
-
-EventScript_16473C:: @ 816473C
-	call EventScript_1C53AA
-	end
diff --git a/data/maps/SevenIsland_TrainerTower_4F/scripts.inc b/data/maps/SevenIsland_TrainerTower_4F/scripts.inc
deleted file mode 100644
index cfa0be11b..000000000
--- a/data/maps/SevenIsland_TrainerTower_4F/scripts.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-SevenIsland_TrainerTower_4F_MapScripts:: @ 8164742
-	map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_4F_MapScript1_1C4F54
-	map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_4F_MapScript2_1C4F62
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_4F_MapScript3_1C5046
-	.byte 0
-
-SevenIsland_TrainerTower_4F_EventScript_164752:: @ 8164752
-	call EventScript_1C52F4
-	end
-
-EventScript_164758:: @ 8164758
-	call EventScript_1C533B
-	end
-
-EventScript_16475E:: @ 816475E
-	call EventScript_1C5382
-	end
-
-EventScript_164764:: @ 8164764
-	call EventScript_1C538C
-	end
-
-EventScript_16476A:: @ 816476A
-	call EventScript_1C53AA
-	end
diff --git a/data/maps/SevenIsland_TrainerTower_5F/scripts.inc b/data/maps/SevenIsland_TrainerTower_5F/scripts.inc
deleted file mode 100644
index 35ccdf129..000000000
--- a/data/maps/SevenIsland_TrainerTower_5F/scripts.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-SevenIsland_TrainerTower_5F_MapScripts:: @ 8164770
-	map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_5F_MapScript1_1C4F54
-	map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_5F_MapScript2_1C4F62
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_5F_MapScript3_1C5046
-	.byte 0
-
-SevenIsland_TrainerTower_5F_EventScript_164780:: @ 8164780
-	call EventScript_1C52F4
-	end
-
-EventScript_164786:: @ 8164786
-	call EventScript_1C533B
-	end
-
-EventScript_16478C:: @ 816478C
-	call EventScript_1C5382
-	end
-
-EventScript_164792:: @ 8164792
-	call EventScript_1C538C
-	end
-
-EventScript_164798:: @ 8164798
-	call EventScript_1C53AA
-	end
diff --git a/data/maps/SevenIsland_TrainerTower_6F/map.json b/data/maps/SevenIsland_TrainerTower_6F/map.json
deleted file mode 100644
index abaab80d6..000000000
--- a/data/maps/SevenIsland_TrainerTower_6F/map.json
+++ /dev/null
@@ -1,135 +0,0 @@
-{
-  "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_6F",
-  "name": "SevenIsland_TrainerTower_6F",
-  "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_6F",
-  "music": "MUS_T_TOWER",
-  "region_map_section": "MAPSEC_TRAINER_TOWER_2",
-  "requires_flash": false,
-  "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
-  "unknown_18": 0,
-  "unknown_19": 2,
-  "elevator_flag": 0,
-  "battle_scene": "BATTLE_SCENE_0",
-  "connections": null,
-  "object_events": [
-    {
-      "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE",
-      "x": 9,
-      "y": 7,
-      "elevation": 3,
-      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
-      "movement_range_x": 1,
-      "movement_range_y": 1,
-      "trainer_type": 0,
-      "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_6F_EventScript_1646E0",
-      "flag": "FLAG_TEMP_6"
-    },
-    {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_0",
-      "x": 10,
-      "y": 10,
-      "elevation": 3,
-      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
-      "movement_range_x": 1,
-      "movement_range_y": 1,
-      "trainer_type": 0,
-      "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_6F_EventScript_1646C8",
-      "flag": "FLAG_TEMP_2"
-    },
-    {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_1",
-      "x": 15,
-      "y": 13,
-      "elevation": 3,
-      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
-      "movement_range_x": 1,
-      "movement_range_y": 1,
-      "trainer_type": 0,
-      "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_6F_EventScript_1646CE",
-      "flag": "FLAG_TEMP_3"
-    },
-    {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_2",
-      "x": 10,
-      "y": 16,
-      "elevation": 3,
-      "movement_type": "MOVEMENT_TYPE_FACE_UP",
-      "movement_range_x": 1,
-      "movement_range_y": 1,
-      "trainer_type": 0,
-      "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_6F_EventScript_1646D4",
-      "flag": "FLAG_TEMP_4"
-    },
-    {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_3",
-      "x": 11,
-      "y": 10,
-      "elevation": 3,
-      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
-      "movement_range_x": 1,
-      "movement_range_y": 1,
-      "trainer_type": 0,
-      "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_6F_EventScript_1646DA",
-      "flag": "FLAG_TEMP_5"
-    }
-  ],
-  "warp_events": [
-    {
-      "x": 15,
-      "y": 6,
-      "elevation": 3,
-      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_7F",
-      "dest_warp_id": 1
-    },
-    {
-      "x": 4,
-      "y": 6,
-      "elevation": 3,
-      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_5F",
-      "dest_warp_id": 0
-    },
-    {
-      "x": 13,
-      "y": 5,
-      "elevation": 0,
-      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR",
-      "dest_warp_id": 0
-    }
-  ],
-  "coord_events": [
-    {
-      "type": "trigger",
-      "x": 10,
-      "y": 13,
-      "elevation": 3,
-      "var": "VAR_TEMP_E",
-      "var_value": 0,
-      "script": "SevenIsland_TrainerTower_6F_EventScript_1C54AF"
-    },
-    {
-      "type": "trigger",
-      "x": 9,
-      "y": 12,
-      "elevation": 3,
-      "var": "VAR_TEMP_F",
-      "var_value": 0,
-      "script": "SevenIsland_TrainerTower_6F_EventScript_1C54B4"
-    },
-    {
-      "type": "trigger",
-      "x": 9,
-      "y": 13,
-      "elevation": 3,
-      "var": "VAR_TEMP_F",
-      "var_value": 0,
-      "script": "SevenIsland_TrainerTower_6F_EventScript_1C54EA"
-    }
-  ],
-  "bg_events": []
-}
diff --git a/data/maps/SevenIsland_TrainerTower_6F/scripts.inc b/data/maps/SevenIsland_TrainerTower_6F/scripts.inc
deleted file mode 100644
index 361c92749..000000000
--- a/data/maps/SevenIsland_TrainerTower_6F/scripts.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-SevenIsland_TrainerTower_6F_MapScripts:: @ 816479E
-	map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_6F_MapScript1_1C4F54
-	map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_6F_MapScript2_1C4F62
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_6F_MapScript3_1C5046
-	.byte 0
-
-SevenIsland_TrainerTower_6F_EventScript_1647AE:: @ 81647AE
-	call EventScript_1C52F4
-	end
-
-EventScript_1647B4:: @ 81647B4
-	call EventScript_1C533B
-	end
-
-EventScript_1647BA:: @ 81647BA
-	call EventScript_1C5382
-	end
-
-EventScript_1647C0:: @ 81647C0
-	call EventScript_1C538C
-	end
-
-EventScript_1647C6:: @ 81647C6
-	call EventScript_1C53AA
-	end
diff --git a/data/maps/SevenIsland_TrainerTower_7F/map.json b/data/maps/SevenIsland_TrainerTower_7F/map.json
deleted file mode 100644
index 827c6c9ca..000000000
--- a/data/maps/SevenIsland_TrainerTower_7F/map.json
+++ /dev/null
@@ -1,135 +0,0 @@
-{
-  "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_7F",
-  "name": "SevenIsland_TrainerTower_7F",
-  "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_7F",
-  "music": "MUS_T_TOWER",
-  "region_map_section": "MAPSEC_TRAINER_TOWER_2",
-  "requires_flash": false,
-  "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
-  "unknown_18": 0,
-  "unknown_19": 2,
-  "elevator_flag": 0,
-  "battle_scene": "BATTLE_SCENE_0",
-  "connections": null,
-  "object_events": [
-    {
-      "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE",
-      "x": 9,
-      "y": 7,
-      "elevation": 3,
-      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
-      "movement_range_x": 1,
-      "movement_range_y": 1,
-      "trainer_type": 0,
-      "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_7F_EventScript_1646E0",
-      "flag": "FLAG_TEMP_6"
-    },
-    {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_0",
-      "x": 10,
-      "y": 10,
-      "elevation": 3,
-      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
-      "movement_range_x": 1,
-      "movement_range_y": 1,
-      "trainer_type": 0,
-      "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_7F_EventScript_1646C8",
-      "flag": "FLAG_TEMP_2"
-    },
-    {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_1",
-      "x": 15,
-      "y": 13,
-      "elevation": 3,
-      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
-      "movement_range_x": 1,
-      "movement_range_y": 1,
-      "trainer_type": 0,
-      "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_7F_EventScript_1646CE",
-      "flag": "FLAG_TEMP_3"
-    },
-    {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_2",
-      "x": 10,
-      "y": 16,
-      "elevation": 3,
-      "movement_type": "MOVEMENT_TYPE_FACE_UP",
-      "movement_range_x": 1,
-      "movement_range_y": 1,
-      "trainer_type": 0,
-      "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_7F_EventScript_1646D4",
-      "flag": "FLAG_TEMP_4"
-    },
-    {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_3",
-      "x": 11,
-      "y": 10,
-      "elevation": 3,
-      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
-      "movement_range_x": 1,
-      "movement_range_y": 1,
-      "trainer_type": 0,
-      "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_7F_EventScript_1646DA",
-      "flag": "FLAG_TEMP_5"
-    }
-  ],
-  "warp_events": [
-    {
-      "x": 15,
-      "y": 6,
-      "elevation": 3,
-      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_8F",
-      "dest_warp_id": 1
-    },
-    {
-      "x": 4,
-      "y": 6,
-      "elevation": 3,
-      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_6F",
-      "dest_warp_id": 0
-    },
-    {
-      "x": 13,
-      "y": 5,
-      "elevation": 0,
-      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR",
-      "dest_warp_id": 0
-    }
-  ],
-  "coord_events": [
-    {
-      "type": "trigger",
-      "x": 10,
-      "y": 13,
-      "elevation": 3,
-      "var": "VAR_TEMP_E",
-      "var_value": 0,
-      "script": "SevenIsland_TrainerTower_7F_EventScript_1C54AF"
-    },
-    {
-      "type": "trigger",
-      "x": 9,
-      "y": 12,
-      "elevation": 3,
-      "var": "VAR_TEMP_F",
-      "var_value": 0,
-      "script": "SevenIsland_TrainerTower_7F_EventScript_1C54B4"
-    },
-    {
-      "type": "trigger",
-      "x": 9,
-      "y": 13,
-      "elevation": 3,
-      "var": "VAR_TEMP_F",
-      "var_value": 0,
-      "script": "SevenIsland_TrainerTower_7F_EventScript_1C54EA"
-    }
-  ],
-  "bg_events": []
-}
diff --git a/data/maps/SevenIsland_TrainerTower_7F/scripts.inc b/data/maps/SevenIsland_TrainerTower_7F/scripts.inc
deleted file mode 100644
index be0036605..000000000
--- a/data/maps/SevenIsland_TrainerTower_7F/scripts.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-SevenIsland_TrainerTower_7F_MapScripts:: @ 81647CC
-	map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_7F_MapScript1_1C4F54
-	map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_7F_MapScript2_1C4F62
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_7F_MapScript3_1C5046
-	.byte 0
-
-SevenIsland_TrainerTower_7F_EventScript_1647DC:: @ 81647DC
-	call EventScript_1C52F4
-	end
-
-EventScript_1647E2:: @ 81647E2
-	call EventScript_1C533B
-	end
-
-EventScript_1647E8:: @ 81647E8
-	call EventScript_1C5382
-	end
-
-EventScript_1647EE:: @ 81647EE
-	call EventScript_1C538C
-	end
-
-EventScript_1647F4:: @ 81647F4
-	call EventScript_1C53AA
-	end
diff --git a/data/maps/SevenIsland_TrainerTower_8F/map.json b/data/maps/SevenIsland_TrainerTower_8F/map.json
deleted file mode 100644
index ed9ba908f..000000000
--- a/data/maps/SevenIsland_TrainerTower_8F/map.json
+++ /dev/null
@@ -1,135 +0,0 @@
-{
-  "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_8F",
-  "name": "SevenIsland_TrainerTower_8F",
-  "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_8F",
-  "music": "MUS_T_TOWER",
-  "region_map_section": "MAPSEC_TRAINER_TOWER_2",
-  "requires_flash": false,
-  "weather": "WEATHER_NONE",
-  "map_type": "MAP_TYPE_8",
-  "unknown_18": 0,
-  "unknown_19": 2,
-  "elevator_flag": 0,
-  "battle_scene": "BATTLE_SCENE_0",
-  "connections": null,
-  "object_events": [
-    {
-      "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE",
-      "x": 9,
-      "y": 7,
-      "elevation": 3,
-      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
-      "movement_range_x": 1,
-      "movement_range_y": 1,
-      "trainer_type": 0,
-      "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_8F_EventScript_1646E0",
-      "flag": "FLAG_TEMP_6"
-    },
-    {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_0",
-      "x": 10,
-      "y": 10,
-      "elevation": 3,
-      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
-      "movement_range_x": 1,
-      "movement_range_y": 1,
-      "trainer_type": 0,
-      "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_8F_EventScript_1646C8",
-      "flag": "FLAG_TEMP_2"
-    },
-    {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_1",
-      "x": 15,
-      "y": 13,
-      "elevation": 3,
-      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
-      "movement_range_x": 1,
-      "movement_range_y": 1,
-      "trainer_type": 0,
-      "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_8F_EventScript_1646CE",
-      "flag": "FLAG_TEMP_3"
-    },
-    {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_2",
-      "x": 10,
-      "y": 16,
-      "elevation": 3,
-      "movement_type": "MOVEMENT_TYPE_FACE_UP",
-      "movement_range_x": 1,
-      "movement_range_y": 1,
-      "trainer_type": 0,
-      "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_8F_EventScript_1646D4",
-      "flag": "FLAG_TEMP_4"
-    },
-    {
-      "graphics_id": "OBJECT_EVENT_GFX_VAR_3",
-      "x": 11,
-      "y": 10,
-      "elevation": 3,
-      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
-      "movement_range_x": 1,
-      "movement_range_y": 1,
-      "trainer_type": 0,
-      "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_8F_EventScript_1646DA",
-      "flag": "FLAG_TEMP_5"
-    }
-  ],
-  "warp_events": [
-    {
-      "x": 15,
-      "y": 6,
-      "elevation": 3,
-      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ROOF",
-      "dest_warp_id": 1
-    },
-    {
-      "x": 4,
-      "y": 6,
-      "elevation": 3,
-      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_7F",
-      "dest_warp_id": 0
-    },
-    {
-      "x": 13,
-      "y": 5,
-      "elevation": 0,
-      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR",
-      "dest_warp_id": 0
-    }
-  ],
-  "coord_events": [
-    {
-      "type": "trigger",
-      "x": 10,
-      "y": 13,
-      "elevation": 3,
-      "var": "VAR_TEMP_E",
-      "var_value": 0,
-      "script": "SevenIsland_TrainerTower_8F_EventScript_1C54AF"
-    },
-    {
-      "type": "trigger",
-      "x": 9,
-      "y": 12,
-      "elevation": 3,
-      "var": "VAR_TEMP_F",
-      "var_value": 0,
-      "script": "SevenIsland_TrainerTower_8F_EventScript_1C54B4"
-    },
-    {
-      "type": "trigger",
-      "x": 9,
-      "y": 13,
-      "elevation": 3,
-      "var": "VAR_TEMP_F",
-      "var_value": 0,
-      "script": "SevenIsland_TrainerTower_8F_EventScript_1C54EA"
-    }
-  ],
-  "bg_events": []
-}
diff --git a/data/maps/SevenIsland_TrainerTower_8F/scripts.inc b/data/maps/SevenIsland_TrainerTower_8F/scripts.inc
deleted file mode 100644
index b51982f48..000000000
--- a/data/maps/SevenIsland_TrainerTower_8F/scripts.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-SevenIsland_TrainerTower_8F_MapScripts:: @ 81647FA
-	map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_8F_MapScript1_1C4F54
-	map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_8F_MapScript2_1C4F62
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_8F_MapScript3_1C5046
-	.byte 0
-
-SevenIsland_TrainerTower_8F_EventScript_16480A:: @ 816480A
-	call EventScript_1C52F4
-	end
-
-EventScript_164810:: @ 8164810
-	call EventScript_1C533B
-	end
-
-EventScript_164816:: @ 8164816
-	call EventScript_1C5382
-	end
-
-EventScript_16481C:: @ 816481C
-	call EventScript_1C538C
-	end
-
-EventScript_164822:: @ 8164822
-	call EventScript_1C53AA
-	end
diff --git a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc b/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc
deleted file mode 100644
index f84c67295..000000000
--- a/data/maps/SevenIsland_TrainerTower_Elevator/scripts.inc
+++ /dev/null
@@ -1,80 +0,0 @@
-SevenIsland_TrainerTower_Elevator_MapScripts:: @ 8164AF8
-	map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_Elevator_MapScript1_1C4F54
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_Elevator_MapScript2_1C5046
-	.byte 0
-
-SevenIsland_TrainerTower_Elevator_EventScript_164B03:: @ 8164B03
-	lockall
-	setvar VAR_0x8004, 6
-	call_if_unset FLAG_TEMP_2, EventScript_1A7AB9
-	copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR
-	special Special_DrawElevatorCurrentFloorWindow
-	message Text_WantWhichFloor
-	waitmessage
-	setvar VAR_0x8004, 6
-	specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos
-	switch VAR_RESULT
-	case 0, EventScript_164B46
-	case 1, EventScript_164B52
-	end
-
-EventScript_164B46:: @ 8164B46
-	multichoicedefault 0, 0, MULTICHOICE_ROOFTOP_B1F, 0, FALSE
-	goto EventScript_164B5E
-	end
-
-EventScript_164B52:: @ 8164B52
-	multichoicedefault 0, 0, MULTICHOICE_ROOFTOP_B1F, 1, FALSE
-	goto EventScript_164B5E
-	end
-
-EventScript_164B5E:: @ 8164B5E
-	switch VAR_RESULT
-	case 0, EventScript_164BCD
-	case 1, EventScript_164B90
-	case 2, EventScript_164BD3
-	case 127, EventScript_164BD3
-	end
-
-EventScript_164B90:: @ 8164B90
-	setvar VAR_0x8006, 3
-	setdynamicwarp MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY, 255, 17, 8
-	compare VAR_ELEVATOR_FLOOR, 3
-	goto_if_eq EventScript_164BD3
-	call EventScript_164BD8
-	setvar VAR_ELEVATOR_FLOOR, 3
-	special Special_CloseElevatorCurrentFloorWindow
-	delay 25
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_164BE5
-	waitmovement 0
-	warp MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY, 255, 17, 8
-	waitstate
-	releaseall
-	end
-
-EventScript_164BCD:: @ 8164BCD
-	goto EventScript_164BD3
-	end
-
-EventScript_164BD3:: @ 8164BD3
-	special Special_CloseElevatorCurrentFloorWindow
-	releaseall
-	end
-
-EventScript_164BD8:: @ 8164BD8
-	special Special_CloseElevatorCurrentFloorWindow
-	closemessage
-	waitse
-	special Special_AnimateElevator
-	waitstate
-	setflag FLAG_TEMP_2
-	return
-
-Movement_164BE5:: @ 8164BE5
-	walk_in_place_fastest_down
-	delay_16
-	walk_down
-	walk_right
-	walk_right
-	walk_down
-	step_end
diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc
deleted file mode 100644
index 0558b5a8b..000000000
--- a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc
+++ /dev/null
@@ -1,235 +0,0 @@
-SevenIsland_TrainerTower_Lobby_MapScripts:: @ 8164839
-	map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_Lobby_OnResume
-	map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, SevenIsland_TrainerTower_Lobby_OnReturnToField
-	map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_TrainerTower_Lobby_OnTransition
-	map_script MAP_SCRIPT_ON_LOAD, SevenIsland_TrainerTower_Lobby_OnLoad
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_Lobby_OnFrame
-	.byte 0
-
-SevenIsland_TrainerTower_Lobby_OnResume:: @ 8164853
-	setvar VAR_TEMP_2, 0
-	setvar VAR_0x8004, 10
-	special sub_815D9E8
-	setvar VAR_0x8004, 18
-	special sub_815D9E8
-	compare VAR_RESULT, 0
-	goto_if_eq EventScript_164886
-	setvar VAR_TEMP_0, 0
-	setobjectxy OBJ_EVENT_ID_PLAYER, 9, 7
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_164AD4
-
-EventScript_164886:: @ 8164886
-	end
-
-SevenIsland_TrainerTower_Lobby_OnReturnToField:: @ 8164887
-	addobject 1
-	addobject 2
-	addobject 3
-	addobject 4
-	addobject 5
-	end
-
-SevenIsland_TrainerTower_Lobby_OnLoad:: @ 8164897
-	compare VAR_TEMP_D, 17
-	call_if_eq EventScript_1648A3
-	end
-
-EventScript_1648A3:: @ 81648A3
-	setmetatile 17, 10, 647, 0
-	return
-
-SevenIsland_TrainerTower_Lobby_OnTransition:: @ 81648AD
-	setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY
-	getplayerxy VAR_TEMP_D, VAR_RESULT
-	end
-
-SevenIsland_TrainerTower_Lobby_OnFrame:: @ 81648B6
-	map_script_2 VAR_TEMP_0, 0, EventScript_1648ED
-	map_script_2 VAR_TEMP_D, 0x11, EventScript_1648C8
-	.2byte 0
-
-EventScript_1648C8:: @ 81648C8
-	lockall
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_1648EA
-	waitmovement 0
-	setmetatile 17, 10, 692, 1
-	special DrawWholeMapView
-	playse SE_TK_KASYA
-	waitse
-	setvar VAR_TEMP_D, 0
-	releaseall
-	end
-
-Movement_1648EA:: @ 81648EA
-	walk_down
-	walk_down
-	step_end
-
-EventScript_1648ED:: @ 81648ED
-	setvar VAR_TEMP_0, 1
-	setvar VAR_0x8004, 12
-	special sub_815D9E8
-	switch VAR_RESULT
-	case 0, EventScript_164920
-	case 1, EventScript_164938
-	case 2, EventScript_16495C
-
-EventScript_164920:: @ 8164920
-	lock
-	faceplayer
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_164AD4
-	textcolor 1
-	msgbox gUnknown_817C937
-	goto EventScript_16494B
-
-EventScript_164938:: @ 8164938
-	lock
-	faceplayer
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_164AD4
-	textcolor 1
-	msgbox gUnknown_817C9C0
-
-EventScript_16494B:: @ 816494B
-	closemessage
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_164AD6
-	waitmovement 0
-	setvar VAR_MAP_SCENE_TRAINER_TOWER, 0
-	release
-
-EventScript_16495C:: @ 816495C
-	end
-
-SevenIsland_TrainerTower_Lobby_EventScript_16495D:: @ 816495D
-	lock
-	faceplayer
-	call EventScript_PkmnCenterNurse
-	release
-	end
-
-SevenIsland_TrainerTower_Lobby_EventScript_164966:: @ 8164966
-	lock
-	faceplayer
-	setvar VAR_0x8004, 20
-	special sub_815D9E8
-	compare VAR_RESULT, 1
-	goto_if_eq EventScript_164988
-	msgbox gUnknown_817C9A2
-	goto EventScript_164990
-
-EventScript_164988:: @ 8164988
-	msgbox gUnknown_817CE1F
-
-EventScript_164990:: @ 8164990
-	release
-	end
-
-SevenIsland_TrainerTower_Lobby_EventScript_164992:: @ 8164992
-	goto_if_questlog EventScript_ReleaseEnd
-	lock
-	faceplayer
-	message Text_MayIHelpYou
-	waitmessage
-	pokemart Items_1649B8
-	msgbox Text_PleaseComeAgain
-	release
-	end
-
-	.align 2
-Items_1649B8:: @ 81649B8
-	.2byte ITEM_ULTRA_BALL
-	.2byte ITEM_GREAT_BALL
-	.2byte ITEM_FULL_RESTORE
-	.2byte ITEM_MAX_POTION
-	.2byte ITEM_HYPER_POTION
-	.2byte ITEM_REVIVE
-	.2byte ITEM_FULL_HEAL
-	.2byte ITEM_ESCAPE_ROPE
-	.2byte ITEM_MAX_REPEL
-	.2byte ITEM_NONE
-	release
-	end
-
-SevenIsland_TrainerTower_Lobby_EventScript_1649CE:: @ 81649CE
-	lockall
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_164AD4
-	textcolor 1
-	msgbox gUnknown_817C794
-	setvar VAR_0x8004, 17
-	special sub_815D9E8
-	compare VAR_RESULT, 0
-	goto_if_eq EventScript_164A00
-	msgbox gUnknown_817C7D9
-	goto EventScript_164A08
-
-EventScript_164A00:: @ 8164A00
-	msgbox gUnknown_817C850
-
-EventScript_164A08:: @ 8164A08
-	message Text_17C88D
-	waitmessage
-	multichoice 18, 6, MULTICHOICE_YES_NO_INFO, FALSE
-	switch VAR_RESULT
-	case 0, EventScript_164A53
-	case 1, EventScript_164ABF
-	case 2, EventScript_164A45
-	case 127, EventScript_164ABF
-	end
-
-EventScript_164A45:: @ 8164A45
-	msgbox gUnknown_817CCC9
-	goto EventScript_164A08
-	end
-
-EventScript_164A53:: @ 8164A53
-	multichoice 13, 3, MULTICHOICE_TRAINER_TOWER_MODE, FALSE
-	switch VAR_RESULT
-	case 0, EventScript_164AA0
-	case 1, EventScript_164AA0
-	case 2, EventScript_164AA0
-	case 3, EventScript_164AA0
-	case 4, EventScript_164ABF
-	case 127, EventScript_164ABF
-	end
-
-EventScript_164AA0:: @ 8164AA0
-	copyvar VAR_0x8005, VAR_RESULT
-	setvar VAR_MAP_SCENE_TRAINER_TOWER, 1
-	special HealPlayerParty
-	msgbox gUnknown_817C8BF
-	setvar VAR_0x8004, 6
-	special sub_815D9E8
-	releaseall
-	end
-
-EventScript_164ABF:: @ 8164ABF
-	msgbox gUnknown_817C91D
-	closemessage
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_164AD6
-	waitmovement 0
-	releaseall
-	end
-
-Movement_164AD4:: @ 8164AD4
-	face_right
-	step_end
-
-Movement_164AD6:: @ 8164AD6
-	walk_down
-	step_end
-
-SevenIsland_TrainerTower_Lobby_EventScript_164AD8:: @ 8164AD8
-	lockall
-	fadescreen FADE_TO_BLACK
-	setvar VAR_0x8004, 1
-	special Special_BattleRecords
-	waitstate
-	releaseall
-	end
-
-SevenIsland_TrainerTower_Lobby_EventScript_164AE6:: @ 8164AE6
-	msgbox gUnknown_817CE38, MSGBOX_NPC
-	end
-
-SevenIsland_TrainerTower_Lobby_EventScript_164AEF:: @ 8164AEF
-	msgbox gUnknown_817CE9F, MSGBOX_NPC
-	end
diff --git a/data/maps/SevenIsland_TrainerTower_Roof/scripts.inc b/data/maps/SevenIsland_TrainerTower_Roof/scripts.inc
deleted file mode 100644
index 6ae4ed2be..000000000
--- a/data/maps/SevenIsland_TrainerTower_Roof/scripts.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-SevenIsland_TrainerTower_Roof_MapScripts:: @ 8164828
-	map_script MAP_SCRIPT_ON_RESUME, SevenIsland_TrainerTower_Roof_MapScript1_1C4F54
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_TrainerTower_Roof_MapScript2_1C5046
-	.byte 0
-
-SevenIsland_TrainerTower_Roof_EventScript_164833:: @ 8164833
-	call EventScript_1C53AA
-	end
diff --git a/data/maps/SilphCo_10F/map.json b/data/maps/SilphCo_10F/map.json
index 7d71b3b26..bebe3f71e 100644
--- a/data/maps/SilphCo_10F/map.json
+++ b/data/maps/SilphCo_10F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 2,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "SilphCo_10F_EventScript_161DC0",
+      "script": "SilphCo_10F_EventScript_Travis",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SilphCo_10F_EventScript_161D96",
+      "script": "SilphCo_10F_EventScript_WorkerF",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "SilphCo_10F_EventScript_161DD7",
+      "script": "SilphCo_10F_EventScript_Grunt",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
@@ -181,7 +181,7 @@
       "x": 7,
       "y": 1,
       "elevation": 0,
-      "script": "SilphCo_10F_EventScript_161DB7"
+      "script": "SilphCo_10F_EventScript_FloorSign"
     }
   ]
 }
diff --git a/data/maps/SilphCo_10F/scripts.inc b/data/maps/SilphCo_10F/scripts.inc
index a0ab7219b..20d98d291 100644
--- a/data/maps/SilphCo_10F/scripts.inc
+++ b/data/maps/SilphCo_10F/scripts.inc
@@ -6,30 +6,30 @@ SilphCo_10F_OnLoad:: @ 8161D8C
 	call_if_unset FLAG_SILPH_10F_DOOR, EventScript_Close10FDoor
 	end
 
-SilphCo_10F_EventScript_161D96:: @ 8161D96
+SilphCo_10F_EventScript_WorkerF:: @ 8161D96
 	lock
 	faceplayer
 	compare VAR_MAP_SCENE_SILPH_CO_11F, 1
-	goto_if_ge EventScript_161DAD
-	msgbox gUnknown_8176DBA
+	goto_if_ge SilphCo_10F_EventScript_WorkerFRocketsGone
+	msgbox SilphCo_10F_Text_WaaaImScared
 	release
 	end
 
-EventScript_161DAD:: @ 8161DAD
-	msgbox gUnknown_8176DCE
+SilphCo_10F_EventScript_WorkerFRocketsGone:: @ 8161DAD
+	msgbox SilphCo_10F_Text_KeepMeCryingASecret
 	release
 	end
 
-SilphCo_10F_EventScript_161DB7:: @ 8161DB7
-	msgbox gUnknown_8176DF8, MSGBOX_SIGN
+SilphCo_10F_EventScript_FloorSign:: @ 8161DB7
+	msgbox SilphCo_10F_Text_FloorSign, MSGBOX_SIGN
 	end
 
-SilphCo_10F_EventScript_161DC0:: @ 8161DC0
-	trainerbattle_single TRAINER_SCIENTIST_TRAVIS, Text_176D57, Text_176D73
-	msgbox gUnknown_8176D86, MSGBOX_AUTOCLOSE
+SilphCo_10F_EventScript_Travis:: @ 8161DC0
+	trainerbattle_single TRAINER_SCIENTIST_TRAVIS, SilphCo_10F_Text_TravisIntro, SilphCo_10F_Text_TravisDefeat
+	msgbox SilphCo_10F_Text_TravisPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SilphCo_10F_EventScript_161DD7:: @ 8161DD7
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_39, Text_176CED, Text_176D18
-	msgbox gUnknown_8176D25, MSGBOX_AUTOCLOSE
+SilphCo_10F_EventScript_Grunt:: @ 8161DD7
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_39, SilphCo_10F_Text_GruntIntro, SilphCo_10F_Text_GruntDefeat
+	msgbox SilphCo_10F_Text_GruntPostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/SilphCo_10F/text.inc b/data/maps/SilphCo_10F/text.inc
index a910cd435..ac8483558 100644
--- a/data/maps/SilphCo_10F/text.inc
+++ b/data/maps/SilphCo_10F/text.inc
@@ -1,33 +1,33 @@
-Text_176CED:: @ 8176CED
+SilphCo_10F_Text_GruntIntro:: @ 8176CED
     .string "Welcome to 10F!\n"
     .string "So good of you to join me!$"
 
-Text_176D18:: @ 8176D18
+SilphCo_10F_Text_GruntDefeat:: @ 8176D18
     .string "I'm stunned!$"
 
-gUnknown_8176D25:: @ 8176D25
+SilphCo_10F_Text_GruntPostBattle:: @ 8176D25
     .string "Nice try, but the boardroom is up\n"
     .string "one more floor.$"
 
-Text_176D57:: @ 8176D57
+SilphCo_10F_Text_TravisIntro:: @ 8176D57
     .string "Enough of your silly games!$"
 
-Text_176D73:: @ 8176D73
+SilphCo_10F_Text_TravisDefeat:: @ 8176D73
     .string "No continues left!$"
 
-gUnknown_8176D86:: @ 8176D86
+SilphCo_10F_Text_TravisPostBattle:: @ 8176D86
     .string "Are you satisfied with beating me?\n"
     .string "Then go on home!$"
 
-gUnknown_8176DBA:: @ 8176DBA
+SilphCo_10F_Text_WaaaImScared:: @ 8176DBA
     .string "Waaaaa!\n"
     .string "I'm scared!$"
 
-gUnknown_8176DCE:: @ 8176DCE
+SilphCo_10F_Text_KeepMeCryingASecret:: @ 8176DCE
     .string "About me crying…\n"
     .string "Please keep it a secret.$"
 
-gUnknown_8176DF8:: @ 8176DF8
+SilphCo_10F_Text_FloorSign:: @ 8176DF8
     .string "SILPH CO. HEAD OFFICE\n"
     .string "10F$"
 
diff --git a/data/maps/SilphCo_11F/map.json b/data/maps/SilphCo_11F/map.json
index 89a1a8bf3..19b187c08 100644
--- a/data/maps/SilphCo_11F/map.json
+++ b/data/maps/SilphCo_11F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SilphCo_11F_EventScript_161DFE",
+      "script": "SilphCo_11F_EventScript_President",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SilphCo_11F_EventScript_161E7F",
+      "script": "SilphCo_11F_EventScript_Secretary",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 5,
-      "script": "SilphCo_11F_EventScript_161F40",
+      "script": "SilphCo_11F_EventScript_Grunt1",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
@@ -88,7 +88,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 5,
-      "script": "SilphCo_11F_EventScript_161F57",
+      "script": "SilphCo_11F_EventScript_Grunt2",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     }
   ],
@@ -123,7 +123,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_SILPH_CO_11F",
       "var_value": 0,
-      "script": "SilphCo_11F_EventScript_161E88"
+      "script": "SilphCo_11F_EventScript_GiovanniTriggerLeft"
     },
     {
       "type": "trigger",
@@ -132,7 +132,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_SILPH_CO_11F",
       "var_value": 0,
-      "script": "SilphCo_11F_EventScript_161E94"
+      "script": "SilphCo_11F_EventScript_GiovanniTriggerRight"
     }
   ],
   "bg_events": [
@@ -179,7 +179,7 @@
       "x": 8,
       "y": 1,
       "elevation": 0,
-      "script": "SilphCo_11F_EventScript_161F37"
+      "script": "SilphCo_11F_EventScript_FloorSign"
     }
   ]
 }
diff --git a/data/maps/SilphCo_11F/scripts.inc b/data/maps/SilphCo_11F/scripts.inc
index 05f52646e..38de05842 100644
--- a/data/maps/SilphCo_11F/scripts.inc
+++ b/data/maps/SilphCo_11F/scripts.inc
@@ -6,76 +6,72 @@ SilphCo_11F_OnLoad:: @ 8161DF4
 	call_if_unset FLAG_SILPH_11F_DOOR, EventScript_Close11FDoor
 	end
 
-SilphCo_11F_EventScript_161DFE:: @ 8161DFE
+SilphCo_11F_EventScript_President:: @ 8161DFE
 	lock
 	faceplayer
-	goto_if_set FLAG_GOT_MASTER_BALL_FROM_SILPH, EventScript_161E75
+	goto_if_set FLAG_GOT_MASTER_BALL_FROM_SILPH, SilphCo_11F_EventScript_AlreadyGotMasterBall
 	checkplayergender
 	compare VAR_RESULT, MALE
-	call_if_eq EventScript_161E59
+	call_if_eq SilphCo_11F_EventScript_PresidentThanksMale
 	compare VAR_RESULT, FEMALE
-	call_if_eq EventScript_161E62
+	call_if_eq SilphCo_11F_EventScript_PresidentThanksFemale
 	checkitemspace ITEM_MASTER_BALL, 1
 	compare VAR_RESULT, FALSE
-	goto_if_eq EventScript_161E6B
-	giveitem_msg gUnknown_8176FBD, ITEM_MASTER_BALL, 1, MUS_FAN5
-	msgbox gUnknown_8176FEB
+	goto_if_eq SilphCo_11F_EventScript_NoRoomForMasterBall
+	giveitem_msg SilphCo_11F_Text_ObtainedMasterBallFromPresident, ITEM_MASTER_BALL, 1, MUS_FAN5
+	msgbox SilphCo_11F_Text_ThatsOurSecretPrototype
 	setflag FLAG_GOT_MASTER_BALL_FROM_SILPH
 	release
 	end
 
-EventScript_161E59:: @ 8161E59
-	msgbox gUnknown_8176E12
+SilphCo_11F_EventScript_PresidentThanksMale:: @ 8161E59
+	msgbox SilphCo_11F_Text_ThanksForSavingMeDearBoy
 	return
 
-EventScript_161E62:: @ 8161E62
-	msgbox gUnknown_8176EE7
+SilphCo_11F_EventScript_PresidentThanksFemale:: @ 8161E62
+	msgbox SilphCo_11F_Text_ThanksForSavingMeDearGirl
 	return
 
-EventScript_161E6B:: @ 8161E6B
-	msgbox gUnknown_817708E
+SilphCo_11F_EventScript_NoRoomForMasterBall:: @ 8161E6B
+	msgbox SilphCo_11F_Text_YouHaveNoRoomForThis
 	release
 	end
 
-EventScript_161E75:: @ 8161E75
-	msgbox gUnknown_8176FEB
+SilphCo_11F_EventScript_AlreadyGotMasterBall:: @ 8161E75
+	msgbox SilphCo_11F_Text_ThatsOurSecretPrototype
 	release
 	end
 
-SilphCo_11F_EventScript_161E7F:: @ 8161E7F
-	msgbox gUnknown_81770A9, MSGBOX_NPC
+SilphCo_11F_EventScript_Secretary:: @ 8161E7F
+	msgbox SilphCo_11F_Text_ThanksForRescuingUs, MSGBOX_NPC
 	end
 
-SilphCo_11F_EventScript_161E88:: @ 8161E88
+SilphCo_11F_EventScript_GiovanniTriggerLeft:: @ 8161E88
 	lockall
 	setvar VAR_TEMP_1, 0
-	goto EventScript_161EA0
-
-EventScript_161E93:: @ 8161E93
+	goto SilphCo_11F_EventScript_BattleGiovanni
 	end
 
-SilphCo_11F_EventScript_161E94:: @ 8161E94
+SilphCo_11F_EventScript_GiovanniTriggerRight:: @ 8161E94
 	lockall
 	setvar VAR_TEMP_1, 1
-	goto EventScript_161EA0
-
-EventScript_161E9F:: @ 8161E9F
+	goto SilphCo_11F_EventScript_BattleGiovanni
 	end
 
-EventScript_161EA0:: @ 8161EA0
+SilphCo_11F_EventScript_BattleGiovanni:: @ 8161EA0
 	textcolor 0
 	applymovement 3, Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	delay 25
-	msgbox gUnknown_8177108
+	msgbox SilphCo_11F_Text_GiovanniIntro
 	closemessage
 	compare VAR_TEMP_1, 0
-	call_if_eq EventScript_161F00
+	call_if_eq SilphCo_11F_EventScript_GiovanniApproachLeft
 	compare VAR_TEMP_1, 1
-	call_if_eq EventScript_161F12
+	call_if_eq SilphCo_11F_EventScript_GiovanniApproachRight
 	setvar VAR_LAST_TALKED, 3
-	trainerbattle_no_intro TRAINER_BOSS_GIOVANNI_2, Text_1771AB
-	msgbox gUnknown_81771C2
+	trainerbattle_no_intro TRAINER_BOSS_GIOVANNI_2, SilphCo_11F_Text_GiovanniDefeat
+	msgbox SilphCo_11F_Text_GiovanniPostBattle
 	closemessage
 	fadescreen FADE_TO_BLACK
 	removeobject 3
@@ -88,18 +84,18 @@ EventScript_161EA0:: @ 8161EA0
 	releaseall
 	end
 
-EventScript_161F00:: @ 8161F00
-	applymovement 3, Movement_161F1D
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_161F27
+SilphCo_11F_EventScript_GiovanniApproachLeft:: @ 8161F00
+	applymovement 3, SilphCo_11F_Movement_GiovanniApproachLeft
+	applymovement OBJ_EVENT_ID_PLAYER, SilphCo_11F_Movement_PlayerFaceGiovanni
 	waitmovement 0
 	return
 
-EventScript_161F12:: @ 8161F12
-	applymovement 3, Movement_161F23
+SilphCo_11F_EventScript_GiovanniApproachRight:: @ 8161F12
+	applymovement 3, SilphCo_11F_Movement_GiovanniApproachRight
 	waitmovement 0
 	return
 
-Movement_161F1D:: @ 8161F1D
+SilphCo_11F_Movement_GiovanniApproachLeft:: @ 8161F1D
 	walk_down
 	walk_down
 	walk_down
@@ -107,13 +103,13 @@ Movement_161F1D:: @ 8161F1D
 	walk_in_place_fastest_left
 	step_end
 
-Movement_161F23:: @ 8161F23
+SilphCo_11F_Movement_GiovanniApproachRight:: @ 8161F23
 	walk_down
 	walk_down
 	walk_down
 	step_end
 
-Movement_161F27:: @ 8161F27
+SilphCo_11F_Movement_PlayerFaceGiovanni:: @ 8161F27
 	delay_16
 	delay_16
 	delay_16
@@ -122,20 +118,21 @@ Movement_161F27:: @ 8161F27
 	walk_in_place_fastest_right
 	step_end
 
-EventScript_161F2E:: @ 8161F2E
-	msgbox gUnknown_817732B, MSGBOX_SIGN
+@ Unused
+SilphCo_11F_EventScript_Monitor:: @ 8161F2E
+	msgbox SilphCo_11F_Text_MonitorHasMonsOnIt, MSGBOX_SIGN
 	end
 
-SilphCo_11F_EventScript_161F37:: @ 8161F37
-	msgbox gUnknown_817734A, MSGBOX_SIGN
+SilphCo_11F_EventScript_FloorSign:: @ 8161F37
+	msgbox SilphCo_11F_Text_FloorSign, MSGBOX_SIGN
 	end
 
-SilphCo_11F_EventScript_161F40:: @ 8161F40
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_40, Text_1772B8, Text_1772E7
-	msgbox gUnknown_81772F9, MSGBOX_AUTOCLOSE
+SilphCo_11F_EventScript_Grunt1:: @ 8161F40
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_40, SilphCo_11F_Text_Grunt1Intro, SilphCo_11F_Text_Grunt1Defeat
+	msgbox SilphCo_11F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SilphCo_11F_EventScript_161F57:: @ 8161F57
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_41, Text_17726A, Text_17728C
-	msgbox gUnknown_817729B, MSGBOX_AUTOCLOSE
+SilphCo_11F_EventScript_Grunt2:: @ 8161F57
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_41, SilphCo_11F_Text_Grunt2Intro, SilphCo_11F_Text_Grunt2Defeat
+	msgbox SilphCo_11F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/SilphCo_11F/text.inc b/data/maps/SilphCo_11F/text.inc
index dcb60219a..83b004f4a 100644
--- a/data/maps/SilphCo_11F/text.inc
+++ b/data/maps/SilphCo_11F/text.inc
@@ -1,4 +1,4 @@
-gUnknown_8176E12:: @ 8176E12
+SilphCo_11F_Text_ThanksForSavingMeDearBoy:: @ 8176E12
     .string "PRESIDENT: Oh, dear boy!\n"
     .string "Thank you for saving SILPH.\p"
     .string "I will never forget you saved us in\n"
@@ -8,7 +8,7 @@ gUnknown_8176E12:: @ 8176E12
     .string "anything.\p"
     .string "Here, maybe this will do.$"
 
-gUnknown_8176EE7:: @ 8176EE7
+SilphCo_11F_Text_ThanksForSavingMeDearGirl:: @ 8176EE7
     .string "PRESIDENT: Oh, dear girl!\n"
     .string "Thank you for saving SILPH.\p"
     .string "I will never forget you saved us in\n"
@@ -18,11 +18,11 @@ gUnknown_8176EE7:: @ 8176EE7
     .string "anything.\p"
     .string "Here, maybe this will do.$"
 
-gUnknown_8176FBD:: @ 8176FBD
+SilphCo_11F_Text_ObtainedMasterBallFromPresident:: @ 8176FBD
     .string "{PLAYER} obtained a MASTER BALL\n"
     .string "from the PRESIDENT!$"
 
-gUnknown_8176FEB:: @ 8176FEB
+SilphCo_11F_Text_ThatsOurSecretPrototype:: @ 8176FEB
     .string "PRESIDENT: You can't buy that\n"
     .string "anywhere.\p"
     .string "It's our secret prototype MASTER\n"
@@ -32,16 +32,16 @@ gUnknown_8176FEB:: @ 8176FEB
     .string "You should be quiet about using it,\n"
     .string "though.$"
 
-gUnknown_817708E:: @ 817708E
+SilphCo_11F_Text_YouHaveNoRoomForThis:: @ 817708E
     .string "You have no room for this.$"
 
-gUnknown_81770A9:: @ 81770A9
+SilphCo_11F_Text_ThanksForRescuingUs:: @ 81770A9
     .string "SECRETARY: Thank you for rescuing\n"
     .string "all of us.\p"
     .string "We, from the PRESIDENT down,\n"
     .string "are indebted to you.$"
 
-gUnknown_8177108:: @ 8177108
+SilphCo_11F_Text_GiovanniIntro:: @ 8177108
     .string "Ah, {PLAYER}!\n"
     .string "So we meet again!\p"
     .string "The PRESIDENT and I are discussing\n"
@@ -50,11 +50,11 @@ gUnknown_8177108:: @ 8177108
     .string "matters…\p"
     .string "Or, experience a world of pain!$"
 
-Text_1771AB:: @ 81771AB
+SilphCo_11F_Text_GiovanniDefeat:: @ 81771AB
     .string "Arrgh!!\n"
     .string "I lost again!?$"
 
-gUnknown_81771C2:: @ 81771C2
+SilphCo_11F_Text_GiovanniPostBattle:: @ 81771C2
     .string "Blast it all!\n"
     .string "You ruined our plans for SILPH!\p"
     .string "But, TEAM ROCKET will never fall!\p"
@@ -62,33 +62,33 @@ gUnknown_81771C2:: @ 81771C2
     .string "POKéMON exist for TEAM ROCKET!\p"
     .string "I must go, but I shall return!$"
 
-Text_17726A:: @ 817726A
+SilphCo_11F_Text_Grunt2Intro:: @ 817726A
     .string "Stop right there!\n"
     .string "Don't you move!$"
 
-Text_17728C:: @ 817728C
+SilphCo_11F_Text_Grunt2Defeat:: @ 817728C
     .string "Don't…\n"
     .string "Please!$"
 
-gUnknown_817729B:: @ 817729B
+SilphCo_11F_Text_Grunt2PostBattle:: @ 817729B
     .string "So, you want to see my BOSS?$"
 
-Text_1772B8:: @ 81772B8
+SilphCo_11F_Text_Grunt1Intro:: @ 81772B8
     .string "Halt! Do you have an appointment\n"
     .string "with my BOSS?$"
 
-Text_1772E7:: @ 81772E7
+SilphCo_11F_Text_Grunt1Defeat:: @ 81772E7
     .string "Gaah!\n"
     .string "Demolished!$"
 
-gUnknown_81772F9:: @ 81772F9
+SilphCo_11F_Text_Grunt1PostBattle:: @ 81772F9
     .string "Watch your step…\n"
     .string "My BOSS likes his POKéMON tough!$"
 
-gUnknown_817732B:: @ 817732B
+SilphCo_11F_Text_MonitorHasMonsOnIt:: @ 817732B
     .string "The monitor has POKéMON on it!$"
 
-gUnknown_817734A:: @ 817734A
+SilphCo_11F_Text_FloorSign:: @ 817734A
     .string "SILPH CO. HEAD OFFICE\n"
     .string "11F$"
 
diff --git a/data/maps/SilphCo_1F/map.json b/data/maps/SilphCo_1F/map.json
index 277329dfc..b4e329490 100644
--- a/data/maps/SilphCo_1F/map.json
+++ b/data/maps/SilphCo_1F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SilphCo_1F_EventScript_16162F",
+      "script": "SilphCo_1F_EventScript_Receptionist",
       "flag": "FLAG_HIDE_SAFFRON_CIVILIANS"
     }
   ],
@@ -71,7 +71,7 @@
       "x": 30,
       "y": 1,
       "elevation": 0,
-      "script": "SilphCo_1F_EventScript_161638"
+      "script": "SilphCo_1F_EventScript_FloorSign"
     }
   ]
 }
diff --git a/data/maps/SilphCo_1F/scripts.inc b/data/maps/SilphCo_1F/scripts.inc
index f10c4d8b3..004d2de0c 100644
--- a/data/maps/SilphCo_1F/scripts.inc
+++ b/data/maps/SilphCo_1F/scripts.inc
@@ -6,10 +6,10 @@ SilphCo_1F_OnTransition:: @ 816162B
 	setworldmapflag FLAG_WORLD_MAP_SILPH_CO_1F
 	end
 
-SilphCo_1F_EventScript_16162F:: @ 816162F
-	msgbox gUnknown_81754F7, MSGBOX_NPC
+SilphCo_1F_EventScript_Receptionist:: @ 816162F
+	msgbox SilphCo_1F_Text_WelcomePresidentInBoardroom, MSGBOX_NPC
 	end
 
-SilphCo_1F_EventScript_161638:: @ 8161638
-	msgbox gUnknown_8175549, MSGBOX_SIGN
+SilphCo_1F_EventScript_FloorSign:: @ 8161638
+	msgbox SilphCo_1F_Text_FloorSign, MSGBOX_SIGN
 	end
diff --git a/data/maps/SilphCo_1F/text.inc b/data/maps/SilphCo_1F/text.inc
index 048102660..808aec46b 100644
--- a/data/maps/SilphCo_1F/text.inc
+++ b/data/maps/SilphCo_1F/text.inc
@@ -1,13 +1,13 @@
-gUnknown_81754F7:: @ 81754F7
+SilphCo_1F_Text_WelcomePresidentInBoardroom:: @ 81754F7
     .string "Welcome.\p"
     .string "The PRESIDENT is in the boardroom\n"
     .string "on 11F.$"
 
-Text_17552A:: @ 817552A
+SilphCo_1F_Text_17552A:: @ 817552A
     .string "めちゃめちゃに　こわされてる\n"
     .string "とうぶん　なおりそうに　ない‥$"
 
-gUnknown_8175549:: @ 8175549
+SilphCo_1F_Text_FloorSign:: @ 8175549
     .string "SILPH CO. HEAD OFFICE\n"
     .string "1F$"
 
diff --git a/data/maps/SilphCo_2F/map.json b/data/maps/SilphCo_2F/map.json
index fed3b8390..89439ba8a 100644
--- a/data/maps/SilphCo_2F/map.json
+++ b/data/maps/SilphCo_2F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 5,
-      "script": "SilphCo_2F_EventScript_1616AE",
+      "script": "SilphCo_2F_EventScript_Grunt2",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "SilphCo_2F_EventScript_161680",
+      "script": "SilphCo_2F_EventScript_Jerry",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "SilphCo_2F_EventScript_161697",
+      "script": "SilphCo_2F_EventScript_Grunt1",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SilphCo_2F_EventScript_161669",
+      "script": "SilphCo_2F_EventScript_Connor",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
@@ -203,7 +203,7 @@
       "x": 29,
       "y": 1,
       "elevation": 0,
-      "script": "SilphCo_2F_EventScript_161660"
+      "script": "SilphCo_2F_EventScript_FloorSign"
     }
   ]
 }
diff --git a/data/maps/SilphCo_2F/scripts.inc b/data/maps/SilphCo_2F/scripts.inc
index 6f800bbd0..161ddefe6 100644
--- a/data/maps/SilphCo_2F/scripts.inc
+++ b/data/maps/SilphCo_2F/scripts.inc
@@ -9,30 +9,28 @@ SilphCo_2F_OnLoad:: @ 8161647
 
 SilphCo_2F_EventScript_ThunderWaveTutor:: @ 816165A
 	goto EventScript_ThunderWaveTutor
-
-EventScript_16165F:: @ 816165F
 	end
 
-SilphCo_2F_EventScript_161660:: @ 8161660
-	msgbox gUnknown_8175894, MSGBOX_SIGN
+SilphCo_2F_EventScript_FloorSign:: @ 8161660
+	msgbox SilphCo_2F_Text_FloorSign, MSGBOX_SIGN
 	end
 
-SilphCo_2F_EventScript_161669:: @ 8161669
-	trainerbattle_single TRAINER_SCIENTIST_CONNOR, Text_175562, Text_17557E
-	msgbox gUnknown_817559F, MSGBOX_AUTOCLOSE
+SilphCo_2F_EventScript_Connor:: @ 8161669
+	trainerbattle_single TRAINER_SCIENTIST_CONNOR, SilphCo_2F_Text_ConnorIntro, SilphCo_2F_Text_ConnorDefeat
+	msgbox SilphCo_2F_Text_ConnorPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SilphCo_2F_EventScript_161680:: @ 8161680
-	trainerbattle_single TRAINER_SCIENTIST_JERRY, Text_1755C6, Text_1755E5
-	msgbox gUnknown_81755F2, MSGBOX_AUTOCLOSE
+SilphCo_2F_EventScript_Jerry:: @ 8161680
+	trainerbattle_single TRAINER_SCIENTIST_JERRY, SilphCo_2F_Text_JerryIntro, SilphCo_2F_Text_JerryDefeat
+	msgbox SilphCo_2F_Text_JerryPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SilphCo_2F_EventScript_161697:: @ 8161697
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_23, Text_17562D, Text_17564A
-	msgbox gUnknown_8175651, MSGBOX_AUTOCLOSE
+SilphCo_2F_EventScript_Grunt1:: @ 8161697
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_23, SilphCo_2F_Text_Grunt1Intro, SilphCo_2F_Text_Grunt1Defeat
+	msgbox SilphCo_2F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SilphCo_2F_EventScript_1616AE:: @ 81616AE
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_24, Text_1756AD, Text_1756D8
-	msgbox gUnknown_81756E2, MSGBOX_AUTOCLOSE
+SilphCo_2F_EventScript_Grunt2:: @ 81616AE
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_24, SilphCo_2F_Text_Grunt2Intro, SilphCo_2F_Text_Grunt2Defeat
+	msgbox SilphCo_2F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/SilphCo_2F/text.inc b/data/maps/SilphCo_2F/text.inc
index 3dc65664d..82c7bac99 100644
--- a/data/maps/SilphCo_2F/text.inc
+++ b/data/maps/SilphCo_2F/text.inc
@@ -1,46 +1,46 @@
-Text_175562:: @ 8175562
+SilphCo_2F_Text_ConnorIntro:: @ 8175562
     .string "Help!\n"
     .string "I'm a SILPH employee.$"
 
-Text_17557E:: @ 817557E
+SilphCo_2F_Text_ConnorDefeat:: @ 817557E
     .string "How did you know\n"
     .string "I was a ROCKET?$"
 
-gUnknown_817559F:: @ 817559F
+SilphCo_2F_Text_ConnorPostBattle:: @ 817559F
     .string "I work for both SILPH and TEAM\n"
     .string "ROCKET.$"
 
-Text_1755C6:: @ 81755C6
+SilphCo_2F_Text_JerryIntro:: @ 81755C6
     .string "It's off-limits here!\n"
     .string "Go home!$"
 
-Text_1755E5:: @ 81755E5
+SilphCo_2F_Text_JerryDefeat:: @ 81755E5
     .string "You're good.$"
 
-gUnknown_81755F2:: @ 81755F2
+SilphCo_2F_Text_JerryPostBattle:: @ 81755F2
     .string "Can you solve the maze in here?\n"
     .string "It's not easy, I tell you!$"
 
-Text_17562D:: @ 817562D
+SilphCo_2F_Text_Grunt1Intro:: @ 817562D
     .string "No kids are allowed in here!$"
 
-Text_17564A:: @ 817564A
+SilphCo_2F_Text_Grunt1Defeat:: @ 817564A
     .string "Tough!$"
 
-gUnknown_8175651:: @ 8175651
+SilphCo_2F_Text_Grunt1PostBattle:: @ 8175651
     .string "Diamond-shaped tiles are teleport\n"
     .string "blocks.\p"
     .string "They're transporters for this\n"
     .string "high-tech building.$"
 
-Text_1756AD:: @ 81756AD
+SilphCo_2F_Text_Grunt2Intro:: @ 81756AD
     .string "Hey, kid!\n"
     .string "What are you wandering here for?$"
 
-Text_1756D8:: @ 81756D8
+SilphCo_2F_Text_Grunt2Defeat:: @ 81756D8
     .string "I goofed!$"
 
-gUnknown_81756E2:: @ 81756E2
+SilphCo_2F_Text_Grunt2PostBattle:: @ 81756E2
     .string "SILPH CO. will be associated with\n"
     .string "TEAM ROCKET!$"
 
@@ -68,7 +68,7 @@ Text_ThunderWaveTaught:: @ 81757EC
     .string "It's an ELECTRIC-type move, so it\n"
     .string "won't work on some POKéMON.$"
 
-gUnknown_8175894:: @ 8175894
+SilphCo_2F_Text_FloorSign:: @ 8175894
     .string "SILPH CO. HEAD OFFICE\n"
     .string "2F$"
 
diff --git a/data/maps/SilphCo_3F/map.json b/data/maps/SilphCo_3F/map.json
index 8a81b5118..42a1e6b72 100644
--- a/data/maps/SilphCo_3F/map.json
+++ b/data/maps/SilphCo_3F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "SilphCo_3F_EventScript_16171F",
+      "script": "SilphCo_3F_EventScript_Grunt",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SilphCo_3F_EventScript_1616DE",
+      "script": "SilphCo_3F_EventScript_WorkerM",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SilphCo_3F_EventScript_161708",
+      "script": "SilphCo_3F_EventScript_Jose",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
@@ -211,7 +211,7 @@
       "x": 29,
       "y": 1,
       "elevation": 0,
-      "script": "SilphCo_3F_EventScript_1616FF"
+      "script": "SilphCo_3F_EventScript_FloorSign"
     }
   ]
 }
diff --git a/data/maps/SilphCo_3F/scripts.inc b/data/maps/SilphCo_3F/scripts.inc
index a5e62b667..2fab54a56 100644
--- a/data/maps/SilphCo_3F/scripts.inc
+++ b/data/maps/SilphCo_3F/scripts.inc
@@ -7,30 +7,30 @@ SilphCo_3F_OnLoad:: @ 81616CB
 	call_if_unset FLAG_SILPH_3F_DOOR_2, EventScript_Close3FDoor2
 	end
 
-SilphCo_3F_EventScript_1616DE:: @ 81616DE
+SilphCo_3F_EventScript_WorkerM:: @ 81616DE
 	lock
 	faceplayer
 	compare VAR_MAP_SCENE_SILPH_CO_11F, 1
-	goto_if_ge EventScript_1616F5
-	msgbox gUnknown_81758AD
+	goto_if_ge SilphCo_3F_EventScript_WorkerMRocketsGone
+	msgbox SilphCo_3F_Text_WhatAmIToDo
 	release
 	end
 
-EventScript_1616F5:: @ 81616F5
-	msgbox gUnknown_81758D3
+SilphCo_3F_EventScript_WorkerMRocketsGone:: @ 81616F5
+	msgbox SilphCo_3F_Text_YouAndYourMonsSavedUs
 	release
 	end
 
-SilphCo_3F_EventScript_1616FF:: @ 81616FF
-	msgbox gUnknown_81759DC, MSGBOX_SIGN
+SilphCo_3F_EventScript_FloorSign:: @ 81616FF
+	msgbox SilphCo_3F_Text_FloorSign, MSGBOX_SIGN
 	end
 
-SilphCo_3F_EventScript_161708:: @ 8161708
-	trainerbattle_single TRAINER_SCIENTIST_JOSE, Text_175948, Text_17597D
-	msgbox gUnknown_8175990, MSGBOX_AUTOCLOSE
+SilphCo_3F_EventScript_Jose:: @ 8161708
+	trainerbattle_single TRAINER_SCIENTIST_JOSE, SilphCo_3F_Text_JoseIntro, SilphCo_3F_Text_JoseDefeat
+	msgbox SilphCo_3F_Text_JosePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SilphCo_3F_EventScript_16171F:: @ 816171F
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_25, Text_1758F6, Text_175911
-	msgbox gUnknown_817591C, MSGBOX_AUTOCLOSE
+SilphCo_3F_EventScript_Grunt:: @ 816171F
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_25, SilphCo_3F_Text_GruntIntro, SilphCo_3F_Text_GruntDefeat
+	msgbox SilphCo_3F_Text_GruntPostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/SilphCo_3F/text.inc b/data/maps/SilphCo_3F/text.inc
index 6b8a8d4d1..128865c1b 100644
--- a/data/maps/SilphCo_3F/text.inc
+++ b/data/maps/SilphCo_3F/text.inc
@@ -1,34 +1,34 @@
-gUnknown_81758AD:: @ 81758AD
+SilphCo_3F_Text_WhatAmIToDo:: @ 81758AD
     .string "I work for SILPH CO.\n"
     .string "What am I to do?$"
 
-gUnknown_81758D3:: @ 81758D3
+SilphCo_3F_Text_YouAndYourMonsSavedUs:: @ 81758D3
     .string "{PLAYER}!\n"
     .string "You and your POKéMON saved us!$"
 
-Text_1758F6:: @ 81758F6
+SilphCo_3F_Text_GruntIntro:: @ 81758F6
     .string "Quit messing with us, kid!$"
 
-Text_175911:: @ 8175911
+SilphCo_3F_Text_GruntDefeat:: @ 8175911
     .string "I give up!$"
 
-gUnknown_817591C:: @ 817591C
+SilphCo_3F_Text_GruntPostBattle:: @ 817591C
     .string "A hint? You can open doors with\n"
     .string "a CARD KEY!$"
 
-Text_175948:: @ 8175948
+SilphCo_3F_Text_JoseIntro:: @ 8175948
     .string "I support TEAM ROCKET more than\n"
     .string "I support SILPH CO.!$"
 
-Text_17597D:: @ 817597D
+SilphCo_3F_Text_JoseDefeat:: @ 817597D
     .string "You really got me!$"
 
-gUnknown_8175990:: @ 8175990
+SilphCo_3F_Text_JosePostBattle:: @ 8175990
     .string "Humph…\p"
     .string "TEAM ROCKET said that if I helped\n"
     .string "them, they'd let me study POKéMON.$"
 
-gUnknown_81759DC:: @ 81759DC
+SilphCo_3F_Text_FloorSign:: @ 81759DC
     .string "SILPH CO. HEAD OFFICE\n"
     .string "3F$"
 
diff --git a/data/maps/SilphCo_4F/map.json b/data/maps/SilphCo_4F/map.json
index fc37a6102..6473f3c5d 100644
--- a/data/maps/SilphCo_4F/map.json
+++ b/data/maps/SilphCo_4F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "SilphCo_4F_EventScript_1617A7",
+      "script": "SilphCo_4F_EventScript_Grunt2",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 5,
-      "script": "SilphCo_4F_EventScript_161790",
+      "script": "SilphCo_4F_EventScript_Grunt1",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "SilphCo_4F_EventScript_161779",
+      "script": "SilphCo_4F_EventScript_Rodney",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SilphCo_4F_EventScript_16174F",
+      "script": "SilphCo_4F_EventScript_WorkerM",
       "flag": "0"
     },
     {
@@ -242,7 +242,7 @@
       "x": 29,
       "y": 1,
       "elevation": 0,
-      "script": "SilphCo_4F_EventScript_161770"
+      "script": "SilphCo_4F_EventScript_FloorSign"
     }
   ]
 }
diff --git a/data/maps/SilphCo_4F/scripts.inc b/data/maps/SilphCo_4F/scripts.inc
index 406e394f1..bd20cb533 100644
--- a/data/maps/SilphCo_4F/scripts.inc
+++ b/data/maps/SilphCo_4F/scripts.inc
@@ -7,35 +7,35 @@ SilphCo_4F_OnLoad:: @ 816173C
 	call_if_unset FLAG_SILPH_4F_DOOR_2, EventScript_Close4FDoor2
 	end
 
-SilphCo_4F_EventScript_16174F:: @ 816174F
+SilphCo_4F_EventScript_WorkerM:: @ 816174F
 	lock
 	faceplayer
 	compare VAR_MAP_SCENE_SILPH_CO_11F, 1
-	goto_if_ge EventScript_161766
-	msgbox gUnknown_81759F5
+	goto_if_ge SilphCo_4F_EventScript_WorkerMRocketsGone
+	msgbox SilphCo_4F_Text_CantYouSeeImHiding
 	release
 	end
 
-EventScript_161766:: @ 8161766
-	msgbox gUnknown_8175A15
+SilphCo_4F_EventScript_WorkerMRocketsGone:: @ 8161766
+	msgbox SilphCo_4F_Text_TeamRocketIsGone
 	release
 	end
 
-SilphCo_4F_EventScript_161770:: @ 8161770
-	msgbox gUnknown_8175B57, MSGBOX_SIGN
+SilphCo_4F_EventScript_FloorSign:: @ 8161770
+	msgbox SilphCo_4F_Text_FloorSign, MSGBOX_SIGN
 	end
 
-SilphCo_4F_EventScript_161779:: @ 8161779
-	trainerbattle_single TRAINER_SCIENTIST_RODNEY, Text_175A90, Text_175AB0
-	msgbox gUnknown_8175AC8, MSGBOX_AUTOCLOSE
+SilphCo_4F_EventScript_Rodney:: @ 8161779
+	trainerbattle_single TRAINER_SCIENTIST_RODNEY, SilphCo_4F_Text_RodneyIntro, SilphCo_4F_Text_RodneyDefeat
+	msgbox SilphCo_4F_Text_RodneyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SilphCo_4F_EventScript_161790:: @ 8161790
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_26, Text_175A2F, Text_175A5B
-	msgbox gUnknown_8175A62, MSGBOX_AUTOCLOSE
+SilphCo_4F_EventScript_Grunt1:: @ 8161790
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_26, SilphCo_4F_Text_Grunt1Intro, SilphCo_4F_Text_Grunt1Defeat
+	msgbox SilphCo_4F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SilphCo_4F_EventScript_1617A7:: @ 81617A7
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_27, Text_175B19, Text_175B2B
-	msgbox gUnknown_8175B38, MSGBOX_AUTOCLOSE
+SilphCo_4F_EventScript_Grunt2:: @ 81617A7
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_27, SilphCo_4F_Text_Grunt2Intro, SilphCo_4F_Text_Grunt2Defeat
+	msgbox SilphCo_4F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/SilphCo_4F/text.inc b/data/maps/SilphCo_4F/text.inc
index d8741f9a3..dd1ed2d20 100644
--- a/data/maps/SilphCo_4F/text.inc
+++ b/data/maps/SilphCo_4F/text.inc
@@ -1,45 +1,45 @@
-gUnknown_81759F5:: @ 81759F5
+SilphCo_4F_Text_CantYouSeeImHiding:: @ 81759F5
     .string "Sssh!\n"
     .string "Can't you see I'm hiding?$"
 
-gUnknown_8175A15:: @ 8175A15
+SilphCo_4F_Text_TeamRocketIsGone:: @ 8175A15
     .string "Huh?\n"
     .string "TEAM ROCKET is gone?$"
 
-Text_175A2F:: @ 8175A2F
+SilphCo_4F_Text_Grunt1Intro:: @ 8175A2F
     .string "TEAM ROCKET has taken control\n"
     .string "of SILPH CO.!$"
 
-Text_175A5B:: @ 8175A5B
+SilphCo_4F_Text_Grunt1Defeat:: @ 8175A5B
     .string "Arrgh!$"
 
-gUnknown_8175A62:: @ 8175A62
+SilphCo_4F_Text_Grunt1PostBattle:: @ 8175A62
     .string "Fwahahaha!\n"
     .string "My BOSS has been after this place!$"
 
-Text_175A90:: @ 8175A90
+SilphCo_4F_Text_RodneyIntro:: @ 8175A90
     .string "My POKéMON is my loyal servant.$"
 
-Text_175AB0:: @ 8175AB0
+SilphCo_4F_Text_RodneyDefeat:: @ 8175AB0
     .string "Darn!\n"
     .string "You weak POKéMON!$"
 
-gUnknown_8175AC8:: @ 8175AC8
+SilphCo_4F_Text_RodneyPostBattle:: @ 8175AC8
     .string "The doors are electronically\n"
     .string "locked.\p"
     .string "It takes a CARD KEY to open the\n"
     .string "doors here.$"
 
-Text_175B19:: @ 8175B19
+SilphCo_4F_Text_Grunt2Intro:: @ 8175B19
     .string "Intruder spotted!$"
 
-Text_175B2B:: @ 8175B2B
+SilphCo_4F_Text_Grunt2Defeat:: @ 8175B2B
     .string "Who are you?$"
 
-gUnknown_8175B38:: @ 8175B38
+SilphCo_4F_Text_Grunt2PostBattle:: @ 8175B38
     .string "I better tell the BOSS on 11F!$"
 
-gUnknown_8175B57:: @ 8175B57
+SilphCo_4F_Text_FloorSign:: @ 8175B57
     .string "SILPH CO. HEAD OFFICE\n"
     .string "4F$"
 
diff --git a/data/maps/SilphCo_5F/map.json b/data/maps/SilphCo_5F/map.json
index 9bc1989ff..834d3c9eb 100644
--- a/data/maps/SilphCo_5F/map.json
+++ b/data/maps/SilphCo_5F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "SilphCo_5F_EventScript_161853",
+      "script": "SilphCo_5F_EventScript_Grunt2",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "SilphCo_5F_EventScript_16186A",
+      "script": "SilphCo_5F_EventScript_Dalton",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SilphCo_5F_EventScript_1617E0",
+      "script": "SilphCo_5F_EventScript_WorkerM",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "SilphCo_5F_EventScript_161825",
+      "script": "SilphCo_5F_EventScript_Beau",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "SilphCo_5F_EventScript_16183C",
+      "script": "SilphCo_5F_EventScript_Grunt1",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
@@ -127,7 +127,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SilphCo_5F_EventScript_1AD0D4",
+      "script": "SilphCo_5F_EventScript_Scientist",
       "flag": "0"
     }
   ],
@@ -283,21 +283,21 @@
       "x": 28,
       "y": 11,
       "elevation": 0,
-      "script": "SilphCo_5F_EventScript_161813"
+      "script": "SilphCo_5F_EventScript_PokemonReport3"
     },
     {
       "type": "bg_event_type_0",
       "x": 30,
       "y": 13,
       "elevation": 0,
-      "script": "SilphCo_5F_EventScript_16180A"
+      "script": "SilphCo_5F_EventScript_PokemonReport2"
     },
     {
       "type": "bg_event_type_0",
       "x": 25,
       "y": 15,
       "elevation": 0,
-      "script": "SilphCo_5F_EventScript_161801"
+      "script": "SilphCo_5F_EventScript_PokemonReport1"
     },
     {
       "type": "hidden_item",
@@ -314,7 +314,7 @@
       "x": 29,
       "y": 1,
       "elevation": 0,
-      "script": "SilphCo_5F_EventScript_16181C"
+      "script": "SilphCo_5F_EventScript_FloorSign"
     }
   ]
 }
diff --git a/data/maps/SilphCo_5F/scripts.inc b/data/maps/SilphCo_5F/scripts.inc
index 1a17e3b44..ae195ee09 100644
--- a/data/maps/SilphCo_5F/scripts.inc
+++ b/data/maps/SilphCo_5F/scripts.inc
@@ -8,52 +8,52 @@ SilphCo_5F_OnLoad:: @ 81617C4
 	call_if_unset FLAG_SILPH_5F_DOOR_3, EventScript_Close5FDoor3
 	end
 
-SilphCo_5F_EventScript_1617E0:: @ 81617E0
+SilphCo_5F_EventScript_WorkerM:: @ 81617E0
 	lock
 	faceplayer
 	compare VAR_MAP_SCENE_SILPH_CO_11F, 1
-	goto_if_ge EventScript_1617F7
-	msgbox gUnknown_8175B70
+	goto_if_ge SilphCo_5F_EventScript_WorkerMRocketsGone
+	msgbox SilphCo_5F_Text_RocketsInUproarAboutIntruder
 	release
 	end
 
-EventScript_1617F7:: @ 81617F7
-	msgbox gUnknown_8175BB3
+SilphCo_5F_EventScript_WorkerMRocketsGone:: @ 81617F7
+	msgbox SilphCo_5F_Text_YoureOurHeroThankYou
 	release
 	end
 
-SilphCo_5F_EventScript_161801:: @ 8161801
-	msgbox gUnknown_8175D89, MSGBOX_SIGN
+SilphCo_5F_EventScript_PokemonReport1:: @ 8161801
+	msgbox SilphCo_5F_Text_PorygonFirstVRMon, MSGBOX_SIGN
 	end
 
-SilphCo_5F_EventScript_16180A:: @ 816180A
-	msgbox gUnknown_8175DE0, MSGBOX_SIGN
+SilphCo_5F_EventScript_PokemonReport2:: @ 816180A
+	msgbox SilphCo_5F_Text_Over350TechniquesConfirmed, MSGBOX_SIGN
 	end
 
-SilphCo_5F_EventScript_161813:: @ 8161813
-	msgbox gUnknown_8175E28, MSGBOX_SIGN
+SilphCo_5F_EventScript_PokemonReport3:: @ 8161813
+	msgbox SilphCo_5F_Text_SomeMonsEvolveWhenTraded, MSGBOX_SIGN
 	end
 
-SilphCo_5F_EventScript_16181C:: @ 816181C
-	msgbox gUnknown_8175E80, MSGBOX_SIGN
+SilphCo_5F_EventScript_FloorSign:: @ 816181C
+	msgbox SilphCo_5F_Text_FloorSign, MSGBOX_SIGN
 	end
 
-SilphCo_5F_EventScript_161825:: @ 8161825
-	trainerbattle_single TRAINER_SCIENTIST_BEAU, Text_175C40, Text_175C6D
-	msgbox gUnknown_8175C7D, MSGBOX_AUTOCLOSE
+SilphCo_5F_EventScript_Beau:: @ 8161825
+	trainerbattle_single TRAINER_SCIENTIST_BEAU, SilphCo_5F_Text_BeauIntro, SilphCo_5F_Text_BeauDefeat
+	msgbox SilphCo_5F_Text_BeauPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SilphCo_5F_EventScript_16183C:: @ 816183C
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_28, Text_175BE5, Text_175C09
-	msgbox gUnknown_8175C0F, MSGBOX_AUTOCLOSE
+SilphCo_5F_EventScript_Grunt1:: @ 816183C
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_28, SilphCo_5F_Text_Grunt1Intro, SilphCo_5F_Text_Grunt1Defeat
+	msgbox SilphCo_5F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SilphCo_5F_EventScript_161853:: @ 8161853
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_29, Text_175D28, Text_175D4B
-	msgbox gUnknown_8175D59, MSGBOX_AUTOCLOSE
+SilphCo_5F_EventScript_Grunt2:: @ 8161853
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_29, SilphCo_5F_Text_Grunt2Intro, SilphCo_5F_Text_Grunt2Defeat
+	msgbox SilphCo_5F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SilphCo_5F_EventScript_16186A:: @ 816186A
-	trainerbattle_single TRAINER_JUGGLER_DALTON, Text_175CBD, Text_175CEB
-	msgbox gUnknown_8175CF9, MSGBOX_AUTOCLOSE
+SilphCo_5F_EventScript_Dalton:: @ 816186A
+	trainerbattle_single TRAINER_JUGGLER_DALTON, SilphCo_5F_Text_DaltonIntro, SilphCo_5F_Text_DaltonDefeat
+	msgbox SilphCo_5F_Text_DaltonPostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/SilphCo_5F/text.inc b/data/maps/SilphCo_5F/text.inc
index 5a768d5f5..3161f971c 100644
--- a/data/maps/SilphCo_5F/text.inc
+++ b/data/maps/SilphCo_5F/text.inc
@@ -1,74 +1,81 @@
-gUnknown_8175B70:: @ 8175B70
+SilphCo_5F_Text_RocketsInUproarAboutIntruder:: @ 8175B70
     .string "TEAM ROCKET is in an uproar over\n"
     .string "some intruder.\p"
     .string "That's you, right?$"
 
-gUnknown_8175BB3:: @ 8175BB3
+SilphCo_5F_Text_YoureOurHeroThankYou:: @ 8175BB3
     .string "TEAM ROCKET took off!\n"
     .string "You're our hero! Thank you!$"
 
-Text_175BE5:: @ 8175BE5
+SilphCo_5F_Text_Grunt1Intro:: @ 8175BE5
     .string "I heard a kid was wandering\n"
     .string "around.$"
 
-Text_175C09:: @ 8175C09
+SilphCo_5F_Text_Grunt1Defeat:: @ 8175C09
     .string "Boom!$"
 
-gUnknown_8175C0F:: @ 8175C0F
+SilphCo_5F_Text_Grunt1PostBattle:: @ 8175C0F
     .string "It's not smart to pick a fight with\n"
     .string "TEAM ROCKET!$"
 
-Text_175C40:: @ 8175C40
+SilphCo_5F_Text_BeauIntro:: @ 8175C40
     .string "We study POKé BALL technology on\n"
     .string "this floor.$"
 
-Text_175C6D:: @ 8175C6D
+SilphCo_5F_Text_BeauDefeat:: @ 8175C6D
     .string "Dang!\n"
     .string "Blast it!$"
 
-gUnknown_8175C7D:: @ 8175C7D
+SilphCo_5F_Text_BeauPostBattle:: @ 8175C7D
     .string "We worked on the ultimate POKé\n"
     .string "BALL which would catch anything.$"
 
-Text_175CBD:: @ 8175CBD
+SilphCo_5F_Text_DaltonIntro:: @ 8175CBD
     .string "Whaaat?\p"
     .string "There shouldn't be any children\n"
     .string "here!$"
 
-Text_175CEB:: @ 8175CEB
+SilphCo_5F_Text_DaltonDefeat:: @ 8175CEB
     .string "Oh, goodness!$"
 
-gUnknown_8175CF9:: @ 8175CF9
+SilphCo_5F_Text_DaltonPostBattle:: @ 8175CF9
     .string "You're only on 5F.\n"
     .string "It's a long way to my BOSS!$"
 
-Text_175D28:: @ 8175D28
+SilphCo_5F_Text_Grunt2Intro:: @ 8175D28
     .string "Show TEAM ROCKET a little respect!$"
 
-Text_175D4B:: @ 8175D4B
+SilphCo_5F_Text_Grunt2Defeat:: @ 8175D4B
     .string "Cough…\n"
     .string "Cough…$"
 
-gUnknown_8175D59:: @ 8175D59
+SilphCo_5F_Text_Grunt2PostBattle:: @ 8175D59
     .string "Which reminds me.\p"
     .string "KOFFING evolves into WEEZING!$"
 
-gUnknown_8175D89:: @ 8175D89
+SilphCo_5F_Text_PorygonFirstVRMon:: @ 8175D89
     .string "It's a POKéMON REPORT!\p"
     .string "POKéMON LAB created PORYGON,\n"
     .string "the first virtual-reality POKéMON.$"
 
-gUnknown_8175DE0:: @ 8175DE0
+SilphCo_5F_Text_Over350TechniquesConfirmed:: @ 8175DE0
     .string "It's a POKéMON REPORT!\p"
     .string "Over 350 POKéMON techniques have\n"
     .string "been confirmed.$"
 
-gUnknown_8175E28:: @ 8175E28
+SilphCo_5F_Text_SomeMonsEvolveWhenTraded:: @ 8175E28
     .string "It's a POKéMON REPORT!\p"
     .string "Some POKéMON have been confirmed\n"
     .string "to evolve when they are traded.$"
 
-gUnknown_8175E80:: @ 8175E80
+SilphCo_5F_Text_FloorSign:: @ 8175E80
     .string "SILPH CO. HEAD OFFICE\n"
     .string "5F$"
 
+SilphCo_5F_Text_RocketBossLookingForStrongMons:: @ 8175E99
+    .string "Those thugs that took over our\n"
+    .string "building…\p"
+    .string "Their BOSS said he was looking for\n"
+    .string "strong POKéMON.\p"
+    .string "I hope our PRESIDENT managed to\n"
+    .string "avoid trouble…$"
diff --git a/data/maps/SilphCo_6F/map.json b/data/maps/SilphCo_6F/map.json
index a1142c5ed..f5e701cf2 100644
--- a/data/maps/SilphCo_6F/map.json
+++ b/data/maps/SilphCo_6F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "SilphCo_6F_EventScript_161956",
+      "script": "SilphCo_6F_EventScript_Grunt1",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SilphCo_6F_EventScript_1618D3",
+      "script": "SilphCo_6F_EventScript_WorkerM1",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SilphCo_6F_EventScript_1618F4",
+      "script": "SilphCo_6F_EventScript_WorkerF1",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SilphCo_6F_EventScript_161891",
+      "script": "SilphCo_6F_EventScript_WorkerM2",
       "flag": "0"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SilphCo_6F_EventScript_1618B2",
+      "script": "SilphCo_6F_EventScript_WorkerM3",
       "flag": "0"
     },
     {
@@ -88,7 +88,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SilphCo_6F_EventScript_161915",
+      "script": "SilphCo_6F_EventScript_WorkerF2",
       "flag": "0"
     },
     {
@@ -101,7 +101,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "SilphCo_6F_EventScript_16193F",
+      "script": "SilphCo_6F_EventScript_Taylor",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
@@ -140,7 +140,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "SilphCo_6F_EventScript_16196D",
+      "script": "SilphCo_6F_EventScript_Grunt2",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     }
   ],
@@ -226,7 +226,7 @@
       "x": 25,
       "y": 1,
       "elevation": 0,
-      "script": "SilphCo_6F_EventScript_161936"
+      "script": "SilphCo_6F_EventScript_FloorSign"
     }
   ]
 }
diff --git a/data/maps/SilphCo_6F/scripts.inc b/data/maps/SilphCo_6F/scripts.inc
index 6bc5cd545..478ff3309 100644
--- a/data/maps/SilphCo_6F/scripts.inc
+++ b/data/maps/SilphCo_6F/scripts.inc
@@ -6,91 +6,91 @@ SilphCo_6F_OnLoad:: @ 8161887
 	call_if_unset FLAG_SILPH_6F_DOOR, EventScript_Close6FDoor
 	end
 
-SilphCo_6F_EventScript_161891:: @ 8161891
+SilphCo_6F_EventScript_WorkerM2:: @ 8161891
 	lock
 	faceplayer
 	compare VAR_MAP_SCENE_SILPH_CO_11F, 1
-	goto_if_ge EventScript_1618A8
-	msgbox gUnknown_817607E
+	goto_if_ge SilphCo_6F_EventScript_WorkerM2RocketsGone
+	msgbox SilphCo_6F_Text_TargetedSilphForOurMonProducts
 	release
 	end
 
-EventScript_1618A8:: @ 81618A8
-	msgbox gUnknown_81760B6
+SilphCo_6F_EventScript_WorkerM2RocketsGone:: @ 81618A8
+	msgbox SilphCo_6F_Text_ComeWorkForSilphWhenYoureOlder
 	release
 	end
 
-SilphCo_6F_EventScript_1618B2:: @ 81618B2
+SilphCo_6F_EventScript_WorkerM3:: @ 81618B2
 	lock
 	faceplayer
 	compare VAR_MAP_SCENE_SILPH_CO_11F, 1
-	goto_if_ge EventScript_1618C9
-	msgbox gUnknown_8175F24
+	goto_if_ge SilphCo_6F_EventScript_WorkerM3RocketsGone
+	msgbox SilphCo_6F_Text_RocketsTookOverBuilding
 	release
 	end
 
-EventScript_1618C9:: @ 81618C9
-	msgbox gUnknown_8175F51
+SilphCo_6F_EventScript_WorkerM3RocketsGone:: @ 81618C9
+	msgbox SilphCo_6F_Text_BetterGetBackToWork
 	release
 	end
 
-SilphCo_6F_EventScript_1618D3:: @ 81618D3
+SilphCo_6F_EventScript_WorkerM1:: @ 81618D3
 	lock
 	faceplayer
 	compare VAR_MAP_SCENE_SILPH_CO_11F, 1
-	goto_if_ge EventScript_1618EA
-	msgbox gUnknown_8175F70
+	goto_if_ge SilphCo_6F_EventScript_WorkerM1RocketsGone
+	msgbox SilphCo_6F_Text_HelpMePlease
 	release
 	end
 
-EventScript_1618EA:: @ 81618EA
-	msgbox gUnknown_8175F93
+SilphCo_6F_EventScript_WorkerM1RocketsGone:: @ 81618EA
+	msgbox SilphCo_6F_Text_WeGotEngaged
 	release
 	end
 
-SilphCo_6F_EventScript_1618F4:: @ 81618F4
+SilphCo_6F_EventScript_WorkerF1:: @ 81618F4
 	lock
 	faceplayer
 	compare VAR_MAP_SCENE_SILPH_CO_11F, 1
-	goto_if_ge EventScript_16190B
-	msgbox gUnknown_8175FAA
+	goto_if_ge SilphCo_6F_EventScript_WorkerF1RocketsGone
+	msgbox SilphCo_6F_Text_ThatManIsSuchACoward
 	release
 	end
 
-EventScript_16190B:: @ 816190B
-	msgbox gUnknown_8175FD3
+SilphCo_6F_EventScript_WorkerF1RocketsGone:: @ 816190B
+	msgbox SilphCo_6F_Text_NeedsMeToLookAfterHim
 	release
 	end
 
-SilphCo_6F_EventScript_161915:: @ 8161915
+SilphCo_6F_EventScript_WorkerF2:: @ 8161915
 	lock
 	faceplayer
 	compare VAR_MAP_SCENE_SILPH_CO_11F, 1
-	goto_if_ge EventScript_16192C
-	msgbox gUnknown_8176012
+	goto_if_ge SilphCo_6F_EventScript_WorkerF2RocketsGone
+	msgbox SilphCo_6F_Text_RocketsTryingToConquerWorld
 	release
 	end
 
-EventScript_16192C:: @ 816192C
-	msgbox gUnknown_817604B
+SilphCo_6F_EventScript_WorkerF2RocketsGone:: @ 816192C
+	msgbox SilphCo_6F_Text_RocketsRanAwayBecauseOfYou
 	release
 	end
 
-SilphCo_6F_EventScript_161936:: @ 8161936
-	msgbox gUnknown_817624D, MSGBOX_SIGN
+SilphCo_6F_EventScript_FloorSign:: @ 8161936
+	msgbox SilphCo_6F_Text_FloorSign, MSGBOX_SIGN
 	end
 
-SilphCo_6F_EventScript_16193F:: @ 816193F
-	trainerbattle_single TRAINER_SCIENTIST_TAYLOR, Text_176136, Text_1761BD
-	msgbox gUnknown_81761C4, MSGBOX_AUTOCLOSE
+SilphCo_6F_EventScript_Taylor:: @ 816193F
+	trainerbattle_single TRAINER_SCIENTIST_TAYLOR, SilphCo_6F_Text_TaylorIntro, SilphCo_6F_Text_TaylorDefeat
+	msgbox SilphCo_6F_Text_TaylorPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SilphCo_6F_EventScript_161956:: @ 8161956
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_30, Text_1760DE, Text_176104
-	msgbox gUnknown_817610F, MSGBOX_AUTOCLOSE
+SilphCo_6F_EventScript_Grunt1:: @ 8161956
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_30, SilphCo_6F_Text_Grunt1Intro, SilphCo_6F_Text_Grunt1Defeat
+	msgbox SilphCo_6F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SilphCo_6F_EventScript_16196D:: @ 816196D
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_31, Text_1761F1, Text_17620E
-	msgbox gUnknown_817621B, MSGBOX_AUTOCLOSE
+SilphCo_6F_EventScript_Grunt2:: @ 816196D
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_31, SilphCo_6F_Text_Grunt2Intro, SilphCo_6F_Text_Grunt2Defeat
+	msgbox SilphCo_6F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/SilphCo_6F/text.inc b/data/maps/SilphCo_6F/text.inc
index 1de83df51..f0d1084a1 100644
--- a/data/maps/SilphCo_6F/text.inc
+++ b/data/maps/SilphCo_6F/text.inc
@@ -1,86 +1,78 @@
-Text_175E99:: @ 8175E99
-    .string "Those thugs that took over our\n"
-    .string "building…\p"
-    .string "Their BOSS said he was looking for\n"
-    .string "strong POKéMON.\p"
-    .string "I hope our PRESIDENT managed to\n"
-    .string "avoid trouble…$"
-
-gUnknown_8175F24:: @ 8175F24
+SilphCo_6F_Text_RocketsTookOverBuilding:: @ 8175F24
     .string "The ROCKETS came and took over\n"
     .string "the building!$"
 
-gUnknown_8175F51:: @ 8175F51
+SilphCo_6F_Text_BetterGetBackToWork:: @ 8175F51
     .string "Well, better get back to work.$"
 
-gUnknown_8175F70:: @ 8175F70
+SilphCo_6F_Text_HelpMePlease:: @ 8175F70
     .string "Oh dear, oh dear.\n"
     .string "Help me, please!$"
 
-gUnknown_8175F93:: @ 8175F93
+SilphCo_6F_Text_WeGotEngaged:: @ 8175F93
     .string "We got engaged.\n"
     .string "Heheh!$"
 
-gUnknown_8175FAA:: @ 8175FAA
+SilphCo_6F_Text_ThatManIsSuchACoward:: @ 8175FAA
     .string "That man next to me…\n"
     .string "He's such a coward!$"
 
-gUnknown_8175FD3:: @ 8175FD3
+SilphCo_6F_Text_NeedsMeToLookAfterHim:: @ 8175FD3
     .string "He's so helpless, he needed\n"
     .string "someone like me to look after him.$"
 
-gUnknown_8176012:: @ 8176012
+SilphCo_6F_Text_RocketsTryingToConquerWorld:: @ 8176012
     .string "TEAM ROCKET is trying to conquer\n"
     .string "the world with POKéMON.$"
 
-gUnknown_817604B:: @ 817604B
+SilphCo_6F_Text_RocketsRanAwayBecauseOfYou:: @ 817604B
     .string "TEAM ROCKET ran away, and it's all\n"
     .string "because of you!$"
 
-gUnknown_817607E:: @ 817607E
+SilphCo_6F_Text_TargetedSilphForOurMonProducts:: @ 817607E
     .string "They must have targeted SILPH for\n"
     .string "our POKéMON products.$"
 
-gUnknown_81760B6:: @ 81760B6
+SilphCo_6F_Text_ComeWorkForSilphWhenYoureOlder:: @ 81760B6
     .string "Come work for SILPH when you\n"
     .string "get older.$"
 
-Text_1760DE:: @ 81760DE
+SilphCo_6F_Text_Grunt1Intro:: @ 81760DE
     .string "I am one of the four ROCKET\n"
     .string "BROTHERS!$"
 
-Text_176104:: @ 8176104
+SilphCo_6F_Text_Grunt1Defeat:: @ 8176104
     .string "Flame out!$"
 
-gUnknown_817610F:: @ 817610F
+SilphCo_6F_Text_Grunt1PostBattle:: @ 817610F
     .string "No matter!\n"
     .string "My brothers will avenge me!$"
 
-Text_176136:: @ 8176136
+SilphCo_6F_Text_TaylorIntro:: @ 8176136
     .string "That rotten PRESIDENT!\p"
     .string "Serves him right for shipping me\n"
     .string "off to the TIKSI BRANCH!\p"
     .string "That's why TEAM ROCKET came after\n"
     .string "us, I'm sure of it!$"
 
-Text_1761BD:: @ 81761BD
+SilphCo_6F_Text_TaylorDefeat:: @ 81761BD
     .string "Shoot!$"
 
-gUnknown_81761C4:: @ 81761C4
+SilphCo_6F_Text_TaylorPostBattle:: @ 81761C4
     .string "TIKSI BRANCH?\n"
     .string "It's in Russian no-man's-land!$"
 
-Text_1761F1:: @ 81761F1
+SilphCo_6F_Text_Grunt2Intro:: @ 81761F1
     .string "You dare betray TEAM ROCKET?$"
 
-Text_17620E:: @ 817620E
+SilphCo_6F_Text_Grunt2Defeat:: @ 817620E
     .string "You traitor!$"
 
-gUnknown_817621B:: @ 817621B
+SilphCo_6F_Text_Grunt2PostBattle:: @ 817621B
     .string "If you stand for justice, you\n"
     .string "betray us bad guys!$"
 
-gUnknown_817624D:: @ 817624D
+SilphCo_6F_Text_FloorSign:: @ 817624D
     .string "SILPH CO. HEAD OFFICE\n"
     .string "6F$"
 
diff --git a/data/maps/SilphCo_7F/map.json b/data/maps/SilphCo_7F/map.json
index 87a1a413c..994088fb0 100644
--- a/data/maps/SilphCo_7F/map.json
+++ b/data/maps/SilphCo_7F/map.json
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SilphCo_7F_EventScript_161AC8",
+      "script": "SilphCo_7F_EventScript_LaprasGuy",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "SilphCo_7F_EventScript_161C1A",
+      "script": "SilphCo_7F_EventScript_Grunt1",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "SilphCo_7F_EventScript_161C31",
+      "script": "SilphCo_7F_EventScript_Grunt2",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "SilphCo_7F_EventScript_161C48",
+      "script": "SilphCo_7F_EventScript_Grunt3",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
@@ -88,7 +88,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SilphCo_7F_EventScript_161BD9",
+      "script": "SilphCo_7F_EventScript_WorkerF",
       "flag": "0"
     },
     {
@@ -101,7 +101,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SilphCo_7F_EventScript_161B97",
+      "script": "SilphCo_7F_EventScript_WorkerM1",
       "flag": "0"
     },
     {
@@ -114,7 +114,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SilphCo_7F_EventScript_161BB8",
+      "script": "SilphCo_7F_EventScript_WorkerM2",
       "flag": "0"
     },
     {
@@ -127,7 +127,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "SilphCo_7F_EventScript_161C03",
+      "script": "SilphCo_7F_EventScript_Joshua",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
@@ -209,7 +209,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_SILPH_CO_7F",
       "var_value": 0,
-      "script": "SilphCo_7F_EventScript_1619BC"
+      "script": "SilphCo_7F_EventScript_RivalTriggerTop"
     },
     {
       "type": "trigger",
@@ -218,7 +218,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_SILPH_CO_7F",
       "var_value": 0,
-      "script": "SilphCo_7F_EventScript_1619C8"
+      "script": "SilphCo_7F_EventScript_RivalTriggerBottom"
     }
   ],
   "bg_events": [
@@ -321,7 +321,7 @@
       "x": 20,
       "y": 1,
       "elevation": 0,
-      "script": "SilphCo_7F_EventScript_161BFA"
+      "script": "SilphCo_7F_EventScript_FloorSign"
     }
   ]
 }
diff --git a/data/maps/SilphCo_7F/scripts.inc b/data/maps/SilphCo_7F/scripts.inc
index 9ca4f31ec..0bfac0151 100644
--- a/data/maps/SilphCo_7F/scripts.inc
+++ b/data/maps/SilphCo_7F/scripts.inc
@@ -11,30 +11,26 @@ SilphCo_7F_OnLoad:: @ 816198F
 
 SilphCo_7F_OnTransition:: @ 81619AB
 	compare VAR_MAP_SCENE_SILPH_CO_11F, 1
-	call_if_ge EventScript_1619B7
+	call_if_ge SilphCo_7F_EventScript_SetObjRocketsGone
 	end
 
-EventScript_1619B7:: @ 81619B7
-	setobjectmovementtype 8, 7
+SilphCo_7F_EventScript_SetObjRocketsGone:: @ 81619B7
+	setobjectmovementtype 8, MOVEMENT_TYPE_FACE_UP
 	return
 
-SilphCo_7F_EventScript_1619BC:: @ 81619BC
+SilphCo_7F_EventScript_RivalTriggerTop:: @ 81619BC
 	lockall
 	setvar VAR_TEMP_1, 0
-	goto EventScript_1619D4
-
-EventScript_1619C7:: @ 81619C7
+	goto SilphCo_7F_EventScript_RivalScene
 	end
 
-SilphCo_7F_EventScript_1619C8:: @ 81619C8
+SilphCo_7F_EventScript_RivalTriggerBottom:: @ 81619C8
 	lockall
 	setvar VAR_TEMP_1, 1
-	goto EventScript_1619D4
-
-EventScript_1619D3:: @ 81619D3
+	goto SilphCo_7F_EventScript_RivalScene
 	end
 
-EventScript_1619D4:: @ 81619D4
+SilphCo_7F_EventScript_RivalScene:: @ 81619D4
 	textcolor 0
 	playbgm MUS_RIVAL1, 0
 	applymovement 1, Movement_ExclamationMark
@@ -42,26 +38,26 @@ EventScript_1619D4:: @ 81619D4
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown
 	applymovement 1, Movement_Delay48
 	waitmovement 0
-	msgbox gUnknown_8176710
+	msgbox SilphCo_7F_Text_RivalWhatKeptYou
 	compare VAR_TEMP_1, 0
-	call_if_eq EventScript_161A73
+	call_if_eq SilphCo_7F_EventScript_RivalApproachTop
 	compare VAR_TEMP_1, 1
-	call_if_eq EventScript_161A7F
-	msgbox gUnknown_8176727
+	call_if_eq SilphCo_7F_EventScript_RivalApproachBottom
+	msgbox SilphCo_7F_Text_RivalIntro
 	setvar VAR_LAST_TALKED, 1
 	compare VAR_STARTER_MON, 2
-	call_if_eq EventScript_161A80
+	call_if_eq SilphCo_7F_EventScript_RivalSquirtle
 	compare VAR_STARTER_MON, 1
-	call_if_eq EventScript_161A8B
+	call_if_eq SilphCo_7F_EventScript_RivalBulbasaur
 	compare VAR_STARTER_MON, 0
-	call_if_eq EventScript_161A96
-	msgbox gUnknown_8176827
+	call_if_eq SilphCo_7F_EventScript_RivalCharmander
+	msgbox SilphCo_7F_Text_RivalPostBattle
 	closemessage
 	playbgm MUS_RIVAL2, 0
 	compare VAR_TEMP_1, 0
-	call_if_eq EventScript_161AA1
+	call_if_eq SilphCo_7F_EventScript_RivalExitTop
 	compare VAR_TEMP_1, 1
-	call_if_eq EventScript_161AAC
+	call_if_eq SilphCo_7F_EventScript_RivalExitBottom
 	playse SE_TK_WARPIN
 	fadedefaultbgm
 	removeobject 1
@@ -70,42 +66,42 @@ EventScript_1619D4:: @ 81619D4
 	releaseall
 	end
 
-EventScript_161A73:: @ 8161A73
+SilphCo_7F_EventScript_RivalApproachTop:: @ 8161A73
 	closemessage
-	applymovement 1, Movement_161AB7
+	applymovement 1, SilphCo_7F_Movement_RivalApproachTop
 	waitmovement 0
 	return
 
-EventScript_161A7F:: @ 8161A7F
+SilphCo_7F_EventScript_RivalApproachBottom:: @ 8161A7F
 	return
 
-EventScript_161A80:: @ 8161A80
-	trainerbattle_no_intro TRAINER_RIVAL_SILPH_SQUIRTLE, Text_1767D0
+SilphCo_7F_EventScript_RivalSquirtle:: @ 8161A80
+	trainerbattle_no_intro TRAINER_RIVAL_SILPH_SQUIRTLE, SilphCo_7F_Text_RivalDefeat
 	return
 
-EventScript_161A8B:: @ 8161A8B
-	trainerbattle_no_intro TRAINER_RIVAL_SILPH_BULBASAUR, Text_1767D0
+SilphCo_7F_EventScript_RivalBulbasaur:: @ 8161A8B
+	trainerbattle_no_intro TRAINER_RIVAL_SILPH_BULBASAUR, SilphCo_7F_Text_RivalDefeat
 	return
 
-EventScript_161A96:: @ 8161A96
-	trainerbattle_no_intro TRAINER_RIVAL_SILPH_CHARMANDER, Text_1767D0
+SilphCo_7F_EventScript_RivalCharmander:: @ 8161A96
+	trainerbattle_no_intro TRAINER_RIVAL_SILPH_CHARMANDER, SilphCo_7F_Text_RivalDefeat
 	return
 
-EventScript_161AA1:: @ 8161AA1
-	applymovement 1, Movement_161AB9
+SilphCo_7F_EventScript_RivalExitTop:: @ 8161AA1
+	applymovement 1, SilphCo_7F_Movement_RivalExitTop
 	waitmovement 0
 	return
 
-EventScript_161AAC:: @ 8161AAC
-	applymovement 1, Movement_161ABF
+SilphCo_7F_EventScript_RivalExitBottom:: @ 8161AAC
+	applymovement 1, SilphCo_7F_Movement_RivalExitBottom
 	waitmovement 0
 	return
 
-Movement_161AB7:: @ 8161AB7
+SilphCo_7F_Movement_RivalApproachTop:: @ 8161AB7
 	walk_up
 	step_end
 
-Movement_161AB9:: @ 8161AB9
+SilphCo_7F_Movement_RivalExitTop:: @ 8161AB9
 	walk_right
 	walk_right
 	walk_right
@@ -113,7 +109,7 @@ Movement_161AB9:: @ 8161AB9
 	delay_16
 	step_end
 
-Movement_161ABF:: @ 8161ABF
+SilphCo_7F_Movement_RivalExitBottom:: @ 8161ABF
 	walk_left
 	walk_up
 	walk_up
@@ -124,136 +120,130 @@ Movement_161ABF:: @ 8161ABF
 	delay_16
 	step_end
 
-SilphCo_7F_EventScript_161AC8:: @ 8161AC8
+SilphCo_7F_EventScript_LaprasGuy:: @ 8161AC8
 	lock
 	faceplayer
-	goto_if_set FLAG_GOT_LAPRAS_FROM_SILPH, EventScript_161B8D
-	msgbox gUnknown_8176266
+	goto_if_set FLAG_GOT_LAPRAS_FROM_SILPH, SilphCo_7F_EventScript_AlreadyGotLapras
+	msgbox SilphCo_7F_Text_HaveMonForSavingUs
 	setvar VAR_TEMP_1, SPECIES_LAPRAS
 	givemon SPECIES_LAPRAS, 25, ITEM_NONE
 	compare VAR_RESULT, 0
-	goto_if_eq EventScript_161B12
+	goto_if_eq SilphCo_7F_EventScript_ReceiveLaprasParty
 	compare VAR_RESULT, 1
-	goto_if_eq EventScript_161B45
+	goto_if_eq SilphCo_7F_EventScript_ReceiveLaprasPC
 	compare VAR_RESULT, 2
 	goto_if_eq EventScript_NoMoreRoomForPokemon
 	release
 	end
 
-EventScript_161B12:: @ 8161B12
+SilphCo_7F_EventScript_ReceiveLaprasParty:: @ 8161B12
 	textcolor 3
 	playfanfare MUS_FANFA1
-	message Text_1762D7
+	message SilphCo_7F_Text_ObtainedLaprasFromEmployee
 	waitmessage
 	waitfanfare
 	getspeciesname 0, SPECIES_LAPRAS
 	msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_161B7E
+	goto_if_eq SilphCo_7F_EventScript_EndReceiveLapras
 	call EventScript_GetGiftMonPartySlot
 	call EventScript_ChangePokemonNickname
-	goto EventScript_161B7E
-
-EventScript_161B44:: @ 8161B44
+	goto SilphCo_7F_EventScript_EndReceiveLapras
 	end
 
-EventScript_161B45:: @ 8161B45
+SilphCo_7F_EventScript_ReceiveLaprasPC:: @ 8161B45
 	textcolor 3
 	playfanfare MUS_FANFA1
-	message Text_1762D7
+	message SilphCo_7F_Text_ObtainedLaprasFromEmployee
 	waitmessage
 	waitfanfare
 	getspeciesname 0, SPECIES_LAPRAS
 	msgbox Text_GiveNicknameToThisMon, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_161B73
+	goto_if_eq SilphCo_7F_EventScript_LaprasTransferredToPC
 	call EventScript_NameReceivedBoxMon
-	goto EventScript_161B73
-
-EventScript_161B72:: @ 8161B72
+	goto SilphCo_7F_EventScript_LaprasTransferredToPC
 	end
 
-EventScript_161B73:: @ 8161B73
+SilphCo_7F_EventScript_LaprasTransferredToPC:: @ 8161B73
 	call EventScript_TransferredToPC
-	goto EventScript_161B7E
-
-EventScript_161B7D:: @ 8161B7D
+	goto SilphCo_7F_EventScript_EndReceiveLapras
 	end
 
-EventScript_161B7E:: @ 8161B7E
+SilphCo_7F_EventScript_EndReceiveLapras:: @ 8161B7E
 	textcolor 0
-	msgbox gUnknown_8176305
+	msgbox SilphCo_7F_Text_ExplainLapras
 	setflag FLAG_GOT_LAPRAS_FROM_SILPH
 	release
 	end
 
-EventScript_161B8D:: @ 8161B8D
-	msgbox gUnknown_81763DD
+SilphCo_7F_EventScript_AlreadyGotLapras:: @ 8161B8D
+	msgbox SilphCo_7F_Text_RocketBossWentToBoardroom
 	release
 	end
 
-SilphCo_7F_EventScript_161B97:: @ 8161B97
+SilphCo_7F_EventScript_WorkerM1:: @ 8161B97
 	lock
 	faceplayer
 	compare VAR_MAP_SCENE_SILPH_CO_11F, 1
-	goto_if_ge EventScript_161BAE
-	msgbox gUnknown_8176444
+	goto_if_ge SilphCo_7F_EventScript_WorkerM1RocketsGone
+	msgbox SilphCo_7F_Text_RocketsAfterMasterBall
 	release
 	end
 
-EventScript_161BAE:: @ 8161BAE
-	msgbox gUnknown_8176486
+SilphCo_7F_EventScript_WorkerM1RocketsGone:: @ 8161BAE
+	msgbox SilphCo_7F_Text_CanceledMasterBallProject
 	release
 	end
 
-SilphCo_7F_EventScript_161BB8:: @ 8161BB8
+SilphCo_7F_EventScript_WorkerM2:: @ 8161BB8
 	lock
 	faceplayer
 	compare VAR_MAP_SCENE_SILPH_CO_11F, 1
-	goto_if_ge EventScript_161BCF
-	msgbox gUnknown_81764C2
+	goto_if_ge SilphCo_7F_EventScript_WorkerM2RocketsGone
+	msgbox SilphCo_7F_Text_BadIfTeamRocketTookOver
 	release
 	end
 
-EventScript_161BCF:: @ 8161BCF
-	msgbox gUnknown_8176501
+SilphCo_7F_EventScript_WorkerM2RocketsGone:: @ 8161BCF
+	msgbox SilphCo_7F_Text_WowYouChasedOffTeamRocket
 	release
 	end
 
-SilphCo_7F_EventScript_161BD9:: @ 8161BD9
+SilphCo_7F_EventScript_WorkerF:: @ 8161BD9
 	lock
 	faceplayer
 	compare VAR_MAP_SCENE_SILPH_CO_11F, 1
-	goto_if_ge EventScript_161BF0
-	msgbox gUnknown_8176532
+	goto_if_ge SilphCo_7F_EventScript_WorkerFRocketsGone
+	msgbox SilphCo_7F_Text_ReallyDangerousHere
 	release
 	end
 
-EventScript_161BF0:: @ 8161BF0
-	msgbox gUnknown_8176573
+SilphCo_7F_EventScript_WorkerFRocketsGone:: @ 8161BF0
+	msgbox SilphCo_7F_Text_ThankYouSoMuch
 	release
 	end
 
-SilphCo_7F_EventScript_161BFA:: @ 8161BFA
-	msgbox gUnknown_8176954, MSGBOX_SIGN
+SilphCo_7F_EventScript_FloorSign:: @ 8161BFA
+	msgbox SilphCo_7F_Text_FloorSign, MSGBOX_SIGN
 	end
 
-SilphCo_7F_EventScript_161C03:: @ 8161C03
-	trainerbattle_single TRAINER_SCIENTIST_JOSHUA, Text_1765E2, Text_17660C
-	msgbox gUnknown_8176616, MSGBOX_AUTOCLOSE
+SilphCo_7F_EventScript_Joshua:: @ 8161C03
+	trainerbattle_single TRAINER_SCIENTIST_JOSHUA, SilphCo_7F_Text_JoshuaIntro, SilphCo_7F_Text_JoshuaDefeat
+	msgbox SilphCo_7F_Text_JoshuaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SilphCo_7F_EventScript_161C1A:: @ 8161C1A
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_33, Text_176643, Text_176669
-	msgbox gUnknown_8176681, MSGBOX_AUTOCLOSE
+SilphCo_7F_EventScript_Grunt1:: @ 8161C1A
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_33, SilphCo_7F_Text_Grunt1Intro, SilphCo_7F_Text_Grunt1Defeat
+	msgbox SilphCo_7F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SilphCo_7F_EventScript_161C31:: @ 8161C31
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_34, Text_1766B3, Text_1766D7
-	msgbox gUnknown_81766E5, MSGBOX_AUTOCLOSE
+SilphCo_7F_EventScript_Grunt2:: @ 8161C31
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_34, SilphCo_7F_Text_Grunt2Intro, SilphCo_7F_Text_Grunt2Defeat
+	msgbox SilphCo_7F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SilphCo_7F_EventScript_161C48:: @ 8161C48
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_35, Text_176586, Text_1765A5
-	msgbox gUnknown_81765B1, MSGBOX_AUTOCLOSE
+SilphCo_7F_EventScript_Grunt3:: @ 8161C48
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_35, SilphCo_7F_Text_Grunt3Intro, SilphCo_7F_Text_Grunt3Defeat
+	msgbox SilphCo_7F_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/SilphCo_7F/text.inc b/data/maps/SilphCo_7F/text.inc
index d977d816e..27e01c4a5 100644
--- a/data/maps/SilphCo_7F/text.inc
+++ b/data/maps/SilphCo_7F/text.inc
@@ -1,15 +1,15 @@
-gUnknown_8176266:: @ 8176266
+SilphCo_7F_Text_HaveMonForSavingUs:: @ 8176266
     .string "Oh! Hi! You're not a ROCKET!\n"
     .string "You came to save us?\l"
     .string "Why, thank you!\p"
     .string "I want you to have this POKéMON\n"
     .string "for saving us.$"
 
-Text_1762D7:: @ 81762D7
+SilphCo_7F_Text_ObtainedLaprasFromEmployee:: @ 81762D7
     .string "{PLAYER} obtained a LAPRAS from\n"
     .string "the SILPH employee!$"
 
-gUnknown_8176305:: @ 8176305
+SilphCo_7F_Text_ExplainLapras:: @ 8176305
     .string "It's a LAPRAS.\n"
     .string "It's a very intelligent POKéMON.\p"
     .string "We kept it in our lab, but it will\n"
@@ -19,94 +19,94 @@ gUnknown_8176305:: @ 8176305
     .string "It's a good swimmer.\n"
     .string "It'll give you a lift across water!$"
 
-gUnknown_81763DD:: @ 81763DD
+SilphCo_7F_Text_RocketBossWentToBoardroom:: @ 81763DD
     .string "TEAM ROCKET's BOSS went to the\n"
     .string "boardroom!\p"
     .string "Is our PRESIDENT okay?\n"
     .string "I'm worried.$"
 
-Text_17642B:: @ 817642B
+SilphCo_7F_Text_OhNo:: @ 817642B
     .string "あ‥　もう　もてないぞ$"
 
-Text_176437:: @ 8176437
+SilphCo_7F_Text_SavedAtLast:: @ 8176437
     .string "たすかったよ　ありがと！$"
 
-gUnknown_8176444:: @ 8176444
+SilphCo_7F_Text_RocketsAfterMasterBall:: @ 8176444
     .string "TEAM ROCKET was after the MASTER\n"
     .string "BALL, which catches any POKéMON.$"
 
-gUnknown_8176486:: @ 8176486
+SilphCo_7F_Text_CanceledMasterBallProject:: @ 8176486
     .string "We canceled the MASTER BALL\n"
     .string "project because of TEAM ROCKET.$"
 
-gUnknown_81764C2:: @ 81764C2
+SilphCo_7F_Text_BadIfTeamRocketTookOver:: @ 81764C2
     .string "It would be bad if TEAM ROCKET\n"
     .string "took over SILPH or our POKéMON.$"
 
-gUnknown_8176501:: @ 8176501
+SilphCo_7F_Text_WowYouChasedOffTeamRocket:: @ 8176501
     .string "Wow!\p"
     .string "You chased off TEAM ROCKET all by\n"
     .string "yourself?$"
 
-gUnknown_8176532:: @ 8176532
+SilphCo_7F_Text_ReallyDangerousHere:: @ 8176532
     .string "You!\n"
     .string "It's really dangerous here!\p"
     .string "You came to save me?\n"
     .string "You can't!$"
 
-gUnknown_8176573:: @ 8176573
+SilphCo_7F_Text_ThankYouSoMuch:: @ 8176573
     .string "Thank you so much!$"
 
-Text_176586:: @ 8176586
+SilphCo_7F_Text_Grunt3Intro:: @ 8176586
     .string "Uh-oh!\n"
     .string "I smell a little mouse!$"
 
-Text_1765A5:: @ 81765A5
+SilphCo_7F_Text_Grunt3Defeat:: @ 81765A5
     .string "Lights out!$"
 
-gUnknown_81765B1:: @ 81765B1
+SilphCo_7F_Text_Grunt3PostBattle:: @ 81765B1
     .string "You won't find my BOSS by just\n"
     .string "scurrying around!$"
 
-Text_1765E2:: @ 81765E2
+SilphCo_7F_Text_JoshuaIntro:: @ 81765E2
     .string "Heheh!\p"
     .string "You mistook me for a SILPH worker?$"
 
-Text_17660C:: @ 817660C
+SilphCo_7F_Text_JoshuaDefeat:: @ 817660C
     .string "I'm done!$"
 
-gUnknown_8176616:: @ 8176616
+SilphCo_7F_Text_JoshuaPostBattle:: @ 8176616
     .string "Despite your age, you are a\n"
     .string "skilled TRAINER!$"
 
-Text_176643:: @ 8176643
+SilphCo_7F_Text_Grunt1Intro:: @ 8176643
     .string "I am one of the four ROCKET\n"
     .string "BROTHERS!$"
 
-Text_176669:: @ 8176669
+SilphCo_7F_Text_Grunt1Defeat:: @ 8176669
     .string "Aack!\n"
     .string "Brothers, I lost!$"
 
-gUnknown_8176681:: @ 8176681
+SilphCo_7F_Text_Grunt1PostBattle:: @ 8176681
     .string "Doesn't matter.\n"
     .string "My brothers will repay the favor!$"
 
-Text_1766B3:: @ 81766B3
+SilphCo_7F_Text_Grunt2Intro:: @ 81766B3
     .string "A child intruder?\n"
     .string "That must be you!$"
 
-Text_1766D7:: @ 81766D7
+SilphCo_7F_Text_Grunt2Defeat:: @ 81766D7
     .string "Fine!\n"
     .string "I lost!$"
 
-gUnknown_81766E5:: @ 81766E5
+SilphCo_7F_Text_Grunt2PostBattle:: @ 81766E5
     .string "Go on home before my BOSS gets\n"
     .string "ticked off!$"
 
-gUnknown_8176710:: @ 8176710
+SilphCo_7F_Text_RivalWhatKeptYou:: @ 8176710
     .string "{RIVAL}: What kept you, {PLAYER}?$"
 
-gUnknown_8176727:: @ 8176727
+SilphCo_7F_Text_RivalIntro:: @ 8176727
     .string "{RIVAL}: Hahaha! I thought you'd\n"
     .string "turn up if I waited here!\p"
     .string "I guess TEAM ROCKET slowed you\n"
@@ -114,18 +114,18 @@ gUnknown_8176727:: @ 8176727
     .string "I saw you in SAFFRON, so I decided\n"
     .string "to see if you got better!$"
 
-Text_1767D0:: @ 81767D0
+SilphCo_7F_Text_RivalDefeat:: @ 81767D0
     .string "Oh, man!\n"
     .string "So, you are ready for BOSS\l"
     .string "ROCKET!$"
 
-Text_1767FC:: @ 81767FC
+SilphCo_7F_Text_RivalVictory:: @ 81767FC
     .string "{RIVAL}“おまえなあ‥\p"
     .string "こんな　うでまえじゃ\n"
     .string "まだまだ‥\l"
     .string "いちにんまえ　とは　いえないぜ$"
 
-gUnknown_8176827:: @ 8176827
+SilphCo_7F_Text_RivalPostBattle:: @ 8176827
     .string "Well, {PLAYER}!\n"
     .string "I'm moving on up and ahead!\p"
     .string "By checking my POKéDEX, I'm\n"
@@ -140,7 +140,7 @@ gUnknown_8176827:: @ 8176827
     .string "Don't sweat it!\l"
     .string "Smell ya!$"
 
-gUnknown_8176954:: @ 8176954
+SilphCo_7F_Text_FloorSign:: @ 8176954
     .string "SILPH CO. HEAD OFFICE\n"
     .string "7F$"
 
diff --git a/data/maps/SilphCo_8F/map.json b/data/maps/SilphCo_8F/map.json
index ef04548df..badb0553e 100644
--- a/data/maps/SilphCo_8F/map.json
+++ b/data/maps/SilphCo_8F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "SilphCo_8F_EventScript_161CB0",
+      "script": "SilphCo_8F_EventScript_Grunt1",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 5,
-      "script": "SilphCo_8F_EventScript_161CC7",
+      "script": "SilphCo_8F_EventScript_Grunt2",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "SilphCo_8F_EventScript_161C99",
+      "script": "SilphCo_8F_EventScript_Parker",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SilphCo_8F_EventScript_161C6F",
+      "script": "SilphCo_8F_EventScript_WorkerM",
       "flag": "0"
     },
     {
@@ -88,7 +88,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SilphCo_8F_EventScript_1AD0ED",
+      "script": "SilphCo_8F_EventScript_Scientist",
       "flag": "0"
     }
   ],
@@ -188,7 +188,7 @@
       "x": 27,
       "y": 1,
       "elevation": 0,
-      "script": "SilphCo_8F_EventScript_161C90"
+      "script": "SilphCo_8F_EventScript_FloorSign"
     }
   ]
 }
diff --git a/data/maps/SilphCo_8F/scripts.inc b/data/maps/SilphCo_8F/scripts.inc
index f96188c3f..d888f339e 100644
--- a/data/maps/SilphCo_8F/scripts.inc
+++ b/data/maps/SilphCo_8F/scripts.inc
@@ -6,35 +6,35 @@ SilphCo_8F_OnLoad:: @ 8161C65
 	call_if_unset FLAG_SILPH_8F_DOOR, EventScript_Close8FDoor
 	end
 
-SilphCo_8F_EventScript_161C6F:: @ 8161C6F
+SilphCo_8F_EventScript_WorkerM:: @ 8161C6F
 	lock
 	faceplayer
 	compare VAR_MAP_SCENE_SILPH_CO_11F, 1
-	goto_if_ge EventScript_161C86
-	msgbox gUnknown_817696D
+	goto_if_ge SilphCo_8F_EventScript_WorkerMRocketsGone
+	msgbox SilphCo_8F_Text_WonderIfSilphIsFinished
 	release
 	end
 
-EventScript_161C86:: @ 8161C86
-	msgbox gUnknown_817698C
+SilphCo_8F_EventScript_WorkerMRocketsGone:: @ 8161C86
+	msgbox SilphCo_8F_Text_ThanksForSavingUs
 	release
 	end
 
-SilphCo_8F_EventScript_161C90:: @ 8161C90
-	msgbox gUnknown_8176AB2, MSGBOX_SIGN
+SilphCo_8F_EventScript_FloorSign:: @ 8161C90
+	msgbox SilphCo_8F_Text_FloorSign, MSGBOX_SIGN
 	end
 
-SilphCo_8F_EventScript_161C99:: @ 8161C99
-	trainerbattle_single TRAINER_SCIENTIST_PARKER, Text_1769FD, Text_176A19
-	msgbox gUnknown_8176A26, MSGBOX_AUTOCLOSE
+SilphCo_8F_EventScript_Parker:: @ 8161C99
+	trainerbattle_single TRAINER_SCIENTIST_PARKER, SilphCo_8F_Text_ParkerIntro, SilphCo_8F_Text_ParkerDefeat
+	msgbox SilphCo_8F_Text_ParkerPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SilphCo_8F_EventScript_161CB0:: @ 8161CB0
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_32, Text_1769A2, Text_1769BE
-	msgbox gUnknown_81769CF, MSGBOX_AUTOCLOSE
+SilphCo_8F_EventScript_Grunt1:: @ 8161CB0
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_32, SilphCo_8F_Text_Grunt1Intro, SilphCo_8F_Text_Grunt1Defeat
+	msgbox SilphCo_8F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SilphCo_8F_EventScript_161CC7:: @ 8161CC7
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_36, Text_176A56, Text_176A7C
-	msgbox gUnknown_8176A90, MSGBOX_AUTOCLOSE
+SilphCo_8F_EventScript_Grunt2:: @ 8161CC7
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_36, SilphCo_8F_Text_Grunt2Intro, SilphCo_8F_Text_Grunt2Defeat
+	msgbox SilphCo_8F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/SilphCo_8F/text.inc b/data/maps/SilphCo_8F/text.inc
index 858d5da17..9144cda4e 100644
--- a/data/maps/SilphCo_8F/text.inc
+++ b/data/maps/SilphCo_8F/text.inc
@@ -1,42 +1,49 @@
-gUnknown_817696D:: @ 817696D
+SilphCo_8F_Text_WonderIfSilphIsFinished:: @ 817696D
     .string "I wonder if SILPH is finished…$"
 
-gUnknown_817698C:: @ 817698C
+SilphCo_8F_Text_ThanksForSavingUs:: @ 817698C
     .string "Thanks for saving us!$"
 
-Text_1769A2:: @ 81769A2
+SilphCo_8F_Text_Grunt1Intro:: @ 81769A2
     .string "That's as far as you'll go!$"
 
-Text_1769BE:: @ 81769BE
+SilphCo_8F_Text_Grunt1Defeat:: @ 81769BE
     .string "Not enough grit!$"
 
-gUnknown_81769CF:: @ 81769CF
+SilphCo_8F_Text_Grunt1PostBattle:: @ 81769CF
     .string "If you don't turn back…\n"
     .string "I'll call for backup!$"
 
-Text_1769FD:: @ 81769FD
+SilphCo_8F_Text_ParkerIntro:: @ 81769FD
     .string "You're causing us problems!$"
 
-Text_176A19:: @ 8176A19
+SilphCo_8F_Text_ParkerDefeat:: @ 8176A19
     .string "Huh?\n"
     .string "I lost?$"
 
-gUnknown_8176A26:: @ 8176A26
+SilphCo_8F_Text_ParkerPostBattle:: @ 8176A26
     .string "So, what do you think of SILPH\n"
     .string "BUILDING's maze?$"
 
-Text_176A56:: @ 8176A56
+SilphCo_8F_Text_Grunt2Intro:: @ 8176A56
     .string "I am one of the four ROCKET\n"
     .string "BROTHERS!$"
 
-Text_176A7C:: @ 8176A7C
+SilphCo_8F_Text_Grunt2Defeat:: @ 8176A7C
     .string "Whoo!\n"
     .string "Oh, Brothers!$"
 
-gUnknown_8176A90:: @ 8176A90
+SilphCo_8F_Text_Grunt2PostBattle:: @ 8176A90
     .string "I'll leave you up to my brothers.$"
 
-gUnknown_8176AB2:: @ 8176AB2
+SilphCo_8F_Text_FloorSign:: @ 8176AB2
     .string "SILPH CO. HEAD OFFICE\n"
     .string "8F$"
 
+SilphCo_8F_Text_ToRocketBossMonsAreTools:: @ 8176ACB
+    .string "TEAM ROCKET's BOSS is terribly\n"
+    .string "cruel!\p"
+    .string "To him, POKéMON are just tools to\n"
+    .string "be used.\p"
+    .string "What will happen if that tyrant\n"
+    .string "takes over our company…$"
diff --git a/data/maps/SilphCo_9F/map.json b/data/maps/SilphCo_9F/map.json
index e8f39eba5..92a229699 100644
--- a/data/maps/SilphCo_9F/map.json
+++ b/data/maps/SilphCo_9F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "SilphCo_9F_EventScript_161D41",
+      "script": "SilphCo_9F_EventScript_Ed",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "SilphCo_9F_EventScript_161D6F",
+      "script": "SilphCo_9F_EventScript_Grunt2",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SilphCo_9F_EventScript_161D09",
+      "script": "SilphCo_9F_EventScript_HealWoman",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 5,
-      "script": "SilphCo_9F_EventScript_161D58",
+      "script": "SilphCo_9F_EventScript_Grunt1",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     }
   ],
@@ -242,7 +242,7 @@
       "x": 17,
       "y": 1,
       "elevation": 0,
-      "script": "SilphCo_9F_EventScript_161D38"
+      "script": "SilphCo_9F_EventScript_FloorSign"
     }
   ]
 }
diff --git a/data/maps/SilphCo_9F/scripts.inc b/data/maps/SilphCo_9F/scripts.inc
index 7f4258b5d..5cdfc2c82 100644
--- a/data/maps/SilphCo_9F/scripts.inc
+++ b/data/maps/SilphCo_9F/scripts.inc
@@ -9,38 +9,38 @@ SilphCo_9F_OnLoad:: @ 8161CE4
 	call_if_unset FLAG_SILPH_9F_DOOR_4, EventScript_Close9FDoor4
 	end
 
-SilphCo_9F_EventScript_161D09:: @ 8161D09
+SilphCo_9F_EventScript_HealWoman:: @ 8161D09
 	lock
 	faceplayer
 	compare VAR_MAP_SCENE_SILPH_CO_11F, 1
-	goto_if_ge EventScript_161D2E
-	msgbox gUnknown_8176B54
+	goto_if_ge SilphCo_9F_EventScript_HealWomanRocketsGone
+	msgbox SilphCo_9F_Text_YouShouldTakeQuickNap
 	closemessage
 	call EventScript_OutOfCenterPartyHeal
-	msgbox gUnknown_8176B81
+	msgbox SilphCo_9F_Text_DontGiveUp
 	release
 	end
 
-EventScript_161D2E:: @ 8161D2E
-	msgbox gUnknown_8176B90
+SilphCo_9F_EventScript_HealWomanRocketsGone:: @ 8161D2E
+	msgbox SilphCo_9F_Text_ThankYouSoMuch
 	release
 	end
 
-SilphCo_9F_EventScript_161D38:: @ 8161D38
-	msgbox gUnknown_8176CD4, MSGBOX_SIGN
+SilphCo_9F_EventScript_FloorSign:: @ 8161D38
+	msgbox SilphCo_9F_Text_FloorSign, MSGBOX_SIGN
 	end
 
-SilphCo_9F_EventScript_161D41:: @ 8161D41
-	trainerbattle_single TRAINER_SCIENTIST_ED, Text_176BFB, Text_176C2B
-	msgbox gUnknown_8176C3C, MSGBOX_AUTOCLOSE
+SilphCo_9F_EventScript_Ed:: @ 8161D41
+	trainerbattle_single TRAINER_SCIENTIST_ED, SilphCo_9F_Text_EdIntro, SilphCo_9F_Text_EdDefeat
+	msgbox SilphCo_9F_Text_EdPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SilphCo_9F_EventScript_161D58:: @ 8161D58
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_37, Text_176BA3, Text_176BC8
-	msgbox gUnknown_8176BD0, MSGBOX_AUTOCLOSE
+SilphCo_9F_EventScript_Grunt1:: @ 8161D58
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_37, SilphCo_9F_Text_Grunt1Intro, SilphCo_9F_Text_Grunt1Defeat
+	msgbox SilphCo_9F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SilphCo_9F_EventScript_161D6F:: @ 8161D6F
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_38, Text_176C7A, Text_176CA0
-	msgbox gUnknown_8176CB8, MSGBOX_AUTOCLOSE
+SilphCo_9F_EventScript_Grunt2:: @ 8161D6F
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_38, SilphCo_9F_Text_Grunt2Intro, SilphCo_9F_Text_Grunt2Defeat
+	msgbox SilphCo_9F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/SilphCo_9F/text.inc b/data/maps/SilphCo_9F/text.inc
index bf400f768..f89262090 100644
--- a/data/maps/SilphCo_9F/text.inc
+++ b/data/maps/SilphCo_9F/text.inc
@@ -1,55 +1,47 @@
-Text_176ACB:: @ 8176ACB
-    .string "TEAM ROCKET's BOSS is terribly\n"
-    .string "cruel!\p"
-    .string "To him, POKéMON are just tools to\n"
-    .string "be used.\p"
-    .string "What will happen if that tyrant\n"
-    .string "takes over our company…$"
-
-gUnknown_8176B54:: @ 8176B54
+SilphCo_9F_Text_YouShouldTakeQuickNap:: @ 8176B54
     .string "You look tired.\n"
     .string "You should take a quick nap.$"
 
-gUnknown_8176B81:: @ 8176B81
+SilphCo_9F_Text_DontGiveUp:: @ 8176B81
     .string "Don't give up!$"
 
-gUnknown_8176B90:: @ 8176B90
+SilphCo_9F_Text_ThankYouSoMuch:: @ 8176B90
     .string "Thank you so much.$"
 
-Text_176BA3:: @ 8176BA3
+SilphCo_9F_Text_Grunt1Intro:: @ 8176BA3
     .string "Your POKéMON seem to adore you,\n"
     .string "kid!$"
 
-Text_176BC8:: @ 8176BC8
+SilphCo_9F_Text_Grunt1Defeat:: @ 8176BC8
     .string "Ghaaah!$"
 
-gUnknown_8176BD0:: @ 8176BD0
+SilphCo_9F_Text_Grunt1PostBattle:: @ 8176BD0
     .string "If I had started as a TRAINER at\n"
     .string "your age…$"
 
-Text_176BFB:: @ 8176BFB
+SilphCo_9F_Text_EdIntro:: @ 8176BFB
     .string "Your POKéMON have weak points!\n"
     .string "I can nail them!$"
 
-Text_176C2B:: @ 8176C2B
+SilphCo_9F_Text_EdDefeat:: @ 8176C2B
     .string "You hammered me!$"
 
-gUnknown_8176C3C:: @ 8176C3C
+SilphCo_9F_Text_EdPostBattle:: @ 8176C3C
     .string "Exploiting weak spots does work.\n"
     .string "Think about type advantages.$"
 
-Text_176C7A:: @ 8176C7A
+SilphCo_9F_Text_Grunt2Intro:: @ 8176C7A
     .string "I am one of the four ROCKET\n"
     .string "BROTHERS!$"
 
-Text_176CA0:: @ 8176CA0
+SilphCo_9F_Text_Grunt2Defeat:: @ 8176CA0
     .string "Warg!\n"
     .string "Brothers, I lost!$"
 
-gUnknown_8176CB8:: @ 8176CB8
+SilphCo_9F_Text_Grunt2PostBattle:: @ 8176CB8
     .string "My brothers will avenge me!$"
 
-gUnknown_8176CD4:: @ 8176CD4
+SilphCo_9F_Text_FloorSign:: @ 8176CD4
     .string "SILPH CO. HEAD OFFICE\n"
     .string "9F$"
 
diff --git a/data/maps/SilphCo_Elevator/map.json b/data/maps/SilphCo_Elevator/map.json
index 815ed916e..857d5c209 100644
--- a/data/maps/SilphCo_Elevator/map.json
+++ b/data/maps/SilphCo_Elevator/map.json
@@ -29,7 +29,7 @@
       "x": 0,
       "y": 2,
       "elevation": 3,
-      "script": "SilphCo_Elevator_EventScript_161F6F"
+      "script": "SilphCo_Elevator_EventScript_FloorSelect"
     }
   ]
 }
diff --git a/data/maps/SilphCo_Elevator/scripts.inc b/data/maps/SilphCo_Elevator/scripts.inc
index 87ed62c9b..790eba70a 100644
--- a/data/maps/SilphCo_Elevator/scripts.inc
+++ b/data/maps/SilphCo_Elevator/scripts.inc
@@ -1,10 +1,10 @@
 SilphCo_Elevator_MapScripts:: @ 8161F6E
 	.byte 0
 
-SilphCo_Elevator_EventScript_161F6F:: @ 8161F6F
+SilphCo_Elevator_EventScript_FloorSelect:: @ 8161F6F
 	lockall
 	setvar VAR_0x8004, 1
-	call_if_unset FLAG_TEMP_2, EventScript_1A7AB9
+	call_if_unset FLAG_TEMP_2, EventScript_GetElevatorFloor
 	copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR
 	special Special_DrawElevatorCurrentFloorWindow
 	message Text_WantWhichFloor
@@ -14,159 +14,137 @@ SilphCo_Elevator_EventScript_161F6F:: @ 8161F6F
 	special Special_ListMenu
 	waitstate
 	switch VAR_RESULT
-	case 0, EventScript_1621BF
-	case 1, EventScript_162197
-	case 2, EventScript_16216F
-	case 3, EventScript_162147
-	case 4, EventScript_16211F
-	case 5, EventScript_1620F7
-	case 6, EventScript_1620CF
-	case 7, EventScript_1620A7
-	case 8, EventScript_16207F
-	case 9, EventScript_162057
-	case 10, EventScript_16202F
-	case 11, EventScript_1621E7
-	case 127, EventScript_1621E7
+	case 0, SilphCo_Elevator_EventScript_To11F
+	case 1, SilphCo_Elevator_EventScript_To10F
+	case 2, SilphCo_Elevator_EventScript_To9F
+	case 3, SilphCo_Elevator_EventScript_To8F
+	case 4, SilphCo_Elevator_EventScript_To7F
+	case 5, SilphCo_Elevator_EventScript_To6F
+	case 6, SilphCo_Elevator_EventScript_To5F
+	case 7, SilphCo_Elevator_EventScript_To4F
+	case 8, SilphCo_Elevator_EventScript_To3F
+	case 9, SilphCo_Elevator_EventScript_To2F
+	case 10, SilphCo_Elevator_EventScript_To1F
+	case 11, SilphCo_Elevator_EventScript_ExitFloorSelect
+	case 127, SilphCo_Elevator_EventScript_ExitFloorSelect
 	end
 
-EventScript_16202F:: @ 816202F
+SilphCo_Elevator_EventScript_To1F:: @ 816202F
 	setvar VAR_0x8006, 4
 	setdynamicwarp MAP_SILPH_CO_1F, 255, 22, 3
 	compare VAR_ELEVATOR_FLOOR, 4
-	goto_if_eq EventScript_1621E7
-	call EventScript_1621EC
+	goto_if_eq SilphCo_Elevator_EventScript_ExitFloorSelect
+	call SilphCo_Elevator_EventScript_MoveElevator
 	setvar VAR_ELEVATOR_FLOOR, 4
-	goto EventScript_1621E7
-
-EventScript_162056:: @ 8162056
+	goto SilphCo_Elevator_EventScript_ExitFloorSelect
 	end
 
-EventScript_162057:: @ 8162057
+SilphCo_Elevator_EventScript_To2F:: @ 8162057
 	setvar VAR_0x8006, 5
 	setdynamicwarp MAP_SILPH_CO_2F, 255, 22, 3
 	compare VAR_ELEVATOR_FLOOR, 5
-	goto_if_eq EventScript_1621E7
-	call EventScript_1621EC
+	goto_if_eq SilphCo_Elevator_EventScript_ExitFloorSelect
+	call SilphCo_Elevator_EventScript_MoveElevator
 	setvar VAR_ELEVATOR_FLOOR, 5
-	goto EventScript_1621E7
-
-EventScript_16207E:: @ 816207E
+	goto SilphCo_Elevator_EventScript_ExitFloorSelect
 	end
 
-EventScript_16207F:: @ 816207F
+SilphCo_Elevator_EventScript_To3F:: @ 816207F
 	setvar VAR_0x8006, 6
 	setdynamicwarp MAP_SILPH_CO_3F, 255, 22, 3
 	compare VAR_ELEVATOR_FLOOR, 6
-	goto_if_eq EventScript_1621E7
-	call EventScript_1621EC
+	goto_if_eq SilphCo_Elevator_EventScript_ExitFloorSelect
+	call SilphCo_Elevator_EventScript_MoveElevator
 	setvar VAR_ELEVATOR_FLOOR, 6
-	goto EventScript_1621E7
-
-EventScript_1620A6:: @ 81620A6
+	goto SilphCo_Elevator_EventScript_ExitFloorSelect
 	end
 
-EventScript_1620A7:: @ 81620A7
+SilphCo_Elevator_EventScript_To4F:: @ 81620A7
 	setvar VAR_0x8006, 7
 	setdynamicwarp MAP_SILPH_CO_4F, 255, 22, 3
 	compare VAR_ELEVATOR_FLOOR, 7
-	goto_if_eq EventScript_1621E7
-	call EventScript_1621EC
+	goto_if_eq SilphCo_Elevator_EventScript_ExitFloorSelect
+	call SilphCo_Elevator_EventScript_MoveElevator
 	setvar VAR_ELEVATOR_FLOOR, 7
-	goto EventScript_1621E7
-
-EventScript_1620CE:: @ 81620CE
+	goto SilphCo_Elevator_EventScript_ExitFloorSelect
 	end
 
-EventScript_1620CF:: @ 81620CF
+SilphCo_Elevator_EventScript_To5F:: @ 81620CF
 	setvar VAR_0x8006, 8
 	setdynamicwarp MAP_SILPH_CO_5F, 255, 22, 3
 	compare VAR_ELEVATOR_FLOOR, 8
-	goto_if_eq EventScript_1621E7
-	call EventScript_1621EC
+	goto_if_eq SilphCo_Elevator_EventScript_ExitFloorSelect
+	call SilphCo_Elevator_EventScript_MoveElevator
 	setvar VAR_ELEVATOR_FLOOR, 8
-	goto EventScript_1621E7
-
-EventScript_1620F6:: @ 81620F6
+	goto SilphCo_Elevator_EventScript_ExitFloorSelect
 	end
 
-EventScript_1620F7:: @ 81620F7
+SilphCo_Elevator_EventScript_To6F:: @ 81620F7
 	setvar VAR_0x8006, 9
 	setdynamicwarp MAP_SILPH_CO_6F, 255, 20, 3
 	compare VAR_ELEVATOR_FLOOR, 9
-	goto_if_eq EventScript_1621E7
-	call EventScript_1621EC
+	goto_if_eq SilphCo_Elevator_EventScript_ExitFloorSelect
+	call SilphCo_Elevator_EventScript_MoveElevator
 	setvar VAR_ELEVATOR_FLOOR, 9
-	goto EventScript_1621E7
-
-EventScript_16211E:: @ 816211E
+	goto SilphCo_Elevator_EventScript_ExitFloorSelect
 	end
 
-EventScript_16211F:: @ 816211F
+SilphCo_Elevator_EventScript_To7F:: @ 816211F
 	setvar VAR_0x8006, 10
 	setdynamicwarp MAP_SILPH_CO_7F, 255, 23, 3
 	compare VAR_ELEVATOR_FLOOR, 10
-	goto_if_eq EventScript_1621E7
-	call EventScript_1621EC
+	goto_if_eq SilphCo_Elevator_EventScript_ExitFloorSelect
+	call SilphCo_Elevator_EventScript_MoveElevator
 	setvar VAR_ELEVATOR_FLOOR, 10
-	goto EventScript_1621E7
-
-EventScript_162146:: @ 8162146
+	goto SilphCo_Elevator_EventScript_ExitFloorSelect
 	end
 
-EventScript_162147:: @ 8162147
+SilphCo_Elevator_EventScript_To8F:: @ 8162147
 	setvar VAR_0x8006, 11
 	setdynamicwarp MAP_SILPH_CO_8F, 255, 22, 3
 	compare VAR_ELEVATOR_FLOOR, 11
-	goto_if_eq EventScript_1621E7
-	call EventScript_1621EC
+	goto_if_eq SilphCo_Elevator_EventScript_ExitFloorSelect
+	call SilphCo_Elevator_EventScript_MoveElevator
 	setvar VAR_ELEVATOR_FLOOR, 11
-	goto EventScript_1621E7
-
-EventScript_16216E:: @ 816216E
+	goto SilphCo_Elevator_EventScript_ExitFloorSelect
 	end
 
-EventScript_16216F:: @ 816216F
+SilphCo_Elevator_EventScript_To9F:: @ 816216F
 	setvar VAR_0x8006, 12
 	setdynamicwarp MAP_SILPH_CO_9F, 255, 24, 3
 	compare VAR_ELEVATOR_FLOOR, 12
-	goto_if_eq EventScript_1621E7
-	call EventScript_1621EC
+	goto_if_eq SilphCo_Elevator_EventScript_ExitFloorSelect
+	call SilphCo_Elevator_EventScript_MoveElevator
 	setvar VAR_ELEVATOR_FLOOR, 12
-	goto EventScript_1621E7
-
-EventScript_162196:: @ 8162196
+	goto SilphCo_Elevator_EventScript_ExitFloorSelect
 	end
 
-EventScript_162197:: @ 8162197
+SilphCo_Elevator_EventScript_To10F:: @ 8162197
 	setvar VAR_0x8006, 13
 	setdynamicwarp MAP_SILPH_CO_10F, 255, 13, 3
 	compare VAR_ELEVATOR_FLOOR, 13
-	goto_if_eq EventScript_1621E7
-	call EventScript_1621EC
+	goto_if_eq SilphCo_Elevator_EventScript_ExitFloorSelect
+	call SilphCo_Elevator_EventScript_MoveElevator
 	setvar VAR_ELEVATOR_FLOOR, 13
-	goto EventScript_1621E7
-
-EventScript_1621BE:: @ 81621BE
+	goto SilphCo_Elevator_EventScript_ExitFloorSelect
 	end
 
-EventScript_1621BF:: @ 81621BF
+SilphCo_Elevator_EventScript_To11F:: @ 81621BF
 	setvar VAR_0x8006, 14
 	setdynamicwarp MAP_SILPH_CO_11F, 255, 13, 3
 	compare VAR_ELEVATOR_FLOOR, 14
-	goto_if_eq EventScript_1621E7
-	call EventScript_1621EC
+	goto_if_eq SilphCo_Elevator_EventScript_ExitFloorSelect
+	call SilphCo_Elevator_EventScript_MoveElevator
 	setvar VAR_ELEVATOR_FLOOR, 14
-	goto EventScript_1621E7
-
-EventScript_1621E6:: @ 81621E6
+	goto SilphCo_Elevator_EventScript_ExitFloorSelect
 	end
 
-EventScript_1621E7:: @ 81621E7
+SilphCo_Elevator_EventScript_ExitFloorSelect:: @ 81621E7
 	special Special_CloseElevatorCurrentFloorWindow
 	releaseall
 	end
 
-EventScript_1621EC:: @ 81621EC
+SilphCo_Elevator_EventScript_MoveElevator:: @ 81621EC
 	special Special_CloseElevatorCurrentFloorWindow
 	closemessage
 	waitse
diff --git a/data/maps/SixIsland_DottedHole_1F/scripts.inc b/data/maps/SixIsland_DottedHole_1F/scripts.inc
index 26217512e..21a47dcd6 100644
--- a/data/maps/SixIsland_DottedHole_1F/scripts.inc
+++ b/data/maps/SixIsland_DottedHole_1F/scripts.inc
@@ -6,28 +6,28 @@ SixIsland_DottedHole_1F_OnTransition:: @ 8164188
 	setworldmapflag FLAG_WORLD_MAP_SIX_ISLAND_DOTTED_HOLE_1F
 	end
 
-SixIsland_DottedHole_B1F_EventScript_16418C:: @ 816418C
+SixIsland_DottedHole_B1F_EventScript_BrailleUp:: @ 816418C
 	lockall
 	braillemessage Braille_Text_Up
 	waitbuttonpress
 	releaseall
 	end
 
-SixIsland_DottedHole_B4F_EventScript_164195:: @ 8164195
+SixIsland_DottedHole_B4F_EventScript_BrailleDown:: @ 8164195
 	lockall
 	braillemessage Braille_Text_Down
 	waitbuttonpress
 	releaseall
 	end
 
-SixIsland_DottedHole_B3F_EventScript_16419E:: @ 816419E
+SixIsland_DottedHole_B3F_EventScript_BrailleRight:: @ 816419E
 	lockall
 	braillemessage Braille_Text_Right
 	waitbuttonpress
 	releaseall
 	end
 
-SixIsland_DottedHole_B2F_EventScript_1641A7:: @ 81641A7
+SixIsland_DottedHole_B2F_EventScript_BrailleLeft:: @ 81641A7
 	lockall
 	braillemessage Braille_Text_Left
 	waitbuttonpress
diff --git a/data/maps/SixIsland_DottedHole_B1F/map.json b/data/maps/SixIsland_DottedHole_B1F/map.json
index 449f0da2d..9d264d645 100644
--- a/data/maps/SixIsland_DottedHole_B1F/map.json
+++ b/data/maps/SixIsland_DottedHole_B1F/map.json
@@ -57,7 +57,7 @@
       "x": 6,
       "y": 5,
       "elevation": 0,
-      "script": "SixIsland_DottedHole_B1F_EventScript_16418C"
+      "script": "SixIsland_DottedHole_B1F_EventScript_BrailleUp"
     }
   ]
 }
diff --git a/data/maps/SixIsland_DottedHole_B2F/map.json b/data/maps/SixIsland_DottedHole_B2F/map.json
index 79cf28355..0dd58ba70 100644
--- a/data/maps/SixIsland_DottedHole_B2F/map.json
+++ b/data/maps/SixIsland_DottedHole_B2F/map.json
@@ -57,7 +57,7 @@
       "x": 6,
       "y": 5,
       "elevation": 0,
-      "script": "SixIsland_DottedHole_B2F_EventScript_1641A7"
+      "script": "SixIsland_DottedHole_B2F_EventScript_BrailleLeft"
     }
   ]
 }
diff --git a/data/maps/SixIsland_DottedHole_B3F/map.json b/data/maps/SixIsland_DottedHole_B3F/map.json
index 6c7af4456..df77a280c 100644
--- a/data/maps/SixIsland_DottedHole_B3F/map.json
+++ b/data/maps/SixIsland_DottedHole_B3F/map.json
@@ -57,7 +57,7 @@
       "x": 6,
       "y": 5,
       "elevation": 0,
-      "script": "SixIsland_DottedHole_B3F_EventScript_16419E"
+      "script": "SixIsland_DottedHole_B3F_EventScript_BrailleRight"
     }
   ]
 }
diff --git a/data/maps/SixIsland_DottedHole_B4F/map.json b/data/maps/SixIsland_DottedHole_B4F/map.json
index 2490d48a7..56e07628d 100644
--- a/data/maps/SixIsland_DottedHole_B4F/map.json
+++ b/data/maps/SixIsland_DottedHole_B4F/map.json
@@ -57,7 +57,7 @@
       "x": 6,
       "y": 5,
       "elevation": 0,
-      "script": "SixIsland_DottedHole_B4F_EventScript_164195"
+      "script": "SixIsland_DottedHole_B4F_EventScript_BrailleDown"
     }
   ]
 }
diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json
index e3cce0b89..0acc6464e 100644
--- a/data/maps/SixIsland_DottedHole_SapphireRoom/map.json
+++ b/data/maps/SixIsland_DottedHole_SapphireRoom/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SixIsland_DottedHole_SapphireRoom_EventScript_1641B5",
+      "script": "SixIsland_DottedHole_SapphireRoom_EventScript_Sapphire",
       "flag": "FLAG_HIDE_SAPPHIRE"
     },
     {
@@ -63,7 +63,7 @@
       "x": 7,
       "y": 2,
       "elevation": 0,
-      "script": "SixIsland_DottedHole_SapphireRoom_EventScript_16441F"
+      "script": "SixIsland_DottedHole_SapphireRoom_EventScript_BrailleMessage"
     }
   ]
 }
diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc
index a73503f7c..67f4c6a2d 100644
--- a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc
+++ b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc
@@ -1,29 +1,32 @@
+.equ LOCALID_SAPPHIRE, 1
+.equ LOCALID_THIEF,    2
+
 SixIsland_DottedHole_SapphireRoom_MapScripts:: @ 81641B4
 	.byte 0
 
-SixIsland_DottedHole_SapphireRoom_EventScript_1641B5:: @ 81641B5
+SixIsland_DottedHole_SapphireRoom_EventScript_Sapphire:: @ 81641B5
 	lock
 	faceplayer
 	textcolor 3
 	playfanfare MUS_FAN5
-	message Text_17BD82
+	message SixIsland_DottedHole_SapphireRoom_Text_FoundSapphire
 	waitmessage
 	waitfanfare
 	closemessage
-	setobjectxyperm 2, 5, 0
-	addobject 2
+	setobjectxyperm LOCALID_THIEF, 5, 0
+	addobject LOCALID_THIEF
 	playse SE_RU_HYUU
-	applymovement 2, Movement_16440F
+	applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefFallIn
 	waitmovement 0
 	playse SE_W070
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq EventScript_16430F
+	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefLeft
 	compare VAR_FACING, DIR_SOUTH
-	call_if_eq EventScript_16430F
+	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefLeft
 	compare VAR_FACING, DIR_EAST
-	call_if_eq EventScript_16431A
+	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefDown
 	compare VAR_FACING, DIR_WEST
-	call_if_eq EventScript_16431A
+	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefDown
 	setvar VAR_0x8004, 3
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 12
@@ -31,163 +34,164 @@ SixIsland_DottedHole_SapphireRoom_EventScript_1641B5:: @ 81641B5
 	special Special_ShakeScreen
 	delay 60
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq EventScript_164325
+	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireNorth
 	compare VAR_FACING, DIR_SOUTH
-	call_if_eq EventScript_164330
+	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireSouth
 	compare VAR_FACING, DIR_EAST
-	call_if_eq EventScript_16433B
+	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireEast
 	compare VAR_FACING, DIR_WEST
-	call_if_eq EventScript_164346
+	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireWest
 	textcolor 0
-	msgbox gUnknown_817BD97
+	msgbox SixIsland_DottedHole_SapphireRoom_Text_IWasRightInTailingYou
 	closemessage
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq EventScript_164351
+	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireNorth
 	compare VAR_FACING, DIR_SOUTH
-	call_if_eq EventScript_164366
+	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireSouth
 	compare VAR_FACING, DIR_EAST
-	call_if_eq EventScript_16437B
+	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireEast
 	compare VAR_FACING, DIR_WEST
-	call_if_eq EventScript_164390
-	removeobject 1
+	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireWest
+	removeobject LOCALID_SAPPHIRE
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq EventScript_1642F9
+	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefLeft2
 	compare VAR_FACING, DIR_SOUTH
-	call_if_eq EventScript_1642F9
+	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefLeft2
 	compare VAR_FACING, DIR_EAST
-	call_if_eq EventScript_164304
+	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefDown2
 	compare VAR_FACING, DIR_WEST
-	call_if_eq EventScript_164304
-	msgbox gUnknown_817BDD4
+	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefDown2
+	msgbox SixIsland_DottedHole_SapphireRoom_Text_SellToTeamRocketTellPassword
 	closemessage
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq EventScript_1643A5
+	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitNorth
 	compare VAR_FACING, DIR_SOUTH
-	call_if_eq EventScript_1643B7
+	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitSouth
 	compare VAR_FACING, DIR_EAST
-	call_if_eq EventScript_1643C9
+	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitEast
 	compare VAR_FACING, DIR_WEST
-	call_if_eq EventScript_1643DB
+	call_if_eq SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitWest
 	playse SE_KAIDAN
 	delay 35
-	removeobject 2
+	removeobject LOCALID_THIEF
 	setflag FLAG_LEARNED_YES_NAH_CHANSEY
 	release
 	end
 
-EventScript_1642F9:: @ 81642F9
+@ Lots of redundant scripts below
+SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefLeft2:: @ 81642F9
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
-EventScript_164304:: @ 8164304
+SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefDown2:: @ 8164304
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
-EventScript_16430F:: @ 816430F
+SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefLeft:: @ 816430F
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
-EventScript_16431A:: @ 816431A
+SixIsland_DottedHole_SapphireRoom_EventScript_PlayerFaceThiefDown:: @ 816431A
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
-EventScript_164325:: @ 8164325
-	applymovement 2, Movement_1643ED
+SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireNorth:: @ 8164325
+	applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromLeft
 	waitmovement 0
 	return
 
-EventScript_164330:: @ 8164330
-	applymovement 2, Movement_1643ED
+SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireSouth:: @ 8164330
+	applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromLeft
 	waitmovement 0
 	return
 
-EventScript_16433B:: @ 816433B
-	applymovement 2, Movement_1643F1
+SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireEast:: @ 816433B
+	applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromBelow
 	waitmovement 0
 	return
 
-EventScript_164346:: @ 8164346
-	applymovement 2, Movement_1643F1
+SixIsland_DottedHole_SapphireRoom_EventScript_ThiefLookAtSapphireWest:: @ 8164346
+	applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromBelow
 	waitmovement 0
 	return
 
-EventScript_164351:: @ 8164351
-	applymovement 2, Movement_1643F5
+SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireNorth:: @ 8164351
+	applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromLeft
 	waitmovement 0
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	return
 
-EventScript_164366:: @ 8164366
-	applymovement 2, Movement_1643F5
+SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireSouth:: @ 8164366
+	applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromLeft
 	waitmovement 0
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
-EventScript_16437B:: @ 816437B
-	applymovement 2, Movement_1643F7
+SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireEast:: @ 816437B
+	applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromBelow
 	waitmovement 0
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
-EventScript_164390:: @ 8164390
-	applymovement 2, Movement_1643F7
+SixIsland_DottedHole_SapphireRoom_EventScript_ThiefGetSapphireWest:: @ 8164390
+	applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromBelow
 	waitmovement 0
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
-EventScript_1643A5:: @ 81643A5
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_16441C
-	applymovement 2, Movement_1643F9
+SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitNorth:: @ 81643A5
+	applymovement OBJ_EVENT_ID_PLAYER, SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit
+	applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitNorth
 	waitmovement 0
 	return
 
-EventScript_1643B7:: @ 81643B7
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_16441C
-	applymovement 2, Movement_164401
+SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitSouth:: @ 81643B7
+	applymovement OBJ_EVENT_ID_PLAYER, SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit
+	applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitSouth
 	waitmovement 0
 	return
 
-EventScript_1643C9:: @ 81643C9
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_16441C
-	applymovement 2, Movement_164409
+SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitEast:: @ 81643C9
+	applymovement OBJ_EVENT_ID_PLAYER, SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit
+	applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitEastWest
 	waitmovement 0
 	return
 
-EventScript_1643DB:: @ 81643DB
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_16441C
-	applymovement 2, Movement_164409
+SixIsland_DottedHole_SapphireRoom_EventScript_ThiefExitWest:: @ 81643DB
+	applymovement OBJ_EVENT_ID_PLAYER, SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit
+	applymovement LOCALID_THIEF, SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitEastWest
 	waitmovement 0
 	return
 
-Movement_1643ED:: @ 81643ED
+SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromLeft:: @ 81643ED
 	walk_up
 	walk_up
 	walk_in_place_fastest_right
 	step_end
 
-Movement_1643F1:: @ 81643F1
+SixIsland_DottedHole_SapphireRoom_Movement_ThiefLookAtSapphireFromBelow:: @ 81643F1
 	walk_right
 	walk_right
 	walk_in_place_fastest_up
 	step_end
 
-Movement_1643F5:: @ 81643F5
+SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromLeft:: @ 81643F5
 	walk_right
 	step_end
 
-Movement_1643F7:: @ 81643F7
+SixIsland_DottedHole_SapphireRoom_Movement_ThiefGetSapphireFromBelow:: @ 81643F7
 	walk_up
 	step_end
 
-Movement_1643F9:: @ 81643F9
+SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitNorth:: @ 81643F9
 	walk_fast_up
 	walk_fast_right
 	walk_fast_right
@@ -197,7 +201,7 @@ Movement_1643F9:: @ 81643F9
 	walk_fast_right
 	step_end
 
-Movement_164401:: @ 8164401
+SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitSouth:: @ 8164401
 	walk_fast_down
 	walk_fast_right
 	walk_fast_right
@@ -207,7 +211,7 @@ Movement_164401:: @ 8164401
 	walk_fast_right
 	step_end
 
-Movement_164409:: @ 8164409
+SixIsland_DottedHole_SapphireRoom_Movement_ThiefExitEastWest:: @ 8164409
 	walk_fast_right
 	walk_fast_right
 	walk_fast_right
@@ -215,7 +219,7 @@ Movement_164409:: @ 8164409
 	walk_fast_up
 	step_end
 
-Movement_16440F:: @ 816440F
+SixIsland_DottedHole_SapphireRoom_Movement_ThiefFallIn:: @ 816440F
 	face_down
 	disable_anim
 	slide_down
@@ -230,12 +234,12 @@ Movement_16440F:: @ 816440F
 	restore_anim
 	step_end
 
-Movement_16441C:: @ 816441C
+SixIsland_DottedHole_SapphireRoom_Movement_PlayerWatchThiefExit:: @ 816441C
 	delay_16
 	walk_in_place_fastest_right
 	step_end
 
-SixIsland_DottedHole_SapphireRoom_EventScript_16441F:: @ 816441F
+SixIsland_DottedHole_SapphireRoom_EventScript_BrailleMessage:: @ 816441F
 	lockall
 	setvar VAR_0x8005, 130
 	braillemessage_wait Braille_Text_LetTheTwo
diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/text.inc b/data/maps/SixIsland_DottedHole_SapphireRoom/text.inc
index 713e8cadf..4fdef4a5d 100644
--- a/data/maps/SixIsland_DottedHole_SapphireRoom/text.inc
+++ b/data/maps/SixIsland_DottedHole_SapphireRoom/text.inc
@@ -1,12 +1,12 @@
-Text_17BD82:: @ 817BD82
+SixIsland_DottedHole_SapphireRoom_Text_FoundSapphire:: @ 817BD82
     .string "{PLAYER} found a SAPPHIRE!$"
 
-gUnknown_817BD97:: @ 817BD97
+SixIsland_DottedHole_SapphireRoom_Text_IWasRightInTailingYou:: @ 817BD97
     .string "Fufu… Fufufufu…\n"
     .string "I guessed right.\p"
     .string "I was right in tailing you!$"
 
-gUnknown_817BDD4:: @ 817BDD4
+SixIsland_DottedHole_SapphireRoom_Text_SellToTeamRocketTellPassword:: @ 817BDD4
     .string "I knew that there was a SAPPHIRE\n"
     .string "here, so it belongs to me!\p"
     .string "I'll sell it to TEAM ROCKET for\n"
diff --git a/data/maps/ThreeIsland_BerryForest/map.json b/data/maps/ThreeIsland_BerryForest/map.json
index f6dd0d71c..d3ba4d3c3 100644
--- a/data/maps/ThreeIsland_BerryForest/map.json
+++ b/data/maps/ThreeIsland_BerryForest/map.json
@@ -5,7 +5,7 @@
   "music": "MUS_T_MORI",
   "region_map_section": "MAPSEC_BERRY_FOREST",
   "requires_flash": false,
-  "weather": "WEATHER_CLOUDY",
+  "weather": "WEATHER_SHADE",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 7,
diff --git a/data/maps/ThreeIsland_DunsparceTunnel/map.json b/data/maps/ThreeIsland_DunsparceTunnel/map.json
index 22ddfed8b..84f116348 100644
--- a/data/maps/ThreeIsland_DunsparceTunnel/map.json
+++ b/data/maps/ThreeIsland_DunsparceTunnel/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "ThreeIsland_DunsparceTunnel_EventScript_164D60",
+      "script": "ThreeIsland_DunsparceTunnel_EventScript_Prospector",
       "flag": "0"
     }
   ],
diff --git a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc
index 46e8e15f8..7729b3536 100644
--- a/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc
+++ b/data/maps/ThreeIsland_DunsparceTunnel/scripts.inc
@@ -7,49 +7,49 @@ ThreeIsland_DunsparceTunnel_OnTransition:: @ 8164D2C
 	specialvar VAR_RESULT, IsNationalPokedexEnabled
 	copyvar VAR_0x8008, VAR_RESULT
 	compare VAR_0x8008, TRUE
-	call_if_eq EventScript_164D50
+	call_if_eq ThreeIsland_DunsparceTunnel_EventScript_SetLayoutDugOut
 	compare VAR_0x8008, FALSE
-	call_if_eq EventScript_164D54
+	call_if_eq ThreeIsland_DunsparceTunnel_EventScript_MoveProspectorToWall
 	end
 
-EventScript_164D50:: @ 8164D50
-	setmaplayoutindex LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL_2
+ThreeIsland_DunsparceTunnel_EventScript_SetLayoutDugOut:: @ 8164D50
+	setmaplayoutindex LAYOUT_THREE_ISLAND_DUNSPARCE_TUNNEL_DUG_OUT
 	return
 
-EventScript_164D54:: @ 8164D54
+ThreeIsland_DunsparceTunnel_EventScript_MoveProspectorToWall:: @ 8164D54
 	setobjectxyperm 1, 6, 3
-	setobjectmovementtype 1, 10
+	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_RIGHT
 	return
 
-ThreeIsland_DunsparceTunnel_EventScript_164D60:: @ 8164D60
+ThreeIsland_DunsparceTunnel_EventScript_Prospector:: @ 8164D60
 	lock
 	faceplayer
-	goto_if_set FLAG_GOT_NUGGET_FROM_DUNSPARCE_TUNNEL, EventScript_164DC2
+	goto_if_set FLAG_GOT_NUGGET_FROM_DUNSPARCE_TUNNEL, ThreeIsland_DunsparceTunnel_EventScript_ProspectorAlreadyGaveNugget
 	specialvar VAR_RESULT, IsNationalPokedexEnabled
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_164D90
-	msgbox gUnknown_817D13B
+	goto_if_eq ThreeIsland_DunsparceTunnel_EventScript_ProspectorStruckGold
+	msgbox ThreeIsland_DunsparceTunnel_Text_ProspectingForGold
 	closemessage
 	applymovement 1, Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-EventScript_164D90:: @ 8164D90
-	msgbox gUnknown_817D1C9
+ThreeIsland_DunsparceTunnel_EventScript_ProspectorStruckGold:: @ 8164D90
+	msgbox ThreeIsland_DunsparceTunnel_Text_StruckGoldThisIsForYou
 	giveitem ITEM_NUGGET
-	compare VAR_RESULT, 0
-	goto_if_eq EventScript_164DB8
+	compare VAR_RESULT, FALSE
+	goto_if_eq ThreeIsland_DunsparceTunnel_EventScript_NoRoomForNugget
 	setflag FLAG_GOT_NUGGET_FROM_DUNSPARCE_TUNNEL
-	goto EventScript_164DC2
+	goto ThreeIsland_DunsparceTunnel_EventScript_ProspectorAlreadyGaveNugget
 	end
 
-EventScript_164DB8:: @ 8164DB8
-	msgbox gUnknown_817D2DC
+ThreeIsland_DunsparceTunnel_EventScript_NoRoomForNugget:: @ 8164DB8
+	msgbox ThreeIsland_DunsparceTunnel_Text_WhoopsBagCrammedFull
 	release
 	end
 
-EventScript_164DC2:: @ 8164DC2
-	msgbox gUnknown_817D28C
+ThreeIsland_DunsparceTunnel_EventScript_ProspectorAlreadyGaveNugget:: @ 8164DC2
+	msgbox ThreeIsland_DunsparceTunnel_Text_ThatsANugget
 	release
 	end
diff --git a/data/maps/ThreeIsland_DunsparceTunnel/text.inc b/data/maps/ThreeIsland_DunsparceTunnel/text.inc
index e8c5269dd..96a0603c4 100644
--- a/data/maps/ThreeIsland_DunsparceTunnel/text.inc
+++ b/data/maps/ThreeIsland_DunsparceTunnel/text.inc
@@ -1,4 +1,4 @@
-gUnknown_817D13B:: @ 817D13B
+ThreeIsland_DunsparceTunnel_Text_ProspectingForGold:: @ 817D13B
     .string "Hey, there!\n"
     .string "How's it going?\p"
     .string "What am I doing here, you ask?\n"
@@ -6,7 +6,7 @@ gUnknown_817D13B:: @ 817D13B
     .string "When I strike it rich, I'm buying\n"
     .string "a house in KANTO.$"
 
-gUnknown_817D1C9:: @ 817D1C9
+ThreeIsland_DunsparceTunnel_Text_StruckGoldThisIsForYou:: @ 817D1C9
     .string "Hey, there! How's it going?\n"
     .string "Did you hear? I've struck gold!\p"
     .string "You remembered that I was\n"
@@ -16,12 +16,12 @@ gUnknown_817D1C9:: @ 817D1C9
     .string "So, I'll show you!\n"
     .string "This is for you!$"
 
-gUnknown_817D28C:: @ 817D28C
+ThreeIsland_DunsparceTunnel_Text_ThatsANugget:: @ 817D28C
     .string "That's a NUGGET!\p"
     .string "I can't give you any nuggets of\n"
     .string "wisdom, so that'll have to do!$"
 
-gUnknown_817D2DC:: @ 817D2DC
+ThreeIsland_DunsparceTunnel_Text_WhoopsBagCrammedFull:: @ 817D2DC
     .string "Whoops, your BAG is crammed full!\n"
     .string "I'll give this to you later.$"
 
diff --git a/data/maps/SevenIsland_TrainerTower_1F/map.json b/data/maps/TrainerTower_1F/map.json
index 924dbbcba..925dbdd69 100644
--- a/data/maps/SevenIsland_TrainerTower_1F/map.json
+++ b/data/maps/TrainerTower_1F/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_1F",
-  "name": "SevenIsland_TrainerTower_1F",
-  "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_1F",
+  "id": "MAP_TRAINER_TOWER_1F",
+  "name": "TrainerTower_1F",
+  "layout": "LAYOUT_TRAINER_TOWER_1F",
   "music": "MUS_T_TOWER",
   "region_map_section": "MAPSEC_TRAINER_TOWER_2",
   "requires_flash": false,
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_1F_EventScript_1646C8",
+      "script": "TrainerTower_EventScript_DoublesTrainer1",
       "flag": "FLAG_TEMP_2"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_1F_EventScript_1646CE",
+      "script": "TrainerTower_EventScript_SinglesTrainer",
       "flag": "FLAG_TEMP_3"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_1F_EventScript_1646D4",
+      "script": "TrainerTower_EventScript_KnockoutTrainer",
       "flag": "FLAG_TEMP_4"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_1F_EventScript_1646DA",
+      "script": "TrainerTower_EventScript_DoublesTrainer2",
       "flag": "FLAG_TEMP_5"
     }
   ],
@@ -84,14 +84,14 @@
       "x": 15,
       "y": 6,
       "elevation": 3,
-      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_2F",
+      "dest_map": "MAP_TRAINER_TOWER_2F",
       "dest_warp_id": 1
     },
     {
       "x": 4,
       "y": 6,
       "elevation": 3,
-      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY",
+      "dest_map": "MAP_TRAINER_TOWER_LOBBY",
       "dest_warp_id": 0
     }
   ],
@@ -103,7 +103,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_E",
       "var_value": 0,
-      "script": "SevenIsland_TrainerTower_1F_EventScript_1C54AF"
+      "script": "TrainerTower_EventScript_SingleBattleTrigger"
     },
     {
       "type": "trigger",
@@ -112,7 +112,7 @@
       "elevation": 0,
       "var": "VAR_TEMP_F",
       "var_value": 0,
-      "script": "SevenIsland_TrainerTower_1F_EventScript_1C54B4"
+      "script": "TrainerTower_EventScript_DoubleBattleTriggerTop"
     },
     {
       "type": "trigger",
@@ -121,7 +121,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_F",
       "var_value": 0,
-      "script": "SevenIsland_TrainerTower_1F_EventScript_1C54EA"
+      "script": "TrainerTower_EventScript_DoubleBattleTriggerBottom"
     }
   ],
   "bg_events": []
diff --git a/data/maps/TrainerTower_1F/scripts.inc b/data/maps/TrainerTower_1F/scripts.inc
new file mode 100644
index 000000000..77917c4a4
--- /dev/null
+++ b/data/maps/TrainerTower_1F/scripts.inc
@@ -0,0 +1,27 @@
+TrainerTower_1F_MapScripts:: @ 81646B8
+	map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume
+	map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_OnTransition
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame
+	.byte 0
+
+@ All Trainer Tower floors/roof share these scripts for their object events
+
+TrainerTower_EventScript_DoublesTrainer1:: @ 81646C8
+	call TrainerTower_EventScript_SpeakToDoublesTrainer1
+	end
+
+TrainerTower_EventScript_SinglesTrainer:: @ 81646CE
+	call TrainerTower_EventScript_SpeakToSinglesTrainer
+	end
+
+TrainerTower_EventScript_KnockoutTrainer:: @ 81646D4
+	call TrainerTower_EventScript_SpeakToKnockoutTrainer
+	end
+
+TrainerTower_EventScript_DoublesTrainer2:: @ 81646DA
+	call TrainerTower_EventScript_SpeakToDoublesTrainer2
+	end
+
+TrainerTower_EventScript_Owner:: @ 81646E0
+	call TrainerTower_EventScript_SpeakToOwner
+	end
diff --git a/data/maps/SevenIsland_TrainerTower_5F/map.json b/data/maps/TrainerTower_2F/map.json
index 1ee41e1b4..e2e2f4c97 100644
--- a/data/maps/SevenIsland_TrainerTower_5F/map.json
+++ b/data/maps/TrainerTower_2F/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_5F",
-  "name": "SevenIsland_TrainerTower_5F",
-  "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_5F",
+  "id": "MAP_TRAINER_TOWER_2F",
+  "name": "TrainerTower_2F",
+  "layout": "LAYOUT_TRAINER_TOWER_2F",
   "music": "MUS_T_TOWER",
   "region_map_section": "MAPSEC_TRAINER_TOWER_2",
   "requires_flash": false,
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_5F_EventScript_1646E0",
+      "script": "TrainerTower_EventScript_Owner",
       "flag": "FLAG_TEMP_6"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_5F_EventScript_1646C8",
+      "script": "TrainerTower_EventScript_DoublesTrainer1",
       "flag": "FLAG_TEMP_2"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_5F_EventScript_1646CE",
+      "script": "TrainerTower_EventScript_SinglesTrainer",
       "flag": "FLAG_TEMP_3"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_5F_EventScript_1646D4",
+      "script": "TrainerTower_EventScript_KnockoutTrainer",
       "flag": "FLAG_TEMP_4"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_5F_EventScript_1646DA",
+      "script": "TrainerTower_EventScript_DoublesTrainer2",
       "flag": "FLAG_TEMP_5"
     }
   ],
@@ -84,21 +84,21 @@
       "x": 15,
       "y": 6,
       "elevation": 3,
-      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_6F",
+      "dest_map": "MAP_TRAINER_TOWER_3F",
       "dest_warp_id": 1
     },
     {
       "x": 4,
       "y": 6,
       "elevation": 3,
-      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_4F",
+      "dest_map": "MAP_TRAINER_TOWER_1F",
       "dest_warp_id": 0
     },
     {
       "x": 13,
       "y": 5,
       "elevation": 0,
-      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR",
+      "dest_map": "MAP_TRAINER_TOWER_ELEVATOR",
       "dest_warp_id": 0
     }
   ],
@@ -110,7 +110,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_E",
       "var_value": 0,
-      "script": "SevenIsland_TrainerTower_5F_EventScript_1C54AF"
+      "script": "TrainerTower_EventScript_SingleBattleTrigger"
     },
     {
       "type": "trigger",
@@ -119,7 +119,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_F",
       "var_value": 0,
-      "script": "SevenIsland_TrainerTower_5F_EventScript_1C54B4"
+      "script": "TrainerTower_EventScript_DoubleBattleTriggerTop"
     },
     {
       "type": "trigger",
@@ -128,7 +128,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_F",
       "var_value": 0,
-      "script": "SevenIsland_TrainerTower_5F_EventScript_1C54EA"
+      "script": "TrainerTower_EventScript_DoubleBattleTriggerBottom"
     }
   ],
   "bg_events": []
diff --git a/data/maps/TrainerTower_2F/scripts.inc b/data/maps/TrainerTower_2F/scripts.inc
new file mode 100644
index 000000000..c34f36a34
--- /dev/null
+++ b/data/maps/TrainerTower_2F/scripts.inc
@@ -0,0 +1,27 @@
+TrainerTower_2F_MapScripts:: @ 81646E6
+	map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume
+	map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_OnTransition
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame
+	.byte 0
+
+@ Below scripts are unused, the identical versions in the 1F script are used instead
+
+TrainerTower_2F_EventScript_DoublesTrainer1:: @ 81646F6
+	call TrainerTower_EventScript_SpeakToDoublesTrainer1
+	end
+
+TrainerTower_2F_EventScript_SinglesTrainer:: @ 81646FC
+	call TrainerTower_EventScript_SpeakToSinglesTrainer
+	end
+
+TrainerTower_2F_EventScript_KnockoutTrainer:: @ 8164702
+	call TrainerTower_EventScript_SpeakToKnockoutTrainer
+	end
+
+TrainerTower_2F_EventScript_DoublesTrainer2:: @ 8164708
+	call TrainerTower_EventScript_SpeakToDoublesTrainer2
+	end
+
+TrainerTower_2F_EventScript_Owner:: @ 816470E
+	call TrainerTower_EventScript_SpeakToOwner
+	end
diff --git a/data/maps/SevenIsland_TrainerTower_2F/map.json b/data/maps/TrainerTower_3F/map.json
index 6d0fbaa4c..8db22b61d 100644
--- a/data/maps/SevenIsland_TrainerTower_2F/map.json
+++ b/data/maps/TrainerTower_3F/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_2F",
-  "name": "SevenIsland_TrainerTower_2F",
-  "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_2F",
+  "id": "MAP_TRAINER_TOWER_3F",
+  "name": "TrainerTower_3F",
+  "layout": "LAYOUT_TRAINER_TOWER_3F",
   "music": "MUS_T_TOWER",
   "region_map_section": "MAPSEC_TRAINER_TOWER_2",
   "requires_flash": false,
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_2F_EventScript_1646E0",
+      "script": "TrainerTower_EventScript_Owner",
       "flag": "FLAG_TEMP_6"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_2F_EventScript_1646C8",
+      "script": "TrainerTower_EventScript_DoublesTrainer1",
       "flag": "FLAG_TEMP_2"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_2F_EventScript_1646CE",
+      "script": "TrainerTower_EventScript_SinglesTrainer",
       "flag": "FLAG_TEMP_3"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_2F_EventScript_1646D4",
+      "script": "TrainerTower_EventScript_KnockoutTrainer",
       "flag": "FLAG_TEMP_4"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_2F_EventScript_1646DA",
+      "script": "TrainerTower_EventScript_DoublesTrainer2",
       "flag": "FLAG_TEMP_5"
     }
   ],
@@ -84,21 +84,21 @@
       "x": 15,
       "y": 6,
       "elevation": 3,
-      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_3F",
+      "dest_map": "MAP_TRAINER_TOWER_4F",
       "dest_warp_id": 1
     },
     {
       "x": 4,
       "y": 6,
       "elevation": 3,
-      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_1F",
+      "dest_map": "MAP_TRAINER_TOWER_2F",
       "dest_warp_id": 0
     },
     {
       "x": 13,
       "y": 5,
       "elevation": 0,
-      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR",
+      "dest_map": "MAP_TRAINER_TOWER_ELEVATOR",
       "dest_warp_id": 0
     }
   ],
@@ -110,7 +110,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_E",
       "var_value": 0,
-      "script": "SevenIsland_TrainerTower_2F_EventScript_1C54AF"
+      "script": "TrainerTower_EventScript_SingleBattleTrigger"
     },
     {
       "type": "trigger",
@@ -119,7 +119,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_F",
       "var_value": 0,
-      "script": "SevenIsland_TrainerTower_2F_EventScript_1C54B4"
+      "script": "TrainerTower_EventScript_DoubleBattleTriggerTop"
     },
     {
       "type": "trigger",
@@ -128,7 +128,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_F",
       "var_value": 0,
-      "script": "SevenIsland_TrainerTower_2F_EventScript_1C54EA"
+      "script": "TrainerTower_EventScript_DoubleBattleTriggerBottom"
     }
   ],
   "bg_events": []
diff --git a/data/maps/TrainerTower_3F/scripts.inc b/data/maps/TrainerTower_3F/scripts.inc
new file mode 100644
index 000000000..0c8d434eb
--- /dev/null
+++ b/data/maps/TrainerTower_3F/scripts.inc
@@ -0,0 +1,27 @@
+TrainerTower_3F_MapScripts:: @ 8164714
+	map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume
+	map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_OnTransition
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame
+	.byte 0
+
+@ Below scripts are unused, the identical versions in the 1F script are used instead
+
+TrainerTower_3F_EventScript_DoublesTrainer1:: @ 8164724
+	call TrainerTower_EventScript_SpeakToDoublesTrainer1
+	end
+
+TrainerTower_3F_EventScript_SinglesTrainer:: @ 816472A
+	call TrainerTower_EventScript_SpeakToSinglesTrainer
+	end
+
+TrainerTower_3F_EventScript_KnockoutTrainer:: @ 8164730
+	call TrainerTower_EventScript_SpeakToKnockoutTrainer
+	end
+
+TrainerTower_3F_EventScript_DoublesTrainer2:: @ 8164736
+	call TrainerTower_EventScript_SpeakToDoublesTrainer2
+	end
+
+TrainerTower_3F_EventScript_Owner:: @ 816473C
+	call TrainerTower_EventScript_SpeakToOwner
+	end
diff --git a/data/maps/SevenIsland_TrainerTower_4F/map.json b/data/maps/TrainerTower_4F/map.json
index d4a021ff3..32c868e91 100644
--- a/data/maps/SevenIsland_TrainerTower_4F/map.json
+++ b/data/maps/TrainerTower_4F/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_4F",
-  "name": "SevenIsland_TrainerTower_4F",
-  "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_4F",
+  "id": "MAP_TRAINER_TOWER_4F",
+  "name": "TrainerTower_4F",
+  "layout": "LAYOUT_TRAINER_TOWER_4F",
   "music": "MUS_T_TOWER",
   "region_map_section": "MAPSEC_TRAINER_TOWER_2",
   "requires_flash": false,
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_4F_EventScript_1646E0",
+      "script": "TrainerTower_EventScript_Owner",
       "flag": "FLAG_TEMP_6"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_4F_EventScript_1646C8",
+      "script": "TrainerTower_EventScript_DoublesTrainer1",
       "flag": "FLAG_TEMP_2"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_4F_EventScript_1646CE",
+      "script": "TrainerTower_EventScript_SinglesTrainer",
       "flag": "FLAG_TEMP_3"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_4F_EventScript_1646D4",
+      "script": "TrainerTower_EventScript_KnockoutTrainer",
       "flag": "FLAG_TEMP_4"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_4F_EventScript_1646DA",
+      "script": "TrainerTower_EventScript_DoublesTrainer2",
       "flag": "FLAG_TEMP_5"
     }
   ],
@@ -84,21 +84,21 @@
       "x": 15,
       "y": 6,
       "elevation": 3,
-      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_5F",
+      "dest_map": "MAP_TRAINER_TOWER_5F",
       "dest_warp_id": 1
     },
     {
       "x": 4,
       "y": 6,
       "elevation": 3,
-      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_3F",
+      "dest_map": "MAP_TRAINER_TOWER_3F",
       "dest_warp_id": 0
     },
     {
       "x": 13,
       "y": 5,
       "elevation": 0,
-      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR",
+      "dest_map": "MAP_TRAINER_TOWER_ELEVATOR",
       "dest_warp_id": 0
     }
   ],
@@ -110,7 +110,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_E",
       "var_value": 0,
-      "script": "SevenIsland_TrainerTower_4F_EventScript_1C54AF"
+      "script": "TrainerTower_EventScript_SingleBattleTrigger"
     },
     {
       "type": "trigger",
@@ -119,7 +119,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_F",
       "var_value": 0,
-      "script": "SevenIsland_TrainerTower_4F_EventScript_1C54B4"
+      "script": "TrainerTower_EventScript_DoubleBattleTriggerTop"
     },
     {
       "type": "trigger",
@@ -128,7 +128,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_F",
       "var_value": 0,
-      "script": "SevenIsland_TrainerTower_4F_EventScript_1C54EA"
+      "script": "TrainerTower_EventScript_DoubleBattleTriggerBottom"
     }
   ],
   "bg_events": []
diff --git a/data/maps/TrainerTower_4F/scripts.inc b/data/maps/TrainerTower_4F/scripts.inc
new file mode 100644
index 000000000..6e0e7e09f
--- /dev/null
+++ b/data/maps/TrainerTower_4F/scripts.inc
@@ -0,0 +1,27 @@
+TrainerTower_4F_MapScripts:: @ 8164742
+	map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume
+	map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_OnTransition
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame
+	.byte 0
+
+@ Below scripts are unused, the identical versions in the 1F script are used instead
+
+TrainerTower_4F_EventScript_DoublesTrainer1:: @ 8164752
+	call TrainerTower_EventScript_SpeakToDoublesTrainer1
+	end
+
+TrainerTower_4F_EventScript_SinglesTrainer:: @ 8164758
+	call TrainerTower_EventScript_SpeakToSinglesTrainer
+	end
+
+TrainerTower_4F_EventScript_KnockoutTrainer:: @ 816475E
+	call TrainerTower_EventScript_SpeakToKnockoutTrainer
+	end
+
+TrainerTower_4F_EventScript_DoublesTrainer2:: @ 8164764
+	call TrainerTower_EventScript_SpeakToDoublesTrainer2
+	end
+
+TrainerTower_4F_EventScript_Owner:: @ 816476A
+	call TrainerTower_EventScript_SpeakToOwner
+	end
diff --git a/data/maps/SevenIsland_TrainerTower_3F/map.json b/data/maps/TrainerTower_5F/map.json
index 780878898..7a32b597c 100644
--- a/data/maps/SevenIsland_TrainerTower_3F/map.json
+++ b/data/maps/TrainerTower_5F/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_3F",
-  "name": "SevenIsland_TrainerTower_3F",
-  "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_3F",
+  "id": "MAP_TRAINER_TOWER_5F",
+  "name": "TrainerTower_5F",
+  "layout": "LAYOUT_TRAINER_TOWER_5F",
   "music": "MUS_T_TOWER",
   "region_map_section": "MAPSEC_TRAINER_TOWER_2",
   "requires_flash": false,
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_3F_EventScript_1646E0",
+      "script": "TrainerTower_EventScript_Owner",
       "flag": "FLAG_TEMP_6"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_3F_EventScript_1646C8",
+      "script": "TrainerTower_EventScript_DoublesTrainer1",
       "flag": "FLAG_TEMP_2"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_3F_EventScript_1646CE",
+      "script": "TrainerTower_EventScript_SinglesTrainer",
       "flag": "FLAG_TEMP_3"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_3F_EventScript_1646D4",
+      "script": "TrainerTower_EventScript_KnockoutTrainer",
       "flag": "FLAG_TEMP_4"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_3F_EventScript_1646DA",
+      "script": "TrainerTower_EventScript_DoublesTrainer2",
       "flag": "FLAG_TEMP_5"
     }
   ],
@@ -84,21 +84,21 @@
       "x": 15,
       "y": 6,
       "elevation": 3,
-      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_4F",
+      "dest_map": "MAP_TRAINER_TOWER_6F",
       "dest_warp_id": 1
     },
     {
       "x": 4,
       "y": 6,
       "elevation": 3,
-      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_2F",
+      "dest_map": "MAP_TRAINER_TOWER_4F",
       "dest_warp_id": 0
     },
     {
       "x": 13,
       "y": 5,
       "elevation": 0,
-      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR",
+      "dest_map": "MAP_TRAINER_TOWER_ELEVATOR",
       "dest_warp_id": 0
     }
   ],
@@ -110,7 +110,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_E",
       "var_value": 0,
-      "script": "SevenIsland_TrainerTower_3F_EventScript_1C54AF"
+      "script": "TrainerTower_EventScript_SingleBattleTrigger"
     },
     {
       "type": "trigger",
@@ -119,7 +119,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_F",
       "var_value": 0,
-      "script": "SevenIsland_TrainerTower_3F_EventScript_1C54B4"
+      "script": "TrainerTower_EventScript_DoubleBattleTriggerTop"
     },
     {
       "type": "trigger",
@@ -128,7 +128,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_F",
       "var_value": 0,
-      "script": "SevenIsland_TrainerTower_3F_EventScript_1C54EA"
+      "script": "TrainerTower_EventScript_DoubleBattleTriggerBottom"
     }
   ],
   "bg_events": []
diff --git a/data/maps/TrainerTower_5F/scripts.inc b/data/maps/TrainerTower_5F/scripts.inc
new file mode 100644
index 000000000..71af237be
--- /dev/null
+++ b/data/maps/TrainerTower_5F/scripts.inc
@@ -0,0 +1,27 @@
+TrainerTower_5F_MapScripts:: @ 8164770
+	map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume
+	map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_OnTransition
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame
+	.byte 0
+
+@ Below scripts are unused, the identical versions in the 1F script are used instead
+
+TrainerTower_5F_EventScript_DoublesTrainer1:: @ 8164780
+	call TrainerTower_EventScript_SpeakToDoublesTrainer1
+	end
+
+TrainerTower_5F_EventScript_SinglesTrainer:: @ 8164786
+	call TrainerTower_EventScript_SpeakToSinglesTrainer
+	end
+
+TrainerTower_5F_EventScript_KnockoutTrainer:: @ 816478C
+	call TrainerTower_EventScript_SpeakToKnockoutTrainer
+	end
+
+TrainerTower_5F_EventScript_DoublesTrainer2:: @ 8164792
+	call TrainerTower_EventScript_SpeakToDoublesTrainer2
+	end
+
+TrainerTower_5F_EventScript_Owner:: @ 8164798
+	call TrainerTower_EventScript_SpeakToOwner
+	end
diff --git a/data/maps/TrainerTower_6F/map.json b/data/maps/TrainerTower_6F/map.json
new file mode 100644
index 000000000..05491cf05
--- /dev/null
+++ b/data/maps/TrainerTower_6F/map.json
@@ -0,0 +1,135 @@
+{
+  "id": "MAP_TRAINER_TOWER_6F",
+  "name": "TrainerTower_6F",
+  "layout": "LAYOUT_TRAINER_TOWER_6F",
+  "music": "MUS_T_TOWER",
+  "region_map_section": "MAPSEC_TRAINER_TOWER_2",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 2,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE",
+      "x": 9,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TrainerTower_EventScript_Owner",
+      "flag": "FLAG_TEMP_6"
+    },
+    {
+      "graphics_id": "OBJECT_EVENT_GFX_VAR_0",
+      "x": 10,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TrainerTower_EventScript_DoublesTrainer1",
+      "flag": "FLAG_TEMP_2"
+    },
+    {
+      "graphics_id": "OBJECT_EVENT_GFX_VAR_1",
+      "x": 15,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TrainerTower_EventScript_SinglesTrainer",
+      "flag": "FLAG_TEMP_3"
+    },
+    {
+      "graphics_id": "OBJECT_EVENT_GFX_VAR_2",
+      "x": 10,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TrainerTower_EventScript_KnockoutTrainer",
+      "flag": "FLAG_TEMP_4"
+    },
+    {
+      "graphics_id": "OBJECT_EVENT_GFX_VAR_3",
+      "x": 11,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TrainerTower_EventScript_DoublesTrainer2",
+      "flag": "FLAG_TEMP_5"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 15,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_TRAINER_TOWER_7F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 4,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_TRAINER_TOWER_5F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 13,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_TRAINER_TOWER_ELEVATOR",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 10,
+      "y": 13,
+      "elevation": 3,
+      "var": "VAR_TEMP_E",
+      "var_value": 0,
+      "script": "TrainerTower_EventScript_SingleBattleTrigger"
+    },
+    {
+      "type": "trigger",
+      "x": 9,
+      "y": 12,
+      "elevation": 3,
+      "var": "VAR_TEMP_F",
+      "var_value": 0,
+      "script": "TrainerTower_EventScript_DoubleBattleTriggerTop"
+    },
+    {
+      "type": "trigger",
+      "x": 9,
+      "y": 13,
+      "elevation": 3,
+      "var": "VAR_TEMP_F",
+      "var_value": 0,
+      "script": "TrainerTower_EventScript_DoubleBattleTriggerBottom"
+    }
+  ],
+  "bg_events": []
+}
diff --git a/data/maps/TrainerTower_6F/scripts.inc b/data/maps/TrainerTower_6F/scripts.inc
new file mode 100644
index 000000000..8b9e1dd38
--- /dev/null
+++ b/data/maps/TrainerTower_6F/scripts.inc
@@ -0,0 +1,27 @@
+TrainerTower_6F_MapScripts:: @ 816479E
+	map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume
+	map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_OnTransition
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame
+	.byte 0
+
+@ Below scripts are unused, the identical versions in the 1F script are used instead
+
+TrainerTower_6F_EventScript_DoublesTrainer1:: @ 81647AE
+	call TrainerTower_EventScript_SpeakToDoublesTrainer1
+	end
+
+TrainerTower_6F_EventScript_SinglesTrainer:: @ 81647B4
+	call TrainerTower_EventScript_SpeakToSinglesTrainer
+	end
+
+TrainerTower_6F_EventScript_KnockoutTrainer:: @ 81647BA
+	call TrainerTower_EventScript_SpeakToKnockoutTrainer
+	end
+
+TrainerTower_6F_EventScript_DoublesTrainer2:: @ 81647C0
+	call TrainerTower_EventScript_SpeakToDoublesTrainer2
+	end
+
+TrainerTower_6F_EventScript_Owner:: @ 81647C6
+	call TrainerTower_EventScript_SpeakToOwner
+	end
diff --git a/data/maps/TrainerTower_7F/map.json b/data/maps/TrainerTower_7F/map.json
new file mode 100644
index 000000000..76f2a53f4
--- /dev/null
+++ b/data/maps/TrainerTower_7F/map.json
@@ -0,0 +1,135 @@
+{
+  "id": "MAP_TRAINER_TOWER_7F",
+  "name": "TrainerTower_7F",
+  "layout": "LAYOUT_TRAINER_TOWER_7F",
+  "music": "MUS_T_TOWER",
+  "region_map_section": "MAPSEC_TRAINER_TOWER_2",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 2,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE",
+      "x": 9,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TrainerTower_EventScript_Owner",
+      "flag": "FLAG_TEMP_6"
+    },
+    {
+      "graphics_id": "OBJECT_EVENT_GFX_VAR_0",
+      "x": 10,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TrainerTower_EventScript_DoublesTrainer1",
+      "flag": "FLAG_TEMP_2"
+    },
+    {
+      "graphics_id": "OBJECT_EVENT_GFX_VAR_1",
+      "x": 15,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TrainerTower_EventScript_SinglesTrainer",
+      "flag": "FLAG_TEMP_3"
+    },
+    {
+      "graphics_id": "OBJECT_EVENT_GFX_VAR_2",
+      "x": 10,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TrainerTower_EventScript_KnockoutTrainer",
+      "flag": "FLAG_TEMP_4"
+    },
+    {
+      "graphics_id": "OBJECT_EVENT_GFX_VAR_3",
+      "x": 11,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TrainerTower_EventScript_DoublesTrainer2",
+      "flag": "FLAG_TEMP_5"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 15,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_TRAINER_TOWER_8F",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 4,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_TRAINER_TOWER_6F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 13,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_TRAINER_TOWER_ELEVATOR",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 10,
+      "y": 13,
+      "elevation": 3,
+      "var": "VAR_TEMP_E",
+      "var_value": 0,
+      "script": "TrainerTower_EventScript_SingleBattleTrigger"
+    },
+    {
+      "type": "trigger",
+      "x": 9,
+      "y": 12,
+      "elevation": 3,
+      "var": "VAR_TEMP_F",
+      "var_value": 0,
+      "script": "TrainerTower_EventScript_DoubleBattleTriggerTop"
+    },
+    {
+      "type": "trigger",
+      "x": 9,
+      "y": 13,
+      "elevation": 3,
+      "var": "VAR_TEMP_F",
+      "var_value": 0,
+      "script": "TrainerTower_EventScript_DoubleBattleTriggerBottom"
+    }
+  ],
+  "bg_events": []
+}
diff --git a/data/maps/TrainerTower_7F/scripts.inc b/data/maps/TrainerTower_7F/scripts.inc
new file mode 100644
index 000000000..de47276ca
--- /dev/null
+++ b/data/maps/TrainerTower_7F/scripts.inc
@@ -0,0 +1,27 @@
+TrainerTower_7F_MapScripts:: @ 81647CC
+	map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume
+	map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_OnTransition
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame
+	.byte 0
+
+@ Below scripts are unused, the identical versions in the 1F script are used instead
+
+TrainerTower_7F_EventScript_DoublesTrainer1:: @ 81647DC
+	call TrainerTower_EventScript_SpeakToDoublesTrainer1
+	end
+
+TrainerTower_7F_EventScript_SinglesTrainer:: @ 81647E2
+	call TrainerTower_EventScript_SpeakToSinglesTrainer
+	end
+
+TrainerTower_7F_EventScript_KnockoutTrainer:: @ 81647E8
+	call TrainerTower_EventScript_SpeakToKnockoutTrainer
+	end
+
+TrainerTower_7F_EventScript_DoublesTrainer2:: @ 81647EE
+	call TrainerTower_EventScript_SpeakToDoublesTrainer2
+	end
+
+TrainerTower_7F_EventScript_Owner:: @ 81647F4
+	call TrainerTower_EventScript_SpeakToOwner
+	end
diff --git a/data/maps/TrainerTower_8F/map.json b/data/maps/TrainerTower_8F/map.json
new file mode 100644
index 000000000..26cabfb06
--- /dev/null
+++ b/data/maps/TrainerTower_8F/map.json
@@ -0,0 +1,135 @@
+{
+  "id": "MAP_TRAINER_TOWER_8F",
+  "name": "TrainerTower_8F",
+  "layout": "LAYOUT_TRAINER_TOWER_8F",
+  "music": "MUS_T_TOWER",
+  "region_map_section": "MAPSEC_TRAINER_TOWER_2",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 2,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "OBJECT_EVENT_GFX_TRAINER_TOWER_DUDE",
+      "x": 9,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TrainerTower_EventScript_Owner",
+      "flag": "FLAG_TEMP_6"
+    },
+    {
+      "graphics_id": "OBJECT_EVENT_GFX_VAR_0",
+      "x": 10,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TrainerTower_EventScript_DoublesTrainer1",
+      "flag": "FLAG_TEMP_2"
+    },
+    {
+      "graphics_id": "OBJECT_EVENT_GFX_VAR_1",
+      "x": 15,
+      "y": 13,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_LEFT",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TrainerTower_EventScript_SinglesTrainer",
+      "flag": "FLAG_TEMP_3"
+    },
+    {
+      "graphics_id": "OBJECT_EVENT_GFX_VAR_2",
+      "x": 10,
+      "y": 16,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_UP",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TrainerTower_EventScript_KnockoutTrainer",
+      "flag": "FLAG_TEMP_4"
+    },
+    {
+      "graphics_id": "OBJECT_EVENT_GFX_VAR_3",
+      "x": 11,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "TrainerTower_EventScript_DoublesTrainer2",
+      "flag": "FLAG_TEMP_5"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 15,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_TRAINER_TOWER_ROOF",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 4,
+      "y": 6,
+      "elevation": 3,
+      "dest_map": "MAP_TRAINER_TOWER_7F",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 13,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_TRAINER_TOWER_ELEVATOR",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+    {
+      "type": "trigger",
+      "x": 10,
+      "y": 13,
+      "elevation": 3,
+      "var": "VAR_TEMP_E",
+      "var_value": 0,
+      "script": "TrainerTower_EventScript_SingleBattleTrigger"
+    },
+    {
+      "type": "trigger",
+      "x": 9,
+      "y": 12,
+      "elevation": 3,
+      "var": "VAR_TEMP_F",
+      "var_value": 0,
+      "script": "TrainerTower_EventScript_DoubleBattleTriggerTop"
+    },
+    {
+      "type": "trigger",
+      "x": 9,
+      "y": 13,
+      "elevation": 3,
+      "var": "VAR_TEMP_F",
+      "var_value": 0,
+      "script": "TrainerTower_EventScript_DoubleBattleTriggerBottom"
+    }
+  ],
+  "bg_events": []
+}
diff --git a/data/maps/TrainerTower_8F/scripts.inc b/data/maps/TrainerTower_8F/scripts.inc
new file mode 100644
index 000000000..fc168780b
--- /dev/null
+++ b/data/maps/TrainerTower_8F/scripts.inc
@@ -0,0 +1,27 @@
+TrainerTower_8F_MapScripts:: @ 81647FA
+	map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume
+	map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_OnTransition
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame
+	.byte 0
+
+@ Below scripts are unused, the identical versions in the 1F script are used instead
+
+TrainerTower_8F_EventScript_DoublesTrainer1:: @ 816480A
+	call TrainerTower_EventScript_SpeakToDoublesTrainer1
+	end
+
+TrainerTower_8F_EventScript_SinglesTrainer:: @ 8164810
+	call TrainerTower_EventScript_SpeakToSinglesTrainer
+	end
+
+TrainerTower_8F_EventScript_KnockoutTrainer:: @ 8164816
+	call TrainerTower_EventScript_SpeakToKnockoutTrainer
+	end
+
+TrainerTower_8F_EventScript_DoublesTrainer2:: @ 816481C
+	call TrainerTower_EventScript_SpeakToDoublesTrainer2
+	end
+
+TrainerTower_8F_EventScript_Owner:: @ 8164822
+	call TrainerTower_EventScript_SpeakToOwner
+	end
diff --git a/data/maps/SevenIsland_TrainerTower_Elevator/map.json b/data/maps/TrainerTower_Elevator/map.json
index fef686312..7d004c2df 100644
--- a/data/maps/SevenIsland_TrainerTower_Elevator/map.json
+++ b/data/maps/TrainerTower_Elevator/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR",
-  "name": "SevenIsland_TrainerTower_Elevator",
-  "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR",
+  "id": "MAP_TRAINER_TOWER_ELEVATOR",
+  "name": "TrainerTower_Elevator",
+  "layout": "LAYOUT_TRAINER_TOWER_ELEVATOR",
   "music": "MUS_T_TOWER",
   "region_map_section": "MAPSEC_TRAINER_TOWER_2",
   "requires_flash": false,
@@ -29,7 +29,7 @@
       "x": 0,
       "y": 2,
       "elevation": 0,
-      "script": "SevenIsland_TrainerTower_Elevator_EventScript_164B03"
+      "script": "TrainerTower_Elevator_EventScript_FloorSelect"
     }
   ]
 }
diff --git a/data/maps/TrainerTower_Elevator/scripts.inc b/data/maps/TrainerTower_Elevator/scripts.inc
new file mode 100644
index 000000000..349667102
--- /dev/null
+++ b/data/maps/TrainerTower_Elevator/scripts.inc
@@ -0,0 +1,80 @@
+TrainerTower_Elevator_MapScripts:: @ 8164AF8
+	map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame
+	.byte 0
+
+TrainerTower_Elevator_EventScript_FloorSelect:: @ 8164B03
+	lockall
+	setvar VAR_0x8004, 6
+	call_if_unset FLAG_TEMP_2, EventScript_GetElevatorFloor
+	copyvar VAR_0x8005, VAR_ELEVATOR_FLOOR
+	special Special_DrawElevatorCurrentFloorWindow
+	message Text_WantWhichFloor
+	waitmessage
+	setvar VAR_0x8004, 6
+	specialvar VAR_RESULT, Special_InitElevatorFloorSelectMenuPos
+	switch VAR_RESULT
+	case 0, TrainerTower_Elevator_EventScript_FloorSelectFromRoof
+	case 1, TrainerTower_Elevator_EventScript_FloorSelectFromLobby
+	end
+
+TrainerTower_Elevator_EventScript_FloorSelectFromRoof:: @ 8164B46
+	multichoicedefault 0, 0, MULTICHOICE_ROOFTOP_B1F, 0, FALSE
+	goto TrainerTower_Elevator_EventScript_ChooseFloor
+	end
+
+TrainerTower_Elevator_EventScript_FloorSelectFromLobby:: @ 8164B52
+	multichoicedefault 0, 0, MULTICHOICE_ROOFTOP_B1F, 1, FALSE
+	goto TrainerTower_Elevator_EventScript_ChooseFloor
+	end
+
+TrainerTower_Elevator_EventScript_ChooseFloor:: @ 8164B5E
+	switch VAR_RESULT
+	case 0, TrainerTower_Elevator_EventScript_SelectRoof
+	case 1, TrainerTower_Elevator_EventScript_SelectLobby
+	case 2, TrainerTower_Elevator_EventScript_CloseFloorSelect
+	case SCR_MENU_CANCEL, TrainerTower_Elevator_EventScript_CloseFloorSelect
+	end
+
+TrainerTower_Elevator_EventScript_SelectLobby:: @ 8164B90
+	setvar VAR_0x8006, 3
+	setdynamicwarp MAP_TRAINER_TOWER_LOBBY, 255, 17, 8
+	compare VAR_ELEVATOR_FLOOR, 3
+	goto_if_eq TrainerTower_Elevator_EventScript_CloseFloorSelect
+	call TrainerTower_Elevator_EventScript_MoveElevator
+	setvar VAR_ELEVATOR_FLOOR, 3
+	special Special_CloseElevatorCurrentFloorWindow
+	delay 25
+	applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Elevator_Movement_ExitElevator
+	waitmovement 0
+	warp MAP_TRAINER_TOWER_LOBBY, 255, 17, 8
+	waitstate
+	releaseall
+	end
+
+TrainerTower_Elevator_EventScript_SelectRoof:: @ 8164BCD
+	goto TrainerTower_Elevator_EventScript_CloseFloorSelect
+	end
+
+TrainerTower_Elevator_EventScript_CloseFloorSelect:: @ 8164BD3
+	special Special_CloseElevatorCurrentFloorWindow
+	releaseall
+	end
+
+TrainerTower_Elevator_EventScript_MoveElevator:: @ 8164BD8
+	special Special_CloseElevatorCurrentFloorWindow
+	closemessage
+	waitse
+	special Special_AnimateElevator
+	waitstate
+	setflag FLAG_TEMP_2
+	return
+
+TrainerTower_Elevator_Movement_ExitElevator:: @ 8164BE5
+	walk_in_place_fastest_down
+	delay_16
+	walk_down
+	walk_right
+	walk_right
+	walk_down
+	step_end
diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/map.json b/data/maps/TrainerTower_Lobby/map.json
index 3f553ce47..23e8456c0 100644
--- a/data/maps/SevenIsland_TrainerTower_Lobby/map.json
+++ b/data/maps/TrainerTower_Lobby/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY",
-  "name": "SevenIsland_TrainerTower_Lobby",
-  "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_LOBBY",
+  "id": "MAP_TRAINER_TOWER_LOBBY",
+  "name": "TrainerTower_Lobby",
+  "layout": "LAYOUT_TRAINER_TOWER_LOBBY",
   "music": "MUS_T_TOWER",
   "region_map_section": "MAPSEC_TRAINER_TOWER_2",
   "requires_flash": false,
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_Lobby_EventScript_16495D",
+      "script": "TrainerTower_Lobby_EventScript_Nurse",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_Lobby_EventScript_164992",
+      "script": "TrainerTower_Lobby_EventScript_MartClerk",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_Lobby_EventScript_164966",
+      "script": "TrainerTower_Lobby_EventScript_Receptionist",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_Lobby_EventScript_164AE6",
+      "script": "TrainerTower_Lobby_EventScript_CooltrainerF",
       "flag": "0"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_Lobby_EventScript_164AEF",
+      "script": "TrainerTower_Lobby_EventScript_BaldingMan",
       "flag": "0"
     }
   ],
@@ -84,7 +84,7 @@
       "x": 9,
       "y": 2,
       "elevation": 3,
-      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_1F",
+      "dest_map": "MAP_TRAINER_TOWER_1F",
       "dest_warp_id": 1
     },
     {
@@ -98,7 +98,7 @@
       "x": 17,
       "y": 8,
       "elevation": 0,
-      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR",
+      "dest_map": "MAP_TRAINER_TOWER_ELEVATOR",
       "dest_warp_id": 0
     }
   ],
@@ -110,7 +110,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_TRAINER_TOWER",
       "var_value": 0,
-      "script": "SevenIsland_TrainerTower_Lobby_EventScript_1649CE"
+      "script": "TrainerTower_Lobby_EventScript_EntryTrigger"
     }
   ],
   "bg_events": [
@@ -119,7 +119,7 @@
       "x": 8,
       "y": 10,
       "elevation": 0,
-      "script": "SevenIsland_TrainerTower_Lobby_EventScript_164AD8"
+      "script": "TrainerTower_Lobby_EventScript_ShowRecords"
     }
   ]
 }
diff --git a/data/maps/TrainerTower_Lobby/scripts.inc b/data/maps/TrainerTower_Lobby/scripts.inc
new file mode 100644
index 000000000..0fc2422b6
--- /dev/null
+++ b/data/maps/TrainerTower_Lobby/scripts.inc
@@ -0,0 +1,226 @@
+TrainerTower_Lobby_MapScripts:: @ 8164839
+	map_script MAP_SCRIPT_ON_RESUME, TrainerTower_Lobby_OnResume
+	map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, TrainerTower_Lobby_OnReturnToField
+	map_script MAP_SCRIPT_ON_TRANSITION, TrainerTower_Lobby_OnTransition
+	map_script MAP_SCRIPT_ON_LOAD, TrainerTower_Lobby_OnLoad
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_Lobby_OnFrame
+	.byte 0
+
+TrainerTower_Lobby_OnResume:: @ 8164853
+	setvar VAR_TEMP_2, 0
+	ttower_resumetimer
+	ttower_shouldexit
+	compare VAR_RESULT, FALSE
+	goto_if_eq TrainerTower_Lobby_OnResumeEnd
+	@ Never reached, above always FALSE
+	setvar VAR_TEMP_0, 0
+	setobjectxy OBJ_EVENT_ID_PLAYER, 9, 7
+	applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_FaceReceptionist
+TrainerTower_Lobby_OnResumeEnd:: @ 8164886
+	end
+
+TrainerTower_Lobby_OnReturnToField:: @ 8164887
+	addobject 1
+	addobject 2
+	addobject 3
+	addobject 4
+	addobject 5
+	end
+
+TrainerTower_Lobby_OnLoad:: @ 8164897
+	compare VAR_TEMP_D, 17
+	call_if_eq TrainerTower_Lobby_OpenCounterBarrier
+	end
+
+TrainerTower_Lobby_OpenCounterBarrier:: @ 81648A3
+	setmetatile 17, 10, METATILE_TrainerTower_Floor_ShadeBottomLeft, 0
+	return
+
+TrainerTower_Lobby_OnTransition:: @ 81648AD
+	setworldmapflag FLAG_WORLD_MAP_TRAINER_TOWER_LOBBY
+	getplayerxy VAR_TEMP_D, VAR_RESULT
+	end
+
+TrainerTower_Lobby_OnFrame:: @ 81648B6
+	map_script_2 VAR_TEMP_0, 0, TrainerTower_Lobby_EventScript_Enter
+	map_script_2 VAR_TEMP_D, 17, TrainerTower_Lobby_EventScript_ExitElevator
+	.2byte 0
+
+TrainerTower_Lobby_EventScript_ExitElevator:: @ 81648C8
+	lockall
+	applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_ExitElevator
+	waitmovement 0
+	setmetatile 17, 10, METATILE_TrainerTower_CounterBarrier, 1
+	special DrawWholeMapView
+	playse SE_TK_KASYA
+	waitse
+	setvar VAR_TEMP_D, 0
+	releaseall
+	end
+
+TrainerTower_Lobby_Movement_ExitElevator:: @ 81648EA
+	walk_down
+	walk_down
+	step_end
+
+TrainerTower_Lobby_EventScript_Enter:: @ 81648ED
+	setvar VAR_TEMP_0, 1
+	ttower_getchallengestatus
+	switch VAR_RESULT
+	case CHALLENGE_STATUS_LOST, TrainerTower_Lobby_EventScript_LostChallenge
+	case CHALLENGE_STATUS_UNK, TrainerTower_Lobby_EventScript_164938
+	case CHALLENGE_STATUS_NORMAL, TrainerTower_Lobby_EventScript_EnterEnd
+
+TrainerTower_Lobby_EventScript_LostChallenge:: @ 8164920
+	lock
+	faceplayer
+	applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_FaceReceptionist
+	textcolor 1
+	msgbox TrainerTower_Lobby_Text_TooBadComeBackTryAgain
+	goto TrainerTower_Lobby_EventScript_ExitChallenge
+
+@ Presumably E-Reader related
+TrainerTower_Lobby_EventScript_164938:: @ 8164938
+	lock
+	faceplayer
+	applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_FaceReceptionist
+	textcolor 1
+	msgbox TrainerTower_Lobby_Text_MoveCounterHereWhenTrainersSwitch
+TrainerTower_Lobby_EventScript_ExitChallenge:: @ 816494B
+	closemessage
+	applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_WalkDown
+	waitmovement 0
+	setvar VAR_MAP_SCENE_TRAINER_TOWER, 0
+	release
+TrainerTower_Lobby_EventScript_EnterEnd:: @ 816495C
+	end
+
+TrainerTower_Lobby_EventScript_Nurse:: @ 816495D
+	lock
+	faceplayer
+	call EventScript_PkmnCenterNurse
+	release
+	end
+
+TrainerTower_Lobby_EventScript_Receptionist:: @ 8164966
+	lock
+	faceplayer
+	ttower_getbeatchallenge
+	compare VAR_RESULT, TRUE
+	goto_if_eq TrainerTower_Lobby_EventScript_ThanksForCompeting
+	msgbox TrainerTower_Lobby_Text_GiveItYourBest
+	goto TrainerTower_Lobby_EventScript_ReceptionistEnd
+
+TrainerTower_Lobby_EventScript_ThanksForCompeting:: @ 8164988
+	msgbox TrainerTower_Lobby_Text_ThanksForCompeting
+TrainerTower_Lobby_EventScript_ReceptionistEnd:: @ 8164990
+	release
+	end
+
+TrainerTower_Lobby_EventScript_MartClerk:: @ 8164992
+	goto_if_questlog EventScript_ReleaseEnd
+	lock
+	faceplayer
+	message Text_MayIHelpYou
+	waitmessage
+	pokemart TrainerTower_Lobby_Mart_Items
+	msgbox Text_PleaseComeAgain
+	release
+	end
+
+	.align 2
+TrainerTower_Lobby_Mart_Items:: @ 81649B8
+	.2byte ITEM_ULTRA_BALL
+	.2byte ITEM_GREAT_BALL
+	.2byte ITEM_FULL_RESTORE
+	.2byte ITEM_MAX_POTION
+	.2byte ITEM_HYPER_POTION
+	.2byte ITEM_REVIVE
+	.2byte ITEM_FULL_HEAL
+	.2byte ITEM_ESCAPE_ROPE
+	.2byte ITEM_MAX_REPEL
+	.2byte ITEM_NONE
+	release
+	end
+
+TrainerTower_Lobby_EventScript_EntryTrigger:: @ 81649CE
+	lockall
+	applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_FaceReceptionist
+	textcolor 1
+	msgbox TrainerTower_Lobby_Text_WelcomeToTrainerTower
+	ttower_getnumfloors
+	compare VAR_RESULT, FALSE
+	goto_if_eq TrainerTower_Lobby_EventScript_AllFloorsUsed
+	msgbox TrainerTower_Lobby_Text_TrainersUpToFloorNum
+	goto TrainerTower_Lobby_EventScript_AskEnterChallenge
+
+TrainerTower_Lobby_EventScript_AllFloorsUsed:: @ 8164A00
+	msgbox TrainerTower_Lobby_Text_TrainersUpEighthFloor
+TrainerTower_Lobby_EventScript_AskEnterChallenge:: @ 8164A08
+	message TrainerTower_Lobby_Text_LikeToChallengeTrainers
+	waitmessage
+	multichoice 18, 6, MULTICHOICE_YES_NO_INFO, FALSE
+	switch VAR_RESULT
+	case 0, TrainerTower_Lobby_EventScript_ChooseChallenge
+	case 1, TrainerTower_Lobby_EventScript_DeclineChallenge
+	case 2, TrainerTower_Lobby_EventScript_ChallengeInfo
+	case SCR_MENU_CANCEL, TrainerTower_Lobby_EventScript_DeclineChallenge
+	end
+
+TrainerTower_Lobby_EventScript_ChallengeInfo:: @ 8164A45
+	msgbox TrainerTower_Lobby_Text_ExplainTrainerTower
+	goto TrainerTower_Lobby_EventScript_AskEnterChallenge
+	end
+
+TrainerTower_Lobby_EventScript_ChooseChallenge:: @ 8164A53
+	multichoice 13, 3, MULTICHOICE_TRAINER_TOWER_MODE, FALSE
+	switch VAR_RESULT
+	case 0, TrainerTower_Lobby_EventScript_BeginChallenge
+	case 1, TrainerTower_Lobby_EventScript_BeginChallenge
+	case 2, TrainerTower_Lobby_EventScript_BeginChallenge
+	case 3, TrainerTower_Lobby_EventScript_BeginChallenge
+	case 4, TrainerTower_Lobby_EventScript_DeclineChallenge
+	case SCR_MENU_CANCEL, TrainerTower_Lobby_EventScript_DeclineChallenge
+	end
+
+TrainerTower_Lobby_EventScript_BeginChallenge:: @ 8164AA0
+	copyvar VAR_0x8005, VAR_RESULT
+	setvar VAR_MAP_SCENE_TRAINER_TOWER, 1
+	special HealPlayerParty
+	msgbox TrainerTower_Lobby_Text_StartClockGetSetGo
+	ttower_startchallenge
+	releaseall
+	end
+
+TrainerTower_Lobby_EventScript_DeclineChallenge:: @ 8164ABF
+	msgbox TrainerTower_Lobby_Text_PleaseVisitUsAgain
+	closemessage
+	applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Lobby_Movement_WalkDown
+	waitmovement 0
+	releaseall
+	end
+
+TrainerTower_Lobby_Movement_FaceReceptionist:: @ 8164AD4
+	face_right
+	step_end
+
+TrainerTower_Lobby_Movement_WalkDown:: @ 8164AD6
+	walk_down
+	step_end
+
+TrainerTower_Lobby_EventScript_ShowRecords:: @ 8164AD8
+	lockall
+	fadescreen FADE_TO_BLACK
+	setvar VAR_0x8004, 1
+	special Special_BattleRecords
+	waitstate
+	releaseall
+	end
+
+TrainerTower_Lobby_EventScript_CooltrainerF:: @ 8164AE6
+	msgbox TrainerTower_Lobby_Text_WonderWhatKindsOfTrainers, MSGBOX_NPC
+	end
+
+TrainerTower_Lobby_EventScript_BaldingMan:: @ 8164AEF
+	msgbox TrainerTower_Lobby_Text_StairsTougherThanAnyBattle, MSGBOX_NPC
+	end
diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/text.inc b/data/maps/TrainerTower_Lobby/text.inc
index bf1e73b91..4e6bb8b07 100644
--- a/data/maps/SevenIsland_TrainerTower_Lobby/text.inc
+++ b/data/maps/TrainerTower_Lobby/text.inc
@@ -1,50 +1,52 @@
-gUnknown_817C794:: @ 817C794
+@ All Trainer Tower text (Lobby and Roof) is interleaved here
+
+TrainerTower_Lobby_Text_WelcomeToTrainerTower:: @ 817C794
     .string "Hello!\p"
     .string "Welcome to TRAINER TOWER where\n"
     .string "TRAINERS gather from all over!$"
 
-gUnknown_817C7D9:: @ 817C7D9
+TrainerTower_Lobby_Text_TrainersUpToFloorNum:: @ 817C7D9
     .string "TRAINERS from all over the world\n"
     .string "gather here to battle.\p"
     .string "Let me see…\p"
     .string "Right now, there are TRAINERS only\n"
     .string "up to Floor {STR_VAR_1}.$"
 
-gUnknown_817C850:: @ 817C850
+TrainerTower_Lobby_Text_TrainersUpEighthFloor:: @ 817C850
     .string "TRAINERS are awaiting your\n"
     .string "challenge up to the eighth floor.$"
 
-Text_17C88D:: @ 817C88D
+TrainerTower_Lobby_Text_LikeToChallengeTrainers:: @ 817C88D
     .string "Would you like to challenge the\n"
     .string "waiting TRAINERS?$"
 
-gUnknown_817C8BF:: @ 817C8BF
+TrainerTower_Lobby_Text_StartClockGetSetGo:: @ 817C8BF
     .string "Okay, I'll get the clock started,\n"
     .string "so give it everything you have.\p"
     .string "On your marks…\p"
     .string "Get set…\p"
     .string "Go!$"
 
-gUnknown_817C91D:: @ 817C91D
+TrainerTower_Lobby_Text_PleaseVisitUsAgain:: @ 817C91D
     .string "Please do visit us again!$"
 
-gUnknown_817C937:: @ 817C937
+TrainerTower_Lobby_Text_TooBadComeBackTryAgain:: @ 817C937
     .string "That was too bad.\p"
     .string "I think you put in a tremendous\n"
     .string "effort in your battling.\p"
     .string "Please come back and try again!$"
 
-gUnknown_817C9A2:: @ 817C9A2
+TrainerTower_Lobby_Text_GiveItYourBest:: @ 817C9A2
     .string "I hope you give it your best.$"
 
-gUnknown_817C9C0:: @ 817C9C0
+TrainerTower_Lobby_Text_MoveCounterHereWhenTrainersSwitch:: @ 817C9C0
     .string "When the TRAINERS switch places,\n"
     .string "the movement can be hectic.\p"
     .string "To avoid the stampede, we moved\n"
     .string "the reception counter here.\p"
     .string "I'm sorry for the inconvenience.$"
 
-Text_17CA5A:: @ 817CA5A
+TrainerTower_Roof_Text_ImOwnerBattledPerfectly:: @ 817CA5A
     .string "Hello…\p"
     .string "I am the owner of this TOWER…\p"
     .string "How the sky soars above this\n"
@@ -54,10 +56,10 @@ Text_17CA5A:: @ 817CA5A
     .string "The way you battled…\n"
     .string "It, too, was perfection…$"
 
-Text_17CB09:: @ 817CB09
+TrainerTower_Roof_Text_ThisIsForYou:: @ 817CB09
     .string "This is for you…$"
 
-Text_17CB1A:: @ 817CB1A
+TrainerTower_Roof_Text_DoneItInRecordTime:: @ 817CB1A
     .string "Oh!\n"
     .string "Stupendous!\p"
     .string "It's marvelous how you've come up\n"
@@ -67,28 +69,28 @@ Text_17CB1A:: @ 817CB1A
     .string "I'll have your record posted at\n"
     .string "the reception counter.$"
 
-Text_17CBC0:: @ 817CBC0
+TrainerTower_Roof_Text_TookSweetTimeGettingHere:: @ 817CBC0
     .string "You seem to have taken your sweet\n"
     .string "time getting here…$"
 
-Text_17CBF5:: @ 817CBF5
+TrainerTower_Roof_Text_IdLikeToSeeBetterTime:: @ 817CBF5
     .string "What I would like to see is a\n"
     .string "better time out of you…\p"
     .string "I'm counting on you.\p"
     .string "Until then, farewell…$"
 
-Text_17CC56:: @ 817CC56
+TrainerTower_Text_XMinYZSec:: @ 817CC56
     .string "{STR_VAR_1} min. {STR_VAR_2}.{STR_VAR_3} sec.$"
 
-Text_17CC69:: @ 817CC69
+TrainerTower_Lobby_Text_HereAreTheResults:: @ 817CC69
     .string "せいせきひょうです$"
 
-Text_17CC73:: @ 817CC73
+TrainerTower_Lobby_Text_NeedTwoMonsForDouble:: @ 817CC73
     .string "This is a two-on-two battle.\p"
     .string "You may not battle unless you have\n"
     .string "at least two POKéMON.$"
 
-gUnknown_817CCC9:: @ 817CCC9
+TrainerTower_Lobby_Text_ExplainTrainerTower:: @ 817CCC9
     .string "Here at TRAINER TOWER, there is an\n"
     .string "event called TIME ATTACK.\p"
     .string "You will be timed on how quickly\n"
@@ -101,16 +103,16 @@ gUnknown_817CCC9:: @ 817CCC9
     .string "You will not earn any EXP. Points\n"
     .string "or money by beating TRAINERS here.$"
 
-gUnknown_817CE1F:: @ 817CE1F
+TrainerTower_Lobby_Text_ThanksForCompeting:: @ 817CE1F
     .string "Thank you for competing!$"
 
-gUnknown_817CE38:: @ 817CE38
+TrainerTower_Lobby_Text_WonderWhatKindsOfTrainers:: @ 817CE38
     .string "I'm here to see how good I am.\p"
     .string "I wonder what kinds of TRAINERS\n"
     .string "are waiting for me?\p"
     .string "It's nerve-racking!$"
 
-gUnknown_817CE9F:: @ 817CE9F
+TrainerTower_Lobby_Text_StairsTougherThanAnyBattle:: @ 817CE9F
     .string "Gasp, gasp…\n"
     .string "Gasp…\p"
     .string "Never mind battling! These stairs…\n"
diff --git a/data/maps/SevenIsland_TrainerTower_Roof/map.json b/data/maps/TrainerTower_Roof/map.json
index ee3dbe4c0..c9a98a144 100644
--- a/data/maps/SevenIsland_TrainerTower_Roof/map.json
+++ b/data/maps/TrainerTower_Roof/map.json
@@ -1,7 +1,7 @@
 {
-  "id": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ROOF",
-  "name": "SevenIsland_TrainerTower_Roof",
-  "layout": "LAYOUT_SEVEN_ISLAND_TRAINER_TOWER_ROOF",
+  "id": "MAP_TRAINER_TOWER_ROOF",
+  "name": "TrainerTower_Roof",
+  "layout": "LAYOUT_TRAINER_TOWER_ROOF",
   "music": "MUS_T_TOWER",
   "region_map_section": "MAPSEC_TRAINER_TOWER_2",
   "requires_flash": false,
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_TrainerTower_Roof_EventScript_1646E0",
+      "script": "TrainerTower_EventScript_Owner",
       "flag": "FLAG_TEMP_6"
     }
   ],
@@ -32,14 +32,14 @@
       "x": 13,
       "y": 5,
       "elevation": 0,
-      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_ELEVATOR",
+      "dest_map": "MAP_TRAINER_TOWER_ELEVATOR",
       "dest_warp_id": 0
     },
     {
       "x": 4,
       "y": 6,
       "elevation": 3,
-      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_8F",
+      "dest_map": "MAP_TRAINER_TOWER_8F",
       "dest_warp_id": 0
     }
   ],
diff --git a/data/maps/TrainerTower_Roof/scripts.inc b/data/maps/TrainerTower_Roof/scripts.inc
new file mode 100644
index 000000000..b338e3a62
--- /dev/null
+++ b/data/maps/TrainerTower_Roof/scripts.inc
@@ -0,0 +1,10 @@
+TrainerTower_Roof_MapScripts:: @ 8164828
+	map_script MAP_SCRIPT_ON_RESUME, TrainerTower_OnResume
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerTower_OnFrame
+	.byte 0
+
+@ Below script is unused, the identical version in the 1F script is used instead
+
+TrainerTower_Roof_EventScript_Owner:: @ 8164833
+	call TrainerTower_EventScript_SpeakToOwner
+	end
diff --git a/data/maps/UnknownMap_03_50/scripts.inc b/data/maps/UnknownMap_03_50/scripts.inc
deleted file mode 100644
index 4e136faae..000000000
--- a/data/maps/UnknownMap_03_50/scripts.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-UnknownMap_03_50_MapScripts:: @ 81687E0
-	.byte 0
diff --git a/data/maps/UnknownMap_03_51/scripts.inc b/data/maps/UnknownMap_03_51/scripts.inc
deleted file mode 100644
index 7398062d8..000000000
--- a/data/maps/UnknownMap_03_51/scripts.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-UnknownMap_03_51_MapScripts:: @ 81687E1
-	.byte 0
diff --git a/data/maps/UnknownMap_03_52/scripts.inc b/data/maps/UnknownMap_03_52/scripts.inc
deleted file mode 100644
index 2e48ca113..000000000
--- a/data/maps/UnknownMap_03_52/scripts.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-UnknownMap_03_52_MapScripts:: @ 81687E2
-	.byte 0
diff --git a/data/maps/UnknownMap_03_53/scripts.inc b/data/maps/UnknownMap_03_53/scripts.inc
deleted file mode 100644
index 2dec9650e..000000000
--- a/data/maps/UnknownMap_03_53/scripts.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-UnknownMap_03_53_MapScripts:: @ 81687E3
-	.byte 0
diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json
index 03b6b0cdd..9f5ddc540 100644
--- a/data/maps/VictoryRoad_1F/map.json
+++ b/data/maps/VictoryRoad_1F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "VictoryRoad_1F_EventScript_160F7B",
+      "script": "VictoryRoad_1F_EventScript_Rolando",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "VictoryRoad_1F_EventScript_160F64",
+      "script": "VictoryRoad_1F_EventScript_Naomi",
       "flag": "0"
     },
     {
@@ -129,7 +129,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_VICTORY_ROAD_1F",
       "var_value": 99,
-      "script": "VictoryRoad_1F_EventScript_160F33"
+      "script": "VictoryRoad_1F_EventScript_FloorSwitch"
     }
   ],
   "bg_events": [
diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc
index 79d01278f..5bdc91202 100644
--- a/data/maps/VictoryRoad_1F/scripts.inc
+++ b/data/maps/VictoryRoad_1F/scripts.inc
@@ -5,24 +5,24 @@ VictoryRoad_1F_MapScripts:: @ 8160F05
 
 VictoryRoad_1F_OnLoad:: @ 8160F10
 	compare VAR_MAP_SCENE_VICTORY_ROAD_1F, 100
-	call_if_ne EventScript_160F1C
+	call_if_ne VictoryRoad_1F_EventScript_SetRockBarrier
 	end
 
-EventScript_160F1C:: @ 8160F1C
-	setmetatile 12, 14, 775, 1
-	setmetatile 12, 15, 791, 1
+VictoryRoad_1F_EventScript_SetRockBarrier:: @ 8160F1C
+	setmetatile 12, 14, METATILE_Cave_RockBarrier_Top, 1
+	setmetatile 12, 15, METATILE_Cave_RockBarrier_Bottom, 1
 	return
 
 VictoryRoad_1F_OnTransition:: @ 8160F2F
 	setworldmapflag FLAG_WORLD_MAP_VICTORY_ROAD_1F
 	end
 
-VictoryRoad_1F_EventScript_160F33:: @ 8160F33
+VictoryRoad_1F_EventScript_FloorSwitch:: @ 8160F33
 	lockall
 	compare VAR_MAP_SCENE_VICTORY_ROAD_1F, 100
-	goto_if_eq EventScript_160F62
-	setmetatile 12, 14, 721, 0
-	setmetatile 12, 15, 737, 0
+	goto_if_eq VictoryRoad_1F_EventScript_FloorSwitchAlreadyPressed
+	setmetatile 12, 14, METATILE_Cave_Floor_Ledge_Top, 0
+	setmetatile 12, 15, METATILE_Cave_Floor_Ledge_Bottom, 0
 	playse SE_RU_GASYAN
 	special DrawWholeMapView
 	waitse
@@ -31,16 +31,16 @@ VictoryRoad_1F_EventScript_160F33:: @ 8160F33
 	releaseall
 	end
 
-EventScript_160F62:: @ 8160F62
+VictoryRoad_1F_EventScript_FloorSwitchAlreadyPressed:: @ 8160F62
 	releaseall
 	end
 
-VictoryRoad_1F_EventScript_160F64:: @ 8160F64
-	trainerbattle_single TRAINER_COOLTRAINER_NAOMI, Text_174710, Text_174738
-	msgbox gUnknown_8174744, MSGBOX_AUTOCLOSE
+VictoryRoad_1F_EventScript_Naomi:: @ 8160F64
+	trainerbattle_single TRAINER_COOLTRAINER_NAOMI, VictoryRoad_1F_Text_NaomiIntro, VictoryRoad_1F_Text_NaomiDefeat
+	msgbox VictoryRoad_1F_Text_NaomiPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_1F_EventScript_160F7B:: @ 8160F7B
-	trainerbattle_single TRAINER_COOLTRAINER_ROLANDO, Text_174784, Text_1747B8
-	msgbox gUnknown_81747C8, MSGBOX_AUTOCLOSE
+VictoryRoad_1F_EventScript_Rolando:: @ 8160F7B
+	trainerbattle_single TRAINER_COOLTRAINER_ROLANDO, VictoryRoad_1F_Text_RolandoIntro, VictoryRoad_1F_Text_RolandoDefeat
+	msgbox VictoryRoad_1F_Text_RolandoPostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/VictoryRoad_1F/text.inc b/data/maps/VictoryRoad_1F/text.inc
index 46cd136ad..d83abf202 100644
--- a/data/maps/VictoryRoad_1F/text.inc
+++ b/data/maps/VictoryRoad_1F/text.inc
@@ -1,22 +1,22 @@
-Text_174710:: @ 8174710
+VictoryRoad_1F_Text_NaomiIntro:: @ 8174710
     .string "I wonder if you are good enough\n"
     .string "for me?$"
 
-Text_174738:: @ 8174738
+VictoryRoad_1F_Text_NaomiDefeat:: @ 8174738
     .string "I lost out…$"
 
-gUnknown_8174744:: @ 8174744
+VictoryRoad_1F_Text_NaomiPostBattle:: @ 8174744
     .string "I never wanted to lose to anybody,\n"
     .string "especially to a younger kid…$"
 
-Text_174784:: @ 8174784
+VictoryRoad_1F_Text_RolandoIntro:: @ 8174784
     .string "I can see you're good.\n"
     .string "Let me see exactly how good!$"
 
-Text_1747B8:: @ 81747B8
+VictoryRoad_1F_Text_RolandoDefeat:: @ 81747B8
     .string "I had a chance…$"
 
-gUnknown_81747C8:: @ 81747C8
+VictoryRoad_1F_Text_RolandoPostBattle:: @ 81747C8
     .string "Tch!\n"
     .string "I concede, you are better than I!$"
 
diff --git a/data/maps/VictoryRoad_2F/map.json b/data/maps/VictoryRoad_2F/map.json
index bb44ea7d0..33024c025 100644
--- a/data/maps/VictoryRoad_2F/map.json
+++ b/data/maps/VictoryRoad_2F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "VictoryRoad_2F_EventScript_161037",
+      "script": "VictoryRoad_2F_EventScript_Dawson",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "VictoryRoad_2F_EventScript_16104E",
+      "script": "VictoryRoad_2F_EventScript_Daisuke",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "VictoryRoad_2F_EventScript_161065",
+      "script": "VictoryRoad_2F_EventScript_Nelson",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 4,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "VictoryRoad_2F_EventScript_161093",
+      "script": "VictoryRoad_2F_EventScript_Vincent",
       "flag": "0"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "VictoryRoad_2F_EventScript_16107C",
+      "script": "VictoryRoad_2F_EventScript_Gregory",
       "flag": "0"
     },
     {
@@ -256,7 +256,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1",
       "var_value": 99,
-      "script": "VictoryRoad_2F_EventScript_160FD5"
+      "script": "VictoryRoad_2F_EventScript_FloorSwitch1"
     },
     {
       "type": "trigger",
@@ -265,7 +265,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2",
       "var_value": 99,
-      "script": "VictoryRoad_2F_EventScript_161006"
+      "script": "VictoryRoad_2F_EventScript_FloorSwitch2"
     }
   ],
   "bg_events": []
diff --git a/data/maps/VictoryRoad_2F/scripts.inc b/data/maps/VictoryRoad_2F/scripts.inc
index 49d21b7de..1dfd658ae 100644
--- a/data/maps/VictoryRoad_2F/scripts.inc
+++ b/data/maps/VictoryRoad_2F/scripts.inc
@@ -4,27 +4,27 @@ VictoryRoad_2F_MapScripts:: @ 8160F92
 
 VictoryRoad_2F_OnLoad:: @ 8160F98
 	compare VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1, 100
-	call_if_ne EventScript_160FAF
+	call_if_ne VictoryRoad_2F_EventScript_SetRockBarrier1
 	compare VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2, 100
-	call_if_ne EventScript_160FC2
+	call_if_ne VictoryRoad_2F_EventScript_SetRockBarrier2
 	end
 
-EventScript_160FAF:: @ 8160FAF
-	setmetatile 13, 10, 775, 1
-	setmetatile 13, 11, 791, 1
+VictoryRoad_2F_EventScript_SetRockBarrier1:: @ 8160FAF
+	setmetatile 13, 10, METATILE_Cave_RockBarrier_Top, 1
+	setmetatile 13, 11, METATILE_Cave_RockBarrier_Bottom, 1
 	return
 
-EventScript_160FC2:: @ 8160FC2
-	setmetatile 33, 16, 775, 1
-	setmetatile 33, 17, 791, 1
+VictoryRoad_2F_EventScript_SetRockBarrier2:: @ 8160FC2
+	setmetatile 33, 16, METATILE_Cave_RockBarrier_Top, 1
+	setmetatile 33, 17, METATILE_Cave_RockBarrier_Bottom, 1
 	return
 
-VictoryRoad_2F_EventScript_160FD5:: @ 8160FD5
+VictoryRoad_2F_EventScript_FloorSwitch1:: @ 8160FD5
 	lockall
 	compare VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER1, 100
-	goto_if_eq EventScript_161004
-	setmetatile 13, 10, 721, 0
-	setmetatile 13, 11, 737, 0
+	goto_if_eq VictoryRoad_2F_EventScript_FloorSwitch1AlreadyPressed
+	setmetatile 13, 10, METATILE_Cave_Floor_Ledge_Top, 0
+	setmetatile 13, 11, METATILE_Cave_Floor_Ledge_Bottom, 0
 	playse SE_RU_GASYAN
 	special DrawWholeMapView
 	waitse
@@ -33,16 +33,16 @@ VictoryRoad_2F_EventScript_160FD5:: @ 8160FD5
 	releaseall
 	end
 
-EventScript_161004:: @ 8161004
+VictoryRoad_2F_EventScript_FloorSwitch1AlreadyPressed:: @ 8161004
 	releaseall
 	end
 
-VictoryRoad_2F_EventScript_161006:: @ 8161006
+VictoryRoad_2F_EventScript_FloorSwitch2:: @ 8161006
 	lockall
 	compare VAR_MAP_SCENE_VICTORY_ROAD_2F_BOULDER2, 100
-	goto_if_eq EventScript_161035
-	setmetatile 33, 16, 721, 0
-	setmetatile 33, 17, 737, 0
+	goto_if_eq VictoryRoad_2F_EventScript_FloorSwitch2AlreadyPressed
+	setmetatile 33, 16, METATILE_Cave_Floor_Ledge_Top, 0
+	setmetatile 33, 17, METATILE_Cave_Floor_Ledge_Bottom, 0
 	playse SE_RU_GASYAN
 	special DrawWholeMapView
 	waitse
@@ -51,31 +51,31 @@ VictoryRoad_2F_EventScript_161006:: @ 8161006
 	releaseall
 	end
 
-EventScript_161035:: @ 8161035
+VictoryRoad_2F_EventScript_FloorSwitch2AlreadyPressed:: @ 8161035
 	releaseall
 	end
 
-VictoryRoad_2F_EventScript_161037:: @ 8161037
-	trainerbattle_single TRAINER_POKEMANIAC_DAWSON, Text_1747EF, Text_17482C
-	msgbox gUnknown_817483E, MSGBOX_AUTOCLOSE
+VictoryRoad_2F_EventScript_Dawson:: @ 8161037
+	trainerbattle_single TRAINER_POKEMANIAC_DAWSON, VictoryRoad_2F_Text_DawsonIntro, VictoryRoad_2F_Text_DawsonDefeat
+	msgbox VictoryRoad_2F_Text_DawsonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_2F_EventScript_16104E:: @ 816104E
-	trainerbattle_single TRAINER_BLACK_BELT_DAISUKE, Text_174877, Text_1748B4
-	msgbox gUnknown_81748BB, MSGBOX_AUTOCLOSE
+VictoryRoad_2F_EventScript_Daisuke:: @ 816104E
+	trainerbattle_single TRAINER_BLACK_BELT_DAISUKE, VictoryRoad_2F_Text_DaisukeIntro, VictoryRoad_2F_Text_DaisukeDefeat
+	msgbox VictoryRoad_2F_Text_DaisukePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_2F_EventScript_161065:: @ 8161065
-	trainerbattle_single TRAINER_JUGGLER_NELSON, Text_1748EE, Text_17491B
-	msgbox gUnknown_8174927, MSGBOX_AUTOCLOSE
+VictoryRoad_2F_EventScript_Nelson:: @ 8161065
+	trainerbattle_single TRAINER_JUGGLER_NELSON, VictoryRoad_2F_Text_NelsonIntro, VictoryRoad_2F_Text_NelsonDefeat
+	msgbox VictoryRoad_2F_Text_NelsonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_2F_EventScript_16107C:: @ 816107C
-	trainerbattle_single TRAINER_JUGGLER_GREGORY, Text_174995, Text_1749B0
-	msgbox gUnknown_81749BB, MSGBOX_AUTOCLOSE
+VictoryRoad_2F_EventScript_Gregory:: @ 816107C
+	trainerbattle_single TRAINER_JUGGLER_GREGORY, VictoryRoad_2F_Text_GregoryIntro, VictoryRoad_2F_Text_GregoryDefeat
+	msgbox VictoryRoad_2F_Text_GregoryPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_2F_EventScript_161093:: @ 8161093
-	trainerbattle_single TRAINER_TAMER_VINCENT, Text_174942, Text_17495A
-	msgbox gUnknown_8174969, MSGBOX_AUTOCLOSE
+VictoryRoad_2F_EventScript_Vincent:: @ 8161093
+	trainerbattle_single TRAINER_TAMER_VINCENT, VictoryRoad_2F_Text_VincentIntro, VictoryRoad_2F_Text_VincentDefeat
+	msgbox VictoryRoad_2F_Text_VincentPostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/VictoryRoad_2F/text.inc b/data/maps/VictoryRoad_2F/text.inc
index d125ef160..301a5f22b 100644
--- a/data/maps/VictoryRoad_2F/text.inc
+++ b/data/maps/VictoryRoad_2F/text.inc
@@ -1,54 +1,58 @@
-Text_1747EF:: @ 81747EF
+VictoryRoad_2F_Text_DawsonIntro:: @ 81747EF
     .string "If you can get through here,\n"
     .string "you can go meet the ELITE FOUR.$"
 
-Text_17482C:: @ 817482C
+VictoryRoad_2F_Text_DawsonDefeat:: @ 817482C
     .string "No!\n"
     .string "Unbelievable!$"
 
-gUnknown_817483E:: @ 817483E
+VictoryRoad_2F_Text_DawsonPostBattle:: @ 817483E
     .string "I can beat you when it comes to\n"
     .string "knowledge about POKéMON!$"
 
-Text_174877:: @ 8174877
+VictoryRoad_2F_Text_DaisukeIntro:: @ 8174877
     .string "This here is VICTORY ROAD.\n"
     .string "It's the final test for TRAINERS!$"
 
-Text_1748B4:: @ 81748B4
+VictoryRoad_2F_Text_DaisukeDefeat:: @ 81748B4
     .string "Atcho!$"
 
-gUnknown_81748BB:: @ 81748BB
+VictoryRoad_2F_Text_DaisukePostBattle:: @ 81748BB
     .string "If you get stuck, try moving some\n"
     .string "boulders around.$"
 
-Text_1748EE:: @ 81748EE
+VictoryRoad_2F_Text_NelsonIntro:: @ 81748EE
     .string "Ah, so you wish to challenge the\n"
     .string "ELITE FOUR?$"
 
-Text_17491B:: @ 817491B
+VictoryRoad_2F_Text_NelsonDefeat:: @ 817491B
     .string "You got me!$"
 
-gUnknown_8174927:: @ 8174927
+VictoryRoad_2F_Text_NelsonPostBattle:: @ 8174927
     .string "{RIVAL} also came through here.$"
 
-Text_174942:: @ 8174942
+VictoryRoad_2F_Text_VincentIntro:: @ 8174942
     .string "Come on!\n"
     .string "I'll whip you!$"
 
-Text_17495A:: @ 817495A
+VictoryRoad_2F_Text_VincentDefeat:: @ 817495A
     .string "I got whipped!$"
 
-gUnknown_8174969:: @ 8174969
+VictoryRoad_2F_Text_VincentPostBattle:: @ 8174969
     .string "You earned the right to be on\n"
     .string "VICTORY ROAD…$"
 
-Text_174995:: @ 8174995
+VictoryRoad_2F_Text_GregoryIntro:: @ 8174995
     .string "Is VICTORY ROAD too tough?$"
 
-Text_1749B0:: @ 81749B0
+VictoryRoad_2F_Text_GregoryDefeat:: @ 81749B0
     .string "Well done!$"
 
-gUnknown_81749BB:: @ 81749BB
+VictoryRoad_2F_Text_GregoryPostBattle:: @ 81749BB
     .string "Many TRAINERS give up their\n"
     .string "challenge here and go home.$"
 
+@ Unused, old text for Moltres
+VictoryRoad_2F_Text_Gyaoo:: @ 81749F3
+    .string "ギヤーオ！$"
+
diff --git a/data/maps/VictoryRoad_3F/map.json b/data/maps/VictoryRoad_3F/map.json
index 9d2b982a9..ffde167e7 100644
--- a/data/maps/VictoryRoad_3F/map.json
+++ b/data/maps/VictoryRoad_3F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "VictoryRoad_3F_EventScript_161103",
+      "script": "VictoryRoad_3F_EventScript_George",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "VictoryRoad_3F_EventScript_161148",
+      "script": "VictoryRoad_3F_EventScript_Alexa",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 5,
-      "script": "VictoryRoad_3F_EventScript_16111A",
+      "script": "VictoryRoad_3F_EventScript_Colby",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 5,
-      "script": "VictoryRoad_3F_EventScript_161131",
+      "script": "VictoryRoad_3F_EventScript_Caroline",
       "flag": "0"
     },
     {
@@ -153,7 +153,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "VictoryRoad_3F_EventScript_16115F",
+      "script": "VictoryRoad_3F_EventScript_Ray",
       "flag": "0"
     },
     {
@@ -166,7 +166,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "VictoryRoad_3F_EventScript_16117A",
+      "script": "VictoryRoad_3F_EventScript_Tyra",
       "flag": "0"
     }
   ],
@@ -215,7 +215,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_VICTORY_ROAD_3F",
       "var_value": 99,
-      "script": "VictoryRoad_3F_EventScript_1610CF"
+      "script": "VictoryRoad_3F_EventScript_FloorSwitch"
     }
   ],
   "bg_events": []
diff --git a/data/maps/VictoryRoad_3F/scripts.inc b/data/maps/VictoryRoad_3F/scripts.inc
index 4cd011f92..f601d83be 100644
--- a/data/maps/VictoryRoad_3F/scripts.inc
+++ b/data/maps/VictoryRoad_3F/scripts.inc
@@ -4,20 +4,20 @@ VictoryRoad_3F_MapScripts:: @ 81610AA
 
 VictoryRoad_3F_OnLoad:: @ 81610B0
 	compare VAR_MAP_SCENE_VICTORY_ROAD_3F, 100
-	call_if_ne EventScript_1610BC
+	call_if_ne VictoryRoad_3F_EventScript_SetRockBarrier
 	end
 
-EventScript_1610BC:: @ 81610BC
-	setmetatile 12, 12, 775, 1
-	setmetatile 12, 13, 791, 1
+VictoryRoad_3F_EventScript_SetRockBarrier:: @ 81610BC
+	setmetatile 12, 12, METATILE_Cave_RockBarrier_Top, 1
+	setmetatile 12, 13, METATILE_Cave_RockBarrier_Bottom, 1
 	return
 
-VictoryRoad_3F_EventScript_1610CF:: @ 81610CF
+VictoryRoad_3F_EventScript_FloorSwitch:: @ 81610CF
 	lockall
 	compare VAR_MAP_SCENE_VICTORY_ROAD_3F, 100
-	goto_if_eq EventScript_161101
-	setmetatile 12, 12, 721, 0
-	setmetatile 12, 13, 737, 0
+	goto_if_eq VictoryRoad_3F_EventScript_FloorSwitchAlreadyPressed
+	setmetatile 12, 12, METATILE_Cave_Floor_Ledge_Top, 0
+	setmetatile 12, 13, METATILE_Cave_Floor_Ledge_Bottom, 0
 	playse SE_RU_GASYAN
 	special DrawWholeMapView
 	waitse
@@ -27,36 +27,36 @@ VictoryRoad_3F_EventScript_1610CF:: @ 81610CF
 	releaseall
 	end
 
-EventScript_161101:: @ 8161101
+VictoryRoad_3F_EventScript_FloorSwitchAlreadyPressed:: @ 8161101
 	releaseall
 	end
 
-VictoryRoad_3F_EventScript_161103:: @ 8161103
-	trainerbattle_single TRAINER_COOLTRAINER_GEORGE, Text_174B60, Text_174B83
-	msgbox gUnknown_8174B99, MSGBOX_AUTOCLOSE
+VictoryRoad_3F_EventScript_George:: @ 8161103
+	trainerbattle_single TRAINER_COOLTRAINER_GEORGE, VictoryRoad_3F_Text_GeorgeIntro, VictoryRoad_3F_Text_GeorgeDefeat
+	msgbox VictoryRoad_3F_Text_GeorgePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_3F_EventScript_16111A:: @ 816111A
-	trainerbattle_single TRAINER_COOLTRAINER_COLBY, Text_174C8A, Text_174CA9
-	msgbox gUnknown_8174CBD, MSGBOX_AUTOCLOSE
+VictoryRoad_3F_EventScript_Colby:: @ 816111A
+	trainerbattle_single TRAINER_COOLTRAINER_COLBY, VictoryRoad_3F_Text_ColbyIntro, VictoryRoad_3F_Text_ColbyDefeat
+	msgbox VictoryRoad_3F_Text_ColbyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_3F_EventScript_161131:: @ 8161131
-	trainerbattle_single TRAINER_COOLTRAINER_CAROLINE, Text_174C30, Text_174C5A
-	msgbox gUnknown_8174C67, MSGBOX_AUTOCLOSE
+VictoryRoad_3F_EventScript_Caroline:: @ 8161131
+	trainerbattle_single TRAINER_COOLTRAINER_CAROLINE, VictoryRoad_3F_Text_CarolineIntro, VictoryRoad_3F_Text_CarolineDefeat
+	msgbox VictoryRoad_3F_Text_CarolinePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_3F_EventScript_161148:: @ 8161148
-	trainerbattle_single TRAINER_COOLTRAINER_ALEXA, Text_174BCA, Text_174BF4
-	msgbox gUnknown_8174C03, MSGBOX_AUTOCLOSE
+VictoryRoad_3F_EventScript_Alexa:: @ 8161148
+	trainerbattle_single TRAINER_COOLTRAINER_ALEXA, VictoryRoad_3F_Text_AlexaIntro, VictoryRoad_3F_Text_AlexaDefeat
+	msgbox VictoryRoad_3F_Text_AlexaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_3F_EventScript_16115F:: @ 816115F
-	trainerbattle_double TRAINER_COOL_COUPLE_RAY_TYRA, Text_174D0C, Text_174D45, Text_174D96
-	msgbox gUnknown_8174D64, MSGBOX_AUTOCLOSE
+VictoryRoad_3F_EventScript_Ray:: @ 816115F
+	trainerbattle_double TRAINER_COOL_COUPLE_RAY_TYRA, VictoryRoad_3F_Text_RayIntro, VictoryRoad_3F_Text_RayDefeat, VictoryRoad_3F_Text_RayNotEnoughMons
+	msgbox VictoryRoad_3F_Text_RayPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_3F_EventScript_16117A:: @ 816117A
-	trainerbattle_double TRAINER_COOL_COUPLE_RAY_TYRA, Text_174E08, Text_174E39, Text_174E8D
-	msgbox gUnknown_8174E48, MSGBOX_AUTOCLOSE
+VictoryRoad_3F_EventScript_Tyra:: @ 816117A
+	trainerbattle_double TRAINER_COOL_COUPLE_RAY_TYRA, VictoryRoad_3F_Text_TyraIntro, VictoryRoad_3F_Text_TyraDefeat, VictoryRoad_3F_Text_TyraNotEnoughMons
+	msgbox VictoryRoad_3F_Text_TyraPostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/VictoryRoad_3F/text.inc b/data/maps/VictoryRoad_3F/text.inc
index 22c42342a..dd60180df 100644
--- a/data/maps/VictoryRoad_3F/text.inc
+++ b/data/maps/VictoryRoad_3F/text.inc
@@ -1,6 +1,3 @@
-Text_1749F3:: @ 81749F3
-    .string "ギヤーオ！$"
-
 Text_DoubleEdgeTeach:: @ 81749F9
     .string "You should be proud of yourself,\n"
     .string "having battled your way through\l"
@@ -24,80 +21,80 @@ Text_DoubleEdgeTaught:: @ 8174B0C
     .string "Take a run at them and knock 'em\n"
     .string "out!$"
 
-Text_174B60:: @ 8174B60
+VictoryRoad_3F_Text_GeorgeIntro:: @ 8174B60
     .string "I heard rumors of a child prodigy.$"
 
-Text_174B83:: @ 8174B83
+VictoryRoad_3F_Text_GeorgeDefeat:: @ 8174B83
     .string "The rumors were true!$"
 
-gUnknown_8174B99:: @ 8174B99
+VictoryRoad_3F_Text_GeorgePostBattle:: @ 8174B99
     .string "So, it was you who beat GIOVANNI\n"
     .string "of TEAM ROCKET?$"
 
-Text_174BCA:: @ 8174BCA
+VictoryRoad_3F_Text_AlexaIntro:: @ 8174BCA
     .string "TRAINERS live to seek stronger\n"
     .string "opponents.$"
 
-Text_174BF4:: @ 8174BF4
+VictoryRoad_3F_Text_AlexaDefeat:: @ 8174BF4
     .string "Oh!\n"
     .string "So strong!$"
 
-gUnknown_8174C03:: @ 8174C03
+VictoryRoad_3F_Text_AlexaPostBattle:: @ 8174C03
     .string "By fighting tough battles, you get\n"
     .string "stronger.$"
 
-Text_174C30:: @ 8174C30
+VictoryRoad_3F_Text_CarolineIntro:: @ 8174C30
     .string "I'll show you just how good you\n"
     .string "are. Not!$"
 
-Text_174C5A:: @ 8174C5A
+VictoryRoad_3F_Text_CarolineDefeat:: @ 8174C5A
     .string "I'm furious!$"
 
-gUnknown_8174C67:: @ 8174C67
+VictoryRoad_3F_Text_CarolinePostBattle:: @ 8174C67
     .string "You showed me just how good\n"
     .string "I was…$"
 
-Text_174C8A:: @ 8174C8A
+VictoryRoad_3F_Text_ColbyIntro:: @ 8174C8A
     .string "Only the chosen can pass here!$"
 
-Text_174CA9:: @ 8174CA9
+VictoryRoad_3F_Text_ColbyDefeat:: @ 8174CA9
     .string "I don't believe it!$"
 
-gUnknown_8174CBD:: @ 8174CBD
+VictoryRoad_3F_Text_ColbyPostBattle:: @ 8174CBD
     .string "All TRAINERS here are headed to\n"
     .string "the POKéMON LEAGUE.\p"
     .string "Don't let down your guard.$"
 
-Text_174D0C:: @ 8174D0C
+VictoryRoad_3F_Text_RayIntro:: @ 8174D0C
     .string "RAY: Together, the two of us are\n"
     .string "destined for greatness!$"
 
-Text_174D45:: @ 8174D45
+VictoryRoad_3F_Text_RayDefeat:: @ 8174D45
     .string "RAY: Ludicrous!\n"
     .string "This can't be!$"
 
-gUnknown_8174D64:: @ 8174D64
+VictoryRoad_3F_Text_RayPostBattle:: @ 8174D64
     .string "RAY: You've beaten us.\n"
     .string "Greatness remains elusive…$"
 
-Text_174D96:: @ 8174D96
+VictoryRoad_3F_Text_RayNotEnoughMons:: @ 8174D96
     .string "RAY: Together, the two of us are\n"
     .string "striving for the pinnacle.\p"
     .string "We need you to bring two POKéMON\n"
     .string "into battle with us.$"
 
-Text_174E08:: @ 8174E08
+VictoryRoad_3F_Text_TyraIntro:: @ 8174E08
     .string "TYRA: We're trying to become\n"
     .string "champions together.$"
 
-Text_174E39:: @ 8174E39
+VictoryRoad_3F_Text_TyraDefeat:: @ 8174E39
     .string "TYRA: Oh, but…$"
 
-gUnknown_8174E48:: @ 8174E48
+VictoryRoad_3F_Text_TyraPostBattle:: @ 8174E48
     .string "TYRA: You've taught me that power\n"
     .string "can be infinite in shape and form.$"
 
-Text_174E8D:: @ 8174E8D
+VictoryRoad_3F_Text_TyraNotEnoughMons:: @ 8174E8D
     .string "TYRA: You can't battle with us if\n"
     .string "you have only one POKéMON.$"
 
diff --git a/data/maps/ViridianCity_Mart/scripts.inc b/data/maps/ViridianCity_Mart/scripts.inc
index 5ad0d9a2f..cb458b682 100644
--- a/data/maps/ViridianCity_Mart/scripts.inc
+++ b/data/maps/ViridianCity_Mart/scripts.inc
@@ -8,8 +8,8 @@ ViridianCity_Mart_OnLoad:: @ 816A1DE
 	end
 
 ViridianCity_Mart_EventScript_HideQuestionnaire:: @ 816A1E8
-	setmetatile 1, 3, METATILE_Shop_CounterMid_Top, 1
-	setmetatile 1, 4, METATILE_Shop_CounterMid_Bottom, 1
+	setmetatile 1, 3, METATILE_Mart_CounterMid_Top, 1
+	setmetatile 1, 4, METATILE_Mart_CounterMid_Bottom, 1
 	end
 
 ViridianCity_Mart_OnFrame:: @ 816A1FB
diff --git a/data/maps/ViridianForest/map.json b/data/maps/ViridianForest/map.json
index 463bc53f5..97f28ced9 100644
--- a/data/maps/ViridianForest/map.json
+++ b/data/maps/ViridianForest/map.json
@@ -5,7 +5,7 @@
   "music": "MUS_T_MORI",
   "region_map_section": "MAPSEC_VIRIDIAN_FOREST",
   "requires_flash": false,
-  "weather": "WEATHER_CLOUDY",
+  "weather": "WEATHER_SHADE",
   "map_type": "MAP_TYPE_3",
   "unknown_18": 1,
   "unknown_19": 7,
diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json
index 05f1cd544..a7a468351 100644
--- a/data/maps/map_groups.json
+++ b/data/maps/map_groups.json
@@ -178,17 +178,17 @@
   ],
   "gMapGroup2": [
     "NavelRock_Exterior",
-    "SevenIsland_TrainerTower_1F",
-    "SevenIsland_TrainerTower_2F",
-    "SevenIsland_TrainerTower_3F",
-    "SevenIsland_TrainerTower_4F",
-    "SevenIsland_TrainerTower_5F",
-    "SevenIsland_TrainerTower_6F",
-    "SevenIsland_TrainerTower_7F",
-    "SevenIsland_TrainerTower_8F",
-    "SevenIsland_TrainerTower_Roof",
-    "SevenIsland_TrainerTower_Lobby",
-    "SevenIsland_TrainerTower_Elevator",
+    "TrainerTower_1F",
+    "TrainerTower_2F",
+    "TrainerTower_3F",
+    "TrainerTower_4F",
+    "TrainerTower_5F",
+    "TrainerTower_6F",
+    "TrainerTower_7F",
+    "TrainerTower_8F",
+    "TrainerTower_Roof",
+    "TrainerTower_Lobby",
+    "TrainerTower_Elevator",
     "FiveIsland_LostCave_Entrance",
     "FiveIsland_LostCave_Room1",
     "FiveIsland_LostCave_Room2",
@@ -250,7 +250,7 @@
     "CinnabarIsland",
     "IndigoPlateau_Exterior",
     "SaffronCity",
-    "SaffronCity_Classic",
+    "SaffronCity_Connection",
     "OneIsland",
     "TwoIsland",
     "ThreeIsland",
@@ -289,10 +289,10 @@
     "TwoIsland_CapeBrink",
     "ThreeIsland_BondBridge",
     "ThreeIsland_Port",
-    "UnknownMap_03_50",
-    "UnknownMap_03_51",
-    "UnknownMap_03_52",
-    "UnknownMap_03_53",
+    "Prototype_SeviiIsle_6",
+    "Prototype_SeviiIsle_7",
+    "Prototype_SeviiIsle_8",
+    "Prototype_SeviiIsle_9",
     "FiveIsland_ResortGorgeous",
     "FiveIsland_WaterLabyrinth",
     "FiveIsland_Meadow",
@@ -409,15 +409,15 @@
     "IndigoPlateau_PokemonCenter_2F"
   ],
   "gMapGroup14": [
-    "SaffronCity_House1_1F",
-    "SaffronCity_House1_2F",
+    "SaffronCity_CopycatsHouse_1F",
+    "SaffronCity_CopycatsHouse_2F",
     "SaffronCity_Dojo",
     "SaffronCity_Gym",
-    "SaffronCity_House2",
+    "SaffronCity_House",
     "SaffronCity_Mart",
     "SaffronCity_PokemonCenter_1F",
     "SaffronCity_PokemonCenter_2F",
-    "SaffronCity_House3",
+    "SaffronCity_MrPsychicsHouse",
     "SaffronCity_PokemonTrainerFanClub"
   ],
   "gMapGroup15": [
@@ -567,7 +567,7 @@
     "CinnabarIsland",
     "IndigoPlateau_Exterior",
     "SaffronCity",
-    "SaffronCity_Classic",
+    "SaffronCity_Connection",
     "OneIsland",
     "TwoIsland",
     "ThreeIsland",
@@ -605,8 +605,8 @@
     "TwoIsland_CapeBrink",
     "ThreeIsland_BondBridge",
     "ThreeIsland_Port",
-    "UnknownMap_03_50",
-    "UnknownMap_03_51",
+    "Prototype_SeviiIsle_6",
+    "Prototype_SeviiIsle_7",
     "FiveIsland_ResortGorgeous",
     "FiveIsland_WaterLabyrinth",
     "FiveIsland_Meadow",
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index c75ebdcfd..c174eaf41 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -1149,7 +1149,7 @@ CableClub_EventScript_81BBFD8:: @ 81BBFD8
 	goto_if_eq CableClub_EventScript_AdapterNotConnected
 	special HelpSystem_Disable
 	fadescreen FADE_TO_BLACK
-	special sub_814F1D4
+	special Special_WirelessCommunicationScreen
 	waitstate
 	msgbox CableClub_Text_ParticipantsStepUpToCounter
 	special HelpSystem_Enable
diff --git a/data/scripts/fame_checker.inc b/data/scripts/fame_checker.inc
index 9741b2899..67d34232c 100644
--- a/data/scripts/fame_checker.inc
+++ b/data/scripts/fame_checker.inc
@@ -43,11 +43,11 @@ Route4_EventScript_Boy:: @ 81ACDEA
 	release
 	end
 
-MtMoon_1F_EventScript_1ACE03:: @ 81ACE03
+MtMoon_1F_EventScript_BaldingMan:: @ 81ACE03
 	lock
 	faceplayer
 	famechecker FAMECHECKER_BROCK, 4
-	msgbox Text_172B00
+	msgbox MtMoon_1F_Text_BrockHelpsExcavateFossils
 	release
 	end
 
@@ -92,12 +92,12 @@ VermilionCity_PokemonCenter_1F_EventScript_PokemonJournalLtSurge:: @ 81ACE83
 	releaseall
 	end
 
-CeladonCity_Condominiums_2F_EventScript_1ACE9D:: @ 81ACE9D
+CeladonCity_Condominiums_2F_EventScript_PokemonJournalErika:: @ 81ACE9D
 	lock
 	faceplayer
 	famechecker FAMECHECKER_ERIKA, 5
 	textcolor 3
-	msgbox gUnknown_81B161B
+	msgbox PokemonJournal_Text_SpecialFeatureErika
 	release
 	end
 
@@ -118,12 +118,12 @@ SafariZone_North_RestHouse_EventScript_BaldingMan:: @ 81ACED3
 	release
 	end
 
-SaffronCity_PokemonCenter_1F_EventScript_1ACEEC:: @ 81ACEEC
+SaffronCity_PokemonCenter_1F_EventScript_PokemonJournalSabrina:: @ 81ACEEC
 	lock
 	faceplayer
 	famechecker FAMECHECKER_SABRINA, 4
 	textcolor 3
-	msgbox gUnknown_81B1753
+	msgbox PokemonJournal_Text_SpecialFeatureSabrina
 	release
 	end
 
@@ -160,12 +160,12 @@ FiveIsland_PokemonCenter_1F_EventScript_1ACF5F:: @ 81ACF5F
 	release
 	end
 
-SaffronCity_PokemonTrainerFanClub_EventScript_1ACF7A:: @ 81ACF7A
+SaffronCity_PokemonTrainerFanClub_EventScript_PokemonJournalBruno:: @ 81ACF7A
 	lock
 	faceplayer
 	famechecker FAMECHECKER_BRUNO, 2
 	textcolor 3
-	msgbox gUnknown_81B1913
+	msgbox PokemonJournal_Text_SpecialFeatureBruno
 	release
 	end
 
@@ -177,12 +177,12 @@ SevenIsland_SevaultCanyon_EventScript_1ACF95:: @ 81ACF95
 	release
 	end
 
-IndigoPlateau_PokemonCenter_1F_EventScript_1ACFAE:: @ 81ACFAE
+IndigoPlateau_PokemonCenter_1F_EventScript_BlackBelt:: @ 81ACFAE
 	lock
 	faceplayer
 	famechecker FAMECHECKER_AGATHA, 1
 	famechecker FAMECHECKER_AGATHA, 2
-	msgbox Text_19A9E7
+	msgbox IndigoPlateau_PokemonCenter_1F_Text_AgathaWhuppedUs
 	release
 	end
 
@@ -215,40 +215,40 @@ EventScript_1AD021:: @ 81AD021
 	lock
 	faceplayer
 	famechecker FAMECHECKER_LANCE, 1
-	msgbox Text_181569
+	msgbox SaffronCity_Text_HowCanClubNotRecognizeLance
 	release
 	end
 
-SaffronCity_EventScript_1AD03A:: @ 81AD03A
+SaffronCity_EventScript_BattleGirl:: @ 81AD03A
 	lock
 	faceplayer
 	famechecker FAMECHECKER_LANCE, 2
-	msgbox Text_181569
+	msgbox SaffronCity_Text_HowCanClubNotRecognizeLance
 	release
 	end
 
-CeladonCity_DepartmentStore_2F_EventScript_1AD053:: @ 81AD053
+CeladonCity_DepartmentStore_2F_EventScript_Woman:: @ 81AD053
 	lock
 	faceplayer
 	famechecker FAMECHECKER_LANCE, 3
-	msgbox Text_19566B
+	msgbox CeladonCity_DepartmentStore_2F_Text_LanceComesToBuyCapes
 	release
 	end
 
-IndigoPlateau_PokemonCenter_1F_EventScript_1AD06C:: @ 81AD06C
+IndigoPlateau_PokemonCenter_1F_EventScript_PokemonJournal:: @ 81AD06C
 	lock
 	faceplayer
 	famechecker FAMECHECKER_LANCE, 4
 	textcolor 3
-	msgbox gUnknown_81B1A31
+	msgbox PokemonJournal_Text_SpecialFeatureLance
 	release
 	end
 
-IndigoPlateau_PokemonCenter_1F_EventScript_1AD087:: @ 81AD087
+IndigoPlateau_PokemonCenter_1F_EventScript_CooltrainerM:: @ 81AD087
 	lock
 	faceplayer
 	famechecker FAMECHECKER_LANCE, 5
-	msgbox Text_19AB16
+	msgbox IndigoPlateau_PokemonCenter_1F_Text_LancesCousinGymLeaderFarAway
 	release
 	end
 
@@ -269,18 +269,18 @@ CinnabarIsland_PokemonCenter_1F_EventScript_PokemonJournalMrFuji:: @ 81AD0B9
 	release
 	end
 
-SilphCo_5F_EventScript_1AD0D4:: @ 81AD0D4
+SilphCo_5F_EventScript_Scientist:: @ 81AD0D4
 	lock
 	faceplayer
 	famechecker FAMECHECKER_GIOVANNI, 1
-	msgbox Text_175E99
+	msgbox SilphCo_5F_Text_RocketBossLookingForStrongMons
 	release
 	end
 
-SilphCo_8F_EventScript_1AD0ED:: @ 81AD0ED
+SilphCo_8F_EventScript_Scientist:: @ 81AD0ED
 	lock
 	faceplayer
 	famechecker FAMECHECKER_GIOVANNI, 2
-	msgbox Text_176ACB
+	msgbox SilphCo_8F_Text_ToRocketBossMonsAreTools
 	release
 	end
diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc
index d47a2d06c..bfc9fbbbd 100644
--- a/data/scripts/mystery_event_club.inc
+++ b/data/scripts/mystery_event_club.inc
@@ -101,7 +101,7 @@ EventScript_GaveSpecialProfile: @ 81BEF3F
 
 EventScript_GiveProfile: @ 81BEF5A
 	setvar VAR_0x8004, 0
-	call EventScript_1A6AC0
+	call Common_ShowEasyChatScreen
 	lock
 	faceplayer
 	compare VAR_0x8004, 0
diff --git a/data/scripts/pokemon_league.inc b/data/scripts/pokemon_league.inc
new file mode 100644
index 000000000..806e0976a
--- /dev/null
+++ b/data/scripts/pokemon_league.inc
@@ -0,0 +1,64 @@
+PokemonLeague_EventScript_OpenDoor:: @ 81A7506
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_Delay32
+	waitmovement 0
+	playse SE_DOOR
+	call PokemonLeague_EventScript_SetDoorOpen
+	special DrawWholeMapView
+	setflag FLAG_TEMP_4
+	return
+
+PokemonLeague_EventScript_EnterRoom:: @ 81A751F
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkUp5
+	waitmovement 0
+	setflag FLAG_TEMP_2
+	playse SE_KI_GASYAN
+	call PokemonLeague_EventScript_CloseEntry
+	special DrawWholeMapView
+	return
+
+PokemonLeague_EventScript_SetDoorOpen:: @ 81A7538
+	setmetatile 6, 1, METATILE_PokemonLeague_Door_Top_Open, 1
+	setmetatile 6, 2, METATILE_PokemonLeague_Door_Mid_Open, 0
+	return
+
+PokemonLeague_EventScript_PreventExit:: @ 81A754B
+	lockall
+	textcolor 0
+	msgbox Text_VoiceRangOutDontRunAway
+	closemessage
+	applymovement OBJ_EVENT_ID_PLAYER, PokemonLeague_Movement_ForcePlayerIn
+	waitmovement 0
+	releaseall
+	end
+
+PokemonLeague_EventScript_OpenDoorLance:: @ 81A7563
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_Delay32
+	waitmovement 0
+	playse SE_DOOR
+	setmetatile 6, 4, METATILE_PokemonLeague_Door_Top_Open, 1
+	setmetatile 6, 5, METATILE_PokemonLeague_Door_Mid_Open, 0
+	special DrawWholeMapView
+	setflag FLAG_TEMP_4
+	return
+
+PokemonLeague_EventScript_SetDoorOpenLance:: @ 81A7589
+	setmetatile 6, 4, METATILE_PokemonLeague_Door_Top_Open, 1
+	setmetatile 6, 5, METATILE_PokemonLeague_Door_Mid_Open, 0
+	return
+
+PokemonLeague_EventScript_CloseEntry:: @ 81A759C
+	setmetatile 5, 11, METATILE_PokemonLeague_Entry_TopLeft_Closed, 1
+	setmetatile 6, 11, METATILE_PokemonLeague_Entry_TopMid_Closed, 1
+	setmetatile 7, 11, METATILE_PokemonLeague_Entry_TopRight_Closed, 1
+	setmetatile 5, 12, METATILE_PokemonLeague_Entry_BottomLeft_Closed, 1
+	setmetatile 6, 12, METATILE_PokemonLeague_Entry_BottomMid_Closed, 1
+	setmetatile 7, 12, METATILE_PokemonLeague_Entry_BottomRight_Closed, 1
+	return
+
+PokemonLeague_Movement_ForcePlayerIn:: @ 81A75D3
+	walk_up
+	step_end
+
+PokemonLeague_EventScript_DoLightingEffect:: @ 81A75D5
+	special Special_PokemonLeagueLightingEffect
+	return
diff --git a/data/scripts/trainer_card.inc b/data/scripts/trainer_card.inc
new file mode 100644
index 000000000..906744fa8
--- /dev/null
+++ b/data/scripts/trainer_card.inc
@@ -0,0 +1,384 @@
+CeladonCity_GameCorner_EventScript_PhotoPrinter:: @ 81B2867
+	lockall
+	showmoneybox 0, 0, 0
+	msgbox gUnknown_81B1D7D, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq EventScript_1B2926
+	checkmoney 50, 0
+	compare VAR_RESULT, FALSE
+	goto_if_eq EventScript_1B292B
+	playse SE_SHOP
+	removemoney 50, 0
+	updatemoneybox 0, 0, 0
+	waitse
+	message gUnknown_81B1E24
+	waitmessage
+	multichoice 21, 0, MULTICHOICE_TRAINER_CARD_ICON_TINT, TRUE
+	switch VAR_RESULT
+	case 0, EventScript_1B28DB
+	case 1, EventScript_1B28E6
+	case 2, EventScript_1B28F1
+	case 3, EventScript_1B28FC
+	end
+
+EventScript_1B28DB:: @ 81B28DB
+	setvar VAR_0x8004, 0
+	goto EventScript_1B2907
+	end
+
+EventScript_1B28E6:: @ 81B28E6
+	setvar VAR_0x8004, 1
+	goto EventScript_1B2907
+	end
+
+EventScript_1B28F1:: @ 81B28F1
+	setvar VAR_0x8004, 2
+	goto EventScript_1B2907
+	end
+
+EventScript_1B28FC:: @ 81B28FC
+	setvar VAR_0x8004, 3
+	goto EventScript_1B2907
+	end
+
+EventScript_1B2907:: @ 81B2907
+	message gUnknown_81B1E42
+	waitmessage
+	playse MUS_ME_PHOTO
+	dofieldeffect FLDEFF_UNK_45
+	delay 60
+	special Special_UpdateTrainerCardPhotoIcons
+	msgbox gUnknown_81B1E7D
+	hidemoneybox 0, 0
+	releaseall
+	end
+
+EventScript_1B2926:: @ 81B2926
+	hidemoneybox 0, 0
+	releaseall
+	end
+
+EventScript_1B292B:: @ 81B292B
+	msgbox gUnknown_81B1E07
+	hidemoneybox 0, 0
+	releaseall
+	end
+
+FourIsland_House2_EventScript_1B2938:: @ 81B2938
+	lock
+	specialvar VAR_0x8008, Special_StickerLadyGetBragFlags
+	goto_if_unset FLAG_MET_STICKER_LADY, EventScript_1B2951
+	goto_if_set FLAG_MET_STICKER_LADY, EventScript_1B2994
+	end
+
+EventScript_1B2951:: @ 81B2951
+	setflag FLAG_MET_STICKER_LADY
+	msgbox gUnknown_81B1EB3
+	applymovement 1, Movement_FacePlayer
+	waitmovement 0
+	playse SE_PIN
+	applymovement 1, Movement_ExclamationMark
+	waitmovement 0
+	applymovement 1, Movement_Delay48
+	waitmovement 0
+	compare VAR_0x8008, 0
+	goto_if_eq EventScript_1B2B8E
+	message gUnknown_81B1EF8
+	waitmessage
+	goto EventScript_1B29D0
+	end
+
+EventScript_1B2994:: @ 81B2994
+	applymovement 1, Movement_FacePlayer
+	waitmovement 0
+	goto_if_questlog EventScript_ReleaseEnd
+	special sub_8112364
+	compare VAR_0x8008, 0
+	goto_if_eq EventScript_1B29C6
+	message gUnknown_81B2025
+	waitmessage
+	goto EventScript_1B29D0
+	end
+
+EventScript_1B29C6:: @ 81B29C6
+	msgbox gUnknown_81B1FEF
+	release
+	end
+
+EventScript_1B29D0:: @ 81B29D0
+	switch VAR_0x8008
+	case 1, EventScript_1B2A23
+	case 2, EventScript_1B2A4F
+	case 4, EventScript_1B2A7B
+	case 3, EventScript_1B2AA7
+	case 5, EventScript_1B2ADE
+	case 6, EventScript_1B2B15
+	case 7, EventScript_1B2B4C
+	end
+
+EventScript_1B2A23:: @ 81B2A23
+	multichoice 15, 8, MULTICHOICE_HOF_QUIT, FALSE
+	switch VAR_RESULT
+	case 0, EventScript_1B2B98
+	case 1, EventScript_1B2DF6
+	case SCR_MENU_CANCEL, EventScript_1B2DF6
+	end
+
+EventScript_1B2A4F:: @ 81B2A4F
+	multichoice 16, 8, MULTICHOICE_EGGS_QUIT, FALSE
+	switch VAR_RESULT
+	case 0, EventScript_1B2C62
+	case 1, EventScript_1B2DF6
+	case SCR_MENU_CANCEL, EventScript_1B2DF6
+	end
+
+EventScript_1B2A7B:: @ 81B2A7B
+	multichoice 15, 8, MULTICHOICE_VICTORIES_QUIT, FALSE
+	switch VAR_RESULT
+	case 0, EventScript_1B2D2C
+	case 1, EventScript_1B2DF6
+	case SCR_MENU_CANCEL, EventScript_1B2DF6
+	end
+
+EventScript_1B2AA7:: @ 81B2AA7
+	multichoice 15, 6, MULTICHOICE_HOF_EGGS_QUIT, FALSE
+	switch VAR_RESULT
+	case 0, EventScript_1B2B98
+	case 1, EventScript_1B2C62
+	case 2, EventScript_1B2DF6
+	case SCR_MENU_CANCEL, EventScript_1B2DF6
+	end
+
+EventScript_1B2ADE:: @ 81B2ADE
+	multichoice 15, 6, MULTICHOICE_HOF_VICTORIES_QUIT, FALSE
+	switch VAR_RESULT
+	case 0, EventScript_1B2B98
+	case 1, EventScript_1B2D2C
+	case 2, EventScript_1B2DF6
+	case SCR_MENU_CANCEL, EventScript_1B2DF6
+	end
+
+EventScript_1B2B15:: @ 81B2B15
+	multichoice 15, 6, MULTICHOICE_EGGS_VICTORIES_QUIT, FALSE
+	switch VAR_RESULT
+	case 0, EventScript_1B2C62
+	case 1, EventScript_1B2D2C
+	case 2, EventScript_1B2DF6
+	case SCR_MENU_CANCEL, EventScript_1B2DF6
+	end
+
+EventScript_1B2B4C:: @ 81B2B4C
+	multichoice 15, 5, MULTICHOICE_HOF_EGGS_VICTORIES_QUIT, FALSE
+	switch VAR_RESULT
+	case 0, EventScript_1B2B98
+	case 1, EventScript_1B2C62
+	case 2, EventScript_1B2D2C
+	case 3, EventScript_1B2DF6
+	case SCR_MENU_CANCEL, EventScript_1B2DF6
+	end
+
+EventScript_1B2B8E:: @ 81B2B8E
+	msgbox gUnknown_81B1EF8
+	release
+	end
+
+EventScript_1B2B98:: @ 81B2B98
+	compare VAR_0x8004, 39
+	goto_if_le EventScript_1B2BC5
+	compare VAR_0x8004, 99
+	goto_if_le EventScript_1B2BE3
+	compare VAR_0x8004, 199
+	goto_if_le EventScript_1B2C01
+	compare VAR_0x8004, 200
+	goto_if_ge EventScript_1B2C1F
+	end
+
+EventScript_1B2BC5:: @ 81B2BC5
+	compare VAR_HOF_BRAG_STATE, 1
+	goto_if_eq EventScript_1B2C3D
+	setvar VAR_HOF_BRAG_STATE, 1
+	msgbox gUnknown_81B206E
+	goto EventScript_1B2C51
+
+EventScript_1B2BE2:: @ 81B2BE2
+	end
+
+EventScript_1B2BE3:: @ 81B2BE3
+	compare VAR_HOF_BRAG_STATE, 2
+	goto_if_eq EventScript_1B2C3D
+	setvar VAR_HOF_BRAG_STATE, 2
+	msgbox gUnknown_81B20CF
+	goto EventScript_1B2C51
+
+EventScript_1B2C00:: @ 81B2C00
+	end
+
+EventScript_1B2C01:: @ 81B2C01
+	compare VAR_HOF_BRAG_STATE, 3
+	goto_if_eq EventScript_1B2C3D
+	setvar VAR_HOF_BRAG_STATE, 3
+	msgbox gUnknown_81B2133
+	goto EventScript_1B2C51
+
+EventScript_1B2C1E:: @ 81B2C1E
+	end
+
+EventScript_1B2C1F:: @ 81B2C1F
+	compare VAR_HOF_BRAG_STATE, 4
+	goto_if_eq EventScript_1B2C47
+	setvar VAR_HOF_BRAG_STATE, 4
+	msgbox gUnknown_81B21C4
+	goto EventScript_1B2C51
+
+EventScript_1B2C3C:: @ 81B2C3C
+	end
+
+EventScript_1B2C3D:: @ 81B2C3D
+	msgbox gUnknown_81B227C
+	release
+	end
+
+EventScript_1B2C47:: @ 81B2C47
+	msgbox gUnknown_81B22B0
+	release
+	end
+
+EventScript_1B2C51:: @ 81B2C51
+	textcolor 3
+	playfanfare MUS_FANFA1
+	message gUnknown_81B2242
+	waitmessage
+	waitfanfare
+	delay 90
+	release
+	end
+
+EventScript_1B2C62:: @ 81B2C62
+	compare VAR_0x8005, 99
+	goto_if_le EventScript_1B2C8F
+	compare VAR_0x8005, 199
+	goto_if_le EventScript_1B2CAD
+	compare VAR_0x8005, 299
+	goto_if_le EventScript_1B2CCB
+	compare VAR_0x8005, 300
+	goto_if_ge EventScript_1B2CE9
+	end
+
+EventScript_1B2C8F:: @ 81B2C8F
+	compare VAR_EGG_BRAG_STATE, 1
+	goto_if_eq EventScript_1B2D07
+	setvar VAR_EGG_BRAG_STATE, 1
+	msgbox gUnknown_81B2308
+	goto EventScript_1B2D1B
+	end
+
+EventScript_1B2CAD:: @ 81B2CAD
+	compare VAR_EGG_BRAG_STATE, 2
+	goto_if_eq EventScript_1B2D07
+	setvar VAR_EGG_BRAG_STATE, 2
+	msgbox gUnknown_81B2372
+	goto EventScript_1B2D1B
+	end
+
+EventScript_1B2CCB:: @ 81B2CCB
+	compare VAR_EGG_BRAG_STATE, 3
+	goto_if_eq EventScript_1B2D07
+	setvar VAR_EGG_BRAG_STATE, 3
+	msgbox gUnknown_81B23E0
+	goto EventScript_1B2D1B
+	end
+
+EventScript_1B2CE9:: @ 81B2CE9
+	compare VAR_EGG_BRAG_STATE, 4
+	goto_if_eq EventScript_1B2D11
+	setvar VAR_EGG_BRAG_STATE, 4
+	msgbox gUnknown_81B2448
+	goto EventScript_1B2D1B
+	end
+
+EventScript_1B2D07:: @ 81B2D07
+	msgbox gUnknown_81B251B
+	release
+	end
+
+EventScript_1B2D11:: @ 81B2D11
+	msgbox gUnknown_81B254F
+	release
+	end
+
+EventScript_1B2D1B:: @ 81B2D1B
+	textcolor 3
+	playfanfare MUS_FANFA1
+	message gUnknown_81B24EA
+	waitmessage
+	waitfanfare
+	delay 90
+	release
+	end
+
+EventScript_1B2D2C:: @ 81B2D2C
+	compare VAR_0x8006, 19
+	goto_if_le EventScript_1B2D59
+	compare VAR_0x8006, 49
+	goto_if_le EventScript_1B2D77
+	compare VAR_0x8006, 99
+	goto_if_le EventScript_1B2D95
+	compare VAR_0x8006, 100
+	goto_if_ge EventScript_1B2DB3
+	end
+
+EventScript_1B2D59:: @ 81B2D59
+	compare VAR_LINK_WIN_BRAG_STATE, 1
+	goto_if_eq EventScript_1B2DD1
+	setvar VAR_LINK_WIN_BRAG_STATE, 1
+	msgbox gUnknown_81B25A7
+	goto EventScript_1B2DE5
+	end
+
+EventScript_1B2D77:: @ 81B2D77
+	compare VAR_LINK_WIN_BRAG_STATE, 2
+	goto_if_eq EventScript_1B2DD1
+	setvar VAR_LINK_WIN_BRAG_STATE, 2
+	msgbox gUnknown_81B2609
+	goto EventScript_1B2DE5
+	end
+
+EventScript_1B2D95:: @ 81B2D95
+	compare VAR_LINK_WIN_BRAG_STATE, 3
+	goto_if_eq EventScript_1B2DD1
+	setvar VAR_LINK_WIN_BRAG_STATE, 3
+	msgbox gUnknown_81B267B
+	goto EventScript_1B2DE5
+	end
+
+EventScript_1B2DB3:: @ 81B2DB3
+	compare VAR_LINK_WIN_BRAG_STATE, 4
+	goto_if_eq EventScript_1B2DDB
+	setvar VAR_LINK_WIN_BRAG_STATE, 4
+	msgbox gUnknown_81B26F6
+	goto EventScript_1B2DE5
+	end
+
+EventScript_1B2DD1:: @ 81B2DD1
+	msgbox gUnknown_81B27DB
+	release
+	end
+
+EventScript_1B2DDB:: @ 81B2DDB
+	msgbox gUnknown_81B280F
+	release
+	end
+
+EventScript_1B2DE5:: @ 81B2DE5
+	textcolor 3
+	playfanfare MUS_FANFA1
+	message gUnknown_81B27A6
+	waitmessage
+	waitfanfare
+	delay 90
+	release
+	end
+
+EventScript_1B2DF6:: @ 81B2DF6
+	release
+	end
diff --git a/data/scripts/trainer_tower.inc b/data/scripts/trainer_tower.inc
index 2a5a84f72..45ffc285d 100644
--- a/data/scripts/trainer_tower.inc
+++ b/data/scripts/trainer_tower.inc
@@ -1,320 +1,297 @@
-SevenIsland_TrainerTower_1F_MapScript1_1C4F54:: @ 81C4F54
-SevenIsland_TrainerTower_2F_MapScript1_1C4F54:: @ 81C4F54
-SevenIsland_TrainerTower_3F_MapScript1_1C4F54:: @ 81C4F54
-SevenIsland_TrainerTower_4F_MapScript1_1C4F54:: @ 81C4F54
-SevenIsland_TrainerTower_5F_MapScript1_1C4F54:: @ 81C4F54
-SevenIsland_TrainerTower_6F_MapScript1_1C4F54:: @ 81C4F54
-SevenIsland_TrainerTower_7F_MapScript1_1C4F54:: @ 81C4F54
-SevenIsland_TrainerTower_8F_MapScript1_1C4F54:: @ 81C4F54
-SevenIsland_TrainerTower_Elevator_MapScript1_1C4F54:: @ 81C4F54
-SevenIsland_TrainerTower_Roof_MapScript1_1C4F54:: @ 81C4F54
+@ Local IDs apply to all floors (not lobby or roof)
+.equ LOCALID_TRAINER_DOUBLES1, 2
+.equ LOCALID_TRAINER_SINGLES,  3
+.equ LOCALID_TRAINER_KNOCKOUT, 4
+.equ LOCALID_TRAINER_DOUBLES2, 5
+
+.equ HIDE_TRAINER_DOUBLES1, FLAG_TEMP_2
+.equ HIDE_TRAINER_SINGLES,  FLAG_TEMP_3
+.equ HIDE_TRAINER_KNOCKOUT, FLAG_TEMP_4
+.equ HIDE_TRAINER_DOUBLES2, FLAG_TEMP_5
+.equ HIDE_OWNER,            FLAG_TEMP_6
+
+.equ DISABLE_SINGLES_TRIGGER,  VAR_TEMP_E
+.equ DISABLE_DOUBLES_TRIGGER,  VAR_TEMP_F
+
+
+@@ Map scripts
+
+TrainerTower_OnResume:: @ 81C4F54
 	setvar VAR_TEMP_2, 0
-	setvar VAR_0x8004, 10
-	special sub_815D9E8
+	ttower_resumetimer
 	end
 
-SevenIsland_TrainerTower_1F_MapScript2_1C4F62:: @ 81C4F62
-SevenIsland_TrainerTower_2F_MapScript2_1C4F62:: @ 81C4F62
-SevenIsland_TrainerTower_3F_MapScript2_1C4F62:: @ 81C4F62
-SevenIsland_TrainerTower_4F_MapScript2_1C4F62:: @ 81C4F62
-SevenIsland_TrainerTower_5F_MapScript2_1C4F62:: @ 81C4F62
-SevenIsland_TrainerTower_6F_MapScript2_1C4F62:: @ 81C4F62
-SevenIsland_TrainerTower_7F_MapScript2_1C4F62:: @ 81C4F62
-SevenIsland_TrainerTower_8F_MapScript2_1C4F62:: @ 81C4F62
-	setvar VAR_0x8004, 0
-	special sub_815D9E8
+TrainerTower_OnTransition:: @ 81C4F62
+	ttower_initfloor
 	switch VAR_RESULT
-	case 0, EventScript_1C4FA7
-	case 1, EventScript_1C4FC5
-	case 2, EventScript_1C5019
-	setflag FLAG_TEMP_2
-	setflag FLAG_TEMP_3
-	setflag FLAG_TEMP_4
-	setflag FLAG_TEMP_5
-	setvar VAR_TEMP_E, 1
-	setvar VAR_TEMP_F, 1
+	case CHALLENGE_TYPE_SINGLE, TrainerTower_EventScript_SetObjectsSingles
+	case CHALLENGE_TYPE_DOUBLE, TrainerTower_EventScript_SetObjectsDoubles
+	case CHALLENGE_TYPE_KNOCKOUT, TrainerTower_EventScript_SetObjectsKnockout
+	setflag HIDE_TRAINER_DOUBLES1
+	setflag HIDE_TRAINER_SINGLES
+	setflag HIDE_TRAINER_KNOCKOUT
+	setflag HIDE_TRAINER_DOUBLES2
+	setvar DISABLE_SINGLES_TRIGGER, TRUE
+	setvar DISABLE_DOUBLES_TRIGGER, TRUE
 	end
 
-EventScript_1C4FA7:: @ 81C4FA7
-	setflag FLAG_TEMP_2
-	setflag FLAG_TEMP_4
-	setflag FLAG_TEMP_5
-	setvar VAR_TEMP_F, 1
-	setobjectxyperm 3, 15, 13
-	setobjectmovementtype 3, 9
-	goto EventScript_1C5042
-
-EventScript_1C4FC5:: @ 81C4FC5
-	setflag FLAG_TEMP_3
-	setflag FLAG_TEMP_4
-	setvar VAR_TEMP_E, 1
-	setvar VAR_0x8004, 5
-	special sub_815D9E8
-	compare VAR_RESULT, 1
-	goto_if_eq EventScript_1C4FFE
-	setobjectxyperm 2, 10, 12
-	setobjectmovementtype 2, 9
-	setobjectxyperm 5, 10, 13
-	setobjectmovementtype 5, 9
-	goto EventScript_1C5042
-
-EventScript_1C4FFE:: @ 81C4FFE
-	setobjectxyperm 2, 10, 12
-	setobjectmovementtype 2, 8
-	setobjectxyperm 5, 11, 12
-	setobjectmovementtype 5, 8
-	goto EventScript_1C5042
-
-EventScript_1C5019:: @ 81C5019
-	setflag FLAG_TEMP_5
-	setvar VAR_TEMP_F, 1
-	setobjectxyperm 2, 10, 10
-	setobjectmovementtype 2, 8
-	setobjectxyperm 3, 14, 13
-	setobjectmovementtype 3, 9
-	setobjectxyperm 4, 10, 16
-	setobjectmovementtype 4, 7
-EventScript_1C5042:
-	setflag FLAG_TEMP_6
+TrainerTower_EventScript_SetObjectsSingles:: @ 81C4FA7
+	setflag HIDE_TRAINER_DOUBLES1
+	setflag HIDE_TRAINER_KNOCKOUT
+	setflag HIDE_TRAINER_DOUBLES2
+	setvar DISABLE_DOUBLES_TRIGGER, TRUE
+	setobjectxyperm       LOCALID_TRAINER_SINGLES, 15, 13
+	setobjectmovementtype LOCALID_TRAINER_SINGLES, MOVEMENT_TYPE_FACE_LEFT
+	goto TrainerTower_EventScript_HideOwner
+
+TrainerTower_EventScript_SetObjectsDoubles:: @ 81C4FC5
+	setflag HIDE_TRAINER_SINGLES
+	setflag HIDE_TRAINER_KNOCKOUT
+	setvar DISABLE_SINGLES_TRIGGER, TRUE
+	ttower_isfloorcleared
+	compare VAR_RESULT, TRUE
+	goto_if_eq TrainerTower_EventScript_SetObjectsDoublesAlreadyBeaten
+	setobjectxyperm       LOCALID_TRAINER_DOUBLES1, 10, 12
+	setobjectmovementtype LOCALID_TRAINER_DOUBLES1, MOVEMENT_TYPE_FACE_LEFT
+	setobjectxyperm       LOCALID_TRAINER_DOUBLES2, 10, 13
+	setobjectmovementtype LOCALID_TRAINER_DOUBLES2, MOVEMENT_TYPE_FACE_LEFT
+	goto TrainerTower_EventScript_HideOwner
+
+TrainerTower_EventScript_SetObjectsDoublesAlreadyBeaten:: @ 81C4FFE
+	setobjectxyperm       LOCALID_TRAINER_DOUBLES1, 10, 12
+	setobjectmovementtype LOCALID_TRAINER_DOUBLES1, MOVEMENT_TYPE_FACE_DOWN
+	setobjectxyperm       LOCALID_TRAINER_DOUBLES2, 11, 12
+	setobjectmovementtype LOCALID_TRAINER_DOUBLES2, MOVEMENT_TYPE_FACE_DOWN
+	goto TrainerTower_EventScript_HideOwner
+
+@ Knockout challenge re-uses trainer objects
+TrainerTower_EventScript_SetObjectsKnockout:: @ 81C5019
+	setflag HIDE_TRAINER_DOUBLES2
+	setvar DISABLE_DOUBLES_TRIGGER, TRUE
+	setobjectxyperm       LOCALID_TRAINER_DOUBLES1, 10, 10
+	setobjectmovementtype LOCALID_TRAINER_DOUBLES1, MOVEMENT_TYPE_FACE_DOWN
+	setobjectxyperm       LOCALID_TRAINER_SINGLES, 14, 13
+	setobjectmovementtype LOCALID_TRAINER_SINGLES, MOVEMENT_TYPE_FACE_LEFT
+	setobjectxyperm       LOCALID_TRAINER_KNOCKOUT, 10, 16
+	setobjectmovementtype LOCALID_TRAINER_KNOCKOUT, MOVEMENT_TYPE_FACE_UP
+TrainerTower_EventScript_HideOwner:
+	setflag HIDE_OWNER
 	end
 
-SevenIsland_TrainerTower_1F_MapScript3_1C5046:: @ 81C5046
-SevenIsland_TrainerTower_2F_MapScript3_1C5046:: @ 81C5046
-SevenIsland_TrainerTower_3F_MapScript3_1C5046:: @ 81C5046
-SevenIsland_TrainerTower_4F_MapScript3_1C5046:: @ 81C5046
-SevenIsland_TrainerTower_5F_MapScript3_1C5046:: @ 81C5046
-SevenIsland_TrainerTower_6F_MapScript3_1C5046:: @ 81C5046
-SevenIsland_TrainerTower_7F_MapScript3_1C5046:: @ 81C5046
-SevenIsland_TrainerTower_8F_MapScript3_1C5046:: @ 81C5046
-SevenIsland_TrainerTower_Elevator_MapScript2_1C5046:: @ 81C5046
-SevenIsland_TrainerTower_Roof_MapScript2_1C5046:: @ 81C5046
-	map_script_2 VAR_TEMP_2, 0, EventScript_1C5050
+TrainerTower_OnFrame:: @ 81C5046
+	map_script_2 VAR_TEMP_2, 0, TrainerTower_EventScript_EnterFloor
 	.2byte 0
 
-EventScript_1C5050:: @ 81C5050
+TrainerTower_EventScript_EnterFloor:: @ 81C5050
 	setvar VAR_TEMP_2, 1
-	setvar VAR_0x8004, 5
-	special sub_815D9E8
-	compare VAR_RESULT, 0
-	goto_if_eq EventScript_1C5072
-	setvar VAR_TEMP_E, 1
-	setvar VAR_TEMP_F, 1
-EventScript_1C5072:
-	setvar VAR_0x8004, 18
-	special sub_815D9E8
-	compare VAR_RESULT, 1
-	goto_if_eq EventScript_1C5086
+	ttower_isfloorcleared
+	compare VAR_RESULT, FALSE
+	goto_if_eq TrainerTower_EventScript_EndEnterFloor
+	setvar DISABLE_SINGLES_TRIGGER, TRUE
+	setvar DISABLE_DOUBLES_TRIGGER, TRUE
+TrainerTower_EventScript_EndEnterFloor:
+	ttower_shouldexit
+	compare VAR_RESULT, TRUE
+	goto_if_eq TrainerTower_EventScript_WarpToLobby
 	end
 
-EventScript_1C5086:: @ 81C5086
-	warp MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY, 255, 9, 7
+@ Never reached
+TrainerTower_EventScript_WarpToLobby:: @ 81C5086
+	warp MAP_TRAINER_TOWER_LOBBY, 255, 9, 7
 	waitstate
-EventScript_1C508F::
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 0
-	special sub_815D9E8
+
+
+@@ Battle scripts
+
+TrainerTower_EventScript_TriggerBattle::
+	ttower_getchallengetype
 	switch VAR_RESULT
-	case 0, EventScript_1C50C2
-	case 1, EventScript_1C510D
-	case 2, EventScript_1C515C
-EventScript_1C50C2:
-	setvar VAR_0x8004, 19
-	special sub_815D9E8
-	applymovement 3, Movement_ExclamationMark
+	case CHALLENGE_TYPE_SINGLE, TrainerTower_EventScript_DoSingleBattle
+	case CHALLENGE_TYPE_DOUBLE, TrainerTower_EventScript_DoDoubleBattle
+	case CHALLENGE_TYPE_KNOCKOUT, TrainerTower_EventScript_DoKnockoutBattle
+
+TrainerTower_EventScript_DoSingleBattle:
+	ttower_encountermusic
+	applymovement LOCALID_TRAINER_SINGLES, Movement_ExclamationMark
 	waitmovement 0
-	applymovement 3, Movement_Delay48
+	applymovement LOCALID_TRAINER_SINGLES, Movement_Delay48
 	waitmovement 0
-	setvar VAR_TEMP_E, 1
-	applymovement 3, Movement_1C5541
+	setvar DISABLE_SINGLES_TRIGGER, TRUE
+	applymovement LOCALID_TRAINER_SINGLES, TrainerTower_Movement_SingleTrainerApproach
 	waitmovement 0
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 2
-	setvar VAR_0x8006, 0
-	special sub_815D9E8
+	ttower_getspeech TRAINER_TOWER_TEXT_INTRO, 0
 	msgbox gStringVar4
 	closemessage
-	goto EventScript_1C5219
+	goto TrainerTower_EventScript_DoBattle
 
-EventScript_1C510D:: @ 81C510D
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 2
-	copyvar VAR_0x8006, VAR_TEMP_3
-	special sub_815D9E8
+TrainerTower_EventScript_DoDoubleBattle:: @ 81C510D
+	ttower_getspeech TRAINER_TOWER_TEXT_INTRO, VAR_TEMP_3
 	msgbox gStringVar4
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 2
+	setvar VAR_0x8004, TRAINER_TOWER_FUNC_GET_SPEECH
+	setvar VAR_0x8005, TRAINER_TOWER_TEXT_INTRO
 	addvar VAR_TEMP_3, 1
 	compare VAR_TEMP_3, 1
-	goto_if_eq EventScript_1C5146
+	goto_if_eq TrainerTower_EventScript_DoSecondTrainerIntro
 	setvar VAR_TEMP_3, 0
-EventScript_1C5146:
+TrainerTower_EventScript_DoSecondTrainerIntro:
 	copyvar VAR_0x8006, VAR_TEMP_3
-	special sub_815D9E8
+	special CallTrainerTowerFunc
 	msgbox gStringVar4
 	closemessage
-	goto EventScript_1C5219
+	goto TrainerTower_EventScript_DoBattle
 
-EventScript_1C515C:: @ 81C515C
+TrainerTower_EventScript_DoKnockoutBattle:: @ 81C515C
 	switch VAR_TEMP_1
-	case 0, EventScript_1C5182
-	case 1, EventScript_1C51AD
-	case 2, EventScript_1C51D8
-EventScript_1C5182:
-	setvar VAR_0x8004, 19
-	special sub_815D9E8
-	applymovement 4, Movement_ExclamationMark
+	case 0, TrainerTower_EventScript_DoKnockoutBattle1
+	case 1, TrainerTower_EventScript_DoKnockoutBattle2
+	case 2, TrainerTower_EventScript_DoKnockoutBattle3
+
+TrainerTower_EventScript_DoKnockoutBattle1:
+	ttower_encountermusic
+	applymovement LOCALID_TRAINER_KNOCKOUT, Movement_ExclamationMark
 	waitmovement 0
-	applymovement 4, Movement_Delay48
+	applymovement LOCALID_TRAINER_KNOCKOUT, Movement_Delay48
 	waitmovement 0
-	applymovement 4, Movement_1C5546
+	applymovement LOCALID_TRAINER_KNOCKOUT, TrainerTower_Movement_BottomKnockoutTrainerApproach
 	waitmovement 0
-	goto EventScript_1C51FE
+	goto TrainerTower_EventScript_DoKnockoutBattleIntro
 
-EventScript_1C51AD:: @ 81C51AD
-	setvar VAR_0x8004, 19
-	special sub_815D9E8
-	applymovement 2, Movement_ExclamationMark
+TrainerTower_EventScript_DoKnockoutBattle2:: @ 81C51AD
+	ttower_encountermusic
+	applymovement LOCALID_TRAINER_DOUBLES1, Movement_ExclamationMark
 	waitmovement 0
-	applymovement 2, Movement_Delay48
+	applymovement LOCALID_TRAINER_DOUBLES1, Movement_Delay48
 	waitmovement 0
-	applymovement 2, Movement_1C5549
+	applymovement LOCALID_TRAINER_DOUBLES1, TrainerTower_Movement_TopKnockoutTrainerApproach
 	waitmovement 0
-	goto EventScript_1C51FE
+	goto TrainerTower_EventScript_DoKnockoutBattleIntro
 
-EventScript_1C51D8:: @ 81C51D8
-	setvar VAR_0x8004, 19
-	special sub_815D9E8
-	applymovement 3, Movement_ExclamationMark
+TrainerTower_EventScript_DoKnockoutBattle3:: @ 81C51D8
+	ttower_encountermusic
+	applymovement LOCALID_TRAINER_SINGLES, Movement_ExclamationMark
 	waitmovement 0
-	applymovement 3, Movement_Delay48
+	applymovement LOCALID_TRAINER_SINGLES, Movement_Delay48
 	waitmovement 0
-	applymovement 3, Movement_1C5542
+	applymovement LOCALID_TRAINER_SINGLES, TrainerTower_Movement_RightKnockoutTrainerApproach
 	waitmovement 0
-EventScript_1C51FE:
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 2
-	copyvar VAR_0x8006, VAR_TEMP_1
-	special sub_815D9E8
+TrainerTower_EventScript_DoKnockoutBattleIntro:
+	ttower_getspeech TRAINER_TOWER_TEXT_INTRO, VAR_TEMP_1
 	msgbox gStringVar4
 	closemessage
-EventScript_1C5219:
-	setvar VAR_0x8004, 2
-	setvar VAR_0x8005, 0
-	special sub_815D9E8
+TrainerTower_EventScript_DoBattle:
+	ttower_dobattle
 	waitstate
 	switch VAR_RESULT
-	case 1, EventScript_1C524D
-	case 2, EventScript_1C52E0
-	case 3, EventScript_1C52E0
-EventScript_1C524D:
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 0
-	special sub_815D9E8
+	case B_OUTCOME_WON, TrainerTower_EventScript_WonBattle
+	case B_OUTCOME_LOST, TrainerTower_EventScript_WarpToLobbyLost
+	case B_OUTCOME_DREW, TrainerTower_EventScript_WarpToLobbyLost
+TrainerTower_EventScript_WonBattle:
+	ttower_getchallengetype
 	switch VAR_RESULT
-	case 0, EventScript_1C52D7
-	case 1, EventScript_1C52BA
-	case 2, EventScript_1C5280
-EventScript_1C5280:
+	case CHALLENGE_TYPE_SINGLE, TrainerTower_EventScript_SetFloorCleared
+	case CHALLENGE_TYPE_DOUBLE, TrainerTower_EventScript_MoveDoublesTrainers
+	case CHALLENGE_TYPE_KNOCKOUT, TrainerTower_EventScript_CheckNextKnockoutBattle
+
+TrainerTower_EventScript_CheckNextKnockoutBattle:
 	switch VAR_TEMP_1
-	case 0, EventScript_1C52A6
-	case 1, EventScript_1C52B0
-	case 2, EventScript_1C52D0
-EventScript_1C52A6:
+	case 0, TrainerTower_EventScript_DoSecondKnockoutBattle
+	case 1, TrainerTower_EventScript_DoThirdKnockoutBattle
+	case 2, TrainerTower_EventScript_MoveLastKnockoutTrainer
+
+TrainerTower_EventScript_DoSecondKnockoutBattle:
 	addvar VAR_TEMP_1, 1
-	goto EventScript_1C515C
+	goto TrainerTower_EventScript_DoKnockoutBattle
 
-EventScript_1C52B0:: @ 81C52B0
+TrainerTower_EventScript_DoThirdKnockoutBattle:: @ 81C52B0
 	addvar VAR_TEMP_1, 1
-	goto EventScript_1C515C
+	goto TrainerTower_EventScript_DoKnockoutBattle
 
-EventScript_1C52BA:: @ 81C52BA
-	applymovement 5, Movement_1C554C
+TrainerTower_EventScript_MoveDoublesTrainers:: @ 81C52BA
+	applymovement LOCALID_TRAINER_DOUBLES2, TrainerTower_Movement_DoublesTrainer2OutOfWay
 	waitmovement 0
-	applymovement 2, Movement_1C5550
-	goto EventScript_1C52D7
-
-EventScript_1C52D0:: @ 81C52D0
-	applymovement 3, Movement_1C554D
-EventScript_1C52D7:
-	setvar VAR_0x8004, 4
-	special sub_815D9E8
+	applymovement LOCALID_TRAINER_DOUBLES1, TrainerTower_Movement_DoublesTrainer1FaceDown
+	goto TrainerTower_EventScript_SetFloorCleared
+
+TrainerTower_EventScript_MoveLastKnockoutTrainer:: @ 81C52D0
+	applymovement LOCALID_TRAINER_SINGLES, TrainerTower_Movement_LastKnockoutTrainerOutOfWay
+TrainerTower_EventScript_SetFloorCleared:
+	ttower_clearedfloor
 	end
 
-EventScript_1C52E0:: @ 81C52E0
+TrainerTower_EventScript_WarpToLobbyLost:: @ 81C52E0
 	special HealPlayerParty
-	setvar VAR_0x8004, 11
-	special sub_815D9E8
-	warp MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY, 255, 9, 7
+	ttower_setlost
+	warp MAP_TRAINER_TOWER_LOBBY, 255, 9, 7
 	waitstate
 
-EventScript_1C52F4:: @ 81C52F4
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 0
-	special sub_815D9E8
+
+@@ Speaking to trainers after battle
+
+TrainerTower_EventScript_SpeakToDoublesTrainer1:: @ 81C52F4
+	ttower_getchallengetype
 	switch VAR_RESULT
-	case 0, EventScript_1C5327
-	case 1, EventScript_1C5327
-	case 2, EventScript_1C5331
-EventScript_1C5327:
+	case CHALLENGE_TYPE_SINGLE, TrainerTower_EventScript_DoublesTrainer1PostBattle
+	case CHALLENGE_TYPE_DOUBLE, TrainerTower_EventScript_DoublesTrainer1PostBattle
+	case CHALLENGE_TYPE_KNOCKOUT, TrainerTower_EventScript_KnockoutTrainer2PostBattle
+TrainerTower_EventScript_DoublesTrainer1PostBattle:
 	setvar VAR_0x8006, 0
-	goto EventScript_1C5391
+	goto TrainerTower_EventScript_DoPostBattleText
 
-EventScript_1C5331:: @ 81C5331
+TrainerTower_EventScript_KnockoutTrainer2PostBattle:: @ 81C5331
 	setvar VAR_0x8006, 1
-	goto EventScript_1C5391
+	goto TrainerTower_EventScript_DoPostBattleText
 
-EventScript_1C533B:: @ 81C533B
-	setvar VAR_0x8004, 3
-	setvar VAR_0x8005, 0
-	special sub_815D9E8
+TrainerTower_EventScript_SpeakToSinglesTrainer:: @ 81C533B
+	ttower_getchallengetype
 	switch VAR_RESULT
-	case 0, EventScript_1C536E
-	case 1, EventScript_1C536E
-	case 2, EventScript_1C5378
-EventScript_1C536E:
+	case CHALLENGE_TYPE_SINGLE, TrainerTower_EventScript_SinglesTrainerPostBattle
+	case CHALLENGE_TYPE_DOUBLE, TrainerTower_EventScript_SinglesTrainerPostBattle
+	case CHALLENGE_TYPE_KNOCKOUT, TrainerTower_EventScript_KnockoutTrainer3PostBattle
+TrainerTower_EventScript_SinglesTrainerPostBattle:
 	setvar VAR_0x8006, 0
-	goto EventScript_1C5391
+	goto TrainerTower_EventScript_DoPostBattleText
 
-EventScript_1C5378:: @ 81C5378
+TrainerTower_EventScript_KnockoutTrainer3PostBattle:: @ 81C5378
 	setvar VAR_0x8006, 2
-	goto EventScript_1C5391
+	goto TrainerTower_EventScript_DoPostBattleText
 
-EventScript_1C5382:: @ 81C5382
+TrainerTower_EventScript_SpeakToKnockoutTrainer:: @ 81C5382
 	setvar VAR_0x8006, 0
-	goto EventScript_1C5391
+	goto TrainerTower_EventScript_DoPostBattleText
 
-EventScript_1C538C:: @ 81C538C
+TrainerTower_EventScript_SpeakToDoublesTrainer2:: @ 81C538C
 	setvar VAR_0x8006, 1
-EventScript_1C5391:
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 5
-	special sub_815D9E8
+TrainerTower_EventScript_DoPostBattleText:
+	ttower_getspeech TRAINER_TOWER_TEXT_AFTER
 	lock
 	faceplayer
 	msgbox gStringVar4
 	release
 	return
 
-EventScript_1C53AA:: @ 81C53AA
+
+@@ Speaking to owner
+
+TrainerTower_EventScript_SpeakToOwner:: @ 81C53AA
 	lock
 	faceplayer
-	setvar VAR_0x8004, 7
-	special sub_815D9E8
+	ttower_getownerstate
 	switch VAR_RESULT
-	case 0, EventScript_1C53DA
-	case 1, EventScript_1C53E2
-	case 2, EventScript_1C5492
-EventScript_1C53DA:
-	msgbox Text_17CA5A
-EventScript_1C53E2:
-	setvar VAR_0x8004, 8
-	special sub_815D9E8
+	case 0, TrainerTower_Roof_EventScript_Arrived
+	case 1, TrainerTower_Roof_EventScript_GivePrize
+	case 2, TrainerTower_Roof_EventScript_OwnerEnd
+
+TrainerTower_Roof_EventScript_Arrived:
+	msgbox TrainerTower_Roof_Text_ImOwnerBattledPerfectly
+TrainerTower_Roof_EventScript_GivePrize:
+	ttower_giveprize
 	switch VAR_RESULT
-	case 0, EventScript_1C5410
-	case 1, EventScript_1C543A
-	case 2, EventScript_1C544F
-EventScript_1C5410:
-	msgbox Text_17CB09
+	case 0, TrainerTower_Roof_EventScript_ReceivePrize
+	case 1, TrainerTower_Roof_EventScript_NoRoomForPrize
+	case 2, TrainerTower_Roof_EventScript_CheckFinalTime
+
+TrainerTower_Roof_EventScript_ReceivePrize:
+	msgbox TrainerTower_Roof_Text_ThisIsForYou
 	textcolor 3
 	playfanfare MUS_FANFA1
 	message Text_ObtainedTheX
@@ -323,128 +300,105 @@ EventScript_1C5410:
 	getstdstring 2, STDSTRING_ITEMS_POCKET
 	msgbox Text_PutItemAway
 	call EventScript_1A6675
-	goto EventScript_1C544F
+	goto TrainerTower_Roof_EventScript_CheckFinalTime
 
-EventScript_1C543A:: @ 81C543A
-	msgbox Text_17CB09
+TrainerTower_Roof_EventScript_NoRoomForPrize:: @ 81C543A
+	msgbox TrainerTower_Roof_Text_ThisIsForYou
 	msgbox Text_BagIsFull
-	goto EventScript_1C544F
+	goto TrainerTower_Roof_EventScript_CheckFinalTime
 
-EventScript_1C544F:: @ 81C544F
-	setvar VAR_0x8004, 9
-	special sub_815D9E8
+TrainerTower_Roof_EventScript_CheckFinalTime:: @ 81C544F
+	ttower_checkfinaltime
 	switch VAR_RESULT
-	case 0, EventScript_1C547D
-	case 1, EventScript_1C548A
-	case 2, EventScript_1C5492
-EventScript_1C547D:
-	msgbox Text_17CB1A
-	goto EventScript_1C5492
-
-EventScript_1C548A:: @ 81C548A
-	msgbox Text_17CBC0
-EventScript_1C5492:
-	msgbox Text_17CBF5
+	case 0, TrainerTower_Roof_EventScript_NewRecord
+	case 1, TrainerTower_Roof_EventScript_NoNewRecord
+	case 2, TrainerTower_Roof_EventScript_OwnerEnd
+
+TrainerTower_Roof_EventScript_NewRecord:
+	msgbox TrainerTower_Roof_Text_DoneItInRecordTime
+	goto TrainerTower_Roof_EventScript_OwnerEnd
+
+TrainerTower_Roof_EventScript_NoNewRecord:: @ 81C548A
+	msgbox TrainerTower_Roof_Text_TookSweetTimeGettingHere
+TrainerTower_Roof_EventScript_OwnerEnd:
+	msgbox TrainerTower_Roof_Text_IdLikeToSeeBetterTime
 	release
 	return
 
-EventScript_1C549C:: @ 81C549C
+TrainerTower_EventScript_ShowTime:: @ 81C549C
 	lockall
-	setvar VAR_0x8004, 13
-	special sub_815D9E8
-	msgbox Text_17CC56
+	ttower_gettime
+	msgbox TrainerTower_Text_XMinYZSec
 	releaseall
 	end
 
-SevenIsland_TrainerTower_2F_EventScript_1C54AF:: @ 81C54AF
-SevenIsland_TrainerTower_4F_EventScript_1C54AF:: @ 81C54AF
-SevenIsland_TrainerTower_6F_EventScript_1C54AF:: @ 81C54AF
-SevenIsland_TrainerTower_8F_EventScript_1C54AF:: @ 81C54AF
-SevenIsland_TrainerTower_5F_EventScript_1C54AF:: @ 81C54AF
-SevenIsland_TrainerTower_7F_EventScript_1C54AF:: @ 81C54AF
-SevenIsland_TrainerTower_3F_EventScript_1C54AF:: @ 81C54AF
-SevenIsland_TrainerTower_1F_EventScript_1C54AF:: @ 81C54AF
-	goto EventScript_1C508F
-
-SevenIsland_TrainerTower_2F_EventScript_1C54B4:: @ 81C54B4
-SevenIsland_TrainerTower_4F_EventScript_1C54B4:: @ 81C54B4
-SevenIsland_TrainerTower_6F_EventScript_1C54B4:: @ 81C54B4
-SevenIsland_TrainerTower_8F_EventScript_1C54B4:: @ 81C54B4
-SevenIsland_TrainerTower_5F_EventScript_1C54B4:: @ 81C54B4
-SevenIsland_TrainerTower_7F_EventScript_1C54B4:: @ 81C54B4
-SevenIsland_TrainerTower_3F_EventScript_1C54B4:: @ 81C54B4
-SevenIsland_TrainerTower_1F_EventScript_1C54B4:: @ 81C54B4
+
+@@ Battle triggers
+
+TrainerTower_EventScript_SingleBattleTrigger:: @ 81C54AF
+	goto TrainerTower_EventScript_TriggerBattle
+
+TrainerTower_EventScript_DoubleBattleTriggerTop:: @ 81C54B4
 	setvar VAR_TEMP_3, 0
-	setvar VAR_0x8004, 16
-	special sub_815D9E8
-	compare VAR_RESULT, 0
-	goto_if_ne EventScript_1C5528
-	setvar VAR_0x8004, 19
-	special sub_815D9E8
-	applymovement 2, Movement_ExclamationMark
+	ttower_checkdoubles
+	compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS
+	goto_if_ne TrainerTower_EventScript_IneligibleForDoubleBattle
+	ttower_encountermusic
+	applymovement LOCALID_TRAINER_DOUBLES1, Movement_ExclamationMark
 	waitmovement 0
-	applymovement 2, Movement_Delay48
-	goto EventScript_1C551B
-
-SevenIsland_TrainerTower_2F_EventScript_1C54EA:: @ 81C54EA
-SevenIsland_TrainerTower_4F_EventScript_1C54EA:: @ 81C54EA
-SevenIsland_TrainerTower_6F_EventScript_1C54EA:: @ 81C54EA
-SevenIsland_TrainerTower_8F_EventScript_1C54EA:: @ 81C54EA
-SevenIsland_TrainerTower_5F_EventScript_1C54EA:: @ 81C54EA
-SevenIsland_TrainerTower_7F_EventScript_1C54EA:: @ 81C54EA
-SevenIsland_TrainerTower_3F_EventScript_1C54EA:: @ 81C54EA
-SevenIsland_TrainerTower_1F_EventScript_1C54EA:: @ 81C54EA
+	applymovement LOCALID_TRAINER_DOUBLES1, Movement_Delay48
+	goto TrainerTower_EventScript_TriggerDoubleBattle
+
+TrainerTower_EventScript_DoubleBattleTriggerBottom:: @ 81C54EA
 	setvar VAR_TEMP_3, 1
-	setvar VAR_0x8004, 16
-	special sub_815D9E8
-	compare VAR_RESULT, 0
-	goto_if_ne EventScript_1C5528
-	setvar VAR_0x8004, 19
-	special sub_815D9E8
-	applymovement 5, Movement_ExclamationMark
+	ttower_checkdoubles
+	compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS
+	goto_if_ne TrainerTower_EventScript_IneligibleForDoubleBattle
+	ttower_encountermusic
+	applymovement LOCALID_TRAINER_DOUBLES2, Movement_ExclamationMark
 	waitmovement 0
-	applymovement 5, Movement_Delay48
-EventScript_1C551B:
+	applymovement LOCALID_TRAINER_DOUBLES2, Movement_Delay48
+TrainerTower_EventScript_TriggerDoubleBattle:
 	waitmovement 0
-	setvar VAR_TEMP_F, 1
-	goto EventScript_1C508F
+	setvar DISABLE_DOUBLES_TRIGGER, TRUE
+	goto TrainerTower_EventScript_TriggerBattle
 
-EventScript_1C5528:: @ 81C5528
+TrainerTower_EventScript_IneligibleForDoubleBattle:: @ 81C5528
 	lockall
 	playse SE_PINPON
-	msgbox Text_17CC73
+	msgbox TrainerTower_Lobby_Text_NeedTwoMonsForDouble
 	closemessage
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_1C5544
+	applymovement OBJ_EVENT_ID_PLAYER, TrainerTower_Movement_PushPlayerBack
 	waitmovement 0
 	releaseall
 	end
 
-Movement_1C5541:
+TrainerTower_Movement_SingleTrainerApproach:
 	walk_left
-Movement_1C5542:: @ 81C5542
+TrainerTower_Movement_RightKnockoutTrainerApproach:: @ 81C5542
 	walk_left
 	walk_left
-Movement_1C5544:
+TrainerTower_Movement_PushPlayerBack:
 	walk_left
 	step_end
 
-Movement_1C5546:: @ 81C5546
+TrainerTower_Movement_BottomKnockoutTrainerApproach:: @ 81C5546
 	walk_up
 	walk_up
 	step_end
 
-Movement_1C5549:: @ 81C5549
+TrainerTower_Movement_TopKnockoutTrainerApproach:: @ 81C5549
 	walk_down
 	walk_down
 	step_end
 
-Movement_1C554C:: @ 81C554C
+TrainerTower_Movement_DoublesTrainer2OutOfWay:: @ 81C554C
 	walk_right
-Movement_1C554D:
+TrainerTower_Movement_LastKnockoutTrainerOutOfWay:
 	walk_up
 	face_down
 	step_end
 
-Movement_1C5550:: @ 81C5550
+TrainerTower_Movement_DoublesTrainer1FaceDown:: @ 81C5550
 	face_down
 	step_end
diff --git a/data/scripts/trainers.inc b/data/scripts/trainers.inc
index 68d7e1157..68e8154b1 100644
--- a/data/scripts/trainers.inc
+++ b/data/scripts/trainers.inc
@@ -2988,54 +2988,54 @@ EventScript_1ACC32:: @ 81ACC32
 	msgbox Text_18CE78, MSGBOX_AUTOCLOSE
 	end
 
-SevenIsland_TanobyRuins_EventScript_1ACC4D:: @ 81ACC4D
-	trainerbattle_single TRAINER_RUIN_MANIAC_BRANDON, Text_18CFFB, Text_18D02A
+SevenIsland_TanobyRuins_EventScript_Brandon:: @ 81ACC4D
+	trainerbattle_single TRAINER_RUIN_MANIAC_BRANDON, SevenIsland_TanobyRuins_Text_BrandonIntro, SevenIsland_TanobyRuins_Text_BrandonDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1ACC74
-	msgbox Text_18D061, MSGBOX_AUTOCLOSE
+	goto_if_eq SevenIsland_TanobyRuins_EventScript_RematchBrandon
+	msgbox SevenIsland_TanobyRuins_Text_BrandonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1ACC74:: @ 81ACC74
-	trainerbattle_rematch TRAINER_RUIN_MANIAC_BRANDON, Text_1C46D3, Text_18D02A
-	msgbox Text_18D061, MSGBOX_AUTOCLOSE
+SevenIsland_TanobyRuins_EventScript_RematchBrandon:: @ 81ACC74
+	trainerbattle_rematch TRAINER_RUIN_MANIAC_BRANDON, SevenIsland_TanobyRuins_Text_BrandonRematchIntro, SevenIsland_TanobyRuins_Text_BrandonDefeat
+	msgbox SevenIsland_TanobyRuins_Text_BrandonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SevenIsland_TanobyRuins_EventScript_1ACC8B:: @ 81ACC8B
-	trainerbattle_single TRAINER_RUIN_MANIAC_BENJAMIN, Text_18D0D9, Text_18D108
+SevenIsland_TanobyRuins_EventScript_Benjamin:: @ 81ACC8B
+	trainerbattle_single TRAINER_RUIN_MANIAC_BENJAMIN, SevenIsland_TanobyRuins_Text_BenjaminIntro, SevenIsland_TanobyRuins_Text_BenjaminDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1ACCB2
-	msgbox Text_18D125, MSGBOX_AUTOCLOSE
+	goto_if_eq SevenIsland_TanobyRuins_EventScript_RematchBenjamin
+	msgbox SevenIsland_TanobyRuins_Text_BenjaminPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1ACCB2:: @ 81ACCB2
-	trainerbattle_rematch TRAINER_RUIN_MANIAC_BENJAMIN, Text_1C470A, Text_18D108
-	msgbox Text_18D125, MSGBOX_AUTOCLOSE
+SevenIsland_TanobyRuins_EventScript_RematchBenjamin:: @ 81ACCB2
+	trainerbattle_rematch TRAINER_RUIN_MANIAC_BENJAMIN, SevenIsland_TanobyRuins_Text_BenjaminRematchIntro, SevenIsland_TanobyRuins_Text_BenjaminDefeat
+	msgbox SevenIsland_TanobyRuins_Text_BenjaminPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SevenIsland_TanobyRuins_EventScript_1ACCC9:: @ 81ACCC9
-	trainerbattle_single TRAINER_PAINTER_EDNA, Text_18D18F, Text_18D1B5
+SevenIsland_TanobyRuins_EventScript_Edna:: @ 81ACCC9
+	trainerbattle_single TRAINER_PAINTER_EDNA, SevenIsland_TanobyRuins_Text_EdnaIntro, SevenIsland_TanobyRuins_Text_EdnaDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1ACCF0
-	msgbox Text_18D1E3, MSGBOX_AUTOCLOSE
+	goto_if_eq SevenIsland_TanobyRuins_EventScript_RematchEdna
+	msgbox SevenIsland_TanobyRuins_Text_EdnaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1ACCF0:: @ 81ACCF0
-	trainerbattle_rematch TRAINER_PAINTER_EDNA, Text_1C4739, Text_18D1B5
-	msgbox Text_18D1E3, MSGBOX_AUTOCLOSE
+SevenIsland_TanobyRuins_EventScript_RematchEdna:: @ 81ACCF0
+	trainerbattle_rematch TRAINER_PAINTER_EDNA, SevenIsland_TanobyRuins_Text_EdnaRematchIntro, SevenIsland_TanobyRuins_Text_EdnaDefeat
+	msgbox SevenIsland_TanobyRuins_Text_EdnaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SevenIsland_TanobyRuins_EventScript_1ACD07:: @ 81ACD07
-	trainerbattle_single TRAINER_GENTLEMAN_CLIFFORD, Text_18D22F, Text_18D26D
+SevenIsland_TanobyRuins_EventScript_Clifford:: @ 81ACD07
+	trainerbattle_single TRAINER_GENTLEMAN_CLIFFORD, SevenIsland_TanobyRuins_Text_CliffordIntro, SevenIsland_TanobyRuins_Text_CliffordDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1ACD2E
-	msgbox Text_18D284, MSGBOX_AUTOCLOSE
+	goto_if_eq SevenIsland_TanobyRuins_EventScript_RematchClifford
+	msgbox SevenIsland_TanobyRuins_Text_CliffordPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1ACD2E:: @ 81ACD2E
-	trainerbattle_rematch TRAINER_GENTLEMAN_CLIFFORD, Text_1C476A, Text_18D26D
-	msgbox Text_18D284, MSGBOX_AUTOCLOSE
+SevenIsland_TanobyRuins_EventScript_RematchClifford:: @ 81ACD2E
+	trainerbattle_rematch TRAINER_GENTLEMAN_CLIFFORD, SevenIsland_TanobyRuins_Text_CliffordRematchIntro, SevenIsland_TanobyRuins_Text_CliffordDefeat
+	msgbox SevenIsland_TanobyRuins_Text_CliffordPostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/specials.inc b/data/specials.inc
index 39ce252a4..4ed38160d 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -103,7 +103,7 @@ gSpecials:: @ 815FD60
 	def_special sub_8081128
 	def_special Field_AskSaveTheGame
 	def_special nullsub_56
-	def_special sub_80FEE44
+	def_special ShowEasyChatScreen
 	def_special Special_BufferEasyChatMessage
 	def_special nullsub_75
 	def_special nullsub_75
@@ -374,7 +374,7 @@ gSpecials:: @ 815FD60
 	def_special TryBecomeLinkLeader
 	def_special TryJoinLinkGroup
 	def_special UnionRoomSpecial
-	def_special sub_814F1D4
+	def_special Special_WirelessCommunicationScreen
 	def_special EnableNationalPokedex
 	def_special sub_80699E0
 	def_special sub_80699BC
@@ -412,7 +412,7 @@ gSpecials:: @ 815FD60
 	def_special Special_SSAnneDepartureCutscene
 	def_special IsPokemonJumpSpeciesInParty
 	def_special IsNationalPokedexEnabled
-	def_special sub_815D9E8
+	def_special CallTrainerTowerFunc
 	def_special ShowPokemonJumpRecords
 	def_special Special_ItemIsTM_GetMoveName
 	def_special Special_DaisyMassageServices
@@ -439,7 +439,7 @@ gSpecials:: @ 815FD60
 	def_special Special_SetDeoxysTriangleObjectPal
 	def_special IsPlayerLeftOfVermilionSailor
 	def_special Special_BadEggInParty
-	def_special sub_815D834
+	def_special ReadTrainerTowerAndValidate
 	def_special HasAllMons
 	def_special Special_PlayerIsNotInTrainerTowerLobby
 	def_special Special_BrailleCursorToggle
diff --git a/data/strings.s b/data/strings.s
index 5cff90fcd..f595170ff 100644
--- a/data/strings.s
+++ b/data/strings.s
@@ -4230,51 +4230,51 @@ gJPText_MysteryGift:: @ 841DE50
 gJPText_DecideStop:: @ 841DE51
 	.string "$"
 
-gUnknown_841DE52:: @ 841DE52
+gJPText_ReceiveMysteryGiftWithEReader:: @ 841DE52
 	.string "$"
 
-gUnknown_841DE53:: @ 841DE53
+gJPText_SelectConnectFromEReaderMenu:: @ 841DE53
 	.string "$"
 
-gUnknown_841DE54:: @ 841DE54
+gJPText_SelectConnectWithGBA:: @ 841DE54
 	.string "$"
 
-gUnknown_841DE55:: @ 841DE55
+gJPText_SelectConnectAndPressA:: @ 841DE55
 	.string "カ-ドeリ-ダ-{PLUS}の ‘つうしん'を\n"
 	.string "えらんで Aボタンを おしてください$"
 
-gUnknown_841DE7C:: @ 841DE7C
+gJPText_LinkIsIncorrect:: @ 841DE7C
 	.string "$"
 
-gUnknown_841DE7D:: @ 841DE7D
+gJPText_CardReadingHasBeenHalted:: @ 841DE7D
 	.string "$"
 
-gUnknown_841DE7E:: @ 841DE7E
+gJPText_UnableConnectWithEReader:: @ 841DE7E
 	.string "カ-ドeリ-ダ-{PLUS}と\n"
 	.string "つうしん できません$"
 
-gUnknown_841DE95:: @ 841DE95
+gJPText_Connecting:: @ 841DE95
 	.string "$"
 
-gUnknown_841DE96:: @ 841DE96
+gJPText_ConnectionErrorCheckLink:: @ 841DE96
 	.string "$"
 
-gUnknown_841DE97:: @ 841DE97
+gJPText_ConnectionErrorTryAgain:: @ 841DE97
 	.string "$"
 
-gUnknown_841DE98:: @ 841DE98
+gJPText_AllowEReaderToLoadCard:: @ 841DE98
 	.string "$"
 
-gUnknown_841DE99:: @ 841DE99
+gJPText_ConnectionComplete:: @ 841DE99
 	.string "$"
 
-gUnknown_841DE9A:: @ 841DE9A
+gJPText_NewTrainerHasComeToSevii:: @ 841DE9A
 	.string "$"
 
-gUnknown_841DE9B:: @ 841DE9B
+gJPText_PleaseWaitAMoment:: @ 841DE9B
 	.string "$"
 
-gUnknown_841DE9C:: @ 841DE9C
+gJPText_WriteErrorUnableToSaveData:: @ 841DE9C
 	.string "$"
 
 gText_CommErrorCheckConnections:: @ 841DE9D
@@ -4498,19 +4498,19 @@ gUnknown_841E243:: @ 841E243
 gUnknown_841E244:: @ 841E244
 	.string "$"
 
-gUnknown_841E245:: @ 841E245
+gText_WirelessCommunicationStatus:: @ 841E245
 	.string "Wireless Communication Status$"
 
-gUnknown_841E263:: @ 841E263
+gText_PeopleTrading:: @ 841E263
 	.string "People trading:$"
 
-gUnknown_841E273:: @ 841E273
+gText_PeopleBattling:: @ 841E273
 	.string "People battling:$"
 
-gUnknown_841E284:: @ 841E284
+gText_PeopleInUnionRoom:: @ 841E284
 	.string "People in the UNION ROOM:$"
 
-gUnknown_841E29E:: @ 841E29E
+gText_PeopleCommunicating:: @ 841E29E
 	.string "People communicating:$"
 
 gUnknown_841E2B4:: @ 841E2B4
diff --git a/data/text/fame_checker.inc b/data/text/fame_checker.inc
index 0705caffe..a8226df05 100644
--- a/data/text/fame_checker.inc
+++ b/data/text/fame_checker.inc
@@ -1396,7 +1396,7 @@ PokemonJournal_Text_SpecialFeatureLtSurge:: @ 81B1558
 	.string "He used the electricity generated\n"
 	.string "by POKéMON to power his plane.$"
 
-gUnknown_81B161B:: @ 81B161B
+PokemonJournal_Text_SpecialFeatureErika:: @ 81B161B
 	.string "POKéMON JOURNAL\p"
 	.string "Special Feature: CELADON GYM\n"
 	.string "LEADER ERIKA!\p"
@@ -1413,7 +1413,7 @@ PokemonJournal_Text_SpecialFeatureKoga:: @ 81B16A8
 	.string "He even concocts medicine to nurse\n"
 	.string "his POKéMON to health.$"
 
-gUnknown_81B1753:: @ 81B1753
+PokemonJournal_Text_SpecialFeatureSabrina:: @ 81B1753
 	.string "POKéMON JOURNAL\p"
 	.string "Special Feature: SAFFRON GYM\n"
 	.string "LEADER SABRINA!\p"
@@ -1437,7 +1437,7 @@ gUnknown_81B187F:: @ 81B187F
 	.string "and cool battling style, LORELEI\l"
 	.string "has a surprising secret!$"
 
-gUnknown_81B1913:: @ 81B1913
+PokemonJournal_Text_SpecialFeatureBruno:: @ 81B1913
 	.string "POKéMON JOURNAL\p"
 	.string "Special Feature:\n"
 	.string "ELITE FOUR's BRUNO!\p"
@@ -1453,7 +1453,7 @@ gUnknown_81B19A8:: @ 81B19A8
 	.string "OAK were rivals who vied for\l"
 	.string "supremacy as TRAINERS.$"
 
-gUnknown_81B1A31:: @ 81B1A31
+PokemonJournal_Text_SpecialFeatureLance:: @ 81B1A31
 	.string "POKéMON JOURNAL\p"
 	.string "Special Feature:\n"
 	.string "ELITE FOUR's LANCE!\p"
@@ -1485,198 +1485,3 @@ PokemonJournal_Text_SpecialFeatureMrFuji:: @ 81B1BD1
 	.string "down our interview requests.\p"
 	.string "He is a kindly man who is adored\n"
 	.string "and respected in LAVENDER TOWN.$"
-
-gUnknown_81B1C8B:: @ 81B1C8B
-	.string "Hmm…\n"
-	.string "Is that right…$"
-
-gUnknown_81B1C9F:: @ 81B1C9F
-	.string "Oh!\n"
-	.string "Look, look!$"
-
-gUnknown_81B1CAF:: @ 81B1CAF
-	.string "Read it, read it!$"
-
-gUnknown_81B1CC1:: @ 81B1CC1
-	.string "TRAINER TIPS\p"
-	.string "Press START to open the MENU!$"
-
-gUnknown_81B1CEC:: @ 81B1CEC
-	.string "Signs are useful, aren't they?$"
-
-gUnknown_81B1D0B:: @ 81B1D0B
-	.string "Look, look!\p"
-	.string "I copied what it said on one of\n"
-	.string "those TRAINER TIPS signs!$"
-
-gUnknown_81B1D51:: @ 81B1D51
-	.string "TRAINER TIPS!\p"
-	.string "Press START to open the MENU!$"
-
-gUnknown_81B1D7D:: @ 81B1D7D
-	.string "It's a POKéMON PRINTER!\p"
-	.string "It can put a print of your POKéMON\n"
-	.string "on the back of your TRAINER CARD.\p"
-	.string "It costs only ¥50.\n"
-	.string "Would you like to try it?$"
-
-gUnknown_81B1E07:: @ 81B1E07
-	.string "You don't have enough money.$"
-
-gUnknown_81B1E24:: @ 81B1E24
-	.string "Please choose the print type.$"
-
-gUnknown_81B1E42:: @ 81B1E42
-	.string "A big smile for the photo, please!\n"
-	.string "Three… Two… One…\p"
-	.string "Flash!$"
-
-gUnknown_81B1E7D:: @ 81B1E7D
-	.string "Your POKéMON print is ready!\n"
-	.string "Check your TRAINER CARD.$"
-
-gUnknown_81B1EB3:: @ 81B1EB3
-	.string "Giggle…\n"
-	.string "I collected a ton of STICKERS.\l"
-	.string "I wish I could show them off…$"
-
-gUnknown_81B1EF8:: @ 81B1EF8
-	.string "Oh, excellent!\n"
-	.string "You've come to the right place!\p"
-	.string "Look, look! See? See?\n"
-	.string "These are my STICKERS!\l"
-	.string "Look how many I got!\p"
-	.string "I bet you want some.\n"
-	.string "I bet you do!\p"
-	.string "I'll give a STICKER if you can tell\n"
-	.string "me something awesome about\l"
-	.string "yourself.\p"
-	.string "What will you brag about?$"
-
-gUnknown_81B1FEF:: @ 81B1FEF
-	.string "Brag about something for me.\n"
-	.string "I'll give you a STICKER.$"
-
-gUnknown_81B2025:: @ 81B2025
-	.string "Oh, hi!\n"
-	.string "Here comes the braggart.\p"
-	.string "What are you going to brag about\n"
-	.string "today?$"
-
-gUnknown_81B206E:: @ 81B206E
-	.string "Oh, wow, you made it into the\n"
-	.string "HALL OF FAME.\p"
-	.string "That's pretty good, yup!\n"
-	.string "I'll give you one of these.$"
-
-gUnknown_81B20CF:: @ 81B20CF
-	.string "Oh, wow, you've entered the\n"
-	.string "HALL OF FAME often!\p"
-	.string "That's impressive, yup!\n"
-	.string "I'll give you one of these.$"
-
-gUnknown_81B2133:: @ 81B2133
-	.string "Whoa! You've made it into the\n"
-	.string "HALL OF FAME that often?\l"
-	.string "That's seriously incredible, yup!\p"
-	.string "You own the POKéMON LEAGUE!\n"
-	.string "I'll give you one of these.$"
-
-gUnknown_81B21C4:: @ 81B21C4
-	.string "No way! You've gone into the\n"
-	.string "HALL OF FAME that many times?\p"
-	.string "You're beyond incredible, yup!\n"
-	.string "That's it, I have to give you this.$"
-
-gUnknown_81B2242:: @ 81B2242
-	.string "The HALL OF FAME STICKER was\n"
-	.string "applied to the TRAINER CARD.$"
-
-gUnknown_81B227C:: @ 81B227C
-	.string "Hmm…\p"
-	.string "Come back with a better story next\n"
-	.string "time, okay?$"
-
-gUnknown_81B22B0:: @ 81B22B0
-	.string "Oh, no, no can do.\p"
-	.string "You're practically a living legend.\n"
-	.string "I have no SITCKERS left to give.$"
-
-gUnknown_81B2308:: @ 81B2308
-	.string "Oh, wow, there are POKéMON EGGS?\n"
-	.string "I didn't know that!\p"
-	.string "That's pretty good, yup!\n"
-	.string "I'll give you one of these.$"
-
-gUnknown_81B2372:: @ 81B2372
-	.string "You've hatched that many EGGS?\n"
-	.string "You really must like them!\p"
-	.string "That's impressive, yup!\n"
-	.string "I'll give you one of these.$"
-
-gUnknown_81B23E0:: @ 81B23E0
-	.string "Whoa! You've hatched a whole\n"
-	.string "bunch of EGGS!\p"
-	.string "You're an EGG-hatching machine!\n"
-	.string "I'll give you one of these.$"
-
-gUnknown_81B2448:: @ 81B2448
-	.string "Wh… You hatched that many EGGS?\p"
-	.string "What's behind your love of EGGS?\n"
-	.string "It's beyond incredible, yup!\p"
-	.string "You're too awesome, I tell you.\n"
-	.string "That's it, I have to give you this.$"
-
-gUnknown_81B24EA:: @ 81B24EA
-	.string "The EGG STICKER was applied\n"
-	.string "to the TRAINER CARD.$"
-
-gUnknown_81B251B:: @ 81B251B
-	.string "Hmm…\p"
-	.string "Come back with a better story next\n"
-	.string "time, okay?$"
-
-gUnknown_81B254F:: @ 81B254F
-	.string "Oh, no, no can do.\p"
-	.string "You're practically a living legend.\n"
-	.string "I have no SITCKERS left to give.$"
-
-gUnknown_81B25A7:: @ 81B25A7
-	.string "Oh, wow, you've had success\n"
-	.string "link battling?\p"
-	.string "You're pretty strong, yup!\n"
-	.string "I'll give you one of these.$"
-
-gUnknown_81B2609:: @ 81B2609
-	.string "You've beaten your friends a lot\n"
-	.string "link battling, huh?\p"
-	.string "You're impressively strong, yup!\n"
-	.string "I'll give you one of these.$"
-
-gUnknown_81B267B:: @ 81B267B
-	.string "Whoa! You've beaten your friends\n"
-	.string "a frightful number of times.\p"
-	.string "Have you lost friends over this?\n"
-	.string "I'll give you one of these.$"
-
-gUnknown_81B26F6:: @ 81B26F6
-	.string "Wh… Wickedly whoa!\n"
-	.string "You've won mind-blowingly often!\p"
-	.string "It just knocks me out thinking\n"
-	.string "about how tough you are.\p"
-	.string "You're the stuff of nightmares!\n"
-	.string "That's it, I have to give you this.$"
-
-gUnknown_81B27A6:: @ 81B27A6
-	.string "The VICTORY STICKER was applied\n"
-	.string "to the TRAINER CARD.$"
-
-gUnknown_81B27DB:: @ 81B27DB
-	.string "Hmm…\p"
-	.string "Come back with a better story next\n"
-	.string "time, okay?$"
-
-gUnknown_81B280F:: @ 81B280F
-	.string "Oh, no, no can do.\p"
-	.string "You're practically a living legend.\n"
-	.string "I have no SITCKERS left to give.$"
diff --git a/data/text/trainer_card.inc b/data/text/trainer_card.inc
new file mode 100644
index 000000000..3a6557cca
--- /dev/null
+++ b/data/text/trainer_card.inc
@@ -0,0 +1,167 @@
+gUnknown_81B1D7D:: @ 81B1D7D
+	.string "It's a POKéMON PRINTER!\p"
+	.string "It can put a print of your POKéMON\n"
+	.string "on the back of your TRAINER CARD.\p"
+	.string "It costs only ¥50.\n"
+	.string "Would you like to try it?$"
+
+gUnknown_81B1E07:: @ 81B1E07
+	.string "You don't have enough money.$"
+
+gUnknown_81B1E24:: @ 81B1E24
+	.string "Please choose the print type.$"
+
+gUnknown_81B1E42:: @ 81B1E42
+	.string "A big smile for the photo, please!\n"
+	.string "Three… Two… One…\p"
+	.string "Flash!$"
+
+gUnknown_81B1E7D:: @ 81B1E7D
+	.string "Your POKéMON print is ready!\n"
+	.string "Check your TRAINER CARD.$"
+
+gUnknown_81B1EB3:: @ 81B1EB3
+	.string "Giggle…\n"
+	.string "I collected a ton of STICKERS.\l"
+	.string "I wish I could show them off…$"
+
+gUnknown_81B1EF8:: @ 81B1EF8
+	.string "Oh, excellent!\n"
+	.string "You've come to the right place!\p"
+	.string "Look, look! See? See?\n"
+	.string "These are my STICKERS!\l"
+	.string "Look how many I got!\p"
+	.string "I bet you want some.\n"
+	.string "I bet you do!\p"
+	.string "I'll give a STICKER if you can tell\n"
+	.string "me something awesome about\l"
+	.string "yourself.\p"
+	.string "What will you brag about?$"
+
+gUnknown_81B1FEF:: @ 81B1FEF
+	.string "Brag about something for me.\n"
+	.string "I'll give you a STICKER.$"
+
+gUnknown_81B2025:: @ 81B2025
+	.string "Oh, hi!\n"
+	.string "Here comes the braggart.\p"
+	.string "What are you going to brag about\n"
+	.string "today?$"
+
+gUnknown_81B206E:: @ 81B206E
+	.string "Oh, wow, you made it into the\n"
+	.string "HALL OF FAME.\p"
+	.string "That's pretty good, yup!\n"
+	.string "I'll give you one of these.$"
+
+gUnknown_81B20CF:: @ 81B20CF
+	.string "Oh, wow, you've entered the\n"
+	.string "HALL OF FAME often!\p"
+	.string "That's impressive, yup!\n"
+	.string "I'll give you one of these.$"
+
+gUnknown_81B2133:: @ 81B2133
+	.string "Whoa! You've made it into the\n"
+	.string "HALL OF FAME that often?\l"
+	.string "That's seriously incredible, yup!\p"
+	.string "You own the POKéMON LEAGUE!\n"
+	.string "I'll give you one of these.$"
+
+gUnknown_81B21C4:: @ 81B21C4
+	.string "No way! You've gone into the\n"
+	.string "HALL OF FAME that many times?\p"
+	.string "You're beyond incredible, yup!\n"
+	.string "That's it, I have to give you this.$"
+
+gUnknown_81B2242:: @ 81B2242
+	.string "The HALL OF FAME STICKER was\n"
+	.string "applied to the TRAINER CARD.$"
+
+gUnknown_81B227C:: @ 81B227C
+	.string "Hmm…\p"
+	.string "Come back with a better story next\n"
+	.string "time, okay?$"
+
+gUnknown_81B22B0:: @ 81B22B0
+	.string "Oh, no, no can do.\p"
+	.string "You're practically a living legend.\n"
+	.string "I have no SITCKERS left to give.$"
+
+gUnknown_81B2308:: @ 81B2308
+	.string "Oh, wow, there are POKéMON EGGS?\n"
+	.string "I didn't know that!\p"
+	.string "That's pretty good, yup!\n"
+	.string "I'll give you one of these.$"
+
+gUnknown_81B2372:: @ 81B2372
+	.string "You've hatched that many EGGS?\n"
+	.string "You really must like them!\p"
+	.string "That's impressive, yup!\n"
+	.string "I'll give you one of these.$"
+
+gUnknown_81B23E0:: @ 81B23E0
+	.string "Whoa! You've hatched a whole\n"
+	.string "bunch of EGGS!\p"
+	.string "You're an EGG-hatching machine!\n"
+	.string "I'll give you one of these.$"
+
+gUnknown_81B2448:: @ 81B2448
+	.string "Wh… You hatched that many EGGS?\p"
+	.string "What's behind your love of EGGS?\n"
+	.string "It's beyond incredible, yup!\p"
+	.string "You're too awesome, I tell you.\n"
+	.string "That's it, I have to give you this.$"
+
+gUnknown_81B24EA:: @ 81B24EA
+	.string "The EGG STICKER was applied\n"
+	.string "to the TRAINER CARD.$"
+
+gUnknown_81B251B:: @ 81B251B
+	.string "Hmm…\p"
+	.string "Come back with a better story next\n"
+	.string "time, okay?$"
+
+gUnknown_81B254F:: @ 81B254F
+	.string "Oh, no, no can do.\p"
+	.string "You're practically a living legend.\n"
+	.string "I have no SITCKERS left to give.$"
+
+gUnknown_81B25A7:: @ 81B25A7
+	.string "Oh, wow, you've had success\n"
+	.string "link battling?\p"
+	.string "You're pretty strong, yup!\n"
+	.string "I'll give you one of these.$"
+
+gUnknown_81B2609:: @ 81B2609
+	.string "You've beaten your friends a lot\n"
+	.string "link battling, huh?\p"
+	.string "You're impressively strong, yup!\n"
+	.string "I'll give you one of these.$"
+
+gUnknown_81B267B:: @ 81B267B
+	.string "Whoa! You've beaten your friends\n"
+	.string "a frightful number of times.\p"
+	.string "Have you lost friends over this?\n"
+	.string "I'll give you one of these.$"
+
+gUnknown_81B26F6:: @ 81B26F6
+	.string "Wh… Wickedly whoa!\n"
+	.string "You've won mind-blowingly often!\p"
+	.string "It just knocks me out thinking\n"
+	.string "about how tough you are.\p"
+	.string "You're the stuff of nightmares!\n"
+	.string "That's it, I have to give you this.$"
+
+gUnknown_81B27A6:: @ 81B27A6
+	.string "The VICTORY STICKER was applied\n"
+	.string "to the TRAINER CARD.$"
+
+gUnknown_81B27DB:: @ 81B27DB
+	.string "Hmm…\p"
+	.string "Come back with a better story next\n"
+	.string "time, okay?$"
+
+gUnknown_81B280F:: @ 81B280F
+	.string "Oh, no, no can do.\p"
+	.string "You're practically a living legend.\n"
+	.string "I have no SITCKERS left to give.$"
diff --git a/data/text/trainers.inc b/data/text/trainers.inc
index a4184c58e..ddeb2040f 100644
--- a/data/text/trainers.inc
+++ b/data/text/trainers.inc
@@ -989,18 +989,18 @@ Text_1C4699:: @ 81C4699
 	.string "NYA: I won't drag down my mentor\n"
 	.string "LEX! We're going to win!$"
 
-Text_1C46D3:: @ 81C46D3
+SevenIsland_TanobyRuins_Text_BrandonRematchIntro:: @ 81C46D3
 	.string "Have you discovered anything about\n"
 	.string "this stone chamber?$"
 
-Text_1C470A:: @ 81C470A
+SevenIsland_TanobyRuins_Text_BenjaminRematchIntro:: @ 81C470A
 	.string "A mystic POKéMON is said to sleep\n"
 	.string "inside here.$"
 
-Text_1C4739:: @ 81C4739
+SevenIsland_TanobyRuins_Text_EdnaRematchIntro:: @ 81C4739
 	.string "My teacher is showing me how to\n"
 	.string "paint some more.$"
 
-Text_1C476A:: @ 81C476A
+SevenIsland_TanobyRuins_Text_CliffordRematchIntro:: @ 81C476A
 	.string "Today, in addition to our lesson,\n"
 	.string "we came to see the chamber again.$"
diff --git a/data/tilesets/graphics.inc b/data/tilesets/graphics.inc
index a23f73322..6fc9a48f6 100644
--- a/data/tilesets/graphics.inc
+++ b/data/tilesets/graphics.inc
@@ -1,1471 +1,1471 @@
 	.align 2
-gTilesetTiles_826D37C:: @ 826D37C
-	.incbin "data/tilesets/secondary/82D4AAC/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_826D7C0:: @ 826D7C0
-	.incbin "data/tilesets/secondary/82D4AAC/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4AAC/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4AAC/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4AAC/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4AAC/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4AAC/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4AAC/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4AAC/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4AAC/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4AAC/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4AAC/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4AAC/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4AAC/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4AAC/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4AAC/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4AAC/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_826D9C0:: @ 826D9C0
-	.incbin "data/tilesets/secondary/82D4AC4/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_826DFC0:: @ 826DFC0
-	.incbin "data/tilesets/secondary/82D4AC4/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4AC4/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4AC4/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4AC4/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4AC4/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4AC4/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4AC4/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4AC4/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4AC4/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4AC4/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4AC4/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4AC4/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4AC4/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4AC4/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4AC4/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4AC4/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_826E1C0:: @ 826E1C0
-	.incbin "data/tilesets/secondary/82D4ADC/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_826EAB8:: @ 826EAB8
-	.incbin "data/tilesets/secondary/82D4ADC/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4ADC/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4ADC/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4ADC/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4ADC/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4ADC/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4ADC/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4ADC/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4ADC/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4ADC/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4ADC/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4ADC/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4ADC/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4ADC/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4ADC/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4ADC/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_826ECB8:: @ 826ECB8
-	.incbin "data/tilesets/secondary/82D4AF4/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_826F4B8:: @ 826F4B8
-	.incbin "data/tilesets/secondary/82D4AF4/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4AF4/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4AF4/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4AF4/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4AF4/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4AF4/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4AF4/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4AF4/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4AF4/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4AF4/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4AF4/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4AF4/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4AF4/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4AF4/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4AF4/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4AF4/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_826F6B8:: @ 826F6B8
-	.incbin "data/tilesets/secondary/82D4B0C/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8270438:: @ 8270438
-	.incbin "data/tilesets/secondary/82D4B0C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4B0C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4B0C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4B0C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4B0C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4B0C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4B0C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4B0C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4B0C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4B0C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4B0C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4B0C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4B0C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4B0C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4B0C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4B0C/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8270638:: @ 8270638
-	.incbin "data/tilesets/secondary/82D4B24/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8270DA0:: @ 8270DA0
-	.incbin "data/tilesets/secondary/82D4B24/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4B24/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4B24/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4B24/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4B24/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4B24/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4B24/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4B24/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4B24/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4B24/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4B24/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4B24/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4B24/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4B24/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4B24/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4B24/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8270FA0:: @ 8270FA0
-	.incbin "data/tilesets/secondary/82D4B3C/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8271C74:: @ 8271C74
-	.incbin "data/tilesets/secondary/82D4B3C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4B3C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4B3C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4B3C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4B3C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4B3C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4B3C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4B3C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4B3C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4B3C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4B3C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4B3C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4B3C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4B3C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4B3C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4B3C/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8271E74:: @ 8271E74
-	.incbin "data/tilesets/secondary/82D4B54/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8272A5C:: @ 8272A5C
-	.incbin "data/tilesets/secondary/82D4B54/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4B54/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4B54/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4B54/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4B54/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4B54/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4B54/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4B54/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4B54/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4B54/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4B54/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4B54/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4B54/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4B54/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4B54/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4B54/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8272C5C:: @ 8272C5C
-	.incbin "data/tilesets/secondary/82D4B6C/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8273358:: @ 8273358
-	.incbin "data/tilesets/secondary/82D4B6C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4B6C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4B6C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4B6C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4B6C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4B6C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4B6C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4B6C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4B6C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4B6C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4B6C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4B6C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4B6C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4B6C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4B6C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4B6C/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8273558:: @ 8273558
-	.incbin "data/tilesets/secondary/82D4B84/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_82742D0:: @ 82742D0
-	.incbin "data/tilesets/secondary/82D4B84/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4B84/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4B84/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4B84/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4B84/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4B84/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4B84/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4B84/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4B84/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4B84/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4B84/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4B84/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4B84/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4B84/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4B84/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4B84/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_82744D0:: @ 82744D0
-	.incbin "data/tilesets/secondary/82D4B9C/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8275094:: @ 8275094
-	.incbin "data/tilesets/secondary/82D4B9C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4B9C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4B9C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4B9C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4B9C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4B9C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4B9C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4B9C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4B9C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4B9C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4B9C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4B9C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4B9C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4B9C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4B9C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4B9C/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8275294:: @ 8275294
-	.incbin "data/tilesets/primary/82D4BB4/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8277694:: @ 8277694
-	.incbin "data/tilesets/primary/82D4BB4/palettes/0.gbapal"
-	.incbin "data/tilesets/primary/82D4BB4/palettes/1.gbapal"
-	.incbin "data/tilesets/primary/82D4BB4/palettes/2.gbapal"
-	.incbin "data/tilesets/primary/82D4BB4/palettes/3.gbapal"
-	.incbin "data/tilesets/primary/82D4BB4/palettes/4.gbapal"
-	.incbin "data/tilesets/primary/82D4BB4/palettes/5.gbapal"
-	.incbin "data/tilesets/primary/82D4BB4/palettes/6.gbapal"
-	.incbin "data/tilesets/primary/82D4BB4/palettes/7.gbapal"
-	.incbin "data/tilesets/primary/82D4BB4/palettes/8.gbapal"
-	.incbin "data/tilesets/primary/82D4BB4/palettes/9.gbapal"
-	.incbin "data/tilesets/primary/82D4BB4/palettes/10.gbapal"
-	.incbin "data/tilesets/primary/82D4BB4/palettes/11.gbapal"
-	.incbin "data/tilesets/primary/82D4BB4/palettes/12.gbapal"
-	.incbin "data/tilesets/primary/82D4BB4/palettes/13.gbapal"
-	.incbin "data/tilesets/primary/82D4BB4/palettes/14.gbapal"
-	.incbin "data/tilesets/primary/82D4BB4/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8277894:: @ 8277894
-	.incbin "data/tilesets/secondary/82D4BCC/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8277A5C:: @ 8277A5C
-	.incbin "data/tilesets/secondary/82D4BCC/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4BCC/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4BCC/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4BCC/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4BCC/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4BCC/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4BCC/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4BCC/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4BCC/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4BCC/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4BCC/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4BCC/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4BCC/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4BCC/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4BCC/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4BCC/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8277C5C:: @ 8277C5C
-	.incbin "data/tilesets/secondary/82D4BE4/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8278CC4:: @ 8278CC4
-	.incbin "data/tilesets/secondary/82D4BE4/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4BE4/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4BE4/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4BE4/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4BE4/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4BE4/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4BE4/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4BE4/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4BE4/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4BE4/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4BE4/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4BE4/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4BE4/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4BE4/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4BE4/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4BE4/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8278EC4:: @ 8278EC4
-	.incbin "data/tilesets/secondary/82D4BFC/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_827A1A8:: @ 827A1A8
-	.incbin "data/tilesets/secondary/82D4BFC/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4BFC/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4BFC/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4BFC/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4BFC/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4BFC/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4BFC/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4BFC/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4BFC/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4BFC/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4BFC/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4BFC/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4BFC/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4BFC/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4BFC/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4BFC/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_827A3A8:: @ 827A3A8
-	.incbin "data/tilesets/secondary/82D4C14/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_827A3B8:: @ 827A3B8
-	.incbin "data/tilesets/secondary/82D4C14/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4C14/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4C14/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4C14/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4C14/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4C14/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4C14/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4C14/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4C14/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4C14/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4C14/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4C14/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4C14/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4C14/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4C14/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4C14/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_827A5B8:: @ 827A5B8
-	.incbin "data/tilesets/secondary/82D4C2C/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_827AE14:: @ 827AE14
-	.incbin "data/tilesets/secondary/82D4C2C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4C2C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4C2C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4C2C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4C2C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4C2C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4C2C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4C2C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4C2C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4C2C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4C2C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4C2C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4C2C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4C2C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4C2C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4C2C/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_827B014:: @ 827B014
-	.incbin "data/tilesets/secondary/82D4C44/tiles.4bpp"
-
-	.align 2
-gTilesetPalettes_827FF14:: @ 827FF14
-	.incbin "data/tilesets/secondary/82D4C44/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4C44/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4C44/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4C44/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4C44/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4C44/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4C44/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4C44/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4C44/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4C44/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4C44/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4C44/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4C44/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4C44/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4C44/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4C44/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8280114:: @ 8280114
-	.incbin "data/tilesets/secondary/82D4C5C/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_82804EC:: @ 82804EC
-	.incbin "data/tilesets/secondary/82D4C5C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4C5C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4C5C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4C5C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4C5C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4C5C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4C5C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4C5C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4C5C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4C5C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4C5C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4C5C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4C5C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4C5C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4C5C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4C5C/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_82806EC:: @ 82806EC
-	.incbin "data/tilesets/secondary/82D4C8C/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8280D00:: @ 8280D00
-	.incbin "data/tilesets/secondary/82D4C8C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4C8C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4C8C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4C8C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4C8C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4C8C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4C8C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4C8C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4C8C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4C8C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4C8C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4C8C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4C8C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4C8C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4C8C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4C8C/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8280F00:: @ 8280F00
-	.incbin "data/tilesets/secondary/82D4CD4/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_82823A4:: @ 82823A4
-	.incbin "data/tilesets/secondary/82D4CD4/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4CD4/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4CD4/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4CD4/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4CD4/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4CD4/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4CD4/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4CD4/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4CD4/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4CD4/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4CD4/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4CD4/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4CD4/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4CD4/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4CD4/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4CD4/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_82825A4:: @ 82825A4
-	.incbin "data/tilesets/secondary/82D4CEC/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8282FBC:: @ 8282FBC
-	.incbin "data/tilesets/secondary/82D4CEC/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4CEC/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4CEC/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4CEC/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4CEC/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4CEC/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4CEC/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4CEC/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4CEC/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4CEC/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4CEC/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4CEC/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4CEC/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4CEC/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4CEC/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4CEC/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_82831BC:: @ 82831BC
-	.incbin "data/tilesets/secondary/82D4D04/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_82839B0:: @ 82839B0
-	.incbin "data/tilesets/secondary/82D4D04/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4D04/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4D04/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4D04/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4D04/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4D04/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4D04/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4D04/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4D04/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4D04/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4D04/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4D04/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4D04/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4D04/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4D04/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4D04/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8283BB0:: @ 8283BB0
-	.incbin "data/tilesets/secondary/82D4D1C/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8283FF8:: @ 8283FF8
-	.incbin "data/tilesets/secondary/82D4D1C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4D1C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4D1C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4D1C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4D1C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4D1C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4D1C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4D1C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4D1C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4D1C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4D1C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4D1C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4D1C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4D1C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4D1C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4D1C/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_82841F8:: @ 82841F8
-	.incbin "data/tilesets/secondary/82D4D34/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_82849B8:: @ 82849B8
-	.incbin "data/tilesets/secondary/82D4D34/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4D34/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4D34/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4D34/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4D34/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4D34/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4D34/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4D34/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4D34/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4D34/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4D34/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4D34/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4D34/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4D34/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4D34/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4D34/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8284BB8:: @ 8284BB8
-	.incbin "data/tilesets/secondary/82D4D4C/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8285150:: @ 8285150
-	.incbin "data/tilesets/secondary/82D4D4C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4D4C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4D4C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4D4C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4D4C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4D4C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4D4C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4D4C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4D4C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4D4C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4D4C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4D4C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4D4C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4D4C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4D4C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4D4C/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8285350:: @ 8285350
-	.incbin "data/tilesets/secondary/82D4CA4/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_82857A4:: @ 82857A4
-	.incbin "data/tilesets/secondary/82D4CA4/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4CA4/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4CA4/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4CA4/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4CA4/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4CA4/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4CA4/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4CA4/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4CA4/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4CA4/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4CA4/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4CA4/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4CA4/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4CA4/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4CA4/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4CA4/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_82859A4:: @ 82859A4
-	.incbin "data/tilesets/secondary/82D4D64/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8285D90:: @ 8285D90
-	.incbin "data/tilesets/secondary/82D4D64/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4D64/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4D64/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4D64/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4D64/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4D64/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4D64/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4D64/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4D64/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4D64/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4D64/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4D64/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4D64/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4D64/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4D64/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4D64/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8285F90:: @ 8285F90
-	.incbin "data/tilesets/secondary/82D4D7C/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_82865D4:: @ 82865D4
-	.incbin "data/tilesets/secondary/82D4D7C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4D7C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4D7C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4D7C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4D7C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4D7C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4D7C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4D7C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4D7C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4D7C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4D7C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4D7C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4D7C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4D7C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4D7C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4D7C/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_82867D4:: @ 82867D4
-	.incbin "data/tilesets/secondary/82D4CBC/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8286BC8:: @ 8286BC8
-	.incbin "data/tilesets/secondary/82D4CBC/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4CBC/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4CBC/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4CBC/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4CBC/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4CBC/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4CBC/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4CBC/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4CBC/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4CBC/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4CBC/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4CBC/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4CBC/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4CBC/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4CBC/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4CBC/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8286DC8:: @ 8286DC8
-	.incbin "data/tilesets/secondary/82D4D94/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8287B80:: @ 8287B80
-	.incbin "data/tilesets/secondary/82D4D94/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4D94/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4D94/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4D94/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4D94/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4D94/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4D94/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4D94/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4D94/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4D94/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4D94/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4D94/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4D94/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4D94/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4D94/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4D94/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8287D80:: @ 8287D80
-	.incbin "data/tilesets/secondary/82D4DAC/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8287D94:: @ 8287D94
-	.incbin "data/tilesets/secondary/82D4DAC/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4DAC/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4DAC/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4DAC/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4DAC/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4DAC/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4DAC/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4DAC/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4DAC/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4DAC/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4DAC/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4DAC/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4DAC/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4DAC/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4DAC/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4DAC/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8287F94:: @ 8287F94
-	.incbin "data/tilesets/secondary/82D4DC4/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8288444:: @ 8288444
-	.incbin "data/tilesets/secondary/82D4DC4/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4DC4/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4DC4/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4DC4/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4DC4/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4DC4/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4DC4/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4DC4/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4DC4/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4DC4/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4DC4/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4DC4/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4DC4/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4DC4/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4DC4/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4DC4/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8288644:: @ 8288644
-	.incbin "data/tilesets/secondary/82D4DDC/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8288C60:: @ 8288C60
-	.incbin "data/tilesets/secondary/82D4DDC/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4DDC/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4DDC/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4DDC/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4DDC/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4DDC/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4DDC/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4DDC/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4DDC/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4DDC/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4DDC/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4DDC/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4DDC/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4DDC/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4DDC/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4DDC/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8288E60:: @ 8288E60
-	.incbin "data/tilesets/secondary/82D4DF4/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8289FC8:: @ 8289FC8
-	.incbin "data/tilesets/secondary/82D4DF4/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4DF4/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4DF4/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4DF4/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4DF4/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4DF4/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4DF4/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4DF4/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4DF4/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4DF4/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4DF4/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4DF4/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4DF4/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4DF4/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4DF4/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4DF4/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_828A1C8:: @ 828A1C8
-	.incbin "data/tilesets/secondary/82D4E0C/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_828B250:: @ 828B250
-	.incbin "data/tilesets/secondary/82D4E0C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4E0C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4E0C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4E0C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4E0C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4E0C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4E0C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4E0C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4E0C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4E0C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4E0C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4E0C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4E0C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4E0C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4E0C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4E0C/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_828B450:: @ 828B450
-	.incbin "data/tilesets/secondary/82D4E24/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_828CAA0:: @ 828CAA0
-	.incbin "data/tilesets/secondary/82D4E24/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4E24/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4E24/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4E24/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4E24/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4E24/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4E24/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4E24/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4E24/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4E24/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4E24/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4E24/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4E24/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4E24/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4E24/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4E24/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_828CCA0:: @ 828CCA0
-	.incbin "data/tilesets/secondary/82D4E3C/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_828D2BC:: @ 828D2BC
-	.incbin "data/tilesets/secondary/82D4E3C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4E3C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4E3C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4E3C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4E3C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4E3C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4E3C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4E3C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4E3C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4E3C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4E3C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4E3C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4E3C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4E3C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4E3C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4E3C/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_828D4BC:: @ 828D4BC
-	.incbin "data/tilesets/secondary/82D4E54/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_828E3A4:: @ 828E3A4
-	.incbin "data/tilesets/secondary/82D4E54/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4E54/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4E54/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4E54/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4E54/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4E54/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4E54/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4E54/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4E54/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4E54/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4E54/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4E54/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4E54/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4E54/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4E54/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4E54/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_828E5A4:: @ 828E5A4
-	.incbin "data/tilesets/secondary/82D4E84/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_828EC70:: @ 828EC70
-	.incbin "data/tilesets/secondary/82D4E84/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4E84/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4E84/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4E84/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4E84/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4E84/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4E84/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4E84/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4E84/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4E84/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4E84/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4E84/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4E84/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4E84/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4E84/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4E84/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_828EE70:: @ 828EE70
-	.incbin "data/tilesets/secondary/82D4E9C/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_828F378:: @ 828F378
-	.incbin "data/tilesets/secondary/82D4E9C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4E9C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4E9C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4E9C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4E9C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4E9C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4E9C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4E9C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4E9C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4E9C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4E9C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4E9C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4E9C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4E9C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4E9C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4E9C/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_828F578:: @ 828F578
-	.incbin "data/tilesets/secondary/82D4EB4/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_828F9D8:: @ 828F9D8
-	.incbin "data/tilesets/secondary/82D4EB4/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4EB4/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4EB4/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4EB4/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4EB4/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4EB4/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4EB4/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4EB4/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4EB4/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4EB4/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4EB4/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4EB4/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4EB4/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4EB4/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4EB4/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4EB4/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_828FBD8:: @ 828FBD8
-	.incbin "data/tilesets/secondary/82D4F8C/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8290DD0:: @ 8290DD0
-	.incbin "data/tilesets/secondary/82D4F8C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4F8C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4F8C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4F8C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4F8C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4F8C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4F8C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4F8C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4F8C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4F8C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4F8C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4F8C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4F8C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4F8C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4F8C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4F8C/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8290FD0:: @ 8290FD0
-	.incbin "data/tilesets/secondary/82D4EE4/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8291274:: @ 8291274
-	.incbin "data/tilesets/secondary/82D4EE4/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4EE4/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4EE4/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4EE4/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4EE4/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4EE4/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4EE4/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4EE4/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4EE4/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4EE4/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4EE4/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4EE4/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4EE4/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4EE4/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4EE4/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4EE4/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8291474:: @ 8291474
-	.incbin "data/tilesets/secondary/82D4EFC/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8291AFC:: @ 8291AFC
-	.incbin "data/tilesets/secondary/82D4EFC/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4EFC/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4EFC/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4EFC/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4EFC/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4EFC/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4EFC/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4EFC/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4EFC/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4EFC/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4EFC/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4EFC/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4EFC/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4EFC/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4EFC/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4EFC/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8291CFC:: @ 8291CFC
-	.incbin "data/tilesets/secondary/82D4F14/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_82920F0:: @ 82920F0
-	.incbin "data/tilesets/secondary/82D4F14/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4F14/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4F14/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4F14/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4F14/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4F14/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4F14/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4F14/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4F14/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4F14/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4F14/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4F14/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4F14/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4F14/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4F14/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4F14/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_82922F0:: @ 82922F0
-	.incbin "data/tilesets/secondary/82D4F2C/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8292FF0:: @ 8292FF0
-	.incbin "data/tilesets/secondary/82D4F2C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4F2C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4F2C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4F2C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4F2C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4F2C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4F2C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4F2C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4F2C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4F2C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4F2C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4F2C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4F2C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4F2C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4F2C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4F2C/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_82931F0:: @ 82931F0
-	.incbin "data/tilesets/secondary/82D4F44/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8293660:: @ 8293660
-	.incbin "data/tilesets/secondary/82D4F44/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4F44/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4F44/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4F44/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4F44/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4F44/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4F44/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4F44/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4F44/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4F44/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4F44/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4F44/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4F44/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4F44/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4F44/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4F44/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8293860:: @ 8293860
-	.incbin "data/tilesets/secondary/82D4F5C/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8293B0C:: @ 8293B0C
-	.incbin "data/tilesets/secondary/82D4F5C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4F5C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4F5C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4F5C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4F5C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4F5C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4F5C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4F5C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4F5C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4F5C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4F5C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4F5C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4F5C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4F5C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4F5C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4F5C/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8293D0C:: @ 8293D0C
-	.incbin "data/tilesets/secondary/82D4F74/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8294144:: @ 8294144
-	.incbin "data/tilesets/secondary/82D4F74/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4F74/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4F74/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4F74/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4F74/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4F74/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4F74/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4F74/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4F74/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4F74/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4F74/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4F74/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4F74/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4F74/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4F74/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4F74/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8294344:: @ 8294344
-	.incbin "data/tilesets/secondary/82D4FA4/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8294D08:: @ 8294D08
-	.incbin "data/tilesets/secondary/82D4FA4/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4FA4/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4FA4/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4FA4/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4FA4/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4FA4/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4FA4/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4FA4/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4FA4/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4FA4/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4FA4/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4FA4/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4FA4/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4FA4/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4FA4/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4FA4/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8294F08:: @ 8294F08
-	.incbin "data/tilesets/secondary/82D4FBC/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8294F18:: @ 8294F18
-	.incbin "data/tilesets/secondary/82D4FBC/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4FBC/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4FBC/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4FBC/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4FBC/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4FBC/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4FBC/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4FBC/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4FBC/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4FBC/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4FBC/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4FBC/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4FBC/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4FBC/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4FBC/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4FBC/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8295118:: @ 8295118
-	.incbin "data/tilesets/secondary/82D4FD4/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_829512C:: @ 829512C
-	.incbin "data/tilesets/secondary/82D4FD4/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4FD4/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4FD4/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4FD4/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4FD4/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4FD4/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4FD4/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4FD4/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4FD4/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4FD4/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4FD4/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4FD4/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4FD4/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4FD4/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4FD4/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4FD4/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_829532C:: @ 829532C
-	.incbin "data/tilesets/secondary/82D4FEC/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_82967D4:: @ 82967D4
-	.incbin "data/tilesets/secondary/82D4FEC/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D4FEC/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D4FEC/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D4FEC/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D4FEC/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D4FEC/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D4FEC/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D4FEC/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D4FEC/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D4FEC/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D4FEC/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D4FEC/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D4FEC/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D4FEC/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D4FEC/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D4FEC/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_82969D4:: @ 82969D4
-	.incbin "data/tilesets/secondary/82D5004/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8296E90:: @ 8296E90
-	.incbin "data/tilesets/secondary/82D5004/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D5004/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D5004/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D5004/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D5004/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D5004/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D5004/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D5004/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D5004/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D5004/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D5004/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D5004/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D5004/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D5004/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D5004/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D5004/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8297090:: @ 8297090
-	.incbin "data/tilesets/secondary/82D501C/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_82983BC:: @ 82983BC
-	.incbin "data/tilesets/secondary/82D501C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D501C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D501C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D501C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D501C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D501C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D501C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D501C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D501C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D501C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D501C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D501C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D501C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D501C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D501C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D501C/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_82985BC:: @ 82985BC
-	.incbin "data/tilesets/secondary/82D5034/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8298970:: @ 8298970
-	.incbin "data/tilesets/secondary/82D5034/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D5034/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D5034/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D5034/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D5034/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D5034/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D5034/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D5034/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D5034/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D5034/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D5034/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D5034/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D5034/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D5034/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D5034/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D5034/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8298B70:: @ 8298B70
-	.incbin "data/tilesets/secondary/82D504C/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_8299AA4:: @ 8299AA4
-	.incbin "data/tilesets/secondary/82D504C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D504C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D504C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D504C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D504C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D504C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D504C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D504C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D504C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D504C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D504C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D504C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D504C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D504C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D504C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D504C/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_8299CA4:: @ 8299CA4
-	.incbin "data/tilesets/secondary/82D5064/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_829AB04:: @ 829AB04
-	.incbin "data/tilesets/secondary/82D5064/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D5064/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D5064/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D5064/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D5064/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D5064/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D5064/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D5064/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D5064/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D5064/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D5064/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D5064/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D5064/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D5064/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D5064/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D5064/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_829AD04:: @ 829AD04
-	.incbin "data/tilesets/secondary/82D507C/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_829BD64:: @ 829BD64
-	.incbin "data/tilesets/secondary/82D507C/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D507C/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D507C/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D507C/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D507C/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D507C/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D507C/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D507C/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D507C/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D507C/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D507C/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D507C/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D507C/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D507C/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D507C/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D507C/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_829BF64:: @ 829BF64
-	.incbin "data/tilesets/secondary/82D5094/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_829CEE4:: @ 829CEE4
-	.incbin "data/tilesets/secondary/82D5094/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D5094/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D5094/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D5094/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D5094/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D5094/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D5094/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D5094/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D5094/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D5094/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D5094/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D5094/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D5094/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D5094/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D5094/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D5094/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_829D0E4:: @ 829D0E4
-	.incbin "data/tilesets/secondary/82D50AC/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_829D894:: @ 829D894
-	.incbin "data/tilesets/secondary/82D50AC/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D50AC/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D50AC/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D50AC/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D50AC/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D50AC/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D50AC/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D50AC/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D50AC/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D50AC/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D50AC/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D50AC/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D50AC/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D50AC/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D50AC/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D50AC/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_829DA94:: @ 829DA94
-	.incbin "data/tilesets/secondary/82D50C4/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_829EA50:: @ 829EA50
-	.incbin "data/tilesets/secondary/82D50C4/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D50C4/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D50C4/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D50C4/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D50C4/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D50C4/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D50C4/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D50C4/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D50C4/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D50C4/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D50C4/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D50C4/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D50C4/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D50C4/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D50C4/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D50C4/palettes/15.gbapal"
-
-	.align 2
-gTilesetTiles_829EC50:: @ 829EC50
-	.incbin "data/tilesets/secondary/82D50DC/tiles.4bpp.lz"
-
-	.align 2
-gTilesetPalettes_829F4C8:: @ 829F4C8
-	.incbin "data/tilesets/secondary/82D50DC/palettes/0.gbapal"
-	.incbin "data/tilesets/secondary/82D50DC/palettes/1.gbapal"
-	.incbin "data/tilesets/secondary/82D50DC/palettes/2.gbapal"
-	.incbin "data/tilesets/secondary/82D50DC/palettes/3.gbapal"
-	.incbin "data/tilesets/secondary/82D50DC/palettes/4.gbapal"
-	.incbin "data/tilesets/secondary/82D50DC/palettes/5.gbapal"
-	.incbin "data/tilesets/secondary/82D50DC/palettes/6.gbapal"
-	.incbin "data/tilesets/secondary/82D50DC/palettes/7.gbapal"
-	.incbin "data/tilesets/secondary/82D50DC/palettes/8.gbapal"
-	.incbin "data/tilesets/secondary/82D50DC/palettes/9.gbapal"
-	.incbin "data/tilesets/secondary/82D50DC/palettes/10.gbapal"
-	.incbin "data/tilesets/secondary/82D50DC/palettes/11.gbapal"
-	.incbin "data/tilesets/secondary/82D50DC/palettes/12.gbapal"
-	.incbin "data/tilesets/secondary/82D50DC/palettes/13.gbapal"
-	.incbin "data/tilesets/secondary/82D50DC/palettes/14.gbapal"
-	.incbin "data/tilesets/secondary/82D50DC/palettes/15.gbapal"
+gTilesetTiles_PalletTown:: @ 826D37C
+	.incbin "data/tilesets/secondary/pallet_town/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_PalletTown:: @ 826D7C0
+	.incbin "data/tilesets/secondary/pallet_town/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/pallet_town/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/pallet_town/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/pallet_town/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/pallet_town/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/pallet_town/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/pallet_town/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/pallet_town/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/pallet_town/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/pallet_town/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/pallet_town/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/pallet_town/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/pallet_town/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/pallet_town/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/pallet_town/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/pallet_town/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_ViridianCity:: @ 826D9C0
+	.incbin "data/tilesets/secondary/viridian_city/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_ViridianCity:: @ 826DFC0
+	.incbin "data/tilesets/secondary/viridian_city/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/viridian_city/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/viridian_city/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/viridian_city/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/viridian_city/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/viridian_city/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/viridian_city/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/viridian_city/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/viridian_city/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/viridian_city/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/viridian_city/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/viridian_city/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/viridian_city/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/viridian_city/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/viridian_city/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/viridian_city/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_PewterCity:: @ 826E1C0
+	.incbin "data/tilesets/secondary/pewter_city/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_PewterCity:: @ 826EAB8
+	.incbin "data/tilesets/secondary/pewter_city/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/pewter_city/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/pewter_city/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/pewter_city/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/pewter_city/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/pewter_city/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/pewter_city/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/pewter_city/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/pewter_city/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/pewter_city/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/pewter_city/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/pewter_city/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/pewter_city/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/pewter_city/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/pewter_city/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/pewter_city/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_CeruleanCity:: @ 826ECB8
+	.incbin "data/tilesets/secondary/cerulean_city/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_CeruleanCity:: @ 826F4B8
+	.incbin "data/tilesets/secondary/cerulean_city/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_city/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_city/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_city/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_city/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_city/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_city/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_city/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_city/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_city/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_city/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_city/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_city/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_city/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_city/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_city/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_LavenderTown:: @ 826F6B8
+	.incbin "data/tilesets/secondary/lavender_town/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_LavenderTown:: @ 8270438
+	.incbin "data/tilesets/secondary/lavender_town/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/lavender_town/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/lavender_town/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/lavender_town/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/lavender_town/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/lavender_town/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/lavender_town/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/lavender_town/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/lavender_town/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/lavender_town/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/lavender_town/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/lavender_town/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/lavender_town/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/lavender_town/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/lavender_town/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/lavender_town/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_VermilionCity:: @ 8270638
+	.incbin "data/tilesets/secondary/vermilion_city/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_VermilionCity:: @ 8270DA0
+	.incbin "data/tilesets/secondary/vermilion_city/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_city/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_city/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_city/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_city/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_city/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_city/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_city/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_city/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_city/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_city/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_city/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_city/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_city/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_city/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_city/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_CeladonCity:: @ 8270FA0
+	.incbin "data/tilesets/secondary/celadon_city/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_CeladonCity:: @ 8271C74
+	.incbin "data/tilesets/secondary/celadon_city/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/celadon_city/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/celadon_city/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/celadon_city/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/celadon_city/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/celadon_city/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/celadon_city/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/celadon_city/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/celadon_city/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/celadon_city/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/celadon_city/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/celadon_city/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/celadon_city/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/celadon_city/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/celadon_city/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/celadon_city/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_FuchsiaCity:: @ 8271E74
+	.incbin "data/tilesets/secondary/fuchsia_city/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_FuchsiaCity:: @ 8272A5C
+	.incbin "data/tilesets/secondary/fuchsia_city/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_city/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_city/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_city/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_city/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_city/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_city/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_city/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_city/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_city/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_city/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_city/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_city/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_city/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_city/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_city/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_CinnabarIsland:: @ 8272C5C
+	.incbin "data/tilesets/secondary/cinnabar_island/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_CinnabarIsland:: @ 8273358
+	.incbin "data/tilesets/secondary/cinnabar_island/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_island/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_island/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_island/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_island/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_island/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_island/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_island/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_island/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_island/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_island/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_island/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_island/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_island/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_island/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_island/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_IndigoPlateau:: @ 8273558
+	.incbin "data/tilesets/secondary/indigo_plateau/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_IndigoPlateau:: @ 82742D0
+	.incbin "data/tilesets/secondary/indigo_plateau/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/indigo_plateau/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/indigo_plateau/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/indigo_plateau/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/indigo_plateau/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/indigo_plateau/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/indigo_plateau/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/indigo_plateau/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/indigo_plateau/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/indigo_plateau/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/indigo_plateau/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/indigo_plateau/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/indigo_plateau/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/indigo_plateau/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/indigo_plateau/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/indigo_plateau/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_SaffronCity:: @ 82744D0
+	.incbin "data/tilesets/secondary/saffron_city/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_SaffronCity:: @ 8275094
+	.incbin "data/tilesets/secondary/saffron_city/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/saffron_city/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/saffron_city/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/saffron_city/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/saffron_city/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/saffron_city/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/saffron_city/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/saffron_city/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/saffron_city/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/saffron_city/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/saffron_city/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/saffron_city/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/saffron_city/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/saffron_city/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/saffron_city/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/saffron_city/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_Building:: @ Building
+	.incbin "data/tilesets/primary/building/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_Building:: @ Building
+	.incbin "data/tilesets/primary/building/palettes/0.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/1.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/2.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/3.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/4.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/5.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/6.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/7.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/8.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/9.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/10.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/11.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/12.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/13.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/14.gbapal"
+	.incbin "data/tilesets/primary/building/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_Mart:: @ 8277894
+	.incbin "data/tilesets/secondary/mart/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_Mart:: @ 8277A5C
+	.incbin "data/tilesets/secondary/mart/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/mart/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/mart/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/mart/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/mart/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/mart/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/mart/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/mart/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/mart/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/mart/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/mart/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/mart/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/mart/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/mart/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/mart/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/mart/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_PokemonCenter:: @ 8277C5C
+	.incbin "data/tilesets/secondary/pokemon_center/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_PokemonCenter:: @ 8278CC4
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_center/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_Cave:: @ 8278EC4
+	.incbin "data/tilesets/secondary/cave/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_Cave:: @ 827A1A8
+	.incbin "data/tilesets/secondary/cave/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/cave/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_Dummy1:: @ 827A3A8
+	.incbin "data/tilesets/secondary/dummy1/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_Dummy1:: @ 827A3B8
+	.incbin "data/tilesets/secondary/dummy1/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/dummy1/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/dummy1/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/dummy1/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/dummy1/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/dummy1/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/dummy1/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/dummy1/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/dummy1/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/dummy1/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/dummy1/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/dummy1/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/dummy1/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/dummy1/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/dummy1/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/dummy1/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_Museum:: @ 827A5B8
+	.incbin "data/tilesets/secondary/museum/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_Museum:: @ 827AE14
+	.incbin "data/tilesets/secondary/museum/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/museum/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/museum/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/museum/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/museum/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/museum/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/museum/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/museum/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/museum/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/museum/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/museum/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/museum/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/museum/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/museum/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/museum/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/museum/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_CableClub:: @ 827B014
+	.incbin "data/tilesets/secondary/cable_club/tiles.4bpp"
+
+	.align 2
+gTilesetPalettes_CableClub:: @ 827FF14
+	.incbin "data/tilesets/secondary/cable_club/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/cable_club/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_BikeShop:: @ 8280114
+	.incbin "data/tilesets/secondary/bike_shop/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_BikeShop:: @ 82804EC
+	.incbin "data/tilesets/secondary/bike_shop/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/bike_shop/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_Lab:: @ 82806EC
+	.incbin "data/tilesets/secondary/lab/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_Lab:: @ 8280D00
+	.incbin "data/tilesets/secondary/lab/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/lab/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_HoennBuilding:: @ 8280F00
+	.incbin "data/tilesets/secondary/hoenn_building/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_HoennBuilding:: @ 82823A4
+	.incbin "data/tilesets/secondary/hoenn_building/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/hoenn_building/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/hoenn_building/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/hoenn_building/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/hoenn_building/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/hoenn_building/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/hoenn_building/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/hoenn_building/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/hoenn_building/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/hoenn_building/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/hoenn_building/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/hoenn_building/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/hoenn_building/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/hoenn_building/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/hoenn_building/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/hoenn_building/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_GameCorner:: @ 82825A4
+	.incbin "data/tilesets/secondary/game_corner/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_GameCorner:: @ 8282FBC
+	.incbin "data/tilesets/secondary/game_corner/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/game_corner/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/game_corner/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/game_corner/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/game_corner/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/game_corner/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/game_corner/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/game_corner/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/game_corner/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/game_corner/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/game_corner/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/game_corner/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/game_corner/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/game_corner/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/game_corner/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/game_corner/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_PewterGym:: @ 82831BC
+	.incbin "data/tilesets/secondary/pewter_gym/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_PewterGym:: @ 82839B0
+	.incbin "data/tilesets/secondary/pewter_gym/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/pewter_gym/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/pewter_gym/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/pewter_gym/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/pewter_gym/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/pewter_gym/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/pewter_gym/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/pewter_gym/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/pewter_gym/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/pewter_gym/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/pewter_gym/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/pewter_gym/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/pewter_gym/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/pewter_gym/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/pewter_gym/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/pewter_gym/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_CeruleanGym:: @ 8283BB0
+	.incbin "data/tilesets/secondary/cerulean_gym/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_CeruleanGym:: @ 8283FF8
+	.incbin "data/tilesets/secondary/cerulean_gym/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_gym/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_gym/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_gym/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_gym/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_gym/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_gym/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_gym/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_gym/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_gym/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_gym/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_gym/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_gym/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_gym/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_gym/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_gym/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_VermilionGym:: @ 82841F8
+	.incbin "data/tilesets/secondary/vermilion_gym/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_VermilionGym:: @ 82849B8
+	.incbin "data/tilesets/secondary/vermilion_gym/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_gym/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_gym/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_gym/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_gym/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_gym/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_gym/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_gym/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_gym/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_gym/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_gym/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_gym/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_gym/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_gym/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_gym/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/vermilion_gym/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_CeladonGym:: @ 8284BB8
+	.incbin "data/tilesets/secondary/celadon_gym/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_CeladonGym:: @ 8285150
+	.incbin "data/tilesets/secondary/celadon_gym/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/celadon_gym/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/celadon_gym/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/celadon_gym/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/celadon_gym/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/celadon_gym/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/celadon_gym/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/celadon_gym/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/celadon_gym/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/celadon_gym/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/celadon_gym/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/celadon_gym/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/celadon_gym/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/celadon_gym/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/celadon_gym/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/celadon_gym/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_FuchsiaGym:: @ 8285350
+	.incbin "data/tilesets/secondary/fuchsia_gym/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_FuchsiaGym:: @ 82857A4
+	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/fuchsia_gym/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_SaffronGym:: @ 82859A4
+	.incbin "data/tilesets/secondary/saffron_gym/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_SaffronGym:: @ 8285D90
+	.incbin "data/tilesets/secondary/saffron_gym/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/saffron_gym/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/saffron_gym/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/saffron_gym/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/saffron_gym/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/saffron_gym/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/saffron_gym/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/saffron_gym/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/saffron_gym/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/saffron_gym/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/saffron_gym/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/saffron_gym/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/saffron_gym/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/saffron_gym/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/saffron_gym/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/saffron_gym/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_CinnabarGym:: @ 8285F90
+	.incbin "data/tilesets/secondary/cinnabar_gym/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_CinnabarGym:: @ 82865D4
+	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/cinnabar_gym/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_ViridianGym:: @ 82867D4
+	.incbin "data/tilesets/secondary/viridian_gym/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_ViridianGym:: @ 8286BC8
+	.incbin "data/tilesets/secondary/viridian_gym/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/viridian_gym/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/viridian_gym/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/viridian_gym/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/viridian_gym/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/viridian_gym/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/viridian_gym/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/viridian_gym/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/viridian_gym/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/viridian_gym/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/viridian_gym/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/viridian_gym/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/viridian_gym/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/viridian_gym/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/viridian_gym/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/viridian_gym/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_SSAnne:: @ 8286DC8
+	.incbin "data/tilesets/secondary/ss_anne/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_SSAnne:: @ 8287B80
+	.incbin "data/tilesets/secondary/ss_anne/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/ss_anne/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/ss_anne/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/ss_anne/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/ss_anne/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/ss_anne/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/ss_anne/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/ss_anne/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/ss_anne/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/ss_anne/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/ss_anne/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/ss_anne/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/ss_anne/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/ss_anne/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/ss_anne/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/ss_anne/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_Dummy2:: @ 8287D80
+	.incbin "data/tilesets/secondary/dummy2/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_Dummy2:: @ 8287D94
+	.incbin "data/tilesets/secondary/dummy2/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/dummy2/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/dummy2/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/dummy2/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/dummy2/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/dummy2/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/dummy2/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/dummy2/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/dummy2/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/dummy2/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/dummy2/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/dummy2/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/dummy2/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/dummy2/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/dummy2/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/dummy2/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_ViridianForest:: @ 8287F94
+	.incbin "data/tilesets/secondary/viridian_forest/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_ViridianForest:: @ 8288444
+	.incbin "data/tilesets/secondary/viridian_forest/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/viridian_forest/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/viridian_forest/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/viridian_forest/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/viridian_forest/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/viridian_forest/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/viridian_forest/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/viridian_forest/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/viridian_forest/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/viridian_forest/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/viridian_forest/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/viridian_forest/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/viridian_forest/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/viridian_forest/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/viridian_forest/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/viridian_forest/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_UnusedGatehouse1:: @ 8288644
+	.incbin "data/tilesets/secondary/unused_gatehouse1/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_UnusedGatehouse1:: @ 8288C60
+	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse1/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_RockTunnel:: @ 8288E60
+	.incbin "data/tilesets/secondary/rock_tunnel/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_RockTunnel:: @ 8289FC8
+	.incbin "data/tilesets/secondary/rock_tunnel/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/rock_tunnel/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/rock_tunnel/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/rock_tunnel/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/rock_tunnel/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/rock_tunnel/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/rock_tunnel/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/rock_tunnel/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/rock_tunnel/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/rock_tunnel/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/rock_tunnel/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/rock_tunnel/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/rock_tunnel/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/rock_tunnel/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/rock_tunnel/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/rock_tunnel/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_DiglettsCave:: @ 828A1C8
+	.incbin "data/tilesets/secondary/digletts_cave/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_DiglettsCave:: @ 828B250
+	.incbin "data/tilesets/secondary/digletts_cave/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/digletts_cave/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/digletts_cave/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/digletts_cave/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/digletts_cave/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/digletts_cave/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/digletts_cave/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/digletts_cave/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/digletts_cave/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/digletts_cave/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/digletts_cave/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/digletts_cave/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/digletts_cave/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/digletts_cave/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/digletts_cave/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/digletts_cave/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_SeafoamIslands:: @ 828B450
+	.incbin "data/tilesets/secondary/seafoam_islands/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_SeafoamIslands:: @ 828CAA0
+	.incbin "data/tilesets/secondary/seafoam_islands/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/seafoam_islands/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/seafoam_islands/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/seafoam_islands/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/seafoam_islands/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/seafoam_islands/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/seafoam_islands/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/seafoam_islands/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/seafoam_islands/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/seafoam_islands/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/seafoam_islands/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/seafoam_islands/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/seafoam_islands/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/seafoam_islands/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/seafoam_islands/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/seafoam_islands/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_UnusedGatehouse2:: @ 828CCA0
+	.incbin "data/tilesets/secondary/unused_gatehouse2/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_UnusedGatehouse2:: @ 828D2BC
+	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/unused_gatehouse2/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_CeruleanCave:: @ 828D4BC
+	.incbin "data/tilesets/secondary/cerulean_cave/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_CeruleanCave:: @ 828E3A4
+	.incbin "data/tilesets/secondary/cerulean_cave/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_cave/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_cave/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_cave/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_cave/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_cave/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_cave/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_cave/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_cave/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_cave/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_cave/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_cave/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_cave/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_cave/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_cave/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/cerulean_cave/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_GenericBuilding2:: @ 828E5A4
+	.incbin "data/tilesets/secondary/generic_building2/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_GenericBuilding2:: @ 828EC70
+	.incbin "data/tilesets/secondary/generic_building2/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/generic_building2/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_PowerPlant:: @ 828EE70
+	.incbin "data/tilesets/secondary/power_plant/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_PowerPlant:: @ 828F378
+	.incbin "data/tilesets/secondary/power_plant/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/power_plant/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/power_plant/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/power_plant/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/power_plant/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/power_plant/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/power_plant/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/power_plant/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/power_plant/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/power_plant/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/power_plant/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/power_plant/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/power_plant/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/power_plant/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/power_plant/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/power_plant/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_SeaCottage:: @ 828F578
+	.incbin "data/tilesets/secondary/sea_cottage/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_SeaCottage:: @ 828F9D8
+	.incbin "data/tilesets/secondary/sea_cottage/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/sea_cottage/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/sea_cottage/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/sea_cottage/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/sea_cottage/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/sea_cottage/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/sea_cottage/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/sea_cottage/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/sea_cottage/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/sea_cottage/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/sea_cottage/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/sea_cottage/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/sea_cottage/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/sea_cottage/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/sea_cottage/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/sea_cottage/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_SilphCo:: @ 828FBD8
+	.incbin "data/tilesets/secondary/condominiums/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_SilphCo:: @ 8290DD0
+	.incbin "data/tilesets/secondary/condominiums/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/condominiums/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/condominiums/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/condominiums/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/condominiums/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/condominiums/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/condominiums/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/condominiums/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/condominiums/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/condominiums/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/condominiums/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/condominiums/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/condominiums/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/condominiums/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/condominiums/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/condominiums/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_UndergroundPath:: @ 8290FD0
+	.incbin "data/tilesets/secondary/underground_path/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_UndergroundPath:: @ 8291274
+	.incbin "data/tilesets/secondary/underground_path/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/underground_path/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/underground_path/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/underground_path/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/underground_path/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/underground_path/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/underground_path/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/underground_path/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/underground_path/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/underground_path/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/underground_path/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/underground_path/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/underground_path/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/underground_path/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/underground_path/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/underground_path/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_PokemonTower:: @ 8291474
+	.incbin "data/tilesets/secondary/pokemon_tower/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_PokemonTower:: @ 8291AFC
+	.incbin "data/tilesets/secondary/pokemon_tower/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_tower/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_tower/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_tower/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_tower/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_tower/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_tower/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_tower/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_tower/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_tower/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_tower/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_tower/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_tower/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_tower/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_tower/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_tower/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_SafariZoneBuilding:: @ 8291CFC
+	.incbin "data/tilesets/secondary/safari_zone_building/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_SafariZoneBuilding:: @ 82920F0
+	.incbin "data/tilesets/secondary/safari_zone_building/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/safari_zone_building/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/safari_zone_building/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/safari_zone_building/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/safari_zone_building/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/safari_zone_building/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/safari_zone_building/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/safari_zone_building/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/safari_zone_building/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/safari_zone_building/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/safari_zone_building/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/safari_zone_building/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/safari_zone_building/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/safari_zone_building/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/safari_zone_building/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/safari_zone_building/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_PokemonMansion:: @ 82922F0
+	.incbin "data/tilesets/secondary/pokemon_mansion/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_PokemonMansion:: @ 8292FF0
+	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_mansion/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_RestaurantHotel:: @ 82931F0
+	.incbin "data/tilesets/secondary/restaurant_hotel/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_RestaurantHotel:: @ 8293660
+	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/restaurant_hotel/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_School:: @ 8293860
+	.incbin "data/tilesets/secondary/school/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_School:: @ 8293B0C
+	.incbin "data/tilesets/secondary/school/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/school/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/school/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/school/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/school/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/school/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/school/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/school/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/school/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/school/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/school/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/school/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/school/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/school/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/school/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/school/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_FanClubDaycare:: @ 8293D0C
+	.incbin "data/tilesets/secondary/fan_club_daycare/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_FanClubDaycare:: @ 8294144
+	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/fan_club_daycare/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_BurgledHouse:: @ 8294344
+	.incbin "data/tilesets/secondary/burgled_house/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_BurgledHouse:: @ 8294D08
+	.incbin "data/tilesets/secondary/burgled_house/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/burgled_house/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/burgled_house/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/burgled_house/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/burgled_house/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/burgled_house/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/burgled_house/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/burgled_house/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/burgled_house/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/burgled_house/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/burgled_house/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/burgled_house/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/burgled_house/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/burgled_house/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/burgled_house/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/burgled_house/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_Dummy3:: @ 8294F08
+	.incbin "data/tilesets/secondary/dummy3/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_Dummy3:: @ 8294F18
+	.incbin "data/tilesets/secondary/dummy3/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/dummy3/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/dummy3/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/dummy3/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/dummy3/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/dummy3/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/dummy3/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/dummy3/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/dummy3/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/dummy3/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/dummy3/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/dummy3/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/dummy3/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/dummy3/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/dummy3/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/dummy3/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_Dummy4:: @ 8295118
+	.incbin "data/tilesets/secondary/dummy4/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_Dummy4:: @ 829512C
+	.incbin "data/tilesets/secondary/dummy4/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/dummy4/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/dummy4/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/dummy4/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/dummy4/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/dummy4/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/dummy4/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/dummy4/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/dummy4/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/dummy4/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/dummy4/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/dummy4/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/dummy4/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/dummy4/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/dummy4/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/dummy4/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_MtEmber:: @ 829532C
+	.incbin "data/tilesets/secondary/mt_ember/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_MtEmber:: @ 82967D4
+	.incbin "data/tilesets/secondary/mt_ember/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/mt_ember/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/mt_ember/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/mt_ember/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/mt_ember/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/mt_ember/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/mt_ember/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/mt_ember/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/mt_ember/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/mt_ember/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/mt_ember/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/mt_ember/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/mt_ember/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/mt_ember/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/mt_ember/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/mt_ember/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_BerryForest:: @ 82969D4
+	.incbin "data/tilesets/secondary/berry_forest/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_BerryForest:: @ 8296E90
+	.incbin "data/tilesets/secondary/berry_forest/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/berry_forest/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/berry_forest/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/berry_forest/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/berry_forest/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/berry_forest/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/berry_forest/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/berry_forest/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/berry_forest/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/berry_forest/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/berry_forest/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/berry_forest/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/berry_forest/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/berry_forest/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/berry_forest/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/berry_forest/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_NavelRock:: @ 8297090
+	.incbin "data/tilesets/secondary/navel_rock/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_NavelRock:: @ 82983BC
+	.incbin "data/tilesets/secondary/navel_rock/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/navel_rock/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_TanobyRuins:: @ 82985BC
+	.incbin "data/tilesets/secondary/tanoby_ruins/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_TanobyRuins:: @ 8298970
+	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/tanoby_ruins/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_SeviiIslands123:: @ 8298B70
+	.incbin "data/tilesets/secondary/sevii_islands_123/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_SeviiIslands123:: @ 8299AA4
+	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_123/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_SeviiIslands45:: @ 8299CA4
+	.incbin "data/tilesets/secondary/sevii_islands_45/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_SeviiIslands45:: @ 829AB04
+	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_45/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_SeviiIslands67:: @ 829AD04
+	.incbin "data/tilesets/secondary/sevii_islands_67/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_SeviiIslands67:: @ 829BD64
+	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/sevii_islands_67/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_TrainerTower:: @ 829BF64
+	.incbin "data/tilesets/secondary/trainer_tower/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_TrainerTower:: @ 829CEE4
+	.incbin "data/tilesets/secondary/trainer_tower/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/trainer_tower/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/trainer_tower/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/trainer_tower/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/trainer_tower/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/trainer_tower/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/trainer_tower/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/trainer_tower/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/trainer_tower/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/trainer_tower/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/trainer_tower/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/trainer_tower/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/trainer_tower/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/trainer_tower/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/trainer_tower/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/trainer_tower/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_IslandHarbor:: @ 829D0E4
+	.incbin "data/tilesets/secondary/island_harbor/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_IslandHarbor:: @ 829D894
+	.incbin "data/tilesets/secondary/island_harbor/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/island_harbor/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_PokemonLeague:: @ 829DA94
+	.incbin "data/tilesets/secondary/pokemon_league/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_PokemonLeague:: @ 829EA50
+	.incbin "data/tilesets/secondary/pokemon_league/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_league/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_league/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_league/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_league/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_league/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_league/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_league/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_league/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_league/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_league/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_league/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_league/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_league/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_league/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/pokemon_league/palettes/15.gbapal"
+
+	.align 2
+gTilesetTiles_HallOfFame:: @ 829EC50
+	.incbin "data/tilesets/secondary/hall_of_fame/tiles.4bpp.lz"
+
+	.align 2
+gTilesetPalettes_HallOfFame:: @ 829F4C8
+	.incbin "data/tilesets/secondary/hall_of_fame/palettes/0.gbapal"
+	.incbin "data/tilesets/secondary/hall_of_fame/palettes/1.gbapal"
+	.incbin "data/tilesets/secondary/hall_of_fame/palettes/2.gbapal"
+	.incbin "data/tilesets/secondary/hall_of_fame/palettes/3.gbapal"
+	.incbin "data/tilesets/secondary/hall_of_fame/palettes/4.gbapal"
+	.incbin "data/tilesets/secondary/hall_of_fame/palettes/5.gbapal"
+	.incbin "data/tilesets/secondary/hall_of_fame/palettes/6.gbapal"
+	.incbin "data/tilesets/secondary/hall_of_fame/palettes/7.gbapal"
+	.incbin "data/tilesets/secondary/hall_of_fame/palettes/8.gbapal"
+	.incbin "data/tilesets/secondary/hall_of_fame/palettes/9.gbapal"
+	.incbin "data/tilesets/secondary/hall_of_fame/palettes/10.gbapal"
+	.incbin "data/tilesets/secondary/hall_of_fame/palettes/11.gbapal"
+	.incbin "data/tilesets/secondary/hall_of_fame/palettes/12.gbapal"
+	.incbin "data/tilesets/secondary/hall_of_fame/palettes/13.gbapal"
+	.incbin "data/tilesets/secondary/hall_of_fame/palettes/14.gbapal"
+	.incbin "data/tilesets/secondary/hall_of_fame/palettes/15.gbapal"
diff --git a/data/tilesets/headers.inc b/data/tilesets/headers.inc
index d40b3a5e6..cac3cf82f 100644
--- a/data/tilesets/headers.inc
+++ b/data/tilesets/headers.inc
@@ -1,749 +1,749 @@
 
 	.align 2
-gTileset_82D4A94::
+gTileset_General::
 	.byte TRUE @ is compressed
 	.byte FALSE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8EA1D68
-	.4byte gTilesetPalettes_8EA1B68
-	.4byte gMetatiles_829F6C8
-	.4byte sub_8070154
-	.4byte gMetatileAttributes_82A1EC8
+	.4byte gTilesetTiles_General
+	.4byte gTilesetPalettes_General
+	.4byte gMetatiles_General
+	.4byte InitTilesetAnim_General
+	.4byte gMetatileAttributes_General
 
 	.align 2
-gTileset_82D4AAC::
+gTileset_PalletTown::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_826D37C
-	.4byte gTilesetPalettes_826D7C0
-	.4byte gMetatiles_82A28C8
+	.4byte gTilesetTiles_PalletTown
+	.4byte gTilesetPalettes_PalletTown
+	.4byte gMetatiles_PalletTown
 	.4byte 0x0
-	.4byte gMetatileAttributes_82A2E58
+	.4byte gMetatileAttributes_PalletTown
 
 	.align 2
-gTileset_82D4AC4::
+gTileset_ViridianCity::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_826D9C0
-	.4byte gTilesetPalettes_826DFC0
-	.4byte gMetatiles_82A2FBC
+	.4byte gTilesetTiles_ViridianCity
+	.4byte gTilesetPalettes_ViridianCity
+	.4byte gMetatiles_ViridianCity
 	.4byte 0x0
-	.4byte gMetatileAttributes_82A35AC
+	.4byte gMetatileAttributes_ViridianCity
 
 	.align 2
-gTileset_82D4ADC::
+gTileset_PewterCity::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_826E1C0
-	.4byte gTilesetPalettes_826EAB8
-	.4byte gMetatiles_82A3728
+	.4byte gTilesetTiles_PewterCity
+	.4byte gTilesetPalettes_PewterCity
+	.4byte gMetatiles_PewterCity
 	.4byte 0x0
-	.4byte gMetatileAttributes_82A3C18
+	.4byte gMetatileAttributes_PewterCity
 
 	.align 2
-gTileset_82D4AF4::
+gTileset_CeruleanCity::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_826ECB8
-	.4byte gTilesetPalettes_826F4B8
-	.4byte gMetatiles_82A3D54
+	.4byte gTilesetTiles_CeruleanCity
+	.4byte gTilesetPalettes_CeruleanCity
+	.4byte gMetatiles_CeruleanCity
 	.4byte 0x0
-	.4byte gMetatileAttributes_82A45B4
+	.4byte gMetatileAttributes_CeruleanCity
 
 	.align 2
-gTileset_82D4B0C::
+gTileset_LavenderTown::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_826F6B8
-	.4byte gTilesetPalettes_8270438
-	.4byte gMetatiles_82A47CC
+	.4byte gTilesetTiles_LavenderTown
+	.4byte gTilesetPalettes_LavenderTown
+	.4byte gMetatiles_LavenderTown
 	.4byte 0x0
-	.4byte gMetatileAttributes_82A556C
+	.4byte gMetatileAttributes_LavenderTown
 
 	.align 2
-gTileset_82D4B24::
+gTileset_VermilionCity::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8270638
-	.4byte gTilesetPalettes_8270DA0
-	.4byte gMetatiles_82A58D4
+	.4byte gTilesetTiles_VermilionCity
+	.4byte gTilesetPalettes_VermilionCity
+	.4byte gMetatiles_VermilionCity
 	.4byte 0x0
-	.4byte gMetatileAttributes_82A6354
+	.4byte gMetatileAttributes_VermilionCity
 
 	.align 2
-gTileset_82D4B3C::
+gTileset_CeladonCity::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8270FA0
-	.4byte gTilesetPalettes_8271C74
-	.4byte gMetatiles_82A65F4
-	.4byte sub_80701D8
-	.4byte gMetatileAttributes_82A74F4
+	.4byte gTilesetTiles_CeladonCity
+	.4byte gTilesetPalettes_CeladonCity
+	.4byte gMetatiles_CeladonCity
+	.4byte InitTilesetAnim_CeladonCity
+	.4byte gMetatileAttributes_CeladonCity
 
 	.align 2
-gTileset_82D4B54::
+gTileset_FuchsiaCity::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8271E74
-	.4byte gTilesetPalettes_8272A5C
-	.4byte gMetatiles_82A78B4
+	.4byte gTilesetTiles_FuchsiaCity
+	.4byte gTilesetPalettes_FuchsiaCity
+	.4byte gMetatiles_FuchsiaCity
 	.4byte 0x0
-	.4byte gMetatileAttributes_82A84B4
+	.4byte gMetatileAttributes_FuchsiaCity
 
 	.align 2
-gTileset_82D4B6C::
+gTileset_CinnabarIsland::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8272C5C
-	.4byte gTilesetPalettes_8273358
-	.4byte gMetatiles_82A87B4
+	.4byte gTilesetTiles_CinnabarIsland
+	.4byte gTilesetPalettes_CinnabarIsland
+	.4byte gMetatiles_CinnabarIsland
 	.4byte 0x0
-	.4byte gMetatileAttributes_82A8BB4
+	.4byte gMetatileAttributes_CinnabarIsland
 
 	.align 2
-gTileset_82D4B84::
+gTileset_IndigoPlateau::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8273558
-	.4byte gTilesetPalettes_82742D0
-	.4byte gMetatiles_82A8CB4
+	.4byte gTilesetTiles_IndigoPlateau
+	.4byte gTilesetPalettes_IndigoPlateau
+	.4byte gMetatiles_IndigoPlateau
 	.4byte 0x0
-	.4byte gMetatileAttributes_82A97B4
+	.4byte gMetatileAttributes_IndigoPlateau
 
 	.align 2
-gTileset_82D4B9C::
+gTileset_SaffronCity::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_82744D0
-	.4byte gTilesetPalettes_8275094
-	.4byte gMetatiles_82A9A74
+	.4byte gTilesetTiles_SaffronCity
+	.4byte gTilesetPalettes_SaffronCity
+	.4byte gMetatiles_SaffronCity
 	.4byte 0x0
-	.4byte gMetatileAttributes_82AA6F4
+	.4byte gMetatileAttributes_SaffronCity
 
 	.align 2
-gTileset_82D4BB4::
+gTileset_Building::
 	.byte TRUE @ is compressed
 	.byte FALSE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8275294
-	.4byte gTilesetPalettes_8277694
-	.4byte gMetatiles_82AD7B4
+	.4byte gTilesetTiles_Building
+	.4byte gTilesetPalettes_Building
+	.4byte gMetatiles_Building
 	.4byte 0x0
-	.4byte gMetatileAttributes_82AFFB4
+	.4byte gMetatileAttributes_Building
 
 	.align 2
-gTileset_82D4BCC::
+gTileset_Mart::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8277894
-	.4byte gTilesetPalettes_8277A5C
-	.4byte gMetatiles_82B3524
+	.4byte gTilesetTiles_Mart
+	.4byte gTilesetPalettes_Mart
+	.4byte gMetatiles_Mart
 	.4byte 0x0
-	.4byte gMetatileAttributes_82B3954
+	.4byte gMetatileAttributes_Mart
 
 	.align 2
-gTileset_82D4BE4::
+gTileset_PokemonCenter::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8277C5C
-	.4byte gTilesetPalettes_8278CC4
-	.4byte gMetatiles_82B3A60
+	.4byte gTilesetTiles_PokemonCenter
+	.4byte gTilesetPalettes_PokemonCenter
+	.4byte gMetatiles_PokemonCenter
 	.4byte 0x0
-	.4byte gMetatileAttributes_82B4A50
+	.4byte gMetatileAttributes_PokemonCenter
 
 	.align 2
-gTileset_82D4BFC::
+gTileset_Cave::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8278EC4
-	.4byte gTilesetPalettes_827A1A8
-	.4byte gMetatiles_82B502C
+	.4byte gTilesetTiles_Cave
+	.4byte gTilesetPalettes_Cave
+	.4byte gMetatiles_Cave
 	.4byte 0x0
-	.4byte gMetatileAttributes_82B5A3C
+	.4byte gMetatileAttributes_Cave
 
 	.align 2
-gTileset_82D4C14::
+gTileset_Dummy1::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_827A3A8
-	.4byte gTilesetPalettes_827A3B8
-	.4byte gMetatiles_82B09B4
+	.4byte gTilesetTiles_Dummy1
+	.4byte gTilesetPalettes_Dummy1
+	.4byte gMetatiles_Dummy1
 	.4byte 0x0
-	.4byte gMetatileAttributes_82B09D4
+	.4byte gMetatileAttributes_Dummy1
 
 	.align 2
-gTileset_82D4C2C::
+gTileset_Museum::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_827A5B8
-	.4byte gTilesetPalettes_827AE14
-	.4byte gMetatiles_82C5738
+	.4byte gTilesetTiles_Museum
+	.4byte gTilesetPalettes_Museum
+	.4byte gMetatiles_Museum
 	.4byte 0x0
-	.4byte gMetatileAttributes_82C5FA8
+	.4byte gMetatileAttributes_Museum
 
 	.align 2
-gTileset_82D4C44::
+gTileset_CableClub::
 	.byte FALSE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_827B014
-	.4byte gTilesetPalettes_827FF14
-	.4byte gMetatiles_82C61C4
+	.4byte gTilesetTiles_CableClub
+	.4byte gTilesetPalettes_CableClub
+	.4byte gMetatiles_CableClub
 	.4byte 0x0
-	.4byte gMetatileAttributes_82C71C4
+	.4byte gMetatileAttributes_CableClub
 
 	.align 2
-gTileset_82D4C5C::
+gTileset_BikeShop::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8280114
-	.4byte gTilesetPalettes_82804EC
-	.4byte gMetatiles_82B31DC
+	.4byte gTilesetTiles_BikeShop
+	.4byte gTilesetPalettes_BikeShop
+	.4byte gMetatiles_BikeShop
 	.4byte 0x0
-	.4byte gMetatileAttributes_82B347C
+	.4byte gMetatileAttributes_BikeShop
 
 	.align 2
-gTileset_82D4C74::
+gTileset_GenericBuilding1::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8EA99F4
-	.4byte gTilesetPalettes_8EA97F4
-	.4byte gMetatiles_82B4E4C
+	.4byte gTilesetTiles_GenericBuilding1
+	.4byte gTilesetPalettes_GenericBuilding1
+	.4byte gMetatiles_GenericBuilding1
 	.4byte 0x0
-	.4byte gMetatileAttributes_82B4FCC
+	.4byte gMetatileAttributes_GenericBuilding1
 
 	.align 2
-gTileset_82D4C8C::
+gTileset_Lab::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_82806EC
-	.4byte gTilesetPalettes_8280D00
-	.4byte gMetatiles_82B68A0
+	.4byte gTilesetTiles_Lab
+	.4byte gTilesetPalettes_Lab
+	.4byte gMetatiles_Lab
 	.4byte 0x0
-	.4byte gMetatileAttributes_82B7390
+	.4byte gMetatileAttributes_Lab
 
 	.align 2
-gTileset_82D4CA4::
+gTileset_FuchsiaGym::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8285350
-	.4byte gTilesetPalettes_82857A4
-	.4byte gMetatiles_82AC364
+	.4byte gTilesetTiles_FuchsiaGym
+	.4byte gTilesetPalettes_FuchsiaGym
+	.4byte gMetatiles_FuchsiaGym
 	.4byte 0x0
-	.4byte gMetatileAttributes_82AC584
+	.4byte gMetatileAttributes_FuchsiaGym
 
 	.align 2
-gTileset_82D4CBC::
+gTileset_ViridianGym::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_82867D4
-	.4byte gTilesetPalettes_8286BC8
-	.4byte gMetatiles_82AD124
+	.4byte gTilesetTiles_ViridianGym
+	.4byte gTilesetPalettes_ViridianGym
+	.4byte gMetatiles_ViridianGym
 	.4byte 0x0
-	.4byte gMetatileAttributes_82AD664
+	.4byte gMetatileAttributes_ViridianGym
 
 	.align 2
-gTileset_82D4CD4::
+gTileset_HoennBuilding::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8280F00
-	.4byte gTilesetPalettes_82823A4
-	.4byte gMetatiles_82B09DC
+	.4byte gTilesetTiles_HoennBuilding
+	.4byte gTilesetPalettes_HoennBuilding
+	.4byte gMetatiles_HoennBuilding
 	.4byte 0x0
-	.4byte gMetatileAttributes_82B29DC
+	.4byte gMetatileAttributes_HoennBuilding
 
 	.align 2
-gTileset_82D4CEC::
+gTileset_GameCorner::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_82825A4
-	.4byte gTilesetPalettes_8282FBC
-	.4byte gMetatiles_82B5CC0
+	.4byte gTilesetTiles_GameCorner
+	.4byte gTilesetPalettes_GameCorner
+	.4byte gMetatiles_GameCorner
 	.4byte 0x0
-	.4byte gMetatileAttributes_82B6640
+	.4byte gMetatileAttributes_GameCorner
 
 	.align 2
-gTileset_82D4D04::
+gTileset_PewterGym::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_82831BC
-	.4byte gTilesetPalettes_82839B0
-	.4byte gMetatiles_82AAA14
+	.4byte gTilesetTiles_PewterGym
+	.4byte gTilesetPalettes_PewterGym
+	.4byte gMetatiles_PewterGym
 	.4byte 0x0
-	.4byte gMetatileAttributes_82AB064
+	.4byte gMetatileAttributes_PewterGym
 
 	.align 2
-gTileset_82D4D1C::
+gTileset_CeruleanGym::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8283BB0
-	.4byte gTilesetPalettes_8283FF8
-	.4byte gMetatiles_82AB1F8
+	.4byte gTilesetTiles_CeruleanGym
+	.4byte gTilesetPalettes_CeruleanGym
+	.4byte gMetatiles_CeruleanGym
 	.4byte 0x0
-	.4byte gMetatileAttributes_82AB738
+	.4byte gMetatileAttributes_CeruleanGym
 
 	.align 2
-gTileset_82D4D34::
+gTileset_VermilionGym::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_82841F8
-	.4byte gTilesetPalettes_82849B8
-	.4byte gMetatiles_82AB888
-	.4byte sub_807031C
-	.4byte gMetatileAttributes_82ABD38
+	.4byte gTilesetTiles_VermilionGym
+	.4byte gTilesetPalettes_VermilionGym
+	.4byte gMetatiles_VermilionGym
+	.4byte InitTilesetAnim_VermilionGym
+	.4byte gMetatileAttributes_VermilionGym
 
 	.align 2
-gTileset_82D4D4C::
+gTileset_CeladonGym::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8284BB8
-	.4byte gTilesetPalettes_8285150
-	.4byte gMetatiles_82ABE64
-	.4byte sub_8070380
-	.4byte gMetatileAttributes_82AC264
+	.4byte gTilesetTiles_CeladonGym
+	.4byte gTilesetPalettes_CeladonGym
+	.4byte gMetatiles_CeladonGym
+	.4byte InitTilesetAnim_CeladonGym
+	.4byte gMetatileAttributes_CeladonGym
 
 	.align 2
-gTileset_82D4D64::
+gTileset_SaffronGym::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_82859A4
-	.4byte gTilesetPalettes_8285D90
-	.4byte gMetatiles_82AC60C
+	.4byte gTilesetTiles_SaffronGym
+	.4byte gTilesetPalettes_SaffronGym
+	.4byte gMetatiles_SaffronGym
 	.4byte 0x0
-	.4byte gMetatileAttributes_82AC8EC
+	.4byte gMetatileAttributes_SaffronGym
 
 	.align 2
-gTileset_82D4D7C::
+gTileset_CinnabarGym::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8285F90
-	.4byte gTilesetPalettes_82865D4
-	.4byte gMetatiles_82AC9A4
+	.4byte gTilesetTiles_CinnabarGym
+	.4byte gTilesetPalettes_CinnabarGym
+	.4byte gMetatiles_CinnabarGym
 	.4byte 0x0
-	.4byte gMetatileAttributes_82ACFA4
+	.4byte gMetatileAttributes_CinnabarGym
 
 	.align 2
-gTileset_82D4D94::
+gTileset_SSAnne::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8286DC8
-	.4byte gTilesetPalettes_8287B80
-	.4byte gMetatiles_82B764C
+	.4byte gTilesetTiles_SSAnne
+	.4byte gTilesetPalettes_SSAnne
+	.4byte gMetatiles_SSAnne
 	.4byte 0x0
-	.4byte gMetatileAttributes_82B8B4C
+	.4byte gMetatileAttributes_SSAnne
 
 	.align 2
-gTileset_82D4DAC::
+gTileset_Dummy2::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8287D80
-	.4byte gTilesetPalettes_8287D94
-	.4byte gMetatiles_82B908C
+	.4byte gTilesetTiles_Dummy2
+	.4byte gTilesetPalettes_Dummy2
+	.4byte gMetatiles_Dummy2
 	.4byte 0x0
-	.4byte gMetatileAttributes_82B90AC
+	.4byte gMetatileAttributes_Dummy2
 
 	.align 2
-gTileset_82D4DC4::
+gTileset_ViridianForest::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8287F94
-	.4byte gTilesetPalettes_8288444
-	.4byte gMetatiles_82B90B4
+	.4byte gTilesetTiles_ViridianForest
+	.4byte gTilesetPalettes_ViridianForest
+	.4byte gMetatiles_ViridianForest
 	.4byte 0x0
-	.4byte gMetatileAttributes_82B9364
+	.4byte gMetatileAttributes_ViridianForest
 
 	.align 2
-gTileset_82D4DDC::
+gTileset_UnusedGatehouse1::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8288644
-	.4byte gTilesetPalettes_8288C60
-	.4byte gMetatiles_82B9410
+	.4byte gTilesetTiles_UnusedGatehouse1
+	.4byte gTilesetPalettes_UnusedGatehouse1
+	.4byte gMetatiles_UnusedGatehouse1
 	.4byte 0x0
-	.4byte gMetatileAttributes_82B9B30
+	.4byte gMetatileAttributes_UnusedGatehouse1
 
 	.align 2
-gTileset_82D4DF4::
+gTileset_RockTunnel::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8288E60
-	.4byte gTilesetPalettes_8289FC8
-	.4byte gMetatiles_82B9CF8
+	.4byte gTilesetTiles_RockTunnel
+	.4byte gTilesetPalettes_RockTunnel
+	.4byte gMetatiles_RockTunnel
 	.4byte 0x0
-	.4byte gMetatileAttributes_82BA678
+	.4byte gMetatileAttributes_RockTunnel
 
 	.align 2
-gTileset_82D4E0C::
+gTileset_DiglettsCave::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_828A1C8
-	.4byte gTilesetPalettes_828B250
-	.4byte gMetatiles_82BA8D8
+	.4byte gTilesetTiles_DiglettsCave
+	.4byte gTilesetPalettes_DiglettsCave
+	.4byte gMetatiles_DiglettsCave
 	.4byte 0x0
-	.4byte gMetatileAttributes_82BB2A8
+	.4byte gMetatileAttributes_DiglettsCave
 
 	.align 2
-gTileset_82D4E24::
+gTileset_SeafoamIslands::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_828B450
-	.4byte gTilesetPalettes_828CAA0
-	.4byte gMetatiles_82BB51C
+	.4byte gTilesetTiles_SeafoamIslands
+	.4byte gTilesetPalettes_SeafoamIslands
+	.4byte gMetatiles_SeafoamIslands
 	.4byte 0x0
-	.4byte gMetatileAttributes_82BC49C
+	.4byte gMetatileAttributes_SeafoamIslands
 
 	.align 2
-gTileset_82D4E3C::
+gTileset_UnusedGatehouse2::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_828CCA0
-	.4byte gTilesetPalettes_828D2BC
-	.4byte gMetatiles_82BC87C
+	.4byte gTilesetTiles_UnusedGatehouse2
+	.4byte gTilesetPalettes_UnusedGatehouse2
+	.4byte gMetatiles_UnusedGatehouse2
 	.4byte 0x0
-	.4byte gMetatileAttributes_82BCF9C
+	.4byte gMetatileAttributes_UnusedGatehouse2
 
 	.align 2
-gTileset_82D4E54::
+gTileset_CeruleanCave::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_828D4BC
-	.4byte gTilesetPalettes_828E3A4
-	.4byte gMetatiles_82BD164
+	.4byte gTilesetTiles_CeruleanCave
+	.4byte gTilesetPalettes_CeruleanCave
+	.4byte gMetatiles_CeruleanCave
 	.4byte 0x0
-	.4byte gMetatileAttributes_82BD9C4
+	.4byte gMetatileAttributes_CeruleanCave
 
 	.align 2
-gTileset_82D4E6C::
+gTileset_DepartmentStore::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8EA9F88
-	.4byte gTilesetPalettes_8EA9D88
-	.4byte gMetatiles_82BDBDC
+	.4byte gTilesetTiles_DepartmentStore
+	.4byte gTilesetPalettes_DepartmentStore
+	.4byte gMetatiles_DepartmentStore
 	.4byte 0x0
-	.4byte gMetatileAttributes_82BEB3C
+	.4byte gMetatileAttributes_DepartmentStore
 
 	.align 2
-gTileset_82D4E84::
+gTileset_GenericBuilding2::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_828E5A4
-	.4byte gTilesetPalettes_828EC70
-	.4byte gMetatiles_82BEF14
+	.4byte gTilesetTiles_GenericBuilding2
+	.4byte gTilesetPalettes_GenericBuilding2
+	.4byte gMetatiles_GenericBuilding2
 	.4byte 0x0
-	.4byte gMetatileAttributes_82BFA94
+	.4byte gMetatileAttributes_GenericBuilding2
 
 	.align 2
-gTileset_82D4E9C::
+gTileset_PowerPlant::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_828EE70
-	.4byte gTilesetPalettes_828F378
-	.4byte gMetatiles_82BFD74
+	.4byte gTilesetTiles_PowerPlant
+	.4byte gTilesetPalettes_PowerPlant
+	.4byte gMetatiles_PowerPlant
 	.4byte 0x0
-	.4byte gMetatileAttributes_82C0704
+	.4byte gMetatileAttributes_PowerPlant
 
 	.align 2
-gTileset_82D4EB4::
+gTileset_SeaCottage::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_828F578
-	.4byte gTilesetPalettes_828F9D8
-	.4byte gMetatiles_82C0968
+	.4byte gTilesetTiles_SeaCottage
+	.4byte gTilesetPalettes_SeaCottage
+	.4byte gMetatiles_SeaCottage
 	.4byte 0x0
-	.4byte gMetatileAttributes_82C0D18
+	.4byte gMetatileAttributes_SeaCottage
 
 	.align 2
-gTileset_82D4ECC::
+gTileset_SilphCo::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_828FBD8
-	.4byte gTilesetPalettes_8290DD0
-	.4byte gMetatiles_82C0E04
-	.4byte sub_8070250
-	.4byte gMetatileAttributes_82C25A4
+	.4byte gTilesetTiles_SilphCo
+	.4byte gTilesetPalettes_SilphCo
+	.4byte gMetatiles_SilphCo
+	.4byte InitTilesetAnim_SilphCo
+	.4byte gMetatileAttributes_SilphCo
 
 	.align 2
-gTileset_82D4EE4::
+gTileset_UndergroundPath::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8290FD0
-	.4byte gTilesetPalettes_8291274
-	.4byte gMetatiles_82C2B8C
+	.4byte gTilesetTiles_UndergroundPath
+	.4byte gTilesetPalettes_UndergroundPath
+	.4byte gMetatiles_UndergroundPath
 	.4byte 0x0
-	.4byte gMetatileAttributes_82C300C
+	.4byte gMetatileAttributes_UndergroundPath
 
 	.align 2
-gTileset_82D4EFC::
+gTileset_PokemonTower::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8291474
-	.4byte gTilesetPalettes_8291AFC
-	.4byte gMetatiles_82C312C
+	.4byte gTilesetTiles_PokemonTower
+	.4byte gTilesetPalettes_PokemonTower
+	.4byte gMetatiles_PokemonTower
 	.4byte 0x0
-	.4byte gMetatileAttributes_82C377C
+	.4byte gMetatileAttributes_PokemonTower
 
 	.align 2
-gTileset_82D4F14::
+gTileset_SafariZoneBuilding::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8291CFC
-	.4byte gTilesetPalettes_82920F0
-	.4byte gMetatiles_82C3910
+	.4byte gTilesetTiles_SafariZoneBuilding
+	.4byte gTilesetPalettes_SafariZoneBuilding
+	.4byte gMetatiles_SafariZoneBuilding
 	.4byte 0x0
-	.4byte gMetatileAttributes_82C4110
+	.4byte gMetatileAttributes_SafariZoneBuilding
 
 	.align 2
-gTileset_82D4F2C::
+gTileset_PokemonMansion::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_82922F0
-	.4byte gTilesetPalettes_8292FF0
-	.4byte gMetatiles_82C4310
+	.4byte gTilesetTiles_PokemonMansion
+	.4byte gTilesetPalettes_PokemonMansion
+	.4byte gMetatiles_PokemonMansion
 	.4byte 0x0
-	.4byte gMetatileAttributes_82C5330
+	.4byte gMetatileAttributes_PokemonMansion
 
 	.align 2
-gTileset_82D4F44::
+gTileset_RestaurantHotel::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_82931F0
-	.4byte gTilesetPalettes_8293660
-	.4byte gMetatiles_82C75C4
+	.4byte gTilesetTiles_RestaurantHotel
+	.4byte gTilesetPalettes_RestaurantHotel
+	.4byte gMetatiles_RestaurantHotel
 	.4byte 0x0
-	.4byte gMetatileAttributes_82C7C44
+	.4byte gMetatileAttributes_RestaurantHotel
 
 	.align 2
-gTileset_82D4F5C::
+gTileset_School::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8293860
-	.4byte gTilesetPalettes_8293B0C
-	.4byte gMetatiles_82C7DE4
+	.4byte gTilesetTiles_School
+	.4byte gTilesetPalettes_School
+	.4byte gMetatiles_School
 	.4byte 0x0
-	.4byte gMetatileAttributes_82C80C4
+	.4byte gMetatileAttributes_School
 
 	.align 2
-gTileset_82D4F74::
+gTileset_FanClubDaycare::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8293D0C
-	.4byte gTilesetPalettes_8294144
-	.4byte gMetatiles_82C817C
+	.4byte gTilesetTiles_FanClubDaycare
+	.4byte gTilesetPalettes_FanClubDaycare
+	.4byte gMetatiles_FanClubDaycare
 	.4byte 0x0
-	.4byte gMetatileAttributes_82C8C1C
+	.4byte gMetatileAttributes_FanClubDaycare
 
 	.align 2
-gTileset_82D4F8C::
+gTileset_Condominiums::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_828FBD8
-	.4byte gTilesetPalettes_8290DD0
-	.4byte gMetatiles_82C8EC4
+	.4byte gTilesetTiles_SilphCo
+	.4byte gTilesetPalettes_SilphCo
+	.4byte gMetatiles_Condominiums
 	.4byte 0x0
-	.4byte gMetatileAttributes_82C9C34
+	.4byte gMetatileAttributes_Condominiums
 
 	.align 2
-gTileset_82D4FA4::
+gTileset_BurgledHouse::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8294344
-	.4byte gTilesetPalettes_8294D08
-	.4byte gMetatiles_82C9F90
+	.4byte gTilesetTiles_BurgledHouse
+	.4byte gTilesetPalettes_BurgledHouse
+	.4byte gMetatiles_BurgledHouse
 	.4byte 0x0
-	.4byte gMetatileAttributes_82CA320
+	.4byte gMetatileAttributes_BurgledHouse
 
 	.align 2
-gTileset_82D4FBC::
+gTileset_Dummy3::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8294F08
-	.4byte gTilesetPalettes_8294F18
-	.4byte gMetatiles_82CA404
+	.4byte gTilesetTiles_Dummy3
+	.4byte gTilesetPalettes_Dummy3
+	.4byte gMetatiles_Dummy3
 	.4byte 0x0
-	.4byte gMetatileAttributes_82CA424
+	.4byte gMetatileAttributes_Dummy3
 
 	.align 2
-gTileset_82D4FD4::
+gTileset_Dummy4::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8295118
-	.4byte gTilesetPalettes_829512C
-	.4byte gMetatiles_82CA42C
+	.4byte gTilesetTiles_Dummy4
+	.4byte gTilesetPalettes_Dummy4
+	.4byte gMetatiles_Dummy4
 	.4byte 0x0
-	.4byte gMetatileAttributes_82CA44C
+	.4byte gMetatileAttributes_Dummy4
 
 	.align 2
-gTileset_82D4FEC::
+gTileset_MtEmber::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_829532C
-	.4byte gTilesetPalettes_82967D4
-	.4byte gMetatiles_82CA454
-	.4byte sub_80702B4
-	.4byte gMetatileAttributes_82CB274
+	.4byte gTilesetTiles_MtEmber
+	.4byte gTilesetPalettes_MtEmber
+	.4byte gMetatiles_MtEmber
+	.4byte InitTilesetAnim_MtEmber
+	.4byte gMetatileAttributes_MtEmber
 
 	.align 2
-gTileset_82D5004::
+gTileset_BerryForest::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_82969D4
-	.4byte gTilesetPalettes_8296E90
-	.4byte gMetatiles_82CB5FC
+	.4byte gTilesetTiles_BerryForest
+	.4byte gTilesetPalettes_BerryForest
+	.4byte gMetatiles_BerryForest
 	.4byte 0x0
-	.4byte gMetatileAttributes_82CB89C
+	.4byte gMetatileAttributes_BerryForest
 
 	.align 2
-gTileset_82D501C::
+gTileset_NavelRock::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8297090
-	.4byte gTilesetPalettes_82983BC
-	.4byte gMetatiles_82CB944
+	.4byte gTilesetTiles_NavelRock
+	.4byte gTilesetPalettes_NavelRock
+	.4byte gMetatiles_NavelRock
 	.4byte 0x0
-	.4byte gMetatileAttributes_82CC704
+	.4byte gMetatileAttributes_NavelRock
 
 	.align 2
-gTileset_82D5034::
+gTileset_TanobyRuins::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_82985BC
-	.4byte gTilesetPalettes_8298970
-	.4byte gMetatiles_82CCA74
+	.4byte gTilesetTiles_TanobyRuins
+	.4byte gTilesetPalettes_TanobyRuins
+	.4byte gMetatiles_TanobyRuins
 	.4byte 0x0
-	.4byte gMetatileAttributes_82CD054
+	.4byte gMetatileAttributes_TanobyRuins
 
 	.align 2
-gTileset_82D504C::
+gTileset_SeviiIslands123::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8298B70
-	.4byte gTilesetPalettes_8299AA4
-	.4byte gMetatiles_82CD1CC
+	.4byte gTilesetTiles_SeviiIslands123
+	.4byte gTilesetPalettes_SeviiIslands123
+	.4byte gMetatiles_SeviiIslands123
 	.4byte 0x0
-	.4byte gMetatileAttributes_82CE39C
+	.4byte gMetatileAttributes_SeviiIslands123
 
 	.align 2
-gTileset_82D5064::
+gTileset_SeviiIslands45::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_8299CA4
-	.4byte gTilesetPalettes_829AB04
-	.4byte gMetatiles_82CE810
+	.4byte gTilesetTiles_SeviiIslands45
+	.4byte gTilesetPalettes_SeviiIslands45
+	.4byte gMetatiles_SeviiIslands45
 	.4byte 0x0
-	.4byte gMetatileAttributes_82CF190
+	.4byte gMetatileAttributes_SeviiIslands45
 
 	.align 2
-gTileset_82D507C::
+gTileset_SeviiIslands67::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_829AD04
-	.4byte gTilesetPalettes_829BD64
-	.4byte gMetatiles_82CF3F0
+	.4byte gTilesetTiles_SeviiIslands67
+	.4byte gTilesetPalettes_SeviiIslands67
+	.4byte gMetatiles_SeviiIslands67
 	.4byte 0x0
-	.4byte gMetatileAttributes_82D02F0
+	.4byte gMetatileAttributes_SeviiIslands67
 
 	.align 2
-gTileset_82D5094::
+gTileset_TrainerTower::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_829BF64
-	.4byte gTilesetPalettes_829CEE4
-	.4byte gMetatiles_82D06B0
+	.4byte gTilesetTiles_TrainerTower
+	.4byte gTilesetPalettes_TrainerTower
+	.4byte gMetatiles_TrainerTower
 	.4byte 0x0
-	.4byte gMetatileAttributes_82D18B0
+	.4byte gMetatileAttributes_TrainerTower
 
 	.align 2
-gTileset_82D50AC::
+gTileset_IslandHarbor::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_829D0E4
-	.4byte gTilesetPalettes_829D894
-	.4byte gMetatiles_82D1D30
+	.4byte gTilesetTiles_IslandHarbor
+	.4byte gTilesetPalettes_IslandHarbor
+	.4byte gMetatiles_IslandHarbor
 	.4byte 0x0
-	.4byte gMetatileAttributes_82D2220
+	.4byte gMetatileAttributes_IslandHarbor
 
 	.align 2
-gTileset_82D50C4::
+gTileset_PokemonLeague::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_829DA94
-	.4byte gTilesetPalettes_829EA50
-	.4byte gMetatiles_82D235C
+	.4byte gTilesetTiles_PokemonLeague
+	.4byte gTilesetPalettes_PokemonLeague
+	.4byte gMetatiles_PokemonLeague
 	.4byte 0x0
-	.4byte gMetatileAttributes_82D3B5C
+	.4byte gMetatileAttributes_PokemonLeague
 
 	.align 2
-gTileset_82D50DC::
+gTileset_HallOfFame::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary
 	.2byte 0 @ padding
-	.4byte gTilesetTiles_829EC50
-	.4byte gTilesetPalettes_829F4C8
-	.4byte gMetatiles_82D415C
+	.4byte gTilesetTiles_HallOfFame
+	.4byte gTilesetPalettes_HallOfFame
+	.4byte gMetatiles_HallOfFame
 	.4byte 0x0
-	.4byte gMetatileAttributes_82D48BC
+	.4byte gMetatileAttributes_HallOfFame
 
diff --git a/data/tilesets/metatiles.inc b/data/tilesets/metatiles.inc
index 50c849648..7475f8117 100644
--- a/data/tilesets/metatiles.inc
+++ b/data/tilesets/metatiles.inc
@@ -1,543 +1,543 @@
 	.align 1
-gMetatiles_829F6C8:: @ 829F6C8
-	.incbin "data/tilesets/primary/82D4A94/metatiles.bin"
+gMetatiles_General:: @ 829F6C8
+	.incbin "data/tilesets/primary/general/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82A1EC8:: @ 82A1EC8
-	.incbin "data/tilesets/primary/82D4A94/metatile_attributes.bin"
+gMetatileAttributes_General:: @ 82A1EC8
+	.incbin "data/tilesets/primary/general/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82A28C8:: @ 82A28C8
-	.incbin "data/tilesets/secondary/82D4AAC/metatiles.bin"
+gMetatiles_PalletTown:: @ 82A28C8
+	.incbin "data/tilesets/secondary/pallet_town/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82A2E58:: @ 82A2E58
-	.incbin "data/tilesets/secondary/82D4AAC/metatile_attributes.bin"
+gMetatileAttributes_PalletTown:: @ 82A2E58
+	.incbin "data/tilesets/secondary/pallet_town/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82A2FBC:: @ 82A2FBC
-	.incbin "data/tilesets/secondary/82D4AC4/metatiles.bin"
+gMetatiles_ViridianCity:: @ 82A2FBC
+	.incbin "data/tilesets/secondary/viridian_city/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82A35AC:: @ 82A35AC
-	.incbin "data/tilesets/secondary/82D4AC4/metatile_attributes.bin"
+gMetatileAttributes_ViridianCity:: @ 82A35AC
+	.incbin "data/tilesets/secondary/viridian_city/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82A3728:: @ 82A3728
-	.incbin "data/tilesets/secondary/82D4ADC/metatiles.bin"
+gMetatiles_PewterCity:: @ 82A3728
+	.incbin "data/tilesets/secondary/pewter_city/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82A3C18:: @ 82A3C18
-	.incbin "data/tilesets/secondary/82D4ADC/metatile_attributes.bin"
+gMetatileAttributes_PewterCity:: @ 82A3C18
+	.incbin "data/tilesets/secondary/pewter_city/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82A3D54:: @ 82A3D54
-	.incbin "data/tilesets/secondary/82D4AF4/metatiles.bin"
+gMetatiles_CeruleanCity:: @ 82A3D54
+	.incbin "data/tilesets/secondary/cerulean_city/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82A45B4:: @ 82A45B4
-	.incbin "data/tilesets/secondary/82D4AF4/metatile_attributes.bin"
+gMetatileAttributes_CeruleanCity:: @ 82A45B4
+	.incbin "data/tilesets/secondary/cerulean_city/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82A47CC:: @ 82A47CC
-	.incbin "data/tilesets/secondary/82D4B0C/metatiles.bin"
+gMetatiles_LavenderTown:: @ 82A47CC
+	.incbin "data/tilesets/secondary/lavender_town/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82A556C:: @ 82A556C
-	.incbin "data/tilesets/secondary/82D4B0C/metatile_attributes.bin"
+gMetatileAttributes_LavenderTown:: @ 82A556C
+	.incbin "data/tilesets/secondary/lavender_town/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82A58D4:: @ 82A58D4
-	.incbin "data/tilesets/secondary/82D4B24/metatiles.bin"
+gMetatiles_VermilionCity:: @ 82A58D4
+	.incbin "data/tilesets/secondary/vermilion_city/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82A6354:: @ 82A6354
-	.incbin "data/tilesets/secondary/82D4B24/metatile_attributes.bin"
+gMetatileAttributes_VermilionCity:: @ 82A6354
+	.incbin "data/tilesets/secondary/vermilion_city/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82A65F4:: @ 82A65F4
-	.incbin "data/tilesets/secondary/82D4B3C/metatiles.bin"
+gMetatiles_CeladonCity:: @ 82A65F4
+	.incbin "data/tilesets/secondary/celadon_city/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82A74F4:: @ 82A74F4
-	.incbin "data/tilesets/secondary/82D4B3C/metatile_attributes.bin"
+gMetatileAttributes_CeladonCity:: @ 82A74F4
+	.incbin "data/tilesets/secondary/celadon_city/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82A78B4:: @ 82A78B4
-	.incbin "data/tilesets/secondary/82D4B54/metatiles.bin"
+gMetatiles_FuchsiaCity:: @ 82A78B4
+	.incbin "data/tilesets/secondary/fuchsia_city/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82A84B4:: @ 82A84B4
-	.incbin "data/tilesets/secondary/82D4B54/metatile_attributes.bin"
+gMetatileAttributes_FuchsiaCity:: @ 82A84B4
+	.incbin "data/tilesets/secondary/fuchsia_city/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82A87B4:: @ 82A87B4
-	.incbin "data/tilesets/secondary/82D4B6C/metatiles.bin"
+gMetatiles_CinnabarIsland:: @ 82A87B4
+	.incbin "data/tilesets/secondary/cinnabar_island/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82A8BB4:: @ 82A8BB4
-	.incbin "data/tilesets/secondary/82D4B6C/metatile_attributes.bin"
+gMetatileAttributes_CinnabarIsland:: @ 82A8BB4
+	.incbin "data/tilesets/secondary/cinnabar_island/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82A8CB4:: @ 82A8CB4
-	.incbin "data/tilesets/secondary/82D4B84/metatiles.bin"
+gMetatiles_IndigoPlateau:: @ 82A8CB4
+	.incbin "data/tilesets/secondary/indigo_plateau/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82A97B4:: @ 82A97B4
-	.incbin "data/tilesets/secondary/82D4B84/metatile_attributes.bin"
+gMetatileAttributes_IndigoPlateau:: @ 82A97B4
+	.incbin "data/tilesets/secondary/indigo_plateau/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82A9A74:: @ 82A9A74
-	.incbin "data/tilesets/secondary/82D4B9C/metatiles.bin"
+gMetatiles_SaffronCity:: @ 82A9A74
+	.incbin "data/tilesets/secondary/saffron_city/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82AA6F4:: @ 82AA6F4
-	.incbin "data/tilesets/secondary/82D4B9C/metatile_attributes.bin"
+gMetatileAttributes_SaffronCity:: @ 82AA6F4
+	.incbin "data/tilesets/secondary/saffron_city/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82AAA14:: @ 82AAA14
-	.incbin "data/tilesets/secondary/82D4D04/metatiles.bin"
+gMetatiles_PewterGym:: @ 82AAA14
+	.incbin "data/tilesets/secondary/pewter_gym/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82AB064:: @ 82AB064
-	.incbin "data/tilesets/secondary/82D4D04/metatile_attributes.bin"
+gMetatileAttributes_PewterGym:: @ 82AB064
+	.incbin "data/tilesets/secondary/pewter_gym/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82AB1F8:: @ 82AB1F8
-	.incbin "data/tilesets/secondary/82D4D1C/metatiles.bin"
+gMetatiles_CeruleanGym:: @ 82AB1F8
+	.incbin "data/tilesets/secondary/cerulean_gym/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82AB738:: @ 82AB738
-	.incbin "data/tilesets/secondary/82D4D1C/metatile_attributes.bin"
+gMetatileAttributes_CeruleanGym:: @ 82AB738
+	.incbin "data/tilesets/secondary/cerulean_gym/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82AB888:: @ 82AB888
-	.incbin "data/tilesets/secondary/82D4D34/metatiles.bin"
+gMetatiles_VermilionGym:: @ 82AB888
+	.incbin "data/tilesets/secondary/vermilion_gym/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82ABD38:: @ 82ABD38
-	.incbin "data/tilesets/secondary/82D4D34/metatile_attributes.bin"
+gMetatileAttributes_VermilionGym:: @ 82ABD38
+	.incbin "data/tilesets/secondary/vermilion_gym/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82ABE64:: @ 82ABE64
-	.incbin "data/tilesets/secondary/82D4D4C/metatiles.bin"
+gMetatiles_CeladonGym:: @ 82ABE64
+	.incbin "data/tilesets/secondary/celadon_gym/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82AC264:: @ 82AC264
-	.incbin "data/tilesets/secondary/82D4D4C/metatile_attributes.bin"
+gMetatileAttributes_CeladonGym:: @ 82AC264
+	.incbin "data/tilesets/secondary/celadon_gym/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82AC364:: @ 82AC364
-	.incbin "data/tilesets/secondary/82D4CA4/metatiles.bin"
+gMetatiles_FuchsiaGym:: @ 82AC364
+	.incbin "data/tilesets/secondary/fuchsia_gym/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82AC584:: @ 82AC584
-	.incbin "data/tilesets/secondary/82D4CA4/metatile_attributes.bin"
+gMetatileAttributes_FuchsiaGym:: @ 82AC584
+	.incbin "data/tilesets/secondary/fuchsia_gym/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82AC60C:: @ 82AC60C
-	.incbin "data/tilesets/secondary/82D4D64/metatiles.bin"
+gMetatiles_SaffronGym:: @ 82AC60C
+	.incbin "data/tilesets/secondary/saffron_gym/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82AC8EC:: @ 82AC8EC
-	.incbin "data/tilesets/secondary/82D4D64/metatile_attributes.bin"
+gMetatileAttributes_SaffronGym:: @ 82AC8EC
+	.incbin "data/tilesets/secondary/saffron_gym/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82AC9A4:: @ 82AC9A4
-	.incbin "data/tilesets/secondary/82D4D7C/metatiles.bin"
+gMetatiles_CinnabarGym:: @ 82AC9A4
+	.incbin "data/tilesets/secondary/cinnabar_gym/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82ACFA4:: @ 82ACFA4
-	.incbin "data/tilesets/secondary/82D4D7C/metatile_attributes.bin"
+gMetatileAttributes_CinnabarGym:: @ 82ACFA4
+	.incbin "data/tilesets/secondary/cinnabar_gym/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82AD124:: @ 82AD124
-	.incbin "data/tilesets/secondary/82D4CBC/metatiles.bin"
+gMetatiles_ViridianGym:: @ 82AD124
+	.incbin "data/tilesets/secondary/viridian_gym/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82AD664:: @ 82AD664
-	.incbin "data/tilesets/secondary/82D4CBC/metatile_attributes.bin"
+gMetatileAttributes_ViridianGym:: @ 82AD664
+	.incbin "data/tilesets/secondary/viridian_gym/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82AD7B4:: @ 82AD7B4
-	.incbin "data/tilesets/primary/82D4BB4/metatiles.bin"
+gMetatiles_Building:: @ Building
+	.incbin "data/tilesets/primary/building/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82AFFB4:: @ 82AFFB4
-	.incbin "data/tilesets/primary/82D4BB4/metatile_attributes.bin"
+gMetatileAttributes_Building:: @ Building
+	.incbin "data/tilesets/primary/building/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82B09B4:: @ 82B09B4
-	.incbin "data/tilesets/secondary/82D4C14/metatiles.bin"
+gMetatiles_Dummy1:: @ 82B09B4
+	.incbin "data/tilesets/secondary/dummy1/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82B09D4:: @ 82B09D4
-	.incbin "data/tilesets/secondary/82D4C14/metatile_attributes.bin"
+gMetatileAttributes_Dummy1:: @ 82B09D4
+	.incbin "data/tilesets/secondary/dummy1/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82B09DC:: @ 82B09DC
-	.incbin "data/tilesets/secondary/82D4CD4/metatiles.bin"
+gMetatiles_HoennBuilding:: @ 82B09DC
+	.incbin "data/tilesets/secondary/hoenn_building/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82B29DC:: @ 82B29DC
-	.incbin "data/tilesets/secondary/82D4CD4/metatile_attributes.bin"
+gMetatileAttributes_HoennBuilding:: @ 82B29DC
+	.incbin "data/tilesets/secondary/hoenn_building/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82B31DC:: @ 82B31DC
-	.incbin "data/tilesets/secondary/82D4C5C/metatiles.bin"
+gMetatiles_BikeShop:: @ 82B31DC
+	.incbin "data/tilesets/secondary/bike_shop/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82B347C:: @ 82B347C
-	.incbin "data/tilesets/secondary/82D4C5C/metatile_attributes.bin"
+gMetatileAttributes_BikeShop:: @ 82B347C
+	.incbin "data/tilesets/secondary/bike_shop/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82B3524:: @ 82B3524
-	.incbin "data/tilesets/secondary/82D4BCC/metatiles.bin"
+gMetatiles_Mart:: @ 82B3524
+	.incbin "data/tilesets/secondary/mart/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82B3954:: @ 82B3954
-	.incbin "data/tilesets/secondary/82D4BCC/metatile_attributes.bin"
+gMetatileAttributes_Mart:: @ 82B3954
+	.incbin "data/tilesets/secondary/mart/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82B3A60:: @ 82B3A60
-	.incbin "data/tilesets/secondary/82D4BE4/metatiles.bin"
+gMetatiles_PokemonCenter:: @ 82B3A60
+	.incbin "data/tilesets/secondary/pokemon_center/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82B4A50:: @ 82B4A50
-	.incbin "data/tilesets/secondary/82D4BE4/metatile_attributes.bin"
+gMetatileAttributes_PokemonCenter:: @ 82B4A50
+	.incbin "data/tilesets/secondary/pokemon_center/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82B4E4C:: @ 82B4E4C
-	.incbin "data/tilesets/secondary/82D4C74/metatiles.bin"
+gMetatiles_GenericBuilding1:: @ 82B4E4C
+	.incbin "data/tilesets/secondary/generic_building1/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82B4FCC:: @ 82B4FCC
-	.incbin "data/tilesets/secondary/82D4C74/metatile_attributes.bin"
+gMetatileAttributes_GenericBuilding1:: @ 82B4FCC
+	.incbin "data/tilesets/secondary/generic_building1/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82B502C:: @ 82B502C
-	.incbin "data/tilesets/secondary/82D4BFC/metatiles.bin"
+gMetatiles_Cave:: @ 82B502C
+	.incbin "data/tilesets/secondary/cave/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82B5A3C:: @ 82B5A3C
-	.incbin "data/tilesets/secondary/82D4BFC/metatile_attributes.bin"
+gMetatileAttributes_Cave:: @ 82B5A3C
+	.incbin "data/tilesets/secondary/cave/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82B5CC0:: @ 82B5CC0
-	.incbin "data/tilesets/secondary/82D4CEC/metatiles.bin"
+gMetatiles_GameCorner:: @ 82B5CC0
+	.incbin "data/tilesets/secondary/game_corner/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82B6640:: @ 82B6640
-	.incbin "data/tilesets/secondary/82D4CEC/metatile_attributes.bin"
+gMetatileAttributes_GameCorner:: @ 82B6640
+	.incbin "data/tilesets/secondary/game_corner/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82B68A0:: @ 82B68A0
-	.incbin "data/tilesets/secondary/82D4C8C/metatiles.bin"
+gMetatiles_Lab:: @ 82B68A0
+	.incbin "data/tilesets/secondary/lab/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82B7390:: @ 82B7390
-	.incbin "data/tilesets/secondary/82D4C8C/metatile_attributes.bin"
+gMetatileAttributes_Lab:: @ 82B7390
+	.incbin "data/tilesets/secondary/lab/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82B764C:: @ 82B764C
-	.incbin "data/tilesets/secondary/82D4D94/metatiles.bin"
+gMetatiles_SSAnne:: @ 82B764C
+	.incbin "data/tilesets/secondary/ss_anne/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82B8B4C:: @ 82B8B4C
-	.incbin "data/tilesets/secondary/82D4D94/metatile_attributes.bin"
+gMetatileAttributes_SSAnne:: @ 82B8B4C
+	.incbin "data/tilesets/secondary/ss_anne/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82B908C:: @ 82B908C
-	.incbin "data/tilesets/secondary/82D4DAC/metatiles.bin"
+gMetatiles_Dummy2:: @ 82B908C
+	.incbin "data/tilesets/secondary/dummy2/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82B90AC:: @ 82B90AC
-	.incbin "data/tilesets/secondary/82D4DAC/metatile_attributes.bin"
+gMetatileAttributes_Dummy2:: @ 82B90AC
+	.incbin "data/tilesets/secondary/dummy2/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82B90B4:: @ 82B90B4
-	.incbin "data/tilesets/secondary/82D4DC4/metatiles.bin"
+gMetatiles_ViridianForest:: @ 82B90B4
+	.incbin "data/tilesets/secondary/viridian_forest/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82B9364:: @ 82B9364
-	.incbin "data/tilesets/secondary/82D4DC4/metatile_attributes.bin"
+gMetatileAttributes_ViridianForest:: @ 82B9364
+	.incbin "data/tilesets/secondary/viridian_forest/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82B9410:: @ 82B9410
-	.incbin "data/tilesets/secondary/82D4DDC/metatiles.bin"
+gMetatiles_UnusedGatehouse1:: @ 82B9410
+	.incbin "data/tilesets/secondary/unused_gatehouse1/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82B9B30:: @ 82B9B30
-	.incbin "data/tilesets/secondary/82D4DDC/metatile_attributes.bin"
+gMetatileAttributes_UnusedGatehouse1:: @ 82B9B30
+	.incbin "data/tilesets/secondary/unused_gatehouse1/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82B9CF8:: @ 82B9CF8
-	.incbin "data/tilesets/secondary/82D4DF4/metatiles.bin"
+gMetatiles_RockTunnel:: @ 82B9CF8
+	.incbin "data/tilesets/secondary/rock_tunnel/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82BA678:: @ 82BA678
-	.incbin "data/tilesets/secondary/82D4DF4/metatile_attributes.bin"
+gMetatileAttributes_RockTunnel:: @ 82BA678
+	.incbin "data/tilesets/secondary/rock_tunnel/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82BA8D8:: @ 82BA8D8
-	.incbin "data/tilesets/secondary/82D4E0C/metatiles.bin"
+gMetatiles_DiglettsCave:: @ 82BA8D8
+	.incbin "data/tilesets/secondary/digletts_cave/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82BB2A8:: @ 82BB2A8
-	.incbin "data/tilesets/secondary/82D4E0C/metatile_attributes.bin"
+gMetatileAttributes_DiglettsCave:: @ 82BB2A8
+	.incbin "data/tilesets/secondary/digletts_cave/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82BB51C:: @ 82BB51C
-	.incbin "data/tilesets/secondary/82D4E24/metatiles.bin"
+gMetatiles_SeafoamIslands:: @ 82BB51C
+	.incbin "data/tilesets/secondary/seafoam_islands/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82BC49C:: @ 82BC49C
-	.incbin "data/tilesets/secondary/82D4E24/metatile_attributes.bin"
+gMetatileAttributes_SeafoamIslands:: @ 82BC49C
+	.incbin "data/tilesets/secondary/seafoam_islands/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82BC87C:: @ 82BC87C
-	.incbin "data/tilesets/secondary/82D4E3C/metatiles.bin"
+gMetatiles_UnusedGatehouse2:: @ 82BC87C
+	.incbin "data/tilesets/secondary/unused_gatehouse2/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82BCF9C:: @ 82BCF9C
-	.incbin "data/tilesets/secondary/82D4E3C/metatile_attributes.bin"
+gMetatileAttributes_UnusedGatehouse2:: @ 82BCF9C
+	.incbin "data/tilesets/secondary/unused_gatehouse2/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82BD164:: @ 82BD164
-	.incbin "data/tilesets/secondary/82D4E54/metatiles.bin"
+gMetatiles_CeruleanCave:: @ 82BD164
+	.incbin "data/tilesets/secondary/cerulean_cave/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82BD9C4:: @ 82BD9C4
-	.incbin "data/tilesets/secondary/82D4E54/metatile_attributes.bin"
+gMetatileAttributes_CeruleanCave:: @ 82BD9C4
+	.incbin "data/tilesets/secondary/cerulean_cave/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82BDBDC:: @ 82BDBDC
-	.incbin "data/tilesets/secondary/82D4E6C/metatiles.bin"
+gMetatiles_DepartmentStore:: @ 82BDBDC
+	.incbin "data/tilesets/secondary/department_store/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82BEB3C:: @ 82BEB3C
-	.incbin "data/tilesets/secondary/82D4E6C/metatile_attributes.bin"
+gMetatileAttributes_DepartmentStore:: @ 82BEB3C
+	.incbin "data/tilesets/secondary/department_store/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82BEF14:: @ 82BEF14
-	.incbin "data/tilesets/secondary/82D4E84/metatiles.bin"
+gMetatiles_GenericBuilding2:: @ 82BEF14
+	.incbin "data/tilesets/secondary/generic_building2/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82BFA94:: @ 82BFA94
-	.incbin "data/tilesets/secondary/82D4E84/metatile_attributes.bin"
+gMetatileAttributes_GenericBuilding2:: @ 82BFA94
+	.incbin "data/tilesets/secondary/generic_building2/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82BFD74:: @ 82BFD74
-	.incbin "data/tilesets/secondary/82D4E9C/metatiles.bin"
+gMetatiles_PowerPlant:: @ 82BFD74
+	.incbin "data/tilesets/secondary/power_plant/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82C0704:: @ 82C0704
-	.incbin "data/tilesets/secondary/82D4E9C/metatile_attributes.bin"
+gMetatileAttributes_PowerPlant:: @ 82C0704
+	.incbin "data/tilesets/secondary/power_plant/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82C0968:: @ 82C0968
-	.incbin "data/tilesets/secondary/82D4EB4/metatiles.bin"
+gMetatiles_SeaCottage:: @ 82C0968
+	.incbin "data/tilesets/secondary/sea_cottage/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82C0D18:: @ 82C0D18
-	.incbin "data/tilesets/secondary/82D4EB4/metatile_attributes.bin"
+gMetatileAttributes_SeaCottage:: @ 82C0D18
+	.incbin "data/tilesets/secondary/sea_cottage/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82C0E04:: @ 82C0E04
-	.incbin "data/tilesets/secondary/82D4ECC/metatiles.bin"
+gMetatiles_SilphCo:: @ 82C0E04
+	.incbin "data/tilesets/secondary/silph_co/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82C25A4:: @ 82C25A4
-	.incbin "data/tilesets/secondary/82D4ECC/metatile_attributes.bin"
+gMetatileAttributes_SilphCo:: @ 82C25A4
+	.incbin "data/tilesets/secondary/silph_co/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82C2B8C:: @ 82C2B8C
-	.incbin "data/tilesets/secondary/82D4EE4/metatiles.bin"
+gMetatiles_UndergroundPath:: @ 82C2B8C
+	.incbin "data/tilesets/secondary/underground_path/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82C300C:: @ 82C300C
-	.incbin "data/tilesets/secondary/82D4EE4/metatile_attributes.bin"
+gMetatileAttributes_UndergroundPath:: @ 82C300C
+	.incbin "data/tilesets/secondary/underground_path/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82C312C:: @ 82C312C
-	.incbin "data/tilesets/secondary/82D4EFC/metatiles.bin"
+gMetatiles_PokemonTower:: @ 82C312C
+	.incbin "data/tilesets/secondary/pokemon_tower/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82C377C:: @ 82C377C
-	.incbin "data/tilesets/secondary/82D4EFC/metatile_attributes.bin"
+gMetatileAttributes_PokemonTower:: @ 82C377C
+	.incbin "data/tilesets/secondary/pokemon_tower/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82C3910:: @ 82C3910
-	.incbin "data/tilesets/secondary/82D4F14/metatiles.bin"
+gMetatiles_SafariZoneBuilding:: @ 82C3910
+	.incbin "data/tilesets/secondary/safari_zone_building/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82C4110:: @ 82C4110
-	.incbin "data/tilesets/secondary/82D4F14/metatile_attributes.bin"
+gMetatileAttributes_SafariZoneBuilding:: @ 82C4110
+	.incbin "data/tilesets/secondary/safari_zone_building/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82C4310:: @ 82C4310
-	.incbin "data/tilesets/secondary/82D4F2C/metatiles.bin"
+gMetatiles_PokemonMansion:: @ 82C4310
+	.incbin "data/tilesets/secondary/pokemon_mansion/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82C5330:: @ 82C5330
-	.incbin "data/tilesets/secondary/82D4F2C/metatile_attributes.bin"
+gMetatileAttributes_PokemonMansion:: @ 82C5330
+	.incbin "data/tilesets/secondary/pokemon_mansion/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82C5738:: @ 82C5738
-	.incbin "data/tilesets/secondary/82D4C2C/metatiles.bin"
+gMetatiles_Museum:: @ 82C5738
+	.incbin "data/tilesets/secondary/museum/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82C5FA8:: @ 82C5FA8
-	.incbin "data/tilesets/secondary/82D4C2C/metatile_attributes.bin"
+gMetatileAttributes_Museum:: @ 82C5FA8
+	.incbin "data/tilesets/secondary/museum/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82C61C4:: @ 82C61C4
-	.incbin "data/tilesets/secondary/82D4C44/metatiles.bin"
+gMetatiles_CableClub:: @ 82C61C4
+	.incbin "data/tilesets/secondary/cable_club/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82C71C4:: @ 82C71C4
-	.incbin "data/tilesets/secondary/82D4C44/metatile_attributes.bin"
+gMetatileAttributes_CableClub:: @ 82C71C4
+	.incbin "data/tilesets/secondary/cable_club/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82C75C4:: @ 82C75C4
-	.incbin "data/tilesets/secondary/82D4F44/metatiles.bin"
+gMetatiles_RestaurantHotel:: @ 82C75C4
+	.incbin "data/tilesets/secondary/restaurant_hotel/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82C7C44:: @ 82C7C44
-	.incbin "data/tilesets/secondary/82D4F44/metatile_attributes.bin"
+gMetatileAttributes_RestaurantHotel:: @ 82C7C44
+	.incbin "data/tilesets/secondary/restaurant_hotel/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82C7DE4:: @ 82C7DE4
-	.incbin "data/tilesets/secondary/82D4F5C/metatiles.bin"
+gMetatiles_School:: @ 82C7DE4
+	.incbin "data/tilesets/secondary/school/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82C80C4:: @ 82C80C4
-	.incbin "data/tilesets/secondary/82D4F5C/metatile_attributes.bin"
+gMetatileAttributes_School:: @ 82C80C4
+	.incbin "data/tilesets/secondary/school/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82C817C:: @ 82C817C
-	.incbin "data/tilesets/secondary/82D4F74/metatiles.bin"
+gMetatiles_FanClubDaycare:: @ 82C817C
+	.incbin "data/tilesets/secondary/fan_club_daycare/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82C8C1C:: @ 82C8C1C
-	.incbin "data/tilesets/secondary/82D4F74/metatile_attributes.bin"
+gMetatileAttributes_FanClubDaycare:: @ 82C8C1C
+	.incbin "data/tilesets/secondary/fan_club_daycare/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82C8EC4:: @ 82C8EC4
-	.incbin "data/tilesets/secondary/82D4F8C/metatiles.bin"
+gMetatiles_Condominiums:: @ 82C8EC4
+	.incbin "data/tilesets/secondary/condominiums/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82C9C34:: @ 82C9C34
-	.incbin "data/tilesets/secondary/82D4F8C/metatile_attributes.bin"
+gMetatileAttributes_Condominiums:: @ 82C9C34
+	.incbin "data/tilesets/secondary/condominiums/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82C9F90:: @ 82C9F90
-	.incbin "data/tilesets/secondary/82D4FA4/metatiles.bin"
+gMetatiles_BurgledHouse:: @ 82C9F90
+	.incbin "data/tilesets/secondary/burgled_house/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82CA320:: @ 82CA320
-	.incbin "data/tilesets/secondary/82D4FA4/metatile_attributes.bin"
+gMetatileAttributes_BurgledHouse:: @ 82CA320
+	.incbin "data/tilesets/secondary/burgled_house/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82CA404:: @ 82CA404
-	.incbin "data/tilesets/secondary/82D4FBC/metatiles.bin"
+gMetatiles_Dummy3:: @ 82CA404
+	.incbin "data/tilesets/secondary/dummy3/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82CA424:: @ 82CA424
-	.incbin "data/tilesets/secondary/82D4FBC/metatile_attributes.bin"
+gMetatileAttributes_Dummy3:: @ 82CA424
+	.incbin "data/tilesets/secondary/dummy3/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82CA42C:: @ 82CA42C
-	.incbin "data/tilesets/secondary/82D4FD4/metatiles.bin"
+gMetatiles_Dummy4:: @ 82CA42C
+	.incbin "data/tilesets/secondary/dummy4/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82CA44C:: @ 82CA44C
-	.incbin "data/tilesets/secondary/82D4FD4/metatile_attributes.bin"
+gMetatileAttributes_Dummy4:: @ 82CA44C
+	.incbin "data/tilesets/secondary/dummy4/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82CA454:: @ 82CA454
-	.incbin "data/tilesets/secondary/82D4FEC/metatiles.bin"
+gMetatiles_MtEmber:: @ 82CA454
+	.incbin "data/tilesets/secondary/mt_ember/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82CB274:: @ 82CB274
-	.incbin "data/tilesets/secondary/82D4FEC/metatile_attributes.bin"
+gMetatileAttributes_MtEmber:: @ 82CB274
+	.incbin "data/tilesets/secondary/mt_ember/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82CB5FC:: @ 82CB5FC
-	.incbin "data/tilesets/secondary/82D5004/metatiles.bin"
+gMetatiles_BerryForest:: @ 82CB5FC
+	.incbin "data/tilesets/secondary/berry_forest/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82CB89C:: @ 82CB89C
-	.incbin "data/tilesets/secondary/82D5004/metatile_attributes.bin"
+gMetatileAttributes_BerryForest:: @ 82CB89C
+	.incbin "data/tilesets/secondary/berry_forest/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82CB944:: @ 82CB944
-	.incbin "data/tilesets/secondary/82D501C/metatiles.bin"
+gMetatiles_NavelRock:: @ 82CB944
+	.incbin "data/tilesets/secondary/navel_rock/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82CC704:: @ 82CC704
-	.incbin "data/tilesets/secondary/82D501C/metatile_attributes.bin"
+gMetatileAttributes_NavelRock:: @ 82CC704
+	.incbin "data/tilesets/secondary/navel_rock/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82CCA74:: @ 82CCA74
-	.incbin "data/tilesets/secondary/82D5034/metatiles.bin"
+gMetatiles_TanobyRuins:: @ 82CCA74
+	.incbin "data/tilesets/secondary/tanoby_ruins/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82CD054:: @ 82CD054
-	.incbin "data/tilesets/secondary/82D5034/metatile_attributes.bin"
+gMetatileAttributes_TanobyRuins:: @ 82CD054
+	.incbin "data/tilesets/secondary/tanoby_ruins/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82CD1CC:: @ 82CD1CC
-	.incbin "data/tilesets/secondary/82D504C/metatiles.bin"
+gMetatiles_SeviiIslands123:: @ 82CD1CC
+	.incbin "data/tilesets/secondary/sevii_islands_123/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82CE39C:: @ 82CE39C
-	.incbin "data/tilesets/secondary/82D504C/metatile_attributes.bin"
+gMetatileAttributes_SeviiIslands123:: @ 82CE39C
+	.incbin "data/tilesets/secondary/sevii_islands_123/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82CE810:: @ 82CE810
-	.incbin "data/tilesets/secondary/82D5064/metatiles.bin"
+gMetatiles_SeviiIslands45:: @ 82CE810
+	.incbin "data/tilesets/secondary/sevii_islands_45/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82CF190:: @ 82CF190
-	.incbin "data/tilesets/secondary/82D5064/metatile_attributes.bin"
+gMetatileAttributes_SeviiIslands45:: @ 82CF190
+	.incbin "data/tilesets/secondary/sevii_islands_45/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82CF3F0:: @ 82CF3F0
-	.incbin "data/tilesets/secondary/82D507C/metatiles.bin"
+gMetatiles_SeviiIslands67:: @ 82CF3F0
+	.incbin "data/tilesets/secondary/sevii_islands_67/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82D02F0:: @ 82D02F0
-	.incbin "data/tilesets/secondary/82D507C/metatile_attributes.bin"
+gMetatileAttributes_SeviiIslands67:: @ 82D02F0
+	.incbin "data/tilesets/secondary/sevii_islands_67/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82D06B0:: @ 82D06B0
-	.incbin "data/tilesets/secondary/82D5094/metatiles.bin"
+gMetatiles_TrainerTower:: @ 82D06B0
+	.incbin "data/tilesets/secondary/trainer_tower/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82D18B0:: @ 82D18B0
-	.incbin "data/tilesets/secondary/82D5094/metatile_attributes.bin"
+gMetatileAttributes_TrainerTower:: @ 82D18B0
+	.incbin "data/tilesets/secondary/trainer_tower/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82D1D30:: @ 82D1D30
-	.incbin "data/tilesets/secondary/82D50AC/metatiles.bin"
+gMetatiles_IslandHarbor:: @ 82D1D30
+	.incbin "data/tilesets/secondary/island_harbor/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82D2220:: @ 82D2220
-	.incbin "data/tilesets/secondary/82D50AC/metatile_attributes.bin"
+gMetatileAttributes_IslandHarbor:: @ 82D2220
+	.incbin "data/tilesets/secondary/island_harbor/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82D235C:: @ 82D235C
-	.incbin "data/tilesets/secondary/82D50C4/metatiles.bin"
+gMetatiles_PokemonLeague:: @ 82D235C
+	.incbin "data/tilesets/secondary/pokemon_league/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82D3B5C:: @ 82D3B5C
-	.incbin "data/tilesets/secondary/82D50C4/metatile_attributes.bin"
+gMetatileAttributes_PokemonLeague:: @ 82D3B5C
+	.incbin "data/tilesets/secondary/pokemon_league/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_82D415C:: @ 82D415C
-	.incbin "data/tilesets/secondary/82D50DC/metatiles.bin"
+gMetatiles_HallOfFame:: @ 82D415C
+	.incbin "data/tilesets/secondary/hall_of_fame/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_82D48BC:: @ 82D48BC
-	.incbin "data/tilesets/secondary/82D50DC/metatile_attributes.bin"
+gMetatileAttributes_HallOfFame:: @ 82D48BC
+	.incbin "data/tilesets/secondary/hall_of_fame/metatile_attributes.bin"
diff --git a/data/tilesets/primary/82D4BB4/metatile_attributes.bin b/data/tilesets/primary/building/metatile_attributes.bin
index 3dbc31883..3dbc31883 100644
--- a/data/tilesets/primary/82D4BB4/metatile_attributes.bin
+++ b/data/tilesets/primary/building/metatile_attributes.bin
diff --git a/data/tilesets/primary/82D4BB4/metatiles.bin b/data/tilesets/primary/building/metatiles.bin
index 024797c8e..024797c8e 100644
--- a/data/tilesets/primary/82D4BB4/metatiles.bin
+++ b/data/tilesets/primary/building/metatiles.bin
diff --git a/data/tilesets/primary/82D4BB4/palettes/0.pal b/data/tilesets/primary/building/palettes/0.pal
index 3b6416376..3b6416376 100644
--- a/data/tilesets/primary/82D4BB4/palettes/0.pal
+++ b/data/tilesets/primary/building/palettes/0.pal
diff --git a/data/tilesets/primary/82D4BB4/palettes/1.pal b/data/tilesets/primary/building/palettes/1.pal
index 66561f6d3..66561f6d3 100644
--- a/data/tilesets/primary/82D4BB4/palettes/1.pal
+++ b/data/tilesets/primary/building/palettes/1.pal
diff --git a/data/tilesets/primary/82D4A94/palettes/10.pal b/data/tilesets/primary/building/palettes/10.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/primary/82D4A94/palettes/10.pal
+++ b/data/tilesets/primary/building/palettes/10.pal
diff --git a/data/tilesets/primary/82D4A94/palettes/11.pal b/data/tilesets/primary/building/palettes/11.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/primary/82D4A94/palettes/11.pal
+++ b/data/tilesets/primary/building/palettes/11.pal
diff --git a/data/tilesets/primary/82D4BB4/palettes/12.pal b/data/tilesets/primary/building/palettes/12.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/primary/82D4BB4/palettes/12.pal
+++ b/data/tilesets/primary/building/palettes/12.pal
diff --git a/data/tilesets/primary/82D4A94/palettes/13.pal b/data/tilesets/primary/building/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/primary/82D4A94/palettes/13.pal
+++ b/data/tilesets/primary/building/palettes/13.pal
diff --git a/data/tilesets/primary/82D4A94/palettes/14.pal b/data/tilesets/primary/building/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/primary/82D4A94/palettes/14.pal
+++ b/data/tilesets/primary/building/palettes/14.pal
diff --git a/data/tilesets/primary/82D4BB4/palettes/15.pal b/data/tilesets/primary/building/palettes/15.pal
index 92e7ed309..92e7ed309 100644
--- a/data/tilesets/primary/82D4BB4/palettes/15.pal
+++ b/data/tilesets/primary/building/palettes/15.pal
diff --git a/data/tilesets/primary/82D4BB4/palettes/2.pal b/data/tilesets/primary/building/palettes/2.pal
index 87a022102..87a022102 100644
--- a/data/tilesets/primary/82D4BB4/palettes/2.pal
+++ b/data/tilesets/primary/building/palettes/2.pal
diff --git a/data/tilesets/primary/82D4BB4/palettes/3.pal b/data/tilesets/primary/building/palettes/3.pal
index 783496dcd..783496dcd 100644
--- a/data/tilesets/primary/82D4BB4/palettes/3.pal
+++ b/data/tilesets/primary/building/palettes/3.pal
diff --git a/data/tilesets/primary/82D4BB4/palettes/4.pal b/data/tilesets/primary/building/palettes/4.pal
index 89eace605..89eace605 100644
--- a/data/tilesets/primary/82D4BB4/palettes/4.pal
+++ b/data/tilesets/primary/building/palettes/4.pal
diff --git a/data/tilesets/primary/82D4BB4/palettes/5.pal b/data/tilesets/primary/building/palettes/5.pal
index c7780e5c7..c7780e5c7 100644
--- a/data/tilesets/primary/82D4BB4/palettes/5.pal
+++ b/data/tilesets/primary/building/palettes/5.pal
diff --git a/data/tilesets/primary/82D4BB4/palettes/6.pal b/data/tilesets/primary/building/palettes/6.pal
index 1d08ce9a2..1d08ce9a2 100644
--- a/data/tilesets/primary/82D4BB4/palettes/6.pal
+++ b/data/tilesets/primary/building/palettes/6.pal
diff --git a/data/tilesets/primary/82D4BB4/palettes/7.pal b/data/tilesets/primary/building/palettes/7.pal
index c1e7c3d5c..c1e7c3d5c 100644
--- a/data/tilesets/primary/82D4BB4/palettes/7.pal
+++ b/data/tilesets/primary/building/palettes/7.pal
diff --git a/data/tilesets/primary/82D4BB4/palettes/8.pal b/data/tilesets/primary/building/palettes/8.pal
index c1e7c3d5c..c1e7c3d5c 100644
--- a/data/tilesets/primary/82D4BB4/palettes/8.pal
+++ b/data/tilesets/primary/building/palettes/8.pal
diff --git a/data/tilesets/primary/82D4A94/palettes/9.pal b/data/tilesets/primary/building/palettes/9.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/primary/82D4A94/palettes/9.pal
+++ b/data/tilesets/primary/building/palettes/9.pal
diff --git a/data/tilesets/primary/82D4BB4/tiles.png b/data/tilesets/primary/building/tiles.png
index 8d864f27e..8d864f27e 100644
--- a/data/tilesets/primary/82D4BB4/tiles.png
+++ b/data/tilesets/primary/building/tiles.png
diff --git a/data/tilesets/primary/82D4A94/metatile_attributes.bin b/data/tilesets/primary/general/metatile_attributes.bin
index 45f6f352e..45f6f352e 100644
--- a/data/tilesets/primary/82D4A94/metatile_attributes.bin
+++ b/data/tilesets/primary/general/metatile_attributes.bin
diff --git a/data/tilesets/primary/82D4A94/metatiles.bin b/data/tilesets/primary/general/metatiles.bin
index 7a228eeae..7a228eeae 100644
--- a/data/tilesets/primary/82D4A94/metatiles.bin
+++ b/data/tilesets/primary/general/metatiles.bin
diff --git a/data/tilesets/primary/82D4A94/palettes/0.pal b/data/tilesets/primary/general/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/primary/82D4A94/palettes/0.pal
+++ b/data/tilesets/primary/general/palettes/0.pal
diff --git a/data/tilesets/primary/82D4A94/palettes/1.pal b/data/tilesets/primary/general/palettes/1.pal
index 09828f4f1..09828f4f1 100644
--- a/data/tilesets/primary/82D4A94/palettes/1.pal
+++ b/data/tilesets/primary/general/palettes/1.pal
diff --git a/data/tilesets/primary/82D4BB4/palettes/10.pal b/data/tilesets/primary/general/palettes/10.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/primary/82D4BB4/palettes/10.pal
+++ b/data/tilesets/primary/general/palettes/10.pal
diff --git a/data/tilesets/primary/82D4BB4/palettes/11.pal b/data/tilesets/primary/general/palettes/11.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/primary/82D4BB4/palettes/11.pal
+++ b/data/tilesets/primary/general/palettes/11.pal
diff --git a/data/tilesets/primary/82D4A94/palettes/12.pal b/data/tilesets/primary/general/palettes/12.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/primary/82D4A94/palettes/12.pal
+++ b/data/tilesets/primary/general/palettes/12.pal
diff --git a/data/tilesets/primary/82D4BB4/palettes/13.pal b/data/tilesets/primary/general/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/primary/82D4BB4/palettes/13.pal
+++ b/data/tilesets/primary/general/palettes/13.pal
diff --git a/data/tilesets/primary/82D4BB4/palettes/14.pal b/data/tilesets/primary/general/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/primary/82D4BB4/palettes/14.pal
+++ b/data/tilesets/primary/general/palettes/14.pal
diff --git a/data/tilesets/primary/82D4A94/palettes/15.pal b/data/tilesets/primary/general/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/primary/82D4A94/palettes/15.pal
+++ b/data/tilesets/primary/general/palettes/15.pal
diff --git a/data/tilesets/primary/82D4A94/palettes/2.pal b/data/tilesets/primary/general/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/primary/82D4A94/palettes/2.pal
+++ b/data/tilesets/primary/general/palettes/2.pal
diff --git a/data/tilesets/primary/82D4A94/palettes/3.pal b/data/tilesets/primary/general/palettes/3.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/primary/82D4A94/palettes/3.pal
+++ b/data/tilesets/primary/general/palettes/3.pal
diff --git a/data/tilesets/primary/82D4A94/palettes/4.pal b/data/tilesets/primary/general/palettes/4.pal
index 9b094a6aa..9b094a6aa 100644
--- a/data/tilesets/primary/82D4A94/palettes/4.pal
+++ b/data/tilesets/primary/general/palettes/4.pal
diff --git a/data/tilesets/primary/82D4A94/palettes/5.pal b/data/tilesets/primary/general/palettes/5.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/primary/82D4A94/palettes/5.pal
+++ b/data/tilesets/primary/general/palettes/5.pal
diff --git a/data/tilesets/primary/82D4A94/palettes/6.pal b/data/tilesets/primary/general/palettes/6.pal
index cdf41b298..cdf41b298 100644
--- a/data/tilesets/primary/82D4A94/palettes/6.pal
+++ b/data/tilesets/primary/general/palettes/6.pal
diff --git a/data/tilesets/primary/82D4A94/palettes/7.pal b/data/tilesets/primary/general/palettes/7.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/primary/82D4A94/palettes/7.pal
+++ b/data/tilesets/primary/general/palettes/7.pal
diff --git a/data/tilesets/primary/82D4A94/palettes/8.pal b/data/tilesets/primary/general/palettes/8.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/primary/82D4A94/palettes/8.pal
+++ b/data/tilesets/primary/general/palettes/8.pal
diff --git a/data/tilesets/primary/82D4BB4/palettes/9.pal b/data/tilesets/primary/general/palettes/9.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/primary/82D4BB4/palettes/9.pal
+++ b/data/tilesets/primary/general/palettes/9.pal
diff --git a/data/tilesets/primary/82D4A94/tiles.png b/data/tilesets/primary/general/tiles.png
index 84ba7b2f9..84ba7b2f9 100644
--- a/data/tilesets/primary/82D4A94/tiles.png
+++ b/data/tilesets/primary/general/tiles.png
diff --git a/data/tilesets/secondary/82D5004/metatile_attributes.bin b/data/tilesets/secondary/berry_forest/metatile_attributes.bin
index 6d6c6d544..6d6c6d544 100644
--- a/data/tilesets/secondary/82D5004/metatile_attributes.bin
+++ b/data/tilesets/secondary/berry_forest/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D5004/metatiles.bin b/data/tilesets/secondary/berry_forest/metatiles.bin
index fb47747c4..fb47747c4 100644
--- a/data/tilesets/secondary/82D5004/metatiles.bin
+++ b/data/tilesets/secondary/berry_forest/metatiles.bin
diff --git a/data/tilesets/secondary/82D4B3C/palettes/0.pal b/data/tilesets/secondary/berry_forest/palettes/0.pal
index 7af5bb7d2..7af5bb7d2 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/0.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4B3C/palettes/1.pal b/data/tilesets/secondary/berry_forest/palettes/1.pal
index 391d1e3d1..391d1e3d1 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/1.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4DC4/palettes/10.pal b/data/tilesets/secondary/berry_forest/palettes/10.pal
index 746437492..746437492 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/10.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/10.pal
diff --git a/data/tilesets/secondary/82D5004/palettes/11.pal b/data/tilesets/secondary/berry_forest/palettes/11.pal
index 6fe747b2d..6fe747b2d 100644
--- a/data/tilesets/secondary/82D5004/palettes/11.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4C74/palettes/12.pal b/data/tilesets/secondary/berry_forest/palettes/12.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4C74/palettes/12.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4AAC/palettes/13.pal b/data/tilesets/secondary/berry_forest/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/13.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4AAC/palettes/14.pal b/data/tilesets/secondary/berry_forest/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/14.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4AAC/palettes/15.pal b/data/tilesets/secondary/berry_forest/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/15.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4ADC/palettes/2.pal b/data/tilesets/secondary/berry_forest/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/2.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4ADC/palettes/3.pal b/data/tilesets/secondary/berry_forest/palettes/3.pal
index 9581f2cd8..9581f2cd8 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/3.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4ADC/palettes/4.pal b/data/tilesets/secondary/berry_forest/palettes/4.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/4.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4ADC/palettes/5.pal b/data/tilesets/secondary/berry_forest/palettes/5.pal
index 3a2db72a7..3a2db72a7 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/5.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4ADC/palettes/6.pal b/data/tilesets/secondary/berry_forest/palettes/6.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/6.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4B84/palettes/7.pal b/data/tilesets/secondary/berry_forest/palettes/7.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4B84/palettes/7.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4DC4/palettes/8.pal b/data/tilesets/secondary/berry_forest/palettes/8.pal
index 650a35cc8..650a35cc8 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/8.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4DC4/palettes/9.pal b/data/tilesets/secondary/berry_forest/palettes/9.pal
index df2d04037..df2d04037 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/9.pal
+++ b/data/tilesets/secondary/berry_forest/palettes/9.pal
diff --git a/data/tilesets/secondary/82D5004/tiles.png b/data/tilesets/secondary/berry_forest/tiles.png
index dacbc0120..dacbc0120 100644
--- a/data/tilesets/secondary/82D5004/tiles.png
+++ b/data/tilesets/secondary/berry_forest/tiles.png
diff --git a/data/tilesets/secondary/82D4C5C/metatile_attributes.bin b/data/tilesets/secondary/bike_shop/metatile_attributes.bin
index d1a4900c5..d1a4900c5 100644
--- a/data/tilesets/secondary/82D4C5C/metatile_attributes.bin
+++ b/data/tilesets/secondary/bike_shop/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4C5C/metatiles.bin b/data/tilesets/secondary/bike_shop/metatiles.bin
index f1c0ab02d..f1c0ab02d 100644
--- a/data/tilesets/secondary/82D4C5C/metatiles.bin
+++ b/data/tilesets/secondary/bike_shop/metatiles.bin
diff --git a/data/tilesets/secondary/82D4C5C/palettes/0.pal b/data/tilesets/secondary/bike_shop/palettes/0.pal
index 4b44e19f4..4b44e19f4 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/0.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4C5C/palettes/1.pal b/data/tilesets/secondary/bike_shop/palettes/1.pal
index a39ca6aa8..a39ca6aa8 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/1.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4C5C/palettes/10.pal b/data/tilesets/secondary/bike_shop/palettes/10.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/10.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4C5C/palettes/11.pal b/data/tilesets/secondary/bike_shop/palettes/11.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/11.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4C5C/palettes/12.pal b/data/tilesets/secondary/bike_shop/palettes/12.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/12.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4AC4/palettes/13.pal b/data/tilesets/secondary/bike_shop/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/13.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4AC4/palettes/14.pal b/data/tilesets/secondary/bike_shop/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/14.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4AC4/palettes/15.pal b/data/tilesets/secondary/bike_shop/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/15.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4C5C/palettes/2.pal b/data/tilesets/secondary/bike_shop/palettes/2.pal
index 5a4f127be..5a4f127be 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/2.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4C5C/palettes/3.pal b/data/tilesets/secondary/bike_shop/palettes/3.pal
index c84fa4a58..c84fa4a58 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/3.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4C14/palettes/4.pal b/data/tilesets/secondary/bike_shop/palettes/4.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C14/palettes/4.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4C14/palettes/5.pal b/data/tilesets/secondary/bike_shop/palettes/5.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C14/palettes/5.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4AAC/palettes/6.pal b/data/tilesets/secondary/bike_shop/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/6.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4C5C/palettes/7.pal b/data/tilesets/secondary/bike_shop/palettes/7.pal
index a71b8fee2..a71b8fee2 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/7.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4C5C/palettes/8.pal b/data/tilesets/secondary/bike_shop/palettes/8.pal
index 0a666a9c9..0a666a9c9 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/8.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4C5C/palettes/9.pal b/data/tilesets/secondary/bike_shop/palettes/9.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/9.pal
+++ b/data/tilesets/secondary/bike_shop/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4C5C/tiles.png b/data/tilesets/secondary/bike_shop/tiles.png
index 90124ff4a..90124ff4a 100644
--- a/data/tilesets/secondary/82D4C5C/tiles.png
+++ b/data/tilesets/secondary/bike_shop/tiles.png
diff --git a/data/tilesets/secondary/82D4FA4/metatile_attributes.bin b/data/tilesets/secondary/burgled_house/metatile_attributes.bin
index db0f7817e..db0f7817e 100644
--- a/data/tilesets/secondary/82D4FA4/metatile_attributes.bin
+++ b/data/tilesets/secondary/burgled_house/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4FA4/metatiles.bin b/data/tilesets/secondary/burgled_house/metatiles.bin
index dfe78c910..dfe78c910 100644
--- a/data/tilesets/secondary/82D4FA4/metatiles.bin
+++ b/data/tilesets/secondary/burgled_house/metatiles.bin
diff --git a/data/tilesets/secondary/82D4EE4/palettes/0.pal b/data/tilesets/secondary/burgled_house/palettes/0.pal
index 6d876039d..6d876039d 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/0.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4D04/palettes/1.pal b/data/tilesets/secondary/burgled_house/palettes/1.pal
index 66561f6d3..66561f6d3 100644
--- a/data/tilesets/secondary/82D4D04/palettes/1.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4BCC/palettes/10.pal b/data/tilesets/secondary/burgled_house/palettes/10.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/10.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4BCC/palettes/11.pal b/data/tilesets/secondary/burgled_house/palettes/11.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/11.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4DC4/palettes/12.pal b/data/tilesets/secondary/burgled_house/palettes/12.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/12.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4ADC/palettes/13.pal b/data/tilesets/secondary/burgled_house/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/13.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4ADC/palettes/14.pal b/data/tilesets/secondary/burgled_house/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/14.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4ADC/palettes/15.pal b/data/tilesets/secondary/burgled_house/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/15.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4D04/palettes/2.pal b/data/tilesets/secondary/burgled_house/palettes/2.pal
index 87a022102..87a022102 100644
--- a/data/tilesets/secondary/82D4D04/palettes/2.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4D04/palettes/3.pal b/data/tilesets/secondary/burgled_house/palettes/3.pal
index 783496dcd..783496dcd 100644
--- a/data/tilesets/secondary/82D4D04/palettes/3.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4D04/palettes/4.pal b/data/tilesets/secondary/burgled_house/palettes/4.pal
index 89eace605..89eace605 100644
--- a/data/tilesets/secondary/82D4D04/palettes/4.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4D04/palettes/5.pal b/data/tilesets/secondary/burgled_house/palettes/5.pal
index 0eef3df8e..0eef3df8e 100644
--- a/data/tilesets/secondary/82D4D04/palettes/5.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4D04/palettes/6.pal b/data/tilesets/secondary/burgled_house/palettes/6.pal
index 1d08ce9a2..1d08ce9a2 100644
--- a/data/tilesets/secondary/82D4D04/palettes/6.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4C74/palettes/7.pal b/data/tilesets/secondary/burgled_house/palettes/7.pal
index c1e7c3d5c..c1e7c3d5c 100644
--- a/data/tilesets/secondary/82D4C74/palettes/7.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4FA4/palettes/8.pal b/data/tilesets/secondary/burgled_house/palettes/8.pal
index c1e7c3d5c..c1e7c3d5c 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/8.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4C74/palettes/9.pal b/data/tilesets/secondary/burgled_house/palettes/9.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4C74/palettes/9.pal
+++ b/data/tilesets/secondary/burgled_house/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4FA4/tiles.png b/data/tilesets/secondary/burgled_house/tiles.png
index 9fcf94314..9fcf94314 100644
--- a/data/tilesets/secondary/82D4FA4/tiles.png
+++ b/data/tilesets/secondary/burgled_house/tiles.png
diff --git a/data/tilesets/secondary/82D4C44/metatile_attributes.bin b/data/tilesets/secondary/cable_club/metatile_attributes.bin
index 53505839d..53505839d 100644
--- a/data/tilesets/secondary/82D4C44/metatile_attributes.bin
+++ b/data/tilesets/secondary/cable_club/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4C44/metatiles.bin b/data/tilesets/secondary/cable_club/metatiles.bin
index 0e2f2a6c3..0e2f2a6c3 100644
--- a/data/tilesets/secondary/82D4C44/metatiles.bin
+++ b/data/tilesets/secondary/cable_club/metatiles.bin
diff --git a/data/tilesets/secondary/82D4C14/palettes/0.pal b/data/tilesets/secondary/cable_club/palettes/0.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C14/palettes/0.pal
+++ b/data/tilesets/secondary/cable_club/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4C14/palettes/1.pal b/data/tilesets/secondary/cable_club/palettes/1.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C14/palettes/1.pal
+++ b/data/tilesets/secondary/cable_club/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4C44/palettes/10.pal b/data/tilesets/secondary/cable_club/palettes/10.pal
index ab8f75e5a..ab8f75e5a 100644
--- a/data/tilesets/secondary/82D4C44/palettes/10.pal
+++ b/data/tilesets/secondary/cable_club/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4C44/palettes/11.pal b/data/tilesets/secondary/cable_club/palettes/11.pal
index 468d7212c..468d7212c 100644
--- a/data/tilesets/secondary/82D4C44/palettes/11.pal
+++ b/data/tilesets/secondary/cable_club/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4C44/palettes/12.pal b/data/tilesets/secondary/cable_club/palettes/12.pal
index 05794ac82..05794ac82 100644
--- a/data/tilesets/secondary/82D4C44/palettes/12.pal
+++ b/data/tilesets/secondary/cable_club/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4AF4/palettes/13.pal b/data/tilesets/secondary/cable_club/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/13.pal
+++ b/data/tilesets/secondary/cable_club/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4AF4/palettes/14.pal b/data/tilesets/secondary/cable_club/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/14.pal
+++ b/data/tilesets/secondary/cable_club/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4AF4/palettes/15.pal b/data/tilesets/secondary/cable_club/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/15.pal
+++ b/data/tilesets/secondary/cable_club/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4C14/palettes/2.pal b/data/tilesets/secondary/cable_club/palettes/2.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C14/palettes/2.pal
+++ b/data/tilesets/secondary/cable_club/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4C14/palettes/3.pal b/data/tilesets/secondary/cable_club/palettes/3.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C14/palettes/3.pal
+++ b/data/tilesets/secondary/cable_club/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4C44/palettes/4.pal b/data/tilesets/secondary/cable_club/palettes/4.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C44/palettes/4.pal
+++ b/data/tilesets/secondary/cable_club/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4C44/palettes/5.pal b/data/tilesets/secondary/cable_club/palettes/5.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C44/palettes/5.pal
+++ b/data/tilesets/secondary/cable_club/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4B3C/palettes/6.pal b/data/tilesets/secondary/cable_club/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/6.pal
+++ b/data/tilesets/secondary/cable_club/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4C44/palettes/7.pal b/data/tilesets/secondary/cable_club/palettes/7.pal
index 00ca6903f..00ca6903f 100644
--- a/data/tilesets/secondary/82D4C44/palettes/7.pal
+++ b/data/tilesets/secondary/cable_club/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4C44/palettes/8.pal b/data/tilesets/secondary/cable_club/palettes/8.pal
index 43d6db90d..43d6db90d 100644
--- a/data/tilesets/secondary/82D4C44/palettes/8.pal
+++ b/data/tilesets/secondary/cable_club/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4C44/palettes/9.pal b/data/tilesets/secondary/cable_club/palettes/9.pal
index 87857607f..87857607f 100644
--- a/data/tilesets/secondary/82D4C44/palettes/9.pal
+++ b/data/tilesets/secondary/cable_club/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4C44/tiles.png b/data/tilesets/secondary/cable_club/tiles.png
index f71f29432..f71f29432 100644
--- a/data/tilesets/secondary/82D4C44/tiles.png
+++ b/data/tilesets/secondary/cable_club/tiles.png
diff --git a/data/tilesets/secondary/82D4BFC/metatile_attributes.bin b/data/tilesets/secondary/cave/metatile_attributes.bin
index 510f0fdf1..510f0fdf1 100644
--- a/data/tilesets/secondary/82D4BFC/metatile_attributes.bin
+++ b/data/tilesets/secondary/cave/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4BFC/metatiles.bin b/data/tilesets/secondary/cave/metatiles.bin
index 9f35adc11..9f35adc11 100644
--- a/data/tilesets/secondary/82D4BFC/metatiles.bin
+++ b/data/tilesets/secondary/cave/metatiles.bin
diff --git a/data/tilesets/secondary/82D4AC4/palettes/0.pal b/data/tilesets/secondary/cave/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/0.pal
+++ b/data/tilesets/secondary/cave/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4B24/palettes/1.pal b/data/tilesets/secondary/cave/palettes/1.pal
index 09828f4f1..09828f4f1 100644
--- a/data/tilesets/secondary/82D4B24/palettes/1.pal
+++ b/data/tilesets/secondary/cave/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4BFC/palettes/10.pal b/data/tilesets/secondary/cave/palettes/10.pal
index 937405d15..937405d15 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/10.pal
+++ b/data/tilesets/secondary/cave/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4BFC/palettes/11.pal b/data/tilesets/secondary/cave/palettes/11.pal
index bb4f4867c..bb4f4867c 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/11.pal
+++ b/data/tilesets/secondary/cave/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4BFC/palettes/12.pal b/data/tilesets/secondary/cave/palettes/12.pal
index 583384664..583384664 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/12.pal
+++ b/data/tilesets/secondary/cave/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4B0C/palettes/13.pal b/data/tilesets/secondary/cave/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/13.pal
+++ b/data/tilesets/secondary/cave/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4B0C/palettes/14.pal b/data/tilesets/secondary/cave/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/14.pal
+++ b/data/tilesets/secondary/cave/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4B3C/palettes/15.pal b/data/tilesets/secondary/cave/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/15.pal
+++ b/data/tilesets/secondary/cave/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4B0C/palettes/2.pal b/data/tilesets/secondary/cave/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/2.pal
+++ b/data/tilesets/secondary/cave/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4BFC/palettes/3.pal b/data/tilesets/secondary/cave/palettes/3.pal
index ef7460f41..ef7460f41 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/3.pal
+++ b/data/tilesets/secondary/cave/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4BFC/palettes/4.pal b/data/tilesets/secondary/cave/palettes/4.pal
index e83c6b367..e83c6b367 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/4.pal
+++ b/data/tilesets/secondary/cave/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4B0C/palettes/5.pal b/data/tilesets/secondary/cave/palettes/5.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/5.pal
+++ b/data/tilesets/secondary/cave/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4B24/palettes/6.pal b/data/tilesets/secondary/cave/palettes/6.pal
index 9bad44649..9bad44649 100644
--- a/data/tilesets/secondary/82D4B24/palettes/6.pal
+++ b/data/tilesets/secondary/cave/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4BFC/palettes/7.pal b/data/tilesets/secondary/cave/palettes/7.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/7.pal
+++ b/data/tilesets/secondary/cave/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4BFC/palettes/8.pal b/data/tilesets/secondary/cave/palettes/8.pal
index 1c8d33fac..1c8d33fac 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/8.pal
+++ b/data/tilesets/secondary/cave/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4BFC/palettes/9.pal b/data/tilesets/secondary/cave/palettes/9.pal
index 3795f6c6a..3795f6c6a 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/9.pal
+++ b/data/tilesets/secondary/cave/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4BFC/tiles.png b/data/tilesets/secondary/cave/tiles.png
index 8e0f64a78..8e0f64a78 100644
--- a/data/tilesets/secondary/82D4BFC/tiles.png
+++ b/data/tilesets/secondary/cave/tiles.png
diff --git a/data/tilesets/secondary/82D4B3C/metatile_attributes.bin b/data/tilesets/secondary/celadon_city/metatile_attributes.bin
index 5dd139155..5dd139155 100644
--- a/data/tilesets/secondary/82D4B3C/metatile_attributes.bin
+++ b/data/tilesets/secondary/celadon_city/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4B3C/metatiles.bin b/data/tilesets/secondary/celadon_city/metatiles.bin
index 3bfb9d239..3bfb9d239 100644
--- a/data/tilesets/secondary/82D4B3C/metatiles.bin
+++ b/data/tilesets/secondary/celadon_city/metatiles.bin
diff --git a/data/tilesets/secondary/82D4DC4/palettes/0.pal b/data/tilesets/secondary/celadon_city/palettes/0.pal
index 7af5bb7d2..7af5bb7d2 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/0.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4B54/palettes/1.pal b/data/tilesets/secondary/celadon_city/palettes/1.pal
index 391d1e3d1..391d1e3d1 100644
--- a/data/tilesets/secondary/82D4B54/palettes/1.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4B3C/palettes/10.pal b/data/tilesets/secondary/celadon_city/palettes/10.pal
index 361b133e6..361b133e6 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/10.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4B3C/palettes/11.pal b/data/tilesets/secondary/celadon_city/palettes/11.pal
index 00caf8dfc..00caf8dfc 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/11.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4B3C/palettes/12.pal b/data/tilesets/secondary/celadon_city/palettes/12.pal
index 4257575ae..4257575ae 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/12.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4B24/palettes/13.pal b/data/tilesets/secondary/celadon_city/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B24/palettes/13.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4B24/palettes/14.pal b/data/tilesets/secondary/celadon_city/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B24/palettes/14.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4B54/palettes/15.pal b/data/tilesets/secondary/celadon_city/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B54/palettes/15.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4B3C/palettes/2.pal b/data/tilesets/secondary/celadon_city/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/2.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4AF4/palettes/3.pal b/data/tilesets/secondary/celadon_city/palettes/3.pal
index 973765509..973765509 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/3.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4B3C/palettes/4.pal b/data/tilesets/secondary/celadon_city/palettes/4.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/4.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4B3C/palettes/5.pal b/data/tilesets/secondary/celadon_city/palettes/5.pal
index 3a2db72a7..3a2db72a7 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/5.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4BCC/palettes/6.pal b/data/tilesets/secondary/celadon_city/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/6.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4B3C/palettes/7.pal b/data/tilesets/secondary/celadon_city/palettes/7.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/7.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4B3C/palettes/8.pal b/data/tilesets/secondary/celadon_city/palettes/8.pal
index 86930c1d1..86930c1d1 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/8.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4B3C/palettes/9.pal b/data/tilesets/secondary/celadon_city/palettes/9.pal
index 5dc82505a..5dc82505a 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/9.pal
+++ b/data/tilesets/secondary/celadon_city/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4B3C/tiles.png b/data/tilesets/secondary/celadon_city/tiles.png
index db18cb938..db18cb938 100644
--- a/data/tilesets/secondary/82D4B3C/tiles.png
+++ b/data/tilesets/secondary/celadon_city/tiles.png
diff --git a/data/tilesets/secondary/82D4D4C/metatile_attributes.bin b/data/tilesets/secondary/celadon_gym/metatile_attributes.bin
index def1ee695..def1ee695 100644
--- a/data/tilesets/secondary/82D4D4C/metatile_attributes.bin
+++ b/data/tilesets/secondary/celadon_gym/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4D4C/metatiles.bin b/data/tilesets/secondary/celadon_gym/metatiles.bin
index f3f58a44d..f3f58a44d 100644
--- a/data/tilesets/secondary/82D4D4C/metatiles.bin
+++ b/data/tilesets/secondary/celadon_gym/metatiles.bin
diff --git a/data/tilesets/secondary/82D4BCC/palettes/0.pal b/data/tilesets/secondary/celadon_gym/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/0.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4C2C/palettes/1.pal b/data/tilesets/secondary/celadon_gym/palettes/1.pal
index 69f3f0b9e..69f3f0b9e 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/1.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4C14/palettes/10.pal b/data/tilesets/secondary/celadon_gym/palettes/10.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C14/palettes/10.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4C14/palettes/11.pal b/data/tilesets/secondary/celadon_gym/palettes/11.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C14/palettes/11.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4D4C/palettes/12.pal b/data/tilesets/secondary/celadon_gym/palettes/12.pal
index 041512724..041512724 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/12.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4B3C/palettes/13.pal b/data/tilesets/secondary/celadon_gym/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/13.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4B3C/palettes/14.pal b/data/tilesets/secondary/celadon_gym/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/14.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4B6C/palettes/15.pal b/data/tilesets/secondary/celadon_gym/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/15.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4C2C/palettes/2.pal b/data/tilesets/secondary/celadon_gym/palettes/2.pal
index 330e35b02..330e35b02 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/2.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4D4C/palettes/3.pal b/data/tilesets/secondary/celadon_gym/palettes/3.pal
index eac8236f1..eac8236f1 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/3.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4BCC/palettes/4.pal b/data/tilesets/secondary/celadon_gym/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/4.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4BCC/palettes/5.pal b/data/tilesets/secondary/celadon_gym/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/5.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4BE4/palettes/6.pal b/data/tilesets/secondary/celadon_gym/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/6.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4D4C/palettes/7.pal b/data/tilesets/secondary/celadon_gym/palettes/7.pal
index 9d84ecaba..9d84ecaba 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/7.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4D4C/palettes/8.pal b/data/tilesets/secondary/celadon_gym/palettes/8.pal
index 085c49344..085c49344 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/8.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4D4C/palettes/9.pal b/data/tilesets/secondary/celadon_gym/palettes/9.pal
index 9020b628f..9020b628f 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/9.pal
+++ b/data/tilesets/secondary/celadon_gym/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4D4C/tiles.png b/data/tilesets/secondary/celadon_gym/tiles.png
index ef08ccc83..ef08ccc83 100644
--- a/data/tilesets/secondary/82D4D4C/tiles.png
+++ b/data/tilesets/secondary/celadon_gym/tiles.png
diff --git a/data/tilesets/secondary/82D4E54/metatile_attributes.bin b/data/tilesets/secondary/cerulean_cave/metatile_attributes.bin
index 45b5bef90..45b5bef90 100644
--- a/data/tilesets/secondary/82D4E54/metatile_attributes.bin
+++ b/data/tilesets/secondary/cerulean_cave/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4E54/metatiles.bin b/data/tilesets/secondary/cerulean_cave/metatiles.bin
index 249addbc7..249addbc7 100644
--- a/data/tilesets/secondary/82D4E54/metatiles.bin
+++ b/data/tilesets/secondary/cerulean_cave/metatiles.bin
diff --git a/data/tilesets/secondary/82D4E0C/palettes/0.pal b/data/tilesets/secondary/cerulean_cave/palettes/0.pal
index a3fab1c2f..a3fab1c2f 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/0.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4B0C/palettes/1.pal b/data/tilesets/secondary/cerulean_cave/palettes/1.pal
index d8a4e7757..d8a4e7757 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/1.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4E54/palettes/10.pal b/data/tilesets/secondary/cerulean_cave/palettes/10.pal
index eb9198b0a..eb9198b0a 100644
--- a/data/tilesets/secondary/82D4E54/palettes/10.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4E54/palettes/11.pal b/data/tilesets/secondary/cerulean_cave/palettes/11.pal
index 9afe8750d..9afe8750d 100644
--- a/data/tilesets/secondary/82D4E54/palettes/11.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4E54/palettes/12.pal b/data/tilesets/secondary/cerulean_cave/palettes/12.pal
index aced117f7..aced117f7 100644
--- a/data/tilesets/secondary/82D4E54/palettes/12.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4B54/palettes/13.pal b/data/tilesets/secondary/cerulean_cave/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B54/palettes/13.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4B54/palettes/14.pal b/data/tilesets/secondary/cerulean_cave/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B54/palettes/14.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4B84/palettes/15.pal b/data/tilesets/secondary/cerulean_cave/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B84/palettes/15.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4B54/palettes/2.pal b/data/tilesets/secondary/cerulean_cave/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D4B54/palettes/2.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4B0C/palettes/3.pal b/data/tilesets/secondary/cerulean_cave/palettes/3.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/3.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4B54/palettes/4.pal b/data/tilesets/secondary/cerulean_cave/palettes/4.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/82D4B54/palettes/4.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4B24/palettes/5.pal b/data/tilesets/secondary/cerulean_cave/palettes/5.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/secondary/82D4B24/palettes/5.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4DF4/palettes/6.pal b/data/tilesets/secondary/cerulean_cave/palettes/6.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/6.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4AAC/palettes/7.pal b/data/tilesets/secondary/cerulean_cave/palettes/7.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/7.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4E54/palettes/8.pal b/data/tilesets/secondary/cerulean_cave/palettes/8.pal
index db2216a05..db2216a05 100644
--- a/data/tilesets/secondary/82D4E54/palettes/8.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4E54/palettes/9.pal b/data/tilesets/secondary/cerulean_cave/palettes/9.pal
index c1a5d4f29..c1a5d4f29 100644
--- a/data/tilesets/secondary/82D4E54/palettes/9.pal
+++ b/data/tilesets/secondary/cerulean_cave/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4E54/tiles.png b/data/tilesets/secondary/cerulean_cave/tiles.png
index d53a0cf17..d53a0cf17 100644
--- a/data/tilesets/secondary/82D4E54/tiles.png
+++ b/data/tilesets/secondary/cerulean_cave/tiles.png
diff --git a/data/tilesets/secondary/82D4AF4/metatile_attributes.bin b/data/tilesets/secondary/cerulean_city/metatile_attributes.bin
index 7de4de077..7de4de077 100644
--- a/data/tilesets/secondary/82D4AF4/metatile_attributes.bin
+++ b/data/tilesets/secondary/cerulean_city/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4AF4/metatiles.bin b/data/tilesets/secondary/cerulean_city/metatiles.bin
index b810e7996..b810e7996 100644
--- a/data/tilesets/secondary/82D4AF4/metatiles.bin
+++ b/data/tilesets/secondary/cerulean_city/metatiles.bin
diff --git a/data/tilesets/secondary/82D4AF4/palettes/0.pal b/data/tilesets/secondary/cerulean_city/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/0.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4AF4/palettes/1.pal b/data/tilesets/secondary/cerulean_city/palettes/1.pal
index 31a636983..31a636983 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/1.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4AF4/palettes/10.pal b/data/tilesets/secondary/cerulean_city/palettes/10.pal
index 536972f8f..536972f8f 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/10.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4AF4/palettes/11.pal b/data/tilesets/secondary/cerulean_city/palettes/11.pal
index 986335b74..986335b74 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/11.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4AF4/palettes/12.pal b/data/tilesets/secondary/cerulean_city/palettes/12.pal
index c44bc32b5..c44bc32b5 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/12.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4B6C/palettes/13.pal b/data/tilesets/secondary/cerulean_city/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/13.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4B6C/palettes/14.pal b/data/tilesets/secondary/cerulean_city/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/14.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4BFC/palettes/15.pal b/data/tilesets/secondary/cerulean_city/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/15.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4AC4/palettes/2.pal b/data/tilesets/secondary/cerulean_city/palettes/2.pal
index 372fb5d7c..372fb5d7c 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/2.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4B3C/palettes/3.pal b/data/tilesets/secondary/cerulean_city/palettes/3.pal
index 973765509..973765509 100644
--- a/data/tilesets/secondary/82D4B3C/palettes/3.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4AF4/palettes/4.pal b/data/tilesets/secondary/cerulean_city/palettes/4.pal
index 91fdcabdf..91fdcabdf 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/4.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4AF4/palettes/5.pal b/data/tilesets/secondary/cerulean_city/palettes/5.pal
index 0edb843f5..0edb843f5 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/5.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4AF4/palettes/6.pal b/data/tilesets/secondary/cerulean_city/palettes/6.pal
index f8ebbc6dc..f8ebbc6dc 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/6.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4AC4/palettes/7.pal b/data/tilesets/secondary/cerulean_city/palettes/7.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/7.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4AF4/palettes/8.pal b/data/tilesets/secondary/cerulean_city/palettes/8.pal
index ae3dd3f0d..ae3dd3f0d 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/8.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4AF4/palettes/9.pal b/data/tilesets/secondary/cerulean_city/palettes/9.pal
index 3ed18e08f..3ed18e08f 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/9.pal
+++ b/data/tilesets/secondary/cerulean_city/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4AF4/tiles.png b/data/tilesets/secondary/cerulean_city/tiles.png
index 737d3dd7f..737d3dd7f 100644
--- a/data/tilesets/secondary/82D4AF4/tiles.png
+++ b/data/tilesets/secondary/cerulean_city/tiles.png
diff --git a/data/tilesets/secondary/82D4D1C/metatile_attributes.bin b/data/tilesets/secondary/cerulean_gym/metatile_attributes.bin
index 84b5e2049..84b5e2049 100644
--- a/data/tilesets/secondary/82D4D1C/metatile_attributes.bin
+++ b/data/tilesets/secondary/cerulean_gym/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4D1C/metatiles.bin b/data/tilesets/secondary/cerulean_gym/metatiles.bin
index c026eb65a..c026eb65a 100644
--- a/data/tilesets/secondary/82D4D1C/metatiles.bin
+++ b/data/tilesets/secondary/cerulean_gym/metatiles.bin
diff --git a/data/tilesets/secondary/82D4D1C/palettes/0.pal b/data/tilesets/secondary/cerulean_gym/palettes/0.pal
index 4b44e19f4..4b44e19f4 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/0.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4D1C/palettes/1.pal b/data/tilesets/secondary/cerulean_gym/palettes/1.pal
index a39ca6aa8..a39ca6aa8 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/1.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4D1C/palettes/10.pal b/data/tilesets/secondary/cerulean_gym/palettes/10.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/10.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4D1C/palettes/11.pal b/data/tilesets/secondary/cerulean_gym/palettes/11.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/11.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4D1C/palettes/12.pal b/data/tilesets/secondary/cerulean_gym/palettes/12.pal
index 419c00911..419c00911 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/12.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4B84/palettes/13.pal b/data/tilesets/secondary/cerulean_gym/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B84/palettes/13.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4B84/palettes/14.pal b/data/tilesets/secondary/cerulean_gym/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B84/palettes/14.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4C14/palettes/15.pal b/data/tilesets/secondary/cerulean_gym/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C14/palettes/15.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4D1C/palettes/2.pal b/data/tilesets/secondary/cerulean_gym/palettes/2.pal
index 5a4f127be..5a4f127be 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/2.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4D1C/palettes/3.pal b/data/tilesets/secondary/cerulean_gym/palettes/3.pal
index c84fa4a58..c84fa4a58 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/3.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4C5C/palettes/4.pal b/data/tilesets/secondary/cerulean_gym/palettes/4.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/4.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4C5C/palettes/5.pal b/data/tilesets/secondary/cerulean_gym/palettes/5.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/5.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4C14/palettes/6.pal b/data/tilesets/secondary/cerulean_gym/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C14/palettes/6.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4D1C/palettes/7.pal b/data/tilesets/secondary/cerulean_gym/palettes/7.pal
index aac016a72..aac016a72 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/7.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4D1C/palettes/8.pal b/data/tilesets/secondary/cerulean_gym/palettes/8.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/8.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4D1C/palettes/9.pal b/data/tilesets/secondary/cerulean_gym/palettes/9.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/9.pal
+++ b/data/tilesets/secondary/cerulean_gym/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4D1C/tiles.png b/data/tilesets/secondary/cerulean_gym/tiles.png
index 44b7c0c34..44b7c0c34 100644
--- a/data/tilesets/secondary/82D4D1C/tiles.png
+++ b/data/tilesets/secondary/cerulean_gym/tiles.png
diff --git a/data/tilesets/secondary/82D4D7C/metatile_attributes.bin b/data/tilesets/secondary/cinnabar_gym/metatile_attributes.bin
index 1d68a40a4..1d68a40a4 100644
--- a/data/tilesets/secondary/82D4D7C/metatile_attributes.bin
+++ b/data/tilesets/secondary/cinnabar_gym/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4D7C/metatiles.bin b/data/tilesets/secondary/cinnabar_gym/metatiles.bin
index 7a5532619..7a5532619 100644
--- a/data/tilesets/secondary/82D4D7C/metatiles.bin
+++ b/data/tilesets/secondary/cinnabar_gym/metatiles.bin
diff --git a/data/tilesets/secondary/82D4BE4/palettes/0.pal b/data/tilesets/secondary/cinnabar_gym/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/0.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4C74/palettes/1.pal b/data/tilesets/secondary/cinnabar_gym/palettes/1.pal
index 69f3f0b9e..69f3f0b9e 100644
--- a/data/tilesets/secondary/82D4C74/palettes/1.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4D4C/palettes/10.pal b/data/tilesets/secondary/cinnabar_gym/palettes/10.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/10.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4C2C/palettes/11.pal b/data/tilesets/secondary/cinnabar_gym/palettes/11.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/11.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4D7C/palettes/12.pal b/data/tilesets/secondary/cinnabar_gym/palettes/12.pal
index 3f9aa94d6..3f9aa94d6 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/12.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4B9C/palettes/13.pal b/data/tilesets/secondary/cinnabar_gym/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/13.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4B9C/palettes/14.pal b/data/tilesets/secondary/cinnabar_gym/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/14.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4BCC/palettes/15.pal b/data/tilesets/secondary/cinnabar_gym/palettes/15.pal
index 92e7ed309..92e7ed309 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/15.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4D4C/palettes/2.pal b/data/tilesets/secondary/cinnabar_gym/palettes/2.pal
index 330e35b02..330e35b02 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/2.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4D7C/palettes/3.pal b/data/tilesets/secondary/cinnabar_gym/palettes/3.pal
index eac8236f1..eac8236f1 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/3.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4BE4/palettes/4.pal b/data/tilesets/secondary/cinnabar_gym/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/4.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4BE4/palettes/5.pal b/data/tilesets/secondary/cinnabar_gym/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/5.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4C44/palettes/6.pal b/data/tilesets/secondary/cinnabar_gym/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C44/palettes/6.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4D7C/palettes/7.pal b/data/tilesets/secondary/cinnabar_gym/palettes/7.pal
index 5b659ef1b..5b659ef1b 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/7.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4D7C/palettes/8.pal b/data/tilesets/secondary/cinnabar_gym/palettes/8.pal
index f5a4ee678..f5a4ee678 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/8.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4C14/palettes/9.pal b/data/tilesets/secondary/cinnabar_gym/palettes/9.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C14/palettes/9.pal
+++ b/data/tilesets/secondary/cinnabar_gym/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4D7C/tiles.png b/data/tilesets/secondary/cinnabar_gym/tiles.png
index 213799158..213799158 100644
--- a/data/tilesets/secondary/82D4D7C/tiles.png
+++ b/data/tilesets/secondary/cinnabar_gym/tiles.png
diff --git a/data/tilesets/secondary/82D4B6C/metatile_attributes.bin b/data/tilesets/secondary/cinnabar_island/metatile_attributes.bin
index d2c655c41..d2c655c41 100644
--- a/data/tilesets/secondary/82D4B6C/metatile_attributes.bin
+++ b/data/tilesets/secondary/cinnabar_island/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4B6C/metatiles.bin b/data/tilesets/secondary/cinnabar_island/metatiles.bin
index 0abe4b18d..0abe4b18d 100644
--- a/data/tilesets/secondary/82D4B6C/metatiles.bin
+++ b/data/tilesets/secondary/cinnabar_island/metatiles.bin
diff --git a/data/tilesets/secondary/82D4B6C/palettes/0.pal b/data/tilesets/secondary/cinnabar_island/palettes/0.pal
index 9dcb673aa..9dcb673aa 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/0.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4B6C/palettes/1.pal b/data/tilesets/secondary/cinnabar_island/palettes/1.pal
index 391d1e3d1..391d1e3d1 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/1.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4B6C/palettes/10.pal b/data/tilesets/secondary/cinnabar_island/palettes/10.pal
index 608bbc2cf..608bbc2cf 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/10.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4B6C/palettes/11.pal b/data/tilesets/secondary/cinnabar_island/palettes/11.pal
index 608bbc2cf..608bbc2cf 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/11.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4B6C/palettes/12.pal b/data/tilesets/secondary/cinnabar_island/palettes/12.pal
index 608bbc2cf..608bbc2cf 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/12.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4BCC/palettes/13.pal b/data/tilesets/secondary/cinnabar_island/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/13.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4BCC/palettes/14.pal b/data/tilesets/secondary/cinnabar_island/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/14.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4C2C/palettes/15.pal b/data/tilesets/secondary/cinnabar_island/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/15.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4B6C/palettes/2.pal b/data/tilesets/secondary/cinnabar_island/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/2.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4B24/palettes/3.pal b/data/tilesets/secondary/cinnabar_island/palettes/3.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/82D4B24/palettes/3.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4B6C/palettes/4.pal b/data/tilesets/secondary/cinnabar_island/palettes/4.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/4.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4B54/palettes/5.pal b/data/tilesets/secondary/cinnabar_island/palettes/5.pal
index 3a2db72a7..3a2db72a7 100644
--- a/data/tilesets/secondary/82D4B54/palettes/5.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4B54/palettes/6.pal b/data/tilesets/secondary/cinnabar_island/palettes/6.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/82D4B54/palettes/6.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4ADC/palettes/7.pal b/data/tilesets/secondary/cinnabar_island/palettes/7.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/7.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4B6C/palettes/8.pal b/data/tilesets/secondary/cinnabar_island/palettes/8.pal
index f734cd166..f734cd166 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/8.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4B6C/palettes/9.pal b/data/tilesets/secondary/cinnabar_island/palettes/9.pal
index ca26d1b08..ca26d1b08 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/9.pal
+++ b/data/tilesets/secondary/cinnabar_island/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4B6C/tiles.png b/data/tilesets/secondary/cinnabar_island/tiles.png
index ddb9ad0cb..ddb9ad0cb 100644
--- a/data/tilesets/secondary/82D4B6C/tiles.png
+++ b/data/tilesets/secondary/cinnabar_island/tiles.png
diff --git a/data/tilesets/secondary/82D4F8C/metatile_attributes.bin b/data/tilesets/secondary/condominiums/metatile_attributes.bin
index aa43d15ee..aa43d15ee 100644
--- a/data/tilesets/secondary/82D4F8C/metatile_attributes.bin
+++ b/data/tilesets/secondary/condominiums/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4F8C/metatiles.bin b/data/tilesets/secondary/condominiums/metatiles.bin
index 117c036fa..117c036fa 100644
--- a/data/tilesets/secondary/82D4F8C/metatiles.bin
+++ b/data/tilesets/secondary/condominiums/metatiles.bin
diff --git a/data/tilesets/secondary/82D4F8C/palettes/0.pal b/data/tilesets/secondary/condominiums/palettes/0.pal
index 5867e5ba6..5867e5ba6 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/0.pal
+++ b/data/tilesets/secondary/condominiums/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4EE4/palettes/1.pal b/data/tilesets/secondary/condominiums/palettes/1.pal
index 66561f6d3..66561f6d3 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/1.pal
+++ b/data/tilesets/secondary/condominiums/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4F8C/palettes/10.pal b/data/tilesets/secondary/condominiums/palettes/10.pal
index 3c091df8b..3c091df8b 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/10.pal
+++ b/data/tilesets/secondary/condominiums/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4F8C/palettes/11.pal b/data/tilesets/secondary/condominiums/palettes/11.pal
index 79494336b..79494336b 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/11.pal
+++ b/data/tilesets/secondary/condominiums/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4F8C/palettes/12.pal b/data/tilesets/secondary/condominiums/palettes/12.pal
index b9b1e6061..b9b1e6061 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/12.pal
+++ b/data/tilesets/secondary/condominiums/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4BE4/palettes/13.pal b/data/tilesets/secondary/condominiums/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/13.pal
+++ b/data/tilesets/secondary/condominiums/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4BE4/palettes/14.pal b/data/tilesets/secondary/condominiums/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/14.pal
+++ b/data/tilesets/secondary/condominiums/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4F8C/palettes/15.pal b/data/tilesets/secondary/condominiums/palettes/15.pal
index 093fbdd6c..093fbdd6c 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/15.pal
+++ b/data/tilesets/secondary/condominiums/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4EE4/palettes/2.pal b/data/tilesets/secondary/condominiums/palettes/2.pal
index 87a022102..87a022102 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/2.pal
+++ b/data/tilesets/secondary/condominiums/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4EE4/palettes/3.pal b/data/tilesets/secondary/condominiums/palettes/3.pal
index 783496dcd..783496dcd 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/3.pal
+++ b/data/tilesets/secondary/condominiums/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4EE4/palettes/4.pal b/data/tilesets/secondary/condominiums/palettes/4.pal
index 89eace605..89eace605 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/4.pal
+++ b/data/tilesets/secondary/condominiums/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4F8C/palettes/5.pal b/data/tilesets/secondary/condominiums/palettes/5.pal
index c7780e5c7..c7780e5c7 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/5.pal
+++ b/data/tilesets/secondary/condominiums/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4EE4/palettes/6.pal b/data/tilesets/secondary/condominiums/palettes/6.pal
index 1d08ce9a2..1d08ce9a2 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/6.pal
+++ b/data/tilesets/secondary/condominiums/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4F8C/palettes/7.pal b/data/tilesets/secondary/condominiums/palettes/7.pal
index 35987db53..35987db53 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/7.pal
+++ b/data/tilesets/secondary/condominiums/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4F8C/palettes/8.pal b/data/tilesets/secondary/condominiums/palettes/8.pal
index 7f33e006f..7f33e006f 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/8.pal
+++ b/data/tilesets/secondary/condominiums/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4F8C/palettes/9.pal b/data/tilesets/secondary/condominiums/palettes/9.pal
index 75022050d..75022050d 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/9.pal
+++ b/data/tilesets/secondary/condominiums/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4F8C/tiles.png b/data/tilesets/secondary/condominiums/tiles.png
index 324b42c9f..324b42c9f 100644
--- a/data/tilesets/secondary/82D4F8C/tiles.png
+++ b/data/tilesets/secondary/condominiums/tiles.png
diff --git a/data/tilesets/secondary/82D4E6C/metatile_attributes.bin b/data/tilesets/secondary/department_store/metatile_attributes.bin
index 5eca0b5c7..5eca0b5c7 100644
--- a/data/tilesets/secondary/82D4E6C/metatile_attributes.bin
+++ b/data/tilesets/secondary/department_store/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4E6C/metatiles.bin b/data/tilesets/secondary/department_store/metatiles.bin
index 053045190..053045190 100644
--- a/data/tilesets/secondary/82D4E6C/metatiles.bin
+++ b/data/tilesets/secondary/department_store/metatiles.bin
diff --git a/data/tilesets/secondary/82D4C2C/palettes/0.pal b/data/tilesets/secondary/department_store/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/0.pal
+++ b/data/tilesets/secondary/department_store/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4E6C/palettes/1.pal b/data/tilesets/secondary/department_store/palettes/1.pal
index 30be2fbe3..30be2fbe3 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/1.pal
+++ b/data/tilesets/secondary/department_store/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4E6C/palettes/10.pal b/data/tilesets/secondary/department_store/palettes/10.pal
index c6e769ccc..c6e769ccc 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/10.pal
+++ b/data/tilesets/secondary/department_store/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4D4C/palettes/11.pal b/data/tilesets/secondary/department_store/palettes/11.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/11.pal
+++ b/data/tilesets/secondary/department_store/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4BCC/palettes/12.pal b/data/tilesets/secondary/department_store/palettes/12.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/12.pal
+++ b/data/tilesets/secondary/department_store/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4BFC/palettes/13.pal b/data/tilesets/secondary/department_store/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/13.pal
+++ b/data/tilesets/secondary/department_store/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4BFC/palettes/14.pal b/data/tilesets/secondary/department_store/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/14.pal
+++ b/data/tilesets/secondary/department_store/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4C44/palettes/15.pal b/data/tilesets/secondary/department_store/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C44/palettes/15.pal
+++ b/data/tilesets/secondary/department_store/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4BCC/palettes/2.pal b/data/tilesets/secondary/department_store/palettes/2.pal
index cc3a9457d..cc3a9457d 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/2.pal
+++ b/data/tilesets/secondary/department_store/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4BE4/palettes/3.pal b/data/tilesets/secondary/department_store/palettes/3.pal
index 7ec794ae5..7ec794ae5 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/3.pal
+++ b/data/tilesets/secondary/department_store/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4C2C/palettes/4.pal b/data/tilesets/secondary/department_store/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/4.pal
+++ b/data/tilesets/secondary/department_store/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4C2C/palettes/5.pal b/data/tilesets/secondary/department_store/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/5.pal
+++ b/data/tilesets/secondary/department_store/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4C2C/palettes/6.pal b/data/tilesets/secondary/department_store/palettes/6.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/6.pal
+++ b/data/tilesets/secondary/department_store/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4C2C/palettes/7.pal b/data/tilesets/secondary/department_store/palettes/7.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/7.pal
+++ b/data/tilesets/secondary/department_store/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4C74/palettes/8.pal b/data/tilesets/secondary/department_store/palettes/8.pal
index 18480092b..18480092b 100644
--- a/data/tilesets/secondary/82D4C74/palettes/8.pal
+++ b/data/tilesets/secondary/department_store/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4E6C/palettes/9.pal b/data/tilesets/secondary/department_store/palettes/9.pal
index dd18b9d07..dd18b9d07 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/9.pal
+++ b/data/tilesets/secondary/department_store/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4E6C/tiles.png b/data/tilesets/secondary/department_store/tiles.png
index 421932118..421932118 100644
--- a/data/tilesets/secondary/82D4E6C/tiles.png
+++ b/data/tilesets/secondary/department_store/tiles.png
diff --git a/data/tilesets/secondary/82D4E0C/metatile_attributes.bin b/data/tilesets/secondary/digletts_cave/metatile_attributes.bin
index 2b24a5266..2b24a5266 100644
--- a/data/tilesets/secondary/82D4E0C/metatile_attributes.bin
+++ b/data/tilesets/secondary/digletts_cave/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4E0C/metatiles.bin b/data/tilesets/secondary/digletts_cave/metatiles.bin
index 37ef8fe34..37ef8fe34 100644
--- a/data/tilesets/secondary/82D4E0C/metatiles.bin
+++ b/data/tilesets/secondary/digletts_cave/metatiles.bin
diff --git a/data/tilesets/secondary/82D4E54/palettes/0.pal b/data/tilesets/secondary/digletts_cave/palettes/0.pal
index a3fab1c2f..a3fab1c2f 100644
--- a/data/tilesets/secondary/82D4E54/palettes/0.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4DF4/palettes/1.pal b/data/tilesets/secondary/digletts_cave/palettes/1.pal
index d8a4e7757..d8a4e7757 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/1.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4E0C/palettes/10.pal b/data/tilesets/secondary/digletts_cave/palettes/10.pal
index 5ccabc5a0..5ccabc5a0 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/10.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4E0C/palettes/11.pal b/data/tilesets/secondary/digletts_cave/palettes/11.pal
index fa0038726..fa0038726 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/11.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4E0C/palettes/12.pal b/data/tilesets/secondary/digletts_cave/palettes/12.pal
index c19d59bd0..c19d59bd0 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/12.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4C14/palettes/13.pal b/data/tilesets/secondary/digletts_cave/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C14/palettes/13.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4C14/palettes/14.pal b/data/tilesets/secondary/digletts_cave/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C14/palettes/14.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4C5C/palettes/15.pal b/data/tilesets/secondary/digletts_cave/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/15.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4B9C/palettes/2.pal b/data/tilesets/secondary/digletts_cave/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/2.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4B6C/palettes/3.pal b/data/tilesets/secondary/digletts_cave/palettes/3.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/3.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4B9C/palettes/4.pal b/data/tilesets/secondary/digletts_cave/palettes/4.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/4.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4BFC/palettes/5.pal b/data/tilesets/secondary/digletts_cave/palettes/5.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/5.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4E0C/palettes/6.pal b/data/tilesets/secondary/digletts_cave/palettes/6.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/6.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4DF4/palettes/7.pal b/data/tilesets/secondary/digletts_cave/palettes/7.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/7.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4E0C/palettes/8.pal b/data/tilesets/secondary/digletts_cave/palettes/8.pal
index 74cbc54c6..74cbc54c6 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/8.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4E0C/palettes/9.pal b/data/tilesets/secondary/digletts_cave/palettes/9.pal
index def7acffc..def7acffc 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/9.pal
+++ b/data/tilesets/secondary/digletts_cave/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4E0C/tiles.png b/data/tilesets/secondary/digletts_cave/tiles.png
index 77b767b79..77b767b79 100644
--- a/data/tilesets/secondary/82D4E0C/tiles.png
+++ b/data/tilesets/secondary/digletts_cave/tiles.png
diff --git a/data/tilesets/secondary/82D4C14/metatile_attributes.bin b/data/tilesets/secondary/dummy1/metatile_attributes.bin
index 1b1cb4d44..1b1cb4d44 100644
--- a/data/tilesets/secondary/82D4C14/metatile_attributes.bin
+++ b/data/tilesets/secondary/dummy1/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4C14/metatiles.bin b/data/tilesets/secondary/dummy1/metatiles.bin
index 274da22a6..274da22a6 100644
--- a/data/tilesets/secondary/82D4C14/metatiles.bin
+++ b/data/tilesets/secondary/dummy1/metatiles.bin
diff --git a/data/tilesets/secondary/82D4C44/palettes/0.pal b/data/tilesets/secondary/dummy1/palettes/0.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C44/palettes/0.pal
+++ b/data/tilesets/secondary/dummy1/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4C44/palettes/1.pal b/data/tilesets/secondary/dummy1/palettes/1.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C44/palettes/1.pal
+++ b/data/tilesets/secondary/dummy1/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4D7C/palettes/10.pal b/data/tilesets/secondary/dummy1/palettes/10.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/10.pal
+++ b/data/tilesets/secondary/dummy1/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4D7C/palettes/11.pal b/data/tilesets/secondary/dummy1/palettes/11.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/11.pal
+++ b/data/tilesets/secondary/dummy1/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4C14/palettes/12.pal b/data/tilesets/secondary/dummy1/palettes/12.pal
index 97d3f20bd..97d3f20bd 100644
--- a/data/tilesets/secondary/82D4C14/palettes/12.pal
+++ b/data/tilesets/secondary/dummy1/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4C2C/palettes/13.pal b/data/tilesets/secondary/dummy1/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/13.pal
+++ b/data/tilesets/secondary/dummy1/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4C2C/palettes/14.pal b/data/tilesets/secondary/dummy1/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/14.pal
+++ b/data/tilesets/secondary/dummy1/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4C74/palettes/15.pal b/data/tilesets/secondary/dummy1/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C74/palettes/15.pal
+++ b/data/tilesets/secondary/dummy1/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4C44/palettes/2.pal b/data/tilesets/secondary/dummy1/palettes/2.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C44/palettes/2.pal
+++ b/data/tilesets/secondary/dummy1/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4C44/palettes/3.pal b/data/tilesets/secondary/dummy1/palettes/3.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C44/palettes/3.pal
+++ b/data/tilesets/secondary/dummy1/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4CD4/palettes/4.pal b/data/tilesets/secondary/dummy1/palettes/4.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/4.pal
+++ b/data/tilesets/secondary/dummy1/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4CD4/palettes/5.pal b/data/tilesets/secondary/dummy1/palettes/5.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/5.pal
+++ b/data/tilesets/secondary/dummy1/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4C5C/palettes/6.pal b/data/tilesets/secondary/dummy1/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/6.pal
+++ b/data/tilesets/secondary/dummy1/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4C14/palettes/7.pal b/data/tilesets/secondary/dummy1/palettes/7.pal
index 4172436d0..4172436d0 100644
--- a/data/tilesets/secondary/82D4C14/palettes/7.pal
+++ b/data/tilesets/secondary/dummy1/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4C14/palettes/8.pal b/data/tilesets/secondary/dummy1/palettes/8.pal
index 7fd087b3b..7fd087b3b 100644
--- a/data/tilesets/secondary/82D4C14/palettes/8.pal
+++ b/data/tilesets/secondary/dummy1/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4D7C/palettes/9.pal b/data/tilesets/secondary/dummy1/palettes/9.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/9.pal
+++ b/data/tilesets/secondary/dummy1/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4C14/tiles.png b/data/tilesets/secondary/dummy1/tiles.png
index d4b21f3e4..d4b21f3e4 100644
--- a/data/tilesets/secondary/82D4C14/tiles.png
+++ b/data/tilesets/secondary/dummy1/tiles.png
diff --git a/data/tilesets/secondary/82D4DAC/metatile_attributes.bin b/data/tilesets/secondary/dummy2/metatile_attributes.bin
index 1b1cb4d44..1b1cb4d44 100644
--- a/data/tilesets/secondary/82D4DAC/metatile_attributes.bin
+++ b/data/tilesets/secondary/dummy2/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4DAC/metatiles.bin b/data/tilesets/secondary/dummy2/metatiles.bin
index c15edf653..c15edf653 100644
--- a/data/tilesets/secondary/82D4DAC/metatiles.bin
+++ b/data/tilesets/secondary/dummy2/metatiles.bin
diff --git a/data/tilesets/secondary/82D4DAC/palettes/0.pal b/data/tilesets/secondary/dummy2/palettes/0.pal
index 0fd74602e..0fd74602e 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/0.pal
+++ b/data/tilesets/secondary/dummy2/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4DAC/palettes/1.pal b/data/tilesets/secondary/dummy2/palettes/1.pal
index 3c6e40c2e..3c6e40c2e 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/1.pal
+++ b/data/tilesets/secondary/dummy2/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4DAC/palettes/10.pal b/data/tilesets/secondary/dummy2/palettes/10.pal
index cd86ca4ae..cd86ca4ae 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/10.pal
+++ b/data/tilesets/secondary/dummy2/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4DAC/palettes/11.pal b/data/tilesets/secondary/dummy2/palettes/11.pal
index ec8e2f42d..ec8e2f42d 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/11.pal
+++ b/data/tilesets/secondary/dummy2/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4DAC/palettes/12.pal b/data/tilesets/secondary/dummy2/palettes/12.pal
index 5caa038ad..5caa038ad 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/12.pal
+++ b/data/tilesets/secondary/dummy2/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4C44/palettes/13.pal b/data/tilesets/secondary/dummy2/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C44/palettes/13.pal
+++ b/data/tilesets/secondary/dummy2/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4C44/palettes/14.pal b/data/tilesets/secondary/dummy2/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C44/palettes/14.pal
+++ b/data/tilesets/secondary/dummy2/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4CA4/palettes/15.pal b/data/tilesets/secondary/dummy2/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/15.pal
+++ b/data/tilesets/secondary/dummy2/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4DAC/palettes/2.pal b/data/tilesets/secondary/dummy2/palettes/2.pal
index 4c41030f6..4c41030f6 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/2.pal
+++ b/data/tilesets/secondary/dummy2/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4DAC/palettes/3.pal b/data/tilesets/secondary/dummy2/palettes/3.pal
index 5665ddc22..5665ddc22 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/3.pal
+++ b/data/tilesets/secondary/dummy2/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4DAC/palettes/4.pal b/data/tilesets/secondary/dummy2/palettes/4.pal
index d8051b7ba..d8051b7ba 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/4.pal
+++ b/data/tilesets/secondary/dummy2/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4DAC/palettes/5.pal b/data/tilesets/secondary/dummy2/palettes/5.pal
index 4e684594c..4e684594c 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/5.pal
+++ b/data/tilesets/secondary/dummy2/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4C74/palettes/6.pal b/data/tilesets/secondary/dummy2/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C74/palettes/6.pal
+++ b/data/tilesets/secondary/dummy2/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4DAC/palettes/7.pal b/data/tilesets/secondary/dummy2/palettes/7.pal
index 2064b3bd2..2064b3bd2 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/7.pal
+++ b/data/tilesets/secondary/dummy2/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4DAC/palettes/8.pal b/data/tilesets/secondary/dummy2/palettes/8.pal
index 42a3483c0..42a3483c0 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/8.pal
+++ b/data/tilesets/secondary/dummy2/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4DAC/palettes/9.pal b/data/tilesets/secondary/dummy2/palettes/9.pal
index b06dfbda7..b06dfbda7 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/9.pal
+++ b/data/tilesets/secondary/dummy2/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4DAC/tiles.png b/data/tilesets/secondary/dummy2/tiles.png
index c00ba0d61..c00ba0d61 100644
--- a/data/tilesets/secondary/82D4DAC/tiles.png
+++ b/data/tilesets/secondary/dummy2/tiles.png
diff --git a/data/tilesets/secondary/82D4FBC/metatile_attributes.bin b/data/tilesets/secondary/dummy3/metatile_attributes.bin
index 1b1cb4d44..1b1cb4d44 100644
--- a/data/tilesets/secondary/82D4FBC/metatile_attributes.bin
+++ b/data/tilesets/secondary/dummy3/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4FBC/metatiles.bin b/data/tilesets/secondary/dummy3/metatiles.bin
index 274da22a6..274da22a6 100644
--- a/data/tilesets/secondary/82D4FBC/metatiles.bin
+++ b/data/tilesets/secondary/dummy3/metatiles.bin
diff --git a/data/tilesets/secondary/82D4B0C/palettes/0.pal b/data/tilesets/secondary/dummy3/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/0.pal
+++ b/data/tilesets/secondary/dummy3/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4E0C/palettes/1.pal b/data/tilesets/secondary/dummy3/palettes/1.pal
index d8a4e7757..d8a4e7757 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/1.pal
+++ b/data/tilesets/secondary/dummy3/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4FBC/palettes/10.pal b/data/tilesets/secondary/dummy3/palettes/10.pal
index 937405d15..937405d15 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/10.pal
+++ b/data/tilesets/secondary/dummy3/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4FBC/palettes/11.pal b/data/tilesets/secondary/dummy3/palettes/11.pal
index bb4f4867c..bb4f4867c 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/11.pal
+++ b/data/tilesets/secondary/dummy3/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4FBC/palettes/12.pal b/data/tilesets/secondary/dummy3/palettes/12.pal
index 583384664..583384664 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/12.pal
+++ b/data/tilesets/secondary/dummy3/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4C5C/palettes/13.pal b/data/tilesets/secondary/dummy3/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/13.pal
+++ b/data/tilesets/secondary/dummy3/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4C5C/palettes/14.pal b/data/tilesets/secondary/dummy3/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C5C/palettes/14.pal
+++ b/data/tilesets/secondary/dummy3/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4CD4/palettes/15.pal b/data/tilesets/secondary/dummy3/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/15.pal
+++ b/data/tilesets/secondary/dummy3/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4BFC/palettes/2.pal b/data/tilesets/secondary/dummy3/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/2.pal
+++ b/data/tilesets/secondary/dummy3/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4DF4/palettes/3.pal b/data/tilesets/secondary/dummy3/palettes/3.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/3.pal
+++ b/data/tilesets/secondary/dummy3/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4DC4/palettes/4.pal b/data/tilesets/secondary/dummy3/palettes/4.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/4.pal
+++ b/data/tilesets/secondary/dummy3/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4DF4/palettes/5.pal b/data/tilesets/secondary/dummy3/palettes/5.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/5.pal
+++ b/data/tilesets/secondary/dummy3/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4E24/palettes/6.pal b/data/tilesets/secondary/dummy3/palettes/6.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4E24/palettes/6.pal
+++ b/data/tilesets/secondary/dummy3/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4E0C/palettes/7.pal b/data/tilesets/secondary/dummy3/palettes/7.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/7.pal
+++ b/data/tilesets/secondary/dummy3/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4FBC/palettes/8.pal b/data/tilesets/secondary/dummy3/palettes/8.pal
index 6774e407f..6774e407f 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/8.pal
+++ b/data/tilesets/secondary/dummy3/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4FBC/palettes/9.pal b/data/tilesets/secondary/dummy3/palettes/9.pal
index 3795f6c6a..3795f6c6a 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/9.pal
+++ b/data/tilesets/secondary/dummy3/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4FBC/tiles.png b/data/tilesets/secondary/dummy3/tiles.png
index b2d960c60..b2d960c60 100644
--- a/data/tilesets/secondary/82D4FBC/tiles.png
+++ b/data/tilesets/secondary/dummy3/tiles.png
diff --git a/data/tilesets/secondary/82D4FD4/metatile_attributes.bin b/data/tilesets/secondary/dummy4/metatile_attributes.bin
index 1b1cb4d44..1b1cb4d44 100644
--- a/data/tilesets/secondary/82D4FD4/metatile_attributes.bin
+++ b/data/tilesets/secondary/dummy4/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4FD4/metatiles.bin b/data/tilesets/secondary/dummy4/metatiles.bin
index 8f740f6af..8f740f6af 100644
--- a/data/tilesets/secondary/82D4FD4/metatiles.bin
+++ b/data/tilesets/secondary/dummy4/metatiles.bin
diff --git a/data/tilesets/secondary/82D4B24/palettes/0.pal b/data/tilesets/secondary/dummy4/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/82D4B24/palettes/0.pal
+++ b/data/tilesets/secondary/dummy4/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4E24/palettes/1.pal b/data/tilesets/secondary/dummy4/palettes/1.pal
index d8a4e7757..d8a4e7757 100644
--- a/data/tilesets/secondary/82D4E24/palettes/1.pal
+++ b/data/tilesets/secondary/dummy4/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4FD4/palettes/10.pal b/data/tilesets/secondary/dummy4/palettes/10.pal
index 937405d15..937405d15 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/10.pal
+++ b/data/tilesets/secondary/dummy4/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4FD4/palettes/11.pal b/data/tilesets/secondary/dummy4/palettes/11.pal
index bb4f4867c..bb4f4867c 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/11.pal
+++ b/data/tilesets/secondary/dummy4/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4FD4/palettes/12.pal b/data/tilesets/secondary/dummy4/palettes/12.pal
index 583384664..583384664 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/12.pal
+++ b/data/tilesets/secondary/dummy4/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4C74/palettes/13.pal b/data/tilesets/secondary/dummy4/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C74/palettes/13.pal
+++ b/data/tilesets/secondary/dummy4/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4C74/palettes/14.pal b/data/tilesets/secondary/dummy4/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C74/palettes/14.pal
+++ b/data/tilesets/secondary/dummy4/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4D04/palettes/15.pal b/data/tilesets/secondary/dummy4/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D04/palettes/15.pal
+++ b/data/tilesets/secondary/dummy4/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4DC4/palettes/2.pal b/data/tilesets/secondary/dummy4/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/2.pal
+++ b/data/tilesets/secondary/dummy4/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4E0C/palettes/3.pal b/data/tilesets/secondary/dummy4/palettes/3.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/3.pal
+++ b/data/tilesets/secondary/dummy4/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4DF4/palettes/4.pal b/data/tilesets/secondary/dummy4/palettes/4.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/4.pal
+++ b/data/tilesets/secondary/dummy4/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4E0C/palettes/5.pal b/data/tilesets/secondary/dummy4/palettes/5.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/5.pal
+++ b/data/tilesets/secondary/dummy4/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4E54/palettes/6.pal b/data/tilesets/secondary/dummy4/palettes/6.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4E54/palettes/6.pal
+++ b/data/tilesets/secondary/dummy4/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4E24/palettes/7.pal b/data/tilesets/secondary/dummy4/palettes/7.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4E24/palettes/7.pal
+++ b/data/tilesets/secondary/dummy4/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4FD4/palettes/8.pal b/data/tilesets/secondary/dummy4/palettes/8.pal
index 6774e407f..6774e407f 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/8.pal
+++ b/data/tilesets/secondary/dummy4/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4FD4/palettes/9.pal b/data/tilesets/secondary/dummy4/palettes/9.pal
index 3795f6c6a..3795f6c6a 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/9.pal
+++ b/data/tilesets/secondary/dummy4/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4FD4/tiles.png b/data/tilesets/secondary/dummy4/tiles.png
index 201df80fb..201df80fb 100644
--- a/data/tilesets/secondary/82D4FD4/tiles.png
+++ b/data/tilesets/secondary/dummy4/tiles.png
diff --git a/data/tilesets/secondary/82D4F74/metatile_attributes.bin b/data/tilesets/secondary/fan_club_daycare/metatile_attributes.bin
index 8255cca20..8255cca20 100644
--- a/data/tilesets/secondary/82D4F74/metatile_attributes.bin
+++ b/data/tilesets/secondary/fan_club_daycare/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4F74/metatiles.bin b/data/tilesets/secondary/fan_club_daycare/metatiles.bin
index 63ddd975b..63ddd975b 100644
--- a/data/tilesets/secondary/82D4F74/metatiles.bin
+++ b/data/tilesets/secondary/fan_club_daycare/metatiles.bin
diff --git a/data/tilesets/secondary/82D4CD4/palettes/0.pal b/data/tilesets/secondary/fan_club_daycare/palettes/0.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/0.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4CD4/palettes/1.pal b/data/tilesets/secondary/fan_club_daycare/palettes/1.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/1.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4F74/palettes/10.pal b/data/tilesets/secondary/fan_club_daycare/palettes/10.pal
index afe462f8e..afe462f8e 100644
--- a/data/tilesets/secondary/82D4F74/palettes/10.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4E6C/palettes/11.pal b/data/tilesets/secondary/fan_club_daycare/palettes/11.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/11.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4C2C/palettes/12.pal b/data/tilesets/secondary/fan_club_daycare/palettes/12.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/12.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4C8C/palettes/13.pal b/data/tilesets/secondary/fan_club_daycare/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/13.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4C8C/palettes/14.pal b/data/tilesets/secondary/fan_club_daycare/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/14.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4D1C/palettes/15.pal b/data/tilesets/secondary/fan_club_daycare/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/15.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4CD4/palettes/2.pal b/data/tilesets/secondary/fan_club_daycare/palettes/2.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/2.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4CD4/palettes/3.pal b/data/tilesets/secondary/fan_club_daycare/palettes/3.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/3.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4D1C/palettes/4.pal b/data/tilesets/secondary/fan_club_daycare/palettes/4.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/4.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4D1C/palettes/5.pal b/data/tilesets/secondary/fan_club_daycare/palettes/5.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/5.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4C8C/palettes/6.pal b/data/tilesets/secondary/fan_club_daycare/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/6.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4EB4/palettes/7.pal b/data/tilesets/secondary/fan_club_daycare/palettes/7.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/7.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4F74/palettes/8.pal b/data/tilesets/secondary/fan_club_daycare/palettes/8.pal
index 4b7de8012..4b7de8012 100644
--- a/data/tilesets/secondary/82D4F74/palettes/8.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4F74/palettes/9.pal b/data/tilesets/secondary/fan_club_daycare/palettes/9.pal
index 8fe0861de..8fe0861de 100644
--- a/data/tilesets/secondary/82D4F74/palettes/9.pal
+++ b/data/tilesets/secondary/fan_club_daycare/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4F74/tiles.png b/data/tilesets/secondary/fan_club_daycare/tiles.png
index b8a2a1a4f..b8a2a1a4f 100644
--- a/data/tilesets/secondary/82D4F74/tiles.png
+++ b/data/tilesets/secondary/fan_club_daycare/tiles.png
diff --git a/data/tilesets/secondary/82D4B54/metatile_attributes.bin b/data/tilesets/secondary/fuchsia_city/metatile_attributes.bin
index 3e370a747..3e370a747 100644
--- a/data/tilesets/secondary/82D4B54/metatile_attributes.bin
+++ b/data/tilesets/secondary/fuchsia_city/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4B54/metatiles.bin b/data/tilesets/secondary/fuchsia_city/metatiles.bin
index 0e0e722da..0e0e722da 100644
--- a/data/tilesets/secondary/82D4B54/metatiles.bin
+++ b/data/tilesets/secondary/fuchsia_city/metatiles.bin
diff --git a/data/tilesets/secondary/82D4B54/palettes/0.pal b/data/tilesets/secondary/fuchsia_city/palettes/0.pal
index 5fb8bdb01..5fb8bdb01 100644
--- a/data/tilesets/secondary/82D4B54/palettes/0.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4B9C/palettes/1.pal b/data/tilesets/secondary/fuchsia_city/palettes/1.pal
index 391d1e3d1..391d1e3d1 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/1.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4B54/palettes/10.pal b/data/tilesets/secondary/fuchsia_city/palettes/10.pal
index d82bb0391..d82bb0391 100644
--- a/data/tilesets/secondary/82D4B54/palettes/10.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4B54/palettes/11.pal b/data/tilesets/secondary/fuchsia_city/palettes/11.pal
index cc0cf52cf..cc0cf52cf 100644
--- a/data/tilesets/secondary/82D4B54/palettes/11.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4B54/palettes/12.pal b/data/tilesets/secondary/fuchsia_city/palettes/12.pal
index ebcfeb596..ebcfeb596 100644
--- a/data/tilesets/secondary/82D4B54/palettes/12.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4CA4/palettes/13.pal b/data/tilesets/secondary/fuchsia_city/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/13.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4CA4/palettes/14.pal b/data/tilesets/secondary/fuchsia_city/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/14.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4D34/palettes/15.pal b/data/tilesets/secondary/fuchsia_city/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D34/palettes/15.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4DF4/palettes/2.pal b/data/tilesets/secondary/fuchsia_city/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/2.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4B54/palettes/3.pal b/data/tilesets/secondary/fuchsia_city/palettes/3.pal
index 9581f2cd8..9581f2cd8 100644
--- a/data/tilesets/secondary/82D4B54/palettes/3.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4E0C/palettes/4.pal b/data/tilesets/secondary/fuchsia_city/palettes/4.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/4.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4B6C/palettes/5.pal b/data/tilesets/secondary/fuchsia_city/palettes/5.pal
index 3a2db72a7..3a2db72a7 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/5.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4B6C/palettes/6.pal b/data/tilesets/secondary/fuchsia_city/palettes/6.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/6.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4AF4/palettes/7.pal b/data/tilesets/secondary/fuchsia_city/palettes/7.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/7.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4B54/palettes/8.pal b/data/tilesets/secondary/fuchsia_city/palettes/8.pal
index 8a0a9a1e0..8a0a9a1e0 100644
--- a/data/tilesets/secondary/82D4B54/palettes/8.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4B54/palettes/9.pal b/data/tilesets/secondary/fuchsia_city/palettes/9.pal
index d39bbb454..d39bbb454 100644
--- a/data/tilesets/secondary/82D4B54/palettes/9.pal
+++ b/data/tilesets/secondary/fuchsia_city/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4B54/tiles.png b/data/tilesets/secondary/fuchsia_city/tiles.png
index a9e9e13e8..a9e9e13e8 100644
--- a/data/tilesets/secondary/82D4B54/tiles.png
+++ b/data/tilesets/secondary/fuchsia_city/tiles.png
diff --git a/data/tilesets/secondary/82D4CA4/metatile_attributes.bin b/data/tilesets/secondary/fuchsia_gym/metatile_attributes.bin
index 1b7a02c1f..1b7a02c1f 100644
--- a/data/tilesets/secondary/82D4CA4/metatile_attributes.bin
+++ b/data/tilesets/secondary/fuchsia_gym/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4CA4/metatiles.bin b/data/tilesets/secondary/fuchsia_gym/metatiles.bin
index 25e3b6297..25e3b6297 100644
--- a/data/tilesets/secondary/82D4CA4/metatiles.bin
+++ b/data/tilesets/secondary/fuchsia_gym/metatiles.bin
diff --git a/data/tilesets/secondary/82D4C74/palettes/0.pal b/data/tilesets/secondary/fuchsia_gym/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4C74/palettes/0.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4BE4/palettes/1.pal b/data/tilesets/secondary/fuchsia_gym/palettes/1.pal
index d99adafff..d99adafff 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/1.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4C74/palettes/10.pal b/data/tilesets/secondary/fuchsia_gym/palettes/10.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4C74/palettes/10.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4C74/palettes/11.pal b/data/tilesets/secondary/fuchsia_gym/palettes/11.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4C74/palettes/11.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4CA4/palettes/12.pal b/data/tilesets/secondary/fuchsia_gym/palettes/12.pal
index ebfedc7d5..ebfedc7d5 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/12.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4CBC/palettes/13.pal b/data/tilesets/secondary/fuchsia_gym/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/13.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4CBC/palettes/14.pal b/data/tilesets/secondary/fuchsia_gym/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/14.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4D4C/palettes/15.pal b/data/tilesets/secondary/fuchsia_gym/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/15.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4BE4/palettes/2.pal b/data/tilesets/secondary/fuchsia_gym/palettes/2.pal
index cc3a9457d..cc3a9457d 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/2.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4CA4/palettes/3.pal b/data/tilesets/secondary/fuchsia_gym/palettes/3.pal
index 7ec794ae5..7ec794ae5 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/3.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4C74/palettes/4.pal b/data/tilesets/secondary/fuchsia_gym/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4C74/palettes/4.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4C74/palettes/5.pal b/data/tilesets/secondary/fuchsia_gym/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4C74/palettes/5.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4CA4/palettes/6.pal b/data/tilesets/secondary/fuchsia_gym/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/6.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4CA4/palettes/7.pal b/data/tilesets/secondary/fuchsia_gym/palettes/7.pal
index 9020b628f..9020b628f 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/7.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4CA4/palettes/8.pal b/data/tilesets/secondary/fuchsia_gym/palettes/8.pal
index 1873ad439..1873ad439 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/8.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4C8C/palettes/9.pal b/data/tilesets/secondary/fuchsia_gym/palettes/9.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/9.pal
+++ b/data/tilesets/secondary/fuchsia_gym/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4CA4/tiles.png b/data/tilesets/secondary/fuchsia_gym/tiles.png
index cf2fa4ff7..cf2fa4ff7 100644
--- a/data/tilesets/secondary/82D4CA4/tiles.png
+++ b/data/tilesets/secondary/fuchsia_gym/tiles.png
diff --git a/data/tilesets/secondary/82D4CEC/metatile_attributes.bin b/data/tilesets/secondary/game_corner/metatile_attributes.bin
index a2bcd959e..a2bcd959e 100644
--- a/data/tilesets/secondary/82D4CEC/metatile_attributes.bin
+++ b/data/tilesets/secondary/game_corner/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4CEC/metatiles.bin b/data/tilesets/secondary/game_corner/metatiles.bin
index 1529f8582..1529f8582 100644
--- a/data/tilesets/secondary/82D4CEC/metatiles.bin
+++ b/data/tilesets/secondary/game_corner/metatiles.bin
diff --git a/data/tilesets/secondary/82D4CA4/palettes/0.pal b/data/tilesets/secondary/game_corner/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/0.pal
+++ b/data/tilesets/secondary/game_corner/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4CA4/palettes/1.pal b/data/tilesets/secondary/game_corner/palettes/1.pal
index d99adafff..d99adafff 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/1.pal
+++ b/data/tilesets/secondary/game_corner/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4CEC/palettes/10.pal b/data/tilesets/secondary/game_corner/palettes/10.pal
index 6d76050a9..6d76050a9 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/10.pal
+++ b/data/tilesets/secondary/game_corner/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4CEC/palettes/11.pal b/data/tilesets/secondary/game_corner/palettes/11.pal
index 9359b8858..9359b8858 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/11.pal
+++ b/data/tilesets/secondary/game_corner/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4CEC/palettes/12.pal b/data/tilesets/secondary/game_corner/palettes/12.pal
index 61b3764be..61b3764be 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/12.pal
+++ b/data/tilesets/secondary/game_corner/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4CD4/palettes/13.pal b/data/tilesets/secondary/game_corner/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/13.pal
+++ b/data/tilesets/secondary/game_corner/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4CD4/palettes/14.pal b/data/tilesets/secondary/game_corner/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/14.pal
+++ b/data/tilesets/secondary/game_corner/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4CEC/palettes/15.pal b/data/tilesets/secondary/game_corner/palettes/15.pal
index 3bb14e445..3bb14e445 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/15.pal
+++ b/data/tilesets/secondary/game_corner/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4CA4/palettes/2.pal b/data/tilesets/secondary/game_corner/palettes/2.pal
index cc3a9457d..cc3a9457d 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/2.pal
+++ b/data/tilesets/secondary/game_corner/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4CEC/palettes/3.pal b/data/tilesets/secondary/game_corner/palettes/3.pal
index 7ec794ae5..7ec794ae5 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/3.pal
+++ b/data/tilesets/secondary/game_corner/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4C8C/palettes/4.pal b/data/tilesets/secondary/game_corner/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/4.pal
+++ b/data/tilesets/secondary/game_corner/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4C8C/palettes/5.pal b/data/tilesets/secondary/game_corner/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/5.pal
+++ b/data/tilesets/secondary/game_corner/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4CBC/palettes/6.pal b/data/tilesets/secondary/game_corner/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/6.pal
+++ b/data/tilesets/secondary/game_corner/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4CEC/palettes/7.pal b/data/tilesets/secondary/game_corner/palettes/7.pal
index b3612e537..b3612e537 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/7.pal
+++ b/data/tilesets/secondary/game_corner/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4CEC/palettes/8.pal b/data/tilesets/secondary/game_corner/palettes/8.pal
index e58f94305..e58f94305 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/8.pal
+++ b/data/tilesets/secondary/game_corner/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4CEC/palettes/9.pal b/data/tilesets/secondary/game_corner/palettes/9.pal
index 75f1d81b5..75f1d81b5 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/9.pal
+++ b/data/tilesets/secondary/game_corner/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4CEC/tiles.png b/data/tilesets/secondary/game_corner/tiles.png
index b5b249d0a..b5b249d0a 100644
--- a/data/tilesets/secondary/82D4CEC/tiles.png
+++ b/data/tilesets/secondary/game_corner/tiles.png
diff --git a/data/tilesets/secondary/82D4C74/metatile_attributes.bin b/data/tilesets/secondary/generic_building1/metatile_attributes.bin
index be95e451c..be95e451c 100644
--- a/data/tilesets/secondary/82D4C74/metatile_attributes.bin
+++ b/data/tilesets/secondary/generic_building1/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4C74/metatiles.bin b/data/tilesets/secondary/generic_building1/metatiles.bin
index 806d040ce..806d040ce 100644
--- a/data/tilesets/secondary/82D4C74/metatiles.bin
+++ b/data/tilesets/secondary/generic_building1/metatiles.bin
diff --git a/data/tilesets/secondary/82D4CBC/palettes/0.pal b/data/tilesets/secondary/generic_building1/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/0.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4D4C/palettes/1.pal b/data/tilesets/secondary/generic_building1/palettes/1.pal
index 69f3f0b9e..69f3f0b9e 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/1.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4C8C/palettes/10.pal b/data/tilesets/secondary/generic_building1/palettes/10.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/10.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4C8C/palettes/11.pal b/data/tilesets/secondary/generic_building1/palettes/11.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/11.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4FA4/palettes/12.pal b/data/tilesets/secondary/generic_building1/palettes/12.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/12.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4CEC/palettes/13.pal b/data/tilesets/secondary/generic_building1/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/13.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4CEC/palettes/14.pal b/data/tilesets/secondary/generic_building1/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/14.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4D94/palettes/15.pal b/data/tilesets/secondary/generic_building1/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D94/palettes/15.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4C74/palettes/2.pal b/data/tilesets/secondary/generic_building1/palettes/2.pal
index c8ee236d7..c8ee236d7 100644
--- a/data/tilesets/secondary/82D4C74/palettes/2.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4C74/palettes/3.pal b/data/tilesets/secondary/generic_building1/palettes/3.pal
index b17dbb054..b17dbb054 100644
--- a/data/tilesets/secondary/82D4C74/palettes/3.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4CA4/palettes/4.pal b/data/tilesets/secondary/generic_building1/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/4.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4CA4/palettes/5.pal b/data/tilesets/secondary/generic_building1/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/5.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4CD4/palettes/6.pal b/data/tilesets/secondary/generic_building1/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/6.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4FA4/palettes/7.pal b/data/tilesets/secondary/generic_building1/palettes/7.pal
index c1e7c3d5c..c1e7c3d5c 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/7.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4E6C/palettes/8.pal b/data/tilesets/secondary/generic_building1/palettes/8.pal
index 18480092b..18480092b 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/8.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4CA4/palettes/9.pal b/data/tilesets/secondary/generic_building1/palettes/9.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/9.pal
+++ b/data/tilesets/secondary/generic_building1/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4C74/tiles.png b/data/tilesets/secondary/generic_building1/tiles.png
index 191287197..191287197 100644
--- a/data/tilesets/secondary/82D4C74/tiles.png
+++ b/data/tilesets/secondary/generic_building1/tiles.png
diff --git a/data/tilesets/secondary/82D4E84/metatile_attributes.bin b/data/tilesets/secondary/generic_building2/metatile_attributes.bin
index 18d7517d9..18d7517d9 100644
--- a/data/tilesets/secondary/82D4E84/metatile_attributes.bin
+++ b/data/tilesets/secondary/generic_building2/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4E84/metatiles.bin b/data/tilesets/secondary/generic_building2/metatiles.bin
index 0943dc7af..0943dc7af 100644
--- a/data/tilesets/secondary/82D4E84/metatiles.bin
+++ b/data/tilesets/secondary/generic_building2/metatiles.bin
diff --git a/data/tilesets/secondary/82D4CEC/palettes/0.pal b/data/tilesets/secondary/generic_building2/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/0.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4CEC/palettes/1.pal b/data/tilesets/secondary/generic_building2/palettes/1.pal
index d99adafff..d99adafff 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/1.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4CA4/palettes/10.pal b/data/tilesets/secondary/generic_building2/palettes/10.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/10.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4CA4/palettes/11.pal b/data/tilesets/secondary/generic_building2/palettes/11.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4CA4/palettes/11.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4E84/palettes/12.pal b/data/tilesets/secondary/generic_building2/palettes/12.pal
index 2903bb074..2903bb074 100644
--- a/data/tilesets/secondary/82D4E84/palettes/12.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4D04/palettes/13.pal b/data/tilesets/secondary/generic_building2/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D04/palettes/13.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4D04/palettes/14.pal b/data/tilesets/secondary/generic_building2/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D04/palettes/14.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4DAC/palettes/15.pal b/data/tilesets/secondary/generic_building2/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/15.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4CEC/palettes/2.pal b/data/tilesets/secondary/generic_building2/palettes/2.pal
index cc3a9457d..cc3a9457d 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/2.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4D34/palettes/3.pal b/data/tilesets/secondary/generic_building2/palettes/3.pal
index 7ec794ae5..7ec794ae5 100644
--- a/data/tilesets/secondary/82D4D34/palettes/3.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4CBC/palettes/4.pal b/data/tilesets/secondary/generic_building2/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/4.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4CBC/palettes/5.pal b/data/tilesets/secondary/generic_building2/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/5.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4CEC/palettes/6.pal b/data/tilesets/secondary/generic_building2/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/6.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4DDC/palettes/7.pal b/data/tilesets/secondary/generic_building2/palettes/7.pal
index c62a40b0d..c62a40b0d 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/7.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4DDC/palettes/8.pal b/data/tilesets/secondary/generic_building2/palettes/8.pal
index 8c66b4998..8c66b4998 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/8.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4E84/palettes/9.pal b/data/tilesets/secondary/generic_building2/palettes/9.pal
index 25d5d7019..25d5d7019 100644
--- a/data/tilesets/secondary/82D4E84/palettes/9.pal
+++ b/data/tilesets/secondary/generic_building2/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4E84/tiles.png b/data/tilesets/secondary/generic_building2/tiles.png
index ca6e21f03..ca6e21f03 100644
--- a/data/tilesets/secondary/82D4E84/tiles.png
+++ b/data/tilesets/secondary/generic_building2/tiles.png
diff --git a/data/tilesets/secondary/82D50DC/metatile_attributes.bin b/data/tilesets/secondary/hall_of_fame/metatile_attributes.bin
index 2fa59412a..2fa59412a 100644
--- a/data/tilesets/secondary/82D50DC/metatile_attributes.bin
+++ b/data/tilesets/secondary/hall_of_fame/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D50DC/metatiles.bin b/data/tilesets/secondary/hall_of_fame/metatiles.bin
index 6f4e8a22e..6f4e8a22e 100644
--- a/data/tilesets/secondary/82D50DC/metatiles.bin
+++ b/data/tilesets/secondary/hall_of_fame/metatiles.bin
diff --git a/data/tilesets/secondary/82D4D04/palettes/0.pal b/data/tilesets/secondary/hall_of_fame/palettes/0.pal
index 8db07d418..8db07d418 100644
--- a/data/tilesets/secondary/82D4D04/palettes/0.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4F14/palettes/1.pal b/data/tilesets/secondary/hall_of_fame/palettes/1.pal
index 66561f6d3..66561f6d3 100644
--- a/data/tilesets/secondary/82D4F14/palettes/1.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/1.pal
diff --git a/data/tilesets/secondary/82D50DC/palettes/10.pal b/data/tilesets/secondary/hall_of_fame/palettes/10.pal
index 6ea570459..6ea570459 100644
--- a/data/tilesets/secondary/82D50DC/palettes/10.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/10.pal
diff --git a/data/tilesets/secondary/82D50DC/palettes/11.pal b/data/tilesets/secondary/hall_of_fame/palettes/11.pal
index 008f150c7..008f150c7 100644
--- a/data/tilesets/secondary/82D50DC/palettes/11.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/11.pal
diff --git a/data/tilesets/secondary/82D50DC/palettes/12.pal b/data/tilesets/secondary/hall_of_fame/palettes/12.pal
index c1e7c3d5c..c1e7c3d5c 100644
--- a/data/tilesets/secondary/82D50DC/palettes/12.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4D1C/palettes/13.pal b/data/tilesets/secondary/hall_of_fame/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/13.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4D1C/palettes/14.pal b/data/tilesets/secondary/hall_of_fame/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/14.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4DC4/palettes/15.pal b/data/tilesets/secondary/hall_of_fame/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/15.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4F8C/palettes/2.pal b/data/tilesets/secondary/hall_of_fame/palettes/2.pal
index 87a022102..87a022102 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/2.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4F8C/palettes/3.pal b/data/tilesets/secondary/hall_of_fame/palettes/3.pal
index 783496dcd..783496dcd 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/3.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4F8C/palettes/4.pal b/data/tilesets/secondary/hall_of_fame/palettes/4.pal
index 89eace605..89eace605 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/4.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/4.pal
diff --git a/data/tilesets/secondary/82D5034/palettes/5.pal b/data/tilesets/secondary/hall_of_fame/palettes/5.pal
index c7780e5c7..c7780e5c7 100644
--- a/data/tilesets/secondary/82D5034/palettes/5.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4F8C/palettes/6.pal b/data/tilesets/secondary/hall_of_fame/palettes/6.pal
index 1d08ce9a2..1d08ce9a2 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/6.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/6.pal
diff --git a/data/tilesets/secondary/82D50DC/palettes/7.pal b/data/tilesets/secondary/hall_of_fame/palettes/7.pal
index f0c97cf87..f0c97cf87 100644
--- a/data/tilesets/secondary/82D50DC/palettes/7.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/7.pal
diff --git a/data/tilesets/secondary/82D50DC/palettes/8.pal b/data/tilesets/secondary/hall_of_fame/palettes/8.pal
index 33b52bbbd..33b52bbbd 100644
--- a/data/tilesets/secondary/82D50DC/palettes/8.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/8.pal
diff --git a/data/tilesets/secondary/82D50DC/palettes/9.pal b/data/tilesets/secondary/hall_of_fame/palettes/9.pal
index 3a2cf3b7a..3a2cf3b7a 100644
--- a/data/tilesets/secondary/82D50DC/palettes/9.pal
+++ b/data/tilesets/secondary/hall_of_fame/palettes/9.pal
diff --git a/data/tilesets/secondary/82D50DC/tiles.png b/data/tilesets/secondary/hall_of_fame/tiles.png
index f5ab3a9cb..f5ab3a9cb 100644
--- a/data/tilesets/secondary/82D50DC/tiles.png
+++ b/data/tilesets/secondary/hall_of_fame/tiles.png
diff --git a/data/tilesets/secondary/82D4CD4/metatile_attributes.bin b/data/tilesets/secondary/hoenn_building/metatile_attributes.bin
index 6c4ffed21..6c4ffed21 100644
--- a/data/tilesets/secondary/82D4CD4/metatile_attributes.bin
+++ b/data/tilesets/secondary/hoenn_building/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4CD4/metatiles.bin b/data/tilesets/secondary/hoenn_building/metatiles.bin
index af8effb11..af8effb11 100644
--- a/data/tilesets/secondary/82D4CD4/metatiles.bin
+++ b/data/tilesets/secondary/hoenn_building/metatiles.bin
diff --git a/data/tilesets/secondary/82D4F2C/palettes/0.pal b/data/tilesets/secondary/hoenn_building/palettes/0.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/0.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4F2C/palettes/1.pal b/data/tilesets/secondary/hoenn_building/palettes/1.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/1.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4CD4/palettes/10.pal b/data/tilesets/secondary/hoenn_building/palettes/10.pal
index 432f42149..432f42149 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/10.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4CD4/palettes/11.pal b/data/tilesets/secondary/hoenn_building/palettes/11.pal
index 8c2460403..8c2460403 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/11.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4CD4/palettes/12.pal b/data/tilesets/secondary/hoenn_building/palettes/12.pal
index 920ad12c9..920ad12c9 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/12.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4D34/palettes/13.pal b/data/tilesets/secondary/hoenn_building/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D34/palettes/13.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4D34/palettes/14.pal b/data/tilesets/secondary/hoenn_building/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D34/palettes/14.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4DDC/palettes/15.pal b/data/tilesets/secondary/hoenn_building/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/15.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4F2C/palettes/2.pal b/data/tilesets/secondary/hoenn_building/palettes/2.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/2.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4F2C/palettes/3.pal b/data/tilesets/secondary/hoenn_building/palettes/3.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/3.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4F2C/palettes/4.pal b/data/tilesets/secondary/hoenn_building/palettes/4.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/4.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4F2C/palettes/5.pal b/data/tilesets/secondary/hoenn_building/palettes/5.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/5.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4D1C/palettes/6.pal b/data/tilesets/secondary/hoenn_building/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D1C/palettes/6.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4CD4/palettes/7.pal b/data/tilesets/secondary/hoenn_building/palettes/7.pal
index 533778712..533778712 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/7.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4CD4/palettes/8.pal b/data/tilesets/secondary/hoenn_building/palettes/8.pal
index 0b01f1a0f..0b01f1a0f 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/8.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4CD4/palettes/9.pal b/data/tilesets/secondary/hoenn_building/palettes/9.pal
index 371e5a211..371e5a211 100644
--- a/data/tilesets/secondary/82D4CD4/palettes/9.pal
+++ b/data/tilesets/secondary/hoenn_building/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4CD4/tiles.png b/data/tilesets/secondary/hoenn_building/tiles.png
index ef8a943fa..ef8a943fa 100644
--- a/data/tilesets/secondary/82D4CD4/tiles.png
+++ b/data/tilesets/secondary/hoenn_building/tiles.png
diff --git a/data/tilesets/secondary/82D4B84/metatile_attributes.bin b/data/tilesets/secondary/indigo_plateau/metatile_attributes.bin
index f840f6486..f840f6486 100644
--- a/data/tilesets/secondary/82D4B84/metatile_attributes.bin
+++ b/data/tilesets/secondary/indigo_plateau/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4B84/metatiles.bin b/data/tilesets/secondary/indigo_plateau/metatiles.bin
index bbb7ffbee..bbb7ffbee 100644
--- a/data/tilesets/secondary/82D4B84/metatiles.bin
+++ b/data/tilesets/secondary/indigo_plateau/metatiles.bin
diff --git a/data/tilesets/secondary/82D4B84/palettes/0.pal b/data/tilesets/secondary/indigo_plateau/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/82D4B84/palettes/0.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4AC4/palettes/1.pal b/data/tilesets/secondary/indigo_plateau/palettes/1.pal
index cf1123812..cf1123812 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/1.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4B84/palettes/10.pal b/data/tilesets/secondary/indigo_plateau/palettes/10.pal
index 70ed40322..70ed40322 100644
--- a/data/tilesets/secondary/82D4B84/palettes/10.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4B84/palettes/11.pal b/data/tilesets/secondary/indigo_plateau/palettes/11.pal
index 7b47acf60..7b47acf60 100644
--- a/data/tilesets/secondary/82D4B84/palettes/11.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4B84/palettes/12.pal b/data/tilesets/secondary/indigo_plateau/palettes/12.pal
index f5ff3dddf..f5ff3dddf 100644
--- a/data/tilesets/secondary/82D4B84/palettes/12.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4D4C/palettes/13.pal b/data/tilesets/secondary/indigo_plateau/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/13.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4D4C/palettes/14.pal b/data/tilesets/secondary/indigo_plateau/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/14.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4DF4/palettes/15.pal b/data/tilesets/secondary/indigo_plateau/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/15.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4AF4/palettes/2.pal b/data/tilesets/secondary/indigo_plateau/palettes/2.pal
index 372fb5d7c..372fb5d7c 100644
--- a/data/tilesets/secondary/82D4AF4/palettes/2.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4AC4/palettes/3.pal b/data/tilesets/secondary/indigo_plateau/palettes/3.pal
index 5a5e60211..5a5e60211 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/3.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4AC4/palettes/4.pal b/data/tilesets/secondary/indigo_plateau/palettes/4.pal
index 229f9132c..229f9132c 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/4.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4AC4/palettes/5.pal b/data/tilesets/secondary/indigo_plateau/palettes/5.pal
index 215dd1272..215dd1272 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/5.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4AC4/palettes/6.pal b/data/tilesets/secondary/indigo_plateau/palettes/6.pal
index 7e7862a19..7e7862a19 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/6.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4DC4/palettes/7.pal b/data/tilesets/secondary/indigo_plateau/palettes/7.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/7.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4B84/palettes/8.pal b/data/tilesets/secondary/indigo_plateau/palettes/8.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4B84/palettes/8.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4B84/palettes/9.pal b/data/tilesets/secondary/indigo_plateau/palettes/9.pal
index 3ff6139ac..3ff6139ac 100644
--- a/data/tilesets/secondary/82D4B84/palettes/9.pal
+++ b/data/tilesets/secondary/indigo_plateau/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4B84/tiles.png b/data/tilesets/secondary/indigo_plateau/tiles.png
index 4a938b4c5..4a938b4c5 100644
--- a/data/tilesets/secondary/82D4B84/tiles.png
+++ b/data/tilesets/secondary/indigo_plateau/tiles.png
diff --git a/data/tilesets/secondary/82D50AC/metatile_attributes.bin b/data/tilesets/secondary/island_harbor/metatile_attributes.bin
index 9dd5f613d..9dd5f613d 100644
--- a/data/tilesets/secondary/82D50AC/metatile_attributes.bin
+++ b/data/tilesets/secondary/island_harbor/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D50AC/metatiles.bin b/data/tilesets/secondary/island_harbor/metatiles.bin
index d5916a2cf..d5916a2cf 100644
--- a/data/tilesets/secondary/82D50AC/metatiles.bin
+++ b/data/tilesets/secondary/island_harbor/metatiles.bin
diff --git a/data/tilesets/secondary/82D4BFC/palettes/0.pal b/data/tilesets/secondary/island_harbor/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/0.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/0.pal
diff --git a/data/tilesets/secondary/82D50AC/palettes/1.pal b/data/tilesets/secondary/island_harbor/palettes/1.pal
index 22eb1667c..22eb1667c 100644
--- a/data/tilesets/secondary/82D50AC/palettes/1.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/1.pal
diff --git a/data/tilesets/secondary/82D50AC/palettes/10.pal b/data/tilesets/secondary/island_harbor/palettes/10.pal
index 3c091df8b..3c091df8b 100644
--- a/data/tilesets/secondary/82D50AC/palettes/10.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/10.pal
diff --git a/data/tilesets/secondary/82D50AC/palettes/11.pal b/data/tilesets/secondary/island_harbor/palettes/11.pal
index c42eeb7e1..c42eeb7e1 100644
--- a/data/tilesets/secondary/82D50AC/palettes/11.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/11.pal
diff --git a/data/tilesets/secondary/82D5004/palettes/12.pal b/data/tilesets/secondary/island_harbor/palettes/12.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D5004/palettes/12.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/12.pal
diff --git a/data/tilesets/secondary/82D50AC/palettes/13.pal b/data/tilesets/secondary/island_harbor/palettes/13.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D50AC/palettes/13.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4D64/palettes/14.pal b/data/tilesets/secondary/island_harbor/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D64/palettes/14.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4E0C/palettes/15.pal b/data/tilesets/secondary/island_harbor/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/15.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4E0C/palettes/2.pal b/data/tilesets/secondary/island_harbor/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/2.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4E24/palettes/3.pal b/data/tilesets/secondary/island_harbor/palettes/3.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/82D4E24/palettes/3.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4B24/palettes/4.pal b/data/tilesets/secondary/island_harbor/palettes/4.pal
index 5871a448c..5871a448c 100644
--- a/data/tilesets/secondary/82D4B24/palettes/4.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4E24/palettes/5.pal b/data/tilesets/secondary/island_harbor/palettes/5.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/secondary/82D4E24/palettes/5.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4BFC/palettes/6.pal b/data/tilesets/secondary/island_harbor/palettes/6.pal
index 9bad44649..9bad44649 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/6.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/6.pal
diff --git a/data/tilesets/secondary/82D5004/palettes/7.pal b/data/tilesets/secondary/island_harbor/palettes/7.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D5004/palettes/7.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/7.pal
diff --git a/data/tilesets/secondary/82D50AC/palettes/8.pal b/data/tilesets/secondary/island_harbor/palettes/8.pal
index 5c1251024..5c1251024 100644
--- a/data/tilesets/secondary/82D50AC/palettes/8.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/8.pal
diff --git a/data/tilesets/secondary/82D50AC/palettes/9.pal b/data/tilesets/secondary/island_harbor/palettes/9.pal
index c25501332..c25501332 100644
--- a/data/tilesets/secondary/82D50AC/palettes/9.pal
+++ b/data/tilesets/secondary/island_harbor/palettes/9.pal
diff --git a/data/tilesets/secondary/82D50AC/tiles.png b/data/tilesets/secondary/island_harbor/tiles.png
index 166ae2e18..166ae2e18 100644
--- a/data/tilesets/secondary/82D50AC/tiles.png
+++ b/data/tilesets/secondary/island_harbor/tiles.png
diff --git a/data/tilesets/secondary/82D4C8C/metatile_attributes.bin b/data/tilesets/secondary/lab/metatile_attributes.bin
index 0d685881c..0d685881c 100644
--- a/data/tilesets/secondary/82D4C8C/metatile_attributes.bin
+++ b/data/tilesets/secondary/lab/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4C8C/metatiles.bin b/data/tilesets/secondary/lab/metatiles.bin
index a7833446f..a7833446f 100644
--- a/data/tilesets/secondary/82D4C8C/metatiles.bin
+++ b/data/tilesets/secondary/lab/metatiles.bin
diff --git a/data/tilesets/secondary/82D4C8C/palettes/0.pal b/data/tilesets/secondary/lab/palettes/0.pal
index 9fc16da3b..9fc16da3b 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/0.pal
+++ b/data/tilesets/secondary/lab/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4C8C/palettes/1.pal b/data/tilesets/secondary/lab/palettes/1.pal
index 76403e6d6..76403e6d6 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/1.pal
+++ b/data/tilesets/secondary/lab/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4CBC/palettes/10.pal b/data/tilesets/secondary/lab/palettes/10.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/10.pal
+++ b/data/tilesets/secondary/lab/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4CBC/palettes/11.pal b/data/tilesets/secondary/lab/palettes/11.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/11.pal
+++ b/data/tilesets/secondary/lab/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4C8C/palettes/12.pal b/data/tilesets/secondary/lab/palettes/12.pal
index 3c32c9fd4..3c32c9fd4 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/12.pal
+++ b/data/tilesets/secondary/lab/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4D64/palettes/13.pal b/data/tilesets/secondary/lab/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D64/palettes/13.pal
+++ b/data/tilesets/secondary/lab/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4D7C/palettes/14.pal b/data/tilesets/secondary/lab/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/14.pal
+++ b/data/tilesets/secondary/lab/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4BE4/palettes/15.pal b/data/tilesets/secondary/lab/palettes/15.pal
index 92e7ed309..92e7ed309 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/15.pal
+++ b/data/tilesets/secondary/lab/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4C8C/palettes/2.pal b/data/tilesets/secondary/lab/palettes/2.pal
index b1ecd71dc..b1ecd71dc 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/2.pal
+++ b/data/tilesets/secondary/lab/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4C8C/palettes/3.pal b/data/tilesets/secondary/lab/palettes/3.pal
index 43d9b60e3..43d9b60e3 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/3.pal
+++ b/data/tilesets/secondary/lab/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4CEC/palettes/4.pal b/data/tilesets/secondary/lab/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/4.pal
+++ b/data/tilesets/secondary/lab/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4CEC/palettes/5.pal b/data/tilesets/secondary/lab/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4CEC/palettes/5.pal
+++ b/data/tilesets/secondary/lab/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4D34/palettes/6.pal b/data/tilesets/secondary/lab/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D34/palettes/6.pal
+++ b/data/tilesets/secondary/lab/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4C8C/palettes/7.pal b/data/tilesets/secondary/lab/palettes/7.pal
index 3d7f8bd89..3d7f8bd89 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/7.pal
+++ b/data/tilesets/secondary/lab/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4C8C/palettes/8.pal b/data/tilesets/secondary/lab/palettes/8.pal
index 7fce49d06..7fce49d06 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/8.pal
+++ b/data/tilesets/secondary/lab/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4CBC/palettes/9.pal b/data/tilesets/secondary/lab/palettes/9.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/9.pal
+++ b/data/tilesets/secondary/lab/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4C8C/tiles.png b/data/tilesets/secondary/lab/tiles.png
index 6caeac8a8..6caeac8a8 100644
--- a/data/tilesets/secondary/82D4C8C/tiles.png
+++ b/data/tilesets/secondary/lab/tiles.png
diff --git a/data/tilesets/secondary/82D4B0C/metatile_attributes.bin b/data/tilesets/secondary/lavender_town/metatile_attributes.bin
index d103d7155..d103d7155 100644
--- a/data/tilesets/secondary/82D4B0C/metatile_attributes.bin
+++ b/data/tilesets/secondary/lavender_town/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4B0C/metatiles.bin b/data/tilesets/secondary/lavender_town/metatiles.bin
index f69885645..f69885645 100644
--- a/data/tilesets/secondary/82D4B0C/metatiles.bin
+++ b/data/tilesets/secondary/lavender_town/metatiles.bin
diff --git a/data/tilesets/secondary/82D4DF4/palettes/0.pal b/data/tilesets/secondary/lavender_town/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/0.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4E54/palettes/1.pal b/data/tilesets/secondary/lavender_town/palettes/1.pal
index d8a4e7757..d8a4e7757 100644
--- a/data/tilesets/secondary/82D4E54/palettes/1.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4B0C/palettes/10.pal b/data/tilesets/secondary/lavender_town/palettes/10.pal
index b97e9df4b..b97e9df4b 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/10.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4B0C/palettes/11.pal b/data/tilesets/secondary/lavender_town/palettes/11.pal
index f71181976..f71181976 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/11.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4B0C/palettes/12.pal b/data/tilesets/secondary/lavender_town/palettes/12.pal
index 0cdcab8c2..0cdcab8c2 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/12.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4D7C/palettes/13.pal b/data/tilesets/secondary/lavender_town/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/13.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4D94/palettes/14.pal b/data/tilesets/secondary/lavender_town/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D94/palettes/14.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4B0C/palettes/15.pal b/data/tilesets/secondary/lavender_town/palettes/15.pal
index 3973e491a..3973e491a 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/15.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4E24/palettes/2.pal b/data/tilesets/secondary/lavender_town/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D4E24/palettes/2.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4E54/palettes/3.pal b/data/tilesets/secondary/lavender_town/palettes/3.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/82D4E54/palettes/3.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4B0C/palettes/4.pal b/data/tilesets/secondary/lavender_town/palettes/4.pal
index 07dcd957c..07dcd957c 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/4.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4E54/palettes/5.pal b/data/tilesets/secondary/lavender_town/palettes/5.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/secondary/82D4E54/palettes/5.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4B0C/palettes/6.pal b/data/tilesets/secondary/lavender_town/palettes/6.pal
index 0dba59a72..0dba59a72 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/6.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4B0C/palettes/7.pal b/data/tilesets/secondary/lavender_town/palettes/7.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/7.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4B0C/palettes/8.pal b/data/tilesets/secondary/lavender_town/palettes/8.pal
index 376749664..376749664 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/8.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4B0C/palettes/9.pal b/data/tilesets/secondary/lavender_town/palettes/9.pal
index 82b469a66..82b469a66 100644
--- a/data/tilesets/secondary/82D4B0C/palettes/9.pal
+++ b/data/tilesets/secondary/lavender_town/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4B0C/tiles.png b/data/tilesets/secondary/lavender_town/tiles.png
index 66bd81f8b..66bd81f8b 100644
--- a/data/tilesets/secondary/82D4B0C/tiles.png
+++ b/data/tilesets/secondary/lavender_town/tiles.png
diff --git a/data/tilesets/secondary/82D4BCC/metatile_attributes.bin b/data/tilesets/secondary/mart/metatile_attributes.bin
index 31fdb5cc0..31fdb5cc0 100644
--- a/data/tilesets/secondary/82D4BCC/metatile_attributes.bin
+++ b/data/tilesets/secondary/mart/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4BCC/metatiles.bin b/data/tilesets/secondary/mart/metatiles.bin
index 1c00836c1..1c00836c1 100644
--- a/data/tilesets/secondary/82D4BCC/metatiles.bin
+++ b/data/tilesets/secondary/mart/metatiles.bin
diff --git a/data/tilesets/secondary/82D4D34/palettes/0.pal b/data/tilesets/secondary/mart/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4D34/palettes/0.pal
+++ b/data/tilesets/secondary/mart/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4BCC/palettes/1.pal b/data/tilesets/secondary/mart/palettes/1.pal
index 3a16a45c7..3a16a45c7 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/1.pal
+++ b/data/tilesets/secondary/mart/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4D34/palettes/10.pal b/data/tilesets/secondary/mart/palettes/10.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4D34/palettes/10.pal
+++ b/data/tilesets/secondary/mart/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4D64/palettes/11.pal b/data/tilesets/secondary/mart/palettes/11.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4D64/palettes/11.pal
+++ b/data/tilesets/secondary/mart/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4D94/palettes/12.pal b/data/tilesets/secondary/mart/palettes/12.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D94/palettes/12.pal
+++ b/data/tilesets/secondary/mart/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4D94/palettes/13.pal b/data/tilesets/secondary/mart/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D94/palettes/13.pal
+++ b/data/tilesets/secondary/mart/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4DAC/palettes/14.pal b/data/tilesets/secondary/mart/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/14.pal
+++ b/data/tilesets/secondary/mart/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4C8C/palettes/15.pal b/data/tilesets/secondary/mart/palettes/15.pal
index 92e7ed309..92e7ed309 100644
--- a/data/tilesets/secondary/82D4C8C/palettes/15.pal
+++ b/data/tilesets/secondary/mart/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4D34/palettes/2.pal b/data/tilesets/secondary/mart/palettes/2.pal
index cc3a9457d..cc3a9457d 100644
--- a/data/tilesets/secondary/82D4D34/palettes/2.pal
+++ b/data/tilesets/secondary/mart/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4BCC/palettes/3.pal b/data/tilesets/secondary/mart/palettes/3.pal
index e1b56cd57..e1b56cd57 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/3.pal
+++ b/data/tilesets/secondary/mart/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4D34/palettes/4.pal b/data/tilesets/secondary/mart/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4D34/palettes/4.pal
+++ b/data/tilesets/secondary/mart/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4D34/palettes/5.pal b/data/tilesets/secondary/mart/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4D34/palettes/5.pal
+++ b/data/tilesets/secondary/mart/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4D4C/palettes/6.pal b/data/tilesets/secondary/mart/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/6.pal
+++ b/data/tilesets/secondary/mart/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4BCC/palettes/7.pal b/data/tilesets/secondary/mart/palettes/7.pal
index 0a07057ec..0a07057ec 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/7.pal
+++ b/data/tilesets/secondary/mart/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4BCC/palettes/8.pal b/data/tilesets/secondary/mart/palettes/8.pal
index 06fcc911b..06fcc911b 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/8.pal
+++ b/data/tilesets/secondary/mart/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4BCC/palettes/9.pal b/data/tilesets/secondary/mart/palettes/9.pal
index ea018609b..ea018609b 100644
--- a/data/tilesets/secondary/82D4BCC/palettes/9.pal
+++ b/data/tilesets/secondary/mart/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4BCC/tiles.png b/data/tilesets/secondary/mart/tiles.png
index 2bfeb4080..2bfeb4080 100644
--- a/data/tilesets/secondary/82D4BCC/tiles.png
+++ b/data/tilesets/secondary/mart/tiles.png
diff --git a/data/tilesets/secondary/82D4FEC/metatile_attributes.bin b/data/tilesets/secondary/mt_ember/metatile_attributes.bin
index 45432b773..45432b773 100644
--- a/data/tilesets/secondary/82D4FEC/metatile_attributes.bin
+++ b/data/tilesets/secondary/mt_ember/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4FEC/metatiles.bin b/data/tilesets/secondary/mt_ember/metatiles.bin
index b80796821..b80796821 100644
--- a/data/tilesets/secondary/82D4FEC/metatiles.bin
+++ b/data/tilesets/secondary/mt_ember/metatiles.bin
diff --git a/data/tilesets/secondary/82D4FEC/palettes/0.pal b/data/tilesets/secondary/mt_ember/palettes/0.pal
index 30ff4070a..30ff4070a 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/0.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4FEC/palettes/1.pal b/data/tilesets/secondary/mt_ember/palettes/1.pal
index e15d979f1..e15d979f1 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/1.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4FEC/palettes/10.pal b/data/tilesets/secondary/mt_ember/palettes/10.pal
index fc340ed15..fc340ed15 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/10.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4FEC/palettes/11.pal b/data/tilesets/secondary/mt_ember/palettes/11.pal
index e07ce6909..e07ce6909 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/11.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4FEC/palettes/12.pal b/data/tilesets/secondary/mt_ember/palettes/12.pal
index cc53a5940..cc53a5940 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/12.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4DAC/palettes/13.pal b/data/tilesets/secondary/mt_ember/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/13.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4DC4/palettes/14.pal b/data/tilesets/secondary/mt_ember/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/14.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4E24/palettes/15.pal b/data/tilesets/secondary/mt_ember/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E24/palettes/15.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4B24/palettes/2.pal b/data/tilesets/secondary/mt_ember/palettes/2.pal
index 372fb5d7c..372fb5d7c 100644
--- a/data/tilesets/secondary/82D4B24/palettes/2.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4B9C/palettes/3.pal b/data/tilesets/secondary/mt_ember/palettes/3.pal
index 973765509..973765509 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/3.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4FEC/palettes/4.pal b/data/tilesets/secondary/mt_ember/palettes/4.pal
index 91fdcabdf..91fdcabdf 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/4.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4FEC/palettes/5.pal b/data/tilesets/secondary/mt_ember/palettes/5.pal
index 0edb843f5..0edb843f5 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/5.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4FEC/palettes/6.pal b/data/tilesets/secondary/mt_ember/palettes/6.pal
index 32afdccbb..32afdccbb 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/6.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4FEC/palettes/7.pal b/data/tilesets/secondary/mt_ember/palettes/7.pal
index fa9d5d633..fa9d5d633 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/7.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4FEC/palettes/8.pal b/data/tilesets/secondary/mt_ember/palettes/8.pal
index f4a797b87..f4a797b87 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/8.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4FEC/palettes/9.pal b/data/tilesets/secondary/mt_ember/palettes/9.pal
index 0a2109195..0a2109195 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/9.pal
+++ b/data/tilesets/secondary/mt_ember/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4FEC/tiles.png b/data/tilesets/secondary/mt_ember/tiles.png
index 04d2b7b67..04d2b7b67 100644
--- a/data/tilesets/secondary/82D4FEC/tiles.png
+++ b/data/tilesets/secondary/mt_ember/tiles.png
diff --git a/data/tilesets/secondary/82D4C2C/metatile_attributes.bin b/data/tilesets/secondary/museum/metatile_attributes.bin
index 097e93ce1..097e93ce1 100644
--- a/data/tilesets/secondary/82D4C2C/metatile_attributes.bin
+++ b/data/tilesets/secondary/museum/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4C2C/metatiles.bin b/data/tilesets/secondary/museum/metatiles.bin
index 993b73cbd..993b73cbd 100644
--- a/data/tilesets/secondary/82D4C2C/metatiles.bin
+++ b/data/tilesets/secondary/museum/metatiles.bin
diff --git a/data/tilesets/secondary/82D4D4C/palettes/0.pal b/data/tilesets/secondary/museum/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/0.pal
+++ b/data/tilesets/secondary/museum/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4D7C/palettes/1.pal b/data/tilesets/secondary/museum/palettes/1.pal
index 69f3f0b9e..69f3f0b9e 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/1.pal
+++ b/data/tilesets/secondary/museum/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4C2C/palettes/10.pal b/data/tilesets/secondary/museum/palettes/10.pal
index fc8da5d40..fc8da5d40 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/10.pal
+++ b/data/tilesets/secondary/museum/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4F2C/palettes/11.pal b/data/tilesets/secondary/museum/palettes/11.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/11.pal
+++ b/data/tilesets/secondary/museum/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4DDC/palettes/12.pal b/data/tilesets/secondary/museum/palettes/12.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/12.pal
+++ b/data/tilesets/secondary/museum/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4DC4/palettes/13.pal b/data/tilesets/secondary/museum/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/13.pal
+++ b/data/tilesets/secondary/museum/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4DDC/palettes/14.pal b/data/tilesets/secondary/museum/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/14.pal
+++ b/data/tilesets/secondary/museum/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4E3C/palettes/15.pal b/data/tilesets/secondary/museum/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/15.pal
+++ b/data/tilesets/secondary/museum/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4D7C/palettes/2.pal b/data/tilesets/secondary/museum/palettes/2.pal
index 330e35b02..330e35b02 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/2.pal
+++ b/data/tilesets/secondary/museum/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4C2C/palettes/3.pal b/data/tilesets/secondary/museum/palettes/3.pal
index 1520bed0b..1520bed0b 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/3.pal
+++ b/data/tilesets/secondary/museum/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4D4C/palettes/4.pal b/data/tilesets/secondary/museum/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/4.pal
+++ b/data/tilesets/secondary/museum/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4D4C/palettes/5.pal b/data/tilesets/secondary/museum/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4D4C/palettes/5.pal
+++ b/data/tilesets/secondary/museum/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4E6C/palettes/6.pal b/data/tilesets/secondary/museum/palettes/6.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/6.pal
+++ b/data/tilesets/secondary/museum/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4E6C/palettes/7.pal b/data/tilesets/secondary/museum/palettes/7.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/7.pal
+++ b/data/tilesets/secondary/museum/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4C2C/palettes/8.pal b/data/tilesets/secondary/museum/palettes/8.pal
index 223737ab6..223737ab6 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/8.pal
+++ b/data/tilesets/secondary/museum/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4C2C/palettes/9.pal b/data/tilesets/secondary/museum/palettes/9.pal
index 6de173f90..6de173f90 100644
--- a/data/tilesets/secondary/82D4C2C/palettes/9.pal
+++ b/data/tilesets/secondary/museum/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4C2C/tiles.png b/data/tilesets/secondary/museum/tiles.png
index 9be5ebca9..9be5ebca9 100644
--- a/data/tilesets/secondary/82D4C2C/tiles.png
+++ b/data/tilesets/secondary/museum/tiles.png
diff --git a/data/tilesets/secondary/82D501C/metatile_attributes.bin b/data/tilesets/secondary/navel_rock/metatile_attributes.bin
index 6e3d955e2..6e3d955e2 100644
--- a/data/tilesets/secondary/82D501C/metatile_attributes.bin
+++ b/data/tilesets/secondary/navel_rock/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D501C/metatiles.bin b/data/tilesets/secondary/navel_rock/metatiles.bin
index 7fdc5c55d..7fdc5c55d 100644
--- a/data/tilesets/secondary/82D501C/metatiles.bin
+++ b/data/tilesets/secondary/navel_rock/metatiles.bin
diff --git a/data/tilesets/secondary/82D4E24/palettes/0.pal b/data/tilesets/secondary/navel_rock/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/82D4E24/palettes/0.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4FBC/palettes/1.pal b/data/tilesets/secondary/navel_rock/palettes/1.pal
index d8a4e7757..d8a4e7757 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/1.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/1.pal
diff --git a/data/tilesets/secondary/82D501C/palettes/10.pal b/data/tilesets/secondary/navel_rock/palettes/10.pal
index 334da8f23..334da8f23 100644
--- a/data/tilesets/secondary/82D501C/palettes/10.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/10.pal
diff --git a/data/tilesets/secondary/82D501C/palettes/11.pal b/data/tilesets/secondary/navel_rock/palettes/11.pal
index 0c3d2870e..0c3d2870e 100644
--- a/data/tilesets/secondary/82D501C/palettes/11.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/11.pal
diff --git a/data/tilesets/secondary/82D501C/palettes/12.pal b/data/tilesets/secondary/navel_rock/palettes/12.pal
index a68c94c2c..a68c94c2c 100644
--- a/data/tilesets/secondary/82D501C/palettes/12.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4DDC/palettes/13.pal b/data/tilesets/secondary/navel_rock/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/13.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4DF4/palettes/14.pal b/data/tilesets/secondary/navel_rock/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/14.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4E54/palettes/15.pal b/data/tilesets/secondary/navel_rock/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E54/palettes/15.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4E54/palettes/2.pal b/data/tilesets/secondary/navel_rock/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D4E54/palettes/2.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4FBC/palettes/3.pal b/data/tilesets/secondary/navel_rock/palettes/3.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/3.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4E24/palettes/4.pal b/data/tilesets/secondary/navel_rock/palettes/4.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/82D4E24/palettes/4.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4FBC/palettes/5.pal b/data/tilesets/secondary/navel_rock/palettes/5.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/5.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4F14/palettes/6.pal b/data/tilesets/secondary/navel_rock/palettes/6.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4F14/palettes/6.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/6.pal
diff --git a/data/tilesets/secondary/82D501C/palettes/7.pal b/data/tilesets/secondary/navel_rock/palettes/7.pal
index 364379ad9..364379ad9 100644
--- a/data/tilesets/secondary/82D501C/palettes/7.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/7.pal
diff --git a/data/tilesets/secondary/82D501C/palettes/8.pal b/data/tilesets/secondary/navel_rock/palettes/8.pal
index 102aaaf2c..102aaaf2c 100644
--- a/data/tilesets/secondary/82D501C/palettes/8.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/8.pal
diff --git a/data/tilesets/secondary/82D501C/palettes/9.pal b/data/tilesets/secondary/navel_rock/palettes/9.pal
index 91329f82e..91329f82e 100644
--- a/data/tilesets/secondary/82D501C/palettes/9.pal
+++ b/data/tilesets/secondary/navel_rock/palettes/9.pal
diff --git a/data/tilesets/secondary/82D501C/tiles.png b/data/tilesets/secondary/navel_rock/tiles.png
index cbce25763..cbce25763 100644
--- a/data/tilesets/secondary/82D501C/tiles.png
+++ b/data/tilesets/secondary/navel_rock/tiles.png
diff --git a/data/tilesets/secondary/82D4AAC/metatile_attributes.bin b/data/tilesets/secondary/pallet_town/metatile_attributes.bin
index 2ba2894bc..2ba2894bc 100644
--- a/data/tilesets/secondary/82D4AAC/metatile_attributes.bin
+++ b/data/tilesets/secondary/pallet_town/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4AAC/metatiles.bin b/data/tilesets/secondary/pallet_town/metatiles.bin
index 41db27015..41db27015 100644
--- a/data/tilesets/secondary/82D4AAC/metatiles.bin
+++ b/data/tilesets/secondary/pallet_town/metatiles.bin
diff --git a/data/tilesets/secondary/82D4AAC/palettes/0.pal b/data/tilesets/secondary/pallet_town/palettes/0.pal
index 42246e9ea..42246e9ea 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/0.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4AAC/palettes/1.pal b/data/tilesets/secondary/pallet_town/palettes/1.pal
index 28db536cb..28db536cb 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/1.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4AAC/palettes/10.pal b/data/tilesets/secondary/pallet_town/palettes/10.pal
index 1958eff11..1958eff11 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/10.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4AAC/palettes/11.pal b/data/tilesets/secondary/pallet_town/palettes/11.pal
index 896c79281..896c79281 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/11.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4AAC/palettes/12.pal b/data/tilesets/secondary/pallet_town/palettes/12.pal
index 2bfc45b6d..2bfc45b6d 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/12.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4DF4/palettes/13.pal b/data/tilesets/secondary/pallet_town/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/13.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4E0C/palettes/14.pal b/data/tilesets/secondary/pallet_town/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/14.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4E6C/palettes/15.pal b/data/tilesets/secondary/pallet_town/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/15.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4AAC/palettes/2.pal b/data/tilesets/secondary/pallet_town/palettes/2.pal
index 937cec4da..937cec4da 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/2.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4AAC/palettes/3.pal b/data/tilesets/secondary/pallet_town/palettes/3.pal
index 6d1dfb5af..6d1dfb5af 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/3.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4AAC/palettes/4.pal b/data/tilesets/secondary/pallet_town/palettes/4.pal
index cde020d4e..cde020d4e 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/4.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4AAC/palettes/5.pal b/data/tilesets/secondary/pallet_town/palettes/5.pal
index bdcc7b8ed..bdcc7b8ed 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/5.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4D64/palettes/6.pal b/data/tilesets/secondary/pallet_town/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D64/palettes/6.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4E54/palettes/7.pal b/data/tilesets/secondary/pallet_town/palettes/7.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4E54/palettes/7.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4AAC/palettes/8.pal b/data/tilesets/secondary/pallet_town/palettes/8.pal
index dcecb9c40..dcecb9c40 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/8.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4AAC/palettes/9.pal b/data/tilesets/secondary/pallet_town/palettes/9.pal
index 90bb77517..90bb77517 100644
--- a/data/tilesets/secondary/82D4AAC/palettes/9.pal
+++ b/data/tilesets/secondary/pallet_town/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4AAC/tiles.png b/data/tilesets/secondary/pallet_town/tiles.png
index 771eed906..771eed906 100644
--- a/data/tilesets/secondary/82D4AAC/tiles.png
+++ b/data/tilesets/secondary/pallet_town/tiles.png
diff --git a/data/tilesets/secondary/82D4ADC/metatile_attributes.bin b/data/tilesets/secondary/pewter_city/metatile_attributes.bin
index 4e19ca185..4e19ca185 100644
--- a/data/tilesets/secondary/82D4ADC/metatile_attributes.bin
+++ b/data/tilesets/secondary/pewter_city/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4ADC/metatiles.bin b/data/tilesets/secondary/pewter_city/metatiles.bin
index a23224773..a23224773 100644
--- a/data/tilesets/secondary/82D4ADC/metatiles.bin
+++ b/data/tilesets/secondary/pewter_city/metatiles.bin
diff --git a/data/tilesets/secondary/82D4ADC/palettes/0.pal b/data/tilesets/secondary/pewter_city/palettes/0.pal
index 620015e77..620015e77 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/0.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4ADC/palettes/1.pal b/data/tilesets/secondary/pewter_city/palettes/1.pal
index 60de8c7ad..60de8c7ad 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/1.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4ADC/palettes/10.pal b/data/tilesets/secondary/pewter_city/palettes/10.pal
index 76fda8006..76fda8006 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/10.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4ADC/palettes/11.pal b/data/tilesets/secondary/pewter_city/palettes/11.pal
index 3f8fdc519..3f8fdc519 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/11.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4ADC/palettes/12.pal b/data/tilesets/secondary/pewter_city/palettes/12.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/12.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4E0C/palettes/13.pal b/data/tilesets/secondary/pewter_city/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E0C/palettes/13.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4E24/palettes/14.pal b/data/tilesets/secondary/pewter_city/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E24/palettes/14.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4E84/palettes/15.pal b/data/tilesets/secondary/pewter_city/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E84/palettes/15.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4FBC/palettes/2.pal b/data/tilesets/secondary/pewter_city/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/2.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4DC4/palettes/3.pal b/data/tilesets/secondary/pewter_city/palettes/3.pal
index 9581f2cd8..9581f2cd8 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/3.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4E54/palettes/4.pal b/data/tilesets/secondary/pewter_city/palettes/4.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/82D4E54/palettes/4.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4B9C/palettes/5.pal b/data/tilesets/secondary/pewter_city/palettes/5.pal
index 3a2db72a7..3a2db72a7 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/5.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4B9C/palettes/6.pal b/data/tilesets/secondary/pewter_city/palettes/6.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/6.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4B54/palettes/7.pal b/data/tilesets/secondary/pewter_city/palettes/7.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/82D4B54/palettes/7.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4ADC/palettes/8.pal b/data/tilesets/secondary/pewter_city/palettes/8.pal
index d404706ab..d404706ab 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/8.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4ADC/palettes/9.pal b/data/tilesets/secondary/pewter_city/palettes/9.pal
index cacf892a6..cacf892a6 100644
--- a/data/tilesets/secondary/82D4ADC/palettes/9.pal
+++ b/data/tilesets/secondary/pewter_city/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4ADC/tiles.png b/data/tilesets/secondary/pewter_city/tiles.png
index d3148ba5a..d3148ba5a 100644
--- a/data/tilesets/secondary/82D4ADC/tiles.png
+++ b/data/tilesets/secondary/pewter_city/tiles.png
diff --git a/data/tilesets/secondary/82D4D04/metatile_attributes.bin b/data/tilesets/secondary/pewter_gym/metatile_attributes.bin
index ead3610f0..ead3610f0 100644
--- a/data/tilesets/secondary/82D4D04/metatile_attributes.bin
+++ b/data/tilesets/secondary/pewter_gym/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4D04/metatiles.bin b/data/tilesets/secondary/pewter_gym/metatiles.bin
index 7034bb6d6..7034bb6d6 100644
--- a/data/tilesets/secondary/82D4D04/metatiles.bin
+++ b/data/tilesets/secondary/pewter_gym/metatiles.bin
diff --git a/data/tilesets/secondary/82D4EFC/palettes/0.pal b/data/tilesets/secondary/pewter_gym/palettes/0.pal
index 8db07d418..8db07d418 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/0.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4F8C/palettes/1.pal b/data/tilesets/secondary/pewter_gym/palettes/1.pal
index 66561f6d3..66561f6d3 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/1.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4D04/palettes/10.pal b/data/tilesets/secondary/pewter_gym/palettes/10.pal
index 131aaa71c..131aaa71c 100644
--- a/data/tilesets/secondary/82D4D04/palettes/10.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4D04/palettes/11.pal b/data/tilesets/secondary/pewter_gym/palettes/11.pal
index 131aaa71c..131aaa71c 100644
--- a/data/tilesets/secondary/82D4D04/palettes/11.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4D04/palettes/12.pal b/data/tilesets/secondary/pewter_gym/palettes/12.pal
index c8dfac7d2..c8dfac7d2 100644
--- a/data/tilesets/secondary/82D4D04/palettes/12.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4E24/palettes/13.pal b/data/tilesets/secondary/pewter_gym/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E24/palettes/13.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4E3C/palettes/14.pal b/data/tilesets/secondary/pewter_gym/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/14.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4E9C/palettes/15.pal b/data/tilesets/secondary/pewter_gym/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/15.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4FA4/palettes/2.pal b/data/tilesets/secondary/pewter_gym/palettes/2.pal
index 87a022102..87a022102 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/2.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4FA4/palettes/3.pal b/data/tilesets/secondary/pewter_gym/palettes/3.pal
index 783496dcd..783496dcd 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/3.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4FA4/palettes/4.pal b/data/tilesets/secondary/pewter_gym/palettes/4.pal
index 89eace605..89eace605 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/4.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4EE4/palettes/5.pal b/data/tilesets/secondary/pewter_gym/palettes/5.pal
index 0eef3df8e..0eef3df8e 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/5.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4FA4/palettes/6.pal b/data/tilesets/secondary/pewter_gym/palettes/6.pal
index 1d08ce9a2..1d08ce9a2 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/6.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4D04/palettes/7.pal b/data/tilesets/secondary/pewter_gym/palettes/7.pal
index 34c0ddd17..34c0ddd17 100644
--- a/data/tilesets/secondary/82D4D04/palettes/7.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4D04/palettes/8.pal b/data/tilesets/secondary/pewter_gym/palettes/8.pal
index 77e03a48c..77e03a48c 100644
--- a/data/tilesets/secondary/82D4D04/palettes/8.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4D04/palettes/9.pal b/data/tilesets/secondary/pewter_gym/palettes/9.pal
index ef91ae987..ef91ae987 100644
--- a/data/tilesets/secondary/82D4D04/palettes/9.pal
+++ b/data/tilesets/secondary/pewter_gym/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4D04/tiles.png b/data/tilesets/secondary/pewter_gym/tiles.png
index 6e97a68a1..6e97a68a1 100644
--- a/data/tilesets/secondary/82D4D04/tiles.png
+++ b/data/tilesets/secondary/pewter_gym/tiles.png
diff --git a/data/tilesets/secondary/82D4BE4/metatile_attributes.bin b/data/tilesets/secondary/pokemon_center/metatile_attributes.bin
index f9bd3d289..f9bd3d289 100644
--- a/data/tilesets/secondary/82D4BE4/metatile_attributes.bin
+++ b/data/tilesets/secondary/pokemon_center/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4BE4/metatiles.bin b/data/tilesets/secondary/pokemon_center/metatiles.bin
index 2ec8817bc..2ec8817bc 100644
--- a/data/tilesets/secondary/82D4BE4/metatiles.bin
+++ b/data/tilesets/secondary/pokemon_center/metatiles.bin
diff --git a/data/tilesets/secondary/82D4D64/palettes/0.pal b/data/tilesets/secondary/pokemon_center/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4D64/palettes/0.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4D34/palettes/1.pal b/data/tilesets/secondary/pokemon_center/palettes/1.pal
index d99adafff..d99adafff 100644
--- a/data/tilesets/secondary/82D4D34/palettes/1.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4BE4/palettes/10.pal b/data/tilesets/secondary/pokemon_center/palettes/10.pal
index 62e3e6d6b..62e3e6d6b 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/10.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4BE4/palettes/11.pal b/data/tilesets/secondary/pokemon_center/palettes/11.pal
index 7ba7bccca..7ba7bccca 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/11.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4BE4/palettes/12.pal b/data/tilesets/secondary/pokemon_center/palettes/12.pal
index 0f1f36738..0f1f36738 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/12.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4E3C/palettes/13.pal b/data/tilesets/secondary/pokemon_center/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/13.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4E54/palettes/14.pal b/data/tilesets/secondary/pokemon_center/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E54/palettes/14.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4CBC/palettes/15.pal b/data/tilesets/secondary/pokemon_center/palettes/15.pal
index 92e7ed309..92e7ed309 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/15.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4DDC/palettes/2.pal b/data/tilesets/secondary/pokemon_center/palettes/2.pal
index cc3a9457d..cc3a9457d 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/2.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4DDC/palettes/3.pal b/data/tilesets/secondary/pokemon_center/palettes/3.pal
index 7ec794ae5..7ec794ae5 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/3.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4D64/palettes/4.pal b/data/tilesets/secondary/pokemon_center/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4D64/palettes/4.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4D64/palettes/5.pal b/data/tilesets/secondary/pokemon_center/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4D64/palettes/5.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4D7C/palettes/6.pal b/data/tilesets/secondary/pokemon_center/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/6.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4BE4/palettes/7.pal b/data/tilesets/secondary/pokemon_center/palettes/7.pal
index 27ca86ca3..27ca86ca3 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/7.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4BE4/palettes/8.pal b/data/tilesets/secondary/pokemon_center/palettes/8.pal
index 6b6a0f25f..6b6a0f25f 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/8.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4BE4/palettes/9.pal b/data/tilesets/secondary/pokemon_center/palettes/9.pal
index 4b279ecf9..4b279ecf9 100644
--- a/data/tilesets/secondary/82D4BE4/palettes/9.pal
+++ b/data/tilesets/secondary/pokemon_center/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4BE4/tiles.png b/data/tilesets/secondary/pokemon_center/tiles.png
index 92d0112f3..92d0112f3 100644
--- a/data/tilesets/secondary/82D4BE4/tiles.png
+++ b/data/tilesets/secondary/pokemon_center/tiles.png
diff --git a/data/tilesets/secondary/82D50C4/metatile_attributes.bin b/data/tilesets/secondary/pokemon_league/metatile_attributes.bin
index bcc2fedb4..bcc2fedb4 100644
--- a/data/tilesets/secondary/82D50C4/metatile_attributes.bin
+++ b/data/tilesets/secondary/pokemon_league/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D50C4/metatiles.bin b/data/tilesets/secondary/pokemon_league/metatiles.bin
index 7cdfa846a..7cdfa846a 100644
--- a/data/tilesets/secondary/82D50C4/metatiles.bin
+++ b/data/tilesets/secondary/pokemon_league/metatiles.bin
diff --git a/data/tilesets/secondary/82D5094/palettes/0.pal b/data/tilesets/secondary/pokemon_league/palettes/0.pal
index 8db07d418..8db07d418 100644
--- a/data/tilesets/secondary/82D5094/palettes/0.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/0.pal
diff --git a/data/tilesets/secondary/82D50C4/palettes/1.pal b/data/tilesets/secondary/pokemon_league/palettes/1.pal
index fc945ef6c..fc945ef6c 100644
--- a/data/tilesets/secondary/82D50C4/palettes/1.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/1.pal
diff --git a/data/tilesets/secondary/82D50C4/palettes/10.pal b/data/tilesets/secondary/pokemon_league/palettes/10.pal
index 18908d2ef..18908d2ef 100644
--- a/data/tilesets/secondary/82D50C4/palettes/10.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/10.pal
diff --git a/data/tilesets/secondary/82D50C4/palettes/11.pal b/data/tilesets/secondary/pokemon_league/palettes/11.pal
index edc05893b..edc05893b 100644
--- a/data/tilesets/secondary/82D50C4/palettes/11.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/11.pal
diff --git a/data/tilesets/secondary/82D50C4/palettes/12.pal b/data/tilesets/secondary/pokemon_league/palettes/12.pal
index 36807053a..36807053a 100644
--- a/data/tilesets/secondary/82D50C4/palettes/12.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4E54/palettes/13.pal b/data/tilesets/secondary/pokemon_league/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E54/palettes/13.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4E6C/palettes/14.pal b/data/tilesets/secondary/pokemon_league/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/14.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/14.pal
diff --git a/data/tilesets/secondary/82D50C4/palettes/15.pal b/data/tilesets/secondary/pokemon_league/palettes/15.pal
index 0b5e86def..0b5e86def 100644
--- a/data/tilesets/secondary/82D50C4/palettes/15.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/15.pal
diff --git a/data/tilesets/secondary/82D5034/palettes/2.pal b/data/tilesets/secondary/pokemon_league/palettes/2.pal
index 87a022102..87a022102 100644
--- a/data/tilesets/secondary/82D5034/palettes/2.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/2.pal
diff --git a/data/tilesets/secondary/82D5034/palettes/3.pal b/data/tilesets/secondary/pokemon_league/palettes/3.pal
index 783496dcd..783496dcd 100644
--- a/data/tilesets/secondary/82D5034/palettes/3.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/3.pal
diff --git a/data/tilesets/secondary/82D5034/palettes/4.pal b/data/tilesets/secondary/pokemon_league/palettes/4.pal
index 89eace605..89eace605 100644
--- a/data/tilesets/secondary/82D5034/palettes/4.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/4.pal
diff --git a/data/tilesets/secondary/82D50C4/palettes/5.pal b/data/tilesets/secondary/pokemon_league/palettes/5.pal
index 34ef2f2d2..34ef2f2d2 100644
--- a/data/tilesets/secondary/82D50C4/palettes/5.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/5.pal
diff --git a/data/tilesets/secondary/82D5034/palettes/6.pal b/data/tilesets/secondary/pokemon_league/palettes/6.pal
index 1d08ce9a2..1d08ce9a2 100644
--- a/data/tilesets/secondary/82D5034/palettes/6.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/6.pal
diff --git a/data/tilesets/secondary/82D50C4/palettes/7.pal b/data/tilesets/secondary/pokemon_league/palettes/7.pal
index 6528f9f75..6528f9f75 100644
--- a/data/tilesets/secondary/82D50C4/palettes/7.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/7.pal
diff --git a/data/tilesets/secondary/82D50C4/palettes/8.pal b/data/tilesets/secondary/pokemon_league/palettes/8.pal
index 6b56cd49e..6b56cd49e 100644
--- a/data/tilesets/secondary/82D50C4/palettes/8.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/8.pal
diff --git a/data/tilesets/secondary/82D50C4/palettes/9.pal b/data/tilesets/secondary/pokemon_league/palettes/9.pal
index 5c2ed43a0..5c2ed43a0 100644
--- a/data/tilesets/secondary/82D50C4/palettes/9.pal
+++ b/data/tilesets/secondary/pokemon_league/palettes/9.pal
diff --git a/data/tilesets/secondary/82D50C4/tiles.png b/data/tilesets/secondary/pokemon_league/tiles.png
index 0f65e1ff3..0f65e1ff3 100644
--- a/data/tilesets/secondary/82D50C4/tiles.png
+++ b/data/tilesets/secondary/pokemon_league/tiles.png
diff --git a/data/tilesets/secondary/82D4F2C/metatile_attributes.bin b/data/tilesets/secondary/pokemon_mansion/metatile_attributes.bin
index 91b8105d3..91b8105d3 100644
--- a/data/tilesets/secondary/82D4F2C/metatile_attributes.bin
+++ b/data/tilesets/secondary/pokemon_mansion/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4F2C/metatiles.bin b/data/tilesets/secondary/pokemon_mansion/metatiles.bin
index 5caba25a7..5caba25a7 100644
--- a/data/tilesets/secondary/82D4F2C/metatiles.bin
+++ b/data/tilesets/secondary/pokemon_mansion/metatiles.bin
diff --git a/data/tilesets/secondary/82D4F74/palettes/0.pal b/data/tilesets/secondary/pokemon_mansion/palettes/0.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F74/palettes/0.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4F74/palettes/1.pal b/data/tilesets/secondary/pokemon_mansion/palettes/1.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F74/palettes/1.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4F2C/palettes/10.pal b/data/tilesets/secondary/pokemon_mansion/palettes/10.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/10.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4F74/palettes/11.pal b/data/tilesets/secondary/pokemon_mansion/palettes/11.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F74/palettes/11.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4F2C/palettes/12.pal b/data/tilesets/secondary/pokemon_mansion/palettes/12.pal
index 9c9a571ef..9c9a571ef 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/12.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4E6C/palettes/13.pal b/data/tilesets/secondary/pokemon_mansion/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/13.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4E84/palettes/14.pal b/data/tilesets/secondary/pokemon_mansion/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E84/palettes/14.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4EB4/palettes/15.pal b/data/tilesets/secondary/pokemon_mansion/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/15.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4F74/palettes/2.pal b/data/tilesets/secondary/pokemon_mansion/palettes/2.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F74/palettes/2.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4F74/palettes/3.pal b/data/tilesets/secondary/pokemon_mansion/palettes/3.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F74/palettes/3.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4F74/palettes/4.pal b/data/tilesets/secondary/pokemon_mansion/palettes/4.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F74/palettes/4.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4F74/palettes/5.pal b/data/tilesets/secondary/pokemon_mansion/palettes/5.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F74/palettes/5.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4DAC/palettes/6.pal b/data/tilesets/secondary/pokemon_mansion/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4DAC/palettes/6.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4F2C/palettes/7.pal b/data/tilesets/secondary/pokemon_mansion/palettes/7.pal
index 4d22869cd..4d22869cd 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/7.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4F2C/palettes/8.pal b/data/tilesets/secondary/pokemon_mansion/palettes/8.pal
index 2a9d791a4..2a9d791a4 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/8.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4F2C/palettes/9.pal b/data/tilesets/secondary/pokemon_mansion/palettes/9.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/9.pal
+++ b/data/tilesets/secondary/pokemon_mansion/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4F2C/tiles.png b/data/tilesets/secondary/pokemon_mansion/tiles.png
index 3e69db5c3..3e69db5c3 100644
--- a/data/tilesets/secondary/82D4F2C/tiles.png
+++ b/data/tilesets/secondary/pokemon_mansion/tiles.png
diff --git a/data/tilesets/secondary/82D4EFC/metatile_attributes.bin b/data/tilesets/secondary/pokemon_tower/metatile_attributes.bin
index 8c16318f0..8c16318f0 100644
--- a/data/tilesets/secondary/82D4EFC/metatile_attributes.bin
+++ b/data/tilesets/secondary/pokemon_tower/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4EFC/metatiles.bin b/data/tilesets/secondary/pokemon_tower/metatiles.bin
index d4216989e..d4216989e 100644
--- a/data/tilesets/secondary/82D4EFC/metatiles.bin
+++ b/data/tilesets/secondary/pokemon_tower/metatiles.bin
diff --git a/data/tilesets/secondary/82D50C4/palettes/0.pal b/data/tilesets/secondary/pokemon_tower/palettes/0.pal
index 8db07d418..8db07d418 100644
--- a/data/tilesets/secondary/82D50C4/palettes/0.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4E9C/palettes/1.pal b/data/tilesets/secondary/pokemon_tower/palettes/1.pal
index 30be2fbe3..30be2fbe3 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/1.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4D64/palettes/10.pal b/data/tilesets/secondary/pokemon_tower/palettes/10.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4D64/palettes/10.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4DDC/palettes/11.pal b/data/tilesets/secondary/pokemon_tower/palettes/11.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/11.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4EFC/palettes/12.pal b/data/tilesets/secondary/pokemon_tower/palettes/12.pal
index fa56f966e..fa56f966e 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/12.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4E84/palettes/13.pal b/data/tilesets/secondary/pokemon_tower/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E84/palettes/13.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4E9C/palettes/14.pal b/data/tilesets/secondary/pokemon_tower/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/14.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4D64/palettes/15.pal b/data/tilesets/secondary/pokemon_tower/palettes/15.pal
index 92e7ed309..92e7ed309 100644
--- a/data/tilesets/secondary/82D4D64/palettes/15.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4E9C/palettes/2.pal b/data/tilesets/secondary/pokemon_tower/palettes/2.pal
index e7c4b911a..e7c4b911a 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/2.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4E9C/palettes/3.pal b/data/tilesets/secondary/pokemon_tower/palettes/3.pal
index 54b77e0c8..54b77e0c8 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/3.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4D7C/palettes/4.pal b/data/tilesets/secondary/pokemon_tower/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/4.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4D7C/palettes/5.pal b/data/tilesets/secondary/pokemon_tower/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/5.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4E84/palettes/6.pal b/data/tilesets/secondary/pokemon_tower/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E84/palettes/6.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4EFC/palettes/7.pal b/data/tilesets/secondary/pokemon_tower/palettes/7.pal
index 241a2678c..241a2678c 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/7.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4EFC/palettes/8.pal b/data/tilesets/secondary/pokemon_tower/palettes/8.pal
index ebd9e912c..ebd9e912c 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/8.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4EFC/palettes/9.pal b/data/tilesets/secondary/pokemon_tower/palettes/9.pal
index 51daf6701..51daf6701 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/9.pal
+++ b/data/tilesets/secondary/pokemon_tower/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4EFC/tiles.png b/data/tilesets/secondary/pokemon_tower/tiles.png
index b8f8c6a4d..b8f8c6a4d 100644
--- a/data/tilesets/secondary/82D4EFC/tiles.png
+++ b/data/tilesets/secondary/pokemon_tower/tiles.png
diff --git a/data/tilesets/secondary/82D4E9C/metatile_attributes.bin b/data/tilesets/secondary/power_plant/metatile_attributes.bin
index 1105056c9..1105056c9 100644
--- a/data/tilesets/secondary/82D4E9C/metatile_attributes.bin
+++ b/data/tilesets/secondary/power_plant/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4E9C/metatiles.bin b/data/tilesets/secondary/power_plant/metatiles.bin
index 7d1e15676..7d1e15676 100644
--- a/data/tilesets/secondary/82D4E9C/metatiles.bin
+++ b/data/tilesets/secondary/power_plant/metatiles.bin
diff --git a/data/tilesets/secondary/82D4D7C/palettes/0.pal b/data/tilesets/secondary/power_plant/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/0.pal
+++ b/data/tilesets/secondary/power_plant/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4EFC/palettes/1.pal b/data/tilesets/secondary/power_plant/palettes/1.pal
index 30be2fbe3..30be2fbe3 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/1.pal
+++ b/data/tilesets/secondary/power_plant/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4D94/palettes/10.pal b/data/tilesets/secondary/power_plant/palettes/10.pal
index 2a1743eaa..2a1743eaa 100644
--- a/data/tilesets/secondary/82D4D94/palettes/10.pal
+++ b/data/tilesets/secondary/power_plant/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4D94/palettes/11.pal b/data/tilesets/secondary/power_plant/palettes/11.pal
index 307e0ea7e..307e0ea7e 100644
--- a/data/tilesets/secondary/82D4D94/palettes/11.pal
+++ b/data/tilesets/secondary/power_plant/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4E3C/palettes/12.pal b/data/tilesets/secondary/power_plant/palettes/12.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/12.pal
+++ b/data/tilesets/secondary/power_plant/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4E9C/palettes/13.pal b/data/tilesets/secondary/power_plant/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/13.pal
+++ b/data/tilesets/secondary/power_plant/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4EB4/palettes/14.pal b/data/tilesets/secondary/power_plant/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/14.pal
+++ b/data/tilesets/secondary/power_plant/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4EE4/palettes/15.pal b/data/tilesets/secondary/power_plant/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/15.pal
+++ b/data/tilesets/secondary/power_plant/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4EFC/palettes/2.pal b/data/tilesets/secondary/power_plant/palettes/2.pal
index e7c4b911a..e7c4b911a 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/2.pal
+++ b/data/tilesets/secondary/power_plant/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4EFC/palettes/3.pal b/data/tilesets/secondary/power_plant/palettes/3.pal
index 54b77e0c8..54b77e0c8 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/3.pal
+++ b/data/tilesets/secondary/power_plant/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4DDC/palettes/4.pal b/data/tilesets/secondary/power_plant/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/4.pal
+++ b/data/tilesets/secondary/power_plant/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4DDC/palettes/5.pal b/data/tilesets/secondary/power_plant/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/5.pal
+++ b/data/tilesets/secondary/power_plant/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4E9C/palettes/6.pal b/data/tilesets/secondary/power_plant/palettes/6.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/6.pal
+++ b/data/tilesets/secondary/power_plant/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4E9C/palettes/7.pal b/data/tilesets/secondary/power_plant/palettes/7.pal
index b69e6cfa4..b69e6cfa4 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/7.pal
+++ b/data/tilesets/secondary/power_plant/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4E9C/palettes/8.pal b/data/tilesets/secondary/power_plant/palettes/8.pal
index 3cada9fa1..3cada9fa1 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/8.pal
+++ b/data/tilesets/secondary/power_plant/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4E9C/palettes/9.pal b/data/tilesets/secondary/power_plant/palettes/9.pal
index 2a1743eaa..2a1743eaa 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/9.pal
+++ b/data/tilesets/secondary/power_plant/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4E9C/tiles.png b/data/tilesets/secondary/power_plant/tiles.png
index d252dbcd3..d252dbcd3 100644
--- a/data/tilesets/secondary/82D4E9C/tiles.png
+++ b/data/tilesets/secondary/power_plant/tiles.png
diff --git a/data/tilesets/secondary/82D4F44/metatile_attributes.bin b/data/tilesets/secondary/restaurant_hotel/metatile_attributes.bin
index a2ac291b5..a2ac291b5 100644
--- a/data/tilesets/secondary/82D4F44/metatile_attributes.bin
+++ b/data/tilesets/secondary/restaurant_hotel/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4F44/metatiles.bin b/data/tilesets/secondary/restaurant_hotel/metatiles.bin
index 5cddd954c..5cddd954c 100644
--- a/data/tilesets/secondary/82D4F44/metatiles.bin
+++ b/data/tilesets/secondary/restaurant_hotel/metatiles.bin
diff --git a/data/tilesets/secondary/82D4DDC/palettes/0.pal b/data/tilesets/secondary/restaurant_hotel/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/0.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4F44/palettes/1.pal b/data/tilesets/secondary/restaurant_hotel/palettes/1.pal
index 30be2fbe3..30be2fbe3 100644
--- a/data/tilesets/secondary/82D4F44/palettes/1.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4F44/palettes/10.pal b/data/tilesets/secondary/restaurant_hotel/palettes/10.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/82D4F44/palettes/10.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4F44/palettes/11.pal b/data/tilesets/secondary/restaurant_hotel/palettes/11.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/82D4F44/palettes/11.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4E6C/palettes/12.pal b/data/tilesets/secondary/restaurant_hotel/palettes/12.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/12.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4EB4/palettes/13.pal b/data/tilesets/secondary/restaurant_hotel/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/13.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4EE4/palettes/14.pal b/data/tilesets/secondary/restaurant_hotel/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/14.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4F44/palettes/15.pal b/data/tilesets/secondary/restaurant_hotel/palettes/15.pal
index 71b5ee827..71b5ee827 100644
--- a/data/tilesets/secondary/82D4F44/palettes/15.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4F44/palettes/2.pal b/data/tilesets/secondary/restaurant_hotel/palettes/2.pal
index e7c4b911a..e7c4b911a 100644
--- a/data/tilesets/secondary/82D4F44/palettes/2.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4F44/palettes/3.pal b/data/tilesets/secondary/restaurant_hotel/palettes/3.pal
index 54b77e0c8..54b77e0c8 100644
--- a/data/tilesets/secondary/82D4F44/palettes/3.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4E3C/palettes/4.pal b/data/tilesets/secondary/restaurant_hotel/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/4.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4E3C/palettes/5.pal b/data/tilesets/secondary/restaurant_hotel/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/5.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4F44/palettes/6.pal b/data/tilesets/secondary/restaurant_hotel/palettes/6.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4F44/palettes/6.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4F44/palettes/7.pal b/data/tilesets/secondary/restaurant_hotel/palettes/7.pal
index 5e3bac102..5e3bac102 100644
--- a/data/tilesets/secondary/82D4F44/palettes/7.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4F44/palettes/8.pal b/data/tilesets/secondary/restaurant_hotel/palettes/8.pal
index 2257c0006..2257c0006 100644
--- a/data/tilesets/secondary/82D4F44/palettes/8.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4F44/palettes/9.pal b/data/tilesets/secondary/restaurant_hotel/palettes/9.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/82D4F44/palettes/9.pal
+++ b/data/tilesets/secondary/restaurant_hotel/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4F44/tiles.png b/data/tilesets/secondary/restaurant_hotel/tiles.png
index 5c8a38b9e..5c8a38b9e 100644
--- a/data/tilesets/secondary/82D4F44/tiles.png
+++ b/data/tilesets/secondary/restaurant_hotel/tiles.png
diff --git a/data/tilesets/secondary/82D4DF4/metatile_attributes.bin b/data/tilesets/secondary/rock_tunnel/metatile_attributes.bin
index 96ef6a853..96ef6a853 100644
--- a/data/tilesets/secondary/82D4DF4/metatile_attributes.bin
+++ b/data/tilesets/secondary/rock_tunnel/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4DF4/metatiles.bin b/data/tilesets/secondary/rock_tunnel/metatiles.bin
index 0ee478c87..0ee478c87 100644
--- a/data/tilesets/secondary/82D4DF4/metatiles.bin
+++ b/data/tilesets/secondary/rock_tunnel/metatiles.bin
diff --git a/data/tilesets/secondary/82D4FBC/palettes/0.pal b/data/tilesets/secondary/rock_tunnel/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/0.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4FD4/palettes/1.pal b/data/tilesets/secondary/rock_tunnel/palettes/1.pal
index d8a4e7757..d8a4e7757 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/1.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4DF4/palettes/10.pal b/data/tilesets/secondary/rock_tunnel/palettes/10.pal
index 4235579fc..4235579fc 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/10.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4DF4/palettes/11.pal b/data/tilesets/secondary/rock_tunnel/palettes/11.pal
index 277172976..277172976 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/11.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4DF4/palettes/12.pal b/data/tilesets/secondary/rock_tunnel/palettes/12.pal
index 2fa21e9fb..2fa21e9fb 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/12.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4EE4/palettes/13.pal b/data/tilesets/secondary/rock_tunnel/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/13.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4EFC/palettes/14.pal b/data/tilesets/secondary/rock_tunnel/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/14.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4F14/palettes/15.pal b/data/tilesets/secondary/rock_tunnel/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F14/palettes/15.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4FD4/palettes/2.pal b/data/tilesets/secondary/rock_tunnel/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/2.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4FD4/palettes/3.pal b/data/tilesets/secondary/rock_tunnel/palettes/3.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/3.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4F14/palettes/4.pal b/data/tilesets/secondary/rock_tunnel/palettes/4.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/82D4F14/palettes/4.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4FD4/palettes/5.pal b/data/tilesets/secondary/rock_tunnel/palettes/5.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/5.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4FBC/palettes/6.pal b/data/tilesets/secondary/rock_tunnel/palettes/6.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/6.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4F14/palettes/7.pal b/data/tilesets/secondary/rock_tunnel/palettes/7.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4F14/palettes/7.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4DF4/palettes/8.pal b/data/tilesets/secondary/rock_tunnel/palettes/8.pal
index 34a637b1a..34a637b1a 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/8.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4DF4/palettes/9.pal b/data/tilesets/secondary/rock_tunnel/palettes/9.pal
index f10a94f7c..f10a94f7c 100644
--- a/data/tilesets/secondary/82D4DF4/palettes/9.pal
+++ b/data/tilesets/secondary/rock_tunnel/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4DF4/tiles.png b/data/tilesets/secondary/rock_tunnel/tiles.png
index cb4078fa9..cb4078fa9 100644
--- a/data/tilesets/secondary/82D4DF4/tiles.png
+++ b/data/tilesets/secondary/rock_tunnel/tiles.png
diff --git a/data/tilesets/secondary/82D4F14/metatile_attributes.bin b/data/tilesets/secondary/safari_zone_building/metatile_attributes.bin
index 9656d8ed7..9656d8ed7 100644
--- a/data/tilesets/secondary/82D4F14/metatile_attributes.bin
+++ b/data/tilesets/secondary/safari_zone_building/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4F14/metatiles.bin b/data/tilesets/secondary/safari_zone_building/metatiles.bin
index 3337a5393..3337a5393 100644
--- a/data/tilesets/secondary/82D4F14/metatiles.bin
+++ b/data/tilesets/secondary/safari_zone_building/metatiles.bin
diff --git a/data/tilesets/secondary/82D4F14/palettes/0.pal b/data/tilesets/secondary/safari_zone_building/palettes/0.pal
index 620015e77..620015e77 100644
--- a/data/tilesets/secondary/82D4F14/palettes/0.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4FA4/palettes/1.pal b/data/tilesets/secondary/safari_zone_building/palettes/1.pal
index 66561f6d3..66561f6d3 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/1.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4F14/palettes/10.pal b/data/tilesets/secondary/safari_zone_building/palettes/10.pal
index 1f08b0f6f..1f08b0f6f 100644
--- a/data/tilesets/secondary/82D4F14/palettes/10.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4E3C/palettes/11.pal b/data/tilesets/secondary/safari_zone_building/palettes/11.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/11.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4E9C/palettes/12.pal b/data/tilesets/secondary/safari_zone_building/palettes/12.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/12.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4EFC/palettes/13.pal b/data/tilesets/secondary/safari_zone_building/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/13.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4F14/palettes/14.pal b/data/tilesets/secondary/safari_zone_building/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F14/palettes/14.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4F2C/palettes/15.pal b/data/tilesets/secondary/safari_zone_building/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/15.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4F14/palettes/2.pal b/data/tilesets/secondary/safari_zone_building/palettes/2.pal
index ddec077d0..ddec077d0 100644
--- a/data/tilesets/secondary/82D4F14/palettes/2.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4F14/palettes/3.pal b/data/tilesets/secondary/safari_zone_building/palettes/3.pal
index 6d1dfb5af..6d1dfb5af 100644
--- a/data/tilesets/secondary/82D4F14/palettes/3.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4FBC/palettes/4.pal b/data/tilesets/secondary/safari_zone_building/palettes/4.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/4.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4F14/palettes/5.pal b/data/tilesets/secondary/safari_zone_building/palettes/5.pal
index 9de0ef422..9de0ef422 100644
--- a/data/tilesets/secondary/82D4F14/palettes/5.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4FD4/palettes/6.pal b/data/tilesets/secondary/safari_zone_building/palettes/6.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/6.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4FBC/palettes/7.pal b/data/tilesets/secondary/safari_zone_building/palettes/7.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/7.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4F14/palettes/8.pal b/data/tilesets/secondary/safari_zone_building/palettes/8.pal
index eed6dbc35..eed6dbc35 100644
--- a/data/tilesets/secondary/82D4F14/palettes/8.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4F14/palettes/9.pal b/data/tilesets/secondary/safari_zone_building/palettes/9.pal
index e9b93cfd2..e9b93cfd2 100644
--- a/data/tilesets/secondary/82D4F14/palettes/9.pal
+++ b/data/tilesets/secondary/safari_zone_building/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4F14/tiles.png b/data/tilesets/secondary/safari_zone_building/tiles.png
index 6c8d53e34..6c8d53e34 100644
--- a/data/tilesets/secondary/82D4F14/tiles.png
+++ b/data/tilesets/secondary/safari_zone_building/tiles.png
diff --git a/data/tilesets/secondary/82D4B9C/metatile_attributes.bin b/data/tilesets/secondary/saffron_city/metatile_attributes.bin
index c6f6551c0..c6f6551c0 100644
--- a/data/tilesets/secondary/82D4B9C/metatile_attributes.bin
+++ b/data/tilesets/secondary/saffron_city/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4B9C/metatiles.bin b/data/tilesets/secondary/saffron_city/metatiles.bin
index dd43794df..dd43794df 100644
--- a/data/tilesets/secondary/82D4B9C/metatiles.bin
+++ b/data/tilesets/secondary/saffron_city/metatiles.bin
diff --git a/data/tilesets/secondary/82D4B9C/palettes/0.pal b/data/tilesets/secondary/saffron_city/palettes/0.pal
index 9dcb673aa..9dcb673aa 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/0.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4DC4/palettes/1.pal b/data/tilesets/secondary/saffron_city/palettes/1.pal
index 391d1e3d1..391d1e3d1 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/1.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4B9C/palettes/10.pal b/data/tilesets/secondary/saffron_city/palettes/10.pal
index ce671fee4..ce671fee4 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/10.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4B9C/palettes/11.pal b/data/tilesets/secondary/saffron_city/palettes/11.pal
index d1ae629c8..d1ae629c8 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/11.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4B9C/palettes/12.pal b/data/tilesets/secondary/saffron_city/palettes/12.pal
index b66bd774a..b66bd774a 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/12.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4F14/palettes/13.pal b/data/tilesets/secondary/saffron_city/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F14/palettes/13.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4F2C/palettes/14.pal b/data/tilesets/secondary/saffron_city/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/14.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4B9C/palettes/15.pal b/data/tilesets/secondary/saffron_city/palettes/15.pal
index 3ffc684ac..3ffc684ac 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/15.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/15.pal
diff --git a/data/tilesets/secondary/82D5004/palettes/2.pal b/data/tilesets/secondary/saffron_city/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D5004/palettes/2.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4FEC/palettes/3.pal b/data/tilesets/secondary/saffron_city/palettes/3.pal
index 973765509..973765509 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/3.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4FD4/palettes/4.pal b/data/tilesets/secondary/saffron_city/palettes/4.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/4.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4DC4/palettes/5.pal b/data/tilesets/secondary/saffron_city/palettes/5.pal
index 3a2db72a7..3a2db72a7 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/5.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4DC4/palettes/6.pal b/data/tilesets/secondary/saffron_city/palettes/6.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/6.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4B6C/palettes/7.pal b/data/tilesets/secondary/saffron_city/palettes/7.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/82D4B6C/palettes/7.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4B9C/palettes/8.pal b/data/tilesets/secondary/saffron_city/palettes/8.pal
index b1e168855..b1e168855 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/8.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4B9C/palettes/9.pal b/data/tilesets/secondary/saffron_city/palettes/9.pal
index 7a88fdbbf..7a88fdbbf 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/9.pal
+++ b/data/tilesets/secondary/saffron_city/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4B9C/tiles.png b/data/tilesets/secondary/saffron_city/tiles.png
index ea835f8dd..ea835f8dd 100644
--- a/data/tilesets/secondary/82D4B9C/tiles.png
+++ b/data/tilesets/secondary/saffron_city/tiles.png
diff --git a/data/tilesets/secondary/82D4D64/metatile_attributes.bin b/data/tilesets/secondary/saffron_gym/metatile_attributes.bin
index ee895c35a..ee895c35a 100644
--- a/data/tilesets/secondary/82D4D64/metatile_attributes.bin
+++ b/data/tilesets/secondary/saffron_gym/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4D64/metatiles.bin b/data/tilesets/secondary/saffron_gym/metatiles.bin
index e0fdb79fb..e0fdb79fb 100644
--- a/data/tilesets/secondary/82D4D64/metatiles.bin
+++ b/data/tilesets/secondary/saffron_gym/metatiles.bin
diff --git a/data/tilesets/secondary/82D4E3C/palettes/0.pal b/data/tilesets/secondary/saffron_gym/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/0.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4CBC/palettes/1.pal b/data/tilesets/secondary/saffron_gym/palettes/1.pal
index 3a16a45c7..3a16a45c7 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/1.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4DDC/palettes/10.pal b/data/tilesets/secondary/saffron_gym/palettes/10.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/10.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4E84/palettes/11.pal b/data/tilesets/secondary/saffron_gym/palettes/11.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4E84/palettes/11.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4D64/palettes/12.pal b/data/tilesets/secondary/saffron_gym/palettes/12.pal
index 702c67ecb..702c67ecb 100644
--- a/data/tilesets/secondary/82D4D64/palettes/12.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4F2C/palettes/13.pal b/data/tilesets/secondary/saffron_gym/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/13.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4F44/palettes/14.pal b/data/tilesets/secondary/saffron_gym/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F44/palettes/14.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4D7C/palettes/15.pal b/data/tilesets/secondary/saffron_gym/palettes/15.pal
index 92e7ed309..92e7ed309 100644
--- a/data/tilesets/secondary/82D4D7C/palettes/15.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4CBC/palettes/2.pal b/data/tilesets/secondary/saffron_gym/palettes/2.pal
index c8ee236d7..c8ee236d7 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/2.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4CBC/palettes/3.pal b/data/tilesets/secondary/saffron_gym/palettes/3.pal
index b17dbb054..b17dbb054 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/3.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4E6C/palettes/4.pal b/data/tilesets/secondary/saffron_gym/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/4.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4E6C/palettes/5.pal b/data/tilesets/secondary/saffron_gym/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/5.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4EFC/palettes/6.pal b/data/tilesets/secondary/saffron_gym/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/6.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4D64/palettes/7.pal b/data/tilesets/secondary/saffron_gym/palettes/7.pal
index c66eaedff..c66eaedff 100644
--- a/data/tilesets/secondary/82D4D64/palettes/7.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4D34/palettes/8.pal b/data/tilesets/secondary/saffron_gym/palettes/8.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4D34/palettes/8.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4D34/palettes/9.pal b/data/tilesets/secondary/saffron_gym/palettes/9.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4D34/palettes/9.pal
+++ b/data/tilesets/secondary/saffron_gym/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4D64/tiles.png b/data/tilesets/secondary/saffron_gym/tiles.png
index 87641a309..87641a309 100644
--- a/data/tilesets/secondary/82D4D64/tiles.png
+++ b/data/tilesets/secondary/saffron_gym/tiles.png
diff --git a/data/tilesets/secondary/82D4F5C/metatile_attributes.bin b/data/tilesets/secondary/school/metatile_attributes.bin
index cdcb96c53..cdcb96c53 100644
--- a/data/tilesets/secondary/82D4F5C/metatile_attributes.bin
+++ b/data/tilesets/secondary/school/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4F5C/metatiles.bin b/data/tilesets/secondary/school/metatiles.bin
index 35009a690..35009a690 100644
--- a/data/tilesets/secondary/82D4F5C/metatiles.bin
+++ b/data/tilesets/secondary/school/metatiles.bin
diff --git a/data/tilesets/secondary/82D4E6C/palettes/0.pal b/data/tilesets/secondary/school/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/0.pal
+++ b/data/tilesets/secondary/school/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4F5C/palettes/1.pal b/data/tilesets/secondary/school/palettes/1.pal
index 30be2fbe3..30be2fbe3 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/1.pal
+++ b/data/tilesets/secondary/school/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4F5C/palettes/10.pal b/data/tilesets/secondary/school/palettes/10.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/10.pal
+++ b/data/tilesets/secondary/school/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4F5C/palettes/11.pal b/data/tilesets/secondary/school/palettes/11.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/11.pal
+++ b/data/tilesets/secondary/school/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4F14/palettes/12.pal b/data/tilesets/secondary/school/palettes/12.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F14/palettes/12.pal
+++ b/data/tilesets/secondary/school/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4F44/palettes/13.pal b/data/tilesets/secondary/school/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F44/palettes/13.pal
+++ b/data/tilesets/secondary/school/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4F5C/palettes/14.pal b/data/tilesets/secondary/school/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/14.pal
+++ b/data/tilesets/secondary/school/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4F5C/palettes/15.pal b/data/tilesets/secondary/school/palettes/15.pal
index 71b5ee827..71b5ee827 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/15.pal
+++ b/data/tilesets/secondary/school/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4F5C/palettes/2.pal b/data/tilesets/secondary/school/palettes/2.pal
index e7c4b911a..e7c4b911a 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/2.pal
+++ b/data/tilesets/secondary/school/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4F5C/palettes/3.pal b/data/tilesets/secondary/school/palettes/3.pal
index 54b77e0c8..54b77e0c8 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/3.pal
+++ b/data/tilesets/secondary/school/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4E84/palettes/4.pal b/data/tilesets/secondary/school/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4E84/palettes/4.pal
+++ b/data/tilesets/secondary/school/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4E84/palettes/5.pal b/data/tilesets/secondary/school/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4E84/palettes/5.pal
+++ b/data/tilesets/secondary/school/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4F5C/palettes/6.pal b/data/tilesets/secondary/school/palettes/6.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/6.pal
+++ b/data/tilesets/secondary/school/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4F5C/palettes/7.pal b/data/tilesets/secondary/school/palettes/7.pal
index 6c1a5b096..6c1a5b096 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/7.pal
+++ b/data/tilesets/secondary/school/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4F5C/palettes/8.pal b/data/tilesets/secondary/school/palettes/8.pal
index 1557a55f0..1557a55f0 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/8.pal
+++ b/data/tilesets/secondary/school/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4F5C/palettes/9.pal b/data/tilesets/secondary/school/palettes/9.pal
index c06a049b0..c06a049b0 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/9.pal
+++ b/data/tilesets/secondary/school/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4F5C/tiles.png b/data/tilesets/secondary/school/tiles.png
index 935afccd2..935afccd2 100644
--- a/data/tilesets/secondary/82D4F5C/tiles.png
+++ b/data/tilesets/secondary/school/tiles.png
diff --git a/data/tilesets/secondary/82D4EB4/metatile_attributes.bin b/data/tilesets/secondary/sea_cottage/metatile_attributes.bin
index 05caeb58b..05caeb58b 100644
--- a/data/tilesets/secondary/82D4EB4/metatile_attributes.bin
+++ b/data/tilesets/secondary/sea_cottage/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4EB4/metatiles.bin b/data/tilesets/secondary/sea_cottage/metatiles.bin
index 6ac3cbf98..6ac3cbf98 100644
--- a/data/tilesets/secondary/82D4EB4/metatiles.bin
+++ b/data/tilesets/secondary/sea_cottage/metatiles.bin
diff --git a/data/tilesets/secondary/82D4EB4/palettes/0.pal b/data/tilesets/secondary/sea_cottage/palettes/0.pal
index ed708dd79..ed708dd79 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/0.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4EB4/palettes/1.pal b/data/tilesets/secondary/sea_cottage/palettes/1.pal
index 4d2b48991..4d2b48991 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/1.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4EB4/palettes/10.pal b/data/tilesets/secondary/sea_cottage/palettes/10.pal
index e8624e82f..e8624e82f 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/10.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4EB4/palettes/11.pal b/data/tilesets/secondary/sea_cottage/palettes/11.pal
index 9cec1272b..9cec1272b 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/11.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4EB4/palettes/12.pal b/data/tilesets/secondary/sea_cottage/palettes/12.pal
index 600d8f469..600d8f469 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/12.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4F5C/palettes/13.pal b/data/tilesets/secondary/sea_cottage/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/13.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4F74/palettes/14.pal b/data/tilesets/secondary/sea_cottage/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F74/palettes/14.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4F74/palettes/15.pal b/data/tilesets/secondary/sea_cottage/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F74/palettes/15.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4EB4/palettes/2.pal b/data/tilesets/secondary/sea_cottage/palettes/2.pal
index 878c13c95..878c13c95 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/2.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4EB4/palettes/3.pal b/data/tilesets/secondary/sea_cottage/palettes/3.pal
index bed4c20c3..bed4c20c3 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/3.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4EB4/palettes/4.pal b/data/tilesets/secondary/sea_cottage/palettes/4.pal
index b77ba3e87..b77ba3e87 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/4.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4EB4/palettes/5.pal b/data/tilesets/secondary/sea_cottage/palettes/5.pal
index 74a2a9ed0..74a2a9ed0 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/5.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4EB4/palettes/6.pal b/data/tilesets/secondary/sea_cottage/palettes/6.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/6.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4F74/palettes/7.pal b/data/tilesets/secondary/sea_cottage/palettes/7.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F74/palettes/7.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4EB4/palettes/8.pal b/data/tilesets/secondary/sea_cottage/palettes/8.pal
index 370a3d2db..370a3d2db 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/8.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4EB4/palettes/9.pal b/data/tilesets/secondary/sea_cottage/palettes/9.pal
index 1193cc807..1193cc807 100644
--- a/data/tilesets/secondary/82D4EB4/palettes/9.pal
+++ b/data/tilesets/secondary/sea_cottage/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4EB4/tiles.png b/data/tilesets/secondary/sea_cottage/tiles.png
index 42d557bcf..42d557bcf 100644
--- a/data/tilesets/secondary/82D4EB4/tiles.png
+++ b/data/tilesets/secondary/sea_cottage/tiles.png
diff --git a/data/tilesets/secondary/82D4E24/metatile_attributes.bin b/data/tilesets/secondary/seafoam_islands/metatile_attributes.bin
index 87564066c..87564066c 100644
--- a/data/tilesets/secondary/82D4E24/metatile_attributes.bin
+++ b/data/tilesets/secondary/seafoam_islands/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4E24/metatiles.bin b/data/tilesets/secondary/seafoam_islands/metatiles.bin
index 8f8bd569b..8f8bd569b 100644
--- a/data/tilesets/secondary/82D4E24/metatiles.bin
+++ b/data/tilesets/secondary/seafoam_islands/metatiles.bin
diff --git a/data/tilesets/secondary/82D4FD4/palettes/0.pal b/data/tilesets/secondary/seafoam_islands/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/0.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/0.pal
diff --git a/data/tilesets/secondary/82D501C/palettes/1.pal b/data/tilesets/secondary/seafoam_islands/palettes/1.pal
index d8a4e7757..d8a4e7757 100644
--- a/data/tilesets/secondary/82D501C/palettes/1.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4E24/palettes/10.pal b/data/tilesets/secondary/seafoam_islands/palettes/10.pal
index 7116e91ff..7116e91ff 100644
--- a/data/tilesets/secondary/82D4E24/palettes/10.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4E24/palettes/11.pal b/data/tilesets/secondary/seafoam_islands/palettes/11.pal
index b237ef1c8..b237ef1c8 100644
--- a/data/tilesets/secondary/82D4E24/palettes/11.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4E24/palettes/12.pal b/data/tilesets/secondary/seafoam_islands/palettes/12.pal
index ed56edee1..ed56edee1 100644
--- a/data/tilesets/secondary/82D4E24/palettes/12.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4F74/palettes/13.pal b/data/tilesets/secondary/seafoam_islands/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F74/palettes/13.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4F8C/palettes/14.pal b/data/tilesets/secondary/seafoam_islands/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/14.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4FA4/palettes/15.pal b/data/tilesets/secondary/seafoam_islands/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/15.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/15.pal
diff --git a/data/tilesets/secondary/82D501C/palettes/2.pal b/data/tilesets/secondary/seafoam_islands/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D501C/palettes/2.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/2.pal
diff --git a/data/tilesets/secondary/82D501C/palettes/3.pal b/data/tilesets/secondary/seafoam_islands/palettes/3.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/82D501C/palettes/3.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/3.pal
diff --git a/data/tilesets/secondary/82D5004/palettes/4.pal b/data/tilesets/secondary/seafoam_islands/palettes/4.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/82D5004/palettes/4.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/4.pal
diff --git a/data/tilesets/secondary/82D501C/palettes/5.pal b/data/tilesets/secondary/seafoam_islands/palettes/5.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/secondary/82D501C/palettes/5.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/5.pal
diff --git a/data/tilesets/secondary/82D501C/palettes/6.pal b/data/tilesets/secondary/seafoam_islands/palettes/6.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D501C/palettes/6.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4FD4/palettes/7.pal b/data/tilesets/secondary/seafoam_islands/palettes/7.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/7.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4E24/palettes/8.pal b/data/tilesets/secondary/seafoam_islands/palettes/8.pal
index d96f3f0fc..d96f3f0fc 100644
--- a/data/tilesets/secondary/82D4E24/palettes/8.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4E24/palettes/9.pal b/data/tilesets/secondary/seafoam_islands/palettes/9.pal
index 1a1dc881b..1a1dc881b 100644
--- a/data/tilesets/secondary/82D4E24/palettes/9.pal
+++ b/data/tilesets/secondary/seafoam_islands/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4E24/tiles.png b/data/tilesets/secondary/seafoam_islands/tiles.png
index e085d8e33..e085d8e33 100644
--- a/data/tilesets/secondary/82D4E24/tiles.png
+++ b/data/tilesets/secondary/seafoam_islands/tiles.png
diff --git a/data/tilesets/secondary/82D504C/metatile_attributes.bin b/data/tilesets/secondary/sevii_islands_123/metatile_attributes.bin
index 62eb1b917..62eb1b917 100644
--- a/data/tilesets/secondary/82D504C/metatile_attributes.bin
+++ b/data/tilesets/secondary/sevii_islands_123/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D504C/metatiles.bin b/data/tilesets/secondary/sevii_islands_123/metatiles.bin
index 52d2f020d..52d2f020d 100644
--- a/data/tilesets/secondary/82D504C/metatiles.bin
+++ b/data/tilesets/secondary/sevii_islands_123/metatiles.bin
diff --git a/data/tilesets/secondary/82D501C/palettes/0.pal b/data/tilesets/secondary/sevii_islands_123/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/82D501C/palettes/0.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/0.pal
diff --git a/data/tilesets/secondary/82D504C/palettes/1.pal b/data/tilesets/secondary/sevii_islands_123/palettes/1.pal
index e15d979f1..e15d979f1 100644
--- a/data/tilesets/secondary/82D504C/palettes/1.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/1.pal
diff --git a/data/tilesets/secondary/82D504C/palettes/10.pal b/data/tilesets/secondary/sevii_islands_123/palettes/10.pal
index 265fb0625..265fb0625 100644
--- a/data/tilesets/secondary/82D504C/palettes/10.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/10.pal
diff --git a/data/tilesets/secondary/82D504C/palettes/11.pal b/data/tilesets/secondary/sevii_islands_123/palettes/11.pal
index 9e1e423c6..9e1e423c6 100644
--- a/data/tilesets/secondary/82D504C/palettes/11.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/11.pal
diff --git a/data/tilesets/secondary/82D504C/palettes/12.pal b/data/tilesets/secondary/sevii_islands_123/palettes/12.pal
index 375e3914b..375e3914b 100644
--- a/data/tilesets/secondary/82D504C/palettes/12.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4F8C/palettes/13.pal b/data/tilesets/secondary/sevii_islands_123/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F8C/palettes/13.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4FA4/palettes/14.pal b/data/tilesets/secondary/sevii_islands_123/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/14.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4FBC/palettes/15.pal b/data/tilesets/secondary/sevii_islands_123/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/15.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4B84/palettes/2.pal b/data/tilesets/secondary/sevii_islands_123/palettes/2.pal
index 372fb5d7c..372fb5d7c 100644
--- a/data/tilesets/secondary/82D4B84/palettes/2.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/2.pal
diff --git a/data/tilesets/secondary/82D504C/palettes/3.pal b/data/tilesets/secondary/sevii_islands_123/palettes/3.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/82D504C/palettes/3.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/3.pal
diff --git a/data/tilesets/secondary/82D504C/palettes/4.pal b/data/tilesets/secondary/sevii_islands_123/palettes/4.pal
index fca4a2623..fca4a2623 100644
--- a/data/tilesets/secondary/82D504C/palettes/4.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4D94/palettes/5.pal b/data/tilesets/secondary/sevii_islands_123/palettes/5.pal
index 09555ded5..09555ded5 100644
--- a/data/tilesets/secondary/82D4D94/palettes/5.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/5.pal
diff --git a/data/tilesets/secondary/82D504C/palettes/6.pal b/data/tilesets/secondary/sevii_islands_123/palettes/6.pal
index f8ebbc6dc..f8ebbc6dc 100644
--- a/data/tilesets/secondary/82D504C/palettes/6.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/6.pal
diff --git a/data/tilesets/secondary/82D504C/palettes/7.pal b/data/tilesets/secondary/sevii_islands_123/palettes/7.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D504C/palettes/7.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/7.pal
diff --git a/data/tilesets/secondary/82D504C/palettes/8.pal b/data/tilesets/secondary/sevii_islands_123/palettes/8.pal
index 4d9ab6348..4d9ab6348 100644
--- a/data/tilesets/secondary/82D504C/palettes/8.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/8.pal
diff --git a/data/tilesets/secondary/82D504C/palettes/9.pal b/data/tilesets/secondary/sevii_islands_123/palettes/9.pal
index b66fdcdbf..b66fdcdbf 100644
--- a/data/tilesets/secondary/82D504C/palettes/9.pal
+++ b/data/tilesets/secondary/sevii_islands_123/palettes/9.pal
diff --git a/data/tilesets/secondary/82D504C/tiles.png b/data/tilesets/secondary/sevii_islands_123/tiles.png
index ad8f73a2c..ad8f73a2c 100644
--- a/data/tilesets/secondary/82D504C/tiles.png
+++ b/data/tilesets/secondary/sevii_islands_123/tiles.png
diff --git a/data/tilesets/secondary/82D5064/metatile_attributes.bin b/data/tilesets/secondary/sevii_islands_45/metatile_attributes.bin
index d67c4690c..d67c4690c 100644
--- a/data/tilesets/secondary/82D5064/metatile_attributes.bin
+++ b/data/tilesets/secondary/sevii_islands_45/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D5064/metatiles.bin b/data/tilesets/secondary/sevii_islands_45/metatiles.bin
index 7613f3702..7613f3702 100644
--- a/data/tilesets/secondary/82D5064/metatiles.bin
+++ b/data/tilesets/secondary/sevii_islands_45/metatiles.bin
diff --git a/data/tilesets/secondary/82D504C/palettes/0.pal b/data/tilesets/secondary/sevii_islands_45/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/82D504C/palettes/0.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/0.pal
diff --git a/data/tilesets/secondary/82D5064/palettes/1.pal b/data/tilesets/secondary/sevii_islands_45/palettes/1.pal
index d8a4e7757..d8a4e7757 100644
--- a/data/tilesets/secondary/82D5064/palettes/1.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/1.pal
diff --git a/data/tilesets/secondary/82D5064/palettes/10.pal b/data/tilesets/secondary/sevii_islands_45/palettes/10.pal
index 86502dd48..86502dd48 100644
--- a/data/tilesets/secondary/82D5064/palettes/10.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/10.pal
diff --git a/data/tilesets/secondary/82D5064/palettes/11.pal b/data/tilesets/secondary/sevii_islands_45/palettes/11.pal
index b05410cba..b05410cba 100644
--- a/data/tilesets/secondary/82D5064/palettes/11.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/11.pal
diff --git a/data/tilesets/secondary/82D5064/palettes/12.pal b/data/tilesets/secondary/sevii_islands_45/palettes/12.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D5064/palettes/12.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4FA4/palettes/13.pal b/data/tilesets/secondary/sevii_islands_45/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/13.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4FBC/palettes/14.pal b/data/tilesets/secondary/sevii_islands_45/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/14.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4FD4/palettes/15.pal b/data/tilesets/secondary/sevii_islands_45/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/15.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4FEC/palettes/2.pal b/data/tilesets/secondary/sevii_islands_45/palettes/2.pal
index 372fb5d7c..372fb5d7c 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/2.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/2.pal
diff --git a/data/tilesets/secondary/82D5064/palettes/3.pal b/data/tilesets/secondary/sevii_islands_45/palettes/3.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/82D5064/palettes/3.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/3.pal
diff --git a/data/tilesets/secondary/82D5064/palettes/4.pal b/data/tilesets/secondary/sevii_islands_45/palettes/4.pal
index fca4a2623..fca4a2623 100644
--- a/data/tilesets/secondary/82D5064/palettes/4.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/4.pal
diff --git a/data/tilesets/secondary/82D504C/palettes/5.pal b/data/tilesets/secondary/sevii_islands_45/palettes/5.pal
index 09555ded5..09555ded5 100644
--- a/data/tilesets/secondary/82D504C/palettes/5.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/5.pal
diff --git a/data/tilesets/secondary/82D5064/palettes/6.pal b/data/tilesets/secondary/sevii_islands_45/palettes/6.pal
index f8ebbc6dc..f8ebbc6dc 100644
--- a/data/tilesets/secondary/82D5064/palettes/6.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/6.pal
diff --git a/data/tilesets/secondary/82D5064/palettes/7.pal b/data/tilesets/secondary/sevii_islands_45/palettes/7.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D5064/palettes/7.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/7.pal
diff --git a/data/tilesets/secondary/82D5064/palettes/8.pal b/data/tilesets/secondary/sevii_islands_45/palettes/8.pal
index 4d9ab6348..4d9ab6348 100644
--- a/data/tilesets/secondary/82D5064/palettes/8.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/8.pal
diff --git a/data/tilesets/secondary/82D5064/palettes/9.pal b/data/tilesets/secondary/sevii_islands_45/palettes/9.pal
index 5ac617b25..5ac617b25 100644
--- a/data/tilesets/secondary/82D5064/palettes/9.pal
+++ b/data/tilesets/secondary/sevii_islands_45/palettes/9.pal
diff --git a/data/tilesets/secondary/82D5064/tiles.png b/data/tilesets/secondary/sevii_islands_45/tiles.png
index 744b38638..744b38638 100644
--- a/data/tilesets/secondary/82D5064/tiles.png
+++ b/data/tilesets/secondary/sevii_islands_45/tiles.png
diff --git a/data/tilesets/secondary/82D507C/metatile_attributes.bin b/data/tilesets/secondary/sevii_islands_67/metatile_attributes.bin
index edf192276..edf192276 100644
--- a/data/tilesets/secondary/82D507C/metatile_attributes.bin
+++ b/data/tilesets/secondary/sevii_islands_67/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D507C/metatiles.bin b/data/tilesets/secondary/sevii_islands_67/metatiles.bin
index 13f97073b..13f97073b 100644
--- a/data/tilesets/secondary/82D507C/metatiles.bin
+++ b/data/tilesets/secondary/sevii_islands_67/metatiles.bin
diff --git a/data/tilesets/secondary/82D5064/palettes/0.pal b/data/tilesets/secondary/sevii_islands_67/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/82D5064/palettes/0.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4BFC/palettes/1.pal b/data/tilesets/secondary/sevii_islands_67/palettes/1.pal
index 09828f4f1..09828f4f1 100644
--- a/data/tilesets/secondary/82D4BFC/palettes/1.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/1.pal
diff --git a/data/tilesets/secondary/82D507C/palettes/10.pal b/data/tilesets/secondary/sevii_islands_67/palettes/10.pal
index d26d003af..d26d003af 100644
--- a/data/tilesets/secondary/82D507C/palettes/10.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/10.pal
diff --git a/data/tilesets/secondary/82D507C/palettes/11.pal b/data/tilesets/secondary/sevii_islands_67/palettes/11.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D507C/palettes/11.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/11.pal
diff --git a/data/tilesets/secondary/82D507C/palettes/12.pal b/data/tilesets/secondary/sevii_islands_67/palettes/12.pal
index 995731c23..995731c23 100644
--- a/data/tilesets/secondary/82D507C/palettes/12.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4FBC/palettes/13.pal b/data/tilesets/secondary/sevii_islands_67/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4FBC/palettes/13.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4FD4/palettes/14.pal b/data/tilesets/secondary/sevii_islands_67/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/14.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4FEC/palettes/15.pal b/data/tilesets/secondary/sevii_islands_67/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/15.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/15.pal
diff --git a/data/tilesets/secondary/82D507C/palettes/2.pal b/data/tilesets/secondary/sevii_islands_67/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D507C/palettes/2.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/2.pal
diff --git a/data/tilesets/secondary/82D507C/palettes/3.pal b/data/tilesets/secondary/sevii_islands_67/palettes/3.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/82D507C/palettes/3.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/3.pal
diff --git a/data/tilesets/secondary/82D507C/palettes/4.pal b/data/tilesets/secondary/sevii_islands_67/palettes/4.pal
index 5871a448c..5871a448c 100644
--- a/data/tilesets/secondary/82D507C/palettes/4.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/4.pal
diff --git a/data/tilesets/secondary/82D507C/palettes/5.pal b/data/tilesets/secondary/sevii_islands_67/palettes/5.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/secondary/82D507C/palettes/5.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/5.pal
diff --git a/data/tilesets/secondary/82D507C/palettes/6.pal b/data/tilesets/secondary/sevii_islands_67/palettes/6.pal
index 9bad44649..9bad44649 100644
--- a/data/tilesets/secondary/82D507C/palettes/6.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/6.pal
diff --git a/data/tilesets/secondary/82D507C/palettes/7.pal b/data/tilesets/secondary/sevii_islands_67/palettes/7.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D507C/palettes/7.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/7.pal
diff --git a/data/tilesets/secondary/82D507C/palettes/8.pal b/data/tilesets/secondary/sevii_islands_67/palettes/8.pal
index 4d9ab6348..4d9ab6348 100644
--- a/data/tilesets/secondary/82D507C/palettes/8.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/8.pal
diff --git a/data/tilesets/secondary/82D507C/palettes/9.pal b/data/tilesets/secondary/sevii_islands_67/palettes/9.pal
index edc5961bb..edc5961bb 100644
--- a/data/tilesets/secondary/82D507C/palettes/9.pal
+++ b/data/tilesets/secondary/sevii_islands_67/palettes/9.pal
diff --git a/data/tilesets/secondary/82D507C/tiles.png b/data/tilesets/secondary/sevii_islands_67/tiles.png
index d40c92649..d40c92649 100644
--- a/data/tilesets/secondary/82D507C/tiles.png
+++ b/data/tilesets/secondary/sevii_islands_67/tiles.png
diff --git a/data/tilesets/secondary/82D4ECC/metatile_attributes.bin b/data/tilesets/secondary/silph_co/metatile_attributes.bin
index a118a0181..a118a0181 100644
--- a/data/tilesets/secondary/82D4ECC/metatile_attributes.bin
+++ b/data/tilesets/secondary/silph_co/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4ECC/metatiles.bin b/data/tilesets/secondary/silph_co/metatiles.bin
index c86070668..c86070668 100644
--- a/data/tilesets/secondary/82D4ECC/metatiles.bin
+++ b/data/tilesets/secondary/silph_co/metatiles.bin
diff --git a/data/tilesets/secondary/82D4D94/metatile_attributes.bin b/data/tilesets/secondary/ss_anne/metatile_attributes.bin
index 949846f90..949846f90 100644
--- a/data/tilesets/secondary/82D4D94/metatile_attributes.bin
+++ b/data/tilesets/secondary/ss_anne/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4D94/metatiles.bin b/data/tilesets/secondary/ss_anne/metatiles.bin
index a976297b3..a976297b3 100644
--- a/data/tilesets/secondary/82D4D94/metatiles.bin
+++ b/data/tilesets/secondary/ss_anne/metatiles.bin
diff --git a/data/tilesets/secondary/82D4D94/palettes/0.pal b/data/tilesets/secondary/ss_anne/palettes/0.pal
index 28232d99e..28232d99e 100644
--- a/data/tilesets/secondary/82D4D94/palettes/0.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4D94/palettes/1.pal b/data/tilesets/secondary/ss_anne/palettes/1.pal
index b43532470..b43532470 100644
--- a/data/tilesets/secondary/82D4D94/palettes/1.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4E9C/palettes/10.pal b/data/tilesets/secondary/ss_anne/palettes/10.pal
index 2a1743eaa..2a1743eaa 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/10.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4E9C/palettes/11.pal b/data/tilesets/secondary/ss_anne/palettes/11.pal
index 307e0ea7e..307e0ea7e 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/11.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4F44/palettes/12.pal b/data/tilesets/secondary/ss_anne/palettes/12.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F44/palettes/12.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4FD4/palettes/13.pal b/data/tilesets/secondary/ss_anne/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4FD4/palettes/13.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/13.pal
diff --git a/data/tilesets/secondary/82D4FEC/palettes/14.pal b/data/tilesets/secondary/ss_anne/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/14.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/14.pal
diff --git a/data/tilesets/secondary/82D5004/palettes/15.pal b/data/tilesets/secondary/ss_anne/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D5004/palettes/15.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4D94/palettes/2.pal b/data/tilesets/secondary/ss_anne/palettes/2.pal
index e267ae90e..e267ae90e 100644
--- a/data/tilesets/secondary/82D4D94/palettes/2.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4D94/palettes/3.pal b/data/tilesets/secondary/ss_anne/palettes/3.pal
index 503f22878..503f22878 100644
--- a/data/tilesets/secondary/82D4D94/palettes/3.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4D94/palettes/4.pal b/data/tilesets/secondary/ss_anne/palettes/4.pal
index cdf1b6190..cdf1b6190 100644
--- a/data/tilesets/secondary/82D4D94/palettes/4.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/4.pal
diff --git a/data/tilesets/secondary/82D5064/palettes/5.pal b/data/tilesets/secondary/ss_anne/palettes/5.pal
index 09555ded5..09555ded5 100644
--- a/data/tilesets/secondary/82D5064/palettes/5.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4D94/palettes/6.pal b/data/tilesets/secondary/ss_anne/palettes/6.pal
index 0dba59a72..0dba59a72 100644
--- a/data/tilesets/secondary/82D4D94/palettes/6.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4D94/palettes/7.pal b/data/tilesets/secondary/ss_anne/palettes/7.pal
index e9848a1c0..e9848a1c0 100644
--- a/data/tilesets/secondary/82D4D94/palettes/7.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4D94/palettes/8.pal b/data/tilesets/secondary/ss_anne/palettes/8.pal
index b5c80c8f4..b5c80c8f4 100644
--- a/data/tilesets/secondary/82D4D94/palettes/8.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4D94/palettes/9.pal b/data/tilesets/secondary/ss_anne/palettes/9.pal
index b66b2399a..b66b2399a 100644
--- a/data/tilesets/secondary/82D4D94/palettes/9.pal
+++ b/data/tilesets/secondary/ss_anne/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4D94/tiles.png b/data/tilesets/secondary/ss_anne/tiles.png
index 280f3e227..280f3e227 100644
--- a/data/tilesets/secondary/82D4D94/tiles.png
+++ b/data/tilesets/secondary/ss_anne/tiles.png
diff --git a/data/tilesets/secondary/82D5034/metatile_attributes.bin b/data/tilesets/secondary/tanoby_ruins/metatile_attributes.bin
index 5fe7d59fc..5fe7d59fc 100644
--- a/data/tilesets/secondary/82D5034/metatile_attributes.bin
+++ b/data/tilesets/secondary/tanoby_ruins/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D5034/metatiles.bin b/data/tilesets/secondary/tanoby_ruins/metatiles.bin
index 2b3a9543e..2b3a9543e 100644
--- a/data/tilesets/secondary/82D5034/metatiles.bin
+++ b/data/tilesets/secondary/tanoby_ruins/metatiles.bin
diff --git a/data/tilesets/secondary/82D5034/palettes/0.pal b/data/tilesets/secondary/tanoby_ruins/palettes/0.pal
index 83b30fc17..83b30fc17 100644
--- a/data/tilesets/secondary/82D5034/palettes/0.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/0.pal
diff --git a/data/tilesets/secondary/82D5034/palettes/1.pal b/data/tilesets/secondary/tanoby_ruins/palettes/1.pal
index 66561f6d3..66561f6d3 100644
--- a/data/tilesets/secondary/82D5034/palettes/1.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/1.pal
diff --git a/data/tilesets/secondary/82D5034/palettes/10.pal b/data/tilesets/secondary/tanoby_ruins/palettes/10.pal
index fb565545b..fb565545b 100644
--- a/data/tilesets/secondary/82D5034/palettes/10.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/10.pal
diff --git a/data/tilesets/secondary/82D5034/palettes/11.pal b/data/tilesets/secondary/tanoby_ruins/palettes/11.pal
index e637019c6..e637019c6 100644
--- a/data/tilesets/secondary/82D5034/palettes/11.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/11.pal
diff --git a/data/tilesets/secondary/82D5034/palettes/12.pal b/data/tilesets/secondary/tanoby_ruins/palettes/12.pal
index 775369fed..775369fed 100644
--- a/data/tilesets/secondary/82D5034/palettes/12.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/12.pal
diff --git a/data/tilesets/secondary/82D4FEC/palettes/13.pal b/data/tilesets/secondary/tanoby_ruins/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4FEC/palettes/13.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/13.pal
diff --git a/data/tilesets/secondary/82D5004/palettes/14.pal b/data/tilesets/secondary/tanoby_ruins/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D5004/palettes/14.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/14.pal
diff --git a/data/tilesets/secondary/82D501C/palettes/15.pal b/data/tilesets/secondary/tanoby_ruins/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D501C/palettes/15.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/15.pal
diff --git a/data/tilesets/secondary/82D5094/palettes/2.pal b/data/tilesets/secondary/tanoby_ruins/palettes/2.pal
index 87a022102..87a022102 100644
--- a/data/tilesets/secondary/82D5094/palettes/2.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/2.pal
diff --git a/data/tilesets/secondary/82D5094/palettes/3.pal b/data/tilesets/secondary/tanoby_ruins/palettes/3.pal
index 783496dcd..783496dcd 100644
--- a/data/tilesets/secondary/82D5094/palettes/3.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/3.pal
diff --git a/data/tilesets/secondary/82D5094/palettes/4.pal b/data/tilesets/secondary/tanoby_ruins/palettes/4.pal
index 89eace605..89eace605 100644
--- a/data/tilesets/secondary/82D5094/palettes/4.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/4.pal
diff --git a/data/tilesets/secondary/82D5094/palettes/5.pal b/data/tilesets/secondary/tanoby_ruins/palettes/5.pal
index c7780e5c7..c7780e5c7 100644
--- a/data/tilesets/secondary/82D5094/palettes/5.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/5.pal
diff --git a/data/tilesets/secondary/82D5094/palettes/6.pal b/data/tilesets/secondary/tanoby_ruins/palettes/6.pal
index 1d08ce9a2..1d08ce9a2 100644
--- a/data/tilesets/secondary/82D5094/palettes/6.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/6.pal
diff --git a/data/tilesets/secondary/82D5034/palettes/7.pal b/data/tilesets/secondary/tanoby_ruins/palettes/7.pal
index dfa779635..dfa779635 100644
--- a/data/tilesets/secondary/82D5034/palettes/7.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/7.pal
diff --git a/data/tilesets/secondary/82D5034/palettes/8.pal b/data/tilesets/secondary/tanoby_ruins/palettes/8.pal
index fd7d8a9d7..fd7d8a9d7 100644
--- a/data/tilesets/secondary/82D5034/palettes/8.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/8.pal
diff --git a/data/tilesets/secondary/82D5034/palettes/9.pal b/data/tilesets/secondary/tanoby_ruins/palettes/9.pal
index 0d43d6ef9..0d43d6ef9 100644
--- a/data/tilesets/secondary/82D5034/palettes/9.pal
+++ b/data/tilesets/secondary/tanoby_ruins/palettes/9.pal
diff --git a/data/tilesets/secondary/82D5034/tiles.png b/data/tilesets/secondary/tanoby_ruins/tiles.png
index c61f91c47..c61f91c47 100644
--- a/data/tilesets/secondary/82D5034/tiles.png
+++ b/data/tilesets/secondary/tanoby_ruins/tiles.png
diff --git a/data/tilesets/secondary/82D5094/metatile_attributes.bin b/data/tilesets/secondary/trainer_tower/metatile_attributes.bin
index 96b25bb0f..96b25bb0f 100644
--- a/data/tilesets/secondary/82D5094/metatile_attributes.bin
+++ b/data/tilesets/secondary/trainer_tower/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D5094/metatiles.bin b/data/tilesets/secondary/trainer_tower/metatiles.bin
index f045f57e8..f045f57e8 100644
--- a/data/tilesets/secondary/82D5094/metatiles.bin
+++ b/data/tilesets/secondary/trainer_tower/metatiles.bin
diff --git a/data/tilesets/secondary/82D50DC/palettes/0.pal b/data/tilesets/secondary/trainer_tower/palettes/0.pal
index 8db07d418..8db07d418 100644
--- a/data/tilesets/secondary/82D50DC/palettes/0.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/0.pal
diff --git a/data/tilesets/secondary/82D5094/palettes/1.pal b/data/tilesets/secondary/trainer_tower/palettes/1.pal
index 66561f6d3..66561f6d3 100644
--- a/data/tilesets/secondary/82D5094/palettes/1.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/1.pal
diff --git a/data/tilesets/secondary/82D5094/palettes/10.pal b/data/tilesets/secondary/trainer_tower/palettes/10.pal
index ab3a7d14f..ab3a7d14f 100644
--- a/data/tilesets/secondary/82D5094/palettes/10.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/10.pal
diff --git a/data/tilesets/secondary/82D5094/palettes/11.pal b/data/tilesets/secondary/trainer_tower/palettes/11.pal
index bb88b4d57..bb88b4d57 100644
--- a/data/tilesets/secondary/82D5094/palettes/11.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/11.pal
diff --git a/data/tilesets/secondary/82D5094/palettes/12.pal b/data/tilesets/secondary/trainer_tower/palettes/12.pal
index b0d005f21..b0d005f21 100644
--- a/data/tilesets/secondary/82D5094/palettes/12.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/12.pal
diff --git a/data/tilesets/secondary/82D5004/palettes/13.pal b/data/tilesets/secondary/trainer_tower/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D5004/palettes/13.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/13.pal
diff --git a/data/tilesets/secondary/82D501C/palettes/14.pal b/data/tilesets/secondary/trainer_tower/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D501C/palettes/14.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/14.pal
diff --git a/data/tilesets/secondary/82D5094/palettes/15.pal b/data/tilesets/secondary/trainer_tower/palettes/15.pal
index 6a17f18dc..6a17f18dc 100644
--- a/data/tilesets/secondary/82D5094/palettes/15.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/15.pal
diff --git a/data/tilesets/secondary/82D50C4/palettes/2.pal b/data/tilesets/secondary/trainer_tower/palettes/2.pal
index 87a022102..87a022102 100644
--- a/data/tilesets/secondary/82D50C4/palettes/2.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/2.pal
diff --git a/data/tilesets/secondary/82D50C4/palettes/3.pal b/data/tilesets/secondary/trainer_tower/palettes/3.pal
index 783496dcd..783496dcd 100644
--- a/data/tilesets/secondary/82D50C4/palettes/3.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/3.pal
diff --git a/data/tilesets/secondary/82D50C4/palettes/4.pal b/data/tilesets/secondary/trainer_tower/palettes/4.pal
index 89eace605..89eace605 100644
--- a/data/tilesets/secondary/82D50C4/palettes/4.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/4.pal
diff --git a/data/tilesets/secondary/82D50DC/palettes/5.pal b/data/tilesets/secondary/trainer_tower/palettes/5.pal
index c7780e5c7..c7780e5c7 100644
--- a/data/tilesets/secondary/82D50DC/palettes/5.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/5.pal
diff --git a/data/tilesets/secondary/82D50C4/palettes/6.pal b/data/tilesets/secondary/trainer_tower/palettes/6.pal
index 1d08ce9a2..1d08ce9a2 100644
--- a/data/tilesets/secondary/82D50C4/palettes/6.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/6.pal
diff --git a/data/tilesets/secondary/82D5094/palettes/7.pal b/data/tilesets/secondary/trainer_tower/palettes/7.pal
index edc5961bb..edc5961bb 100644
--- a/data/tilesets/secondary/82D5094/palettes/7.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/7.pal
diff --git a/data/tilesets/secondary/82D5094/palettes/8.pal b/data/tilesets/secondary/trainer_tower/palettes/8.pal
index 317213c42..317213c42 100644
--- a/data/tilesets/secondary/82D5094/palettes/8.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/8.pal
diff --git a/data/tilesets/secondary/82D5094/palettes/9.pal b/data/tilesets/secondary/trainer_tower/palettes/9.pal
index 19dc9a47e..19dc9a47e 100644
--- a/data/tilesets/secondary/82D5094/palettes/9.pal
+++ b/data/tilesets/secondary/trainer_tower/palettes/9.pal
diff --git a/data/tilesets/secondary/82D5094/tiles.png b/data/tilesets/secondary/trainer_tower/tiles.png
index f74f7c9f7..f74f7c9f7 100644
--- a/data/tilesets/secondary/82D5094/tiles.png
+++ b/data/tilesets/secondary/trainer_tower/tiles.png
diff --git a/data/tilesets/secondary/82D4EE4/metatile_attributes.bin b/data/tilesets/secondary/underground_path/metatile_attributes.bin
index 29caa862d..29caa862d 100644
--- a/data/tilesets/secondary/82D4EE4/metatile_attributes.bin
+++ b/data/tilesets/secondary/underground_path/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4EE4/metatiles.bin b/data/tilesets/secondary/underground_path/metatiles.bin
index 2010e1eca..2010e1eca 100644
--- a/data/tilesets/secondary/82D4EE4/metatiles.bin
+++ b/data/tilesets/secondary/underground_path/metatiles.bin
diff --git a/data/tilesets/secondary/82D4FA4/palettes/0.pal b/data/tilesets/secondary/underground_path/palettes/0.pal
index 6d876039d..6d876039d 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/0.pal
+++ b/data/tilesets/secondary/underground_path/palettes/0.pal
diff --git a/data/tilesets/secondary/82D50DC/palettes/1.pal b/data/tilesets/secondary/underground_path/palettes/1.pal
index 66561f6d3..66561f6d3 100644
--- a/data/tilesets/secondary/82D50DC/palettes/1.pal
+++ b/data/tilesets/secondary/underground_path/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4EE4/palettes/10.pal b/data/tilesets/secondary/underground_path/palettes/10.pal
index e12b8edac..e12b8edac 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/10.pal
+++ b/data/tilesets/secondary/underground_path/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4EE4/palettes/11.pal b/data/tilesets/secondary/underground_path/palettes/11.pal
index e12b8edac..e12b8edac 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/11.pal
+++ b/data/tilesets/secondary/underground_path/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4EE4/palettes/12.pal b/data/tilesets/secondary/underground_path/palettes/12.pal
index e12b8edac..e12b8edac 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/12.pal
+++ b/data/tilesets/secondary/underground_path/palettes/12.pal
diff --git a/data/tilesets/secondary/82D501C/palettes/13.pal b/data/tilesets/secondary/underground_path/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D501C/palettes/13.pal
+++ b/data/tilesets/secondary/underground_path/palettes/13.pal
diff --git a/data/tilesets/secondary/82D5034/palettes/14.pal b/data/tilesets/secondary/underground_path/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D5034/palettes/14.pal
+++ b/data/tilesets/secondary/underground_path/palettes/14.pal
diff --git a/data/tilesets/secondary/82D5034/palettes/15.pal b/data/tilesets/secondary/underground_path/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D5034/palettes/15.pal
+++ b/data/tilesets/secondary/underground_path/palettes/15.pal
diff --git a/data/tilesets/secondary/82D50DC/palettes/2.pal b/data/tilesets/secondary/underground_path/palettes/2.pal
index 87a022102..87a022102 100644
--- a/data/tilesets/secondary/82D50DC/palettes/2.pal
+++ b/data/tilesets/secondary/underground_path/palettes/2.pal
diff --git a/data/tilesets/secondary/82D50DC/palettes/3.pal b/data/tilesets/secondary/underground_path/palettes/3.pal
index 783496dcd..783496dcd 100644
--- a/data/tilesets/secondary/82D50DC/palettes/3.pal
+++ b/data/tilesets/secondary/underground_path/palettes/3.pal
diff --git a/data/tilesets/secondary/82D50DC/palettes/4.pal b/data/tilesets/secondary/underground_path/palettes/4.pal
index 89eace605..89eace605 100644
--- a/data/tilesets/secondary/82D50DC/palettes/4.pal
+++ b/data/tilesets/secondary/underground_path/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4FA4/palettes/5.pal b/data/tilesets/secondary/underground_path/palettes/5.pal
index 0eef3df8e..0eef3df8e 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/5.pal
+++ b/data/tilesets/secondary/underground_path/palettes/5.pal
diff --git a/data/tilesets/secondary/82D50DC/palettes/6.pal b/data/tilesets/secondary/underground_path/palettes/6.pal
index 1d08ce9a2..1d08ce9a2 100644
--- a/data/tilesets/secondary/82D50DC/palettes/6.pal
+++ b/data/tilesets/secondary/underground_path/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4EE4/palettes/7.pal b/data/tilesets/secondary/underground_path/palettes/7.pal
index 23e995640..23e995640 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/7.pal
+++ b/data/tilesets/secondary/underground_path/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4EE4/palettes/8.pal b/data/tilesets/secondary/underground_path/palettes/8.pal
index 3ce3570a1..3ce3570a1 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/8.pal
+++ b/data/tilesets/secondary/underground_path/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4EE4/palettes/9.pal b/data/tilesets/secondary/underground_path/palettes/9.pal
index e12b8edac..e12b8edac 100644
--- a/data/tilesets/secondary/82D4EE4/palettes/9.pal
+++ b/data/tilesets/secondary/underground_path/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4EE4/tiles.png b/data/tilesets/secondary/underground_path/tiles.png
index b8865022d..b8865022d 100644
--- a/data/tilesets/secondary/82D4EE4/tiles.png
+++ b/data/tilesets/secondary/underground_path/tiles.png
diff --git a/data/tilesets/secondary/82D4DDC/metatile_attributes.bin b/data/tilesets/secondary/unused_gatehouse1/metatile_attributes.bin
index 3549eaa93..3549eaa93 100644
--- a/data/tilesets/secondary/82D4DDC/metatile_attributes.bin
+++ b/data/tilesets/secondary/unused_gatehouse1/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4DDC/metatiles.bin b/data/tilesets/secondary/unused_gatehouse1/metatiles.bin
index ea1398be3..ea1398be3 100644
--- a/data/tilesets/secondary/82D4DDC/metatiles.bin
+++ b/data/tilesets/secondary/unused_gatehouse1/metatiles.bin
diff --git a/data/tilesets/secondary/82D4E84/palettes/0.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4E84/palettes/0.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4DDC/palettes/1.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/1.pal
index d99adafff..d99adafff 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/1.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4E3C/palettes/10.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/10.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/10.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4EFC/palettes/11.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/11.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/11.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4F5C/palettes/12.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/12.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/12.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/12.pal
diff --git a/data/tilesets/secondary/82D5034/palettes/13.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D5034/palettes/13.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/13.pal
diff --git a/data/tilesets/secondary/82D504C/palettes/14.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D504C/palettes/14.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/14.pal
diff --git a/data/tilesets/secondary/82D504C/palettes/15.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D504C/palettes/15.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4E3C/palettes/2.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/2.pal
index cc3a9457d..cc3a9457d 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/2.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4E3C/palettes/3.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/3.pal
index 7ec794ae5..7ec794ae5 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/3.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4E9C/palettes/4.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/4.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4E9C/palettes/5.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/5.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4DDC/palettes/6.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/6.pal
index 2903bb074..2903bb074 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/6.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4E3C/palettes/7.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/7.pal
index c62a40b0d..c62a40b0d 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/7.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4E3C/palettes/8.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/8.pal
index 8c66b4998..8c66b4998 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/8.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4D64/palettes/9.pal b/data/tilesets/secondary/unused_gatehouse1/palettes/9.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4D64/palettes/9.pal
+++ b/data/tilesets/secondary/unused_gatehouse1/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4DDC/tiles.png b/data/tilesets/secondary/unused_gatehouse1/tiles.png
index 6d376f447..6d376f447 100644
--- a/data/tilesets/secondary/82D4DDC/tiles.png
+++ b/data/tilesets/secondary/unused_gatehouse1/tiles.png
diff --git a/data/tilesets/secondary/82D4E3C/metatile_attributes.bin b/data/tilesets/secondary/unused_gatehouse2/metatile_attributes.bin
index 3549eaa93..3549eaa93 100644
--- a/data/tilesets/secondary/82D4E3C/metatile_attributes.bin
+++ b/data/tilesets/secondary/unused_gatehouse2/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4E3C/metatiles.bin b/data/tilesets/secondary/unused_gatehouse2/metatiles.bin
index ea1398be3..ea1398be3 100644
--- a/data/tilesets/secondary/82D4E3C/metatiles.bin
+++ b/data/tilesets/secondary/unused_gatehouse2/metatiles.bin
diff --git a/data/tilesets/secondary/82D4E9C/palettes/0.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4E9C/palettes/0.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4E3C/palettes/1.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/1.pal
index d99adafff..d99adafff 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/1.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4E84/palettes/10.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/10.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4E84/palettes/10.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4F14/palettes/11.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/11.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4F14/palettes/11.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4F74/palettes/12.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/12.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F74/palettes/12.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/12.pal
diff --git a/data/tilesets/secondary/82D504C/palettes/13.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D504C/palettes/13.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/13.pal
diff --git a/data/tilesets/secondary/82D5064/palettes/14.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D5064/palettes/14.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/14.pal
diff --git a/data/tilesets/secondary/82D5064/palettes/15.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D5064/palettes/15.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4E6C/palettes/2.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/2.pal
index cc3a9457d..cc3a9457d 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/2.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4E6C/palettes/3.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/3.pal
index 7ec794ae5..7ec794ae5 100644
--- a/data/tilesets/secondary/82D4E6C/palettes/3.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4EFC/palettes/4.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/4.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4EFC/palettes/5.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/5.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4E3C/palettes/6.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/6.pal
index 2903bb074..2903bb074 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/6.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4E84/palettes/7.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/7.pal
index c62a40b0d..c62a40b0d 100644
--- a/data/tilesets/secondary/82D4E84/palettes/7.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4E84/palettes/8.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/8.pal
index 8c66b4998..8c66b4998 100644
--- a/data/tilesets/secondary/82D4E84/palettes/8.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4DDC/palettes/9.pal b/data/tilesets/secondary/unused_gatehouse2/palettes/9.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4DDC/palettes/9.pal
+++ b/data/tilesets/secondary/unused_gatehouse2/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4E3C/tiles.png b/data/tilesets/secondary/unused_gatehouse2/tiles.png
index 6d376f447..6d376f447 100644
--- a/data/tilesets/secondary/82D4E3C/tiles.png
+++ b/data/tilesets/secondary/unused_gatehouse2/tiles.png
diff --git a/data/tilesets/secondary/82D4B24/metatile_attributes.bin b/data/tilesets/secondary/vermilion_city/metatile_attributes.bin
index 1136f644a..1136f644a 100644
--- a/data/tilesets/secondary/82D4B24/metatile_attributes.bin
+++ b/data/tilesets/secondary/vermilion_city/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4B24/metatiles.bin b/data/tilesets/secondary/vermilion_city/metatiles.bin
index c7978128e..c7978128e 100644
--- a/data/tilesets/secondary/82D4B24/metatiles.bin
+++ b/data/tilesets/secondary/vermilion_city/metatiles.bin
diff --git a/data/tilesets/secondary/82D507C/palettes/0.pal b/data/tilesets/secondary/vermilion_city/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/82D507C/palettes/0.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/0.pal
diff --git a/data/tilesets/secondary/82D507C/palettes/1.pal b/data/tilesets/secondary/vermilion_city/palettes/1.pal
index 09828f4f1..09828f4f1 100644
--- a/data/tilesets/secondary/82D507C/palettes/1.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4B24/palettes/10.pal b/data/tilesets/secondary/vermilion_city/palettes/10.pal
index 892aae6ed..892aae6ed 100644
--- a/data/tilesets/secondary/82D4B24/palettes/10.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4B24/palettes/11.pal b/data/tilesets/secondary/vermilion_city/palettes/11.pal
index b2a405273..b2a405273 100644
--- a/data/tilesets/secondary/82D4B24/palettes/11.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4B24/palettes/12.pal b/data/tilesets/secondary/vermilion_city/palettes/12.pal
index f124929b4..f124929b4 100644
--- a/data/tilesets/secondary/82D4B24/palettes/12.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/12.pal
diff --git a/data/tilesets/secondary/82D5064/palettes/13.pal b/data/tilesets/secondary/vermilion_city/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D5064/palettes/13.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/13.pal
diff --git a/data/tilesets/secondary/82D507C/palettes/14.pal b/data/tilesets/secondary/vermilion_city/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D507C/palettes/14.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4B24/palettes/15.pal b/data/tilesets/secondary/vermilion_city/palettes/15.pal
index ac0d32eb0..ac0d32eb0 100644
--- a/data/tilesets/secondary/82D4B24/palettes/15.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/15.pal
diff --git a/data/tilesets/secondary/82D504C/palettes/2.pal b/data/tilesets/secondary/vermilion_city/palettes/2.pal
index 372fb5d7c..372fb5d7c 100644
--- a/data/tilesets/secondary/82D504C/palettes/2.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/2.pal
diff --git a/data/tilesets/secondary/82D50AC/palettes/3.pal b/data/tilesets/secondary/vermilion_city/palettes/3.pal
index 205c464c7..205c464c7 100644
--- a/data/tilesets/secondary/82D50AC/palettes/3.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/3.pal
diff --git a/data/tilesets/secondary/82D50AC/palettes/4.pal b/data/tilesets/secondary/vermilion_city/palettes/4.pal
index 5871a448c..5871a448c 100644
--- a/data/tilesets/secondary/82D50AC/palettes/4.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/4.pal
diff --git a/data/tilesets/secondary/82D50AC/palettes/5.pal b/data/tilesets/secondary/vermilion_city/palettes/5.pal
index c5a653979..c5a653979 100644
--- a/data/tilesets/secondary/82D50AC/palettes/5.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/5.pal
diff --git a/data/tilesets/secondary/82D50AC/palettes/6.pal b/data/tilesets/secondary/vermilion_city/palettes/6.pal
index 9bad44649..9bad44649 100644
--- a/data/tilesets/secondary/82D50AC/palettes/6.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4B24/palettes/7.pal b/data/tilesets/secondary/vermilion_city/palettes/7.pal
index 17b1a0ed2..17b1a0ed2 100644
--- a/data/tilesets/secondary/82D4B24/palettes/7.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4B24/palettes/8.pal b/data/tilesets/secondary/vermilion_city/palettes/8.pal
index 7179b91bd..7179b91bd 100644
--- a/data/tilesets/secondary/82D4B24/palettes/8.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4B24/palettes/9.pal b/data/tilesets/secondary/vermilion_city/palettes/9.pal
index 746dac7da..746dac7da 100644
--- a/data/tilesets/secondary/82D4B24/palettes/9.pal
+++ b/data/tilesets/secondary/vermilion_city/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4B24/tiles.png b/data/tilesets/secondary/vermilion_city/tiles.png
index 8cfa9b4dd..8cfa9b4dd 100644
--- a/data/tilesets/secondary/82D4B24/tiles.png
+++ b/data/tilesets/secondary/vermilion_city/tiles.png
diff --git a/data/tilesets/secondary/82D4D34/metatile_attributes.bin b/data/tilesets/secondary/vermilion_gym/metatile_attributes.bin
index a5e733de0..a5e733de0 100644
--- a/data/tilesets/secondary/82D4D34/metatile_attributes.bin
+++ b/data/tilesets/secondary/vermilion_gym/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4D34/metatiles.bin b/data/tilesets/secondary/vermilion_gym/metatiles.bin
index 25a46724b..25a46724b 100644
--- a/data/tilesets/secondary/82D4D34/metatiles.bin
+++ b/data/tilesets/secondary/vermilion_gym/metatiles.bin
diff --git a/data/tilesets/secondary/82D4F44/palettes/0.pal b/data/tilesets/secondary/vermilion_gym/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4F44/palettes/0.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4E84/palettes/1.pal b/data/tilesets/secondary/vermilion_gym/palettes/1.pal
index d99adafff..d99adafff 100644
--- a/data/tilesets/secondary/82D4E84/palettes/1.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4EFC/palettes/10.pal b/data/tilesets/secondary/vermilion_gym/palettes/10.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/10.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4D34/palettes/11.pal b/data/tilesets/secondary/vermilion_gym/palettes/11.pal
index 9fa42f21f..9fa42f21f 100644
--- a/data/tilesets/secondary/82D4D34/palettes/11.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4D34/palettes/12.pal b/data/tilesets/secondary/vermilion_gym/palettes/12.pal
index 5e2756cc9..5e2756cc9 100644
--- a/data/tilesets/secondary/82D4D34/palettes/12.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/12.pal
diff --git a/data/tilesets/secondary/82D507C/palettes/13.pal b/data/tilesets/secondary/vermilion_gym/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D507C/palettes/13.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/13.pal
diff --git a/data/tilesets/secondary/82D5094/palettes/14.pal b/data/tilesets/secondary/vermilion_gym/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D5094/palettes/14.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/14.pal
diff --git a/data/tilesets/secondary/82D507C/palettes/15.pal b/data/tilesets/secondary/vermilion_gym/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D507C/palettes/15.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4E84/palettes/2.pal b/data/tilesets/secondary/vermilion_gym/palettes/2.pal
index cc3a9457d..cc3a9457d 100644
--- a/data/tilesets/secondary/82D4E84/palettes/2.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4E84/palettes/3.pal b/data/tilesets/secondary/vermilion_gym/palettes/3.pal
index 7ec794ae5..7ec794ae5 100644
--- a/data/tilesets/secondary/82D4E84/palettes/3.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4F44/palettes/4.pal b/data/tilesets/secondary/vermilion_gym/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4F44/palettes/4.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4F44/palettes/5.pal b/data/tilesets/secondary/vermilion_gym/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4F44/palettes/5.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4F2C/palettes/6.pal b/data/tilesets/secondary/vermilion_gym/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F2C/palettes/6.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4D34/palettes/7.pal b/data/tilesets/secondary/vermilion_gym/palettes/7.pal
index efd64bcc5..efd64bcc5 100644
--- a/data/tilesets/secondary/82D4D34/palettes/7.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4D64/palettes/8.pal b/data/tilesets/secondary/vermilion_gym/palettes/8.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4D64/palettes/8.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4E3C/palettes/9.pal b/data/tilesets/secondary/vermilion_gym/palettes/9.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4E3C/palettes/9.pal
+++ b/data/tilesets/secondary/vermilion_gym/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4D34/tiles.png b/data/tilesets/secondary/vermilion_gym/tiles.png
index 1baac0893..1baac0893 100644
--- a/data/tilesets/secondary/82D4D34/tiles.png
+++ b/data/tilesets/secondary/vermilion_gym/tiles.png
diff --git a/data/tilesets/secondary/82D4AC4/metatile_attributes.bin b/data/tilesets/secondary/viridian_city/metatile_attributes.bin
index ee2d7d5b3..ee2d7d5b3 100644
--- a/data/tilesets/secondary/82D4AC4/metatile_attributes.bin
+++ b/data/tilesets/secondary/viridian_city/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4AC4/metatiles.bin b/data/tilesets/secondary/viridian_city/metatiles.bin
index 297673a4b..297673a4b 100644
--- a/data/tilesets/secondary/82D4AC4/metatiles.bin
+++ b/data/tilesets/secondary/viridian_city/metatiles.bin
diff --git a/data/tilesets/secondary/82D50AC/palettes/0.pal b/data/tilesets/secondary/viridian_city/palettes/0.pal
index 2f3f97d6f..2f3f97d6f 100644
--- a/data/tilesets/secondary/82D50AC/palettes/0.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4B84/palettes/1.pal b/data/tilesets/secondary/viridian_city/palettes/1.pal
index cf1123812..cf1123812 100644
--- a/data/tilesets/secondary/82D4B84/palettes/1.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4AC4/palettes/10.pal b/data/tilesets/secondary/viridian_city/palettes/10.pal
index 4baf904ae..4baf904ae 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/10.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4AC4/palettes/11.pal b/data/tilesets/secondary/viridian_city/palettes/11.pal
index 2e92b3cc3..2e92b3cc3 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/11.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4AC4/palettes/12.pal b/data/tilesets/secondary/viridian_city/palettes/12.pal
index 70ed40322..70ed40322 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/12.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/12.pal
diff --git a/data/tilesets/secondary/82D5094/palettes/13.pal b/data/tilesets/secondary/viridian_city/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D5094/palettes/13.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/13.pal
diff --git a/data/tilesets/secondary/82D50AC/palettes/14.pal b/data/tilesets/secondary/viridian_city/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D50AC/palettes/14.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/14.pal
diff --git a/data/tilesets/secondary/82D50AC/palettes/15.pal b/data/tilesets/secondary/viridian_city/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D50AC/palettes/15.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/15.pal
diff --git a/data/tilesets/secondary/82D5064/palettes/2.pal b/data/tilesets/secondary/viridian_city/palettes/2.pal
index 372fb5d7c..372fb5d7c 100644
--- a/data/tilesets/secondary/82D5064/palettes/2.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4B84/palettes/3.pal b/data/tilesets/secondary/viridian_city/palettes/3.pal
index 5a5e60211..5a5e60211 100644
--- a/data/tilesets/secondary/82D4B84/palettes/3.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4B84/palettes/4.pal b/data/tilesets/secondary/viridian_city/palettes/4.pal
index 229f9132c..229f9132c 100644
--- a/data/tilesets/secondary/82D4B84/palettes/4.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4B84/palettes/5.pal b/data/tilesets/secondary/viridian_city/palettes/5.pal
index 215dd1272..215dd1272 100644
--- a/data/tilesets/secondary/82D4B84/palettes/5.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4B84/palettes/6.pal b/data/tilesets/secondary/viridian_city/palettes/6.pal
index 7e7862a19..7e7862a19 100644
--- a/data/tilesets/secondary/82D4B84/palettes/6.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4B9C/palettes/7.pal b/data/tilesets/secondary/viridian_city/palettes/7.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/82D4B9C/palettes/7.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4AC4/palettes/8.pal b/data/tilesets/secondary/viridian_city/palettes/8.pal
index 219129eba..219129eba 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/8.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4AC4/palettes/9.pal b/data/tilesets/secondary/viridian_city/palettes/9.pal
index 0aa2b58dc..0aa2b58dc 100644
--- a/data/tilesets/secondary/82D4AC4/palettes/9.pal
+++ b/data/tilesets/secondary/viridian_city/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4AC4/tiles.png b/data/tilesets/secondary/viridian_city/tiles.png
index 39b80d8f9..39b80d8f9 100644
--- a/data/tilesets/secondary/82D4AC4/tiles.png
+++ b/data/tilesets/secondary/viridian_city/tiles.png
diff --git a/data/tilesets/secondary/82D4DC4/metatile_attributes.bin b/data/tilesets/secondary/viridian_forest/metatile_attributes.bin
index 990d6861c..990d6861c 100644
--- a/data/tilesets/secondary/82D4DC4/metatile_attributes.bin
+++ b/data/tilesets/secondary/viridian_forest/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4DC4/metatiles.bin b/data/tilesets/secondary/viridian_forest/metatiles.bin
index cd0bd5f53..cd0bd5f53 100644
--- a/data/tilesets/secondary/82D4DC4/metatiles.bin
+++ b/data/tilesets/secondary/viridian_forest/metatiles.bin
diff --git a/data/tilesets/secondary/82D5004/palettes/0.pal b/data/tilesets/secondary/viridian_forest/palettes/0.pal
index 7af5bb7d2..7af5bb7d2 100644
--- a/data/tilesets/secondary/82D5004/palettes/0.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/0.pal
diff --git a/data/tilesets/secondary/82D5004/palettes/1.pal b/data/tilesets/secondary/viridian_forest/palettes/1.pal
index 391d1e3d1..391d1e3d1 100644
--- a/data/tilesets/secondary/82D5004/palettes/1.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/1.pal
diff --git a/data/tilesets/secondary/82D5004/palettes/10.pal b/data/tilesets/secondary/viridian_forest/palettes/10.pal
index 746437492..746437492 100644
--- a/data/tilesets/secondary/82D5004/palettes/10.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4DC4/palettes/11.pal b/data/tilesets/secondary/viridian_forest/palettes/11.pal
index 410d5193a..410d5193a 100644
--- a/data/tilesets/secondary/82D4DC4/palettes/11.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/11.pal
diff --git a/data/tilesets/secondary/82D50AC/palettes/12.pal b/data/tilesets/secondary/viridian_forest/palettes/12.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D50AC/palettes/12.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/12.pal
diff --git a/data/tilesets/secondary/82D50C4/palettes/13.pal b/data/tilesets/secondary/viridian_forest/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D50C4/palettes/13.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/13.pal
diff --git a/data/tilesets/secondary/82D50C4/palettes/14.pal b/data/tilesets/secondary/viridian_forest/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D50C4/palettes/14.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/14.pal
diff --git a/data/tilesets/secondary/82D50DC/palettes/15.pal b/data/tilesets/secondary/viridian_forest/palettes/15.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D50DC/palettes/15.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/15.pal
diff --git a/data/tilesets/secondary/82D50AC/palettes/2.pal b/data/tilesets/secondary/viridian_forest/palettes/2.pal
index 6b019b884..6b019b884 100644
--- a/data/tilesets/secondary/82D50AC/palettes/2.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/2.pal
diff --git a/data/tilesets/secondary/82D5004/palettes/3.pal b/data/tilesets/secondary/viridian_forest/palettes/3.pal
index 9581f2cd8..9581f2cd8 100644
--- a/data/tilesets/secondary/82D5004/palettes/3.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/3.pal
diff --git a/data/tilesets/secondary/82D501C/palettes/4.pal b/data/tilesets/secondary/viridian_forest/palettes/4.pal
index 702db8a90..702db8a90 100644
--- a/data/tilesets/secondary/82D501C/palettes/4.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/4.pal
diff --git a/data/tilesets/secondary/82D5004/palettes/5.pal b/data/tilesets/secondary/viridian_forest/palettes/5.pal
index 3a2db72a7..3a2db72a7 100644
--- a/data/tilesets/secondary/82D5004/palettes/5.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/5.pal
diff --git a/data/tilesets/secondary/82D5004/palettes/6.pal b/data/tilesets/secondary/viridian_forest/palettes/6.pal
index 93518605a..93518605a 100644
--- a/data/tilesets/secondary/82D5004/palettes/6.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/6.pal
diff --git a/data/tilesets/secondary/82D50AC/palettes/7.pal b/data/tilesets/secondary/viridian_forest/palettes/7.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D50AC/palettes/7.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/7.pal
diff --git a/data/tilesets/secondary/82D5004/palettes/8.pal b/data/tilesets/secondary/viridian_forest/palettes/8.pal
index 650a35cc8..650a35cc8 100644
--- a/data/tilesets/secondary/82D5004/palettes/8.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/8.pal
diff --git a/data/tilesets/secondary/82D5004/palettes/9.pal b/data/tilesets/secondary/viridian_forest/palettes/9.pal
index df2d04037..df2d04037 100644
--- a/data/tilesets/secondary/82D5004/palettes/9.pal
+++ b/data/tilesets/secondary/viridian_forest/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4DC4/tiles.png b/data/tilesets/secondary/viridian_forest/tiles.png
index 451eb8d5a..451eb8d5a 100644
--- a/data/tilesets/secondary/82D4DC4/tiles.png
+++ b/data/tilesets/secondary/viridian_forest/tiles.png
diff --git a/data/tilesets/secondary/82D4CBC/metatile_attributes.bin b/data/tilesets/secondary/viridian_gym/metatile_attributes.bin
index a84364708..a84364708 100644
--- a/data/tilesets/secondary/82D4CBC/metatile_attributes.bin
+++ b/data/tilesets/secondary/viridian_gym/metatile_attributes.bin
diff --git a/data/tilesets/secondary/82D4CBC/metatiles.bin b/data/tilesets/secondary/viridian_gym/metatiles.bin
index 2980877c1..2980877c1 100644
--- a/data/tilesets/secondary/82D4CBC/metatiles.bin
+++ b/data/tilesets/secondary/viridian_gym/metatiles.bin
diff --git a/data/tilesets/secondary/82D4F5C/palettes/0.pal b/data/tilesets/secondary/viridian_gym/palettes/0.pal
index 88e712348..88e712348 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/0.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/0.pal
diff --git a/data/tilesets/secondary/82D4D64/palettes/1.pal b/data/tilesets/secondary/viridian_gym/palettes/1.pal
index 3a16a45c7..3a16a45c7 100644
--- a/data/tilesets/secondary/82D4D64/palettes/1.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/1.pal
diff --git a/data/tilesets/secondary/82D4FA4/palettes/10.pal b/data/tilesets/secondary/viridian_gym/palettes/10.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/10.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/10.pal
diff --git a/data/tilesets/secondary/82D4FA4/palettes/11.pal b/data/tilesets/secondary/viridian_gym/palettes/11.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/11.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/11.pal
diff --git a/data/tilesets/secondary/82D4CBC/palettes/12.pal b/data/tilesets/secondary/viridian_gym/palettes/12.pal
index d2c6cb089..d2c6cb089 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/12.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/12.pal
diff --git a/data/tilesets/secondary/82D50DC/palettes/13.pal b/data/tilesets/secondary/viridian_gym/palettes/13.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D50DC/palettes/13.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/13.pal
diff --git a/data/tilesets/secondary/82D50DC/palettes/14.pal b/data/tilesets/secondary/viridian_gym/palettes/14.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D50DC/palettes/14.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/14.pal
diff --git a/data/tilesets/secondary/82D4EFC/palettes/15.pal b/data/tilesets/secondary/viridian_gym/palettes/15.pal
index 92e7ed309..92e7ed309 100644
--- a/data/tilesets/secondary/82D4EFC/palettes/15.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/15.pal
diff --git a/data/tilesets/secondary/82D4D64/palettes/2.pal b/data/tilesets/secondary/viridian_gym/palettes/2.pal
index c8ee236d7..c8ee236d7 100644
--- a/data/tilesets/secondary/82D4D64/palettes/2.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/2.pal
diff --git a/data/tilesets/secondary/82D4D64/palettes/3.pal b/data/tilesets/secondary/viridian_gym/palettes/3.pal
index b17dbb054..b17dbb054 100644
--- a/data/tilesets/secondary/82D4D64/palettes/3.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/3.pal
diff --git a/data/tilesets/secondary/82D4F5C/palettes/4.pal b/data/tilesets/secondary/viridian_gym/palettes/4.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/4.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/4.pal
diff --git a/data/tilesets/secondary/82D4F5C/palettes/5.pal b/data/tilesets/secondary/viridian_gym/palettes/5.pal
index 6f31ca776..6f31ca776 100644
--- a/data/tilesets/secondary/82D4F5C/palettes/5.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/5.pal
diff --git a/data/tilesets/secondary/82D4F74/palettes/6.pal b/data/tilesets/secondary/viridian_gym/palettes/6.pal
index 4b0812f09..4b0812f09 100644
--- a/data/tilesets/secondary/82D4F74/palettes/6.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/6.pal
diff --git a/data/tilesets/secondary/82D4CBC/palettes/7.pal b/data/tilesets/secondary/viridian_gym/palettes/7.pal
index f55e52fe2..f55e52fe2 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/7.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/7.pal
diff --git a/data/tilesets/secondary/82D4CBC/palettes/8.pal b/data/tilesets/secondary/viridian_gym/palettes/8.pal
index 3a7dbc274..3a7dbc274 100644
--- a/data/tilesets/secondary/82D4CBC/palettes/8.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/8.pal
diff --git a/data/tilesets/secondary/82D4FA4/palettes/9.pal b/data/tilesets/secondary/viridian_gym/palettes/9.pal
index 6b0281bd6..6b0281bd6 100644
--- a/data/tilesets/secondary/82D4FA4/palettes/9.pal
+++ b/data/tilesets/secondary/viridian_gym/palettes/9.pal
diff --git a/data/tilesets/secondary/82D4CBC/tiles.png b/data/tilesets/secondary/viridian_gym/tiles.png
index b53b94b96..b53b94b96 100644
--- a/data/tilesets/secondary/82D4CBC/tiles.png
+++ b/data/tilesets/secondary/viridian_gym/tiles.png
diff --git a/data/trainer_tower/trainers.inc b/data/trainer_tower/trainers.inc
index 5f9b0f49b..645a8a27e 100644
--- a/data/trainer_tower/trainers.inc
+++ b/data/trainer_tower/trainers.inc
@@ -5111,3 +5111,43 @@ gUnknown_84823CC::
 	.byte 255 @ friendship
 
 	.byte 0x80, 0x6b, 0x01
+
+	.align 2
+gUnknown_84827AC:: @ 84827AC
+	.byte 0x08, 0x01
+	.2byte 0
+	.4byte 0
+
+gUnknown_84827B4:: @ 84827B4
+	.4byte gUnknown_847F16C
+	.4byte gUnknown_847D26C
+	.4byte gUnknown_84808AC
+	.4byte gUnknown_847ABAC
+	.4byte gUnknown_847CAAC
+	.4byte gUnknown_847E9AC
+	.4byte gUnknown_847AF8C
+	.4byte gUnknown_847CE8C
+	.4byte gUnknown_847DA2C
+	.4byte gUnknown_847BF0C
+	.4byte gUnknown_847D64C
+	.4byte gUnknown_847DE0C
+	.4byte gUnknown_847B74C
+	.4byte gUnknown_847BB2C
+	.4byte gUnknown_848182C
+	.4byte gUnknown_847F92C
+	.4byte gUnknown_847C2EC
+	.4byte gUnknown_847C6CC
+	.4byte gUnknown_847E5CC
+	.4byte gUnknown_84804CC
+	.4byte gUnknown_84823CC
+	.4byte gUnknown_8481FEC
+	.4byte gUnknown_84800EC
+	.4byte gUnknown_847E1EC
+	.4byte gUnknown_847ED8C
+	.4byte gUnknown_848106C
+	.4byte gUnknown_8480C8C
+	.4byte gUnknown_847F92C
+	.4byte gUnknown_847F54C
+	.4byte gUnknown_847E1EC
+	.4byte gUnknown_847D64C
+	.4byte gUnknown_847C6CC