Identify an unused intro sprite animation from pokegold-spaceworld

6 files changed, 17 insertions, 16 deletions

diff --git a/constants/sprite_anim_constants.asm b/constants/sprite_anim_constants.asm
index 20f23c2b..2a0e356a 100644
--- a/constants/sprite_anim_constants.asm
+++ b/constants/sprite_anim_constants.asm
@@ -40,7 +40,7 @@ NUM_SPRITEANIMDICT_ENTRIES EQU 10
 	const SPRITE_ANIM_INDEX_GS_INTRO_BUBBLE           ; 01
 	const SPRITE_ANIM_INDEX_GS_INTRO_SHELLDER         ; 02
 	const SPRITE_ANIM_INDEX_GS_INTRO_MAGIKARP         ; 03
-	const SPRITE_ANIM_INDEX_UNUSED_LAPRAS             ; 04
+	const SPRITE_ANIM_INDEX_UNUSED_INTRO_AERODACTYL   ; 04
 	const SPRITE_ANIM_INDEX_GS_INTRO_LAPRAS           ; 05
 	const SPRITE_ANIM_INDEX_GS_INTRO_NOTE             ; 06
 	const SPRITE_ANIM_INDEX_GS_INTRO_INVISIBLE_NOTE   ; 07
@@ -93,7 +93,7 @@ NUM_SPRITEANIMDICT_ENTRIES EQU 10
 	const SPRITE_ANIM_SEQ_GS_INTRO_BUBBLE             ; 04
 	const SPRITE_ANIM_SEQ_GS_INTRO_SHELLDER           ; 05
 	const SPRITE_ANIM_SEQ_GS_INTRO_MAGIKARP           ; 06
-	const SPRITE_ANIM_SEQ_UNUSED_LAPRAS               ; 07
+	const SPRITE_ANIM_SEQ_UNUSED_INTRO_AERODACTYL     ; 07
 	const SPRITE_ANIM_SEQ_GS_INTRO_LAPRAS             ; 08
 	const SPRITE_ANIM_SEQ_GS_INTRO_NOTE               ; 09
 	const SPRITE_ANIM_SEQ_GS_INTRO_JIGGLYPUFF         ; 0a
@@ -138,7 +138,7 @@ NUM_SPRITEANIMDICT_ENTRIES EQU 10
 	const SPRITE_ANIM_FRAMESET_GS_INTRO_BUBBLE           ; 04
 	const SPRITE_ANIM_FRAMESET_GS_INTRO_SHELLDER         ; 05
 	const SPRITE_ANIM_FRAMESET_GS_INTRO_MAGIKARP         ; 06
-	const SPRITE_ANIM_FRAMESET_UNUSED_LAPRAS             ; 07
+	const SPRITE_ANIM_FRAMESET_UNUSED_INTRO_AERODACTYL   ; 07
 	const SPRITE_ANIM_FRAMESET_GS_INTRO_LAPRAS           ; 08
 	const SPRITE_ANIM_FRAMESET_GS_INTRO_NOTE             ; 09
 	const SPRITE_ANIM_FRAMESET_GS_INTRO_INVISIBLE_NOTE   ; 0a
@@ -198,7 +198,7 @@ NUM_SPRITEANIMDICT_ENTRIES EQU 10
 	const SPRITE_ANIM_OAMSET_GS_INTRO_SHELLDER_2         ; 05
 	const SPRITE_ANIM_OAMSET_GS_INTRO_MAGIKARP_1         ; 06
 	const SPRITE_ANIM_OAMSET_GS_INTRO_MAGIKARP_2         ; 07
-	const SPRITE_ANIM_OAMSET_GS_INTRO_UNUSED_LAPRAS      ; 08
+	const SPRITE_ANIM_OAMSET_UNUSED_INTRO_AERODACTYL     ; 08
 	const SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_1           ; 09
 	const SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_2           ; 0a
 	const SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_3           ; 0b
diff --git a/data/sprite_anims/framesets.asm b/data/sprite_anims/framesets.asm
index 4ae8d6b7..9660043f 100644
--- a/data/sprite_anims/framesets.asm
+++ b/data/sprite_anims/framesets.asm
@@ -7,7 +7,7 @@ SpriteAnimFrameData:
 	dw .Frameset_GSIntroBubble
 	dw .Frameset_GSIntroShellder
 	dw .Frameset_GSIntroMagikarp
-	dw .Frameset_UnusedLapras
+	dw .Frameset_UnusedIntroAerodactyl
 	dw .Frameset_GSIntroLapras
 	dw .Frameset_GSIntroNote
 	dw .Frameset_GSIntroInvisibleNote
@@ -98,8 +98,8 @@ SpriteAnimFrameData:
 	frame SPRITE_ANIM_OAMSET_GS_INTRO_MAGIKARP_2,  1, OAM_X_FLIP
 	dorestart
 
-.Frameset_UnusedLapras:
-	frame SPRITE_ANIM_OAMSET_GS_INTRO_UNUSED_LAPRAS,  7, OAM_X_FLIP
+.Frameset_UnusedIntroAerodactyl:
+	frame SPRITE_ANIM_OAMSET_UNUSED_INTRO_AERODACTYL,  7, OAM_X_FLIP
 	endanim
 
 .Frameset_GSIntroLapras:
@@ -380,7 +380,6 @@ IF DEF(_GOLD)
 	frame SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_3,  9
 	frame SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_5, 10
 	dorestart
-
 ELIF DEF(_SILVER)
 	frame SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_2,  3
 	frame SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_1,  7
diff --git a/data/sprite_anims/oam.asm b/data/sprite_anims/oam.asm
index d34d3a03..00da9b51 100644
--- a/data/sprite_anims/oam.asm
+++ b/data/sprite_anims/oam.asm
@@ -9,7 +9,7 @@ SpriteAnimOAMData:
 	dbw $6e, .OAMData_GSIntroShellder          ; SPRITE_ANIM_OAMSET_GS_INTRO_SHELLDER_2
 	dbw $2d, .OAMData_GSIntroMagikarp          ; SPRITE_ANIM_OAMSET_GS_INTRO_MAGIKARP_1
 	dbw $4d, .OAMData_GSIntroMagikarp          ; SPRITE_ANIM_OAMSET_GS_INTRO_MAGIKARP_2
- 	dbw $60, .OAMData_UnusedLapras             ; SPRITE_ANIM_OAMSET_GS_INTRO_UNUSED_LAPRAS
+ 	dbw $60, .OAMData_UnusedIntroAerodactyl    ; SPRITE_ANIM_OAMSET_UNUSED_INTRO_AERODACTYL
  	dbw $00, .OAMData_GSIntroLapras1           ; SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_1
  	dbw $00, .OAMData_GSIntroLapras2           ; SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_2
 	dbw $06, .OAMData_GSIntroLapras3           ; SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_3
@@ -355,7 +355,9 @@ ENDC
 	dbsprite -1,  0,  4,  0, $11, 1
 	dbsprite  0,  0,  4,  0, $12, 1
 
-.OAMData_UnusedLapras:
+.OAMData_UnusedIntroAerodactyl:
+; These OAM sprite definitions, with the vtile offset $60 from SpriteAnimOAMData,
+; correspond to unused Aerodactyl graphics in pokegold-spaceworld's gfx/intro/water_pokemon.png.
 	db 10
 	dbsprite -2, -2,  0,  4, $00, 0
 	dbsprite -1, -2,  0,  4, $01, 0
diff --git a/data/sprite_anims/sequences.asm b/data/sprite_anims/sequences.asm
index 24b0d9b8..726c26d7 100644
--- a/data/sprite_anims/sequences.asm
+++ b/data/sprite_anims/sequences.asm
@@ -9,8 +9,8 @@ SpriteAnimSeqData:
 	db SPRITE_ANIM_FRAMESET_GS_INTRO_SHELLDER,         SPRITE_ANIM_SEQ_GS_INTRO_SHELLDER,           SPRITE_ANIM_DICT_DEFAULT
 ; SPRITE_ANIM_INDEX_GS_INTRO_MAGIKARP
 	db SPRITE_ANIM_FRAMESET_GS_INTRO_MAGIKARP,         SPRITE_ANIM_SEQ_GS_INTRO_MAGIKARP,           SPRITE_ANIM_DICT_DEFAULT
-; SPRITE_ANIM_INDEX_UNUSED_LAPRAS
-	db SPRITE_ANIM_FRAMESET_UNUSED_LAPRAS,             SPRITE_ANIM_SEQ_UNUSED_LAPRAS,               SPRITE_ANIM_DICT_DEFAULT
+; SPRITE_ANIM_INDEX_UNUSED_INTRO_AERODACTYL
+	db SPRITE_ANIM_FRAMESET_UNUSED_INTRO_AERODACTYL,   SPRITE_ANIM_SEQ_UNUSED_INTRO_AERODACTYL,     SPRITE_ANIM_DICT_DEFAULT
 ; SPRITE_ANIM_INDEX_GS_INTRO_LAPRAS
 	db SPRITE_ANIM_FRAMESET_GS_INTRO_LAPRAS,           SPRITE_ANIM_SEQ_GS_INTRO_LAPRAS,             SPRITE_ANIM_DICT_DEFAULT
 ; SPRITE_ANIM_INDEX_GS_INTRO_NOTE
diff --git a/engine/gfx/sprite_anims.asm b/engine/gfx/sprite_anims.asm
index 93b69a3c..76d6230c 100644
--- a/engine/gfx/sprite_anims.asm
+++ b/engine/gfx/sprite_anims.asm
@@ -20,7 +20,7 @@ DoAnimFrame:
 	dw AnimSeq_GSIntroBubble
 	dw AnimSeq_GSIntroShellder
 	dw AnimSeq_GSIntroMagikarp
-	dw AnimSeq_UnusedLapras
+	dw AnimSeq_UnusedIntroAerodactyl
 	dw AnimSeq_GSIntroLapras
 	dw AnimSeq_GSIntroNote
 	dw AnimSeq_GSIntroJigglypuff
@@ -225,7 +225,7 @@ AnimSeq_GSIntroMagikarp:
 	call DeinitializeSprite
 	ret
 
-AnimSeq_UnusedLapras:
+AnimSeq_UnusedIntroAerodactyl:
 	ld hl, SPRITEANIMSTRUCT_XCOORD
 	add hl, bc
 	ld a, [hl]
diff --git a/engine/movie/intro.asm b/engine/movie/intro.asm
index 03a1c1a8..4772037f 100644
--- a/engine/movie/intro.asm
+++ b/engine/movie/intro.asm
@@ -419,9 +419,9 @@ Intro_InitLapras:
 	call InitSpriteAnimStruct
 	ret
 
-Intro_UnusedInitLapras: ; unreferenced
+Intro_UnusedInitAerodactyl: ; unreferenced
 	depixel 2, 0
-	ld a, SPRITE_ANIM_INDEX_UNUSED_LAPRAS
+	ld a, SPRITE_ANIM_INDEX_UNUSED_INTRO_AERODACTYL
 	call InitSpriteAnimStruct
 	ret