diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-12 17:23:50 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-12 17:23:50 -0500 |
| commit | d0541164589a5fd2f628bf8629f878430b31c5f7 (patch) | |
| tree | 03599c969ac901a7878b4d4ddbb3d1e01dcd019d /engine/namingscreen.asm | |
| parent | 59c95abf836e139931a41d20cf95af2472763fab (diff) | |
| parent | 5b7773b7d3ddf1addd99588cc5c41cd81ecdc402 (diff) | |
Merge branch 'patch' of https://github.com/mid-kid/pokecrystal
# Conflicts:
# constants/sprite_anim_constants.asm
# data/sprite_anims/framesets.asm
# data/sprite_anims/oam.asm
Diffstat (limited to 'engine/namingscreen.asm')
| -rwxr-xr-x | engine/namingscreen.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/namingscreen.asm b/engine/namingscreen.asm index 7ef5669db..9d915dc9e 100755 --- a/engine/namingscreen.asm +++ b/engine/namingscreen.asm @@ -568,14 +568,14 @@ NamingScreen_AnimateCursor: ; 11a3b (4:5a3b) .ok cp d ld de, .LetterEntries - ld a, $0 + ld a, SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR - SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR ; 0 jr nz, .ok2 ld de, .CaseDelEnd - ld a, $1 + ld a, SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR_BIG - SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR ; 1 .ok2 ld hl, SPRITEANIMSTRUCT_0E add hl, bc - add [hl] + add [hl] ; default SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR ld hl, SPRITEANIMSTRUCT_FRAMESET_ID add hl, bc ld [hl], a |