Optimize jumps

src/include/interrupts.asm

@@ -51,7 +51,7 @@ LCDCInterrupt_WaitUntilNotBusy:
     ; Check our interrupt counter
     ldh a, [hLCDCCtr]
     cp 21
-    jp nz, LCDCInterrupt_End
+    jr nz, LCDCInterrupt_End
     ld a, 255
     ldh [hLCDCCtr], a
     ld a, 6

src/include/memory.asm

@@ -11,7 +11,7 @@ UnsafeMemCopy::
     dec bc
     ld a, b
     or a, c
-    jp nz, UnsafeMemCopy
+    jr nz, UnsafeMemCopy
     ret
 
 
@@ -24,7 +24,7 @@ SafeMemCopy::
     dec bc
     ld a, b
     or a, c
-    jp nz, SafeMemCopy
+    jr nz, SafeMemCopy
     ret
 
 ; Sets memory from hl to hl+bc to d
@@ -34,7 +34,7 @@ UnsafeMemSet::
     dec bc
     ld a, b
     or a, c
-    jp nz, UnsafeMemSet
+    jr nz, UnsafeMemSet
     ret
 
 

src/include/sprites.asm

@@ -134,7 +134,7 @@ ApplyNext::
 ; Index of hold piece in A.
 ApplyHold::
     cp 255
-    jp nz, .doApplyHold
+    jr nz, .doApplyHold
     ld hl, wSPRHold1
     ld bc, 16
     ld d, 0

src/main.asm

@@ -118,7 +118,7 @@ GameLoopEnd:
     wait_vblank
     call hOAMDMA
     call BlitField
-    jp GameLoop
+    jr GameLoop