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/Route118 | |
| parent | 3bd2094141da60be175f237fa34889469f77f187 (diff) | |
Sync event macros
Diffstat (limited to 'data/maps/Route118')
| -rw-r--r-- | data/maps/Route118/scripts.inc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index 0bb082903..fa27a4697 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -19,7 +19,7 @@ Route118_EventScript_150F34:: @ 8150F34 Route118_EventScript_150F5E:: @ 8150F5E msgbox Route118_Text_170F46, 4 - giveitem_std ITEM_GOOD_ROD + giveitem ITEM_GOOD_ROD setflag FLAG_RECEIVED_GOOD_ROD msgbox Route118_Text_170F7E, 4 release @@ -159,7 +159,7 @@ Route118_Movement_151086:: @ 8151086 end_movement Route118_EventScript_15108F:: @ 815108F - trainerbattle 0, TRAINER_ROSE_1, 0, Route118_Text_1BDFF4, Route118_Text_1BE03C + trainerbattle_single TRAINER_ROSE_1, Route118_Text_1BDFF4, Route118_Text_1BE03C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route118_EventScript_1510B6 @@ -167,22 +167,22 @@ Route118_EventScript_15108F:: @ 815108F end Route118_EventScript_1510B6:: @ 81510B6 - trainerbattle 5, TRAINER_ROSE_1, 0, Route118_Text_1BE0AB, Route118_Text_1BE0D3 + trainerbattle_rematch TRAINER_ROSE_1, Route118_Text_1BE0AB, Route118_Text_1BE0D3 msgbox Route118_Text_1BE104, 6 end Route118_EventScript_1510CD:: @ 81510CD - trainerbattle 0, TRAINER_BARNY, 0, Route118_Text_1BE24A, Route118_Text_1BE291 + trainerbattle_single TRAINER_BARNY, Route118_Text_1BE24A, Route118_Text_1BE291 msgbox Route118_Text_1BE2BE, 6 end Route118_EventScript_1510E4:: @ 81510E4 - trainerbattle 0, TRAINER_WADE, 0, Route118_Text_1BE318, Route118_Text_1BE385 + trainerbattle_single TRAINER_WADE, Route118_Text_1BE318, Route118_Text_1BE385 msgbox Route118_Text_1BE39C, 6 end Route118_EventScript_1510FB:: @ 81510FB - trainerbattle 0, TRAINER_DALTON_1, 0, Route118_Text_1BE3E8, Route118_Text_1BE406 + trainerbattle_single TRAINER_DALTON_1, Route118_Text_1BE3E8, Route118_Text_1BE406 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route118_EventScript_151122 @@ -190,16 +190,16 @@ Route118_EventScript_1510FB:: @ 81510FB end Route118_EventScript_151122:: @ 8151122 - trainerbattle 5, TRAINER_DALTON_1, 0, Route118_Text_1BE489, Route118_Text_1BE4CC + trainerbattle_rematch TRAINER_DALTON_1, Route118_Text_1BE489, Route118_Text_1BE4CC msgbox Route118_Text_1BE4D9, 6 end Route118_EventScript_151139:: @ 8151139 - trainerbattle 0, TRAINER_PERRY, 0, Route118_Text_1BE148, Route118_Text_1BE188 + trainerbattle_single TRAINER_PERRY, Route118_Text_1BE148, Route118_Text_1BE188 msgbox Route118_Text_1BE19D, 6 end Route118_EventScript_151150:: @ 8151150 - trainerbattle 0, TRAINER_CHESTER, 0, Route118_Text_1BE1D7, Route118_Text_1BE1F5 + trainerbattle_single TRAINER_CHESTER, Route118_Text_1BE1D7, Route118_Text_1BE1F5 msgbox Route118_Text_1BE20D, 6 end |