diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-06-24 21:23:51 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-06-24 21:23:51 -0400 |
| commit | e2fb7acac0e3c1d598021b52fc2583dd983321bc (patch) | |
| tree | ea5922596ce167e5b0485ea3bacd65f43339ca60 /home/sprite_anims.asm | |
| parent | 1a888f22004aec967d2b6049ede7e04b1815f956 (diff) | |
| parent | 364854623267a8a39242243b0cdf80144e868642 (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
# engine/items/mart.asm
Diffstat (limited to 'home/sprite_anims.asm')
| -rw-r--r-- | home/sprite_anims.asm | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/home/sprite_anims.asm b/home/sprite_anims.asm index b5a3fce56..5f3ef82d2 100644 --- a/home/sprite_anims.asm +++ b/home/sprite_anims.asm @@ -1,4 +1,4 @@ -PushLYOverrides:: ; 3b0c +PushLYOverrides:: ld a, [hLCDCPointer] and a ret z @@ -16,9 +16,8 @@ PushLYOverrides:: ; 3b0c ld a, (wLYOverridesEnd - wLYOverrides) / 16 ld [wRequested2bpp], a ret -; 3b2a -_InitSpriteAnimStruct:: ; 3b2a +_InitSpriteAnimStruct:: ld [wSpriteAnimIDBuffer], a ld a, [hROMBank] push af @@ -33,9 +32,8 @@ _InitSpriteAnimStruct:: ; 3b2a rst Bankswitch ret -; 3b3c -ReinitSpriteAnimFrame:: ; 3b3c +ReinitSpriteAnimFrame:: ld [wSpriteAnimIDBuffer], a ld a, [hROMBank] push af @@ -50,4 +48,3 @@ ReinitSpriteAnimFrame:: ; 3b3c rst Bankswitch ret -; 3b4e |