diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-10-07 16:10:35 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-07 16:10:35 -0400 |
| commit | a2655ba9ab82646a54f60abc6078df372179f8d4 (patch) | |
| tree | 95b074a1a4d77d6cd77e413e1d6e72eb55b595b0 /data/maps/MtPyre_4F | |
| parent | e86d3410a1719fcbf62754bfda93a295aa7e0d57 (diff) | |
| parent | 001a25e49cd6acdac89a62f4230aef80422e78f2 (diff) | |
Merge branch 'master' into doc-union
Diffstat (limited to 'data/maps/MtPyre_4F')
| -rw-r--r-- | data/maps/MtPyre_4F/scripts.inc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/MtPyre_4F/scripts.inc b/data/maps/MtPyre_4F/scripts.inc index 683b38607..0127e6856 100644 --- a/data/maps/MtPyre_4F/scripts.inc +++ b/data/maps/MtPyre_4F/scripts.inc @@ -1,22 +1,22 @@ -MtPyre_4F_MapScripts:: @ 8231BC8 +MtPyre_4F_MapScripts:: .byte 0 @ Seems like the scripts for the 4F and 5F were swapped -MtPyre_5F_EventScript_Atsushi:: @ 8231BC9 +MtPyre_5F_EventScript_Atsushi:: trainerbattle_single TRAINER_ATSUSHI, MtPyre_5F_Text_AtsushiIntro, MtPyre_5F_Text_AtsushiDefeat msgbox MtPyre_5F_Text_AtsushiPostBattle, MSGBOX_AUTOCLOSE end -MtPyre_5F_Text_AtsushiIntro: @ 8231BE0 +MtPyre_5F_Text_AtsushiIntro: .string "Teacher…\n" .string "Please watch over my progress!$" -MtPyre_5F_Text_AtsushiDefeat: @ 8231C08 +MtPyre_5F_Text_AtsushiDefeat: .string "Teacher…\n" .string "Please forgive me!$" -MtPyre_5F_Text_AtsushiPostBattle: @ 8231C24 +MtPyre_5F_Text_AtsushiPostBattle: .string "Until I improve, my teacher, who rests\n" .string "here, will never find true peace…$" |