diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-08 05:51:49 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-08 05:51:49 -0500 |
| commit | 635267ce32bd696fe15391449efdf07fa35cf449 (patch) | |
| tree | 688ac2c6e0b8e135d8f3450b28b53e3c1c36638b /data/maps/MtChimney | |
| parent | ef67f2d33b45348d76d722f250cdbcc8485be264 (diff) | |
| parent | 8b1595ebc36a623240fa8dd509864f5400eed1f9 (diff) | |
Merge branch 'master' into fix-eventobj
Diffstat (limited to 'data/maps/MtChimney')
| -rw-r--r-- | data/maps/MtChimney/scripts.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc index 359b8376f..894c47684 100644 --- a/data/maps/MtChimney/scripts.inc +++ b/data/maps/MtChimney/scripts.inc @@ -43,7 +43,7 @@ MtChimney_EventScript_Maxie:: @ 822EE0B applymovement 2, Common_Movement_Delay48 waitmovement 0 msgbox MtChimney_Text_MaxieIntro, MSGBOX_DEFAULT - trainerbattle_no_intro TRAINER_MAXIE_2, MtChimney_Text_MaxieDefeat + trainerbattle_no_intro TRAINER_MAXIE_MT_CHIMNEY, MtChimney_Text_MaxieDefeat msgbox MtChimney_Text_MaxieYouHaventSeenLastOfMagma, MSGBOX_DEFAULT closemessage delay 30 @@ -415,7 +415,7 @@ MtChimney_EventScript_BusyAquaGrunt3:: @ 822F065 end MtChimney_EventScript_Tabitha:: @ 822F06E - trainerbattle_single TRAINER_TABITHA_2, MtChimney_Text_TabithaIntro, MtChimney_Text_TabithaDefeat + trainerbattle_single TRAINER_TABITHA_MT_CHIMNEY, MtChimney_Text_TabithaIntro, MtChimney_Text_TabithaDefeat msgbox MtChimney_Text_TabithaPostBattle, MSGBOX_AUTOCLOSE end |