aboutsummaryrefslogtreecommitdiffstats
path: root/engine/menu/naming_screen.asm
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-06-11 20:37:15 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-06-11 20:37:15 -0400
commitf5983c0f813d3d908b6016db3ed866e4ca9437dc (patch)
treed6888723f443557ce45c9a00d873caa5e7a8930e /engine/menu/naming_screen.asm
parentCharacter dict; surfing minigame; printer debug (diff)
parentMore syncing with pokered (diff)
downloadpokeyellow-f5983c0f813d3d908b6016db3ed866e4ca9437dc.tar.gz
pokeyellow-f5983c0f813d3d908b6016db3ed866e4ca9437dc.tar.xz
pokeyellow-f5983c0f813d3d908b6016db3ed866e4ca9437dc.zip
Merge branch 'master' of github.com:pret/pokeyellow
Diffstat (limited to 'engine/menu/naming_screen.asm')
-rwxr-xr-xengine/menu/naming_screen.asm2
1 files changed, 1 insertions, 1 deletions
diff --git a/engine/menu/naming_screen.asm b/engine/menu/naming_screen.asm
index de0c696c..0eacc8f6 100755
--- a/engine/menu/naming_screen.asm
+++ b/engine/menu/naming_screen.asm
@@ -164,7 +164,7 @@ DisplayNamingScreen: ; 6307 (1:6307)
call RunDefaultPaletteCommand
call GBPalNormal
xor a
- ld [wSubAnimTransform], a
+ ld [wAnimCounter], a
ld hl, wd730
res 6, [hl]
ld a, [wIsInBattle]