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/Route125.inc | |
| parent | 6b5157b2a3b2d81f83a910b211834cde5cd3a238 (diff) | |
| parent | 841ee0f2b25b39b923a9f800279df413edb8c66d (diff) | |
merge bike with master, fix conflicts
Diffstat (limited to 'data/scripts/maps/Route125.inc')
| -rw-r--r-- | data/scripts/maps/Route125.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/data/scripts/maps/Route125.inc b/data/scripts/maps/Route125.inc index b93e7f016..de3ae07b5 100644 --- a/data/scripts/maps/Route125.inc +++ b/data/scripts/maps/Route125.inc @@ -7,18 +7,18 @@ Route125_MapScripts:: @ 81F6748 Route125_MapScript1_1F6758: @ 81F6758 checkflag FLAG_SYS_WEATHER_CTRL call_if 1, Route125_EventScript_27207A - compare_var_to_value VAR_0x4039, 1 + compare VAR_0x4039, 1 call_if 1, Route125_EventScript_273D13 - compare_var_to_value VAR_0x4037, 11 + compare VAR_0x4037, 11 call_if 1, Route125_EventScript_273D17 - compare_var_to_value VAR_0x4037, 12 + compare VAR_0x4037, 12 call_if 1, Route125_EventScript_273D17 end Route125_MapScript1_1F6783: @ 81F6783 - compare_var_to_value VAR_0x4037, 11 + compare VAR_0x4037, 11 call_if 1, Route125_EventScript_273A85 - compare_var_to_value VAR_0x4037, 12 + compare VAR_0x4037, 12 call_if 1, Route125_EventScript_273AF2 end @@ -49,7 +49,7 @@ Route125_EventScript_1F67E9:: @ 81F67E9 Route125_EventScript_1F6800:: @ 81F6800 trainerbattle 2, TRAINER_ERNEST_1, 0, Route125_Text_2A16FC, Route125_Text_2A173A, Route125_EventScript_1F682C specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route125_EventScript_1F684B msgbox Route125_Text_2A1755, 4 release |