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/Route126/scripts.inc | |
parent | 67242f5d0fae1c573d74117b3ce3cf9bef48489e (diff) | |
parent | fce8a1b817d2033d2203c341dfa12d1115f564ca (diff) |
Merge pull request #11 from pret/master
merge with source repo
Diffstat (limited to 'data/maps/Route126/scripts.inc')
-rw-r--r-- | data/maps/Route126/scripts.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/maps/Route126/scripts.inc b/data/maps/Route126/scripts.inc index 4a28abfb7..3eb68a1d1 100644 --- a/data/maps/Route126/scripts.inc +++ b/data/maps/Route126/scripts.inc @@ -7,21 +7,21 @@ Route126_MapScript1_152004:: @ 8152004 end Route126_EventScript_15200E:: @ 815200E - trainerbattle 0, OPPONENT_BARRY, 0, Route126_Text_1C1590, Route126_Text_1C15C3 + trainerbattle 0, TRAINER_BARRY, 0, Route126_Text_1C1590, Route126_Text_1C15C3 msgbox Route126_Text_1C15D8, 6 end Route126_EventScript_152025:: @ 8152025 - trainerbattle 0, OPPONENT_DEAN, 0, Route126_Text_1C1627, Route126_Text_1C1660 + trainerbattle 0, TRAINER_DEAN, 0, Route126_Text_1C1627, Route126_Text_1C1660 msgbox Route126_Text_1C166F, 6 end Route126_EventScript_15203C:: @ 815203C - trainerbattle 0, OPPONENT_NIKKI, 0, Route126_Text_1C16AB, Route126_Text_1C16C5 + trainerbattle 0, TRAINER_NIKKI, 0, Route126_Text_1C16AB, Route126_Text_1C16C5 msgbox Route126_Text_1C1702, 6 end Route126_EventScript_152053:: @ 8152053 - trainerbattle 0, OPPONENT_BRENDA, 0, Route126_Text_1C1741, Route126_Text_1C1766 + trainerbattle 0, TRAINER_BRENDA, 0, Route126_Text_1C1741, Route126_Text_1C1766 msgbox Route126_Text_1C1773, 6 end |