From 2c87516ca3efa260b96b92ededb24d75edfe49e8 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Tue, 12 Sep 2017 20:23:23 -0500 Subject: more labels and fix build --- data/scripts/pokeblocks.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/scripts/pokeblocks.inc') diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index e1add8734..852acd292 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -235,7 +235,7 @@ FallarborTown_ContestLobby_EventScript_1B7897:: @ 81B7897 end FallarborTown_ContestLobby_EventScript_1B78A1:: @ 81B78A1 - call FallarborTown_ContestLobby_EventScript_19F806 + call S_DoSaveDialog compare RESULT, 0 jumpeq FallarborTown_ContestLobby_EventScript_1B7936 message FallarborTown_ContestLobby_Text_1B7304 -- cgit v1.2.3 From ae5ec7f5b05218ba21c53ef632590a5243a7f647 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 24 Sep 2017 14:17:14 -0500 Subject: Replace script commands: snop -> nop, snop1 -> nop1, jump -> goto --- data/scripts/pokeblocks.inc | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'data/scripts/pokeblocks.inc') diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 852acd292..05f91a3aa 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -3,7 +3,7 @@ FallarborTown_ContestLobby_EventScript_1B7604:: @ 81B7604 setvar 0x8009, 1 move 0x8008, FallarborTown_ContestLobby_Movement_1B7821 waitmove 0 - jump FallarborTown_ContestLobby_EventScript_1B7681 + goto FallarborTown_ContestLobby_EventScript_1B7681 end SlateportCity_ContestLobby_EventScript_1B761E:: @ 81B761E @@ -12,7 +12,7 @@ SlateportCity_ContestLobby_EventScript_1B761E:: @ 81B761E move 6, SlateportCity_ContestLobby_Movement_1A083D move 0x8008, SlateportCity_ContestLobby_Movement_1B7821 waitmove 0 - jump SlateportCity_ContestLobby_EventScript_1B7681 + goto SlateportCity_ContestLobby_EventScript_1B7681 end VerdanturfTown_ContestLobby_EventScript_1B763F:: @ 81B763F @@ -20,7 +20,7 @@ VerdanturfTown_ContestLobby_EventScript_1B763F:: @ 81B763F setvar 0x8009, 1 move 0x8008, VerdanturfTown_ContestLobby_Movement_1B7821 waitmove 0 - jump VerdanturfTown_ContestLobby_EventScript_1B7681 + goto VerdanturfTown_ContestLobby_EventScript_1B7681 end LilycoveCity_ContestLobby_EventScript_1B7659:: @ 81B7659 @@ -30,7 +30,7 @@ LilycoveCity_ContestLobby_EventScript_1B7659:: @ 81B7659 move 10, LilycoveCity_ContestLobby_Movement_1A083D move 0x8008, LilycoveCity_ContestLobby_Movement_1B7821 waitmove 0 - jump LilycoveCity_ContestLobby_EventScript_1B7681 + goto LilycoveCity_ContestLobby_EventScript_1B7681 end FallarborTown_ContestLobby_EventScript_1B7681:: @ 81B7681 @@ -78,17 +78,17 @@ FallarborTown_ContestLobby_EventScript_1B770E:: @ 81B770E checkdailyflags checkflag 2241 jumpeq FallarborTown_ContestLobby_EventScript_1B774F - jump FallarborTown_ContestLobby_EventScript_1B7759 + goto FallarborTown_ContestLobby_EventScript_1B7759 end FallarborTown_ContestLobby_EventScript_1B7726:: @ 81B7726 msgbox FallarborTown_ContestLobby_Text_1B6F1F, 4 - jump FallarborTown_ContestLobby_EventScript_1B7734 + goto FallarborTown_ContestLobby_EventScript_1B7734 end FallarborTown_ContestLobby_EventScript_1B7734:: @ 81B7734 msgbox FallarborTown_ContestLobby_Text_1B6EF1, 4 - jump FallarborTown_ContestLobby_EventScript_1B7742 + goto FallarborTown_ContestLobby_EventScript_1B7742 end FallarborTown_ContestLobby_EventScript_1B7742:: @ 81B7742 @@ -108,7 +108,7 @@ FallarborTown_ContestLobby_EventScript_1B7759:: @ 81B7759 msgbox FallarborTown_ContestLobby_Text_1B704A, 4 giveitem ITEM_PECHA_BERRY setflag 2241 - jump FallarborTown_ContestLobby_EventScript_1B76EF + goto FallarborTown_ContestLobby_EventScript_1B76EF end FallarborTown_ContestLobby_EventScript_1B7776:: @ 81B7776 @@ -123,22 +123,22 @@ FallarborTown_ContestLobby_EventScript_1B7780:: @ 81B7780 FallarborTown_ContestLobby_EventScript_1B778A:: @ 81B778A setvar 0x8008, 4 - jump FallarborTown_ContestLobby_EventScript_1B77B6 + goto FallarborTown_ContestLobby_EventScript_1B77B6 end SlateportCity_ContestLobby_EventScript_1B7795:: @ 81B7795 setvar 0x8008, 2 - jump SlateportCity_ContestLobby_EventScript_1B77B6 + goto SlateportCity_ContestLobby_EventScript_1B77B6 end VerdanturfTown_ContestLobby_EventScript_1B77A0:: @ 81B77A0 setvar 0x8008, 2 - jump VerdanturfTown_ContestLobby_EventScript_1B77B6 + goto VerdanturfTown_ContestLobby_EventScript_1B77B6 end LilycoveCity_ContestLobby_EventScript_1B77AB:: @ 81B77AB setvar 0x8008, 3 - jump LilycoveCity_ContestLobby_EventScript_1B77B6 + goto LilycoveCity_ContestLobby_EventScript_1B77B6 end FallarborTown_ContestLobby_EventScript_1B77B6:: @ 81B77B6 @@ -164,7 +164,7 @@ FallarborTown_ContestLobby_EventScript_1B77E6:: @ 81B77E6 checkdailyflags checkflag 2241 jumpeq FallarborTown_ContestLobby_EventScript_1B77F6 - jump FallarborTown_ContestLobby_EventScript_1B7800 + goto FallarborTown_ContestLobby_EventScript_1B7800 end FallarborTown_ContestLobby_EventScript_1B77F6:: @ 81B77F6 @@ -188,19 +188,19 @@ VerdanturfTown_ContestLobby_Movement_1B7821:: @ 81B7821 step_end FallarborTown_ContestLobby_EventScript_1B7823:: @ 81B7823 - jump FallarborTown_ContestLobby_EventScript_1B783B + goto FallarborTown_ContestLobby_EventScript_1B783B end SlateportCity_ContestLobby_EventScript_1B7829:: @ 81B7829 - jump SlateportCity_ContestLobby_EventScript_1B783B + goto SlateportCity_ContestLobby_EventScript_1B783B end VerdanturfTown_ContestLobby_EventScript_1B782F:: @ 81B782F - jump VerdanturfTown_ContestLobby_EventScript_1B783B + goto VerdanturfTown_ContestLobby_EventScript_1B783B end LilycoveCity_ContestLobby_EventScript_1B7835:: @ 81B7835 - jump LilycoveCity_ContestLobby_EventScript_1B783B + goto LilycoveCity_ContestLobby_EventScript_1B783B end FallarborTown_ContestLobby_EventScript_1B783B:: @ 81B783B @@ -256,17 +256,17 @@ FallarborTown_ContestLobby_EventScript_1B78A1:: @ 81B78A1 FallarborTown_ContestLobby_EventScript_1B78F3:: @ 81B78F3 msgbox FallarborTown_ContestLobby_Text_1B733B, 4 - jump FallarborTown_ContestLobby_EventScript_1B791D + goto FallarborTown_ContestLobby_EventScript_1B791D end FallarborTown_ContestLobby_EventScript_1B7901:: @ 81B7901 msgbox FallarborTown_ContestLobby_Text_1B7347, 4 - jump FallarborTown_ContestLobby_EventScript_1B791D + goto FallarborTown_ContestLobby_EventScript_1B791D end FallarborTown_ContestLobby_EventScript_1B790F:: @ 81B790F msgbox FallarborTown_ContestLobby_Text_1B735A, 4 - jump FallarborTown_ContestLobby_EventScript_1B791D + goto FallarborTown_ContestLobby_EventScript_1B791D end FallarborTown_ContestLobby_EventScript_1B791D:: @ 81B791D @@ -325,7 +325,7 @@ FallarborTown_ContestLobby_EventScript_1B7980:: @ 81B7980 copyvar 0x8008, RESULT copyvar 0x8004, 0x8008 special SpawnBerryBlenderLinkPlayerSprites - jump FallarborTown_ContestLobby_EventScript_1B799A + goto FallarborTown_ContestLobby_EventScript_1B799A end FallarborTown_ContestLobby_EventScript_1B799A:: @ 81B799A -- cgit v1.2.3 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/pokeblocks.inc | 48 ++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'data/scripts/pokeblocks.inc') diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 05f91a3aa..0cf3163fd 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -40,24 +40,24 @@ VerdanturfTown_ContestLobby_EventScript_1B7681:: @ 81B7681 lockall msgbox FallarborTown_ContestLobby_Text_1B6E63, 5 compare RESULT, 1 - jumpeq FallarborTown_ContestLobby_EventScript_1B76A1 + goto_if_eq FallarborTown_ContestLobby_EventScript_1B76A1 compare RESULT, 0 - jumpeq FallarborTown_ContestLobby_EventScript_1B76E5 + goto_if_eq FallarborTown_ContestLobby_EventScript_1B76E5 end FallarborTown_ContestLobby_EventScript_1B76A1:: @ 81B76A1 checkitem ITEM_POKEBLOCK_CASE, 1 compare RESULT, 0 - jumpeq FallarborTown_ContestLobby_EventScript_1B7780 + goto_if_eq FallarborTown_ContestLobby_EventScript_1B7780 specialval RESULT, PlayerHasBerries compare RESULT, 0 - jumpeq FallarborTown_ContestLobby_EventScript_1B770E + goto_if_eq FallarborTown_ContestLobby_EventScript_1B770E msgbox FallarborTown_ContestLobby_Text_1B6E9D, 4 specialval RESULT, sub_810CA00 compare RESULT, 65535 - jumpif 5, FallarborTown_ContestLobby_EventScript_1B76EF + goto_if 5, FallarborTown_ContestLobby_EventScript_1B76EF compare RESULT, 65535 - jumpeq FallarborTown_ContestLobby_EventScript_1B7776 + goto_if_eq FallarborTown_ContestLobby_EventScript_1B7776 end FallarborTown_ContestLobby_EventScript_1B76E5:: @ 81B76E5 @@ -68,16 +68,16 @@ FallarborTown_ContestLobby_EventScript_1B76E5:: @ 81B76E5 FallarborTown_ContestLobby_EventScript_1B76EF:: @ 81B76EF msgbox FallarborTown_ContestLobby_Text_1B6ED0, 5 compare RESULT, 1 - jumpeq FallarborTown_ContestLobby_EventScript_1B7734 + goto_if_eq FallarborTown_ContestLobby_EventScript_1B7734 compare RESULT, 0 - jumpeq FallarborTown_ContestLobby_EventScript_1B7726 + goto_if_eq FallarborTown_ContestLobby_EventScript_1B7726 end FallarborTown_ContestLobby_EventScript_1B770E:: @ 81B770E msgbox FallarborTown_ContestLobby_Text_1B6FF0, 4 checkdailyflags checkflag 2241 - jumpeq FallarborTown_ContestLobby_EventScript_1B774F + goto_if_eq FallarborTown_ContestLobby_EventScript_1B774F goto FallarborTown_ContestLobby_EventScript_1B7759 end @@ -150,9 +150,9 @@ VerdanturfTown_ContestLobby_EventScript_1B77B6:: @ 81B77B6 msgbox FallarborTown_ContestLobby_Text_1B742F, 4 specialval RESULT, PlayerHasBerries compare RESULT, 1 - jumpeq FallarborTown_ContestLobby_EventScript_1B77DC + goto_if_eq FallarborTown_ContestLobby_EventScript_1B77DC compare RESULT, 0 - jumpeq FallarborTown_ContestLobby_EventScript_1B77E6 + goto_if_eq FallarborTown_ContestLobby_EventScript_1B77E6 end FallarborTown_ContestLobby_EventScript_1B77DC:: @ 81B77DC @@ -163,7 +163,7 @@ FallarborTown_ContestLobby_EventScript_1B77DC:: @ 81B77DC FallarborTown_ContestLobby_EventScript_1B77E6:: @ 81B77E6 checkdailyflags checkflag 2241 - jumpeq FallarborTown_ContestLobby_EventScript_1B77F6 + goto_if_eq FallarborTown_ContestLobby_EventScript_1B77F6 goto FallarborTown_ContestLobby_EventScript_1B7800 end @@ -210,23 +210,23 @@ VerdanturfTown_ContestLobby_EventScript_1B783B:: @ 81B783B lockall specialval RESULT, PlayerHasBerries compare RESULT, 0 - jumpeq FallarborTown_ContestLobby_EventScript_1B7897 + goto_if_eq FallarborTown_ContestLobby_EventScript_1B7897 checkitem ITEM_POKEBLOCK_CASE, 1 compare RESULT, 0 - jumpeq FallarborTown_ContestLobby_EventScript_1B7942 + goto_if_eq FallarborTown_ContestLobby_EventScript_1B7942 specialval RESULT, sub_810CA00 compare RESULT, 65535 - jumpif 5, FallarborTown_ContestLobby_EventScript_1B7878 + goto_if 5, FallarborTown_ContestLobby_EventScript_1B7878 compare RESULT, 65535 - jumpeq FallarborTown_ContestLobby_EventScript_1B7938 + goto_if_eq FallarborTown_ContestLobby_EventScript_1B7938 end FallarborTown_ContestLobby_EventScript_1B7878:: @ 81B7878 msgbox FallarborTown_ContestLobby_Text_1B727C, 5 compare RESULT, 1 - jumpeq FallarborTown_ContestLobby_EventScript_1B78A1 + goto_if_eq FallarborTown_ContestLobby_EventScript_1B78A1 compare RESULT, 0 - jumpeq FallarborTown_ContestLobby_EventScript_1B7936 + goto_if_eq FallarborTown_ContestLobby_EventScript_1B7936 end FallarborTown_ContestLobby_EventScript_1B7897:: @ 81B7897 @@ -237,21 +237,21 @@ FallarborTown_ContestLobby_EventScript_1B7897:: @ 81B7897 FallarborTown_ContestLobby_EventScript_1B78A1:: @ 81B78A1 call S_DoSaveDialog compare RESULT, 0 - jumpeq FallarborTown_ContestLobby_EventScript_1B7936 + goto_if_eq FallarborTown_ContestLobby_EventScript_1B7936 message FallarborTown_ContestLobby_Text_1B7304 waittext special sub_8083614 waitstate compare RESULT, 1 - jumpeq FallarborTown_ContestLobby_EventScript_1B7980 + goto_if_eq FallarborTown_ContestLobby_EventScript_1B7980 compare RESULT, 2 - jumpeq FallarborTown_ContestLobby_EventScript_1B794C + goto_if_eq FallarborTown_ContestLobby_EventScript_1B794C compare RESULT, 3 - jumpeq FallarborTown_ContestLobby_EventScript_1B7959 + goto_if_eq FallarborTown_ContestLobby_EventScript_1B7959 compare RESULT, 5 - jumpeq FallarborTown_ContestLobby_EventScript_1B7966 + goto_if_eq FallarborTown_ContestLobby_EventScript_1B7966 compare RESULT, 6 - jumpeq FallarborTown_ContestLobby_EventScript_1B7973 + goto_if_eq FallarborTown_ContestLobby_EventScript_1B7973 end FallarborTown_ContestLobby_EventScript_1B78F3:: @ 81B78F3 -- 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/pokeblocks.inc | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'data/scripts/pokeblocks.inc') diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 0cf3163fd..8badf3aab 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -39,24 +39,24 @@ SlateportCity_ContestLobby_EventScript_1B7681:: @ 81B7681 VerdanturfTown_ContestLobby_EventScript_1B7681:: @ 81B7681 lockall msgbox FallarborTown_ContestLobby_Text_1B6E63, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1B76A1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B76E5 end FallarborTown_ContestLobby_EventScript_1B76A1:: @ 81B76A1 checkitem ITEM_POKEBLOCK_CASE, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7780 specialval RESULT, PlayerHasBerries - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B770E msgbox FallarborTown_ContestLobby_Text_1B6E9D, 4 specialval RESULT, sub_810CA00 - compare RESULT, 65535 + compare_var_to_imm RESULT, 65535 goto_if 5, FallarborTown_ContestLobby_EventScript_1B76EF - compare RESULT, 65535 + compare_var_to_imm RESULT, 65535 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7776 end @@ -67,9 +67,9 @@ FallarborTown_ContestLobby_EventScript_1B76E5:: @ 81B76E5 FallarborTown_ContestLobby_EventScript_1B76EF:: @ 81B76EF msgbox FallarborTown_ContestLobby_Text_1B6ED0, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7734 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7726 end @@ -149,9 +149,9 @@ VerdanturfTown_ContestLobby_EventScript_1B77B6:: @ 81B77B6 faceplayer msgbox FallarborTown_ContestLobby_Text_1B742F, 4 specialval RESULT, PlayerHasBerries - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1B77DC - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B77E6 end @@ -209,23 +209,23 @@ SlateportCity_ContestLobby_EventScript_1B783B:: @ 81B783B VerdanturfTown_ContestLobby_EventScript_1B783B:: @ 81B783B lockall specialval RESULT, PlayerHasBerries - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7897 checkitem ITEM_POKEBLOCK_CASE, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7942 specialval RESULT, sub_810CA00 - compare RESULT, 65535 + compare_var_to_imm RESULT, 65535 goto_if 5, FallarborTown_ContestLobby_EventScript_1B7878 - compare RESULT, 65535 + compare_var_to_imm RESULT, 65535 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7938 end FallarborTown_ContestLobby_EventScript_1B7878:: @ 81B7878 msgbox FallarborTown_ContestLobby_Text_1B727C, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1B78A1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7936 end @@ -236,21 +236,21 @@ FallarborTown_ContestLobby_EventScript_1B7897:: @ 81B7897 FallarborTown_ContestLobby_EventScript_1B78A1:: @ 81B78A1 call S_DoSaveDialog - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7936 message FallarborTown_ContestLobby_Text_1B7304 waittext special sub_8083614 waitstate - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7980 - compare RESULT, 2 + compare_var_to_imm RESULT, 2 goto_if_eq FallarborTown_ContestLobby_EventScript_1B794C - compare RESULT, 3 + compare_var_to_imm RESULT, 3 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7959 - compare RESULT, 5 + compare_var_to_imm RESULT, 5 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7966 - compare RESULT, 6 + compare_var_to_imm RESULT, 6 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7973 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/pokeblocks.inc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'data/scripts/pokeblocks.inc') diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 8badf3aab..61a484b4c 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -49,11 +49,11 @@ FallarborTown_ContestLobby_EventScript_1B76A1:: @ 81B76A1 checkitem ITEM_POKEBLOCK_CASE, 1 compare_var_to_imm RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7780 - specialval RESULT, PlayerHasBerries + specialvar RESULT, PlayerHasBerries compare_var_to_imm RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B770E msgbox FallarborTown_ContestLobby_Text_1B6E9D, 4 - specialval RESULT, sub_810CA00 + specialvar RESULT, sub_810CA00 compare_var_to_imm RESULT, 65535 goto_if 5, FallarborTown_ContestLobby_EventScript_1B76EF compare_var_to_imm RESULT, 65535 @@ -75,7 +75,7 @@ FallarborTown_ContestLobby_EventScript_1B76EF:: @ 81B76EF FallarborTown_ContestLobby_EventScript_1B770E:: @ 81B770E msgbox FallarborTown_ContestLobby_Text_1B6FF0, 4 - checkdailyflags + dodailyevents checkflag 2241 goto_if_eq FallarborTown_ContestLobby_EventScript_1B774F goto FallarborTown_ContestLobby_EventScript_1B7759 @@ -148,7 +148,7 @@ VerdanturfTown_ContestLobby_EventScript_1B77B6:: @ 81B77B6 lock faceplayer msgbox FallarborTown_ContestLobby_Text_1B742F, 4 - specialval RESULT, PlayerHasBerries + specialvar RESULT, PlayerHasBerries compare_var_to_imm RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1B77DC compare_var_to_imm RESULT, 0 @@ -161,7 +161,7 @@ FallarborTown_ContestLobby_EventScript_1B77DC:: @ 81B77DC end FallarborTown_ContestLobby_EventScript_1B77E6:: @ 81B77E6 - checkdailyflags + dodailyevents checkflag 2241 goto_if_eq FallarborTown_ContestLobby_EventScript_1B77F6 goto FallarborTown_ContestLobby_EventScript_1B7800 @@ -208,13 +208,13 @@ LilycoveCity_ContestLobby_EventScript_1B783B:: @ 81B783B SlateportCity_ContestLobby_EventScript_1B783B:: @ 81B783B VerdanturfTown_ContestLobby_EventScript_1B783B:: @ 81B783B lockall - specialval RESULT, PlayerHasBerries + specialvar RESULT, PlayerHasBerries compare_var_to_imm RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7897 checkitem ITEM_POKEBLOCK_CASE, 1 compare_var_to_imm RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7942 - specialval RESULT, sub_810CA00 + specialvar RESULT, sub_810CA00 compare_var_to_imm RESULT, 65535 goto_if 5, FallarborTown_ContestLobby_EventScript_1B7878 compare_var_to_imm RESULT, 65535 @@ -321,7 +321,7 @@ FallarborTown_ContestLobby_EventScript_1B7973:: @ 81B7973 FallarborTown_ContestLobby_EventScript_1B7980:: @ 81B7980 fadescreen 1 - specialval RESULT, GetLinkPartnerNames + specialvar RESULT, GetLinkPartnerNames copyvar 0x8008, RESULT copyvar 0x8004, 0x8008 special SpawnBerryBlenderLinkPlayerSprites -- cgit v1.2.3 From 598756eaa47b523bd557a619e05cb23399ac02e5 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 24 Sep 2017 17:57:54 -0500 Subject: more script command renaming --- data/scripts/pokeblocks.inc | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'data/scripts/pokeblocks.inc') diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 61a484b4c..5f185c8ff 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -1,35 +1,35 @@ FallarborTown_ContestLobby_EventScript_1B7604:: @ 81B7604 setvar 0x8008, 4 setvar 0x8009, 1 - move 0x8008, FallarborTown_ContestLobby_Movement_1B7821 - waitmove 0 + applymovement 0x8008, FallarborTown_ContestLobby_Movement_1B7821 + waitmovement 0 goto FallarborTown_ContestLobby_EventScript_1B7681 end SlateportCity_ContestLobby_EventScript_1B761E:: @ 81B761E setvar 0x8008, 2 setvar 0x8009, 2 - move 6, SlateportCity_ContestLobby_Movement_1A083D - move 0x8008, SlateportCity_ContestLobby_Movement_1B7821 - waitmove 0 + applymovement 6, SlateportCity_ContestLobby_Movement_1A083D + applymovement 0x8008, SlateportCity_ContestLobby_Movement_1B7821 + waitmovement 0 goto SlateportCity_ContestLobby_EventScript_1B7681 end VerdanturfTown_ContestLobby_EventScript_1B763F:: @ 81B763F setvar 0x8008, 2 setvar 0x8009, 1 - move 0x8008, VerdanturfTown_ContestLobby_Movement_1B7821 - waitmove 0 + applymovement 0x8008, VerdanturfTown_ContestLobby_Movement_1B7821 + waitmovement 0 goto VerdanturfTown_ContestLobby_EventScript_1B7681 end LilycoveCity_ContestLobby_EventScript_1B7659:: @ 81B7659 setvar 0x8008, 3 setvar 0x8009, 3 - move 9, LilycoveCity_ContestLobby_Movement_1A083D - move 10, LilycoveCity_ContestLobby_Movement_1A083D - move 0x8008, LilycoveCity_ContestLobby_Movement_1B7821 - waitmove 0 + applymovement 9, LilycoveCity_ContestLobby_Movement_1A083D + applymovement 10, LilycoveCity_ContestLobby_Movement_1A083D + applymovement 0x8008, LilycoveCity_ContestLobby_Movement_1B7821 + waitmovement 0 goto LilycoveCity_ContestLobby_EventScript_1B7681 end -- 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/pokeblocks.inc | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'data/scripts/pokeblocks.inc') diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 5f185c8ff..dde0d0400 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -39,24 +39,24 @@ SlateportCity_ContestLobby_EventScript_1B7681:: @ 81B7681 VerdanturfTown_ContestLobby_EventScript_1B7681:: @ 81B7681 lockall msgbox FallarborTown_ContestLobby_Text_1B6E63, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1B76A1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B76E5 end FallarborTown_ContestLobby_EventScript_1B76A1:: @ 81B76A1 checkitem ITEM_POKEBLOCK_CASE, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7780 specialvar RESULT, PlayerHasBerries - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B770E msgbox FallarborTown_ContestLobby_Text_1B6E9D, 4 specialvar RESULT, sub_810CA00 - compare_var_to_imm RESULT, 65535 + compare RESULT, 65535 goto_if 5, FallarborTown_ContestLobby_EventScript_1B76EF - compare_var_to_imm RESULT, 65535 + compare RESULT, 65535 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7776 end @@ -67,9 +67,9 @@ FallarborTown_ContestLobby_EventScript_1B76E5:: @ 81B76E5 FallarborTown_ContestLobby_EventScript_1B76EF:: @ 81B76EF msgbox FallarborTown_ContestLobby_Text_1B6ED0, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7734 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7726 end @@ -149,9 +149,9 @@ VerdanturfTown_ContestLobby_EventScript_1B77B6:: @ 81B77B6 faceplayer msgbox FallarborTown_ContestLobby_Text_1B742F, 4 specialvar RESULT, PlayerHasBerries - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1B77DC - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B77E6 end @@ -209,23 +209,23 @@ SlateportCity_ContestLobby_EventScript_1B783B:: @ 81B783B VerdanturfTown_ContestLobby_EventScript_1B783B:: @ 81B783B lockall specialvar RESULT, PlayerHasBerries - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7897 checkitem ITEM_POKEBLOCK_CASE, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7942 specialvar RESULT, sub_810CA00 - compare_var_to_imm RESULT, 65535 + compare RESULT, 65535 goto_if 5, FallarborTown_ContestLobby_EventScript_1B7878 - compare_var_to_imm RESULT, 65535 + compare RESULT, 65535 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7938 end FallarborTown_ContestLobby_EventScript_1B7878:: @ 81B7878 msgbox FallarborTown_ContestLobby_Text_1B727C, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1B78A1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7936 end @@ -236,21 +236,21 @@ FallarborTown_ContestLobby_EventScript_1B7897:: @ 81B7897 FallarborTown_ContestLobby_EventScript_1B78A1:: @ 81B78A1 call S_DoSaveDialog - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7936 message FallarborTown_ContestLobby_Text_1B7304 waittext special sub_8083614 waitstate - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7980 - compare_var_to_imm RESULT, 2 + compare RESULT, 2 goto_if_eq FallarborTown_ContestLobby_EventScript_1B794C - compare_var_to_imm RESULT, 3 + compare RESULT, 3 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7959 - compare_var_to_imm RESULT, 5 + compare RESULT, 5 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7966 - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7973 end -- cgit v1.2.3 From b4ba35a54c0f6204e34d2814351162c79ea4c0ba Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Tue, 26 Sep 2017 14:33:52 -0500 Subject: more command renaming --- data/scripts/pokeblocks.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'data/scripts/pokeblocks.inc') diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index dde0d0400..9f9b21807 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -272,10 +272,10 @@ FallarborTown_ContestLobby_EventScript_1B790F:: @ 81B790F FallarborTown_ContestLobby_EventScript_1B791D:: @ 81B791D setvar 0x8004, 0 fadescreen 1 - disappear 240 - disappear 239 - disappear 238 - disappear 237 + removeobject 240 + removeobject 239 + removeobject 238 + removeobject 237 special sub_804E538 waitstate releaseall -- cgit v1.2.3 From e926119b726839bc687c503db3680899906aad0d Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sat, 30 Sep 2017 17:04:25 -0500 Subject: update --- data/scripts/pokeblocks.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/scripts/pokeblocks.inc') diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 9f9b21807..6fe754097 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -239,7 +239,7 @@ FallarborTown_ContestLobby_EventScript_1B78A1:: @ 81B78A1 compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7936 message FallarborTown_ContestLobby_Text_1B7304 - waittext + waitmessage special sub_8083614 waitstate compare RESULT, 1 -- 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/pokeblocks.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'data/scripts/pokeblocks.inc') diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 6fe754097..6934ffe57 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -76,7 +76,7 @@ FallarborTown_ContestLobby_EventScript_1B76EF:: @ 81B76EF FallarborTown_ContestLobby_EventScript_1B770E:: @ 81B770E msgbox FallarborTown_ContestLobby_Text_1B6FF0, 4 dodailyevents - checkflag 2241 + checkflag FLAG_DAILY_RECEIVED_BERRY_FALLARBOR goto_if_eq FallarborTown_ContestLobby_EventScript_1B774F goto FallarborTown_ContestLobby_EventScript_1B7759 end @@ -107,7 +107,7 @@ FallarborTown_ContestLobby_EventScript_1B774F:: @ 81B774F FallarborTown_ContestLobby_EventScript_1B7759:: @ 81B7759 msgbox FallarborTown_ContestLobby_Text_1B704A, 4 giveitem ITEM_PECHA_BERRY - setflag 2241 + setflag FLAG_DAILY_RECEIVED_BERRY_FALLARBOR goto FallarborTown_ContestLobby_EventScript_1B76EF end @@ -162,7 +162,7 @@ FallarborTown_ContestLobby_EventScript_1B77DC:: @ 81B77DC FallarborTown_ContestLobby_EventScript_1B77E6:: @ 81B77E6 dodailyevents - checkflag 2241 + checkflag FLAG_DAILY_RECEIVED_BERRY_FALLARBOR goto_if_eq FallarborTown_ContestLobby_EventScript_1B77F6 goto FallarborTown_ContestLobby_EventScript_1B7800 end @@ -175,7 +175,7 @@ FallarborTown_ContestLobby_EventScript_1B77F6:: @ 81B77F6 FallarborTown_ContestLobby_EventScript_1B7800:: @ 81B7800 msgbox FallarborTown_ContestLobby_Text_1B74B4, 4 giveitem ITEM_PECHA_BERRY - setflag 2241 + setflag FLAG_DAILY_RECEIVED_BERRY_FALLARBOR msgbox FallarborTown_ContestLobby_Text_1B753A, 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/pokeblocks.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/scripts/pokeblocks.inc') diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 6934ffe57..42e73e17c 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -106,7 +106,7 @@ FallarborTown_ContestLobby_EventScript_1B774F:: @ 81B774F FallarborTown_ContestLobby_EventScript_1B7759:: @ 81B7759 msgbox FallarborTown_ContestLobby_Text_1B704A, 4 - giveitem ITEM_PECHA_BERRY + giveitem_std ITEM_PECHA_BERRY setflag FLAG_DAILY_RECEIVED_BERRY_FALLARBOR goto FallarborTown_ContestLobby_EventScript_1B76EF end @@ -174,7 +174,7 @@ FallarborTown_ContestLobby_EventScript_1B77F6:: @ 81B77F6 FallarborTown_ContestLobby_EventScript_1B7800:: @ 81B7800 msgbox FallarborTown_ContestLobby_Text_1B74B4, 4 - giveitem ITEM_PECHA_BERRY + giveitem_std ITEM_PECHA_BERRY setflag FLAG_DAILY_RECEIVED_BERRY_FALLARBOR msgbox FallarborTown_ContestLobby_Text_1B753A, 4 release -- cgit v1.2.3 From 1c8b05e7b059a98d4259f4129896d0cc1eaa3847 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 24 Dec 2017 10:11:43 -0600 Subject: Name and use constants for special vars --- data/scripts/pokeblocks.inc | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'data/scripts/pokeblocks.inc') diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 42e73e17c..12ee04d3c 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -1,34 +1,34 @@ FallarborTown_ContestLobby_EventScript_1B7604:: @ 81B7604 - setvar 0x8008, 4 - setvar 0x8009, 1 - applymovement 0x8008, FallarborTown_ContestLobby_Movement_1B7821 + setvar SPECIALVAR_8, 4 + setvar SPECIALVAR_9, 1 + applymovement SPECIALVAR_8, FallarborTown_ContestLobby_Movement_1B7821 waitmovement 0 goto FallarborTown_ContestLobby_EventScript_1B7681 end SlateportCity_ContestLobby_EventScript_1B761E:: @ 81B761E - setvar 0x8008, 2 - setvar 0x8009, 2 + setvar SPECIALVAR_8, 2 + setvar SPECIALVAR_9, 2 applymovement 6, SlateportCity_ContestLobby_Movement_1A083D - applymovement 0x8008, SlateportCity_ContestLobby_Movement_1B7821 + applymovement SPECIALVAR_8, SlateportCity_ContestLobby_Movement_1B7821 waitmovement 0 goto SlateportCity_ContestLobby_EventScript_1B7681 end VerdanturfTown_ContestLobby_EventScript_1B763F:: @ 81B763F - setvar 0x8008, 2 - setvar 0x8009, 1 - applymovement 0x8008, VerdanturfTown_ContestLobby_Movement_1B7821 + setvar SPECIALVAR_8, 2 + setvar SPECIALVAR_9, 1 + applymovement SPECIALVAR_8, VerdanturfTown_ContestLobby_Movement_1B7821 waitmovement 0 goto VerdanturfTown_ContestLobby_EventScript_1B7681 end LilycoveCity_ContestLobby_EventScript_1B7659:: @ 81B7659 - setvar 0x8008, 3 - setvar 0x8009, 3 + setvar SPECIALVAR_8, 3 + setvar SPECIALVAR_9, 3 applymovement 9, LilycoveCity_ContestLobby_Movement_1A083D applymovement 10, LilycoveCity_ContestLobby_Movement_1A083D - applymovement 0x8008, LilycoveCity_ContestLobby_Movement_1B7821 + applymovement SPECIALVAR_8, LilycoveCity_ContestLobby_Movement_1B7821 waitmovement 0 goto LilycoveCity_ContestLobby_EventScript_1B7681 end @@ -92,7 +92,7 @@ FallarborTown_ContestLobby_EventScript_1B7734:: @ 81B7734 end FallarborTown_ContestLobby_EventScript_1B7742:: @ 81B7742 - copyvar 0x8004, 0x8009 + copyvar SPECIALVAR_4, SPECIALVAR_9 fadescreen 1 special sub_804E538 waitstate @@ -122,22 +122,22 @@ FallarborTown_ContestLobby_EventScript_1B7780:: @ 81B7780 end FallarborTown_ContestLobby_EventScript_1B778A:: @ 81B778A - setvar 0x8008, 4 + setvar SPECIALVAR_8, 4 goto FallarborTown_ContestLobby_EventScript_1B77B6 end SlateportCity_ContestLobby_EventScript_1B7795:: @ 81B7795 - setvar 0x8008, 2 + setvar SPECIALVAR_8, 2 goto SlateportCity_ContestLobby_EventScript_1B77B6 end VerdanturfTown_ContestLobby_EventScript_1B77A0:: @ 81B77A0 - setvar 0x8008, 2 + setvar SPECIALVAR_8, 2 goto VerdanturfTown_ContestLobby_EventScript_1B77B6 end LilycoveCity_ContestLobby_EventScript_1B77AB:: @ 81B77AB - setvar 0x8008, 3 + setvar SPECIALVAR_8, 3 goto LilycoveCity_ContestLobby_EventScript_1B77B6 end @@ -270,7 +270,7 @@ FallarborTown_ContestLobby_EventScript_1B790F:: @ 81B790F end FallarborTown_ContestLobby_EventScript_1B791D:: @ 81B791D - setvar 0x8004, 0 + setvar SPECIALVAR_4, 0 fadescreen 1 removeobject 240 removeobject 239 @@ -322,15 +322,15 @@ FallarborTown_ContestLobby_EventScript_1B7973:: @ 81B7973 FallarborTown_ContestLobby_EventScript_1B7980:: @ 81B7980 fadescreen 1 specialvar RESULT, GetLinkPartnerNames - copyvar 0x8008, RESULT - copyvar 0x8004, 0x8008 + copyvar SPECIALVAR_8, RESULT + copyvar SPECIALVAR_4, SPECIALVAR_8 special SpawnBerryBlenderLinkPlayerSprites goto FallarborTown_ContestLobby_EventScript_1B799A end FallarborTown_ContestLobby_EventScript_1B799A:: @ 81B799A fadescreen 0 - switch 0x8008 + switch SPECIALVAR_8 case 2, FallarborTown_ContestLobby_EventScript_1B78F3 case 3, FallarborTown_ContestLobby_EventScript_1B7901 case 4, FallarborTown_ContestLobby_EventScript_1B790F -- cgit v1.2.3 From 2c4d972f7c5a79ca94dca599b6e7b9e2c769cf70 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 24 Dec 2017 14:00:44 -0600 Subject: 'VAR_SPECIAL_X' instead of 'SPECIALVAR_X' --- data/scripts/pokeblocks.inc | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'data/scripts/pokeblocks.inc') diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 12ee04d3c..4a659f469 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -1,34 +1,34 @@ FallarborTown_ContestLobby_EventScript_1B7604:: @ 81B7604 - setvar SPECIALVAR_8, 4 - setvar SPECIALVAR_9, 1 - applymovement SPECIALVAR_8, FallarborTown_ContestLobby_Movement_1B7821 + setvar VAR_SPECIAL_8, 4 + setvar VAR_SPECIAL_9, 1 + applymovement VAR_SPECIAL_8, FallarborTown_ContestLobby_Movement_1B7821 waitmovement 0 goto FallarborTown_ContestLobby_EventScript_1B7681 end SlateportCity_ContestLobby_EventScript_1B761E:: @ 81B761E - setvar SPECIALVAR_8, 2 - setvar SPECIALVAR_9, 2 + setvar VAR_SPECIAL_8, 2 + setvar VAR_SPECIAL_9, 2 applymovement 6, SlateportCity_ContestLobby_Movement_1A083D - applymovement SPECIALVAR_8, SlateportCity_ContestLobby_Movement_1B7821 + applymovement VAR_SPECIAL_8, SlateportCity_ContestLobby_Movement_1B7821 waitmovement 0 goto SlateportCity_ContestLobby_EventScript_1B7681 end VerdanturfTown_ContestLobby_EventScript_1B763F:: @ 81B763F - setvar SPECIALVAR_8, 2 - setvar SPECIALVAR_9, 1 - applymovement SPECIALVAR_8, VerdanturfTown_ContestLobby_Movement_1B7821 + setvar VAR_SPECIAL_8, 2 + setvar VAR_SPECIAL_9, 1 + applymovement VAR_SPECIAL_8, VerdanturfTown_ContestLobby_Movement_1B7821 waitmovement 0 goto VerdanturfTown_ContestLobby_EventScript_1B7681 end LilycoveCity_ContestLobby_EventScript_1B7659:: @ 81B7659 - setvar SPECIALVAR_8, 3 - setvar SPECIALVAR_9, 3 + setvar VAR_SPECIAL_8, 3 + setvar VAR_SPECIAL_9, 3 applymovement 9, LilycoveCity_ContestLobby_Movement_1A083D applymovement 10, LilycoveCity_ContestLobby_Movement_1A083D - applymovement SPECIALVAR_8, LilycoveCity_ContestLobby_Movement_1B7821 + applymovement VAR_SPECIAL_8, LilycoveCity_ContestLobby_Movement_1B7821 waitmovement 0 goto LilycoveCity_ContestLobby_EventScript_1B7681 end @@ -92,7 +92,7 @@ FallarborTown_ContestLobby_EventScript_1B7734:: @ 81B7734 end FallarborTown_ContestLobby_EventScript_1B7742:: @ 81B7742 - copyvar SPECIALVAR_4, SPECIALVAR_9 + copyvar VAR_SPECIAL_4, VAR_SPECIAL_9 fadescreen 1 special sub_804E538 waitstate @@ -122,22 +122,22 @@ FallarborTown_ContestLobby_EventScript_1B7780:: @ 81B7780 end FallarborTown_ContestLobby_EventScript_1B778A:: @ 81B778A - setvar SPECIALVAR_8, 4 + setvar VAR_SPECIAL_8, 4 goto FallarborTown_ContestLobby_EventScript_1B77B6 end SlateportCity_ContestLobby_EventScript_1B7795:: @ 81B7795 - setvar SPECIALVAR_8, 2 + setvar VAR_SPECIAL_8, 2 goto SlateportCity_ContestLobby_EventScript_1B77B6 end VerdanturfTown_ContestLobby_EventScript_1B77A0:: @ 81B77A0 - setvar SPECIALVAR_8, 2 + setvar VAR_SPECIAL_8, 2 goto VerdanturfTown_ContestLobby_EventScript_1B77B6 end LilycoveCity_ContestLobby_EventScript_1B77AB:: @ 81B77AB - setvar SPECIALVAR_8, 3 + setvar VAR_SPECIAL_8, 3 goto LilycoveCity_ContestLobby_EventScript_1B77B6 end @@ -270,7 +270,7 @@ FallarborTown_ContestLobby_EventScript_1B790F:: @ 81B790F end FallarborTown_ContestLobby_EventScript_1B791D:: @ 81B791D - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 fadescreen 1 removeobject 240 removeobject 239 @@ -322,15 +322,15 @@ FallarborTown_ContestLobby_EventScript_1B7973:: @ 81B7973 FallarborTown_ContestLobby_EventScript_1B7980:: @ 81B7980 fadescreen 1 specialvar RESULT, GetLinkPartnerNames - copyvar SPECIALVAR_8, RESULT - copyvar SPECIALVAR_4, SPECIALVAR_8 + copyvar VAR_SPECIAL_8, RESULT + copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 special SpawnBerryBlenderLinkPlayerSprites goto FallarborTown_ContestLobby_EventScript_1B799A end FallarborTown_ContestLobby_EventScript_1B799A:: @ 81B799A fadescreen 0 - switch SPECIALVAR_8 + switch VAR_SPECIAL_8 case 2, FallarborTown_ContestLobby_EventScript_1B78F3 case 3, FallarborTown_ContestLobby_EventScript_1B7901 case 4, FallarborTown_ContestLobby_EventScript_1B790F -- cgit v1.2.3 From 7158286302493c6fe34068926b351292af2cb6a9 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 1 Jan 2018 13:59:39 -0600 Subject: Label a bunch more specials --- data/scripts/pokeblocks.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'data/scripts/pokeblocks.inc') diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 4a659f469..eb12ab148 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -53,7 +53,7 @@ FallarborTown_ContestLobby_EventScript_1B76A1:: @ 81B76A1 compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B770E msgbox FallarborTown_ContestLobby_Text_1B6E9D, 4 - specialvar RESULT, sub_810CA00 + specialvar RESULT, GetFirstFreePokeblockSlot compare RESULT, 65535 goto_if 5, FallarborTown_ContestLobby_EventScript_1B76EF compare RESULT, 65535 @@ -94,7 +94,7 @@ FallarborTown_ContestLobby_EventScript_1B7734:: @ 81B7734 FallarborTown_ContestLobby_EventScript_1B7742:: @ 81B7742 copyvar VAR_SPECIAL_4, VAR_SPECIAL_9 fadescreen 1 - special sub_804E538 + special DoBerryBlending waitstate releaseall end @@ -214,7 +214,7 @@ VerdanturfTown_ContestLobby_EventScript_1B783B:: @ 81B783B checkitem ITEM_POKEBLOCK_CASE, 1 compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7942 - specialvar RESULT, sub_810CA00 + specialvar RESULT, GetFirstFreePokeblockSlot compare RESULT, 65535 goto_if 5, FallarborTown_ContestLobby_EventScript_1B7878 compare RESULT, 65535 @@ -276,7 +276,7 @@ FallarborTown_ContestLobby_EventScript_1B791D:: @ 81B791D removeobject 239 removeobject 238 removeobject 237 - special sub_804E538 + special DoBerryBlending waitstate releaseall end -- cgit v1.2.3 From c748287725a01561ba9f972b094d7b297cea2d8e Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 4 Jan 2018 15:24:19 -0800 Subject: Use -1 instead of 65535 for compare macro --- data/scripts/pokeblocks.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'data/scripts/pokeblocks.inc') diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index eb12ab148..2f5dd6f47 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -54,9 +54,9 @@ FallarborTown_ContestLobby_EventScript_1B76A1:: @ 81B76A1 goto_if_eq FallarborTown_ContestLobby_EventScript_1B770E msgbox FallarborTown_ContestLobby_Text_1B6E9D, 4 specialvar RESULT, GetFirstFreePokeblockSlot - compare RESULT, 65535 + compare RESULT, -1 goto_if 5, FallarborTown_ContestLobby_EventScript_1B76EF - compare RESULT, 65535 + compare RESULT, -1 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7776 end @@ -215,9 +215,9 @@ VerdanturfTown_ContestLobby_EventScript_1B783B:: @ 81B783B compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7942 specialvar RESULT, GetFirstFreePokeblockSlot - compare RESULT, 65535 + compare RESULT, -1 goto_if 5, FallarborTown_ContestLobby_EventScript_1B7878 - compare RESULT, 65535 + compare RESULT, -1 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7938 end -- cgit v1.2.3 From f0097860b0098ae465204152fb3a38d69422b27e Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 4 Jan 2018 16:19:02 -0800 Subject: Use MSGBOX_YESNO and YES/NO constants for yes/no message boxes --- data/scripts/pokeblocks.inc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'data/scripts/pokeblocks.inc') diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 2f5dd6f47..589d4e21c 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -38,10 +38,10 @@ LilycoveCity_ContestLobby_EventScript_1B7681:: @ 81B7681 SlateportCity_ContestLobby_EventScript_1B7681:: @ 81B7681 VerdanturfTown_ContestLobby_EventScript_1B7681:: @ 81B7681 lockall - msgbox FallarborTown_ContestLobby_Text_1B6E63, 5 - compare RESULT, 1 + msgbox FallarborTown_ContestLobby_Text_1B6E63, MSGBOX_YESNO + compare RESULT, YES goto_if_eq FallarborTown_ContestLobby_EventScript_1B76A1 - compare RESULT, 0 + compare RESULT, NO goto_if_eq FallarborTown_ContestLobby_EventScript_1B76E5 end @@ -66,10 +66,10 @@ FallarborTown_ContestLobby_EventScript_1B76E5:: @ 81B76E5 end FallarborTown_ContestLobby_EventScript_1B76EF:: @ 81B76EF - msgbox FallarborTown_ContestLobby_Text_1B6ED0, 5 - compare RESULT, 1 + msgbox FallarborTown_ContestLobby_Text_1B6ED0, MSGBOX_YESNO + compare RESULT, YES goto_if_eq FallarborTown_ContestLobby_EventScript_1B7734 - compare RESULT, 0 + compare RESULT, NO goto_if_eq FallarborTown_ContestLobby_EventScript_1B7726 end @@ -222,10 +222,10 @@ VerdanturfTown_ContestLobby_EventScript_1B783B:: @ 81B783B end FallarborTown_ContestLobby_EventScript_1B7878:: @ 81B7878 - msgbox FallarborTown_ContestLobby_Text_1B727C, 5 - compare RESULT, 1 + msgbox FallarborTown_ContestLobby_Text_1B727C, MSGBOX_YESNO + compare RESULT, YES goto_if_eq FallarborTown_ContestLobby_EventScript_1B78A1 - compare RESULT, 0 + compare RESULT, NO goto_if_eq FallarborTown_ContestLobby_EventScript_1B7936 end -- 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/pokeblocks.inc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'data/scripts/pokeblocks.inc') diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 589d4e21c..4b21aa99b 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -55,7 +55,7 @@ FallarborTown_ContestLobby_EventScript_1B76A1:: @ 81B76A1 msgbox FallarborTown_ContestLobby_Text_1B6E9D, 4 specialvar RESULT, GetFirstFreePokeblockSlot compare RESULT, -1 - goto_if 5, FallarborTown_ContestLobby_EventScript_1B76EF + goto_if_ne FallarborTown_ContestLobby_EventScript_1B76EF compare RESULT, -1 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7776 end @@ -76,8 +76,7 @@ FallarborTown_ContestLobby_EventScript_1B76EF:: @ 81B76EF FallarborTown_ContestLobby_EventScript_1B770E:: @ 81B770E msgbox FallarborTown_ContestLobby_Text_1B6FF0, 4 dodailyevents - checkflag FLAG_DAILY_RECEIVED_BERRY_FALLARBOR - goto_if_eq FallarborTown_ContestLobby_EventScript_1B774F + goto_if_set FLAG_DAILY_RECEIVED_BERRY_FALLARBOR, FallarborTown_ContestLobby_EventScript_1B774F goto FallarborTown_ContestLobby_EventScript_1B7759 end @@ -162,8 +161,7 @@ FallarborTown_ContestLobby_EventScript_1B77DC:: @ 81B77DC FallarborTown_ContestLobby_EventScript_1B77E6:: @ 81B77E6 dodailyevents - checkflag FLAG_DAILY_RECEIVED_BERRY_FALLARBOR - goto_if_eq FallarborTown_ContestLobby_EventScript_1B77F6 + goto_if_set FLAG_DAILY_RECEIVED_BERRY_FALLARBOR, FallarborTown_ContestLobby_EventScript_1B77F6 goto FallarborTown_ContestLobby_EventScript_1B7800 end @@ -216,7 +214,7 @@ VerdanturfTown_ContestLobby_EventScript_1B783B:: @ 81B783B goto_if_eq FallarborTown_ContestLobby_EventScript_1B7942 specialvar RESULT, GetFirstFreePokeblockSlot compare RESULT, -1 - goto_if 5, FallarborTown_ContestLobby_EventScript_1B7878 + goto_if_ne FallarborTown_ContestLobby_EventScript_1B7878 compare RESULT, -1 goto_if_eq FallarborTown_ContestLobby_EventScript_1B7938 end -- cgit v1.2.3