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/Route114.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'data/scripts/maps/Route114.inc') diff --git a/data/scripts/maps/Route114.inc b/data/scripts/maps/Route114.inc index cfe1dfe7d..6d28b87a4 100644 --- a/data/scripts/maps/Route114.inc +++ b/data/scripts/maps/Route114.inc @@ -6,14 +6,14 @@ Route114_EventScript_150733:: @ 8150733 faceplayer checkdailyflags checkflag 2251 - jumpeq Route114_EventScript_150778 + goto_if_eq Route114_EventScript_150778 msgbox Route114_Text_1C5803, 4 random 5 addvar RESULT, 15 addvar RESULT, 133 giveitem RESULT compare RESULT, 0 - jumpeq Route114_EventScript_1A029B + goto_if_eq Route114_EventScript_1A029B setflag 2251 msgbox Route114_Text_1C5861, 4 release @@ -28,11 +28,11 @@ Route114_EventScript_150782:: @ 8150782 lock faceplayer checkflag 231 - jumpeq Route114_EventScript_1507B9 + goto_if_eq Route114_EventScript_1507B9 msgbox Route114_Text_170154, 4 giveitem ITEM_TM05 compare RESULT, 0 - jumpeq Route114_EventScript_1A029B + goto_if_eq Route114_EventScript_1A029B setflag 231 msgbox Route114_Text_1701C5, 4 release @@ -89,7 +89,7 @@ Route114_EventScript_15084D:: @ 815084D trainerbattle 0, OPPONENT_STEVE_1, 0, Route114_Text_1BC2F5, Route114_Text_1BC327 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route114_EventScript_150874 + goto_if_eq Route114_EventScript_150874 msgbox Route114_Text_1BC337, 6 end @@ -102,7 +102,7 @@ Route114_EventScript_15088B:: @ 815088B trainerbattle 0, OPPONENT_BERNIE_1, 0, Route114_Text_1BC45A, Route114_Text_1BC499 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route114_EventScript_1508B2 + goto_if_eq Route114_EventScript_1508B2 msgbox Route114_Text_1BC4B5, 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/Route114.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'data/scripts/maps/Route114.inc') diff --git a/data/scripts/maps/Route114.inc b/data/scripts/maps/Route114.inc index 6d28b87a4..d910d3e16 100644 --- a/data/scripts/maps/Route114.inc +++ b/data/scripts/maps/Route114.inc @@ -12,7 +12,7 @@ Route114_EventScript_150733:: @ 8150733 addvar RESULT, 15 addvar RESULT, 133 giveitem RESULT - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route114_EventScript_1A029B setflag 2251 msgbox Route114_Text_1C5861, 4 @@ -31,7 +31,7 @@ Route114_EventScript_150782:: @ 8150782 goto_if_eq Route114_EventScript_1507B9 msgbox Route114_Text_170154, 4 giveitem ITEM_TM05 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route114_EventScript_1A029B setflag 231 msgbox Route114_Text_1701C5, 4 @@ -88,7 +88,7 @@ Route114_EventScript_150836:: @ 8150836 Route114_EventScript_15084D:: @ 815084D trainerbattle 0, OPPONENT_STEVE_1, 0, Route114_Text_1BC2F5, Route114_Text_1BC327 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route114_EventScript_150874 msgbox Route114_Text_1BC337, 6 end @@ -101,7 +101,7 @@ Route114_EventScript_150874:: @ 8150874 Route114_EventScript_15088B:: @ 815088B trainerbattle 0, OPPONENT_BERNIE_1, 0, Route114_Text_1BC45A, Route114_Text_1BC499 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route114_EventScript_1508B2 msgbox Route114_Text_1BC4B5, 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/Route114.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'data/scripts/maps/Route114.inc') diff --git a/data/scripts/maps/Route114.inc b/data/scripts/maps/Route114.inc index d910d3e16..799a115b7 100644 --- a/data/scripts/maps/Route114.inc +++ b/data/scripts/maps/Route114.inc @@ -4,7 +4,7 @@ Route114_MapScripts:: @ 8150732 Route114_EventScript_150733:: @ 8150733 lock faceplayer - checkdailyflags + dodailyevents checkflag 2251 goto_if_eq Route114_EventScript_150778 msgbox Route114_Text_1C5803, 4 @@ -46,7 +46,7 @@ Route114_EventScript_1507B9:: @ 81507B9 Route114_EventScript_1507C3:: @ 81507C3 lock faceplayer - checksound + waitse pokecry SPECIES_POOCHYENA, 2 msgbox Route114_Text_1701F9, 4 waitpokecry @@ -87,7 +87,7 @@ Route114_EventScript_150836:: @ 8150836 Route114_EventScript_15084D:: @ 815084D trainerbattle 0, OPPONENT_STEVE_1, 0, Route114_Text_1BC2F5, Route114_Text_1BC327 - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route114_EventScript_150874 msgbox Route114_Text_1BC337, 6 @@ -100,7 +100,7 @@ Route114_EventScript_150874:: @ 8150874 Route114_EventScript_15088B:: @ 815088B trainerbattle 0, OPPONENT_BERNIE_1, 0, Route114_Text_1BC45A, Route114_Text_1BC499 - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route114_EventScript_1508B2 msgbox Route114_Text_1BC4B5, 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/Route114.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'data/scripts/maps/Route114.inc') diff --git a/data/scripts/maps/Route114.inc b/data/scripts/maps/Route114.inc index 799a115b7..95d321e0b 100644 --- a/data/scripts/maps/Route114.inc +++ b/data/scripts/maps/Route114.inc @@ -12,7 +12,7 @@ Route114_EventScript_150733:: @ 8150733 addvar RESULT, 15 addvar RESULT, 133 giveitem RESULT - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route114_EventScript_1A029B setflag 2251 msgbox Route114_Text_1C5861, 4 @@ -31,7 +31,7 @@ Route114_EventScript_150782:: @ 8150782 goto_if_eq Route114_EventScript_1507B9 msgbox Route114_Text_170154, 4 giveitem ITEM_TM05 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route114_EventScript_1A029B setflag 231 msgbox Route114_Text_1701C5, 4 @@ -88,7 +88,7 @@ Route114_EventScript_150836:: @ 8150836 Route114_EventScript_15084D:: @ 815084D trainerbattle 0, OPPONENT_STEVE_1, 0, Route114_Text_1BC2F5, Route114_Text_1BC327 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route114_EventScript_150874 msgbox Route114_Text_1BC337, 6 end @@ -101,7 +101,7 @@ Route114_EventScript_150874:: @ 8150874 Route114_EventScript_15088B:: @ 815088B trainerbattle 0, OPPONENT_BERNIE_1, 0, Route114_Text_1BC45A, Route114_Text_1BC499 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route114_EventScript_1508B2 msgbox Route114_Text_1BC4B5, 6 end -- cgit v1.2.3 From 89092b609a9af15a35b0151442e9881aeab28708 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 1 Oct 2017 12:21:52 -0500 Subject: fix more command names --- data/scripts/maps/Route114.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/scripts/maps/Route114.inc') diff --git a/data/scripts/maps/Route114.inc b/data/scripts/maps/Route114.inc index 95d321e0b..0730db23a 100644 --- a/data/scripts/maps/Route114.inc +++ b/data/scripts/maps/Route114.inc @@ -47,7 +47,7 @@ Route114_EventScript_1507C3:: @ 81507C3 lock faceplayer waitse - pokecry SPECIES_POOCHYENA, 2 + playpokecry SPECIES_POOCHYENA, 2 msgbox Route114_Text_1701F9, 4 waitpokecry release -- cgit v1.2.3 From c9f38d22060841ac59e56c3f498427f53bc28569 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 3 Dec 2017 12:32:57 -0800 Subject: Label scripts flags up to flag 256. --- data/scripts/maps/Route114.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/scripts/maps/Route114.inc') diff --git a/data/scripts/maps/Route114.inc b/data/scripts/maps/Route114.inc index 0730db23a..a3056c8ff 100644 --- a/data/scripts/maps/Route114.inc +++ b/data/scripts/maps/Route114.inc @@ -27,13 +27,13 @@ Route114_EventScript_150778:: @ 8150778 Route114_EventScript_150782:: @ 8150782 lock faceplayer - checkflag 231 + checkflag FLAG_RECEIVED_TM05 goto_if_eq Route114_EventScript_1507B9 msgbox Route114_Text_170154, 4 giveitem ITEM_TM05 compare RESULT, 0 goto_if_eq Route114_EventScript_1A029B - setflag 231 + setflag FLAG_RECEIVED_TM05 msgbox Route114_Text_1701C5, 4 release end -- cgit v1.2.3 From b14cdde8bd4afda2b0b73bb72b3cffc6961a5790 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Fri, 15 Dec 2017 14:59:25 -0800 Subject: Label landmark and daily flags. --- data/scripts/maps/Route114.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/scripts/maps/Route114.inc') diff --git a/data/scripts/maps/Route114.inc b/data/scripts/maps/Route114.inc index a3056c8ff..3d1da2014 100644 --- a/data/scripts/maps/Route114.inc +++ b/data/scripts/maps/Route114.inc @@ -5,7 +5,7 @@ Route114_EventScript_150733:: @ 8150733 lock faceplayer dodailyevents - checkflag 2251 + checkflag FLAG_DAILY_RECEIVED_BERRY_ROUTE114 goto_if_eq Route114_EventScript_150778 msgbox Route114_Text_1C5803, 4 random 5 @@ -14,7 +14,7 @@ Route114_EventScript_150733:: @ 8150733 giveitem RESULT compare RESULT, 0 goto_if_eq Route114_EventScript_1A029B - setflag 2251 + setflag FLAG_DAILY_RECEIVED_BERRY_ROUTE114 msgbox Route114_Text_1C5861, 4 release end -- cgit v1.2.3 From a753c44277c050fb24aaf97a8947c7f54e0dacd7 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 20 Dec 2017 19:58:17 -0600 Subject: Use event script macro names from pokeemerald --- data/scripts/maps/Route114.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'data/scripts/maps/Route114.inc') diff --git a/data/scripts/maps/Route114.inc b/data/scripts/maps/Route114.inc index 3d1da2014..302c162b0 100644 --- a/data/scripts/maps/Route114.inc +++ b/data/scripts/maps/Route114.inc @@ -11,7 +11,7 @@ Route114_EventScript_150733:: @ 8150733 random 5 addvar RESULT, 15 addvar RESULT, 133 - giveitem RESULT + giveitem_std RESULT compare RESULT, 0 goto_if_eq Route114_EventScript_1A029B setflag FLAG_DAILY_RECEIVED_BERRY_ROUTE114 @@ -30,7 +30,7 @@ Route114_EventScript_150782:: @ 8150782 checkflag FLAG_RECEIVED_TM05 goto_if_eq Route114_EventScript_1507B9 msgbox Route114_Text_170154, 4 - giveitem ITEM_TM05 + giveitem_std ITEM_TM05 compare RESULT, 0 goto_if_eq Route114_EventScript_1A029B setflag FLAG_RECEIVED_TM05 @@ -47,9 +47,9 @@ Route114_EventScript_1507C3:: @ 81507C3 lock faceplayer waitse - playpokecry SPECIES_POOCHYENA, 2 + playmoncry SPECIES_POOCHYENA, 2 msgbox Route114_Text_1701F9, 4 - waitpokecry + waitmoncry release 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/Route114.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/scripts/maps/Route114.inc') diff --git a/data/scripts/maps/Route114.inc b/data/scripts/maps/Route114.inc index 302c162b0..f6bb6d8ba 100644 --- a/data/scripts/maps/Route114.inc +++ b/data/scripts/maps/Route114.inc @@ -87,7 +87,7 @@ Route114_EventScript_150836:: @ 8150836 Route114_EventScript_15084D:: @ 815084D trainerbattle 0, OPPONENT_STEVE_1, 0, Route114_Text_1BC2F5, Route114_Text_1BC327 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route114_EventScript_150874 msgbox Route114_Text_1BC337, 6 @@ -100,7 +100,7 @@ Route114_EventScript_150874:: @ 8150874 Route114_EventScript_15088B:: @ 815088B trainerbattle 0, OPPONENT_BERNIE_1, 0, Route114_Text_1BC45A, Route114_Text_1BC499 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route114_EventScript_1508B2 msgbox Route114_Text_1BC4B5, 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/Route114.inc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'data/scripts/maps/Route114.inc') diff --git a/data/scripts/maps/Route114.inc b/data/scripts/maps/Route114.inc index f6bb6d8ba..30ab8c572 100644 --- a/data/scripts/maps/Route114.inc +++ b/data/scripts/maps/Route114.inc @@ -5,8 +5,7 @@ Route114_EventScript_150733:: @ 8150733 lock faceplayer dodailyevents - checkflag FLAG_DAILY_RECEIVED_BERRY_ROUTE114 - goto_if_eq Route114_EventScript_150778 + goto_if_set FLAG_DAILY_RECEIVED_BERRY_ROUTE114, Route114_EventScript_150778 msgbox Route114_Text_1C5803, 4 random 5 addvar RESULT, 15 @@ -27,8 +26,7 @@ Route114_EventScript_150778:: @ 8150778 Route114_EventScript_150782:: @ 8150782 lock faceplayer - checkflag FLAG_RECEIVED_TM05 - goto_if_eq Route114_EventScript_1507B9 + goto_if_set FLAG_RECEIVED_TM05, Route114_EventScript_1507B9 msgbox Route114_Text_170154, 4 giveitem_std ITEM_TM05 compare RESULT, 0 -- cgit v1.2.3