Merge remote-tracking branch 'upstream' into tustin2121-patch-5

1 files changed, 30 insertions, 30 deletions

diff --git a/data/maps/MtPyre_3F/scripts.inc b/data/maps/MtPyre_3F/scripts.inc
index 558ab9999..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
-	special sub_80B4808
+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"