2 files changed, 11 insertions, 5 deletions
diff --git a/main.asm b/main.asm
index 7eb5810..5149c95 100755
--- a/main.asm
+++ b/main.asm
@@ -23262,13 +23262,13 @@ Func_1658f: ; 0x1658f
     ld hl, Func_f269
     call nz, BankSwitch
 .showNextMap
-    ld a, [$d4e1]
+    ld a, [wInitialMapSelectionIndex]
     inc a
     cp $7  ; number of maps to choose from at the start of play
     jr c, .gotMapId
     xor a  ; wrap around to 0
 .gotMapId
-    ld [$d4e1], a
+    ld [wInitialMapSelectionIndex], a
     ld c, a
     ld b, $0
     ld hl, RedStageInitialMaps
@@ -28891,13 +28891,13 @@ Func_1c839: ; 0x1c839
     ld hl, Func_f269
     call nz, BankSwitch
 .showNextMap
-    ld a, [$d4e1]
+    ld a, [wInitialMapSelectionIndex]
     inc a
     cp $7  ; number of maps to choose from at the start of play
     jr c, .gotMapId
     xor a  ; wrap around to 0
 .gotMapId
-    ld [$d4e1], a
+    ld [wInitialMapSelectionIndex], a
     ld c, a
     ld b, $0
     ld hl, BlueStageInitialMaps
diff --git a/wram.asm b/wram.asm
index a190c0d..07af332 100755
--- a/wram.asm
+++ b/wram.asm
@@ -74,7 +74,13 @@ wBallRotation:: ; 0xd4c4
 ; wBallSpin is added to this every frame
     ds 1
 
-    ds $2b
+    ds $1c
+
+wInitialMapSelectionIndex:: ; 0xd4e1
+; index to keep track of the spinning map selection at the start of a new game
+    ds 1
+
+    ds $e
 
 wLeftMapMoveCounter:: ; 0xd4f0
 ; Diglett or Poliwag counter that counts to three to trigger a Map Move