GS_INTRO_STAR/SPARKLE -> GS_GAMEFREAK_LOGO_STAR/SPARKLE

These two sprite animations are related to the Game Freak Logo splash
screen, not the actual intro.

6 files changed, 268 insertions, 268 deletions

diff --git a/constants/sprite_anim_constants.asm b/constants/sprite_anim_constants.asm
index 9e8639de..4f66040b 100644
--- a/constants/sprite_anim_constants.asm
+++ b/constants/sprite_anim_constants.asm
@@ -21,53 +21,53 @@ NUM_SPRITE_ANIM_STRUCTS EQU 10 ; see wSpriteAnimationStructs
 
 ; SpriteAnimSeqData indexes (see data/sprite_anims/sequences.asm)
 	const_def
-	const SPRITE_ANIM_INDEX_PARTY_MON               ; 00
-	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_GS_INTRO_LAPRAS         ; 05
-	const SPRITE_ANIM_INDEX_GS_INTRO_NOTE           ; 06
-	const SPRITE_ANIM_INDEX_GS_INTRO_INVISIBLE_NOTE ; 07
-	const SPRITE_ANIM_INDEX_GS_INTRO_JIGGLYPUFF     ; 08
-	const SPRITE_ANIM_INDEX_GS_INTRO_PIKACHU        ; 09
-	const SPRITE_ANIM_INDEX_GS_INTRO_PIKACHU_TAIL   ; 0a
-	const SPRITE_ANIM_INDEX_GS_INTRO_FIREBALL       ; 0b
-	const SPRITE_ANIM_INDEX_GS_INTRO_CHIKORITA      ; 0c
-	const SPRITE_ANIM_INDEX_GS_INTRO_CYNDAQUIL      ; 0d
-	const SPRITE_ANIM_INDEX_GS_INTRO_TOTODILE       ; 0e
-	const SPRITE_ANIM_INDEX_GS_TITLE_TRAIL          ; 0f
-	const SPRITE_ANIM_INDEX_UNUSED_PIKACHU          ; 10
-	const SPRITE_ANIM_INDEX_UNUSED_PIKACHU_TAIL     ; 11
-	const SPRITE_ANIM_INDEX_UNUSED_NOTE             ; 12
-	const SPRITE_ANIM_INDEX_UNUSED_JIGGLYPUFF       ; 13
-	const SPRITE_ANIM_INDEX_NAMING_SCREEN_CURSOR    ; 14
-	const SPRITE_ANIM_INDEX_GAMEFREAK_LOGO          ; 15
-	const SPRITE_ANIM_INDEX_GS_INTRO_STAR           ; 16
-	const SPRITE_ANIM_INDEX_GS_INTRO_SPARKLE        ; 17
-	const SPRITE_ANIM_INDEX_SLOTS_GOLEM             ; 18
-	const SPRITE_ANIM_INDEX_SLOTS_CHANSEY           ; 19
-	const SPRITE_ANIM_INDEX_SLOTS_EGG               ; 1a
-	const SPRITE_ANIM_INDEX_COMPOSE_MAIL_CURSOR     ; 1b
-	const SPRITE_ANIM_INDEX_RED_WALK                ; 1c
-	const SPRITE_ANIM_INDEX_UNUSED_CURSOR           ; 1d
-	const SPRITE_ANIM_INDEX_DUMMY_GAME              ; 1e
-	const SPRITE_ANIM_INDEX_POKEGEAR_ARROW          ; 1f
-	const SPRITE_ANIM_INDEX_TRADE_POKE_BALL         ; 20
-	const SPRITE_ANIM_INDEX_TRADE_POOF              ; 21
-	const SPRITE_ANIM_INDEX_TRADE_TUBE_BULGE        ; 22
-	const SPRITE_ANIM_INDEX_TRADEMON_ICON           ; 23
-	const SPRITE_ANIM_INDEX_TRADEMON_BUBBLE         ; 24
-	const SPRITE_ANIM_INDEX_EVOLUTION_BALL_OF_LIGHT ; 25
-	const SPRITE_ANIM_INDEX_RADIO_TUNING_KNOB       ; 26
-	const SPRITE_ANIM_INDEX_MAGNET_TRAIN_RED        ; 27
-	const SPRITE_ANIM_INDEX_LEAF                    ; 28
-	const SPRITE_ANIM_INDEX_CUT_TREE                ; 29
-	const SPRITE_ANIM_INDEX_FLY_LEAF                ; 2a
-	const SPRITE_ANIM_INDEX_EGG_CRACK               ; 2b
-	const SPRITE_ANIM_INDEX_GS_INTRO_HO_OH_LUGIA    ; 2c
-	const SPRITE_ANIM_INDEX_HEADBUTT                ; 2d
-	const SPRITE_ANIM_INDEX_EGG_HATCH               ; 2e
+	const SPRITE_ANIM_INDEX_PARTY_MON                 ; 00
+	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_GS_INTRO_LAPRAS           ; 05
+	const SPRITE_ANIM_INDEX_GS_INTRO_NOTE             ; 06
+	const SPRITE_ANIM_INDEX_GS_INTRO_INVISIBLE_NOTE   ; 07
+	const SPRITE_ANIM_INDEX_GS_INTRO_JIGGLYPUFF       ; 08
+	const SPRITE_ANIM_INDEX_GS_INTRO_PIKACHU          ; 09
+	const SPRITE_ANIM_INDEX_GS_INTRO_PIKACHU_TAIL     ; 0a
+	const SPRITE_ANIM_INDEX_GS_INTRO_FIREBALL         ; 0b
+	const SPRITE_ANIM_INDEX_GS_INTRO_CHIKORITA        ; 0c
+	const SPRITE_ANIM_INDEX_GS_INTRO_CYNDAQUIL        ; 0d
+	const SPRITE_ANIM_INDEX_GS_INTRO_TOTODILE         ; 0e
+	const SPRITE_ANIM_INDEX_GS_TITLE_TRAIL            ; 0f
+	const SPRITE_ANIM_INDEX_UNUSED_PIKACHU            ; 10
+	const SPRITE_ANIM_INDEX_UNUSED_PIKACHU_TAIL       ; 11
+	const SPRITE_ANIM_INDEX_UNUSED_NOTE               ; 12
+	const SPRITE_ANIM_INDEX_UNUSED_JIGGLYPUFF         ; 13
+	const SPRITE_ANIM_INDEX_NAMING_SCREEN_CURSOR      ; 14
+	const SPRITE_ANIM_INDEX_GAMEFREAK_LOGO            ; 15
+	const SPRITE_ANIM_INDEX_GS_GAMEFREAK_LOGO_STAR    ; 16
+	const SPRITE_ANIM_INDEX_GS_GAMEFREAK_LOGO_SPARKLE ; 17
+	const SPRITE_ANIM_INDEX_SLOTS_GOLEM               ; 18
+	const SPRITE_ANIM_INDEX_SLOTS_CHANSEY             ; 19
+	const SPRITE_ANIM_INDEX_SLOTS_EGG                 ; 1a
+	const SPRITE_ANIM_INDEX_COMPOSE_MAIL_CURSOR       ; 1b
+	const SPRITE_ANIM_INDEX_RED_WALK                  ; 1c
+	const SPRITE_ANIM_INDEX_UNUSED_CURSOR             ; 1d
+	const SPRITE_ANIM_INDEX_DUMMY_GAME                ; 1e
+	const SPRITE_ANIM_INDEX_POKEGEAR_ARROW            ; 1f
+	const SPRITE_ANIM_INDEX_TRADE_POKE_BALL           ; 20
+	const SPRITE_ANIM_INDEX_TRADE_POOF                ; 21
+	const SPRITE_ANIM_INDEX_TRADE_TUBE_BULGE          ; 22
+	const SPRITE_ANIM_INDEX_TRADEMON_ICON             ; 23
+	const SPRITE_ANIM_INDEX_TRADEMON_BUBBLE           ; 24
+	const SPRITE_ANIM_INDEX_EVOLUTION_BALL_OF_LIGHT   ; 25
+	const SPRITE_ANIM_INDEX_RADIO_TUNING_KNOB         ; 26
+	const SPRITE_ANIM_INDEX_MAGNET_TRAIN_RED          ; 27
+	const SPRITE_ANIM_INDEX_LEAF                      ; 28
+	const SPRITE_ANIM_INDEX_CUT_TREE                  ; 29
+	const SPRITE_ANIM_INDEX_FLY_LEAF                  ; 2a
+	const SPRITE_ANIM_INDEX_EGG_CRACK                 ; 2b
+	const SPRITE_ANIM_INDEX_GS_INTRO_HO_OH_LUGIA      ; 2c
+	const SPRITE_ANIM_INDEX_HEADBUTT                  ; 2d
+	const SPRITE_ANIM_INDEX_EGG_HATCH                 ; 2e
 
 ; DoAnimFrame.Jumptable indexes (see engine/gfx/sprite_anims.asm)
 	const_def
@@ -94,8 +94,8 @@ NUM_SPRITE_ANIM_STRUCTS EQU 10 ; see wSpriteAnimationStructs
 	const SPRITE_ANIM_SEQ_UNUSED_JIGGLYPUFF           ; 14
 	const SPRITE_ANIM_SEQ_NAMING_SCREEN_CURSOR        ; 15
 	const SPRITE_ANIM_SEQ_GAMEFREAK_LOGO              ; 16
-	const SPRITE_ANIM_SEQ_GS_INTRO_STAR               ; 17
-	const SPRITE_ANIM_SEQ_GS_INTRO_SPARKLE            ; 18
+	const SPRITE_ANIM_SEQ_GS_GAMEFREAK_LOGO_STAR      ; 17
+	const SPRITE_ANIM_SEQ_GS_GAMEFREAK_LOGO_SPARKLE   ; 18
 	const SPRITE_ANIM_SEQ_SLOTS_GOLEM                 ; 19
 	const SPRITE_ANIM_SEQ_SLOTS_CHANSEY               ; 1a
 	const SPRITE_ANIM_SEQ_SLOTS_EGG                   ; 1b
@@ -116,154 +116,154 @@ NUM_SPRITE_ANIM_STRUCTS EQU 10 ; see wSpriteAnimationStructs
 
 ; SpriteAnimFrameData indexes (see data/sprite_anims/framesets.asm)
 	const_def
-	const SPRITE_ANIM_FRAMESET_00                       ; 00
-	const SPRITE_ANIM_FRAMESET_PARTY_MON                ; 01
-	const SPRITE_ANIM_FRAMESET_PARTY_MON_WITH_MAIL      ; 02
-	const SPRITE_ANIM_FRAMESET_PARTY_MON_WITH_ITEM      ; 03
-	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_GS_INTRO_LAPRAS          ; 08
-	const SPRITE_ANIM_FRAMESET_GS_INTRO_NOTE            ; 09
-	const SPRITE_ANIM_FRAMESET_GS_INTRO_INVISIBLE_NOTE  ; 0a
-	const SPRITE_ANIM_FRAMESET_GS_INTRO_JIGGLYPUFF      ; 0b
-	const SPRITE_ANIM_FRAMESET_GS_INTRO_JIGGLYPUFF_2    ; 0c
-	const SPRITE_ANIM_FRAMESET_GS_INTRO_PIKACHU         ; 0d
-	const SPRITE_ANIM_FRAMESET_GS_INTRO_PIKACHU_2       ; 0e
-	const SPRITE_ANIM_FRAMESET_GS_INTRO_PIKACHU_3       ; 0f
-	const SPRITE_ANIM_FRAMESET_GS_INTRO_PIKACHU_TAIL    ; 10
-	const SPRITE_ANIM_FRAMESET_GS_INTRO_PIKACHU_TAIL_2  ; 11
-	const SPRITE_ANIM_FRAMESET_GS_INTRO_FIREBALL        ; 12
-	const SPRITE_ANIM_FRAMESET_GS_INTRO_CHIKORITA       ; 13
-	const SPRITE_ANIM_FRAMESET_GS_INTRO_CYNDAQUIL       ; 14
-	const SPRITE_ANIM_FRAMESET_GS_INTRO_TOTODILE        ; 15
-	const SPRITE_ANIM_FRAMESET_GS_TITLE_TRAIL           ; 16
-	const SPRITE_ANIM_FRAMESET_UNUSED_PIKACHU           ; 17
-	const SPRITE_ANIM_FRAMESET_UNUSED_PIKACHU_2         ; 18
-	const SPRITE_ANIM_FRAMESET_UNUSED_PIKACHU_3         ; 19
-	const SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR        ; 1a
-	const SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR_BIG    ; 1b
-	const SPRITE_ANIM_FRAMESET_GAMEFREAK_LOGO           ; 1c
-	const SPRITE_ANIM_FRAMESET_GS_INTRO_STAR            ; 1d
-	const SPRITE_ANIM_FRAMESET_GS_INTRO_SPARKLE         ; 1e
-	const SPRITE_ANIM_FRAMESET_SLOTS_GOLEM              ; 1f
-	const SPRITE_ANIM_FRAMESET_SLOTS_CHANSEY            ; 20
-	const SPRITE_ANIM_FRAMESET_SLOTS_CHANSEY_2          ; 21
-	const SPRITE_ANIM_FRAMESET_SLOTS_EGG                ; 22
-	const SPRITE_ANIM_FRAMESET_RED_WALK                 ; 23
-	const SPRITE_ANIM_FRAMESET_STILL_CURSOR             ; 24
-	const SPRITE_ANIM_FRAMESET_TRADE_POKE_BALL          ; 25
-	const SPRITE_ANIM_FRAMESET_TRADE_POKE_BALL_WOBBLE   ; 26
-	const SPRITE_ANIM_FRAMESET_TRADE_POOF               ; 27
-	const SPRITE_ANIM_FRAMESET_TRADE_TUBE_BULGE         ; 28
-	const SPRITE_ANIM_FRAMESET_TRADEMON_ICON            ; 29
-	const SPRITE_ANIM_FRAMESET_TRADEMON_BUBBLE          ; 2a
-	const SPRITE_ANIM_FRAMESET_EVOLUTION_BALL_OF_LIGHT  ; 2b
-	const SPRITE_ANIM_FRAMESET_RADIO_TUNING_KNOB        ; 2c
-	const SPRITE_ANIM_FRAMESET_MAGNET_TRAIN_RED         ; 2d
-	const SPRITE_ANIM_FRAMESET_UNUSED_2E                ; 2e
-	const SPRITE_ANIM_FRAMESET_LEAF                     ; 2f
-	const SPRITE_ANIM_FRAMESET_CUT_TREE                 ; 30
-	const SPRITE_ANIM_FRAMESET_EGG_CRACK                ; 31
-	const SPRITE_ANIM_FRAMESET_EGG_HATCH_1              ; 32
-	const SPRITE_ANIM_FRAMESET_EGG_HATCH_2              ; 33
-	const SPRITE_ANIM_FRAMESET_EGG_HATCH_3              ; 34
-	const SPRITE_ANIM_FRAMESET_EGG_HATCH_4              ; 35
-	const SPRITE_ANIM_FRAMESET_GS_INTRO_HO_OH_LUGIA     ; 36
-	const SPRITE_ANIM_FRAMESET_HEADBUTT                 ; 37
+	const SPRITE_ANIM_FRAMESET_00                        ; 00
+	const SPRITE_ANIM_FRAMESET_PARTY_MON                 ; 01
+	const SPRITE_ANIM_FRAMESET_PARTY_MON_WITH_MAIL       ; 02
+	const SPRITE_ANIM_FRAMESET_PARTY_MON_WITH_ITEM       ; 03
+	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_GS_INTRO_LAPRAS           ; 08
+	const SPRITE_ANIM_FRAMESET_GS_INTRO_NOTE             ; 09
+	const SPRITE_ANIM_FRAMESET_GS_INTRO_INVISIBLE_NOTE   ; 0a
+	const SPRITE_ANIM_FRAMESET_GS_INTRO_JIGGLYPUFF       ; 0b
+	const SPRITE_ANIM_FRAMESET_GS_INTRO_JIGGLYPUFF_2     ; 0c
+	const SPRITE_ANIM_FRAMESET_GS_INTRO_PIKACHU          ; 0d
+	const SPRITE_ANIM_FRAMESET_GS_INTRO_PIKACHU_2        ; 0e
+	const SPRITE_ANIM_FRAMESET_GS_INTRO_PIKACHU_3        ; 0f
+	const SPRITE_ANIM_FRAMESET_GS_INTRO_PIKACHU_TAIL     ; 10
+	const SPRITE_ANIM_FRAMESET_GS_INTRO_PIKACHU_TAIL_2   ; 11
+	const SPRITE_ANIM_FRAMESET_GS_INTRO_FIREBALL         ; 12
+	const SPRITE_ANIM_FRAMESET_GS_INTRO_CHIKORITA        ; 13
+	const SPRITE_ANIM_FRAMESET_GS_INTRO_CYNDAQUIL        ; 14
+	const SPRITE_ANIM_FRAMESET_GS_INTRO_TOTODILE         ; 15
+	const SPRITE_ANIM_FRAMESET_GS_TITLE_TRAIL            ; 16
+	const SPRITE_ANIM_FRAMESET_UNUSED_PIKACHU            ; 17
+	const SPRITE_ANIM_FRAMESET_UNUSED_PIKACHU_2          ; 18
+	const SPRITE_ANIM_FRAMESET_UNUSED_PIKACHU_3          ; 19
+	const SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR         ; 1a
+	const SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR_BIG     ; 1b
+	const SPRITE_ANIM_FRAMESET_GAMEFREAK_LOGO            ; 1c
+	const SPRITE_ANIM_FRAMESET_GS_GAMEFREAK_LOGO_STAR    ; 1d
+	const SPRITE_ANIM_FRAMESET_GS_GAMEFREAK_LOGO_SPARKLE ; 1e
+	const SPRITE_ANIM_FRAMESET_SLOTS_GOLEM               ; 1f
+	const SPRITE_ANIM_FRAMESET_SLOTS_CHANSEY             ; 20
+	const SPRITE_ANIM_FRAMESET_SLOTS_CHANSEY_2           ; 21
+	const SPRITE_ANIM_FRAMESET_SLOTS_EGG                 ; 22
+	const SPRITE_ANIM_FRAMESET_RED_WALK                  ; 23
+	const SPRITE_ANIM_FRAMESET_STILL_CURSOR              ; 24
+	const SPRITE_ANIM_FRAMESET_TRADE_POKE_BALL           ; 25
+	const SPRITE_ANIM_FRAMESET_TRADE_POKE_BALL_WOBBLE    ; 26
+	const SPRITE_ANIM_FRAMESET_TRADE_POOF                ; 27
+	const SPRITE_ANIM_FRAMESET_TRADE_TUBE_BULGE          ; 28
+	const SPRITE_ANIM_FRAMESET_TRADEMON_ICON             ; 29
+	const SPRITE_ANIM_FRAMESET_TRADEMON_BUBBLE           ; 2a
+	const SPRITE_ANIM_FRAMESET_EVOLUTION_BALL_OF_LIGHT   ; 2b
+	const SPRITE_ANIM_FRAMESET_RADIO_TUNING_KNOB         ; 2c
+	const SPRITE_ANIM_FRAMESET_MAGNET_TRAIN_RED          ; 2d
+	const SPRITE_ANIM_FRAMESET_UNUSED_2E                 ; 2e
+	const SPRITE_ANIM_FRAMESET_LEAF                      ; 2f
+	const SPRITE_ANIM_FRAMESET_CUT_TREE                  ; 30
+	const SPRITE_ANIM_FRAMESET_EGG_CRACK                 ; 31
+	const SPRITE_ANIM_FRAMESET_EGG_HATCH_1               ; 32
+	const SPRITE_ANIM_FRAMESET_EGG_HATCH_2               ; 33
+	const SPRITE_ANIM_FRAMESET_EGG_HATCH_3               ; 34
+	const SPRITE_ANIM_FRAMESET_EGG_HATCH_4               ; 35
+	const SPRITE_ANIM_FRAMESET_GS_INTRO_HO_OH_LUGIA      ; 36
+	const SPRITE_ANIM_FRAMESET_HEADBUTT                  ; 37
 
 ; SpriteAnimOAMData indexes (see data/sprite_anims/oam.asm)
 	const_def
-	const SPRITE_ANIM_OAMSET_RED_WALK_1                 ; 00
-	const SPRITE_ANIM_OAMSET_RED_WALK_2                 ; 01
-	const SPRITE_ANIM_OAMSET_GS_INTRO_BUBBLE_1          ; 02
-	const SPRITE_ANIM_OAMSET_GS_INTRO_BUBBLE_2          ; 03
-	const SPRITE_ANIM_OAMSET_GS_INTRO_SHELLDER_1        ; 04
-	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_GS_INTRO_LAPRAS_1          ; 09
-	const SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_2          ; 0a
-	const SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_3          ; 0b
-	const SPRITE_ANIM_OAMSET_GS_INTRO_NOTE              ; 0c
-	const SPRITE_ANIM_OAMSET_GS_INTRO_INVISIBLE_NOTE    ; 0d
-	const SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_1      ; 0e
-	const SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_2      ; 0f
-	const SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_3      ; 10
-	const SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_1         ; 11
-	const SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_2         ; 12
-	const SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_3         ; 13
-	const SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_4         ; 14
-	const SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_TAIL_1    ; 15
-	const SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_TAIL_2    ; 16
-	const SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_TAIL_3    ; 17
-	const SPRITE_ANIM_OAMSET_GS_INTRO_SMALL_FIREBALL    ; 18
-	const SPRITE_ANIM_OAMSET_GS_INTRO_MED_FIREBALL      ; 19
-	const SPRITE_ANIM_OAMSET_GS_INTRO_BIG_FIREBALL      ; 1a
-	const SPRITE_ANIM_OAMSET_GS_INTRO_CHIKORITA         ; 1b
-	const SPRITE_ANIM_OAMSET_GS_INTRO_CYNDAQUIL         ; 1c
-	const SPRITE_ANIM_OAMSET_GS_INTRO_TOTODILE          ; 1d
-	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_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
-	const SPRITE_ANIM_OAMSET_GS_INTRO_SPARKLE_2         ; 25
-	const SPRITE_ANIM_OAMSET_GS_INTRO_SPARKLE_3         ; 26
-	const SPRITE_ANIM_OAMSET_SLOTS_GOLEM_1              ; 27
-	const SPRITE_ANIM_OAMSET_SLOTS_GOLEM_2              ; 28
-	const SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_1            ; 29
-	const SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_2            ; 2a
-	const SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_3            ; 2b
-	const SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_4            ; 2c
-	const SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_5            ; 2d
-	const SPRITE_ANIM_OAMSET_SLOTS_EGG                  ; 2e
-	const SPRITE_ANIM_OAMSET_STILL_CURSOR               ; 2f
-	const SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1          ; 30
-	const SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_2          ; 31
-	const SPRITE_ANIM_OAMSET_TRADE_POOF_1               ; 32
-	const SPRITE_ANIM_OAMSET_TRADE_POOF_2               ; 33
-	const SPRITE_ANIM_OAMSET_TRADE_POOF_3               ; 34
-	const SPRITE_ANIM_OAMSET_TRADE_TUBE_BULGE_1         ; 35
-	const SPRITE_ANIM_OAMSET_TRADE_TUBE_BULGE_2         ; 36
-	const SPRITE_ANIM_OAMSET_TRADEMON_ICON_1            ; 37
-	const SPRITE_ANIM_OAMSET_TRADEMON_ICON_2            ; 38
-	const SPRITE_ANIM_OAMSET_TRADEMON_BUBBLE            ; 39
-	const SPRITE_ANIM_OAMSET_EVOLUTION_BALL_OF_LIGHT_1  ; 3a
-	const SPRITE_ANIM_OAMSET_EVOLUTION_BALL_OF_LIGHT_2  ; 3b
-	const SPRITE_ANIM_OAMSET_RADIO_TUNING_KNOB          ; 3c
-	const SPRITE_ANIM_OAMSET_PARTY_MON_WITH_MAIL_1      ; 3d
-	const SPRITE_ANIM_OAMSET_PARTY_MON_WITH_MAIL_2      ; 3e
-	const SPRITE_ANIM_OAMSET_PARTY_MON_WITH_ITEM_1      ; 3f
-	const SPRITE_ANIM_OAMSET_PARTY_MON_WITH_ITEM_2      ; 40
-	const SPRITE_ANIM_OAMSET_MAGNET_TRAIN_RED_1         ; 41
-	const SPRITE_ANIM_OAMSET_MAGNET_TRAIN_RED_2         ; 42
-	const SPRITE_ANIM_OAMSET_UNUSED_43                  ; 43
-	const SPRITE_ANIM_OAMSET_UNUSED_44                  ; 44
-	const SPRITE_ANIM_OAMSET_UNUSED_45                  ; 45
-	const SPRITE_ANIM_OAMSET_UNUSED_46                  ; 46
-	const SPRITE_ANIM_OAMSET_UNUSED_47                  ; 47
-	const SPRITE_ANIM_OAMSET_UNUSED_48                  ; 48
-	const SPRITE_ANIM_OAMSET_UNUSED_49                  ; 49
-	const SPRITE_ANIM_OAMSET_UNUSED_4A                  ; 4a
-	const SPRITE_ANIM_OAMSET_UNUSED_4B                  ; 4b
-	const SPRITE_ANIM_OAMSET_UNUSED_4C                  ; 4c
-	const SPRITE_ANIM_OAMSET_UNUSED_4D                  ; 4d
-	const SPRITE_ANIM_OAMSET_UNUSED_4E                  ; 4e
-	const SPRITE_ANIM_OAMSET_LEAF                       ; 4f
-	const SPRITE_ANIM_OAMSET_TREE_1                     ; 50
-	const SPRITE_ANIM_OAMSET_CUT_TREE_2                 ; 51
-	const SPRITE_ANIM_OAMSET_CUT_TREE_3                 ; 52
-	const SPRITE_ANIM_OAMSET_CUT_TREE_4                 ; 53
-	const SPRITE_ANIM_OAMSET_EGG_CRACK                  ; 54
-	const SPRITE_ANIM_OAMSET_EGG_HATCH                  ; 55
-	const SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_1     ; 56
-	const SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_2     ; 57
-	const SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_3     ; 58
-	const SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_4     ; 59
-	const SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_5     ; 5a
-	const SPRITE_ANIM_OAMSET_HEADBUTT_TREE_2            ; 5b
+	const SPRITE_ANIM_OAMSET_RED_WALK_1                  ; 00
+	const SPRITE_ANIM_OAMSET_RED_WALK_2                  ; 01
+	const SPRITE_ANIM_OAMSET_GS_INTRO_BUBBLE_1           ; 02
+	const SPRITE_ANIM_OAMSET_GS_INTRO_BUBBLE_2           ; 03
+	const SPRITE_ANIM_OAMSET_GS_INTRO_SHELLDER_1         ; 04
+	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_GS_INTRO_LAPRAS_1           ; 09
+	const SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_2           ; 0a
+	const SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_3           ; 0b
+	const SPRITE_ANIM_OAMSET_GS_INTRO_NOTE               ; 0c
+	const SPRITE_ANIM_OAMSET_GS_INTRO_INVISIBLE_NOTE     ; 0d
+	const SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_1       ; 0e
+	const SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_2       ; 0f
+	const SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_3       ; 10
+	const SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_1          ; 11
+	const SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_2          ; 12
+	const SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_3          ; 13
+	const SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_4          ; 14
+	const SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_TAIL_1     ; 15
+	const SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_TAIL_2     ; 16
+	const SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_TAIL_3     ; 17
+	const SPRITE_ANIM_OAMSET_GS_INTRO_SMALL_FIREBALL     ; 18
+	const SPRITE_ANIM_OAMSET_GS_INTRO_MED_FIREBALL       ; 19
+	const SPRITE_ANIM_OAMSET_GS_INTRO_BIG_FIREBALL       ; 1a
+	const SPRITE_ANIM_OAMSET_GS_INTRO_CHIKORITA          ; 1b
+	const SPRITE_ANIM_OAMSET_GS_INTRO_CYNDAQUIL          ; 1c
+	const SPRITE_ANIM_OAMSET_GS_INTRO_TOTODILE           ; 1d
+	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_TEXT_ENTRY_CURSOR_BIG       ; 21
+	const SPRITE_ANIM_OAMSET_GS_GAMEFREAK_LOGO           ; 22
+	const SPRITE_ANIM_OAMSET_GS_GAMEFREAK_LOGO_STAR      ; 23
+	const SPRITE_ANIM_OAMSET_GS_GAMEFREAK_LOGO_SPARKLE_1 ; 24
+	const SPRITE_ANIM_OAMSET_GS_GAMEFREAK_LOGO_SPARKLE_2 ; 25
+	const SPRITE_ANIM_OAMSET_GS_GAMEFREAK_LOGO_SPARKLE_3 ; 26
+	const SPRITE_ANIM_OAMSET_SLOTS_GOLEM_1               ; 27
+	const SPRITE_ANIM_OAMSET_SLOTS_GOLEM_2               ; 28
+	const SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_1             ; 29
+	const SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_2             ; 2a
+	const SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_3             ; 2b
+	const SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_4             ; 2c
+	const SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_5             ; 2d
+	const SPRITE_ANIM_OAMSET_SLOTS_EGG                   ; 2e
+	const SPRITE_ANIM_OAMSET_STILL_CURSOR                ; 2f
+	const SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_1           ; 30
+	const SPRITE_ANIM_OAMSET_TRADE_POKE_BALL_2           ; 31
+	const SPRITE_ANIM_OAMSET_TRADE_POOF_1                ; 32
+	const SPRITE_ANIM_OAMSET_TRADE_POOF_2                ; 33
+	const SPRITE_ANIM_OAMSET_TRADE_POOF_3                ; 34
+	const SPRITE_ANIM_OAMSET_TRADE_TUBE_BULGE_1          ; 35
+	const SPRITE_ANIM_OAMSET_TRADE_TUBE_BULGE_2          ; 36
+	const SPRITE_ANIM_OAMSET_TRADEMON_ICON_1             ; 37
+	const SPRITE_ANIM_OAMSET_TRADEMON_ICON_2             ; 38
+	const SPRITE_ANIM_OAMSET_TRADEMON_BUBBLE             ; 39
+	const SPRITE_ANIM_OAMSET_EVOLUTION_BALL_OF_LIGHT_1   ; 3a
+	const SPRITE_ANIM_OAMSET_EVOLUTION_BALL_OF_LIGHT_2   ; 3b
+	const SPRITE_ANIM_OAMSET_RADIO_TUNING_KNOB           ; 3c
+	const SPRITE_ANIM_OAMSET_PARTY_MON_WITH_MAIL_1       ; 3d
+	const SPRITE_ANIM_OAMSET_PARTY_MON_WITH_MAIL_2       ; 3e
+	const SPRITE_ANIM_OAMSET_PARTY_MON_WITH_ITEM_1       ; 3f
+	const SPRITE_ANIM_OAMSET_PARTY_MON_WITH_ITEM_2       ; 40
+	const SPRITE_ANIM_OAMSET_MAGNET_TRAIN_RED_1          ; 41
+	const SPRITE_ANIM_OAMSET_MAGNET_TRAIN_RED_2          ; 42
+	const SPRITE_ANIM_OAMSET_UNUSED_43                   ; 43
+	const SPRITE_ANIM_OAMSET_UNUSED_44                   ; 44
+	const SPRITE_ANIM_OAMSET_UNUSED_45                   ; 45
+	const SPRITE_ANIM_OAMSET_UNUSED_46                   ; 46
+	const SPRITE_ANIM_OAMSET_UNUSED_47                   ; 47
+	const SPRITE_ANIM_OAMSET_UNUSED_48                   ; 48
+	const SPRITE_ANIM_OAMSET_UNUSED_49                   ; 49
+	const SPRITE_ANIM_OAMSET_UNUSED_4A                   ; 4a
+	const SPRITE_ANIM_OAMSET_UNUSED_4B                   ; 4b
+	const SPRITE_ANIM_OAMSET_UNUSED_4C                   ; 4c
+	const SPRITE_ANIM_OAMSET_UNUSED_4D                   ; 4d
+	const SPRITE_ANIM_OAMSET_UNUSED_4E                   ; 4e
+	const SPRITE_ANIM_OAMSET_LEAF                        ; 4f
+	const SPRITE_ANIM_OAMSET_TREE_1                      ; 50
+	const SPRITE_ANIM_OAMSET_CUT_TREE_2                  ; 51
+	const SPRITE_ANIM_OAMSET_CUT_TREE_3                  ; 52
+	const SPRITE_ANIM_OAMSET_CUT_TREE_4                  ; 53
+	const SPRITE_ANIM_OAMSET_EGG_CRACK                   ; 54
+	const SPRITE_ANIM_OAMSET_EGG_HATCH                   ; 55
+	const SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_1      ; 56
+	const SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_2      ; 57
+	const SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_3      ; 58
+	const SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_4      ; 59
+	const SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_5      ; 5a
+	const SPRITE_ANIM_OAMSET_HEADBUTT_TREE_2             ; 5b
diff --git a/data/sprite_anims/framesets.asm b/data/sprite_anims/framesets.asm
index 22b81d0b..6104dbb7 100644
--- a/data/sprite_anims/framesets.asm
+++ b/data/sprite_anims/framesets.asm
@@ -29,8 +29,8 @@ SpriteAnimFrameData:
 	dw .Frameset_TextEntryCursor
 	dw .Frameset_TextEntryCursorBig
 	dw .Frameset_GameFreakLogo
-	dw .Frameset_GSIntroStar
-	dw .Frameset_GSIntroSparkle
+	dw .Frameset_GSGameFreakLogoStar
+	dw .Frameset_GSGameFreakLogoSparkle
 	dw .Frameset_SlotsGolem
 	dw .Frameset_SlotsChansey
 	dw .Frameset_SlotsChansey2
@@ -198,19 +198,19 @@ ENDC
 	dorestart
 
 .Frameset_GameFreakLogo:
-	frame SPRITE_ANIM_OAMSET_GS_INTRO_GAMEFREAK_LOGO,  8
+	frame SPRITE_ANIM_OAMSET_GS_GAMEFREAK_LOGO,  8
 	endanim
 
-.Frameset_GSIntroStar:
-	frame SPRITE_ANIM_OAMSET_GS_INTRO_STAR,  3
-	frame SPRITE_ANIM_OAMSET_GS_INTRO_STAR,  3, OAM_Y_FLIP
+.Frameset_GSGameFreakLogoStar:
+	frame SPRITE_ANIM_OAMSET_GS_GAMEFREAK_LOGO_STAR,  3
+	frame SPRITE_ANIM_OAMSET_GS_GAMEFREAK_LOGO_STAR,  3, OAM_Y_FLIP
 	dorestart
 
-.Frameset_GSIntroSparkle:
-	frame SPRITE_ANIM_OAMSET_GS_INTRO_SPARKLE_1,  2
-	frame SPRITE_ANIM_OAMSET_GS_INTRO_SPARKLE_2,  2
-	frame SPRITE_ANIM_OAMSET_GS_INTRO_SPARKLE_3,  2
-	frame SPRITE_ANIM_OAMSET_GS_INTRO_SPARKLE_2,  2
+.Frameset_GSGameFreakLogoSparkle:
+	frame SPRITE_ANIM_OAMSET_GS_GAMEFREAK_LOGO_SPARKLE_1,  2
+	frame SPRITE_ANIM_OAMSET_GS_GAMEFREAK_LOGO_SPARKLE_2,  2
+	frame SPRITE_ANIM_OAMSET_GS_GAMEFREAK_LOGO_SPARKLE_3,  2
+	frame SPRITE_ANIM_OAMSET_GS_GAMEFREAK_LOGO_SPARKLE_2,  2
 	dorestart
 
 .Frameset_SlotsGolem:
diff --git a/data/sprite_anims/oam.asm b/data/sprite_anims/oam.asm
index a1380a1b..cc43267d 100644
--- a/data/sprite_anims/oam.asm
+++ b/data/sprite_anims/oam.asm
@@ -35,11 +35,11 @@ SpriteAnimOAMData:
 	dbw $fa, .OAMData_GSTitleTrail             ; SPRITE_ANIM_OAMSET_GS_TITLE_TRAIL_2
 	dbw $00, .OAMData_TextEntryCursor          ; SPRITE_ANIM_OAMSET_TEXT_ENTRY_CURSOR
 	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
-	dbw $12, .OAMData_1x1_Palette0             ; SPRITE_ANIM_OAMSET_GS_INTRO_SPARKLE_2
-	dbw $13, .OAMData_1x1_Palette0             ; SPRITE_ANIM_OAMSET_GS_INTRO_SPARKLE_3
+	dbw $00, .OAMData_GSGameFreakLogo          ; SPRITE_ANIM_OAMSET_GS_GAMEFREAK_LOGO
+	dbw $0f, .OAMData_GSGameFreakLogoStar      ; SPRITE_ANIM_OAMSET_GS_GAMEFREAK_LOGO_STAR
+	dbw $11, .OAMData_1x1_Palette0             ; SPRITE_ANIM_OAMSET_GS_GAMEFREAK_LOGO_SPARKLE_1
+	dbw $12, .OAMData_1x1_Palette0             ; SPRITE_ANIM_OAMSET_GS_GAMEFREAK_LOGO_SPARKLE_2
+	dbw $13, .OAMData_1x1_Palette0             ; SPRITE_ANIM_OAMSET_GS_GAMEFREAK_LOGO_SPARKLE_3
 	dbw $00, .OAMData_SlotsGolem               ; SPRITE_ANIM_OAMSET_SLOTS_GOLEM_1
 	dbw $08, .OAMData_SlotsGolem               ; SPRITE_ANIM_OAMSET_SLOTS_GOLEM_2
 	dbw $10, .OAMData_SlotsChansey1            ; SPRITE_ANIM_OAMSET_SLOTS_CHANSEY_1
@@ -113,7 +113,7 @@ ENDC
 	dbsprite -1,  0,  0,  0, $10, 0
 	dbsprite  0,  0,  0,  0, $11, 0
 
-.OAMData_GSIntroStar:
+.OAMData_GSGameFreakLogoStar:
 	db 4
 	dbsprite -1, -1,  0,  0, $00, 0
 	dbsprite  0, -1,  0,  0, $00, 0 | X_FLIP
@@ -504,7 +504,7 @@ ENDC
 	dbsprite  3,  0,  0,  0, $01, 0 | Y_FLIP
 	dbsprite  4,  0,  0,  0, $00, 0 | X_FLIP | Y_FLIP
 
-.OAMData_GSIntroGameFreakLogo:
+.OAMData_GSGameFreakLogo:
 	db 15
 	dbsprite -2, -3,  4,  4, $00, 1 | OBP_NUM
 	dbsprite -1, -3,  4,  4, $01, 1 | OBP_NUM
diff --git a/data/sprite_anims/sequences.asm b/data/sprite_anims/sequences.asm
index 725d1984..ab30fb3c 100644
--- a/data/sprite_anims/sequences.asm
+++ b/data/sprite_anims/sequences.asm
@@ -1,50 +1,50 @@
 SpriteAnimSeqData:
 ; entries correspond to SPRITE_ANIM_INDEX_* constants
 	; frameset, sequence, tile
-	db SPRITE_ANIM_FRAMESET_PARTY_MON,                SPRITE_ANIM_SEQ_PARTY_MON,                   $00 ; SPRITE_ANIM_INDEX_PARTY_MON
-	db SPRITE_ANIM_FRAMESET_GS_INTRO_BUBBLE,          SPRITE_ANIM_SEQ_GS_INTRO_BUBBLE,             $00 ; SPRITE_ANIM_INDEX_GS_INTRO_BUBBLE
-	db SPRITE_ANIM_FRAMESET_GS_INTRO_SHELLDER,        SPRITE_ANIM_SEQ_GS_INTRO_SHELLDER,           $00 ; SPRITE_ANIM_INDEX_GS_INTRO_SHELLDER
-	db SPRITE_ANIM_FRAMESET_GS_INTRO_MAGIKARP,        SPRITE_ANIM_SEQ_GS_INTRO_MAGIKARP,           $00 ; SPRITE_ANIM_INDEX_GS_INTRO_MAGIKARP
-	db SPRITE_ANIM_FRAMESET_UNUSED_LAPRAS,            SPRITE_ANIM_SEQ_UNUSED_LAPRAS,               $00 ; SPRITE_ANIM_INDEX_UNUSED_LAPRAS
-	db SPRITE_ANIM_FRAMESET_GS_INTRO_LAPRAS,          SPRITE_ANIM_SEQ_GS_INTRO_LAPRAS,             $00 ; SPRITE_ANIM_INDEX_GS_INTRO_LAPRAS
-	db SPRITE_ANIM_FRAMESET_GS_INTRO_NOTE,            SPRITE_ANIM_SEQ_GS_INTRO_NOTE,               $01 ; SPRITE_ANIM_INDEX_GS_INTRO_NOTE
-	db SPRITE_ANIM_FRAMESET_GS_INTRO_INVISIBLE_NOTE,  SPRITE_ANIM_SEQ_GS_INTRO_NOTE,               $01 ; SPRITE_ANIM_INDEX_GS_INTRO_INVISIBLE_NOTE
-	db SPRITE_ANIM_FRAMESET_GS_INTRO_JIGGLYPUFF,      SPRITE_ANIM_SEQ_GS_INTRO_JIGGLYPUFF,         $01 ; SPRITE_ANIM_INDEX_GS_INTRO_JIGGLYPUFF
-	db SPRITE_ANIM_FRAMESET_GS_INTRO_PIKACHU,         SPRITE_ANIM_SEQ_GS_INTRO_PIKACHU,            $01 ; SPRITE_ANIM_INDEX_GS_INTRO_PIKACHU
-	db SPRITE_ANIM_FRAMESET_GS_INTRO_PIKACHU_TAIL,    SPRITE_ANIM_SEQ_GS_INTRO_PIKACHU_TAIL,       $01 ; SPRITE_ANIM_INDEX_GS_INTRO_PIKACHU_TAIL
-	db SPRITE_ANIM_FRAMESET_GS_INTRO_FIREBALL,        SPRITE_ANIM_SEQ_GS_INTRO_FIREBALL,           $02 ; SPRITE_ANIM_INDEX_GS_INTRO_FIREBALL
-	db SPRITE_ANIM_FRAMESET_GS_INTRO_CHIKORITA,       SPRITE_ANIM_SEQ_GS_INTRO_CHIKORITA_TOTODILE, $02 ; SPRITE_ANIM_INDEX_GS_INTRO_CHIKORITA
-	db SPRITE_ANIM_FRAMESET_GS_INTRO_CYNDAQUIL,       SPRITE_ANIM_SEQ_GS_INTRO_CYNDAQUIL,          $02 ; SPRITE_ANIM_INDEX_GS_INTRO_CYNDAQUIL
-	db SPRITE_ANIM_FRAMESET_GS_INTRO_TOTODILE,        SPRITE_ANIM_SEQ_GS_INTRO_CHIKORITA_TOTODILE, $02 ; SPRITE_ANIM_INDEX_GS_INTRO_TOTODILE
-	db SPRITE_ANIM_FRAMESET_GS_TITLE_TRAIL,           SPRITE_ANIM_SEQ_GS_TITLE_TRAIL,              $00 ; SPRITE_ANIM_INDEX_GS_TITLE_TRAIL
-	db SPRITE_ANIM_FRAMESET_GS_INTRO_PIKACHU,         SPRITE_ANIM_SEQ_UNUSED_PIKACHU,              $01 ; SPRITE_ANIM_INDEX_UNUSED_PIKACHU
-	db SPRITE_ANIM_FRAMESET_GS_INTRO_PIKACHU_TAIL,    SPRITE_ANIM_SEQ_UNUSED_PIKACHU_TAIL,         $01 ; SPRITE_ANIM_INDEX_UNUSED_PIKACHU_TAIL
-	db SPRITE_ANIM_FRAMESET_GS_INTRO_NOTE,            SPRITE_ANIM_SEQ_UNUSED_NOTE,                 $01 ; SPRITE_ANIM_INDEX_UNUSED_NOTE
-	db SPRITE_ANIM_FRAMESET_GS_INTRO_JIGGLYPUFF,      SPRITE_ANIM_SEQ_UNUSED_JIGGLYPUFF,           $01 ; SPRITE_ANIM_INDEX_UNUSED_JIGGLYPUFF
-	db SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR,        SPRITE_ANIM_SEQ_NAMING_SCREEN_CURSOR,        $05 ; SPRITE_ANIM_INDEX_NAMING_SCREEN_CURSOR
-	db SPRITE_ANIM_FRAMESET_GAMEFREAK_LOGO,           SPRITE_ANIM_SEQ_GAMEFREAK_LOGO,              $06 ; SPRITE_ANIM_INDEX_GAMEFREAK_LOGO
-	db SPRITE_ANIM_FRAMESET_GS_INTRO_STAR,            SPRITE_ANIM_SEQ_GS_INTRO_STAR,               $06 ; SPRITE_ANIM_INDEX_GS_INTRO_STAR
-	db SPRITE_ANIM_FRAMESET_GS_INTRO_SPARKLE,         SPRITE_ANIM_SEQ_GS_INTRO_SPARKLE,            $06 ; SPRITE_ANIM_INDEX_GS_INTRO_SPARKLE
-	db SPRITE_ANIM_FRAMESET_SLOTS_GOLEM,              SPRITE_ANIM_SEQ_SLOTS_GOLEM,                 $07 ; SPRITE_ANIM_INDEX_SLOTS_GOLEM
-	db SPRITE_ANIM_FRAMESET_SLOTS_CHANSEY,            SPRITE_ANIM_SEQ_SLOTS_CHANSEY,               $07 ; SPRITE_ANIM_INDEX_SLOTS_CHANSEY
-	db SPRITE_ANIM_FRAMESET_SLOTS_EGG,                SPRITE_ANIM_SEQ_SLOTS_EGG,                   $07 ; SPRITE_ANIM_INDEX_SLOTS_EGG
-	db SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR,        SPRITE_ANIM_SEQ_MAIL_CURSOR,                 $05 ; SPRITE_ANIM_INDEX_COMPOSE_MAIL_CURSOR
-	db SPRITE_ANIM_FRAMESET_RED_WALK,                 SPRITE_ANIM_SEQ_NULL,                        $00 ; SPRITE_ANIM_INDEX_RED_WALK
-	db SPRITE_ANIM_FRAMESET_STILL_CURSOR,             SPRITE_ANIM_SEQ_UNUSED_CURSOR,               $08 ; SPRITE_ANIM_INDEX_UNUSED_CURSOR
-	db SPRITE_ANIM_FRAMESET_STILL_CURSOR,             SPRITE_ANIM_SEQ_DUMMY_GAME_CURSOR,           $08 ; SPRITE_ANIM_INDEX_DUMMY_GAME
-	db SPRITE_ANIM_FRAMESET_STILL_CURSOR,             SPRITE_ANIM_SEQ_POKEGEAR_ARROW,              $08 ; SPRITE_ANIM_INDEX_POKEGEAR_ARROW
-	db SPRITE_ANIM_FRAMESET_TRADE_POKE_BALL,          SPRITE_ANIM_SEQ_TRADE_POKE_BALL,             $00 ; SPRITE_ANIM_INDEX_TRADE_POKE_BALL
-	db SPRITE_ANIM_FRAMESET_TRADE_POOF,               SPRITE_ANIM_SEQ_NULL,                        $00 ; SPRITE_ANIM_INDEX_TRADE_POOF
-	db SPRITE_ANIM_FRAMESET_TRADE_TUBE_BULGE,         SPRITE_ANIM_SEQ_TRADE_TUBE_BULGE,            $00 ; SPRITE_ANIM_INDEX_TRADE_TUBE_BULGE
-	db SPRITE_ANIM_FRAMESET_TRADEMON_ICON,            SPRITE_ANIM_SEQ_TRADEMON_IN_TUBE,            $00 ; SPRITE_ANIM_INDEX_TRADEMON_ICON
-	db SPRITE_ANIM_FRAMESET_TRADEMON_BUBBLE,          SPRITE_ANIM_SEQ_TRADEMON_IN_TUBE,            $00 ; SPRITE_ANIM_INDEX_TRADEMON_BUBBLE
-	db SPRITE_ANIM_FRAMESET_EVOLUTION_BALL_OF_LIGHT,  SPRITE_ANIM_SEQ_REVEAL_NEW_MON,              $00 ; SPRITE_ANIM_INDEX_EVOLUTION_BALL_OF_LIGHT
-	db SPRITE_ANIM_FRAMESET_RADIO_TUNING_KNOB,        SPRITE_ANIM_SEQ_RADIO_TUNING_KNOB,           $00 ; SPRITE_ANIM_INDEX_RADIO_TUNING_KNOB
-	db SPRITE_ANIM_FRAMESET_MAGNET_TRAIN_RED,         SPRITE_ANIM_SEQ_NULL,                        $00 ; SPRITE_ANIM_INDEX_MAGNET_TRAIN_RED
-	db SPRITE_ANIM_FRAMESET_LEAF,                     SPRITE_ANIM_SEQ_CUT_LEAVES,                  $00 ; SPRITE_ANIM_INDEX_LEAF
-	db SPRITE_ANIM_FRAMESET_CUT_TREE,                 SPRITE_ANIM_SEQ_NULL,                        $00 ; SPRITE_ANIM_INDEX_CUT_TREE
-	db SPRITE_ANIM_FRAMESET_LEAF,                     SPRITE_ANIM_SEQ_FLY_LEAF,                    $00 ; SPRITE_ANIM_INDEX_FLY_LEAF
-	db SPRITE_ANIM_FRAMESET_EGG_CRACK,                SPRITE_ANIM_SEQ_NULL,                        $00 ; SPRITE_ANIM_INDEX_EGG_CRACK
-	db SPRITE_ANIM_FRAMESET_GS_INTRO_HO_OH_LUGIA,     SPRITE_ANIM_SEQ_GS_INTRO_HO_OH_LUGIA,        $00 ; SPRITE_ANIM_INDEX_GS_INTRO_HO_OH_LUGIA
-	db SPRITE_ANIM_FRAMESET_HEADBUTT,                 SPRITE_ANIM_SEQ_NULL,                        $00 ; SPRITE_ANIM_INDEX_HEADBUTT
-	db SPRITE_ANIM_FRAMESET_EGG_HATCH_1,              SPRITE_ANIM_SEQ_REVEAL_NEW_MON,              $00 ; SPRITE_ANIM_INDEX_EGG_HATCH
+	db SPRITE_ANIM_FRAMESET_PARTY_MON,                 SPRITE_ANIM_SEQ_PARTY_MON,                   $00 ; SPRITE_ANIM_INDEX_PARTY_MON
+	db SPRITE_ANIM_FRAMESET_GS_INTRO_BUBBLE,           SPRITE_ANIM_SEQ_GS_INTRO_BUBBLE,             $00 ; SPRITE_ANIM_INDEX_GS_INTRO_BUBBLE
+	db SPRITE_ANIM_FRAMESET_GS_INTRO_SHELLDER,         SPRITE_ANIM_SEQ_GS_INTRO_SHELLDER,           $00 ; SPRITE_ANIM_INDEX_GS_INTRO_SHELLDER
+	db SPRITE_ANIM_FRAMESET_GS_INTRO_MAGIKARP,         SPRITE_ANIM_SEQ_GS_INTRO_MAGIKARP,           $00 ; SPRITE_ANIM_INDEX_GS_INTRO_MAGIKARP
+	db SPRITE_ANIM_FRAMESET_UNUSED_LAPRAS,             SPRITE_ANIM_SEQ_UNUSED_LAPRAS,               $00 ; SPRITE_ANIM_INDEX_UNUSED_LAPRAS
+	db SPRITE_ANIM_FRAMESET_GS_INTRO_LAPRAS,           SPRITE_ANIM_SEQ_GS_INTRO_LAPRAS,             $00 ; SPRITE_ANIM_INDEX_GS_INTRO_LAPRAS
+	db SPRITE_ANIM_FRAMESET_GS_INTRO_NOTE,             SPRITE_ANIM_SEQ_GS_INTRO_NOTE,               $01 ; SPRITE_ANIM_INDEX_GS_INTRO_NOTE
+	db SPRITE_ANIM_FRAMESET_GS_INTRO_INVISIBLE_NOTE,   SPRITE_ANIM_SEQ_GS_INTRO_NOTE,               $01 ; SPRITE_ANIM_INDEX_GS_INTRO_INVISIBLE_NOTE
+	db SPRITE_ANIM_FRAMESET_GS_INTRO_JIGGLYPUFF,       SPRITE_ANIM_SEQ_GS_INTRO_JIGGLYPUFF,         $01 ; SPRITE_ANIM_INDEX_GS_INTRO_JIGGLYPUFF
+	db SPRITE_ANIM_FRAMESET_GS_INTRO_PIKACHU,          SPRITE_ANIM_SEQ_GS_INTRO_PIKACHU,            $01 ; SPRITE_ANIM_INDEX_GS_INTRO_PIKACHU
+	db SPRITE_ANIM_FRAMESET_GS_INTRO_PIKACHU_TAIL,     SPRITE_ANIM_SEQ_GS_INTRO_PIKACHU_TAIL,       $01 ; SPRITE_ANIM_INDEX_GS_INTRO_PIKACHU_TAIL
+	db SPRITE_ANIM_FRAMESET_GS_INTRO_FIREBALL,         SPRITE_ANIM_SEQ_GS_INTRO_FIREBALL,           $02 ; SPRITE_ANIM_INDEX_GS_INTRO_FIREBALL
+	db SPRITE_ANIM_FRAMESET_GS_INTRO_CHIKORITA,        SPRITE_ANIM_SEQ_GS_INTRO_CHIKORITA_TOTODILE, $02 ; SPRITE_ANIM_INDEX_GS_INTRO_CHIKORITA
+	db SPRITE_ANIM_FRAMESET_GS_INTRO_CYNDAQUIL,        SPRITE_ANIM_SEQ_GS_INTRO_CYNDAQUIL,          $02 ; SPRITE_ANIM_INDEX_GS_INTRO_CYNDAQUIL
+	db SPRITE_ANIM_FRAMESET_GS_INTRO_TOTODILE,         SPRITE_ANIM_SEQ_GS_INTRO_CHIKORITA_TOTODILE, $02 ; SPRITE_ANIM_INDEX_GS_INTRO_TOTODILE
+	db SPRITE_ANIM_FRAMESET_GS_TITLE_TRAIL,            SPRITE_ANIM_SEQ_GS_TITLE_TRAIL,              $00 ; SPRITE_ANIM_INDEX_GS_TITLE_TRAIL
+	db SPRITE_ANIM_FRAMESET_GS_INTRO_PIKACHU,          SPRITE_ANIM_SEQ_UNUSED_PIKACHU,              $01 ; SPRITE_ANIM_INDEX_UNUSED_PIKACHU
+	db SPRITE_ANIM_FRAMESET_GS_INTRO_PIKACHU_TAIL,     SPRITE_ANIM_SEQ_UNUSED_PIKACHU_TAIL,         $01 ; SPRITE_ANIM_INDEX_UNUSED_PIKACHU_TAIL
+	db SPRITE_ANIM_FRAMESET_GS_INTRO_NOTE,             SPRITE_ANIM_SEQ_UNUSED_NOTE,                 $01 ; SPRITE_ANIM_INDEX_UNUSED_NOTE
+	db SPRITE_ANIM_FRAMESET_GS_INTRO_JIGGLYPUFF,       SPRITE_ANIM_SEQ_UNUSED_JIGGLYPUFF,           $01 ; SPRITE_ANIM_INDEX_UNUSED_JIGGLYPUFF
+	db SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR,         SPRITE_ANIM_SEQ_NAMING_SCREEN_CURSOR,        $05 ; SPRITE_ANIM_INDEX_NAMING_SCREEN_CURSOR
+	db SPRITE_ANIM_FRAMESET_GAMEFREAK_LOGO,            SPRITE_ANIM_SEQ_GAMEFREAK_LOGO,              $06 ; SPRITE_ANIM_INDEX_GAMEFREAK_LOGO
+	db SPRITE_ANIM_FRAMESET_GS_GAMEFREAK_LOGO_STAR,    SPRITE_ANIM_SEQ_GS_GAMEFREAK_LOGO_STAR,      $06 ; SPRITE_ANIM_INDEX_GS_GAMEFREAK_LOGO_STAR
+	db SPRITE_ANIM_FRAMESET_GS_GAMEFREAK_LOGO_SPARKLE, SPRITE_ANIM_SEQ_GS_GAMEFREAK_LOGO_SPARKLE,   $06 ; SPRITE_ANIM_INDEX_GS_GAMEFREAK_LOGO_SPARKLE
+	db SPRITE_ANIM_FRAMESET_SLOTS_GOLEM,               SPRITE_ANIM_SEQ_SLOTS_GOLEM,                 $07 ; SPRITE_ANIM_INDEX_SLOTS_GOLEM
+	db SPRITE_ANIM_FRAMESET_SLOTS_CHANSEY,             SPRITE_ANIM_SEQ_SLOTS_CHANSEY,               $07 ; SPRITE_ANIM_INDEX_SLOTS_CHANSEY
+	db SPRITE_ANIM_FRAMESET_SLOTS_EGG,                 SPRITE_ANIM_SEQ_SLOTS_EGG,                   $07 ; SPRITE_ANIM_INDEX_SLOTS_EGG
+	db SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR,         SPRITE_ANIM_SEQ_MAIL_CURSOR,                 $05 ; SPRITE_ANIM_INDEX_COMPOSE_MAIL_CURSOR
+	db SPRITE_ANIM_FRAMESET_RED_WALK,                  SPRITE_ANIM_SEQ_NULL,                        $00 ; SPRITE_ANIM_INDEX_RED_WALK
+	db SPRITE_ANIM_FRAMESET_STILL_CURSOR,              SPRITE_ANIM_SEQ_UNUSED_CURSOR,               $08 ; SPRITE_ANIM_INDEX_UNUSED_CURSOR
+	db SPRITE_ANIM_FRAMESET_STILL_CURSOR,              SPRITE_ANIM_SEQ_DUMMY_GAME_CURSOR,           $08 ; SPRITE_ANIM_INDEX_DUMMY_GAME
+	db SPRITE_ANIM_FRAMESET_STILL_CURSOR,              SPRITE_ANIM_SEQ_POKEGEAR_ARROW,              $08 ; SPRITE_ANIM_INDEX_POKEGEAR_ARROW
+	db SPRITE_ANIM_FRAMESET_TRADE_POKE_BALL,           SPRITE_ANIM_SEQ_TRADE_POKE_BALL,             $00 ; SPRITE_ANIM_INDEX_TRADE_POKE_BALL
+	db SPRITE_ANIM_FRAMESET_TRADE_POOF,                SPRITE_ANIM_SEQ_NULL,                        $00 ; SPRITE_ANIM_INDEX_TRADE_POOF
+	db SPRITE_ANIM_FRAMESET_TRADE_TUBE_BULGE,          SPRITE_ANIM_SEQ_TRADE_TUBE_BULGE,            $00 ; SPRITE_ANIM_INDEX_TRADE_TUBE_BULGE
+	db SPRITE_ANIM_FRAMESET_TRADEMON_ICON,             SPRITE_ANIM_SEQ_TRADEMON_IN_TUBE,            $00 ; SPRITE_ANIM_INDEX_TRADEMON_ICON
+	db SPRITE_ANIM_FRAMESET_TRADEMON_BUBBLE,           SPRITE_ANIM_SEQ_TRADEMON_IN_TUBE,            $00 ; SPRITE_ANIM_INDEX_TRADEMON_BUBBLE
+	db SPRITE_ANIM_FRAMESET_EVOLUTION_BALL_OF_LIGHT,   SPRITE_ANIM_SEQ_REVEAL_NEW_MON,              $00 ; SPRITE_ANIM_INDEX_EVOLUTION_BALL_OF_LIGHT
+	db SPRITE_ANIM_FRAMESET_RADIO_TUNING_KNOB,         SPRITE_ANIM_SEQ_RADIO_TUNING_KNOB,           $00 ; SPRITE_ANIM_INDEX_RADIO_TUNING_KNOB
+	db SPRITE_ANIM_FRAMESET_MAGNET_TRAIN_RED,          SPRITE_ANIM_SEQ_NULL,                        $00 ; SPRITE_ANIM_INDEX_MAGNET_TRAIN_RED
+	db SPRITE_ANIM_FRAMESET_LEAF,                      SPRITE_ANIM_SEQ_CUT_LEAVES,                  $00 ; SPRITE_ANIM_INDEX_LEAF
+	db SPRITE_ANIM_FRAMESET_CUT_TREE,                  SPRITE_ANIM_SEQ_NULL,                        $00 ; SPRITE_ANIM_INDEX_CUT_TREE
+	db SPRITE_ANIM_FRAMESET_LEAF,                      SPRITE_ANIM_SEQ_FLY_LEAF,                    $00 ; SPRITE_ANIM_INDEX_FLY_LEAF
+	db SPRITE_ANIM_FRAMESET_EGG_CRACK,                 SPRITE_ANIM_SEQ_NULL,                        $00 ; SPRITE_ANIM_INDEX_EGG_CRACK
+	db SPRITE_ANIM_FRAMESET_GS_INTRO_HO_OH_LUGIA,      SPRITE_ANIM_SEQ_GS_INTRO_HO_OH_LUGIA,        $00 ; SPRITE_ANIM_INDEX_GS_INTRO_HO_OH_LUGIA
+	db SPRITE_ANIM_FRAMESET_HEADBUTT,                  SPRITE_ANIM_SEQ_NULL,                        $00 ; SPRITE_ANIM_INDEX_HEADBUTT
+	db SPRITE_ANIM_FRAMESET_EGG_HATCH_1,               SPRITE_ANIM_SEQ_REVEAL_NEW_MON,              $00 ; SPRITE_ANIM_INDEX_EGG_HATCH
diff --git a/engine/gfx/sprite_anims.asm b/engine/gfx/sprite_anims.asm
index a52c4412..8abad293 100644
--- a/engine/gfx/sprite_anims.asm
+++ b/engine/gfx/sprite_anims.asm
@@ -36,8 +36,8 @@ DoAnimFrame:
 	dw .UnusedJigglypuff
 	dw .NamingScreenCursor
 	dw .GameFreakLogo
-	dw .GSIntroStar
-	dw .GSIntroSparkle
+	dw .GSGameFreakLogoStar
+	dw .GSGameFreakLogoSparkle
 	dw .SlotsGolem
 	dw .SlotsChansey
 	dw .SlotsChanseyEgg
@@ -951,7 +951,7 @@ ENDC
 	callfar GameFreakPresents_UpdateLogoPal
 	ret
 
-.GSIntroStar
+.GSGameFreakLogoStar
 	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hl]
@@ -1001,7 +1001,7 @@ ENDC
 	call DeinitializeSprite
 	ret
 
-.GSIntroSparkle
+.GSGameFreakLogoSparkle
 	ld hl, SPRITEANIMSTRUCT_VAR1
 	add hl, bc
 	ld a, [hli]
diff --git a/engine/movie/splash.asm b/engine/movie/splash.asm
index c29150ad..903ec4ea 100644
--- a/engine/movie/splash.asm
+++ b/engine/movie/splash.asm
@@ -148,7 +148,7 @@ GameFreakPresents_Star:
 	ld [wIntroSceneFrameCounter], a
 
 	depixel 10, 11, 4, 0
-	ld a, SPRITE_ANIM_INDEX_GS_INTRO_STAR
+	ld a, SPRITE_ANIM_INDEX_GS_GAMEFREAK_LOGO_STAR
 	call InitSpriteAnimStruct
 
 	ld hl, SPRITEANIMSTRUCT_VAR1
@@ -284,7 +284,7 @@ GameFreakPresents_Sparkle:
 ; set up a new sparkle sprite
 	push af
 	depixel 11, 11
-	ld a, SPRITE_ANIM_INDEX_GS_INTRO_SPARKLE
+	ld a, SPRITE_ANIM_INDEX_GS_GAMEFREAK_LOGO_SPARKLE
 	call InitSpriteAnimStruct
 	pop af