summaryrefslogtreecommitdiff
path: root/wram.asm
diff options
context:
space:
mode:
authorBryan Bishop <kanzure@gmail.com>2013-10-25 16:01:12 -0700
committerBryan Bishop <kanzure@gmail.com>2013-10-25 16:01:12 -0700
commit07612257ccf21e0b5a4be28d7b5d9b7d9917d613 (patch)
treeae88e3028cf13f549b2257383b9931d18298a9c0 /wram.asm
parent80329c54897a545b9b8b3e82b686b09f295bb67a (diff)
parent046192575eec6405472ed2a43c701c7e25645c66 (diff)
Merge pull request #213 from yenatch/merge-mrwint
Merge mrwint/master into kanzure/master
Diffstat (limited to 'wram.asm')
-rw-r--r--wram.asm28
1 files changed, 21 insertions, 7 deletions
diff --git a/wram.asm b/wram.asm
index 22096650c..3796969fb 100644
--- a/wram.asm
+++ b/wram.asm
@@ -1099,15 +1099,29 @@ SECTION "UsedSprites",WRAMX[$d154],BANK[1]
UsedSprites: ; d154
ds 32
-SECTION "map",WRAMX[$d1a3],BANK[1]
+SECTION "map",WRAMX[$d19d],BANK[1]
-MapEventBank: ; d1a3
+; both are in blocks (2x2 walkable tiles, 4x4 graphics tiles)
+MapHeader: ; d19d
+MapBorderBlock: ; d19d
+ ds 1
+MapHeight: ; d19e
+ ds 1
+MapWidth: ; d19f
+ ds 1
+MapBlockDataBank: ; d1a0
+ ds 1
+MapBlockDataPointer: ; d1a1
+ ds 2
+MapScriptHeaderBank: ; d1a3
+ ds 1
+MapScriptHeaderPointer: ; d1a4
+ ds 2
+MapEventHeaderPointer: ; d1a6
+ ds 2
+; bit set
+MapConnections: ; d1a8
ds 1
-
- ds 5
-
-MapConnections:
-
NorthMapConnection: ; d1a9
NorthConnectedMapGroup: ; d1a9
ds 1