3 files changed, 22 insertions, 22 deletions
diff --git a/engine/battle/4.asm b/engine/battle/4.asm
index 37ffaa05..97db1ba3 100755
--- a/engine/battle/4.asm
+++ b/engine/battle/4.asm
@@ -26,9 +26,9 @@ Func_128f6: ; 128f6 (4:68f6)
 asm_128fb: ; 128fb (4:68fb)
 	ld [wListMenuID], a
 	push hl
-	ld a, [wcf99]
+	ld a, [wLoadedMonHP]
 	ld b, a
-	ld a, [wcf9a]
+	ld a, [wLoadedMonHP + 1]
 	ld c, a
 	or b
 	jr nz, .asm_12913
@@ -39,9 +39,9 @@ asm_128fb: ; 128fb (4:68fb)
 	ld d, a
 	jp DrawHPBarAndFraction
 .asm_12913
-	ld a, [wcfba]
+	ld a, [wLoadedMonMaxHP]
 	ld d, a
-	ld a, [wcfbb]
+	ld a, [wLoadedMonMaxHP + 1]
 	ld e, a
 	predef HPBarLength
 	ld a, $6
@@ -64,12 +64,12 @@ DrawHPBarAndFraction: ; 12924 (4:6924)
 	ld bc, SCREEN_WIDTH + 1 ; below bar
 .printHPFraction
 	add hl, bc
-	ld de, wcf99
+	ld de, wLoadedMonHP
 	ld bc, $203
 	call PrintNumber
 	ld a, "/"
 	ld [hli], a
-	ld de, wcfba
+	ld de, wLoadedMonMaxHP
 	ld bc, $203
 	call PrintNumber
 	pop hl
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index 6ea2c55b..a502ed7c 100755
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -1899,23 +1899,23 @@ DrawPlayerHUDAndHPBar: ; 3cd60 (f:4d60)
 	call CenterMonName
 	call PlaceString
 	ld hl, wBattleMonSpecies
-	ld de, wcf98
+	ld de, wLoadedMon
 	ld bc, $c
 	call CopyData
 	ld hl, wBattleMonLevel
-	ld de, wcfb9
+	ld de, wLoadedMonLevel
 	ld bc, $b
 	call CopyData
 	hlCoord 14, 8
 	push hl
 	inc hl
-	ld de, wcf9c
+	ld de, wLoadedMonStatus
 	call PrintStatusConditionNotFainted
 	pop hl
 	jr nz, .asm_3cdae
 	call PrintLevel
 .asm_3cdae
-	ld a, [wcf98]
+	ld a, [wLoadedMonSpecies]
 	ld [wcf91], a
 	hlCoord 10, 9
 	predef DrawHP
@@ -1965,7 +1965,7 @@ DrawEnemyHUDAndHPBar: ; 3cdec (f:4dec)
 	pop hl
 	jr nz, .skipPrintLevel ; if the mon has a status condition, skip printing the level
 	ld a, [wEnemyMonLevel]
-	ld [wcfb9], a
+	ld [wLoadedMonLevel], a
 	call PrintLevel
 .skipPrintLevel
 	ld hl, wEnemyMonHP
@@ -2270,9 +2270,9 @@ BagWasSelected:
 	jr nz, DisplayPlayerBag ; no, it is a normal battle
 	ld hl, OldManItemList
 	ld a, l
-	ld [wcf8b], a
+	ld [wList], a
 	ld a, h
-	ld [wcf8c], a
+	ld [wList + 1], a
 	jr DisplayBagMenu
 
 OldManItemList:
@@ -2284,9 +2284,9 @@ DisplayPlayerBag:
 	; get the pointer to player's bag when in a normal battle
 	ld hl, wNumBagItems
 	ld a, l
-	ld [wcf8b], a
+	ld [wList], a
 	ld a, h
-	ld [wcf8c], a
+	ld [wList + 1], a
 
 DisplayBagMenu:
 	xor a
@@ -4451,7 +4451,7 @@ GetEnemyMonStat: ; 3df1c (f:5f1c)
 	ld [wd0b5], a
 	call GetMonHeader
 	ld hl, wEnemyMonDVs
-	ld de, wcfaf
+	ld de, wLoadedMonSpeedExp
 	ld a, [hli]
 	ld [de], a
 	inc de
@@ -4459,7 +4459,7 @@ GetEnemyMonStat: ; 3df1c (f:5f1c)
 	ld [de], a
 	pop bc
 	ld b, $0
-	ld hl, wcfa4
+	ld hl, wLoadedMonSpeedExp - $b ; this base address makes CalcStat look in [wLoadedMonSpeedExp] for DVs
 	call CalcStat
 	pop de
 	ret
diff --git a/engine/battle/e.asm b/engine/battle/e.asm
index 9f93baa6..ff3ac839 100755
--- a/engine/battle/e.asm
+++ b/engine/battle/e.asm
@@ -665,18 +665,18 @@ Func_39bd5: ; 39bd5 (e:5bd5)
 .asm_39c18
 	ld [W_LISTTYPE], a
 	ld a, l
-	ld [wcf8b], a
+	ld [wList], a
 	ld a, h
-	ld [wcf8c], a
+	ld [wList + 1], a
 	ld a, e
 	ld [wcf8d], a
 	ld a, d
 	ld [wcf8e], a
-	ld bc, ItemPrices ; $4608
+	ld bc, ItemPrices
 	ld a, c
-	ld [wcf8f], a
+	ld [wItemPrices], a
 	ld a, b
-	ld [wcf90], a
+	ld [wItemPrices + 1], a
 	ret
 
 Func_39c37: ; 39c37 (e:5c37)