summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2015-09-22 12:11:54 -0700
committerMarcus Huderle <huderlem@gmail.com>2015-09-22 12:11:54 -0700
commita4188b4ea36bdc4545e394219995ccb9e964fdbe (patch)
tree113e33b14daeee9e61bcaa224b0566747cac47c1
parent1cd5c259c2cd642e752a66b7cb93b4b263455589 (diff)
Label collision masks pointer in wram.
-rwxr-xr-xmain.asm4
-rwxr-xr-xwram.asm9
2 files changed, 10 insertions, 3 deletions
diff --git a/main.asm b/main.asm
index 46646e7..612bda3 100755
--- a/main.asm
+++ b/main.asm
@@ -4857,7 +4857,7 @@ Func_22b5: ; 0x22b5
ld [$2000], a
ld a, [hLoadedROMBank]
push af
- ld a, [$d7f1]
+ ld a, [wStageCollisionMasksBank]
ld [hLoadedROMBank], a
ld [$2000], a
ld a, [wSubTileBallXPos]
@@ -4903,7 +4903,7 @@ Func_22b5: ; 0x22b5
rl b
sla c
rl b
- ld hl, $d7ef
+ ld hl, wStageCollisionMasksPointer
ld a, [hli]
ld h, [hl]
ld l, a
diff --git a/wram.asm b/wram.asm
index b5e73a9..bd93c62 100755
--- a/wram.asm
+++ b/wram.asm
@@ -396,7 +396,14 @@ wStageCollisionMapBank:: ; 0xd7ee
; holds bank of current collision map (always $00, except when loading new attributes)
ds 1
- ds $a
+wStageCollisionMasksPointer:: ; 0xd7ef
+; Pointer to the current collision masks array
+ ds 2
+wStageCollisionMasksBank:: ; 0xd7f1
+; Holds bank of current collision masks array
+ ds 1
+
+ ds 7
wInGameMenuIndex:: ; 0xd7f9
ds 1