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/GoldenrodDeptStoreB1F.asm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'maps/GoldenrodDeptStoreB1F.asm') diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm index da3dd0765..f2e88b6a1 100644 --- a/maps/GoldenrodDeptStoreB1F.asm +++ b/maps/GoldenrodDeptStoreB1F.asm @@ -23,7 +23,7 @@ UnknownScript_0x7d781: jump UnknownScript_0x7d791 UnknownScript_0x7d78a: - changeblock $10, $4, $d + changeblock 16, 4, $d jump UnknownScript_0x7d791 UnknownScript_0x7d791: @@ -31,15 +31,15 @@ UnknownScript_0x7d791: iftrue .Layout2 checkevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_3 iftrue .Layout3 - changeblock $a, $8, $d + changeblock 10, 8, $d return .Layout2: - changeblock $4, $a, $d + changeblock 4, 10, $d return .Layout3: - changeblock $a, $c, $d + changeblock 10, 12, $d return UnknownScript_0x7d7ac: -- 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/GoldenrodDeptStoreB1F.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'maps/GoldenrodDeptStoreB1F.asm') diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm index f2e88b6a1..035bc1107 100644 --- a/maps/GoldenrodDeptStoreB1F.asm +++ b/maps/GoldenrodDeptStoreB1F.asm @@ -14,8 +14,8 @@ GoldenrodDeptStoreB1F_MapScriptHeader: .MapCallbacks: db 2 - dbw MAPCALLBACK_TILES, UnknownScript_0x7d781 - dbw MAPCALLBACK_NEWMAP, UnknownScript_0x7d7ac + callback MAPCALLBACK_TILES, UnknownScript_0x7d781 + callback MAPCALLBACK_NEWMAP, UnknownScript_0x7d7ac UnknownScript_0x7d781: checkevent EVENT_RECEIVED_CARD_KEY -- cgit v1.2.3 From eb3102200f66e3aa1688e4e52429fcac4b0272fa Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sun, 14 Jan 2018 19:26:55 -0500 Subject: More Battle Tower map script constants, fewer raw hex values --- maps/GoldenrodDeptStoreB1F.asm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'maps/GoldenrodDeptStoreB1F.asm') diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm index 035bc1107..7922e4185 100644 --- a/maps/GoldenrodDeptStoreB1F.asm +++ b/maps/GoldenrodDeptStoreB1F.asm @@ -23,7 +23,7 @@ UnknownScript_0x7d781: jump UnknownScript_0x7d791 UnknownScript_0x7d78a: - changeblock 16, 4, $d + changeblock 16, 4, $0d jump UnknownScript_0x7d791 UnknownScript_0x7d791: @@ -31,15 +31,15 @@ UnknownScript_0x7d791: iftrue .Layout2 checkevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_3 iftrue .Layout3 - changeblock 10, 8, $d + changeblock 10, 8, $0d return .Layout2: - changeblock 4, 10, $d + changeblock 4, 10, $0d return .Layout3: - changeblock 10, 12, $d + changeblock 10, 12, $0d return UnknownScript_0x7d7ac: -- 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/GoldenrodDeptStoreB1F.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'maps/GoldenrodDeptStoreB1F.asm') diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm index 7922e4185..7d39dd8a9 100644 --- a/maps/GoldenrodDeptStoreB1F.asm +++ b/maps/GoldenrodDeptStoreB1F.asm @@ -8,7 +8,7 @@ const_value set 2 const GOLDENRODDEPTSTOREB1F_BLACK_BELT3 const GOLDENRODDEPTSTOREB1F_MACHOP -GoldenrodDeptStoreB1F_MapScriptHeader: +GoldenrodDeptStoreB1F_MapScripts: .SceneScripts: db 0 @@ -109,7 +109,7 @@ UnknownText_0x7d8bb: text "MACHOKE: Maaacho!" done -GoldenrodDeptStoreB1F_MapEventHeader: +GoldenrodDeptStoreB1F_MapEvents: ; filler db 0, 0 -- cgit v1.2.3 From c70e8eec499ce70ffff03b38ae6ea987d99608e7 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Wed, 17 Jan 2018 13:23:43 -0500 Subject: Comment on changeblock ids --- maps/GoldenrodDeptStoreB1F.asm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'maps/GoldenrodDeptStoreB1F.asm') diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm index 7d39dd8a9..4d0603d0f 100644 --- a/maps/GoldenrodDeptStoreB1F.asm +++ b/maps/GoldenrodDeptStoreB1F.asm @@ -23,7 +23,7 @@ UnknownScript_0x7d781: jump UnknownScript_0x7d791 UnknownScript_0x7d78a: - changeblock 16, 4, $0d + changeblock 16, 4, $0d ; floor jump UnknownScript_0x7d791 UnknownScript_0x7d791: @@ -31,15 +31,15 @@ UnknownScript_0x7d791: iftrue .Layout2 checkevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_3 iftrue .Layout3 - changeblock 10, 8, $0d + changeblock 10, 8, $0d ; floor return .Layout2: - changeblock 4, 10, $0d + changeblock 4, 10, $0d ; floor return .Layout3: - changeblock 10, 12, $0d + changeblock 10, 12, $0d ; floor return UnknownScript_0x7d7ac: -- cgit v1.2.3