From e92d1af478c8381fde30f709c2619abe90104d3a Mon Sep 17 00:00:00 2001
From: Rangi <35663410+Rangi42@users.noreply.github.com>
Date: Tue, 25 Nov 2025 17:53:29 -0500
Subject: Avoid magic numbers for most `CopyData` calls (#542)

---
 ram/vram.asm |  6 +++---
 ram/wram.asm | 10 +++++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'ram')

diff --git a/ram/vram.asm b/ram/vram.asm
index fafb5d8e..0819fe0a 100644
--- a/ram/vram.asm
+++ b/ram/vram.asm
@@ -12,8 +12,8 @@ NEXTU
 ; battle/menu
 vSprites::  ds $80 tiles
 vFont::     ds $80 tiles
-vFrontPic:: ds 7 * 7 tiles
-vBackPic::  ds 7 * 7 tiles
+vFrontPic:: ds PIC_SIZE tiles
+vBackPic::  ds PIC_SIZE tiles
 
 NEXTU
 ; overworld
@@ -25,7 +25,7 @@ NEXTU
 ; title
 	ds $80 tiles
 vTitleLogo::  ds $80 tiles
-	ds 7 * 7 tiles
+	ds PIC_SIZE tiles
 vTitleLogo2:: ds 30 tiles
 
 ENDU
diff --git a/ram/wram.asm b/ram/wram.asm
index ff7d10ae..0b00d272 100644
--- a/ram/wram.asm
+++ b/ram/wram.asm
@@ -191,7 +191,7 @@ wOverworldMap:: ds 1300
 wOverworldMapEnd::
 
 NEXTU
-wTempPic:: ds 7 * 7 tiles
+wTempPic:: ds PIC_SIZE tiles
 ENDU
 
 
@@ -688,7 +688,11 @@ NEXTU
 	ds 1
 ; difference in X between the next ball and the current one
 wHUDPokeballGfxOffsetX:: db
-wHUDGraphicsTiles:: ds 3
+wHUDGraphicsTiles::
+wHUDUnusedTopTile:: db
+wHUDCornerTile:: db
+wHUDTriangleTile:: db
+wHUDGraphicsTilesEnd::
 
 NEXTU
 ; the level of the mon at the time it entered day care
@@ -1079,7 +1083,7 @@ wExpAmountGained:: dw
 wGainBoostedExp:: db
 ENDU
 
-wGymCityName:: ds 17
+wGymCityName:: ds GYM_CITY_LENGTH
 
 wGymLeaderName:: ds NAME_LENGTH
 
-- 
cgit v1.3.1-sl0p