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/Route121 | |
| parent | 3bd2094141da60be175f237fa34889469f77f187 (diff) | |
Sync event macros
Diffstat (limited to 'data/maps/Route121')
| -rw-r--r-- | data/maps/Route121/scripts.inc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/data/maps/Route121/scripts.inc b/data/maps/Route121/scripts.inc index b6a0abe09..92ca05aea 100644 --- a/data/maps/Route121/scripts.inc +++ b/data/maps/Route121/scripts.inc @@ -67,12 +67,12 @@ Route121_Movement_151B69:: @ 8151B69 end_movement Route121_EventScript_151B72:: @ 8151B72 - trainerbattle 0, TRAINER_VANESSA, 0, Route121_Text_1BF96E, Route121_Text_1BF9A1 + trainerbattle_single TRAINER_VANESSA, Route121_Text_1BF96E, Route121_Text_1BF9A1 msgbox Route121_Text_1BF9BA, 6 end Route121_EventScript_151B89:: @ 8151B89 - trainerbattle 0, TRAINER_WALTER_1, 0, Route121_Text_1BFA1B, Route121_Text_1BFA8C + trainerbattle_single TRAINER_WALTER_1, Route121_Text_1BFA1B, Route121_Text_1BFA8C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route121_EventScript_151BB0 @@ -80,27 +80,27 @@ Route121_EventScript_151B89:: @ 8151B89 end Route121_EventScript_151BB0:: @ 8151BB0 - trainerbattle 5, TRAINER_WALTER_1, 0, Route121_Text_1BFADA, Route121_Text_1BFB4B + trainerbattle_rematch TRAINER_WALTER_1, Route121_Text_1BFADA, Route121_Text_1BFB4B msgbox Route121_Text_1BFB5C, 6 end Route121_EventScript_151BC7:: @ 8151BC7 - trainerbattle 0, TRAINER_TAMMY, 0, Route121_Text_1BFBB4, Route121_Text_1BFBEE + trainerbattle_single TRAINER_TAMMY, Route121_Text_1BFBB4, Route121_Text_1BFBEE msgbox Route121_Text_1BFBFD, 6 end Route121_EventScript_151BDE:: @ 8151BDE - trainerbattle 4, TRAINER_KATE_AND_JOY, 0, Route121_Text_1BFC36, Route121_Text_1BFC7A, Route121_Text_1BFD08 + trainerbattle_double TRAINER_KATE_AND_JOY, Route121_Text_1BFC36, Route121_Text_1BFC7A, Route121_Text_1BFD08 msgbox Route121_Text_1BFCB3, 6 end Route121_EventScript_151BF9:: @ 8151BF9 - trainerbattle 4, TRAINER_KATE_AND_JOY, 0, Route121_Text_1BFD60, Route121_Text_1BFDA3, Route121_Text_1BFE0D + trainerbattle_double TRAINER_KATE_AND_JOY, Route121_Text_1BFD60, Route121_Text_1BFDA3, Route121_Text_1BFE0D msgbox Route121_Text_1BFDC1, 6 end Route121_EventScript_151C14:: @ 8151C14 - trainerbattle 0, TRAINER_JESSICA_1, 0, Route121_Text_1BFE51, Route121_Text_1BFE80 + trainerbattle_single TRAINER_JESSICA_1, Route121_Text_1BFE51, Route121_Text_1BFE80 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route121_EventScript_151C3B @@ -108,6 +108,6 @@ Route121_EventScript_151C14:: @ 8151C14 end Route121_EventScript_151C3B:: @ 8151C3B - trainerbattle 5, TRAINER_JESSICA_1, 0, Route121_Text_1BFEDE, Route121_Text_1BFF0A + trainerbattle_rematch TRAINER_JESSICA_1, Route121_Text_1BFEDE, Route121_Text_1BFF0A msgbox Route121_Text_1BFF3A, 6 end |