diff options
| author | Thomas Winwood <twwinwood@gmail.com> | 2018-07-21 02:06:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-21 02:06:31 +0100 |
| commit | 23ef2f50a7b94c23b50e9e690a7482ac349c9ef3 (patch) | |
| tree | 63c20c67efbdf8334c6e273f78065b83135e3886 /data/sprite_anims/framesets.asm | |
| parent | 17a4d0540acc00e3f5ad260009115eb36e72b7d2 (diff) | |
| parent | 2d73d040d16a7836f935a7a6cb2a311aed2ca5a2 (diff) | |
Merge branch 'master' into the-diffening
Diffstat (limited to 'data/sprite_anims/framesets.asm')
| -rw-r--r-- | data/sprite_anims/framesets.asm | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/data/sprite_anims/framesets.asm b/data/sprite_anims/framesets.asm index d768ec21a..666f2b2e2 100644 --- a/data/sprite_anims/framesets.asm +++ b/data/sprite_anims/framesets.asm @@ -1,4 +1,4 @@ -SpriteAnimFrameData: ; 8d6e6 +SpriteAnimFrameData: ; entries correspond to SPRITE_ANIM_FRAMESET_* constants dw .Frameset_00 dw .Frameset_PartyMon @@ -66,7 +66,6 @@ SpriteAnimFrameData: ; 8d6e6 dw .Frameset_IntroUnownF dw .Frameset_CelebiLeft dw .Frameset_CelebiRight -; 8d76a .Frameset_00: frame SPRITE_ANIM_OAMSET_RED_WALK_1, 32 @@ -496,4 +495,3 @@ SpriteAnimFrameData: ; 8d6e6 frame SPRITE_ANIM_OAMSET_CELEBI_1, 8, OAM_X_FLIP frame SPRITE_ANIM_OAMSET_CELEBI_2, 8, OAM_X_FLIP endanim -; 8d94d |