summaryrefslogtreecommitdiff
path: root/engine/menu/naming_screen.asm
diff options
context:
space:
mode:
authordannye <corrnondacqb@yahoo.com>2016-07-18 01:32:24 -0500
committerdannye <corrnondacqb@yahoo.com>2016-07-18 01:32:24 -0500
commit7c01509b6b69b4dc33f5d739589d50f26ffd65b0 (patch)
tree89b4000a56c9e3d942666639c83416100f360f88 /engine/menu/naming_screen.asm
parent80bae03975a84dadf080c79f52216866dd410cf8 (diff)
parentfc474c8ee740acbe662b06db0d9cab8edc6680e9 (diff)
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/menu/naming_screen.asm')
-rwxr-xr-xengine/menu/naming_screen.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/menu/naming_screen.asm b/engine/menu/naming_screen.asm
index 217d6e54..758a2d8d 100755
--- a/engine/menu/naming_screen.asm
+++ b/engine/menu/naming_screen.asm
@@ -7,7 +7,7 @@ AskName:
coord hl, 0, 0
ld b, 4
ld c, 11
- call z, ClearScreenArea ; only if in wild batle
+ call z, ClearScreenArea ; only if in wild battle
ld a, [wcf91]
ld [wd11e], a
call GetMonName
@@ -40,7 +40,7 @@ AskName:
pop af
ld [wUpdateSpritesEnabled], a
ld a, [wcf4b]
- cp $50
+ cp "@"
ret nz
.declinedNickname
ld d, h
@@ -108,7 +108,7 @@ DisplayNamingScreen:
ld [wMenuWatchedKeys], a
ld a, 7
ld [wMaxMenuItem], a
- ld a, $50
+ ld a, "@"
ld [wcf4b], a
xor a
ld hl, wNamingScreenSubmitName
@@ -153,7 +153,7 @@ DisplayNamingScreen:
ld h, [hl]
ld l, a
push de
- jp [hl]
+ jp hl
.submitNickname
pop de
@@ -259,7 +259,7 @@ DisplayNamingScreen:
.addLetter
ld a, [wNamingScreenLetter]
ld [hli], a
- ld [hl], $50
+ ld [hl], "@"
ld a, SFX_PRESS_AB
call PlaySound
ret