Skip to content

Commit

Permalink
Sync sprite and battle anim consts/labels (pret/pokecrystal#1055)
Browse files Browse the repository at this point in the history 
* Sync sprite and battle anim consts/labels

* Add `; 00` comments

* Renamed to `SpriteAnimFunc_` and `BattleAnimFunc_`
  • Loading branch information
@vulcandth
vulcandth committed Sep 17, 2023
1 parent 1a5c2b0 commit 70f883d
Show file tree
Hide file tree
Showing 35 changed files with 3,896 additions and 3,896 deletions.
1,572 changes: 786 additions & 786 deletions constants/battle_anim_constants.asm
View file

Large diffs are not rendered by default.

186 changes: 93 additions & 93 deletions constants/sprite_anim_constants.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,102 +35,102 @@ DEF NUM_SPRITE_ANIM_GFX EQU const_value
; wSpriteAnimDict size (see wram.asm)
DEF NUM_SPRITEANIMDICT_ENTRIES EQU 10

; SpriteAnimSeqData indexes (see data/sprite_anims/sequences.asm)
; SpriteAnimObjects indexes (see data/sprite_anims/objects.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_INTRO_AERODACTYL ; 04
const SPRITE_ANIM_INDEX_GS_INTRO_LAPRAS ; 05
const SPRITE_ANIM_INDEX_GS_INTRO_NOTE ; 06
const SPRITE_ANIM_INDEX_GS_INTRO_INVISIBLE_NOTE ; 07
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_MEMORY_GAME_CURSOR ; 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
DEF NUM_SPRITE_ANIM_INDEXES EQU const_value
const SPRITE_ANIM_OBJ_PARTY_MON ; 00
const SPRITE_ANIM_OBJ_GS_INTRO_BUBBLE ; 01
const SPRITE_ANIM_OBJ_GS_INTRO_SHELLDER ; 02
const SPRITE_ANIM_OBJ_GS_INTRO_MAGIKARP ; 03
const SPRITE_ANIM_OBJ_UNUSED_INTRO_AERODACTYL ; 04
const SPRITE_ANIM_OBJ_GS_INTRO_LAPRAS ; 05
const SPRITE_ANIM_OBJ_GS_INTRO_NOTE ; 06
const SPRITE_ANIM_OBJ_GS_INTRO_INVISIBLE_NOTE ; 07
const SPRITE_ANIM_OBJ_GS_INTRO_JIGGLYPUFF ; 08
const SPRITE_ANIM_OBJ_GS_INTRO_PIKACHU ; 09
const SPRITE_ANIM_OBJ_GS_INTRO_PIKACHU_TAIL ; 0a
const SPRITE_ANIM_OBJ_GS_INTRO_FIREBALL ; 0b
const SPRITE_ANIM_OBJ_GS_INTRO_CHIKORITA ; 0c
const SPRITE_ANIM_OBJ_GS_INTRO_CYNDAQUIL ; 0d
const SPRITE_ANIM_OBJ_GS_INTRO_TOTODILE ; 0e
const SPRITE_ANIM_OBJ_GS_TITLE_TRAIL ; 0f
const SPRITE_ANIM_OBJ_UNUSED_PIKACHU ; 10
const SPRITE_ANIM_OBJ_UNUSED_PIKACHU_TAIL ; 11
const SPRITE_ANIM_OBJ_UNUSED_NOTE ; 12
const SPRITE_ANIM_OBJ_UNUSED_JIGGLYPUFF ; 13
const SPRITE_ANIM_OBJ_NAMING_SCREEN_CURSOR ; 14
const SPRITE_ANIM_OBJ_GAMEFREAK_LOGO ; 15
const SPRITE_ANIM_OBJ_GS_GAMEFREAK_LOGO_STAR ; 16
const SPRITE_ANIM_OBJ_GS_GAMEFREAK_LOGO_SPARKLE ; 17
const SPRITE_ANIM_OBJ_SLOTS_GOLEM ; 18
const SPRITE_ANIM_OBJ_SLOTS_CHANSEY ; 19
const SPRITE_ANIM_OBJ_SLOTS_EGG ; 1a
const SPRITE_ANIM_OBJ_COMPOSE_MAIL_CURSOR ; 1b
const SPRITE_ANIM_OBJ_RED_WALK ; 1c
const SPRITE_ANIM_OBJ_UNUSED_CURSOR ; 1d
const SPRITE_ANIM_OBJ_MEMORY_GAME_CURSOR ; 1e
const SPRITE_ANIM_OBJ_POKEGEAR_ARROW ; 1f
const SPRITE_ANIM_OBJ_TRADE_POKE_BALL ; 20
const SPRITE_ANIM_OBJ_TRADE_POOF ; 21
const SPRITE_ANIM_OBJ_TRADE_TUBE_BULGE ; 22
const SPRITE_ANIM_OBJ_TRADEMON_ICON ; 23
const SPRITE_ANIM_OBJ_TRADEMON_BUBBLE ; 24
const SPRITE_ANIM_OBJ_EVOLUTION_BALL_OF_LIGHT ; 25
const SPRITE_ANIM_OBJ_RADIO_TUNING_KNOB ; 26
const SPRITE_ANIM_OBJ_MAGNET_TRAIN_RED ; 27
const SPRITE_ANIM_OBJ_LEAF ; 28
const SPRITE_ANIM_OBJ_CUT_TREE ; 29
const SPRITE_ANIM_OBJ_FLY_LEAF ; 2a
const SPRITE_ANIM_OBJ_EGG_CRACK ; 2b
const SPRITE_ANIM_OBJ_GS_INTRO_HO_OH_LUGIA ; 2c
const SPRITE_ANIM_OBJ_HEADBUTT ; 2d
const SPRITE_ANIM_OBJ_EGG_HATCH ; 2e
DEF NUM_SPRITE_ANIM_OBJS EQU const_value

; DoAnimFrame.Jumptable indexes (see engine/gfx/sprite_anims.asm)
; DoSpriteAnimFrame.Jumptable indexes (see engine/sprite_anims/functions.asm)
const_def
const SPRITE_ANIM_SEQ_NULL ; 00
const SPRITE_ANIM_SEQ_PARTY_MON ; 01
const SPRITE_ANIM_SEQ_PARTY_MON_SWITCH ; 02
const SPRITE_ANIM_SEQ_PARTY_MON_SELECTED ; 03
const SPRITE_ANIM_SEQ_GS_INTRO_BUBBLE ; 04
const SPRITE_ANIM_SEQ_GS_INTRO_SHELLDER ; 05
const SPRITE_ANIM_SEQ_GS_INTRO_MAGIKARP ; 06
const SPRITE_ANIM_SEQ_UNUSED_INTRO_AERODACTYL ; 07
const SPRITE_ANIM_SEQ_GS_INTRO_LAPRAS ; 08
const SPRITE_ANIM_SEQ_GS_INTRO_NOTE ; 09
const SPRITE_ANIM_SEQ_GS_INTRO_JIGGLYPUFF ; 0a
const SPRITE_ANIM_SEQ_GS_INTRO_PIKACHU ; 0b
const SPRITE_ANIM_SEQ_GS_INTRO_PIKACHU_TAIL ; 0c
const SPRITE_ANIM_SEQ_GS_INTRO_FIREBALL ; 0d
const SPRITE_ANIM_SEQ_GS_INTRO_CHIKORITA_TOTODILE ; 0e
const SPRITE_ANIM_SEQ_GS_INTRO_CYNDAQUIL ; 0f
const SPRITE_ANIM_SEQ_GS_TITLE_TRAIL ; 10
const SPRITE_ANIM_SEQ_UNUSED_PIKACHU ; 11
const SPRITE_ANIM_SEQ_UNUSED_PIKACHU_TAIL ; 12
const SPRITE_ANIM_SEQ_UNUSED_NOTE ; 13
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_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
const SPRITE_ANIM_SEQ_MAIL_CURSOR ; 1c
const SPRITE_ANIM_SEQ_UNUSED_CURSOR ; 1d
const SPRITE_ANIM_SEQ_MEMORY_GAME_CURSOR ; 1e
const SPRITE_ANIM_SEQ_POKEGEAR_ARROW ; 1f
const SPRITE_ANIM_SEQ_TRADE_POKE_BALL ; 20
const SPRITE_ANIM_SEQ_TRADE_TUBE_BULGE ; 21
const SPRITE_ANIM_SEQ_TRADEMON_IN_TUBE ; 22
const SPRITE_ANIM_SEQ_REVEAL_NEW_MON ; 23
const SPRITE_ANIM_SEQ_RADIO_TUNING_KNOB ; 24
const SPRITE_ANIM_SEQ_CUT_LEAVES ; 25
const SPRITE_ANIM_SEQ_FLY_FROM ; 26
const SPRITE_ANIM_SEQ_FLY_LEAF ; 27
const SPRITE_ANIM_SEQ_FLY_TO ; 28
const SPRITE_ANIM_SEQ_GS_INTRO_HO_OH_LUGIA ; 29
DEF NUM_SPRITE_ANIM_SEQS EQU const_value
const SPRITE_ANIM_FUNC_NULL ; 00
const SPRITE_ANIM_FUNC_PARTY_MON ; 01
const SPRITE_ANIM_FUNC_PARTY_MON_SWITCH ; 02
const SPRITE_ANIM_FUNC_PARTY_MON_SELECTED ; 03
const SPRITE_ANIM_FUNC_GS_INTRO_BUBBLE ; 04
const SPRITE_ANIM_FUNC_GS_INTRO_SHELLDER ; 05
const SPRITE_ANIM_FUNC_GS_INTRO_MAGIKARP ; 06
const SPRITE_ANIM_FUNC_UNUSED_INTRO_AERODACTYL ; 07
const SPRITE_ANIM_FUNC_GS_INTRO_LAPRAS ; 08
const SPRITE_ANIM_FUNC_GS_INTRO_NOTE ; 09
const SPRITE_ANIM_FUNC_GS_INTRO_JIGGLYPUFF ; 0a
const SPRITE_ANIM_FUNC_GS_INTRO_PIKACHU ; 0b
const SPRITE_ANIM_FUNC_GS_INTRO_PIKACHU_TAIL ; 0c
const SPRITE_ANIM_FUNC_GS_INTRO_FIREBALL ; 0d
const SPRITE_ANIM_FUNC_GS_INTRO_CHIKORITA_TOTODILE ; 0e
const SPRITE_ANIM_FUNC_GS_INTRO_CYNDAQUIL ; 0f
const SPRITE_ANIM_FUNC_GS_TITLE_TRAIL ; 10
const SPRITE_ANIM_FUNC_UNUSED_PIKACHU ; 11
const SPRITE_ANIM_FUNC_UNUSED_PIKACHU_TAIL ; 12
const SPRITE_ANIM_FUNC_UNUSED_NOTE ; 13
const SPRITE_ANIM_FUNC_UNUSED_JIGGLYPUFF ; 14
const SPRITE_ANIM_FUNC_NAMING_SCREEN_CURSOR ; 15
const SPRITE_ANIM_FUNC_GAMEFREAK_LOGO ; 16
const SPRITE_ANIM_FUNC_GS_GAMEFREAK_LOGO_STAR ; 17
const SPRITE_ANIM_FUNC_GS_GAMEFREAK_LOGO_SPARKLE ; 18
const SPRITE_ANIM_FUNC_SLOTS_GOLEM ; 19
const SPRITE_ANIM_FUNC_SLOTS_CHANSEY ; 1a
const SPRITE_ANIM_FUNC_SLOTS_EGG ; 1b
const SPRITE_ANIM_FUNC_MAIL_CURSOR ; 1c
const SPRITE_ANIM_FUNC_UNUSED_CURSOR ; 1d
const SPRITE_ANIM_FUNC_MEMORY_GAME_CURSOR ; 1e
const SPRITE_ANIM_FUNC_POKEGEAR_ARROW ; 1f
const SPRITE_ANIM_FUNC_TRADE_POKE_BALL ; 20
const SPRITE_ANIM_FUNC_TRADE_TUBE_BULGE ; 21
const SPRITE_ANIM_FUNC_TRADEMON_IN_TUBE ; 22
const SPRITE_ANIM_FUNC_REVEAL_NEW_MON ; 23
const SPRITE_ANIM_FUNC_RADIO_TUNING_KNOB ; 24
const SPRITE_ANIM_FUNC_CUT_LEAVES ; 25
const SPRITE_ANIM_FUNC_FLY_FROM ; 26
const SPRITE_ANIM_FUNC_FLY_LEAF ; 27
const SPRITE_ANIM_FUNC_FLY_TO ; 28
const SPRITE_ANIM_FUNC_GS_INTRO_HO_OH_LUGIA ; 29
DEF NUM_SPRITE_ANIM_FUNCS EQU const_value

; SpriteAnimFrameData indexes (see data/sprite_anims/framesets.asm)
const_def
Expand Down
Loading

0 comments on commit 70f883d

Please sign in to comment.