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/Route127.inc | |
| parent | 6b5157b2a3b2d81f83a910b211834cde5cd3a238 (diff) | |
| parent | 841ee0f2b25b39b923a9f800279df413edb8c66d (diff) | |
merge bike with master, fix conflicts
Diffstat (limited to 'data/scripts/maps/Route127.inc')
| -rw-r--r-- | data/scripts/maps/Route127.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/data/scripts/maps/Route127.inc b/data/scripts/maps/Route127.inc index 68992425e..cbc7d7da1 100644 --- a/data/scripts/maps/Route127.inc +++ b/data/scripts/maps/Route127.inc @@ -7,18 +7,18 @@ Route127_MapScripts:: @ 81F69D9 Route127_MapScript1_1F69E9: @ 81F69E9 checkflag FLAG_SYS_WEATHER_CTRL call_if 1, Route127_EventScript_27207A - compare_var_to_value VAR_0x4039, 1 + compare VAR_0x4039, 1 call_if 1, Route127_EventScript_273D13 - compare_var_to_value VAR_0x4037, 13 + compare VAR_0x4037, 13 call_if 1, Route127_EventScript_273D17 - compare_var_to_value VAR_0x4037, 14 + compare VAR_0x4037, 14 call_if 1, Route127_EventScript_273D17 end Route127_MapScript1_1F6A14: @ 81F6A14 - compare_var_to_value VAR_0x4037, 13 + compare VAR_0x4037, 13 call_if 1, Route127_EventScript_273B5F - compare_var_to_value VAR_0x4037, 14 + compare VAR_0x4037, 14 call_if 1, Route127_EventScript_273BCC end @@ -64,7 +64,7 @@ Route127_EventScript_1F6ABF:: @ 81F6ABF Route127_EventScript_1F6AD6:: @ 81F6AD6 trainerbattle 2, TRAINER_KOJI_1, 0, Route127_Text_2A264D, Route127_Text_2A2685, Route127_EventScript_1F6B02 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route127_EventScript_1F6B21 msgbox Route127_Text_2A26AC, 4 release |