From c2239e3290220592f18e7ee4a2e3d00493a44fae Mon Sep 17 00:00:00 2001
From: Randy Thiemann <randy.thiemann@edt.zone>
Date: Fri, 13 Oct 2023 11:26:40 +0200
Subject: [PATCH] Optimize jumps

---
 src/include/interrupts.asm | 2 +-
 src/include/memory.asm     | 6 +++---
 src/include/sprites.asm    | 2 +-
 src/main.asm               | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/include/interrupts.asm b/src/include/interrupts.asm
index fff903c..ae601cc 100644
--- a/src/include/interrupts.asm
+++ b/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
diff --git a/src/include/memory.asm b/src/include/memory.asm
index c48d49c..99f5cc2 100644
--- a/src/include/memory.asm
+++ b/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
 
 
diff --git a/src/include/sprites.asm b/src/include/sprites.asm
index e2f3614..ba39891 100644
--- a/src/include/sprites.asm
+++ b/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
diff --git a/src/main.asm b/src/main.asm
index ac2ee22..5fb2d4d 100644
--- a/src/main.asm
+++ b/src/main.asm
@@ -118,7 +118,7 @@ GameLoopEnd:
     wait_vblank
     call hOAMDMA
     call BlitField
-    jp GameLoop
+    jr GameLoop