summaryrefslogtreecommitdiff
path: root/home/clear_sprites.asm
diff options
context:
space:
mode:
authorThomas Winwood <twwinwood@gmail.com>2018-07-21 02:06:31 +0100
committerGitHub <noreply@github.com>2018-07-21 02:06:31 +0100
commit23ef2f50a7b94c23b50e9e690a7482ac349c9ef3 (patch)
tree63c20c67efbdf8334c6e273f78065b83135e3886 /home/clear_sprites.asm
parent17a4d0540acc00e3f5ad260009115eb36e72b7d2 (diff)
parent2d73d040d16a7836f935a7a6cb2a311aed2ca5a2 (diff)
Merge branch 'master' into the-diffening
Diffstat (limited to 'home/clear_sprites.asm')
-rw-r--r--home/clear_sprites.asm6
1 files changed, 2 insertions, 4 deletions
diff --git a/home/clear_sprites.asm b/home/clear_sprites.asm
index 8d64c6b10..699774612 100644
--- a/home/clear_sprites.asm
+++ b/home/clear_sprites.asm
@@ -1,4 +1,4 @@
-ClearSprites:: ; 300b
+ClearSprites::
; Erase OAM data
ld hl, wVirtualOAM
ld b, wVirtualOAMEnd - wVirtualOAM
@@ -8,9 +8,8 @@ ClearSprites:: ; 300b
dec b
jr nz, .loop
ret
-; 3016
-HideSprites:: ; 3016
+HideSprites::
; Set all OAM y-positions to 160 to hide them offscreen
ld hl, wVirtualOAMSprite00YCoord
ld de, SPRITEOAMSTRUCT_LENGTH
@@ -22,4 +21,3 @@ HideSprites:: ; 3016
dec b
jr nz, .loop
ret
-; 3026