From 4a9958e5aca026b4b59c33dfc683cba71f6197d3 Mon Sep 17 00:00:00 2001
From: blondie7575 <qd@quinndunki.com>
Date: Sun, 25 Jun 2023 18:43:07 -0700
Subject: [PATCH] Added power indicator to crosshair

Fixed years-old bug in terrain unclipper which caused it to spray garbage in bank 3. My god, what a bug.
---
 Art/015Crosshair1.gif                       | Bin 0 -> 123 bytes
 Art/015Crosshair1.xcf                       | Bin 0 -> 971 bytes
 Art/{015Crosshair.gif => 016Crosshair2.gif} | Bin
 Art/{015Crosshair.xcf => 016Crosshair2.xcf} | Bin
 Art/017Crosshair3.gif                       | Bin 0 -> 127 bytes
 Art/017Crosshair3.xcf                       | Bin 0 -> 987 bytes
 Art/018Crosshair4.gif                       | Bin 0 -> 130 bytes
 Art/018Crosshair4.xcf                       | Bin 0 -> 998 bytes
 Art/019Crosshair5.gif                       | Bin 0 -> 130 bytes
 Art/019Crosshair5.xcf                       | Bin 0 -> 1000 bytes
 SpriteBank#060000                           | Bin 4212 -> 5007 bytes
 crosshair.s                                 |  18 +++++++++++++----
 gamemanager.s                               |  21 +++++++++++++++++---
 input.s                                     |   5 +++--
 macros.s                                    |  14 +++++++++++++
 player.s                                    |  11 ++++++----
 spritebank.s                                |   8 +++++---
 terrain.s                                   |   7 +++----
 18 files changed, 64 insertions(+), 20 deletions(-)
 create mode 100644 Art/015Crosshair1.gif
 create mode 100644 Art/015Crosshair1.xcf
 rename Art/{015Crosshair.gif => 016Crosshair2.gif} (100%)
 rename Art/{015Crosshair.xcf => 016Crosshair2.xcf} (100%)
 create mode 100644 Art/017Crosshair3.gif
 create mode 100644 Art/017Crosshair3.xcf
 create mode 100644 Art/018Crosshair4.gif
 create mode 100644 Art/018Crosshair4.xcf
 create mode 100644 Art/019Crosshair5.gif
 create mode 100644 Art/019Crosshair5.xcf

diff --git a/Art/015Crosshair1.gif b/Art/015Crosshair1.gif
new file mode 100644
index 0000000000000000000000000000000000000000..2dd879da658ad4afbc92b3b6558596f842184baf
GIT binary patch
literal 123
zcmZ?wbhEHb6krfwc+AhR<o<7l1_mJNNE19W)A-$Pm%C|c|7Wf$FE9Vkz_5M$_PclQ
zGL-LL=(CK0f#LuE|BC+vor_WvOHxx5$}>wc6x=<10~mCGazNt*7#LWj1x|Rb-fQtX
bHuzD(_sshdN$L~Q;$EzJtbM+ig~1vC@F6id

literal 0
HcmV?d00001

diff --git a/Art/015Crosshair1.xcf b/Art/015Crosshair1.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..65e85dcdcaabaa306959e2bd9becb851942490eb
GIT binary patch
literal 971
zcmb7CzfTlF7@gfC!W|-@Xa&jOuN=iCcfnc{G#C>|O!y0yz1d~L-7eW(Sg4@1w8g~2
zXebN~)fH4$HvS72Ya1FH6O&ut+nb3?V&mI;Gw=H`d*AoXhPuBe5B)$MwA&p4%o)1a
z9q<Y5Pv3uw6M^5GVE)_b>ec0oVGtCjpYuE~gcuA4!{JcmmmfCHkX;n;iFwfB3+{kZ
zYj1@hfdy~^Y=HNSX5L-!CpZ(Lq?RA|`zp#{msQ+;o+vL<U771_N4|Wu`I?crGFA7z
zP_@EDcWw50GtG{AN~Up7cUKzCAoSy2oXBRmwUTh#lkM{9tRTGok8nqp55tG)p6BZ*
zl$|!LqidEiTKkdCq>lU@mGVR!1gXkonP1Ukc|Dmm8#wRA!u??!_AWTC={3*a4U>33
zD%<4s5H~=EIr3%dXD3)Oagcsawr(^walfJ$E1I{#d_sa&PgnHKik_+HS!n*B#UzA1
z|EQuLQse6wVSivW>$YEn?FlaTJr=@_0DZU@W0&>0Uudrjr@jO>#IHI##WML<HcWJ#
zsrFs7TdJr0OvjPj^wM31Y`J!v$M7xF|8z8BiT^uJ$+IAF3#3L1WeGLxz+;dTt-?-%
YsRp%=5VmsoYXcK7zS>vX$Broe0OR6}F#rGn

literal 0
HcmV?d00001

diff --git a/Art/015Crosshair.gif b/Art/016Crosshair2.gif
similarity index 100%
rename from Art/015Crosshair.gif
rename to Art/016Crosshair2.gif
diff --git a/Art/015Crosshair.xcf b/Art/016Crosshair2.xcf
similarity index 100%
rename from Art/015Crosshair.xcf
rename to Art/016Crosshair2.xcf
diff --git a/Art/017Crosshair3.gif b/Art/017Crosshair3.gif
new file mode 100644
index 0000000000000000000000000000000000000000..5f901eb7e78bebf3983a0b8cc1f83be4c8c5be71
GIT binary patch
literal 127
zcmZ?wbhEHb6krfwc+AhR<o<7l1_mJNNE19W)A-$Pm%C|c|7Wf$FE9Vkz_5M$_PclQ
zGL-LL=(CK0f#LuE|BC+vor_WvOHxx5$}>wc6x=<10~mCGazNt*7#LXO1x|Rb-dnM3
f%I^Dd6^#<<Uh2yk)nBht);agY=X9B$D}yxvsiHCF

literal 0
HcmV?d00001

diff --git a/Art/017Crosshair3.xcf b/Art/017Crosshair3.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..ae8d5526554a5f3befd5542547911d41932d279f
GIT binary patch
literal 987
zcmb7Czfaph6h7OiO`sIgmQF=F`U8a_Qlc_bi6SASA|de?80TzGBsQ`Q4ik(WyMn|}
zsp?R5sTeXaF|n|BiuxaPfu*Vx_j{K+=_0Z8*`M!wKYV`gJ4dp+&wD}051Y*vgUxEV
zSRG)Q{4c-$vJ-~;V_3U6ef#@zZ4id#>9?XNO2+#A{$Ma*#pUM@Ur}9_h_M>r&<0O|
z%IYV^2(V|s1n^vgIMvMox4?9SmKs6Q?TR>uuaZyRr^3%gn-?<Q<?9=pTa=kqrLyZs
zq7kLCZK}W5v;3$dc$Rczdug&BMnTd^QeIa}BaL=^-c(m>3F)1C(k-qoO82sTKag?6
zTTOUJW1e;z2eHh#jDuZ~(Hlt^W+LaR-r^%VUQ9h}bIwM@{i6fsEJ&iMRX^B^(&Qjk
zW76@EJpd?8k}nW{cY-Gr2PjU;RyD`MURwNx#V0M!Ek0%OM;4#9_zXCG&)7o{`Zn1c
z!0^|^@plZdzS5lfHh+Yf2_g3!4>BVG=5T+ELMG;3k-x~C>bypU-BmFy=2eR~?pCbI
zMS9ijJ+m!3BFJSD^G!e7qm*gc$a{>Kl6Pe|q?Z3zUT*FASaUiWYQY0w)DkIdn^A^J
XwRsmHrgOx-Yn{+B?<e`k4lDlwAGwU5

literal 0
HcmV?d00001

diff --git a/Art/018Crosshair4.gif b/Art/018Crosshair4.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f1c84fe46fb7047ab6cf90acb5a31003edfc34b2
GIT binary patch
literal 130
zcmV-|0Db>QNk%w1VGsZi0OJn;q~H4hfB*o10ElK0%$YOpyF}e)X8)P0cXxOH006hQ
zx82>{0C&5gOr`(;0RR90A^s6Va%Ew3Wn>_CX>@2HM@dak04x9i000mG5C8xKA`r+)
ktCcC;o45Z{2ac9lYA6Pv+M2d+dy;f0*P{vQ_!I#EJ4<OZ$^ZZW

literal 0
HcmV?d00001

diff --git a/Art/018Crosshair4.xcf b/Art/018Crosshair4.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..53d65e13a5384749e437e4c7614131078be0445b
GIT binary patch
literal 998
zcmb7CziSjh7@fTp<0YQ?rKuDq{^C*`+!5;tQ4qm^;9s!Wo82tA+YP&$Y*HnqrELU@
zK(G)St1AM6y_NkTh_#KSaO-<>GcW-g-`?BreLrSzzHcT@hI{fbjO0PL+Y`WoVFT6!
zAJISm{zse${9Z?kUr*P6T|6B}QGNQMs;XLu(P%Utk41HH_ToLN>l!h!2zva$GI(wC
zjSwVo6TAY>f-6R|?iTnPY{l48C(MRJm6q`JE|#9;DkxQ7R!O-dpFQ7t$;^T-O@=|N
zI&q%#ZS}`?Q63GHEV4n;Uz=@5ahMIVT(-68<neYOyZY&^A-(;NbWiGs>BC|#2$M9H
zy)L|?OP+B$`)N|jBn@{|!4+8)6{?iF-qBNextM!4@ZL^^&+!oUEa=Z|2H|d;XZxvc
zlgC3`1)1i^SE(PL;EjocjB~P0qhZ8dN8ffdPlNS@1g)NP^mRwK96b-s|Ff8Zu<IW<
z`aU&o#{~AC(cHJa5w<6U8t?ET><G|D<I^-`V~sELSA^GWfp-jNV1J@zG|g9&RtxL1
zz!q~M@1Xspn17`PDlC&Mm0Llv%arZJPWl+JRmL|a6Yl<hCoQ=aByNDz=uU6JhXo#j
c9JUKPB$gWZpCOz9`QJ>!#QY!hk3CWU1v=Y`;Q#;t

literal 0
HcmV?d00001

diff --git a/Art/019Crosshair5.gif b/Art/019Crosshair5.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c1121665a286401cd6ca36131fde2163a7426a82
GIT binary patch
literal 130
zcmZ?wbhEHb6krfwc+AhR<o<7l1_mJNNE19W)A-$Pm%C|c|7Wf$FE9Vkz_5M$_PclQ
zGL-LL=(CK0f#LuE|BC+vor_WvOHxx5$}>wc6x=<10~mCGazNt*7#LWT1Ws@UEwXr>
iyZwJKd*95C*bLRB8mm|3RZje3b$v-^^Dhxb25SI4{4=xw

literal 0
HcmV?d00001

diff --git a/Art/019Crosshair5.xcf b/Art/019Crosshair5.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..b7bb7591a4fcf95f4a28ea4801c44a8781a864d6
GIT binary patch
literal 1000
zcmb7Czi-n(7(K@*ke1S4zy#8jUrL8aiRcVcK|)AWLgFuQowIvtVpq0{+o>HHyS5TT
zCB%SOm@;&Mosl(yftiI7Dds)rPPzgM@ACY;@5jaWedkyYcjR6e$(P-3PXG&s4OkCc
zqyOgXFL5aFdlfByKED6s?D05?s^fQMSyn=fMx*g~EXuRfXKztmRfvg2(BmI0gO}Ei
zgdl;d;0167ylyn>u7N+nxfn<4gz0dok^+8xils-H3JTSir7pJQlcyWcnOUey^)QH4
zC(d-=R=;oO#r{CaJRRu%>P$O|!*q~lvR#`_7H<Z!Td&?K(wqNC_hh}8-phA_P$#kM
zb>Z!w^NiEkO>`l35^kxSJJKl1RUzwoM^EMXVxHN+JDCc<X#(~xIIh|CAl#0#bT_Hn
z<n<6NWtt;jp?-LXCngRu&dIinh7q?MeZ$eb4b~G9w0hRjmmNLl=y_<q&*CD4-GA57
zcc}4oOki&t&2!r?!uEtv<24?H9Rd1ie3*u8tnrC{Q+TbL4x8dz3mtPA)B4l@dyDg;
z`4?)S!a}Es+z9e*zQXomXMKR!3gZtZ6Q2KnXDzuGB(8we=&$a}hXw9|9JdQQCYBob
UA0eC(`Cm-J#Qg8{4?I!*20I6e>i_@%

literal 0
HcmV?d00001

diff --git a/SpriteBank#060000 b/SpriteBank#060000
index ac3df34394ee0c72a48e65aa0d9f668d26e29a4d..42dc42f88d9b452bd147a80aa73900c5ac835c56 100644
GIT binary patch
delta 623
zcmeyO(64Ujy_#!P4JQKw!wErVfq1?LJjvWaT#=jw96jtC*{-qvWienWVLrrU!nA@>
zj&VAJA;V+?CXtD@Z@sNE8<?aQGi!d}=j5Ew%xs<Mz=*_MyhxLupL4>5=0%H_Xny#>
z$;sKg1fqlqD#5gv1uDTZc`cLV<Rk$hkkOm97|$@)qnU=EyLchg$c2j+Yw~~KoWR+<
zc=1xG;Y%TU8KFuTfi8w9VP4D%Rl*9?2JyvW>&yorUrgS|#KDVV>Er|f5wP>VF~u;m
zSZ6L^nC!u%l7gb9nR)R7s6h*``G4^;sO&O`HU=n{VKJ64S<D8NWdnr{D0nCDVzQ~n
x8Q^FxLE{1)28j-w4g*IK++h&Km=5FRY-Rzu46GXLG8r_RP`L0=3u05^0syfL!88B>

delta 67
zcmV-J0KET?C-fjFOREa1d<g&m0Id$_3`7gX2}lSx2R;U41&9Q%1L6WO0-^yH0gnJF
Zu`mJwv%CS!0h34qT%(`_1G8-jA_|Xk66XK_

diff --git a/crosshair.s b/crosshair.s
index 6aaa9af..51ce6d9 100644
--- a/crosshair.s
+++ b/crosshair.s
@@ -18,11 +18,11 @@ crosshairGameObject:
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; updateCrosshair
 ;
-; Y = Player index to render for
+; Y = Player index to update for
 ; Trashes SCRATCHL, PARAML0, PARAML1
 ;
 updateCrosshair:
-	SAVE_AX
+	SAVE_AXY
 
 	PLAYERPTR_Y
 
@@ -68,19 +68,28 @@ updateCrosshairCalcY:
 
 updateCrosshairDone:
 
-	RESTORE_AX
+	RESTORE_AXY
 	rts
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; renderCrosshair
 ;
+; Y = Player index to render for
+; Trashes Y,PARAML0,SCRATCHL
 ;
 renderCrosshair:
 	pha
+	PLAYERPTR_Y
+
 	lda #crosshairGameObject
 	sta PARAML0
-	lda #15
+
+	lda playerData+PD_POWER,y		; Choose reticle size for power level
+	sta SCRATCHL
+	lda #14
+	clc
+	adc SCRATCHL
 	jsr renderGameObject
 
 renderCrosshairDone:
@@ -91,6 +100,7 @@ renderCrosshairDone:
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; unrenderCrosshair
 ;
+; Trashes PARAML0
 ;
 unrenderCrosshair:
 	pha
diff --git a/gamemanager.s b/gamemanager.s
index 158c4b6..4067774 100644
--- a/gamemanager.s
+++ b/gamemanager.s
@@ -103,24 +103,31 @@ gameplayLoopBeginUpdate:
 	lda projectileActive			; Skip interactivity during shots, but still allow map scrolling
 	bpl gameplayLoopShotTracking
 	lda dirtExplosionActive
-	bne gameplayLoopRender			; Skip interactivity during dirt explosions
+	bne gameplayLoopRenderJump			; Skip interactivity during dirt explosions
 	bra gameplayLoopScroll
 
+gameplayLoopRenderJump:
+	jmp gameplayLoopRender
+
 gameplayLoopShotTracking:
 	jsr trackActiveShot
 
 ;	BORDER_COLOR #$1
 
 gameplayLoopScroll:
-
 	; Scroll map if needed
 	lda mapScrollRequested
 	bmi gameplayLoopAngleCheck
+
 	jsr scrollMap
 
+
 gameplayLoopAngleCheck:
 	lda projectileActive			; Skip interactivity during shots
-	bpl gameplayLoopRender
+	bpl gameplayLoopRenderJmp
+	bra gameplayLoopAngle
+gameplayLoopRenderJmp:
+	jmp gameplayLoopRender
 
 gameplayLoopAngle:
 	; Update aim angle if needed
@@ -328,6 +335,13 @@ scrollMap:
 	jsr unrenderPlayers
 	jsr unrenderProjectiles
 
+	pha
+	lda projectileActive		; Crosshair is visible if projectile isn't
+	beq scrollMapApplyScrolling
+	jsr unrenderCrosshair
+
+scrollMapApplyScrolling:
+	pla
 ;	jsr updateProjectilePhysics	; Good idea?
 
 	sta mapScrollPos
@@ -345,6 +359,7 @@ scrollMap:
 	jsr protectProjectiles
 	jsr renderPlayers
 	jsr renderProjectiles		; Prevents flicker, but ads jitter to shot tracking
+
 	lda #1
 	sta terrainDirty
 	stz projectilesDirty
diff --git a/input.s b/input.s
index 8c76e9c..c2673e1 100644
--- a/input.s
+++ b/input.s
@@ -35,7 +35,7 @@ kbdScanGameplay:
 	cmp #(' ' + $80)
 	beq kbdScanSpace
 	cmp #(9 + $80)
-	bne kbdScanDone
+	bne kbdScanDebugPiggyback
 	jmp kbdScanTab
 
 kbdScanDone:
@@ -47,7 +47,8 @@ kbdScanDebug:
 	lda KBD
 	bpl kbdScanDone
 	sta KBDSTROBE
-	
+
+kbdScanDebugPiggyback:
 	cmp #(27 + $80)
 	beq kbdScanESC
 	cmp #(127 + $80)
diff --git a/macros.s b/macros.s
index fe65ea9..c24975f 100644
--- a/macros.s
+++ b/macros.s
@@ -242,6 +242,20 @@ done:
 .endmacro
 
 
+.macro MEMCHK	; Check to see when a memory value has been stepped on
+	.local chkdone
+	pha
+	lda $0311CC
+	cmp #$4242
+	bne chkdone
+	lda #1
+	sta $e1c029
+	pla
+	brk
+chkdone:
+	pla
+.endmacro
+
 ;;;;;;;;;;
 ; Stack Macros
 
diff --git a/player.s b/player.s
index b09700f..58c068e 100644
--- a/player.s
+++ b/player.s
@@ -61,6 +61,9 @@ PD_CURRWEAPON = 166
 PD_TREATS = 168
 PD_SIZE = 256
 
+MAX_POWER = 5
+MAX_ANGLE = 180
+
 .macro PLAYERPTR_Y
 	tya		; Pointer to player structure from index
 	asl
@@ -125,7 +128,7 @@ playerDeltaAngle:
 	clc
 	adc playerData+PD_ANGLE,y
 	bmi playerDeltaAngleClampLow
-	cmp #180
+	cmp #MAX_ANGLE
 	bpl playerDeltaAngleClampHigh
 
 playerDeltaAngleStore:
@@ -138,7 +141,7 @@ playerDeltaAngleClampLow:
 	bra playerDeltaAngleStore
 
 playerDeltaAngleClampHigh:
-	lda #180
+	lda #MAX_ANGLE
 	bra playerDeltaAngleStore
 
 
@@ -156,7 +159,7 @@ playerDeltaPower:
 	clc
 	adc playerData+PD_POWER,y
 	beq playerDeltaPowerClampLow
-	cmp #15
+	cmp #MAX_POWER
 	bpl playerDeltaPowerClampHigh
 
 playerDeltaPowerStore:
@@ -169,7 +172,7 @@ playerDeltaPowerClampLow:
 	bra playerDeltaPowerStore
 
 playerDeltaPowerClampHigh:
-	lda #15
+	lda #MAX_POWER
 	bra playerDeltaPowerStore
 
 
diff --git a/spritebank.s b/spritebank.s
index dc1b62c..5a20dd2 100644
--- a/spritebank.s
+++ b/spritebank.s
@@ -2,18 +2,20 @@
 
 
 DrawSpriteBank :
- 	 ASL 	  	 ; A=Sprite Number ($0000-$000F)
+ 	 ASL 	  	 ; A=Sprite Number ($0000-$0013)
 	  	 TAX 	  	 ; Y=Target Screen Address ($2000-$9D00)
 	  	 LDA 	 SpriteBankNum,X 	 ; Relative Sprite Number Table
 	  	 JMP 	 (SpriteBankBank,X) 	 ; Bank Number Table
 	  	  	  	 
 SpriteBankNum :
- 	 .dbyt 	 $0100,$0000,$0A00,$0500,$0600,$0900,$0E00,$0D00 	 
-	  	 .dbyt 	 $0800,$0700,$0C00,$0F00,$0200,$0300,$0400,$0B00 	 
+ 	 .dbyt 	 $0100,$0000,$0C00,$0500,$0600,$0B00,$1200,$1000 	 
+	  	 .dbyt 	 $0A00,$0900,$0F00,$1300,$0200,$0300,$0400,$1100 	 
+	  	 .dbyt 	 $0E00,$0D00,$0800,$0700 	 
 	  	  	  	 
 SpriteBankBank :
  	 .addr 	 SpriteBankBank00,SpriteBankBank00,SpriteBankBank00,SpriteBankBank00,SpriteBankBank00,SpriteBankBank00,SpriteBankBank00,SpriteBankBank00 	 
 	  	 .addr 	 SpriteBankBank00,SpriteBankBank00,SpriteBankBank00,SpriteBankBank00,SpriteBankBank00,SpriteBankBank00,SpriteBankBank00,SpriteBankBank00 	 
+	  	 .addr 	 SpriteBankBank00,SpriteBankBank00,SpriteBankBank00,SpriteBankBank00 	 
 	  	  	  	 
 SpriteBankBank00 :
  	 JSL 	 $AA0000 	 
diff --git a/terrain.s b/terrain.s
index 9e7363e..ed71bb8 100644
--- a/terrain.s
+++ b/terrain.s
@@ -206,6 +206,7 @@ clipTerrainLoop:
 ; On first move-left unclip every second row is unclipped incorrectly
 unclipTerrain:
 	SAVE_AXY
+	
 
 	phd
 	lda #(CLIPPEDTERRAINSTACK & $f000)
@@ -220,9 +221,8 @@ unclipTerrain:
 	sec							; Find stopping point for stack-relative addressing
 	lda clippedTerrainStackPtr
 	and #$0fff
-	sbc #7						; 4 bytes past top of stack, +3 for starting offset
+	sbc #3						; -3 for starting offset
 	sta STACKPTR
-
 	lda #$0fff-3	; Start at the bottom of the stack
 	tax
 
@@ -234,7 +234,6 @@ unclipTerrainLoop:
 
 	lda 0,x
 	sta compiledTerrain,y
-
 	tya
 	sec
 	sbc #COMPILEDTERRAINROW+2
@@ -244,7 +243,7 @@ unclipTerrainLoop:
 	dex
 	dex
 	dex
-	cpx STACKPTR  ;#$e6f-7 ;$1000		; When x hits the top of the stack, we're done
+	cpx STACKPTR  			; When x hits the top of the stack, we're done
 	bne unclipTerrainLoop
 
 	pld