Named wram symbols

5 files changed, 32 insertions, 32 deletions

diff --git a/engine/menu/bills_pc.asm b/engine/menu/bills_pc.asm
index a26c5aed..9e8422c0 100644
--- a/engine/menu/bills_pc.asm
+++ b/engine/menu/bills_pc.asm
@@ -325,9 +325,9 @@ Func_216b3: ; 216b3 (8:56b3)
 
 Func_216be: ; 216be (8:56be)
 	ld a, l
-	ld [wcf8b], a
+	ld [wList], a
 	ld a, h
-	ld [wcf8c], a
+	ld [wList + 1], a
 	xor a
 	ld [wcf93], a
 	ld [wListMenuID], a ; wListMenuID
diff --git a/engine/menu/party_menu.asm b/engine/menu/party_menu.asm
index a2c02481..86474be9 100755
--- a/engine/menu/party_menu.asm
+++ b/engine/menu/party_menu.asm
@@ -83,7 +83,7 @@ RedrawPartyMenu_: ; 12ce3 (4:6ce3)
 	push hl
 	ld bc,14 ; 14 columns to the right
 	add hl,bc
-	ld de,wcf9c
+	ld de,wLoadedMonStatus
 	call PrintStatusCondition
 	pop hl
 	push hl
@@ -134,7 +134,7 @@ RedrawPartyMenu_: ; 12ce3 (4:6ce3)
 	push hl
 	ld hl,EvosMovesPointerTable
 	ld b,0
-	ld a,[wcf98] ; pokemon ID
+	ld a,[wLoadedMonSpecies]
 	dec a
 	add a
 	rl b
diff --git a/engine/menu/players_pc.asm b/engine/menu/players_pc.asm
index 5f1175eb..5217befa 100755
--- a/engine/menu/players_pc.asm
+++ b/engine/menu/players_pc.asm
@@ -97,9 +97,9 @@ Func_79ab: ; 79ab (1:79ab)
 	call PrintText
 	ld hl, wNumBagItems ; wNumBagItems
 	ld a, l
-	ld [wcf8b], a
+	ld [wList], a
 	ld a, h
-	ld [wcf8c], a
+	ld [wList + 1], a
 	xor a
 	ld [wcf93], a
 	ld a, $3
@@ -151,9 +151,9 @@ Func_7a28: ; 7a28 (1:7a28)
 	call PrintText
 	ld hl, wNumBoxItems ; wNumBoxItems
 	ld a, l
-	ld [wcf8b], a
+	ld [wList], a
 	ld a, h
-	ld [wcf8c], a
+	ld [wList + 1], a
 	xor a
 	ld [wcf93], a
 	ld a, $3
@@ -205,9 +205,9 @@ Func_7aa5: ; 7aa5 (1:7aa5)
 	call PrintText
 	ld hl, wNumBoxItems ; wNumBoxItems
 	ld a, l
-	ld [wcf8b], a
+	ld [wList], a
 	ld a, h
-	ld [wcf8c], a
+	ld [wList + 1], a
 	xor a
 	ld [wcf93], a
 	ld a, $3
diff --git a/engine/menu/start_sub_menus.asm b/engine/menu/start_sub_menus.asm
index 1bedb0ea..589224ab 100755
--- a/engine/menu/start_sub_menus.asm
+++ b/engine/menu/start_sub_menus.asm
@@ -308,10 +308,10 @@ StartMenu_Item: ; 13302 (4:7302)
 	jr .exitMenu
 .notInCableClubRoom
 	ld bc,wNumBagItems
-	ld hl,wcf8b
+	ld hl,wList
 	ld a,c
 	ld [hli],a
-	ld [hl],b ; store item bag pointer at wcf8b (for DisplayListMenuID)
+	ld [hl],b ; store item bag pointer at wList (for DisplayListMenuID)
 	xor a
 	ld [wcf93],a
 	ld a,ITEMLISTMENU
diff --git a/engine/menu/status_screen.asm b/engine/menu/status_screen.asm
index 2fc5e713..79daa0c0 100755
--- a/engine/menu/status_screen.asm
+++ b/engine/menu/status_screen.asm
@@ -4,11 +4,11 @@ StatusScreen: ; 12953 (4:6953)
 	ld a, [wcc49]
 	cp $2 ; 2 means we're in a PC box
 	jr c, .DontRecalculate ; 0x1295b $14
-	ld a, [wcf9b]
-	ld [wcfb9], a
+	ld a, [wLoadedMonBoxLevel]
+	ld [wLoadedMonLevel], a
 	ld [W_CURENEMYLVL], a
-	ld hl, wcfa8
-	ld de, wcfba
+	ld hl, wLoadedMonHPExp - 1
+	ld de, wLoadedMonStats
 	ld b, $1
 	call CalcStats ; Recalculate stats
 .DontRecalculate
@@ -61,7 +61,7 @@ StatusScreen: ; 12953 (4:6953)
 	ld b, $3
 	call GoPAL_SET ; SGB palette
 	hlCoord 16, 6
-	ld de, wcf9c
+	ld de, wLoadedMonStatus
 	call PrintStatusCondition
 	jr nz, .StatusWritten ; 0x129fc $9
 	hlCoord 16, 6
@@ -96,7 +96,7 @@ StatusScreen: ; 12953 (4:6953)
 	hlCoord 12, 16
 	call PlaceString ; OT
 	hlCoord 12, 14
-	ld de, wcfa4
+	ld de, wLoadedMonOTID
 	ld bc, $8205 ; 5
 	call PrintNumber ; ID Number
 	ld d, $0
@@ -203,14 +203,14 @@ PrintStatsBox: ; 12ae4 (4:6ae4)
 	pop hl
 	pop bc
 	add hl, bc
-	ld de, wcfbc
+	ld de, wLoadedMonAttack
 	ld bc, $0203 ; three digits
 	call PrintStat
-	ld de, wcfbe
+	ld de, wLoadedMonDefense
 	call PrintStat
-	ld de, wcfc0
+	ld de, wLoadedMonSpeed
 	call PrintStat
-	ld de, wcfc2
+	ld de, wLoadedMonSpecial
 	jp PrintNumber
 PrintStat
 	push hl
@@ -235,7 +235,7 @@ StatusScreen2: ; 12b57 (4:6b57)
 	ld bc, $0005
 	ld hl, wd0dc
 	call FillMemory
-	ld hl, wcfa0
+	ld hl, wLoadedMonMoves
 	ld de, wd0dc
 	ld bc, $0004
 	call CopyData
@@ -269,7 +269,7 @@ StatusScreen2: ; 12b57 (4:6b57)
 	ld a, "-"
 	call Func_12ccb ; Fill the rest with --
 .InitPP ; 12bbb
-	ld hl, wcfa0
+	ld hl, wLoadedMonMoves
 	deCoord 14, 10
 	ld b, $0
 .PrintPP ; 12bc3
@@ -323,12 +323,12 @@ StatusScreen2: ; 12b57 (4:6b57)
 	hlCoord 9, 3
 	ld de, EXPPointsText
 	call PlaceString
-	ld a, [wcfb9] ; level
+	ld a, [wLoadedMonLevel] ; level
 	push af
 	cp MAX_LEVEL
 	jr z, .Level100 ; 0x12c20 $4
 	inc a
-	ld [wcfb9], a ; Increase temporarily if not 100
+	ld [wLoadedMonLevel], a ; Increase temporarily if not 100
 .Level100
 	hlCoord 14, 6
 	ld [hl], $70 ; 1-tile "to"
@@ -336,13 +336,13 @@ StatusScreen2: ; 12b57 (4:6b57)
 	inc hl
 	call PrintLevel
 	pop af
-	ld [wcfb9], a
-	ld de, wcfa6
+	ld [wLoadedMonLevel], a
+	ld de, wLoadedMonExp
 	hlCoord 12, 4
 	ld bc, $0307
 	call PrintNumber ; exp
 	call .asm_12c86
-	ld de, wcfa6
+	ld de, wLoadedMonExp
 	hlCoord 7, 6
 	ld bc, $0307
 	call PrintNumber
@@ -368,13 +368,13 @@ StatusScreen2: ; 12b57 (4:6b57)
 	call GBPalWhiteOut
 	jp ClearScreen
 .asm_12c86 ; This does some magic with lvl/exp?
-	ld a, [wcfb9] ; Load level
+	ld a, [wLoadedMonLevel] ; Load level
 	cp MAX_LEVEL
 	jr z, .asm_12ca7 ; 0x12c8b $1a ; If 100
 	inc a
 	ld d, a
 	callab CalcExperience
-	ld hl, wcfa8
+	ld hl, wLoadedMonExp + 2
 	ld a, [$ff98]
 	sub [hl]
 	ld [hld], a
@@ -386,7 +386,7 @@ StatusScreen2: ; 12b57 (4:6b57)
 	ld [hld], a
 	ret
 .asm_12ca7
-	ld hl, wcfa6
+	ld hl, wLoadedMonExp
 	xor a
 	ld [hli], a
 	ld [hli], a