Document Pokemon Tower scripts

25 files changed, 279 insertions, 278 deletions

diff --git a/data/maps/PokemonTower_1F/map.json b/data/maps/PokemonTower_1F/map.json
index e61eac230..8824c0f00 100644
--- a/data/maps/PokemonTower_1F/map.json
+++ b/data/maps/PokemonTower_1F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "PokemonTower_1F_EventScript_16327C",
+      "script": "PokemonTower_1F_EventScript_WorkerF",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "PokemonTower_1F_EventScript_16323F",
+      "script": "PokemonTower_1F_EventScript_Channeler",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "PokemonTower_1F_EventScript_163248",
+      "script": "PokemonTower_1F_EventScript_Woman1",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "PokemonTower_1F_EventScript_16325A",
+      "script": "PokemonTower_1F_EventScript_Woman2",
       "flag": "0"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 2,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "PokemonTower_1F_EventScript_163251",
+      "script": "PokemonTower_1F_EventScript_BaldingMan",
       "flag": "0"
     }
   ],
diff --git a/data/maps/PokemonTower_1F/scripts.inc b/data/maps/PokemonTower_1F/scripts.inc
index 84509e616..aa84c96c7 100644
--- a/data/maps/PokemonTower_1F/scripts.inc
+++ b/data/maps/PokemonTower_1F/scripts.inc
@@ -6,33 +6,33 @@ PokemonTower_1F_OnTransition:: @ 816323B
 	setworldmapflag FLAG_WORLD_MAP_POKEMON_TOWER_1F
 	end
 
-PokemonTower_1F_EventScript_16323F:: @ 816323F
-	msgbox gUnknown_8179CAB, MSGBOX_NPC
+PokemonTower_1F_EventScript_Channeler:: @ 816323F
+	msgbox PokemonTower_1F_Text_SenseSpiritsUpToMischief, MSGBOX_NPC
 	end
 
-PokemonTower_1F_EventScript_163248:: @ 8163248
-	msgbox gUnknown_8179C8C, MSGBOX_NPC
+PokemonTower_1F_EventScript_Woman1:: @ 8163248
+	msgbox PokemonTower_1F_Text_GrowlitheWhyDidYouDie, MSGBOX_NPC
 	end
 
-PokemonTower_1F_EventScript_163251:: @ 8163251
-	msgbox gUnknown_8179C41, MSGBOX_NPC
+PokemonTower_1F_EventScript_BaldingMan:: @ 8163251
+	msgbox PokemonTower_1F_Text_CameToPrayForDepartedClefairy, MSGBOX_NPC
 	end
 
-PokemonTower_1F_EventScript_16325A:: @ 816325A
+PokemonTower_1F_EventScript_Woman2:: @ 816325A
 	lock
 	faceplayer
 	checkplayergender
 	compare VAR_RESULT, MALE
-	goto_if_eq EventScript_163272
-	msgbox gUnknown_8179BFC
+	goto_if_eq PokemonTower_1F_EventScript_Woman2MalePlayer
+	msgbox PokemonTower_1F_Text_ComeToPayRespectsGirl
 	release
 	end
 
-EventScript_163272:: @ 8163272
-	msgbox gUnknown_8179BB8
+PokemonTower_1F_EventScript_Woman2MalePlayer:: @ 8163272
+	msgbox PokemonTower_1F_Text_ComeToPayRespectsSon
 	release
 	end
 
-PokemonTower_1F_EventScript_16327C:: @ 816327C
-	msgbox gUnknown_8179B7A, MSGBOX_NPC
+PokemonTower_1F_EventScript_WorkerF:: @ 816327C
+	msgbox PokemonTower_1F_Text_ErectedInMemoryOfDeadMons, MSGBOX_NPC
 	end
diff --git a/data/maps/PokemonTower_1F/text.inc b/data/maps/PokemonTower_1F/text.inc
index 33aca9fb7..04ba0d5fa 100644
--- a/data/maps/PokemonTower_1F/text.inc
+++ b/data/maps/PokemonTower_1F/text.inc
@@ -1,28 +1,28 @@
-gUnknown_8179B7A:: @ 8179B7A
+PokemonTower_1F_Text_ErectedInMemoryOfDeadMons:: @ 8179B7A
     .string "POKéMON TOWER was erected in the\n"
     .string "memory of POKéMON that died.$"
 
-gUnknown_8179BB8:: @ 8179BB8
+PokemonTower_1F_Text_ComeToPayRespectsSon:: @ 8179BB8
     .string "Did you come to pay respects?\p"
     .string "Bless your POKéMON-loving heart,\n"
     .string "son.$"
 
-gUnknown_8179BFC:: @ 8179BFC
+PokemonTower_1F_Text_ComeToPayRespectsGirl:: @ 8179BFC
     .string "Did you come to pay respects?\p"
     .string "Bless your POKéMON-loving heart,\n"
     .string "girl.$"
 
-gUnknown_8179C41:: @ 8179C41
+PokemonTower_1F_Text_CameToPrayForDepartedClefairy:: @ 8179C41
     .string "I came to pray for my dearly\n"
     .string "departed CLEFAIRY.\p"
     .string "Sniff!\n"
     .string "I'm awash in tears…$"
 
-gUnknown_8179C8C:: @ 8179C8C
+PokemonTower_1F_Text_GrowlitheWhyDidYouDie:: @ 8179C8C
     .string "My GROWLITHE…\n"
     .string "Why did you die?$"
 
-gUnknown_8179CAB:: @ 8179CAB
+PokemonTower_1F_Text_SenseSpiritsUpToMischief:: @ 8179CAB
     .string "I am a CHANNELER.\p"
     .string "There are spirits up to mischief.\n"
     .string "I sense them high in the TOWER.$"
diff --git a/data/maps/PokemonTower_2F/map.json b/data/maps/PokemonTower_2F/map.json
index a5d1e6178..d25fb4c30 100644
--- a/data/maps/PokemonTower_2F/map.json
+++ b/data/maps/PokemonTower_2F/map.json
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "PokemonTower_2F_EventScript_163286",
+      "script": "PokemonTower_2F_EventScript_Channeler",
       "flag": "0"
     }
   ],
@@ -64,7 +64,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_POKEMON_TOWER_2F",
       "var_value": 0,
-      "script": "PokemonTower_2F_EventScript_16328F"
+      "script": "PokemonTower_2F_EventScript_RivalTriggerRight"
     },
     {
       "type": "trigger",
@@ -73,7 +73,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_POKEMON_TOWER_2F",
       "var_value": 0,
-      "script": "PokemonTower_2F_EventScript_16329B"
+      "script": "PokemonTower_2F_EventScript_RivalTriggerDown"
     }
   ],
   "bg_events": []
diff --git a/data/maps/PokemonTower_2F/scripts.inc b/data/maps/PokemonTower_2F/scripts.inc
index 7180936fb..0042290c1 100644
--- a/data/maps/PokemonTower_2F/scripts.inc
+++ b/data/maps/PokemonTower_2F/scripts.inc
@@ -1,48 +1,48 @@
 PokemonTower_2F_MapScripts:: @ 8163285
 	.byte 0
 
-PokemonTower_2F_EventScript_163286:: @ 8163286
-	msgbox gUnknown_8179EAE, MSGBOX_NPC
+PokemonTower_2F_EventScript_Channeler:: @ 8163286
+	msgbox PokemonTower_2F_Text_SilphScopeCouldUnmaskGhosts, MSGBOX_NPC
 	end
 
-PokemonTower_2F_EventScript_16328F:: @ 816328F
+PokemonTower_2F_EventScript_RivalTriggerRight:: @ 816328F
 	lockall
 	setvar VAR_TEMP_1, 0
-	goto EventScript_1632A7
+	goto PokemonTower_2F_EventScript_Rival
 	end
 
-PokemonTower_2F_EventScript_16329B:: @ 816329B
+PokemonTower_2F_EventScript_RivalTriggerDown:: @ 816329B
 	lockall
 	setvar VAR_TEMP_1, 1
-	goto EventScript_1632A7
+	goto PokemonTower_2F_EventScript_Rival
 	end
 
-EventScript_1632A7:: @ 81632A7
+PokemonTower_2F_EventScript_Rival:: @ 81632A7
 	textcolor 0
 	playbgm MUS_RIVAL1, 0
 	compare VAR_TEMP_1, 0
-	call_if_eq EventScript_163339
+	call_if_eq PokemonTower_2F_EventScript_RivalFacePlayerRight
 	compare VAR_TEMP_1, 1
-	call_if_eq EventScript_16334B
+	call_if_eq PokemonTower_2F_EventScript_RivalFacePlayerDown
 	applymovement 1, Movement_ExclamationMark
 	waitmovement 0
 	applymovement 1, Movement_Delay48
 	waitmovement 0
-	msgbox gUnknown_8179CFF
+	msgbox PokemonTower_2F_Text_RivalIntro
 	setvar VAR_LAST_TALKED, 1
 	compare VAR_STARTER_MON, 2
-	call_if_eq EventScript_16335D
+	call_if_eq PokemonTower_2F_EventScript_RivalSquirtle
 	compare VAR_STARTER_MON, 1
-	call_if_eq EventScript_163368
+	call_if_eq PokemonTower_2F_EventScript_RivalBulbasaur
 	compare VAR_STARTER_MON, 0
-	call_if_eq EventScript_163373
-	msgbox gUnknown_8179DD4
+	call_if_eq PokemonTower_2F_EventScript_RivalCharmander
+	msgbox PokemonTower_2F_Text_RivalPostBattle
 	closemessage
 	playbgm MUS_RIVAL2, 0
 	compare VAR_TEMP_1, 0
-	call_if_eq EventScript_16337E
+	call_if_eq PokemonTower_2F_EventScript_RivalExitRight
 	compare VAR_TEMP_1, 1
-	call_if_eq EventScript_163389
+	call_if_eq PokemonTower_2F_EventScript_RivalExitDown
 	playse SE_KAIDAN
 	delay 25
 	fadedefaultbgm
@@ -51,41 +51,41 @@ EventScript_1632A7:: @ 81632A7
 	releaseall
 	end
 
-EventScript_163339:: @ 8163339
+PokemonTower_2F_EventScript_RivalFacePlayerRight:: @ 8163339
 	applymovement 1, Movement_WalkInPlaceFastestRight
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
-EventScript_16334B:: @ 816334B
+PokemonTower_2F_EventScript_RivalFacePlayerDown:: @ 816334B
 	applymovement 1, Movement_WalkInPlaceFastestDown
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	return
 
-EventScript_16335D:: @ 816335D
-	trainerbattle_no_intro TRAINER_RIVAL_POKENON_TOWER_SQUIRTLE, Text_179D73
+PokemonTower_2F_EventScript_RivalSquirtle:: @ 816335D
+	trainerbattle_no_intro TRAINER_RIVAL_POKENON_TOWER_SQUIRTLE, PokemonTower_2F_Text_RivalDefeat
 	return
 
-EventScript_163368:: @ 8163368
-	trainerbattle_no_intro TRAINER_RIVAL_POKENON_TOWER_BULBASAUR, Text_179D73
+PokemonTower_2F_EventScript_RivalBulbasaur:: @ 8163368
+	trainerbattle_no_intro TRAINER_RIVAL_POKENON_TOWER_BULBASAUR, PokemonTower_2F_Text_RivalDefeat
 	return
 
-EventScript_163373:: @ 8163373
-	trainerbattle_no_intro TRAINER_RIVAL_POKENON_TOWER_CHARMANDER, Text_179D73
+PokemonTower_2F_EventScript_RivalCharmander:: @ 8163373
+	trainerbattle_no_intro TRAINER_RIVAL_POKENON_TOWER_CHARMANDER, PokemonTower_2F_Text_RivalDefeat
 	return
 
-EventScript_16337E:: @ 816337E
-	applymovement 1, Movement_163394
+PokemonTower_2F_EventScript_RivalExitRight:: @ 816337E
+	applymovement 1, PokemonTower_2F_Movement_RivalExitRight
 	waitmovement 0
 	return
 
-EventScript_163389:: @ 8163389
-	applymovement 1, Movement_16339D
+PokemonTower_2F_EventScript_RivalExitDown:: @ 8163389
+	applymovement 1, PokemonTower_2F_Movement_RivalExitDown
 	waitmovement 0
 	return
 
-Movement_163394:: @ 8163394
+PokemonTower_2F_Movement_RivalExitRight:: @ 8163394
 	walk_down
 	walk_right
 	walk_right
@@ -96,7 +96,7 @@ Movement_163394:: @ 8163394
 	walk_in_place_fastest_right
 	step_end
 
-Movement_16339D:: @ 816339D
+PokemonTower_2F_Movement_RivalExitDown:: @ 816339D
 	walk_right
 	walk_right
 	walk_down
diff --git a/data/maps/PokemonTower_2F/text.inc b/data/maps/PokemonTower_2F/text.inc
index b45235d7d..d75695980 100644
--- a/data/maps/PokemonTower_2F/text.inc
+++ b/data/maps/PokemonTower_2F/text.inc
@@ -1,4 +1,4 @@
-gUnknown_8179CFF:: @ 8179CFF
+PokemonTower_2F_Text_RivalIntro:: @ 8179CFF
     .string "{RIVAL}: Hey, {PLAYER}!\n"
     .string "What brings you here?\l"
     .string "Is your POKéMON dead?\p"
@@ -6,18 +6,18 @@ gUnknown_8179CFF:: @ 8179CFF
     .string "I can at least make them faint!\n"
     .string "Let's go!$"
 
-Text_179D73:: @ 8179D73
+PokemonTower_2F_Text_RivalDefeat:: @ 8179D73
     .string "What?\n"
     .string "You stinker!\p"
     .string "I took it easy on you, too!$"
 
-Text_179DA2:: @ 8179DA2
+PokemonTower_2F_Text_179DA2:: @ 8179DA2
     .string "{RIVAL}“あーあ‥！\n"
     .string "ほんとに　くたばっちまったぞ！\l"
     .string "よわいなー！\l"
     .string "もっと　ちゃんと　そだてて　やれよ$"
 
-gUnknown_8179DD4:: @ 8179DD4
+PokemonTower_2F_Text_RivalPostBattle:: @ 8179DD4
     .string "How's your POKéDEX coming?\n"
     .string "I just caught a CUBONE!\p"
     .string "I can't find the bigger MAROWAK.\n"
@@ -28,7 +28,7 @@ gUnknown_8179DD4:: @ 8179DD4
     .string "unlike you.\p"
     .string "Smell ya later!$"
 
-gUnknown_8179EAE:: @ 8179EAE
+PokemonTower_2F_Text_SilphScopeCouldUnmaskGhosts:: @ 8179EAE
     .string "Even we could not identify the\n"
     .string "wayward ghosts.\p"
     .string "A SILPH SCOPE might be able to\n"
diff --git a/data/maps/PokemonTower_3F/map.json b/data/maps/PokemonTower_3F/map.json
index dc1304400..0952ea0e2 100644
--- a/data/maps/PokemonTower_3F/map.json
+++ b/data/maps/PokemonTower_3F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "PokemonTower_3F_EventScript_1633A7",
+      "script": "PokemonTower_3F_EventScript_Patricia",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "PokemonTower_3F_EventScript_1633BE",
+      "script": "PokemonTower_3F_EventScript_Carly",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "PokemonTower_3F_EventScript_1633D5",
+      "script": "PokemonTower_3F_EventScript_Hope",
       "flag": "0"
     },
     {
diff --git a/data/maps/PokemonTower_3F/scripts.inc b/data/maps/PokemonTower_3F/scripts.inc
index a6a278554..5432268b2 100644
--- a/data/maps/PokemonTower_3F/scripts.inc
+++ b/data/maps/PokemonTower_3F/scripts.inc
@@ -1,17 +1,17 @@
 PokemonTower_3F_MapScripts:: @ 81633A6
 	.byte 0
 
-PokemonTower_3F_EventScript_1633A7:: @ 81633A7
-	trainerbattle_single TRAINER_CHANNELER_PATRICIA, Text_179FA0, Text_179FBC
-	msgbox gUnknown_8179FD3, MSGBOX_AUTOCLOSE
+PokemonTower_3F_EventScript_Patricia:: @ 81633A7
+	trainerbattle_single TRAINER_CHANNELER_PATRICIA, PokemonTower_3F_Text_PatriciaIntro, PokemonTower_3F_Text_PatriciaDefeat
+	msgbox PokemonTower_3F_Text_PatriciaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-PokemonTower_3F_EventScript_1633BE:: @ 81633BE
-	trainerbattle_single TRAINER_CHANNELER_CARLY, Text_179F62, Text_179F72
-	msgbox gUnknown_8179F88, MSGBOX_AUTOCLOSE
+PokemonTower_3F_EventScript_Carly:: @ 81633BE
+	trainerbattle_single TRAINER_CHANNELER_CARLY, PokemonTower_3F_Text_CarlyIntro, PokemonTower_3F_Text_CarlyDefeat
+	msgbox PokemonTower_3F_Text_CarlyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-PokemonTower_3F_EventScript_1633D5:: @ 81633D5
-	trainerbattle_single TRAINER_CHANNELER_HOPE, Text_179F09, Text_179F21
-	msgbox gUnknown_8179F31, MSGBOX_AUTOCLOSE
+PokemonTower_3F_EventScript_Hope:: @ 81633D5
+	trainerbattle_single TRAINER_CHANNELER_HOPE, PokemonTower_3F_Text_HopeIntro, PokemonTower_3F_Text_HopeDefeat
+	msgbox PokemonTower_3F_Text_HopePostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/PokemonTower_3F/text.inc b/data/maps/PokemonTower_3F/text.inc
index 49388655d..2df4ad713 100644
--- a/data/maps/PokemonTower_3F/text.inc
+++ b/data/maps/PokemonTower_3F/text.inc
@@ -1,36 +1,36 @@
-Text_179F09:: @ 8179F09
+PokemonTower_3F_Text_HopeIntro:: @ 8179F09
     .string "Urrg… Awaa…\n"
     .string "Huhu… Graa…$"
 
-Text_179F21:: @ 8179F21
+PokemonTower_3F_Text_HopeDefeat:: @ 8179F21
     .string "Hwa!\n"
     .string "I'm saved!$"
 
-gUnknown_8179F31:: @ 8179F31
+PokemonTower_3F_Text_HopePostBattle:: @ 8179F31
     .string "The ghosts can be identified by\n"
     .string "the SILPH SCOPE.$"
 
-Text_179F62:: @ 8179F62
+PokemonTower_3F_Text_CarlyIntro:: @ 8179F62
     .string "Kekeke…\n"
     .string "Kwaaah!$"
 
-Text_179F72:: @ 8179F72
+PokemonTower_3F_Text_CarlyDefeat:: @ 8179F72
     .string "Hmm?\n"
     .string "What am I doing?$"
 
-gUnknown_8179F88:: @ 8179F88
+PokemonTower_3F_Text_CarlyPostBattle:: @ 8179F88
     .string "Sorry!\n"
     .string "I was possessed!$"
 
-Text_179FA0:: @ 8179FA0
+PokemonTower_3F_Text_PatriciaIntro:: @ 8179FA0
     .string "Be gone!\n"
     .string "Malevolent spirit!$"
 
-Text_179FBC:: @ 8179FBC
+PokemonTower_3F_Text_PatriciaDefeat:: @ 8179FBC
     .string "Whew!\n"
     .string "The spirit left!$"
 
-gUnknown_8179FD3:: @ 8179FD3
+PokemonTower_3F_Text_PatriciaPostBattle:: @ 8179FD3
     .string "The others above…\n"
     .string "They must have been possessed.$"
 
diff --git a/data/maps/PokemonTower_4F/map.json b/data/maps/PokemonTower_4F/map.json
index 73fec4fc6..4e0a22b9f 100644
--- a/data/maps/PokemonTower_4F/map.json
+++ b/data/maps/PokemonTower_4F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "PokemonTower_4F_EventScript_163404",
+      "script": "PokemonTower_4F_EventScript_Laurel",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 5,
-      "script": "PokemonTower_4F_EventScript_16341B",
+      "script": "PokemonTower_4F_EventScript_Jody",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "PokemonTower_4F_EventScript_1633ED",
+      "script": "PokemonTower_4F_EventScript_Paula",
       "flag": "0"
     },
     {
diff --git a/data/maps/PokemonTower_4F/scripts.inc b/data/maps/PokemonTower_4F/scripts.inc
index 238e600e7..126cc33ef 100644
--- a/data/maps/PokemonTower_4F/scripts.inc
+++ b/data/maps/PokemonTower_4F/scripts.inc
@@ -1,17 +1,17 @@
 PokemonTower_4F_MapScripts:: @ 81633EC
 	.byte 0
 
-PokemonTower_4F_EventScript_1633ED:: @ 81633ED
-	trainerbattle_single TRAINER_CHANNELER_PAULA, Text_17A004, Text_17A017
-	msgbox gUnknown_817A02B, MSGBOX_AUTOCLOSE
+PokemonTower_4F_EventScript_Paula:: @ 81633ED
+	trainerbattle_single TRAINER_CHANNELER_PAULA, PokemonTower_4F_Text_PaulaIntro, PokemonTower_4F_Text_PaulaDefeat
+	msgbox PokemonTower_4F_Text_PaulaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-PokemonTower_4F_EventScript_163404:: @ 8163404
-	trainerbattle_single TRAINER_CHANNELER_LAUREL, Text_17A046, Text_17A061
-	msgbox gUnknown_817A067, MSGBOX_AUTOCLOSE
+PokemonTower_4F_EventScript_Laurel:: @ 8163404
+	trainerbattle_single TRAINER_CHANNELER_LAUREL, PokemonTower_4F_Text_LaurelIntro, PokemonTower_4F_Text_LaurelDefeat
+	msgbox PokemonTower_4F_Text_LaurelPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-PokemonTower_4F_EventScript_16341B:: @ 816341B
-	trainerbattle_single TRAINER_CHANNELER_JODY, Text_17A096, Text_17A0AB
-	msgbox gUnknown_817A0BB, MSGBOX_AUTOCLOSE
+PokemonTower_4F_EventScript_Jody:: @ 816341B
+	trainerbattle_single TRAINER_CHANNELER_JODY, PokemonTower_4F_Text_JodyIntro, PokemonTower_4F_Text_JodyDefeat
+	msgbox PokemonTower_4F_Text_JodyPostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/PokemonTower_4F/text.inc b/data/maps/PokemonTower_4F/text.inc
index 69a18a2f6..78692d6b5 100644
--- a/data/maps/PokemonTower_4F/text.inc
+++ b/data/maps/PokemonTower_4F/text.inc
@@ -1,33 +1,33 @@
-Text_17A004:: @ 817A004
+PokemonTower_4F_Text_PaulaIntro:: @ 817A004
     .string "Ghost! No!\n"
     .string "Kwaaah!$"
 
-Text_17A017:: @ 817A017
+PokemonTower_4F_Text_PaulaDefeat:: @ 817A017
     .string "Where is the ghost?$"
 
-gUnknown_817A02B:: @ 817A02B
+PokemonTower_4F_Text_PaulaPostBattle:: @ 817A02B
     .string "I must have been dreaming…$"
 
-Text_17A046:: @ 817A046
+PokemonTower_4F_Text_LaurelIntro:: @ 817A046
     .string "Be cursed with me!\n"
     .string "Kwaaah!$"
 
-Text_17A061:: @ 817A061
+PokemonTower_4F_Text_LaurelDefeat:: @ 817A061
     .string "What!$"
 
-gUnknown_817A067:: @ 817A067
+PokemonTower_4F_Text_LaurelPostBattle:: @ 817A067
     .string "We can't determine the identity of\n"
     .string "the ghosts…$"
 
-Text_17A096:: @ 817A096
+PokemonTower_4F_Text_JodyIntro:: @ 817A096
     .string "Huhuhu…\n"
     .string "Beat me not!$"
 
-Text_17A0AB:: @ 817A0AB
+PokemonTower_4F_Text_JodyDefeat:: @ 817A0AB
     .string "Huh?\n"
     .string "Who? What?$"
 
-gUnknown_817A0BB:: @ 817A0BB
+PokemonTower_4F_Text_JodyPostBattle:: @ 817A0BB
     .string "May the departed POKéMON rest in\n"
     .string "peace…$"
 
diff --git a/data/maps/PokemonTower_5F/map.json b/data/maps/PokemonTower_5F/map.json
index 56cc9b30b..08166799d 100644
--- a/data/maps/PokemonTower_5F/map.json
+++ b/data/maps/PokemonTower_5F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "PokemonTower_5F_EventScript_163472",
+      "script": "PokemonTower_5F_EventScript_Ruth",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "PokemonTower_5F_EventScript_16345B",
+      "script": "PokemonTower_5F_EventScript_Tammy",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "PokemonTower_5F_EventScript_163489",
+      "script": "PokemonTower_5F_EventScript_Karina",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "PokemonTower_5F_EventScript_1634A0",
+      "script": "PokemonTower_5F_EventScript_Janae",
       "flag": "0"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "PokemonTower_5F_EventScript_163433",
+      "script": "PokemonTower_5F_EventScript_Channeler",
       "flag": "0"
     },
     {
@@ -129,7 +129,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": 0,
-      "script": "PokemonTower_5F_EventScript_16343C"
+      "script": "PokemonTower_5F_EventScript_PurifiedZone"
     },
     {
       "type": "trigger",
@@ -138,7 +138,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": 0,
-      "script": "PokemonTower_5F_EventScript_16343C"
+      "script": "PokemonTower_5F_EventScript_PurifiedZone"
     },
     {
       "type": "trigger",
@@ -147,7 +147,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": 0,
-      "script": "PokemonTower_5F_EventScript_16343C"
+      "script": "PokemonTower_5F_EventScript_PurifiedZone"
     },
     {
       "type": "trigger",
@@ -156,7 +156,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": 0,
-      "script": "PokemonTower_5F_EventScript_16343C"
+      "script": "PokemonTower_5F_EventScript_PurifiedZone"
     },
     {
       "type": "trigger",
@@ -165,7 +165,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": 1,
-      "script": "PokemonTower_5F_EventScript_163453"
+      "script": "PokemonTower_5F_EventScript_ExitPurifiedZone"
     },
     {
       "type": "trigger",
@@ -174,7 +174,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": 0,
-      "script": "PokemonTower_5F_EventScript_16343C"
+      "script": "PokemonTower_5F_EventScript_PurifiedZone"
     },
     {
       "type": "trigger",
@@ -183,7 +183,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": 0,
-      "script": "PokemonTower_5F_EventScript_16343C"
+      "script": "PokemonTower_5F_EventScript_PurifiedZone"
     },
     {
       "type": "trigger",
@@ -192,7 +192,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": 0,
-      "script": "PokemonTower_5F_EventScript_16343C"
+      "script": "PokemonTower_5F_EventScript_PurifiedZone"
     },
     {
       "type": "trigger",
@@ -201,7 +201,7 @@
       "elevation": 0,
       "var": "VAR_TEMP_1",
       "var_value": 0,
-      "script": "PokemonTower_5F_EventScript_16343C"
+      "script": "PokemonTower_5F_EventScript_PurifiedZone"
     },
     {
       "type": "trigger",
@@ -210,7 +210,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": 1,
-      "script": "PokemonTower_5F_EventScript_163453"
+      "script": "PokemonTower_5F_EventScript_ExitPurifiedZone"
     },
     {
       "type": "trigger",
@@ -219,7 +219,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": 1,
-      "script": "PokemonTower_5F_EventScript_163453"
+      "script": "PokemonTower_5F_EventScript_ExitPurifiedZone"
     },
     {
       "type": "trigger",
@@ -228,7 +228,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": 1,
-      "script": "PokemonTower_5F_EventScript_163453"
+      "script": "PokemonTower_5F_EventScript_ExitPurifiedZone"
     },
     {
       "type": "trigger",
@@ -237,7 +237,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": 1,
-      "script": "PokemonTower_5F_EventScript_163453"
+      "script": "PokemonTower_5F_EventScript_ExitPurifiedZone"
     },
     {
       "type": "trigger",
@@ -246,7 +246,7 @@
       "elevation": 0,
       "var": "VAR_TEMP_1",
       "var_value": 1,
-      "script": "PokemonTower_5F_EventScript_163453"
+      "script": "PokemonTower_5F_EventScript_ExitPurifiedZone"
     },
     {
       "type": "trigger",
@@ -255,7 +255,7 @@
       "elevation": 0,
       "var": "VAR_TEMP_1",
       "var_value": 1,
-      "script": "PokemonTower_5F_EventScript_163453"
+      "script": "PokemonTower_5F_EventScript_ExitPurifiedZone"
     },
     {
       "type": "trigger",
@@ -264,7 +264,7 @@
       "elevation": 0,
       "var": "VAR_TEMP_1",
       "var_value": 1,
-      "script": "PokemonTower_5F_EventScript_163453"
+      "script": "PokemonTower_5F_EventScript_ExitPurifiedZone"
     },
     {
       "type": "trigger",
@@ -273,7 +273,7 @@
       "elevation": 0,
       "var": "VAR_TEMP_1",
       "var_value": 1,
-      "script": "PokemonTower_5F_EventScript_163453"
+      "script": "PokemonTower_5F_EventScript_ExitPurifiedZone"
     }
   ],
   "bg_events": [
diff --git a/data/maps/PokemonTower_5F/scripts.inc b/data/maps/PokemonTower_5F/scripts.inc
index 4f9145909..a21caf79e 100644
--- a/data/maps/PokemonTower_5F/scripts.inc
+++ b/data/maps/PokemonTower_5F/scripts.inc
@@ -1,42 +1,42 @@
 PokemonTower_5F_MapScripts:: @ 8163432
 	.byte 0
 
-PokemonTower_5F_EventScript_163433:: @ 8163433
-	msgbox gUnknown_817A0E3, MSGBOX_NPC
+PokemonTower_5F_EventScript_Channeler:: @ 8163433
+	msgbox PokemonTower_5F_Text_RestHereInPurifiedSpace, MSGBOX_NPC
 	end
 
-PokemonTower_5F_EventScript_16343C:: @ 816343C
+PokemonTower_5F_EventScript_PurifiedZone:: @ 816343C
 	lockall
 	fadescreen FADE_TO_WHITE
 	special HealPlayerParty
 	fadescreen FADE_FROM_WHITE
-	msgbox gUnknown_817A1FA
+	msgbox PokemonTower_5F_Text_PurifiedZoneMonsFullyHealed
 	setvar VAR_TEMP_1, 1
 	releaseall
 	end
 
-PokemonTower_5F_EventScript_163453:: @ 8163453
+PokemonTower_5F_EventScript_ExitPurifiedZone:: @ 8163453
 	lockall
 	setvar VAR_TEMP_1, 0
 	releaseall
 	end
 
-PokemonTower_5F_EventScript_16345B:: @ 816345B
-	trainerbattle_single TRAINER_CHANNELER_TAMMY, Text_17A11F, Text_17A132
-	msgbox gUnknown_817A138, MSGBOX_AUTOCLOSE
+PokemonTower_5F_EventScript_Tammy:: @ 816345B
+	trainerbattle_single TRAINER_CHANNELER_TAMMY, PokemonTower_5F_Text_TammyIntro, PokemonTower_5F_Text_TammyDefeat
+	msgbox PokemonTower_5F_Text_TammyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-PokemonTower_5F_EventScript_163472:: @ 8163472
-	trainerbattle_single TRAINER_CHANNELER_RUTH, Text_17A150, Text_17A164
-	msgbox gUnknown_817A176, MSGBOX_AUTOCLOSE
+PokemonTower_5F_EventScript_Ruth:: @ 8163472
+	trainerbattle_single TRAINER_CHANNELER_RUTH, PokemonTower_5F_Text_RuthIntro, PokemonTower_5F_Text_RuthDefeat
+	msgbox PokemonTower_5F_Text_RuthPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-PokemonTower_5F_EventScript_163489:: @ 8163489
-	trainerbattle_single TRAINER_CHANNELER_KARINA, Text_17A187, Text_17A190
-	msgbox gUnknown_817A194, MSGBOX_AUTOCLOSE
+PokemonTower_5F_EventScript_Karina:: @ 8163489
+	trainerbattle_single TRAINER_CHANNELER_KARINA, PokemonTower_5F_Text_KarinaIntro, PokemonTower_5F_Text_KarinaDefeat
+	msgbox PokemonTower_5F_Text_KarinaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-PokemonTower_5F_EventScript_1634A0:: @ 81634A0
-	trainerbattle_single TRAINER_CHANNELER_JANAE, Text_17A1AA, Text_17A1B7
-	msgbox gUnknown_817A1BD, MSGBOX_AUTOCLOSE
+PokemonTower_5F_EventScript_Janae:: @ 81634A0
+	trainerbattle_single TRAINER_CHANNELER_JANAE, PokemonTower_5F_Text_JanaeIntro, PokemonTower_5F_Text_JanaeDefeat
+	msgbox PokemonTower_5F_Text_JanaePostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/PokemonTower_5F/text.inc b/data/maps/PokemonTower_5F/text.inc
index 5fef4219e..9bcf84a12 100644
--- a/data/maps/PokemonTower_5F/text.inc
+++ b/data/maps/PokemonTower_5F/text.inc
@@ -1,49 +1,49 @@
-gUnknown_817A0E3:: @ 817A0E3
+PokemonTower_5F_Text_RestHereInPurifiedSpace:: @ 817A0E3
     .string "Come, child!\n"
     .string "I have purified this space.\l"
     .string "You can rest here.$"
 
-Text_17A11F:: @ 817A11F
+PokemonTower_5F_Text_TammyIntro:: @ 817A11F
     .string "Give…me…\n"
     .string "your…all…$"
 
-Text_17A132:: @ 817A132
+PokemonTower_5F_Text_TammyDefeat:: @ 817A132
     .string "Gasp!$"
 
-gUnknown_817A138:: @ 817A138
+PokemonTower_5F_Text_TammyPostBattle:: @ 817A138
     .string "I was under possession.$"
 
-Text_17A150:: @ 817A150
+PokemonTower_5F_Text_RuthIntro:: @ 817A150
     .string "You…shall…\n"
     .string "join…us…$"
 
-Text_17A164:: @ 817A164
+PokemonTower_5F_Text_RuthDefeat:: @ 817A164
     .string "What a nightmare!$"
 
-gUnknown_817A176:: @ 817A176
+PokemonTower_5F_Text_RuthPostBattle:: @ 817A176
     .string "I was possessed.$"
 
-Text_17A187:: @ 817A187
+PokemonTower_5F_Text_KarinaIntro:: @ 817A187
     .string "Zombies!$"
 
-Text_17A190:: @ 817A190
+PokemonTower_5F_Text_KarinaDefeat:: @ 817A190
     .string "Ha?$"
 
-gUnknown_817A194:: @ 817A194
+PokemonTower_5F_Text_KarinaPostBattle:: @ 817A194
     .string "I regained my senses.$"
 
-Text_17A1AA:: @ 817A1AA
+PokemonTower_5F_Text_JanaeIntro:: @ 817A1AA
     .string "Urgah…\n"
     .string "Urff…$"
 
-Text_17A1B7:: @ 817A1B7
+PokemonTower_5F_Text_JanaeDefeat:: @ 817A1B7
     .string "Whoo!$"
 
-gUnknown_817A1BD:: @ 817A1BD
+PokemonTower_5F_Text_JanaePostBattle:: @ 817A1BD
     .string "I fell to evil spirits despite my\n"
     .string "training in the mountains…$"
 
-gUnknown_817A1FA:: @ 817A1FA
+PokemonTower_5F_Text_PurifiedZoneMonsFullyHealed:: @ 817A1FA
     .string "Entered the purified and protected\n"
     .string "zone.\p"
     .string "{PLAYER}'s POKéMON were fully\n"
diff --git a/data/maps/PokemonTower_6F/map.json b/data/maps/PokemonTower_6F/map.json
index 06fd7e03d..9a2ff3756 100644
--- a/data/maps/PokemonTower_6F/map.json
+++ b/data/maps/PokemonTower_6F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "PokemonTower_6F_EventScript_163514",
+      "script": "PokemonTower_6F_EventScript_Angelica",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "PokemonTower_6F_EventScript_163542",
+      "script": "PokemonTower_6F_EventScript_Jennifer",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "PokemonTower_6F_EventScript_16352B",
+      "script": "PokemonTower_6F_EventScript_Emilia",
       "flag": "0"
     },
     {
@@ -103,7 +103,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_POKEMON_TOWER_6F",
       "var_value": 0,
-      "script": "PokemonTower_6F_EventScript_1634B8"
+      "script": "PokemonTower_6F_EventScript_MarowakGhost"
     },
     {
       "type": "trigger",
@@ -112,7 +112,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_POKEMON_TOWER_6F",
       "var_value": 0,
-      "script": "PokemonTower_6F_EventScript_1634B8"
+      "script": "PokemonTower_6F_EventScript_MarowakGhost"
     }
   ],
   "bg_events": []
diff --git a/data/maps/PokemonTower_6F/scripts.inc b/data/maps/PokemonTower_6F/scripts.inc
index 4cd13a1f1..3caf16bfe 100644
--- a/data/maps/PokemonTower_6F/scripts.inc
+++ b/data/maps/PokemonTower_6F/scripts.inc
@@ -1,49 +1,49 @@
 PokemonTower_6F_MapScripts:: @ 81634B7
 	.byte 0
 
-PokemonTower_6F_EventScript_1634B8:: @ 81634B8
+PokemonTower_6F_EventScript_MarowakGhost:: @ 81634B8
 	lockall
 	textcolor 2
-	msgbox gUnknown_817A2F8
+	msgbox PokemonTower_6F_Text_BeGoneIntruders
 	goto_if_questlog EventScript_ReleaseEnd
 	setwildbattle SPECIES_MAROWAK, 30, ITEM_NONE
 	special ScrSpecial_StartMarowakBattle
 	waitstate
 	special sub_8112364
-	compare VAR_RESULT, 0
-	goto_if_eq EventScript_1634F5
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_163512
+	compare VAR_RESULT, FALSE  @ Set by CB2_EndMarowakBattle
+	goto_if_eq PokemonTower_6F_EventScript_DefeatedMarowakGhost
+	applymovement OBJ_EVENT_ID_PLAYER, PokemonTower_6F_Movement_ForcePlayerUp
 	waitmovement 0
 	releaseall
 	end
 
-EventScript_1634F5:: @ 81634F5
-	message Text_17A30C
+PokemonTower_6F_EventScript_DefeatedMarowakGhost:: @ 81634F5
+	message PokemonTower_6F_Text_GhostWasCubonesMother
 	waitmessage
 	waitse
 	playmoncry SPECIES_MAROWAK, 0
 	waitbuttonpress
 	waitmoncry
-	msgbox gUnknown_817A342
+	msgbox PokemonTower_6F_Text_MothersSpiritWasCalmed
 	setvar VAR_MAP_SCENE_POKEMON_TOWER_6F, 1
 	releaseall
 	end
 
-Movement_163512:: @ 8163512
+PokemonTower_6F_Movement_ForcePlayerUp:: @ 8163512
 	walk_up
 	step_end
 
-PokemonTower_6F_EventScript_163514:: @ 8163514
-	trainerbattle_single TRAINER_CHANNELER_ANGELICA, Text_17A243, Text_17A253
-	msgbox gUnknown_817A25A, MSGBOX_AUTOCLOSE
+PokemonTower_6F_EventScript_Angelica:: @ 8163514
+	trainerbattle_single TRAINER_CHANNELER_ANGELICA, PokemonTower_6F_Text_AngelicaIntro, PokemonTower_6F_Text_AngelicaDefeat
+	msgbox PokemonTower_6F_Text_AngelicaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-PokemonTower_6F_EventScript_16352B:: @ 816352B
-	trainerbattle_single TRAINER_CHANNELER_EMILIA, Text_17A272, Text_17A27F
-	msgbox gUnknown_817A293, MSGBOX_AUTOCLOSE
+PokemonTower_6F_EventScript_Emilia:: @ 816352B
+	trainerbattle_single TRAINER_CHANNELER_EMILIA, PokemonTower_6F_Text_EmiliaIntro, PokemonTower_6F_Text_EmiliaDefeat
+	msgbox PokemonTower_6F_Text_EmiliaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-PokemonTower_6F_EventScript_163542:: @ 8163542
-	trainerbattle_single TRAINER_CHANNELER_JENNIFER, Text_17A2C8, Text_17A2DC
-	msgbox gUnknown_817A2E2, MSGBOX_AUTOCLOSE
+PokemonTower_6F_EventScript_Jennifer:: @ 8163542
+	trainerbattle_single TRAINER_CHANNELER_JENNIFER, PokemonTower_6F_Text_JenniferIntro, PokemonTower_6F_Text_JenniferDefeat
+	msgbox PokemonTower_6F_Text_JenniferPostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/PokemonTower_6F/text.inc b/data/maps/PokemonTower_6F/text.inc
index 5f6747816..8d968a69b 100644
--- a/data/maps/PokemonTower_6F/text.inc
+++ b/data/maps/PokemonTower_6F/text.inc
@@ -1,43 +1,43 @@
-Text_17A243:: @ 817A243
+PokemonTower_6F_Text_AngelicaIntro:: @ 817A243
     .string "Give…me…\n"
     .string "blood…$"
 
-Text_17A253:: @ 817A253
+PokemonTower_6F_Text_AngelicaDefeat:: @ 817A253
     .string "Groan!$"
 
-gUnknown_817A25A:: @ 817A25A
+PokemonTower_6F_Text_AngelicaPostBattle:: @ 817A25A
     .string "I feel anemic and weak…$"
 
-Text_17A272:: @ 817A272
+PokemonTower_6F_Text_EmiliaIntro:: @ 817A272
     .string "Urff…\n"
     .string "Kwaah!$"
 
-Text_17A27F:: @ 817A27F
+PokemonTower_6F_Text_EmiliaDefeat:: @ 817A27F
     .string "Something fell out!$"
 
-gUnknown_817A293:: @ 817A293
+PokemonTower_6F_Text_EmiliaPostBattle:: @ 817A293
     .string "My hair didn't fall out!\n"
     .string "It was a malevolent spirit!$"
 
-Text_17A2C8:: @ 817A2C8
+PokemonTower_6F_Text_JenniferIntro:: @ 817A2C8
     .string "Ke…ke…ke…\n"
     .string "ke…ke…ke!$"
 
-Text_17A2DC:: @ 817A2DC
+PokemonTower_6F_Text_JenniferDefeat:: @ 817A2DC
     .string "Keee!$"
 
-gUnknown_817A2E2:: @ 817A2E2
+PokemonTower_6F_Text_JenniferPostBattle:: @ 817A2E2
     .string "What's going on here?$"
 
-gUnknown_817A2F8:: @ 817A2F8
+PokemonTower_6F_Text_BeGoneIntruders:: @ 817A2F8
     .string "Be gone…\n"
     .string "Intruders…$"
 
-Text_17A30C:: @ 817A30C
+PokemonTower_6F_Text_GhostWasCubonesMother:: @ 817A30C
     .string "The ghost was the restless spirit\n"
     .string "of CUBONE's mother!$"
 
-gUnknown_817A342:: @ 817A342
+PokemonTower_6F_Text_MothersSpiritWasCalmed:: @ 817A342
     .string "The mother's spirit was calmed.\p"
     .string "It departed to the afterlife…$"
 
diff --git a/data/maps/PokemonTower_7F/map.json b/data/maps/PokemonTower_7F/map.json
index f05d1f87c..9524a236b 100644
--- a/data/maps/PokemonTower_7F/map.json
+++ b/data/maps/PokemonTower_7F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "PokemonTower_7F_EventScript_16355A",
+      "script": "PokemonTower_7F_EventScript_MrFuji",
       "flag": "FLAG_HIDE_TOWER_FUJI"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "PokemonTower_7F_EventScript_163586",
+      "script": "PokemonTower_7F_EventScript_Grunt1",
       "flag": "FLAG_HIDE_TOWER_ROCKET_1"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "PokemonTower_7F_EventScript_16363D",
+      "script": "PokemonTower_7F_EventScript_Grunt2",
       "flag": "FLAG_HIDE_TOWER_ROCKET_2"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "PokemonTower_7F_EventScript_1636D6",
+      "script": "PokemonTower_7F_EventScript_Grunt3",
       "flag": "FLAG_HIDE_TOWER_ROCKET_3"
     }
   ],
diff --git a/data/maps/PokemonTower_7F/scripts.inc b/data/maps/PokemonTower_7F/scripts.inc
index 9f7986523..7b0d5f37a 100644
--- a/data/maps/PokemonTower_7F/scripts.inc
+++ b/data/maps/PokemonTower_7F/scripts.inc
@@ -1,66 +1,66 @@
 PokemonTower_7F_MapScripts:: @ 8163559
 	.byte 0
 
-PokemonTower_7F_EventScript_16355A:: @ 816355A
+PokemonTower_7F_EventScript_MrFuji:: @ 816355A
 	lock
 	faceplayer
 	famechecker FAMECHECKER_MRFUJI, FCPICKSTATE_COLORED, UpdatePickStateFromSpecialVar8005
 	setflag FLAG_HIDE_TOWER_FUJI
 	clearflag FLAG_HIDE_POKEHOUSE_FUJI
 	setflag FLAG_RESCUED_MR_FUJI
-	msgbox gUnknown_817A529
+	msgbox PokemonTower_7F_Text_MrFujiThankYouFollowMe
 	closemessage
 	warp MAP_LAVENDER_TOWN_VOLUNTEER_POKEMON_HOUSE, 255, 4, 7
 	waitstate
 	release
 	end
 
-PokemonTower_7F_EventScript_163586:: @ 8163586
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_19, Text_17A380, Text_17A3A4, EventScript_1635A1
-	msgbox gUnknown_817A3AF, MSGBOX_AUTOCLOSE
+PokemonTower_7F_EventScript_Grunt1:: @ 8163586
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_19, PokemonTower_7F_Text_Grunt1Intro, PokemonTower_7F_Text_Grunt1Defeat, PokemonTower_7F_EventScript_DefeatedGrunt1
+	msgbox PokemonTower_7F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1635A1:: @ 81635A1
-	msgbox gUnknown_817A3AF
+PokemonTower_7F_EventScript_DefeatedGrunt1:: @ 81635A1
+	msgbox PokemonTower_7F_Text_Grunt1PostBattle
 	closemessage
 	getplayerxy VAR_0x8004, VAR_0x8005
 	compare VAR_0x8004, 10
-	goto_if_eq EventScript_1635E0
+	goto_if_eq PokemonTower_7F_EventScript_Grunt1ExitMid
 	compare VAR_0x8004, 11
-	goto_if_eq EventScript_1635F0
+	goto_if_eq PokemonTower_7F_EventScript_Grunt1ExitRight
 	compare VAR_0x8004, 9
-	goto_if_eq EventScript_163600
-	applymovement 2, Movement_16362C
+	goto_if_eq PokemonTower_7F_EventScript_Grunt1ExitLeft
+	applymovement 2, PokemonTower_7F_Movement_Grunt1Exit
 	waitmovement 0
-	goto EventScript_163616
+	goto PokemonTower_7F_EventScript_RemoveGrunt1
 	end
 
-EventScript_1635E0:: @ 81635E0
-	applymovement 2, Movement_16361B
+PokemonTower_7F_EventScript_Grunt1ExitMid:: @ 81635E0
+	applymovement 2, PokemonTower_7F_Movement_Grunt1ExitMid
 	waitmovement 0
-	goto EventScript_163616
+	goto PokemonTower_7F_EventScript_RemoveGrunt1
 	end
 
-EventScript_1635F0:: @ 81635F0
-	applymovement 2, Movement_163624
+PokemonTower_7F_EventScript_Grunt1ExitRight:: @ 81635F0
+	applymovement 2, PokemonTower_7F_Movement_Grunt1ExitRight
 	waitmovement 0
-	goto EventScript_163616
+	goto PokemonTower_7F_EventScript_RemoveGrunt1
 	end
 
-EventScript_163600:: @ 8163600
-	applymovement 2, Movement_163633
+PokemonTower_7F_EventScript_Grunt1ExitLeft:: @ 8163600
+	applymovement 2, PokemonTower_7F_Movement_Grunt1ExitLeft
 	waitmovement 0
 	playse SE_KAIDAN
 	delay 25
-	goto EventScript_163616
+	goto PokemonTower_7F_EventScript_RemoveGrunt1
 	end
 
-EventScript_163616:: @ 8163616
+PokemonTower_7F_EventScript_RemoveGrunt1:: @ 8163616
 	removeobject 2
 	release
 	end
 
-Movement_16361B:: @ 816361B
+PokemonTower_7F_Movement_Grunt1ExitMid:: @ 816361B
 	walk_down
 	walk_right
 	walk_down
@@ -71,7 +71,7 @@ Movement_16361B:: @ 816361B
 	walk_down
 	step_end
 
-Movement_163624:: @ 8163624
+PokemonTower_7F_Movement_Grunt1ExitRight:: @ 8163624
 	walk_down
 	walk_down
 	walk_down
@@ -81,7 +81,7 @@ Movement_163624:: @ 8163624
 	walk_down
 	step_end
 
-Movement_16362C:: @ 816362C
+PokemonTower_7F_Movement_Grunt1Exit:: @ 816362C
 	walk_down
 	walk_down
 	walk_down
@@ -90,7 +90,7 @@ Movement_16362C:: @ 816362C
 	walk_down
 	step_end
 
-Movement_163633:: @ 8163633
+PokemonTower_7F_Movement_Grunt1ExitLeft:: @ 8163633
 	walk_right
 	walk_down
 	walk_down
@@ -102,43 +102,43 @@ Movement_163633:: @ 8163633
 	walk_in_place_fastest_left
 	step_end
 
-PokemonTower_7F_EventScript_16363D:: @ 816363D
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_20, Text_17A3CD, Text_17A466, EventScript_163658
-	msgbox gUnknown_817A477, MSGBOX_AUTOCLOSE
+PokemonTower_7F_EventScript_Grunt2:: @ 816363D
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_20, PokemonTower_7F_Text_Grunt2Intro, PokemonTower_7F_Text_Grunt2Defeat, PokemonTower_7F_EventScript_DefeatedGrunt2
+	msgbox PokemonTower_7F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_163658:: @ 8163658
+PokemonTower_7F_EventScript_DefeatedGrunt2:: @ 8163658
 	famechecker FAMECHECKER_MRFUJI, 1
-	msgbox gUnknown_817A477
+	msgbox PokemonTower_7F_Text_Grunt2PostBattle
 	closemessage
 	getplayerxy VAR_0x8004, VAR_0x8005
 	compare VAR_0x8004, 12
-	goto_if_eq EventScript_163699
+	goto_if_eq PokemonTower_7F_EventScript_Grunt2ExitLeft
 	compare VAR_0x8004, 13
-	goto_if_eq EventScript_1636A9
-	applymovement 3, Movement_1636C6
+	goto_if_eq PokemonTower_7F_EventScript_Grunt2ExitRight
+	applymovement 3, PokemonTower_7F_Movement_Grunt2Exit
 	waitmovement 0
-	goto EventScript_1636B9
+	goto PokemonTower_7F_EventScript_RemoveGrunt2
 	end
 
-EventScript_163699:: @ 8163699
-	applymovement 3, Movement_1636BE
+PokemonTower_7F_EventScript_Grunt2ExitLeft:: @ 8163699
+	applymovement 3, PokemonTower_7F_Movement_Grunt2ExitLeft
 	waitmovement 0
-	goto EventScript_1636B9
+	goto PokemonTower_7F_EventScript_RemoveGrunt2
 	end
 
-EventScript_1636A9:: @ 81636A9
-	applymovement 3, Movement_1636CD
+PokemonTower_7F_EventScript_Grunt2ExitRight:: @ 81636A9
+	applymovement 3, PokemonTower_7F_Movement_Grunt2ExitRight
 	waitmovement 0
-	goto EventScript_1636B9
+	goto PokemonTower_7F_EventScript_RemoveGrunt2
 	end
 
-EventScript_1636B9:: @ 81636B9
+PokemonTower_7F_EventScript_RemoveGrunt2:: @ 81636B9
 	removeobject 3
 	release
 	end
 
-Movement_1636BE:: @ 81636BE
+PokemonTower_7F_Movement_Grunt2ExitLeft:: @ 81636BE
 	walk_down
 	walk_down
 	walk_down
@@ -148,7 +148,7 @@ Movement_1636BE:: @ 81636BE
 	walk_down
 	step_end
 
-Movement_1636C6:: @ 81636C6
+PokemonTower_7F_Movement_Grunt2Exit:: @ 81636C6
 	walk_down
 	walk_down
 	walk_down
@@ -157,7 +157,7 @@ Movement_1636C6:: @ 81636C6
 	walk_down
 	step_end
 
-Movement_1636CD:: @ 81636CD
+PokemonTower_7F_Movement_Grunt2ExitRight:: @ 81636CD
 	walk_left
 	walk_down
 	walk_down
@@ -168,46 +168,46 @@ Movement_1636CD:: @ 81636CD
 	walk_down
 	step_end
 
-PokemonTower_7F_EventScript_1636D6:: @ 81636D6
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_21, Text_17A4CF, Text_17A4EE, EventScript_1636F1
-	msgbox gUnknown_817A506, MSGBOX_AUTOCLOSE
+PokemonTower_7F_EventScript_Grunt3:: @ 81636D6
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_21, PokemonTower_7F_Text_Grunt3Intro, PokemonTower_7F_Text_Grunt3Defeat, PokemonTower_7F_EventScript_DefeatedGrunt3
+	msgbox PokemonTower_7F_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1636F1:: @ 81636F1
-	msgbox gUnknown_817A506
+PokemonTower_7F_EventScript_DefeatedGrunt3:: @ 81636F1
+	msgbox PokemonTower_7F_Text_Grunt3PostBattle
 	closemessage
 	getplayerxy VAR_0x8004, VAR_0x8005
 	compare VAR_0x8004, 10
-	goto_if_eq EventScript_163725
+	goto_if_eq PokemonTower_7F_EventScript_Grunt3ExitRight
 	compare VAR_0x8004, 9
-	goto_if_eq EventScript_163735
-	applymovement 4, Movement_163754
+	goto_if_eq PokemonTower_7F_EventScript_Grunt3ExitLeft
+	applymovement 4, PokemonTower_7F_Movement_Grunt3Exit
 	waitmovement 0
-	goto EventScript_163745
+	goto PokemonTower_7F_EventScript_RemoveGrunt3
 	end
 
-EventScript_163725:: @ 8163725
-	applymovement 4, Movement_16374C
+PokemonTower_7F_EventScript_Grunt3ExitRight:: @ 8163725
+	applymovement 4, PokemonTower_7F_Movement_Grunt3ExitRight
 	waitmovement 0
-	goto EventScript_163745
+	goto PokemonTower_7F_EventScript_RemoveGrunt3
 	end
 
-EventScript_163735:: @ 8163735
-	applymovement 4, Movement_16375B
+PokemonTower_7F_EventScript_Grunt3ExitLeft:: @ 8163735
+	applymovement 4, PokemonTower_7F_Movement_Grunt3ExitLeft
 	waitmovement 0
-	goto EventScript_163745
+	goto PokemonTower_7F_EventScript_RemoveGrunt3
 	end
 
-EventScript_163745:: @ 8163745
+PokemonTower_7F_EventScript_RemoveGrunt3:: @ 8163745
 	removeobject 4
 	release
 	end
 
-EventScript_16374A:: @ 816374A
+PokemonTower_7F_EventScript_Unused:: @ 816374A
 	release
 	end
 
-Movement_16374C:: @ 816374C
+PokemonTower_7F_Movement_Grunt3ExitRight:: @ 816374C
 	walk_down
 	walk_down
 	walk_down
@@ -217,7 +217,7 @@ Movement_16374C:: @ 816374C
 	walk_down
 	step_end
 
-Movement_163754:: @ 8163754
+PokemonTower_7F_Movement_Grunt3Exit:: @ 8163754
 	walk_down
 	walk_down
 	walk_down
@@ -226,7 +226,7 @@ Movement_163754:: @ 8163754
 	walk_down
 	step_end
 
-Movement_16375B:: @ 816375B
+PokemonTower_7F_Movement_Grunt3ExitLeft:: @ 816375B
 	walk_right
 	walk_down
 	walk_down
diff --git a/data/maps/PokemonTower_7F/text.inc b/data/maps/PokemonTower_7F/text.inc
index d55f9c2e2..c11f66791 100644
--- a/data/maps/PokemonTower_7F/text.inc
+++ b/data/maps/PokemonTower_7F/text.inc
@@ -1,14 +1,14 @@
-Text_17A380:: @ 817A380
+PokemonTower_7F_Text_Grunt1Intro:: @ 817A380
     .string "What do you want?\n"
     .string "Why are you here?$"
 
-Text_17A3A4:: @ 817A3A4
+PokemonTower_7F_Text_Grunt1Defeat:: @ 817A3A4
     .string "I give up!$"
 
-gUnknown_817A3AF:: @ 817A3AF
+PokemonTower_7F_Text_Grunt1PostBattle:: @ 817A3AF
     .string "I'm not going to forget this!$"
 
-Text_17A3CD:: @ 817A3CD
+PokemonTower_7F_Text_Grunt2Intro:: @ 817A3CD
     .string "This old guy marched right up to\n"
     .string "our HIDEOUT.\p"
     .string "Then, he starts ranting about how\n"
@@ -16,25 +16,25 @@ Text_17A3CD:: @ 817A3CD
     .string "So, we're just talking it over as\n"
     .string "adults.$"
 
-Text_17A466:: @ 817A466
+PokemonTower_7F_Text_Grunt2Defeat:: @ 817A466
     .string "Please!\n"
     .string "No more!$"
 
-gUnknown_817A477:: @ 817A477
+PokemonTower_7F_Text_Grunt2PostBattle:: @ 817A477
     .string "POKéMON are only good for making\n"
     .string "money. Why not use them?\p"
     .string "You stay out of our business!$"
 
-Text_17A4CF:: @ 817A4CF
+PokemonTower_7F_Text_Grunt3Intro:: @ 817A4CF
     .string "You're not saving anyone, kid!$"
 
-Text_17A4EE:: @ 817A4EE
+PokemonTower_7F_Text_Grunt3Defeat:: @ 817A4EE
     .string "Don't fight us ROCKETS!$"
 
-gUnknown_817A506:: @ 817A506
+PokemonTower_7F_Text_Grunt3PostBattle:: @ 817A506
     .string "You're not getting away with this!$"
 
-gUnknown_817A529:: @ 817A529
+PokemonTower_7F_Text_MrFujiThankYouFollowMe:: @ 817A529
     .string "MR. FUJI: Heh?\n"
     .string "You came to save me?\p"
     .string "Thank you. But, I came here of my\n"
diff --git a/data/strings.s b/data/strings.s
index 0b928174f..a9c76b88e 100644
--- a/data/strings.s
+++ b/data/strings.s
@@ -3535,7 +3535,7 @@ gUnknown_841D13C:: @ 841D13C
 	.string "{STR_VAR_1} PLAYERS$"
 
 	.align 2
-gUnknown_841D148:: @ 841D148
+gText_Ghost:: @ 841D148
 	.string "GHOST$"
 
 gUnknown_841D14E:: @ 841D14E
diff --git a/include/strings.h b/include/strings.h
index 5b75da174..ec8533a54 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -185,7 +185,7 @@ extern const u8 gUnknown_84166A7[];
 extern const u8 gText_WontHaveEffect[];
 extern const u8 gUnknown_841623D[];
 extern const u8 gUnknown_84162BD[];
-extern const u8 gUnknown_841D148[];
+extern const u8 gText_Ghost[];
 
 // pokemon
 extern const u8 gBattleText_Rose[];
diff --git a/src/battle_setup.c b/src/battle_setup.c
index 994ed858a..a46191509 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -276,7 +276,7 @@ static void DoGhostBattle(void)
     gMain.savedCallback = CB2_EndWildBattle;
     gBattleTypeFlags = BATTLE_TYPE_GHOST;
     CreateBattleStartTask(GetWildBattleTransition(), 0);
-    SetMonData(&gEnemyParty[0], MON_DATA_NICKNAME, gUnknown_841D148);
+    SetMonData(&gEnemyParty[0], MON_DATA_NICKNAME, gText_Ghost);
     IncrementGameStat(GAME_STAT_TOTAL_BATTLES);
     IncrementGameStat(GAME_STAT_WILD_BATTLES);
 }
@@ -321,7 +321,7 @@ void ScrSpecial_StartMarowakBattle(void)
         gBattleTypeFlags = BATTLE_TYPE_GHOST;
     }
     CreateBattleStartTask(GetWildBattleTransition(), 0);
-    SetMonData(&gEnemyParty[0], MON_DATA_NICKNAME, gUnknown_841D148);
+    SetMonData(&gEnemyParty[0], MON_DATA_NICKNAME, gText_Ghost);
     IncrementGameStat(GAME_STAT_TOTAL_BATTLES);
     IncrementGameStat(GAME_STAT_WILD_BATTLES);
 }
@@ -444,10 +444,11 @@ static void CB2_EndMarowakBattle(void)
     }
     else
     {
+        // If result is TRUE player didnt defeat Marowak, force player back from stairs
         if (gBattleOutcome == B_OUTCOME_WON)
-            gSpecialVar_Result = 0;
+            gSpecialVar_Result = FALSE;
         else
-            gSpecialVar_Result = 1;
+            gSpecialVar_Result = TRUE;
         SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic);
     }
 }
diff --git a/src/pokemon.c b/src/pokemon.c
index 39019421c..1270a25ed 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -6059,7 +6059,7 @@ bool8 CheckBattleTypeGhost(struct Pokemon *mon, u8 battlerId)
     {
         GetMonData(mon, MON_DATA_NICKNAME, buffer);
         StringGetEnd10(buffer);
-        if (!StringCompare(buffer, gUnknown_841D148))
+        if (!StringCompare(buffer, gText_Ghost))
             return TRUE;
     }
     return FALSE;