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 /home/sprite_anims.asm | |
| parent | 17a4d0540acc00e3f5ad260009115eb36e72b7d2 (diff) | |
| parent | 2d73d040d16a7836f935a7a6cb2a311aed2ca5a2 (diff) | |
Merge branch 'master' into the-diffening
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 |