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

6 files changed, 12 insertions, 12 deletions

diff --git a/constants/sprite_anim_constants.asm b/constants/sprite_anim_constants.asm
index 6d6b1a474..5692c6efc 100644
--- a/constants/sprite_anim_constants.asm
+++ b/constants/sprite_anim_constants.asm
@@ -116,7 +116,7 @@ NUM_SPRITE_ANIM_STRUCTS EQU 10 ; see wSpriteAnimationStructs
 	const SPRITE_ANIM_FRAMESET_PARTY_MON_WITH_ITEM_FAST ; 06
 	const SPRITE_ANIM_FRAMESET_GS_TITLE_TRAIL           ; 07
 	const SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR        ; 08
-	const SPRITE_ANIM_FRAMESET_UNUSED_09                ; 09
+	const SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR_BIG    ; 09
 	const SPRITE_ANIM_FRAMESET_GAMEFREAK_LOGO           ; 0a
 	const SPRITE_ANIM_FRAMESET_GS_INTRO_STAR            ; 0b
 	const SPRITE_ANIM_FRAMESET_GS_INTRO_SPARKLE         ; 0c
@@ -209,7 +209,7 @@ NUM_SPRITE_ANIM_STRUCTS EQU 10 ; see wSpriteAnimationStructs
 	const SPRITE_ANIM_OAMSET_GS_TITLE_TRAIL_1           ; 1e
 	const SPRITE_ANIM_OAMSET_GS_TITLE_TRAIL_2           ; 1f
 	const SPRITE_ANIM_OAMSET_TEXT_ENTRY_CURSOR          ; 20
-	const SPRITE_ANIM_OAMSET_FOR_UNUSED_FRAMESET_09     ; 21
+	const SPRITE_ANIM_OAMSET_TEXT_ENTRY_CURSOR_BIG      ; 21
 	const SPRITE_ANIM_OAMSET_GS_INTRO_GAMEFREAK_LOGO    ; 22
 	const SPRITE_ANIM_OAMSET_GS_INTRO_STAR              ; 23
 	const SPRITE_ANIM_OAMSET_GS_INTRO_SPARKLE_1         ; 24
diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm
index 32d386ba7..767d7a3c6 100644
--- a/constants/sprite_constants.asm
+++ b/constants/sprite_constants.asm
@@ -1,5 +1,5 @@
 ; sprite ids
-; OverworldSprites indexes (see gfx/sprite_data.asm)
+; OverworldSprites indexes (see data/sprites.asm)
 	const_def
 	const SPRITE_NONE ; 00
 	const SPRITE_CHRIS ; 01
diff --git a/constants/sprite_data_constants.asm b/constants/sprite_data_constants.asm
index 32cc343e0..db53c3ca1 100644
--- a/constants/sprite_data_constants.asm
+++ b/constants/sprite_data_constants.asm
@@ -1,4 +1,4 @@
-; overworld_sprite struct members (see gfx/sprite_data.asm)
+; overworld_sprite struct members (see data/sprites.asm)
 	const_def
 	const SPRITEDATA_ADDR    ; 0
 	const SPRITEDATA_ADDR_HI ; 1
diff --git a/data/sprite_anims/framesets.asm b/data/sprite_anims/framesets.asm
index 5216a4d88..a4e126cef 100755
--- a/data/sprite_anims/framesets.asm
+++ b/data/sprite_anims/framesets.asm
@@ -9,7 +9,7 @@ SpriteAnimFrameData: ; 8d6e6
 	dw .Frameset_PartyMonWithItemFast
 	dw .Frameset_GSTitleTrail
 	dw .Frameset_TextEntryCursor
-	dw .Frameset_Unused09
+	dw .Frameset_TextEntryCursorBig
 	dw .Frameset_GameFreakLogo
 	dw .Frameset_GSIntroStar
 	dw .Frameset_GSIntroSparkle
@@ -133,8 +133,8 @@ SpriteAnimFrameData: ; 8d6e6
 	dorepeat  1
 	dorestart
 
-.Frameset_Unused09:
-	frame SPRITE_ANIM_OAMSET_FOR_UNUSED_FRAMESET_09,  1
+.Frameset_TextEntryCursorBig:
+	frame SPRITE_ANIM_OAMSET_TEXT_ENTRY_CURSOR_BIG,  1
 	dorepeat  1
 	dorestart
 
diff --git a/data/sprite_anims/oam.asm b/data/sprite_anims/oam.asm
index 41187ed5e..cd03eec29 100644
--- a/data/sprite_anims/oam.asm
+++ b/data/sprite_anims/oam.asm
@@ -34,7 +34,7 @@ SpriteAnimOAMData: ; 8d94d
 	dbw $f8, .OAMData_GSTitleTrail             ; SPRITE_ANIM_OAMSET_GS_TITLE_TRAIL_1
 	dbw $fa, .OAMData_GSTitleTrail             ; SPRITE_ANIM_OAMSET_GS_TITLE_TRAIL_2
 	dbw $00, .OAMData_TextEntryCursor          ; SPRITE_ANIM_OAMSET_TEXT_ENTRY_CURSOR
-	dbw $00, .OAMData_ForUnusedFrameset09      ; SPRITE_ANIM_OAMSET_FOR_UNUSED_FRAMESET_09
+	dbw $00, .OAMData_TextEntryCursorBig       ; SPRITE_ANIM_OAMSET_TEXT_ENTRY_CURSOR_BIG
 	dbw $00, .OAMData_GSIntroGameFreakLogo     ; SPRITE_ANIM_OAMSET_GS_INTRO_GAMEFREAK_LOGO
 	dbw $0f, .OAMData_GSIntroStar              ; SPRITE_ANIM_OAMSET_GS_INTRO_STAR
 	dbw $11, .OAMData_1x1_Palette0             ; SPRITE_ANIM_OAMSET_GS_INTRO_SPARKLE_1
@@ -458,7 +458,7 @@ SpriteAnimOAMData: ; 8d94d
 	dsprite  0,  0, -1,  7, $00, 0 | Y_FLIP
 	dsprite  0,  0,  0,  0, $00, 0 | X_FLIP | Y_FLIP
 
-.OAMData_ForUnusedFrameset09:
+.OAMData_TextEntryCursorBig:
 	db 10
 	dsprite -1,  7,  0,  0, $00, 0
 	dsprite -1,  7,  1,  0, $01, 0
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