From: Lukas Myers <lukaskrickl@gmail.com>
Date: Wed, 24 Jan 2018 09:16:10 +0000 (+0100)
Subject: Fixed dumb error in sprite movement
X-Git-Tag: 0.1.0~3
X-Git-Url: https://git.krickl.dev/?a=commitdiff_plain;h=8cf3e420f06cf183678286dab050e3a6d4f58df4;p=turtlebay%2F.git

Fixed dumb error in sprite movement
---

diff --git a/main.asm b/main.asm
index f97b0d9..ed278f8 100644
--- a/main.asm
+++ b/main.asm
@@ -672,7 +672,7 @@ SaveXRight
 	stx ObjectX,y
 	ldx #1
 	stx REFP0,y ; makes turtle image face right
-	jmp MoveDone
+	rts;jmp MoveDone
 LeftCollision
 	; left pressed code
 	ldx ObjectX,y
@@ -684,24 +684,24 @@ SaveXLeft
 	stx ObjectX,y
 	ldx #0
 	stx REFP0,y ; makes turtle image face left
-	jmp MoveDone
-UpCollision
-	; down pressed code
+	rts;jmp MoveDone
+DownCollision
+	; up pressed code
 	ldx ObjectY,y
-	dex
-	cpx #255
+	inx
+	cpx #PFHEIGHT+1 ; used to be $60 - works with $FF too because this is the edge of the screen
 	bne SaveYUp
-	ldx #PFHEIGHT
+	ldx #0
 SaveYUp
 	stx ObjectY,y
-	jmp MoveDone
-DownCollision
+	rts;jmp MoveDone
+UpCollision
 	; down pressed code
 	ldx ObjectY,y
-	inx
-	cpx PFHEIGHT+1
+	dex
+	cpx #$FF
 	bne SaveYDown
-	ldx #0
+	ldx #PFHEIGHT
 SaveYDown
 	stx ObjectY,y