summaryrefslogtreecommitdiff
path: root/wram.asm
diff options
context:
space:
mode:
authorBryan Bishop <kanzure@gmail.com>2013-08-30 13:06:57 -0700
committerBryan Bishop <kanzure@gmail.com>2013-08-30 13:06:57 -0700
commit9152664ca51e2c870ed89ba3c81473847c1705db (patch)
tree243498feeaaa2a3726e8de489d4da0b8202ae95e /wram.asm
parent3e5b09b9416c0f734298e156bc4afb8db1d2140b (diff)
parentb86d0da040448f286aa65ff5b2bacb05fff200a8 (diff)
Merge pull request #177 from yenatch/split-main
split out a bunch of bank 0 from main.asm
Diffstat (limited to 'wram.asm')
-rw-r--r--wram.asm15
1 files changed, 10 insertions, 5 deletions
diff --git a/wram.asm b/wram.asm
index e93318db0..e4e0af723 100644
--- a/wram.asm
+++ b/wram.asm
@@ -13,9 +13,9 @@ VBGMap1:
SECTION "WRAMBank0",WRAM0[$c000]
-SECTION "stack",WRAM0[$c000]
- ds $100
-Stack: ; c100
+SECTION "stack",WRAM0[$c0ff]
+Stack: ; c0ff
+ ds -$100
SECTION "audio",WRAM0[$c100]
@@ -1642,8 +1642,8 @@ PlayerDirection: ; d4de
; $11 right
ds 1
+ ds 2
-SECTION "MapEngine",WRAMX[$d4e1],BANK[1]
PlayerAction: ; d4e1
; 1 standing
; 2 walking
@@ -1742,7 +1742,12 @@ NumBalls: ; d8d7
Balls: ; d8d8
ds 25
BallsEnd
-
+
+PCItems: ; d8f1
+ ds 101
+PCItemsEnd
+
+
SECTION "overworld",WRAMX[$d95b],BANK[1]
WhichRegisteredItem: ; d95b
REGISTERED_POCKET EQU %11000000