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/Route25.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'maps/Route25.asm') diff --git a/maps/Route25.asm b/maps/Route25.asm index ce37fe894..0d2f7a054 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -48,7 +48,7 @@ UnknownScript_0x19eea0: applymovement ROUTE25_MISTY, MovementData_0x19f000 disappear ROUTE25_MISTY clearevent EVENT_TRAINERS_IN_CERULEAN_GYM - setscene $0 + setscene 0 special RestartMapMusic end @@ -74,7 +74,7 @@ UnknownScript_0x19eee0: applymovement ROUTE25_MISTY, MovementData_0x19f000 disappear ROUTE25_MISTY clearevent EVENT_TRAINERS_IN_CERULEAN_GYM - setscene $0 + setscene 0 special RestartMapMusic end -- cgit v1.2.3 From 59c95abf836e139931a41d20cf95af2472763fab Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Fri, 12 Jan 2018 17:09:32 -0500 Subject: Trim whitespace --- maps/Route25.asm | 1 - 1 file changed, 1 deletion(-) (limited to 'maps/Route25.asm') diff --git a/maps/Route25.asm b/maps/Route25.asm index 0d2f7a054..00f52d1e9 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -193,7 +193,6 @@ Route25Protein: Route25HiddenPotion: dwb EVENT_ROUTE_25_HIDDEN_POTION, POTION - MovementData_0x19efe8: big_step DOWN step_end -- 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/Route25.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'maps/Route25.asm') diff --git a/maps/Route25.asm b/maps/Route25.asm index 00f52d1e9..15a2ded4e 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -191,7 +191,7 @@ Route25Protein: itemball PROTEIN Route25HiddenPotion: - dwb EVENT_ROUTE_25_HIDDEN_POTION, POTION + hiddenitem EVENT_ROUTE_25_HIDDEN_POTION, POTION MovementData_0x19efe8: big_step DOWN -- 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/Route25.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'maps/Route25.asm') diff --git a/maps/Route25.asm b/maps/Route25.asm index 15a2ded4e..616a8ff8f 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -11,7 +11,7 @@ const_value set 2 const ROUTE25_COOLTRAINER_M2 const ROUTE25_POKE_BALL -Route25_MapScriptHeader: +Route25_MapScripts: .SceneScripts: db 2 scene_script .DummyScene0 @@ -429,7 +429,7 @@ BillsHouseSignText: text "BILL'S HOUSE" done -Route25_MapEventHeader: +Route25_MapEvents: ; filler db 0, 0 -- cgit v1.2.3