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/Route105.inc | |
parent | 6b5157b2a3b2d81f83a910b211834cde5cd3a238 (diff) | |
parent | 841ee0f2b25b39b923a9f800279df413edb8c66d (diff) |
merge bike with master, fix conflicts
Diffstat (limited to 'data/scripts/maps/Route105.inc')
-rw-r--r-- | data/scripts/maps/Route105.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/data/scripts/maps/Route105.inc b/data/scripts/maps/Route105.inc index b527fc7a8..32c6826af 100644 --- a/data/scripts/maps/Route105.inc +++ b/data/scripts/maps/Route105.inc @@ -7,9 +7,9 @@ Route105_MapScripts:: @ 81EE1DB Route105_MapScript1_1EE1EB: @ 81EE1EB checkflag FLAG_0x0E4 call_if 0, Route105_EventScript_1EE20B - compare_var_to_value VAR_0x4037, 9 + compare VAR_0x4037, 9 call_if 1, Route105_EventScript_2739AB - compare_var_to_value VAR_0x4037, 10 + compare VAR_0x4037, 10 call_if 1, Route105_EventScript_273A18 end @@ -19,11 +19,11 @@ Route105_EventScript_1EE20B:: @ 81EE20B return Route105_MapScript1_1EE21E: @ 81EE21E - compare_var_to_value VAR_0x4039, 1 + compare VAR_0x4039, 1 call_if 1, Route105_EventScript_273D13 - compare_var_to_value VAR_0x4037, 9 + compare VAR_0x4037, 9 call_if 1, Route105_EventScript_273D17 - compare_var_to_value VAR_0x4037, 10 + compare VAR_0x4037, 10 call_if 1, Route105_EventScript_273D17 end @@ -64,7 +64,7 @@ Route105_EventScript_1EE2BD:: @ 81EE2BD Route105_EventScript_1EE2D4:: @ 81EE2D4 trainerbattle 2, TRAINER_ANDRES_1, 0, Route105_Text_2960A9, Route105_Text_2960DB, Route105_EventScript_1EE300 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route105_EventScript_1EE31F msgbox Route105_Text_2960FA, 4 release |