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