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/Route129.inc | |
| parent | 6b5157b2a3b2d81f83a910b211834cde5cd3a238 (diff) | |
| parent | 841ee0f2b25b39b923a9f800279df413edb8c66d (diff) | |
merge bike with master, fix conflicts
Diffstat (limited to 'data/scripts/maps/Route129.inc')
| -rw-r--r-- | data/scripts/maps/Route129.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/data/scripts/maps/Route129.inc b/data/scripts/maps/Route129.inc index 822c6018d..170d87e56 100644 --- a/data/scripts/maps/Route129.inc +++ b/data/scripts/maps/Route129.inc @@ -5,20 +5,20 @@ Route129_MapScripts:: @ 81F7284 .byte 0 Route129_MapScript1_1F7294: @ 81F7294 - compare_var_to_value VAR_0x4037, 15 + compare VAR_0x4037, 15 call_if 1, Route129_EventScript_273C39 - compare_var_to_value VAR_0x4037, 16 + compare VAR_0x4037, 16 call_if 1, Route129_EventScript_273CA6 end Route129_MapScript1_1F72AB: @ 81F72AB - compare_var_to_value VAR_0x4039, 1 + compare VAR_0x4039, 1 call_if 1, Route129_EventScript_273D13 - compare_var_to_value VAR_0x405E, 4 + compare VAR_0x405E, 4 call_if 4, Route129_EventScript_1F72D8 - compare_var_to_value VAR_0x4037, 15 + compare VAR_0x4037, 15 call_if 1, Route129_EventScript_273D17 - compare_var_to_value VAR_0x4037, 16 + compare VAR_0x4037, 16 call_if 1, Route129_EventScript_273D17 end |