diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-04-23 17:20:34 -0400 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-04-23 17:59:25 -0400 |
| commit | 71094356313801bf20191f3db1efa0decd3c3dcb (patch) | |
| tree | 18c501d04a21f88c5f4d59f764883e326710ca39 /data/maps/Route115 | |
| parent | 3bd2094141da60be175f237fa34889469f77f187 (diff) | |
Sync event macros
Diffstat (limited to 'data/maps/Route115')
| -rw-r--r-- | data/maps/Route115/scripts.inc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/data/maps/Route115/scripts.inc b/data/maps/Route115/scripts.inc index 6fd262de4..31d4a2860 100644 --- a/data/maps/Route115/scripts.inc +++ b/data/maps/Route115/scripts.inc @@ -14,7 +14,7 @@ Route115_EventScript_150940:: @ 8150940 end Route115_EventScript_150949:: @ 8150949 - trainerbattle 0, TRAINER_TIMOTHY_1, 0, Route115_Text_1BC9AC, Route115_Text_1BC9E6 + trainerbattle_single TRAINER_TIMOTHY_1, Route115_Text_1BC9AC, Route115_Text_1BC9E6 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route115_EventScript_150970 @@ -22,17 +22,17 @@ Route115_EventScript_150949:: @ 8150949 end Route115_EventScript_150970:: @ 8150970 - trainerbattle 5, TRAINER_TIMOTHY_1, 0, Route115_Text_1BCA6B, Route115_Text_1BCAB3 + trainerbattle_rematch TRAINER_TIMOTHY_1, Route115_Text_1BCA6B, Route115_Text_1BCAB3 msgbox Route115_Text_1BCAC6, 6 end Route115_EventScript_150987:: @ 8150987 - trainerbattle 0, TRAINER_KOICHI, 0, Route115_Text_1BCB0D, Route115_Text_1BCB2E + trainerbattle_single TRAINER_KOICHI, Route115_Text_1BCB0D, Route115_Text_1BCB2E msgbox Route115_Text_1BCB40, 6 end Route115_EventScript_15099E:: @ 815099E - trainerbattle 0, TRAINER_NOB_1, 0, Route115_Text_1BCB8A, Route115_Text_1BCBC1 + trainerbattle_single TRAINER_NOB_1, Route115_Text_1BCB8A, Route115_Text_1BCBC1 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route115_EventScript_1509C5 @@ -40,12 +40,12 @@ Route115_EventScript_15099E:: @ 815099E end Route115_EventScript_1509C5:: @ 81509C5 - trainerbattle 5, TRAINER_NOB_1, 0, Route115_Text_1BCC4C, Route115_Text_1BCCA2 + trainerbattle_rematch TRAINER_NOB_1, Route115_Text_1BCC4C, Route115_Text_1BCCA2 msgbox Route115_Text_1BCCBA, 6 end Route115_EventScript_1509DC:: @ 81509DC - trainerbattle 0, TRAINER_CYNDY_1, 0, Route115_Text_1BCCF4, Route115_Text_1BCD32 + trainerbattle_single TRAINER_CYNDY_1, Route115_Text_1BCCF4, Route115_Text_1BCD32 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route115_EventScript_150A03 @@ -53,16 +53,16 @@ Route115_EventScript_1509DC:: @ 81509DC end Route115_EventScript_150A03:: @ 8150A03 - trainerbattle 5, TRAINER_CYNDY_1, 0, Route115_Text_1BCDB0, Route115_Text_1BCDD0 + trainerbattle_rematch TRAINER_CYNDY_1, 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_single TRAINER_514, UnknownString_81BCE47, UnknownString_81BCE7D msgbox UnknownString_81BCEA4, 6 .else - trainerbattle 0, TRAINER_514, 0, Route115_Text_1BCEE0, Route115_Text_1BCF16 + trainerbattle_single TRAINER_514, Route115_Text_1BCEE0, Route115_Text_1BCF16 msgbox Route115_Text_1BCF3D, 6 .endc end |