diff options
| author | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2018-01-23 16:45:34 -0500 |
|---|---|---|
| committer | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2018-01-23 16:45:34 -0500 |
| commit | f2ae74079fc917cbf7e1f640eb8beda0d4740887 (patch) | |
| tree | d1982b2f1c0c23e1b274ed84db330351d4f4806b /engine/sprites.asm | |
| parent | c60f1331fef22b886adf3472d2b4f348832cfaf7 (diff) | |
Prefix wram labels with w, part 1.
Handle edge cases first.
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 7928fe1f0..6816e4133 100755 --- a/engine/sprites.asm +++ b/engine/sprites.asm @@ -23,7 +23,7 @@ PlaySpriteAnimations: ; 8cf69 push bc push af - ld a, LOW(Sprites) + ld a, LOW(wVirtualOAM) ld [wCurrSpriteOAMAddr], a call DoNextFrameForAllSprites @@ -60,9 +60,9 @@ DoNextFrameForAllSprites: ; 8cf7a ld a, [wCurrSpriteOAMAddr] ld l, a - ld h, HIGH(Sprites) + ld h, HIGH(wVirtualOAM) -.loop2 ; Clear (Sprites + [wCurrSpriteOAMAddr] --> SpritesEnd) +.loop2 ; Clear (wVirtualOAM + [wCurrSpriteOAMAddr] --> SpritesEnd) ld a, l cp LOW(SpritesEnd) jr nc, .done @@ -102,7 +102,7 @@ DoNextFrameForFirst16Sprites: ; 8cfa8 (23:4fa8) ld l, a ld h, HIGH(Sprite17) -.loop2 ; Clear (Sprites + [wCurrSpriteOAMAddr] --> Sprites + $40) +.loop2 ; Clear (wVirtualOAM + [wCurrSpriteOAMAddr] --> Sprites + $40) ld a, l cp LOW(Sprite17) jr nc, .done @@ -253,7 +253,7 @@ UpdateAnimFrame: ; 8d04c push bc ld a, [wCurrSpriteOAMAddr] ld e, a - ld d, HIGH(Sprites) + ld d, HIGH(wVirtualOAM) ld a, [hli] ld c, a ; number of objects .loop |