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/Route130.inc | |
parent | 6b5157b2a3b2d81f83a910b211834cde5cd3a238 (diff) | |
parent | 841ee0f2b25b39b923a9f800279df413edb8c66d (diff) |
merge bike with master, fix conflicts
Diffstat (limited to 'data/scripts/maps/Route130.inc')
-rw-r--r-- | data/scripts/maps/Route130.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/scripts/maps/Route130.inc b/data/scripts/maps/Route130.inc index b76d77759..0b9d85e30 100644 --- a/data/scripts/maps/Route130.inc +++ b/data/scripts/maps/Route130.inc @@ -3,10 +3,10 @@ Route130_MapScripts:: @ 81F735F .byte 0 Route130_MapScript1_1F7365: @ 81F7365 - compare_var_to_value VAR_0x405E, 4 + compare VAR_0x405E, 4 call_if 4, Route130_EventScript_1F73B5 specialvar VAR_RESULT, sub_813793C - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route130_EventScript_1F73B1 setflag FLAG_0x011 setflag FLAG_0x012 |