Identify some SPRITE_ANIM_FRAME_IDX_* constants

constants/sprite_data_constants.asm

@@ -212,18 +212,104 @@ SPRITEMOVEDATA_FIELDS EQU 6
 	const SPRITEANIMSTRUCT_0E              ; e
 	const SPRITEANIMSTRUCT_0F              ; f
 
+; SpriteAnimSeqData indexes (see data/sprite_anim_seqs.asm)
+	const_def
+	const SPRITE_ANIM_INDEX_PARTY_MON
+	const SPRITE_ANIM_INDEX_GS_TITLE_TRAIL
+	const SPRITE_ANIM_INDEX_NAMING_SCREEN_CURSOR
+	const SPRITE_ANIM_INDEX_GAMEFREAK_LOGO
+	const SPRITE_ANIM_INDEX_GS_INTRO_STAR
+	const SPRITE_ANIM_INDEX_GS_INTRO_SPARKLE
+	const SPRITE_ANIM_INDEX_SLOTS_GOLEM
+	const SPRITE_ANIM_INDEX_SLOTS_CHANSEY
+	const SPRITE_ANIM_INDEX_SLOTS_EGG
+	const SPRITE_ANIM_INDEX_COMPOSE_MAIL_CURSOR
+	const SPRITE_ANIM_INDEX_RED_WALK
+	const SPRITE_ANIM_INDEX_0B
+	const SPRITE_ANIM_INDEX_DUMMY_GAME
+	const SPRITE_ANIM_INDEX_POKEGEAR_ARROW
+	const SPRITE_ANIM_INDEX_TRADE_POKE_BALL
+	const SPRITE_ANIM_INDEX_TRADE_POOF
+	const SPRITE_ANIM_INDEX_TRADE_TUBE_BULGE
+	const SPRITE_ANIM_INDEX_TRADEMON_ICON
+	const SPRITE_ANIM_INDEX_TRADEMON_BUBBLE
+	const SPRITE_ANIM_INDEX_EVOLUTION_BALL_OF_LIGHT
+	const SPRITE_ANIM_INDEX_RADIO_TUNING_KNOB
+	const SPRITE_ANIM_INDEX_MAGNET_TRAIN_RED
+	const SPRITE_ANIM_INDEX_LEAF
+	const SPRITE_ANIM_INDEX_CUT_TREE
+	const SPRITE_ANIM_INDEX_FLY_LEAF
+	const SPRITE_ANIM_INDEX_EGG_CRACK
+	const SPRITE_ANIM_INDEX_1A
+	const SPRITE_ANIM_INDEX_HEADBUTT
+	const SPRITE_ANIM_INDEX_EGG_HATCH
+	const SPRITE_ANIM_INDEX_1D
+	const SPRITE_ANIM_INDEX_BLUE_WALK
+	const SPRITE_ANIM_INDEX_MAGNET_TRAIN_BLUE
+	const SPRITE_ANIM_INDEX_20
+	const SPRITE_ANIM_INDEX_21
+	const SPRITE_ANIM_INDEX_22
+	const SPRITE_ANIM_INDEX_23
+	const SPRITE_ANIM_INDEX_24
+	const SPRITE_ANIM_INDEX_25
+	const SPRITE_ANIM_INDEX_INTRO_SUICUNE
+	const SPRITE_ANIM_INDEX_INTRO_PICHU
+	const SPRITE_ANIM_INDEX_INTRO_WOOPER
+	const SPRITE_ANIM_INDEX_INTRO_UNOWN
+	const SPRITE_ANIM_INDEX_INTRO_UNOWN_F
+	const SPRITE_ANIM_INDEX_INTRO_SUICUNE_AWAY
+	const SPRITE_ANIM_INDEX_CELEBI
+
+; DoAnimFrame.Jumptable indexes (see engine/sprite_anims.asm)
+	const_def
+	const SPRITE_ANIM_SEQ_NULL
+	const SPRITE_ANIM_SEQ_PARTY_MON
+	const SPRITE_ANIM_SEQ_PARTY_MON_SWITCH
+	const SPRITE_ANIM_SEQ_PARTY_MON_SELECTED
+	const SPRITE_ANIM_SEQ_GS_TITLE_TRAIL
+	const SPRITE_ANIM_SEQ_NAMING_SCREEN_CURSOR
+	const SPRITE_ANIM_SEQ_GAMEFREAK_LOGO
+	const SPRITE_ANIM_SEQ_GS_INTRO_STAR
+	const SPRITE_ANIM_SEQ_GS_INTRO_SPARKLE
+	const SPRITE_ANIM_SEQ_SLOTS_GOLEM
+	const SPRITE_ANIM_SEQ_SLOTS_CHANSEY
+	const SPRITE_ANIM_SEQ_SLOTS_EGG
+	const SPRITE_ANIM_SEQ_MAIL_CURSOR
+	const SPRITE_ANIM_SEQ_0D
+	const SPRITE_ANIM_SEQ_DUMMY_GAME_CURSOR
+	const SPRITE_ANIM_SEQ_POKEGEAR_ARROW
+	const SPRITE_ANIM_SEQ_TRADE_POKE_BALL
+	const SPRITE_ANIM_SEQ_TRADE_TUBE_BULGE
+	const SPRITE_ANIM_SEQ_TRADEMON_IN_TUBE
+	const SPRITE_ANIM_SEQ_REVEAL_NEW_MON
+	const SPRITE_ANIM_SEQ_RADIO_TUNING_KNOB
+	const SPRITE_ANIM_SEQ_CUT_LEAVES
+	const SPRITE_ANIM_SEQ_FLY_FROM
+	const SPRITE_ANIM_SEQ_FLY_LEAF
+	const SPRITE_ANIM_SEQ_FLY_TO
+	const SPRITE_ANIM_SEQ_19
+	const SPRITE_ANIM_SEQ_1A
+	const SPRITE_ANIM_SEQ_1B
+	const SPRITE_ANIM_SEQ_1C
+	const SPRITE_ANIM_SEQ_INTRO_SUICUNE
+	const SPRITE_ANIM_SEQ_INTRO_PICHU_WOOPER
+	const SPRITE_ANIM_SEQ_CELEBI
+	const SPRITE_ANIM_SEQ_INTRO_UNOWN
+	const SPRITE_ANIM_SEQ_INTRO_UNOWN_F
+	const SPRITE_ANIM_SEQ_INTRO_SUICUNE_AWAY
+
 ; SpriteAnimFrameData indexes (see data/sprite_anim_frames.asm)
 	const_def
 	const SPRITE_ANIM_FRAMESET_00
 	const SPRITE_ANIM_FRAMESET_PARTY_MON
-	const SPRITE_ANIM_FRAMESET_02 ; unused?
+	const SPRITE_ANIM_FRAMESET_PARTY_MON_WITH_MAIL
-	const SPRITE_ANIM_FRAMESET_03 ; unused?
+	const SPRITE_ANIM_FRAMESET_PARTY_MON_WITH_ITEM
-	const SPRITE_ANIM_FRAMESET_04 ; unused?
+	const SPRITE_ANIM_FRAMESET_PARTY_MON_FAST
-	const SPRITE_ANIM_FRAMESET_05 ; unused?
+	const SPRITE_ANIM_FRAMESET_PARTY_MON_WITH_MAIL_FAST
-	const SPRITE_ANIM_FRAMESET_06 ; unused?
+	const SPRITE_ANIM_FRAMESET_PARTY_MON_WITH_ITEM_FAST
-	const SPRITE_ANIM_FRAMESET_07
+	const SPRITE_ANIM_FRAMESET_GS_TITLE_TRAIL
 	const SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR
-	const SPRITE_ANIM_FRAMESET_09 ; unused?
+	const SPRITE_ANIM_FRAMESET_09
 	const SPRITE_ANIM_FRAMESET_GAMEFREAK_LOGO
 	const SPRITE_ANIM_FRAMESET_GS_INTRO_STAR
 	const SPRITE_ANIM_FRAMESET_GS_INTRO_SPARKLE
@@ -281,96 +367,10 @@ SPRITEMOVEDATA_FIELDS EQU 6
 	const SPRITE_ANIM_FRAMESET_CELEBI_LEFT
 	const SPRITE_ANIM_FRAMESET_CELEBI_RIGHT
 
-; DoAnimFrame.Jumptable indexes (see engine/sprite_anims.asm)
-	const_def
-	const SPRITE_ANIM_SEQ_NULL
-	const SPRITE_ANIM_SEQ_PARTY_MON
-	const SPRITE_ANIM_SEQ_PARTY_MON_SWITCH
-	const SPRITE_ANIM_SEQ_PARTY_MON_SELECTED
-	const SPRITE_ANIM_SEQ_04
-	const SPRITE_ANIM_SEQ_NAMING_SCREEN_CURSOR
-	const SPRITE_ANIM_SEQ_GAMEFREAK_LOGO
-	const SPRITE_ANIM_SEQ_GS_INTRO_STAR
-	const SPRITE_ANIM_SEQ_GS_INTRO_SPARKLE
-	const SPRITE_ANIM_SEQ_SLOTS_GOLEM
-	const SPRITE_ANIM_SEQ_SLOTS_CHANSEY
-	const SPRITE_ANIM_SEQ_SLOTS_EGG
-	const SPRITE_ANIM_SEQ_MAIL_CURSOR
-	const SPRITE_ANIM_SEQ_0D
-	const SPRITE_ANIM_SEQ_0E
-	const SPRITE_ANIM_SEQ_0F
-	const SPRITE_ANIM_SEQ_TRADE_POKE_BALL
-	const SPRITE_ANIM_SEQ_TRADE_TUBE_BULGE
-	const SPRITE_ANIM_SEQ_TRADEMON_IN_TUBE
-	const SPRITE_ANIM_SEQ_REVEAL_NEW_MON
-	const SPRITE_ANIM_SEQ_RADIO_TUNING_KNOB
-	const SPRITE_ANIM_SEQ_CUT_LEAVES
-	const SPRITE_ANIM_SEQ_FLY_FROM
-	const SPRITE_ANIM_SEQ_FLY_LEAF
-	const SPRITE_ANIM_SEQ_FLY_TO
-	const SPRITE_ANIM_SEQ_19
-	const SPRITE_ANIM_SEQ_1A
-	const SPRITE_ANIM_SEQ_1B
-	const SPRITE_ANIM_SEQ_1C
-	const SPRITE_ANIM_SEQ_INTRO_SUICUNE
-	const SPRITE_ANIM_SEQ_INTRO_PICHU_WOOPER
-	const SPRITE_ANIM_SEQ_CELEBI
-	const SPRITE_ANIM_SEQ_INTRO_UNOWN
-	const SPRITE_ANIM_SEQ_INTRO_UNOWN_F
-	const SPRITE_ANIM_SEQ_INTRO_SUICUNE_AWAY
-
-; SpriteAnimSeqData indexes (see data/sprite_anim_seqs.asm)
-	const_def
-	const SPRITE_ANIM_INDEX_PARTY_MON
-	const SPRITE_ANIM_INDEX_01
-	const SPRITE_ANIM_INDEX_NAMING_SCREEN_CURSOR
-	const SPRITE_ANIM_INDEX_GAMEFREAK_LOGO
-	const SPRITE_ANIM_INDEX_GS_INTRO_STAR
-	const SPRITE_ANIM_INDEX_GS_INTRO_SPARKLE
-	const SPRITE_ANIM_INDEX_SLOTS_GOLEM
-	const SPRITE_ANIM_INDEX_SLOTS_CHANSEY
-	const SPRITE_ANIM_INDEX_SLOTS_EGG
-	const SPRITE_ANIM_INDEX_COMPOSE_MAIL_CURSOR
-	const SPRITE_ANIM_INDEX_RED_WALK
-	const SPRITE_ANIM_INDEX_0B
-	const SPRITE_ANIM_INDEX_DUMMY_GAME
-	const SPRITE_ANIM_INDEX_0D
-	const SPRITE_ANIM_INDEX_TRADE_POKE_BALL
-	const SPRITE_ANIM_INDEX_TRADE_POOF
-	const SPRITE_ANIM_INDEX_TRADE_TUBE_BULGE
-	const SPRITE_ANIM_INDEX_TRADEMON_ICON
-	const SPRITE_ANIM_INDEX_TRADEMON_BUBBLE
-	const SPRITE_ANIM_INDEX_EVOLUTION_BALL_OF_LIGHT
-	const SPRITE_ANIM_INDEX_RADIO_TUNING_KNOB
-	const SPRITE_ANIM_INDEX_MAGNET_TRAIN_RED
-	const SPRITE_ANIM_INDEX_LEAF
-	const SPRITE_ANIM_INDEX_CUT_TREE
-	const SPRITE_ANIM_INDEX_FLY_LEAF
-	const SPRITE_ANIM_INDEX_EGG_CRACK
-	const SPRITE_ANIM_INDEX_1A
-	const SPRITE_ANIM_INDEX_HEADBUTT
-	const SPRITE_ANIM_INDEX_EGG_HATCH
-	const SPRITE_ANIM_INDEX_1D
-	const SPRITE_ANIM_INDEX_BLUE_WALK
-	const SPRITE_ANIM_INDEX_MAGNET_TRAIN_BLUE
-	const SPRITE_ANIM_INDEX_20
-	const SPRITE_ANIM_INDEX_21
-	const SPRITE_ANIM_INDEX_22
-	const SPRITE_ANIM_INDEX_23
-	const SPRITE_ANIM_INDEX_24
-	const SPRITE_ANIM_INDEX_25
-	const SPRITE_ANIM_INDEX_INTRO_SUICUNE
-	const SPRITE_ANIM_INDEX_INTRO_PICHU
-	const SPRITE_ANIM_INDEX_INTRO_WOOPER
-	const SPRITE_ANIM_INDEX_INTRO_UNOWN
-	const SPRITE_ANIM_INDEX_INTRO_UNOWN_F
-	const SPRITE_ANIM_INDEX_INTRO_SUICUNE_AWAY
-	const SPRITE_ANIM_INDEX_CELEBI
-
 ; SpriteAnimOAMData indexes (see data/sprite_anim_oam.asm)
 	const_def
-	const SPRITE_ANIM_FRAME_IDX_00
+	const SPRITE_ANIM_FRAME_IDX_RED_WALK_1 ; 00
-	const SPRITE_ANIM_FRAME_IDX_01
+	const SPRITE_ANIM_FRAME_IDX_RED_WALK_2 ; 01
 	const SPRITE_ANIM_FRAME_IDX_02
 	const SPRITE_ANIM_FRAME_IDX_03
 	const SPRITE_ANIM_FRAME_IDX_04
@@ -399,10 +399,10 @@ SPRITEMOVEDATA_FIELDS EQU 6
 	const SPRITE_ANIM_FRAME_IDX_1B
 	const SPRITE_ANIM_FRAME_IDX_1C
 	const SPRITE_ANIM_FRAME_IDX_1D
-	const SPRITE_ANIM_FRAME_IDX_1E
+	const SPRITE_ANIM_FRAME_IDX_GS_TITLE_TRAIL_1 ; 1e
-	const SPRITE_ANIM_FRAME_IDX_1F
+	const SPRITE_ANIM_FRAME_IDX_GS_TITLE_TRAIL_2 ; 1f
 	const SPRITE_ANIM_FRAME_IDX_20
-	const SPRITE_ANIM_FRAME_IDX_21
+	const SPRITE_ANIM_FRAME_IDX_FOR_FRAMESET_09 ; 21
 	const SPRITE_ANIM_FRAME_IDX_22
 	const SPRITE_ANIM_FRAME_IDX_23
 	const SPRITE_ANIM_FRAME_IDX_24
@@ -416,7 +416,7 @@ SPRITEMOVEDATA_FIELDS EQU 6
 	const SPRITE_ANIM_FRAME_IDX_2C
 	const SPRITE_ANIM_FRAME_IDX_2D
 	const SPRITE_ANIM_FRAME_IDX_2E
-	const SPRITE_ANIM_FRAME_IDX_2F
+	const SPRITE_ANIM_FRAME_IDX_STILL_CURSOR ; 2f
 	const SPRITE_ANIM_FRAME_IDX_30
 	const SPRITE_ANIM_FRAME_IDX_31
 	const SPRITE_ANIM_FRAME_IDX_32
@@ -424,16 +424,16 @@ SPRITEMOVEDATA_FIELDS EQU 6
 	const SPRITE_ANIM_FRAME_IDX_34
 	const SPRITE_ANIM_FRAME_IDX_35
 	const SPRITE_ANIM_FRAME_IDX_36
-	const SPRITE_ANIM_FRAME_IDX_37
+	const SPRITE_ANIM_FRAME_IDX_TRADEMON_ICON_1 ; 37
-	const SPRITE_ANIM_FRAME_IDX_38
+	const SPRITE_ANIM_FRAME_IDX_TRADEMON_ICON_2 ; 38
 	const SPRITE_ANIM_FRAME_IDX_39
 	const SPRITE_ANIM_FRAME_IDX_3A
 	const SPRITE_ANIM_FRAME_IDX_3B
-	const SPRITE_ANIM_FRAME_IDX_3C
+	const SPRITE_ANIM_FRAME_IDX_RADIO_TUNING_KNOB ; 3c
-	const SPRITE_ANIM_FRAME_IDX_3D
+	const SPRITE_ANIM_FRAME_IDX_PARTY_MON_WITH_MAIL_1 ; 3d
-	const SPRITE_ANIM_FRAME_IDX_3E
+	const SPRITE_ANIM_FRAME_IDX_PARTY_MON_WITH_MAIL_2 ; 3e
-	const SPRITE_ANIM_FRAME_IDX_3F
+	const SPRITE_ANIM_FRAME_IDX_PARTY_MON_WITH_ITEM_1 ; 3f
-	const SPRITE_ANIM_FRAME_IDX_40
+	const SPRITE_ANIM_FRAME_IDX_PARTY_MON_WITH_ITEM_2 ; 40
 	const SPRITE_ANIM_FRAME_IDX_41
 	const SPRITE_ANIM_FRAME_IDX_42
 	const SPRITE_ANIM_FRAME_IDX_43
@@ -448,19 +448,19 @@ SPRITEMOVEDATA_FIELDS EQU 6
 	const SPRITE_ANIM_FRAME_IDX_4C
 	const SPRITE_ANIM_FRAME_IDX_4D
 	const SPRITE_ANIM_FRAME_IDX_4E
-	const SPRITE_ANIM_FRAME_IDX_4F
+	const SPRITE_ANIM_FRAME_IDX_LEAF ; 4f
-	const SPRITE_ANIM_FRAME_IDX_50
+	const SPRITE_ANIM_FRAME_IDX_TREE_1 ; 50
-	const SPRITE_ANIM_FRAME_IDX_51
+	const SPRITE_ANIM_FRAME_IDX_CUT_TREE_2 ; 51
-	const SPRITE_ANIM_FRAME_IDX_52
+	const SPRITE_ANIM_FRAME_IDX_CUT_TREE_3 ; 52
-	const SPRITE_ANIM_FRAME_IDX_53
+	const SPRITE_ANIM_FRAME_IDX_CUT_TREE_4 ; 53
-	const SPRITE_ANIM_FRAME_IDX_54
+	const SPRITE_ANIM_FRAME_IDX_EGG_CRACK ; 54
 	const SPRITE_ANIM_FRAME_IDX_55
 	const SPRITE_ANIM_FRAME_IDX_56
 	const SPRITE_ANIM_FRAME_IDX_57
 	const SPRITE_ANIM_FRAME_IDX_58
 	const SPRITE_ANIM_FRAME_IDX_59
 	const SPRITE_ANIM_FRAME_IDX_5A
-	const SPRITE_ANIM_FRAME_IDX_5B
+	const SPRITE_ANIM_FRAME_IDX_HEADBUTT_TREE_2 ; 5b
 	const SPRITE_ANIM_FRAME_IDX_5C
 	const SPRITE_ANIM_FRAME_IDX_5D
 	const SPRITE_ANIM_FRAME_IDX_5E
@@ -468,8 +468,8 @@ SPRITEMOVEDATA_FIELDS EQU 6
 	const SPRITE_ANIM_FRAME_IDX_60
 	const SPRITE_ANIM_FRAME_IDX_61
 	const SPRITE_ANIM_FRAME_IDX_62
-	const SPRITE_ANIM_FRAME_IDX_63
+	const SPRITE_ANIM_FRAME_IDX_BLUE_WALK_1 ; 63
-	const SPRITE_ANIM_FRAME_IDX_64
+	const SPRITE_ANIM_FRAME_IDX_BLUE_WALK_2 ; 64
 	const SPRITE_ANIM_FRAME_IDX_65
 	const SPRITE_ANIM_FRAME_IDX_66
 	const SPRITE_ANIM_FRAME_IDX_67
@@ -495,9 +495,9 @@ SPRITEMOVEDATA_FIELDS EQU 6
 	const SPRITE_ANIM_FRAME_IDX_7B
 	const SPRITE_ANIM_FRAME_IDX_7C
 	const SPRITE_ANIM_FRAME_IDX_7D
-	const SPRITE_ANIM_FRAME_IDX_7E
+	const SPRITE_ANIM_FRAME_IDX_INTRO_SUICUNE_AWAY ; 7e
-	const SPRITE_ANIM_FRAME_IDX_7F
+	const SPRITE_ANIM_FRAME_IDX_CELEBI_1 ; 7f
-	const SPRITE_ANIM_FRAME_IDX_80
+	const SPRITE_ANIM_FRAME_IDX_CELEBI_2 ; 80
 	const SPRITE_ANIM_FRAME_IDX_81
 	const SPRITE_ANIM_FRAME_IDX_82
 	const SPRITE_ANIM_FRAME_IDX_83

data/sprite_anim_frames.asm

@@ -2,12 +2,12 @@ SpriteAnimFrameData: ; 8d6e6
 ; entries correspond to SPRITE_ANIM_FRAMESET_* constants
 	dw .Frameset_00
 	dw .Frameset_PartyMon
-	dw .Frameset_02
+	dw .Frameset_PartyMonWithMail
-	dw .Frameset_03
+	dw .Frameset_PartyMonWithItem
-	dw .Frameset_04
+	dw .Frameset_PartyMonFast
-	dw .Frameset_05
+	dw .Frameset_PartyMonWithMailFast
-	dw .Frameset_06
+	dw .Frameset_PartyMonWithItemFast
-	dw .Frameset_07
+	dw .Frameset_GSTitleTrail
 	dw .Frameset_TextEntryCursor
 	dw .Frameset_09
 	dw .Frameset_GameFreakLogo
@@ -69,51 +69,51 @@ SpriteAnimFrameData: ; 8d6e6
 ; 8d76a
 
 .Frameset_00:
-	frame SPRITE_ANIM_FRAME_IDX_00, 32
+	frame SPRITE_ANIM_FRAME_IDX_RED_WALK_1, 32
 	endanim
 
 .Frameset_PartyMon:
-	frame SPRITE_ANIM_FRAME_IDX_00,  8
+	frame SPRITE_ANIM_FRAME_IDX_RED_WALK_1,  8
-	frame SPRITE_ANIM_FRAME_IDX_01,  8
+	frame SPRITE_ANIM_FRAME_IDX_RED_WALK_2,  8
 	dorestart
 
-.Frameset_02:
+.Frameset_PartyMonWithMail:
-	frame SPRITE_ANIM_FRAME_IDX_3D,  8
+	frame SPRITE_ANIM_FRAME_IDX_PARTY_MON_WITH_MAIL_1,  8
-	frame SPRITE_ANIM_FRAME_IDX_3E,  8
+	frame SPRITE_ANIM_FRAME_IDX_PARTY_MON_WITH_MAIL_2,  8
 	dorestart
 
-.Frameset_03:
+.Frameset_PartyMonWithItem:
-	frame SPRITE_ANIM_FRAME_IDX_3F,  8
+	frame SPRITE_ANIM_FRAME_IDX_PARTY_MON_WITH_ITEM_1,  8
-	frame SPRITE_ANIM_FRAME_IDX_40,  8
+	frame SPRITE_ANIM_FRAME_IDX_PARTY_MON_WITH_ITEM_2,  8
 	dorestart
 
-.Frameset_04:
+.Frameset_PartyMonFast:
-	frame SPRITE_ANIM_FRAME_IDX_00,  4
+	frame SPRITE_ANIM_FRAME_IDX_RED_WALK_1,  4
-	frame SPRITE_ANIM_FRAME_IDX_01,  4
+	frame SPRITE_ANIM_FRAME_IDX_RED_WALK_2,  4
 	dorestart
 
-.Frameset_05:
+.Frameset_PartyMonWithMailFast:
-	frame SPRITE_ANIM_FRAME_IDX_3D,  4
+	frame SPRITE_ANIM_FRAME_IDX_PARTY_MON_WITH_MAIL_1,  4
-	frame SPRITE_ANIM_FRAME_IDX_3E,  4
+	frame SPRITE_ANIM_FRAME_IDX_PARTY_MON_WITH_MAIL_2,  4
 	dorestart
 
-.Frameset_06:
+.Frameset_PartyMonWithItemFast:
-	frame SPRITE_ANIM_FRAME_IDX_3F,  4
+	frame SPRITE_ANIM_FRAME_IDX_PARTY_MON_WITH_ITEM_1,  4
-	frame SPRITE_ANIM_FRAME_IDX_40,  4
+	frame SPRITE_ANIM_FRAME_IDX_PARTY_MON_WITH_ITEM_2,  4
 	dorestart
 
 .Frameset_RedWalk:
-	frame SPRITE_ANIM_FRAME_IDX_00,  8
+	frame SPRITE_ANIM_FRAME_IDX_RED_WALK_1,  8
-	frame SPRITE_ANIM_FRAME_IDX_01,  8
+	frame SPRITE_ANIM_FRAME_IDX_RED_WALK_2,  8
-	frame SPRITE_ANIM_FRAME_IDX_00,  8
+	frame SPRITE_ANIM_FRAME_IDX_RED_WALK_1,  8
-	frame SPRITE_ANIM_FRAME_IDX_01,  8, OAM_X_FLIP
+	frame SPRITE_ANIM_FRAME_IDX_RED_WALK_2,  8, OAM_X_FLIP
 	dorestart
 
 .Frameset_BlueWalk:
-	frame SPRITE_ANIM_FRAME_IDX_63,  8
+	frame SPRITE_ANIM_FRAME_IDX_BLUE_WALK_1,  8
-	frame SPRITE_ANIM_FRAME_IDX_64,  8
+	frame SPRITE_ANIM_FRAME_IDX_BLUE_WALK_2,  8
-	frame SPRITE_ANIM_FRAME_IDX_63,  8
+	frame SPRITE_ANIM_FRAME_IDX_BLUE_WALK_1,  8
-	frame SPRITE_ANIM_FRAME_IDX_64,  8, OAM_X_FLIP
+	frame SPRITE_ANIM_FRAME_IDX_BLUE_WALK_2,  8, OAM_X_FLIP
 	dorestart
 
 .Frameset_MagnetTrainBlue:
@@ -123,9 +123,9 @@ SpriteAnimFrameData: ; 8d6e6
 	frame SPRITE_ANIM_FRAME_IDX_66,  8, OAM_X_FLIP
 	dorestart
 
-.Frameset_07:
+.Frameset_GSTitleTrail:
-	frame SPRITE_ANIM_FRAME_IDX_1E,  1
+	frame SPRITE_ANIM_FRAME_IDX_GS_TITLE_TRAIL_1,  1
-	frame SPRITE_ANIM_FRAME_IDX_1F,  1
+	frame SPRITE_ANIM_FRAME_IDX_GS_TITLE_TRAIL_2,  1
 	dorestart
 
 .Frameset_TextEntryCursor:
@@ -134,7 +134,7 @@ SpriteAnimFrameData: ; 8d6e6
 	dorestart
 
 .Frameset_09:
-	frame SPRITE_ANIM_FRAME_IDX_21,  1
+	frame SPRITE_ANIM_FRAME_IDX_FOR_FRAMESET_09,  1
 	dorepeat  1
 	dorestart
 
@@ -195,7 +195,7 @@ SpriteAnimFrameData: ; 8d6e6
 	endanim
 
 .Frameset_StillCursor:
-	frame SPRITE_ANIM_FRAME_IDX_2F, 32
+	frame SPRITE_ANIM_FRAME_IDX_STILL_CURSOR, 32
 	endanim
 
 .Frameset_TradePokeBall:
@@ -221,8 +221,8 @@ SpriteAnimFrameData: ; 8d6e6
 	dorestart
 
 .Frameset_TrademonIcon:
-	frame SPRITE_ANIM_FRAME_IDX_37,  7
+	frame SPRITE_ANIM_FRAME_IDX_TRADEMON_ICON_1,  7
-	frame SPRITE_ANIM_FRAME_IDX_38,  7
+	frame SPRITE_ANIM_FRAME_IDX_TRADEMON_ICON_2,  7
 	dorestart
 
 .Frameset_TrademonBubble:
@@ -236,7 +236,7 @@ SpriteAnimFrameData: ; 8d6e6
 	endanim
 
 .Frameset_RadioTuningKnob:
-	frame SPRITE_ANIM_FRAME_IDX_3C, 32
+	frame SPRITE_ANIM_FRAME_IDX_RADIO_TUNING_KNOB, 32
 	endanim
 
 .Frameset_MagnetTrainRed:
@@ -294,20 +294,20 @@ SpriteAnimFrameData: ; 8d6e6
 	endanim
 
 .Frameset_Leaf:
-	frame SPRITE_ANIM_FRAME_IDX_4F, 32
+	frame SPRITE_ANIM_FRAME_IDX_LEAF, 32
 	endanim
 
 .Frameset_CutTree:
-	frame SPRITE_ANIM_FRAME_IDX_50,  2
+	frame SPRITE_ANIM_FRAME_IDX_TREE_1,      2
-	frame SPRITE_ANIM_FRAME_IDX_51, 16
+	frame SPRITE_ANIM_FRAME_IDX_CUT_TREE_2, 16
 	dorepeat  1
-	frame SPRITE_ANIM_FRAME_IDX_52,  1
+	frame SPRITE_ANIM_FRAME_IDX_CUT_TREE_3,  1
 	dorepeat  1
-	frame SPRITE_ANIM_FRAME_IDX_53,  1
+	frame SPRITE_ANIM_FRAME_IDX_CUT_TREE_4,  1
 	delanim
 
 .Frameset_EggCrack:
-	frame SPRITE_ANIM_FRAME_IDX_54, 32
+	frame SPRITE_ANIM_FRAME_IDX_EGG_CRACK, 32
 	endanim
 
 .Frameset_EggHatch:
@@ -336,10 +336,10 @@ SpriteAnimFrameData: ; 8d6e6
 	dorestart
 
 .Frameset_HeadbuttTree:
-	frame SPRITE_ANIM_FRAME_IDX_50,  2
+	frame SPRITE_ANIM_FRAME_IDX_TREE_1,           2
-	frame SPRITE_ANIM_FRAME_IDX_5B,  2
+	frame SPRITE_ANIM_FRAME_IDX_HEADBUTT_TREE_2,  2
-	frame SPRITE_ANIM_FRAME_IDX_50,  2
+	frame SPRITE_ANIM_FRAME_IDX_TREE_1,           2
-	frame SPRITE_ANIM_FRAME_IDX_5B,  2, OAM_X_FLIP
+	frame SPRITE_ANIM_FRAME_IDX_HEADBUTT_TREE_2,  2, OAM_X_FLIP
 	dorestart
 
 .Frameset_26:
@@ -480,7 +480,7 @@ SpriteAnimFrameData: ; 8d6e6
 	endanim
 
 .Frameset_IntroSuicuneAway:
-	frame SPRITE_ANIM_FRAME_IDX_7E,  3
+	frame SPRITE_ANIM_FRAME_IDX_INTRO_SUICUNE_AWAY,  3
 	endanim
 
 .Frameset_IntroUnownF:
@@ -488,12 +488,12 @@ SpriteAnimFrameData: ; 8d6e6
 	endanim
 
 .Frameset_CelebiLeft:
-	frame SPRITE_ANIM_FRAME_IDX_7F,  8
+	frame SPRITE_ANIM_FRAME_IDX_CELEBI_1,  8
-	frame SPRITE_ANIM_FRAME_IDX_80,  8
+	frame SPRITE_ANIM_FRAME_IDX_CELEBI_2,  8
 	endanim
 
 .Frameset_CelebiRight:
-	frame SPRITE_ANIM_FRAME_IDX_7F,  8, OAM_X_FLIP
+	frame SPRITE_ANIM_FRAME_IDX_CELEBI_1,  8, OAM_X_FLIP
-	frame SPRITE_ANIM_FRAME_IDX_80,  8, OAM_X_FLIP
+	frame SPRITE_ANIM_FRAME_IDX_CELEBI_2,  8, OAM_X_FLIP
 	endanim
 ; 8d94d

data/sprite_anim_seqs.asm

@@ -3,8 +3,8 @@ SpriteAnimSeqData: ; 8d1c4
 	; frameset sequence, tile
 ; SPRITE_ANIM_INDEX_PARTY_MON
 	db SPRITE_ANIM_FRAMESET_PARTY_MON, SPRITE_ANIM_SEQ_PARTY_MON, $00
-; SPRITE_ANIM_INDEX_01
+; SPRITE_ANIM_INDEX_GS_TITLE_TRAIL
-	db SPRITE_ANIM_FRAMESET_07, SPRITE_ANIM_SEQ_04, $00
+	db SPRITE_ANIM_FRAMESET_GS_TITLE_TRAIL, SPRITE_ANIM_SEQ_GS_TITLE_TRAIL, $00
 ; SPRITE_ANIM_INDEX_NAMING_SCREEN_CURSOR
 	db SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR, SPRITE_ANIM_SEQ_NAMING_SCREEN_CURSOR, $05
 ; SPRITE_ANIM_INDEX_GAMEFREAK_LOGO
@@ -26,9 +26,9 @@ SpriteAnimSeqData: ; 8d1c4
 ; SPRITE_ANIM_INDEX_0B
 	db SPRITE_ANIM_FRAMESET_STILL_CURSOR, SPRITE_ANIM_SEQ_0D, $08
 ; SPRITE_ANIM_INDEX_DUMMY_GAME
-	db SPRITE_ANIM_FRAMESET_STILL_CURSOR, SPRITE_ANIM_SEQ_0E, $08
+	db SPRITE_ANIM_FRAMESET_STILL_CURSOR, SPRITE_ANIM_SEQ_DUMMY_GAME_CURSOR, $08
-; SPRITE_ANIM_INDEX_0D
+; SPRITE_ANIM_INDEX_POKEGEAR_ARROW
-	db SPRITE_ANIM_FRAMESET_STILL_CURSOR, SPRITE_ANIM_SEQ_0F, $08
+	db SPRITE_ANIM_FRAMESET_STILL_CURSOR, SPRITE_ANIM_SEQ_POKEGEAR_ARROW, $08
 ; SPRITE_ANIM_INDEX_TRADE_POKE_BALL
 	db SPRITE_ANIM_FRAMESET_TRADE_POKE_BALL, SPRITE_ANIM_SEQ_TRADE_POKE_BALL, $00
 ; SPRITE_ANIM_INDEX_TRADE_POOF

engine/intro_menu.asm

@@ -1341,7 +1341,7 @@ Function639b: ; unreferenced
 	ld h, 0
 	add hl, hl
 	add hl, hl
-	ld de, Data63ca
+	ld de, .Data63ca
 	add hl, de
 	; If bit 2 of [wTitleScreenTimer] is set, get the second dw; else, get the first dw
 	ld a, [wTitleScreenTimer]
@@ -1357,12 +1357,12 @@ Function639b: ; unreferenced
 	ret z
 	ld e, a
 	ld d, [hl]
-	ld a, SPRITE_ANIM_INDEX_01
+	ld a, SPRITE_ANIM_INDEX_GS_TITLE_TRAIL
 	call _InitSpriteAnimStruct
 	ret
 ; 63ca
 
-Data63ca: ; 63ca
+.Data63ca: ; 63ca
 ; frame 0 y, x; frame 1 y, x
 	db 11 * 8 + 4, 10 * 8,  0 * 8,      0 * 8
 	db 11 * 8 + 4, 13 * 8, 11 * 8 + 4, 11 * 8

engine/mon_icons.asm

@@ -144,11 +144,11 @@ PartyMenu_InitAnimatedMonIcon: ; 8e8d5 (23:68d5)
 	pop bc
 	pop hl
 	jr c, .mail
-	ld a, SPRITE_ANIM_FRAMESET_03
+	ld a, SPRITE_ANIM_FRAMESET_PARTY_MON_WITH_ITEM
 	jr .okay
 
 .mail
-	ld a, SPRITE_ANIM_FRAMESET_02
+	ld a, SPRITE_ANIM_FRAMESET_PARTY_MON_WITH_MAIL
 .okay
 	ld hl, SPRITEANIMSTRUCT_FRAMESET_ID
 	add hl, bc
@@ -297,7 +297,7 @@ GetMemIconGFX: ; 8e9db (23:69db)
 	ld a, [wCurIconTile]
 GetIconGFX: ; 8e9de
 	call GetIcon_a
-	ld de, $80 ; 8 tiles
+	ld de, 8 tiles
 	add hl, de
 	ld de, HeldItemIcons
 	lb bc, BANK(HeldItemIcons), 2
@@ -468,9 +468,6 @@ ReadMonMenuIcon: ; 8eab3
 
 INCLUDE "data/mon_menu_icons.asm"
 
-
 INCLUDE "gfx/icon_pointers.asm"
 
-Icons:
 INCLUDE "gfx/icons.asm"
-

engine/player_object.asm

@@ -193,7 +193,7 @@ CopyMapObjectToObjectStruct: ; 8116
 	and $f0
 	jr z, .skip_color_override
 	swap a
-	and $7 ; OAM_PALETTE
+	and PALETTE_MASK
 	ld [wTempObjectCopyPalette], a
 
 .skip_color_override

engine/pokegear.asm

@@ -141,7 +141,7 @@ INCBIN "gfx/pokegear/fast_ship.2bpp"
 
 InitPokegearModeIndicatorArrow: ; 90d32 (24:4d32)
 	depixel 4, 2, 4, 0
-	ld a, SPRITE_ANIM_INDEX_0D
+	ld a, SPRITE_ANIM_INDEX_POKEGEAR_ARROW
 	call _InitSpriteAnimStruct
 	ld hl, SPRITEANIMSTRUCT_TILE_ID
 	add hl, bc
@@ -685,7 +685,7 @@ PokegearMap_InitPlayerIcon: ; 9106a
 PokegearMap_InitCursor: ; 91098
 	push af
 	depixel 0, 0
-	ld a, SPRITE_ANIM_INDEX_0D
+	ld a, SPRITE_ANIM_INDEX_POKEGEAR_ARROW
 	call _InitSpriteAnimStruct
 	ld hl, SPRITEANIMSTRUCT_TILE_ID
 	add hl, bc

engine/sprite_anims.asm

@@ -18,8 +18,8 @@ DoAnimFrame: ; 8d24b
 	dw .PartyMon
 	dw .PartyMonSwitch
 	dw .PartyMonSelected
-	dw .sprite_anim_seq_04
+	dw .GSTitleTrail
-	dw .namingscreencursor
+	dw .NamingScreenCursor
 	dw .GameFreakLogo
 	dw .GSIntroStar
 	dw .GSIntroSparkle
@@ -28,8 +28,8 @@ DoAnimFrame: ; 8d24b
 	dw .SlotsChanseyEgg
 	dw .MailCursor
 	dw .sprite_anim_seq_0D
-	dw .sprite_anim_seq_0E
+	dw .DummyGameCursor
-	dw .sprite_anim_seq_0F
+	dw .PokegearArrow
 	dw .TradePokeBall
 	dw .TradeTubeBulge
 	dw .TrademonInTube
@@ -132,7 +132,7 @@ DoAnimFrame: ; 8d24b
 	ld [hl], 8 * 3
 	ret
 
-.sprite_anim_seq_04 ; 8d302 (23:5302)
+.GSTitleTrail ; 8d302 (23:5302)
 	call .AnonymousJumptable
 	jp hl
 ; 8d306 (23:5306)
@@ -217,7 +217,7 @@ DoAnimFrame: ; 8d24b
 	ld [hl], a
 	ret
 
-.namingscreencursor ; 8d36c (23:536c)
+.NamingScreenCursor ; 8d36c (23:536c)
 	callab NamingScreen_AnimateCursor
 	ret
 
@@ -408,11 +408,11 @@ DoAnimFrame: ; 8d24b
 	callab ret_e00ed
 	ret
 
-.sprite_anim_seq_0F ; 8d475 (23:5475)
+.PokegearArrow ; 8d475 (23:5475)
 	callab AnimatePokegearModeIndicatorArrow
 	ret
 
-.sprite_anim_seq_0E ; 8d47c (23:547c)
+.DummyGameCursor ; 8d47c (23:547c)
 	callab DummyGame_InterpretJoypad_AnimateCursor
 	ret
 

gbhw.asm

@@ -29,14 +29,15 @@ SERIAL   EQU 3
 JOYPAD   EQU 4
 
 ; OAM attribute flags
-OAM_PALETTE   EQU %111
 OAM_TILE_BANK EQU 3
-OAM_OBP_NUM   EQU 4 ; Non CGB Mode Only
+OAM_OBP_NUM   EQU 4 ; non CGB Mode Only
 OAM_X_FLIP    EQU 5
 OAM_Y_FLIP    EQU 6
 OAM_PRIORITY  EQU 7 ; 0: OBJ above BG, 1: OBJ behind BG (colors 1-3)
 
+PALETTE_MASK EQU %111
 VRAM_BANK_1  EQU 1 << OAM_TILE_BANK
+OBP_NUM      EQU 1 << OAM_OBP_NUM
 X_FLIP       EQU 1 << OAM_X_FLIP
 Y_FLIP       EQU 1 << OAM_Y_FLIP
 BEHIND_BG    EQU 1 << OAM_PRIORITY

gfx/icons.asm

@@ -1,3 +1,4 @@
+Icons:
 NullIcon:
 PoliwagIcon:      INCBIN "gfx/icon/poliwag.2bpp" ; 0x8ec0d
 JigglypuffIcon:   INCBIN "gfx/icon/jigglypuff.2bpp" ; 0x8ec8d