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/Route102.inc | |
parent | 6b5157b2a3b2d81f83a910b211834cde5cd3a238 (diff) | |
parent | 841ee0f2b25b39b923a9f800279df413edb8c66d (diff) |
merge bike with master, fix conflicts
Diffstat (limited to 'data/scripts/maps/Route102.inc')
-rw-r--r-- | data/scripts/maps/Route102.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/scripts/maps/Route102.inc b/data/scripts/maps/Route102.inc index 99e9f610c..ae82ea0b4 100644 --- a/data/scripts/maps/Route102.inc +++ b/data/scripts/maps/Route102.inc @@ -20,11 +20,11 @@ Route102_EventScript_1EC0FC:: @ 81EC0FC Route102_EventScript_1EC105:: @ 81EC105 trainerbattle 2, TRAINER_CALVIN_1, 0, Route102_Text_294513, Route102_Text_29457C, Route102_EventScript_1EC146 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route102_EventScript_1EC19C setvar VAR_0x8004, 318 specialvar VAR_RESULT, sub_813B4E0 - compare_var_to_value VAR_RESULT, 0 + compare VAR_RESULT, 0 goto_eq Route102_EventScript_1EC170 msgbox Route102_Text_2945AC, 4 release |