From 86e7bf1fd61b151011038cdb281db3de0a1d9e6a Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 24 Sep 2017 14:28:51 -0500 Subject: Replace more script commands and fix German build --- data/scripts/maps/Route125.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/scripts/maps/Route125.inc') diff --git a/data/scripts/maps/Route125.inc b/data/scripts/maps/Route125.inc index a5d2457d5..045a55a11 100644 --- a/data/scripts/maps/Route125.inc +++ b/data/scripts/maps/Route125.inc @@ -4,7 +4,7 @@ Route125_MapScripts:: @ 8151F1E Route125_MapScript1_151F24:: @ 8151F24 checkflag 2090 - callif 1, Route125_EventScript_1A02C1 + call_if 1, Route125_EventScript_1A02C1 end Route125_EventScript_151F2E:: @ 8151F2E @@ -31,7 +31,7 @@ Route125_EventScript_151F8A:: @ 8151F8A trainerbattle 0, OPPONENT_ERNEST_1, 0, Route125_Text_1C11AF, Route125_Text_1C11ED specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route125_EventScript_151FB1 + goto_if_eq Route125_EventScript_151FB1 msgbox Route125_Text_1C1208, 6 end -- cgit v1.2.3 From 1e2601a0287fdacfb8f0d680fbe82a274414ea65 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 24 Sep 2017 17:10:51 -0500 Subject: more script command renaming --- data/scripts/maps/Route125.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/scripts/maps/Route125.inc') diff --git a/data/scripts/maps/Route125.inc b/data/scripts/maps/Route125.inc index 045a55a11..7d5fc0376 100644 --- a/data/scripts/maps/Route125.inc +++ b/data/scripts/maps/Route125.inc @@ -30,7 +30,7 @@ Route125_EventScript_151F73:: @ 8151F73 Route125_EventScript_151F8A:: @ 8151F8A trainerbattle 0, OPPONENT_ERNEST_1, 0, Route125_Text_1C11AF, Route125_Text_1C11ED specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route125_EventScript_151FB1 msgbox Route125_Text_1C1208, 6 end -- cgit v1.2.3 From 207f8e6a76f6b13855780bb2608be9d8c1f14b15 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 24 Sep 2017 17:36:39 -0500 Subject: more script command renaming --- data/scripts/maps/Route125.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/scripts/maps/Route125.inc') diff --git a/data/scripts/maps/Route125.inc b/data/scripts/maps/Route125.inc index 7d5fc0376..c62d49117 100644 --- a/data/scripts/maps/Route125.inc +++ b/data/scripts/maps/Route125.inc @@ -29,7 +29,7 @@ Route125_EventScript_151F73:: @ 8151F73 Route125_EventScript_151F8A:: @ 8151F8A trainerbattle 0, OPPONENT_ERNEST_1, 0, Route125_Text_1C11AF, Route125_Text_1C11ED - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route125_EventScript_151FB1 msgbox Route125_Text_1C1208, 6 -- cgit v1.2.3 From 9458b3fad18eea3fbd9168a88dd33e8aa10abcda Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Tue, 26 Sep 2017 14:09:41 -0500 Subject: single compare macro --- data/scripts/maps/Route125.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/scripts/maps/Route125.inc') diff --git a/data/scripts/maps/Route125.inc b/data/scripts/maps/Route125.inc index c62d49117..489a7314b 100644 --- a/data/scripts/maps/Route125.inc +++ b/data/scripts/maps/Route125.inc @@ -30,7 +30,7 @@ Route125_EventScript_151F73:: @ 8151F73 Route125_EventScript_151F8A:: @ 8151F8A trainerbattle 0, OPPONENT_ERNEST_1, 0, Route125_Text_1C11AF, Route125_Text_1C11ED specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route125_EventScript_151FB1 msgbox Route125_Text_1C1208, 6 end -- cgit v1.2.3 From 79e3d29c29335d7e1fb8478b16d100b1844f2da4 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 2 Dec 2017 14:38:49 -0800 Subject: Use constants for all SYS flags --- data/scripts/maps/Route125.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/scripts/maps/Route125.inc') diff --git a/data/scripts/maps/Route125.inc b/data/scripts/maps/Route125.inc index 489a7314b..7c4754f4f 100644 --- a/data/scripts/maps/Route125.inc +++ b/data/scripts/maps/Route125.inc @@ -3,7 +3,7 @@ Route125_MapScripts:: @ 8151F1E .byte 0 Route125_MapScript1_151F24:: @ 8151F24 - checkflag 2090 + checkflag SYS_WEATHER_CTRL call_if 1, Route125_EventScript_1A02C1 end -- cgit v1.2.3 From 88716f4c0e053a984eeb4bef92fefa42027dd22a Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 17 Dec 2017 20:07:53 -0800 Subject: Use FLAG_ prefix for all flags --- data/scripts/maps/Route125.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/scripts/maps/Route125.inc') diff --git a/data/scripts/maps/Route125.inc b/data/scripts/maps/Route125.inc index 7c4754f4f..ea24434e2 100644 --- a/data/scripts/maps/Route125.inc +++ b/data/scripts/maps/Route125.inc @@ -3,7 +3,7 @@ Route125_MapScripts:: @ 8151F1E .byte 0 Route125_MapScript1_151F24:: @ 8151F24 - checkflag SYS_WEATHER_CTRL + checkflag FLAG_SYS_WEATHER_CTRL call_if 1, Route125_EventScript_1A02C1 end -- cgit v1.2.3 From 7f0ba304065a80d68b8610c4c8801839221677f6 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 31 Dec 2017 16:59:55 -0600 Subject: Port battle_setup names from pokeemerald --- data/scripts/maps/Route125.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/scripts/maps/Route125.inc') diff --git a/data/scripts/maps/Route125.inc b/data/scripts/maps/Route125.inc index ea24434e2..58bf75c51 100644 --- a/data/scripts/maps/Route125.inc +++ b/data/scripts/maps/Route125.inc @@ -29,7 +29,7 @@ Route125_EventScript_151F73:: @ 8151F73 Route125_EventScript_151F8A:: @ 8151F8A trainerbattle 0, OPPONENT_ERNEST_1, 0, Route125_Text_1C11AF, Route125_Text_1C11ED - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route125_EventScript_151FB1 msgbox Route125_Text_1C1208, 6 -- cgit v1.2.3 From aed64560bc222e4ea5ccec266c0d77859a05eaac Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Fri, 5 Jan 2018 11:36:47 -0800 Subject: Add friendly macros for goto_if and call_if variants --- data/scripts/maps/Route125.inc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'data/scripts/maps/Route125.inc') diff --git a/data/scripts/maps/Route125.inc b/data/scripts/maps/Route125.inc index 58bf75c51..a1495ac83 100644 --- a/data/scripts/maps/Route125.inc +++ b/data/scripts/maps/Route125.inc @@ -3,8 +3,7 @@ Route125_MapScripts:: @ 8151F1E .byte 0 Route125_MapScript1_151F24:: @ 8151F24 - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, Route125_EventScript_1A02C1 + call_if_set FLAG_SYS_WEATHER_CTRL, Route125_EventScript_1A02C1 end Route125_EventScript_151F2E:: @ 8151F2E -- cgit v1.2.3