more naming variables

1 files changed, 24 insertions, 24 deletions

diff --git a/engine/menu/naming_screen.asm b/engine/menu/naming_screen.asm
index 6037329e..20745c58 100755
--- a/engine/menu/naming_screen.asm
+++ b/engine/menu/naming_screen.asm
@@ -54,7 +54,7 @@ DoYouWantToNicknameText: ; 0x6557
 	db "@"
 
 DisplayNameRaterScreen: ; 655c (1:655c)
-	ld hl, wHPBarMaxHP
+	ld hl, wBuffer
 	xor a
 	ld [wUpdateSpritesEnabled], a
 	ld a, NAME_MON_SCREEN
@@ -72,7 +72,7 @@ DisplayNameRaterScreen: ; 655c (1:655c)
 	call AddNTimes
 	ld e, l
 	ld d, h
-	ld hl, wHPBarMaxHP
+	ld hl, wBuffer
 	ld bc, 11
 	call CopyData
 	and a
@@ -94,24 +94,24 @@ DisplayNamingScreen: ; 6596 (1:6596)
 	call LoadEDTile
 	callba LoadMonPartySpriteGfx
 	coord hl, 0, 4
-	ld b, $9
-	ld c, $12
+	ld b, 9
+	ld c, 18
 	call TextBoxBorder
 	call PrintNamingText
-	ld a, $3
+	ld a, 3
 	ld [wTopMenuItemY], a
-	ld a, $1
+	ld a, 1
 	ld [wTopMenuItemX], a
 	ld [wLastMenuItem], a
 	ld [wCurrentMenuItem], a
 	ld a, $ff
 	ld [wMenuWatchedKeys], a
-	ld a, $7
+	ld a, 7
 	ld [wMaxMenuItem], a
 	ld a, $50
 	ld [wcf4b], a
 	xor a
-	ld hl, wHPBarMaxHP + 1
+	ld hl, wNamingScreenSubmitName
 	ld [hli], a
 	ld [hli], a
 	ld [wAnimCounter], a
@@ -119,7 +119,7 @@ DisplayNamingScreen: ; 6596 (1:6596)
 	call PrintAlphabet
 	call GBPalNormal
 .ABStartReturnPoint
-	ld a, [wHPBarMaxHP + 1]
+	ld a, [wNamingScreenSubmitName]
 	and a
 	jr nz, .submitNickname
 	call PrintNicknameAndUnderscores
@@ -197,14 +197,14 @@ DisplayNamingScreen: ; 6596 (1:6596)
 	ld de, .selectReturnPoint
 	push de
 .pressedSelect
-	ld a, [wHPBarOldHP]
+	ld a, [wAlphabetCase]
 	xor $1
-	ld [wHPBarOldHP], a
+	ld [wAlphabetCase], a
 	ret
 
 .pressedStart
-	ld a, $1
-	ld [wHPBarMaxHP + 1], a
+	ld a, 1
+	ld [wNamingScreenSubmitName], a
 	ret
 
 .pressedA
@@ -216,7 +216,7 @@ DisplayNamingScreen: ; 6596 (1:6596)
 	jr z, .pressedStart
 .didNotPressED
 	ld a, [wCurrentMenuItem]
-	cp $6 ; case swtich row
+	cp $6 ; case switch row
 	jr nz, .didNotPressCaseSwtich
 	ld a, [wTopMenuItemX]
 	cp $1 ; case switch column
@@ -228,9 +228,9 @@ DisplayNamingScreen: ; 6596 (1:6596)
 	ld l, a
 	inc hl
 	ld a, [hl]
-	ld [wHPBarNewHP], a
+	ld [wNamingScreenLetter], a
 	call CalcStringLength
-	ld a, [wHPBarNewHP]
+	ld a, [wNamingScreenLetter]
 	cp $e5
 	ld de, Dakutens
 	jr z, .dakutensAndHandakutens
@@ -240,11 +240,11 @@ DisplayNamingScreen: ; 6596 (1:6596)
 	ld a, [wNamingScreenType]
 	cp NAME_MON_SCREEN
 	jr nc, .checkMonNameLength
-	ld a, [wHPBarMaxHP]
+	ld a, [wNamingScreenNameLength]
 	cp $7 ; max length of player/rival names
 	jr .checkNameLength
 .checkMonNameLength
-	ld a, [wHPBarMaxHP]
+	ld a, [wNamingScreenNameLength]
 	cp $a ; max length of pokemon nicknames
 .checkNameLength
 	jr c, .addLetter
@@ -257,14 +257,14 @@ DisplayNamingScreen: ; 6596 (1:6596)
 	ret nc
 	dec hl
 .addLetter
-	ld a, [wHPBarNewHP]
+	ld a, [wNamingScreenLetter]
 	ld [hli], a
 	ld [hl], $50
 	ld a, SFX_PRESS_AB
 	call PlaySound
 	ret
 .pressedB
-	ld a, [wHPBarMaxHP]
+	ld a, [wNamingScreenNameLength]
 	and a
 	ret z
 	call CalcStringLength
@@ -335,7 +335,7 @@ ED_Tile: ; 6767 (1:6767)
 PrintAlphabet: ; 676f (1:676f)
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED], a
-	ld a, [wHPBarOldHP]
+	ld a, [wAlphabetCase]
 	and a
 	ld de, LowerCaseAlphabet
 	jr nz, .lowercase
@@ -371,7 +371,7 @@ UpperCaseAlphabet: ; 67d6 (1:67d6)
 PrintNicknameAndUnderscores: ; 680e (1:680e)
 	call CalcStringLength
 	ld a, c
-	ld [wHPBarMaxHP], a
+	ld [wNamingScreenNameLength], a
 	coord hl, 10, 2
 	ld bc, $10a
 	call ClearScreenArea
@@ -394,7 +394,7 @@ PrintNicknameAndUnderscores: ; 680e (1:680e)
 	jr nz, .placeUnderscoreLoop
 	ld a, [wNamingScreenType]
 	cp NAME_MON_SCREEN
-	ld a, [wHPBarMaxHP]
+	ld a, [wNamingScreenNameLength]
 	jr nc, .pokemon2
 	cp 7 ; player or rival max name length
 	jr .playerOrRival2
@@ -433,7 +433,7 @@ DakutensAndHandakutens: ; 6871 (1:6871)
 	ret nc
 	inc hl
 	ld a, [hl]
-	ld [wHPBarNewHP], a
+	ld [wNamingScreenLetter], a
 	ret
 
 Dakutens: ; 6885 (1:6885)