diff options
Diffstat (limited to 'data/scripts/maps/Route124.s')
| -rw-r--r-- | data/scripts/maps/Route124.s | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/data/scripts/maps/Route124.s b/data/scripts/maps/Route124.s index 9a665f3b7..ea288daa0 100644 --- a/data/scripts/maps/Route124.s +++ b/data/scripts/maps/Route124.s @@ -12,17 +12,17 @@ Route124_EventScript_151DEF:: @ 8151DEF end Route124_EventScript_151DF8:: @ 8151DF8 - trainerbattle 0, 159, 0, Route124_Text_1C0624, Route124_Text_1C0675 + trainerbattle 0, OPPONENT_SPENCER, 0, Route124_Text_1C0624, Route124_Text_1C0675 msgbox Route124_Text_1C0693, 6 end Route124_EventScript_151E0F:: @ 8151E0F - trainerbattle 0, 160, 0, Route124_Text_1C06F7, Route124_Text_1C0741 + trainerbattle 0, OPPONENT_ROLAND, 0, Route124_Text_1C06F7, Route124_Text_1C0741 msgbox Route124_Text_1C0750, 6 end Route124_EventScript_151E26:: @ 8151E26 - trainerbattle 0, 449, 0, Route124_Text_1C07B4, Route124_Text_1C07F9 + trainerbattle 0, OPPONENT_JENNY_1, 0, Route124_Text_1C07B4, Route124_Text_1C07F9 specialval RESULT, 57 compare RESULT, 1 jumpeq Route124_EventScript_151E4D @@ -30,22 +30,22 @@ Route124_EventScript_151E26:: @ 8151E26 end Route124_EventScript_151E4D:: @ 8151E4D - trainerbattle 5, 449, 0, Route124_Text_1C0888, Route124_Text_1C08C8 + trainerbattle 5, OPPONENT_JENNY_1, 0, Route124_Text_1C0888, Route124_Text_1C08C8 msgbox Route124_Text_1C08EA, 6 end Route124_EventScript_151E64:: @ 8151E64 - trainerbattle 0, 450, 0, Route124_Text_1C0936, Route124_Text_1C096B + trainerbattle 0, OPPONENT_GRACE, 0, Route124_Text_1C0936, Route124_Text_1C096B msgbox Route124_Text_1C0994, 6 end Route124_EventScript_151E7B:: @ 8151E7B - trainerbattle 0, 174, 0, Route124_Text_1C09CE, Route124_Text_1C0A2F + trainerbattle 0, OPPONENT_CHAD, 0, Route124_Text_1C09CE, Route124_Text_1C0A2F msgbox Route124_Text_1C0A52, 6 end Route124_EventScript_151E92:: @ 8151E92 - trainerbattle 4, 687, 0, Route124_Text_1C0ABD, Route124_Text_1C0B36, Route124_Text_1C0BC8 + trainerbattle 4, OPPONENT_RITA_AND_SAM_1, 0, Route124_Text_1C0ABD, Route124_Text_1C0B36, Route124_Text_1C0BC8 specialval RESULT, 57 compare RESULT, 1 jumpeq Route124_EventScript_151EBD @@ -53,12 +53,12 @@ Route124_EventScript_151E92:: @ 8151E92 end Route124_EventScript_151EBD:: @ 8151EBD - trainerbattle 7, 687, 0, Route124_Text_1C0D1F, Route124_Text_1C0DB5, Route124_Text_1C0E5C + trainerbattle 7, OPPONENT_RITA_AND_SAM_1, 0, Route124_Text_1C0D1F, Route124_Text_1C0DB5, Route124_Text_1C0E5C msgbox Route124_Text_1C0E06, 6 end Route124_EventScript_151ED8:: @ 8151ED8 - trainerbattle 4, 687, 0, Route124_Text_1C0C0E, Route124_Text_1C0C4F, Route124_Text_1C0CE0 + trainerbattle 4, OPPONENT_RITA_AND_SAM_1, 0, Route124_Text_1C0C0E, Route124_Text_1C0C4F, Route124_Text_1C0CE0 specialval RESULT, 57 compare RESULT, 1 jumpeq Route124_EventScript_151F03 @@ -66,6 +66,6 @@ Route124_EventScript_151ED8:: @ 8151ED8 end Route124_EventScript_151F03:: @ 8151F03 - trainerbattle 7, 687, 0, Route124_Text_1C0EA2, Route124_Text_1C0EE5, Route124_Text_1C0F90 + trainerbattle 7, OPPONENT_RITA_AND_SAM_1, 0, Route124_Text_1C0EA2, Route124_Text_1C0EE5, Route124_Text_1C0F90 msgbox Route124_Text_1C0F19, 6 end |