diff options
Diffstat (limited to 'data/scripts/maps/Route115.s')
| -rw-r--r-- | data/scripts/maps/Route115.s | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/data/scripts/maps/Route115.s b/data/scripts/maps/Route115.s index 187e9b86f..e2c00f6fc 100644 --- a/data/scripts/maps/Route115.s +++ b/data/scripts/maps/Route115.s @@ -14,7 +14,7 @@ Route115_EventScript_150940:: @ 8150940 end Route115_EventScript_150949:: @ 8150949 - trainerbattle 0, 307, 0, Route115_Text_1BC9AC, Route115_Text_1BC9E6 + trainerbattle 0, OPPONENT_TIMOTHY_1, 0, Route115_Text_1BC9AC, Route115_Text_1BC9E6 specialval RESULT, 57 compare RESULT, 1 jumpeq Route115_EventScript_150970 @@ -22,17 +22,17 @@ Route115_EventScript_150949:: @ 8150949 end Route115_EventScript_150970:: @ 8150970 - trainerbattle 5, 307, 0, Route115_Text_1BCA6B, Route115_Text_1BCAB3 + trainerbattle 5, OPPONENT_TIMOTHY_1, 0, Route115_Text_1BCA6B, Route115_Text_1BCAB3 msgbox Route115_Text_1BCAC6, 6 end Route115_EventScript_150987:: @ 8150987 - trainerbattle 0, 182, 0, Route115_Text_1BCB0D, Route115_Text_1BCB2E + trainerbattle 0, OPPONENT_KOICHI, 0, Route115_Text_1BCB0D, Route115_Text_1BCB2E msgbox Route115_Text_1BCB40, 6 end Route115_EventScript_15099E:: @ 815099E - trainerbattle 0, 183, 0, Route115_Text_1BCB8A, Route115_Text_1BCBC1 + trainerbattle 0, OPPONENT_NOB_1, 0, Route115_Text_1BCB8A, Route115_Text_1BCBC1 specialval RESULT, 57 compare RESULT, 1 jumpeq Route115_EventScript_1509C5 @@ -40,12 +40,12 @@ Route115_EventScript_15099E:: @ 815099E end Route115_EventScript_1509C5:: @ 81509C5 - trainerbattle 5, 183, 0, Route115_Text_1BCC4C, Route115_Text_1BCCA2 + trainerbattle 5, OPPONENT_NOB_1, 0, Route115_Text_1BCC4C, Route115_Text_1BCCA2 msgbox Route115_Text_1BCCBA, 6 end Route115_EventScript_1509DC:: @ 81509DC - trainerbattle 0, 427, 0, Route115_Text_1BCCF4, Route115_Text_1BCD32 + trainerbattle 0, OPPONENT_CYNDY_1, 0, Route115_Text_1BCCF4, Route115_Text_1BCD32 specialval RESULT, 57 compare RESULT, 1 jumpeq Route115_EventScript_150A03 @@ -53,16 +53,16 @@ Route115_EventScript_1509DC:: @ 81509DC end Route115_EventScript_150A03:: @ 8150A03 - trainerbattle 5, 427, 0, Route115_Text_1BCDB0, Route115_Text_1BCDD0 + trainerbattle 5, OPPONENT_CYNDY_1, 0, Route115_Text_1BCDB0, Route115_Text_1BCDD0 msgbox Route115_Text_1BCDEF, 6 end Route115_EventScript_150A1A:: @ 8150A1A .ifdef SAPPHIRE - trainerbattle 0, TRAINER_514, 0, UnknownString_81BCE47, UnknownString_81BCE7D + trainerbattle 0, OPPONENT_514, 0, UnknownString_81BCE47, UnknownString_81BCE7D msgbox UnknownString_81BCEA4, 6 .else - trainerbattle 0, TRAINER_514, 0, Route115_Text_1BCEE0, Route115_Text_1BCF16 + trainerbattle 0, OPPONENT_514, 0, Route115_Text_1BCEE0, Route115_Text_1BCF16 msgbox Route115_Text_1BCF3D, 6 .endc end |