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/Route124.inc | |
parent | 19c25a8f2b3145b6a053cf3af9a76b306dbf3a88 (diff) | |
parent | 841ee0f2b25b39b923a9f800279df413edb8c66d (diff) |
Merge branch 'master' into dump_pointers
Diffstat (limited to 'data/scripts/maps/Route124.inc')
-rw-r--r-- | data/scripts/maps/Route124.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/scripts/maps/Route124.inc b/data/scripts/maps/Route124.inc index 01687eba8..2079c338d 100644 --- a/data/scripts/maps/Route124.inc +++ b/data/scripts/maps/Route124.inc @@ -24,7 +24,7 @@ Route124_EventScript_1F659C:: @ 81F659C Route124_EventScript_1F65B3:: @ 81F65B3 trainerbattle 2, TRAINER_JENNY_1, 0, Route124_Text_2A0B37, Route124_Text_2A0B7C, Route124_EventScript_1F65DF specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route124_EventScript_1F65FE msgbox Route124_Text_2A0B9A, 4 release @@ -59,7 +59,7 @@ Route124_EventScript_1F662C:: @ 81F662C Route124_EventScript_1F6643:: @ 81F6643 trainerbattle 6, TRAINER_LILA_AND_ROY_1, 0, Route124_Text_2A0E87, Route124_Text_2A0EFE, Route124_Text_2A0F8C, Route124_EventScript_1F6673 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route124_EventScript_1F668C msgbox Route124_Text_2A0F3A, 4 release @@ -82,7 +82,7 @@ Route124_EventScript_1F668C:: @ 81F668C Route124_EventScript_1F66A7:: @ 81F66A7 trainerbattle 6, TRAINER_LILA_AND_ROY_1, 0, Route124_Text_2A0FD1, Route124_Text_2A1012, Route124_Text_2A10E5, Route124_EventScript_1F66D7 specialvar VAR_RESULT, ShouldTryRematchBattle - compare_var_to_value VAR_RESULT, 1 + compare VAR_RESULT, 1 goto_eq Route124_EventScript_1F66F0 msgbox Route124_Text_2A103E, 4 release |