diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-12-22 01:22:16 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-12-22 01:22:16 -0600 |
| commit | 6bd6cfcac7ae76806c8c9d940163dc3ece6a9acf (patch) | |
| tree | f71ad889881572488c2a2be299c50fc09393e1a2 /data/scripts/maps/Route125.inc | |
| parent | 0e8d6645f84057a9eaf9e60ac9312bc259f15be1 (diff) | |
| parent | 4554b546ef1699d4b3bde9ef27e7477e620d38d9 (diff) | |
Merge remote-tracking branch 'pret/master'
Diffstat (limited to 'data/scripts/maps/Route125.inc')
| -rw-r--r-- | data/scripts/maps/Route125.inc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/data/scripts/maps/Route125.inc b/data/scripts/maps/Route125.inc index 953bf52b2..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 @@ -48,8 +48,8 @@ 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, sub_80B226C - compare_var_to_value VAR_RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_eq Route125_EventScript_1F684B msgbox Route125_Text_2A1755, 4 release |