From 7ad8ea13c95a6ddbde90de56e7d58bf0eb161dfc Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Tue, 2 Jan 2018 12:25:13 -0500 Subject: [PATCH] Document more sprite anim data --- constants/sprite_anim_constants.asm | 324 +++++------ data/sprite_anims/framesets.asm | 152 ++--- data/sprite_anims/oam.asm | 862 ++++++++++++++-------------- data/sprite_anims/sequences.asm | 90 +-- engine/sprite_anims.asm | 20 +- mobile/fixed_words.asm | 130 ++--- mobile/mobile_42.asm | 18 +- mobile/mobile_5c.asm | 6 +- 8 files changed, 801 insertions(+), 801 deletions(-) diff --git a/constants/sprite_anim_constants.asm b/constants/sprite_anim_constants.asm index 8bb2aed35..b687a3462 100644 --- a/constants/sprite_anim_constants.asm +++ b/constants/sprite_anim_constants.asm @@ -19,93 +19,93 @@ ; SpriteAnimSeqData indexes (see data/sprite_anims/sequences.asm) const_def - const SPRITE_ANIM_INDEX_PARTY_MON ; 00 - const SPRITE_ANIM_INDEX_GS_TITLE_TRAIL ; 01 - const SPRITE_ANIM_INDEX_NAMING_SCREEN_CURSOR ; 02 - const SPRITE_ANIM_INDEX_GAMEFREAK_LOGO ; 03 - const SPRITE_ANIM_INDEX_GS_INTRO_STAR ; 04 - const SPRITE_ANIM_INDEX_GS_INTRO_SPARKLE ; 05 - const SPRITE_ANIM_INDEX_SLOTS_GOLEM ; 06 - const SPRITE_ANIM_INDEX_SLOTS_CHANSEY ; 07 - const SPRITE_ANIM_INDEX_SLOTS_EGG ; 08 - const SPRITE_ANIM_INDEX_COMPOSE_MAIL_CURSOR ; 09 - const SPRITE_ANIM_INDEX_RED_WALK ; 0a - const SPRITE_ANIM_INDEX_UNUSED_CURSOR ; 0b - const SPRITE_ANIM_INDEX_DUMMY_GAME ; 0c - const SPRITE_ANIM_INDEX_POKEGEAR_ARROW ; 0d - const SPRITE_ANIM_INDEX_TRADE_POKE_BALL ; 0e - const SPRITE_ANIM_INDEX_TRADE_POOF ; 0f - const SPRITE_ANIM_INDEX_TRADE_TUBE_BULGE ; 10 - const SPRITE_ANIM_INDEX_TRADEMON_ICON ; 11 - const SPRITE_ANIM_INDEX_TRADEMON_BUBBLE ; 12 - const SPRITE_ANIM_INDEX_EVOLUTION_BALL_OF_LIGHT ; 13 - const SPRITE_ANIM_INDEX_RADIO_TUNING_KNOB ; 14 - const SPRITE_ANIM_INDEX_MAGNET_TRAIN_RED ; 15 - const SPRITE_ANIM_INDEX_LEAF ; 16 - const SPRITE_ANIM_INDEX_CUT_TREE ; 17 - const SPRITE_ANIM_INDEX_FLY_LEAF ; 18 - const SPRITE_ANIM_INDEX_EGG_CRACK ; 19 - const SPRITE_ANIM_INDEX_1A ; 1a - const SPRITE_ANIM_INDEX_HEADBUTT ; 1b - const SPRITE_ANIM_INDEX_EGG_HATCH ; 1c - const SPRITE_ANIM_INDEX_1D ; 1d - const SPRITE_ANIM_INDEX_BLUE_WALK ; 1e - 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_MOBILE_22 ; 22 - const SPRITE_ANIM_INDEX_MOBILE_23 ; 23 - const SPRITE_ANIM_INDEX_MOBILE_24 ; 24 - 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 - const SPRITE_ANIM_INDEX_INTRO_UNOWN ; 29 - const SPRITE_ANIM_INDEX_INTRO_UNOWN_F ; 2a - const SPRITE_ANIM_INDEX_INTRO_SUICUNE_AWAY ; 2b - const SPRITE_ANIM_INDEX_CELEBI ; 2c + const SPRITE_ANIM_INDEX_PARTY_MON ; 00 + const SPRITE_ANIM_INDEX_GS_TITLE_TRAIL ; 01 + const SPRITE_ANIM_INDEX_NAMING_SCREEN_CURSOR ; 02 + const SPRITE_ANIM_INDEX_GAMEFREAK_LOGO ; 03 + const SPRITE_ANIM_INDEX_GS_INTRO_STAR ; 04 + const SPRITE_ANIM_INDEX_GS_INTRO_SPARKLE ; 05 + const SPRITE_ANIM_INDEX_SLOTS_GOLEM ; 06 + const SPRITE_ANIM_INDEX_SLOTS_CHANSEY ; 07 + const SPRITE_ANIM_INDEX_SLOTS_EGG ; 08 + const SPRITE_ANIM_INDEX_COMPOSE_MAIL_CURSOR ; 09 + const SPRITE_ANIM_INDEX_RED_WALK ; 0a + const SPRITE_ANIM_INDEX_UNUSED_CURSOR ; 0b + const SPRITE_ANIM_INDEX_DUMMY_GAME ; 0c + const SPRITE_ANIM_INDEX_POKEGEAR_ARROW ; 0d + const SPRITE_ANIM_INDEX_TRADE_POKE_BALL ; 0e + const SPRITE_ANIM_INDEX_TRADE_POOF ; 0f + const SPRITE_ANIM_INDEX_TRADE_TUBE_BULGE ; 10 + const SPRITE_ANIM_INDEX_TRADEMON_ICON ; 11 + const SPRITE_ANIM_INDEX_TRADEMON_BUBBLE ; 12 + const SPRITE_ANIM_INDEX_EVOLUTION_BALL_OF_LIGHT ; 13 + const SPRITE_ANIM_INDEX_RADIO_TUNING_KNOB ; 14 + const SPRITE_ANIM_INDEX_MAGNET_TRAIN_RED ; 15 + const SPRITE_ANIM_INDEX_LEAF ; 16 + const SPRITE_ANIM_INDEX_CUT_TREE ; 17 + const SPRITE_ANIM_INDEX_FLY_LEAF ; 18 + const SPRITE_ANIM_INDEX_EGG_CRACK ; 19 + const SPRITE_ANIM_INDEX_GS_INTRO_HO_OH ; 1a + const SPRITE_ANIM_INDEX_HEADBUTT ; 1b + const SPRITE_ANIM_INDEX_EGG_HATCH ; 1c + const SPRITE_ANIM_INDEX_EZCHAT_CURSOR ; 1d + const SPRITE_ANIM_INDEX_BLUE_WALK ; 1e + 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_MOBILE_TRADE_CABLE_BULGE ; 22 + const SPRITE_ANIM_INDEX_MOBILE_TRADE_SENT_PULSE ; 23 + const SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_PULSE ; 24 + const SPRITE_ANIM_INDEX_MOBILE_TRADE_PING ; 25 + const SPRITE_ANIM_INDEX_INTRO_SUICUNE ; 26 + const SPRITE_ANIM_INDEX_INTRO_PICHU ; 27 + const SPRITE_ANIM_INDEX_INTRO_WOOPER ; 28 + const SPRITE_ANIM_INDEX_INTRO_UNOWN ; 29 + const SPRITE_ANIM_INDEX_INTRO_UNOWN_F ; 2a + const SPRITE_ANIM_INDEX_INTRO_SUICUNE_AWAY ; 2b + const SPRITE_ANIM_INDEX_CELEBI ; 2c ; DoAnimFrame.Jumptable indexes (see engine/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_GS_TITLE_TRAIL ; 04 - const SPRITE_ANIM_SEQ_NAMING_SCREEN_CURSOR ; 05 - const SPRITE_ANIM_SEQ_GAMEFREAK_LOGO ; 06 - const SPRITE_ANIM_SEQ_GS_INTRO_STAR ; 07 - const SPRITE_ANIM_SEQ_GS_INTRO_SPARKLE ; 08 - const SPRITE_ANIM_SEQ_SLOTS_GOLEM ; 09 - const SPRITE_ANIM_SEQ_SLOTS_CHANSEY ; 0a - const SPRITE_ANIM_SEQ_SLOTS_EGG ; 0b - const SPRITE_ANIM_SEQ_MAIL_CURSOR ; 0c - const SPRITE_ANIM_SEQ_FOR_UNUSED_CURSOR ; 0d - const SPRITE_ANIM_SEQ_DUMMY_GAME_CURSOR ; 0e - const SPRITE_ANIM_SEQ_POKEGEAR_ARROW ; 0f - const SPRITE_ANIM_SEQ_TRADE_POKE_BALL ; 10 - const SPRITE_ANIM_SEQ_TRADE_TUBE_BULGE ; 11 - const SPRITE_ANIM_SEQ_TRADEMON_IN_TUBE ; 12 - const SPRITE_ANIM_SEQ_REVEAL_NEW_MON ; 13 - const SPRITE_ANIM_SEQ_RADIO_TUNING_KNOB ; 14 - const SPRITE_ANIM_SEQ_CUT_LEAVES ; 15 - const SPRITE_ANIM_SEQ_FLY_FROM ; 16 - const SPRITE_ANIM_SEQ_FLY_LEAF ; 17 - const SPRITE_ANIM_SEQ_FLY_TO ; 18 - const SPRITE_ANIM_SEQ_19 ; 19 - const SPRITE_ANIM_SEQ_1A ; 1a - const SPRITE_ANIM_SEQ_FOR_MOBILE_23 ; 1b - const SPRITE_ANIM_SEQ_FOR_MOBILE_24 ; 1c - const SPRITE_ANIM_SEQ_INTRO_SUICUNE ; 1d - const SPRITE_ANIM_SEQ_INTRO_PICHU_WOOPER ; 1e - const SPRITE_ANIM_SEQ_CELEBI ; 1f - const SPRITE_ANIM_SEQ_INTRO_UNOWN ; 20 - const SPRITE_ANIM_SEQ_INTRO_UNOWN_F ; 21 - const SPRITE_ANIM_SEQ_INTRO_SUICUNE_AWAY ; 22 + 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_TITLE_TRAIL ; 04 + const SPRITE_ANIM_SEQ_NAMING_SCREEN_CURSOR ; 05 + const SPRITE_ANIM_SEQ_GAMEFREAK_LOGO ; 06 + const SPRITE_ANIM_SEQ_GS_INTRO_STAR ; 07 + const SPRITE_ANIM_SEQ_GS_INTRO_SPARKLE ; 08 + const SPRITE_ANIM_SEQ_SLOTS_GOLEM ; 09 + const SPRITE_ANIM_SEQ_SLOTS_CHANSEY ; 0a + const SPRITE_ANIM_SEQ_SLOTS_EGG ; 0b + const SPRITE_ANIM_SEQ_MAIL_CURSOR ; 0c + const SPRITE_ANIM_SEQ_UNUSED_CURSOR ; 0d + const SPRITE_ANIM_SEQ_DUMMY_GAME_CURSOR ; 0e + const SPRITE_ANIM_SEQ_POKEGEAR_ARROW ; 0f + const SPRITE_ANIM_SEQ_TRADE_POKE_BALL ; 10 + const SPRITE_ANIM_SEQ_TRADE_TUBE_BULGE ; 11 + const SPRITE_ANIM_SEQ_TRADEMON_IN_TUBE ; 12 + const SPRITE_ANIM_SEQ_REVEAL_NEW_MON ; 13 + const SPRITE_ANIM_SEQ_RADIO_TUNING_KNOB ; 14 + const SPRITE_ANIM_SEQ_CUT_LEAVES ; 15 + const SPRITE_ANIM_SEQ_FLY_FROM ; 16 + const SPRITE_ANIM_SEQ_FLY_LEAF ; 17 + const SPRITE_ANIM_SEQ_FLY_TO ; 18 + const SPRITE_ANIM_SEQ_GS_INTRO_HO_OH ; 19 + const SPRITE_ANIM_SEQ_EZCHAT_CURSOR ; 1a + const SPRITE_ANIM_SEQ_MOBILE_TRADE_SENT_PULSE ; 1b + const SPRITE_ANIM_SEQ_MOBILE_TRADE_OT_PULSE ; 1c + const SPRITE_ANIM_SEQ_INTRO_SUICUNE ; 1d + const SPRITE_ANIM_SEQ_INTRO_PICHU_WOOPER ; 1e + const SPRITE_ANIM_SEQ_CELEBI ; 1f + const SPRITE_ANIM_SEQ_INTRO_UNOWN ; 20 + const SPRITE_ANIM_SEQ_INTRO_UNOWN_F ; 21 + const SPRITE_ANIM_SEQ_INTRO_SUICUNE_AWAY ; 22 ; SpriteAnimFrameData indexes (see data/sprite_anims/framesets.asm) const_def - const SPRITE_ANIM_FRAMESET_00 + 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 @@ -114,7 +114,7 @@ const SPRITE_ANIM_FRAMESET_PARTY_MON_WITH_ITEM_FAST ; 06 const SPRITE_ANIM_FRAMESET_GS_TITLE_TRAIL ; 07 const SPRITE_ANIM_FRAMESET_TEXT_ENTRY_CURSOR ; 08 - const SPRITE_ANIM_FRAMESET_09 + const SPRITE_ANIM_FRAMESET_UNUSED_09 ; 09 const SPRITE_ANIM_FRAMESET_GAMEFREAK_LOGO ; 0a const SPRITE_ANIM_FRAMESET_GS_INTRO_STAR ; 0b const SPRITE_ANIM_FRAMESET_GS_INTRO_SPARKLE ; 0c @@ -133,31 +133,31 @@ const SPRITE_ANIM_FRAMESET_EVOLUTION_BALL_OF_LIGHT ; 19 const SPRITE_ANIM_FRAMESET_RADIO_TUNING_KNOB ; 1a const SPRITE_ANIM_FRAMESET_MAGNET_TRAIN_RED ; 1b - const SPRITE_ANIM_FRAMESET_1C + const SPRITE_ANIM_FRAMESET_UNUSED_1C ; 1c const SPRITE_ANIM_FRAMESET_LEAF ; 1d const SPRITE_ANIM_FRAMESET_CUT_TREE ; 1e const SPRITE_ANIM_FRAMESET_EGG_CRACK ; 1f const SPRITE_ANIM_FRAMESET_EGG_HATCH ; 20 - const SPRITE_ANIM_FRAMESET_21 - const SPRITE_ANIM_FRAMESET_22 - const SPRITE_ANIM_FRAMESET_23 - const SPRITE_ANIM_FRAMESET_24 + const SPRITE_ANIM_FRAMESET_UNUSED_21 ; 21 + const SPRITE_ANIM_FRAMESET_UNUSED_22 ; 22 + const SPRITE_ANIM_FRAMESET_UNUSED_23 ; 23 + const SPRITE_ANIM_FRAMESET_GS_INTRO_HO_OH ; 24 const SPRITE_ANIM_FRAMESET_HEADBUTT ; 25 - const SPRITE_ANIM_FRAMESET_26 - const SPRITE_ANIM_FRAMESET_27 - const SPRITE_ANIM_FRAMESET_28 - const SPRITE_ANIM_FRAMESET_29 - const SPRITE_ANIM_FRAMESET_2A - const SPRITE_ANIM_FRAMESET_2B - const SPRITE_ANIM_FRAMESET_2C + const SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_0 ; 26 + const SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_1 ; 27 + const SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_2 ; 28 + const SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_3 ; 29 + const SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_4 ; 2a + const SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_5 ; 2b + const SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_6 ; 2c const SPRITE_ANIM_FRAMESET_BLUE_WALK ; 2d const SPRITE_ANIM_FRAMESET_MAGNET_TRAIN_BLUE ; 2e const SPRITE_ANIM_FRAMESET_MOBILE_TRADE_SENT_BALL ; 2f const SPRITE_ANIM_FRAMESET_MOBILE_TRADE_OT_BALL ; 30 - const SPRITE_ANIM_FRAMESET_FOR_MOBILE_22 ; 31 - const SPRITE_ANIM_FRAMESET_FOR_MOBILE_23 ; 32 - const SPRITE_ANIM_FRAMESET_FOR_MOBILE_24 ; 33 - const SPRITE_ANIM_FRAMESET_FOR_MOBILE_25 ; 34 + const SPRITE_ANIM_FRAMESET_MOBILE_TRADE_CABLE_BULGE ; 31 + const SPRITE_ANIM_FRAMESET_MOBILE_TRADE_SENT_PULSE ; 32 + const SPRITE_ANIM_FRAMESET_MOBILE_TRADE_OT_PULSE ; 33 + const SPRITE_ANIM_FRAMESET_MOBILE_TRADE_PING ; 34 const SPRITE_ANIM_FRAMESET_INTRO_SUICUNE ; 35 const SPRITE_ANIM_FRAMESET_INTRO_SUICUNE_2 ; 36 const SPRITE_ANIM_FRAMESET_INTRO_PICHU ; 37 @@ -176,39 +176,39 @@ const_def const SPRITE_ANIM_OAMSET_RED_WALK_1 ; 00 const SPRITE_ANIM_OAMSET_RED_WALK_2 ; 01 - const SPRITE_ANIM_OAMSET_02 - const SPRITE_ANIM_OAMSET_03 - const SPRITE_ANIM_OAMSET_04 - const SPRITE_ANIM_OAMSET_05 - const SPRITE_ANIM_OAMSET_06 - const SPRITE_ANIM_OAMSET_07 - const SPRITE_ANIM_OAMSET_08 - const SPRITE_ANIM_OAMSET_09 - const SPRITE_ANIM_OAMSET_0A - const SPRITE_ANIM_OAMSET_0B - const SPRITE_ANIM_OAMSET_0C - const SPRITE_ANIM_OAMSET_0D - const SPRITE_ANIM_OAMSET_0E - const SPRITE_ANIM_OAMSET_0F - const SPRITE_ANIM_OAMSET_10 - const SPRITE_ANIM_OAMSET_11 - const SPRITE_ANIM_OAMSET_12 - const SPRITE_ANIM_OAMSET_13 - const SPRITE_ANIM_OAMSET_14 - const SPRITE_ANIM_OAMSET_15 - const SPRITE_ANIM_OAMSET_16 - const SPRITE_ANIM_OAMSET_17 - const SPRITE_ANIM_OAMSET_18 - const SPRITE_ANIM_OAMSET_19 - const SPRITE_ANIM_OAMSET_1A - const SPRITE_ANIM_OAMSET_1B - const SPRITE_ANIM_OAMSET_1C - const SPRITE_ANIM_OAMSET_1D + 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_LAPRAS_1 ; 08 + const SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_2 ; 09 + const SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_3 ; 0a + const SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_4 ; 0b + const SPRITE_ANIM_OAMSET_GS_INTRO_NOTE ; 0c + const SPRITE_ANIM_OAMSET_UNUSED_0D ; 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_UNUSED_15 ; 15 + const SPRITE_ANIM_OAMSET_UNUSED_16 ; 16 + const SPRITE_ANIM_OAMSET_UNUSED_17 ; 17 + const SPRITE_ANIM_OAMSET_UNUSED_18 ; 18 + const SPRITE_ANIM_OAMSET_UNUSED_19 ; 19 + const SPRITE_ANIM_OAMSET_UNUSED_1A ; 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_FOR_FRAMESET_09 ; 21 - const SPRITE_ANIM_OAMSET_22 + const SPRITE_ANIM_OAMSET_FOR_UNUSED_09 ; 21 + const SPRITE_ANIM_OAMSET_UNUSED_22 ; 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 @@ -227,8 +227,8 @@ 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_35 - const SPRITE_ANIM_OAMSET_36 + 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 @@ -241,49 +241,49 @@ 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_43 - const SPRITE_ANIM_OAMSET_44 - const SPRITE_ANIM_OAMSET_45 - const SPRITE_ANIM_OAMSET_46 - const SPRITE_ANIM_OAMSET_47 - const SPRITE_ANIM_OAMSET_48 - const SPRITE_ANIM_OAMSET_49 - const SPRITE_ANIM_OAMSET_4A - const SPRITE_ANIM_OAMSET_4B - const SPRITE_ANIM_OAMSET_4C - const SPRITE_ANIM_OAMSET_4D - const SPRITE_ANIM_OAMSET_4E + 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_55 - const SPRITE_ANIM_OAMSET_56 - const SPRITE_ANIM_OAMSET_57 - const SPRITE_ANIM_OAMSET_58 - const SPRITE_ANIM_OAMSET_59 - const SPRITE_ANIM_OAMSET_5A + const SPRITE_ANIM_OAMSET_EGG_HATCH ; 55 + const SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_1 ; 56 + const SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_2 ; 57 + const SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_3 ; 58 + const SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_4 ; 59 + const SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_5 ; 5a const SPRITE_ANIM_OAMSET_HEADBUTT_TREE_2 ; 5b - const SPRITE_ANIM_OAMSET_5C - const SPRITE_ANIM_OAMSET_5D - const SPRITE_ANIM_OAMSET_5E - const SPRITE_ANIM_OAMSET_5F - const SPRITE_ANIM_OAMSET_60 - const SPRITE_ANIM_OAMSET_61 - const SPRITE_ANIM_OAMSET_62 + const SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_1 ; 5c + const SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_2 ; 5d + const SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_3 ; 5e + const SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_4 ; 5f + const SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_5 ; 60 + const SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_6 ; 61 + const SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_7 ; 62 const SPRITE_ANIM_OAMSET_BLUE_WALK_1 ; 63 const SPRITE_ANIM_OAMSET_BLUE_WALK_2 ; 64 const SPRITE_ANIM_OAMSET_MAGNET_TRAIN_BLUE_1 ; 65 const SPRITE_ANIM_OAMSET_MAGNET_TRAIN_BLUE_2 ; 66 - const SPRITE_ANIM_OAMSET_FOR_MOBILE_22_1 ; 67 - const SPRITE_ANIM_OAMSET_FOR_MOBILE_22_2 ; 68 - const SPRITE_ANIM_OAMSET_FOR_MOBILE_25_1 ; 69 - const SPRITE_ANIM_OAMSET_FOR_MOBILE_25_2 ; 6a - const SPRITE_ANIM_OAMSET_FOR_MOBILE_25_3 ; 6b - const SPRITE_ANIM_OAMSET_FOR_MOBILE_23 ; 6c - const SPRITE_ANIM_OAMSET_FOR_MOBILE_24 ; 6d + const SPRITE_ANIM_OAMSET_MOBILE_TRADE_CABLE_BULGE_1 ; 67 + const SPRITE_ANIM_OAMSET_MOBILE_TRADE_CABLE_BULGE_2 ; 68 + const SPRITE_ANIM_OAMSET_MOBILE_TRADE_PING_1 ; 69 + const SPRITE_ANIM_OAMSET_MOBILE_TRADE_PING_2 ; 6a + const SPRITE_ANIM_OAMSET_MOBILE_TRADE_PING_3 ; 6b + const SPRITE_ANIM_OAMSET_MOBILE_TRADE_SENT_PULSE ; 6c + const SPRITE_ANIM_OAMSET_MOBILE_TRADE_OT_PULSE ; 6d const SPRITE_ANIM_OAMSET_INTRO_SUICUNE_1 ; 6e const SPRITE_ANIM_OAMSET_INTRO_SUICUNE_2 ; 6f const SPRITE_ANIM_OAMSET_INTRO_SUICUNE_3 ; 70 diff --git a/data/sprite_anims/framesets.asm b/data/sprite_anims/framesets.asm index 24b058859..1f4486186 100755 --- a/data/sprite_anims/framesets.asm +++ b/data/sprite_anims/framesets.asm @@ -9,7 +9,7 @@ SpriteAnimFrameData: ; 8d6e6 dw .Frameset_PartyMonWithItemFast dw .Frameset_GSTitleTrail dw .Frameset_TextEntryCursor - dw .Frameset_09 + dw .Frameset_Unused09 dw .Frameset_GameFreakLogo dw .Frameset_GSIntroStar dw .Frameset_GSIntroSparkle @@ -28,31 +28,31 @@ SpriteAnimFrameData: ; 8d6e6 dw .Frameset_EvolutionBallOfLight dw .Frameset_RadioTuningKnob dw .Frameset_MagnetTrainRed - dw .Frameset_1c + dw .Frameset_Unused1C dw .Frameset_Leaf dw .Frameset_CutTree dw .Frameset_EggCrack dw .Frameset_EggHatch - dw .Frameset_21 - dw .Frameset_22 - dw .Frameset_23 - dw .Frameset_24 + dw .Frameset_Unused21 + dw .Frameset_Unused22 + dw .Frameset_Unused23 + dw .Frameset_GSIntroHoOh dw .Frameset_HeadbuttTree - dw .Frameset_26 - dw .Frameset_27 - dw .Frameset_28 - dw .Frameset_29 - dw .Frameset_2a - dw .Frameset_2b - dw .Frameset_2c + dw .Frameset_EZChatCursor0 + dw .Frameset_EZChatCursor1 + dw .Frameset_EZChatCursor2 + dw .Frameset_EZChatCursor3 + dw .Frameset_EZChatCursor4 + dw .Frameset_EZChatCursor5 + dw .Frameset_EZChatCursor6 dw .Frameset_BlueWalk dw .Frameset_MagnetTrainBlue dw .Frameset_MobileTradeSentBall dw .Frameset_MobileTradeOTBall - dw .Frameset_ForMobile22 - dw .Frameset_ForMobile23 - dw .Frameset_ForMobile24 - dw .Frameset_ForMobile25 + dw .Frameset_MobileTradeCableBulge + dw .Frameset_MobileTradeSentPulse + dw .Frameset_MobileTradeOTPulse + dw .Frameset_MobileTradePing dw .Frameset_IntroSuicune dw .Frameset_IntroSuicune2 dw .Frameset_IntroPichu @@ -133,8 +133,8 @@ SpriteAnimFrameData: ; 8d6e6 dorepeat 1 dorestart -.Frameset_09: - frame SPRITE_ANIM_OAMSET_FOR_FRAMESET_09, 1 +.Frameset_Unused09: + frame SPRITE_ANIM_OAMSET_FOR_UNUSED_09, 1 dorepeat 1 dorestart @@ -216,8 +216,8 @@ SpriteAnimFrameData: ; 8d6e6 delanim .Frameset_TradeTubeBulge: - frame SPRITE_ANIM_OAMSET_35, 3 - frame SPRITE_ANIM_OAMSET_36, 3 + frame SPRITE_ANIM_OAMSET_TRADE_TUBE_BULGE_1, 3 + frame SPRITE_ANIM_OAMSET_TRADE_TUBE_BULGE_2, 3 dorestart .Frameset_TrademonIcon: @@ -247,49 +247,49 @@ SpriteAnimFrameData: ; 8d6e6 dorestart ; XXX - frame SPRITE_ANIM_OAMSET_43, 8 - frame SPRITE_ANIM_OAMSET_44, 8 + frame SPRITE_ANIM_OAMSET_UNUSED_43, 8 + frame SPRITE_ANIM_OAMSET_UNUSED_44, 8 dorestart ; XXX - frame SPRITE_ANIM_OAMSET_45, 8 - frame SPRITE_ANIM_OAMSET_46, 8 + frame SPRITE_ANIM_OAMSET_UNUSED_45, 8 + frame SPRITE_ANIM_OAMSET_UNUSED_46, 8 dorestart ; XXX - frame SPRITE_ANIM_OAMSET_47, 8 - frame SPRITE_ANIM_OAMSET_48, 8 + frame SPRITE_ANIM_OAMSET_UNUSED_47, 8 + frame SPRITE_ANIM_OAMSET_UNUSED_48, 8 dorestart ; XXX - frame SPRITE_ANIM_OAMSET_49, 1 - frame SPRITE_ANIM_OAMSET_49, 1, OAM_X_FLIP - frame SPRITE_ANIM_OAMSET_49, 1, OAM_X_FLIP, OAM_Y_FLIP - frame SPRITE_ANIM_OAMSET_49, 1, OAM_Y_FLIP + frame SPRITE_ANIM_OAMSET_UNUSED_49, 1 + frame SPRITE_ANIM_OAMSET_UNUSED_49, 1, OAM_X_FLIP + frame SPRITE_ANIM_OAMSET_UNUSED_49, 1, OAM_X_FLIP, OAM_Y_FLIP + frame SPRITE_ANIM_OAMSET_UNUSED_49, 1, OAM_Y_FLIP dorestart ; XXX - frame SPRITE_ANIM_OAMSET_4A, 32 + frame SPRITE_ANIM_OAMSET_UNUSED_4A, 32 endanim ; XXX - frame SPRITE_ANIM_OAMSET_4B, 32 + frame SPRITE_ANIM_OAMSET_UNUSED_4B, 32 endanim ; XXX - frame SPRITE_ANIM_OAMSET_4C, 32 + frame SPRITE_ANIM_OAMSET_UNUSED_4C, 32 endanim ; XXX - frame SPRITE_ANIM_OAMSET_4D, 32 + frame SPRITE_ANIM_OAMSET_UNUSED_4D, 32 endanim ; XXX - frame SPRITE_ANIM_OAMSET_4E, 3 + frame SPRITE_ANIM_OAMSET_UNUSED_4E, 3 dorepeat 3 dorestart -.Frameset_1c: +.Frameset_Unused1C: dorepeat 32 endanim @@ -311,28 +311,28 @@ SpriteAnimFrameData: ; 8d6e6 endanim .Frameset_EggHatch: - frame SPRITE_ANIM_OAMSET_55, 32 + frame SPRITE_ANIM_OAMSET_EGG_HATCH, 32 endanim -.Frameset_21: - frame SPRITE_ANIM_OAMSET_55, 32, OAM_X_FLIP +.Frameset_Unused21: + frame SPRITE_ANIM_OAMSET_EGG_HATCH, 32, OAM_X_FLIP endanim -.Frameset_22: - frame SPRITE_ANIM_OAMSET_55, 32, OAM_Y_FLIP +.Frameset_Unused22: + frame SPRITE_ANIM_OAMSET_EGG_HATCH, 32, OAM_Y_FLIP endanim -.Frameset_23: - frame SPRITE_ANIM_OAMSET_55, 32, OAM_X_FLIP, OAM_Y_FLIP +.Frameset_Unused23: + frame SPRITE_ANIM_OAMSET_EGG_HATCH, 32, OAM_X_FLIP, OAM_Y_FLIP endanim -.Frameset_24: - frame SPRITE_ANIM_OAMSET_56, 10 - frame SPRITE_ANIM_OAMSET_57, 9 - frame SPRITE_ANIM_OAMSET_58, 10 - frame SPRITE_ANIM_OAMSET_59, 10 - frame SPRITE_ANIM_OAMSET_58, 9 - frame SPRITE_ANIM_OAMSET_5A, 10 +.Frameset_GSIntroHoOh: + frame SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_1, 10 + frame SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_2, 9 + frame SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_3, 10 + frame SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_4, 10 + frame SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_3, 9 + frame SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_5, 10 dorestart .Frameset_HeadbuttTree: @@ -342,32 +342,32 @@ SpriteAnimFrameData: ; 8d6e6 frame SPRITE_ANIM_OAMSET_HEADBUTT_TREE_2, 2, OAM_X_FLIP dorestart -.Frameset_26: - frame SPRITE_ANIM_OAMSET_5C, 2 +.Frameset_EZChatCursor0: + frame SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_1, 2 endanim -.Frameset_27: - frame SPRITE_ANIM_OAMSET_5D, 2 +.Frameset_EZChatCursor1: + frame SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_2, 2 endanim -.Frameset_28: - frame SPRITE_ANIM_OAMSET_5E, 2 +.Frameset_EZChatCursor2: + frame SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_3, 2 endanim -.Frameset_29: - frame SPRITE_ANIM_OAMSET_5F, 2 +.Frameset_EZChatCursor3: + frame SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_4, 2 endanim -.Frameset_2a: - frame SPRITE_ANIM_OAMSET_60, 2 +.Frameset_EZChatCursor4: + frame SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_5, 2 endanim -.Frameset_2b: - frame SPRITE_ANIM_OAMSET_61, 2 +.Frameset_EZChatCursor5: + frame SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_6, 2 endanim -.Frameset_2c: - frame SPRITE_ANIM_OAMSET_62, 2 +.Frameset_EZChatCursor6: + frame SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_7, 2 endanim .Frameset_MobileTradeSentBall: @@ -406,23 +406,23 @@ SpriteAnimFrameData: ; 8d6e6 frame SPRITE_ANIM_OAMSET_TRADE_POOF_3, 3 delanim -.Frameset_ForMobile22: - frame SPRITE_ANIM_OAMSET_FOR_MOBILE_22_1, 3 - frame SPRITE_ANIM_OAMSET_FOR_MOBILE_22_2, 3 +.Frameset_MobileTradeCableBulge: + frame SPRITE_ANIM_OAMSET_MOBILE_TRADE_CABLE_BULGE_1, 3 + frame SPRITE_ANIM_OAMSET_MOBILE_TRADE_CABLE_BULGE_2, 3 dorestart -.Frameset_ForMobile23: - frame SPRITE_ANIM_OAMSET_FOR_MOBILE_23, 3 +.Frameset_MobileTradeSentPulse: + frame SPRITE_ANIM_OAMSET_MOBILE_TRADE_SENT_PULSE, 3 endanim -.Frameset_ForMobile24: - frame SPRITE_ANIM_OAMSET_FOR_MOBILE_24, 3 +.Frameset_MobileTradeOTPulse: + frame SPRITE_ANIM_OAMSET_MOBILE_TRADE_OT_PULSE, 3 endanim -.Frameset_ForMobile25: - frame SPRITE_ANIM_OAMSET_FOR_MOBILE_25_1, 2 - frame SPRITE_ANIM_OAMSET_FOR_MOBILE_25_2, 2 - frame SPRITE_ANIM_OAMSET_FOR_MOBILE_25_3, 2 +.Frameset_MobileTradePing: + frame SPRITE_ANIM_OAMSET_MOBILE_TRADE_PING_1, 2 + frame SPRITE_ANIM_OAMSET_MOBILE_TRADE_PING_2, 2 + frame SPRITE_ANIM_OAMSET_MOBILE_TRADE_PING_3, 2 delanim .Frameset_IntroSuicune: diff --git a/data/sprite_anims/oam.asm b/data/sprite_anims/oam.asm index 99adc9df3..519396127 100644 --- a/data/sprite_anims/oam.asm +++ b/data/sprite_anims/oam.asm @@ -3,39 +3,39 @@ SpriteAnimOAMData: ; 8d94d ; vtile offset, pointer dbw $00, .OAMData_RedWalk ; SPRITE_ANIM_OAMSET_RED_WALK_1 dbw $04, .OAMData_RedWalk ; SPRITE_ANIM_OAMSET_RED_WALK_2 - dbw $4c, .OAMData_1x1_Palette0 ; SPRITE_ANIM_OAMSET_02 - dbw $5c, .OAMData_1x1_Palette0 ; SPRITE_ANIM_OAMSET_03 - dbw $6c, .OAMData_04 ; SPRITE_ANIM_OAMSET_04 - dbw $6e, .OAMData_04 ; SPRITE_ANIM_OAMSET_05 - dbw $2d, .OAMData_06 ; SPRITE_ANIM_OAMSET_06 - dbw $4d, .OAMData_06 ; SPRITE_ANIM_OAMSET_07 - dbw $60, .OAMData_08 ; SPRITE_ANIM_OAMSET_08 - dbw $00, .OAMData_08 ; SPRITE_ANIM_OAMSET_09 - dbw $00, .OAMData_08 ; SPRITE_ANIM_OAMSET_0A - dbw $06, .OAMData_08 ; SPRITE_ANIM_OAMSET_0B - dbw $0c, .OAMData_0c ; SPRITE_ANIM_OAMSET_0C - dbw $0d, .OAMData_1x1_Palette0 ; SPRITE_ANIM_OAMSET_0D - dbw $00, .OAMData_0e ; SPRITE_ANIM_OAMSET_0E - dbw $04, .OAMData_0e ; SPRITE_ANIM_OAMSET_0F - dbw $08, .OAMData_0e ; SPRITE_ANIM_OAMSET_10 - dbw $40, .OAMData_0e ; SPRITE_ANIM_OAMSET_11 - dbw $44, .OAMData_0e ; SPRITE_ANIM_OAMSET_12 - dbw $48, .OAMData_0e ; SPRITE_ANIM_OAMSET_13 - dbw $4c, .OAMData_0e ; SPRITE_ANIM_OAMSET_14 - dbw $80, .OAMData_15 ; SPRITE_ANIM_OAMSET_15 - dbw $85, .OAMData_15 ; SPRITE_ANIM_OAMSET_16 - dbw $8a, .OAMData_15 ; SPRITE_ANIM_OAMSET_17 - dbw $00, .OAMData_18 ; SPRITE_ANIM_OAMSET_18 - dbw $01, .OAMData_TradePoofBubble ; SPRITE_ANIM_OAMSET_19 - dbw $09, .OAMData_1a ; SPRITE_ANIM_OAMSET_1A - dbw $10, .OAMData_1b ; SPRITE_ANIM_OAMSET_1B - dbw $29, .OAMData_1b ; SPRITE_ANIM_OAMSET_1C - dbw $42, .OAMData_1b ; SPRITE_ANIM_OAMSET_1D + dbw $4c, .OAMData_1x1_Palette0 ; SPRITE_ANIM_OAMSET_GS_INTRO_BUBBLE_1 + dbw $5c, .OAMData_1x1_Palette0 ; SPRITE_ANIM_OAMSET_GS_INTRO_BUBBLE_2 + dbw $6c, .OAMData_GSIntroShellder ; SPRITE_ANIM_OAMSET_GS_INTRO_SHELLDER_1 + dbw $6e, .OAMData_GSIntroShellder ; SPRITE_ANIM_OAMSET_GS_INTRO_SHELLDER_2 + dbw $2d, .OAMData_GSIntroMagikarp ; SPRITE_ANIM_OAMSET_GS_INTRO_MAGIKARP_1 + dbw $4d, .OAMData_GSIntroMagikarp ; SPRITE_ANIM_OAMSET_GS_INTRO_MAGIKARP_2 + dbw $60, .OAMData_GSIntroLapras ; SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_1 + dbw $00, .OAMData_GSIntroLapras ; SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_2 + dbw $00, .OAMData_GSIntroLapras ; SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_3 + dbw $06, .OAMData_GSIntroLapras ; SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_4 + dbw $0c, .OAMData_GSIntroNote ; SPRITE_ANIM_OAMSET_GS_INTRO_NOTE + dbw $0d, .OAMData_1x1_Palette0 ; SPRITE_ANIM_OAMSET_UNUSED_0D + dbw $00, .OAMData_GSIntroJigglypuffPikachu ; SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_1 + dbw $04, .OAMData_GSIntroJigglypuffPikachu ; SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_2 + dbw $08, .OAMData_GSIntroJigglypuffPikachu ; SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_3 + dbw $40, .OAMData_GSIntroJigglypuffPikachu ; SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_1 + dbw $44, .OAMData_GSIntroJigglypuffPikachu ; SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_2 + dbw $48, .OAMData_GSIntroJigglypuffPikachu ; SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_3 + dbw $4c, .OAMData_GSIntroJigglypuffPikachu ; SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_4 + dbw $80, .OAMData_Unused15_17 ; SPRITE_ANIM_OAMSET_UNUSED_15 + dbw $85, .OAMData_Unused15_17 ; SPRITE_ANIM_OAMSET_UNUSED_16 + dbw $8a, .OAMData_Unused15_17 ; SPRITE_ANIM_OAMSET_UNUSED_17 + dbw $00, .OAMData_Unused18 ; SPRITE_ANIM_OAMSET_UNUSED_18 + dbw $01, .OAMData_TradePoofBubble ; SPRITE_ANIM_OAMSET_UNUSED_19 + dbw $09, .OAMData_Unused1A ; SPRITE_ANIM_OAMSET_UNUSED_1A + dbw $10, .OAMData_GSIntroStarter ; SPRITE_ANIM_OAMSET_GS_INTRO_CHIKORITA + dbw $29, .OAMData_GSIntroStarter ; SPRITE_ANIM_OAMSET_GS_INTRO_CYNDAQUIL + dbw $42, .OAMData_GSIntroStarter ; SPRITE_ANIM_OAMSET_GS_INTRO_TOTODILE dbw $f8, .OAMData_GSTitleTrail ; SPRITE_ANIM_OAMSET_GS_TITLE_TRAIL_1 dbw $fa, .OAMData_GSTitleTrail ; SPRITE_ANIM_OAMSET_GS_TITLE_TRAIL_2 dbw $00, .OAMData_TextEntryCursor ; SPRITE_ANIM_OAMSET_TEXT_ENTRY_CURSOR - dbw $00, .OAMData_ForFrameset09 ; SPRITE_ANIM_OAMSET_FOR_FRAMESET_09 - dbw $00, .OAMData_22 ; SPRITE_ANIM_OAMSET_22 + dbw $00, .OAMData_ForUnused09 ; SPRITE_ANIM_OAMSET_FOR_UNUSED_09 + dbw $00, .OAMData_Unused22 ; SPRITE_ANIM_OAMSET_UNUSED_22 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 @@ -54,8 +54,8 @@ SpriteAnimOAMData: ; 8d94d dbw $06, .OAMData_TradePoofBubble ; SPRITE_ANIM_OAMSET_TRADE_POOF_1 dbw $0a, .OAMData_TradePoofBubble ; SPRITE_ANIM_OAMSET_TRADE_POOF_2 dbw $0e, .OAMData_TradePoofBubble ; SPRITE_ANIM_OAMSET_TRADE_POOF_3 - dbw $12, .OAMData_35 ; SPRITE_ANIM_OAMSET_35 - dbw $13, .OAMData_35 ; SPRITE_ANIM_OAMSET_36 + dbw $12, .OAMData_TradeTubeBulge ; SPRITE_ANIM_OAMSET_TRADE_TUBE_BULGE_1 + dbw $13, .OAMData_TradeTubeBulge ; SPRITE_ANIM_OAMSET_TRADE_TUBE_BULGE_2 dbw $00, .OAMData_RedWalk ; SPRITE_ANIM_OAMSET_TRADEMON_ICON_1 dbw $04, .OAMData_RedWalk ; SPRITE_ANIM_OAMSET_TRADEMON_ICON_2 dbw $10, .OAMData_TradePoofBubble ; SPRITE_ANIM_OAMSET_TRADEMON_BUBBLE @@ -68,16 +68,16 @@ SpriteAnimOAMData: ; 8d94d dbw $00, .OAMData_PartyMonWithItem2 ; SPRITE_ANIM_OAMSET_PARTY_MON_WITH_ITEM_2 dbw $00, .OAMData_MagnetTrainRed ; SPRITE_ANIM_OAMSET_MAGNET_TRAIN_RED_1 dbw $04, .OAMData_MagnetTrainRed ; SPRITE_ANIM_OAMSET_MAGNET_TRAIN_RED_2 - dbw $00, .OAMData_43 ; SPRITE_ANIM_OAMSET_43 - dbw $30, .OAMData_43 ; SPRITE_ANIM_OAMSET_44 - dbw $03, .OAMData_43 ; SPRITE_ANIM_OAMSET_45 - dbw $33, .OAMData_43 ; SPRITE_ANIM_OAMSET_46 - dbw $06, .OAMData_43 ; SPRITE_ANIM_OAMSET_47 - dbw $36, .OAMData_43 ; SPRITE_ANIM_OAMSET_48 - dbw $09, .OAMData_43 ; SPRITE_ANIM_OAMSET_49 - dbw $39, .OAMData_43 ; SPRITE_ANIM_OAMSET_4A - dbw $0c, .OAMData_4b ; SPRITE_ANIM_OAMSET_4B - dbw $0c, .OAMData_4c ; SPRITE_ANIM_OAMSET_4C + dbw $00, .OAMData_Unused43_4A ; SPRITE_ANIM_OAMSET_UNUSED_43 + dbw $30, .OAMData_Unused43_4A ; SPRITE_ANIM_OAMSET_UNUSED_44 + dbw $03, .OAMData_Unused43_4A ; SPRITE_ANIM_OAMSET_UNUSED_45 + dbw $33, .OAMData_Unused43_4A ; SPRITE_ANIM_OAMSET_UNUSED_46 + dbw $06, .OAMData_Unused43_4A ; SPRITE_ANIM_OAMSET_UNUSED_47 + dbw $36, .OAMData_Unused43_4A ; SPRITE_ANIM_OAMSET_UNUSED_48 + dbw $09, .OAMData_Unused43_4A ; SPRITE_ANIM_OAMSET_UNUSED_49 + dbw $39, .OAMData_Unused43_4A ; SPRITE_ANIM_OAMSET_UNUSED_4A + dbw $0c, .OAMData_Unused4B ; SPRITE_ANIM_OAMSET_UNUSED_4B + dbw $0c, .OAMData_Unused4C ; SPRITE_ANIM_OAMSET_UNUSED_4C dbw $3c, .OAMData_1x1_Palette0 ; SPRITE_ANIM_OAMSET_4D dbw $3e, .OAMData_1x1_Palette0 ; SPRITE_ANIM_OAMSET_4E dbw $00, .OAMData_Leaf ; SPRITE_ANIM_OAMSET_LEAF @@ -86,31 +86,31 @@ SpriteAnimOAMData: ; 8d94d dbw $00, .OAMData_CutTree3 ; SPRITE_ANIM_OAMSET_CUT_TREE_3 dbw $00, .OAMData_CutTree4 ; SPRITE_ANIM_OAMSET_CUT_TREE_4 dbw $00, .OAMData_1x1_Palette0 ; SPRITE_ANIM_OAMSET_EGG_CRACK - dbw $01, .OAMData_1x1_Palette0 ; SPRITE_ANIM_OAMSET_55 - dbw $00, .OAMData_56 ; SPRITE_ANIM_OAMSET_56 - dbw $00, .OAMData_57 ; SPRITE_ANIM_OAMSET_57 - dbw $00, .OAMData_58 ; SPRITE_ANIM_OAMSET_58 - dbw $00, .OAMData_59 ; SPRITE_ANIM_OAMSET_59 - dbw $00, .OAMData_5a ; SPRITE_ANIM_OAMSET_5A + dbw $01, .OAMData_1x1_Palette0 ; SPRITE_ANIM_OAMSET_EGG_HATCH + dbw $00, .OAMData_GSIntroHoOh1 ; SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_1 + dbw $00, .OAMData_GSIntroHoOh2 ; SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_2 + dbw $00, .OAMData_GSIntroHoOh3 ; SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_3 + dbw $00, .OAMData_GSIntroHoOh4 ; SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_4 + dbw $00, .OAMData_GSIntroHoOh5 ; SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_5 dbw $04, .OAMData_Tree ; SPRITE_ANIM_OAMSET_HEADBUTT_TREE_2 - dbw $00, .OAMData_5c ; SPRITE_ANIM_OAMSET_5C - dbw $00, .OAMData_5d ; SPRITE_ANIM_OAMSET_5D - dbw $00, .OAMData_5e ; SPRITE_ANIM_OAMSET_5E - dbw $00, .OAMData_5f ; SPRITE_ANIM_OAMSET_5F - dbw $00, .OAMData_60 ; SPRITE_ANIM_OAMSET_60 - dbw $00, .OAMData_61 ; SPRITE_ANIM_OAMSET_61 - dbw $00, .OAMData_62 ; SPRITE_ANIM_OAMSET_62 + dbw $00, .OAMData_EZChatCursor1 ; SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_1 + dbw $00, .OAMData_EZChatCursor2 ; SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_2 + dbw $00, .OAMData_EZChatCursor3 ; SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_3 + dbw $00, .OAMData_EZChatCursor4 ; SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_4 + dbw $00, .OAMData_EZChatCursor5 ; SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_5 + dbw $00, .OAMData_EZChatCursor6 ; SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_6 + dbw $00, .OAMData_EZChatCursor7 ; SPRITE_ANIM_OAMSET_EZCHAT_CURSOR_7 dbw $00, .OAMData_BlueWalk ; SPRITE_ANIM_OAMSET_BLUE_WALK_1 dbw $04, .OAMData_BlueWalk ; SPRITE_ANIM_OAMSET_BLUE_WALK_2 dbw $00, .OAMData_MagnetTrainBlue ; SPRITE_ANIM_OAMSET_MAGNET_TRAIN_BLUE_1 dbw $04, .OAMData_MagnetTrainBlue ; SPRITE_ANIM_OAMSET_MAGNET_TRAIN_BLUE_2 - dbw $20, .OAMData_ForMobile22 ; SPRITE_ANIM_OAMSET_FOR_MOBILE_22_1 - dbw $21, .OAMData_ForMobile22 ; SPRITE_ANIM_OAMSET_FOR_MOBILE_22_2 - dbw $22, .OAMData_ForMobile25_1 ; SPRITE_ANIM_OAMSET_FOR_MOBILE_25_1 - dbw $23, .OAMData_ForMobile25_2 ; SPRITE_ANIM_OAMSET_FOR_MOBILE_25_2 - dbw $27, .OAMData_ForMobile25_3 ; SPRITE_ANIM_OAMSET_FOR_MOBILE_25_3 - dbw $2a, .OAMData_ForMobile23 ; SPRITE_ANIM_OAMSET_FOR_MOBILE_23 - dbw $2a, .OAMData_ForMobile24 ; SPRITE_ANIM_OAMSET_FOR_MOBILE_24 + dbw $20, .OAMData_MobileTradeCableBulge ; SPRITE_ANIM_OAMSET_MOBILE_TRADE_CABLE_BULGE_1 + dbw $21, .OAMData_MobileTradeCableBulge ; SPRITE_ANIM_OAMSET_MOBILE_TRADE_CABLE_BULGE_2 + dbw $22, .OAMData_MobileTradePing1 ; SPRITE_ANIM_OAMSET_MOBILE_TRADE_PING_1 + dbw $23, .OAMData_MobileTradePing2 ; SPRITE_ANIM_OAMSET_MOBILE_TRADE_PING_2 + dbw $27, .OAMData_MobileTradePing3 ; SPRITE_ANIM_OAMSET_MOBILE_TRADE_PING_3 + dbw $2a, .OAMData_MobileTradeSentPulse ; SPRITE_ANIM_OAMSET_MOBILE_TRADE_SENT_PULSE + dbw $2a, .OAMData_MobileTradeOTPulse ; SPRITE_ANIM_OAMSET_MOBILE_TRADE_OT_PULSE dbw $00, .OAMData_IntroSuicune1 ; SPRITE_ANIM_OAMSET_INTRO_SUICUNE_1 dbw $08, .OAMData_IntroSuicune2 ; SPRITE_ANIM_OAMSET_INTRO_SUICUNE_2 dbw $60, .OAMData_IntroSuicune3 ; SPRITE_ANIM_OAMSET_INTRO_SUICUNE_3 @@ -122,7 +122,7 @@ SpriteAnimOAMData: ; 8d94d dbw $00, .OAMData_IntroUnown1 ; SPRITE_ANIM_OAMSET_INTRO_UNOWN_1 dbw $01, .OAMData_IntroUnown2 ; SPRITE_ANIM_OAMSET_INTRO_UNOWN_2 dbw $04, .OAMData_IntroUnown3 ; SPRITE_ANIM_OAMSET_INTRO_UNOWN_3 - dbw $00, .OAMData_18 ; SPRITE_ANIM_OAMSET_INTRO_UNOWN_F_2_1 + dbw $00, .OAMData_Unused18 ; SPRITE_ANIM_OAMSET_INTRO_UNOWN_F_2_1 dbw $01, .OAMData_IntroUnownF2_2 ; SPRITE_ANIM_OAMSET_INTRO_UNOWN_F_2_2 dbw $03, .OAMData_IntroUnownF2_3 ; SPRITE_ANIM_OAMSET_INTRO_UNOWN_F_2_3 dbw $08, .OAMData_IntroUnownF2_4_5 ; SPRITE_ANIM_OAMSET_INTRO_UNOWN_F_2_4 @@ -144,14 +144,14 @@ SpriteAnimOAMData: ; 8d94d .OAMData_1x1_Palette0: db 1 - dsprite -1, 4, -1, 4, $00, $00 + dsprite -1, 4, -1, 4, $00, 0 -.OAMData_04: +.OAMData_GSIntroShellder: db 4 - dsprite -1, 0, -1, 0, $00, $00 - dsprite -1, 0, 0, 0, $01, $00 - dsprite 0, 0, -1, 0, $10, $00 - dsprite 0, 0, 0, 0, $11, $00 + dsprite -1, 0, -1, 0, $00, 0 + dsprite -1, 0, 0, 0, $01, 0 + dsprite 0, 0, -1, 0, $10, 0 + dsprite 0, 0, 0, 0, $11, 0 .OAMData_GSIntroStar: db 4 @@ -162,32 +162,32 @@ SpriteAnimOAMData: ; 8d94d .OAMData_TradePokeBall1: db 4 - dsprite -1, 0, -1, 0, $00, $80 - dsprite -1, 0, 0, 0, $00, $a0 - dsprite 0, 0, -1, 0, $01, $80 - dsprite 0, 0, 0, 0, $01, $a0 + dsprite -1, 0, -1, 0, $00, 0 | BEHIND_BG + dsprite -1, 0, 0, 0, $00, 0 | X_FLIP | BEHIND_BG + dsprite 0, 0, -1, 0, $01, 0 | BEHIND_BG + dsprite 0, 0, 0, 0, $01, 0 | X_FLIP | BEHIND_BG -.OAMData_18: +.OAMData_Unused18: db 4 - dsprite -1, 0, -1, 0, $00, $00 - dsprite -1, 0, 0, 0, $00, $20 - dsprite 0, 0, -1, 0, $00, $40 - dsprite 0, 0, 0, 0, $00, $60 + dsprite -1, 0, -1, 0, $00, 0 + dsprite -1, 0, 0, 0, $00, 0 | X_FLIP + dsprite 0, 0, -1, 0, $00, 0 | Y_FLIP + dsprite 0, 0, 0, 0, $00, 0 | X_FLIP | Y_FLIP -.OAMData_35: +.OAMData_TradeTubeBulge: db 4 - dsprite -1, 0, -1, 0, $00, $07 - dsprite -1, 0, 0, 0, $00, $27 - dsprite 0, 0, -1, 0, $00, $47 - dsprite 0, 0, 0, 0, $00, $67 + dsprite -1, 0, -1, 0, $00, 7 + dsprite -1, 0, 0, 0, $00, 7 | X_FLIP + dsprite 0, 0, -1, 0, $00, 7 | Y_FLIP + dsprite 0, 0, 0, 0, $00, 7 | X_FLIP | Y_FLIP ; 8db4b ; 8db4b db 4 - dsprite -1, 0, -1, 0, $00, $80 - dsprite -1, 0, 0, 0, $00, $a0 - dsprite 0, 0, -1, 0, $00, $c0 - dsprite 0, 0, 0, 0, $00, $e0 + dsprite -1, 0, -1, 0, $00, 0 | BEHIND_BG + dsprite -1, 0, 0, 0, $00, 0 | X_FLIP | BEHIND_BG + dsprite 0, 0, -1, 0, $00, 0 | Y_FLIP | BEHIND_BG + dsprite 0, 0, 0, 0, $00, 0 | X_FLIP | Y_FLIP | BEHIND_BG .OAMData_TradePoofBubble: db 16 @@ -208,143 +208,143 @@ SpriteAnimOAMData: ; 8d94d dsprite 1, 0, 0, 0, $01, 0 | X_FLIP | Y_FLIP dsprite 1, 0, 1, 0, $00, 0 | X_FLIP | Y_FLIP -.OAMData_1a: +.OAMData_Unused1A: db 36 - dsprite -3, 0, -3, 0, $00, $00 - dsprite -3, 0, -2, 0, $01, $00 - dsprite -3, 0, -1, 0, $02, $00 - dsprite -2, 0, -3, 0, $03, $00 - dsprite -2, 0, -2, 0, $04, $00 - dsprite -2, 0, -1, 0, $05, $00 - dsprite -1, 0, -3, 0, $06, $00 - dsprite -1, 0, -2, 0, $05, $00 - dsprite -1, 0, -1, 0, $05, $00 - dsprite -3, 0, 0, 0, $02, $20 - dsprite -3, 0, 1, 0, $01, $20 - dsprite -3, 0, 2, 0, $00, $20 - dsprite -2, 0, 0, 0, $05, $20 - dsprite -2, 0, 1, 0, $04, $20 - dsprite -2, 0, 2, 0, $03, $20 - dsprite -1, 0, 0, 0, $05, $20 - dsprite -1, 0, 1, 0, $05, $20 - dsprite -1, 0, 2, 0, $06, $20 - dsprite 0, 0, -3, 0, $06, $40 - dsprite 0, 0, -2, 0, $05, $40 - dsprite 0, 0, -1, 0, $05, $40 - dsprite 1, 0, -3, 0, $03, $40 - dsprite 1, 0, -2, 0, $04, $40 - dsprite 1, 0, -1, 0, $05, $40 - dsprite 2, 0, -3, 0, $00, $40 - dsprite 2, 0, -2, 0, $01, $40 - dsprite 2, 0, -1, 0, $02, $40 - dsprite 0, 0, 0, 0, $05, $60 - dsprite 0, 0, 1, 0, $05, $60 - dsprite 0, 0, 2, 0, $06, $60 - dsprite 1, 0, 0, 0, $05, $60 - dsprite 1, 0, 1, 0, $04, $60 - dsprite 1, 0, 2, 0, $03, $60 - dsprite 2, 0, 0, 0, $02, $60 - dsprite 2, 0, 1, 0, $01, $60 - dsprite 2, 0, 2, 0, $00, $60 + dsprite -3, 0, -3, 0, $00, 0 + dsprite -3, 0, -2, 0, $01, 0 + dsprite -3, 0, -1, 0, $02, 0 + dsprite -2, 0, -3, 0, $03, 0 + dsprite -2, 0, -2, 0, $04, 0 + dsprite -2, 0, -1, 0, $05, 0 + dsprite -1, 0, -3, 0, $06, 0 + dsprite -1, 0, -2, 0, $05, 0 + dsprite -1, 0, -1, 0, $05, 0 + dsprite -3, 0, 0, 0, $02, 0 | X_FLIP + dsprite -3, 0, 1, 0, $01, 0 | X_FLIP + dsprite -3, 0, 2, 0, $00, 0 | X_FLIP + dsprite -2, 0, 0, 0, $05, 0 | X_FLIP + dsprite -2, 0, 1, 0, $04, 0 | X_FLIP + dsprite -2, 0, 2, 0, $03, 0 | X_FLIP + dsprite -1, 0, 0, 0, $05, 0 | X_FLIP + dsprite -1, 0, 1, 0, $05, 0 | X_FLIP + dsprite -1, 0, 2, 0, $06, 0 | X_FLIP + dsprite 0, 0, -3, 0, $06, 0 | Y_FLIP + dsprite 0, 0, -2, 0, $05, 0 | Y_FLIP + dsprite 0, 0, -1, 0, $05, 0 | Y_FLIP + dsprite 1, 0, -3, 0, $03, 0 | Y_FLIP + dsprite 1, 0, -2, 0, $04, 0 | Y_FLIP + dsprite 1, 0, -1, 0, $05, 0 | Y_FLIP + dsprite 2, 0, -3, 0, $00, 0 | Y_FLIP + dsprite 2, 0, -2, 0, $01, 0 | Y_FLIP + dsprite 2, 0, -1, 0, $02, 0 | Y_FLIP + dsprite 0, 0, 0, 0, $05, 0 | X_FLIP | Y_FLIP + dsprite 0, 0, 1, 0, $05, 0 | X_FLIP | Y_FLIP + dsprite 0, 0, 2, 0, $06, 0 | X_FLIP | Y_FLIP + dsprite 1, 0, 0, 0, $05, 0 | X_FLIP | Y_FLIP + dsprite 1, 0, 1, 0, $04, 0 | X_FLIP | Y_FLIP + dsprite 1, 0, 2, 0, $03, 0 | X_FLIP | Y_FLIP + dsprite 2, 0, 0, 0, $02, 0 | X_FLIP | Y_FLIP + dsprite 2, 0, 1, 0, $01, 0 | X_FLIP | Y_FLIP + dsprite 2, 0, 2, 0, $00, 0 | X_FLIP | Y_FLIP -.OAMData_43: +.OAMData_Unused43_4A: db 9 - dsprite -2, 4, -2, 4, $00, $00 - dsprite -2, 4, -1, 4, $01, $00 - dsprite -2, 4, 0, 4, $02, $00 - dsprite -1, 4, -2, 4, $10, $00 - dsprite -1, 4, -1, 4, $11, $00 - dsprite -1, 4, 0, 4, $12, $00 - dsprite 0, 4, -2, 4, $20, $00 - dsprite 0, 4, -1, 4, $21, $00 - dsprite 0, 4, 0, 4, $22, $00 + dsprite -2, 4, -2, 4, $00, 0 + dsprite -2, 4, -1, 4, $01, 0 + dsprite -2, 4, 0, 4, $02, 0 + dsprite -1, 4, -2, 4, $10, 0 + dsprite -1, 4, -1, 4, $11, 0 + dsprite -1, 4, 0, 4, $12, 0 + dsprite 0, 4, -2, 4, $20, 0 + dsprite 0, 4, -1, 4, $21, 0 + dsprite 0, 4, 0, 4, $22, 0 -.OAMData_0e: +.OAMData_GSIntroJigglypuffPikachu: db 16 - dsprite -2, 0, -2, 0, $00, $00 - dsprite -2, 0, -1, 0, $01, $00 - dsprite -2, 0, 0, 0, $02, $00 - dsprite -2, 0, 1, 0, $03, $00 - dsprite -1, 0, -2, 0, $10, $00 - dsprite -1, 0, -1, 0, $11, $00 - dsprite -1, 0, 0, 0, $12, $00 - dsprite -1, 0, 1, 0, $13, $00 - dsprite 0, 0, -2, 0, $20, $00 - dsprite 0, 0, -1, 0, $21, $00 - dsprite 0, 0, 0, 0, $22, $00 - dsprite 0, 0, 1, 0, $23, $00 - dsprite 1, 0, -2, 0, $30, $00 - dsprite 1, 0, -1, 0, $31, $00 - dsprite 1, 0, 0, 0, $32, $00 - dsprite 1, 0, 1, 0, $33, $00 + dsprite -2, 0, -2, 0, $00, 0 + dsprite -2, 0, -1, 0, $01, 0 + dsprite -2, 0, 0, 0, $02, 0 + dsprite -2, 0, 1, 0, $03, 0 + dsprite -1, 0, -2, 0, $10, 0 + dsprite -1, 0, -1, 0, $11, 0 + dsprite -1, 0, 0, 0, $12, 0 + dsprite -1, 0, 1, 0, $13, 0 + dsprite 0, 0, -2, 0, $20, 0 + dsprite 0, 0, -1, 0, $21, 0 + dsprite 0, 0, 0, 0, $22, 0 + dsprite 0, 0, 1, 0, $23, 0 + dsprite 1, 0, -2, 0, $30, 0 + dsprite 1, 0, -1, 0, $31, 0 + dsprite 1, 0, 0, 0, $32, 0 + dsprite 1, 0, 1, 0, $33, 0 -.OAMData_1b: +.OAMData_GSIntroStarter: db 25 - dsprite -3, 4, -3, 4, $00, $00 - dsprite -2, 4, -3, 4, $01, $00 - dsprite -1, 4, -3, 4, $02, $00 - dsprite 0, 4, -3, 4, $03, $00 - dsprite 1, 4, -3, 4, $04, $00 - dsprite -3, 4, -2, 4, $05, $00 - dsprite -2, 4, -2, 4, $06, $00 - dsprite -1, 4, -2, 4, $07, $00 - dsprite 0, 4, -2, 4, $08, $00 - dsprite 1, 4, -2, 4, $09, $00 - dsprite -3, 4, -1, 4, $0a, $00 - dsprite -2, 4, -1, 4, $0b, $00 - dsprite -1, 4, -1, 4, $0c, $00 - dsprite 0, 4, -1, 4, $0d, $00 - dsprite 1, 4, -1, 4, $0e, $00 - dsprite -3, 4, 0, 4, $0f, $00 - dsprite -2, 4, 0, 4, $10, $00 - dsprite -1, 4, 0, 4, $11, $00 - dsprite 0, 4, 0, 4, $12, $00 - dsprite 1, 4, 0, 4, $13, $00 - dsprite -3, 4, 1, 4, $14, $00 - dsprite -2, 4, 1, 4, $15, $00 - dsprite -1, 4, 1, 4, $16, $00 - dsprite 0, 4, 1, 4, $17, $00 - dsprite 1, 4, 1, 4, $18, $00 + dsprite -3, 4, -3, 4, $00, 0 + dsprite -2, 4, -3, 4, $01, 0 + dsprite -1, 4, -3, 4, $02, 0 + dsprite 0, 4, -3, 4, $03, 0 + dsprite 1, 4, -3, 4, $04, 0 + dsprite -3, 4, -2, 4, $05, 0 + dsprite -2, 4, -2, 4, $06, 0 + dsprite -1, 4, -2, 4, $07, 0 + dsprite 0, 4, -2, 4, $08, 0 + dsprite 1, 4, -2, 4, $09, 0 + dsprite -3, 4, -1, 4, $0a, 0 + dsprite -2, 4, -1, 4, $0b, 0 + dsprite -1, 4, -1, 4, $0c, 0 + dsprite 0, 4, -1, 4, $0d, 0 + dsprite 1, 4, -1, 4, $0e, 0 + dsprite -3, 4, 0, 4, $0f, 0 + dsprite -2, 4, 0, 4, $10, 0 + dsprite -1, 4, 0, 4, $11, 0 + dsprite 0, 4, 0, 4, $12, 0 + dsprite 1, 4, 0, 4, $13, 0 + dsprite -3, 4, 1, 4, $14, 0 + dsprite -2, 4, 1, 4, $15, 0 + dsprite -1, 4, 1, 4, $16, 0 + dsprite 0, 4, 1, 4, $17, 0 + dsprite 1, 4, 1, 4, $18, 0 ; 8dcf9 ; 8dcf9 db 36 - dsprite -3, 0, -3, 0, $00, $00 - dsprite -3, 0, -2, 0, $01, $00 - dsprite -3, 0, -1, 0, $02, $00 - dsprite -3, 0, 0, 0, $03, $00 - dsprite -3, 0, 1, 0, $04, $00 - dsprite -3, 0, 2, 0, $05, $00 - dsprite -2, 0, -3, 0, $06, $00 - dsprite -2, 0, -2, 0, $07, $00 - dsprite -2, 0, -1, 0, $08, $00 - dsprite -2, 0, 0, 0, $09, $00 - dsprite -2, 0, 1, 0, $0a, $00 - dsprite -2, 0, 2, 0, $0b, $00 - dsprite -1, 0, -3, 0, $0c, $00 - dsprite -1, 0, -2, 0, $0d, $00 - dsprite -1, 0, -1, 0, $0e, $00 - dsprite -1, 0, 0, 0, $0f, $00 - dsprite -1, 0, 1, 0, $10, $00 - dsprite -1, 0, 2, 0, $11, $00 - dsprite 0, 0, -3, 0, $12, $00 - dsprite 0, 0, -2, 0, $13, $00 - dsprite 0, 0, -1, 0, $14, $00 - dsprite 0, 0, 0, 0, $15, $00 - dsprite 0, 0, 1, 0, $16, $00 - dsprite 0, 0, 2, 0, $17, $00 - dsprite 1, 0, -3, 0, $18, $00 - dsprite 1, 0, -2, 0, $19, $00 - dsprite 1, 0, -1, 0, $1a, $00 - dsprite 1, 0, 0, 0, $1b, $00 - dsprite 1, 0, 1, 0, $1c, $00 - dsprite 1, 0, 2, 0, $1d, $00 - dsprite 2, 0, -3, 0, $1e, $00 - dsprite 2, 0, -2, 0, $1f, $00 - dsprite 2, 0, -1, 0, $20, $00 - dsprite 2, 0, 0, 0, $21, $00 - dsprite 2, 0, 1, 0, $22, $00 - dsprite 2, 0, 2, 0, $23, $00 + dsprite -3, 0, -3, 0, $00, 0 + dsprite -3, 0, -2, 0, $01, 0 + dsprite -3, 0, -1, 0, $02, 0 + dsprite -3, 0, 0, 0, $03, 0 + dsprite -3, 0, 1, 0, $04, 0 + dsprite -3, 0, 2, 0, $05, 0 + dsprite -2, 0, -3, 0, $06, 0 + dsprite -2, 0, -2, 0, $07, 0 + dsprite -2, 0, -1, 0, $08, 0 + dsprite -2, 0, 0, 0, $09, 0 + dsprite -2, 0, 1, 0, $0a, 0 + dsprite -2, 0, 2, 0, $0b, 0 + dsprite -1, 0, -3, 0, $0c, 0 + dsprite -1, 0, -2, 0, $0d, 0 + dsprite -1, 0, -1, 0, $0e, 0 + dsprite -1, 0, 0, 0, $0f, 0 + dsprite -1, 0, 1, 0, $10, 0 + dsprite -1, 0, 2, 0, $11, 0 + dsprite 0, 0, -3, 0, $12, 0 + dsprite 0, 0, -2, 0, $13, 0 + dsprite 0, 0, -1, 0, $14, 0 + dsprite 0, 0, 0, 0, $15, 0 + dsprite 0, 0, 1, 0, $16, 0 + dsprite 0, 0, 2, 0, $17, 0 + dsprite 1, 0, -3, 0, $18, 0 + dsprite 1, 0, -2, 0, $19, 0 + dsprite 1, 0, -1, 0, $1a, 0 + dsprite 1, 0, 0, 0, $1b, 0 + dsprite 1, 0, 1, 0, $1c, 0 + dsprite 1, 0, 2, 0, $1d, 0 + dsprite 2, 0, -3, 0, $1e, 0 + dsprite 2, 0, -2, 0, $1f, 0 + dsprite 2, 0, -1, 0, $20, 0 + dsprite 2, 0, 0, 0, $21, 0 + dsprite 2, 0, 1, 0, $22, 0 + dsprite 2, 0, 2, 0, $23, 0 .OAMData_RedWalk: db 4 @@ -388,59 +388,59 @@ SpriteAnimOAMData: ; 8d94d dsprite 0, 0, -1, 0, $09, PAL_OW_RED dsprite 0, 0, 0, 0, $07, PAL_OW_RED -.OAMData_06: +.OAMData_GSIntroMagikarp: db 6 - dsprite -1, 0, -2, 4, $00, $01 - dsprite -1, 0, -1, 4, $01, $01 - dsprite -1, 0, 0, 4, $02, $01 - dsprite 0, 0, -2, 4, $10, $01 - dsprite 0, 0, -1, 4, $11, $01 - dsprite 0, 0, 0, 4, $12, $01 + dsprite -1, 0, -2, 4, $00, 1 + dsprite -1, 0, -1, 4, $01, 1 + dsprite -1, 0, 0, 4, $02, 1 + dsprite 0, 0, -2, 4, $10, 1 + dsprite 0, 0, -1, 4, $11, 1 + dsprite 0, 0, 0, 4, $12, 1 -.OAMData_08: +.OAMData_GSIntroLapras: db 29 - dsprite -3, 0, -3, 0, $00, $00 - dsprite -3, 0, -2, 0, $01, $00 - dsprite -3, 0, -1, 0, $02, $00 - dsprite -3, 0, 0, 0, $03, $00 - dsprite -2, 0, -3, 0, $10, $00 - dsprite -2, 0, -2, 0, $11, $00 - dsprite -2, 0, -1, 0, $12, $00 - dsprite -2, 0, 0, 0, $13, $00 - dsprite -1, 0, -3, 0, $20, $00 - dsprite -1, 0, -2, 0, $21, $00 - dsprite -1, 0, -1, 0, $22, $00 - dsprite -1, 0, 0, 0, $23, $00 - dsprite -1, 0, 1, 0, $24, $00 - dsprite 0, 0, -3, 0, $30, $80 - dsprite 0, 0, -2, 0, $31, $80 - dsprite 0, 0, -1, 0, $32, $80 - dsprite 0, 0, 0, 0, $33, $80 - dsprite 0, 0, 1, 0, $34, $80 - dsprite 1, 0, -3, 0, $40, $80 - dsprite 1, 0, -2, 0, $41, $80 - dsprite 1, 0, -1, 0, $42, $80 - dsprite 1, 0, 0, 0, $43, $80 - dsprite 1, 0, 1, 0, $44, $80 - dsprite 1, 0, 2, 0, $45, $80 - dsprite 2, 0, -2, 0, $51, $80 - dsprite 2, 0, -1, 0, $52, $80 - dsprite 2, 0, 0, 0, $53, $80 - dsprite 2, 0, 1, 0, $54, $80 - dsprite 2, 0, 2, 0, $55, $80 + dsprite -3, 0, -3, 0, $00, 0 + dsprite -3, 0, -2, 0, $01, 0 + dsprite -3, 0, -1, 0, $02, 0 + dsprite -3, 0, 0, 0, $03, 0 + dsprite -2, 0, -3, 0, $10, 0 + dsprite -2, 0, -2, 0, $11, 0 + dsprite -2, 0, -1, 0, $12, 0 + dsprite -2, 0, 0, 0, $13, 0 + dsprite -1, 0, -3, 0, $20, 0 + dsprite -1, 0, -2, 0, $21, 0 + dsprite -1, 0, -1, 0, $22, 0 + dsprite -1, 0, 0, 0, $23, 0 + dsprite -1, 0, 1, 0, $24, 0 + dsprite 0, 0, -3, 0, $30, 0 | BEHIND_BG + dsprite 0, 0, -2, 0, $31, 0 | BEHIND_BG + dsprite 0, 0, -1, 0, $32, 0 | BEHIND_BG + dsprite 0, 0, 0, 0, $33, 0 | BEHIND_BG + dsprite 0, 0, 1, 0, $34, 0 | BEHIND_BG + dsprite 1, 0, -3, 0, $40, 0 | BEHIND_BG + dsprite 1, 0, -2, 0, $41, 0 | BEHIND_BG + dsprite 1, 0, -1, 0, $42, 0 | BEHIND_BG + dsprite 1, 0, 0, 0, $43, 0 | BEHIND_BG + dsprite 1, 0, 1, 0, $44, 0 | BEHIND_BG + dsprite 1, 0, 2, 0, $45, 0 | BEHIND_BG + dsprite 2, 0, -2, 0, $51, 0 | BEHIND_BG + dsprite 2, 0, -1, 0, $52, 0 | BEHIND_BG + dsprite 2, 0, 0, 0, $53, 0 | BEHIND_BG + dsprite 2, 0, 1, 0, $54, 0 | BEHIND_BG + dsprite 2, 0, 2, 0, $55, 0 | BEHIND_BG -.OAMData_0c: +.OAMData_GSIntroNote: db 2 - dsprite -1, 0, -1, 4, $00, $00 - dsprite 0, 0, -1, 4, $10, $00 + dsprite -1, 0, -1, 4, $00, 0 + dsprite 0, 0, -1, 4, $10, 0 -.OAMData_15: +.OAMData_Unused15_17: db 5 - dsprite -2, 0, 3, 0, $00, $00 - dsprite -2, 0, 4, 0, $01, $00 - dsprite -1, 0, 2, 0, $02, $00 - dsprite -1, 0, 3, 0, $03, $00 - dsprite 0, 0, 2, 0, $04, $00 + dsprite -2, 0, 3, 0, $00, 0 + dsprite -2, 0, 4, 0, $01, 0 + dsprite -1, 0, 2, 0, $02, 0 + dsprite -1, 0, 3, 0, $03, 0 + dsprite 0, 0, 2, 0, $04, 0 .OAMData_Leaf: db 1 @@ -460,7 +460,7 @@ SpriteAnimOAMData: ; 8d94d dsprite 0, 0, -1, 7, $00, 0 | Y_FLIP dsprite 0, 0, 0, 0, $00, 0 | X_FLIP | Y_FLIP -.OAMData_ForFrameset09: +.OAMData_ForUnused09: db 10 dsprite -1, 7, 0, 0, $00, 0 dsprite -1, 7, 1, 0, $01, 0 @@ -473,23 +473,23 @@ SpriteAnimOAMData: ; 8d94d dsprite 0, 0, 3, 0, $01, 0 | Y_FLIP dsprite 0, 0, 4, 0, $00, 0 | X_FLIP | Y_FLIP -.OAMData_22: +.OAMData_Unused22: db 15 - dsprite -3, 4, -2, 4, $00, $11 - dsprite -3, 4, -1, 4, $01, $11 - dsprite -3, 4, 0, 4, $02, $11 - dsprite -2, 4, -2, 4, $03, $11 - dsprite -2, 4, -1, 4, $04, $11 - dsprite -2, 4, 0, 4, $05, $11 - dsprite -1, 4, -2, 4, $06, $11 - dsprite -1, 4, -1, 4, $07, $11 - dsprite -1, 4, 0, 4, $08, $11 - dsprite 0, 4, -2, 4, $09, $11 - dsprite 0, 4, -1, 4, $0a, $11 - dsprite 0, 4, 0, 4, $0b, $11 - dsprite 1, 4, -2, 4, $0c, $11 - dsprite 1, 4, -1, 4, $0d, $11 - dsprite 1, 4, 0, 4, $0e, $11 + dsprite -3, 4, -2, 4, $00, 1 | OBP_NUM + dsprite -3, 4, -1, 4, $01, 1 | OBP_NUM + dsprite -3, 4, 0, 4, $02, 1 | OBP_NUM + dsprite -2, 4, -2, 4, $03, 1 | OBP_NUM + dsprite -2, 4, -1, 4, $04, 1 | OBP_NUM + dsprite -2, 4, 0, 4, $05, 1 | OBP_NUM + dsprite -1, 4, -2, 4, $06, 1 | OBP_NUM + dsprite -1, 4, -1, 4, $07, 1 | OBP_NUM + dsprite -1, 4, 0, 4, $08, 1 | OBP_NUM + dsprite 0, 4, -2, 4, $09, 1 | OBP_NUM + dsprite 0, 4, -1, 4, $0a, 1 | OBP_NUM + dsprite 0, 4, 0, 4, $0b, 1 | OBP_NUM + dsprite 1, 4, -2, 4, $0c, 1 | OBP_NUM + dsprite 1, 4, -1, 4, $0d, 1 | OBP_NUM + dsprite 1, 4, 0, 4, $0e, 1 | OBP_NUM .OAMData_SlotsGolem: db 6 @@ -551,21 +551,21 @@ SpriteAnimOAMData: ; 8d94d dsprite -1, 4, -1, 4, $00, 0 | OBP_NUM dsprite 0, 4, -1, 4, $00, 0 | OBP_NUM -.OAMData_4b: +.OAMData_Unused4B: db 6 - dsprite 0, 0, 0, 0, $00, $00 - dsprite 0, 0, 1, 0, $01, $00 - dsprite 0, 0, 2, 0, $01, $00 - dsprite 0, 0, 3, 0, $01, $00 - dsprite 0, 0, 4, 0, $02, $00 - dsprite 0, 0, 5, 0, $03, $00 + dsprite 0, 0, 0, 0, $00, 0 + dsprite 0, 0, 1, 0, $01, 0 + dsprite 0, 0, 2, 0, $01, 0 + dsprite 0, 0, 3, 0, $01, 0 + dsprite 0, 0, 4, 0, $02, 0 + dsprite 0, 0, 5, 0, $03, 0 -.OAMData_4c: +.OAMData_Unused4C: db 4 - dsprite 0, 0, 0, 0, $00, $00 - dsprite 0, 0, 1, 0, $01, $00 - dsprite 0, 0, 2, 0, $02, $00 - dsprite 0, 0, 3, 0, $03, $00 + dsprite 0, 0, 0, 0, $00, 0 + dsprite 0, 0, 1, 0, $01, 0 + dsprite 0, 0, 2, 0, $02, 0 + dsprite 0, 0, 3, 0, $03, 0 .OAMData_CutTree2: db 4 @@ -588,159 +588,159 @@ SpriteAnimOAMData: ; 8d94d dsprite 0, 0, -2, 0, $02, PAL_OW_TREE dsprite 0, 0, 1, 0, $03, PAL_OW_TREE -.OAMData_56: +.OAMData_GSIntroHoOh1: db 19 - dsprite -1, 0, -4, 0, $00, $00 - dsprite -2, 0, -3, 0, $02, $00 - dsprite 0, 0, -3, 0, $04, $00 - dsprite -3, 0, -2, 0, $06, $00 - dsprite -1, 0, -2, 0, $08, $00 - dsprite 1, 0, -2, 0, $0a, $00 - dsprite -3, 0, -1, 0, $0c, $00 - dsprite -1, 0, -1, 0, $0e, $00 - dsprite 1, 0, -1, 0, $10, $00 - dsprite -3, 0, 0, 0, $12, $00 - dsprite -1, 0, 0, 0, $14, $00 - dsprite 1, 0, 0, 0, $16, $00 - dsprite -3, 0, 1, 0, $18, $00 - dsprite -1, 0, 1, 0, $1a, $00 - dsprite 1, 0, 1, 0, $1c, $00 - dsprite -1, 0, 2, 0, $1e, $00 - dsprite 1, 0, 2, 0, $20, $00 - dsprite -2, 0, 3, 0, $22, $00 - dsprite 0, 0, 3, 0, $24, $00 + dsprite -1, 0, -4, 0, $00, 0 + dsprite -2, 0, -3, 0, $02, 0 + dsprite 0, 0, -3, 0, $04, 0 + dsprite -3, 0, -2, 0, $06, 0 + dsprite -1, 0, -2, 0, $08, 0 + dsprite 1, 0, -2, 0, $0a, 0 + dsprite -3, 0, -1, 0, $0c, 0 + dsprite -1, 0, -1, 0, $0e, 0 + dsprite 1, 0, -1, 0, $10, 0 + dsprite -3, 0, 0, 0, $12, 0 + dsprite -1, 0, 0, 0, $14, 0 + dsprite 1, 0, 0, 0, $16, 0 + dsprite -3, 0, 1, 0, $18, 0 + dsprite -1, 0, 1, 0, $1a, 0 + dsprite 1, 0, 1, 0, $1c, 0 + dsprite -1, 0, 2, 0, $1e, 0 + dsprite 1, 0, 2, 0, $20, 0 + dsprite -2, 0, 3, 0, $22, 0 + dsprite 0, 0, 3, 0, $24, 0 -.OAMData_57: +.OAMData_GSIntroHoOh2: db 16 - dsprite -1, 0, -4, 0, $00, $00 - dsprite -2, 0, -3, 0, $02, $00 - dsprite 0, 0, -3, 0, $04, $00 - dsprite -1, 0, -2, 0, $26, $00 - dsprite 1, 0, -2, 0, $0a, $00 - dsprite -3, 0, -1, 0, $28, $00 - dsprite -1, 0, -1, 0, $2a, $00 - dsprite 1, 0, -1, 0, $10, $00 - dsprite -1, 0, 0, 0, $2c, $00 - dsprite 1, 0, 0, 0, $16, $00 - dsprite -1, 0, 1, 0, $30, $00 - dsprite 1, 0, 1, 0, $1c, $00 - dsprite -1, 0, 2, 0, $1e, $00 - dsprite 1, 0, 2, 0, $20, $00 - dsprite -2, 0, 3, 0, $22, $00 - dsprite 0, 0, 3, 0, $24, $00 + dsprite -1, 0, -4, 0, $00, 0 + dsprite -2, 0, -3, 0, $02, 0 + dsprite 0, 0, -3, 0, $04, 0 + dsprite -1, 0, -2, 0, $26, 0 + dsprite 1, 0, -2, 0, $0a, 0 + dsprite -3, 0, -1, 0, $28, 0 + dsprite -1, 0, -1, 0, $2a, 0 + dsprite 1, 0, -1, 0, $10, 0 + dsprite -1, 0, 0, 0, $2c, 0 + dsprite 1, 0, 0, 0, $16, 0 + dsprite -1, 0, 1, 0, $30, 0 + dsprite 1, 0, 1, 0, $1c, 0 + dsprite -1, 0, 2, 0, $1e, 0 + dsprite 1, 0, 2, 0, $20, 0 + dsprite -2, 0, 3, 0, $22, 0 + dsprite 0, 0, 3, 0, $24, 0 -.OAMData_58: +.OAMData_GSIntroHoOh3: db 15 - dsprite -1, 0, -4, 0, $00, $00 - dsprite -2, 0, -3, 0, $02, $00 - dsprite 0, 0, -3, 0, $32, $00 - dsprite -1, 0, -2, 0, $34, $00 - dsprite 1, 0, -2, 0, $36, $00 - dsprite -1, 0, -1, 0, $38, $00 - dsprite 1, 0, -1, 0, $3a, $00 - dsprite -1, 0, 0, 0, $3c, $00 - dsprite 1, 0, 0, 0, $3e, $00 - dsprite -1, 0, 1, 0, $30, $00 - dsprite 1, 0, 1, 0, $1c, $00 - dsprite -1, 0, 2, 0, $1e, $00 - dsprite 1, 0, 2, 0, $20, $00 - dsprite -2, 0, 3, 0, $22, $00 - dsprite 0, 0, 3, 0, $24, $00 + dsprite -1, 0, -4, 0, $00, 0 + dsprite -2, 0, -3, 0, $02, 0 + dsprite 0, 0, -3, 0, $32, 0 + dsprite -1, 0, -2, 0, $34, 0 + dsprite 1, 0, -2, 0, $36, 0 + dsprite -1, 0, -1, 0, $38, 0 + dsprite 1, 0, -1, 0, $3a, 0 + dsprite -1, 0, 0, 0, $3c, 0 + dsprite 1, 0, 0, 0, $3e, 0 + dsprite -1, 0, 1, 0, $30, 0 + dsprite 1, 0, 1, 0, $1c, 0 + dsprite -1, 0, 2, 0, $1e, 0 + dsprite 1, 0, 2, 0, $20, 0 + dsprite -2, 0, 3, 0, $22, 0 + dsprite 0, 0, 3, 0, $24, 0 -.OAMData_59: +.OAMData_GSIntroHoOh4: db 17 - dsprite -1, 0, -4, 0, $00, $00 - dsprite -2, 0, -3, 0, $02, $00 - dsprite 0, 0, -3, 0, $04, $00 - dsprite -1, 0, -2, 0, $40, $00 - dsprite 1, 0, -2, 0, $42, $00 - dsprite 3, 0, -2, 0, $44, $00 - dsprite -1, 0, -1, 0, $46, $00 - dsprite 1, 0, -1, 0, $48, $00 - dsprite 3, 0, -1, 0, $4a, $00 - dsprite -1, 0, 0, 0, $4c, $00 - dsprite 1, 0, 0, 0, $4e, $00 - dsprite -1, 0, 1, 0, $30, $00 - dsprite 1, 0, 1, 0, $1c, $00 - dsprite -1, 0, 2, 0, $1e, $00 - dsprite 1, 0, 2, 0, $20, $00 - dsprite -2, 0, 3, 0, $22, $00 - dsprite 0, 0, 3, 0, $24, $00 + dsprite -1, 0, -4, 0, $00, 0 + dsprite -2, 0, -3, 0, $02, 0 + dsprite 0, 0, -3, 0, $04, 0 + dsprite -1, 0, -2, 0, $40, 0 + dsprite 1, 0, -2, 0, $42, 0 + dsprite 3, 0, -2, 0, $44, 0 + dsprite -1, 0, -1, 0, $46, 0 + dsprite 1, 0, -1, 0, $48, 0 + dsprite 3, 0, -1, 0, $4a, 0 + dsprite -1, 0, 0, 0, $4c, 0 + dsprite 1, 0, 0, 0, $4e, 0 + dsprite -1, 0, 1, 0, $30, 0 + dsprite 1, 0, 1, 0, $1c, 0 + dsprite -1, 0, 2, 0, $1e, 0 + dsprite 1, 0, 2, 0, $20, 0 + dsprite -2, 0, 3, 0, $22, 0 + dsprite 0, 0, 3, 0, $24, 0 -.OAMData_5a: +.OAMData_GSIntroHoOh5: db 17 - dsprite -1, 0, -4, 0, $00, $00 - dsprite -2, 0, -3, 0, $02, $00 - dsprite 0, 0, -3, 0, $04, $00 - dsprite -1, 0, -2, 0, $50, $00 - dsprite 1, 0, -2, 0, $0a, $00 - dsprite -3, 0, -1, 0, $52, $00 - dsprite -1, 0, -1, 0, $54, $00 - dsprite 1, 0, -1, 0, $10, $00 - dsprite -3, 0, 0, 0, $56, $00 - dsprite -1, 0, 0, 0, $2e, $00 - dsprite 1, 0, 0, 0, $16, $00 - dsprite -1, 0, 1, 0, $30, $00 - dsprite 1, 0, 1, 0, $1c, $00 - dsprite -1, 0, 2, 0, $1e, $00 - dsprite 1, 0, 2, 0, $20, $00 - dsprite -2, 0, 3, 0, $22, $00 - dsprite 0, 0, 3, 0, $24, $00 + dsprite -1, 0, -4, 0, $00, 0 + dsprite -2, 0, -3, 0, $02, 0 + dsprite 0, 0, -3, 0, $04, 0 + dsprite -1, 0, -2, 0, $50, 0 + dsprite 1, 0, -2, 0, $0a, 0 + dsprite -3, 0, -1, 0, $52, 0 + dsprite -1, 0, -1, 0, $54, 0 + dsprite 1, 0, -1, 0, $10, 0 + dsprite -3, 0, 0, 0, $56, 0 + dsprite -1, 0, 0, 0, $2e, 0 + dsprite 1, 0, 0, 0, $16, 0 + dsprite -1, 0, 1, 0, $30, 0 + dsprite 1, 0, 1, 0, $1c, 0 + dsprite -1, 0, 2, 0, $1e, 0 + dsprite 1, 0, 2, 0, $20, 0 + dsprite -2, 0, 3, 0, $22, 0 + dsprite 0, 0, 3, 0, $24, 0 .OAMData_GSTitleTrail: db 1 dsprite -1, 4, -1, 4, $00, 1 | OBP_NUM -.OAMData_5c: +.OAMData_EZChatCursor1: db 12 - dsprite 0, 0, 0, 0, $30, $00 - dsprite 0, 0, 1, 0, $31, $00 - dsprite 0, 0, 2, 0, $31, $00 - dsprite 0, 0, 3, 0, $31, $00 - dsprite 0, 0, 4, 0, $31, $00 - dsprite 0, 0, 5, 0, $32, $00 - dsprite 1, 0, 0, 0, $33, $00 - dsprite 1, 0, 1, 0, $34, $00 - dsprite 1, 0, 2, 0, $34, $00 - dsprite 1, 0, 3, 0, $34, $00 - dsprite 1, 0, 4, 0, $34, $00 - dsprite 1, 0, 5, 0, $35, $00 + dsprite 0, 0, 0, 0, $30, 0 + dsprite 0, 0, 1, 0, $31, 0 + dsprite 0, 0, 2, 0, $31, 0 + dsprite 0, 0, 3, 0, $31, 0 + dsprite 0, 0, 4, 0, $31, 0 + dsprite 0, 0, 5, 0, $32, 0 + dsprite 1, 0, 0, 0, $33, 0 + dsprite 1, 0, 1, 0, $34, 0 + dsprite 1, 0, 2, 0, $34, 0 + dsprite 1, 0, 3, 0, $34, 0 + dsprite 1, 0, 4, 0, $34, 0 + dsprite 1, 0, 5, 0, $35, 0 -.OAMData_5d: +.OAMData_EZChatCursor2: db 1 - dsprite 0, 0, 0, 0, $ed, $00 + dsprite 0, 0, 0, 0, $ed, 0 -.OAMData_5e: +.OAMData_EZChatCursor3: db 4 - dsprite -1, 7, -1, 7, $30, $00 - dsprite -1, 7, 0, 1, $32, $00 - dsprite 0, 1, -1, 7, $33, $00 - dsprite 0, 1, 0, 1, $35, $00 + dsprite -1, 7, -1, 7, $30, 0 + dsprite -1, 7, 0, 1, $32, 0 + dsprite 0, 1, -1, 7, $33, 0 + dsprite 0, 1, 0, 1, $35, 0 -.OAMData_5f: +.OAMData_EZChatCursor4: db 8 - dsprite -1, 7, -1, 7, $30, $00 - dsprite -1, 7, 0, 4, $31, $00 - dsprite -1, 7, 1, 4, $31, $00 - dsprite -1, 7, 2, 1, $32, $00 - dsprite 0, 1, -1, 7, $33, $00 - dsprite 0, 1, 0, 4, $34, $00 - dsprite 0, 1, 1, 4, $34, $00 - dsprite 0, 1, 2, 1, $35, $00 + dsprite -1, 7, -1, 7, $30, 0 + dsprite -1, 7, 0, 4, $31, 0 + dsprite -1, 7, 1, 4, $31, 0 + dsprite -1, 7, 2, 1, $32, 0 + dsprite 0, 1, -1, 7, $33, 0 + dsprite 0, 1, 0, 4, $34, 0 + dsprite 0, 1, 1, 4, $34, 0 + dsprite 0, 1, 2, 1, $35, 0 -.OAMData_60: +.OAMData_EZChatCursor5: db 1 - dsprite 0, 0, 0, 0, $34, $00 + dsprite 0, 0, 0, 0, $34, 0 -.OAMData_61: +.OAMData_EZChatCursor6: db 2 - dsprite 0, 0, 0, 0, $30, $00 - dsprite 1, 0, 0, 0, $33, $00 + dsprite 0, 0, 0, 0, $30, 0 + dsprite 1, 0, 0, 0, $33, 0 -.OAMData_62: +.OAMData_EZChatCursor7: db 2 - dsprite 0, 0, 0, 0, $32, $00 - dsprite 1, 0, 0, 0, $35, $00 + dsprite 0, 0, 0, 0, $32, 0 + dsprite 1, 0, 0, 0, $35, 0 .OAMData_BlueWalk: db 4 @@ -756,32 +756,32 @@ SpriteAnimOAMData: ; 8d94d dsprite 0, 0, -1, 0, $02, PAL_OW_BLUE | BEHIND_BG dsprite 0, 0, 0, 0, $03, PAL_OW_BLUE | BEHIND_BG -.OAMData_ForMobile22: +.OAMData_MobileTradeCableBulge: db 1 dsprite -1, 4, -1, 4, $00, 2 -.OAMData_ForMobile23: +.OAMData_MobileTradeSentPulse: db 4 dsprite -2, 0, -1, 4, $00, 3 dsprite -1, 0, -1, 4, $01, 3 dsprite 0, 0, -1, 4, $02, 3 dsprite 1, 0, -1, 4, $03, 3 -.OAMData_ForMobile24: +.OAMData_MobileTradeOTPulse: db 4 dsprite -2, 0, -1, 4, $03, 4 | Y_FLIP dsprite -1, 0, -1, 4, $02, 4 | Y_FLIP dsprite 0, 0, -1, 4, $01, 4 | Y_FLIP dsprite 1, 0, -1, 4, $00, 4 | Y_FLIP -.OAMData_ForMobile25_1: +.OAMData_MobileTradePing1: db 4 dsprite -1, 0, -1, 0, $00, 1 dsprite -1, 0, 0, 0, $00, 1 | X_FLIP dsprite 0, 0, -1, 0, $00, 1 | Y_FLIP dsprite 0, 0, 0, 0, $00, 1 | X_FLIP | Y_FLIP -.OAMData_ForMobile25_2: +.OAMData_MobileTradePing2: db 8 dsprite -2, 4, -2, 4, $00, 1 dsprite -2, 4, -1, 4, $01, 1 @@ -792,7 +792,7 @@ SpriteAnimOAMData: ; 8d94d dsprite 0, 4, -1, 4, $01, 1 | Y_FLIP dsprite 0, 4, 0, 4, $00, 1 | X_FLIP | Y_FLIP -.OAMData_ForMobile25_3: +.OAMData_MobileTradePing3: db 12 dsprite -2, 0, -2, 0, $00, 1 dsprite -2, 0, -1, 0, $01, 1 @@ -993,23 +993,23 @@ SpriteAnimOAMData: ; 8d94d .OAMData_IntroUnown1: db 1 - dsprite -1, 4, -1, 4, $00, $00 + dsprite -1, 4, -1, 4, $00, 0 .OAMData_IntroUnown2: db 3 - dsprite 0, 0, -1, 0, $00, $00 - dsprite -1, 0, -1, 0, $01, $00 - dsprite -1, 0, 0, 0, $02, $00 + dsprite 0, 0, -1, 0, $00, 0 + dsprite -1, 0, -1, 0, $01, 0 + dsprite -1, 0, 0, 0, $02, 0 .OAMData_IntroUnown3: db 7 - dsprite 1, 0, -2, 0, $00, $00 - dsprite 0, 0, -2, 0, $01, $00 - dsprite -1, 0, -2, 0, $02, $00 - dsprite -1, 0, -1, 0, $03, $00 - dsprite -2, 0, -1, 0, $04, $00 - dsprite -2, 0, 0, 0, $05, $00 - dsprite -2, 0, 1, 0, $06, $00 + dsprite 1, 0, -2, 0, $00, 0 + dsprite 0, 0, -2, 0, $01, 0 + dsprite -1, 0, -2, 0, $02, 0 + dsprite -1, 0, -1, 0, $03, 0 + dsprite -2, 0, -1, 0, $04, 0 + dsprite -2, 0, 0, 0, $05, 0 + dsprite -2, 0, 1, 0, $06, 0 .OAMData_IntroUnownF2_2: db 8 diff --git a/data/sprite_anims/sequences.asm b/data/sprite_anims/sequences.asm index 70544a60a..76947e2dd 100644 --- a/data/sprite_anims/sequences.asm +++ b/data/sprite_anims/sequences.asm @@ -1,49 +1,49 @@ SpriteAnimSeqData: ; 8d1c4 ; 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_TITLE_TRAIL, SPRITE_ANIM_SEQ_GS_TITLE_TRAIL, $00 ; SPRITE_ANIM_INDEX_GS_TITLE_TRAIL - 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, $00 ; 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_FOR_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_24, SPRITE_ANIM_SEQ_19, $00 ; SPRITE_ANIM_INDEX_1A - db SPRITE_ANIM_FRAMESET_HEADBUTT, SPRITE_ANIM_SEQ_NULL, $00 ; SPRITE_ANIM_INDEX_HEADBUTT - db SPRITE_ANIM_FRAMESET_EGG_HATCH, SPRITE_ANIM_SEQ_REVEAL_NEW_MON, $00 ; SPRITE_ANIM_INDEX_EGG_HATCH - db SPRITE_ANIM_FRAMESET_26, SPRITE_ANIM_SEQ_1A, $00 ; SPRITE_ANIM_INDEX_1D - db SPRITE_ANIM_FRAMESET_BLUE_WALK, SPRITE_ANIM_SEQ_NULL, $00 ; SPRITE_ANIM_INDEX_BLUE_WALK - db SPRITE_ANIM_FRAMESET_MAGNET_TRAIN_BLUE, SPRITE_ANIM_SEQ_NULL, $00 ; SPRITE_ANIM_INDEX_MAGNET_TRAIN_BLUE - db SPRITE_ANIM_FRAMESET_MOBILE_TRADE_SENT_BALL, SPRITE_ANIM_SEQ_NULL, $00 ; SPRITE_ANIM_INDEX_MOBILE_TRADE_SENT_BALL - db SPRITE_ANIM_FRAMESET_MOBILE_TRADE_OT_BALL, SPRITE_ANIM_SEQ_NULL, $00 ; SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_BALL - db SPRITE_ANIM_FRAMESET_FOR_MOBILE_22, SPRITE_ANIM_SEQ_NULL, $00 ; SPRITE_ANIM_INDEX_MOBILE_22 - db SPRITE_ANIM_FRAMESET_FOR_MOBILE_23, SPRITE_ANIM_SEQ_FOR_MOBILE_23, $00 ; SPRITE_ANIM_INDEX_MOBILE_23 - db SPRITE_ANIM_FRAMESET_FOR_MOBILE_24, SPRITE_ANIM_SEQ_FOR_MOBILE_24, $00 ; SPRITE_ANIM_INDEX_MOBILE_24 - db SPRITE_ANIM_FRAMESET_FOR_MOBILE_25, SPRITE_ANIM_SEQ_NULL, $00 ; SPRITE_ANIM_INDEX_MOBILE_25 - db SPRITE_ANIM_FRAMESET_INTRO_SUICUNE, SPRITE_ANIM_SEQ_INTRO_SUICUNE, $00 ; SPRITE_ANIM_INDEX_INTRO_SUICUNE - db SPRITE_ANIM_FRAMESET_INTRO_PICHU, SPRITE_ANIM_SEQ_INTRO_PICHU_WOOPER, $00 ; SPRITE_ANIM_INDEX_INTRO_PICHU - db SPRITE_ANIM_FRAMESET_INTRO_WOOPER, SPRITE_ANIM_SEQ_INTRO_PICHU_WOOPER, $00 ; SPRITE_ANIM_INDEX_INTRO_WOOPER - db SPRITE_ANIM_FRAMESET_INTRO_UNOWN_1, SPRITE_ANIM_SEQ_INTRO_UNOWN, $00 ; SPRITE_ANIM_INDEX_INTRO_UNOWN - db SPRITE_ANIM_FRAMESET_INTRO_UNOWN_F, SPRITE_ANIM_SEQ_INTRO_UNOWN_F, $00 ; SPRITE_ANIM_INDEX_INTRO_UNOWN_F - db SPRITE_ANIM_FRAMESET_INTRO_SUICUNE_AWAY, SPRITE_ANIM_SEQ_INTRO_SUICUNE_AWAY, $00 ; SPRITE_ANIM_INDEX_INTRO_SUICUNE_AWAY - db SPRITE_ANIM_FRAMESET_CELEBI_LEFT, SPRITE_ANIM_SEQ_NULL, $00 ; SPRITE_ANIM_INDEX_CELEBI + db SPRITE_ANIM_FRAMESET_PARTY_MON, SPRITE_ANIM_SEQ_PARTY_MON, $00 ; SPRITE_ANIM_INDEX_PARTY_MON + db SPRITE_ANIM_FRAMESET_GS_TITLE_TRAIL, SPRITE_ANIM_SEQ_GS_TITLE_TRAIL, $00 ; SPRITE_ANIM_INDEX_GS_TITLE_TRAIL + 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, $00 ; 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, SPRITE_ANIM_SEQ_GS_INTRO_HO_OH, $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, SPRITE_ANIM_SEQ_REVEAL_NEW_MON, $00 ; SPRITE_ANIM_INDEX_EGG_HATCH + db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_0, SPRITE_ANIM_SEQ_EZCHAT_CURSOR, $00 ; SPRITE_ANIM_INDEX_EZCHAT_CURSOR + db SPRITE_ANIM_FRAMESET_BLUE_WALK, SPRITE_ANIM_SEQ_NULL, $00 ; SPRITE_ANIM_INDEX_BLUE_WALK + db SPRITE_ANIM_FRAMESET_MAGNET_TRAIN_BLUE, SPRITE_ANIM_SEQ_NULL, $00 ; SPRITE_ANIM_INDEX_MAGNET_TRAIN_BLUE + db SPRITE_ANIM_FRAMESET_MOBILE_TRADE_SENT_BALL, SPRITE_ANIM_SEQ_NULL, $00 ; SPRITE_ANIM_INDEX_MOBILE_TRADE_SENT_BALL + db SPRITE_ANIM_FRAMESET_MOBILE_TRADE_OT_BALL, SPRITE_ANIM_SEQ_NULL, $00 ; SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_BALL + db SPRITE_ANIM_FRAMESET_MOBILE_TRADE_CABLE_BULGE, SPRITE_ANIM_SEQ_NULL, $00 ; SPRITE_ANIM_INDEX_MOBILE_TRADE_CABLE_BULGE + db SPRITE_ANIM_FRAMESET_MOBILE_TRADE_SENT_PULSE, SPRITE_ANIM_SEQ_MOBILE_TRADE_SENT_PULSE, $00 ; SPRITE_ANIM_INDEX_MOBILE_TRADE_SENT_PULSE + db SPRITE_ANIM_FRAMESET_MOBILE_TRADE_OT_PULSE, SPRITE_ANIM_SEQ_MOBILE_TRADE_OT_PULSE, $00 ; SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_PULSE + db SPRITE_ANIM_FRAMESET_MOBILE_TRADE_PING, SPRITE_ANIM_SEQ_NULL, $00 ; SPRITE_ANIM_INDEX_MOBILE_TRADE_PING + db SPRITE_ANIM_FRAMESET_INTRO_SUICUNE, SPRITE_ANIM_SEQ_INTRO_SUICUNE, $00 ; SPRITE_ANIM_INDEX_INTRO_SUICUNE + db SPRITE_ANIM_FRAMESET_INTRO_PICHU, SPRITE_ANIM_SEQ_INTRO_PICHU_WOOPER, $00 ; SPRITE_ANIM_INDEX_INTRO_PICHU + db SPRITE_ANIM_FRAMESET_INTRO_WOOPER, SPRITE_ANIM_SEQ_INTRO_PICHU_WOOPER, $00 ; SPRITE_ANIM_INDEX_INTRO_WOOPER + db SPRITE_ANIM_FRAMESET_INTRO_UNOWN_1, SPRITE_ANIM_SEQ_INTRO_UNOWN, $00 ; SPRITE_ANIM_INDEX_INTRO_UNOWN + db SPRITE_ANIM_FRAMESET_INTRO_UNOWN_F, SPRITE_ANIM_SEQ_INTRO_UNOWN_F, $00 ; SPRITE_ANIM_INDEX_INTRO_UNOWN_F + db SPRITE_ANIM_FRAMESET_INTRO_SUICUNE_AWAY, SPRITE_ANIM_SEQ_INTRO_SUICUNE_AWAY, $00 ; SPRITE_ANIM_INDEX_INTRO_SUICUNE_AWAY + db SPRITE_ANIM_FRAMESET_CELEBI_LEFT, SPRITE_ANIM_SEQ_NULL, $00 ; SPRITE_ANIM_INDEX_CELEBI ; 8d24b diff --git a/engine/sprite_anims.asm b/engine/sprite_anims.asm index 965f6bc0b..55777f45a 100755 --- a/engine/sprite_anims.asm +++ b/engine/sprite_anims.asm @@ -27,7 +27,7 @@ DoAnimFrame: ; 8d24b dw .SlotsChansey dw .SlotsChanseyEgg dw .MailCursor - dw .ForUnusedCursor + dw .UnusedCursor dw .DummyGameCursor dw .PokegearArrow dw .TradePokeBall @@ -39,10 +39,10 @@ DoAnimFrame: ; 8d24b dw .FlyFrom dw .FlyLeaf dw .FlyTo - dw .sprite_anim_seq_19 - dw .sprite_anim_seq_1A - dw .sprite_anim_seq_1B - dw .sprite_anim_seq_1C + dw .ForUnused1A + dw .EZChatCursor + dw .MobileTradeSentPulse + dw .MobileTradeOTPulse dw .IntroSuicune dw .IntroPichuWooper dw .Celebi @@ -202,7 +202,7 @@ DoAnimFrame: ; 8d24b ret ; 8d35a -.sprite_anim_seq_19 ; 8d35a (23:535a) +.ForUnused1A ; 8d35a (23:535a) ld hl, SPRITEANIMSTRUCT_0C add hl, bc ld a, [hl] @@ -403,7 +403,7 @@ DoAnimFrame: ; 8d24b ld [hl], a ret -.ForUnusedCursor ; 8d46e (23:546e) +.UnusedCursor ; 8d46e (23:546e) callfar ret_e00ed ret @@ -748,11 +748,11 @@ DoAnimFrame: ; 8d24b ld [hl], a ret -.sprite_anim_seq_1B ; 8d630 (23:5630) +.MobileTradeSentPulse ; 8d630 (23:5630) farcall Function108bc7 ret -.sprite_anim_seq_1C ; 8d637 (23:5637) +.MobileTradeOTPulse ; 8d637 (23:5637) farcall Function108be0 ret @@ -845,7 +845,7 @@ DoAnimFrame: ; 8d24b ld [hl], a ret -.sprite_anim_seq_1A ; 8d6b7 (23:56b7) +.EZChatCursor ; 8d6b7 (23:56b7) farcall AnimateEZChatCursor ret diff --git a/mobile/fixed_words.asm b/mobile/fixed_words.asm index a1ddb5ad2..92858320f 100755 --- a/mobile/fixed_words.asm +++ b/mobile/fixed_words.asm @@ -426,11 +426,11 @@ EZChat_MasterLoop: ; 11c283 .SpawnObjects: ; 11c2e9 (47:42e9) depixel 3, 1, 2, 5 - ld a, SPRITE_ANIM_INDEX_1D + ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR call _InitSpriteAnimStruct depixel 8, 1, 2, 5 - ld a, SPRITE_ANIM_INDEX_1D + ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR call _InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_0C add hl, bc @@ -438,7 +438,7 @@ EZChat_MasterLoop: ; 11c283 ld [hl], a depixel 9, 2, 2, 0 - ld a, SPRITE_ANIM_INDEX_1D + ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR call _InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_0C add hl, bc @@ -446,7 +446,7 @@ EZChat_MasterLoop: ; 11c283 ld [hl], a depixel 10, 16 - ld a, SPRITE_ANIM_INDEX_1D + ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR call _InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_0C add hl, bc @@ -454,7 +454,7 @@ EZChat_MasterLoop: ; 11c283 ld [hl], a depixel 10, 4 - ld a, SPRITE_ANIM_INDEX_1D + ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR call _InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_0C add hl, bc @@ -462,7 +462,7 @@ EZChat_MasterLoop: ; 11c283 ld [hl], a depixel 10, 2 - ld a, SPRITE_ANIM_INDEX_1D + ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR call _InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_0C add hl, bc @@ -2561,7 +2561,7 @@ AnimateEZChatCursor: ; 11d0b6 (47:50b6) jr .load .three ; 11d10f (47:510f) - ld a, SPRITE_ANIM_FRAMESET_27 + ld a, SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_1 call ReinitSpriteAnimFrame ld a, [wMobileCommsJumptableIndex] sla a @@ -2587,7 +2587,7 @@ AnimateEZChatCursor: ; 11d0b6 (47:50b6) ret .four ; 11d134 (47:5134) - ld a, SPRITE_ANIM_FRAMESET_27 + ld a, SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_1 call ReinitSpriteAnimFrame ld a, [wcd2a] sla a @@ -2596,7 +2596,7 @@ AnimateEZChatCursor: ; 11d0b6 (47:50b6) jr .load .five ; 11d145 (47:5145) - ld a, SPRITE_ANIM_FRAMESET_27 + ld a, SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_1 call ReinitSpriteAnimFrame ld a, [wcd2c] sla a @@ -2605,7 +2605,7 @@ AnimateEZChatCursor: ; 11d0b6 (47:50b6) jr .load .six ; 11d156 (47:5156) - ld a, SPRITE_ANIM_FRAMESET_2A + ld a, SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_4 call ReinitSpriteAnimFrame ; X = [wcd4a] * 8 + 24 ld a, [wcd4a] @@ -2628,12 +2628,12 @@ AnimateEZChatCursor: ; 11d0b6 (47:50b6) .seven ; 11d175 (47:5175) ld a, [wEZChatCursorYCoord] cp $4 - jr z, .frameset_26 - ld a, SPRITE_ANIM_FRAMESET_28 + jr z, .cursor0 + ld a, SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_2 jr .got_frameset -.frameset_26 - ld a, SPRITE_ANIM_FRAMESET_26 +.cursor0 + ld a, SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_0 .got_frameset call ReinitSpriteAnimFrame ld a, [wEZChatCursorYCoord] @@ -2685,12 +2685,12 @@ AnimateEZChatCursor: ; 11d0b6 (47:50b6) .nine ; 11d1d1 (47:51d1) ld d, -13 * 8 - ld a, SPRITE_ANIM_FRAMESET_2C + ld a, SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_6 jr .eight_nine_load .eight ; 11d1d7 (47:51d7) ld d, 2 * 8 - ld a, SPRITE_ANIM_FRAMESET_2B + ld a, SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_5 .eight_nine_load ; 11d1db (47:51db) push de call ReinitSpriteAnimFrame @@ -2713,7 +2713,7 @@ AnimateEZChatCursor: ; 11d0b6 (47:50b6) ret .ten ; 11d1fc (47:51fc) - ld a, SPRITE_ANIM_FRAMESET_26 + ld a, SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_0 call ReinitSpriteAnimFrame ld a, $8 ld e, a @@ -2825,54 +2825,54 @@ AnimateEZChatCursor: ; 11d0b6 (47:50b6) dbpixel 4, 12 .FramesetsIDs_Two: ; 11d2be - db SPRITE_ANIM_FRAMESET_28 ; 00 - db SPRITE_ANIM_FRAMESET_28 ; 01 - db SPRITE_ANIM_FRAMESET_28 ; 02 - db SPRITE_ANIM_FRAMESET_28 ; 03 - db SPRITE_ANIM_FRAMESET_28 ; 04 - db SPRITE_ANIM_FRAMESET_28 ; 05 - db SPRITE_ANIM_FRAMESET_28 ; 06 - db SPRITE_ANIM_FRAMESET_28 ; 07 - db SPRITE_ANIM_FRAMESET_28 ; 08 - db SPRITE_ANIM_FRAMESET_28 ; 09 - db SPRITE_ANIM_FRAMESET_28 ; 0a - db SPRITE_ANIM_FRAMESET_28 ; 0b - db SPRITE_ANIM_FRAMESET_28 ; 0c - db SPRITE_ANIM_FRAMESET_28 ; 0d - db SPRITE_ANIM_FRAMESET_28 ; 0e - db SPRITE_ANIM_FRAMESET_28 ; 0f - db SPRITE_ANIM_FRAMESET_28 ; 10 - db SPRITE_ANIM_FRAMESET_28 ; 11 - db SPRITE_ANIM_FRAMESET_28 ; 12 - db SPRITE_ANIM_FRAMESET_28 ; 13 - db SPRITE_ANIM_FRAMESET_28 ; 14 - db SPRITE_ANIM_FRAMESET_28 ; 15 - db SPRITE_ANIM_FRAMESET_28 ; 16 - db SPRITE_ANIM_FRAMESET_28 ; 17 - db SPRITE_ANIM_FRAMESET_28 ; 18 - db SPRITE_ANIM_FRAMESET_28 ; 19 - db SPRITE_ANIM_FRAMESET_28 ; 1a - db SPRITE_ANIM_FRAMESET_28 ; 1b - db SPRITE_ANIM_FRAMESET_28 ; 1c - db SPRITE_ANIM_FRAMESET_28 ; 1d - db SPRITE_ANIM_FRAMESET_28 ; 1e - db SPRITE_ANIM_FRAMESET_28 ; 1f - db SPRITE_ANIM_FRAMESET_28 ; 20 - db SPRITE_ANIM_FRAMESET_28 ; 21 - db SPRITE_ANIM_FRAMESET_28 ; 22 - db SPRITE_ANIM_FRAMESET_28 ; 23 - db SPRITE_ANIM_FRAMESET_28 ; 24 - db SPRITE_ANIM_FRAMESET_28 ; 25 - db SPRITE_ANIM_FRAMESET_28 ; 26 - db SPRITE_ANIM_FRAMESET_28 ; 27 - db SPRITE_ANIM_FRAMESET_28 ; 28 - db SPRITE_ANIM_FRAMESET_28 ; 29 - db SPRITE_ANIM_FRAMESET_28 ; 2a - db SPRITE_ANIM_FRAMESET_28 ; 2b - db SPRITE_ANIM_FRAMESET_29 ; 2c - db SPRITE_ANIM_FRAMESET_26 ; 2d - db SPRITE_ANIM_FRAMESET_26 ; 2e - db SPRITE_ANIM_FRAMESET_26 ; 2f + db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_2 ; 00 + db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_2 ; 01 + db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_2 ; 02 + db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_2 ; 03 + db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_2 ; 04 + db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_2 ; 05 + db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_2 ; 06 + db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_2 ; 07 + db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_2 ; 08 + db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_2 ; 09 + db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_2 ; 0a + db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_2 ; 0b + db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_2 ; 0c + db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_2 ; 0d + db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_2 ; 0e + db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_2 ; 0f + db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_2 ; 10 + db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_2 ; 11 + db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_2 ; 12 + db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_2 ; 13 + db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_2 ; 14 + db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_2 ; 15 + db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_2 ; 16 + db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_2 ; 17 + db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_2 ; 18 + db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_2 ; 19 + db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_2 ; 1a + db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_2 ; 1b + db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_2 ; 1c + db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_2 ; 1d + db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_2 ; 1e + db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_2 ; 1f + db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_2 ; 20 + db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_2 ; 21 + db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_2 ; 22 + db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_2 ; 23 + db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_2 ; 24 + db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_2 ; 25 + db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_2 ; 26 + db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_2 ; 27 + db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_2 ; 28 + db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_2 ; 29 + db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_2 ; 2a + db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_2 ; 2b + db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_3 ; 2c + db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_0 ; 2d + db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_0 ; 2e + db SPRITE_ANIM_FRAMESET_EZCHAT_CURSOR_0 ; 2f .UpdateObjectFlags: ; 11d2ee (47:52ee) ld hl, wcd24 diff --git a/mobile/mobile_42.asm b/mobile/mobile_42.asm index 4e956229c..bbfce6533 100644 --- a/mobile/mobile_42.asm +++ b/mobile/mobile_42.asm @@ -959,7 +959,7 @@ MobileTradeAnim_GiveTrademon1: ; 108763 cp $f8 jr nz, .next depixel 10, 11, 4, 0 - ld a, SPRITE_ANIM_INDEX_MOBILE_22 + ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_CABLE_BULGE call _InitSpriteAnimStruct .next @@ -984,7 +984,7 @@ MobileTradeAnim_GiveTrademon1: ; 108763 .init depixel 10, 11, 4, 0 - ld a, SPRITE_ANIM_INDEX_MOBILE_22 + ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_CABLE_BULGE call _InitSpriteAnimStruct xor a call Function108ad4 @@ -1015,7 +1015,7 @@ MobileTradeAnim_GiveTrademon2: ; 1087cf call Function108af4 call Function108b5a depixel 9, 10, 2, 0 - ld a, SPRITE_ANIM_INDEX_MOBILE_25 + ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_PING call _InitSpriteAnimStruct ld de, SFX_FORESIGHT call PlaySFX @@ -1024,7 +1024,7 @@ MobileTradeAnim_GiveTrademon2: ; 1087cf xor a ld [wcf64], a depixel 9, 10, 2, 0 - ld a, SPRITE_ANIM_INDEX_MOBILE_23 + ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_SENT_PULSE call _InitSpriteAnimStruct .loop ld a, [hSCY] @@ -1051,7 +1051,7 @@ MobileTradeAnim_05: ; 108811 ld c, 60 call WaitMobileTradeSpriteAnims depixel 30, 10, 2, 0 - ld a, SPRITE_ANIM_INDEX_MOBILE_24 + ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_PULSE call _InitSpriteAnimStruct call GetMobileTradeAnimByte ld de, SFX_THROW_BALL @@ -1074,7 +1074,7 @@ MobileTradeAnim_07: ; 10884c ld c, 80 call DelayFrames depixel 30, 10, 2, 0 - ld a, SPRITE_ANIM_INDEX_MOBILE_24 + ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_OT_PULSE call _InitSpriteAnimStruct call GetMobileTradeAnimByte ld de, SFX_THROW_BALL @@ -1098,7 +1098,7 @@ MobileTradeAnim_GetTrademon1: ; 108863 .done farcall DeinitializeAllSprites depixel 9, 10, 2, 0 - ld a, SPRITE_ANIM_INDEX_MOBILE_25 + ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_PING call _InitSpriteAnimStruct ld de, SFX_GLASS_TING_2 call PlaySFX @@ -1134,13 +1134,13 @@ MobileTradeAnim_GetTrademon2: ; 108894 .asm_1088c5 depixel 10, 11, 4, 0 - ld a, SPRITE_ANIM_INDEX_MOBILE_22 + ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_CABLE_BULGE call _InitSpriteAnimStruct jr .asm_1088e7 .asm_1088cf depixel 10, 11, 4, 0 - ld a, SPRITE_ANIM_INDEX_MOBILE_22 + ld a, SPRITE_ANIM_INDEX_MOBILE_TRADE_CABLE_BULGE call _InitSpriteAnimStruct xor a call Function108ad4 diff --git a/mobile/mobile_5c.asm b/mobile/mobile_5c.asm index 0e2f7d024..11c9b5a66 100755 --- a/mobile/mobile_5c.asm +++ b/mobile/mobile_5c.asm @@ -514,7 +514,7 @@ Function171b42: ; 171b42 (5c:5b42) Function171b4b: ; 171b4b (5c:5b4b) depixel 8, 2 - ld a, SPRITE_ANIM_INDEX_1D + ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR call _InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_0C add hl, bc @@ -522,7 +522,7 @@ Function171b4b: ; 171b4b (5c:5b4b) ld [hl], a depixel 8, 19 - ld a, SPRITE_ANIM_INDEX_1D + ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR call _InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_0C add hl, bc @@ -530,7 +530,7 @@ Function171b4b: ; 171b4b (5c:5b4b) ld [hl], a depixel 17, 14, 2, 0 - ld a, SPRITE_ANIM_INDEX_1D + ld a, SPRITE_ANIM_INDEX_EZCHAT_CURSOR call _InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_0C add hl, bc