More WRAM label cleanup (still needs UNIONs and renaming)

engine/battle/core.asm

@@ -6900,9 +6900,9 @@ ResetCryModifiers:
 
 ; animates the mon "growing" out of the pokeball
 AnimateSendingOutMon:
-	ld a, [wPredefRegisters]
+	ld a, [wPredefHL]
 	ld h, a
-	ld a, [wPredefRegisters + 1]
+	ld a, [wPredefHL + 1]
 	ld l, a
 	ldh a, [hStartTileID]
 	ldh [hBaseTileID], a
@@ -6940,9 +6940,9 @@ AnimateSendingOutMon:
 	jr CopyUncompressedPicToHL
 
 CopyUncompressedPicToTilemap:
-	ld a, [wPredefRegisters]
+	ld a, [wPredefHL]
 	ld h, a
-	ld a, [wPredefRegisters + 1]
+	ld a, [wPredefHL + 1]
 	ld l, a
 	ldh a, [hStartTileID]
 CopyUncompressedPicToHL::

engine/items/town_map.asm

@@ -249,7 +249,7 @@ ToText:
 	db "To@"
 
 BuildFlyLocationsList:
-	ld hl, wFlyLocationsList - 1
+	ld hl, wFlyAnimUsingCoordList
 	ld [hl], $ff
 	inc hl
 	ld a, [wTownVisitedFlag]

engine/menus/party_menu.asm

@@ -131,7 +131,7 @@ RedrawPartyMenu_::
 	ld l, a
 	ld de, wEvosMoves
 	ld a, BANK(EvosMovesPointerTable)
-	ld bc, wEvosMoves.end - wEvosMoves
+	ld bc, wEvosMovesEnd - wEvosMoves
 	call FarCopyData
 	ld hl, wEvosMoves
 	ld de, .notAbleToEvolveText

engine/predefs.asm

@@ -1,20 +1,20 @@
 GetPredefPointer::
-; Store the contents of the register
-; pairs (hl, de, bc) at wPredefRegisters.
+; Back up the contents of the registers (hl, de, bc).
 ; Then put the bank and address of predef
 ; wPredefID in [wPredefBank] and hl.
 
 	ld a, h
-	ld [wPredefRegisters], a
+	ld [wPredefHL], a
 	ld a, l
-	ld [wPredefRegisters + 1], a
+	ld [wPredefHL + 1], a
 
-	ld hl, wPredefRegisters + 2
+	ld hl, wPredefDE
 	ld a, d
 	ld [hli], a
 	ld a, e
 	ld [hli], a
 
+	ASSERT wPredefDE + 2 == wPredefBC
 	ld a, b
 	ld [hli], a
 	ld [hl], c