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/maps/RustboroCity.inc | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'data/scripts/maps/RustboroCity.inc') diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index c338e8b67..77f0a5f6f 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -127,7 +127,7 @@ RustboroCity_EventScript_14C481:: @ 814C481 movespriteperm 9, 14, 21 spritebehave 9, 10 setvar 0x8004, 0 - jump RustboroCity_EventScript_14C4F4 + goto RustboroCity_EventScript_14C4F4 end RustboroCity_EventScript_14C498:: @ 814C498 @@ -135,7 +135,7 @@ RustboroCity_EventScript_14C498:: @ 814C498 movespriteperm 9, 14, 21 spritebehave 9, 10 setvar 0x8004, 1 - jump RustboroCity_EventScript_14C4F4 + goto RustboroCity_EventScript_14C4F4 end RustboroCity_EventScript_14C4AF:: @ 814C4AF @@ -143,7 +143,7 @@ RustboroCity_EventScript_14C4AF:: @ 814C4AF movespriteperm 9, 14, 21 spritebehave 9, 10 setvar 0x8004, 2 - jump RustboroCity_EventScript_14C4F4 + goto RustboroCity_EventScript_14C4F4 end RustboroCity_EventScript_14C4C6:: @ 814C4C6 @@ -151,7 +151,7 @@ RustboroCity_EventScript_14C4C6:: @ 814C4C6 movespriteperm 9, 14, 21 spritebehave 9, 10 setvar 0x8004, 3 - jump RustboroCity_EventScript_14C4F4 + goto RustboroCity_EventScript_14C4F4 end RustboroCity_EventScript_14C4DD:: @ 814C4DD @@ -159,7 +159,7 @@ RustboroCity_EventScript_14C4DD:: @ 814C4DD movespriteperm 9, 14, 21 spritebehave 9, 10 setvar 0x8004, 4 - jump RustboroCity_EventScript_14C4F4 + goto RustboroCity_EventScript_14C4F4 end RustboroCity_EventScript_14C4F4:: @ 814C4F4 @@ -335,31 +335,31 @@ RustboroCity_EventScript_14C5FF:: @ 814C5FF RustboroCity_EventScript_14C614:: @ 814C614 checksound setvar 0x4001, 4 - jump RustboroCity_EventScript_14C77D + goto RustboroCity_EventScript_14C77D end RustboroCity_EventScript_14C620:: @ 814C620 lockall setvar 0x4001, 0 - jump RustboroCity_EventScript_14C650 + goto RustboroCity_EventScript_14C650 end RustboroCity_EventScript_14C62C:: @ 814C62C lockall setvar 0x4001, 1 - jump RustboroCity_EventScript_14C650 + goto RustboroCity_EventScript_14C650 end RustboroCity_EventScript_14C638:: @ 814C638 lockall setvar 0x4001, 2 - jump RustboroCity_EventScript_14C650 + goto RustboroCity_EventScript_14C650 end RustboroCity_EventScript_14C644:: @ 814C644 lockall setvar 0x4001, 3 - jump RustboroCity_EventScript_14C650 + goto RustboroCity_EventScript_14C650 end RustboroCity_EventScript_14C650:: @ 814C650 @@ -435,25 +435,25 @@ RustboroCity_Movement_14C74B:: @ 814C74B RustboroCity_EventScript_14C74D:: @ 814C74D lockall setvar 0x4001, 0 - jump RustboroCity_EventScript_14C77D + goto RustboroCity_EventScript_14C77D end RustboroCity_EventScript_14C759:: @ 814C759 lockall setvar 0x4001, 1 - jump RustboroCity_EventScript_14C77D + goto RustboroCity_EventScript_14C77D end RustboroCity_EventScript_14C765:: @ 814C765 lockall setvar 0x4001, 2 - jump RustboroCity_EventScript_14C77D + goto RustboroCity_EventScript_14C77D end RustboroCity_EventScript_14C771:: @ 814C771 lockall setvar 0x4001, 3 - jump RustboroCity_EventScript_14C77D + goto RustboroCity_EventScript_14C77D end RustboroCity_EventScript_14C77D:: @ 814C77D -- 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/maps/RustboroCity.inc | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'data/scripts/maps/RustboroCity.inc') diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 77f0a5f6f..13a4ce265 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -12,7 +12,7 @@ RustboroCity_EventScript_14C386:: @ 814C386 lock faceplayer checkflag 142 - jumpeq RustboroCity_EventScript_14C39B + goto_if_eq RustboroCity_EventScript_14C39B msgbox RustboroCity_Text_16689D, 4 release end @@ -37,7 +37,7 @@ RustboroCity_EventScript_14C3BA:: @ 814C3BA lock faceplayer checkflag 2055 - jumpeq RustboroCity_EventScript_14C3CF + goto_if_eq RustboroCity_EventScript_14C3CF msgbox RustboroCity_Text_16696D, 4 release end @@ -51,7 +51,7 @@ RustboroCity_EventScript_14C3D9:: @ 814C3D9 lock faceplayer checkflag 188 - jumpeq RustboroCity_EventScript_14C3EE + goto_if_eq RustboroCity_EventScript_14C3EE msgbox RustboroCity_Text_166B86, 4 release end @@ -327,7 +327,7 @@ RustboroCity_EventScript_14C5FF:: @ 814C5FF lock faceplayer checkflag 143 - jumpeq RustboroCity_EventScript_14C614 + goto_if_eq RustboroCity_EventScript_14C614 msgbox RustboroCity_Text_166F6B, 4 release end @@ -364,13 +364,13 @@ RustboroCity_EventScript_14C644:: @ 814C644 RustboroCity_EventScript_14C650:: @ 814C650 compare 0x4001, 0 - callif 1, RustboroCity_EventScript_14C691 + call_if 1, RustboroCity_EventScript_14C691 compare 0x4001, 1 - callif 1, RustboroCity_EventScript_14C6BD + call_if 1, RustboroCity_EventScript_14C6BD compare 0x4001, 2 - callif 1, RustboroCity_EventScript_14C6E9 + call_if 1, RustboroCity_EventScript_14C6E9 compare 0x4001, 3 - callif 1, RustboroCity_EventScript_14C715 + call_if 1, RustboroCity_EventScript_14C715 setflag 159 setvar 0x405a, 3 moveoffscreen 9 @@ -458,19 +458,19 @@ RustboroCity_EventScript_14C771:: @ 814C771 RustboroCity_EventScript_14C77D:: @ 814C77D compare 0x4001, 0 - callif 1, RustboroCity_EventScript_14C7FE + call_if 1, RustboroCity_EventScript_14C7FE compare 0x4001, 1 - callif 1, RustboroCity_EventScript_14C82A + call_if 1, RustboroCity_EventScript_14C82A compare 0x4001, 2 - callif 1, RustboroCity_EventScript_14C856 + call_if 1, RustboroCity_EventScript_14C856 compare 0x4001, 3 - callif 1, RustboroCity_EventScript_14C882 + call_if 1, RustboroCity_EventScript_14C882 compare 0x4001, 4 - callif 1, RustboroCity_EventScript_14C8B8 + call_if 1, RustboroCity_EventScript_14C8B8 msgbox RustboroCity_Text_166FB4, 4 giveitem ITEM_GREAT_BALL compare RESULT, 0 - callif 1, RustboroCity_EventScript_14C7F5 + call_if 1, RustboroCity_EventScript_14C7F5 msgbox RustboroCity_Text_16707F, 4 closebutton setflag 144 @@ -550,12 +550,12 @@ RustboroCity_EventScript_14C8DA:: @ 814C8DA lock faceplayer checkflag 288 - jumpeq RustboroCity_EventScript_14C917 + goto_if_eq RustboroCity_EventScript_14C917 checkgender compare RESULT, 0 - jumpeq RustboroCity_EventScript_14C8FD + goto_if_eq RustboroCity_EventScript_14C8FD compare RESULT, 1 - jumpeq RustboroCity_EventScript_14C90A + goto_if_eq RustboroCity_EventScript_14C90A end RustboroCity_EventScript_14C8FD:: @ 814C8FD @@ -573,9 +573,9 @@ RustboroCity_EventScript_14C90A:: @ 814C90A RustboroCity_EventScript_14C917:: @ 814C917 checkgender compare RESULT, 0 - jumpeq RustboroCity_EventScript_14C92F + goto_if_eq RustboroCity_EventScript_14C92F compare RESULT, 1 - jumpeq RustboroCity_EventScript_14C939 + goto_if_eq RustboroCity_EventScript_14C939 end RustboroCity_EventScript_14C92F:: @ 814C92F -- 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/RustboroCity.inc | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'data/scripts/maps/RustboroCity.inc') diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 13a4ce265..1a2afe16d 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -363,13 +363,13 @@ RustboroCity_EventScript_14C644:: @ 814C644 end RustboroCity_EventScript_14C650:: @ 814C650 - compare 0x4001, 0 + compare_var_to_imm 0x4001, 0 call_if 1, RustboroCity_EventScript_14C691 - compare 0x4001, 1 + compare_var_to_imm 0x4001, 1 call_if 1, RustboroCity_EventScript_14C6BD - compare 0x4001, 2 + compare_var_to_imm 0x4001, 2 call_if 1, RustboroCity_EventScript_14C6E9 - compare 0x4001, 3 + compare_var_to_imm 0x4001, 3 call_if 1, RustboroCity_EventScript_14C715 setflag 159 setvar 0x405a, 3 @@ -457,19 +457,19 @@ RustboroCity_EventScript_14C771:: @ 814C771 end RustboroCity_EventScript_14C77D:: @ 814C77D - compare 0x4001, 0 + compare_var_to_imm 0x4001, 0 call_if 1, RustboroCity_EventScript_14C7FE - compare 0x4001, 1 + compare_var_to_imm 0x4001, 1 call_if 1, RustboroCity_EventScript_14C82A - compare 0x4001, 2 + compare_var_to_imm 0x4001, 2 call_if 1, RustboroCity_EventScript_14C856 - compare 0x4001, 3 + compare_var_to_imm 0x4001, 3 call_if 1, RustboroCity_EventScript_14C882 - compare 0x4001, 4 + compare_var_to_imm 0x4001, 4 call_if 1, RustboroCity_EventScript_14C8B8 msgbox RustboroCity_Text_166FB4, 4 giveitem ITEM_GREAT_BALL - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, RustboroCity_EventScript_14C7F5 msgbox RustboroCity_Text_16707F, 4 closebutton @@ -552,9 +552,9 @@ RustboroCity_EventScript_14C8DA:: @ 814C8DA checkflag 288 goto_if_eq RustboroCity_EventScript_14C917 checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq RustboroCity_EventScript_14C8FD - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq RustboroCity_EventScript_14C90A end @@ -572,9 +572,9 @@ RustboroCity_EventScript_14C90A:: @ 814C90A RustboroCity_EventScript_14C917:: @ 814C917 checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq RustboroCity_EventScript_14C92F - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq RustboroCity_EventScript_14C939 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/RustboroCity.inc | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'data/scripts/maps/RustboroCity.inc') diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 1a2afe16d..677838f8a 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -333,7 +333,7 @@ RustboroCity_EventScript_14C5FF:: @ 814C5FF end RustboroCity_EventScript_14C614:: @ 814C614 - checksound + waitse setvar 0x4001, 4 goto RustboroCity_EventScript_14C77D end @@ -381,7 +381,7 @@ RustboroCity_EventScript_14C650:: @ 814C650 RustboroCity_EventScript_14C691:: @ 814C691 move 9, RustboroCity_Movement_1A0841 waitmove 0 - playsfx 21 + playse 21 move 9, RustboroCity_Movement_1A0833 waitmove 0 move 9, RustboroCity_Movement_1A0835 @@ -393,7 +393,7 @@ RustboroCity_EventScript_14C691:: @ 814C691 RustboroCity_EventScript_14C6BD:: @ 814C6BD move 9, RustboroCity_Movement_1A083F waitmove 0 - playsfx 21 + playse 21 move 9, RustboroCity_Movement_1A0833 waitmove 0 move 9, RustboroCity_Movement_1A0835 @@ -405,7 +405,7 @@ RustboroCity_EventScript_14C6BD:: @ 814C6BD RustboroCity_EventScript_14C6E9:: @ 814C6E9 move 9, RustboroCity_Movement_1A0845 waitmove 0 - playsfx 21 + playse 21 move 9, RustboroCity_Movement_1A0833 waitmove 0 move 9, RustboroCity_Movement_1A0835 @@ -417,7 +417,7 @@ RustboroCity_EventScript_14C6E9:: @ 814C6E9 RustboroCity_EventScript_14C715:: @ 814C715 move 9, RustboroCity_Movement_1A0845 waitmove 0 - playsfx 21 + playse 21 move 9, RustboroCity_Movement_1A0833 waitmove 0 move 9, RustboroCity_Movement_1A0835 @@ -476,7 +476,7 @@ RustboroCity_EventScript_14C77D:: @ 814C77D setflag 144 setflag 732 setvar 0x405a, 5 - pause 30 + delay 30 warp RustboroCity_DevonCorp_3F, 255, 2, 2 waitstate releaseall @@ -489,7 +489,7 @@ RustboroCity_EventScript_14C7F5:: @ 814C7F5 RustboroCity_EventScript_14C7FE:: @ 814C7FE move 9, RustboroCity_Movement_1A0841 waitmove 0 - playsfx 21 + playse 21 move 9, RustboroCity_Movement_1A0833 waitmove 0 move 9, RustboroCity_Movement_1A0835 @@ -501,7 +501,7 @@ RustboroCity_EventScript_14C7FE:: @ 814C7FE RustboroCity_EventScript_14C82A:: @ 814C82A move 9, RustboroCity_Movement_1A0843 waitmove 0 - playsfx 21 + playse 21 move 9, RustboroCity_Movement_1A0833 waitmove 0 move 9, RustboroCity_Movement_1A0835 @@ -513,7 +513,7 @@ RustboroCity_EventScript_14C82A:: @ 814C82A RustboroCity_EventScript_14C856:: @ 814C856 move 9, RustboroCity_Movement_1A0845 waitmove 0 - playsfx 21 + playse 21 move 9, RustboroCity_Movement_1A0833 waitmove 0 move 9, RustboroCity_Movement_1A0835 @@ -525,7 +525,7 @@ RustboroCity_EventScript_14C856:: @ 814C856 RustboroCity_EventScript_14C882:: @ 814C882 move 9, RustboroCity_Movement_1A0845 waitmove 0 - playsfx 21 + playse 21 move 9, RustboroCity_Movement_1A0833 waitmove 0 move 9, RustboroCity_Movement_1A0835 @@ -539,7 +539,7 @@ RustboroCity_EventScript_14C882:: @ 814C882 RustboroCity_EventScript_14C8B8:: @ 814C8B8 move 9, RustboroCity_Movement_1A083F waitmove 0 - playsfx 21 + playse 21 move 9, RustboroCity_Movement_1A0833 waitmove 0 move 9, RustboroCity_Movement_1A0835 -- 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/maps/RustboroCity.inc | 192 ++++++++++++++++++------------------- 1 file changed, 96 insertions(+), 96 deletions(-) (limited to 'data/scripts/maps/RustboroCity.inc') diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 677838f8a..ddd58be1a 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -101,8 +101,8 @@ RustboroCity_EventScript_14C449:: @ 814C449 lock faceplayer msgbox RustboroCity_Text_166D59, 4 - move 7, RustboroCity_Movement_1A083D - waitmove 0 + applymovement 7, RustboroCity_Movement_1A083D + waitmovement 0 release end @@ -110,8 +110,8 @@ RustboroCity_EventScript_14C45F:: @ 814C45F lock faceplayer msgbox RustboroCity_Text_166DB0, 4 - move 8, RustboroCity_Movement_1A083D - waitmove 0 + applymovement 8, RustboroCity_Movement_1A083D + waitmovement 0 release end @@ -167,15 +167,15 @@ RustboroCity_EventScript_14C4F4:: @ 814C4F4 closebutton reappear 10 reappear 9 - move 10, RustboroCity_Movement_14C5C2 - waitmove 0 + applymovement 10, RustboroCity_Movement_14C5C2 + waitmovement 0 disappear 10 - move 9, RustboroCity_Movement_14C5D3 - waitmove 0 + applymovement 9, RustboroCity_Movement_14C5D3 + waitmovement 0 msgbox RustboroCity_Text_166E7E, 4 closebutton - move 9, RustboroCity_Movement_14C5DB - waitmove 0 + applymovement 9, RustboroCity_Movement_14C5DB + waitmovement 0 disappear 9 movespriteperm 9, 30, 10 clearflag 732 @@ -200,30 +200,30 @@ RustboroCity_EventScript_14C4F4:: @ 814C4F4 return @ 814C56F - move 9, RustboroCity_Movement_14C5E3 - waitmove 0 + applymovement 9, RustboroCity_Movement_14C5E3 + waitmovement 0 return @ 814C57A - move 9, RustboroCity_Movement_14C5E7 - waitmove 0 + applymovement 9, RustboroCity_Movement_14C5E7 + waitmovement 0 return @ 814C585 - move 9, RustboroCity_Movement_14C5EC - waitmove 0 + applymovement 9, RustboroCity_Movement_14C5EC + waitmovement 0 return @ 814C590 - move 9, RustboroCity_Movement_14C5F1 - waitmove 0 + applymovement 9, RustboroCity_Movement_14C5F1 + waitmovement 0 return @ 814C59B - move 9, RustboroCity_Movement_14C5F7 - waitmove 0 - move 255, RustboroCity_Movement_1A0841 - waitmove 0 + applymovement 9, RustboroCity_Movement_14C5F7 + waitmovement 0 + applymovement 255, RustboroCity_Movement_1A0841 + waitmovement 0 return @ 814C5B0 @@ -379,53 +379,53 @@ RustboroCity_EventScript_14C650:: @ 814C650 end RustboroCity_EventScript_14C691:: @ 814C691 - move 9, RustboroCity_Movement_1A0841 - waitmove 0 + applymovement 9, RustboroCity_Movement_1A0841 + waitmovement 0 playse 21 - move 9, RustboroCity_Movement_1A0833 - waitmove 0 - move 9, RustboroCity_Movement_1A0835 - waitmove 0 - move 255, RustboroCity_Movement_1A0845 - waitmove 0 + applymovement 9, RustboroCity_Movement_1A0833 + waitmovement 0 + applymovement 9, RustboroCity_Movement_1A0835 + waitmovement 0 + applymovement 255, RustboroCity_Movement_1A0845 + waitmovement 0 return RustboroCity_EventScript_14C6BD:: @ 814C6BD - move 9, RustboroCity_Movement_1A083F - waitmove 0 + applymovement 9, RustboroCity_Movement_1A083F + waitmovement 0 playse 21 - move 9, RustboroCity_Movement_1A0833 - waitmove 0 - move 9, RustboroCity_Movement_1A0835 - waitmove 0 - move 255, RustboroCity_Movement_1A0843 - waitmove 0 + applymovement 9, RustboroCity_Movement_1A0833 + waitmovement 0 + applymovement 9, RustboroCity_Movement_1A0835 + waitmovement 0 + applymovement 255, RustboroCity_Movement_1A0843 + waitmovement 0 return RustboroCity_EventScript_14C6E9:: @ 814C6E9 - move 9, RustboroCity_Movement_1A0845 - waitmove 0 + applymovement 9, RustboroCity_Movement_1A0845 + waitmovement 0 playse 21 - move 9, RustboroCity_Movement_1A0833 - waitmove 0 - move 9, RustboroCity_Movement_1A0835 - waitmove 0 - move 255, RustboroCity_Movement_1A0841 - waitmove 0 + applymovement 9, RustboroCity_Movement_1A0833 + waitmovement 0 + applymovement 9, RustboroCity_Movement_1A0835 + waitmovement 0 + applymovement 255, RustboroCity_Movement_1A0841 + waitmovement 0 return RustboroCity_EventScript_14C715:: @ 814C715 - move 9, RustboroCity_Movement_1A0845 - waitmove 0 + applymovement 9, RustboroCity_Movement_1A0845 + waitmovement 0 playse 21 - move 9, RustboroCity_Movement_1A0833 - waitmove 0 - move 9, RustboroCity_Movement_1A0835 - waitmove 0 - move 9, RustboroCity_Movement_14C74B - waitmove 0 - move 255, RustboroCity_Movement_1A0841 - waitmove 0 + applymovement 9, RustboroCity_Movement_1A0833 + waitmovement 0 + applymovement 9, RustboroCity_Movement_1A0835 + waitmovement 0 + applymovement 9, RustboroCity_Movement_14C74B + waitmovement 0 + applymovement 255, RustboroCity_Movement_1A0841 + waitmovement 0 return RustboroCity_Movement_14C74B:: @ 814C74B @@ -487,63 +487,63 @@ RustboroCity_EventScript_14C7F5:: @ 814C7F5 return RustboroCity_EventScript_14C7FE:: @ 814C7FE - move 9, RustboroCity_Movement_1A0841 - waitmove 0 + applymovement 9, RustboroCity_Movement_1A0841 + waitmovement 0 playse 21 - move 9, RustboroCity_Movement_1A0833 - waitmove 0 - move 9, RustboroCity_Movement_1A0835 - waitmove 0 - move 255, RustboroCity_Movement_1A0845 - waitmove 0 + applymovement 9, RustboroCity_Movement_1A0833 + waitmovement 0 + applymovement 9, RustboroCity_Movement_1A0835 + waitmovement 0 + applymovement 255, RustboroCity_Movement_1A0845 + waitmovement 0 return RustboroCity_EventScript_14C82A:: @ 814C82A - move 9, RustboroCity_Movement_1A0843 - waitmove 0 + applymovement 9, RustboroCity_Movement_1A0843 + waitmovement 0 playse 21 - move 9, RustboroCity_Movement_1A0833 - waitmove 0 - move 9, RustboroCity_Movement_1A0835 - waitmove 0 - move 255, RustboroCity_Movement_1A083F - waitmove 0 + applymovement 9, RustboroCity_Movement_1A0833 + waitmovement 0 + applymovement 9, RustboroCity_Movement_1A0835 + waitmovement 0 + applymovement 255, RustboroCity_Movement_1A083F + waitmovement 0 return RustboroCity_EventScript_14C856:: @ 814C856 - move 9, RustboroCity_Movement_1A0845 - waitmove 0 + applymovement 9, RustboroCity_Movement_1A0845 + waitmovement 0 playse 21 - move 9, RustboroCity_Movement_1A0833 - waitmove 0 - move 9, RustboroCity_Movement_1A0835 - waitmove 0 - move 255, RustboroCity_Movement_1A0841 - waitmove 0 + applymovement 9, RustboroCity_Movement_1A0833 + waitmovement 0 + applymovement 9, RustboroCity_Movement_1A0835 + waitmovement 0 + applymovement 255, RustboroCity_Movement_1A0841 + waitmovement 0 return RustboroCity_EventScript_14C882:: @ 814C882 - move 9, RustboroCity_Movement_1A0845 - waitmove 0 + applymovement 9, RustboroCity_Movement_1A0845 + waitmovement 0 playse 21 - move 9, RustboroCity_Movement_1A0833 - waitmove 0 - move 9, RustboroCity_Movement_1A0835 - waitmove 0 - move 9, RustboroCity_Movement_14C74B - waitmove 0 - move 255, RustboroCity_Movement_1A0841 - waitmove 0 + applymovement 9, RustboroCity_Movement_1A0833 + waitmovement 0 + applymovement 9, RustboroCity_Movement_1A0835 + waitmovement 0 + applymovement 9, RustboroCity_Movement_14C74B + waitmovement 0 + applymovement 255, RustboroCity_Movement_1A0841 + waitmovement 0 return RustboroCity_EventScript_14C8B8:: @ 814C8B8 - move 9, RustboroCity_Movement_1A083F - waitmove 0 + applymovement 9, RustboroCity_Movement_1A083F + waitmovement 0 playse 21 - move 9, RustboroCity_Movement_1A0833 - waitmove 0 - move 9, RustboroCity_Movement_1A0835 - waitmove 0 + applymovement 9, RustboroCity_Movement_1A0833 + waitmovement 0 + applymovement 9, RustboroCity_Movement_1A0835 + waitmovement 0 return RustboroCity_EventScript_14C8DA:: @ 814C8DA -- 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/RustboroCity.inc | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'data/scripts/maps/RustboroCity.inc') diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index ddd58be1a..dcbb75886 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -363,13 +363,13 @@ RustboroCity_EventScript_14C644:: @ 814C644 end RustboroCity_EventScript_14C650:: @ 814C650 - compare_var_to_imm 0x4001, 0 + compare 0x4001, 0 call_if 1, RustboroCity_EventScript_14C691 - compare_var_to_imm 0x4001, 1 + compare 0x4001, 1 call_if 1, RustboroCity_EventScript_14C6BD - compare_var_to_imm 0x4001, 2 + compare 0x4001, 2 call_if 1, RustboroCity_EventScript_14C6E9 - compare_var_to_imm 0x4001, 3 + compare 0x4001, 3 call_if 1, RustboroCity_EventScript_14C715 setflag 159 setvar 0x405a, 3 @@ -457,19 +457,19 @@ RustboroCity_EventScript_14C771:: @ 814C771 end RustboroCity_EventScript_14C77D:: @ 814C77D - compare_var_to_imm 0x4001, 0 + compare 0x4001, 0 call_if 1, RustboroCity_EventScript_14C7FE - compare_var_to_imm 0x4001, 1 + compare 0x4001, 1 call_if 1, RustboroCity_EventScript_14C82A - compare_var_to_imm 0x4001, 2 + compare 0x4001, 2 call_if 1, RustboroCity_EventScript_14C856 - compare_var_to_imm 0x4001, 3 + compare 0x4001, 3 call_if 1, RustboroCity_EventScript_14C882 - compare_var_to_imm 0x4001, 4 + compare 0x4001, 4 call_if 1, RustboroCity_EventScript_14C8B8 msgbox RustboroCity_Text_166FB4, 4 giveitem ITEM_GREAT_BALL - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, RustboroCity_EventScript_14C7F5 msgbox RustboroCity_Text_16707F, 4 closebutton @@ -552,9 +552,9 @@ RustboroCity_EventScript_14C8DA:: @ 814C8DA checkflag 288 goto_if_eq RustboroCity_EventScript_14C917 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq RustboroCity_EventScript_14C8FD - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq RustboroCity_EventScript_14C90A end @@ -572,9 +572,9 @@ RustboroCity_EventScript_14C90A:: @ 814C90A RustboroCity_EventScript_14C917:: @ 814C917 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq RustboroCity_EventScript_14C92F - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq RustboroCity_EventScript_14C939 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/maps/RustboroCity.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'data/scripts/maps/RustboroCity.inc') diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index dcbb75886..d2469dca7 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -165,18 +165,18 @@ RustboroCity_EventScript_14C4DD:: @ 814C4DD RustboroCity_EventScript_14C4F4:: @ 814C4F4 msgbox RustboroCity_Text_166E65, 4 closebutton - reappear 10 - reappear 9 + addobject 10 + addobject 9 applymovement 10, RustboroCity_Movement_14C5C2 waitmovement 0 - disappear 10 + removeobject 10 applymovement 9, RustboroCity_Movement_14C5D3 waitmovement 0 msgbox RustboroCity_Text_166E7E, 4 closebutton applymovement 9, RustboroCity_Movement_14C5DB waitmovement 0 - disappear 9 + removeobject 9 movespriteperm 9, 30, 10 clearflag 732 setflag 142 -- 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/maps/RustboroCity.inc | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'data/scripts/maps/RustboroCity.inc') diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index d2469dca7..955726d89 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -124,47 +124,47 @@ RustboroCity_EventScript_14C475:: @ 814C475 RustboroCity_EventScript_14C481:: @ 814C481 lockall - movespriteperm 9, 14, 21 - spritebehave 9, 10 + setobjectxyperm 9, 14, 21 + setobjectmovementtype 9, 10 setvar 0x8004, 0 goto RustboroCity_EventScript_14C4F4 end RustboroCity_EventScript_14C498:: @ 814C498 lockall - movespriteperm 9, 14, 21 - spritebehave 9, 10 + setobjectxyperm 9, 14, 21 + setobjectmovementtype 9, 10 setvar 0x8004, 1 goto RustboroCity_EventScript_14C4F4 end RustboroCity_EventScript_14C4AF:: @ 814C4AF lockall - movespriteperm 9, 14, 21 - spritebehave 9, 10 + setobjectxyperm 9, 14, 21 + setobjectmovementtype 9, 10 setvar 0x8004, 2 goto RustboroCity_EventScript_14C4F4 end RustboroCity_EventScript_14C4C6:: @ 814C4C6 lockall - movespriteperm 9, 14, 21 - spritebehave 9, 10 + setobjectxyperm 9, 14, 21 + setobjectmovementtype 9, 10 setvar 0x8004, 3 goto RustboroCity_EventScript_14C4F4 end RustboroCity_EventScript_14C4DD:: @ 814C4DD lockall - movespriteperm 9, 14, 21 - spritebehave 9, 10 + setobjectxyperm 9, 14, 21 + setobjectmovementtype 9, 10 setvar 0x8004, 4 goto RustboroCity_EventScript_14C4F4 end RustboroCity_EventScript_14C4F4:: @ 814C4F4 msgbox RustboroCity_Text_166E65, 4 - closebutton + closemessage addobject 10 addobject 9 applymovement 10, RustboroCity_Movement_14C5C2 @@ -173,11 +173,11 @@ RustboroCity_EventScript_14C4F4:: @ 814C4F4 applymovement 9, RustboroCity_Movement_14C5D3 waitmovement 0 msgbox RustboroCity_Text_166E7E, 4 - closebutton + closemessage applymovement 9, RustboroCity_Movement_14C5DB waitmovement 0 removeobject 9 - movespriteperm 9, 30, 10 + setobjectxyperm 9, 30, 10 clearflag 732 setflag 142 setvar 0x405a, 2 @@ -373,7 +373,7 @@ RustboroCity_EventScript_14C650:: @ 814C650 call_if 1, RustboroCity_EventScript_14C715 setflag 159 setvar 0x405a, 3 - moveoffscreen 9 + moveobjectoffscreen 9 msgbox RustboroCity_Text_166EA5, 4 releaseall end @@ -472,7 +472,7 @@ RustboroCity_EventScript_14C77D:: @ 814C77D compare RESULT, 0 call_if 1, RustboroCity_EventScript_14C7F5 msgbox RustboroCity_Text_16707F, 4 - closebutton + closemessage setflag 144 setflag 732 setvar 0x405a, 5 -- 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/RustboroCity.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/scripts/maps/RustboroCity.inc') diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 955726d89..916eb8108 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -551,7 +551,7 @@ RustboroCity_EventScript_14C8DA:: @ 814C8DA faceplayer checkflag 288 goto_if_eq RustboroCity_EventScript_14C917 - checkgender + checkplayergender compare RESULT, 0 goto_if_eq RustboroCity_EventScript_14C8FD compare RESULT, 1 @@ -571,7 +571,7 @@ RustboroCity_EventScript_14C90A:: @ 814C90A end RustboroCity_EventScript_14C917:: @ 814C917 - checkgender + checkplayergender compare RESULT, 0 goto_if_eq RustboroCity_EventScript_14C92F compare RESULT, 1 -- cgit v1.2.3 From 2fea5bf7d82e85f4b33857e6eb5b4ddc6e7542d2 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Mon, 27 Nov 2017 22:12:09 -0600 Subject: convert data files to use constants/map.h --- data/scripts/maps/RustboroCity.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/scripts/maps/RustboroCity.inc') diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 916eb8108..3be6be562 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -477,7 +477,7 @@ RustboroCity_EventScript_14C77D:: @ 814C77D setflag 732 setvar 0x405a, 5 delay 30 - warp RustboroCity_DevonCorp_3F, 255, 2, 2 + warp MAP_RUSTBORO_CITY_DEVON_CORP_3F, 255, 2, 2 waitstate releaseall 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/RustboroCity.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/scripts/maps/RustboroCity.inc') diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 3be6be562..6e649de68 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -3,7 +3,7 @@ RustboroCity_MapScripts:: @ 814C372 .byte 0 RustboroCity_MapScript1_14C378:: @ 814C378 - setflag 2073 + setflag FLAG_VISITED_RUSTBORO_CITY call RustboroCity_EventScript_1A0196 call RustboroCity_EventScript_1A014E end @@ -36,7 +36,7 @@ RustboroCity_EventScript_14C3B1:: @ 814C3B1 RustboroCity_EventScript_14C3BA:: @ 814C3BA lock faceplayer - checkflag 2055 + checkflag BADGE01_GET goto_if_eq RustboroCity_EventScript_14C3CF msgbox RustboroCity_Text_16696D, 4 release -- cgit v1.2.3 From 24a90b9acb243bf5c24a797a2a300a23613813d5 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 2 Dec 2017 19:12:33 -0800 Subject: Label script flags up to flag 199. --- data/scripts/maps/RustboroCity.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'data/scripts/maps/RustboroCity.inc') diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 6e649de68..76134aa43 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -11,7 +11,7 @@ RustboroCity_MapScript1_14C378:: @ 814C378 RustboroCity_EventScript_14C386:: @ 814C386 lock faceplayer - checkflag 142 + checkflag FLAG_DEVON_GOODS_STOLEN goto_if_eq RustboroCity_EventScript_14C39B msgbox RustboroCity_Text_16689D, 4 release @@ -50,7 +50,7 @@ RustboroCity_EventScript_14C3CF:: @ 814C3CF RustboroCity_EventScript_14C3D9:: @ 814C3D9 lock faceplayer - checkflag 188 + checkflag FLAG_RECEIVED_POKENAV goto_if_eq RustboroCity_EventScript_14C3EE msgbox RustboroCity_Text_166B86, 4 release @@ -179,7 +179,7 @@ RustboroCity_EventScript_14C4F4:: @ 814C4F4 removeobject 9 setobjectxyperm 9, 30, 10 clearflag 732 - setflag 142 + setflag FLAG_DEVON_GOODS_STOLEN setvar 0x405a, 2 setvar 0x409a, 2 setvar 0x406f, 1 @@ -326,7 +326,7 @@ RustboroCity_Movement_14C5F7:: @ 814C5F7 RustboroCity_EventScript_14C5FF:: @ 814C5FF lock faceplayer - checkflag 143 + checkflag FLAG_RECOVERED_DEVON_GOODS goto_if_eq RustboroCity_EventScript_14C614 msgbox RustboroCity_Text_166F6B, 4 release @@ -371,7 +371,7 @@ RustboroCity_EventScript_14C650:: @ 814C650 call_if 1, RustboroCity_EventScript_14C6E9 compare 0x4001, 3 call_if 1, RustboroCity_EventScript_14C715 - setflag 159 + setflag FLAG_UNKNOWN_9F setvar 0x405a, 3 moveobjectoffscreen 9 msgbox RustboroCity_Text_166EA5, 4 @@ -473,7 +473,7 @@ RustboroCity_EventScript_14C77D:: @ 814C77D call_if 1, RustboroCity_EventScript_14C7F5 msgbox RustboroCity_Text_16707F, 4 closemessage - setflag 144 + setflag FLAG_RETURNED_DEVON_GOODS setflag 732 setvar 0x405a, 5 delay 30 -- cgit v1.2.3 From 503bd8e491eefea7e26d6882674487f9a9765297 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 3 Dec 2017 13:20:55 -0800 Subject: Label script flags up to flag 288. --- data/scripts/maps/RustboroCity.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data/scripts/maps/RustboroCity.inc') diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 76134aa43..8708bde71 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -549,7 +549,7 @@ RustboroCity_EventScript_14C8B8:: @ 814C8B8 RustboroCity_EventScript_14C8DA:: @ 814C8DA lock faceplayer - checkflag 288 + checkflag FLAG_MET_RIVAL_RUSTBORO goto_if_eq RustboroCity_EventScript_14C917 checkplayergender compare RESULT, 0 @@ -559,13 +559,13 @@ RustboroCity_EventScript_14C8DA:: @ 814C8DA end RustboroCity_EventScript_14C8FD:: @ 814C8FD - setflag 288 + setflag FLAG_MET_RIVAL_RUSTBORO msgbox RustboroCity_Text_1670A7, 4 release end RustboroCity_EventScript_14C90A:: @ 814C90A - setflag 288 + setflag FLAG_MET_RIVAL_RUSTBORO msgbox RustboroCity_Text_167213, 4 release end -- cgit v1.2.3 From 8dd25bcad09064f0b3314a71a62ad22f91b42bb3 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 4 Dec 2017 20:48:25 -0800 Subject: Start using constants for hide-show flags --- data/scripts/maps/RustboroCity.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/scripts/maps/RustboroCity.inc') diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 8708bde71..358a946a6 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -178,7 +178,7 @@ RustboroCity_EventScript_14C4F4:: @ 814C4F4 waitmovement 0 removeobject 9 setobjectxyperm 9, 30, 10 - clearflag 732 + clearflag FLAG_HIDE_DEVON_RUSTBORO setflag FLAG_DEVON_GOODS_STOLEN setvar 0x405a, 2 setvar 0x409a, 2 @@ -474,7 +474,7 @@ RustboroCity_EventScript_14C77D:: @ 814C77D msgbox RustboroCity_Text_16707F, 4 closemessage setflag FLAG_RETURNED_DEVON_GOODS - setflag 732 + setflag FLAG_HIDE_DEVON_RUSTBORO setvar 0x405a, 5 delay 30 warp MAP_RUSTBORO_CITY_DEVON_CORP_3F, 255, 2, 2 -- cgit v1.2.3 From 65207e03662c639970ef19b372c21b8e28b6f097 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 9 Dec 2017 14:43:21 -0800 Subject: Label all flags up to 901 --- data/scripts/maps/RustboroCity.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'data/scripts/maps/RustboroCity.inc') diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 358a946a6..ffe133906 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -183,11 +183,11 @@ RustboroCity_EventScript_14C4F4:: @ 814C4F4 setvar 0x405a, 2 setvar 0x409a, 2 setvar 0x406f, 1 - clearflag 891 - clearflag 880 - clearflag 878 - setflag 739 - setflag 881 + clearflag FLAG_HIDE_BRINEY_ROUTE116 + clearflag FLAG_HIDE_PEEKO_RUSTURF_TUNNEL + clearflag FLAG_HIDE_GRUNT_RUSTURF_TUNNEL + setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE + setflag FLAG_HIDE_PEEKO_BRINEY_HOUSE releaseall 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/RustboroCity.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/scripts/maps/RustboroCity.inc') diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index ffe133906..7e3a0e191 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -36,7 +36,7 @@ RustboroCity_EventScript_14C3B1:: @ 814C3B1 RustboroCity_EventScript_14C3BA:: @ 814C3BA lock faceplayer - checkflag BADGE01_GET + checkflag FLAG_BADGE01_GET goto_if_eq RustboroCity_EventScript_14C3CF msgbox RustboroCity_Text_16696D, 4 release -- 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/RustboroCity.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/scripts/maps/RustboroCity.inc') diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 7e3a0e191..c45389b9f 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -468,7 +468,7 @@ RustboroCity_EventScript_14C77D:: @ 814C77D compare 0x4001, 4 call_if 1, RustboroCity_EventScript_14C8B8 msgbox RustboroCity_Text_166FB4, 4 - giveitem ITEM_GREAT_BALL + giveitem_std ITEM_GREAT_BALL compare RESULT, 0 call_if 1, RustboroCity_EventScript_14C7F5 msgbox RustboroCity_Text_16707F, 4 -- cgit v1.2.3 From 4b5ad9de049a63b101b2bf5f2f2cb92beb26e5fb Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Fri, 22 Dec 2017 12:36:12 -0600 Subject: Name and use temp var constants --- data/scripts/maps/RustboroCity.inc | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'data/scripts/maps/RustboroCity.inc') diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index c45389b9f..831cffaea 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -334,42 +334,42 @@ RustboroCity_EventScript_14C5FF:: @ 814C5FF RustboroCity_EventScript_14C614:: @ 814C614 waitse - setvar 0x4001, 4 + setvar VAR_TEMP_1, 4 goto RustboroCity_EventScript_14C77D end RustboroCity_EventScript_14C620:: @ 814C620 lockall - setvar 0x4001, 0 + setvar VAR_TEMP_1, 0 goto RustboroCity_EventScript_14C650 end RustboroCity_EventScript_14C62C:: @ 814C62C lockall - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 goto RustboroCity_EventScript_14C650 end RustboroCity_EventScript_14C638:: @ 814C638 lockall - setvar 0x4001, 2 + setvar VAR_TEMP_1, 2 goto RustboroCity_EventScript_14C650 end RustboroCity_EventScript_14C644:: @ 814C644 lockall - setvar 0x4001, 3 + setvar VAR_TEMP_1, 3 goto RustboroCity_EventScript_14C650 end RustboroCity_EventScript_14C650:: @ 814C650 - compare 0x4001, 0 + compare VAR_TEMP_1, 0 call_if 1, RustboroCity_EventScript_14C691 - compare 0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, RustboroCity_EventScript_14C6BD - compare 0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, RustboroCity_EventScript_14C6E9 - compare 0x4001, 3 + compare VAR_TEMP_1, 3 call_if 1, RustboroCity_EventScript_14C715 setflag FLAG_UNKNOWN_9F setvar 0x405a, 3 @@ -434,38 +434,38 @@ RustboroCity_Movement_14C74B:: @ 814C74B RustboroCity_EventScript_14C74D:: @ 814C74D lockall - setvar 0x4001, 0 + setvar VAR_TEMP_1, 0 goto RustboroCity_EventScript_14C77D end RustboroCity_EventScript_14C759:: @ 814C759 lockall - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 goto RustboroCity_EventScript_14C77D end RustboroCity_EventScript_14C765:: @ 814C765 lockall - setvar 0x4001, 2 + setvar VAR_TEMP_1, 2 goto RustboroCity_EventScript_14C77D end RustboroCity_EventScript_14C771:: @ 814C771 lockall - setvar 0x4001, 3 + setvar VAR_TEMP_1, 3 goto RustboroCity_EventScript_14C77D end RustboroCity_EventScript_14C77D:: @ 814C77D - compare 0x4001, 0 + compare VAR_TEMP_1, 0 call_if 1, RustboroCity_EventScript_14C7FE - compare 0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, RustboroCity_EventScript_14C82A - compare 0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, RustboroCity_EventScript_14C856 - compare 0x4001, 3 + compare VAR_TEMP_1, 3 call_if 1, RustboroCity_EventScript_14C882 - compare 0x4001, 4 + compare VAR_TEMP_1, 4 call_if 1, RustboroCity_EventScript_14C8B8 msgbox RustboroCity_Text_166FB4, 4 giveitem_std ITEM_GREAT_BALL -- cgit v1.2.3 From 51247c3eb9dc1f8ecf4298ada62ed7c2f768b50e Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 23 Dec 2017 10:41:27 -0600 Subject: Name and use general purpose vars --- data/scripts/maps/RustboroCity.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'data/scripts/maps/RustboroCity.inc') diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 831cffaea..efe390f8a 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -180,9 +180,9 @@ RustboroCity_EventScript_14C4F4:: @ 814C4F4 setobjectxyperm 9, 30, 10 clearflag FLAG_HIDE_DEVON_RUSTBORO setflag FLAG_DEVON_GOODS_STOLEN - setvar 0x405a, 2 - setvar 0x409a, 2 - setvar 0x406f, 1 + setvar VAR_RUSTBORO_STATE, 2 + setvar VAR_RUSTURF_TUNNEL_STATE, 2 + setvar VAR_ROUTE116_STATE, 1 clearflag FLAG_HIDE_BRINEY_ROUTE116 clearflag FLAG_HIDE_PEEKO_RUSTURF_TUNNEL clearflag FLAG_HIDE_GRUNT_RUSTURF_TUNNEL @@ -372,7 +372,7 @@ RustboroCity_EventScript_14C650:: @ 814C650 compare VAR_TEMP_1, 3 call_if 1, RustboroCity_EventScript_14C715 setflag FLAG_UNKNOWN_9F - setvar 0x405a, 3 + setvar VAR_RUSTBORO_STATE, 3 moveobjectoffscreen 9 msgbox RustboroCity_Text_166EA5, 4 releaseall @@ -475,7 +475,7 @@ RustboroCity_EventScript_14C77D:: @ 814C77D closemessage setflag FLAG_RETURNED_DEVON_GOODS setflag FLAG_HIDE_DEVON_RUSTBORO - setvar 0x405a, 5 + setvar VAR_RUSTBORO_STATE, 5 delay 30 warp MAP_RUSTBORO_CITY_DEVON_CORP_3F, 255, 2, 2 waitstate -- 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/maps/RustboroCity.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'data/scripts/maps/RustboroCity.inc') diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index efe390f8a..e4cef9fa4 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -126,7 +126,7 @@ RustboroCity_EventScript_14C481:: @ 814C481 lockall setobjectxyperm 9, 14, 21 setobjectmovementtype 9, 10 - setvar 0x8004, 0 + setvar SPECIALVAR_4, 0 goto RustboroCity_EventScript_14C4F4 end @@ -134,7 +134,7 @@ RustboroCity_EventScript_14C498:: @ 814C498 lockall setobjectxyperm 9, 14, 21 setobjectmovementtype 9, 10 - setvar 0x8004, 1 + setvar SPECIALVAR_4, 1 goto RustboroCity_EventScript_14C4F4 end @@ -142,7 +142,7 @@ RustboroCity_EventScript_14C4AF:: @ 814C4AF lockall setobjectxyperm 9, 14, 21 setobjectmovementtype 9, 10 - setvar 0x8004, 2 + setvar SPECIALVAR_4, 2 goto RustboroCity_EventScript_14C4F4 end @@ -150,7 +150,7 @@ RustboroCity_EventScript_14C4C6:: @ 814C4C6 lockall setobjectxyperm 9, 14, 21 setobjectmovementtype 9, 10 - setvar 0x8004, 3 + setvar SPECIALVAR_4, 3 goto RustboroCity_EventScript_14C4F4 end @@ -158,7 +158,7 @@ RustboroCity_EventScript_14C4DD:: @ 814C4DD lockall setobjectxyperm 9, 14, 21 setobjectmovementtype 9, 10 - setvar 0x8004, 4 + setvar SPECIALVAR_4, 4 goto RustboroCity_EventScript_14C4F4 end -- 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/maps/RustboroCity.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'data/scripts/maps/RustboroCity.inc') diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index e4cef9fa4..47d216d9f 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -126,7 +126,7 @@ RustboroCity_EventScript_14C481:: @ 814C481 lockall setobjectxyperm 9, 14, 21 setobjectmovementtype 9, 10 - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 goto RustboroCity_EventScript_14C4F4 end @@ -134,7 +134,7 @@ RustboroCity_EventScript_14C498:: @ 814C498 lockall setobjectxyperm 9, 14, 21 setobjectmovementtype 9, 10 - setvar SPECIALVAR_4, 1 + setvar VAR_SPECIAL_4, 1 goto RustboroCity_EventScript_14C4F4 end @@ -142,7 +142,7 @@ RustboroCity_EventScript_14C4AF:: @ 814C4AF lockall setobjectxyperm 9, 14, 21 setobjectmovementtype 9, 10 - setvar SPECIALVAR_4, 2 + setvar VAR_SPECIAL_4, 2 goto RustboroCity_EventScript_14C4F4 end @@ -150,7 +150,7 @@ RustboroCity_EventScript_14C4C6:: @ 814C4C6 lockall setobjectxyperm 9, 14, 21 setobjectmovementtype 9, 10 - setvar SPECIALVAR_4, 3 + setvar VAR_SPECIAL_4, 3 goto RustboroCity_EventScript_14C4F4 end @@ -158,7 +158,7 @@ RustboroCity_EventScript_14C4DD:: @ 814C4DD lockall setobjectxyperm 9, 14, 21 setobjectmovementtype 9, 10 - setvar SPECIALVAR_4, 4 + setvar VAR_SPECIAL_4, 4 goto RustboroCity_EventScript_14C4F4 end -- cgit v1.2.3 From 5c427e8afed44ed3720cf97d6748fa9e806c9b83 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 4 Jan 2018 14:37:52 -0800 Subject: Use song constants in scripts --- data/scripts/maps/RustboroCity.inc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'data/scripts/maps/RustboroCity.inc') diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 47d216d9f..c6bdbbdb7 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -381,7 +381,7 @@ RustboroCity_EventScript_14C650:: @ 814C650 RustboroCity_EventScript_14C691:: @ 814C691 applymovement 9, RustboroCity_Movement_1A0841 waitmovement 0 - playse 21 + playse SE_PIN applymovement 9, RustboroCity_Movement_1A0833 waitmovement 0 applymovement 9, RustboroCity_Movement_1A0835 @@ -393,7 +393,7 @@ RustboroCity_EventScript_14C691:: @ 814C691 RustboroCity_EventScript_14C6BD:: @ 814C6BD applymovement 9, RustboroCity_Movement_1A083F waitmovement 0 - playse 21 + playse SE_PIN applymovement 9, RustboroCity_Movement_1A0833 waitmovement 0 applymovement 9, RustboroCity_Movement_1A0835 @@ -405,7 +405,7 @@ RustboroCity_EventScript_14C6BD:: @ 814C6BD RustboroCity_EventScript_14C6E9:: @ 814C6E9 applymovement 9, RustboroCity_Movement_1A0845 waitmovement 0 - playse 21 + playse SE_PIN applymovement 9, RustboroCity_Movement_1A0833 waitmovement 0 applymovement 9, RustboroCity_Movement_1A0835 @@ -417,7 +417,7 @@ RustboroCity_EventScript_14C6E9:: @ 814C6E9 RustboroCity_EventScript_14C715:: @ 814C715 applymovement 9, RustboroCity_Movement_1A0845 waitmovement 0 - playse 21 + playse SE_PIN applymovement 9, RustboroCity_Movement_1A0833 waitmovement 0 applymovement 9, RustboroCity_Movement_1A0835 @@ -489,7 +489,7 @@ RustboroCity_EventScript_14C7F5:: @ 814C7F5 RustboroCity_EventScript_14C7FE:: @ 814C7FE applymovement 9, RustboroCity_Movement_1A0841 waitmovement 0 - playse 21 + playse SE_PIN applymovement 9, RustboroCity_Movement_1A0833 waitmovement 0 applymovement 9, RustboroCity_Movement_1A0835 @@ -501,7 +501,7 @@ RustboroCity_EventScript_14C7FE:: @ 814C7FE RustboroCity_EventScript_14C82A:: @ 814C82A applymovement 9, RustboroCity_Movement_1A0843 waitmovement 0 - playse 21 + playse SE_PIN applymovement 9, RustboroCity_Movement_1A0833 waitmovement 0 applymovement 9, RustboroCity_Movement_1A0835 @@ -513,7 +513,7 @@ RustboroCity_EventScript_14C82A:: @ 814C82A RustboroCity_EventScript_14C856:: @ 814C856 applymovement 9, RustboroCity_Movement_1A0845 waitmovement 0 - playse 21 + playse SE_PIN applymovement 9, RustboroCity_Movement_1A0833 waitmovement 0 applymovement 9, RustboroCity_Movement_1A0835 @@ -525,7 +525,7 @@ RustboroCity_EventScript_14C856:: @ 814C856 RustboroCity_EventScript_14C882:: @ 814C882 applymovement 9, RustboroCity_Movement_1A0845 waitmovement 0 - playse 21 + playse SE_PIN applymovement 9, RustboroCity_Movement_1A0833 waitmovement 0 applymovement 9, RustboroCity_Movement_1A0835 @@ -539,7 +539,7 @@ RustboroCity_EventScript_14C882:: @ 814C882 RustboroCity_EventScript_14C8B8:: @ 814C8B8 applymovement 9, RustboroCity_Movement_1A083F waitmovement 0 - playse 21 + playse SE_PIN applymovement 9, RustboroCity_Movement_1A0833 waitmovement 0 applymovement 9, RustboroCity_Movement_1A0835 -- 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/RustboroCity.inc | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-) (limited to 'data/scripts/maps/RustboroCity.inc') diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index c6bdbbdb7..415138d67 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -11,8 +11,7 @@ RustboroCity_MapScript1_14C378:: @ 814C378 RustboroCity_EventScript_14C386:: @ 814C386 lock faceplayer - checkflag FLAG_DEVON_GOODS_STOLEN - goto_if_eq RustboroCity_EventScript_14C39B + goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_EventScript_14C39B msgbox RustboroCity_Text_16689D, 4 release end @@ -36,8 +35,7 @@ RustboroCity_EventScript_14C3B1:: @ 814C3B1 RustboroCity_EventScript_14C3BA:: @ 814C3BA lock faceplayer - checkflag FLAG_BADGE01_GET - goto_if_eq RustboroCity_EventScript_14C3CF + goto_if_set FLAG_BADGE01_GET, RustboroCity_EventScript_14C3CF msgbox RustboroCity_Text_16696D, 4 release end @@ -50,8 +48,7 @@ RustboroCity_EventScript_14C3CF:: @ 814C3CF RustboroCity_EventScript_14C3D9:: @ 814C3D9 lock faceplayer - checkflag FLAG_RECEIVED_POKENAV - goto_if_eq RustboroCity_EventScript_14C3EE + goto_if_set FLAG_RECEIVED_POKENAV, RustboroCity_EventScript_14C3EE msgbox RustboroCity_Text_166B86, 4 release end @@ -326,8 +323,7 @@ RustboroCity_Movement_14C5F7:: @ 814C5F7 RustboroCity_EventScript_14C5FF:: @ 814C5FF lock faceplayer - checkflag FLAG_RECOVERED_DEVON_GOODS - goto_if_eq RustboroCity_EventScript_14C614 + goto_if_set FLAG_RECOVERED_DEVON_GOODS, RustboroCity_EventScript_14C614 msgbox RustboroCity_Text_166F6B, 4 release end @@ -364,13 +360,13 @@ RustboroCity_EventScript_14C644:: @ 814C644 RustboroCity_EventScript_14C650:: @ 814C650 compare VAR_TEMP_1, 0 - call_if 1, RustboroCity_EventScript_14C691 + call_if_eq RustboroCity_EventScript_14C691 compare VAR_TEMP_1, 1 - call_if 1, RustboroCity_EventScript_14C6BD + call_if_eq RustboroCity_EventScript_14C6BD compare VAR_TEMP_1, 2 - call_if 1, RustboroCity_EventScript_14C6E9 + call_if_eq RustboroCity_EventScript_14C6E9 compare VAR_TEMP_1, 3 - call_if 1, RustboroCity_EventScript_14C715 + call_if_eq RustboroCity_EventScript_14C715 setflag FLAG_UNKNOWN_9F setvar VAR_RUSTBORO_STATE, 3 moveobjectoffscreen 9 @@ -458,19 +454,19 @@ RustboroCity_EventScript_14C771:: @ 814C771 RustboroCity_EventScript_14C77D:: @ 814C77D compare VAR_TEMP_1, 0 - call_if 1, RustboroCity_EventScript_14C7FE + call_if_eq RustboroCity_EventScript_14C7FE compare VAR_TEMP_1, 1 - call_if 1, RustboroCity_EventScript_14C82A + call_if_eq RustboroCity_EventScript_14C82A compare VAR_TEMP_1, 2 - call_if 1, RustboroCity_EventScript_14C856 + call_if_eq RustboroCity_EventScript_14C856 compare VAR_TEMP_1, 3 - call_if 1, RustboroCity_EventScript_14C882 + call_if_eq RustboroCity_EventScript_14C882 compare VAR_TEMP_1, 4 - call_if 1, RustboroCity_EventScript_14C8B8 + call_if_eq RustboroCity_EventScript_14C8B8 msgbox RustboroCity_Text_166FB4, 4 giveitem_std ITEM_GREAT_BALL compare RESULT, 0 - call_if 1, RustboroCity_EventScript_14C7F5 + call_if_eq RustboroCity_EventScript_14C7F5 msgbox RustboroCity_Text_16707F, 4 closemessage setflag FLAG_RETURNED_DEVON_GOODS @@ -549,8 +545,7 @@ RustboroCity_EventScript_14C8B8:: @ 814C8B8 RustboroCity_EventScript_14C8DA:: @ 814C8DA lock faceplayer - checkflag FLAG_MET_RIVAL_RUSTBORO - goto_if_eq RustboroCity_EventScript_14C917 + goto_if_set FLAG_MET_RIVAL_RUSTBORO, RustboroCity_EventScript_14C917 checkplayergender compare RESULT, 0 goto_if_eq RustboroCity_EventScript_14C8FD -- cgit v1.2.3