From 3a4382c6055e21da72357dd18638947a2acbbda9 Mon Sep 17 00:00:00 2001
From: Narishma-gb <194818981+Narishma-gb@users.noreply.github.com>
Date: Thu, 27 Nov 2025 19:39:25 +0100
Subject: Use more Pokemon data constants, create MOVE_NAME_LENGTH (#543)

---
 scripts/Daycare.asm         | 4 ++--
 scripts/NameRatersHouse.asm | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'scripts')

diff --git a/scripts/Daycare.asm b/scripts/Daycare.asm
index 05b69935..f7354e37 100644
--- a/scripts/Daycare.asm
+++ b/scripts/Daycare.asm
@@ -173,7 +173,7 @@ DaycareGentlemanText:
 	ld a, [wPartyCount]
 	dec a
 	push af
-	ld bc, wPartyMon2 - wPartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	push bc
 	ld hl, wPartyMon1Moves
 	call AddNTimes
@@ -190,7 +190,7 @@ DaycareGentlemanText:
 	call AddNTimes
 	ld d, h
 	ld e, l
-	ld bc, wPartyMon1MaxHP - wPartyMon1HP
+	ld bc, MON_MAXHP - MON_HP
 	add hl, bc
 	ld a, [hli]
 	ld [de], a
diff --git a/scripts/NameRatersHouse.asm b/scripts/NameRatersHouse.asm
index 61b10a3e..b1e3bf95 100644
--- a/scripts/NameRatersHouse.asm
+++ b/scripts/NameRatersHouse.asm
@@ -19,7 +19,7 @@ NameRatersHouseCheckMonOTScript:
 	call .check_match_loop
 	jr c, .no_match
 	ld hl, wPartyMon1OTID
-	ld bc, wPartyMon2 - wPartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	ld a, [wWhichPokemon]
 	call AddNTimes
 	ld de, wPlayerID
-- 
cgit v1.3.1-sl0p