shithub: pokecrystal

Download patch

ref: 5b7773b7d3ddf1addd99588cc5c41cd81ecdc402
parent: f27f79488a460f0a89670f3611e1e9e175baf5d6
author: mid-kid <esteve.varela@gmail.com>
date: Fri Jan 12 07:15:44 EST 2018

Label frameset 09

It seems to be used as the "big" text entry cursor (i.e. for the bottom
3 buttons in the text entry screen).
It is never referenced explicitly, instead used when adding 1 to
SPRITEANIMSTRUCT_0E, in NamingScreen_AnimateCursor.

--- a/constants/sprite_anim_constants.asm
+++ b/constants/sprite_anim_constants.asm
@@ -114,7 +114,7 @@
 	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_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
@@ -207,7 +207,7 @@
 	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_FRAMESET_09 ; 21
+	const SPRITE_ANIM_OAMSET_TEXT_ENTRY_CURSOR_BIG ; 21
 	const SPRITE_ANIM_OAMSET_22
 	const SPRITE_ANIM_OAMSET_GS_INTRO_STAR ; 23
 	const SPRITE_ANIM_OAMSET_GS_INTRO_SPARKLE_1 ; 24
--- 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
--- 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
--- a/data/sprite_anims/framesets.asm
+++ b/data/sprite_anims/framesets.asm
@@ -9,7 +9,7 @@
 	dw .Frameset_PartyMonWithItemFast
 	dw .Frameset_GSTitleTrail
 	dw .Frameset_TextEntryCursor
-	dw .Frameset_09
+	dw .Frameset_TextEntryCursorBig
 	dw .Frameset_GameFreakLogo
 	dw .Frameset_GSIntroStar
 	dw .Frameset_GSIntroSparkle
@@ -133,8 +133,8 @@
 	dorepeat  1
 	dorestart
 
-.Frameset_09:
-	frame SPRITE_ANIM_OAMSET_FOR_FRAMESET_09,  1
+.Frameset_TextEntryCursorBig:
+	frame SPRITE_ANIM_OAMSET_TEXT_ENTRY_CURSOR_BIG,  1
 	dorepeat  1
 	dorestart
 
--- a/data/sprite_anims/oam.asm
+++ b/data/sprite_anims/oam.asm
@@ -34,7 +34,7 @@
 	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_ForFrameset09 ; SPRITE_ANIM_OAMSET_FOR_FRAMESET_09
+	dbw $00, .OAMData_TextEntryCursorBig ; SPRITE_ANIM_OAMSET_TEXT_ENTRY_CURSOR_BIG
 	dbw $00, .OAMData_22 ; SPRITE_ANIM_OAMSET_22
 	dbw $0f, .OAMData_GSIntroStar ; SPRITE_ANIM_OAMSET_GS_INTRO_STAR
 	dbw $11, .OAMData_1x1_Palette0 ; SPRITE_ANIM_OAMSET_GS_INTRO_SPARKLE_1
@@ -460,7 +460,7 @@
 	dsprite  0,  0, -1,  7, $00, 0 | Y_FLIP
 	dsprite  0,  0,  0,  0, $00, 0 | X_FLIP | Y_FLIP
 
-.OAMData_ForFrameset09:
+.OAMData_TextEntryCursorBig:
 	db 10
 	dsprite -1,  7,  0,  0, $00, 0
 	dsprite -1,  7,  1,  0, $01, 0
--- a/engine/namingscreen.asm
+++ b/engine/namingscreen.asm
@@ -562,10 +562,10 @@
 .ok
 	cp d
 	ld de, .LetterEntries
-	ld a, $0
+	ld a, $0 ; SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR
 	jr nz, .ok2
 	ld de, .CaseDelEnd
-	ld a, $1
+	ld a, $1 ; SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR_BIG
 .ok2
 	ld hl, SPRITEANIMSTRUCT_0E
 	add hl, bc