diff options
Diffstat (limited to 'data/sprite_anims')
| -rw-r--r-- | data/sprite_anims/framesets.asm | 38 | ||||
| -rw-r--r-- | data/sprite_anims/oam.asm | 2 | ||||
| -rw-r--r-- | data/sprite_anims/sequences.asm | 2 |
3 files changed, 21 insertions, 21 deletions
diff --git a/data/sprite_anims/framesets.asm b/data/sprite_anims/framesets.asm index 78969b87..22b81d0b 100644 --- a/data/sprite_anims/framesets.asm +++ b/data/sprite_anims/framesets.asm @@ -23,9 +23,9 @@ SpriteAnimFrameData: dw .Frameset_GSIntroCyndaquil dw .Frameset_GSIntroTotodile dw .Frameset_GSTitleTrail - dw .Frameset_GSIntroPikachu ; SPRITE_ANIM_FRAMESET_UNUSED_PIKACHU - dw .Frameset_GSIntroPikachu2 ; SPRITE_ANIM_FRAMESET_UNUSED_PIKACHU_2 - dw .Frameset_GSIntroPikachu4 ; SPRITE_ANIM_FRAMESET_UNUSED_PIKACHU_3 + dw .Frameset_GSIntroPikachu + dw .Frameset_GSIntroPikachu2 + dw .Frameset_GSIntroPikachu4 dw .Frameset_TextEntryCursor dw .Frameset_TextEntryCursorBig dw .Frameset_GameFreakLogo @@ -46,7 +46,7 @@ SpriteAnimFrameData: dw .Frameset_EvolutionBallOfLight dw .Frameset_RadioTuningKnob dw .Frameset_MagnetTrainRed - dw .Frameset_Unused1C + dw .Frameset_Unused2E dw .Frameset_Leaf dw .Frameset_CutTree dw .Frameset_EggCrack @@ -94,12 +94,12 @@ SpriteAnimFrameData: dorestart .Frameset_GSIntroMagikarp: - frame SPRITE_ANIM_OAMSET_GS_INTRO_MAGIKARP_1, $41 - frame SPRITE_ANIM_OAMSET_GS_INTRO_MAGIKARP_2, $41 + frame SPRITE_ANIM_OAMSET_GS_INTRO_MAGIKARP_1, 1, OAM_X_FLIP + frame SPRITE_ANIM_OAMSET_GS_INTRO_MAGIKARP_2, 1, OAM_X_FLIP dorestart .Frameset_UnusedLapras: - frame SPRITE_ANIM_OAMSET_UNUSED_LAPRAS, $47 + frame SPRITE_ANIM_OAMSET_GS_INTRO_UNUSED_LAPRAS, 7, OAM_X_FLIP endanim .Frameset_GSIntroLapras: @@ -118,14 +118,14 @@ SpriteAnimFrameData: endanim .Frameset_GSIntroJigglypuff: - frame SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_1, $59 + frame SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_1, 25, OAM_X_FLIP frame SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_3, 9 - frame SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_1, $19 + frame SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_1, 25 frame SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_3, 9 dorestart .Frameset_GSIntroJigglypuff2: - frame SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_2, 32 + frame SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_2, 32 endanim .Frameset_GSIntroPikachu: @@ -139,7 +139,7 @@ SpriteAnimFrameData: endanim .Frameset_GSIntroPikachu3: - frame SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_3, 32 + frame SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_3, 32 endanim .Frameset_GSIntroPikachuTail: @@ -150,7 +150,7 @@ SpriteAnimFrameData: dorestart .Frameset_GSIntroPikachuTail2: - frame SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_TAIL_1, $1f + frame SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_TAIL_1, 31 endanim .Frameset_GSIntroFireball: @@ -160,15 +160,15 @@ SpriteAnimFrameData: delanim .Frameset_GSIntroChikorita: - frame SPRITE_ANIM_OAMSET_GS_INTRO_CHIKORITA, $18 + frame SPRITE_ANIM_OAMSET_GS_INTRO_CHIKORITA, 24 delanim .Frameset_GSIntroCyndaquil: - frame SPRITE_ANIM_OAMSET_GS_INTRO_CYNDAQUIL, $58 + frame SPRITE_ANIM_OAMSET_GS_INTRO_CYNDAQUIL, 24, OAM_X_FLIP delanim .Frameset_GSIntroTotodile: - frame SPRITE_ANIM_OAMSET_GS_INTRO_TOTODILE, $18 + frame SPRITE_ANIM_OAMSET_GS_INTRO_TOTODILE, 24 delanim .Frameset_GSTitleTrail: @@ -177,14 +177,14 @@ IF DEF(_GOLD) frame SPRITE_ANIM_OAMSET_GS_TITLE_TRAIL_2, 1 dorestart ELIF DEF(_SILVER) - frame SPRITE_ANIM_OAMSET_GS_TITLE_TRAIL_1, 32 + frame SPRITE_ANIM_OAMSET_GS_TITLE_TRAIL_1, 32 endanim ENDC .Frameset_GSIntroPikachu4: frame SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_2, 0 - frame SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_3, 15 - frame SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_4, 15 + frame SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_3, 15 + frame SPRITE_ANIM_OAMSET_GS_INTRO_PIKACHU_4, 15 endanim .Frameset_TextEntryCursor: @@ -334,7 +334,7 @@ ENDC dowait 3 dorestart -.Frameset_Unused1C: +.Frameset_Unused2E: dowait 32 endanim diff --git a/data/sprite_anims/oam.asm b/data/sprite_anims/oam.asm index 91175fb0..a1380a1b 100644 --- a/data/sprite_anims/oam.asm +++ b/data/sprite_anims/oam.asm @@ -9,7 +9,7 @@ SpriteAnimOAMData: 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_UnusedLapras ; SPRITE_ANIM_OAMSET_UNUSED_LAPRAS + dbw $60, .OAMData_UnusedLapras ; SPRITE_ANIM_OAMSET_GS_INTRO_UNUSED_LAPRAS dbw $00, .OAMData_GSIntroLapras1 ; SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_1 dbw $00, .OAMData_GSIntroLapras2 ; SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_2 dbw $06, .OAMData_GSIntroLapras3 ; SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_3 diff --git a/data/sprite_anims/sequences.asm b/data/sprite_anims/sequences.asm index 581d7268..725d1984 100644 --- a/data/sprite_anims/sequences.asm +++ b/data/sprite_anims/sequences.asm @@ -45,6 +45,6 @@ SpriteAnimSeqData: 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_GS_INTRO_HO_OH_LUGIA, SPRITE_ANIM_SEQ_GS_INTRO_HO_OH_LUGIA, $00 ; SPRITE_ANIM_INDEX_GS_INTRO_HO_OH_LUGIA 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 |