diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-08-02 14:08:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-02 14:08:10 -0400 |
| commit | bd5cf070597e9c9d175777832859ed0c64fe7760 (patch) | |
| tree | 4dda9e759cbb4cf0c061c24a83832c59277f7d53 /data/maps/MtPyre_4F | |
| parent | 06b909bcd80e5b3f882273a317ac957cd57f07a5 (diff) | |
| parent | d391486247cc9f29d85787d6711f7cb993cf6585 (diff) | |
Merge branch 'master' into doc-playerpc
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…$" |
