From 97e3a995e027d8908286301855c8fb28600a95cc Mon Sep 17 00:00:00 2001
From: spannerisms <32842036+spannerisms@users.noreply.github.com>
Date: Wed, 24 Mar 2021 07:42:34 -0400
Subject: [PATCH] refactor clock

JSL : RTL to JML
SEC not necessary if we branch on BEQ, since BEQ implies a set carry
made carry_bit a sublabel
---
 clock.asm | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/clock.asm b/clock.asm
index c0eebd1..4e853d1 100644
--- a/clock.asm
+++ b/clock.asm
@@ -66,8 +66,7 @@ endmacro
 
 Clock_Test:
 	JSL.l Clock_Init
-	JSL.l Clock_IsSupported
-RTL
+	JML.l Clock_IsSupported
 
 ;--------------------------------------------------------------------------------
 ; Clock_Init
@@ -112,11 +111,10 @@ Clock_IsSupported:
 	PHA : PHX
 		LDX #$00;
 		-
-			LDA $002800 : AND.b #$0F : CMP #$0F : BEQ + ; check for clock chip ready signal
-			CPX.b #$0E : !BLT ++ : CLC : BRA .done : ++ ; if we've read 14 bytes with no success, unset carry and exit
-			INX
-		BRA - : +
-		SEC ; found a clock chip
+			LDA $002800 : AND.b #$0F : CMP #$0F : BEQ .done ; check for clock chip ready signal
+			CPX.b #$0E : BCC ++ : CLC : BRA .done ; if we've read 14 bytes with no success, unset carry and exit
+		++	INX
+		BRA -
 	.done
 	PLX : PLA
 RTL
@@ -197,9 +195,9 @@ Multiply_A16Y8:
 	CLC
 	ADC $4216
 	LDY $4217
-	BCC carry_bit
+	BCC .carry_bit
 	INY
-	carry_bit:
+.carry_bit:
 	XBA
 	REP #$20 ; set 16-bit accumulator
 RTL