diff options
author | yenatch <yenatch@gmail.com> | 2016-08-30 23:46:39 -0400 |
---|---|---|
committer | yenatch <yenatch@gmail.com> | 2016-08-30 23:46:39 -0400 |
commit | 0f2f711f11e88fa28ee6977eb5d22eba44cdde03 (patch) | |
tree | 477d880f9ec5c51db6758bbf858fade6f3364d29 /data/scripts/maps/Route121.s | |
parent | ac1f6bc0c865d58471f1213ac27659accacf0268 (diff) |
Use opponent constants in scripts.
Diffstat (limited to 'data/scripts/maps/Route121.s')
-rw-r--r-- | data/scripts/maps/Route121.s | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/data/scripts/maps/Route121.s b/data/scripts/maps/Route121.s index 49b6031bc..54912b0bc 100644 --- a/data/scripts/maps/Route121.s +++ b/data/scripts/maps/Route121.s @@ -67,12 +67,12 @@ Route121_Movement_151B69:: @ 8151B69 step_end Route121_EventScript_151B72:: @ 8151B72 - trainerbattle 0, 300, 0, Route121_Text_1BF96E, Route121_Text_1BF9A1 + trainerbattle 0, OPPONENT_VANESSA, 0, Route121_Text_1BF96E, Route121_Text_1BF9A1 msgbox Route121_Text_1BF9BA, 6 end Route121_EventScript_151B89:: @ 8151B89 - trainerbattle 0, 254, 0, Route121_Text_1BFA1B, Route121_Text_1BFA8C + trainerbattle 0, OPPONENT_WALTER_1, 0, Route121_Text_1BFA1B, Route121_Text_1BFA8C specialval RESULT, 57 compare RESULT, 1 jumpeq Route121_EventScript_151BB0 @@ -80,27 +80,27 @@ Route121_EventScript_151B89:: @ 8151B89 end Route121_EventScript_151BB0:: @ 8151BB0 - trainerbattle 5, 254, 0, Route121_Text_1BFADA, Route121_Text_1BFB4B + trainerbattle 5, OPPONENT_WALTER_1, 0, Route121_Text_1BFADA, Route121_Text_1BFB4B msgbox Route121_Text_1BFB5C, 6 end Route121_EventScript_151BC7:: @ 8151BC7 - trainerbattle 0, 107, 0, Route121_Text_1BFBB4, Route121_Text_1BFBEE + trainerbattle 0, OPPONENT_TAMMY, 0, Route121_Text_1BFBB4, Route121_Text_1BFBEE msgbox Route121_Text_1BFBFD, 6 end Route121_EventScript_151BDE:: @ 8151BDE - trainerbattle 4, 286, 0, Route121_Text_1BFC36, Route121_Text_1BFC7A, Route121_Text_1BFD08 + trainerbattle 4, OPPONENT_KATE_AND_JOY, 0, Route121_Text_1BFC36, Route121_Text_1BFC7A, Route121_Text_1BFD08 msgbox Route121_Text_1BFCB3, 6 end Route121_EventScript_151BF9:: @ 8151BF9 - trainerbattle 4, 286, 0, Route121_Text_1BFD60, Route121_Text_1BFDA3, Route121_Text_1BFE0D + trainerbattle 4, OPPONENT_KATE_AND_JOY, 0, Route121_Text_1BFD60, Route121_Text_1BFDA3, Route121_Text_1BFE0D msgbox Route121_Text_1BFDC1, 6 end Route121_EventScript_151C14:: @ 8151C14 - trainerbattle 0, 127, 0, Route121_Text_1BFE51, Route121_Text_1BFE80 + trainerbattle 0, OPPONENT_JESSICA_1, 0, Route121_Text_1BFE51, Route121_Text_1BFE80 specialval RESULT, 57 compare RESULT, 1 jumpeq Route121_EventScript_151C3B @@ -108,6 +108,6 @@ Route121_EventScript_151C14:: @ 8151C14 end Route121_EventScript_151C3B:: @ 8151C3B - trainerbattle 5, 127, 0, Route121_Text_1BFEDE, Route121_Text_1BFF0A + trainerbattle 5, OPPONENT_JESSICA_1, 0, Route121_Text_1BFEDE, Route121_Text_1BFF0A msgbox Route121_Text_1BFF3A, 6 end |