Document Mt Pyre scripts

14 files changed, 148 insertions, 144 deletions

diff --git a/data/maps/MtPyre_1F/map.json b/data/maps/MtPyre_1F/map.json
index 8b2e146f5..2e03ae728 100644
--- a/data/maps/MtPyre_1F/map.json
+++ b/data/maps/MtPyre_1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MtPyre_1F_EventScript_230F3F",
+      "script": "MtPyre_1F_EventScript_CleanseTagWoman",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MtPyre_1F_EventScript_230F78",
+      "script": "MtPyre_1F_EventScript_PokefanF",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MtPyre_1F_EventScript_230F81",
+      "script": "MtPyre_1F_EventScript_Man",
       "flag": "0"
     }
   ],
diff --git a/data/maps/MtPyre_1F/scripts.inc b/data/maps/MtPyre_1F/scripts.inc
index a06f34a29..2574e6851 100644
--- a/data/maps/MtPyre_1F/scripts.inc
+++ b/data/maps/MtPyre_1F/scripts.inc
@@ -1,48 +1,48 @@
 MtPyre_1F_MapScripts:: @ 8230F3E
 	.byte 0
 
-MtPyre_1F_EventScript_230F3F:: @ 8230F3F
+MtPyre_1F_EventScript_CleanseTagWoman:: @ 8230F3F
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_CLEANSE_TAG, MtPyre_1F_EventScript_230F6E
-	msgbox MtPyre_1F_Text_230F8A, MSGBOX_DEFAULT
+	goto_if_set FLAG_RECEIVED_CLEANSE_TAG, MtPyre_1F_EventScript_ReceivedCleanseTag
+	msgbox MtPyre_1F_Text_TakeThisForYourOwnGood, MSGBOX_DEFAULT
 	giveitem_std ITEM_CLEANSE_TAG
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_CLEANSE_TAG
 	release
 	end
 
-MtPyre_1F_EventScript_230F6E:: @ 8230F6E
-	msgbox MtPyre_1F_Text_231005, MSGBOX_DEFAULT
+MtPyre_1F_EventScript_ReceivedCleanseTag:: @ 8230F6E
+	msgbox MtPyre_1F_Text_ExplainCleanseTag, MSGBOX_DEFAULT
 	release
 	end
 
-MtPyre_1F_EventScript_230F78:: @ 8230F78
-	msgbox MtPyre_1F_Text_23104F, MSGBOX_NPC
+MtPyre_1F_EventScript_PokefanF:: @ 8230F78
+	msgbox MtPyre_1F_Text_ComeToPayRespects, MSGBOX_NPC
 	end
 
-MtPyre_1F_EventScript_230F81:: @ 8230F81
-	msgbox MtPyre_1F_Text_2310BA, MSGBOX_NPC
+MtPyre_1F_EventScript_Man:: @ 8230F81
+	msgbox MtPyre_1F_Text_RestingPlaceOfZigzagoon, MSGBOX_NPC
 	end
 
-MtPyre_1F_Text_230F8A: @ 8230F8A
+MtPyre_1F_Text_TakeThisForYourOwnGood: @ 8230F8A
 	.string "All sorts of beings wander the slopes\n"
 	.string "of MT. PYRE…\p"
 	.string "There is no telling what may happen.\n"
 	.string "Take this. It's for your own good.$"
 
-MtPyre_1F_Text_231005: @ 8231005
+MtPyre_1F_Text_ExplainCleanseTag: @ 8231005
 	.string "Have a POKéMON hold that\n"
 	.string "CLEANSE TAG.\p"
 	.string "It will help ward off wild POKéMON.$"
 
-MtPyre_1F_Text_23104F: @ 823104F
+MtPyre_1F_Text_ComeToPayRespects: @ 823104F
 	.string "Did you come to pay your respect\n"
 	.string "to the spirits of departed POKéMON?\p"
 	.string "You must care for your POKéMON a lot.$"
 
-MtPyre_1F_Text_2310BA: @ 82310BA
+MtPyre_1F_Text_RestingPlaceOfZigzagoon: @ 82310BA
 	.string "This is the final resting place of my\n"
 	.string "ZIGZAGOON. I cherished it…$"
 
diff --git a/data/maps/MtPyre_2F/map.json b/data/maps/MtPyre_2F/map.json
index 64657cb0d..e6882c311 100644
--- a/data/maps/MtPyre_2F/map.json
+++ b/data/maps/MtPyre_2F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "MtPyre_2F_EventScript_231128",
+      "script": "MtPyre_2F_EventScript_Mark",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MtPyre_2F_EventScript_231116",
+      "script": "MtPyre_2F_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MtPyre_2F_EventScript_23111F",
+      "script": "MtPyre_2F_EventScript_PokefanM",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "MtPyre_2F_EventScript_23115A",
+      "script": "MtPyre_2F_EventScript_Dez",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "MtPyre_2F_EventScript_23113F",
+      "script": "MtPyre_2F_EventScript_Luke",
       "flag": "0"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "MtPyre_2F_EventScript_23118C",
+      "script": "MtPyre_2F_EventScript_Zander",
       "flag": "0"
     },
     {
@@ -115,7 +115,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "MtPyre_2F_EventScript_231175",
+      "script": "MtPyre_2F_EventScript_Leah",
       "flag": "0"
     }
   ],
diff --git a/data/maps/MtPyre_2F/scripts.inc b/data/maps/MtPyre_2F/scripts.inc
index be98ac8e7..52c1a154c 100644
--- a/data/maps/MtPyre_2F/scripts.inc
+++ b/data/maps/MtPyre_2F/scripts.inc
@@ -9,83 +9,83 @@ MtPyre_2F_SetHoleWarp: @ 823110B
 	setholewarp MAP_MT_PYRE_1F, 255, 0, 0
 	end
 
-MtPyre_2F_EventScript_231116:: @ 8231116
-	msgbox MtPyre_2F_Text_2311A3, MSGBOX_NPC
+MtPyre_2F_EventScript_Woman:: @ 8231116
+	msgbox MtPyre_2F_Text_MemoriesOfSkitty, MSGBOX_NPC
 	end
 
-MtPyre_2F_EventScript_23111F:: @ 823111F
-	msgbox MtPyre_2F_Text_2311E6, MSGBOX_NPC
+MtPyre_2F_EventScript_PokefanM:: @ 823111F
+	msgbox MtPyre_2F_Text_TumbledFromFloorAbove, MSGBOX_NPC
 	end
 
-MtPyre_2F_EventScript_231128:: @ 8231128
-	trainerbattle_single TRAINER_MARK, MtPyre_2F_Text_231258, MtPyre_2F_Text_2312A2
-	msgbox MtPyre_2F_Text_2312CB, MSGBOX_AUTOCLOSE
+MtPyre_2F_EventScript_Mark:: @ 8231128
+	trainerbattle_single TRAINER_MARK, MtPyre_2F_Text_MarkIntro, MtPyre_2F_Text_MarkDefeat
+	msgbox MtPyre_2F_Text_MarkPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtPyre_2F_EventScript_23113F:: @ 823113F
-	trainerbattle_double TRAINER_DEZ_AND_LUKE, MtPyre_2F_Text_23130F, MtPyre_2F_Text_2313A1, MtPyre_2F_Text_231414
-	msgbox MtPyre_2F_Text_2313B1, MSGBOX_AUTOCLOSE
+MtPyre_2F_EventScript_Luke:: @ 823113F
+	trainerbattle_double TRAINER_DEZ_AND_LUKE, MtPyre_2F_Text_LukeIntro, MtPyre_2F_Text_LukeDefeat, MtPyre_2F_Text_LukeNotEnoughMons
+	msgbox MtPyre_2F_Text_LukePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtPyre_2F_EventScript_23115A:: @ 823115A
-	trainerbattle_double TRAINER_DEZ_AND_LUKE, MtPyre_2F_Text_231492, MtPyre_2F_Text_231534, MtPyre_2F_Text_231582
-	msgbox MtPyre_2F_Text_23154D, MSGBOX_AUTOCLOSE
+MtPyre_2F_EventScript_Dez:: @ 823115A
+	trainerbattle_double TRAINER_DEZ_AND_LUKE, MtPyre_2F_Text_DezIntro, MtPyre_2F_Text_DezDefeat, MtPyre_2F_Text_DezNotEnoughMons
+	msgbox MtPyre_2F_Text_DezPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtPyre_2F_EventScript_231175:: @ 8231175
-	trainerbattle_single TRAINER_LEAH, MtPyre_2F_Text_231604, MtPyre_2F_Text_231645
-	msgbox MtPyre_2F_Text_23165A, MSGBOX_AUTOCLOSE
+MtPyre_2F_EventScript_Leah:: @ 8231175
+	trainerbattle_single TRAINER_LEAH, MtPyre_2F_Text_LeahIntro, MtPyre_2F_Text_LeahDefeat
+	msgbox MtPyre_2F_Text_LeahPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtPyre_2F_EventScript_23118C:: @ 823118C
-	trainerbattle_single TRAINER_ZANDER, MtPyre_2F_Text_2316C7, MtPyre_2F_Text_2316E1
-	msgbox MtPyre_2F_Text_2316FB, MSGBOX_AUTOCLOSE
+MtPyre_2F_EventScript_Zander:: @ 823118C
+	trainerbattle_single TRAINER_ZANDER, MtPyre_2F_Text_ZanderIntro, MtPyre_2F_Text_ZanderDefeat
+	msgbox MtPyre_2F_Text_ZanderPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtPyre_2F_Text_2311A3: @ 82311A3
+MtPyre_2F_Text_MemoriesOfSkitty: @ 82311A3
 	.string "Memories of my darling SKITTY…\n"
 	.string "My eyes overflow thinking about it.$"
 
-MtPyre_2F_Text_2311E6: @ 82311E6
+MtPyre_2F_Text_TumbledFromFloorAbove: @ 82311E6
 	.string "Ooch, ouch… There are holes in the\n"
 	.string "ground here and there.\p"
 	.string "I didn't notice and took a tumble from\n"
 	.string "the floor above.$"
 
-MtPyre_2F_Text_231258: @ 8231258
+MtPyre_2F_Text_MarkIntro: @ 8231258
 	.string "Hey! Are you searching for POKéMON?\n"
 	.string "You came along after me! You're rude!$"
 
-MtPyre_2F_Text_2312A2: @ 82312A2
+MtPyre_2F_Text_MarkDefeat: @ 82312A2
 	.string "Ayieeeeh!\n"
 	.string "I'm sorry, forgive me, please!$"
 
-MtPyre_2F_Text_2312CB: @ 82312CB
+MtPyre_2F_Text_MarkPostBattle: @ 82312CB
 	.string "People don't come here often, so\n"
 	.string "I thought there'd be rare POKéMON.$"
 
-MtPyre_2F_Text_23130F: @ 823130F
+MtPyre_2F_Text_LukeIntro: @ 823130F
 	.string "LUKE: We're here on a dare.\p"
 	.string "Heheh, if I show her how cool I am,\n"
 	.string "she'll fall for me. I know it!\p"
 	.string "I know! I'll cream you and show her\n"
 	.string "how cool I am!$"
 
-MtPyre_2F_Text_2313A1: @ 82313A1
+MtPyre_2F_Text_LukeDefeat: @ 82313A1
 	.string "LUKE: Whoopsie!$"
 
-MtPyre_2F_Text_2313B1: @ 82313B1
+MtPyre_2F_Text_LukePostBattle: @ 82313B1
 	.string "LUKE: Well, we lost but that's okay!\n"
 	.string "I'm right here by your side.\l"
 	.string "We'll make it through this dare!$"
 
-MtPyre_2F_Text_231414: @ 8231414
+MtPyre_2F_Text_LukeNotEnoughMons: @ 8231414
 	.string "LUKE: If you want to take me on,\n"
 	.string "bring some more POKéMON.\p"
 	.string "If you don't, I won't be able to show\n"
 	.string "off to my girl how cool I am!$"
 
-MtPyre_2F_Text_231492: @ 8231492
+MtPyre_2F_Text_DezIntro: @ 8231492
 	.string "DEZ: I came here on a dare with my\n"
 	.string "boyfriend.\p"
 	.string "It's really scary, but I'm with my\n"
@@ -93,42 +93,42 @@ MtPyre_2F_Text_231492: @ 8231492
 	.string "I know! I'll get my boyfriend to look\n"
 	.string "cool by beating you!$"
 
-MtPyre_2F_Text_231534: @ 8231534
+MtPyre_2F_Text_DezDefeat: @ 8231534
 	.string "DEZ: Waaaah! I'm scared!$"
 
-MtPyre_2F_Text_23154D: @ 823154D
+MtPyre_2F_Text_DezPostBattle: @ 823154D
 	.string "DEZ: We're lovey-dovey, so we don't\n"
 	.string "care if we lose!$"
 
-MtPyre_2F_Text_231582: @ 8231582
+MtPyre_2F_Text_DezNotEnoughMons: @ 8231582
 	.string "DEZ: If you want to challenge us, you\n"
 	.string "should bring at least two POKéMON.\p"
 	.string "My boyfriend's strong.\n"
 	.string "Just one POKéMON won't do at all.$"
 
-MtPyre_2F_Text_231604: @ 8231604
+MtPyre_2F_Text_LeahIntro: @ 8231604
 	.string "You are an unfamiliar sight…\n"
 	.string "Depart before anything befalls you!$"
 
-MtPyre_2F_Text_231645: @ 8231645
+MtPyre_2F_Text_LeahDefeat: @ 8231645
 	.string "Hmm…\n"
 	.string "You're durable.$"
 
-MtPyre_2F_Text_23165A: @ 823165A
+MtPyre_2F_Text_LeahPostBattle: @ 823165A
 	.string "Our family has been TRAINERS here\n"
 	.string "since my great-grandmother's time…\p"
 	.string "It is my duty to protect this\n"
 	.string "mountain…$"
 
-MtPyre_2F_Text_2316C7: @ 82316C7
+MtPyre_2F_Text_ZanderIntro: @ 82316C7
 	.string "Kiyaaaaah!\n"
 	.string "I'm terrified!$"
 
-MtPyre_2F_Text_2316E1: @ 82316E1
+MtPyre_2F_Text_ZanderDefeat: @ 82316E1
 	.string "Nooooooo!\n"
 	.string "I lost my wits!$"
 
-MtPyre_2F_Text_2316FB: @ 82316FB
+MtPyre_2F_Text_ZanderPostBattle: @ 82316FB
 	.string "I get freaked out every time I see\n"
 	.string "anything move…\p"
 	.string "I shouldn't have come here to train…$"
diff --git a/data/maps/MtPyre_3F/map.json b/data/maps/MtPyre_3F/map.json
index 3e06adf8c..058c4db0a 100644
--- a/data/maps/MtPyre_3F/map.json
+++ b/data/maps/MtPyre_3F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "MtPyre_3F_EventScript_231753",
+      "script": "MtPyre_3F_EventScript_William",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "MtPyre_3F_EventScript_23176A",
+      "script": "MtPyre_3F_EventScript_Kayla",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "MtPyre_3F_EventScript_231781",
+      "script": "MtPyre_3F_EventScript_Gabrielle",
       "flag": "0"
     }
   ],
diff --git a/data/maps/MtPyre_3F/scripts.inc b/data/maps/MtPyre_3F/scripts.inc
index 3b84a581b..02cea0c22 100644
--- a/data/maps/MtPyre_3F/scripts.inc
+++ b/data/maps/MtPyre_3F/scripts.inc
@@ -1,74 +1,74 @@
 MtPyre_3F_MapScripts:: @ 8231752
 	.byte 0
 
-MtPyre_3F_EventScript_231753:: @ 8231753
-	trainerbattle_single TRAINER_WILLIAM, MtPyre_3F_Text_2317E3, MtPyre_3F_Text_231853
-	msgbox MtPyre_3F_Text_231869, MSGBOX_AUTOCLOSE
+MtPyre_3F_EventScript_William:: @ 8231753
+	trainerbattle_single TRAINER_WILLIAM, MtPyre_3F_Text_WilliamIntro, MtPyre_3F_Text_WilliamDefeat
+	msgbox MtPyre_3F_Text_WilliamPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtPyre_3F_EventScript_23176A:: @ 823176A
-	trainerbattle_single TRAINER_KAYLA, MtPyre_3F_Text_2318A1, MtPyre_3F_Text_2318DD
-	msgbox MtPyre_3F_Text_2318F2, MSGBOX_AUTOCLOSE
+MtPyre_3F_EventScript_Kayla:: @ 823176A
+	trainerbattle_single TRAINER_KAYLA, MtPyre_3F_Text_KaylaIntro MtPyre_3F_Text_KaylaDefeat
+	msgbox MtPyre_3F_Text_KaylaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtPyre_3F_EventScript_231781:: @ 8231781
-	trainerbattle_single TRAINER_GABRIELLE_1, MtPyre_3F_Text_231952, MtPyre_3F_Text_23196A, MtPyre_3F_EventScript_2317AD
+MtPyre_3F_EventScript_Gabrielle:: @ 8231781
+	trainerbattle_single TRAINER_GABRIELLE_1, MtPyre_3F_Text_GabrielleIntro, MtPyre_3F_Text_GabrielleDefeat, MtPyre_3F_EventScript_RegisterGabrielle
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq MtPyre_3F_EventScript_2317CC
-	msgbox MtPyre_3F_Text_23199B, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq MtPyre_3F_EventScript_RematchGabrielle
+	msgbox MtPyre_3F_Text_GabriellePostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-MtPyre_3F_EventScript_2317AD:: @ 82317AD
+MtPyre_3F_EventScript_RegisterGabrielle:: @ 82317AD
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox MtPyre_3F_Text_231A49, MSGBOX_DEFAULT
+	msgbox MtPyre_3F_Text_GabrielleRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_GABRIELLE_1
 	release
 	end
 
-MtPyre_3F_EventScript_2317CC:: @ 82317CC
-	trainerbattle_rematch TRAINER_GABRIELLE_1, MtPyre_3F_Text_231AAB, MtPyre_3F_Text_231AE6
-	msgbox MtPyre_3F_Text_231B0D, MSGBOX_AUTOCLOSE
+MtPyre_3F_EventScript_RematchGabrielle:: @ 82317CC
+	trainerbattle_rematch TRAINER_GABRIELLE_1, MtPyre_3F_Text_GabrielleRematchIntro, MtPyre_3F_Text_GabrielleRematchDefeat
+	msgbox MtPyre_3F_Text_GabriellePostRematch, MSGBOX_AUTOCLOSE
 	end
 
-MtPyre_3F_Text_2317E3: @ 82317E3
+MtPyre_3F_Text_WilliamIntro: @ 82317E3
 	.string "The rich atmosphere of the mountain\n"
 	.string "has elevated my psychic power!\p"
 	.string "A mere child like you…\n"
 	.string "You dream of winning?$"
 
-MtPyre_3F_Text_231853: @ 8231853
+MtPyre_3F_Text_WilliamDefeat: @ 8231853
 	.string "I drown in self-pity…$"
 
-MtPyre_3F_Text_231869: @ 8231869
+MtPyre_3F_Text_WilliamPostBattle: @ 8231869
 	.string "My psychic powers have surely\n"
 	.string "grown several times, but…$"
 
-MtPyre_3F_Text_2318A1: @ 82318A1
+MtPyre_3F_Text_KaylaIntro: @ 82318A1
 	.string "Ahahahaha!\p"
 	.string "This is no place for children, least\n"
 	.string "of all you!$"
 
-MtPyre_3F_Text_2318DD: @ 82318DD
+MtPyre_3F_Text_KaylaDefeat: @ 82318DD
 	.string "I lost that cleanly…$"
 
-MtPyre_3F_Text_2318F2: @ 82318F2
+MtPyre_3F_Text_KaylaPostBattle: @ 82318F2
 	.string "This means my training is still not\n"
 	.string "enough…\p"
 	.string "I've got to keep working toward the\n"
 	.string "summit…\p"
 	.string "Go, me!$"
 
-MtPyre_3F_Text_231952: @ 8231952
+MtPyre_3F_Text_GabrielleIntro: @ 8231952
 	.string "Why have you come here?$"
 
-MtPyre_3F_Text_23196A: @ 823196A
+MtPyre_3F_Text_GabrielleDefeat: @ 823196A
 	.string "That was amazing!\n"
 	.string "You're a very special TRAINER.$"
 
-MtPyre_3F_Text_23199B: @ 823199B
+MtPyre_3F_Text_GabriellePostBattle: @ 823199B
 	.string "POKéMON no longer of this world.\n"
 	.string "POKéMON that are with you now.\p"
 	.string "And the POKéMON that you will meet\n"
@@ -76,21 +76,21 @@ MtPyre_3F_Text_23199B: @ 823199B
 	.string "They are all to be equally cherished.\n"
 	.string "Please remember that.$"
 
-MtPyre_3F_Text_231A49: @ 8231A49
+MtPyre_3F_Text_GabrielleRegister: @ 8231A49
 	.string "I would like to see your POKéMON\n"
 	.string "when they grow up some more…\p"
 	.string "Please, I need to see your POKéNAV.$"
 
-MtPyre_3F_Text_231AAB: @ 8231AAB
+MtPyre_3F_Text_GabrielleRematchIntro: @ 8231AAB
 	.string "Oh, it's you…\p"
 	.string "Have you come to show me your grown\n"
 	.string "POKéMON?$"
 
-MtPyre_3F_Text_231AE6: @ 8231AE6
+MtPyre_3F_Text_GabrielleRematchDefeat: @ 8231AE6
 	.string "How amazing!\n"
 	.string "You are a special person.$"
 
-MtPyre_3F_Text_231B0D: @ 8231B0D
+MtPyre_3F_Text_GabriellePostRematch: @ 8231B0D
 	.string "POKéMON no longer of this world.\n"
 	.string "POKéMON that are with you now.\p"
 	.string "And the POKéMON that you will meet\n"
diff --git a/data/maps/MtPyre_4F/map.json b/data/maps/MtPyre_4F/map.json
index 782a6221e..5c3d72ef8 100644
--- a/data/maps/MtPyre_4F/map.json
+++ b/data/maps/MtPyre_4F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "MtPyre_4F_EventScript_231C6E",
+      "script": "MtPyre_4F_EventScript_Tasha",
       "flag": "0"
     },
     {
diff --git a/data/maps/MtPyre_4F/scripts.inc b/data/maps/MtPyre_4F/scripts.inc
index 27883c8ed..683b38607 100644
--- a/data/maps/MtPyre_4F/scripts.inc
+++ b/data/maps/MtPyre_4F/scripts.inc
@@ -1,20 +1,22 @@
 MtPyre_4F_MapScripts:: @ 8231BC8
 	.byte 0
 
-MtPyre_5F_EventScript_231BC9:: @ 8231BC9
-	trainerbattle_single TRAINER_ATSUSHI, MtPyre_5F_Text_231BE0, MtPyre_5F_Text_231C08
-	msgbox MtPyre_5F_Text_231C24, MSGBOX_AUTOCLOSE
+@ Seems like the scripts for the 4F and 5F were swapped
+
+MtPyre_5F_EventScript_Atsushi:: @ 8231BC9
+	trainerbattle_single TRAINER_ATSUSHI, MtPyre_5F_Text_AtsushiIntro, MtPyre_5F_Text_AtsushiDefeat
+	msgbox MtPyre_5F_Text_AtsushiPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtPyre_5F_Text_231BE0: @ 8231BE0
+MtPyre_5F_Text_AtsushiIntro: @ 8231BE0
 	.string "Teacher…\n"
 	.string "Please watch over my progress!$"
 
-MtPyre_5F_Text_231C08: @ 8231C08
+MtPyre_5F_Text_AtsushiDefeat: @ 8231C08
 	.string "Teacher…\n"
 	.string "Please forgive me!$"
 
-MtPyre_5F_Text_231C24: @ 8231C24
+MtPyre_5F_Text_AtsushiPostBattle: @ 8231C24
 	.string "Until I improve, my teacher, who rests\n"
 	.string "here, will never find true peace…$"
 
diff --git a/data/maps/MtPyre_5F/map.json b/data/maps/MtPyre_5F/map.json
index edd3544ca..1f814bda8 100644
--- a/data/maps/MtPyre_5F/map.json
+++ b/data/maps/MtPyre_5F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "MtPyre_5F_EventScript_231BC9",
+      "script": "MtPyre_5F_EventScript_Atsushi",
       "flag": "0"
     },
     {
diff --git a/data/maps/MtPyre_5F/scripts.inc b/data/maps/MtPyre_5F/scripts.inc
index cbd3b3afa..f27370d7c 100644
--- a/data/maps/MtPyre_5F/scripts.inc
+++ b/data/maps/MtPyre_5F/scripts.inc
@@ -1,21 +1,23 @@
 MtPyre_5F_MapScripts:: @ 8231C6D
 	.byte 0
 
-MtPyre_4F_EventScript_231C6E:: @ 8231C6E
-	trainerbattle_single TRAINER_TASHA, MtPyre_4F_Text_231C85, MtPyre_4F_Text_231CDB
-	msgbox MtPyre_4F_Text_231CEE, MSGBOX_AUTOCLOSE
+@ Seems like the scripts for the 4F and 5F were swapped
+
+MtPyre_4F_EventScript_Tasha:: @ 8231C6E
+	trainerbattle_single TRAINER_TASHA, MtPyre_4F_Text_TashaIntro, MtPyre_4F_Text_TashaDefeat
+	msgbox MtPyre_4F_Text_TashaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtPyre_4F_Text_231C85: @ 8231C85
+MtPyre_4F_Text_TashaIntro: @ 8231C85
 	.string "I love all things horrifying…\n"
 	.string "It's like a disease…\p"
 	.string "When I'm here…\n"
 	.string "I shiver with fear…$"
 
-MtPyre_4F_Text_231CDB: @ 8231CDB
+MtPyre_4F_Text_TashaDefeat: @ 8231CDB
 	.string "Losing, I dislike…$"
 
-MtPyre_4F_Text_231CEE: @ 8231CEE
+MtPyre_4F_Text_TashaPostBattle: @ 8231CEE
 	.string "I want to see dreadful things…\n"
 	.string "I can't leave…\p"
 	.string "Stay…\n"
diff --git a/data/maps/MtPyre_6F/map.json b/data/maps/MtPyre_6F/map.json
index 3c889a7e0..c2de09055 100644
--- a/data/maps/MtPyre_6F/map.json
+++ b/data/maps/MtPyre_6F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "MtPyre_6F_EventScript_231D3B",
+      "script": "MtPyre_6F_EventScript_Valerie",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "MtPyre_6F_EventScript_231D9D",
+      "script": "MtPyre_6F_EventScript_Cedric",
       "flag": "0"
     }
   ],
diff --git a/data/maps/MtPyre_6F/scripts.inc b/data/maps/MtPyre_6F/scripts.inc
index bc975e942..e3bdd928e 100644
--- a/data/maps/MtPyre_6F/scripts.inc
+++ b/data/maps/MtPyre_6F/scripts.inc
@@ -1,69 +1,69 @@
 MtPyre_6F_MapScripts:: @ 8231D3A
 	.byte 0
 
-MtPyre_6F_EventScript_231D3B:: @ 8231D3B
-	trainerbattle_single TRAINER_VALERIE_1, MtPyre_6F_Text_231DB4, MtPyre_6F_Text_231DE2, MtPyre_6F_EventScript_231D67
+MtPyre_6F_EventScript_Valerie:: @ 8231D3B
+	trainerbattle_single TRAINER_VALERIE_1, MtPyre_6F_Text_ValerieIntro, MtPyre_6F_Text_ValerieDefeat, MtPyre_6F_EventScript_RegisterValerie
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq MtPyre_6F_EventScript_231D86
-	msgbox MtPyre_6F_Text_231DFC, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq MtPyre_6F_EventScript_RematchValerie
+	msgbox MtPyre_6F_Text_ValeriePostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-MtPyre_6F_EventScript_231D67:: @ 8231D67
+MtPyre_6F_EventScript_RegisterValerie:: @ 8231D67
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox MtPyre_6F_Text_231E43, MSGBOX_DEFAULT
+	msgbox MtPyre_6F_Text_ValerieRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_VALERIE_1
 	release
 	end
 
-MtPyre_6F_EventScript_231D86:: @ 8231D86
-	trainerbattle_rematch TRAINER_VALERIE_1, MtPyre_6F_Text_231EB3, MtPyre_6F_Text_231ECB
-	msgbox MtPyre_6F_Text_231EE1, MSGBOX_AUTOCLOSE
+MtPyre_6F_EventScript_RematchValerie:: @ 8231D86
+	trainerbattle_rematch TRAINER_VALERIE_1, MtPyre_6F_Text_ValerieRematchIntro, MtPyre_6F_Text_ValerieRematchDefeat
+	msgbox MtPyre_6F_Text_ValeriePostRematch, MSGBOX_AUTOCLOSE
 	end
 
-MtPyre_6F_EventScript_231D9D:: @ 8231D9D
-	trainerbattle_single TRAINER_CEDRIC, MtPyre_6F_Text_231F11, MtPyre_6F_Text_231F4A
-	msgbox MtPyre_6F_Text_231F5C, MSGBOX_AUTOCLOSE
+MtPyre_6F_EventScript_Cedric:: @ 8231D9D
+	trainerbattle_single TRAINER_CEDRIC, MtPyre_6F_Text_CedricIntro, MtPyre_6F_Text_CedricDefeat
+	msgbox MtPyre_6F_Text_CedricPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtPyre_6F_Text_231DB4: @ 8231DB4
+MtPyre_6F_Text_ValerieIntro: @ 8231DB4
 	.string "When I'm here…\n"
 	.string "A curious power flows into me…$"
 
-MtPyre_6F_Text_231DE2: @ 8231DE2
+MtPyre_6F_Text_ValerieDefeat: @ 8231DE2
 	.string "The power is ebbing away…$"
 
-MtPyre_6F_Text_231DFC: @ 8231DFC
+MtPyre_6F_Text_ValeriePostBattle: @ 8231DFC
 	.string "Perhaps the power is from the spirits\n"
 	.string "of POKéMON in fitful sleep here…$"
 
-MtPyre_6F_Text_231E43: @ 8231E43
+MtPyre_6F_Text_ValerieRegister: @ 8231E43
 	.string "Fufufu… I lost the match, but…\n"
 	.string "I have this little ability…\p"
 	.string "Without ever laying my hands on\n"
 	.string "your POKéNAV… Hiyah!$"
 
-MtPyre_6F_Text_231EB3: @ 8231EB3
+MtPyre_6F_Text_ValerieRematchIntro: @ 8231EB3
 	.string "Behind you…\n"
 	.string "What is it…$"
 
-MtPyre_6F_Text_231ECB: @ 8231ECB
+MtPyre_6F_Text_ValerieRematchDefeat: @ 8231ECB
 	.string "Something faded away…$"
 
-MtPyre_6F_Text_231EE1: @ 8231EE1
+MtPyre_6F_Text_ValeriePostRematch: @ 8231EE1
 	.string "The POKéMON at rest here…\n"
 	.string "Sometimes, they play…$"
 
-MtPyre_6F_Text_231F11: @ 8231F11
+MtPyre_6F_Text_CedricIntro: @ 8231F11
 	.string "Have you lost your bearings?\n"
 	.string "Have no fear for I am here!$"
 
-MtPyre_6F_Text_231F4A: @ 8231F4A
+MtPyre_6F_Text_CedricDefeat: @ 8231F4A
 	.string "Weren't you lost?$"
 
-MtPyre_6F_Text_231F5C: @ 8231F5C
+MtPyre_6F_Text_CedricPostBattle: @ 8231F5C
 	.string "I had this feeling that a lost TRAINER\n"
 	.string "would be panicked and easy to beat.\p"
 	.string "It's dirty and I won't try it again…$"
diff --git a/data/maps/MtPyre_Exterior/map.json b/data/maps/MtPyre_Exterior/map.json
index c7653bbd1..2fbcd5673 100644
--- a/data/maps/MtPyre_Exterior/map.json
+++ b/data/maps/MtPyre_Exterior/map.json
@@ -72,7 +72,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "MtPyre_Exterior_EventScript_231FED"
+      "script": "MtPyre_Exterior_EventScript_FogTrigger"
     },
     {
       "type": "trigger",
@@ -81,7 +81,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "MtPyre_Exterior_EventScript_231FED"
+      "script": "MtPyre_Exterior_EventScript_FogTrigger"
     },
     {
       "type": "trigger",
@@ -90,7 +90,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "MtPyre_Exterior_EventScript_231FF2"
+      "script": "MtPyre_Exterior_EventScript_SunTrigger"
     },
     {
       "type": "trigger",
@@ -99,7 +99,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "MtPyre_Exterior_EventScript_231FF2"
+      "script": "MtPyre_Exterior_EventScript_SunTrigger"
     },
     {
       "type": "trigger",
@@ -108,7 +108,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "MtPyre_Exterior_EventScript_231FED"
+      "script": "MtPyre_Exterior_EventScript_FogTrigger"
     }
   ],
   "bg_events": [
diff --git a/data/maps/MtPyre_Exterior/scripts.inc b/data/maps/MtPyre_Exterior/scripts.inc
index b66c50374..11d3f987c 100644
--- a/data/maps/MtPyre_Exterior/scripts.inc
+++ b/data/maps/MtPyre_Exterior/scripts.inc
@@ -3,25 +3,25 @@ MtPyre_Exterior_MapScripts:: @ 8231FCC
 	.byte 0
 
 MtPyre_Exterior_OnTransition: @ 8231FD2
-	call MtPyre_Exterior_EventScript_231FD8
+	call MtPyre_Exterior_EventScript_CheckEnterFromSummit
 	end
 
-MtPyre_Exterior_EventScript_231FD8:: @ 8231FD8
+MtPyre_Exterior_EventScript_CheckEnterFromSummit:: @ 8231FD8
 	getplayerxy VAR_TEMP_0, VAR_TEMP_1
 	compare VAR_TEMP_1, 12
-	goto_if_lt MtPyre_Exterior_EventScript_231FE9
+	goto_if_lt MtPyre_Exterior_EventScript_EnterFromSummit
 	return
 
-MtPyre_Exterior_EventScript_231FE9:: @ 8231FE9
+MtPyre_Exterior_EventScript_EnterFromSummit:: @ 8231FE9
 	setweather WEATHER_FOG_1
 	return
 
-MtPyre_Exterior_EventScript_231FED:: @ 8231FED
+MtPyre_Exterior_EventScript_FogTrigger:: @ 8231FED
 	setweather WEATHER_FOG_1
 	doweather
 	end
 
-MtPyre_Exterior_EventScript_231FF2:: @ 8231FF2
+MtPyre_Exterior_EventScript_SunTrigger:: @ 8231FF2
 	setweather WEATHER_SUNNY
 	doweather
 	end