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/Route134/scripts.inc | |
parent | 67242f5d0fae1c573d74117b3ce3cf9bef48489e (diff) | |
parent | fce8a1b817d2033d2203c341dfa12d1115f564ca (diff) |
Merge pull request #11 from pret/master
merge with source repo
Diffstat (limited to 'data/maps/Route134/scripts.inc')
-rw-r--r-- | data/maps/Route134/scripts.inc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/Route134/scripts.inc b/data/maps/Route134/scripts.inc index 06b53ce31..e5c106899 100644 --- a/data/maps/Route134/scripts.inc +++ b/data/maps/Route134/scripts.inc @@ -7,26 +7,26 @@ Route134_MapScript1_1525BB:: @ 81525BB end Route134_EventScript_1525C4:: @ 81525C4 - trainerbattle 0, OPPONENT_JACK, 0, Route134_Text_1C30C6, Route134_Text_1C3110 + trainerbattle 0, TRAINER_JACK, 0, Route134_Text_1C30C6, Route134_Text_1C3110 msgbox Route134_Text_1C311A, 6 end Route134_EventScript_1525DB:: @ 81525DB - trainerbattle 0, OPPONENT_LAUREL, 0, Route134_Text_1C315E, Route134_Text_1C3198 + trainerbattle 0, TRAINER_LAUREL, 0, Route134_Text_1C315E, Route134_Text_1C3198 msgbox Route134_Text_1C31A0, 6 end Route134_EventScript_1525F2:: @ 81525F2 - trainerbattle 0, OPPONENT_ALEX, 0, Route134_Text_1C31D7, Route134_Text_1C3213 + trainerbattle 0, TRAINER_ALEX, 0, Route134_Text_1C31D7, Route134_Text_1C3213 msgbox Route134_Text_1C3229, 6 end Route134_EventScript_152609:: @ 8152609 - trainerbattle 0, OPPONENT_AARON, 0, Route134_Text_1C3319, Route134_Text_1C335C + trainerbattle 0, TRAINER_AARON, 0, Route134_Text_1C3319, Route134_Text_1C335C msgbox Route134_Text_1C336E, 6 end Route134_EventScript_152620:: @ 8152620 - trainerbattle 0, OPPONENT_HITOSHI, 0, Route134_Text_1C3262, Route134_Text_1C329E + trainerbattle 0, TRAINER_HITOSHI, 0, Route134_Text_1C3262, Route134_Text_1C329E msgbox Route134_Text_1C32D6, 6 end |