diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-22 16:22:16 +0100 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-22 16:22:16 +0100 |
commit | cddd44834e1786b4cb88cf7723b9b7fa9ef15b09 (patch) | |
tree | 6850f86bddce68d1a6b9e4149ffecd0ace874551 /data/scripts/maps/Route113.inc | |
parent | 19c25a8f2b3145b6a053cf3af9a76b306dbf3a88 (diff) | |
parent | 841ee0f2b25b39b923a9f800279df413edb8c66d (diff) |
Merge branch 'master' into dump_pointers
Diffstat (limited to 'data/scripts/maps/Route113.inc')
-rw-r--r-- | data/scripts/maps/Route113.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/scripts/maps/Route113.inc b/data/scripts/maps/Route113.inc index 30bf10068..c1ce29b72 100644 --- a/data/scripts/maps/Route113.inc +++ b/data/scripts/maps/Route113.inc @@ -14,9 +14,9 @@ Route113_MapScript1_1F2161: @ 81F2161 Route113_EventScript_1F216A:: @ 81F216A getplayerxy VAR_0x4000, VAR_0x4001 - compare_var_to_value VAR_0x4000, 19 + compare VAR_0x4000, 19 goto_if 0, Route113_EventScript_1F2189 - compare_var_to_value VAR_0x4000, 84 + compare VAR_0x4000, 84 goto_if 2, Route113_EventScript_1F2189 setweather 7 return @@ -61,7 +61,7 @@ Route113_EventScript_1F21D7:: @ 81F21D7 Route113_EventScript_1F21EE:: @ 81F21EE trainerbattle 2, TRAINER_MADELINE_1, 0, Route113_Text_299EA6, Route113_Text_299EF9, Route113_EventScript_1F221A specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route113_EventScript_1F2239 msgbox Route113_Text_299F15, 4 release @@ -86,7 +86,7 @@ Route113_EventScript_1F2239:: @ 81F2239 Route113_EventScript_1F2250:: @ 81F2250 trainerbattle 2, TRAINER_LAO_1, 0, Route113_Text_29A015, Route113_Text_29A04C, Route113_EventScript_1F227C specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route113_EventScript_1F229B msgbox Route113_Text_29A067, 4 release |