diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-02 09:30:29 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-02 09:30:29 -0500 |
| commit | c9bf53310fd8834a0370a5a52e4aaeb9a79becb5 (patch) | |
| tree | 54882c4e7e1b017c7fd5e24d4da6f0928485c33f /data | |
| parent | 7be1223fc140d824d32100c00db356a195711cb2 (diff) | |
Identify an unused intro sprite animation from pokegold-spaceworld
Diffstat (limited to 'data')
| -rw-r--r-- | data/sprite_anims/framesets.asm | 7 | ||||
| -rw-r--r-- | data/sprite_anims/oam.asm | 6 | ||||
| -rw-r--r-- | data/sprite_anims/sequences.asm | 4 |
3 files changed, 9 insertions, 8 deletions
diff --git a/data/sprite_anims/framesets.asm b/data/sprite_anims/framesets.asm index 4ae8d6b7..9660043f 100644 --- a/data/sprite_anims/framesets.asm +++ b/data/sprite_anims/framesets.asm @@ -7,7 +7,7 @@ SpriteAnimFrameData: dw .Frameset_GSIntroBubble dw .Frameset_GSIntroShellder dw .Frameset_GSIntroMagikarp - dw .Frameset_UnusedLapras + dw .Frameset_UnusedIntroAerodactyl dw .Frameset_GSIntroLapras dw .Frameset_GSIntroNote dw .Frameset_GSIntroInvisibleNote @@ -98,8 +98,8 @@ SpriteAnimFrameData: frame SPRITE_ANIM_OAMSET_GS_INTRO_MAGIKARP_2, 1, OAM_X_FLIP dorestart -.Frameset_UnusedLapras: - frame SPRITE_ANIM_OAMSET_GS_INTRO_UNUSED_LAPRAS, 7, OAM_X_FLIP +.Frameset_UnusedIntroAerodactyl: + frame SPRITE_ANIM_OAMSET_UNUSED_INTRO_AERODACTYL, 7, OAM_X_FLIP endanim .Frameset_GSIntroLapras: @@ -380,7 +380,6 @@ IF DEF(_GOLD) frame SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_3, 9 frame SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_5, 10 dorestart - ELIF DEF(_SILVER) frame SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_2, 3 frame SPRITE_ANIM_OAMSET_GS_INTRO_HO_OH_LUGIA_1, 7 diff --git a/data/sprite_anims/oam.asm b/data/sprite_anims/oam.asm index d34d3a03..00da9b51 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_GS_INTRO_UNUSED_LAPRAS + dbw $60, .OAMData_UnusedIntroAerodactyl ; SPRITE_ANIM_OAMSET_UNUSED_INTRO_AERODACTYL 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 @@ -355,7 +355,9 @@ ENDC dbsprite -1, 0, 4, 0, $11, 1 dbsprite 0, 0, 4, 0, $12, 1 -.OAMData_UnusedLapras: +.OAMData_UnusedIntroAerodactyl: +; These OAM sprite definitions, with the vtile offset $60 from SpriteAnimOAMData, +; correspond to unused Aerodactyl graphics in pokegold-spaceworld's gfx/intro/water_pokemon.png. db 10 dbsprite -2, -2, 0, 4, $00, 0 dbsprite -1, -2, 0, 4, $01, 0 diff --git a/data/sprite_anims/sequences.asm b/data/sprite_anims/sequences.asm index 24b0d9b8..726c26d7 100644 --- a/data/sprite_anims/sequences.asm +++ b/data/sprite_anims/sequences.asm @@ -9,8 +9,8 @@ SpriteAnimSeqData: db SPRITE_ANIM_FRAMESET_GS_INTRO_SHELLDER, SPRITE_ANIM_SEQ_GS_INTRO_SHELLDER, SPRITE_ANIM_DICT_DEFAULT ; SPRITE_ANIM_INDEX_GS_INTRO_MAGIKARP db SPRITE_ANIM_FRAMESET_GS_INTRO_MAGIKARP, SPRITE_ANIM_SEQ_GS_INTRO_MAGIKARP, SPRITE_ANIM_DICT_DEFAULT -; SPRITE_ANIM_INDEX_UNUSED_LAPRAS - db SPRITE_ANIM_FRAMESET_UNUSED_LAPRAS, SPRITE_ANIM_SEQ_UNUSED_LAPRAS, SPRITE_ANIM_DICT_DEFAULT +; SPRITE_ANIM_INDEX_UNUSED_INTRO_AERODACTYL + db SPRITE_ANIM_FRAMESET_UNUSED_INTRO_AERODACTYL, SPRITE_ANIM_SEQ_UNUSED_INTRO_AERODACTYL, SPRITE_ANIM_DICT_DEFAULT ; SPRITE_ANIM_INDEX_GS_INTRO_LAPRAS db SPRITE_ANIM_FRAMESET_GS_INTRO_LAPRAS, SPRITE_ANIM_SEQ_GS_INTRO_LAPRAS, SPRITE_ANIM_DICT_DEFAULT ; SPRITE_ANIM_INDEX_GS_INTRO_NOTE |