pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-12-11 05:02:16 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'patch' of https://github.com/mid-kid/pokecrystal

Browse Source 
# Conflicts:
#	constants/sprite_anim_constants.asm
#	data/sprite_anims/framesets.asm
#	data/sprite_anims/oam.asm
This commit is contained in:
Remy Oukaour
2018-01-12 17:23:50 -05:00
parent 59c95abf83 5b7773b7d3
commit d054116458
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
engine/namingscreen.asm
View File

@@ -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