diff options
author | entrpntr <entrpntr@gmail.com> | 2020-06-03 04:07:24 -0400 |
---|---|---|
committer | entrpntr <entrpntr@gmail.com> | 2020-06-03 04:48:34 -0400 |
commit | 4dd118c2a75c8ee789daacaacd304567a014a8d7 (patch) | |
tree | 3d420fc3952b6f280684dd4a01966a4cafbf0b9f | |
parent | 20f612793ecc50bc4767decbd7e90d37bd4eb162 (diff) |
Label jumptable entries.
-rw-r--r-- | constants/sprite_anim_constants.asm | 112 | ||||
-rwxr-xr-x | data/sprite_anims/sequences.asm | 94 | ||||
-rwxr-xr-x | engine/gfx/sprite_anims.asm | 174 | ||||
-rw-r--r-- | wram.asm | 6 |
4 files changed, 190 insertions, 196 deletions
diff --git a/constants/sprite_anim_constants.asm b/constants/sprite_anim_constants.asm index d86f4cdc..c2a7ae10 100644 --- a/constants/sprite_anim_constants.asm +++ b/constants/sprite_anim_constants.asm @@ -22,20 +22,20 @@ 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_01 ; 01 - const SPRITE_ANIM_INDEX_02 ; 02 - const SPRITE_ANIM_INDEX_03 ; 03 - const SPRITE_ANIM_INDEX_04 ; 04 - const SPRITE_ANIM_INDEX_05 ; 05 - const SPRITE_ANIM_INDEX_06 ; 06 - const SPRITE_ANIM_INDEX_07 ; 07 - const SPRITE_ANIM_INDEX_08 ; 08 - const SPRITE_ANIM_INDEX_09 ; 09 - const SPRITE_ANIM_INDEX_0A ; 0a - const SPRITE_ANIM_INDEX_0B ; 0b - const SPRITE_ANIM_INDEX_0C ; 0c - const SPRITE_ANIM_INDEX_0D ; 0d - const SPRITE_ANIM_INDEX_0E ; 0e + 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_GS_INTRO_LAPRAS ; 04 + const SPRITE_ANIM_INDEX_GS_INTRO_LAPRAS_2 ; 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_10 ; 10 const SPRITE_ANIM_INDEX_UNUSED_11 ; 11 @@ -71,48 +71,48 @@ NUM_SPRITE_ANIM_STRUCTS EQU 10 ; see wSpriteAnimationStructs ; DoAnimFrame.Jumptable indexes (see engine/gfx/sprite_anims.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_04 ; 04 - const SPRITE_ANIM_SEQ_05 ; 05 - const SPRITE_ANIM_SEQ_06 ; 06 - const SPRITE_ANIM_SEQ_07 ; 07 - const SPRITE_ANIM_SEQ_08 ; 08 - const SPRITE_ANIM_SEQ_09 ; 09 - const SPRITE_ANIM_SEQ_0A ; 0a - const SPRITE_ANIM_SEQ_0B ; 0b - const SPRITE_ANIM_SEQ_0C ; 0c - const SPRITE_ANIM_SEQ_0D ; 0d - const SPRITE_ANIM_SEQ_0E ; 0e - const SPRITE_ANIM_SEQ_0F ; 0f - const SPRITE_ANIM_SEQ_10 ; 10 - const SPRITE_ANIM_SEQ_11 ; 11 - const SPRITE_ANIM_SEQ_12 ; 12 - const SPRITE_ANIM_SEQ_13 ; 13 - const SPRITE_ANIM_SEQ_14 ; 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_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_DUMMY_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 + 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_LAPRAS ; 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_INTRO_STAR ; 17 + const SPRITE_ANIM_SEQ_GS_INTRO_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_DUMMY_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 ; SpriteAnimFrameData indexes (see data/sprite_anims/framesets.asm) const_def diff --git a/data/sprite_anims/sequences.asm b/data/sprite_anims/sequences.asm index f62e5654..371a8813 100755 --- 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_04, $00 ; - db SPRITE_ANIM_FRAMESET_GS_INTRO_SHELLDER, SPRITE_ANIM_SEQ_05, $00 ; - db SPRITE_ANIM_FRAMESET_GS_INTRO_MAGIKARP, SPRITE_ANIM_SEQ_06, $00 ; - db SPRITE_ANIM_FRAMESET_GS_INTRO_LAPRAS, SPRITE_ANIM_SEQ_07, $00 ; - db SPRITE_ANIM_FRAMESET_GS_INTRO_LAPRAS_2, SPRITE_ANIM_SEQ_08, $00 ; - db SPRITE_ANIM_FRAMESET_GS_INTRO_NOTE, SPRITE_ANIM_SEQ_09, $01 ; - db SPRITE_ANIM_FRAMESET_GS_INTRO_INVISIBLE_NOTE, SPRITE_ANIM_SEQ_09, $01 ; - db SPRITE_ANIM_FRAMESET_GS_INTRO_JIGGLYPUFF, SPRITE_ANIM_SEQ_0A, $01 ; - db SPRITE_ANIM_FRAMESET_GS_INTRO_PIKACHU, SPRITE_ANIM_SEQ_0B, $01 ; - db SPRITE_ANIM_FRAMESET_GS_INTRO_PIKACHU_TAIL, SPRITE_ANIM_SEQ_0C, $01 ; - db SPRITE_ANIM_FRAMESET_GS_INTRO_FIREBALL, SPRITE_ANIM_SEQ_0D, $02 ; - db SPRITE_ANIM_FRAMESET_GS_INTRO_CHIKORITA, SPRITE_ANIM_SEQ_0E, $02 ; - db SPRITE_ANIM_FRAMESET_GS_INTRO_CYNDAQUIL, SPRITE_ANIM_SEQ_0F, $02 ; - db SPRITE_ANIM_FRAMESET_GS_INTRO_TOTODILE, SPRITE_ANIM_SEQ_0E, $02 ; - db SPRITE_ANIM_FRAMESET_GS_TITLE_TRAIL, SPRITE_ANIM_SEQ_10, $00 ; - db SPRITE_ANIM_FRAMESET_GS_INTRO_PIKACHU, SPRITE_ANIM_SEQ_11, $01 ; - db SPRITE_ANIM_FRAMESET_GS_INTRO_PIKACHU_TAIL, SPRITE_ANIM_SEQ_12, $01 ; - db SPRITE_ANIM_FRAMESET_GS_INTRO_NOTE, SPRITE_ANIM_SEQ_13, $01 ; - db SPRITE_ANIM_FRAMESET_GS_INTRO_JIGGLYPUFF, SPRITE_ANIM_SEQ_14, $01 ; - 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 - 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 ; + db SPRITE_ANIM_FRAMESET_GS_INTRO_SHELLDER, SPRITE_ANIM_SEQ_GS_INTRO_SHELLDER, $00 ; + db SPRITE_ANIM_FRAMESET_GS_INTRO_MAGIKARP, SPRITE_ANIM_SEQ_GS_INTRO_MAGIKARP, $00 ; + db SPRITE_ANIM_FRAMESET_GS_INTRO_LAPRAS, SPRITE_ANIM_SEQ_UNUSED_LAPRAS, $00 ; + db SPRITE_ANIM_FRAMESET_GS_INTRO_LAPRAS_2, SPRITE_ANIM_SEQ_GS_INTRO_LAPRAS, $00 ; + db SPRITE_ANIM_FRAMESET_GS_INTRO_NOTE, SPRITE_ANIM_SEQ_GS_INTRO_NOTE, $01 ; + db SPRITE_ANIM_FRAMESET_GS_INTRO_INVISIBLE_NOTE, SPRITE_ANIM_SEQ_GS_INTRO_NOTE, $01 ; + db SPRITE_ANIM_FRAMESET_GS_INTRO_JIGGLYPUFF, SPRITE_ANIM_SEQ_GS_INTRO_JIGGLYPUFF, $01 ; + db SPRITE_ANIM_FRAMESET_GS_INTRO_PIKACHU, SPRITE_ANIM_SEQ_GS_INTRO_PIKACHU, $01 ; + db SPRITE_ANIM_FRAMESET_GS_INTRO_PIKACHU_TAIL, SPRITE_ANIM_SEQ_GS_INTRO_PIKACHU_TAIL, $01 ; + db SPRITE_ANIM_FRAMESET_GS_INTRO_FIREBALL, SPRITE_ANIM_SEQ_GS_INTRO_FIREBALL, $02 ; + db SPRITE_ANIM_FRAMESET_GS_INTRO_CHIKORITA, SPRITE_ANIM_SEQ_GS_INTRO_CHIKORITA_TOTODILE, $02 ; + db SPRITE_ANIM_FRAMESET_GS_INTRO_CYNDAQUIL, SPRITE_ANIM_SEQ_GS_INTRO_CYNDAQUIL, $02 ; + db SPRITE_ANIM_FRAMESET_GS_INTRO_TOTODILE, SPRITE_ANIM_SEQ_GS_INTRO_CHIKORITA_TOTODILE, $02 ; + db SPRITE_ANIM_FRAMESET_GS_TITLE_TRAIL, SPRITE_ANIM_SEQ_GS_TITLE_TRAIL, $00 ; + db SPRITE_ANIM_FRAMESET_GS_INTRO_PIKACHU, SPRITE_ANIM_SEQ_UNUSED_PIKACHU, $01 ; + db SPRITE_ANIM_FRAMESET_GS_INTRO_PIKACHU_TAIL, SPRITE_ANIM_SEQ_UNUSED_PIKACHU_TAIL, $01 ; + db SPRITE_ANIM_FRAMESET_GS_INTRO_NOTE, SPRITE_ANIM_SEQ_UNUSED_NOTE, $01 ; + db SPRITE_ANIM_FRAMESET_GS_INTRO_JIGGLYPUFF, SPRITE_ANIM_SEQ_UNUSED_JIGGLYPUFF, $01 ; + 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 + 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 178f05d3..a648d461 100755 --- a/engine/gfx/sprite_anims.asm +++ b/engine/gfx/sprite_anims.asm @@ -17,23 +17,23 @@ DoAnimFrame: dw .PartyMon dw .PartyMonSwitch dw .PartyMonSelected - dw .Function8d528 - dw .Function8d54e - dw .Function8d55d - dw .Function8d5a2 - dw .Function8d5bf - dw .Function8d623 - dw .Function8d66b - dw .Function8d690 - dw .Function8d702 - dw .Function8d765 - dw .Function8d7b1 - dw .Function8d7ef - dw .Function8d82d - dw .Function8d897 - dw .Function8d8b8 - dw .Function8d8bf - dw .Function8d909 + dw .GSIntroBubble + dw .GSIntroShellder + dw .GSIntroMagikarp + dw .UnusedLapras + dw .GSIntroLapras + dw .GSIntroNote + dw .GSIntroJigglypuff + dw .GSIntroPikachu + dw .GSIntroPikachuTail + dw .GSIntroFireball + dw .GSIntroChikoritaTotodile + dw .GSIntroCyndaquil + dw .GSTitleTrail + dw .UnusedPikachu + dw .UnusedPikachuTail + dw .UnusedNote + dw .UnusedJigglypuff dw .NamingScreenCursor dw .GameFreakLogo dw .GSIntroStar @@ -137,7 +137,7 @@ DoAnimFrame: ld [hl], 8 * 3 ret -.Function8d528 +.GSIntroBubble ld hl, SPRITEANIMSTRUCT_0D add hl, bc ld a, [hl] @@ -164,7 +164,7 @@ DoAnimFrame: call DeinitializeSprite ret -.Function8d54e +.GSIntroShellder ld a, [wGlobalAnimYOffset] ld hl, SPRITEANIMSTRUCT_YCOORD add hl, bc @@ -174,7 +174,7 @@ DoAnimFrame: call DeinitializeSprite ret -.Function8d55d: +.GSIntroMagikarp call .AnonymousJumptable jp hl @@ -227,7 +227,7 @@ DoAnimFrame: call DeinitializeSprite ret -.Function8d5a2: +.UnusedLapras ld hl, SPRITEANIMSTRUCT_XCOORD add hl, bc ld a, [hl] @@ -247,11 +247,11 @@ DoAnimFrame: inc [hl] ret -.asm_8d5bb: +.asm_8d5bb call DeinitializeSprite ret -.Function8d5bf: +.GSIntroLapras call .AnonymousJumptable jp hl @@ -260,7 +260,7 @@ DoAnimFrame: dw .Function8d5e2 dw .Function8d5f3 -.Function8d5c9: +.Function8d5c9 call .Function8d60b ret z @@ -274,14 +274,14 @@ DoAnimFrame: ret -.asm_8d5d8: +.asm_8d5d8 call .IncrementJumptableIndex ld hl, SPRITEANIMSTRUCT_0D add hl, bc ld [hl], $b0 ret -.Function8d5e2: +.Function8d5e2 call .Function8d60b ld hl, SPRITEANIMSTRUCT_0D add hl, bc @@ -329,7 +329,7 @@ DoAnimFrame: and $1 ret -.Function8d623 +.GSIntroNote call .AnonymousJumptable jp hl @@ -337,7 +337,7 @@ DoAnimFrame: dw .Function8d62b dw .Function8d63e -.Function8d62b: +.Function8d62b call .IncrementJumptableIndex ld hl, 0 add hl, bc @@ -349,7 +349,7 @@ DoAnimFrame: ld hl, SPRITEANIMSTRUCT_0C add hl, bc ld [hl], a -.Function8d63e: +.Function8d63e ld hl, SPRITEANIMSTRUCT_XOFFSET add hl, bc ld a, [hl] @@ -379,11 +379,11 @@ DoAnimFrame: dec [hl] ret -.asm_8d667: +.asm_8d667 call DeinitializeSprite ret -.Function8d66b: +.GSIntroJigglypuff call .AnonymousJumptable jp hl @@ -391,14 +391,14 @@ DoAnimFrame: dw .Function8d673 dw .Function8d680 -.Function8d673: +.Function8d673 ld a, [wBattleMonLevel] and a ret z call .IncrementJumptableIndex ld a, SPRITE_ANIM_FRAMESET_GS_INTRO_JIGGLYPUFF_2 call _ReinitSpriteAnimFrame -.Function8d680: +.Function8d680 ld hl, SPRITEANIMSTRUCT_XCOORD add hl, bc ld a, [hl] @@ -408,11 +408,11 @@ DoAnimFrame: dec [hl] ret -.asm_8d68c: +.asm_8d68c call DeinitializeSprite ret -.Function8d690: +.GSIntroPikachu call .AnonymousJumptable jp hl @@ -422,7 +422,7 @@ DoAnimFrame: dw .Function8d6c9 dw .Function8d6f2 -.Function8d69c: +.Function8d69c ld hl, SPRITEANIMSTRUCT_XCOORD add hl, bc ld a, [hl] @@ -431,7 +431,7 @@ DoAnimFrame: dec [hl] ret -.asm_8d6a7: +.asm_8d6a7 call .IncrementJumptableIndex ld hl, SPRITEANIMSTRUCT_0D add hl, bc @@ -440,7 +440,7 @@ DoAnimFrame: call _ReinitSpriteAnimFrame ret -.Function8d6b6: +.Function8d6b6 ld hl, SPRITEANIMSTRUCT_0D add hl, bc ld a, [hl] @@ -449,13 +449,13 @@ DoAnimFrame: dec [hl] ret -.asm_8d6c0: +.asm_8d6c0 call .IncrementJumptableIndex ld a, SPRITE_ANIM_FRAMESET_GS_INTRO_PIKACHU_3 call _ReinitSpriteAnimFrame ret -.Function8d6c9: +.Function8d6c9 ld hl, SPRITEANIMSTRUCT_0C add hl, bc ld a, [hl] @@ -477,13 +477,13 @@ DoAnimFrame: dec [hl] ret -.asm_8d6e9: +.asm_8d6e9 ld a, 1 ld [wBattleMonLevel], a call .IncrementJumptableIndex ret -.Function8d6f2: +.Function8d6f2 ld hl, SPRITEANIMSTRUCT_XCOORD add hl, bc ld a, [hl] @@ -493,11 +493,11 @@ DoAnimFrame: dec [hl] ret -.asm_8d6fe: +.asm_8d6fe call DeinitializeSprite ret -.Function8d702: +.GSIntroPikachuTail call .AnonymousJumptable jp hl @@ -506,7 +506,7 @@ DoAnimFrame: dw .Function8d726 dw .Function8d73c -.Function8d70c: +.Function8d70c ld hl, SPRITEANIMSTRUCT_XCOORD add hl, bc ld a, [hl] @@ -515,7 +515,7 @@ DoAnimFrame: dec [hl] ret -.asm_8d717: +.asm_8d717 call .IncrementJumptableIndex ld hl, SPRITEANIMSTRUCT_0D @@ -525,7 +525,7 @@ DoAnimFrame: call _ReinitSpriteAnimFrame ret -.Function8d726: +.Function8d726 ld hl, SPRITEANIMSTRUCT_0D add hl, bc ld a, [hl] @@ -538,11 +538,11 @@ DoAnimFrame: call _ReinitSpriteAnimFrame ret -.asm_8d738: +.asm_8d738 call .IncrementJumptableIndex ret -.Function8d73c: +.Function8d73c ld hl, SPRITEANIMSTRUCT_0C add hl, bc ld a, [hl] @@ -569,11 +569,11 @@ DoAnimFrame: dec [hl] ret -.asm_8d761: +.asm_8d761 call DeinitializeSprite ret -.Function8d765: +.GSIntroFireball call .AnonymousJumptable jp hl @@ -581,7 +581,7 @@ DoAnimFrame: dw .Function8d76d dw .Function8d786 -.Function8d76d: +.Function8d76d call .IncrementJumptableIndex ld hl, 0 add hl, bc @@ -598,7 +598,7 @@ DoAnimFrame: ld [hl], a ret -.Function8d786: +.Function8d786 ld hl, SPRITEANIMSTRUCT_XCOORD add hl, bc dec [hl] @@ -632,7 +632,8 @@ DoAnimFrame: ld [hl], a ret -.Function8d7b1: +; flash down/right +.GSIntroChikoritaTotodile call .AnonymousJumptable jp hl @@ -640,7 +641,7 @@ DoAnimFrame: dw .Function8d7b9 dw .Function8d7c9 -.Function8d7b9: +.Function8d7b9 call .IncrementJumptableIndex ld hl, SPRITEANIMSTRUCT_0C add hl, bc @@ -650,7 +651,7 @@ DoAnimFrame: ld [hl], $30 ret -.Function8d7c9: +.Function8d7c9 ld hl, SPRITEANIMSTRUCT_0C add hl, bc ld a, [hl] @@ -679,7 +680,8 @@ DoAnimFrame: ld [hl], a ret -.Function8d7ef: +; flash down/left +.GSIntroCyndaquil call .AnonymousJumptable jp hl @@ -687,7 +689,7 @@ DoAnimFrame: dw .Function8d7f7 dw .Function8d807 -.Function8d7f7: +.Function8d7f7 call .IncrementJumptableIndex ld hl, SPRITEANIMSTRUCT_0C add hl, bc @@ -697,7 +699,7 @@ DoAnimFrame: ld [hl], $10 ret -.Function8d807: +.Function8d807 ld hl, SPRITEANIMSTRUCT_0C add hl, bc ld a, [hl] @@ -722,7 +724,7 @@ DoAnimFrame: ld [hl], a ret -.Function8d82d: +.GSTitleTrail call .AnonymousJumptable jp hl @@ -787,7 +789,7 @@ IF DEF(_GOLD) ld [hl], a ret -.asm_8d881: +.asm_8d881 call DeinitializeSprite ret @@ -796,7 +798,7 @@ ELIF DEF(_SILVER) dw .Function8d835 dw .Function8d856 -.Function8d835: +.Function8d835 ld a, [wIntroSceneTimer] and $30 swap a @@ -816,7 +818,7 @@ ELIF DEF(_SILVER) ld hl, SPRITEANIMSTRUCT_YOFFSET add hl, bc ld [hl], a -.Function8d856: +.Function8d856 ld hl, SPRITEANIMSTRUCT_XCOORD add hl, bc ld a, [hl] @@ -831,7 +833,7 @@ ELIF DEF(_SILVER) ret ENDC -.GSIntroHoOhLugia: +.GSIntroHoOhLugia ld hl, SPRITEANIMSTRUCT_0C add hl, bc ld a, [hl] @@ -851,11 +853,11 @@ ENDC ld [hl], a ret -.Function8d897: +.UnusedPikachu push bc farcall ret_e0000 pop bc - ld hl, wHallOfFamePokemonListMon1DVs + ld hl, wc704 ld a, [hl] and $3 ret z @@ -874,11 +876,11 @@ ENDC db SPRITE_ANIM_FRAMESET_GS_INTRO_PIKACHU_4 db SPRITE_ANIM_FRAMESET_GS_INTRO_PIKACHU_6 -.Function8d8b8: +.UnusedPikachuTail farcall ret_e0000 ret -.Function8d8bf: +.UnusedNote call .AnonymousJumptable jp hl @@ -886,9 +888,9 @@ ENDC dw .Function8d8c7 dw .Function8d8d9 -.Function8d8c7: +.Function8d8c7 call .Function8d8e1 - ld a, [$c717] + ld a, [wc717] ld hl, SPRITEANIMSTRUCT_XCOORD add hl, bc add [hl] @@ -897,13 +899,13 @@ ENDC ret nc cp $a8 ret c -.Function8d8d9: +.Function8d8d9 call DeinitializeSprite ld hl, wSpriteAnimCount dec [hl] ret -.Function8d8e1: +.Function8d8e1 ld hl, SPRITEANIMSTRUCT_0C add hl, bc ld a, [hl] @@ -920,26 +922,12 @@ ENDC ld [hl], a ret -.Data_8d8f9: - db $04 - db $07 - db $09 - db $0a - db $09 - db $07 - db $04 - db $00 - db $fc - db $f9 - db $f7 - db $f6 - db $f7 - db $f9 - db $fc - db $00 - -.Function8d909: - ld a, [$c717] +.Data_8d8f9 + db 4, 7, 9, 10, 9, 7, 4, 0 + db -4, -7, -9, -10, -9, -7, -4, 0 + +.UnusedJigglypuff + ld a, [wc717] ld hl, SPRITEANIMSTRUCT_XCOORD add hl, bc @@ -948,7 +936,7 @@ ENDC cp $30 ret nz xor a - ld [$c717], a + ld [wc717], a ret .NamingScreenCursor @@ -472,6 +472,12 @@ wLinkData:: ds $514 wLinkDataEnd:: NEXTU ; c700 +; unused (engine/gfx/sprite_anims.asm) + ds 4 +wc704:: ds 19 +wc717:: ds 1 + +NEXTU ; c700 ; link data members wLinkPlayerName:: ds NAME_LENGTH wLinkPartyCount:: db |