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/Route110_TrickHousePuzzle2/scripts.inc | |
| parent | 67242f5d0fae1c573d74117b3ce3cf9bef48489e (diff) | |
| parent | fce8a1b817d2033d2203c341dfa12d1115f564ca (diff) | |
Merge pull request #11 from pret/master
merge with source repo
Diffstat (limited to 'data/maps/Route110_TrickHousePuzzle2/scripts.inc')
| -rw-r--r-- | data/maps/Route110_TrickHousePuzzle2/scripts.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/Route110_TrickHousePuzzle2/scripts.inc b/data/maps/Route110_TrickHousePuzzle2/scripts.inc index cdde15d1a..b8e00f385 100644 --- a/data/maps/Route110_TrickHousePuzzle2/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle2/scripts.inc @@ -90,16 +90,16 @@ Route110_TrickHousePuzzle2_EventScript_161E65:: @ 8161E65 return Route110_TrickHousePuzzle2_EventScript_161E78:: @ 8161E78 - trainerbattle 0, OPPONENT_TED, 0, Route110_TrickHousePuzzle2_Text_19CD46, Route110_TrickHousePuzzle2_Text_19CD66 + trainerbattle 0, TRAINER_TED, 0, Route110_TrickHousePuzzle2_Text_19CD46, Route110_TrickHousePuzzle2_Text_19CD66 msgbox Route110_TrickHousePuzzle2_Text_19CD91, 6 end Route110_TrickHousePuzzle2_EventScript_161E8F:: @ 8161E8F - trainerbattle 0, OPPONENT_PAUL, 0, Route110_TrickHousePuzzle2_Text_19CDBF, Route110_TrickHousePuzzle2_Text_19CDF0 + trainerbattle 0, TRAINER_PAUL, 0, Route110_TrickHousePuzzle2_Text_19CDBF, Route110_TrickHousePuzzle2_Text_19CDF0 msgbox Route110_TrickHousePuzzle2_Text_19CE0D, 6 end Route110_TrickHousePuzzle2_EventScript_161EA6:: @ 8161EA6 - trainerbattle 0, OPPONENT_GEORGIA, 0, Route110_TrickHousePuzzle2_Text_19CE52, Route110_TrickHousePuzzle2_Text_19CE98 + trainerbattle 0, TRAINER_GEORGIA, 0, Route110_TrickHousePuzzle2_Text_19CE52, Route110_TrickHousePuzzle2_Text_19CE98 msgbox Route110_TrickHousePuzzle2_Text_19CEB8, 6 end |