improve nextsprite perf in the general case

Author: kirjavascript

CHANGELOG.md

@@ -13,6 +13,7 @@
 * Fixed ingame score display at 8 million with Classic Scoring
 * Fixed CNROM legal screen CHR bank
 * Fixed CNROM legal to title flicker
+* Fixed a bug in Sonic Drop
 * Block Tool pieces wrap around
 * Always Next Box removed
 * 0001 seeds are ignored

src/sprites/piece.asm

@@ -136,15 +136,10 @@ stageSpriteForCurrentPiece_return:
         rts
 
 stageSpriteForNextPiece:
-        lda practiseType
-        cmp #MODE_HARDDROP
-        beq @alwaysNextBox
-        lda debugFlag
-        bne @alwaysNextBox
         lda displayNextPiece
-        bne @ret
+        bne @maybeDisplayNextPiece
 
-@alwaysNextBox:
+@displayNextPiece:
         lda #$C8
         sta spriteXOffset
         lda #$77
@@ -153,4 +148,11 @@ stageSpriteForNextPiece:
         lda orientationToSpriteTable,x
         sta spriteIndexInOamContentLookup
         jmp loadSpriteIntoOamStaging
-@ret:   rts
+
+@maybeDisplayNextPiece:
+        lda practiseType
+        cmp #MODE_HARDDROP
+        beq @displayNextPiece
+        lda debugFlag
+        bne @displayNextPiece
+        rts