diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2025-11-12 15:44:07 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-11-12 15:44:07 -0500 |
| commit | 5943b96cf6d5eda52df2ad689af0ac251e4e0841 (patch) | |
| tree | 1e90b28cfce0c0876ad7f9886fb2ad405478fd39 /engine/menus/naming_screen.asm | |
| parent | Use the same tools/make_patch.c as Gen 2 (diff) | |
| download | pokeyellow-5943b96cf6d5eda52df2ad689af0ac251e4e0841.tar.gz pokeyellow-5943b96cf6d5eda52df2ad689af0ac251e4e0841.tar.xz pokeyellow-5943b96cf6d5eda52df2ad689af0ac251e4e0841.zip | |
Use features of RGBDS 1.0.0 (#537)
Diffstat (limited to 'engine/menus/naming_screen.asm')
| -rw-r--r-- | engine/menus/naming_screen.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/engine/menus/naming_screen.asm b/engine/menus/naming_screen.asm index 14eb0b28..fda482e3 100644 --- a/engine/menus/naming_screen.asm +++ b/engine/menus/naming_screen.asm @@ -40,7 +40,7 @@ AskName: pop af ld [wUpdateSpritesEnabled], a ld a, [wStringBuffer] - cp "@" + cp '@' ret nz .declinedNickname ld d, h @@ -64,7 +64,7 @@ DisplayNameRaterScreen:: call RestoreScreenTilesAndReloadTilePatterns call LoadGBPal ld a, [wStringBuffer] - cp "@" + cp '@' jr z, .playerCancelled ld hl, wPartyMonNicks ld bc, NAME_LENGTH @@ -108,7 +108,7 @@ DisplayNamingScreen: ld [wMenuWatchedKeys], a ld a, 7 ld [wMaxMenuItem], a - ld a, "@" + ld a, '@' ld [wStringBuffer], a xor a ld hl, wNamingScreenSubmitName @@ -231,10 +231,10 @@ DisplayNamingScreen: ld [wNamingScreenLetter], a call CalcStringLength ld a, [wNamingScreenLetter] - cp "ﾞ" + cp 'ﾞ' ld de, Dakutens jr z, .dakutensAndHandakutens - cp "ﾟ" + cp 'ﾟ' ld de, Handakutens jr z, .dakutensAndHandakutens ld a, [wNamingScreenType] @@ -259,7 +259,7 @@ DisplayNamingScreen: .addLetter ld a, [wNamingScreenLetter] ld [hli], a - ld [hl], "@" + ld [hl], '@' ld a, SFX_PRESS_AB call PlaySound ret @@ -269,7 +269,7 @@ DisplayNamingScreen: ret z call CalcStringLength dec hl - ld [hl], "@" + ld [hl], '@' ret .pressedRight ld a, [wCurrentMenuItem] @@ -442,7 +442,7 @@ CalcStringLength: ld c, $0 .loop ld a, [hl] - cp "@" + cp '@' ret z inc hl inc c @@ -468,7 +468,7 @@ PrintNamingText: call PlaceString ld hl, $1 add hl, bc - ld [hl], "の" ; leftover from Japanese version; blank tile $c9 in English + ld [hl], 'の' ; leftover from Japanese version; blank tile $c9 in English hlcoord 1, 3 ld de, NicknameTextString jr .placeString |