diff options
| author | yenatch <yenatch@gmail.com> | 2017-12-28 01:30:36 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-28 01:30:36 -0500 |
| commit | da28d1a84b0499bead314e17ae2ff0d13eb03196 (patch) | |
| tree | c212adfc53d1996c06f2e4be1d6e480e687a2ad8 /engine/sprites.asm | |
| parent | bad9e33530af8cdc29ce5629df682fc7915bfff0 (diff) | |
| parent | 2c4777f3363cd64d05fb00084fd83dff8ac31674 (diff) | |
Merge pull request #437 from roukaour/master
Reorganize battle/; rename most "header" misnomers; gfx/pics → gfx/pokemon
Diffstat (limited to 'engine/sprites.asm')
| -rwxr-xr-x | engine/sprites.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/sprites.asm b/engine/sprites.asm index 755ee0835..4a33eb5cf 100755 --- a/engine/sprites.asm +++ b/engine/sprites.asm @@ -444,9 +444,9 @@ GetSpriteAnimFrame: ; 8d132 inc [hl] call .GetPointer ; load pointer from SpriteAnimFrameData ld a, [hli] - cp -2 + cp dorestart_command jr z, .restart - cp -1 + cp endanim_command jr z, .repeat_last push af @@ -551,13 +551,13 @@ BrokenGetStdGraphics: ; 8d1ac ; 8d1c4 -INCLUDE "data/sprite_anim_seqs.asm" +INCLUDE "data/sprite_anims/sequences.asm" INCLUDE "engine/sprite_anims.asm" -INCLUDE "data/sprite_anim_frames.asm" +INCLUDE "data/sprite_anims/framesets.asm" -INCLUDE "data/sprite_anim_oam.asm" +INCLUDE "data/sprite_anims/oam.asm" BrokenStdGFXPointers: ; Broken 2bpp pointers |