Document Pokemon Tower scripts

3 files changed, 35 insertions, 35 deletions

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…$"