From 947b40b1d3bbcea47751d3d45c5b91d94441b622 Mon Sep 17 00:00:00 2001
From: alpine9000 <alex.g.brown@gmail.com>
Date: Fri, 15 Apr 2016 14:38:13 +1000
Subject: [PATCH] Joystick

---
 028.game2/Makefile | 2 +-
 028.game2/game1.s  | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/028.game2/Makefile b/028.game2/Makefile
index 1313a27..a3a9710 100644
--- a/028.game2/Makefile
+++ b/028.game2/Makefile
@@ -9,7 +9,7 @@ BASE_ADDRESS=4000
 NUM_COLORS=8
 
 BOOTBLOCK_ASM=alpine_bootblock.s
-OBJS=out/init.o out/utils.o out/image.o out/blit.o
+OBJS=out/init.o out/utils.o out/image.o out/blit.o out/joystick.o
 
 #IMAGES=gigi_full.png
 #IMAGEDATA=$(addprefix out/, $(IMAGES:.png=.bin))
diff --git a/028.game2/game1.s b/028.game2/game1.s
index 5dd9c0b..ae615be 100644
--- a/028.game2/game1.s
+++ b/028.game2/game1.s
@@ -80,12 +80,9 @@ Update:
 	lsr.l	#FOREGROUND_SCROLL_SHIFT_CONVERT,d0 ; convert to pixels
 	andi.l	#$f,d0
 
-	cmp.b	#3,joystickpos
-	bne	.slowScroll
+	btst	#0,joystick
+	bne	.c1
 	add.l	#FOREGROUND_SCROLL_PIXELS,foregroundScrollX
-	bra	.c1
-.slowScroll:
-	add.l	#FOREGROUND_SCROLL_PIXELS/4,foregroundScrollX
 .c1:
 	
 .skipForegroundUpdates: