summaryrefslogtreecommitdiff
path: root/engine/overworld/sprite_collisions.asm
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2020-07-05 19:58:21 -0400
committerGitHub <noreply@github.com>2020-07-05 19:58:21 -0400
commitc57c93d2b2fb06cadafefda37c0974ba1ec9e6c0 (patch)
tree531d6b30d5a606ae963024825ed6e614843000a6 /engine/overworld/sprite_collisions.asm
parent2718c36065e7eb201a149938bcdd51987c4e56b6 (diff)
parent5fe8aab3445cb76d8e1c4be954c0392f40798950 (diff)
Merge pull request #259 from Rangi42/master
Port pokecrystal's formatting of text commands and special characters
Diffstat (limited to 'engine/overworld/sprite_collisions.asm')
-rw-r--r--engine/overworld/sprite_collisions.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/overworld/sprite_collisions.asm b/engine/overworld/sprite_collisions.asm
index c5ff8ebb..48cd95b9 100644
--- a/engine/overworld/sprite_collisions.asm
+++ b/engine/overworld/sprite_collisions.asm
@@ -1,10 +1,10 @@
_UpdateSprites::
ld h, $c1
inc h
- ld a, $e ; wSpriteStateData2 + $0e
+ ld a, wSpritePlayerStateData2ImageBaseOffset - wSpritePlayerStateData2
.spriteLoop
ld l, a
- sub $e
+ sub wSpritePlayerStateData2ImageBaseOffset - wSpritePlayerStateData2
ld c, a
ld [hCurrentSpriteOffset], a
ld a, [hl]
@@ -20,7 +20,7 @@ _UpdateSprites::
.skipSprite
ld a, l
add $10 ; move to next sprite
- cp $e ; test for overflow (back at $0e)
+ cp wSpritePlayerStateData2ImageBaseOffset - wSpritePlayerStateData2 ; test for overflow (back at beginning)
jr nz, .spriteLoop
ret
.updateCurrentSprite