diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-12-07 14:47:20 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-12-07 14:47:20 -0500 |
| commit | 53fac4417b53fcee2cc9e46d72ad598b016cc967 (patch) | |
| tree | 07e69072826569c7c31230cb4671a5d321e5f972 /data/maps/MtPyre_5F/scripts.inc | |
| parent | 18124740a4d75ae95948f95ca6f63c320e51501c (diff) | |
| parent | 6df2042b3b3ea8e7bf61cfd95bd24ee06e7b4b32 (diff) | |
fixing merge conflicts
Diffstat (limited to 'data/maps/MtPyre_5F/scripts.inc')
| -rw-r--r-- | data/maps/MtPyre_5F/scripts.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/maps/MtPyre_5F/scripts.inc b/data/maps/MtPyre_5F/scripts.inc index 4678ac7e0..5a5365baf 100644 --- a/data/maps/MtPyre_5F/scripts.inc +++ b/data/maps/MtPyre_5F/scripts.inc @@ -2,8 +2,8 @@ MtPyre_5F_MapScripts:: @ 8231C6D .byte 0 MtPyre_4F_EventScript_231C6E:: @ 8231C6E - trainerbattle 0, TRAINER_TASHA, 0, MtPyre_4F_Text_231C85, MtPyre_4F_Text_231CDB - msgbox MtPyre_4F_Text_231CEE, 6 + trainerbattle_single TRAINER_TASHA, MtPyre_4F_Text_231C85, MtPyre_4F_Text_231CDB + msgbox MtPyre_4F_Text_231CEE, MSGBOX_AUTOCLOSE end MtPyre_4F_Text_231C85: @ 8231C85 |