diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/sprite_anims/framesets.asm | 12 | ||||
| -rw-r--r-- | data/sprite_anims/oam.asm | 14 | ||||
| -rw-r--r-- | data/sprite_anims/sequences.asm | 2 |
3 files changed, 14 insertions, 14 deletions
diff --git a/data/sprite_anims/framesets.asm b/data/sprite_anims/framesets.asm index 0f05fdda..78969b87 100644 --- a/data/sprite_anims/framesets.asm +++ b/data/sprite_anims/framesets.asm @@ -7,8 +7,8 @@ SpriteAnimFrameData: dw .Frameset_GSIntroBubble dw .Frameset_GSIntroShellder dw .Frameset_GSIntroMagikarp + dw .Frameset_UnusedLapras dw .Frameset_GSIntroLapras - dw .Frameset_GSIntroLapras2 dw .Frameset_GSIntroNote dw .Frameset_GSIntroInvisibleNote dw .Frameset_GSIntroJigglypuff @@ -98,15 +98,15 @@ SpriteAnimFrameData: frame SPRITE_ANIM_OAMSET_GS_INTRO_MAGIKARP_2, $41 dorestart -.Frameset_GSIntroLapras: - frame SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_1, $47 +.Frameset_UnusedLapras: + frame SPRITE_ANIM_OAMSET_UNUSED_LAPRAS, $47 endanim -.Frameset_GSIntroLapras2: +.Frameset_GSIntroLapras: + frame SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_1, 7 frame SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_2, 7 frame SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_3, 7 - frame SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_4, 7 - frame SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_2, 7 + frame SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_1, 7 dorestart .Frameset_GSIntroNote: diff --git a/data/sprite_anims/oam.asm b/data/sprite_anims/oam.asm index dde96fca..91175fb0 100644 --- a/data/sprite_anims/oam.asm +++ b/data/sprite_anims/oam.asm @@ -9,10 +9,10 @@ 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_GSIntroLapras1 ; SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_1 + dbw $60, .OAMData_UnusedLapras ; SPRITE_ANIM_OAMSET_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 $00, .OAMData_GSIntroLapras3 ; SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_3 - dbw $06, .OAMData_GSIntroLapras4 ; SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_4 + dbw $06, .OAMData_GSIntroLapras3 ; SPRITE_ANIM_OAMSET_GS_INTRO_LAPRAS_3 dbw $0c, .OAMData_GSIntroNote ; SPRITE_ANIM_OAMSET_GS_INTRO_NOTE dbw $0d, .OAMData_1x1_Palette0 ; SPRITE_ANIM_OAMSET_GS_INTRO_INVISIBLE_NOTE dbw $00, .OAMData_GSIntroJigglypuffPikachu ; SPRITE_ANIM_OAMSET_GS_INTRO_JIGGLYPUFF_1 @@ -355,7 +355,7 @@ ENDC dbsprite -1, 0, 4, 0, $11, 1 dbsprite 0, 0, 4, 0, $12, 1 -.OAMData_GSIntroLapras1: +.OAMData_UnusedLapras: db 10 dbsprite -2, -2, 0, 4, $00, 0 dbsprite -1, -2, 0, 4, $01, 0 @@ -368,7 +368,7 @@ ENDC dbsprite -1, 0, 0, 4, $09, 0 dbsprite 0, 0, 0, 4, $0a, 0 -.OAMData_GSIntroLapras2: +.OAMData_GSIntroLapras1: db 27 dbsprite -3, -3, 0, 0, $00, 0 dbsprite -2, -3, 0, 0, $01, 0 @@ -398,7 +398,7 @@ ENDC dbsprite 1, 2, 0, 0, $54, 0 | PRIORITY dbsprite 2, 2, 0, 0, $55, 0 | PRIORITY -.OAMData_GSIntroLapras3: +.OAMData_GSIntroLapras2: db 27 dbsprite -3, -3, 0, 0, $0d, 0 dbsprite -2, -3, 0, 0, $0e, 0 @@ -428,7 +428,7 @@ ENDC dbsprite 1, 2, 0, 0, $54, 0 | PRIORITY dbsprite 2, 2, 0, 0, $55, 0 | PRIORITY -.OAMData_GSIntroLapras4: +.OAMData_GSIntroLapras3: db 29 dbsprite -3, -3, 0, 0, $00, 0 dbsprite -2, -3, 0, 0, $01, 0 diff --git a/data/sprite_anims/sequences.asm b/data/sprite_anims/sequences.asm index 2c240d24..581d7268 100644 --- a/data/sprite_anims/sequences.asm +++ b/data/sprite_anims/sequences.asm @@ -5,8 +5,8 @@ SpriteAnimSeqData: db SPRITE_ANIM_FRAMESET_GS_INTRO_BUBBLE, SPRITE_ANIM_SEQ_GS_INTRO_BUBBLE, $00 ; SPRITE_ANIM_INDEX_GS_INTRO_BUBBLE db SPRITE_ANIM_FRAMESET_GS_INTRO_SHELLDER, SPRITE_ANIM_SEQ_GS_INTRO_SHELLDER, $00 ; SPRITE_ANIM_INDEX_GS_INTRO_SHELLDER db SPRITE_ANIM_FRAMESET_GS_INTRO_MAGIKARP, SPRITE_ANIM_SEQ_GS_INTRO_MAGIKARP, $00 ; SPRITE_ANIM_INDEX_GS_INTRO_MAGIKARP + db SPRITE_ANIM_FRAMESET_UNUSED_LAPRAS, SPRITE_ANIM_SEQ_UNUSED_LAPRAS, $00 ; SPRITE_ANIM_INDEX_UNUSED_LAPRAS db SPRITE_ANIM_FRAMESET_GS_INTRO_LAPRAS, SPRITE_ANIM_SEQ_GS_INTRO_LAPRAS, $00 ; SPRITE_ANIM_INDEX_GS_INTRO_LAPRAS - db SPRITE_ANIM_FRAMESET_GS_INTRO_LAPRAS_2, SPRITE_ANIM_SEQ_GS_INTRO_LAPRAS_2, $00 ; SPRITE_ANIM_INDEX_GS_INTRO_LAPRAS_2 db SPRITE_ANIM_FRAMESET_GS_INTRO_NOTE, SPRITE_ANIM_SEQ_GS_INTRO_NOTE, $01 ; SPRITE_ANIM_INDEX_GS_INTRO_NOTE db SPRITE_ANIM_FRAMESET_GS_INTRO_INVISIBLE_NOTE, SPRITE_ANIM_SEQ_GS_INTRO_NOTE, $01 ; SPRITE_ANIM_INDEX_GS_INTRO_INVISIBLE_NOTE db SPRITE_ANIM_FRAMESET_GS_INTRO_JIGGLYPUFF, SPRITE_ANIM_SEQ_GS_INTRO_JIGGLYPUFF, $01 ; SPRITE_ANIM_INDEX_GS_INTRO_JIGGLYPUFF |