diff --git a/constants.asm b/constants.asm
index 0df4de29e..c60d4a044 100644
--- a/constants.asm
+++ b/constants.asm
@@ -3287,8 +3287,6 @@ MOVE_ACC EQU 4
 MOVE_PP EQU 5
 MOVE_CHANCE EQU 6
 
-; base stats
-BASE_STATS_LENGTH EQU 32
 
 ; stat constants
 NUM_STATS EQU 6
diff --git a/main.asm b/main.asm
index 52e51f2bd..b90e0e6e0 100644
--- a/main.asm
+++ b/main.asm
@@ -1945,17 +1945,17 @@ GetBaseStats: ; 3856
 	rst $10
 	
 ; Egg doesn't have base stats
-	ld a, [CurBattleSpecies]
+	ld a, [CurSpecies]
 	cp EGG
 	jr z, .egg
 
 ; Get base stats
 	dec a
-	ld bc, BASE_STATS_LENGTH
+	ld bc, BaseStatsStructEnd - BaseStats
 	ld hl, BaseStats
 	call AddNTimes
 	ld de, CurBaseStats
-	ld bc, BASE_STATS_LENGTH
+	ld bc, BaseStatsStructEnd - BaseStats
 	call CopyBytes
 	jr .end
 	
@@ -1981,7 +1981,7 @@ GetBaseStats: ; 3856
 	
 .end
 ; Replace Pokedex # with species
-	ld a, [CurBattleSpecies]
+	ld a, [CurSpecies]
 	ld [CurBaseStats], a
 	
 ; Restore bank
@@ -12646,7 +12646,7 @@ LoadEnemyMon: ; 3e8eb
 ; Make sure everything knows what species we're working with
 	ld a, [TempEnemyMonSpecies]
 	ld [EnemyMonSpecies], a
-	ld [CurBattleSpecies], a
+	ld [CurSpecies], a
 	ld [CurPartySpecies], a
 	
 ; Grab the base stats for this species
@@ -18589,6 +18589,7 @@ BulbasaurBaseStats: ; 0x51424
 	db %01000101
 	db %00000000
 	; end
+BaseStatsStructEnd:
 
 IvysaurBaseStats: ; 0x51444
 	db IVYSAUR ; 002
diff --git a/wram.asm b/wram.asm
index ffa0b6b6f..18abf545c 100644
--- a/wram.asm
+++ b/wram.asm
@@ -658,7 +658,7 @@ MonType: ; cf5f
 ; 4 wildmon
 	ds 1
 
-CurBattleSpecies: ; cf60
+CurSpecies: ; cf60
 	ds 1
 
 	ds 33