From 2f0973f3e0b54073a7fe542258ceb1314f4a0023 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 9 Jan 2018 18:45:25 -0500 Subject: Clean up some hex values in map scripts --- maps/Route43.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'maps/Route43.asm') diff --git a/maps/Route43.asm b/maps/Route43.asm index b76ebaead..79e367af9 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -19,11 +19,11 @@ Route43_MapScriptHeader: .CheckIfRockets: checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue .NoRockets - setmapscene ROUTE_43_GATE, $0 + setmapscene ROUTE_43_GATE, 0 return .NoRockets: - setmapscene ROUTE_43_GATE, $1 + setmapscene ROUTE_43_GATE, 1 return TrainerCamperSpencer: -- cgit v1.2.3 From d83aefb30af180eae03bbd65878e8de45166f3d0 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Fri, 12 Jan 2018 01:40:20 -0500 Subject: Use more constants in scripts --- maps/Route43.asm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'maps/Route43.asm') diff --git a/maps/Route43.asm b/maps/Route43.asm index 79e367af9..8b0c7b307 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -71,9 +71,9 @@ UnknownScript_0x19d0b8: scall UnknownScript_0x19d130 UnknownScript_0x19d0bb: askforphonenumber PHONE_POKEMANIAC_BRENT - if_equal $1, UnknownScript_0x19d140 - if_equal $2, UnknownScript_0x19d13c - trainertotext POKEMANIAC, BRENT1, $0 + if_equal PHONE_CONTACTS_FULL, UnknownScript_0x19d140 + if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x19d13c + trainertotext POKEMANIAC, BRENT1, MEM_BUFFER_0 scall UnknownScript_0x19d134 jump UnknownScript_0x19d138 @@ -202,9 +202,9 @@ UnknownScript_0x19d1aa: scall UnknownScript_0x19d23d UnknownScript_0x19d1ad: askforphonenumber PHONE_PICNICKER_TIFFANY - if_equal $1, UnknownScript_0x19d24d - if_equal $2, UnknownScript_0x19d249 - trainertotext PICNICKER, TIFFANY3, $0 + if_equal PHONE_CONTACTS_FULL, UnknownScript_0x19d24d + if_equal PHONE_CONTACT_REFUSED, UnknownScript_0x19d249 + trainertotext PICNICKER, TIFFANY3, MEM_BUFFER_0 scall UnknownScript_0x19d241 jump UnknownScript_0x19d245 -- cgit v1.2.3 From 5a3822fe863a7365735c1f5d1c007d98d7736f1b Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sat, 13 Jan 2018 00:47:38 -0500 Subject: Introduce callback, hiddenitem, conditional_event, and cmdqueue macros for map scripts --- maps/Route43.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'maps/Route43.asm') diff --git a/maps/Route43.asm b/maps/Route43.asm index 8b0c7b307..afad4a606 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -14,7 +14,7 @@ Route43_MapScriptHeader: .MapCallbacks: db 1 - dbw MAPCALLBACK_NEWMAP, .CheckIfRockets + callback MAPCALLBACK_NEWMAP, .CheckIfRockets .CheckIfRockets: checkevent EVENT_CLEARED_ROCKET_HIDEOUT -- cgit v1.2.3 From bf074f359886707d2ffb2e0b525b03dc7af0fe29 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 16 Jan 2018 22:57:19 -0500 Subject: =?UTF-8?q?map=5Fheader=20=E2=86=92=20map=5Fdef;=20map=5Fheader=5F?= =?UTF-8?q?2=20=E2=86=92=20map=5Fdata?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- maps/Route43.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'maps/Route43.asm') diff --git a/maps/Route43.asm b/maps/Route43.asm index afad4a606..890acfaf8 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -8,7 +8,7 @@ const_value set 2 const ROUTE43_FRUIT_TREE const ROUTE43_POKE_BALL -Route43_MapScriptHeader: +Route43_MapScripts: .SceneScripts: db 0 @@ -500,7 +500,7 @@ Route43TrainerTipsText: line "#MON's type." done -Route43_MapEventHeader: +Route43_MapEvents: ; filler db 0, 0 -- cgit v1.2.3