item name length constant

5 files changed, 5 insertions, 4 deletions

diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm
index 43dc908e..b42745cc 100644
--- a/constants/misc_constants.asm
+++ b/constants/misc_constants.asm
@@ -15,6 +15,7 @@ HOF_TEAM          EQU PARTY_LENGTH * HOF_MON
 HOF_TEAM_CAPACITY EQU 50
 
 NAME_LENGTH EQU 11
+ITEM_NAME_LENGTH EQU 13
 
 A_BUTTON EQU %00000001
 B_BUTTON EQU %00000010
diff --git a/scripts/route11gateupstairs.asm b/scripts/route11gateupstairs.asm
index 05ea2a95..ec543a6a 100755
--- a/scripts/route11gateupstairs.asm
+++ b/scripts/route11gateupstairs.asm
@@ -28,7 +28,7 @@ Route11GateUpstairsText2: ; 4946c (12:546c)
 	ld h, d
 	ld l, e
 	ld de, wOaksAideRewardItemName
-	ld bc, $000d
+	ld bc, ITEM_NAME_LENGTH
 	call CopyData
 	predef OaksAideScript
 	ld a, [hOaksAideResult]
diff --git a/scripts/route15gateupstairs.asm b/scripts/route15gateupstairs.asm
index 5cfb8903..332df6b6 100755
--- a/scripts/route15gateupstairs.asm
+++ b/scripts/route15gateupstairs.asm
@@ -17,7 +17,7 @@ Route15GateUpstairsText1: ; 49651 (12:5651)
 	call GetItemName
 	ld hl, wcd6d
 	ld de, wOaksAideRewardItemName
-	ld bc, $000d
+	ld bc, ITEM_NAME_LENGTH
 	call CopyData
 	predef OaksAideScript
 	ld a, [hOaksAideResult]
diff --git a/scripts/route2gate.asm b/scripts/route2gate.asm
index 1bd82c04..133d0e7c 100755
--- a/scripts/route2gate.asm
+++ b/scripts/route2gate.asm
@@ -17,7 +17,7 @@ Route2GateText1: ; 5d5db (17:55db)
 	call GetItemName
 	ld hl, wcd6d
 	ld de, wOaksAideRewardItemName
-	ld bc, $000d
+	ld bc, ITEM_NAME_LENGTH
 	call CopyData
 	predef OaksAideScript
 	ld a, [hOaksAideResult]
diff --git a/wram.asm b/wram.asm
index 7ab8f8c9..cfa4cc51 100755
--- a/wram.asm
+++ b/wram.asm
@@ -289,7 +289,7 @@ wOverworldMap:: ; c6e8
 
 wRedrawRowOrColumnSrcTiles:: ; cbfc
 ; the tiles of the row or column to be redrawn by RedrawRowOrColumn
-	ds 20 * 2
+	ds SCREEN_WIDTH * 2
 
 ; coordinates of the position of the cursor for the top menu item (id 0)
 wTopMenuItemY:: ; cc24