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/Route104.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/scripts/maps/Route104.inc') diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index b617767bf..d829c6a93 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -9,7 +9,7 @@ Route104_MapScript2_14EE97:: @ 814EE97 Route104_EventScript_14EEA1:: @ 814EEA1 lockall - jump Route104_EventScript_14EFD5 + goto Route104_EventScript_14EFD5 end Route104_MapScript1_14EEA8:: @ 814EEA8 -- 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/Route104.inc | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'data/scripts/maps/Route104.inc') diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index d829c6a93..584ab47dd 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -18,9 +18,9 @@ Route104_MapScript1_14EEA8:: @ 814EEA8 Route104_EventScript_14EEAE:: @ 814EEAE checkflag 127 - jumpif 0, Route104_EventScript_14EEC4 + goto_if 0, Route104_EventScript_14EEC4 checkflag 2057 - jumpif 0, Route104_EventScript_14EEC4 + goto_if 0, Route104_EventScript_14EEC4 clearflag 906 return @@ -32,11 +32,11 @@ Route104_EventScript_14EEC8:: @ 814EEC8 lock faceplayer checkflag 246 - jumpeq Route104_EventScript_14EEFF + goto_if_eq Route104_EventScript_14EEFF msgbox Route104_Text_1C55B9, 4 giveitem ITEM_CHESTO_BERRY compare RESULT, 0 - jumpeq Route104_EventScript_1A029B + goto_if_eq Route104_EventScript_1A029B setflag 246 msgbox Route104_Text_1C5665, 4 release @@ -51,11 +51,11 @@ Route104_EventScript_14EF09:: @ 814EF09 lock faceplayer checkflag 279 - jumpeq Route104_EventScript_14EF38 + goto_if_eq Route104_EventScript_14EF38 msgbox Route104_Text_16DD91, 4 giveitem ITEM_WHITE_HERB compare RESULT, 0 - jumpeq Route104_EventScript_1A029B + goto_if_eq Route104_EventScript_1A029B setflag 279 release end @@ -105,11 +105,11 @@ Route104_EventScript_14EF93:: @ 814EF93 lock faceplayer checkflag 262 - jumpeq Route104_EventScript_14EFC2 + goto_if_eq Route104_EventScript_14EFC2 msgbox Route104_Text_16DC5F, 4 giveitem ITEM_TM09 compare RESULT, 0 - jumpeq Route104_EventScript_1A029B + goto_if_eq Route104_EventScript_1A029B setflag 262 release end @@ -159,9 +159,9 @@ Route104_EventScript_14EFD5:: @ 814EFD5 moveoffscreen 2 setvar 0x408e, 0 checkflag 189 - jumpif 0, Route104_EventScript_14F08B + goto_if 0, Route104_EventScript_14F08B checkflag 189 - jumpeq Route104_EventScript_14F095 + goto_if_eq Route104_EventScript_14F095 end Route104_EventScript_14F08B:: @ 814F08B @@ -411,7 +411,7 @@ Route104_EventScript_14F1A0:: @ 814F1A0 trainerbattle 0, OPPONENT_HALEY_1, 0, Route104_Text_1B8770, Route104_Text_1B87A7 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route104_EventScript_14F1C7 + goto_if_eq Route104_EventScript_14F1C7 msgbox Route104_Text_1B87C3, 6 end @@ -424,7 +424,7 @@ Route104_EventScript_14F1DE:: @ 814F1DE trainerbattle 0, OPPONENT_WINSTON_1, 0, Route104_Text_1B88D4, Route104_Text_1B8911 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route104_EventScript_14F205 + goto_if_eq Route104_EventScript_14F205 msgbox Route104_Text_1B8925, 6 end @@ -437,7 +437,7 @@ Route104_EventScript_14F21C:: @ 814F21C trainerbattle 0, OPPONENT_CINDY_1, 0, Route104_Text_1B8A24, Route104_Text_1B8A61 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route104_EventScript_14F243 + goto_if_eq Route104_EventScript_14F243 msgbox Route104_Text_1B8A69, 6 end -- cgit v1.2.3 From 1e2601a0287fdacfb8f0d680fbe82a274414ea65 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 24 Sep 2017 17:10:51 -0500 Subject: more script command renaming --- data/scripts/maps/Route104.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'data/scripts/maps/Route104.inc') diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index 584ab47dd..8ab1999e6 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -35,7 +35,7 @@ Route104_EventScript_14EEC8:: @ 814EEC8 goto_if_eq Route104_EventScript_14EEFF msgbox Route104_Text_1C55B9, 4 giveitem ITEM_CHESTO_BERRY - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route104_EventScript_1A029B setflag 246 msgbox Route104_Text_1C5665, 4 @@ -54,7 +54,7 @@ Route104_EventScript_14EF09:: @ 814EF09 goto_if_eq Route104_EventScript_14EF38 msgbox Route104_Text_16DD91, 4 giveitem ITEM_WHITE_HERB - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route104_EventScript_1A029B setflag 279 release @@ -108,7 +108,7 @@ Route104_EventScript_14EF93:: @ 814EF93 goto_if_eq Route104_EventScript_14EFC2 msgbox Route104_Text_16DC5F, 4 giveitem ITEM_TM09 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route104_EventScript_1A029B setflag 262 release @@ -410,7 +410,7 @@ Route104_EventScript_14F189:: @ 814F189 Route104_EventScript_14F1A0:: @ 814F1A0 trainerbattle 0, OPPONENT_HALEY_1, 0, Route104_Text_1B8770, Route104_Text_1B87A7 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route104_EventScript_14F1C7 msgbox Route104_Text_1B87C3, 6 end @@ -423,7 +423,7 @@ Route104_EventScript_14F1C7:: @ 814F1C7 Route104_EventScript_14F1DE:: @ 814F1DE trainerbattle 0, OPPONENT_WINSTON_1, 0, Route104_Text_1B88D4, Route104_Text_1B8911 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route104_EventScript_14F205 msgbox Route104_Text_1B8925, 6 end @@ -436,7 +436,7 @@ Route104_EventScript_14F205:: @ 814F205 Route104_EventScript_14F21C:: @ 814F21C trainerbattle 0, OPPONENT_CINDY_1, 0, Route104_Text_1B8A24, Route104_Text_1B8A61 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route104_EventScript_14F243 msgbox Route104_Text_1B8A69, 6 end -- cgit v1.2.3 From 207f8e6a76f6b13855780bb2608be9d8c1f14b15 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 24 Sep 2017 17:36:39 -0500 Subject: more script command renaming --- data/scripts/maps/Route104.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data/scripts/maps/Route104.inc') diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index 8ab1999e6..58a6704bf 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -409,7 +409,7 @@ Route104_EventScript_14F189:: @ 814F189 Route104_EventScript_14F1A0:: @ 814F1A0 trainerbattle 0, OPPONENT_HALEY_1, 0, Route104_Text_1B8770, Route104_Text_1B87A7 - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route104_EventScript_14F1C7 msgbox Route104_Text_1B87C3, 6 @@ -422,7 +422,7 @@ Route104_EventScript_14F1C7:: @ 814F1C7 Route104_EventScript_14F1DE:: @ 814F1DE trainerbattle 0, OPPONENT_WINSTON_1, 0, Route104_Text_1B88D4, Route104_Text_1B8911 - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route104_EventScript_14F205 msgbox Route104_Text_1B8925, 6 @@ -435,7 +435,7 @@ Route104_EventScript_14F205:: @ 814F205 Route104_EventScript_14F21C:: @ 814F21C trainerbattle 0, OPPONENT_CINDY_1, 0, Route104_Text_1B8A24, Route104_Text_1B8A61 - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route104_EventScript_14F243 msgbox Route104_Text_1B8A69, 6 -- 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/Route104.inc | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'data/scripts/maps/Route104.inc') diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index 58a6704bf..d9f65a382 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -126,28 +126,28 @@ Route104_EventScript_14EFCC:: @ 814EFCC Route104_EventScript_14EFD5:: @ 814EFD5 spritelevelup 8, 0, 19, 0 spritelevelup 255, 0, 19, 0 - move 8, Route104_Movement_14F16C - waitmove 0 + applymovement 8, Route104_Movement_14F16C + waitmovement 0 disappear 8 - move 255, Route104_Movement_14F162 - waitmove 0 + applymovement 255, Route104_Movement_14F162 + waitmovement 0 spriteinvisible 255, 0, 19 call Route104_EventScript_1A02E7 - move 7, Route104_Movement_14F09F - move 255, Route104_Movement_14F09F - waitmove 0 - move 255, Route104_Movement_14F166 - waitmove 0 + applymovement 7, Route104_Movement_14F09F + applymovement 255, Route104_Movement_14F09F + waitmovement 0 + applymovement 255, Route104_Movement_14F166 + waitmovement 0 call Route104_EventScript_1A02EF spritevisible 255, 0, 11 - move 255, Route104_Movement_14F168 - waitmove 0 + applymovement 255, Route104_Movement_14F168 + waitmovement 0 movespriteperm 2, 12, 8 reappear 2 spritelevelup 2, 0, 11, 0 clearflag 740 - move 2, Route104_Movement_14F16F - waitmove 0 + applymovement 2, Route104_Movement_14F16F + waitmovement 0 reappear 4 clearflag 743 call Route104_EventScript_1A02EF -- 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/Route104.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'data/scripts/maps/Route104.inc') diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index d9f65a382..c954ac972 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -35,7 +35,7 @@ Route104_EventScript_14EEC8:: @ 814EEC8 goto_if_eq Route104_EventScript_14EEFF msgbox Route104_Text_1C55B9, 4 giveitem ITEM_CHESTO_BERRY - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route104_EventScript_1A029B setflag 246 msgbox Route104_Text_1C5665, 4 @@ -54,7 +54,7 @@ Route104_EventScript_14EF09:: @ 814EF09 goto_if_eq Route104_EventScript_14EF38 msgbox Route104_Text_16DD91, 4 giveitem ITEM_WHITE_HERB - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route104_EventScript_1A029B setflag 279 release @@ -108,7 +108,7 @@ Route104_EventScript_14EF93:: @ 814EF93 goto_if_eq Route104_EventScript_14EFC2 msgbox Route104_Text_16DC5F, 4 giveitem ITEM_TM09 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route104_EventScript_1A029B setflag 262 release @@ -410,7 +410,7 @@ Route104_EventScript_14F189:: @ 814F189 Route104_EventScript_14F1A0:: @ 814F1A0 trainerbattle 0, OPPONENT_HALEY_1, 0, Route104_Text_1B8770, Route104_Text_1B87A7 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route104_EventScript_14F1C7 msgbox Route104_Text_1B87C3, 6 end @@ -423,7 +423,7 @@ Route104_EventScript_14F1C7:: @ 814F1C7 Route104_EventScript_14F1DE:: @ 814F1DE trainerbattle 0, OPPONENT_WINSTON_1, 0, Route104_Text_1B88D4, Route104_Text_1B8911 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route104_EventScript_14F205 msgbox Route104_Text_1B8925, 6 end @@ -436,7 +436,7 @@ Route104_EventScript_14F205:: @ 814F205 Route104_EventScript_14F21C:: @ 814F21C trainerbattle 0, OPPONENT_CINDY_1, 0, Route104_Text_1B8A24, Route104_Text_1B8A61 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route104_EventScript_14F243 msgbox Route104_Text_1B8A69, 6 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/Route104.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'data/scripts/maps/Route104.inc') diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index c954ac972..8abb7354a 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -128,10 +128,10 @@ Route104_EventScript_14EFD5:: @ 814EFD5 spritelevelup 255, 0, 19, 0 applymovement 8, Route104_Movement_14F16C waitmovement 0 - disappear 8 + removeobject 8 applymovement 255, Route104_Movement_14F162 waitmovement 0 - spriteinvisible 255, 0, 19 + hideobject 255, 0, 19 call Route104_EventScript_1A02E7 applymovement 7, Route104_Movement_14F09F applymovement 255, Route104_Movement_14F09F @@ -139,20 +139,20 @@ Route104_EventScript_14EFD5:: @ 814EFD5 applymovement 255, Route104_Movement_14F166 waitmovement 0 call Route104_EventScript_1A02EF - spritevisible 255, 0, 11 + showobject 255, 0, 11 applymovement 255, Route104_Movement_14F168 waitmovement 0 movespriteperm 2, 12, 8 - reappear 2 + addobject 2 spritelevelup 2, 0, 11, 0 clearflag 740 applymovement 2, Route104_Movement_14F16F waitmovement 0 - reappear 4 + addobject 4 clearflag 743 call Route104_EventScript_1A02EF setflag 742 - spriteinvisible 7, 0, 19 + hideobject 7, 0, 19 copyvar 0x4096, 0x8008 restorespritelevel 255, 0, 19 restorespritelevel 2, 0, 11 -- 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/Route104.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/scripts/maps/Route104.inc') diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index 8abb7354a..b1e3d94ac 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -142,7 +142,7 @@ Route104_EventScript_14EFD5:: @ 814EFD5 showobject 255, 0, 11 applymovement 255, Route104_Movement_14F168 waitmovement 0 - movespriteperm 2, 12, 8 + setobjectxyperm 2, 12, 8 addobject 2 spritelevelup 2, 0, 11, 0 clearflag 740 @@ -156,7 +156,7 @@ Route104_EventScript_14EFD5:: @ 814EFD5 copyvar 0x4096, 0x8008 restorespritelevel 255, 0, 19 restorespritelevel 2, 0, 11 - moveoffscreen 2 + moveobjectoffscreen 2 setvar 0x408e, 0 checkflag 189 goto_if 0, Route104_EventScript_14F08B -- cgit v1.2.3 From 6c9249af37b380ee5f5b00ed24013bfc46bf1bae Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 1 Oct 2017 12:32:19 -0500 Subject: fix more command names --- data/scripts/maps/Route104.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'data/scripts/maps/Route104.inc') diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index b1e3d94ac..651f2afb4 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -124,8 +124,8 @@ Route104_EventScript_14EFCC:: @ 814EFCC end Route104_EventScript_14EFD5:: @ 814EFD5 - spritelevelup 8, 0, 19, 0 - spritelevelup 255, 0, 19, 0 + setobjectpriority 8, 0, 19, 0 + setobjectpriority 255, 0, 19, 0 applymovement 8, Route104_Movement_14F16C waitmovement 0 removeobject 8 @@ -144,7 +144,7 @@ Route104_EventScript_14EFD5:: @ 814EFD5 waitmovement 0 setobjectxyperm 2, 12, 8 addobject 2 - spritelevelup 2, 0, 11, 0 + setobjectpriority 2, 0, 11, 0 clearflag 740 applymovement 2, Route104_Movement_14F16F waitmovement 0 @@ -154,8 +154,8 @@ Route104_EventScript_14EFD5:: @ 814EFD5 setflag 742 hideobject 7, 0, 19 copyvar 0x4096, 0x8008 - restorespritelevel 255, 0, 19 - restorespritelevel 2, 0, 11 + resetobjectpriority 255, 0, 19 + resetobjectpriority 2, 0, 11 moveobjectoffscreen 2 setvar 0x408e, 0 checkflag 189 -- 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/Route104.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/scripts/maps/Route104.inc') diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index 651f2afb4..6e151447e 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -19,7 +19,7 @@ Route104_MapScript1_14EEA8:: @ 814EEA8 Route104_EventScript_14EEAE:: @ 814EEAE checkflag 127 goto_if 0, Route104_EventScript_14EEC4 - checkflag 2057 + checkflag BADGE03_GET goto_if 0, Route104_EventScript_14EEC4 clearflag 906 return -- 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/Route104.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data/scripts/maps/Route104.inc') diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index 6e151447e..02cad5688 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -17,7 +17,7 @@ Route104_MapScript1_14EEA8:: @ 814EEA8 end Route104_EventScript_14EEAE:: @ 814EEAE - checkflag 127 + checkflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER goto_if 0, Route104_EventScript_14EEC4 checkflag BADGE03_GET goto_if 0, Route104_EventScript_14EEC4 @@ -158,9 +158,9 @@ Route104_EventScript_14EFD5:: @ 814EFD5 resetobjectpriority 2, 0, 11 moveobjectoffscreen 2 setvar 0x408e, 0 - checkflag 189 + checkflag FLAG_DELIVERED_STEVEN_LETTER goto_if 0, Route104_EventScript_14F08B - checkflag 189 + checkflag FLAG_DELIVERED_STEVEN_LETTER goto_if_eq Route104_EventScript_14F095 end -- cgit v1.2.3 From c9f38d22060841ac59e56c3f498427f53bc28569 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 3 Dec 2017 12:32:57 -0800 Subject: Label scripts flags up to flag 256. --- data/scripts/maps/Route104.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/scripts/maps/Route104.inc') diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index 02cad5688..b9c0deb63 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -31,13 +31,13 @@ Route104_EventScript_14EEC4:: @ 814EEC4 Route104_EventScript_14EEC8:: @ 814EEC8 lock faceplayer - checkflag 246 + checkflag FLAG_RECEIVED_CHESTO_BERRY_ROUTE104 goto_if_eq Route104_EventScript_14EEFF msgbox Route104_Text_1C55B9, 4 giveitem ITEM_CHESTO_BERRY compare RESULT, 0 goto_if_eq Route104_EventScript_1A029B - setflag 246 + setflag FLAG_RECEIVED_CHESTO_BERRY_ROUTE104 msgbox Route104_Text_1C5665, 4 release end -- 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/Route104.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'data/scripts/maps/Route104.inc') diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index b9c0deb63..20044f020 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -50,13 +50,13 @@ Route104_EventScript_14EEFF:: @ 814EEFF Route104_EventScript_14EF09:: @ 814EF09 lock faceplayer - checkflag 279 + checkflag FLAG_RECEIVED_WHITE_HERB goto_if_eq Route104_EventScript_14EF38 msgbox Route104_Text_16DD91, 4 giveitem ITEM_WHITE_HERB compare RESULT, 0 goto_if_eq Route104_EventScript_1A029B - setflag 279 + setflag FLAG_RECEIVED_WHITE_HERB release end @@ -104,13 +104,13 @@ Route104_EventScript_14EF8A:: @ 814EF8A Route104_EventScript_14EF93:: @ 814EF93 lock faceplayer - checkflag 262 + checkflag FLAG_RECEIVED_TM09 goto_if_eq Route104_EventScript_14EFC2 msgbox Route104_Text_16DC5F, 4 giveitem ITEM_TM09 compare RESULT, 0 goto_if_eq Route104_EventScript_1A029B - setflag 262 + setflag FLAG_RECEIVED_TM09 release end -- 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/Route104.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data/scripts/maps/Route104.inc') diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index 20044f020..ac8a48353 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -145,13 +145,13 @@ Route104_EventScript_14EFD5:: @ 814EFD5 setobjectxyperm 2, 12, 8 addobject 2 setobjectpriority 2, 0, 11, 0 - clearflag 740 + clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN applymovement 2, Route104_Movement_14F16F waitmovement 0 addobject 4 - clearflag 743 + clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD call Route104_EventScript_1A02EF - setflag 742 + setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 hideobject 7, 0, 19 copyvar 0x4096, 0x8008 resetobjectpriority 255, 0, 19 -- cgit v1.2.3 From 58bf5392b36bc3a5c3559f218aff9f751dd90a64 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 10 Dec 2017 15:41:21 -0800 Subject: Label flags up to 973 --- data/scripts/maps/Route104.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/scripts/maps/Route104.inc') diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index ac8a48353..9595d00ab 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -21,11 +21,11 @@ Route104_EventScript_14EEAE:: @ 814EEAE goto_if 0, Route104_EventScript_14EEC4 checkflag BADGE03_GET goto_if 0, Route104_EventScript_14EEC4 - clearflag 906 + clearflag FLAG_HIDE_FLOWER_SHOP_WORKER_OUTSIDE return Route104_EventScript_14EEC4:: @ 814EEC4 - setflag 906 + setflag FLAG_HIDE_FLOWER_SHOP_WORKER_OUTSIDE return Route104_EventScript_14EEC8:: @ 814EEC8 -- 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/Route104.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/scripts/maps/Route104.inc') diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index 9595d00ab..92f5d5593 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -19,7 +19,7 @@ Route104_MapScript1_14EEA8:: @ 814EEA8 Route104_EventScript_14EEAE:: @ 814EEAE checkflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER goto_if 0, Route104_EventScript_14EEC4 - checkflag BADGE03_GET + checkflag FLAG_BADGE03_GET goto_if 0, Route104_EventScript_14EEC4 clearflag FLAG_HIDE_FLOWER_SHOP_WORKER_OUTSIDE return -- 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/Route104.inc | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'data/scripts/maps/Route104.inc') diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index 92f5d5593..a04dcd86d 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -34,7 +34,7 @@ Route104_EventScript_14EEC8:: @ 814EEC8 checkflag FLAG_RECEIVED_CHESTO_BERRY_ROUTE104 goto_if_eq Route104_EventScript_14EEFF msgbox Route104_Text_1C55B9, 4 - giveitem ITEM_CHESTO_BERRY + giveitem_std ITEM_CHESTO_BERRY compare RESULT, 0 goto_if_eq Route104_EventScript_1A029B setflag FLAG_RECEIVED_CHESTO_BERRY_ROUTE104 @@ -53,7 +53,7 @@ Route104_EventScript_14EF09:: @ 814EF09 checkflag FLAG_RECEIVED_WHITE_HERB goto_if_eq Route104_EventScript_14EF38 msgbox Route104_Text_16DD91, 4 - giveitem ITEM_WHITE_HERB + giveitem_std ITEM_WHITE_HERB compare RESULT, 0 goto_if_eq Route104_EventScript_1A029B setflag FLAG_RECEIVED_WHITE_HERB @@ -107,7 +107,7 @@ Route104_EventScript_14EF93:: @ 814EF93 checkflag FLAG_RECEIVED_TM09 goto_if_eq Route104_EventScript_14EFC2 msgbox Route104_Text_16DC5F, 4 - giveitem ITEM_TM09 + giveitem_std ITEM_TM09 compare RESULT, 0 goto_if_eq Route104_EventScript_1A029B setflag FLAG_RECEIVED_TM09 @@ -124,14 +124,14 @@ Route104_EventScript_14EFCC:: @ 814EFCC end Route104_EventScript_14EFD5:: @ 814EFD5 - setobjectpriority 8, 0, 19, 0 - setobjectpriority 255, 0, 19, 0 + setobjectpriority 8, MAP_ROUTE104, 0 + setobjectpriority 255, MAP_ROUTE104, 0 applymovement 8, Route104_Movement_14F16C waitmovement 0 removeobject 8 applymovement 255, Route104_Movement_14F162 waitmovement 0 - hideobject 255, 0, 19 + hideobjectat 255, MAP_ROUTE104 call Route104_EventScript_1A02E7 applymovement 7, Route104_Movement_14F09F applymovement 255, Route104_Movement_14F09F @@ -139,12 +139,12 @@ Route104_EventScript_14EFD5:: @ 814EFD5 applymovement 255, Route104_Movement_14F166 waitmovement 0 call Route104_EventScript_1A02EF - showobject 255, 0, 11 + showobjectat 255, MAP_DEWFORD_TOWN applymovement 255, Route104_Movement_14F168 waitmovement 0 setobjectxyperm 2, 12, 8 addobject 2 - setobjectpriority 2, 0, 11, 0 + setobjectpriority 2, MAP_DEWFORD_TOWN, 0 clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN applymovement 2, Route104_Movement_14F16F waitmovement 0 @@ -152,10 +152,10 @@ Route104_EventScript_14EFD5:: @ 814EFD5 clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD call Route104_EventScript_1A02EF setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 - hideobject 7, 0, 19 + hideobjectat 7, MAP_ROUTE104 copyvar 0x4096, 0x8008 - resetobjectpriority 255, 0, 19 - resetobjectpriority 2, 0, 11 + resetobjectpriority 255, MAP_ROUTE104 + resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 setvar 0x408e, 0 checkflag FLAG_DELIVERED_STEVEN_LETTER -- 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/Route104.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data/scripts/maps/Route104.inc') diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index a04dcd86d..1bf579d77 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -4,7 +4,7 @@ Route104_MapScripts:: @ 814EE8C .byte 0 Route104_MapScript2_14EE97:: @ 814EE97 - map_script_2 0x408e, 1, Route104_EventScript_14EEA1 + map_script_2 VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 1, Route104_EventScript_14EEA1 .2byte 0 Route104_EventScript_14EEA1:: @ 814EEA1 @@ -153,11 +153,11 @@ Route104_EventScript_14EFD5:: @ 814EFD5 call Route104_EventScript_1A02EF setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 hideobjectat 7, MAP_ROUTE104 - copyvar 0x4096, 0x8008 + copyvar VAR_BRINEY_LOCATION, 0x8008 resetobjectpriority 255, MAP_ROUTE104 resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 - setvar 0x408e, 0 + setvar VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 0 checkflag FLAG_DELIVERED_STEVEN_LETTER goto_if 0, Route104_EventScript_14F08B checkflag FLAG_DELIVERED_STEVEN_LETTER -- 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/Route104.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/scripts/maps/Route104.inc') diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index 1bf579d77..4d3f03cd1 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -153,7 +153,7 @@ Route104_EventScript_14EFD5:: @ 814EFD5 call Route104_EventScript_1A02EF setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 hideobjectat 7, MAP_ROUTE104 - copyvar VAR_BRINEY_LOCATION, 0x8008 + copyvar VAR_BRINEY_LOCATION, SPECIALVAR_8 resetobjectpriority 255, MAP_ROUTE104 resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 -- 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/Route104.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/scripts/maps/Route104.inc') diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index 4d3f03cd1..b97d92c7d 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -153,7 +153,7 @@ Route104_EventScript_14EFD5:: @ 814EFD5 call Route104_EventScript_1A02EF setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 hideobjectat 7, MAP_ROUTE104 - copyvar VAR_BRINEY_LOCATION, SPECIALVAR_8 + copyvar VAR_BRINEY_LOCATION, VAR_SPECIAL_8 resetobjectpriority 255, MAP_ROUTE104 resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 -- cgit v1.2.3 From 7f0ba304065a80d68b8610c4c8801839221677f6 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 31 Dec 2017 16:59:55 -0600 Subject: Port battle_setup names from pokeemerald --- data/scripts/maps/Route104.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data/scripts/maps/Route104.inc') diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index b97d92c7d..c90a97531 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -409,7 +409,7 @@ Route104_EventScript_14F189:: @ 814F189 Route104_EventScript_14F1A0:: @ 814F1A0 trainerbattle 0, OPPONENT_HALEY_1, 0, Route104_Text_1B8770, Route104_Text_1B87A7 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route104_EventScript_14F1C7 msgbox Route104_Text_1B87C3, 6 @@ -422,7 +422,7 @@ Route104_EventScript_14F1C7:: @ 814F1C7 Route104_EventScript_14F1DE:: @ 814F1DE trainerbattle 0, OPPONENT_WINSTON_1, 0, Route104_Text_1B88D4, Route104_Text_1B8911 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route104_EventScript_14F205 msgbox Route104_Text_1B8925, 6 @@ -435,7 +435,7 @@ Route104_EventScript_14F205:: @ 814F205 Route104_EventScript_14F21C:: @ 814F21C trainerbattle 0, OPPONENT_CINDY_1, 0, Route104_Text_1B8A24, Route104_Text_1B8A61 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route104_EventScript_14F243 msgbox Route104_Text_1B8A69, 6 -- cgit v1.2.3 From aed64560bc222e4ea5ccec266c0d77859a05eaac Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Fri, 5 Jan 2018 11:36:47 -0800 Subject: Add friendly macros for goto_if and call_if variants --- data/scripts/maps/Route104.inc | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) (limited to 'data/scripts/maps/Route104.inc') diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index c90a97531..a3824efcf 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -17,10 +17,8 @@ Route104_MapScript1_14EEA8:: @ 814EEA8 end Route104_EventScript_14EEAE:: @ 814EEAE - checkflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER - goto_if 0, Route104_EventScript_14EEC4 - checkflag FLAG_BADGE03_GET - goto_if 0, Route104_EventScript_14EEC4 + goto_if_unset FLAG_MET_PRETTY_PETAL_SHOP_OWNER, Route104_EventScript_14EEC4 + goto_if_unset FLAG_BADGE03_GET, Route104_EventScript_14EEC4 clearflag FLAG_HIDE_FLOWER_SHOP_WORKER_OUTSIDE return @@ -31,8 +29,7 @@ Route104_EventScript_14EEC4:: @ 814EEC4 Route104_EventScript_14EEC8:: @ 814EEC8 lock faceplayer - checkflag FLAG_RECEIVED_CHESTO_BERRY_ROUTE104 - goto_if_eq Route104_EventScript_14EEFF + goto_if_set FLAG_RECEIVED_CHESTO_BERRY_ROUTE104, Route104_EventScript_14EEFF msgbox Route104_Text_1C55B9, 4 giveitem_std ITEM_CHESTO_BERRY compare RESULT, 0 @@ -50,8 +47,7 @@ Route104_EventScript_14EEFF:: @ 814EEFF Route104_EventScript_14EF09:: @ 814EF09 lock faceplayer - checkflag FLAG_RECEIVED_WHITE_HERB - goto_if_eq Route104_EventScript_14EF38 + goto_if_set FLAG_RECEIVED_WHITE_HERB, Route104_EventScript_14EF38 msgbox Route104_Text_16DD91, 4 giveitem_std ITEM_WHITE_HERB compare RESULT, 0 @@ -104,8 +100,7 @@ Route104_EventScript_14EF8A:: @ 814EF8A Route104_EventScript_14EF93:: @ 814EF93 lock faceplayer - checkflag FLAG_RECEIVED_TM09 - goto_if_eq Route104_EventScript_14EFC2 + goto_if_set FLAG_RECEIVED_TM09, Route104_EventScript_14EFC2 msgbox Route104_Text_16DC5F, 4 giveitem_std ITEM_TM09 compare RESULT, 0 @@ -158,10 +153,8 @@ Route104_EventScript_14EFD5:: @ 814EFD5 resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 setvar VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 0 - checkflag FLAG_DELIVERED_STEVEN_LETTER - goto_if 0, Route104_EventScript_14F08B - checkflag FLAG_DELIVERED_STEVEN_LETTER - goto_if_eq Route104_EventScript_14F095 + goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_14F08B + goto_if_set FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_14F095 end Route104_EventScript_14F08B:: @ 814F08B -- cgit v1.2.3