2 files changed, 9 insertions, 4 deletions
diff --git a/main.asm b/main.asm
index 31ae536..737a125 100755
--- a/main.asm
+++ b/main.asm
@@ -5542,8 +5542,8 @@ Func_1003f: ; 0x1003f
     add hl, bc
     ld a, [hl]  ; a contains mon id
     dec a
-    ld [$d579], a
-    ld a, [$d579]
+    ld [wCurrentMon], a
+    ld a, [wCurrentMon]
     ld c, a
     ld b, $0
     ld hl, EvolutionLineIds
@@ -5587,7 +5587,7 @@ Func_1003f: ; 0x1003f
     dec b
     jr nz, .asm_100c7
 .asm_100ce
-    ld a, [$d579]
+    ld a, [wCurrentMon]
     ld c, a
     ld b, $0
     sla c
diff --git a/wram.asm b/wram.asm
index 3e9febf..2ab7d70 100755
--- a/wram.asm
+++ b/wram.asm
@@ -19,9 +19,14 @@ wCurrentMap:: ; 0xd54a
 ; Current map during play. See map_constants.asm
     ds 1
 
-    ds $2f
+    ds $2e
     ; d54b might be the current mode (catchEm, evolution, map change, etc.)
 
+wCurrentMon:: ; 0xd579
+; Current mon id for CatchEm Mode. Might also be used for Evolution Mode.
+; It stores (mon id - 1), which is annoying.
+    ds 1
+
 wTimerSeconds:: ; 0xd57a
     ds 1
 wTimerMinutes:: ; 0xd57b