From 452501027397bd7442f024f57429a5b9720c0ca9 Mon Sep 17 00:00:00 2001
From: blondie7575 <qd@quinndunki.com>
Date: Tue, 5 Sep 2017 12:07:33 -0700
Subject: [PATCH] Added shot power & fixed point multiply

---
 gscats.2mg   | Bin 819264 -> 819264 bytes
 player.s     |   6 +++---
 projectile.s |  24 +++++++++++++++++++--
 utility.s    |  58 +++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 83 insertions(+), 5 deletions(-)

diff --git a/gscats.2mg b/gscats.2mg
index b8c1dfd0a17f4199dd8be6384e16c04af463f4e5..6adcf5e37ec901ebc61e7853ce28b5f650414e18 100644
GIT binary patch
delta 1438
zcmZvbT}T{P6vyw(>NsxJx~r>>OIvReTUttCV$;?nNK8vwu|62mu5=3RwAAid#YYL0
z!Val6dFUi=ZUbGgt`!ngG7wnovRJFJ6n99a`(T0u3W<=|Afcma3dxH-cW1}?kb%Sf
z-E+@5bN=^Z!Dv}9TCPHQ?LiXyoHXyR4H5DykvWL$nD|?!U3x|meC$LZn~|!zPYHjr
zo}nXRc`WnY&}l(XSi?6T34@tq;<AuwKYOl13<E2ie}fP5NIM@oN5+KXnfoIb-WEjm
z)k>T14Dqp_SK^T+$TdWjxJ*nNa)+Ykb;uown#(}{U`KDX?5zj&g=GbTwDmzf3^%q;
z<;mlQs2Z{tNHE}^o*QHrZfra?s%LjpX6)ukAyKDEQsL3+hFPzzsS{*en5)wY)qmag
z75@EJ(WX?hQ8Nyq?`5Y@je`<bQ;L?yb*BlZo%oepJf`~p<-(n_n7^og`2=+0eN%*7
zmYhBBNFzR_SC(XBvrfMx@gl?0CAm1t^m$FsXsg!(!Ww(_?!iO=oJ#shXfy!y#U2^~
zs|-{hy&SV7aC~$rX32b9jnP;8>6>v{-)H%`V<=|T@W6D;62bYY>wVb@Lc|t{Q)LF>
zN)YJL4@do=j|RcmoDzsBf=)?|83w;u4@!KDm<rHeLd{d#+h!T?hyduAH%+fbOX(7(
z%e)qQc(<=J40bnh9!4S<t}m)q7@T{D54)4n4;EDpn1+C5T|kdq^dOw)o3+iZy%%BK
zVl7*__grELQc19ENHMUMz>i;QhR=(X1#7uTe1<o~x(;{&j(<EXqkmYU2eeeK<gEL2
zmva{QxpZh&5`w<2&A2s-lCh&%uySA%qi@Gf;zSvk0dofU`It#iE9_HZP&9m9|M0w>
z$WoRvkOedA1~af_qDF0-1W$|;f`2pL{lH@E$MuGA5S&L;?6C<c9N1a-eZ47B*~d4@
z560j0e!ua+*!Z4{o5T&njnF&XmS5@bxTRsqToO8$pY|Xa?0OKrN^j%zE$sNE{&_<0
zq%J}}KQDSP?!g3y1Yc|4TMBy1gWDdgd0^}-#hmtl?k{=vd9dKYq6d0&Ddw{xJV9A$
zY$=W1q_L6o1Z%tbdSXZC`YxTjo;%~mJXn;Ky9m5MKF<NGxPYZxKus>7Bo|PU3n<A2
zl;i?RD#90O)a1HQlMATH1=QpMYH|TJxqzDRUV%P~C*z)4ZVo1qCg<9st&iuyk<_vu
y+M+tXMY9H2a-b<glVcTMS8biC+7i%2G#^?SS~;48R)Hp?RigQ`Ra<*rJNF;amuaj3

delta 1351
zcmZvbe`r%z6vxkd(InPpCR%A4#(K4Gus;URxQ<RK){S8ag(=%o%)o`Ixi=C28wlGV
z4|UF!yc+u)m@P{}5!QA-5FV@q>@3{|d4E*$hd*1oHbUB_p)>1np#QjY^YUC7UO3#(
zJ@=e*&-dN?CT0Jm?7z-7ZrcOD9fOXJZ61JM!O1~X4~W0(J@%LEf<ryrJg(bahfWJg
zwg22caVDZ)K6geCTGZC_AL|FiTY}zmVbCE~s9L=E7N4BS9zF$<8NsJll0)wbe)Y@S
z-L^Ntuim&F^`%+9HRz2xLCLWE+d(DA^813yFe6vh{dfF3s#JP)dX>6K*J_o1)z&py
zfG4d%$zx1{ySZs>BA^c4slG6(e|?mmx%+_-_k`^B;^X^OWozi6Gz>Xm!V@ZPSzfRe
z|4FojMkQr?NbW@6>$T!$oV-yf)e<T!BL;9ZmVAGUwS}pr3z$14eg2e%!5T80h4b(Y
zB;X<p!MAV)(vSuH`};pN3*+j+@|*Dzt!*Noc+w?GUh5~1sP=$LHu444W@*hv(o~z{
zvqs56jI1zXM74SDI6}209{3s6?$O%MeIGitGW8iE)LcrLUMo|w|44eChSOy#|1~Or
za*u`yY*i|>NvTqAGy}>iCBJxfjXry(JfJ+HM8lXjMy>}N>9d$V$7`vtEXLleP~#BP
z{`UDWJUk_76<S-|yVqPa4w#ZSU>X9JH32<ybq~UEb$aprc$%dmOv|toV_KRu;Ybbe
zb)6DS%Q3u9-_g`y16RVSB;%j8H>5?F+tznAswJ5>ibo`wHpmQ+W9!X(YJe#Nj9--!
zVUoi*ExJY7*7qY%Ghp}sqZ3R?n9+<GPLP6z0q(;&06a}O_>socKbKlt%Cz>Fi2VjY
zarg6$w&nKtjVM<=Pvu7>eNtYPt5>*?5&QxuGu&&o{70;JCWIyP5f+$!(OYJ0-CI84
zJ<&EcgDua-ZUQN#VysZODO!-TV3<Rk@Ad3x1ifRyf&~vPkasp>&R9S?8lIgNOj<By
zL3mdq=F>VnMOj&FDU01?v61Ys+I_b({#@sGC;!vA?oVa>N&|IS`55B`3Iz^W#RM#6
z0%|e=C7FPdOh8E{pd=GeQXM+8sL6DpCKFJT38={g)MNr`;-I##Y=3!(jo^KaOmqjk
zo?K=%yR_kl?qC>yCS{4Lmrk|o<Wkjf*0uJvYfV5C(QIfN&^Dsk(Hv+_v`uJD<F2*M
Hdj|gnp)hKb

diff --git a/player.s b/player.s
index 4e3eaff..d33a454 100644
--- a/player.s
+++ b/player.s
@@ -13,7 +13,7 @@ playerData:
 	.word 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	; Saved background
 
 	.word 45		; Angle in degrees from +X
-	.word 50		; Power
+	.word 2		; Power
 	.word 100		; Anger
 	.byte 8,"SPROCKET "	; Name
 	.word 0,0,0,0,0,0 ;Padding
@@ -23,8 +23,8 @@ playerData:
 	.word 0	; Y pos in pixels (from bottom terrain edge)
 	.word 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	; Saved background
 
-	.word 45		; Angle in degrees from +X
-	.word 50		; Power
+	.word 135		; Angle in degrees from +X
+	.word 3		; Power
 	.word 100		; Anger
 	.byte 8,"TINKER   "	; Name
 	.word 0,0,0,0,0,0 ;Padding
diff --git a/projectile.s b/projectile.s
index 33395fc..401b789 100644
--- a/projectile.s
+++ b/projectile.s
@@ -90,16 +90,36 @@ fireProjectile:
 	asl
 	sta projectileData+JD_PRECISEY,y
 
+	lda projectileParams+6		; Convert power to 8.8
+	asl
+	asl
+	asl
+	asl
+	asl
+	asl
+	asl
+	asl
+	sta projectileParams+6
+
 	lda projectileParams+4		; Convert angle to vector
 	asl
 	tax
-	lda angleToVectorX,x		; Velocity X
+	lda angleToVectorX,x		; Velocity X (unit vector)
+
+	sta PARAML1
+	lda projectileParams+6		; Scale by power
+	sta PARAML0
+	jsr mult88
 	sta projectileData+JD_VX,y
 
 	lda projectileParams+4		; Convert angle to vector
 	asl
 	tax
-	lda angleToVectorY,x		; Velocity Y
+	lda angleToVectorY,x		; Velocity Y (unit vector)
+	sta PARAML1
+	lda projectileParams+6		; Scale by power
+	sta PARAML0
+	jsr mult88
 	sta projectileData+JD_VY,y
 
 	RESTORE_AXY
diff --git a/utility.s b/utility.s
index f654a59..43441f2 100644
--- a/utility.s
+++ b/utility.s
@@ -61,6 +61,8 @@ intToStringSkipSingle:
 	sta intToStringResult,y
 	iny
 	inx
+	cpx #3
+	beq intToStringFinish		; Single digit number so we're done
 
 intToStringFullDigitsLoop:
 	; Remaining bytes all contain two digits
@@ -83,6 +85,7 @@ intToStringFullDigitsLoop:
 	cpx #3
 	bne intToStringFullDigitsLoop
 
+intToStringFinish:
 	; Store final length and we're done
 	dey
 	sty intToStringResult
@@ -94,3 +97,58 @@ intToStringDone:
 
 intToStringBCD: .byte 0,0,0
 intToStringResult: .byte 0,0,0,0,0,0
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; mult16
+;
+; PARAML0 = Operand 1 (16 bits)
+; PARAML1 = Operand 2 (16 bits)
+; A => Op1 * Op2 (16 bits)
+; Algorithm from https://apple2.gs/downloads/Programmanual.pdf
+; Trashes X
+;
+mult16:
+	lda #0			; Initialize result
+
+mult16L1:
+	ldx PARAML0		; Get operand 1
+	beq mult16Done	; If operand is zero, we're done
+	lsr PARAML0		; Get low bit
+	bcc mult16L2	; If clear, no additions to previous products
+	clc				; Otherwise add oeprand 2 to partial result
+	adc PARAML1
+
+mult16L2:
+	asl	PARAML1		; Now shift operand 2 left for possible add next time
+	bra mult16L1
+
+mult16Done:
+	rts
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; mult88
+;
+; PARAML0 = Operand 1 (8.8 fixed point)
+; PARAML1 = Operand 2 (8.8 fixed point)
+; A => Op1 * Op2 (8.8 fixed point)
+; Substantial precision loss occurs here, but it's usually good enough
+;
+mult88:
+	lda PARAML0		; Convert operands to 12.4
+	lsr
+	lsr
+	lsr
+	lsr
+	sta PARAML0
+
+	lda PARAML1
+	lsr
+	lsr
+	lsr
+	lsr
+	sta PARAML1
+
+	jsr mult16		; Result is 8.8
+	rts