diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-24 00:08:55 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-24 00:08:55 +0100 |
| commit | 8cd4908fa3820b22a8b4e3d96780d725132549c4 (patch) | |
| tree | bcc8e697ce7dd0d4ab532a61fccafbbdb6d2400e /data/scripts/maps/Route123.inc | |
| parent | 6b5157b2a3b2d81f83a910b211834cde5cd3a238 (diff) | |
| parent | 841ee0f2b25b39b923a9f800279df413edb8c66d (diff) | |
merge bike with master, fix conflicts
Diffstat (limited to 'data/scripts/maps/Route123.inc')
| -rw-r--r-- | data/scripts/maps/Route123.inc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/data/scripts/maps/Route123.inc b/data/scripts/maps/Route123.inc index ee659a496..feec8adeb 100644 --- a/data/scripts/maps/Route123.inc +++ b/data/scripts/maps/Route123.inc @@ -13,11 +13,11 @@ Route123_EventScript_1F6151:: @ 81F6151 goto_eq Route123_EventScript_1F61A0 msgbox Route123_Text_1F641E, 4 special sub_81390E0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route123_EventScript_1F619E msgbox Route123_Text_1F645D, 4 giveitem_std ITEM_TM19 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route123_EventScript_272054 setflag FLAG_0x0E8 msgbox Route123_Text_1F64CF, 4 @@ -63,7 +63,7 @@ Route123_EventScript_1F61F3:: @ 81F61F3 Route123_EventScript_1F620A:: @ 81F620A trainerbattle 2, TRAINER_CAMERON_1, 0, Route123_Text_29FDBA, Route123_Text_29FE1E, Route123_EventScript_1F6236 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route123_EventScript_1F6255 msgbox Route123_Text_29FE2A, 4 release @@ -88,7 +88,7 @@ Route123_EventScript_1F6255:: @ 81F6255 Route123_EventScript_1F626C:: @ 81F626C trainerbattle 2, TRAINER_JACKI_1, 0, Route123_Text_29FF61, Route123_Text_29FFD8, Route123_EventScript_1F6298 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route123_EventScript_1F62B7 msgbox Route123_Text_29FFE5, 4 release @@ -163,7 +163,7 @@ Route123_EventScript_1F63A5:: @ 81F63A5 Route123_EventScript_1F63BC:: @ 81F63BC trainerbattle 2, TRAINER_FERNANDO_1, 0, Route123_Text_2A0323, Route123_Text_2A035C, Route123_EventScript_1F63E8 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route123_EventScript_1F6407 msgbox Route123_Text_2A0389, 4 release |