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)

---
 engine/menus/start_sub_menus.asm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'engine/menus/start_sub_menus.asm')

diff --git a/engine/menus/start_sub_menus.asm b/engine/menus/start_sub_menus.asm
index c27e58a9..ec10dd11 100644
--- a/engine/menus/start_sub_menus.asm
+++ b/engine/menus/start_sub_menus.asm
@@ -236,7 +236,7 @@ StartMenu_Pokemon::
 .softboiled
 	ld hl, wPartyMon1MaxHP
 	ld a, [wWhichPokemon]
-	ld bc, wPartyMon2 - wPartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call AddNTimes
 	ld a, [hli]
 	ldh [hDividend], a
@@ -246,7 +246,7 @@ StartMenu_Pokemon::
 	ldh [hDivisor], a
 	ld b, 2 ; number of bytes
 	call Divide
-	ld bc, wPartyMon1HP - wPartyMon1MaxHP
+	ld bc, MON_HP - MON_MAXHP
 	add hl, bc
 	ld a, [hld]
 	ld b, a
@@ -743,24 +743,24 @@ SwitchPartyMon_InitVarOrSwapData:
 	ldh a, [hSwapTemp]
 	ld [de], a
 	ld hl, wPartyMons
-	ld bc, wPartyMon2 - wPartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	ld a, [wCurrentMenuItem]
 	call AddNTimes
 	push hl
 	ld de, wSwitchPartyMonTempBuffer
-	ld bc, wPartyMon2 - wPartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call CopyData
 	ld hl, wPartyMons
-	ld bc, wPartyMon2 - wPartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	ld a, [wMenuItemToSwap]
 	call AddNTimes
 	pop de
 	push hl
-	ld bc, wPartyMon2 - wPartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call CopyData
 	pop de
 	ld hl, wSwitchPartyMonTempBuffer
-	ld bc, wPartyMon2 - wPartyMon1
+	ld bc, PARTYMON_STRUCT_LENGTH
 	call CopyData
 	ld hl, wPartyMonOT
 	ld a, [wCurrentMenuItem]
-- 
cgit v1.3.1-sl0p