summaryrefslogtreecommitdiff
path: root/engine/menus
diff options
context:
space:
mode:
Diffstat (limited to 'engine/menus')
-rw-r--r--engine/menus/naming_screen.asm14
-rw-r--r--engine/menus/start_sub_menus.asm2
2 files changed, 8 insertions, 8 deletions
diff --git a/engine/menus/naming_screen.asm b/engine/menus/naming_screen.asm
index 9347212e..a0062dcd 100644
--- a/engine/menus/naming_screen.asm
+++ b/engine/menus/naming_screen.asm
@@ -39,7 +39,7 @@ AskName:
pop hl
pop af
ld [wUpdateSpritesEnabled], a
- ld a, [wcf4b]
+ ld a, [wStringBuffer]
cp "@"
ret nz
.declinedNickname
@@ -63,7 +63,7 @@ DisplayNameRaterScreen::
call GBPalWhiteOutWithDelay3
call RestoreScreenTilesAndReloadTilePatterns
call LoadGBPal
- ld a, [wcf4b]
+ ld a, [wStringBuffer]
cp "@"
jr z, .playerCancelled
ld hl, wPartyMonNicks
@@ -109,7 +109,7 @@ DisplayNamingScreen:
ld a, 7
ld [wMaxMenuItem], a
ld a, "@"
- ld [wcf4b], a
+ ld [wStringBuffer], a
xor a
ld hl, wNamingScreenSubmitName
ld [hli], a
@@ -157,7 +157,7 @@ DisplayNamingScreen:
.submitNickname
pop de
- ld hl, wcf4b
+ ld hl, wStringBuffer
ld bc, NAME_LENGTH
call CopyData
call GBPalWhiteOutWithDelay3
@@ -375,7 +375,7 @@ PrintNicknameAndUnderscores:
lb bc, 1, 10
call ClearScreenArea
hlcoord 10, 2
- ld de, wcf4b
+ ld de, wStringBuffer
call PlaceString
hlcoord 10, 3
ld a, [wNamingScreenType]
@@ -437,9 +437,9 @@ DakutensAndHandakutens:
INCLUDE "data/text/dakutens.asm"
-; calculates the length of the string at wcf4b and stores it in c
+; calculates the length of the string at wStringBuffer and stores it in c
CalcStringLength:
- ld hl, wcf4b
+ ld hl, wStringBuffer
ld c, $0
.loop
ld a, [hl]
diff --git a/engine/menus/start_sub_menus.asm b/engine/menus/start_sub_menus.asm
index c0448121..cd1e6da6 100644
--- a/engine/menus/start_sub_menus.asm
+++ b/engine/menus/start_sub_menus.asm
@@ -367,7 +367,7 @@ StartMenu_Item::
ld a, [wcf91]
ld [wd11e], a
call GetItemName
- call CopyStringToCF4B ; copy name to wcf4b
+ call CopyToStringBuffer
ld a, [wcf91]
cp BICYCLE
jr nz, .notBicycle2