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)

---
 engine/items/item_effects.asm | 6 +++---
 engine/items/town_map.asm     | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'engine/items')

diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm
index 1b68e47a..7fffae59 100644
--- a/engine/items/item_effects.asm
+++ b/engine/items/item_effects.asm
@@ -1302,13 +1302,13 @@ ItemUseMedicine:
 .statNameInnerLoop
 	ld a, [hli]
 	ld b, a
-	ld a, $50
+	ld a, '@'
 	cp b
 	jr nz, .statNameInnerLoop
 	jr .statNameLoop
 .gotStatName
 	ld de, wStringBuffer
-	ld bc, 10
+	ld bc, NAME_LENGTH - 1 ; all VitaminStats are at most 10 bytes
 	call CopyData ; copy the stat's name to wStringBuffer
 	ld a, SFX_HEAL_AILMENT
 	call PlaySound
@@ -2029,7 +2029,7 @@ ItemUsePPRestore:
 	ld bc, wPartyMon2 - wPartyMon1
 	call AddNTimes
 	ld de, wBattleMonPP
-	ld bc, 4
+	ld bc, NUM_MOVES
 	call CopyData ; copy party data to in-battle data
 .skipUpdatingInBattleData
 	ld a, SFX_HEAL_AILMENT
diff --git a/engine/items/town_map.asm b/engine/items/town_map.asm
index 573ba581..35acaa29 100644
--- a/engine/items/town_map.asm
+++ b/engine/items/town_map.asm
@@ -20,7 +20,7 @@ DisplayTownMap:
 	call PlaceString
 	ld hl, wShadowOAMSprite00
 	ld de, wShadowOAMBackupSprite00
-	ld bc, 4 * 4
+	ld bc, OBJ_SIZE * 4
 	call CopyData
 	ld hl, vSprites tile BIRD_BASE_TILE
 	ld de, TownMapCursor
@@ -64,7 +64,7 @@ DisplayTownMap:
 	call PlaceString
 	ld hl, wShadowOAMSprite04
 	ld de, wShadowOAMBackupSprite04
-	ld bc, 4 * 4
+	ld bc, OBJ_SIZE * 4
 	call CopyData
 .inputLoop
 	call TownMapSpriteBlinkingAnimation
-- 
cgit v1.3.1-sl0p