Identify more sprite-related constants

Start more documentation

audio/engine.asm

@@ -1394,8 +1394,7 @@ ParseMusicCommand: ; e870f
 ; e8720
 
 MusicCommands: ; e8720
-; pointer to each command in order
+; entries correspond to macros/sound.asm enumeration
-	; octaves
 	dw Music_Octave8 ; octave 8
 	dw Music_Octave7 ; octave 7
 	dw Music_Octave6 ; octave 6

battle/anim_commands.asm

@@ -352,6 +352,7 @@ RunBattleAnimCommand: ; cc25f
 
 
 BattleAnimCommands:: ; cc2a4 (33:42a4)
+; entries correspond to macros/move_anim.asm enumeration
 	dw BattleAnimCmd_Obj
 	dw BattleAnimCmd_1GFX
 	dw BattleAnimCmd_2GFX

constants/sprite_data_constants.asm

@@ -248,10 +248,10 @@ SPRITEMOVEDATA_FIELDS EQU 6
 	const SPRITE_ANIM_INDEX_MAGNET_TRAIN_BLUE       ; 1f
 	const SPRITE_ANIM_INDEX_MOBILE_TRADE_SENT_BALL  ; 20
 	const SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_BALL    ; 21
-	const SPRITE_ANIM_INDEX_22                      ; 22
+	const SPRITE_ANIM_INDEX_MOBILE_22               ; 22
-	const SPRITE_ANIM_INDEX_23                      ; 23
+	const SPRITE_ANIM_INDEX_MOBILE_23               ; 23
-	const SPRITE_ANIM_INDEX_24                      ; 24
+	const SPRITE_ANIM_INDEX_MOBILE_24               ; 24
-	const SPRITE_ANIM_INDEX_25                      ; 25
+	const SPRITE_ANIM_INDEX_MOBILE_25               ; 25
 	const SPRITE_ANIM_INDEX_INTRO_SUICUNE           ; 26
 	const SPRITE_ANIM_INDEX_INTRO_PICHU             ; 27
 	const SPRITE_ANIM_INDEX_INTRO_WOOPER            ; 28
@@ -262,110 +262,110 @@ SPRITEMOVEDATA_FIELDS EQU 6
 
 ; DoAnimFrame.Jumptable indexes (see engine/sprite_anims.asm)
 	const_def
-	const SPRITE_ANIM_SEQ_NULL
+	const SPRITE_ANIM_SEQ_NULL                 ; 00
-	const SPRITE_ANIM_SEQ_PARTY_MON
+	const SPRITE_ANIM_SEQ_PARTY_MON            ; 01
-	const SPRITE_ANIM_SEQ_PARTY_MON_SWITCH
+	const SPRITE_ANIM_SEQ_PARTY_MON_SWITCH     ; 02
-	const SPRITE_ANIM_SEQ_PARTY_MON_SELECTED
+	const SPRITE_ANIM_SEQ_PARTY_MON_SELECTED   ; 03
-	const SPRITE_ANIM_SEQ_GS_TITLE_TRAIL
+	const SPRITE_ANIM_SEQ_GS_TITLE_TRAIL       ; 04
-	const SPRITE_ANIM_SEQ_NAMING_SCREEN_CURSOR
+	const SPRITE_ANIM_SEQ_NAMING_SCREEN_CURSOR ; 05
-	const SPRITE_ANIM_SEQ_GAMEFREAK_LOGO
+	const SPRITE_ANIM_SEQ_GAMEFREAK_LOGO       ; 06
-	const SPRITE_ANIM_SEQ_GS_INTRO_STAR
+	const SPRITE_ANIM_SEQ_GS_INTRO_STAR        ; 07
-	const SPRITE_ANIM_SEQ_GS_INTRO_SPARKLE
+	const SPRITE_ANIM_SEQ_GS_INTRO_SPARKLE     ; 08
-	const SPRITE_ANIM_SEQ_SLOTS_GOLEM
+	const SPRITE_ANIM_SEQ_SLOTS_GOLEM          ; 09
-	const SPRITE_ANIM_SEQ_SLOTS_CHANSEY
+	const SPRITE_ANIM_SEQ_SLOTS_CHANSEY        ; 0a
-	const SPRITE_ANIM_SEQ_SLOTS_EGG
+	const SPRITE_ANIM_SEQ_SLOTS_EGG            ; 0b
-	const SPRITE_ANIM_SEQ_MAIL_CURSOR
+	const SPRITE_ANIM_SEQ_MAIL_CURSOR          ; 0c
-	const SPRITE_ANIM_SEQ_FOR_UNUSED_CURSOR
+	const SPRITE_ANIM_SEQ_FOR_UNUSED_CURSOR    ; 0d
-	const SPRITE_ANIM_SEQ_DUMMY_GAME_CURSOR
+	const SPRITE_ANIM_SEQ_DUMMY_GAME_CURSOR    ; 0e
-	const SPRITE_ANIM_SEQ_POKEGEAR_ARROW
+	const SPRITE_ANIM_SEQ_POKEGEAR_ARROW       ; 0f
-	const SPRITE_ANIM_SEQ_TRADE_POKE_BALL
+	const SPRITE_ANIM_SEQ_TRADE_POKE_BALL      ; 10
-	const SPRITE_ANIM_SEQ_TRADE_TUBE_BULGE
+	const SPRITE_ANIM_SEQ_TRADE_TUBE_BULGE     ; 11
-	const SPRITE_ANIM_SEQ_TRADEMON_IN_TUBE
+	const SPRITE_ANIM_SEQ_TRADEMON_IN_TUBE     ; 12
-	const SPRITE_ANIM_SEQ_REVEAL_NEW_MON
+	const SPRITE_ANIM_SEQ_REVEAL_NEW_MON       ; 13
-	const SPRITE_ANIM_SEQ_RADIO_TUNING_KNOB
+	const SPRITE_ANIM_SEQ_RADIO_TUNING_KNOB    ; 14
-	const SPRITE_ANIM_SEQ_CUT_LEAVES
+	const SPRITE_ANIM_SEQ_CUT_LEAVES           ; 15
-	const SPRITE_ANIM_SEQ_FLY_FROM
+	const SPRITE_ANIM_SEQ_FLY_FROM             ; 16
-	const SPRITE_ANIM_SEQ_FLY_LEAF
+	const SPRITE_ANIM_SEQ_FLY_LEAF             ; 17
-	const SPRITE_ANIM_SEQ_FLY_TO
+	const SPRITE_ANIM_SEQ_FLY_TO               ; 18
-	const SPRITE_ANIM_SEQ_19
+	const SPRITE_ANIM_SEQ_19                   ; 19
-	const SPRITE_ANIM_SEQ_1A
+	const SPRITE_ANIM_SEQ_1A                   ; 1a
-	const SPRITE_ANIM_SEQ_1B
+	const SPRITE_ANIM_SEQ_FOR_MOBILE_23        ; 1b
-	const SPRITE_ANIM_SEQ_1C
+	const SPRITE_ANIM_SEQ_FOR_MOBILE_24        ; 1c
-	const SPRITE_ANIM_SEQ_INTRO_SUICUNE
+	const SPRITE_ANIM_SEQ_INTRO_SUICUNE        ; 1d
-	const SPRITE_ANIM_SEQ_INTRO_PICHU_WOOPER
+	const SPRITE_ANIM_SEQ_INTRO_PICHU_WOOPER   ; 1e
-	const SPRITE_ANIM_SEQ_CELEBI
+	const SPRITE_ANIM_SEQ_CELEBI               ; 1f
-	const SPRITE_ANIM_SEQ_INTRO_UNOWN
+	const SPRITE_ANIM_SEQ_INTRO_UNOWN          ; 20
-	const SPRITE_ANIM_SEQ_INTRO_UNOWN_F
+	const SPRITE_ANIM_SEQ_INTRO_UNOWN_F        ; 21
-	const SPRITE_ANIM_SEQ_INTRO_SUICUNE_AWAY
+	const SPRITE_ANIM_SEQ_INTRO_SUICUNE_AWAY   ; 22
 
 ; 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_PARTY_MON ; 01
-	const SPRITE_ANIM_FRAMESET_PARTY_MON_WITH_MAIL
+	const SPRITE_ANIM_FRAMESET_PARTY_MON_WITH_MAIL ; 02
-	const SPRITE_ANIM_FRAMESET_PARTY_MON_WITH_ITEM
+	const SPRITE_ANIM_FRAMESET_PARTY_MON_WITH_ITEM ; 03
-	const SPRITE_ANIM_FRAMESET_PARTY_MON_FAST
+	const SPRITE_ANIM_FRAMESET_PARTY_MON_FAST ; 04
-	const SPRITE_ANIM_FRAMESET_PARTY_MON_WITH_MAIL_FAST
+	const SPRITE_ANIM_FRAMESET_PARTY_MON_WITH_MAIL_FAST ; 05
-	const SPRITE_ANIM_FRAMESET_PARTY_MON_WITH_ITEM_FAST
+	const SPRITE_ANIM_FRAMESET_PARTY_MON_WITH_ITEM_FAST ; 06
-	const SPRITE_ANIM_FRAMESET_GS_TITLE_TRAIL
+	const SPRITE_ANIM_FRAMESET_GS_TITLE_TRAIL ; 07
-	const SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR
+	const SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR ; 08
 	const SPRITE_ANIM_FRAMESET_09
-	const SPRITE_ANIM_FRAMESET_GAMEFREAK_LOGO
+	const SPRITE_ANIM_FRAMESET_GAMEFREAK_LOGO ; 0a
-	const SPRITE_ANIM_FRAMESET_GS_INTRO_STAR
+	const SPRITE_ANIM_FRAMESET_GS_INTRO_STAR ; 0b
-	const SPRITE_ANIM_FRAMESET_GS_INTRO_SPARKLE
+	const SPRITE_ANIM_FRAMESET_GS_INTRO_SPARKLE ; 0c
-	const SPRITE_ANIM_FRAMESET_SLOTS_GOLEM
+	const SPRITE_ANIM_FRAMESET_SLOTS_GOLEM ; 0d
-	const SPRITE_ANIM_FRAMESET_SLOTS_CHANSEY
+	const SPRITE_ANIM_FRAMESET_SLOTS_CHANSEY ; 0e
-	const SPRITE_ANIM_FRAMESET_SLOTS_CHANSEY_2
+	const SPRITE_ANIM_FRAMESET_SLOTS_CHANSEY_2 ; 0f
-	const SPRITE_ANIM_FRAMESET_SLOTS_EGG
+	const SPRITE_ANIM_FRAMESET_SLOTS_EGG ; 10
-	const SPRITE_ANIM_FRAMESET_RED_WALK
+	const SPRITE_ANIM_FRAMESET_RED_WALK ; 11
-	const SPRITE_ANIM_FRAMESET_STILL_CURSOR
+	const SPRITE_ANIM_FRAMESET_STILL_CURSOR ; 12
-	const SPRITE_ANIM_FRAMESET_TRADE_POKE_BALL
+	const SPRITE_ANIM_FRAMESET_TRADE_POKE_BALL ; 13
-	const SPRITE_ANIM_FRAMESET_TRADE_POKE_BALL_0
+	const SPRITE_ANIM_FRAMESET_TRADE_POKE_BALL_0 ; 14
-	const SPRITE_ANIM_FRAMESET_TRADE_POOF
+	const SPRITE_ANIM_FRAMESET_TRADE_POOF ; 15
-	const SPRITE_ANIM_FRAMESET_TRADE_TUBE_BULGE
+	const SPRITE_ANIM_FRAMESET_TRADE_TUBE_BULGE ; 16
-	const SPRITE_ANIM_FRAMESET_TRADEMON_ICON
+	const SPRITE_ANIM_FRAMESET_TRADEMON_ICON ; 17
-	const SPRITE_ANIM_FRAMESET_TRADEMON_BUBBLE
+	const SPRITE_ANIM_FRAMESET_TRADEMON_BUBBLE ; 18
-	const SPRITE_ANIM_FRAMESET_EVOLUTION_BALL_OF_LIGHT
+	const SPRITE_ANIM_FRAMESET_EVOLUTION_BALL_OF_LIGHT ; 19
-	const SPRITE_ANIM_FRAMESET_RADIO_TUNING_KNOB
+	const SPRITE_ANIM_FRAMESET_RADIO_TUNING_KNOB ; 1a
-	const SPRITE_ANIM_FRAMESET_MAGNET_TRAIN_RED
+	const SPRITE_ANIM_FRAMESET_MAGNET_TRAIN_RED ; 1b
-	const SPRITE_ANIM_FRAMESET_1C ; unused?
+	const SPRITE_ANIM_FRAMESET_1C
-	const SPRITE_ANIM_FRAMESET_LEAF
+	const SPRITE_ANIM_FRAMESET_LEAF ; 1d
-	const SPRITE_ANIM_FRAMESET_CUT_TREE
+	const SPRITE_ANIM_FRAMESET_CUT_TREE ; 1e
-	const SPRITE_ANIM_FRAMESET_EGG_CRACK
+	const SPRITE_ANIM_FRAMESET_EGG_CRACK ; 1f
-	const SPRITE_ANIM_FRAMESET_EGG_HATCH
+	const SPRITE_ANIM_FRAMESET_EGG_HATCH ; 20
-	const SPRITE_ANIM_FRAMESET_21 ; unused?
+	const SPRITE_ANIM_FRAMESET_21
-	const SPRITE_ANIM_FRAMESET_22 ; unused?
+	const SPRITE_ANIM_FRAMESET_22
-	const SPRITE_ANIM_FRAMESET_23 ; unused?
+	const SPRITE_ANIM_FRAMESET_23
 	const SPRITE_ANIM_FRAMESET_24
-	const SPRITE_ANIM_FRAMESET_HEADBUTT
+	const SPRITE_ANIM_FRAMESET_HEADBUTT ; 25
 	const SPRITE_ANIM_FRAMESET_26
-	const SPRITE_ANIM_FRAMESET_27 ; unused?
+	const SPRITE_ANIM_FRAMESET_27
-	const SPRITE_ANIM_FRAMESET_28 ; unused?
+	const SPRITE_ANIM_FRAMESET_28
-	const SPRITE_ANIM_FRAMESET_29 ; unused?
+	const SPRITE_ANIM_FRAMESET_29
-	const SPRITE_ANIM_FRAMESET_2A ; unused?
+	const SPRITE_ANIM_FRAMESET_2A
-	const SPRITE_ANIM_FRAMESET_2B ; unused?
+	const SPRITE_ANIM_FRAMESET_2B
-	const SPRITE_ANIM_FRAMESET_2C ; unused?
+	const SPRITE_ANIM_FRAMESET_2C
-	const SPRITE_ANIM_FRAMESET_BLUE_WALK
+	const SPRITE_ANIM_FRAMESET_BLUE_WALK ; 2d
-	const SPRITE_ANIM_FRAMESET_MAGNET_TRAIN_BLUE
+	const SPRITE_ANIM_FRAMESET_MAGNET_TRAIN_BLUE ; 2e
-	const SPRITE_ANIM_FRAMESET_MOBILE_TRADE_SENT_BALL
+	const SPRITE_ANIM_FRAMESET_MOBILE_TRADE_SENT_BALL ; 2f
-	const SPRITE_ANIM_FRAMESET_MOBILE_TRADE_OT_BALL
+	const SPRITE_ANIM_FRAMESET_MOBILE_TRADE_OT_BALL ; 30
-	const SPRITE_ANIM_FRAMESET_31
+	const SPRITE_ANIM_FRAMESET_FOR_MOBILE_22 ; 31
-	const SPRITE_ANIM_FRAMESET_32
+	const SPRITE_ANIM_FRAMESET_FOR_MOBILE_23 ; 32
-	const SPRITE_ANIM_FRAMESET_33
+	const SPRITE_ANIM_FRAMESET_FOR_MOBILE_24 ; 33
-	const SPRITE_ANIM_FRAMESET_34
+	const SPRITE_ANIM_FRAMESET_FOR_MOBILE_25 ; 34
-	const SPRITE_ANIM_FRAMESET_INTRO_SUICUNE
+	const SPRITE_ANIM_FRAMESET_INTRO_SUICUNE ; 35
-	const SPRITE_ANIM_FRAMESET_INTRO_SUICUNE_2
+	const SPRITE_ANIM_FRAMESET_INTRO_SUICUNE_2 ; 36
-	const SPRITE_ANIM_FRAMESET_INTRO_PICHU
+	const SPRITE_ANIM_FRAMESET_INTRO_PICHU ; 37
-	const SPRITE_ANIM_FRAMESET_INTRO_WOOPER
+	const SPRITE_ANIM_FRAMESET_INTRO_WOOPER ; 38
-	const SPRITE_ANIM_FRAMESET_INTRO_UNOWN_1
+	const SPRITE_ANIM_FRAMESET_INTRO_UNOWN_1 ; 39
-	const SPRITE_ANIM_FRAMESET_INTRO_UNOWN_2
+	const SPRITE_ANIM_FRAMESET_INTRO_UNOWN_2 ; 3a
-	const SPRITE_ANIM_FRAMESET_INTRO_UNOWN_3
+	const SPRITE_ANIM_FRAMESET_INTRO_UNOWN_3 ; 3b
-	const SPRITE_ANIM_FRAMESET_INTRO_UNOWN_4
+	const SPRITE_ANIM_FRAMESET_INTRO_UNOWN_4 ; 3c
-	const SPRITE_ANIM_FRAMESET_INTRO_UNOWN_F_2
+	const SPRITE_ANIM_FRAMESET_INTRO_UNOWN_F_2 ; 3d
-	const SPRITE_ANIM_FRAMESET_INTRO_SUICUNE_AWAY
+	const SPRITE_ANIM_FRAMESET_INTRO_SUICUNE_AWAY ; 3e
-	const SPRITE_ANIM_FRAMESET_INTRO_UNOWN_F
+	const SPRITE_ANIM_FRAMESET_INTRO_UNOWN_F ; 3f
-	const SPRITE_ANIM_FRAMESET_CELEBI_LEFT
+	const SPRITE_ANIM_FRAMESET_CELEBI_LEFT ; 40
-	const SPRITE_ANIM_FRAMESET_CELEBI_RIGHT
+	const SPRITE_ANIM_FRAMESET_CELEBI_RIGHT ; 41
 
 ; SpriteAnimOAMData indexes (see data/sprite_anim_oam.asm)
 	const_def
@@ -419,23 +419,23 @@ SPRITEMOVEDATA_FIELDS EQU 6
 	const SPRITE_ANIM_FRAME_IDX_STILL_CURSOR ; 2f
 	const SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_1 ; 30
 	const SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_2 ; 31
-	const SPRITE_ANIM_FRAME_IDX_32
+	const SPRITE_ANIM_FRAME_IDX_TRADE_POOF_1 ; 32
-	const SPRITE_ANIM_FRAME_IDX_33
+	const SPRITE_ANIM_FRAME_IDX_TRADE_POOF_2 ; 33
-	const SPRITE_ANIM_FRAME_IDX_34
+	const SPRITE_ANIM_FRAME_IDX_TRADE_POOF_3 ; 34
 	const SPRITE_ANIM_FRAME_IDX_35
 	const SPRITE_ANIM_FRAME_IDX_36
 	const SPRITE_ANIM_FRAME_IDX_TRADEMON_ICON_1 ; 37
 	const SPRITE_ANIM_FRAME_IDX_TRADEMON_ICON_2 ; 38
-	const SPRITE_ANIM_FRAME_IDX_39
+	const SPRITE_ANIM_FRAME_IDX_TRADEMON_BUBBLE ; 39
-	const SPRITE_ANIM_FRAME_IDX_3A
+	const SPRITE_ANIM_FRAME_IDX_EVOLUTION_BALL_OF_LIGHT_1 ; 3a
-	const SPRITE_ANIM_FRAME_IDX_3B
+	const SPRITE_ANIM_FRAME_IDX_EVOLUTION_BALL_OF_LIGHT_2 ; 3b
 	const SPRITE_ANIM_FRAME_IDX_RADIO_TUNING_KNOB ; 3c
 	const SPRITE_ANIM_FRAME_IDX_PARTY_MON_WITH_MAIL_1 ; 3d
 	const SPRITE_ANIM_FRAME_IDX_PARTY_MON_WITH_MAIL_2 ; 3e
 	const SPRITE_ANIM_FRAME_IDX_PARTY_MON_WITH_ITEM_1 ; 3f
 	const SPRITE_ANIM_FRAME_IDX_PARTY_MON_WITH_ITEM_2 ; 40
-	const SPRITE_ANIM_FRAME_IDX_41
+	const SPRITE_ANIM_FRAME_IDX_MAGNET_TRAIN_RED_1 ; 41
-	const SPRITE_ANIM_FRAME_IDX_42
+	const SPRITE_ANIM_FRAME_IDX_MAGNET_TRAIN_RED_2 ; 42
 	const SPRITE_ANIM_FRAME_IDX_43
 	const SPRITE_ANIM_FRAME_IDX_44
 	const SPRITE_ANIM_FRAME_IDX_45
@@ -472,29 +472,29 @@ SPRITEMOVEDATA_FIELDS EQU 6
 	const SPRITE_ANIM_FRAME_IDX_BLUE_WALK_2 ; 64
 	const SPRITE_ANIM_FRAME_IDX_MAGNET_TRAIN_BLUE_1 ; 65
 	const SPRITE_ANIM_FRAME_IDX_MAGNET_TRAIN_BLUE_2 ; 66
-	const SPRITE_ANIM_FRAME_IDX_67
+	const SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_22_1 ; 67
-	const SPRITE_ANIM_FRAME_IDX_68
+	const SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_22_2 ; 68
-	const SPRITE_ANIM_FRAME_IDX_69
+	const SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_25_1 ; 69
-	const SPRITE_ANIM_FRAME_IDX_6A
+	const SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_25_2 ; 6a
-	const SPRITE_ANIM_FRAME_IDX_6B
+	const SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_25_3 ; 6b
-	const SPRITE_ANIM_FRAME_IDX_6C
+	const SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_23 ; 6c
-	const SPRITE_ANIM_FRAME_IDX_6D
+	const SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_24 ; 6d
-	const SPRITE_ANIM_FRAME_IDX_6E
+	const SPRITE_ANIM_FRAME_IDX_INTRO_SUICUNE_1 ; 6e
-	const SPRITE_ANIM_FRAME_IDX_6F
+	const SPRITE_ANIM_FRAME_IDX_INTRO_SUICUNE_2 ; 6f
-	const SPRITE_ANIM_FRAME_IDX_70
+	const SPRITE_ANIM_FRAME_IDX_INTRO_SUICUNE_3 ; 70
-	const SPRITE_ANIM_FRAME_IDX_71
+	const SPRITE_ANIM_FRAME_IDX_INTRO_SUICUNE_4 ; 71
-	const SPRITE_ANIM_FRAME_IDX_72
+	const SPRITE_ANIM_FRAME_IDX_INTRO_PICHU_1 ; 72
-	const SPRITE_ANIM_FRAME_IDX_73
+	const SPRITE_ANIM_FRAME_IDX_INTRO_PICHU_2 ; 73
-	const SPRITE_ANIM_FRAME_IDX_74
+	const SPRITE_ANIM_FRAME_IDX_INTRO_PICHU_3 ; 74
-	const SPRITE_ANIM_FRAME_IDX_75
+	const SPRITE_ANIM_FRAME_IDX_INTRO_WOOPER ; 75
-	const SPRITE_ANIM_FRAME_IDX_76
+	const SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_1 ; 76
-	const SPRITE_ANIM_FRAME_IDX_77
+	const SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_2 ; 77
-	const SPRITE_ANIM_FRAME_IDX_78
+	const SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_3 ; 78
-	const SPRITE_ANIM_FRAME_IDX_79
+	const SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_F_2_1 ; 79
-	const SPRITE_ANIM_FRAME_IDX_7A
+	const SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_F_2_2 ; 7a
-	const SPRITE_ANIM_FRAME_IDX_7B
+	const SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_F_2_3 ; 7b
-	const SPRITE_ANIM_FRAME_IDX_7C
+	const SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_F_2_4 ; 7c
-	const SPRITE_ANIM_FRAME_IDX_7D
+	const SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_F_2_5 ; 7d
 	const SPRITE_ANIM_FRAME_IDX_INTRO_SUICUNE_AWAY ; 7e
 	const SPRITE_ANIM_FRAME_IDX_CELEBI_1 ; 7f
 	const SPRITE_ANIM_FRAME_IDX_CELEBI_2 ; 80

data/sprite_anim_frames.asm

@@ -49,10 +49,10 @@ SpriteAnimFrameData: ; 8d6e6
 	dw .Frameset_MagnetTrainBlue
 	dw .Frameset_MobileTradeSentBall
 	dw .Frameset_MobileTradeOTBall
-	dw .Frameset_31
+	dw .Frameset_ForMobile22
-	dw .Frameset_32
+	dw .Frameset_ForMobile23
-	dw .Frameset_33
+	dw .Frameset_ForMobile24
-	dw .Frameset_34
+	dw .Frameset_ForMobile25
 	dw .Frameset_IntroSuicune
 	dw .Frameset_IntroSuicune2
 	dw .Frameset_IntroPichu
@@ -210,9 +210,9 @@ SpriteAnimFrameData: ; 8d6e6
 	dorestart
 
 .Frameset_TradePoof:
-	frame SPRITE_ANIM_FRAME_IDX_32,  4
+	frame SPRITE_ANIM_FRAME_IDX_TRADE_POOF_1,  4
-	frame SPRITE_ANIM_FRAME_IDX_33,  4
+	frame SPRITE_ANIM_FRAME_IDX_TRADE_POOF_2,  4
-	frame SPRITE_ANIM_FRAME_IDX_34,  4
+	frame SPRITE_ANIM_FRAME_IDX_TRADE_POOF_3,  4
 	delanim
 
 .Frameset_TradeTubeBulge:
@@ -226,13 +226,13 @@ SpriteAnimFrameData: ; 8d6e6
 	dorestart
 
 .Frameset_TrademonBubble:
-	frame SPRITE_ANIM_FRAME_IDX_39, 32
+	frame SPRITE_ANIM_FRAME_IDX_TRADEMON_BUBBLE, 32
 	endanim
 
 .Frameset_EvolutionBallOfLight:
-	frame SPRITE_ANIM_FRAME_IDX_3B,  2
+	frame SPRITE_ANIM_FRAME_IDX_EVOLUTION_BALL_OF_LIGHT_2,  2
-	frame SPRITE_ANIM_FRAME_IDX_3A,  2
+	frame SPRITE_ANIM_FRAME_IDX_EVOLUTION_BALL_OF_LIGHT_1,  2
-	frame SPRITE_ANIM_FRAME_IDX_3B,  2
+	frame SPRITE_ANIM_FRAME_IDX_EVOLUTION_BALL_OF_LIGHT_2,  2
 	endanim
 
 .Frameset_RadioTuningKnob:
@@ -240,10 +240,10 @@ SpriteAnimFrameData: ; 8d6e6
 	endanim
 
 .Frameset_MagnetTrainRed:
-	frame SPRITE_ANIM_FRAME_IDX_41,  8
+	frame SPRITE_ANIM_FRAME_IDX_MAGNET_TRAIN_RED_1,  8
-	frame SPRITE_ANIM_FRAME_IDX_42,  8
+	frame SPRITE_ANIM_FRAME_IDX_MAGNET_TRAIN_RED_2,  8
-	frame SPRITE_ANIM_FRAME_IDX_41,  8
+	frame SPRITE_ANIM_FRAME_IDX_MAGNET_TRAIN_RED_1,  8
-	frame SPRITE_ANIM_FRAME_IDX_42,  8, OAM_X_FLIP
+	frame SPRITE_ANIM_FRAME_IDX_MAGNET_TRAIN_RED_2,  8, OAM_X_FLIP
 	dorestart
 
 ; XXX
@@ -371,9 +371,9 @@ SpriteAnimFrameData: ; 8d6e6
 	endanim
 
 .Frameset_MobileTradeSentBall:
-	frame SPRITE_ANIM_FRAME_IDX_32,  3
+	frame SPRITE_ANIM_FRAME_IDX_TRADE_POOF_1,  3
-	frame SPRITE_ANIM_FRAME_IDX_33,  3
+	frame SPRITE_ANIM_FRAME_IDX_TRADE_POOF_2,  3
-	frame SPRITE_ANIM_FRAME_IDX_34,  3
+	frame SPRITE_ANIM_FRAME_IDX_TRADE_POOF_3,  3
 	frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_1,  3
 	frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_2,  3
 	frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_1,  3
@@ -401,82 +401,82 @@ SpriteAnimFrameData: ; 8d6e6
 	frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_2,  3
 	frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_1,  3
 	frame SPRITE_ANIM_FRAME_IDX_TRADE_POKE_BALL_2,  3, OAM_X_FLIP
-	frame SPRITE_ANIM_FRAME_IDX_32,  3
+	frame SPRITE_ANIM_FRAME_IDX_TRADE_POOF_1,  3
-	frame SPRITE_ANIM_FRAME_IDX_33,  3
+	frame SPRITE_ANIM_FRAME_IDX_TRADE_POOF_2,  3
-	frame SPRITE_ANIM_FRAME_IDX_34,  3
+	frame SPRITE_ANIM_FRAME_IDX_TRADE_POOF_3,  3
 	delanim
 
-.Frameset_31:
+.Frameset_ForMobile22:
-	frame SPRITE_ANIM_FRAME_IDX_67,  3
+	frame SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_22_1,  3
-	frame SPRITE_ANIM_FRAME_IDX_68,  3
+	frame SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_22_2,  3
 	dorestart
 
-.Frameset_32:
+.Frameset_ForMobile23:
-	frame SPRITE_ANIM_FRAME_IDX_6C,  3
+	frame SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_23,  3
 	endanim
 
-.Frameset_33:
+.Frameset_ForMobile24:
-	frame SPRITE_ANIM_FRAME_IDX_6D,  3
+	frame SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_24,  3
 	endanim
 
-.Frameset_34:
+.Frameset_ForMobile25:
-	frame SPRITE_ANIM_FRAME_IDX_69,  2
+	frame SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_25_1,  2
-	frame SPRITE_ANIM_FRAME_IDX_6A,  2
+	frame SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_25_2,  2
-	frame SPRITE_ANIM_FRAME_IDX_6B,  2
+	frame SPRITE_ANIM_FRAME_IDX_FOR_MOBILE_25_3,  2
 	delanim
 
 .Frameset_IntroSuicune:
-	frame SPRITE_ANIM_FRAME_IDX_6E,  3
+	frame SPRITE_ANIM_FRAME_IDX_INTRO_SUICUNE_1,  3
-	frame SPRITE_ANIM_FRAME_IDX_6F,  3
+	frame SPRITE_ANIM_FRAME_IDX_INTRO_SUICUNE_2,  3
-	frame SPRITE_ANIM_FRAME_IDX_70,  3
+	frame SPRITE_ANIM_FRAME_IDX_INTRO_SUICUNE_3,  3
-	frame SPRITE_ANIM_FRAME_IDX_71,  3
+	frame SPRITE_ANIM_FRAME_IDX_INTRO_SUICUNE_4,  3
 	dorestart
 
 .Frameset_IntroSuicune2:
-	frame SPRITE_ANIM_FRAME_IDX_71,  3
+	frame SPRITE_ANIM_FRAME_IDX_INTRO_SUICUNE_4,  3
-	frame SPRITE_ANIM_FRAME_IDX_6E,  7
+	frame SPRITE_ANIM_FRAME_IDX_INTRO_SUICUNE_1,  7
 	endanim
 
 .Frameset_IntroPichu:
-	frame SPRITE_ANIM_FRAME_IDX_72, 32
+	frame SPRITE_ANIM_FRAME_IDX_INTRO_PICHU_1, 32
-	frame SPRITE_ANIM_FRAME_IDX_73,  7
+	frame SPRITE_ANIM_FRAME_IDX_INTRO_PICHU_2,  7
-	frame SPRITE_ANIM_FRAME_IDX_74,  7
+	frame SPRITE_ANIM_FRAME_IDX_INTRO_PICHU_3,  7
 	endanim
 
 .Frameset_IntroWooper:
-	frame SPRITE_ANIM_FRAME_IDX_75,  3
+	frame SPRITE_ANIM_FRAME_IDX_INTRO_WOOPER,  3
 	endanim
 
 .Frameset_IntroUnown1:
-	frame SPRITE_ANIM_FRAME_IDX_76,  3
+	frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_1,  3
-	frame SPRITE_ANIM_FRAME_IDX_77,  3
+	frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_2,  3
-	frame SPRITE_ANIM_FRAME_IDX_78,  7
+	frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_3,  7
 	delanim
 
 .Frameset_IntroUnown2:
-	frame SPRITE_ANIM_FRAME_IDX_76,  3, OAM_X_FLIP
+	frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_1,  3, OAM_X_FLIP
-	frame SPRITE_ANIM_FRAME_IDX_77,  3, OAM_X_FLIP
+	frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_2,  3, OAM_X_FLIP
-	frame SPRITE_ANIM_FRAME_IDX_78,  7, OAM_X_FLIP
+	frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_3,  7, OAM_X_FLIP
 	delanim
 
 .Frameset_IntroUnown3:
-	frame SPRITE_ANIM_FRAME_IDX_76,  3, OAM_Y_FLIP
+	frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_1,  3, OAM_Y_FLIP
-	frame SPRITE_ANIM_FRAME_IDX_77,  3, OAM_Y_FLIP
+	frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_2,  3, OAM_Y_FLIP
-	frame SPRITE_ANIM_FRAME_IDX_78,  7, OAM_Y_FLIP
+	frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_3,  7, OAM_Y_FLIP
 	delanim
 
 .Frameset_IntroUnown4:
-	frame SPRITE_ANIM_FRAME_IDX_76,  3, OAM_X_FLIP, OAM_Y_FLIP
+	frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_1,  3, OAM_X_FLIP, OAM_Y_FLIP
-	frame SPRITE_ANIM_FRAME_IDX_77,  3, OAM_X_FLIP, OAM_Y_FLIP
+	frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_2,  3, OAM_X_FLIP, OAM_Y_FLIP
-	frame SPRITE_ANIM_FRAME_IDX_78,  7, OAM_X_FLIP, OAM_Y_FLIP
+	frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_3,  7, OAM_X_FLIP, OAM_Y_FLIP
 	delanim
 
 .Frameset_IntroUnownF2:
-	frame SPRITE_ANIM_FRAME_IDX_79,  3
+	frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_F_2_1,  3
-	frame SPRITE_ANIM_FRAME_IDX_7A,  3
+	frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_F_2_2,  3
-	frame SPRITE_ANIM_FRAME_IDX_7B,  3
+	frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_F_2_3,  3
-	frame SPRITE_ANIM_FRAME_IDX_7C,  7
+	frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_F_2_4,  7
-	frame SPRITE_ANIM_FRAME_IDX_7D,  7
+	frame SPRITE_ANIM_FRAME_IDX_INTRO_UNOWN_F_2_5,  7
 	endanim
 
 .Frameset_IntroSuicuneAway:

data/sprite_anim_seqs.asm

@@ -69,14 +69,14 @@ SpriteAnimSeqData: ; 8d1c4
 	db SPRITE_ANIM_FRAMESET_MOBILE_TRADE_SENT_BALL, SPRITE_ANIM_SEQ_NULL, $00
 ; SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_BALL
 	db SPRITE_ANIM_FRAMESET_MOBILE_TRADE_OT_BALL, SPRITE_ANIM_SEQ_NULL, $00
-; SPRITE_ANIM_INDEX_22
+; SPRITE_ANIM_INDEX_MOBILE_22
-	db SPRITE_ANIM_FRAMESET_31, SPRITE_ANIM_SEQ_NULL, $00
+	db SPRITE_ANIM_FRAMESET_FOR_MOBILE_22, SPRITE_ANIM_SEQ_NULL, $00
-; SPRITE_ANIM_INDEX_23
+; SPRITE_ANIM_INDEX_MOBILE_23
-	db SPRITE_ANIM_FRAMESET_32, SPRITE_ANIM_SEQ_1B, $00
+	db SPRITE_ANIM_FRAMESET_FOR_MOBILE_23, SPRITE_ANIM_SEQ_FOR_MOBILE_23, $00
-; SPRITE_ANIM_INDEX_24
+; SPRITE_ANIM_INDEX_MOBILE_24
-	db SPRITE_ANIM_FRAMESET_33, SPRITE_ANIM_SEQ_1C, $00
+	db SPRITE_ANIM_FRAMESET_FOR_MOBILE_24, SPRITE_ANIM_SEQ_FOR_MOBILE_24, $00
-; SPRITE_ANIM_INDEX_25
+; SPRITE_ANIM_INDEX_MOBILE_25
-	db SPRITE_ANIM_FRAMESET_34, SPRITE_ANIM_SEQ_NULL, $00
+	db SPRITE_ANIM_FRAMESET_FOR_MOBILE_25, SPRITE_ANIM_SEQ_NULL, $00
 ; SPRITE_ANIM_INDEX_INTRO_SUICUNE
 	db SPRITE_ANIM_FRAMESET_INTRO_SUICUNE, SPRITE_ANIM_SEQ_INTRO_SUICUNE, $00
 ; SPRITE_ANIM_INDEX_INTRO_PICHU

docs/move_anim_commands.md

@@ -0,0 +1,99 @@
+# Move Animation Commands
+
+## `$00`−`$EF`: `anim_wait` *length*
+
+## `$D0`: `anim_obj` *object*, *x*, *y*, *param*
+
+## `$D1`: `anim_1gfx` *gfx*
+
+## `$D2`: `anim_2gfx` *gfx1*, *gfx2*
+
+## `$D3`: `anim_3gfx` *gfx1*, *gfx2*, *gfx3*
+
+## `$D4`: `anim_4gfx` *gfx1*, *gfx2*, *gfx3*, *gfx4*
+
+## `$D5`: `anim_5gfx` *gfx1*, *gfx2*, *gfx3*, *gfx4*, *gfx5*
+
+## `$D6`: `anim_incobj` *id*
+
+## `$D7`: `anim_setobj` *id*, *object*
+
+## `$D8`: `anim_incbgeffect` *effect*
+
+## `$D9`: `anim_enemyfeetobj`
+
+## `$DA`: `anim_playerheadobj`
+
+## `$DB`: `anim_checkpokeball`
+
+## `$DC`: `anim_transform`
+
+## `$DD`: `anim_raisesub`
+
+## `$DE`: `anim_dropsub`
+
+## `$DF`: `anim_resetobp0`
+
+## `$E0`: `anim_sound` *duration*, *tracks*, *id*
+
+## `$E1`: `anim_cry` *pitch*
+
+## `$E2`: `anim_minimizeopp`
+
+## `$E3`: `anim_oamon`
+
+## `$E4`: `anim_oamoff`
+
+## `$E5`: `anim_clearobjs`
+
+## `$E6`: `anim_beatup`
+
+## `$E7`: `anim_0xe7`
+
+## `$E8`: `anim_updateactorpic`
+
+## `$E9`: `anim_minimize`
+
+## `$EA`: `anim_0xea`
+
+## `$EB`: `anim_0xeb`
+
+## `$EC`: `anim_0xec`
+
+## `$ED`: `anim_0xed`
+
+## `$EE`: `anim_if_param_and` *value*, *address*
+
+## `$EF`: `anim_jumpuntil` *address*
+
+## `$F0`: `anim_bgeffect` *effect*, *unknown1*, *unknown2*, *unknown3*
+
+## `$F1`: `anim_bgp` *colors*
+
+## `$F2`: `anim_obp0` *colors*
+
+## `$F3`: `anim_obp1` *colors*
+
+## `$F4`: `anim_clearsprites`
+
+## `$F5`: `anim_0xf5`
+
+## `$F6`: `anim_0xf6`
+
+## `$F7`: `anim_0xf7`
+
+## `$F8`: `anim_if_param_equal` *value*, *address*
+
+## `$F9`: `anim_setvar` *value*
+
+## `$FA`: `anim_incvar`
+
+## `$FB`: `anim_if_var_equal` *value*, *address*
+
+## `$FC`: `anim_jump` *address*
+
+## `$FD`: `anim_loop` *count*, *address*
+
+## `$FE`: `anim_call` *address*
+
+## `$FF`: `anim_ret`

docs/movement_commands.md

@@ -0,0 +1,81 @@
+# Movement Commands
+
+## `$00`−`$03`: `turn_head` *direction*
+
+## `$04`−`$07`: `turn_step` *direction*
+
+## `$08`−`$0B`: `slow_step` *direction*
+
+## `$0C`−`$0F`: `step` *direction*
+
+## `$10`−`$13`: `big_step` *direction*
+
+## `$14`−`$17`: `slow_slide_step` *direction*
+
+## `$18`−`$1B`: `slide_step` *direction*
+
+## `$1C`−`$1F`: `fast_slide_step` *direction*
+
+## `$20`−`$23`: `turn_away` *direction*
+
+## `$24`−`$27`: `turn_in` *direction*
+
+## `$28`−`$2B`: `turn_waterfall` *direction*
+
+## `$2C`−`$2F`: `slow_jump_step` *direction*
+
+## `$30`−`$33`: `jump_step` *direction*
+
+## `$34`−`$37`: `fast_jump_step` *direction*
+
+## `$38`: `remove_sliding`
+
+## `$39`: `set_sliding`
+
+## `$3A`: `remove_fixed_facing`
+
+## `$3B`: `fix_facing`
+
+## `$3C`: `show_person`
+
+## `$3D`: `hide_person`
+
+## `$3E`−`$46`: `step_sleep` *length*
+
+## `$47`: `step_end`
+
+## `$48`: `step_48` *param*
+
+## `$49`: `remove_person`
+
+## `$4A`: `step_loop`
+
+## `$4B`: `step_4b`
+
+## `$4C`: `teleport_from`
+
+## `$4D`: `teleport_to`
+
+## `$4E`: `skyfall`
+
+## `$4F`: `step_dig` *length*
+
+## `$50`: `step_bump`
+
+## `$51`: `fish_got_bite`
+
+## `$52`: `fish_cast_rod`
+
+## `$53`: `hide_emote`
+
+## `$54`: `show_emote`
+
+## `$55`: `step_shake` *displacement*
+
+## `$56`: `tree_shake`
+
+## `$57`: `rock_smash` *length*
+
+## `$58`: `return_dig` *length*
+
+## `$59`: `skyfall_top`

engine/movement.asm

@@ -1,4 +1,5 @@
 MovementPointers: ; 5075
+; entries correspond to macros/movement.asm enumeration
 	dw Movement_turn_head_down        ; 00
 	dw Movement_turn_head_up          ; 01
 	dw Movement_turn_head_left        ; 02

engine/scripting.asm

@@ -64,6 +64,7 @@ RunScriptCommand:
 
 
 ScriptCommandTable:
+; entries correspond to macros/event.asm enumeration
 	dw Script_scall                      ; 00
 	dw Script_farscall                   ; 01
 	dw Script_ptcall                     ; 02

engine/trade/animation.asm

@@ -236,6 +236,7 @@ DoTradeAnimation: ; 29082
 ; 290af
 
 .JumpTable: ; 290af
+; entries correspond to macros/trade_anim.asm enumeration
 	dw TradeAnim_AdvanceScriptPointer ; 00
 	dw TradeAnim_ShowGivemonData      ; 01
 	dw TradeAnim_ShowGetmonData       ; 02

gbhw.asm

@@ -36,11 +36,11 @@ 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
+VRAM_BANK_1  EQU 1 << OAM_TILE_BANK ; $08
-OBP_NUM      EQU 1 << OAM_OBP_NUM
+OBP_NUM      EQU 1 << OAM_OBP_NUM   ; $10
-X_FLIP       EQU 1 << OAM_X_FLIP
+X_FLIP       EQU 1 << OAM_X_FLIP    ; $20
-Y_FLIP       EQU 1 << OAM_Y_FLIP
+Y_FLIP       EQU 1 << OAM_Y_FLIP    ; $40
-BEHIND_BG    EQU 1 << OAM_PRIORITY
+BEHIND_BG    EQU 1 << OAM_PRIORITY  ; $80
 
 ; Hardware registers
 rJOYP       EQU $ff00 ; Joypad (R/W)

home/text.asm

@@ -748,6 +748,7 @@ DoTextUntilTerminator:: ; 13f6
 ; 1410
 
 TextCommands:: ; 1410
+; entries correspond to macros/text.asm enumeration
 	dw Text_TX
 	dw Text_TX_RAM
 	dw Text_TX_BCD

macros/event.asm

@@ -1,3 +1,4 @@
+; ScriptCommandTable indexes (see engine/scripting.asm)
 	enum_start
 
 	enum scall_command

macros/move_anim.asm

@@ -5,6 +5,7 @@ endc
 	db \1
 	endm
 
+; BattleAnimCommands indexes (see battle/anim_commands.asm)
 	enum_start $d0
 
 	enum anim_obj_command ; d0

macros/movement.asm

@@ -1,3 +1,4 @@
+; MovementPointers indexes (see engine/movement.asm)
 	enum_start
 
 ; Directional movements

macros/sound.asm

@@ -23,7 +23,9 @@ cry_header: macro
 	dw \1, \2, \3
 	endm
 
+; MusicCommands indexes (see audio/engine.asm)
 	enum_start $d8
+
 	enum notetype_cmd
 octave: macro
 	db notetype_cmd - (\1)

macros/text.asm

@@ -7,9 +7,9 @@ cont   EQUS "db $55," ; Scroll to the next line.
 done   EQUS "db $57"  ; End a text box.
 prompt EQUS "db $58"  ; Prompt the player to end a text box (initiating some other event).
 
-; TX_RAM EQU $01
+; TextCommands indexes (see home/text.asm)
-; TX_FAR EQU $16
+	enum_start $01
-	enum_start 1
+
 	enum TX_RAM
 text_from_ram: MACRO
 	db TX_RAM

macros/trade_anim.asm

@@ -1,4 +1,6 @@
+; DoTradeAnimation.JumpTable indexes (see engine/trade/animation.asm)
 	enum_start
+
 	enum tradeanim_next_command
 tradeanim_next: macro
 	db tradeanim_next_command ; 00

misc/mobile_42.asm

@@ -960,7 +960,7 @@ MobileTradeAnim_GiveTrademon1: ; 108763
 	cp $f8
 	jr nz, .next
 	depixel 10, 11, 4, 0
-	ld a, SPRITE_ANIM_INDEX_22
+	ld a, SPRITE_ANIM_INDEX_MOBILE_22
 	call _InitSpriteAnimStruct
 
 .next
@@ -985,7 +985,7 @@ MobileTradeAnim_GiveTrademon1: ; 108763
 
 .init
 	depixel 10, 11, 4, 0
-	ld a, SPRITE_ANIM_INDEX_22
+	ld a, SPRITE_ANIM_INDEX_MOBILE_22
 	call _InitSpriteAnimStruct
 	xor a
 	call Function108ad4
@@ -1016,7 +1016,7 @@ MobileTradeAnim_GiveTrademon2: ; 1087cf
 	call Function108af4
 	call Function108b5a
 	depixel 9, 10, 2, 0
-	ld a, SPRITE_ANIM_INDEX_25
+	ld a, SPRITE_ANIM_INDEX_MOBILE_25
 	call _InitSpriteAnimStruct
 	ld de, SFX_FORESIGHT
 	call PlaySFX
@@ -1025,7 +1025,7 @@ MobileTradeAnim_GiveTrademon2: ; 1087cf
 	xor a
 	ld [wcf64], a
 	depixel 9, 10, 2, 0
-	ld a, SPRITE_ANIM_INDEX_23
+	ld a, SPRITE_ANIM_INDEX_MOBILE_23
 	call _InitSpriteAnimStruct
 .loop
 	ld a, [hSCY]
@@ -1052,7 +1052,7 @@ MobileTradeAnim_05: ; 108811
 	ld c, 60
 	call WaitMobileTradeSpriteAnims
 	depixel 30, 10, 2, 0
-	ld a, SPRITE_ANIM_INDEX_24
+	ld a, SPRITE_ANIM_INDEX_MOBILE_24
 	call _InitSpriteAnimStruct
 	call GetMobileTradeAnimByte
 	ld de, SFX_THROW_BALL
@@ -1075,7 +1075,7 @@ MobileTradeAnim_07: ; 10884c
 	ld c, 80
 	call DelayFrames
 	depixel 30, 10, 2, 0
-	ld a, SPRITE_ANIM_INDEX_24
+	ld a, SPRITE_ANIM_INDEX_MOBILE_24
 	call _InitSpriteAnimStruct
 	call GetMobileTradeAnimByte
 	ld de, SFX_THROW_BALL
@@ -1099,7 +1099,7 @@ MobileTradeAnim_GetTrademon1: ; 108863
 .done
 	callba DeinitializeAllSprites
 	depixel 9, 10, 2, 0
-	ld a, SPRITE_ANIM_INDEX_25
+	ld a, SPRITE_ANIM_INDEX_MOBILE_25
 	call _InitSpriteAnimStruct
 	ld de, SFX_GLASS_TING_2
 	call PlaySFX
@@ -1135,13 +1135,13 @@ MobileTradeAnim_GetTrademon2: ; 108894
 
 .asm_1088c5
 	depixel 10, 11, 4, 0
-	ld a, SPRITE_ANIM_INDEX_22
+	ld a, SPRITE_ANIM_INDEX_MOBILE_22
 	call _InitSpriteAnimStruct
 	jr .asm_1088e7
 
 .asm_1088cf
 	depixel 10, 11, 4, 0
-	ld a, SPRITE_ANIM_INDEX_22
+	ld a, SPRITE_ANIM_INDEX_MOBILE_22
 	call _InitSpriteAnimStruct
 	xor a
 	call Function108ad4