diff options
| author | dannye <33dannye@gmail.com> | 2021-09-26 22:38:47 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2021-09-26 22:43:09 -0500 |
| commit | 501a21fa5dc6f01c0563316c9cd209cccb1eef45 (patch) | |
| tree | c2fe5cc6caa9d8117df3008031d7a26317058acb /engine/menus | |
| parent | 45c039801916713e4066644086de4d4940d5fa1d (diff) | |
| parent | 30acb46b988d4bb54af761696123778acd8517e3 (diff) | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/menus')
| -rw-r--r-- | engine/menus/naming_screen.asm | 14 | ||||
| -rw-r--r-- | engine/menus/start_sub_menus.asm | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/engine/menus/naming_screen.asm b/engine/menus/naming_screen.asm index 553c47d0..7969cdda 100644 --- a/engine/menus/naming_screen.asm +++ b/engine/menus/naming_screen.asm @@ -38,7 +38,7 @@ AskName: pop hl pop af ld [wUpdateSpritesEnabled], a - ld a, [wcf4b] + ld a, [wStringBuffer] cp "@" ret nz .declinedNickname @@ -62,7 +62,7 @@ DisplayNameRaterScreen:: call GBPalWhiteOutWithDelay3 call RestoreScreenTilesAndReloadTilePatterns call LoadGBPal - ld a, [wcf4b] + ld a, [wStringBuffer] cp "@" jr z, .playerCancelled ld hl, wPartyMonNicks @@ -107,7 +107,7 @@ DisplayNamingScreen: ld a, 7 ld [wMaxMenuItem], a ld a, "@" - ld [wcf4b], a + ld [wStringBuffer], a xor a ld hl, wNamingScreenSubmitName ld [hli], a @@ -155,7 +155,7 @@ DisplayNamingScreen: .submitNickname pop de - ld hl, wcf4b + ld hl, wStringBuffer ld bc, NAME_LENGTH call CopyData call GBPalWhiteOutWithDelay3 @@ -389,7 +389,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] @@ -451,9 +451,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 05a1fa56..6055db5c 100644 --- a/engine/menus/start_sub_menus.asm +++ b/engine/menus/start_sub_menus.asm @@ -384,7 +384,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 |