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)

---
 ram/wram.asm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'ram')

diff --git a/ram/wram.asm b/ram/wram.asm
index 0b00d272..fff7f703 100644
--- a/ram/wram.asm
+++ b/ram/wram.asm
@@ -1212,7 +1212,7 @@ wTrainerPicPointer:: dw
 	ds 1
 
 UNION
-wTempMoveNameBuffer:: ds ITEM_NAME_LENGTH + 1
+wTempMoveNameBuffer:: ds MOVE_NAME_LENGTH
 
 NEXTU
 ; The name of the mon that is learning a move.
@@ -1274,6 +1274,7 @@ wCriticalHitOrOHKO:: db
 
 wMoveMissed:: db
 
+wBattleStatusData::
 ; always 0
 wPlayerStatsToDouble:: db
 ; always 0
@@ -1331,6 +1332,7 @@ wPlayerNumHits:: db
 ENDU
 
 	ds 2
+wBattleStatusDataEnd::
 
 ; non-zero when an item or move that allows escape from battle was used
 wEscapedFromBattle:: db
@@ -1560,7 +1562,8 @@ wMoves:: ds NUM_MOVES
 
 wMoveNum:: db
 
-wMovesString:: ds 56
+; concatenated move name list where intermediate '@' are replaced with '<NEXT>'
+wMovesString:: ds NUM_MOVES * MOVE_NAME_LENGTH
 
 wUnusedCurMapTilesetCopy:: db
 
-- 
cgit v1.3.1-sl0p