diff options
Diffstat (limited to 'data')
-rwxr-xr-x | data/sprite_anims/framesets.asm | 16 | ||||
-rw-r--r-- | data/sprite_anims/sequences.asm | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/data/sprite_anims/framesets.asm b/data/sprite_anims/framesets.asm index 1f4486186..71a4ad13a 100755 --- a/data/sprite_anims/framesets.asm +++ b/data/sprite_anims/framesets.asm @@ -32,10 +32,10 @@ SpriteAnimFrameData: ; 8d6e6 dw .Frameset_Leaf dw .Frameset_CutTree dw .Frameset_EggCrack - dw .Frameset_EggHatch - dw .Frameset_Unused21 - dw .Frameset_Unused22 - dw .Frameset_Unused23 + dw .Frameset_EggHatch1 + dw .Frameset_EggHatch2 + dw .Frameset_EggHatch3 + dw .Frameset_EggHatch4 dw .Frameset_GSIntroHoOh dw .Frameset_HeadbuttTree dw .Frameset_EZChatCursor0 @@ -310,19 +310,19 @@ SpriteAnimFrameData: ; 8d6e6 frame SPRITE_ANIM_OAMSET_EGG_CRACK, 32 endanim -.Frameset_EggHatch: +.Frameset_EggHatch1: frame SPRITE_ANIM_OAMSET_EGG_HATCH, 32 endanim -.Frameset_Unused21: +.Frameset_EggHatch2: frame SPRITE_ANIM_OAMSET_EGG_HATCH, 32, OAM_X_FLIP endanim -.Frameset_Unused22: +.Frameset_EggHatch3: frame SPRITE_ANIM_OAMSET_EGG_HATCH, 32, OAM_Y_FLIP endanim -.Frameset_Unused23: +.Frameset_EggHatch4: frame SPRITE_ANIM_OAMSET_EGG_HATCH, 32, OAM_X_FLIP, OAM_Y_FLIP endanim diff --git a/data/sprite_anims/sequences.asm b/data/sprite_anims/sequences.asm index 76947e2dd..22b7a5308 100644 --- a/data/sprite_anims/sequences.asm +++ b/data/sprite_anims/sequences.asm @@ -29,7 +29,7 @@ SpriteAnimSeqData: ; 8d1c4 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_EGG_HATCH_1, 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 |