diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2020-01-13 20:26:20 -0600 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2020-01-13 20:26:20 -0600 |
| commit | 5a2d676e71b720e752ca8a624a5795b3b1d7eb6c (patch) | |
| tree | 6ef755064008dfae8ce2942dc2762670cdabe815 /data/maps/MtPyre_4F/scripts.inc | |
| parent | 5007d279fea5326b41b877703c74fcaa56223364 (diff) | |
| parent | 22931846d680de2bc585093678db3f5721aab891 (diff) | |
Merge remote-tracking branch 'upstream' into tustin2121-patch-5
Diffstat (limited to 'data/maps/MtPyre_4F/scripts.inc')
| -rw-r--r-- | data/maps/MtPyre_4F/scripts.inc | 14 |
1 files changed, 8 insertions, 6 deletions
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…$" |