summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Bishop <kanzure@gmail.com>2012-01-03 10:36:26 -0600
committerBryan Bishop <kanzure@gmail.com>2012-01-03 10:36:26 -0600
commitb843c719dc133d13192c2e9c42a00424a5877e60 (patch)
tree891fdceec63c2710dafa397d734216389acc665c
parentc33ed9378e8bdb9ce3d704b43a3b1f97503c58ed (diff)
CeladonMart6_h map header asm
hg-commit-id: 87429aa4cce0
-rw-r--r--pokered.asm16
1 files changed, 13 insertions, 3 deletions
diff --git a/pokered.asm b/pokered.asm
index faa06015..0be88ed2 100644
--- a/pokered.asm
+++ b/pokered.asm
@@ -242,7 +242,7 @@ MapHeaderPointers: ; $01AE
dw CeladonMart3_h
dw CeladonMart4_h
dw CeladonMart5_h
- dw $45f4
+ dw CeladonMart6_h
dw $4688
dw $472e
dw $4784
@@ -2267,7 +2267,7 @@ MapHeaderBanks: ; 423D
db BANK(CeladonMart3_h)
db BANK(CeladonMart4_h)
db BANK(CeladonMart5_h)
- db $12
+ db BANK(CeladonMart6_h)
db $12
db $12
db $12
@@ -13239,7 +13239,17 @@ CeladonMart5_h: ; 0x483c9 to 0x483d5 (12 bytes) (bank=12) (id=126)
dw $45a8 ; objects
-INCBIN "baserom.gbc",$483D5,$4C000-$483D5
+INCBIN "baserom.gbc",$483D5,$485F4-$483D5
+
+CeladonMart6_h: ; 0x485f4 to 0x48600 (12 bytes) (bank=12) (id=127)
+ db $12 ; tileset
+ db $02, $02 ; dimensions (y, x)
+ dw $4684, $465c, $4600 ; blocks, texts, scripts
+ db $00 ; connections
+
+ dw $466d ; objects
+
+INCBIN "baserom.gbc",$48600,$4C000-$48600
SECTION "bank13",DATA,BANK[$13]