diff options
| author | Garak <garakmon@gmail.com> | 2018-08-08 12:19:07 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-08 12:19:07 -0400 |
| commit | 4ebe2448a4dff2e36ca3c11496c68bcf3767b6cc (patch) | |
| tree | c19885fa4e4801de0f777efe1adfe7db34893a44 /data/maps/SSTidalLowerDeck/scripts.inc | |
| parent | 67242f5d0fae1c573d74117b3ce3cf9bef48489e (diff) | |
| parent | fce8a1b817d2033d2203c341dfa12d1115f564ca (diff) | |
Merge pull request #11 from pret/master
merge with source repo
Diffstat (limited to 'data/maps/SSTidalLowerDeck/scripts.inc')
| -rw-r--r-- | data/maps/SSTidalLowerDeck/scripts.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/maps/SSTidalLowerDeck/scripts.inc b/data/maps/SSTidalLowerDeck/scripts.inc index e91c20625..9b19a2f3a 100644 --- a/data/maps/SSTidalLowerDeck/scripts.inc +++ b/data/maps/SSTidalLowerDeck/scripts.inc @@ -2,11 +2,11 @@ SSTidalLowerDeck_MapScripts:: @ 815FED6 .byte 0 SSTidalLowerDeck_EventScript_15FED7:: @ 815FED7 - trainerbattle 0, OPPONENT_PHILLIP, 0, SSTidalLowerDeck_Text_1993C1, SSTidalLowerDeck_Text_19941A + trainerbattle 0, TRAINER_PHILLIP, 0, SSTidalLowerDeck_Text_1993C1, SSTidalLowerDeck_Text_19941A msgbox SSTidalLowerDeck_Text_19942E, 6 end SSTidalLowerDeck_EventScript_15FEEE:: @ 815FEEE - trainerbattle 0, OPPONENT_LEONARD, 0, SSTidalLowerDeck_Text_199491, SSTidalLowerDeck_Text_1994F7 + trainerbattle 0, TRAINER_LEONARD, 0, SSTidalLowerDeck_Text_199491, SSTidalLowerDeck_Text_1994F7 msgbox SSTidalLowerDeck_Text_199508, 6 end |