From 252abc2a55140b34e29e09d46febb0f02048213f Mon Sep 17 00:00:00 2001
From: blondie7575 <qd@quinndunki.com>
Date: Tue, 15 Aug 2017 12:40:14 -0700
Subject: [PATCH] Working angle display

---
 GSCats.xcodeproj/project.pbxproj |   4 ++
 graphics.s                       |  18 +++++-
 gscats.2mg                       | Bin 819264 -> 819264 bytes
 gscats.s                         |  11 ++--
 macros.s                         |  11 ++++
 player.s                         |  44 ++++++++++++++
 utility.s                        |  95 +++++++++++++++++++++++++++++++
 7 files changed, 176 insertions(+), 7 deletions(-)
 create mode 100644 player.s
 create mode 100644 utility.s

diff --git a/GSCats.xcodeproj/project.pbxproj b/GSCats.xcodeproj/project.pbxproj
index e451ea9..846480e 100644
--- a/GSCats.xcodeproj/project.pbxproj
+++ b/GSCats.xcodeproj/project.pbxproj
@@ -20,6 +20,8 @@
 		70E9D8611F2BD95400555C19 /* gscats.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = gscats.s; sourceTree = "<group>"; };
 		70E9D8621F2BD95400555C19 /* macros.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = macros.s; sourceTree = "<group>"; };
 		70E9D8631F2BD95400555C19 /* Makefile */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = "<group>"; };
+		70F0869F1F413A89002446C3 /* player.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = player.s; sourceTree = "<group>"; };
+		70F086A01F4230CB002446C3 /* utility.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = utility.s; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXGroup section */
@@ -33,7 +35,9 @@
 				706DF1641F2D39F700AA6680 /* loader.s */,
 				700FFAFB1F40F3BF00A442DE /* font.s */,
 				706DF1651F2D4A8100AA6680 /* terrain.s */,
+				70F086A01F4230CB002446C3 /* utility.s */,
 				700C39C51F2E5CA800C24F9C /* tables.s */,
+				70F0869F1F413A89002446C3 /* player.s */,
 				70E9D8611F2BD95400555C19 /* gscats.s */,
 				70E9D8631F2BD95400555C19 /* Makefile */,
 				7088096D1F2ECE8D00D4C950 /* GenerateRenderSpans.py */,
diff --git a/graphics.s b/graphics.s
index d23c9bb..b04a838 100644
--- a/graphics.s
+++ b/graphics.s
@@ -112,7 +112,6 @@ setPaletteColor:
 ; PARAML0 = Pointer to 32 color bytes
 ; A = Palette index
 ;
-
 setPalette:
 	SAVE_XY
 
@@ -139,6 +138,23 @@ setPaletteLoop:
 	rts
 
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; drawNumber
+;
+; A = Number to render
+; X = VRAM position to render at
+;
+; Trashes PARAML0
+;
+drawNumber:
+	sta PARAML0
+	jsr intToString
+	lda #intToStringResult
+
+	jsr DrawString
+	rts
+
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Vertical blank checkers
 ;
diff --git a/gscats.2mg b/gscats.2mg
index eecd4664456b2ca83b49e9f08b62085b01be2c73..ecb83903435854cc97bb093dfb2f5e49490b4b99 100644
GIT binary patch
delta 1227
zcma)5Z%i9y7=P*D)_d>0e=XA%#&UxdX%xLN*$Sj7Y!cCQy1A_-izGxxvYGH<AC@3y
zQgx@z;tlXz!XnGnPLiJ5F-I2dhbEPUq|6X6W?RhSv^36?7_gGy2VkpDX%;^$8sEF$
z{hs&v^Ly{T=e<;@DHUqE@<xT&dkFD$I|xG8k+o=8v<}P6R6F(9+m@#eY29bsL;W}_
zPr6eX`rBc6PRm9$txyI+(kPDB)=K+mY0xf-c4^!e0p~<Ox{X7`5%<ykrZxYZ>Z4<l
z*Czd7jeBWfo3SIHP*Ou6-bUwdmvr5}lI~ACt<ujn$j4aiph3<k6jU$G`%hZqruBtF
zp-MHa{*#(bak+f->;aVjqpAuLdL3)iGAx(Rw6;E+8f8dr(_U5T8xf3wtTfr2%BZW@
zK*L~69*4;qrsZKUrlmG@9UF!5>PT8U5Dt1*aWN;phD*`-I<D^S{l5~I+TXWmFNeFu
zM^v<L!krB4{YJoO2}<RRwjMq>WMRe;bCq%zkoo|}5i|Dyo8^P6$9tC$^Ce=wDn>jD
z62h^|7Dnn~mMs6=q3;tDjAy|`VhI<~ku;xpg6I|?H_;<NPZB)})JXL9?emFeh`twS
zC($!NyNI3z8fqqbsCGWFhv@GDwGdsZn@_Y6y|!+?*G0VK2<ayZxk#>&IdYHOCtKJ?
zwv+8)Pq8XH!6w;T>>^vi)o{(+ey)!@&7J4s+zfY@Tj5yV#e4Z9d_S-77x`=a9Dk3$
z&u<YLg-)SII3=jUgpjNeZV8J*g;*mti~Ges@w9kejEghkU2#QZZKK<rQ}3MJOf~#R
z-y+9Qv2`A!<M5(SyE0NW^vH)Vwy*2XQIBEx7U3{Pk0Hldj8BXlR;Wa-@+0auxZJ2f
z`_YA5WqQM9ylDe_%(L(rirp~HVnhB#;VK1*MTPW+HRgGxRP)P5&C$r~$jDVH)ETQJ
z+ru(;7?)5VrBI=z!3|0HW1<L+57?72`;2v@AzyFYLF#}#mn%88=BwfZ+9#vV#|P{*
z>I(geP^rX-*%fEf7o7TT^ozaQI%xT|Sx=eJqd3!PkC8@yQu4vs6cYUS^Q5VLeA7SF
zfa*~rYC^D&F^q8xmNl*i;2b7C4MZJCx{Ql&Om)2UyuY&*lCtz$^_1f5b3VO0NKxj>
zkH4#Xf>}9=B4x?lL6gsAHkp5Y*b+2kwKW)e7JTl!$pAS{$QN3I=^U6Z!YIv>br9zt
zhM+VXhT3VlxF-Cdr7@Mcd2Z`_?D7Zfav8t^*aRpCQ~)TzW`Gqy1Mt`EGPCR4-@iKK
A{Qv*}

delta 1051
zcmaKqZ)g)|9LJv|=6Zjg`<E0+Q&%2a)MOiS)@_{KsAs7VS%_JY8U-<IzUT%6U-+V|
z&K{fDf^fFky{RDFk?lpEb+>l*h2}*eR)p(dELfFV1d}pGO3`I~B@VqkX&D1$yXQX7
z_xC)%-}61V-&4_hD|+wjCqen<5a4@yL;!99x)u1%L;l-y8nyj`-xxA87vtmS*;QpG
zUa2uRC&;{@;4UUdVE~ZL7Q4IA5K{y!9$-)#hdvLZ_As(S=mD$4h?8PIU80+VMv5sR
zErjmTj>bq`c+YT-LT?N^{Y>-zmUaB#mi5DZG^&S4J<A$th8SVb3mF=dJV!fA^byaC
z8cTHYoGIpZ?Mg9=Y0&&58YTH`<gW#Ve6CsR>-%SkeZc59PvmwV;1Y+E$)o7_(V^rZ
zAkXM3nt8iYGoG^;Opst^ge+dLj50xj1@x}rvDmxXX}jj3{PDfd*;bA7g5AnG9^0A8
z{-?#a+E;$@B_C7EXXICGOq@S#KFg=agWS~sca4gB!0>TSfcwSARkwZiY$W?6!2J;5
zerjdZH3Znwk3kN-&piqL`|7`zOPsnEgQao|S^(9{uS3gE<V|SVMD{|fNJN2_wzFRD
zh1LL(x1d!c@(#3CiHxhz(!1;BK4^VG<UMGio_e_-THQVMYz%5J1JA-dwBZd{g$)S!
z2(R!7KFg2tlYEJ<@XLIYrv)UaLRuIRbYV)E6<nbvJQXA{CTe0vJS*l!Tf8Aw#fAu^
zh@?mfDJzXilTt~lye2J6O^KF~tjcM5MAqdgc~*Ain*3CjLWP|ja~CePQL+DNmVE}a
z`laH*V~<m&GZ{Vd%Fk}~EU|J@#rWW3avO_hK;#n3erz7gQRVgaZ>ZnNhy#yFf-CFo
z?&cOgAG)$`N`>tQUOI4%A~mf8?q)Qlu6+keKUW{MT9!Cze+2M)dycwDqy6UTLT73$
zJU<=2O;5&}yYUJz#=?!p*2a!z)ENsiV5LAc8m?QhLG@0{11EsKyqQVpzX4zaPy_%^
zhjShC_VAorm>%d#Gs=gHs!uwV>u_BayWmes`CzdEq$K<O{64dAH#s+c@A3{a?YF+<
fH@@aKd;~usK-fkI5-36&fhI5n_By}8?Z5mtkn*7$

diff --git a/gscats.s b/gscats.s
index dec1e4c..bb04d9e 100644
--- a/gscats.s
+++ b/gscats.s
@@ -29,14 +29,12 @@ mainBank2:
 	ldx #$2222
 	jsr colorFill
 
-	ldx #2560
-	lda #string
-	jsr DrawString
-
 	jsr generateTerrain
 	jsr compileTerrain
 	jsr clipTerrain
 
+	ldy #0
+	jsr renderPlayerHeader
 
 mainGameLoop:
 
@@ -164,8 +162,7 @@ quitRequested:
 	.word $0000
 mapScrollRequested:
 	.word $FFFF
-string:
-	pstring "HELLO WORLD"
+
 
 ; Position of map viewing window. Can be visualized in two ways:
 ; a) Word-distance from right edge of terrain data (which is in memory right-to-left) to left edge of visible screen
@@ -179,6 +176,8 @@ leftScreenEdge:
 .include "font.s"
 .include "terrain.s"
 .include "gameobject.s"
+.include "player.s"
+.include "utility.s"
 .include "tables.s"
 endMainBank2:
 
diff --git a/macros.s b/macros.s
index 7b3efdd..353e334 100644
--- a/macros.s
+++ b/macros.s
@@ -180,3 +180,14 @@
 	plx
 .endmacro
 
+
+.macro SAVE_P0				; Saves PARAML0
+	lda PARAML0
+	pha
+.endmacro
+
+
+.macro RESTORE_P0			; Restores PARAML0
+	pla
+	sta PARAML0
+.endmacro
diff --git a/player.s b/player.s
new file mode 100644
index 0000000..87c0fd9
--- /dev/null
+++ b/player.s
@@ -0,0 +1,44 @@
+;
+;  players
+;  Code and data structures related to the players
+;
+;  Created by Quinn Dunki on 8/13/17
+;
+
+
+playerData:
+	; gameobject data
+	.word 40	; X pos in pixels (from left terrain edge)
+	.word 38	; Y pos in pixels (from bottom terrain edge)
+
+	.word 45		; Angle in degrees from +X
+	.word 50		; Power
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; renderPlayerHeader
+;
+; Y = Player index to render
+;
+renderPlayerHeader:
+	SAVE_AXY
+
+	tya		; Index to player structure
+	asl
+	asl
+	asl
+	tay
+
+	ldx #0
+	lda #angleStr
+	jsr DrawString
+
+	lda playerData+4,y
+	ldx #24
+	jsr drawNumber
+
+	RESTORE_AXY
+	rts
+
+angleStr:
+	pstring "ANGLE:"
diff --git a/utility.s b/utility.s
new file mode 100644
index 0000000..092db98
--- /dev/null
+++ b/utility.s
@@ -0,0 +1,95 @@
+;
+;  utility
+;  Helper routines
+;
+;  Created by Quinn Dunki on 8/14/17
+;
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; intToString
+;
+; PARAML0 = Number to convert
+; Returns result as pascal string in intToStringResult
+;
+intToString:
+	SAVE_AXY
+
+	; Convert value to BCD digits
+	; This section courtesy of John Brooks
+	sep #9
+	tdc
+	rol PARAML0
+intToStringLoop:
+	sta SCRATCHL
+	adc SCRATCHL
+	rol intToStringBCD
+	asl PARAML0
+	bne intToStringLoop
+	cld
+	xba
+	sta intToStringBCD+1
+
+	; Convert digits to characters
+	BITS8
+
+	; Skip leading double zeros
+	ldx #0
+	ldy #1
+
+intToStringSkipLoop:
+	lda intToStringBCD,x
+	bne intToStringSkipSingle
+	inx
+	cpx #3
+	bne intToStringSkipLoop
+
+	; Special case for full zero
+	sty intToStringResult
+	lda #'0'
+	sta intToStringResult+1
+	bra intToStringDone
+
+intToStringSkipSingle:
+	; Process transition from leading-zero nibble
+	lda intToStringBCD,x
+	and #$f0
+	bne intToStringFullDigitsLoop
+	lda intToStringBCD,x
+	clc
+	adc #'0'
+	sta intToStringResult,y
+	iny
+	inx
+
+intToStringFullDigitsLoop:
+	; Remaining bytes all contain two digits
+	lda intToStringBCD,x
+	lsr
+	lsr
+	lsr
+	lsr
+	adc #'0'
+	sta intToStringResult,y
+	iny
+	lda intToStringBCD,x
+	and #$0f
+	clc
+	adc #'0'
+	sta intToStringResult,y
+	iny
+	inx
+	cpx #3
+	bne intToStringFullDigitsLoop
+
+	; Store final length and we're done
+	dey
+	sty intToStringResult
+
+intToStringDone:
+	BITS16
+	RESTORE_AXY
+	rts
+
+intToStringBCD: .byte 0,0,0
+intToStringResult: .byte 0,0,0,0,0,0