165 files changed, 2447 insertions, 2984 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 8527b4f09..6d8a22898 100644
--- a/data/data_8479668.s
+++ b/data/data_8479668.s
@@ -75,64 +75,64 @@ gUnknown_847AA8F::
 gUnknown_847AAA8::
 	.string "{CLEAR 11}…{CLEAR 16}“{CLEAR 16}”{CLEAR 18}‘{CLEAR 18}'{CLEAR 18} $"
 
-gUnknown_847AAC1::
+gText_UnionRoomChatKeyboard_ABCDE::
 	.string "ABCDE$"
 
-gUnknown_847AAC7::
+gText_UnionRoomChatKeyboard_FGHIJ::
 	.string "FGHIJ$"
 
-gUnknown_847AACD::
+gText_UnionRoomChatKeyboard_KLMNO::
 	.string "KLMNO$"
 
-gUnknown_847AAD3::
+gText_UnionRoomChatKeyboard_PQRST::
 	.string "PQRST$"
 
-gUnknown_847AAD9::
+gText_UnionRoomChatKeyboard_UVWXY::
 	.string "UVWXY$"
 
-gUnknown_847AADF::
+gText_UnionRoomChatKeyboard_Z::
 	.string "Z    $"
 
-gUnknown_847AAE5::
+gText_UnionRoomChatKeyboard_01234Upper::
 	.string "01234$"
 
-gUnknown_847AAEB::
+gText_UnionRoomChatKeyboard_56789Upper::
 	.string "56789$"
 
-gUnknown_847AAF1::
+gText_UnionRoomChatKeyboard_PunctuationUpper::
 	.string ".,!? $"
 
-gUnknown_847AAF7::
+gText_UnionRoomChatKeyboard_SymbolsUpper::
 	.string "-/&… $"
 
-gUnknown_847AAFD::
+gText_UnionRoomChatKeyboard_abcde::
 	.string "abcde$"
 
-gUnknown_847AB03::
+gText_UnionRoomChatKeyboard_fghij::
 	.string "fghij$"
 
-gUnknown_847AB09::
+gText_UnionRoomChatKeyboard_klmno::
 	.string "klmno$"
 
-gUnknown_847AB0F::
+gText_UnionRoomChatKeyboard_pqrst::
 	.string "pqrst$"
 
-gUnknown_847AB15::
+gText_UnionRoomChatKeyboard_uvwxy::
 	.string "uvwxy$"
 
-gUnknown_847AB1B::
+gText_UnionRoomChatKeyboard_z::
 	.string "z    $"
 
-gUnknown_847AB21::
+gText_UnionRoomChatKeyboard_01234Lower::
 	.string "01234$"
 
-gUnknown_847AB27::
+gText_UnionRoomChatKeyboard_56789Lower::
 	.string "56789$"
 
-gUnknown_847AB2D::
+gText_UnionRoomChatKeyboard_PunctuationLower::
 	.string ".,!? $"
 
-gUnknown_847AB33::
+gText_UnionRoomChatKeyboard_SymbolsLower::
 	.string "-/&… $"
 
 	.string "$"
@@ -144,82 +144,40 @@ gUnknown_847AB33::
 	.string "$"
 	.string "$"
 
-gUnknown_847AB41::
+gText_UnionRoomChatKeyboard_Emoji1::
 	.string "{EXTRA 245}{EXTRA 246}{EXTRA 247}{EXTRA 248}{EXTRA 254}$"
 
-gUnknown_847AB4C::
+gText_UnionRoomChatKeyboard_Emoji2::
 	.string "{EXTRA 249}{EXTRA 250}{EXTRA 252}{EXTRA 251}{EXTRA 253}$"
 
-gUnknown_847AB57::
+gText_UnionRoomChatKeyboard_Emoji3::
 	.string "{EXTRA 236}{EXTRA 237}{EXTRA 238}{EXTRA 235}{EXTRA 234}$"
 
-gUnknown_847AB62::
+gText_UnionRoomChatKeyboard_Emoji4::
 	.string "♂♀{EXTRA 212}{EXTRA 213}{EXTRA 211}$"
 
-gUnknown_847AB6B::
+gText_UnionRoomChatKeyboard_Emoji5::
 	.string "{EXTRA 216}{EXTRA 217}{EXTRA 242}{EXTRA 243}{EXTRA 244}$"
 
-gUnknown_847AB76::
+gText_UnionRoomChatKeyboard_Emoji6::
 	.string "{EXTRA 218}{EXTRA 241}{EXTRA 224}{EXTRA 226}{EXTRA 227}$"
 
-gUnknown_847AB81::
+gText_UnionRoomChatKeyboard_Emoji7::
 	.string "{EXTRA 240}{EXTRA 239}{EXTRA 225}{EXTRA 214}{EXTRA 215}$"
 
-gUnknown_847AB8C::
+gText_UnionRoomChatKeyboard_Emoji8::
 	.string "{EXTRA 228}{EXTRA 229}{EXTRA 230}{EXTRA 231}{EXTRA 232}$"
 
-gUnknown_847AB97::
+gText_UnionRoomChatKeyboard_Emoji9::
 	.string "{EXTRA 233}{EXTRA 220}{EXTRA 221}{EXTRA 222}{EXTRA 209}$"
 
-gUnknown_847ABA2::
+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 6b7b60349..d196a799e 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -17,6 +17,7 @@
 #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"
@@ -31,6 +32,7 @@
 #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
@@ -209,17 +211,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"
@@ -594,7 +596,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"
@@ -638,6 +640,8 @@ gStdScriptsEnd::
 	.include "data/maps/Route18/text.inc"
 	.include "data/maps/Route19/text.inc"
 	.include "data/maps/Route20/text.inc"
+	.include "data/maps/Route21_North/text.inc"
+	.include "data/maps/Route21_South/text.inc"
 	.include "data/maps/Route22/text.inc"
 	.include "data/maps/Route23/text.inc"
 	.include "data/maps/Route24/text.inc"
@@ -942,23 +946,7 @@ Text_DugUpItemFromGround:: @ 81A5700
 	.string "from deep in the ground.$"
 
 	.include "data/text/route23.inc"
-
-Text_1A58A7:: @ 81A58A7
-	.string "Let's see…\n"
-	.string "Uh-oh! You have caught only\l"
-	.string "{STR_VAR_3} kinds of POKéMON!\p"
-	.string "You need {STR_VAR_1} kinds\n"
-	.string "if you want the {STR_VAR_2}.$"
-
-Text_1A5909:: @ 81A5909
-	.string "…Oh. I see.\p"
-	.string "When you get {STR_VAR_1} kinds of POKéMON,\n"
-	.string "come back for the {STR_VAR_2}.$"
-
-Text_1A594D:: @ 81A594D
-	.string "Oh! I see you don't have any\n"
-	.string "room for the {STR_VAR_2}.$"
-
+	.include "data/text/aide.inc"
 	.include "data/text/ingame_trade.inc"
 
 Text_CardKeyOpenedDoor:: @ 81A5B88
@@ -1184,10 +1172,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
 
@@ -1347,8 +1334,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
@@ -1422,24 +1409,11 @@ Route18_EastEntrance_1F_EventScript_1A77C1:: @ 81A77C1
 
 	.include "data/scripts/route23.inc"
 
-EventScript_1A7AB9:: @ 81A7AB9
+EventScript_GetElevatorFloor:: @ 81A7AB9
 	special Special_GetElevatorFloor
 	return
 
-EventScript_1A7ABD:: @ 81A7ABD
-	msgbox Text_1A58A7
-	release
-	end
-
-EventScript_1A7AC7:: @ 81A7AC7
-	msgbox Text_1A594D
-	release
-	end
-
-EventScript_1A7AD1:: @ 81A7AD1
-	msgbox Text_1A5909
-	release
-	end
+	.include "data/scripts/aide.inc"
 
 gUnknown_81A7ADB:: @ 81A7ADB
 	special sub_80CADC4
diff --git a/data/field_screen_effect.s b/data/field_screen_effect.s
deleted file mode 100644
index 92078287d..000000000
--- a/data/field_screen_effect.s
+++ /dev/null
@@ -1,15 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-	.align 2
-
-gUnknown_83C68E0:: @ 83C68E0
-	.4byte 4
-
-gUnknown_83C68E4:: @ 83C68E4
-	.byte 0, 0, 5, 30, 11, 15
-	.2byte 0x001
-
-gUnknown_83C68EC:: @ 83C68EC
-	.byte 0, 1, 2
diff --git a/data/graphics.s b/data/graphics.s
index 809385e49..247a5d230 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -16374,16 +16374,16 @@ gFameCheckerBg3Tilemap:: @ 8EA0700
 gFameCheckerBg2Tilemap:: @ 8EA0F00
 	.incbin "data/graphics/fame_checker_tilemap2.bin"
 
-gUnknown_8EA1700:: @ 8EA1700
+gLinkMiscMenu_Pal:: @ 8EA1700
 	.incbin "graphics/interface/union_room_chat.gbapal"
 
-gUnknown_8EA1720:: @ 8EA1720
+gLinkMiscMenu_Gfx:: @ 8EA1720
 	.incbin "graphics/interface/union_room_chat.4bpp.lz"
 
-gUnknown_8EA1958:: @ 8EA1958
+gLinkMiscMenu_Tilemap:: @ 8EA1958
 	.incbin "graphics/interface/union_room_chat.bin.lz"
 
-gUnknown_8EA1A50:: @ 8EA1A50
+gUnionRoomChatIcons:: @ 8EA1A50
 	.incbin "graphics/interface/union_room_chat_icons.4bpp.lz"
 
 	.align 2
@@ -16508,13 +16508,13 @@ gTilesetPalettes_8EA9D88:: @ 8EA9D88
 gTilesetTiles_8EA9F88:: @ 8EA9F88
 	.incbin "data/tilesets/secondary/82D4E6C/tiles.4bpp.lz"
 
-gUnknown_8EAA9F0:: @ 8EAA9F0
+gUnionRoomChatPanelBgPal_7:: @ 8EAA9F0
 	.incbin "graphics/interface/union_room_chat_panel.gbapal"
 
-gUnknown_8EAAA10:: @ 8EAAA10
+gUnionRoomChatPanelBgTiles:: @ 8EAAA10
 	.incbin "graphics/interface/union_room_chat_panel.4bpp.lz"
 
-gUnknown_8EAAA6C:: @ 8EAAA6C
+gUnionRoomChatPanelBgMap:: @ 8EAAA6C
 	.incbin "graphics/interface/union_room_chat_panel.bin.lz"
 
 gCreditsMonBackdropPals:: @ 8EAAB18
diff --git a/data/layouts/SevenIsland_TrainerTower_1F/border.bin b/data/layouts/TrainerTower_1F/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/SevenIsland_TrainerTower_1F/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_2F/border.bin b/data/layouts/TrainerTower_1F_Doubles/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/SevenIsland_TrainerTower_2F/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_3F/border.bin b/data/layouts/TrainerTower_1F_Knockout/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/SevenIsland_TrainerTower_3F/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_4F/border.bin b/data/layouts/TrainerTower_2F/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/SevenIsland_TrainerTower_4F/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_5F/border.bin b/data/layouts/TrainerTower_2F_Doubles/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/SevenIsland_TrainerTower_5F/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_6F/border.bin b/data/layouts/TrainerTower_2F_Knockout/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/SevenIsland_TrainerTower_6F/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_7F/border.bin b/data/layouts/TrainerTower_3F/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/SevenIsland_TrainerTower_7F/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/SevenIsland_TrainerTower_8F/border.bin b/data/layouts/TrainerTower_3F_Doubles/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/SevenIsland_TrainerTower_8F/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/SevenIsland_TrainerTower_Elevator/border.bin b/data/layouts/TrainerTower_3F_Knockout/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/SevenIsland_TrainerTower_Elevator/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/SevenIsland_TrainerTower_Lobby/border.bin b/data/layouts/TrainerTower_4F/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/SevenIsland_TrainerTower_Lobby/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_834BC2C/border.bin b/data/layouts/TrainerTower_4F_Doubles/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/UnusedLayout_834BC2C/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_834BEB4/border.bin b/data/layouts/TrainerTower_4F_Knockout/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/UnusedLayout_834BEB4/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_834C13C/border.bin b/data/layouts/TrainerTower_5F/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/UnusedLayout_834C13C/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_834C3C4/border.bin b/data/layouts/TrainerTower_5F_Doubles/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/UnusedLayout_834C3C4/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_834C64C/border.bin b/data/layouts/TrainerTower_5F_Knockout/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/UnusedLayout_834C64C/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_834C8D4/border.bin b/data/layouts/TrainerTower_6F/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/UnusedLayout_834C8D4/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_834CB5C/border.bin b/data/layouts/TrainerTower_6F_Doubles/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/UnusedLayout_834CB5C/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_834CDE4/border.bin b/data/layouts/TrainerTower_6F_Knockout/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/UnusedLayout_834CDE4/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_834D06C/border.bin b/data/layouts/TrainerTower_7F/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/UnusedLayout_834D06C/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_834D2F4/border.bin b/data/layouts/TrainerTower_7F_Doubles/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/UnusedLayout_834D2F4/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_834D57C/border.bin b/data/layouts/TrainerTower_7F_Knockout/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/UnusedLayout_834D57C/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_834D804/border.bin b/data/layouts/TrainerTower_8F/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/UnusedLayout_834D804/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_834DA8C/border.bin b/data/layouts/TrainerTower_8F_Doubles/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/UnusedLayout_834DA8C/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_834DD14/border.bin b/data/layouts/TrainerTower_8F_Knockout/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/UnusedLayout_834DD14/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_834DF9C/border.bin b/data/layouts/TrainerTower_Elevator/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/UnusedLayout_834DF9C/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_834E224/border.bin b/data/layouts/TrainerTower_Lobby/border.bin
index a886cd764..a886cd764 100644
--- a/data/layouts/UnusedLayout_834E224/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/layouts.json b/data/layouts/layouts.json
index 63fc06562..8f09ae939 100644
--- a/data/layouts/layouts.json
+++ b/data/layouts/layouts.json
@@ -3356,136 +3356,136 @@
       "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"
+      "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"
+      "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"
+      "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"
+      "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"
+      "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"
+      "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"
+      "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"
+      "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"
+      "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"
+      "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"
+      "border_filepath": "data/layouts/TrainerTower_Elevator/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerTower_Elevator/map.bin"
     },
     {
       "id": "LAYOUT_CERULEAN_CITY_HOUSE5",
@@ -4184,196 +4184,196 @@
       "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"
+      "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"
+      "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"
+      "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"
+      "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"
+      "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"
+      "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"
+      "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"
+      "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"
+      "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"
+      "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"
+      "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"
+      "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"
+      "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"
+      "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"
+      "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"
+      "border_filepath": "data/layouts/TrainerTower_8F_Knockout/border.bin",
+      "blockdata_filepath": "data/layouts/TrainerTower_8F_Knockout/map.bin"
     },
     {
       "id": "LAYOUT_SEVEN_ISLAND_HOUSE_ROOM1",
diff --git a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc
index 7a3737610..9469abce4 100644
--- a/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc
+++ b/data/maps/CeladonCity_DepartmentStore_Elevator/scripts.inc
@@ -4,7 +4,7 @@ CeladonCity_DepartmentStore_Elevator_MapScripts:: @ 816C152
 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
diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc
index d28125f72..0e466abd3 100644
--- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc
+++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc
@@ -346,7 +346,7 @@ EventScript_16939C:: @ 816939C
 	end
 
 EventScript_1693AC:: @ 81693AC
-	trainerbattle_tutorial TRAINER_RIVAL_OAKS_LAB_SQUIRTLE, 3, Text_18DDEA, Text_18DE1A
+	trainerbattle_earlyrival TRAINER_RIVAL_OAKS_LAB_SQUIRTLE, RIVAL_BATTLE_TUTORIAL, Text_18DDEA, Text_RivalVictory
 	goto EventScript_1694C2
 	end
 
@@ -402,7 +402,7 @@ EventScript_169414:: @ 8169414
 	end
 
 EventScript_169424:: @ 8169424
-	trainerbattle_tutorial TRAINER_RIVAL_OAKS_LAB_CHARMANDER, 3, Text_18DDEA, Text_18DE1A
+	trainerbattle_earlyrival TRAINER_RIVAL_OAKS_LAB_CHARMANDER, RIVAL_BATTLE_TUTORIAL, Text_18DDEA, Text_RivalVictory
 	goto EventScript_1694C2
 	end
 
@@ -461,7 +461,7 @@ EventScript_16948F:: @ 816948F
 	end
 
 EventScript_16949F:: @ 816949F
-	trainerbattle_tutorial TRAINER_RIVAL_OAKS_LAB_BULBASAUR, 3, Text_18DDEA, Text_18DE1A
+	trainerbattle_earlyrival TRAINER_RIVAL_OAKS_LAB_BULBASAUR, RIVAL_BATTLE_TUTORIAL, Text_18DDEA, Text_RivalVictory
 	goto EventScript_1694C2
 	end
 
diff --git a/data/maps/PalletTown_ProfessorOaksLab/text.inc b/data/maps/PalletTown_ProfessorOaksLab/text.inc
index 3d0c7ba57..e437d4b39 100644
--- a/data/maps/PalletTown_ProfessorOaksLab/text.inc
+++ b/data/maps/PalletTown_ProfessorOaksLab/text.inc
@@ -36,7 +36,8 @@ Text_18DDEA:: @ 818DDEA
     .string "Unbelievable!\l"
     .string "I picked the wrong POKéMON!$"
 
-Text_18DE1A:: @ 818DE1A
+@ Also used for early Route 22 battle
+Text_RivalVictory:: @ 818DE1A
     .string "{RIVAL}: Yeah!\n"
     .string "Am I great or what?$"
 
diff --git a/data/maps/RocketHideout_Elevator/scripts.inc b/data/maps/RocketHideout_Elevator/scripts.inc
index f649e5c40..e797e98a9 100644
--- a/data/maps/RocketHideout_Elevator/scripts.inc
+++ b/data/maps/RocketHideout_Elevator/scripts.inc
@@ -5,7 +5,7 @@ RocketHideout_Elevator_EventScript_1614D9:: @ 81614D9
 	lockall
 	goto_if_unset FLAG_CAN_USE_ROCKET_HIDEOUT_LIFT, EventScript_16161B
 	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
diff --git a/data/maps/Route1/map.json b/data/maps/Route1/map.json
index 8d636de9a..1a2426066 100644
--- a/data/maps/Route1/map.json
+++ b/data/maps/Route1/map.json
@@ -34,7 +34,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route1_EventScript_167EFE",
+      "script": "Route1_EventScript_MartClerk",
       "flag": "0"
     },
     {
@@ -47,7 +47,7 @@
       "movement_range_y": 3,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route1_EventScript_167F52",
+      "script": "Route1_EventScript_Boy",
       "flag": "0"
     }
   ],
@@ -59,7 +59,7 @@
       "x": 9,
       "y": 31,
       "elevation": 0,
-      "script": "Route1_EventScript_167F5B"
+      "script": "Route1_EventScript_RouteSign"
     }
   ]
 }
diff --git a/data/maps/Route1/scripts.inc b/data/maps/Route1/scripts.inc
index 8d5617e3f..36a42f65e 100644
--- a/data/maps/Route1/scripts.inc
+++ b/data/maps/Route1/scripts.inc
@@ -1,11 +1,11 @@
 Route1_MapScripts:: @ 8167EFD
 	.byte 0
 
-Route1_EventScript_167EFE:: @ 8167EFE
+Route1_EventScript_MartClerk:: @ 8167EFE
 	lock
 	faceplayer
-	goto_if_set FLAG_GOT_POTION_ON_ROUTE_1, EventScript_167F48
-	msgbox gUnknown_818329D
+	goto_if_set FLAG_GOT_POTION_ON_ROUTE_1, Route1_EventScript_AlreadyGotPotion
+	msgbox Route1_Text_WorkAtPokeMartTakeSample
 	textcolor 3
 	checkitemspace ITEM_POTION, 1
 	compare VAR_RESULT, FALSE
@@ -16,21 +16,21 @@ Route1_EventScript_167EFE:: @ 8167EFE
 	waitmessage
 	waitfanfare
 	additem ITEM_POTION
-	msgbox gUnknown_8183387
+	msgbox Route1_Text_PutPotionAway
 	call EventScript_1A6675
 	setflag FLAG_GOT_POTION_ON_ROUTE_1
 	release
 	end
 
-EventScript_167F48:: @ 8167F48
-	msgbox gUnknown_8183347
+Route1_EventScript_AlreadyGotPotion:: @ 8167F48
+	msgbox Route1_Text_ComeSeeUsIfYouNeedPokeBalls
 	release
 	end
 
-Route1_EventScript_167F52:: @ 8167F52
-	msgbox gUnknown_81833B9, MSGBOX_NPC
+Route1_EventScript_Boy:: @ 8167F52
+	msgbox Route1_Text_CanJumpFromLedges, MSGBOX_NPC
 	end
 
-Route1_EventScript_167F5B:: @ 8167F5B
-	msgbox gUnknown_818343A, MSGBOX_SIGN
+Route1_EventScript_RouteSign:: @ 8167F5B
+	msgbox Route1_Text_RouteSign, MSGBOX_SIGN
 	end
diff --git a/data/maps/Route1/text.inc b/data/maps/Route1/text.inc
index 7b4150b03..57ebecb86 100644
--- a/data/maps/Route1/text.inc
+++ b/data/maps/Route1/text.inc
@@ -1,4 +1,4 @@
-gUnknown_818329D:: @ 818329D
+Route1_Text_WorkAtPokeMartTakeSample:: @ 818329D
     .string "Hi!\n"
     .string "I work at a POKéMON MART.\p"
     .string "It's part of a convenient chain\n"
@@ -7,22 +7,22 @@ gUnknown_818329D:: @ 818329D
     .string "I know, I'll give you a sample.\n"
     .string "Here you go!$"
 
-gUnknown_8183347:: @ 8183347
+Route1_Text_ComeSeeUsIfYouNeedPokeBalls:: @ 8183347
     .string "Please come see us if you need\n"
     .string "POKé BALLS for catching POKéMON.$"
 
-gUnknown_8183387:: @ 8183387
+Route1_Text_PutPotionAway:: @ 8183387
     .string "{PLAYER} put the POTION away in\n"
     .string "the BAG's ITEMS POCKET.$"
 
-gUnknown_81833B9:: @ 81833B9
+Route1_Text_CanJumpFromLedges:: @ 81833B9
     .string "See those ledges along the road?\p"
     .string "It's a bit scary, but you can jump\n"
     .string "from them.\p"
     .string "You can get back to PALLET TOWN\n"
     .string "quicker that way.$"
 
-gUnknown_818343A:: @ 818343A
+Route1_Text_RouteSign:: @ 818343A
     .string "ROUTE 1\n"
     .string "PALLET TOWN - VIRIDIAN CITY$"
 
diff --git a/data/maps/Route10_PokemonCenter_1F/scripts.inc b/data/maps/Route10_PokemonCenter_1F/scripts.inc
index f81563b0c..56e0b448e 100644
--- a/data/maps/Route10_PokemonCenter_1F/scripts.inc
+++ b/data/maps/Route10_PokemonCenter_1F/scripts.inc
@@ -34,17 +34,17 @@ Route10_PokemonCenter_1F_EventScript_16FC65:: @ 816FC65
 	goto_if_set FLAG_GOT_EVERSTONE_FROM_OAKS_AIDE, EventScript_16FCE7
 	msgbox gUnknown_819E5FB, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_1A7AD1
+	goto_if_eq Aide_EventScript_DeclineCheckMons
 	setvar VAR_0x8004, 0
 	specialvar VAR_RESULT, Special_GetPokedexCount
 	getnumberstring 2, VAR_0x8006
 	call EventScript_16FCF1
 	compare VAR_0x8006, 20
-	goto_if_lt EventScript_1A7ABD
+	goto_if_lt Aide_EventScript_HaventCaughtEnough
 	msgbox gUnknown_819E733
 	checkitemspace ITEM_EVERSTONE, 1
 	compare VAR_RESULT, FALSE
-	goto_if_eq EventScript_1A7AC7
+	goto_if_eq Aide_EventScript_NoRoomForItem
 	giveitem_msg gUnknown_819E786, ITEM_EVERSTONE
 	setflag FLAG_GOT_EVERSTONE_FROM_OAKS_AIDE
 	msgbox gUnknown_819E7AF
diff --git a/data/maps/Route11_EastEntrance_2F/scripts.inc b/data/maps/Route11_EastEntrance_2F/scripts.inc
index 68b520e47..91a6d20bd 100644
--- a/data/maps/Route11_EastEntrance_2F/scripts.inc
+++ b/data/maps/Route11_EastEntrance_2F/scripts.inc
@@ -61,17 +61,17 @@ Route11_EastEntrance_2F_EventScript_16FDD8:: @ 816FDD8
 	goto_if_set FLAG_GOT_ITEMFINDER, EventScript_16FE5A
 	msgbox gUnknown_819E9E5, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_1A7AD1
+	goto_if_eq Aide_EventScript_DeclineCheckMons
 	setvar VAR_0x8004, 0
 	specialvar VAR_RESULT, Special_GetPokedexCount
 	getnumberstring 2, VAR_0x8006
 	call EventScript_16FE64
 	compare VAR_0x8006, 30
-	goto_if_lt EventScript_1A7ABD
+	goto_if_lt Aide_EventScript_HaventCaughtEnough
 	msgbox gUnknown_819EAE4
 	checkitemspace ITEM_ITEMFINDER, 1
 	compare VAR_RESULT, FALSE
-	goto_if_eq EventScript_1A7AC7
+	goto_if_eq Aide_EventScript_NoRoomForItem
 	giveitem_msg gUnknown_819EB37, ITEM_ITEMFINDER
 	setflag FLAG_GOT_ITEMFINDER
 	msgbox gUnknown_819EB59
diff --git a/data/maps/Route15_WestEntrance_2F/scripts.inc b/data/maps/Route15_WestEntrance_2F/scripts.inc
index c4cc4b6fd..088a65876 100644
--- a/data/maps/Route15_WestEntrance_2F/scripts.inc
+++ b/data/maps/Route15_WestEntrance_2F/scripts.inc
@@ -24,17 +24,17 @@ Route15_WestEntrance_2F_EventScript_1700B9:: @ 81700B9
 	goto_if_set FLAG_GOT_EXP_SHARE_FROM_OAKS_AIDE, EventScript_17013B
 	msgbox gUnknown_819F5AB, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_1A7AD1
+	goto_if_eq Aide_EventScript_DeclineCheckMons
 	setvar VAR_0x8004, 0
 	specialvar VAR_RESULT, Special_GetPokedexCount
 	getnumberstring 2, VAR_0x8006
 	call EventScript_170145
 	compare VAR_0x8006, 50
-	goto_if_lt EventScript_1A7ABD
+	goto_if_lt Aide_EventScript_HaventCaughtEnough
 	msgbox gUnknown_819F6AA
 	checkitemspace ITEM_EXP_SHARE, 1
 	compare VAR_RESULT, FALSE
-	goto_if_eq EventScript_1A7AC7
+	goto_if_eq Aide_EventScript_NoRoomForItem
 	giveitem_msg gUnknown_819F6FD, ITEM_EXP_SHARE
 	setflag FLAG_GOT_EXP_SHARE_FROM_OAKS_AIDE
 	msgbox gUnknown_819F71F
diff --git a/data/maps/Route16_NorthEntrance_2F/scripts.inc b/data/maps/Route16_NorthEntrance_2F/scripts.inc
index 2dfd8f1b0..7ccba34c8 100644
--- a/data/maps/Route16_NorthEntrance_2F/scripts.inc
+++ b/data/maps/Route16_NorthEntrance_2F/scripts.inc
@@ -24,17 +24,17 @@ Route16_NorthEntrance_2F_EventScript_1702E3:: @ 81702E3
 	goto_if_set FLAG_GOT_AMULET_COIN_FROM_OAKS_AIDE, EventScript_170365
 	msgbox gUnknown_819FB0E, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_1A7AD1
+	goto_if_eq Aide_EventScript_DeclineCheckMons
 	setvar VAR_0x8004, 0
 	specialvar VAR_RESULT, Special_GetPokedexCount
 	getnumberstring 2, VAR_0x8006
 	call EventScript_17036F
 	compare VAR_0x8006, 40
-	goto_if_lt EventScript_1A7ABD
+	goto_if_lt Aide_EventScript_HaventCaughtEnough
 	msgbox gUnknown_819FC15
 	checkitemspace ITEM_AMULET_COIN, 1
 	compare VAR_RESULT, FALSE
-	goto_if_eq EventScript_1A7AC7
+	goto_if_eq Aide_EventScript_NoRoomForItem
 	giveitem_msg gUnknown_819FC68, ITEM_AMULET_COIN
 	setflag FLAG_GOT_AMULET_COIN_FROM_OAKS_AIDE
 	msgbox gUnknown_819FC93
diff --git a/data/maps/Route2/map.json b/data/maps/Route2/map.json
index ac504faae..86be51055 100644
--- a/data/maps/Route2/map.json
+++ b/data/maps/Route2/map.json
@@ -195,14 +195,14 @@
       "x": 14,
       "y": 12,
       "elevation": 0,
-      "script": "Route2_EventScript_167F6E"
+      "script": "Route2_EventScript_DiglettsCaveSign"
     },
     {
       "type": "bg_event_type_0",
       "x": 7,
       "y": 73,
       "elevation": 0,
-      "script": "Route2_EventScript_167F65"
+      "script": "Route2_EventScript_RouteSign"
     }
   ]
 }
diff --git a/data/maps/Route2/scripts.inc b/data/maps/Route2/scripts.inc
index 75a3dd87b..2ecb31d72 100644
--- a/data/maps/Route2/scripts.inc
+++ b/data/maps/Route2/scripts.inc
@@ -1,10 +1,10 @@
 Route2_MapScripts:: @ 8167F64
 	.byte 0
 
-Route2_EventScript_167F65:: @ 8167F65
-	msgbox gUnknown_818345E, MSGBOX_SIGN
+Route2_EventScript_RouteSign:: @ 8167F65
+	msgbox Route2_Text_RouteSign, MSGBOX_SIGN
 	end
 
-Route2_EventScript_167F6E:: @ 8167F6E
-	msgbox gUnknown_8183482, MSGBOX_SIGN
+Route2_EventScript_DiglettsCaveSign:: @ 8167F6E
+	msgbox Route2_Text_DiglettsCave, MSGBOX_SIGN
 	end
diff --git a/data/maps/Route2/text.inc b/data/maps/Route2/text.inc
index 4197b7071..1ca497d6b 100644
--- a/data/maps/Route2/text.inc
+++ b/data/maps/Route2/text.inc
@@ -1,7 +1,7 @@
-gUnknown_818345E:: @ 818345E
+Route2_Text_RouteSign:: @ 818345E
     .string "ROUTE 2\n"
     .string "VIRIDIAN CITY - PEWTER CITY$"
 
-gUnknown_8183482:: @ 8183482
+Route2_Text_DiglettsCave:: @ 8183482
     .string "DIGLETT'S CAVE$"
 
diff --git a/data/maps/Route21_North/text.inc b/data/maps/Route21_North/text.inc
new file mode 100644
index 000000000..e8fc3223a
--- /dev/null
+++ b/data/maps/Route21_North/text.inc
@@ -0,0 +1,48 @@
+Text_1882E1:: @ 81882E1
+	.string "Strong TRAINERS and WATER POKéMON\n"
+	.string "are common sights in these parts.\p"
+	.string "They say that MISTY of the\n"
+	.string "CERULEAN GYM trains here.$"
+
+Text_18835A:: @ 818835A
+	.string "You want to know if the fish are\n"
+	.string "biting?$"
+
+Text_188383:: @ 8188383
+	.string "Dang!$"
+
+Text_188389:: @ 8188389
+	.string "I can't catch anything good.\n"
+	.string "Not one good POKéMON to be had!$"
+
+Text_1883C6:: @ 81883C6
+	.string "I got a big haul!\n"
+	.string "Wanna go for it?$"
+
+Text_1883E9:: @ 81883E9
+	.string "Heheh, MAGIKARP just don't make\n"
+	.string "the grade, do they?$"
+
+Text_18841D:: @ 818841D
+	.string "I seem to only catch MAGIKARP!$"
+
+Text_18843C:: @ 818843C
+	.string "The sea cleanses my body and soul!$"
+
+Text_18845F:: @ 818845F
+	.string "Ayah!$"
+
+Text_188465:: @ 8188465
+	.string "The sea is great and all, but I\n"
+	.string "like the mountains, too.$"
+
+Text_18849E:: @ 818849E
+	.string "おれだって　たまには\n"
+	.string "およぎに　くるぜ！$"
+
+Text_1884B3:: @ 81884B3
+	.string "ぐわわ！$"
+
+Text_1884B8:: @ 81884B8
+	.string "うきやすそう　だと？\n"
+	.string "うるせー　おおきな　おせわだッ！$"
diff --git a/data/maps/Route21_South/text.inc b/data/maps/Route21_South/text.inc
new file mode 100644
index 000000000..8700006ef
--- /dev/null
+++ b/data/maps/Route21_South/text.inc
@@ -0,0 +1,87 @@
+Text_1884D4:: @ 81884D4
+	.string "I caught my POKéMON at sea.$"
+
+Text_1884F0:: @ 81884F0
+	.string "Diver!!\n"
+	.string "Down!!$"
+
+Text_1884FF:: @ 81884FF
+	.string "Where'd you catch your POKéMON?$"
+
+Text_18851F:: @ 818851F
+	.string "Right now, I'm in a triathlon meet.$"
+
+Text_188543:: @ 8188543
+	.string "Pant…\n"
+	.string "Pant… Pant…$"
+
+Text_188555:: @ 8188555
+	.string "I'm beat! But, I still have the\n"
+	.string "bike race and marathon left!$"
+
+Text_188592:: @ 8188592
+	.string "Ahh!\n"
+	.string "Feel the sun and the wind!$"
+
+Text_1885B2:: @ 81885B2
+	.string "Yow!\n"
+	.string "I lost!$"
+
+Text_1885BF:: @ 81885BF
+	.string "I'm sunburnt to a crisp!$"
+
+Text_1885D8:: @ 81885D8
+	.string "Hey, don't scare away the fish!$"
+
+Text_1885F8:: @ 81885F8
+	.string "Sorry! I'm just so frustrated from\n"
+	.string "not catching anything.$"
+
+Text_188632:: @ 8188632
+	.string "Sheesh, I haven't caught a thing.\n"
+	.string "Could this place actually be a\l"
+	.string "giant pool or something?$"
+
+Text_18868C:: @ 818868C
+	.string "Keep me company till I get a hit.$"
+
+Text_1886AE:: @ 81886AE
+	.string "That burned some time.$"
+
+Text_1886C5:: @ 81886C5
+	.string "Oh wait!\n"
+	.string "I got a bite! Yeah!$"
+
+Text_1886E2:: @ 81886E2
+	.string "LIL: Huh? A battle?\n"
+	.string "IAN, can't you do it alone?$"
+
+Text_188712:: @ 8188712
+	.string "LIL: Oh, see?\n"
+	.string "We lost. Happy now?$"
+
+Text_188734:: @ 8188734
+	.string "LIL: I'm tired.\n"
+	.string "Can't we go home already?$"
+
+Text_18875E:: @ 818875E
+	.string "LIL: Huh? A battle?\n"
+	.string "I can't be bothered to do it alone.\l"
+	.string "Bring two POKéMON, won't you?$"
+
+Text_1887B4:: @ 81887B4
+	.string "IAN: My sis doesn't get enough\n"
+	.string "exercise, so I made her come.$"
+
+Text_1887F1:: @ 81887F1
+	.string "IAN: Awww, Sis!\n"
+	.string "Get it together!$"
+
+Text_188812:: @ 8188812
+	.string "IAN: Come on, Sis!\p"
+	.string "You're not going to lose weight\n"
+	.string "like this!$"
+
+Text_188850:: @ 8188850
+	.string "IAN: We want a two-on-two battle.\n"
+	.string "So can you bring two POKéMON?$"
diff --git a/data/maps/Route22/map.json b/data/maps/Route22/map.json
index c6f903acc..e8695121f 100644
--- a/data/maps/Route22/map.json
+++ b/data/maps/Route22/map.json
@@ -62,7 +62,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROUTE22",
       "var_value": 1,
-      "script": "Route22_EventScript_16828C"
+      "script": "Route22_EventScript_EarlyRivalTriggerTop"
     },
     {
       "type": "trigger",
@@ -71,7 +71,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROUTE22",
       "var_value": 1,
-      "script": "Route22_EventScript_168298"
+      "script": "Route22_EventScript_EarlyRivalTriggerMid"
     },
     {
       "type": "trigger",
@@ -80,7 +80,7 @@
       "elevation": 0,
       "var": "VAR_MAP_SCENE_ROUTE22",
       "var_value": 1,
-      "script": "Route22_EventScript_1682AB"
+      "script": "Route22_EventScript_EarlyRivalTriggerBottom"
     },
     {
       "type": "trigger",
@@ -89,7 +89,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROUTE22",
       "var_value": 3,
-      "script": "Route22_EventScript_1683ED"
+      "script": "Route22_EventScript_LateRivalTriggerTop"
     },
     {
       "type": "trigger",
@@ -98,7 +98,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROUTE22",
       "var_value": 3,
-      "script": "Route22_EventScript_1683F9"
+      "script": "Route22_EventScript_LateRivalTriggerMid"
     },
     {
       "type": "trigger",
@@ -107,7 +107,7 @@
       "elevation": 0,
       "var": "VAR_MAP_SCENE_ROUTE22",
       "var_value": 3,
-      "script": "Route22_EventScript_16840C"
+      "script": "Route22_EventScript_LateRivalTriggerBottom"
     }
   ],
   "bg_events": [
@@ -116,7 +116,7 @@
       "x": 7,
       "y": 12,
       "elevation": 0,
-      "script": "Route22_EventScript_1684E2"
+      "script": "Route22_EventScript_LeagueGateSign"
     }
   ]
 }
diff --git a/data/maps/Route22/scripts.inc b/data/maps/Route22/scripts.inc
index 8036883f3..dbc10e129 100644
--- a/data/maps/Route22/scripts.inc
+++ b/data/maps/Route22/scripts.inc
@@ -1,100 +1,94 @@
 Route22_MapScripts:: @ 816828B
 	.byte 0
 
-Route22_EventScript_16828C:: @ 816828C
+Route22_EventScript_EarlyRivalTriggerTop:: @ 816828C
 	lockall
 	setvar VAR_TEMP_1, 0
-	goto EventScript_1682BE
-
-EventScript_168297:: @ 8168297
+	goto Route22_EventScript_EarlyRival
 	end
 
-Route22_EventScript_168298:: @ 8168298
+Route22_EventScript_EarlyRivalTriggerMid:: @ 8168298
 	lockall
 	setvar VAR_TEMP_1, 1
 	setobjectxyperm 1, 25, 5
-	goto EventScript_1682BE
-
-EventScript_1682AA:: @ 81682AA
+	goto Route22_EventScript_EarlyRival
 	end
 
-Route22_EventScript_1682AB:: @ 81682AB
+Route22_EventScript_EarlyRivalTriggerBottom:: @ 81682AB
 	lockall
 	setvar VAR_TEMP_1, 2
 	setobjectxyperm 1, 25, 5
-	goto EventScript_1682BE
-
-EventScript_1682BD:: @ 81682BD
+	goto Route22_EventScript_EarlyRival
 	end
 
-EventScript_1682BE:: @ 81682BE
+Route22_EventScript_EarlyRival:: @ 81682BE
 	textcolor 0
 	playbgm MUS_RIVAL1, 0
 	addobject 1
 	compare VAR_TEMP_1, 0
-	call_if_eq EventScript_168350
+	call_if_eq Route22_EventScript_EarlyRivalApproach
 	compare VAR_TEMP_1, 1
-	call_if_eq EventScript_168350
+	call_if_eq Route22_EventScript_EarlyRivalApproach
 	compare VAR_TEMP_1, 2
-	call_if_eq EventScript_16835B
+	call_if_eq Route22_EventScript_EarlyRivalApproachBottom
 	delay 6
-	msgbox gUnknown_8188890
+	msgbox Route22_Text_EarlyRivalIntro
 	compare VAR_STARTER_MON, 2
-	call_if_eq EventScript_16836D
+	call_if_eq Route22_EventScript_EarlyRivalSquirtle
 	compare VAR_STARTER_MON, 1
-	call_if_eq EventScript_16837C
+	call_if_eq Route22_EventScript_EarlyRivalBulbasaur
 	compare VAR_STARTER_MON, 0
-	call_if_eq EventScript_16838B
-	msgbox gUnknown_8188974
+	call_if_eq Route22_EventScript_EarlyRivalCharmander
+	msgbox Route22_Text_EarlyRivalPostBattle
 	closemessage
 	delay 10
 	playbgm MUS_RIVAL2, 0
 	compare VAR_TEMP_1, 0
-	call_if_eq EventScript_16839A
+	call_if_eq Route22_EventScript_EarlyRivalExit
 	compare VAR_TEMP_1, 1
-	call_if_eq EventScript_16839A
+	call_if_eq Route22_EventScript_EarlyRivalExit
 	compare VAR_TEMP_1, 2
-	call_if_eq EventScript_1683A5
+	call_if_eq Route22_EventScript_EarlyRivalExitBottom
 	fadedefaultbgm
 	removeobject 1
 	setvar VAR_MAP_SCENE_ROUTE22, 2
 	releaseall
 	end
 
-EventScript_168350:: @ 8168350
-	applymovement 1, Movement_1683D1
+Route22_EventScript_EarlyRivalApproach:: @ 8168350
+	applymovement 1, Route22_Movement_RivalApproach
 	waitmovement 0
 	return
 
-EventScript_16835B:: @ 816835B
-	applymovement 1, Movement_1683D9
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_1683E3
+Route22_EventScript_EarlyRivalApproachBottom:: @ 816835B
+	applymovement 1, Route22_Movement_RivalApproachBottom
+	applymovement OBJ_EVENT_ID_PLAYER, Route22_Movement_PlayerFaceRival
 	waitmovement 0
 	return
 
-EventScript_16836D:: @ 816836D
-	trainerbattle_tutorial TRAINER_RIVAL_ROUTE22_EARLY_SQUIRTLE, 0, Text_188959, Text_18DE1A
+Route22_EventScript_EarlyRivalSquirtle:: @ 816836D
+	trainerbattle_earlyrival TRAINER_RIVAL_ROUTE22_EARLY_SQUIRTLE, 0, Route22_Text_EarlyRivalDefeat, Text_RivalVictory
 	return
 
-EventScript_16837C:: @ 816837C
-	trainerbattle_tutorial TRAINER_RIVAL_ROUTE22_EARLY_BULBASAUR, 0, Text_188959, Text_18DE1A
+Route22_EventScript_EarlyRivalBulbasaur:: @ 816837C
+	trainerbattle_earlyrival TRAINER_RIVAL_ROUTE22_EARLY_BULBASAUR, 0, Route22_Text_EarlyRivalDefeat, Text_RivalVictory
 	return
 
-EventScript_16838B:: @ 816838B
-	trainerbattle_tutorial TRAINER_RIVAL_ROUTE22_EARLY_CHARMANDER, 0, Text_188959, Text_18DE1A
+Route22_EventScript_EarlyRivalCharmander:: @ 816838B
+	trainerbattle_earlyrival TRAINER_RIVAL_ROUTE22_EARLY_CHARMANDER, 0, Route22_Text_EarlyRivalDefeat, Text_RivalVictory
 	return
 
-EventScript_16839A:: @ 816839A
-	applymovement 1, Movement_1683B8
+Route22_EventScript_EarlyRivalExit:: @ 816839A
+	applymovement 1, Route22_Movement_EarlyRivalExit
 	waitmovement 0
 	return
 
-EventScript_1683A5:: @ 81683A5
-	applymovement 1, Movement_1683C5
+Route22_EventScript_EarlyRivalExitBottom:: @ 81683A5
+	applymovement 1, Route22_Movement_EarlyRivalExitBottom
 	waitmovement 0
 	return
 
-Movement_1683B0:: @ 8
+Route22_Movement_UnusedRivalExit:: @ 8
 	walk_right
 	walk_right
 	walk_right
@@ -104,7 +98,7 @@ Movement_1683B0:: @ 8
 	walk_right
 	step_end
 
-Movement_1683B8:: @ 81683B8
+Route22_Movement_EarlyRivalExit:: @ 81683B8
 	walk_down
 	walk_right
 	walk_right
@@ -119,7 +113,7 @@ Movement_1683B8:: @ 81683B8
 	walk_down
 	step_end
 
-Movement_1683C5:: @ 81683C5
+Route22_Movement_EarlyRivalExitBottom:: @ 81683C5
 	walk_right
 	walk_right
 	walk_right
@@ -133,7 +127,7 @@ Movement_1683C5:: @ 81683C5
 	walk_down
 	step_end
 
-Movement_1683D1:: @ 81683D1
+Route22_Movement_RivalApproach:: @ 81683D1
 	walk_right
 	walk_right
 	walk_right
@@ -143,7 +137,7 @@ Movement_1683D1:: @ 81683D1
 	walk_right
 	step_end
 
-Movement_1683D9:: @ 81683D9
+Route22_Movement_RivalApproachBottom:: @ 81683D9
 	walk_right
 	walk_right
 	walk_right
@@ -155,7 +149,7 @@ Movement_1683D9:: @ 81683D9
 	walk_in_place_fastest_down
 	step_end
 
-Movement_1683E3:: @ 81683E3
+Route22_Movement_PlayerFaceRival:: @ 81683E3
 	delay_16
 	delay_16
 	delay_16
@@ -167,55 +161,49 @@ Movement_1683E3:: @ 81683E3
 	walk_in_place_fastest_up
 	step_end
 
-Route22_EventScript_1683ED:: @ 81683ED
+Route22_EventScript_LateRivalTriggerTop:: @ 81683ED
 	lockall
 	setvar VAR_TEMP_1, 0
-	goto EventScript_16841F
-
-EventScript_1683F8:: @ 81683F8
+	goto Route22_EventScript_LateRival
 	end
 
-Route22_EventScript_1683F9:: @ 81683F9
+Route22_EventScript_LateRivalTriggerMid:: @ 81683F9
 	lockall
 	setvar VAR_TEMP_1, 1
 	setobjectxyperm 1, 25, 5
-	goto EventScript_16841F
-
-EventScript_16840B:: @ 816840B
+	goto Route22_EventScript_LateRival
 	end
 
-Route22_EventScript_16840C:: @ 816840C
+Route22_EventScript_LateRivalTriggerBottom:: @ 816840C
 	lockall
 	setvar VAR_TEMP_1, 2
 	setobjectxyperm 1, 25, 5
-	goto EventScript_16841F
-
-EventScript_16841E:: @ 816841E
+	goto Route22_EventScript_LateRival
 	end
 
-EventScript_16841F:: @ 816841F
+Route22_EventScript_LateRival:: @ 816841F
 	textcolor 0
 	playbgm MUS_RIVAL1, 0
 	addobject 1
 	compare VAR_TEMP_1, 0
-	call_if_eq EventScript_16849C
+	call_if_eq Route22_EventScript_LateRivalApproach
 	compare VAR_TEMP_1, 1
-	call_if_eq EventScript_16849C
+	call_if_eq Route22_EventScript_LateRivalApproach
 	compare VAR_TEMP_1, 2
-	call_if_eq EventScript_1684A7
-	msgbox gUnknown_8188A3C
+	call_if_eq Route22_EventScript_LateRivalApproachBottom
+	msgbox Route22_Text_LateRivalIntro
 	setvar VAR_LAST_TALKED, 1
 	compare VAR_STARTER_MON, 2
-	call_if_eq EventScript_1684B9
+	call_if_eq Route22_EventScript_LateRivalSquirtle
 	compare VAR_STARTER_MON, 1
-	call_if_eq EventScript_1684C4
+	call_if_eq Route22_EventScript_LateRivalBulbasaur
 	compare VAR_STARTER_MON, 0
-	call_if_eq EventScript_1684CF
-	msgbox gUnknown_8188B29
+	call_if_eq Route22_EventScript_LateRivalCharmander
+	msgbox Route22_Text_LateRivalPostBattle
 	closemessage
 	delay 10
 	playbgm MUS_RIVAL2, 0
-	applymovement 1, Movement_1684DA
+	applymovement 1, Route22_Movement_LateRivalExit
 	waitmovement 0
 	fadedefaultbgm
 	removeobject 1
@@ -223,30 +211,30 @@ EventScript_16841F:: @ 816841F
 	releaseall
 	end
 
-EventScript_16849C:: @ 816849C
-	applymovement 1, Movement_1683D1
+Route22_EventScript_LateRivalApproach:: @ 816849C
+	applymovement 1, Route22_Movement_RivalApproach
 	waitmovement 0
 	return
 
-EventScript_1684A7:: @ 81684A7
-	applymovement 1, Movement_1683D9
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_1683E3
+Route22_EventScript_LateRivalApproachBottom:: @ 81684A7
+	applymovement 1, Route22_Movement_RivalApproachBottom
+	applymovement OBJ_EVENT_ID_PLAYER, Route22_Movement_PlayerFaceRival
 	waitmovement 0
 	return
 
-EventScript_1684B9:: @ 81684B9
-	trainerbattle_no_intro TRAINER_RIVAL_ROUTE22_LATE_SQUIRTLE, Text_188B08
+Route22_EventScript_LateRivalSquirtle:: @ 81684B9
+	trainerbattle_no_intro TRAINER_RIVAL_ROUTE22_LATE_SQUIRTLE, Route22_Text_LateRivalDefeat
 	return
 
-EventScript_1684C4:: @ 81684C4
-	trainerbattle_no_intro TRAINER_RIVAL_ROUTE22_LATE_BULBASAUR, Text_188B08
+Route22_EventScript_LateRivalBulbasaur:: @ 81684C4
+	trainerbattle_no_intro TRAINER_RIVAL_ROUTE22_LATE_BULBASAUR, Route22_Text_LateRivalDefeat
 	return
 
-EventScript_1684CF:: @ 81684CF
-	trainerbattle_no_intro TRAINER_RIVAL_ROUTE22_LATE_CHARMANDER, Text_188B08
+Route22_EventScript_LateRivalCharmander:: @ 81684CF
+	trainerbattle_no_intro TRAINER_RIVAL_ROUTE22_LATE_CHARMANDER, Route22_Text_LateRivalDefeat
 	return
 
-Movement_1684DA:: @ 81684DA
+Route22_Movement_LateRivalExit:: @ 81684DA
 	walk_left
 	walk_left
 	walk_left
@@ -256,6 +244,6 @@ Movement_1684DA:: @ 81684DA
 	walk_left
 	step_end
 
-Route22_EventScript_1684E2:: @ 81684E2
-	msgbox gUnknown_8188BFF, MSGBOX_SIGN
+Route22_EventScript_LeagueGateSign:: @ 81684E2
+	msgbox Route22_Text_LeagueGateSign, MSGBOX_SIGN
 	end
diff --git a/data/maps/Route22/text.inc b/data/maps/Route22/text.inc
index 7bfe6931b..72b4ca28b 100644
--- a/data/maps/Route22/text.inc
+++ b/data/maps/Route22/text.inc
@@ -1,201 +1,66 @@
-Text_1882E1:: @ 81882E1
-    .string "Strong TRAINERS and WATER POKéMON\n"
-    .string "are common sights in these parts.\p"
-    .string "They say that MISTY of the\n"
-    .string "CERULEAN GYM trains here.$"
-
-Text_18835A:: @ 818835A
-    .string "You want to know if the fish are\n"
-    .string "biting?$"
-
-Text_188383:: @ 8188383
-    .string "Dang!$"
-
-Text_188389:: @ 8188389
-    .string "I can't catch anything good.\n"
-    .string "Not one good POKéMON to be had!$"
-
-Text_1883C6:: @ 81883C6
-    .string "I got a big haul!\n"
-    .string "Wanna go for it?$"
-
-Text_1883E9:: @ 81883E9
-    .string "Heheh, MAGIKARP just don't make\n"
-    .string "the grade, do they?$"
-
-Text_18841D:: @ 818841D
-    .string "I seem to only catch MAGIKARP!$"
-
-Text_18843C:: @ 818843C
-    .string "The sea cleanses my body and soul!$"
-
-Text_18845F:: @ 818845F
-    .string "Ayah!$"
-
-Text_188465:: @ 8188465
-    .string "The sea is great and all, but I\n"
-    .string "like the mountains, too.$"
-
-Text_18849E:: @ 818849E
-    .string "おれだって　たまには\n"
-    .string "およぎに　くるぜ！$"
-
-Text_1884B3:: @ 81884B3
-    .string "ぐわわ！$"
-
-Text_1884B8:: @ 81884B8
-    .string "うきやすそう　だと？\n"
-    .string "うるせー　おおきな　おせわだッ！$"
-
-Text_1884D4:: @ 81884D4
-    .string "I caught my POKéMON at sea.$"
-
-Text_1884F0:: @ 81884F0
-    .string "Diver!!\n"
-    .string "Down!!$"
-
-Text_1884FF:: @ 81884FF
-    .string "Where'd you catch your POKéMON?$"
-
-Text_18851F:: @ 818851F
-    .string "Right now, I'm in a triathlon meet.$"
-
-Text_188543:: @ 8188543
-    .string "Pant…\n"
-    .string "Pant… Pant…$"
-
-Text_188555:: @ 8188555
-    .string "I'm beat! But, I still have the\n"
-    .string "bike race and marathon left!$"
-
-Text_188592:: @ 8188592
-    .string "Ahh!\n"
-    .string "Feel the sun and the wind!$"
-
-Text_1885B2:: @ 81885B2
-    .string "Yow!\n"
-    .string "I lost!$"
-
-Text_1885BF:: @ 81885BF
-    .string "I'm sunburnt to a crisp!$"
-
-Text_1885D8:: @ 81885D8
-    .string "Hey, don't scare away the fish!$"
-
-Text_1885F8:: @ 81885F8
-    .string "Sorry! I'm just so frustrated from\n"
-    .string "not catching anything.$"
-
-Text_188632:: @ 8188632
-    .string "Sheesh, I haven't caught a thing.\n"
-    .string "Could this place actually be a\l"
-    .string "giant pool or something?$"
-
-Text_18868C:: @ 818868C
-    .string "Keep me company till I get a hit.$"
-
-Text_1886AE:: @ 81886AE
-    .string "That burned some time.$"
-
-Text_1886C5:: @ 81886C5
-    .string "Oh wait!\n"
-    .string "I got a bite! Yeah!$"
-
-Text_1886E2:: @ 81886E2
-    .string "LIL: Huh? A battle?\n"
-    .string "IAN, can't you do it alone?$"
-
-Text_188712:: @ 8188712
-    .string "LIL: Oh, see?\n"
-    .string "We lost. Happy now?$"
-
-Text_188734:: @ 8188734
-    .string "LIL: I'm tired.\n"
-    .string "Can't we go home already?$"
-
-Text_18875E:: @ 818875E
-    .string "LIL: Huh? A battle?\n"
-    .string "I can't be bothered to do it alone.\l"
-    .string "Bring two POKéMON, won't you?$"
-
-Text_1887B4:: @ 81887B4
-    .string "IAN: My sis doesn't get enough\n"
-    .string "exercise, so I made her come.$"
-
-Text_1887F1:: @ 81887F1
-    .string "IAN: Awww, Sis!\n"
-    .string "Get it together!$"
-
-Text_188812:: @ 8188812
-    .string "IAN: Come on, Sis!\p"
-    .string "You're not going to lose weight\n"
-    .string "like this!$"
-
-Text_188850:: @ 8188850
-    .string "IAN: We want a two-on-two battle.\n"
-    .string "So can you bring two POKéMON?$"
-
-gUnknown_8188890:: @ 8188890
-    .string "{RIVAL}: Hey! {PLAYER}!\p"
-    .string "You're off to the POKéMON LEAGUE?\n"
-    .string "Forget about it!\p"
-    .string "You probably don't have any\n"
-    .string "BADGES, do you?\p"
-    .string "The guard won't let you through\n"
-    .string "without them.\p"
-    .string "By the way, did your POKéMON get\n"
-    .string "any stronger?$"
-
-Text_188959:: @ 8188959
-    .string "Awww!\n"
-    .string "You just lucked out!$"
-
-gUnknown_8188974:: @ 8188974
-    .string "I heard the POKéMON LEAGUE is\n"
-    .string "crawling with tough TRAINERS.\p"
-    .string "I have to figure out how to get\n"
-    .string "past them.\p"
-    .string "You should quit dawdling and get a\n"
-    .string "move on!$"
-
-Text_188A07:: @ 8188A07
-    .string "{RIVAL}“なんだ？\n"
-    .string "ポケモン　2ひきも\l"
-    .string "もってるの　なぜか　だって？\p"
-    .string "おまえも\n"
-    .string "つかまえれば　いい　じゃん！$"
-
-gUnknown_8188A3C:: @ 8188A3C
-    .string "{RIVAL}: What? {PLAYER}!\n"
-    .string "What a surprise to see you here!\p"
-    .string "So you're going to the POKéMON\n"
-    .string "LEAGUE?\p"
-    .string "You collected all the BADGES, too?\n"
-    .string "That's cool!\p"
-    .string "Then I'll whip you, {PLAYER}, as a\n"
-    .string "warm-up for the POKéMON LEAGUE!\p"
-    .string "Come on!$"
-
-Text_188B08:: @ 8188B08
-    .string "What!?\p"
-    .string "I was just careless, you!$"
-
-gUnknown_8188B29:: @ 8188B29
-    .string "That loosened me up.\n"
-    .string "I'm ready for the POKéMON LEAGUE!\p"
-    .string "{PLAYER}, you need more practice.\p"
-    .string "But hey, you know that!\n"
-    .string "I'm out of here. Smell ya!$"
-
-Text_188BAF:: @ 8188BAF
-    .string "{RIVAL}“ひゃははッ　{PLAYER}ー！\n"
-    .string "それで　がんばってるのかよ！\l"
-    .string "おれの　さいのうに　くらべりゃ\l"
-    .string "{PLAYER}は　まだまだ　だな！\p"
-    .string "もっと　れんしゅう　こいよ！\n"
-    .string "あははーッ！$"
-
-gUnknown_8188BFF:: @ 8188BFF
-    .string "POKéMON LEAGUE\n"
-    .string "Front Gate$"
+Route22_Text_EarlyRivalIntro:: @ 8188890
+	.string "{RIVAL}: Hey! {PLAYER}!\p"
+	.string "You're off to the POKéMON LEAGUE?\n"
+	.string "Forget about it!\p"
+	.string "You probably don't have any\n"
+	.string "BADGES, do you?\p"
+	.string "The guard won't let you through\n"
+	.string "without them.\p"
+	.string "By the way, did your POKéMON get\n"
+	.string "any stronger?$"
+
+Route22_Text_EarlyRivalDefeat:: @ 8188959
+	.string "Awww!\n"
+	.string "You just lucked out!$"
+
+Route22_Text_EarlyRivalPostBattle:: @ 8188974
+	.string "I heard the POKéMON LEAGUE is\n"
+	.string "crawling with tough TRAINERS.\p"
+	.string "I have to figure out how to get\n"
+	.string "past them.\p"
+	.string "You should quit dawdling and get a\n"
+	.string "move on!$"
+
+@ Translated in RB as "{RIVAL}: What? Why do I have 2 POKéMON? You should catch some more too!"
+Route22_Text_RivalShouldCatchSomeMons:: @ 8188A07
+	.string "{RIVAL}“なんだ？\n"
+	.string "ポケモン　2ひきも\l"
+	.string "もってるの　なぜか　だって？\p"
+	.string "おまえも\n"
+	.string "つかまえれば　いい　じゃん！$"
+
+Route22_Text_LateRivalIntro:: @ 8188A3C
+	.string "{RIVAL}: What? {PLAYER}!\n"
+	.string "What a surprise to see you here!\p"
+	.string "So you're going to the POKéMON\n"
+	.string "LEAGUE?\p"
+	.string "You collected all the BADGES, too?\n"
+	.string "That's cool!\p"
+	.string "Then I'll whip you, {PLAYER}, as a\n"
+	.string "warm-up for the POKéMON LEAGUE!\p"
+	.string "Come on!$"
+
+Route22_Text_LateRivalDefeat:: @ 8188B08
+	.string "What!?\p"
+	.string "I was just careless, you!$"
+
+Route22_Text_LateRivalPostBattle:: @ 8188B29
+	.string "That loosened me up.\n"
+	.string "I'm ready for the POKéMON LEAGUE!\p"
+	.string "{PLAYER}, you need more practice.\p"
+	.string "But hey, you know that!\n"
+	.string "I'm out of here. Smell ya!$"
+
+@ Translated in RB as "{RIVAL}: Hahaha! {PLAYER}! That's your best? You're nowhere near as good as me, pal! Go train some more! You loser!"
+Route22_Text_LateRivalVictory:: @ 8188BAF
+	.string "{RIVAL}“ひゃははッ　{PLAYER}ー！\n"
+	.string "それで　がんばってるのかよ！\l"
+	.string "おれの　さいのうに　くらべりゃ\l"
+	.string "{PLAYER}は　まだまだ　だな！\p"
+	.string "もっと　れんしゅう　こいよ！\n"
+	.string "あははーッ！$"
+
+Route22_Text_LeagueGateSign:: @ 8188BFF
+	.string "POKéMON LEAGUE\n"
+	.string "Front Gate$"
 
diff --git a/data/maps/Route2_EastBuilding/map.json b/data/maps/Route2_EastBuilding/map.json
index 2367b0b91..e966962c6 100644
--- a/data/maps/Route2_EastBuilding/map.json
+++ b/data/maps/Route2_EastBuilding/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route2_EastBuilding_EventScript_16F67F",
+      "script": "Route2_EastBuilding_EventScript_Aide",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route2_EastBuilding_EventScript_16F714",
+      "script": "Route2_EastBuilding_EventScript_Rocker",
       "flag": "0"
     }
   ],
diff --git a/data/maps/Route2_EastBuilding/scripts.inc b/data/maps/Route2_EastBuilding/scripts.inc
index cba95dc0b..a94d72fd7 100644
--- a/data/maps/Route2_EastBuilding/scripts.inc
+++ b/data/maps/Route2_EastBuilding/scripts.inc
@@ -1,40 +1,42 @@
+.equ REQUIRED_SEEN_MONS, 10
+
 Route2_EastBuilding_MapScripts:: @ 816F67E
 	.byte 0
 
-Route2_EastBuilding_EventScript_16F67F:: @ 816F67F
+Route2_EastBuilding_EventScript_Aide:: @ 816F67F
 	lock
 	faceplayer
-	call EventScript_16F70B
-	goto_if_set FLAG_GOT_HM05, EventScript_16F701
-	msgbox gUnknown_819D64F, MSGBOX_YESNO
+	call Route2_EastBuilding_EventScript_GetAideRequestInfo
+	goto_if_set FLAG_GOT_HM05, Route2_EastBuilding_EventScript_AlreadyGotHM05
+	msgbox Route2_EastBuilding_Text_GiveHM05IfSeen10Mons, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_1A7AD1
+	goto_if_eq Aide_EventScript_DeclineCheckMons
 	setvar VAR_0x8004, 0
 	specialvar VAR_RESULT, Special_GetPokedexCount
 	getnumberstring 2, VAR_0x8006
-	call EventScript_16F70B
-	compare VAR_0x8006, 10
-	goto_if_lt EventScript_1A7ABD
-	msgbox gUnknown_819D74E
+	call Route2_EastBuilding_EventScript_GetAideRequestInfo
+	compare VAR_0x8006, REQUIRED_SEEN_MONS
+	goto_if_lt Aide_EventScript_HaventCaughtEnough
+	msgbox Route2_EastBuilding_Text_GreatHereYouGo
 	checkitemspace ITEM_HM05, 1
 	compare VAR_RESULT, FALSE
-	goto_if_eq EventScript_1A7AC7
-	giveitem_msg gUnknown_819D7A1, ITEM_HM05
+	goto_if_eq Aide_EventScript_NoRoomForItem
+	giveitem_msg Route2_EastBuilding_Text_ReceivedHM05FromAide, ITEM_HM05
 	setflag FLAG_GOT_HM05
-	msgbox gUnknown_819D7C1
+	msgbox Route2_EastBuilding_Text_ExplainHM05
 	release
 	end
 
-EventScript_16F701:: @ 816F701
-	msgbox gUnknown_819D7C1
+Route2_EastBuilding_EventScript_AlreadyGotHM05:: @ 816F701
+	msgbox Route2_EastBuilding_Text_ExplainHM05
 	release
 	end
 
-EventScript_16F70B:: @ 816F70B
-	getnumberstring 0, 10
+Route2_EastBuilding_EventScript_GetAideRequestInfo:: @ 816F70B
+	getnumberstring 0, REQUIRED_SEEN_MONS
 	getitemname 1, ITEM_HM05
 	return
 
-Route2_EastBuilding_EventScript_16F714:: @ 816F714
-	msgbox gUnknown_819D81E, MSGBOX_NPC
+Route2_EastBuilding_EventScript_Rocker:: @ 816F714
+	msgbox Route2_EastBuilding_Text_CanGetThroughRockTunnel, MSGBOX_NPC
 	end
diff --git a/data/maps/Route2_EastBuilding/text.inc b/data/maps/Route2_EastBuilding/text.inc
index 228cf3c4d..1de4b8fc7 100644
--- a/data/maps/Route2_EastBuilding/text.inc
+++ b/data/maps/Route2_EastBuilding/text.inc
@@ -1,4 +1,4 @@
-gUnknown_819D64F:: @ 819D64F
+Route2_EastBuilding_Text_GiveHM05IfSeen10Mons:: @ 819D64F
     .string "Hi! Remember me?\n"
     .string "I'm one of PROF. OAK's AIDES.\p"
     .string "If your POKéDEX has complete data\n"
@@ -10,23 +10,23 @@ gUnknown_819D64F:: @ 819D64F
     .string "Have you gathered data on at least\n"
     .string "ten kinds of POKéMON?$"
 
-gUnknown_819D74E:: @ 819D74E
+Route2_EastBuilding_Text_GreatHereYouGo:: @ 819D74E
     .string "Great! You have caught or owned\n"
     .string "{STR_VAR_3} kinds of POKéMON!\p"
     .string "Congratulations!\n"
     .string "Here you go!$"
 
-gUnknown_819D7A1:: @ 819D7A1
+Route2_EastBuilding_Text_ReceivedHM05FromAide:: @ 819D7A1
     .string "{PLAYER} received HM05\n"
     .string "from the AIDE.$"
 
-gUnknown_819D7C1:: @ 819D7C1
+Route2_EastBuilding_Text_ExplainHM05:: @ 819D7C1
     .string "HM05 contains the hidden move\n"
     .string "FLASH.\p"
     .string "FLASH lights up even the darkest\n"
     .string "of caves and dungeons.$"
 
-gUnknown_819D81E:: @ 819D81E
+Route2_EastBuilding_Text_CanGetThroughRockTunnel:: @ 819D81E
     .string "Once a POKéMON learns FLASH, you\n"
     .string "can get through ROCK TUNNEL.$"
 
diff --git a/data/maps/Route2_House/map.json b/data/maps/Route2_House/map.json
index 4c4b7e790..8f9785c33 100644
--- a/data/maps/Route2_House/map.json
+++ b/data/maps/Route2_House/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route2_House_EventScript_16F5F9",
+      "script": "Route2_House_EventScript_Scientist",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route2_House_EventScript_16F602",
+      "script": "Route2_House_EventScript_Reyley",
       "flag": "0"
     }
   ],
diff --git a/data/maps/Route2_House/scripts.inc b/data/maps/Route2_House/scripts.inc
index 2cdc2d8ec..6c442958c 100644
--- a/data/maps/Route2_House/scripts.inc
+++ b/data/maps/Route2_House/scripts.inc
@@ -1,43 +1,43 @@
 Route2_House_MapScripts:: @ 816F5F8
 	.byte 0
 
-Route2_House_EventScript_16F5F9:: @ 816F5F9
-	msgbox gUnknown_819D5E7, MSGBOX_NPC
+Route2_House_EventScript_Scientist:: @ 816F5F9
+	msgbox Route2_House_Text_FaintedMonsCanUseFieldMoves, MSGBOX_NPC
 	end
 
-Route2_House_EventScript_16F602:: @ 816F602
+Route2_House_EventScript_Reyley:: @ 816F602
 	lock
 	faceplayer
 	setvar VAR_0x8008, INGAME_TRADE_MR_MIME
 	call EventScript_GetInGameTradeSpeciesInfo
-	goto_if_set FLAG_DID_MIMIEN_TRADE, EventScript_16F674
+	goto_if_set FLAG_DID_MIMIEN_TRADE, Route2_House_EventScript_AlreadyTraded
 	msgbox Trade_Text_LookingForMonWannaTradeForMon, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_16F65C
+	goto_if_eq Route2_House_EventScript_DeclineTrade
 	call EventScript_ChooseMonForInGameTrade
 	compare VAR_0x8004, PARTY_SIZE
-	goto_if_ge EventScript_16F65C
+	goto_if_ge Route2_House_EventScript_DeclineTrade
 	call EventScript_GetInGameTradeSpecies
 	compare VAR_RESULT, VAR_0x8009
-	goto_if_ne EventScript_16F666
+	goto_if_ne Route2_House_EventScript_NotRequestedMon
 	call EventScript_DoInGameTrade
 	msgbox Trade_Text_HeyThanks
 	setflag FLAG_DID_MIMIEN_TRADE
 	release
 	end
 
-EventScript_16F65C:: @ 816F65C
+Route2_House_EventScript_DeclineTrade:: @ 816F65C
 	msgbox Trade_Text_AwwOhWell
 	release
 	end
 
-EventScript_16F666:: @ 816F666
+Route2_House_EventScript_NotRequestedMon:: @ 816F666
 	getspeciesname 0, VAR_0x8009
 	msgbox Trade_Text_WhatThatsNoMon
 	release
 	end
 
-EventScript_16F674:: @ 816F674
+Route2_House_EventScript_AlreadyTraded:: @ 816F674
 	msgbox Trade_Text_IsntMyOldMonGreat
 	release
 	end
diff --git a/data/maps/Route2_House/text.inc b/data/maps/Route2_House/text.inc
index 5fde449d3..76267c113 100644
--- a/data/maps/Route2_House/text.inc
+++ b/data/maps/Route2_House/text.inc
@@ -1,4 +1,4 @@
-gUnknown_819D5E7:: @ 819D5E7
+Route2_House_Text_FaintedMonsCanUseFieldMoves:: @ 819D5E7
     .string "A fainted POKéMON just has no\n"
     .string "energy left to battle.\p"
     .string "It can still use moves like CUT\n"
diff --git a/data/maps/Route2_ViridianForest_NorthEntrance/map.json b/data/maps/Route2_ViridianForest_NorthEntrance/map.json
index 1d73befbd..7f4225d23 100644
--- a/data/maps/Route2_ViridianForest_NorthEntrance/map.json
+++ b/data/maps/Route2_ViridianForest_NorthEntrance/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route2_ViridianForest_NorthEntrance_EventScript_16F71E",
+      "script": "Route2_ViridianForest_NorthEntrance_EventScript_Youngster",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route2_ViridianForest_NorthEntrance_EventScript_16F727",
+      "script": "Route2_ViridianForest_NorthEntrance_EventScript_OldMan",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route2_ViridianForest_NorthEntrance_EventScript_16F730",
+      "script": "Route2_ViridianForest_NorthEntrance_EventScript_CooltrainerF",
       "flag": "0"
     }
   ],
diff --git a/data/maps/Route2_ViridianForest_NorthEntrance/scripts.inc b/data/maps/Route2_ViridianForest_NorthEntrance/scripts.inc
index 29e6bd757..756cf31d9 100644
--- a/data/maps/Route2_ViridianForest_NorthEntrance/scripts.inc
+++ b/data/maps/Route2_ViridianForest_NorthEntrance/scripts.inc
@@ -1,14 +1,14 @@
 Route2_ViridianForest_NorthEntrance_MapScripts:: @ 816F71D
 	.byte 0
 
-Route2_ViridianForest_NorthEntrance_EventScript_16F71E:: @ 816F71E
-	msgbox gUnknown_819D85C, MSGBOX_NPC
+Route2_ViridianForest_NorthEntrance_EventScript_Youngster:: @ 816F71E
+	msgbox Route2_ViridianForest_NorthEntrance_Text_ManyMonsOnlyInForests, MSGBOX_NPC
 	end
 
-Route2_ViridianForest_NorthEntrance_EventScript_16F727:: @ 816F727
-	msgbox gUnknown_819D8D0, MSGBOX_NPC
+Route2_ViridianForest_NorthEntrance_EventScript_OldMan:: @ 816F727
+	msgbox Route2_ViridianForest_NorthEntrance_Text_CanCutSkinnyTrees, MSGBOX_NPC
 	end
 
-Route2_ViridianForest_NorthEntrance_EventScript_16F730:: @ 816F730
-	msgbox gUnknown_819D93B, MSGBOX_NPC
+Route2_ViridianForest_NorthEntrance_EventScript_CooltrainerF:: @ 816F730
+	msgbox Route2_ViridianForest_NorthEntrance_Text_CanCancelEvolution, MSGBOX_NPC
 	end
diff --git a/data/maps/Route2_ViridianForest_NorthEntrance/text.inc b/data/maps/Route2_ViridianForest_NorthEntrance/text.inc
index 630d39fc9..9fec461a8 100644
--- a/data/maps/Route2_ViridianForest_NorthEntrance/text.inc
+++ b/data/maps/Route2_ViridianForest_NorthEntrance/text.inc
@@ -1,16 +1,16 @@
-gUnknown_819D85C:: @ 819D85C
+Route2_ViridianForest_NorthEntrance_Text_ManyMonsOnlyInForests:: @ 819D85C
     .string "Many POKéMON live only in forests \n"
     .string "and caves.\p"
     .string "You need to be persistent and look\n"
     .string "everywhere to get different kinds.$"
 
-gUnknown_819D8D0:: @ 819D8D0
+Route2_ViridianForest_NorthEntrance_Text_CanCutSkinnyTrees:: @ 819D8D0
     .string "Have you noticed the skinny trees\n"
     .string "on the roadside?\p"
     .string "They can be cut down by a special\n"
     .string "POKéMON move, I hear.$"
 
-gUnknown_819D93B:: @ 819D93B
+Route2_ViridianForest_NorthEntrance_Text_CanCancelEvolution:: @ 819D93B
     .string "Do you know the evolution-cancel\n"
     .string "technique?\p"
     .string "When a POKéMON is evolving, you\n"
diff --git a/data/maps/Route2_ViridianForest_SouthEntrance/map.json b/data/maps/Route2_ViridianForest_SouthEntrance/map.json
index 8d85f8f46..4e0ad0164 100644
--- a/data/maps/Route2_ViridianForest_SouthEntrance/map.json
+++ b/data/maps/Route2_ViridianForest_SouthEntrance/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route2_ViridianForest_SouthEntrance_EventScript_16F5E6",
+      "script": "Route2_ViridianForest_SouthEntrance_EventScript_Woman1",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "Route2_ViridianForest_SouthEntrance_EventScript_16F5EF",
+      "script": "Route2_ViridianForest_SouthEntrance_EventScript_Woman2",
       "flag": "0"
     }
   ],
diff --git a/data/maps/Route2_ViridianForest_SouthEntrance/scripts.inc b/data/maps/Route2_ViridianForest_SouthEntrance/scripts.inc
index aea8bfaa4..2a60a3772 100644
--- a/data/maps/Route2_ViridianForest_SouthEntrance/scripts.inc
+++ b/data/maps/Route2_ViridianForest_SouthEntrance/scripts.inc
@@ -1,10 +1,10 @@
 Route2_ViridianForest_SouthEntrance_MapScripts:: @ 816F5E5
 	.byte 0
 
-Route2_ViridianForest_SouthEntrance_EventScript_16F5E6:: @ 816F5E6
-	msgbox gUnknown_819D52C, MSGBOX_NPC
+Route2_ViridianForest_SouthEntrance_EventScript_Woman1:: @ 816F5E6
+	msgbox Route2_ViridianForest_SouthEntrance_Text_ForestIsMaze, MSGBOX_NPC
 	end
 
-Route2_ViridianForest_SouthEntrance_EventScript_16F5EF:: @ 816F5EF
-	msgbox gUnknown_819D58B, MSGBOX_NPC
+Route2_ViridianForest_SouthEntrance_EventScript_Woman2:: @ 816F5EF
+	msgbox Route2_ViridianForest_SouthEntrance_Text_RattataHasWickedBite, MSGBOX_NPC
 	end
diff --git a/data/maps/Route2_ViridianForest_SouthEntrance/text.inc b/data/maps/Route2_ViridianForest_SouthEntrance/text.inc
index c92538340..20e25429f 100644
--- a/data/maps/Route2_ViridianForest_SouthEntrance/text.inc
+++ b/data/maps/Route2_ViridianForest_SouthEntrance/text.inc
@@ -1,9 +1,9 @@
-gUnknown_819D52C:: @ 819D52C
+Route2_ViridianForest_SouthEntrance_Text_ForestIsMaze:: @ 819D52C
     .string "Are you going to VIRIDIAN FOREST?\n"
     .string "It's a natural maze in there.\l"
     .string "Be careful you don't get lost.$"
 
-gUnknown_819D58B:: @ 819D58B
+Route2_ViridianForest_SouthEntrance_Text_RattataHasWickedBite:: @ 819D58B
     .string "RATTATA may be small, but don't\n"
     .string "underestimate its wicked bite.\p"
     .string "Have you caught one already?$"
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_Elevator/scripts.inc b/data/maps/SilphCo_Elevator/scripts.inc
index 87ed62c9b..abc60756a 100644
--- a/data/maps/SilphCo_Elevator/scripts.inc
+++ b/data/maps/SilphCo_Elevator/scripts.inc
@@ -4,7 +4,7 @@ SilphCo_Elevator_MapScripts:: @ 8161F6E
 SilphCo_Elevator_EventScript_161F6F:: @ 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
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_3F/map.json b/data/maps/TrainerTower_4F/map.json
index 780878898..32c868e91 100644
--- a/data/maps/SevenIsland_TrainerTower_3F/map.json
+++ b/data/maps/TrainerTower_4F/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_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_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_5F",
       "dest_warp_id": 1
     },
     {
       "x": 4,
       "y": 6,
       "elevation": 3,
-      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_2F",
+      "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_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_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_4F/map.json b/data/maps/TrainerTower_5F/map.json
index d4a021ff3..7a32b597c 100644
--- a/data/maps/SevenIsland_TrainerTower_4F/map.json
+++ b/data/maps/TrainerTower_5F/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_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_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_6F",
       "dest_warp_id": 1
     },
     {
       "x": 4,
       "y": 6,
       "elevation": 3,
-      "dest_map": "MAP_SEVEN_ISLAND_TRAINER_TOWER_3F",
+      "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_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_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/ViridianCity/map.json b/data/maps/ViridianCity/map.json
index ca30e0c6e..a83f47f5a 100644
--- a/data/maps/ViridianCity/map.json
+++ b/data/maps/ViridianCity/map.json
@@ -65,7 +65,7 @@
       "movement_range_y": 0,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "ViridianCity_EventScript_1659CA",
+      "script": "ViridianCity_EventScript_OldMan",
       "flag": "0"
     },
     {
@@ -78,7 +78,7 @@
       "movement_range_y": 3,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "ViridianCity_EventScript_1659F6",
+      "script": "ViridianCity_EventScript_TutorialOldMan",
       "flag": "0"
     },
     {
@@ -91,7 +91,7 @@
       "movement_range_y": 3,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "ViridianCity_EventScript_165AC4",
+      "script": "ViridianCity_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -104,7 +104,7 @@
       "movement_range_y": 2,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "ViridianCity_EventScript_165A8F",
+      "script": "ViridianCity_EventScript_Youngster",
       "flag": "0"
     },
     {
@@ -117,7 +117,7 @@
       "movement_range_y": 2,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "ViridianCity_EventScript_1659C1",
+      "script": "ViridianCity_EventScript_Boy",
       "flag": "0"
     },
     {
@@ -192,7 +192,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN",
       "var_value": 0,
-      "script": "ViridianCity_EventScript_165AF6"
+      "script": "ViridianCity_EventScript_RoadBlocked"
     },
     {
       "type": "trigger",
@@ -201,7 +201,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR",
       "var_value": 0,
-      "script": "ViridianCity_EventScript_16596D"
+      "script": "ViridianCity_EventScript_GymDoorLocked"
     },
     {
       "type": "trigger",
@@ -210,7 +210,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN",
       "var_value": 1,
-      "script": "ViridianCity_EventScript_165B10"
+      "script": "ViridianCity_EventScript_TutorialTriggerLeft"
     },
     {
       "type": "trigger",
@@ -219,7 +219,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN",
       "var_value": 1,
-      "script": "ViridianCity_EventScript_165B2E"
+      "script": "ViridianCity_EventScript_TutorialTriggerRight"
     }
   ],
   "bg_events": [
@@ -228,35 +228,35 @@
       "x": 23,
       "y": 1,
       "elevation": 3,
-      "script": "ViridianCity_EventScript_16599D"
+      "script": "ViridianCity_EventScript_TrainerTips1"
     },
     {
       "type": "bg_event_type_0",
       "x": 32,
       "y": 10,
       "elevation": 0,
-      "script": "ViridianCity_EventScript_1659AF"
+      "script": "ViridianCity_EventScript_GymSign"
     },
     {
       "type": "bg_event_type_0",
       "x": 20,
       "y": 31,
       "elevation": 0,
-      "script": "ViridianCity_EventScript_1659A6"
+      "script": "ViridianCity_EventScript_TrainerTips2"
     },
     {
       "type": "bg_event_type_0",
       "x": 20,
       "y": 16,
       "elevation": 0,
-      "script": "ViridianCity_EventScript_165994"
+      "script": "ViridianCity_EventScript_CitySign"
     },
     {
       "type": "bg_event_type_0",
       "x": 36,
       "y": 10,
       "elevation": 0,
-      "script": "ViridianCity_EventScript_1659B8"
+      "script": "ViridianCity_EventScript_GymDoor"
     }
   ]
 }
diff --git a/data/maps/ViridianCity/scripts.inc b/data/maps/ViridianCity/scripts.inc
index c317a92eb..4fb140b24 100644
--- a/data/maps/ViridianCity/scripts.inc
+++ b/data/maps/ViridianCity/scripts.inc
@@ -1,3 +1,5 @@
+.equ LOCALID_TUTORIAL_MAN, 4
+
 ViridianCity_MapScripts:: @ 81658D3
 	map_script MAP_SCRIPT_ON_TRANSITION, ViridianCity_OnTransition
 	.byte 0
@@ -5,32 +7,32 @@ ViridianCity_MapScripts:: @ 81658D3
 ViridianCity_OnTransition:: @ 81658D9
 	setworldmapflag FLAG_WORLD_MAP_VIRIDIAN_CITY
 	compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 0
-	call_if_eq EventScript_165920
+	call_if_eq ViridianCity_EventScript_SetOldManBlockingRoad
 	compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 1
-	call_if_eq EventScript_16590F
+	call_if_eq ViridianCity_EventScript_SetOldManStandingByRoad
 	compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 2
-	call_if_ge EventScript_165909
+	call_if_ge ViridianCity_EventScript_SetOldManNormal
 	compare VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR, 0
-	call_if_eq EventScript_165931
+	call_if_eq ViridianCity_EventScript_TryUnlockGym
 	end
 
-EventScript_165909:: @ 8165909
+ViridianCity_EventScript_SetOldManNormal:: @ 8165909
 	setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_OLD_MAN_1
 	return
 
-EventScript_16590F:: @ 816590F
+ViridianCity_EventScript_SetOldManStandingByRoad:: @ 816590F
 	setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_OLD_MAN_1
-	setobjectxyperm 4, 21, 8
-	setobjectmovementtype 4, 1
+	setobjectxyperm LOCALID_TUTORIAL_MAN, 21, 8
+	setobjectmovementtype LOCALID_TUTORIAL_MAN, MOVEMENT_TYPE_LOOK_AROUND
 	return
 
-EventScript_165920:: @ 8165920
-	setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_VIRIDIAN_DRUNK
-	setobjectxyperm 4, 21, 11
-	setobjectmovementtype 4, 8
+ViridianCity_EventScript_SetOldManBlockingRoad:: @ 8165920
+	setvar VAR_OBJ_GFX_ID_0, OBJECT_EVENT_GFX_OLD_MAN_LYING_DOWN
+	setobjectxyperm LOCALID_TUTORIAL_MAN, 21, 11
+	setobjectmovementtype LOCALID_TUTORIAL_MAN, MOVEMENT_TYPE_FACE_DOWN
 	return
 
-EventScript_165931:: @ 8165931
+ViridianCity_EventScript_TryUnlockGym:: @ 8165931
 	goto_if_unset FLAG_BADGE02_GET, EventScript_Return
 	goto_if_unset FLAG_BADGE03_GET, EventScript_Return
 	goto_if_unset FLAG_BADGE04_GET, EventScript_Return
@@ -40,106 +42,109 @@ EventScript_165931:: @ 8165931
 	setvar VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR, 1
 	return
 
-ViridianCity_EventScript_16596D:: @ 816596D
+ViridianCity_EventScript_GymDoorLocked:: @ 816596D
 	lockall
 	textcolor 3
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	delay 20
-	msgbox gUnknown_817E2F5
+	msgbox ViridianCity_Text_GymDoorsAreLocked
 	closemessage
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_165992
+	applymovement OBJ_EVENT_ID_PLAYER, ViridianCity_Movement_JumpDownLedge
 	waitmovement 0
 	releaseall
 	end
 
-Movement_165992:: @ 8165992
+ViridianCity_Movement_JumpDownLedge:: @ 8165992
 	jump_2_down
 	step_end
 
-ViridianCity_EventScript_165994:: @ 8165994
-	msgbox gUnknown_817E1BB, MSGBOX_SIGN
+ViridianCity_EventScript_CitySign:: @ 8165994
+	msgbox ViridianCity_Text_CitySign, MSGBOX_SIGN
 	end
 
-ViridianCity_EventScript_16599D:: @ 816599D
-	msgbox gUnknown_817E1E7, MSGBOX_SIGN
+ViridianCity_EventScript_TrainerTips1:: @ 816599D
+	msgbox ViridianCity_Text_CatchMonsForEasierBattles, MSGBOX_SIGN
 	end
 
-ViridianCity_EventScript_1659A6:: @ 81659A6
-	msgbox gUnknown_817E24D, MSGBOX_SIGN
+ViridianCity_EventScript_TrainerTips2:: @ 81659A6
+	msgbox ViridianCity_Text_MovesLimitedByPP, MSGBOX_SIGN
 	end
 
-ViridianCity_EventScript_1659AF:: @ 81659AF
-	msgbox gUnknown_817E2DB, MSGBOX_SIGN
+ViridianCity_EventScript_GymSign:: @ 81659AF
+	msgbox ViridianCity_Text_GymSign, MSGBOX_SIGN
 	end
 
-ViridianCity_EventScript_1659B8:: @ 81659B8
-	msgbox gUnknown_817E2F5, MSGBOX_SIGN
+ViridianCity_EventScript_GymDoor:: @ 81659B8
+	msgbox ViridianCity_Text_GymDoorsAreLocked, MSGBOX_SIGN
 	end
 
-ViridianCity_EventScript_1659C1:: @ 81659C1
-	msgbox gUnknown_817DABB, MSGBOX_NPC
+ViridianCity_EventScript_Boy:: @ 81659C1
+	msgbox ViridianCity_Text_CanCarryMonsAnywhere, MSGBOX_NPC
 	end
 
-ViridianCity_EventScript_1659CA:: @ 81659CA
+@ Other old man, not the tutorial old man
+ViridianCity_EventScript_OldMan:: @ 81659CA
 	lock
 	faceplayer
 	compare VAR_MAP_SCENE_VIRIDIAN_CITY_GYM_DOOR, 1
-	goto_if_eq EventScript_1659EC
-	msgbox gUnknown_817DB39
+	goto_if_eq ViridianCity_EventScript_OldManGymLeaderReturned
+	msgbox ViridianCity_Text_GymClosedWonderWhoLeaderIs
 	closemessage
 	applymovement 3, Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-EventScript_1659EC:: @ 81659EC
-	msgbox gUnknown_817DB78
+ViridianCity_EventScript_OldManGymLeaderReturned:: @ 81659EC
+	msgbox ViridianCity_Text_ViridiansGymLeaderReturned
 	release
 	end
 
-ViridianCity_EventScript_1659F6:: @ 81659F6
+ViridianCity_EventScript_TutorialOldMan:: @ 81659F6
 	lock
 	faceplayer
-	goto_if_set FLAG_BADGE01_GET, EventScript_165A23
+	goto_if_set FLAG_BADGE01_GET, ViridianCity_EventScript_AskIfTeachyTVHelpful
 	compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 2
-	goto_if_ge EventScript_165A4A
+	goto_if_ge ViridianCity_EventScript_TutorialCompleted
 	compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 1
-	goto_if_eq EventScript_165A54
+	goto_if_eq ViridianCity_EventScript_TutorialStart
 	compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 0
-	goto_if_eq EventScript_165A84
+	goto_if_eq ViridianCity_EventScript_TutorialNotReady
 	end
 
-EventScript_165A23:: @ 8165A23
-	msgbox gUnknown_817E046, MSGBOX_YESNO
+ViridianCity_EventScript_AskIfTeachyTVHelpful:: @ 8165A23
+	msgbox ViridianCity_Text_HowsTeachyTVHelping, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_165A40
-	msgbox gUnknown_817E0EA
+	goto_if_eq ViridianCity_EventScript_TeachyTVNotHelpful
+	msgbox ViridianCity_Text_MyGrandsonOnTheShow
 	release
 	end
 
-EventScript_165A40:: @ 8165A40
-	msgbox gUnknown_817E14E
+ViridianCity_EventScript_TeachyTVNotHelpful:: @ 8165A40
+	msgbox ViridianCity_Text_TooBusyForTeachyTV
 	release
 	end
 
-EventScript_165A4A:: @ 8165A4A
-	msgbox gUnknown_817DF61
+ViridianCity_EventScript_TutorialCompleted:: @ 8165A4A
+	msgbox ViridianCity_Text_WeakenMonsFirstToCatch
 	release
 	end
 
-EventScript_165A54:: @ 8165A54
-	call EventScript_165B4C
+ViridianCity_EventScript_TutorialStart:: @ 8165A54
+	call ViridianCity_EventScript_DoTutorialBattle
 	release
 	end
 
-EventScript_165A5B:: @ 8165A5B
-	msgbox gUnknown_817DEEB
+@ Unused
+ViridianCity_EventScript_WatchToLearnBasics:: @ 8165A5B
+	msgbox ViridianCity_Text_WatchThatToLearnBasics
 	release
 	end
 
-EventScript_165A65:: @ 8165A65
-	msgbox gUnknown_817DE9B
+@ Unused. Starts battle after the post battle text, which is odd.
+ViridianCity_EventScript_TutorialUnused:: @ 8165A65
+	msgbox ViridianCity_Text_ThatWasEducationalTakeThis
 	goto_if_questlog EventScript_ReleaseEnd
 	special sub_8112364
 	special ScrSpecial_StartOldManTutorialBattle
@@ -147,43 +152,43 @@ EventScript_165A65:: @ 8165A65
 	release
 	end
 
-EventScript_165A84:: @ 8165A84
-	msgbox gUnknown_817DD03
+ViridianCity_EventScript_TutorialNotReady:: @ 8165A84
+	msgbox ViridianCity_Text_ThisIsPrivateProperty
 	closemessage
 	release
 	end
 
-ViridianCity_EventScript_165A8F:: @ 8165A8F
+ViridianCity_EventScript_Youngster:: @ 8165A8F
 	lock
 	faceplayer
-	msgbox gUnknown_817DB98, MSGBOX_YESNO
+	msgbox ViridianCity_Text_WantToKnowAboutCaterpillarMons, MSGBOX_YESNO
 	compare VAR_RESULT, YES
-	goto_if_eq EventScript_165AB0
+	goto_if_eq ViridianCity_EventScript_YoungsterExplainCaterpillars
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_165ABA
+	goto_if_eq ViridianCity_EventScript_YoungsterDeclineExplanation
 	end
 
-EventScript_165AB0:: @ 8165AB0
-	msgbox gUnknown_817DBE4
+ViridianCity_EventScript_YoungsterExplainCaterpillars:: @ 8165AB0
+	msgbox ViridianCity_Text_ExplainCaterpieWeedle
 	release
 	end
 
-EventScript_165ABA:: @ 8165ABA
-	msgbox gUnknown_817DBD5
+ViridianCity_EventScript_YoungsterDeclineExplanation:: @ 8165ABA
+	msgbox ViridianCity_Text_OhOkayThen
 	release
 	end
 
-ViridianCity_EventScript_165AC4:: @ 8165AC4
+ViridianCity_EventScript_Woman:: @ 8165AC4
 	lock
 	faceplayer
 	compare VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 0
-	goto_if_eq EventScript_165ADB
-	msgbox gUnknown_817DC99
+	goto_if_eq ViridianCity_EventScript_WomanRoadBlocked
+	msgbox ViridianCity_Text_GoShoppingInPewterOccasionally
 	release
 	end
 
-EventScript_165ADB:: @ 8165ADB
-	msgbox gUnknown_817DC4E
+ViridianCity_EventScript_WomanRoadBlocked:: @ 8165ADB
+	msgbox ViridianCity_Text_GrandpaHasntHadCoffeeYet
 	closemessage
 	applymovement 5, Movement_FaceOriginalDirection
 	waitmovement 0
@@ -194,44 +199,44 @@ ViridianCity_EventScript_DreamEaterTutor:: @ 8165AF0
 	goto EventScript_DreamEaterTutor
 	end
 
-ViridianCity_EventScript_165AF6:: @ 8165AF6
+ViridianCity_EventScript_RoadBlocked:: @ 8165AF6
 	lockall
 	textcolor 0
-	msgbox gUnknown_817DD03
+	msgbox ViridianCity_Text_ThisIsPrivateProperty
 	closemessage
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_165B0E
+	applymovement OBJ_EVENT_ID_PLAYER, ViridianCity_Movement_WalkDown
 	waitmovement 0
 	releaseall
 	end
 
-Movement_165B0E:: @ 8165B0E
+ViridianCity_Movement_WalkDown:: @ 8165B0E
 	walk_down
 	step_end
 
-ViridianCity_EventScript_165B10:: @ 8165B10
+ViridianCity_EventScript_TutorialTriggerLeft:: @ 8165B10
 	lockall
 	textcolor 0
-	applymovement 4, Movement_WalkInPlaceFastestLeft
+	applymovement LOCALID_TUTORIAL_MAN, Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	call EventScript_165B4C
+	call ViridianCity_EventScript_DoTutorialBattle
 	release
 	end
 
-ViridianCity_EventScript_165B2E:: @ 8165B2E
+ViridianCity_EventScript_TutorialTriggerRight:: @ 8165B2E
 	lockall
 	textcolor 0
-	applymovement 4, Movement_WalkInPlaceFastestRight
+	applymovement LOCALID_TUTORIAL_MAN, Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft
 	waitmovement 0
-	call EventScript_165B4C
+	call ViridianCity_EventScript_DoTutorialBattle
 	release
 	end
 
-EventScript_165B4C:: @ 8165B4C
-	msgbox gUnknown_817DD4E
+ViridianCity_EventScript_DoTutorialBattle:: @ 8165B4C
+	msgbox ViridianCity_Text_ShowYouHowToCatchMons
 	closemessage
 	goto_if_questlog EventScript_ReleaseEnd
 	special sub_8112364
@@ -239,8 +244,8 @@ EventScript_165B4C:: @ 8165B4C
 	waitstate
 	lock
 	faceplayer
-	msgbox gUnknown_817DE9B
+	msgbox ViridianCity_Text_ThatWasEducationalTakeThis
 	setvar VAR_MAP_SCENE_VIRIDIAN_CITY_OLD_MAN, 2
 	giveitem ITEM_TEACHY_TV
-	msgbox gUnknown_817DEEB
+	msgbox ViridianCity_Text_WatchThatToLearnBasics
 	return
diff --git a/data/maps/ViridianCity/text.inc b/data/maps/ViridianCity/text.inc
index 37b1d3c55..d029c942d 100644
--- a/data/maps/ViridianCity/text.inc
+++ b/data/maps/ViridianCity/text.inc
@@ -1,47 +1,47 @@
-gUnknown_817DABB:: @ 817DABB
+ViridianCity_Text_CanCarryMonsAnywhere:: @ 817DABB
     .string "Those POKé BALLS at your waist!\n"
     .string "You have POKéMON, don't you?\p"
     .string "It's great that you can carry and\n"
     .string "use POKéMON anytime, anywhere.$"
 
-gUnknown_817DB39:: @ 817DB39
+ViridianCity_Text_GymClosedWonderWhoLeaderIs:: @ 817DB39
     .string "This POKéMON GYM is always closed.\p"
     .string "I wonder who the LEADER is?$"
 
-gUnknown_817DB78:: @ 817DB78
+ViridianCity_Text_ViridiansGymLeaderReturned:: @ 817DB78
     .string "VIRIDIAN GYM's LEADER returned!$"
 
-gUnknown_817DB98:: @ 817DB98
+ViridianCity_Text_WantToKnowAboutCaterpillarMons:: @ 817DB98
     .string "You want to know about the two\n"
     .string "kinds of caterpillar POKéMON?$"
 
-gUnknown_817DBD5:: @ 817DBD5
+ViridianCity_Text_OhOkayThen:: @ 817DBD5
     .string "Oh, okay then!$"
 
-gUnknown_817DBE4:: @ 817DBE4
+ViridianCity_Text_ExplainCaterpieWeedle:: @ 817DBE4
     .string "CATERPIE has no poison,\n"
     .string "but WEEDLE does.\p"
     .string "Watch that your POKéMON aren't\n"
     .string "stabbed by WEEDLE's POISON STING.$"
 
-gUnknown_817DC4E:: @ 817DC4E
+ViridianCity_Text_GrandpaHasntHadCoffeeYet:: @ 817DC4E
     .string "Oh, Grandpa!\n"
     .string "Don't be so mean!\p"
     .string "I'm so sorry.\n"
     .string "He hasn't had his coffee yet.$"
 
-gUnknown_817DC99:: @ 817DC99
+ViridianCity_Text_GoShoppingInPewterOccasionally:: @ 817DC99
     .string "I go shopping in PEWTER CITY\n"
     .string "occasionally.\p"
     .string "I have to take the winding trail in\n"
     .string "VIRIDIAN FOREST when I go.$"
 
-gUnknown_817DD03:: @ 817DD03
+ViridianCity_Text_ThisIsPrivateProperty:: @ 817DD03
     .string "I absolutely forbid you from\n"
     .string "going through here!\p"
     .string "This is private property!$"
 
-gUnknown_817DD4E:: @ 817DD4E
+ViridianCity_Text_ShowYouHowToCatchMons:: @ 817DD4E
     .string "Well, now, I've had my coffee, and\n"
     .string "that's what I need to get going!\p"
     .string "Hm?\n"
@@ -58,18 +58,18 @@ gUnknown_817DD4E:: @ 817DD4E
     .string "I suppose I had better show you\n"
     .string "then!$"
 
-gUnknown_817DE9B:: @ 817DE9B
+ViridianCity_Text_ThatWasEducationalTakeThis:: @ 817DE9B
     .string "There! Now tell me, that was\n"
     .string "educational, was it not?\p"
     .string "And here, take this, too.$"
 
-gUnknown_817DEEB:: @ 817DEEB
+ViridianCity_Text_WatchThatToLearnBasics:: @ 817DEEB
     .string "If there's something you don't\n"
     .string "understand, watch that.\p"
     .string "It will teach you about the basics\n"
     .string "of being a POKéMON TRAINER.$"
 
-gUnknown_817DF61:: @ 817DF61
+ViridianCity_Text_WeakenMonsFirstToCatch:: @ 817DF61
     .string "Well, now, I've had my coffee, and\n"
     .string "that's what I need to get going!\p"
     .string "But I made it too strong.\n"
@@ -79,7 +79,7 @@ gUnknown_817DF61:: @ 817DF61
     .string "At first, focus on weakening the\n"
     .string "POKéMON before trying to catch it.$"
 
-gUnknown_817E046:: @ 817E046
+ViridianCity_Text_HowsTeachyTVHelping:: @ 817E046
     .string "Well, now, I've had my coffee, and\n"
     .string "that's what I need to get going!\p"
     .string "But I made it too strong.\n"
@@ -87,39 +87,39 @@ gUnknown_817E046:: @ 817E046
     .string "Incidentally, is my old TEACHY TV\n"
     .string "helping you?$"
 
-gUnknown_817E0EA:: @ 817E0EA
+ViridianCity_Text_MyGrandsonOnTheShow:: @ 817E0EA
     .string "Wahaha!\n"
     .string "It's my grandson on the show!\p"
     .string "Since he's the one doing the\n"
     .string "teaching, you're bound to learn.$"
 
-gUnknown_817E14E:: @ 817E14E
+ViridianCity_Text_TooBusyForTeachyTV:: @ 817E14E
     .string "Hm… You're too busy to not even\n"
     .string "have the time for TEACHY TV…\p"
     .string "Time is money, and neither should\n"
     .string "be ill spent…$"
 
-gUnknown_817E1BB:: @ 817E1BB
+ViridianCity_Text_CitySign:: @ 817E1BB
     .string "VIRIDIAN CITY \n"
     .string "The Eternally Green Paradise$"
 
-gUnknown_817E1E7:: @ 817E1E7
+ViridianCity_Text_CatchMonsForEasierBattles:: @ 817E1E7
     .string "TRAINER TIPS\p"
     .string "Catch POKéMON and expand your\n"
     .string "collection.\p"
     .string "The more you have, the easier it\n"
     .string "is to battle.$"
 
-gUnknown_817E24D:: @ 817E24D
+ViridianCity_Text_MovesLimitedByPP:: @ 817E24D
     .string "TRAINER TIPS\p"
     .string "The battle moves of POKéMON are\n"
     .string "limited by their POWER POINTS, PP.\p"
     .string "To replenish PP, rest your tired\n"
     .string "POKéMON at a POKéMON CENTER.$"
 
-gUnknown_817E2DB:: @ 817E2DB
+ViridianCity_Text_GymSign:: @ 817E2DB
     .string "VIRIDIAN CITY POKéMON GYM$"
 
-gUnknown_817E2F5:: @ 817E2F5
+ViridianCity_Text_GymDoorsAreLocked:: @ 817E2F5
     .string "VIRIDIAN GYM's doors are locked…$"
 
diff --git a/data/maps/ViridianCity_Gym/map.json b/data/maps/ViridianCity_Gym/map.json
index 0297a31b1..b4c9a93e4 100644
--- a/data/maps/ViridianCity_Gym/map.json
+++ b/data/maps/ViridianCity_Gym/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "ViridianCity_Gym_EventScript_169FD6",
+      "script": "ViridianCity_Gym_EventScript_Takashi",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "ViridianCity_Gym_EventScript_16A004",
+      "script": "ViridianCity_Gym_EventScript_Yuji",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "ViridianCity_Gym_EventScript_169FA8",
+      "script": "ViridianCity_Gym_EventScript_Atsushi",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "ViridianCity_Gym_EventScript_169F7A",
+      "script": "ViridianCity_Gym_EventScript_Jason",
       "flag": "0"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "ViridianCity_Gym_EventScript_169F91",
+      "script": "ViridianCity_Gym_EventScript_Cole",
       "flag": "0"
     },
     {
@@ -88,7 +88,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "ViridianCity_Gym_EventScript_169FBF",
+      "script": "ViridianCity_Gym_EventScript_Kiyo",
       "flag": "0"
     },
     {
@@ -101,7 +101,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "ViridianCity_Gym_EventScript_169FED",
+      "script": "ViridianCity_Gym_EventScript_Samuel",
       "flag": "0"
     },
     {
@@ -114,7 +114,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "ViridianCity_Gym_EventScript_169ECA",
+      "script": "ViridianCity_Gym_EventScript_Giovanni",
       "flag": "FLAG_HIDE_VIRIDIAN_GIOVANNI"
     },
     {
@@ -127,7 +127,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "ViridianCity_Gym_EventScript_16A01B",
+      "script": "ViridianCity_Gym_EventScript_Warren",
       "flag": "0"
     },
     {
@@ -140,7 +140,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "ViridianCity_Gym_EventScript_16A032",
+      "script": "ViridianCity_Gym_EventScript_GymGuy",
       "flag": "0"
     }
   ],
@@ -174,14 +174,14 @@
       "x": 15,
       "y": 20,
       "elevation": 0,
-      "script": "ViridianCity_Gym_EventScript_16A05E"
+      "script": "ViridianCity_Gym_EventScript_GymStatue"
     },
     {
       "type": "bg_event_type_0",
       "x": 19,
       "y": 20,
       "elevation": 0,
-      "script": "ViridianCity_Gym_EventScript_16A05E"
+      "script": "ViridianCity_Gym_EventScript_GymStatue"
     },
     {
       "type": "hidden_item",
diff --git a/data/maps/ViridianCity_Gym/scripts.inc b/data/maps/ViridianCity_Gym/scripts.inc
index 0579e9e32..c14dceddf 100644
--- a/data/maps/ViridianCity_Gym/scripts.inc
+++ b/data/maps/ViridianCity_Gym/scripts.inc
@@ -1,11 +1,11 @@
 ViridianCity_Gym_MapScripts:: @ 8169EC9
 	.byte 0
 
-ViridianCity_Gym_EventScript_169ECA:: @ 8169ECA
+ViridianCity_Gym_EventScript_Giovanni:: @ 8169ECA
 	famechecker FAMECHECKER_GIOVANNI, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
-	trainerbattle_single TRAINER_LEADER_GIOVANNI, Text_18F352, Text_18F43F, EventScript_169F04, NO_MUSIC
-	goto_if_unset FLAG_GOT_TM26_FROM_GIOVANNI, EventScript_169F2F
-	msgbox gUnknown_818F4A2
+	trainerbattle_single TRAINER_LEADER_GIOVANNI, ViridianCity_Gym_Text_GiovanniIntro, ViridianCity_Gym_Text_GiovanniDefeat, ViridianCity_Gym_EventScript_DefeatedGiovanni, NO_MUSIC
+	goto_if_unset FLAG_GOT_TM26_FROM_GIOVANNI, ViridianCity_Gym_EventScript_GiveTM26
+	msgbox ViridianCity_Gym_Text_GiovanniPostBattle
 	closemessage
 	fadescreen FADE_TO_BLACK
 	removeobject 8
@@ -13,94 +13,94 @@ ViridianCity_Gym_EventScript_169ECA:: @ 8169ECA
 	release
 	end
 
-EventScript_169F04:: @ 8169F04
+ViridianCity_Gym_EventScript_DefeatedGiovanni:: @ 8169F04
 	famechecker FAMECHECKER_GIOVANNI, 3
 	setflag FLAG_HIDE_MISC_KANTO_ROCKETS
 	setflag FLAG_DEFEATED_LEADER_GIOVANNI
 	setflag FLAG_BADGE08_GET
 	setvar VAR_MAP_SCENE_ROUTE22, 3
 	set_gym_trainers 8
-	goto EventScript_169F2F
+	goto ViridianCity_Gym_EventScript_GiveTM26
 	end
 
-EventScript_169F2F:: @ 8169F2F
-	msgbox gUnknown_818F586
+ViridianCity_Gym_EventScript_GiveTM26:: @ 8169F2F
+	msgbox ViridianCity_Gym_Text_ExplainEarthBadgeTakeThis
 	checkitemspace ITEM_TM26, 1
 	compare VAR_RESULT, FALSE
-	goto_if_eq EventScript_169F70
-	giveitem_msg gUnknown_818F675, ITEM_TM26
+	goto_if_eq ViridianCity_Gym_EventScript_NoRoomForTM26
+	giveitem_msg ViridianCity_Gym_Text_ReceivedTM26FromGiovanni, ITEM_TM26
 	setflag FLAG_GOT_TM26_FROM_GIOVANNI
-	msgbox gUnknown_818F695
+	msgbox ViridianCity_Gym_Text_ExplainTM26
 	release
 	end
 
-EventScript_169F70:: @ 8169F70
-	msgbox gUnknown_818F71B
+ViridianCity_Gym_EventScript_NoRoomForTM26:: @ 8169F70
+	msgbox ViridianCity_Gym_Text_YouDoNotHaveSpace
 	release
 	end
 
-ViridianCity_Gym_EventScript_169F7A:: @ 8169F7A
-	trainerbattle_single TRAINER_TAMER_JASON, Text_18F7F3, Text_18F824
-	msgbox gUnknown_818F840, MSGBOX_AUTOCLOSE
+ViridianCity_Gym_EventScript_Jason:: @ 8169F7A
+	trainerbattle_single TRAINER_TAMER_JASON, ViridianCity_Gym_Text_JasonIntro, ViridianCity_Gym_Text_JasonDefeat
+	msgbox ViridianCity_Gym_Text_JasonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-ViridianCity_Gym_EventScript_169F91:: @ 8169F91
-	trainerbattle_single TRAINER_TAMER_COLE, Text_18F98A, Text_18F9BB
-	msgbox gUnknown_818F9CC, MSGBOX_AUTOCLOSE
+ViridianCity_Gym_EventScript_Cole:: @ 8169F91
+	trainerbattle_single TRAINER_TAMER_COLE, ViridianCity_Gym_Text_ColeIntro, ViridianCity_Gym_Text_ColeDefeat
+	msgbox ViridianCity_Gym_Text_ColePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-ViridianCity_Gym_EventScript_169FA8:: @ 8169FA8
-	trainerbattle_single TRAINER_BLACK_BELT_ATSUSHI, Text_18F7AD, Text_18F7D6
-	msgbox gUnknown_818F7DD, MSGBOX_AUTOCLOSE
+ViridianCity_Gym_EventScript_Atsushi:: @ 8169FA8
+	trainerbattle_single TRAINER_BLACK_BELT_ATSUSHI, ViridianCity_Gym_Text_AtsushiIntro, ViridianCity_Gym_Text_AtsushiDefeat
+	msgbox ViridianCity_Gym_Text_AtsushiPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-ViridianCity_Gym_EventScript_169FBF:: @ 8169FBF
-	trainerbattle_single TRAINER_BLACK_BELT_KIYO, Text_18F86C, Text_18F899
-	msgbox gUnknown_818F8A0, MSGBOX_AUTOCLOSE
+ViridianCity_Gym_EventScript_Kiyo:: @ 8169FBF
+	trainerbattle_single TRAINER_BLACK_BELT_KIYO, ViridianCity_Gym_Text_KiyoIntro, ViridianCity_Gym_Text_KiyoDefeat
+	msgbox ViridianCity_Gym_Text_KiyoPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-ViridianCity_Gym_EventScript_169FD6:: @ 8169FD6
-	trainerbattle_single TRAINER_BLACK_BELT_TAKASHI, Text_18F92C, Text_18F95A
-	msgbox gUnknown_818F960, MSGBOX_AUTOCLOSE
+ViridianCity_Gym_EventScript_Takashi:: @ 8169FD6
+	trainerbattle_single TRAINER_BLACK_BELT_TAKASHI, ViridianCity_Gym_Text_TakashiIntro, ViridianCity_Gym_Text_TakashiDefeat
+	msgbox ViridianCity_Gym_Text_TakashiPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-ViridianCity_Gym_EventScript_169FED:: @ 8169FED
-	trainerbattle_single TRAINER_COOLTRAINER_SAMUEL, Text_18F9E7, Text_18FA2D
-	msgbox gUnknown_818FA3B, MSGBOX_AUTOCLOSE
+ViridianCity_Gym_EventScript_Samuel:: @ 8169FED
+	trainerbattle_single TRAINER_COOLTRAINER_SAMUEL, ViridianCity_Gym_Text_SamuelIntro, ViridianCity_Gym_Text_SamuelDefeat
+	msgbox ViridianCity_Gym_Text_SamuelPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-ViridianCity_Gym_EventScript_16A004:: @ 816A004
-	trainerbattle_single TRAINER_COOLTRAINER_YUJI, Text_18F73B, Text_18F769
-	msgbox gUnknown_818F77B, MSGBOX_AUTOCLOSE
+ViridianCity_Gym_EventScript_Yuji:: @ 816A004
+	trainerbattle_single TRAINER_COOLTRAINER_YUJI, ViridianCity_Gym_Text_YujiIntro, ViridianCity_Gym_Text_YujiDefeat
+	msgbox ViridianCity_Gym_Text_YujiPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-ViridianCity_Gym_EventScript_16A01B:: @ 816A01B
-	trainerbattle_single TRAINER_COOLTRAINER_WARREN, Text_18F8CB, Text_18F8EE
-	msgbox gUnknown_818F8FE, MSGBOX_AUTOCLOSE
+ViridianCity_Gym_EventScript_Warren:: @ 816A01B
+	trainerbattle_single TRAINER_COOLTRAINER_WARREN, ViridianCity_Gym_Text_WarrenIntro, ViridianCity_Gym_Text_WarrenDefeat
+	msgbox ViridianCity_Gym_Text_WarrenPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-ViridianCity_Gym_EventScript_16A032:: @ 816A032
+ViridianCity_Gym_EventScript_GymGuy:: @ 816A032
 	lock
 	faceplayer
-	goto_if_set FLAG_DEFEATED_LEADER_GIOVANNI, EventScript_16A047
-	msgbox gUnknown_818FA81
+	goto_if_set FLAG_DEFEATED_LEADER_GIOVANNI, ViridianCity_Gym_EventScript_GymGuyPostVictory
+	msgbox ViridianCity_Gym_Text_GymGuyAdvice
 	release
 	end
 
-EventScript_16A047:: @ 816A047
+ViridianCity_Gym_EventScript_GymGuyPostVictory:: @ 816A047
 	famechecker FAMECHECKER_GIOVANNI, 4
-	msgbox gUnknown_818FB56
+	msgbox ViridianCity_Gym_Text_GymGuyPostVictory
 	release
 	end
 
-ViridianCity_Gym_EventScript_16A05E:: @ 816A05E
+ViridianCity_Gym_EventScript_GymStatue:: @ 816A05E
 	lockall
-	goto_if_set FLAG_BADGE08_GET, EventScript_16A072
-	msgbox gUnknown_818FB8D
+	goto_if_set FLAG_BADGE08_GET, ViridianCity_Gym_EventScript_GymStatuePostVictory
+	msgbox ViridianCity_Gym_Text_GymStatue
 	releaseall
 	end
 
-EventScript_16A072:: @ 816A072
-	msgbox gUnknown_818FBC1
+ViridianCity_Gym_EventScript_GymStatuePostVictory:: @ 816A072
+	msgbox ViridianCity_Gym_Text_GymStatuePlayerWon
 	releaseall
 	end
diff --git a/data/maps/ViridianCity_Gym/text.inc b/data/maps/ViridianCity_Gym/text.inc
index 7372bd6d3..38561c011 100644
--- a/data/maps/ViridianCity_Gym/text.inc
+++ b/data/maps/ViridianCity_Gym/text.inc
@@ -1,4 +1,4 @@
-Text_18F352:: @ 818F352
+ViridianCity_Gym_Text_GiovanniIntro:: @ 818F352
     .string "Fwahahaha!\n"
     .string "Welcome to my hideout!\p"
     .string "It shall be so until I can restore\n"
@@ -9,14 +9,14 @@ Text_18F352:: @ 818F352
     .string "Once more, you shall face\n"
     .string "GIOVANNI, the greatest TRAINER!{PLAY_BGM}{MUS_ROCKET}$"
 
-Text_18F43F:: @ 818F43F
+ViridianCity_Gym_Text_GiovanniDefeat:: @ 818F43F
     .string "Ha!\n"
     .string "That was a truly intense fight.\l"
     .string "You have won!\p"
     .string "As proof, here is the EARTHBADGE!\n"
     .string "{PAUSE_MUSIC}{PLAY_BGM}{MUS_ME_BACHI}{PAUSE 0xFE}{PAUSE 0x56}{RESUME_MUSIC}$"
 
-gUnknown_818F4A2:: @ 818F4A2
+ViridianCity_Gym_Text_GiovanniPostBattle:: @ 818F4A2
     .string "Having lost in this fashion, \n"
     .string "I can't face my followers.\l"
     .string "I have betrayed their trust.\p"
@@ -27,7 +27,7 @@ gUnknown_818F4A2:: @ 818F4A2
     .string "Let us meet again someday!\n"
     .string "Farewell!$"
 
-gUnknown_818F586:: @ 818F586
+ViridianCity_Gym_Text_ExplainEarthBadgeTakeThis:: @ 818F586
     .string "The EARTHBADGE makes POKéMON of\n"
     .string "any level obey without question.\p"
     .string "It is evidence of your mastery as\n"
@@ -38,111 +38,111 @@ gUnknown_818F586:: @ 818F586
     .string "Consider it a gift for your POKéMON\n"
     .string "LEAGUE challenge.$"
 
-gUnknown_818F675:: @ 818F675
+ViridianCity_Gym_Text_ReceivedTM26FromGiovanni:: @ 818F675
     .string "{PLAYER} received TM26\n"
     .string "from GIOVANNI.$"
 
-gUnknown_818F695:: @ 818F695
+ViridianCity_Gym_Text_ExplainTM26:: @ 818F695
     .string "TM26 contains EARTHQUAKE.\p"
     .string "It is a powerful attack that causes\n"
     .string "a massive tremor.\p"
     .string "I made it when I ran the GYM here,\n"
     .string "far too long ago… $"
 
-gUnknown_818F71B:: @ 818F71B
+ViridianCity_Gym_Text_YouDoNotHaveSpace:: @ 818F71B
     .string "You do not have space for this!$"
 
-Text_18F73B:: @ 818F73B
+ViridianCity_Gym_Text_YujiIntro:: @ 818F73B
     .string "Heh!\n"
     .string "You must be running out of steam\l"
     .string "by now!$"
 
-Text_18F769:: @ 818F769
+ViridianCity_Gym_Text_YujiDefeat:: @ 818F769
     .string "I ran out of gas!$"
 
-gUnknown_818F77B:: @ 818F77B
+ViridianCity_Gym_Text_YujiPostBattle:: @ 818F77B
     .string "You'll need power to keep up with\n"
     .string "our GYM LEADER.$"
 
-Text_18F7AD:: @ 818F7AD
+ViridianCity_Gym_Text_AtsushiIntro:: @ 818F7AD
     .string "Rrrroar!\n"
     .string "I'm working myself into a rage!$"
 
-Text_18F7D6:: @ 818F7D6
+ViridianCity_Gym_Text_AtsushiDefeat:: @ 818F7D6
     .string "Wargh!$"
 
-gUnknown_818F7DD:: @ 818F7DD
+ViridianCity_Gym_Text_AtsushiPostBattle:: @ 818F7DD
     .string "I'm still not worthy!$"
 
-Text_18F7F3:: @ 818F7F3
+ViridianCity_Gym_Text_JasonIntro:: @ 818F7F3
     .string "POKéMON and I, we make wonderful\n"
     .string "music together!$"
 
-Text_18F824:: @ 818F824
+ViridianCity_Gym_Text_JasonDefeat:: @ 818F824
     .string "You are in perfect harmony!$"
 
-gUnknown_818F840:: @ 818F840
+ViridianCity_Gym_Text_JasonPostBattle:: @ 818F840
     .string "Do you know the identity of our\n"
     .string "GYM LEADER?$"
 
-Text_18F86C:: @ 818F86C
+ViridianCity_Gym_Text_KiyoIntro:: @ 818F86C
     .string "Karate is the ultimate form of\n"
     .string "martial arts!$"
 
-Text_18F899:: @ 818F899
+ViridianCity_Gym_Text_KiyoDefeat:: @ 818F899
     .string "Aiyah!$"
 
-gUnknown_818F8A0:: @ 818F8A0
+ViridianCity_Gym_Text_KiyoPostBattle:: @ 818F8A0
     .string "If my POKéMON were as good at\n"
     .string "karate as I…$"
 
-Text_18F8CB:: @ 818F8CB
+ViridianCity_Gym_Text_WarrenIntro:: @ 818F8CB
     .string "The truly talented win with style.$"
 
-Text_18F8EE:: @ 818F8EE
+ViridianCity_Gym_Text_WarrenDefeat:: @ 818F8EE
     .string "I lost my grip!$"
 
-gUnknown_818F8FE:: @ 818F8FE
+ViridianCity_Gym_Text_WarrenPostBattle:: @ 818F8FE
     .string "The LEADER will scold me for\n"
     .string "losing this way…$"
 
-Text_18F92C:: @ 818F92C
+ViridianCity_Gym_Text_TakashiIntro:: @ 818F92C
     .string "I'm the KARATE KING!\n"
     .string "Your fate rests with me!$"
 
-Text_18F95A:: @ 818F95A
+ViridianCity_Gym_Text_TakashiDefeat:: @ 818F95A
     .string "Ayah!$"
 
-gUnknown_818F960:: @ 818F960
+ViridianCity_Gym_Text_TakashiPostBattle:: @ 818F960
     .string "The POKéMON LEAGUE?\n"
     .string "You? Don't get cocky!$"
 
-Text_18F98A:: @ 818F98A
+ViridianCity_Gym_Text_ColeIntro:: @ 818F98A
     .string "Your POKéMON will cower at the\n"
     .string "crack of my whip!$"
 
-Text_18F9BB:: @ 818F9BB
+ViridianCity_Gym_Text_ColeDefeat:: @ 818F9BB
     .string "Yowch!\n"
     .string "Whiplash!$"
 
-gUnknown_818F9CC:: @ 818F9CC
+ViridianCity_Gym_Text_ColePostBattle:: @ 818F9CC
     .string "Wait!\n"
     .string "I was just careless!$"
 
-Text_18F9E7:: @ 818F9E7
+ViridianCity_Gym_Text_SamuelIntro:: @ 818F9E7
     .string "VIRIDIAN GYM was closed for a\n"
     .string "long time.\p"
     .string "But now, our LEADER is back!$"
 
-Text_18FA2D:: @ 818FA2D
+ViridianCity_Gym_Text_SamuelDefeat:: @ 818FA2D
     .string "I was beaten?$"
 
-gUnknown_818FA3B:: @ 818FA3B
+ViridianCity_Gym_Text_SamuelPostBattle:: @ 818FA3B
     .string "You can go on to the POKéMON\n"
     .string "LEAGUE only by defeating our GYM\l"
     .string "LEADER!$"
 
-gUnknown_818FA81:: @ 818FA81
+ViridianCity_Gym_Text_GymGuyAdvice:: @ 818FA81
     .string "Yo!\n"
     .string "Champ in the making!\p"
     .string "Even I don't know the VIRIDIAN\n"
@@ -153,17 +153,17 @@ gUnknown_818FA81:: @ 818FA81
     .string "Also, I heard that the TRAINERS\n"
     .string "here like GROUND-type POKéMON.$"
 
-gUnknown_818FB56:: @ 818FB56
+ViridianCity_Gym_Text_GymGuyPostVictory:: @ 818FB56
     .string "Blow me away! GIOVANNI was the\n"
     .string "GYM LEADER of VIRIDIAN?$"
 
-gUnknown_818FB8D:: @ 818FB8D
+ViridianCity_Gym_Text_GymStatue:: @ 818FB8D
     .string "VIRIDIAN POKéMON GYM\n"
     .string "LEADER: ?\p"
     .string "WINNING TRAINERS:\n"
     .string "{RIVAL}$"
 
-gUnknown_818FBC1:: @ 818FBC1
+ViridianCity_Gym_Text_GymStatuePlayerWon:: @ 818FBC1
     .string "VIRIDIAN POKéMON GYM\n"
     .string "LEADER: GIOVANNI\p"
     .string "WINNING TRAINERS:\n"
diff --git a/data/maps/ViridianCity_House1/map.json b/data/maps/ViridianCity_House1/map.json
index 1a960169e..167069bc6 100644
--- a/data/maps/ViridianCity_House1/map.json
+++ b/data/maps/ViridianCity_House1/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "ViridianCity_House1_EventScript_169E9B",
+      "script": "ViridianCity_House1_EventScript_BaldingMan",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 2,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "ViridianCity_House1_EventScript_169EA4",
+      "script": "ViridianCity_House1_EventScript_LittleGirl",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "ViridianCity_House1_EventScript_169EAD",
+      "script": "ViridianCity_House1_EventScript_Speary",
       "flag": "0"
     }
   ],
@@ -83,7 +83,7 @@
       "x": 7,
       "y": 1,
       "elevation": 0,
-      "script": "ViridianCity_House1_EventScript_169EC0"
+      "script": "ViridianCity_House1_EventScript_NicknameSign"
     }
   ]
 }
diff --git a/data/maps/ViridianCity_House1/scripts.inc b/data/maps/ViridianCity_House1/scripts.inc
index 446035efe..0af4621cf 100644
--- a/data/maps/ViridianCity_House1/scripts.inc
+++ b/data/maps/ViridianCity_House1/scripts.inc
@@ -1,24 +1,24 @@
 ViridianCity_House1_MapScripts:: @ 8169E9A
 	.byte 0
 
-ViridianCity_House1_EventScript_169E9B:: @ 8169E9B
-	msgbox gUnknown_818F292, MSGBOX_NPC
+ViridianCity_House1_EventScript_BaldingMan:: @ 8169E9B
+	msgbox ViridianCity_House1_Text_NicknamingIsFun, MSGBOX_NPC
 	end
 
-ViridianCity_House1_EventScript_169EA4:: @ 8169EA4
-	msgbox gUnknown_818F30F, MSGBOX_NPC
+ViridianCity_House1_EventScript_LittleGirl:: @ 8169EA4
+	msgbox ViridianCity_House1_Text_MyDaddyLovesMonsToo, MSGBOX_NPC
 	end
 
-ViridianCity_House1_EventScript_169EAD:: @ 8169EAD
+ViridianCity_House1_EventScript_Speary:: @ 8169EAD
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_SPEAROW, 0
-	msgbox gUnknown_818F32C
+	msgbox ViridianCity_House1_Text_Speary
 	waitmoncry
 	release
 	end
 
-ViridianCity_House1_EventScript_169EC0:: @ 8169EC0
-	msgbox gUnknown_818F33D, MSGBOX_SIGN
+ViridianCity_House1_EventScript_NicknameSign:: @ 8169EC0
+	msgbox ViridianCity_House1_Text_SpearowNameSpeary, MSGBOX_SIGN
 	end
diff --git a/data/maps/ViridianCity_House1/text.inc b/data/maps/ViridianCity_House1/text.inc
index c1ec37238..15b066efa 100644
--- a/data/maps/ViridianCity_House1/text.inc
+++ b/data/maps/ViridianCity_House1/text.inc
@@ -1,16 +1,16 @@
-gUnknown_818F292:: @ 818F292
+ViridianCity_House1_Text_NicknamingIsFun:: @ 818F292
     .string "Coming up with nicknames is fun,\n"
     .string "but it's not so easy to do.\p"
     .string "Clever names are nice, but simple\n"
     .string "names are easier to remember.$"
 
-gUnknown_818F30F:: @ 818F30F
+ViridianCity_House1_Text_MyDaddyLovesMonsToo:: @ 818F30F
     .string "My daddy loves POKéMON, too.$"
 
-gUnknown_818F32C:: @ 818F32C
+ViridianCity_House1_Text_Speary:: @ 818F32C
     .string "SPEARY: Tetweet!$"
 
-gUnknown_818F33D:: @ 818F33D
+ViridianCity_House1_Text_SpearowNameSpeary:: @ 818F33D
     .string "SPEAROW\n"
     .string "Name: SPEARY$"
 
diff --git a/data/maps/ViridianCity_House2/map.json b/data/maps/ViridianCity_House2/map.json
index 5190a5d28..dc80606ec 100644
--- a/data/maps/ViridianCity_House2/map.json
+++ b/data/maps/ViridianCity_House2/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "ViridianCity_House2_EventScript_16A094",
+      "script": "ViridianCity_House2_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "ViridianCity_House2_EventScript_16A07D",
+      "script": "ViridianCity_House2_EventScript_Lass",
       "flag": "0"
     }
   ],
@@ -70,35 +70,35 @@
       "x": 4,
       "y": 4,
       "elevation": 0,
-      "script": "ViridianCity_House2_EventScript_16A0AB"
+      "script": "ViridianCity_House2_EventScript_Notebook"
     },
     {
       "type": "bg_event_type_0",
       "x": 5,
       "y": 1,
       "elevation": 0,
-      "script": "ViridianCity_House2_EventScript_16A11D"
+      "script": "ViridianCity_House2_EventScript_Blackboard"
     },
     {
       "type": "bg_event_type_0",
       "x": 4,
       "y": 1,
       "elevation": 0,
-      "script": "ViridianCity_House2_EventScript_16A11D"
+      "script": "ViridianCity_House2_EventScript_Blackboard"
     },
     {
       "type": "bg_event_type_1",
       "x": 9,
       "y": 2,
       "elevation": 0,
-      "script": "ViridianCity_House2_EventScript_1ACD65"
+      "script": "ViridianCity_House2_EventScript_PokemonJournal"
     },
     {
       "type": "bg_event_type_1",
       "x": 8,
       "y": 2,
       "elevation": 0,
-      "script": "ViridianCity_House2_EventScript_1ACD65"
+      "script": "ViridianCity_House2_EventScript_PokemonJournal"
     }
   ]
 }
diff --git a/data/maps/ViridianCity_House2/scripts.inc b/data/maps/ViridianCity_House2/scripts.inc
index 6a0845622..0c08b447d 100644
--- a/data/maps/ViridianCity_House2/scripts.inc
+++ b/data/maps/ViridianCity_House2/scripts.inc
@@ -1,97 +1,97 @@
 ViridianCity_House2_MapScripts:: @ 816A07C
 	.byte 0
 
-ViridianCity_House2_EventScript_16A07D:: @ 816A07D
+ViridianCity_House2_EventScript_Lass:: @ 816A07D
 	lock
 	faceplayer
-	msgbox gUnknown_818FC00
+	msgbox ViridianCity_House2_Text_TryingToMemorizeNotes
 	closemessage
 	applymovement 2, Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	release
 	end
 
-ViridianCity_House2_EventScript_16A094:: @ 816A094
+ViridianCity_House2_EventScript_Woman:: @ 816A094
 	lock
 	faceplayer
-	msgbox gUnknown_818FC2B
+	msgbox ViridianCity_House2_Text_ReadBlackboardCarefully
 	closemessage
 	applymovement 1, Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-ViridianCity_House2_EventScript_16A0AB:: @ 816A0AB
+ViridianCity_House2_EventScript_Notebook:: @ 816A0AB
 	lockall
-	msgbox gUnknown_818FC65
-	msgbox gUnknown_818FF19, MSGBOX_YESNO
+	msgbox ViridianCity_House2_Text_NotebookFirstPage
+	msgbox ViridianCity_House2_Text_TurnThePage, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_16A11B
-	msgbox gUnknown_818FD23
-	msgbox gUnknown_818FF19, MSGBOX_YESNO
+	goto_if_eq ViridianCity_House2_EventScript_StopReadingNotebook
+	msgbox ViridianCity_House2_Text_NotebookSecondPage
+	msgbox ViridianCity_House2_Text_TurnThePage, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_16A11B
-	msgbox gUnknown_818FDA8
-	msgbox gUnknown_818FF19, MSGBOX_YESNO
+	goto_if_eq ViridianCity_House2_EventScript_StopReadingNotebook
+	msgbox ViridianCity_House2_Text_NotebookThirdPage
+	msgbox ViridianCity_House2_Text_TurnThePage, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_16A11B
-	msgbox gUnknown_818FE5C
+	goto_if_eq ViridianCity_House2_EventScript_StopReadingNotebook
+	msgbox ViridianCity_House2_Text_NotebookFourthPage
 	applymovement 2, Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	textcolor 1
-	msgbox gUnknown_818FF28
+	msgbox ViridianCity_House2_Text_HeyDontLookAtMyNotes
 	releaseall
 	end
 
-EventScript_16A11B:: @ 816A11B
+ViridianCity_House2_EventScript_StopReadingNotebook:: @ 816A11B
 	releaseall
 	end
 
-ViridianCity_House2_EventScript_16A11D:: @ 816A11D
+ViridianCity_House2_EventScript_Blackboard:: @ 816A11D
 	lockall
-	msgbox gUnknown_818FF4B
-	goto EventScript_16A12C
+	msgbox ViridianCity_House2_Text_BlackboardListsStatusProblems
+	goto ViridianCity_House2_EventScript_ChooseBlackboardTopic
 	end
 
-EventScript_16A12C:: @ 816A12C
-	message Text_18FF88
+ViridianCity_House2_EventScript_ChooseBlackboardTopic:: @ 816A12C
+	message ViridianCity_House2_Text_ReadWhichTopic
 	waitmessage
 	multichoicegrid 7, 1, MULTICHOICE_TRAINER_SCHOOL_WHITEBOARD, 3, FALSE
 	switch VAR_RESULT
-	case 0, EventScript_16A18B
-	case 1, EventScript_16A1A7
-	case 2, EventScript_16A1C3
-	case 3, EventScript_16A199
-	case 4, EventScript_16A1B5
-	case 5, EventScript_16A1D1
-	case 127, EventScript_16A1D1
+	case 0, ViridianCity_House2_EventScript_ReadSleep
+	case 1, ViridianCity_House2_EventScript_ReadPoison
+	case 2, ViridianCity_House2_EventScript_ReadParalysis
+	case 3, ViridianCity_House2_EventScript_ReadBurn
+	case 4, ViridianCity_House2_EventScript_ReadFreeze
+	case 5, ViridianCity_House2_EventScript_ExitBlackboard
+	case 127, ViridianCity_House2_EventScript_ExitBlackboard
 	end
 
-EventScript_16A18B:: @ 816A18B
-	msgbox gUnknown_818FFA9
-	goto EventScript_16A12C
+ViridianCity_House2_EventScript_ReadSleep:: @ 816A18B
+	msgbox ViridianCity_House2_Text_ExplainSleep
+	goto ViridianCity_House2_EventScript_ChooseBlackboardTopic
 	end
 
-EventScript_16A199:: @ 816A199
-	msgbox gUnknown_8190025
-	goto EventScript_16A12C
+ViridianCity_House2_EventScript_ReadBurn:: @ 816A199
+	msgbox ViridianCity_House2_Text_ExplainBurn
+	goto ViridianCity_House2_EventScript_ChooseBlackboardTopic
 	end
 
-EventScript_16A1A7:: @ 816A1A7
-	msgbox gUnknown_819009F
-	goto EventScript_16A12C
+ViridianCity_House2_EventScript_ReadPoison:: @ 816A1A7
+	msgbox ViridianCity_House2_Text_ExplainPoison
+	goto ViridianCity_House2_EventScript_ChooseBlackboardTopic
 	end
 
-EventScript_16A1B5:: @ 816A1B5
-	msgbox gUnknown_819010F
-	goto EventScript_16A12C
+ViridianCity_House2_EventScript_ReadFreeze:: @ 816A1B5
+	msgbox ViridianCity_House2_Text_ExplainFreeze
+	goto ViridianCity_House2_EventScript_ChooseBlackboardTopic
 	end
 
-EventScript_16A1C3:: @ 816A1C3
-	msgbox gUnknown_8190199
-	goto EventScript_16A12C
+ViridianCity_House2_EventScript_ReadParalysis:: @ 816A1C3
+	msgbox ViridianCity_House2_Text_ExplainParalysis
+	goto ViridianCity_House2_EventScript_ChooseBlackboardTopic
 	end
 
-EventScript_16A1D1:: @ 816A1D1
+ViridianCity_House2_EventScript_ExitBlackboard:: @ 816A1D1
 	releaseall
 	end
diff --git a/data/maps/ViridianCity_House2/text.inc b/data/maps/ViridianCity_House2/text.inc
index a575c0f34..176bb713a 100644
--- a/data/maps/ViridianCity_House2/text.inc
+++ b/data/maps/ViridianCity_House2/text.inc
@@ -1,13 +1,13 @@
-gUnknown_818FC00:: @ 818FC00
+ViridianCity_House2_Text_TryingToMemorizeNotes:: @ 818FC00
     .string "Whew! I'm trying to memorize all my\n"
     .string "notes.$"
 
-gUnknown_818FC2B:: @ 818FC2B
+ViridianCity_House2_Text_ReadBlackboardCarefully:: @ 818FC2B
     .string "Okay!\p"
     .string "Be sure to read what's on the\n"
     .string "blackboard carefully!$"
 
-gUnknown_818FC65:: @ 818FC65
+ViridianCity_House2_Text_NotebookFirstPage:: @ 818FC65
     .string "Let's check out the notebook.\p"
     .string "First page…\p"
     .string "POKé BALLS are used to catch\n"
@@ -17,14 +17,14 @@ gUnknown_818FC65:: @ 818FC65
     .string "People who raise and battle\n"
     .string "with POKéMON are called TRAINERS.$"
 
-gUnknown_818FD23:: @ 818FD23
+ViridianCity_House2_Text_NotebookSecondPage:: @ 818FD23
     .string "Second page…\p"
     .string "A healthy POKéMON may be hard to\n"
     .string "catch, so weaken it first.\p"
     .string "Poison, burn, or cause another\n"
     .string "status problem to weaken it.$"
 
-gUnknown_818FDA8:: @ 818FDA8
+ViridianCity_House2_Text_NotebookThirdPage:: @ 818FDA8
     .string "Third page…\p"
     .string "POKéMON TRAINERS seek others to\n"
     .string "engage in POKéMON battles.\p"
@@ -33,7 +33,7 @@ gUnknown_818FDA8:: @ 818FDA8
     .string "Battles are constantly waged at\n"
     .string "POKéMON GYMS everywhere.$"
 
-gUnknown_818FE5C:: @ 818FE5C
+ViridianCity_House2_Text_NotebookFourthPage:: @ 818FE5C
     .string "Fourth page…\p"
     .string "The ultimate goal for all POKéMON\n"
     .string "TRAINERS is simple.\p"
@@ -43,21 +43,21 @@ gUnknown_818FE5C:: @ 818FE5C
     .string "The ELITE FOUR of the POKéMON\n"
     .string "LEAGUE!$"
 
-gUnknown_818FF19:: @ 818FF19
+ViridianCity_House2_Text_TurnThePage:: @ 818FF19
     .string "Turn the page?$"
 
-gUnknown_818FF28:: @ 818FF28
+ViridianCity_House2_Text_HeyDontLookAtMyNotes:: @ 818FF28
     .string "GIRL: Hey!\n"
     .string "Don't look at my notes!$"
 
-gUnknown_818FF4B:: @ 818FF4B
+ViridianCity_House2_Text_BlackboardListsStatusProblems:: @ 818FF4B
     .string "The blackboard lists POKéMON\n"
     .string "STATUS problems during battles.$"
 
-Text_18FF88:: @ 818FF88
+ViridianCity_House2_Text_ReadWhichTopic:: @ 818FF88
     .string "Which topic do you want to read?$"
 
-gUnknown_818FFA9:: @ 818FFA9
+ViridianCity_House2_Text_ExplainSleep:: @ 818FFA9
     .string "A POKéMON can't attack if it's\n"
     .string "asleep.\p"
     .string "POKéMON will stay asleep even\n"
@@ -65,19 +65,19 @@ gUnknown_818FFA9:: @ 818FFA9
     .string "Use AWAKENING to awaken one\n"
     .string "from sleep.$"
 
-gUnknown_8190025:: @ 8190025
+ViridianCity_House2_Text_ExplainBurn:: @ 8190025
     .string "A burn reduces ATTACK power.\n"
     .string "It also causes ongoing HP loss.\p"
     .string "A burn remains after a battle.\n"
     .string "Use BURN HEAL to cure a burn.$"
 
-gUnknown_819009F:: @ 819009F
+ViridianCity_House2_Text_ExplainPoison:: @ 819009F
     .string "When poisoned, a POKéMON's health\n"
     .string "steadily drops.\p"
     .string "Poison lingers after battles.\n"
     .string "Use an ANTIDOTE to cure poison!$"
 
-gUnknown_819010F:: @ 819010F
+ViridianCity_House2_Text_ExplainFreeze:: @ 819010F
     .string "A frozen POKéMON becomes\n"
     .string "helplessly immobile.\p"
     .string "It stays frozen even after the\n"
@@ -85,7 +85,7 @@ gUnknown_819010F:: @ 819010F
     .string "Use ICE HEAL to thaw out the\n"
     .string "suffering POKéMON.$"
 
-gUnknown_8190199:: @ 8190199
+ViridianCity_House2_Text_ExplainParalysis:: @ 8190199
     .string "Paralysis reduces SPEED and may\n"
     .string "prevent the POKéMON from moving.\p"
     .string "Paralysis remains after battles.\n"
diff --git a/data/maps/ViridianCity_Mart/map.json b/data/maps/ViridianCity_Mart/map.json
index 09f58a9d5..5a4ae7bc0 100644
--- a/data/maps/ViridianCity_Mart/map.json
+++ b/data/maps/ViridianCity_Mart/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "ViridianCity_Mart_EventScript_16A268",
+      "script": "ViridianCity_Mart_EventScript_Clerk",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "ViridianCity_Mart_EventScript_16A2B7",
+      "script": "ViridianCity_Mart_EventScript_Youngster",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "ViridianCity_Mart_EventScript_16A2AE",
+      "script": "ViridianCity_Mart_EventScript_Woman",
       "flag": "0"
     }
   ],
diff --git a/data/maps/ViridianCity_Mart/scripts.inc b/data/maps/ViridianCity_Mart/scripts.inc
index 1f66937cf..5ad0d9a2f 100644
--- a/data/maps/ViridianCity_Mart/scripts.inc
+++ b/data/maps/ViridianCity_Mart/scripts.inc
@@ -4,36 +4,36 @@ ViridianCity_Mart_MapScripts:: @ 816A1D3
 	.byte 0
 
 ViridianCity_Mart_OnLoad:: @ 816A1DE
-	goto_if_unset FLAG_SYS_POKEDEX_GET, EventScript_16A1E8
+	goto_if_unset FLAG_SYS_POKEDEX_GET, ViridianCity_Mart_EventScript_HideQuestionnaire
 	end
 
-EventScript_16A1E8:: @ 816A1E8
-	setmetatile 1, 3, 703, 1
-	setmetatile 1, 4, 704, 1
+ViridianCity_Mart_EventScript_HideQuestionnaire:: @ 816A1E8
+	setmetatile 1, 3, METATILE_Shop_CounterMid_Top, 1
+	setmetatile 1, 4, METATILE_Shop_CounterMid_Bottom, 1
 	end
 
 ViridianCity_Mart_OnFrame:: @ 816A1FB
-	map_script_2 VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 0, EventScript_16A205
+	map_script_2 VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 0, ViridianCity_Mart_EventScript_ParcelScene
 	.2byte 0
 
-EventScript_16A205:: @ 816A205
+ViridianCity_Mart_EventScript_ParcelScene:: @ 816A205
 	lockall
 	textcolor 0
 	applymovement 1, Movement_WalkInPlaceFastestDown
 	waitmovement 0
-	msgbox gUnknown_819021A
+	msgbox ViridianCity_Mart_Text_YouCameFromPallet
 	closemessage
-	applymovement 1, Movement_16A262
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_16A25C
+	applymovement 1, ViridianCity_Mart_Movement_FacePlayer
+	applymovement OBJ_EVENT_ID_PLAYER, ViridianCity_Mart_Movement_ApproachCounter
 	waitmovement 0
-	msgbox gUnknown_819023A
+	msgbox ViridianCity_Mart_Text_TakeThisToProfOak
 	setvar VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1
-	giveitem_msg gUnknown_8190289, ITEM_OAKS_PARCEL, 1, MUS_FAN5
+	giveitem_msg ViridianCity_Mart_Text_ReceivedOaksParcelFromClerk, ITEM_OAKS_PARCEL, 1, MUS_FAN5
 	setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 5
 	releaseall
 	end
 
-Movement_16A25C:: @ 816A25C
+ViridianCity_Mart_Movement_ApproachCounter:: @ 816A25C
 	walk_up
 	walk_up
 	walk_up
@@ -41,7 +41,7 @@ Movement_16A25C:: @ 816A25C
 	walk_in_place_fastest_left
 	step_end
 
-Movement_16A262:: @ 816A262
+ViridianCity_Mart_Movement_FacePlayer:: @ 816A262
 	delay_16
 	delay_16
 	delay_16
@@ -49,21 +49,21 @@ Movement_16A262:: @ 816A262
 	walk_in_place_fastest_right
 	step_end
 
-ViridianCity_Mart_EventScript_16A268:: @ 816A268
+ViridianCity_Mart_EventScript_Clerk:: @ 816A268
 	lock
 	faceplayer
 	compare VAR_MAP_SCENE_VIRIDIAN_CITY_MART, 1
-	goto_if_eq EventScript_16A2A4
+	goto_if_eq ViridianCity_Mart_EventScript_SayHiToOak
 	goto_if_questlog EventScript_ReleaseEnd
 	message Text_MayIHelpYou
 	waitmessage
-	pokemart Items_16A298
+	pokemart ViridianCity_Mart_Items
 	msgbox Text_PleaseComeAgain
 	release
 	end
 
 	.align 2
-Items_16A298:: @ 816A298
+ViridianCity_Mart_Items:: @ 816A298
 	.2byte ITEM_POKE_BALL
 	.2byte ITEM_POTION
 	.2byte ITEM_ANTIDOTE
@@ -72,15 +72,15 @@ Items_16A298:: @ 816A298
 	release
 	end
 
-EventScript_16A2A4:: @ 816A2A4
-	msgbox Text_1902BF
+ViridianCity_Mart_EventScript_SayHiToOak:: @ 816A2A4
+	msgbox ViridianCity_Mart_Text_SayHiToOakForMe
 	release
 	end
 
-ViridianCity_Mart_EventScript_16A2AE:: @ 816A2AE
-	msgbox gUnknown_81902F5, MSGBOX_NPC
+ViridianCity_Mart_EventScript_Woman:: @ 816A2AE
+	msgbox ViridianCity_Mart_Text_ShopDoesGoodBusinessInAntidotes, MSGBOX_NPC
 	end
 
-ViridianCity_Mart_EventScript_16A2B7:: @ 816A2B7
-	msgbox gUnknown_819032C, MSGBOX_NPC
+ViridianCity_Mart_EventScript_Youngster:: @ 816A2B7
+	msgbox ViridianCity_Mart_Text_GotToBuySomePotions, MSGBOX_NPC
 	end
diff --git a/data/maps/ViridianCity_Mart/text.inc b/data/maps/ViridianCity_Mart/text.inc
index a610e83cd..c54f4220a 100644
--- a/data/maps/ViridianCity_Mart/text.inc
+++ b/data/maps/ViridianCity_Mart/text.inc
@@ -1,25 +1,25 @@
-gUnknown_819021A:: @ 819021A
+ViridianCity_Mart_Text_YouCameFromPallet:: @ 819021A
     .string "Hey!\n"
     .string "You came from PALLET TOWN?$"
 
-gUnknown_819023A:: @ 819023A
+ViridianCity_Mart_Text_TakeThisToProfOak:: @ 819023A
     .string "You know PROF. OAK, right?\p"
     .string "His order came in.\n"
     .string "Can I get you to take it to him?$"
 
-gUnknown_8190289:: @ 8190289
+ViridianCity_Mart_Text_ReceivedOaksParcelFromClerk:: @ 8190289
     .string "{PLAYER} received OAK'S PARCEL\n"
     .string "from the POKéMON MART clerk.$"
 
-Text_1902BF:: @ 81902BF
+ViridianCity_Mart_Text_SayHiToOakForMe:: @ 81902BF
     .string "Okay, thanks! Please say hi to\n"
     .string "PROF. OAK for me, too.$"
 
-gUnknown_81902F5:: @ 81902F5
+ViridianCity_Mart_Text_ShopDoesGoodBusinessInAntidotes:: @ 81902F5
     .string "This shop does good business in\n"
     .string "ANTIDOTES, I've heard.$"
 
-gUnknown_819032C:: @ 819032C
+ViridianCity_Mart_Text_GotToBuySomePotions:: @ 819032C
     .string "I've got to buy some POTIONS.\p"
     .string "You never know when your POKéMON\n"
     .string "will need quick healing.$"
diff --git a/data/maps/ViridianCity_PokemonCenter_1F/map.json b/data/maps/ViridianCity_PokemonCenter_1F/map.json
index 3e5822608..c531d4b59 100644
--- a/data/maps/ViridianCity_PokemonCenter_1F/map.json
+++ b/data/maps/ViridianCity_PokemonCenter_1F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "ViridianCity_PokemonCenter_1F_EventScript_16A2CF",
+      "script": "ViridianCity_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": "ViridianCity_PokemonCenter_1F_EventScript_16A2E1",
+      "script": "ViridianCity_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": "ViridianCity_PokemonCenter_1F_EventScript_16A2D8",
+      "script": "ViridianCity_PokemonCenter_1F_EventScript_Boy",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "ViridianCity_PokemonCenter_1F_EventScript_16A2EA",
+      "script": "ViridianCity_PokemonCenter_1F_EventScript_Youngster",
       "flag": "0"
     }
   ],
diff --git a/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc b/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc
index 43e74ef4c..ca02e1113 100644
--- a/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/ViridianCity_PokemonCenter_1F/scripts.inc
@@ -7,21 +7,21 @@ ViridianCity_PokemonCenter_1F_OnTransition:: @ 816A2CB
 	setrespawn SPAWN_VIRIDIAN_CITY
 	end
 
-ViridianCity_PokemonCenter_1F_EventScript_16A2CF:: @ 816A2CF
+ViridianCity_PokemonCenter_1F_EventScript_Nurse:: @ 816A2CF
 	lock
 	faceplayer
 	call EventScript_PkmnCenterNurse
 	release
 	end
 
-ViridianCity_PokemonCenter_1F_EventScript_16A2D8:: @ 816A2D8
-	msgbox gUnknown_81903E5, MSGBOX_NPC
+ViridianCity_PokemonCenter_1F_EventScript_Boy:: @ 816A2D8
+	msgbox ViridianCity_PokemonCenter_1F_Text_PokeCenterInEveryTown, MSGBOX_NPC
 	end
 
-ViridianCity_PokemonCenter_1F_EventScript_16A2E1:: @ 816A2E1
-	msgbox gUnknown_8190384, MSGBOX_NPC
+ViridianCity_PokemonCenter_1F_EventScript_Gentleman:: @ 816A2E1
+	msgbox ViridianCity_PokemonCenter_1F_Text_FeelFreeToUsePC, MSGBOX_NPC
 	end
 
-ViridianCity_PokemonCenter_1F_EventScript_16A2EA:: @ 816A2EA
-	msgbox gUnknown_8190450, MSGBOX_NPC
+ViridianCity_PokemonCenter_1F_EventScript_Youngster:: @ 816A2EA
+	msgbox ViridianCity_PokemonCenter_1F_Text_PokeCentersHealMons, MSGBOX_NPC
 	end
diff --git a/data/maps/ViridianCity_PokemonCenter_1F/text.inc b/data/maps/ViridianCity_PokemonCenter_1F/text.inc
index 18b535a45..f0e636704 100644
--- a/data/maps/ViridianCity_PokemonCenter_1F/text.inc
+++ b/data/maps/ViridianCity_PokemonCenter_1F/text.inc
@@ -1,16 +1,16 @@
-gUnknown_8190384:: @ 8190384
+ViridianCity_PokemonCenter_1F_Text_FeelFreeToUsePC:: @ 8190384
     .string "Please feel free to use that PC in\n"
     .string "the corner.\p"
     .string "The receptionist told me so.\n"
     .string "It's so kind of her!$"
 
-gUnknown_81903E5:: @ 81903E5
+ViridianCity_PokemonCenter_1F_Text_PokeCenterInEveryTown:: @ 81903E5
     .string "There's a POKéMON CENTER in every\n"
     .string "town ahead.\p"
     .string "They charge no money, so don't\n"
     .string "be shy about healing POKéMON.$"
 
-gUnknown_8190450:: @ 8190450
+ViridianCity_PokemonCenter_1F_Text_PokeCentersHealMons:: @ 8190450
     .string "POKéMON CENTERS heal your tired,\n"
     .string "hurt, or fainted POKéMON.\p"
     .string "They make all POKéMON completely\n"
diff --git a/data/maps/ViridianForest/map.json b/data/maps/ViridianForest/map.json
index 90f689a9f..463bc53f5 100644
--- a/data/maps/ViridianForest/map.json
+++ b/data/maps/ViridianForest/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "ViridianForest_EventScript_160529",
+      "script": "ViridianForest_EventScript_Youngster",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "ViridianForest_EventScript_160532",
+      "script": "ViridianForest_EventScript_Boy",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 5,
-      "script": "ViridianForest_EventScript_160571",
+      "script": "ViridianForest_EventScript_Rick",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "ViridianForest_EventScript_160588",
+      "script": "ViridianForest_EventScript_Doug",
       "flag": "0"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "ViridianForest_EventScript_16059F",
+      "script": "ViridianForest_EventScript_Sammy",
       "flag": "0"
     },
     {
@@ -127,7 +127,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "ViridianForest_EventScript_1605B6",
+      "script": "ViridianForest_EventScript_Anthony",
       "flag": "0"
     },
     {
@@ -140,7 +140,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "ViridianForest_EventScript_1605CD",
+      "script": "ViridianForest_EventScript_Charlie",
       "flag": "0"
     },
     {
@@ -208,42 +208,42 @@
       "x": 39,
       "y": 59,
       "elevation": 3,
-      "script": "ViridianForest_EventScript_16053B"
+      "script": "ViridianForest_EventScript_TrainerTips1"
     },
     {
       "type": "bg_event_type_0",
       "x": 43,
       "y": 26,
       "elevation": 0,
-      "script": "ViridianForest_EventScript_16054D"
+      "script": "ViridianForest_EventScript_TrainerTips3"
     },
     {
       "type": "bg_event_type_0",
       "x": 9,
       "y": 29,
       "elevation": 0,
-      "script": "ViridianForest_EventScript_160556"
+      "script": "ViridianForest_EventScript_TrainerTips4"
     },
     {
       "type": "bg_event_type_0",
       "x": 6,
       "y": 12,
       "elevation": 0,
-      "script": "ViridianForest_EventScript_160568"
+      "script": "ViridianForest_EventScript_ExitSign"
     },
     {
       "type": "bg_event_type_0",
       "x": 28,
       "y": 44,
       "elevation": 0,
-      "script": "ViridianForest_EventScript_160544"
+      "script": "ViridianForest_EventScript_TrainerTips2"
     },
     {
       "type": "bg_event_type_0",
       "x": 31,
       "y": 60,
       "elevation": 0,
-      "script": "ViridianForest_EventScript_16055F"
+      "script": "ViridianForest_EventScript_TrainerTips5"
     },
     {
       "type": "hidden_item",
diff --git a/data/maps/ViridianForest/scripts.inc b/data/maps/ViridianForest/scripts.inc
index 6fb97d075..a54fa1377 100644
--- a/data/maps/ViridianForest/scripts.inc
+++ b/data/maps/ViridianForest/scripts.inc
@@ -6,59 +6,59 @@ ViridianForest_OnTransition:: @ 8160525
 	setworldmapflag FLAG_WORLD_MAP_VIRIDIAN_FOREST
 	end
 
-ViridianForest_EventScript_160529:: @ 8160529
-	msgbox gUnknown_8172255, MSGBOX_NPC
+ViridianForest_EventScript_Youngster:: @ 8160529
+	msgbox ViridianForest_Text_FriendsItchingToBattle, MSGBOX_NPC
 	end
 
-ViridianForest_EventScript_160532:: @ 8160532
-	msgbox gUnknown_8172559, MSGBOX_NPC
+ViridianForest_EventScript_Boy:: @ 8160532
+	msgbox ViridianForest_Text_RanOutOfPokeBalls, MSGBOX_NPC
 	end
 
-ViridianForest_EventScript_16053B:: @ 816053B
-	msgbox gUnknown_81725C7, MSGBOX_SIGN
+ViridianForest_EventScript_TrainerTips1:: @ 816053B
+	msgbox ViridianForest_Text_AvoidGrassyAreasWhenWeak, MSGBOX_SIGN
 	end
 
-ViridianForest_EventScript_160544:: @ 8160544
-	msgbox gUnknown_8172629, MSGBOX_SIGN
+ViridianForest_EventScript_TrainerTips2:: @ 8160544
+	msgbox ViridianForest_Text_UseAntidoteForPoison, MSGBOX_SIGN
 	end
 
-ViridianForest_EventScript_16054D:: @ 816054D
-	msgbox gUnknown_817265C, MSGBOX_SIGN
+ViridianForest_EventScript_TrainerTips3:: @ 816054D
+	msgbox ViridianForest_Text_ContactOakViaPCToRatePokedex, MSGBOX_SIGN
 	end
 
-ViridianForest_EventScript_160556:: @ 8160556
-	msgbox gUnknown_81726A3, MSGBOX_SIGN
+ViridianForest_EventScript_TrainerTips4:: @ 8160556
+	msgbox ViridianForest_Text_CantCatchOwnedMons, MSGBOX_SIGN
 	end
 
-ViridianForest_EventScript_16055F:: @ 816055F
-	msgbox gUnknown_817271D, MSGBOX_SIGN
+ViridianForest_EventScript_TrainerTips5:: @ 816055F
+	msgbox ViridianForest_Text_WeakenMonsBeforeCapture, MSGBOX_SIGN
 	end
 
-ViridianForest_EventScript_160568:: @ 8160568
-	msgbox gUnknown_8172773, MSGBOX_SIGN
+ViridianForest_EventScript_ExitSign:: @ 8160568
+	msgbox ViridianForest_Text_LeavingViridianForest, MSGBOX_SIGN
 	end
 
-ViridianForest_EventScript_160571:: @ 8160571
-	trainerbattle_single TRAINER_BUG_CATCHER_RICK, Text_1722C7, Text_1722F9
-	msgbox gUnknown_8172315, MSGBOX_AUTOCLOSE
+ViridianForest_EventScript_Rick:: @ 8160571
+	trainerbattle_single TRAINER_BUG_CATCHER_RICK, ViridianForest_Text_RickIntro, ViridianForest_Text_RickDefeat
+	msgbox ViridianForest_Text_RickPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-ViridianForest_EventScript_160588:: @ 8160588
-	trainerbattle_single TRAINER_BUG_CATCHER_DOUG, Text_17234A, Text_17237D
-	msgbox gUnknown_8172398, MSGBOX_AUTOCLOSE
+ViridianForest_EventScript_Doug:: @ 8160588
+	trainerbattle_single TRAINER_BUG_CATCHER_DOUG, ViridianForest_Text_DougIntro, ViridianForest_Text_DougDefeat
+	msgbox ViridianForest_Text_DougPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-ViridianForest_EventScript_16059F:: @ 816059F
-	trainerbattle_single TRAINER_BUG_CATCHER_SAMMY, Text_1723D4, Text_172402
-	msgbox gUnknown_817241F, MSGBOX_AUTOCLOSE
+ViridianForest_EventScript_Sammy:: @ 816059F
+	trainerbattle_single TRAINER_BUG_CATCHER_SAMMY, ViridianForest_Text_SammyIntro, ViridianForest_Text_SammyDefeat
+	msgbox ViridianForest_Text_SammyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-ViridianForest_EventScript_1605B6:: @ 81605B6
-	trainerbattle_single TRAINER_BUG_CATCHER_ANTHONY, Text_172482, Text_1724BF
-	msgbox gUnknown_81724DC, MSGBOX_AUTOCLOSE
+ViridianForest_EventScript_Anthony:: @ 81605B6
+	trainerbattle_single TRAINER_BUG_CATCHER_ANTHONY, ViridianForest_Text_AnthonyIntro, ViridianForest_Text_AnthonyDefeat
+	msgbox ViridianForest_Text_AnthonyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-ViridianForest_EventScript_1605CD:: @ 81605CD
-	trainerbattle_single TRAINER_BUG_CATCHER_CHARLIE, Text_1724F9, Text_17251B
-	msgbox gUnknown_8172527, MSGBOX_AUTOCLOSE
+ViridianForest_EventScript_Charlie:: @ 81605CD
+	trainerbattle_single TRAINER_BUG_CATCHER_CHARLIE, ViridianForest_Text_CharlieIntro, ViridianForest_Text_CharlieDefeat
+	msgbox ViridianForest_Text_CharliePostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/ViridianForest/text.inc b/data/maps/ViridianForest/text.inc
index e3dc737a2..226d9f905 100644
--- a/data/maps/ViridianForest/text.inc
+++ b/data/maps/ViridianForest/text.inc
@@ -1,105 +1,105 @@
-gUnknown_8172255:: @ 8172255
+ViridianForest_Text_FriendsItchingToBattle:: @ 8172255
     .string "I came here with some friends to\n"
     .string "catch us some BUG POKéMON!\p"
     .string "They're all itching to get into\n"
     .string "some POKéMON battles!$"
 
-Text_1722C7:: @ 81722C7
+ViridianForest_Text_RickIntro:: @ 81722C7
     .string "Hey! You have POKéMON!\n"
     .string "Come on!\l"
     .string "Let's battle 'em!$"
 
-Text_1722F9:: @ 81722F9
+ViridianForest_Text_RickDefeat:: @ 81722F9
     .string "No!\nCATERPIE can't hack it!$"
 
-gUnknown_8172315:: @ 8172315
+ViridianForest_Text_RickPostBattle:: @ 8172315
     .string "Ssh! You'll scare the bugs away.\n"
     .string "Another time, okay?$"
 
-Text_17234A:: @ 817234A
+ViridianForest_Text_DougIntro:: @ 817234A
     .string "Yo!\n"
     .string "You can't jam out if you're a\l"
     .string "POKéMON TRAINER!$"
 
-Text_17237D:: @ 817237D
+ViridianForest_Text_DougDefeat:: @ 817237D
     .string "Huh?\n"
     .string "I ran out of POKéMON!$"
 
-gUnknown_8172398:: @ 8172398
+ViridianForest_Text_DougPostBattle:: @ 8172398
     .string "That totally stinks! I'm going to\n"
     .string "catch some stronger ones!$"
 
-Text_1723D4:: @ 81723D4
+ViridianForest_Text_SammyIntro:: @ 81723D4
     .string "Hey, wait up!\n"
     .string "What's the hurry? Why the rush?$"
 
-Text_172402:: @ 8172402
+ViridianForest_Text_SammyDefeat:: @ 8172402
     .string "I give!\n"
     .string "You're good at this!$"
 
-gUnknown_817241F:: @ 817241F
+ViridianForest_Text_SammyPostBattle:: @ 817241F
     .string "Sometimes, you can find stuff on\n"
     .string "the ground.\p"
     .string "I'm looking for the stuff I\n"
     .string "dropped. Can you help me?$"
 
-Text_172482:: @ 8172482
+ViridianForest_Text_AnthonyIntro:: @ 8172482
     .string "I might be little, but I won't like\n"
     .string "it if you go easy on me!$"
 
-Text_1724BF:: @ 81724BF
+ViridianForest_Text_AnthonyDefeat:: @ 81724BF
     .string "Oh, boo.\n"
     .string "Nothing went right.$"
 
-gUnknown_81724DC:: @ 81724DC
+ViridianForest_Text_AnthonyPostBattle:: @ 81724DC
     .string "I lost some of my allowance…$"
 
-Text_1724F9:: @ 81724F9
+ViridianForest_Text_CharlieIntro:: @ 81724F9
     .string "Did you know that POKéMON evolve?$"
 
-Text_17251B:: @ 817251B
+ViridianForest_Text_CharlieDefeat:: @ 817251B
     .string "Oh!\n"
     .string "I lost!$"
 
-gUnknown_8172527:: @ 8172527
+ViridianForest_Text_CharliePostBattle:: @ 8172527
     .string "BUG POKéMON evolve quickly.\n"
     .string "They're a lot of fun!$"
 
-gUnknown_8172559:: @ 8172559
+ViridianForest_Text_RanOutOfPokeBalls:: @ 8172559
     .string "I was throwing POKé BALLS to\n"
     .string "catch POKéMON, and I ran out.\p"
     .string "That's why you can never have too\n"
     .string "many POKé BALLS.$"
 
-gUnknown_81725C7:: @ 81725C7
+ViridianForest_Text_AvoidGrassyAreasWhenWeak:: @ 81725C7
     .string "TRAINER TIPS\p"
     .string "If your POKéMON are weak and you\n"
     .string "want to avoid battles, stay away\l"
     .string "from grassy areas!$"
 
-gUnknown_8172629:: @ 8172629
+ViridianForest_Text_UseAntidoteForPoison:: @ 8172629
     .string "For poison, use ANTIDOTE!\n"
     .string "Get it at POKéMON MARTS!$"
 
-gUnknown_817265C:: @ 817265C
+ViridianForest_Text_ContactOakViaPCToRatePokedex:: @ 817265C
     .string "TRAINER TIPS\p"
     .string "Contact PROF. OAK via a PC to\n"
     .string "get your POKéDEX evaluated!$"
 
-gUnknown_81726A3:: @ 81726A3
+ViridianForest_Text_CantCatchOwnedMons:: @ 81726A3
     .string "TRAINER TIPS\p"
     .string "You can't catch a POKéMON that\n"
     .string "belongs to someone else.\p"
     .string "Throw POKé BALLS only at wild\n"
     .string "POKéMON to catch them!$"
 
-gUnknown_817271D:: @ 817271D
+ViridianForest_Text_WeakenMonsBeforeCapture:: @ 817271D
     .string "TRAINER TIPS\p"
     .string "Weaken POKéMON before attempting\n"
     .string "capture!\p"
     .string "When healthy, they may escape!$"
 
-gUnknown_8172773:: @ 8172773
+ViridianForest_Text_LeavingViridianForest:: @ 8172773
     .string "LEAVING VIRIDIAN FOREST\n"
     .string "PEWTER CITY AHEAD$"
 
diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json
index 05f1cd544..3793fd9fc 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",
diff --git a/data/scripts/aide.inc b/data/scripts/aide.inc
new file mode 100644
index 000000000..3201de769
--- /dev/null
+++ b/data/scripts/aide.inc
@@ -0,0 +1,14 @@
+Aide_EventScript_HaventCaughtEnough:: @ 81A7ABD
+	msgbox Aide_Text_HaventCaughtEnoughMonsForItem
+	release
+	end
+
+Aide_EventScript_NoRoomForItem:: @ 81A7AC7
+	msgbox Aide_Text_DontHaveAnyRoomForItem
+	release
+	end
+
+Aide_EventScript_DeclineCheckMons:: @ 81A7AD1
+	msgbox Aide_Text_GetEnoughMonsComeBackForItem
+	release
+	end
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 1564717c0..5c85d12c8 100644
--- a/data/scripts/fame_checker.inc
+++ b/data/scripts/fame_checker.inc
@@ -1,10 +1,10 @@
-ViridianCity_House2_EventScript_1ACD65:: @ 81ACD65
+ViridianCity_House2_EventScript_PokemonJournal:: @ 81ACD65
 	lock
 	faceplayer
 	famechecker FAMECHECKER_OAK, 3
 	famechecker FAMECHECKER_DAISY, 3
 	textcolor 3
-	msgbox gUnknown_81B1AB9
+	msgbox PokemonJournal_Text_SpecialFeatureProfOak
 	release
 	end
 
@@ -14,7 +14,7 @@ EventScript_1ACD8D:: @ 81ACD8D
 	famechecker FAMECHECKER_DAISY, 1
 	famechecker FAMECHECKER_OAK, 4
 	textcolor 3
-	msgbox gUnknown_81B1AB9
+	msgbox PokemonJournal_Text_SpecialFeatureProfOak
 	release
 	end
 
@@ -23,7 +23,7 @@ EventScript_1ACDB5:: @ 81ACDB5
 	faceplayer
 	famechecker FAMECHECKER_DAISY, 4
 	textcolor 3
-	msgbox gUnknown_81B1AB9
+	msgbox PokemonJournal_Text_SpecialFeatureProfOak
 	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/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/smokescreen.s b/data/smokescreen.s
index 19dceec00..49b13847b 100644
--- a/data/smokescreen.s
+++ b/data/smokescreen.s
@@ -3,10 +3,10 @@
 	.section .rodata
 	.align 2
 
-gUnknown_825098C:: @ 825098C
+gSmokescreenImpactSpriteSheet:: @ 825098C
 	obj_tiles gFile_graphics_battle_anims_sprites_smokescreen_impact_sheet, 0x0180, 55019
 
-gUnknown_8250994:: @ 8250994
+gSmokescreenImpactSpritePalette:: @ 8250994
 	obj_pal gFile_graphics_battle_anims_sprites_smokescreen_impact_palette, 55019
 
 gOamData_835099C::
@@ -42,8 +42,8 @@ gSpriteAnimTable_82509E4::
 	.4byte gAnimCmd_82509C4
 	.4byte gAnimCmd_82509D4
 
-gUnknown_82509F4:: @ 82509F4
-	spr_template 55019, 55019, gOamData_835099C, gSpriteAnimTable_82509E4, NULL, gDummySpriteAffineAnimTable, sub_804A904
+gSmokescreenImpactSpriteTemplate:: @ 82509F4
+	spr_template 55019, 55019, gOamData_835099C, gSpriteAnimTable_82509E4, NULL, gDummySpriteAffineAnimTable, SpriteCB_DestroySprite
 
 gSpriteSheet_EnemyShadow:: @ 8250A0C
 	obj_tiles gFile_graphics_battle_interface_enemy_mon_shadow_sheet, 0x0080, 55129
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 e77730429..f595170ff 100644
--- a/data/strings.s
+++ b/data/strings.s
@@ -3093,40 +3093,40 @@ gUnknown_841B32E:: @ 841B32E
 	.string "{DYNAMIC 0x00} learned\n"
 	.string "{DYNAMIC 0x01}!$"
 
-gUnknown_841B33D:: @ 0x841B33D
+gText_Upper:: @ 0x841B33D
 	.string "UPPER$"
 
-gUnknown_841B343:: @ 0x841B343
+gText_Lower:: @ 0x841B343
 	.string "lower$"
 
-gUnknown_841B349:: @ 0x841B349
+gText_Others:: @ 0x841B349
 	.string "OTHERS$"
 
-gUnknown_841B350:: @ 0x841B350
+gText_Symbols:: @ 0x841B350
 	.string "SYMBOLS$"
 
-gUnknown_841B358:: @ 0x841B358
+gText_Register2:: @ 0x841B358
 	.string "REGISTER$"
 
-gUnknown_841B361:: @ 0x841B361
+gText_Exit:: @ 0x841B361
 	.string "EXIT$"
 
-gUnknown_841B366:: @ 0x841B366
+gText_QuitChatting:: @ 0x841B366
 	.string "Quit chatting?$"
 
-gUnknown_841B375:: @ 0x841B375
+gText_RegisterTextWhere:: @ 0x841B375
 	.string "Register text where?$"
 
-gUnknown_841B38A:: @ 0x841B38A
+gText_RegisterTextHere:: @ 0x841B38A
 	.string "Register text here?$"
 
-gUnknown_841B39E:: @ 0x841B39E
+gText_InputText:: @ 0x841B39E
 	.string "Input text.$"
 
-gUnknown_841B3AA:: @ 841B3AA
+gText_F700JoinedChat:: @ 841B3AA
 	.string "{DYNAMIC 0x00} joined the chat!$"
 
-gUnknown_841B3BE:: @ 841B3BE
+gText_F700LeftChat:: @ 841B3BE
 	.string "{DYNAMIC 0x00} left the chat.$"
 
 gUnknown_841B3D0:: @ 0x841B3D0
@@ -3135,60 +3135,60 @@ gUnknown_841B3D0:: @ 0x841B3D0
 gUnknown_841B3DA:: @ 0x841B3DA
 	.string "{DYNAMIC 0x00}の{DYNAMIC 0x01}ひきめは いません$"
 
-gUnknown_841B3E9:: @ 0x841B3E9
+gText_ExitingTheChat:: @ 0x841B3E9
 	.string "Exiting the chat‥$"
 
-gUnknown_841B3FB:: @ 0x841B3FB
+gText_LeaderHasLeftEndingChat:: @ 0x841B3FB
 	.string "The LEADER, {DYNAMIC 0x00}, has\n"
 	.string "left, ending the chat.$"
 
-gUnknown_841B426:: @ 0x841B426
+gText_RegisteredTextChanged_OKtoSave:: @ 0x841B426
 	.string "The registered text has been changed.\n"
 	.string "Is it okay to save the game?$"
 
-gUnknown_841B469:: @ 0x841B469
+gText_RegisteredTextChanged_AlreadySavedFile:: @ 0x841B469
 	.string "There is already a saved file.\n"
 	.string "Is it okay to overwrite it?$"
 
-gUnknown_841B4A4:: @ 0x841B4A4
+gText_RegisteredTextChanged_SavingDontTurnOff:: @ 0x841B4A4
 	.string "SAVING‥\n"
 	.string "DON'T TURN OFF THE POWER.$"
 
-gUnknown_841B4C6:: @ 0x841B4C6
+gText_RegisteredTextChanged_SavedTheGame:: @ 0x841B4C6
 	.string "{DYNAMIC 0x00} saved the game.$"
 
-gUnknown_841B4D9:: @ 0x841B4D9
+gText_IfLeaderLeavesChatWillEnd:: @ 0x841B4D9
 	.string "If the LEADER leaves, the chat\n"
 	.string "will end. Is that okay?$"
 
-gUnknown_841B510:: @ 841B510
+gText_Hello:: @ 841B510
 	.string "HELLO$"
 
-gUnknown_841B516:: @ 841B516
+gText_Pokemon2:: @ 841B516
 	.string "POKéMON$"
 
-gUnknown_841B51E:: @ 841B51E
+gText_Trade:: @ 841B51E
 	.string "TRADE$"
 
-gUnknown_841B524:: @ 841B524
+gText_Battle:: @ 841B524
 	.string "BATTLE$"
 
-gUnknown_841B52B:: @ 841B52B
+gText_Lets:: @ 841B52B
 	.string "LET'S$"
 
-gUnknown_841B531:: @ 841B531
+gText_Ok:: @ 841B531
 	.string "OK!$"
 
-gUnknown_841B535:: @ 841B535
+gText_Sorry:: @ 841B535
 	.string "SORRY$"
 
-gUnknown_841B53B:: @ 841B53B
+gText_YaySmileEmoji:: @ 841B53B
 	.string "YAY{EXTRA 0xF9}$"
 
-gUnknown_841B541:: @ 841B541
+gText_ThankYou:: @ 841B541
 	.string "THANK YOU$"
 
-gUnknown_841B54B:: @ 841B54B
+gText_ByeBye:: @ 841B54B
 	.string "BYE-BYE!$"
 
 gUnknown_841B554:: @ 841B554
@@ -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/aide.inc b/data/text/aide.inc
new file mode 100644
index 000000000..70bf4aa70
--- /dev/null
+++ b/data/text/aide.inc
@@ -0,0 +1,15 @@
+Aide_Text_HaventCaughtEnoughMonsForItem:: @ 81A58A7
+	.string "Let's see…\n"
+	.string "Uh-oh! You have caught only\l"
+	.string "{STR_VAR_3} kinds of POKéMON!\p"
+	.string "You need {STR_VAR_1} kinds\n"
+	.string "if you want the {STR_VAR_2}.$"
+
+Aide_Text_GetEnoughMonsComeBackForItem:: @ 81A5909
+	.string "…Oh. I see.\p"
+	.string "When you get {STR_VAR_1} kinds of POKéMON,\n"
+	.string "come back for the {STR_VAR_2}.$"
+
+Aide_Text_DontHaveAnyRoomForItem:: @ 81A594D
+	.string "Oh! I see you don't have any\n"
+	.string "room for the {STR_VAR_2}.$"
diff --git a/data/text/fame_checker.inc b/data/text/fame_checker.inc
index 252c5ce7d..88ab9558f 100644
--- a/data/text/fame_checker.inc
+++ b/data/text/fame_checker.inc
@@ -1461,7 +1461,7 @@ gUnknown_81B1A31:: @ 81B1A31
 	.string "be the elder of a famous clan of\l"
 	.string "dragon masters.$"
 
-gUnknown_81B1AB9:: @ 81B1AB9
+PokemonJournal_Text_SpecialFeatureProfOak:: @ 81B1AB9
 	.string "POKéMON JOURNAL\p"
 	.string "Special Feature: PROF. OAK,\n"
 	.string "the POKéMON Researcher!\p"
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
diff --git a/data/union_room_chat.s b/data/union_room_chat.s
deleted file mode 100644
index b61c5f44d..000000000
--- a/data/union_room_chat.s
+++ /dev/null
@@ -1,358 +0,0 @@
-#include "constants/region_map.h"
-#include "constants/flags.h"
-#include "constants/moves.h"
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-	.section .rodata
-	.align 2
-
-gUnknown_845A880:: @ 845A880
-	.4byte sub_8128640
-	.4byte sub_81286C4
-	.4byte sub_81287B4
-	.4byte sub_81288D4
-	.4byte sub_8128DA4
-	.4byte sub_8128E78
-	.4byte sub_8128AA0
-	.4byte sub_8128C04
-	.4byte sub_8128CA8
-	.4byte sub_8128FB8
-
-gUnknown_845A8A8:: @ 845A8A8
-	.byte 0x09, 0x09, 0x09, 0x09
-
-gUnknown_845A8AC:: @ 845A8AC
-	.byte 0x00, 0x16, 0x17, 0x68, 0x19, 0x1a, 0x1b, 0x1c
-	.byte 0x1d, 0x1e, 0x00, 0x20, 0x21, 0x22, 0x23, 0x24
-	.byte 0x25, 0x26, 0x27, 0x28, 0x29, 0x15, 0x01, 0x02
-	.byte 0x00, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x00
-	.byte 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12
-	.byte 0x13, 0x14, 0x2a, 0x2b, 0x2c, 0x2d, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x35, 0x36, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x53, 0x54, 0x55, 0x56, 0x00
-	.byte 0x00, 0x00, 0x6f, 0x5b, 0x5c, 0x5d, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5a
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x84, 0x85, 0x86, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7
-	.byte 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf
-	.byte 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7
-	.byte 0xb8, 0xb9, 0xba, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9
-	.byte 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf, 0xe0, 0xe1
-	.byte 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9
-	.byte 0xea, 0xeb, 0xec, 0xed, 0xee, 0xbb, 0xbc, 0xbd
-	.byte 0xbe, 0xbf, 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5
-	.byte 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd
-	.byte 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xef
-	.byte 0xf0, 0xf4, 0xf5, 0xf6, 0xf1, 0xf2, 0xf3, 0x00
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-
-gUnknown_845A9AC:: @ 845A9AC
-	.4byte gUnknown_847AAC1
-	.4byte gUnknown_847AAC7
-	.4byte gUnknown_847AACD
-	.4byte gUnknown_847AAD3
-	.4byte gUnknown_847AAD9
-	.4byte gUnknown_847AADF
-	.4byte gUnknown_847AAE5
-	.4byte gUnknown_847AAEB
-	.4byte gUnknown_847AAF1
-	.4byte gUnknown_847AAF7
-	.4byte gUnknown_847AAFD
-	.4byte gUnknown_847AB03
-	.4byte gUnknown_847AB09
-	.4byte gUnknown_847AB0F
-	.4byte gUnknown_847AB15
-	.4byte gUnknown_847AB1B
-	.4byte gUnknown_847AB21
-	.4byte gUnknown_847AB27
-	.4byte gUnknown_847AB2D
-	.4byte gUnknown_847AB33
-	.4byte gUnknown_847AB41
-	.4byte gUnknown_847AB4C
-	.4byte gUnknown_847AB57
-	.4byte gUnknown_847AB62
-	.4byte gUnknown_847AB6B
-	.4byte gUnknown_847AB76
-	.4byte gUnknown_847AB81
-	.4byte gUnknown_847AB8C
-	.4byte gUnknown_847AB97
-	.4byte gUnknown_847ABA2
-
-gUnknown_845AA24:: @ 845AA24
-	.incbin "graphics/union_room_chat/unk_845AA24.gbapal"
-
-gUnknown_845AA44:: @ 845AA44
-	.incbin "graphics/union_room_chat/unk_845AA44.gbapal"
-
-gUnknown_845AA64:: @ 845AA64
-	.incbin "graphics/union_room_chat/unk_845AA64.gbapal"
-
-gUnknown_845AA84:: @ 845AA84
-	.4byte 0x00000070
-	@ {
-	@ 	.bg = 0,
-	@ 	.charBaseIndex = 0,
-	@ 	.mapBaseIndex = 7,
-	@ 	.screenSize = 0,
-	@ 	.paletteMode = 0,
-	@ 	.priority = 0,
-	@ 	.baseTile = 0x0000
-	@ }
-	.4byte 0x000011fd
-	@ {
-	@ 	.bg = 1,
-	@ 	.charBaseIndex = 3,
-	@ 	.mapBaseIndex = 31,
-	@ 	.screenSize = 0,
-	@ 	.paletteMode = 0,
-	@ 	.priority = 1,
-	@ 	.baseTile = 0x0000
-	@ }
-	.4byte 0x0000217a
-	@ {
-	@ 	.bg = 2,
-	@ 	.charBaseIndex = 2,
-	@ 	.mapBaseIndex = 23,
-	@ 	.screenSize = 0,
-	@ 	.paletteMode = 0,
-	@ 	.priority = 2,
-	@ 	.baseTile = 0x0000
-	@ }
-	.4byte 0x000070f7
-	@ {
-	@ 	.bg = 3,
-	@ 	.charBaseIndex = 1,
-	@ 	.mapBaseIndex = 15,
-	@ 	.screenSize = 0,
-	@ 	.paletteMode = 0,
-	@ 	.priority = 3,
-	@ 	.baseTile = 0x0001
-	@ }
-
-gUnknown_845AA94:: @ 845AA94
-	.byte 3, 8, 1, 21, 19, 15
-	.2byte 0x0001
-	.byte 1, 9, 18, 15, 2, 12
-	.2byte 0x007a
-	.byte 1, 0, 2, 6, 15, 7
-	.2byte 0x0020
-	.byte 0, 1, 2, 7, 9, 14
-	.2byte 0x0013
-	.byte 255, 0, 0, 0, 0, 0
-	.2byte 0x0000
-
-gUnknown_845AABC:: @ 845AABC
-	.2byte 0x00
-	.align 2
-	.4byte sub_8129CA0
-	.2byte 0x03
-	.align 2
-	.4byte sub_8129D40
-	.2byte 0x04
-	.align 2
-	.4byte sub_8129D78
-	.2byte 0x05
-	.align 2
-	.4byte sub_8129DB0
-	.2byte 0x01
-	.align 2
-	.4byte sub_8129E1C
-	.2byte 0x06
-	.align 2
-	.4byte sub_8129E28
-	.2byte 0x07
-	.align 2
-	.4byte sub_8129E74
-	.2byte 0x08
-	.align 2
-	.4byte sub_8129EB8
-	.2byte 0x09
-	.align 2
-	.4byte sub_8129F24
-	.2byte 0x0a
-	.align 2
-	.4byte sub_8129FCC
-	.2byte 0x0b
-	.align 2
-	.4byte sub_812A074
-	.2byte 0x0c
-	.align 2
-	.4byte sub_812A0B0
-	.2byte 0x02
-	.align 2
-	.4byte sub_812A18C
-	.2byte 0x0d
-	.align 2
-	.4byte sub_812A1B8
-	.2byte 0x12
-	.align 2
-	.4byte sub_812A1FC
-	.2byte 0x13
-	.align 2
-	.4byte sub_812A240
-	.2byte 0x0e
-	.align 2
-	.4byte sub_812A294
-	.2byte 0x0f
-	.align 2
-	.4byte sub_812A2E4
-	.2byte 0x10
-	.align 2
-	.4byte sub_812A334
-	.2byte 0x11
-	.align 2
-	.4byte sub_812A378
-	.2byte 0x14
-	.align 2
-	.4byte sub_812A3D0
-
-gUnknown_845AB64:: @ 845AB64
-	.4byte gUnknown_841B366
-	.byte 0x01, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00
-	.align 2
-	.4byte gUnknown_841B375
-	.byte 0x01, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00
-	.align 2
-	.4byte gUnknown_841B38A
-	.byte 0x01, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00
-	.align 2
-	.4byte gUnknown_841B39E
-	.byte 0x01, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00
-	.align 2
-	.4byte gUnknown_841B3E9
-	.byte 0x02, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00
-	.align 2
-	.4byte gUnknown_841B3FB
-	.byte 0x02, 0x00, 0x00, 0x00, 0x02, 0x01, 0x00
-	.align 2
-	.4byte gUnknown_841B426
-	.byte 0x02, 0x00, 0x00, 0x01, 0x02, 0x00, 0x01
-	.align 2
-	.4byte gUnknown_841B469
-	.byte 0x02, 0x00, 0x00, 0x01, 0x02, 0x00, 0x01
-	.align 2
-	.4byte gUnknown_841B4A4
-	.byte 0x02, 0x00, 0x00, 0x01, 0x02, 0x00, 0x01
-	.align 2
-	.4byte gUnknown_841B4C6
-	.byte 0x02, 0x00, 0x00, 0x01, 0x02, 0x01, 0x01
-	.align 2
-	.4byte gUnknown_841B4D9
-	.byte 0x02, 0x00, 0x00, 0x01, 0x02, 0x00, 0x01
-	.align 2
-
-gUnknown_845ABE8:: @ 845ABE8
-	.string "…$"
-
-	.align 2
-gUnknown_845ABEC:: @ 845ABEC
-	.4byte gUnknown_841B33D, 0
-	.4byte gUnknown_841B343, 0
-	.4byte gUnknown_841B350, 0
-	.4byte gUnknown_841B358, 0
-	.4byte gUnknown_841B361, 0
-
-gUnknown_845AC14:: @ 845AC14
-	.incbin "graphics/union_room_chat/unk_845AC14.gbapal"
-
-gUnknown_845AC34::
-	.incbin "graphics/union_room_chat/unk_845AC34.4bpp.lz"
-
-gUnknown_845AEB8::
-	.incbin "graphics/union_room_chat/unk_845AEB8.4bpp.lz"
-
-gUnknown_845AED8::
-	.incbin "graphics/union_room_chat/unk_845AED8.4bpp.lz"
-
-gUnknown_845AF04::
-	.incbin "graphics/union_room_chat/unk_845AF04.4bpp.lz"
-
-gUnknown_845AF58:: @ 845AF58
-	obj_tiles gUnknown_845AC34, 0x1000, 0
-	obj_tiles gUnknown_845AED8, 0x0040, 1
-	obj_tiles gUnknown_845AEB8, 0x0040, 2
-	obj_tiles gUnknown_845AF04, 0x0080, 3
-	obj_tiles gUnknown_8EA1A50, 0x0400, 4
-
-gUnknown_845AF80:: @ 845AF80
-	obj_pal gUnknown_845AC14, 0
-
-gOamData_845AF88::
-	.4byte 0xc0004000, 0x00000400
-
-gAnimCmd_845AF90::
-	obj_image_anim_frame 0x0000, 30
-	obj_image_anim_end
-
-gAnimCmd_845AF98::
-	obj_image_anim_frame 0x0020, 30
-	obj_image_anim_end
-
-gAnimCmd_845AFA0::
-	obj_image_anim_frame 0x0040, 30
-	obj_image_anim_end
-
-gAnimCmd_845AFA8::
-	obj_image_anim_frame 0x0060, 30
-	obj_image_anim_end
-
-gSpriteAnimTable_845AFB0::
-	.4byte gAnimCmd_845AF90
-	.4byte gAnimCmd_845AF98
-	.4byte gAnimCmd_845AFA0
-	.4byte gAnimCmd_845AFA8
-
-gUnknown_845AFC0:: @ 845AFC0
-	spr_template 0, 0, gOamData_845AF88, gSpriteAnimTable_845AFB0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-gOamData_845AFD8::
-	.4byte 0x00008000, 0x00000800
-
-gUnknown_845AFE0:: @ 845AFE0
-	spr_template 2, 0, gOamData_845AFD8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_812B09C
-
-gUnknown_845AFF8:: @ 845AFF8
-	spr_template 1, 0, gOamData_845AFD8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_812B0D4
-
-gOamData_845B010::
-	.4byte 0x40000000, 0x00000800
-
-gOamData_845B018::
-	.4byte 0x80004000, 0x00000800
-
-gAnimCmd_845B020::
-	obj_image_anim_frame 0x0000, 2
-	obj_image_anim_end
-
-gAnimCmd_845B028::
-	obj_image_anim_frame 0x0008, 2
-	obj_image_anim_end
-
-gAnimCmd_845B030::
-	obj_image_anim_frame 0x0010, 2
-	obj_image_anim_end
-
-gAnimCmd_845B038::
-	obj_image_anim_frame 0x0018, 2
-	obj_image_anim_end
-
-gSpriteAnimTable_845B040::
-	.4byte gAnimCmd_845B020
-	.4byte gAnimCmd_845B028
-	.4byte gAnimCmd_845B030
-	.4byte gAnimCmd_845B038
-
-gUnknown_845B050:: @ 845B050
-	spr_template 3, 0, gOamData_845B010, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-gUnknown_845B068:: @ 845B068
-	spr_template 4, 0, gOamData_845B018, gSpriteAnimTable_845B040, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy