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/Route112/scripts.inc | |
| parent | 67242f5d0fae1c573d74117b3ce3cf9bef48489e (diff) | |
| parent | fce8a1b817d2033d2203c341dfa12d1115f564ca (diff) | |
Merge pull request #11 from pret/master
merge with source repo
Diffstat (limited to 'data/maps/Route112/scripts.inc')
| -rw-r--r-- | data/maps/Route112/scripts.inc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/Route112/scripts.inc b/data/maps/Route112/scripts.inc index 83d93f222..8e3f73fc0 100644 --- a/data/maps/Route112/scripts.inc +++ b/data/maps/Route112/scripts.inc @@ -32,12 +32,12 @@ Route112_EventScript_150540:: @ 8150540 end Route112_EventScript_150549:: @ 8150549 - trainerbattle 0, OPPONENT_BRICE, 0, Route112_Text_1BB619, Route112_Text_1BB655 + trainerbattle 0, TRAINER_BRICE, 0, Route112_Text_1BB619, Route112_Text_1BB655 msgbox Route112_Text_1BB667, 6 end Route112_EventScript_150560:: @ 8150560 - trainerbattle 0, OPPONENT_TRENT_1, 0, Route112_Text_1BB6A0, Route112_Text_1BB707 + trainerbattle 0, TRAINER_TRENT_1, 0, Route112_Text_1BB6A0, Route112_Text_1BB707 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route112_EventScript_150587 @@ -45,16 +45,16 @@ Route112_EventScript_150560:: @ 8150560 end Route112_EventScript_150587:: @ 8150587 - trainerbattle 5, OPPONENT_TRENT_1, 0, Route112_Text_1BB7C7, Route112_Text_1BB801 + trainerbattle 5, TRAINER_TRENT_1, 0, Route112_Text_1BB7C7, Route112_Text_1BB801 msgbox Route112_Text_1BB819, 6 end Route112_EventScript_15059E:: @ 815059E - trainerbattle 0, OPPONENT_LARRY, 0, Route112_Text_1BB893, Route112_Text_1BB8B6 + trainerbattle 0, TRAINER_LARRY, 0, Route112_Text_1BB893, Route112_Text_1BB8B6 msgbox Route112_Text_1BB8BE, 6 end Route112_EventScript_1505B5:: @ 81505B5 - trainerbattle 0, OPPONENT_CAROL, 0, Route112_Text_1BB8F0, Route112_Text_1BB942 + trainerbattle 0, TRAINER_CAROL, 0, Route112_Text_1BB8F0, Route112_Text_1BB942 msgbox Route112_Text_1BB958, 6 end |