From c247ced5e3c5c24e927c75559b50bf090bad8ada Mon Sep 17 00:00:00 2001
From: Charles Mangin <option8@option8.com>
Date: Wed, 13 Jun 2018 16:30:50 -0400
Subject: [PATCH] added sounds

---
 MINESWEEPER.dsk | Bin 143360 -> 143360 bytes
 MINESWEEPER.s   |  72 +++++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 65 insertions(+), 7 deletions(-)

diff --git a/MINESWEEPER.dsk b/MINESWEEPER.dsk
index 67cdaf40166d262d473a29caee821d4eee818294..44d1f08a2defd83b8625b48d2fd05c9b771aef48 100644
GIT binary patch
delta 806
zcmaJ<L1+^}6x~TS$)aF3*$r-+XoiwlNC~FmL8WND^pryc5ijb32(1Xcduc3A5kaxp
z9=r%8y2U9dfq>v4&_f7pK-im754I?af+;Pcmfh{He>M{0#moQi|9Sua_h+WMB~-VB
z#u0R?Ez<<?F}QK!0`&R;>bnr}X%X^>ctEi{3!FBMGI<Dmi<RlVktqGJJlzBTg@%bo
zC!iqA>a~05^dz5J6_f|}9U8$e-B+cJLg750dTM@uXnv{--6gxlr^rE{a^m1g7+=@6
zksPf^x?}!sPKFU`qVNSlyc6Nx<uY-O`^<?9G%JT2VMVvi9^OvklSzC$iKmm4BQ|mH
ztR}_B7ak|dBMICHY&)=<fpr5r&+H>{1HYFU?W(Inpxa8JP*83;>n*OP82&Dgf5|F-
zEtOXS?w({hx?>0>(XwHdquYRaHWklGtO2e{poymfu`hQ1Ng6RA`oy+|vK`jUH^q)k
zV?i??N@Ig&O+Stf@m=$$s;#H5)JE5GHRJB?S<q#s^__iX4t*dyuyu=De#X^6Nd(l=
zTKec%TUMzLIlZ@k<{Pkja6?cLU{+Dy(~9Za3zt)bdpngP=!LJl%bZ%~#Cnv9{fA<6
z>m@1-MHPzs5uL~9KH@29HAxo-Xk~zOKvW`mJi{1oSUx}oAl1s_F_+3Dr)m?K><E*3
zgSc?>bErT(-3dJVJvTGOD4gQ2vZiJ7Gw|1X{hj}AGuU6noAU6>RsZu!8amb;4TN7B
X$h`&#RI%)H6he#Hr7T*@h7x}OiOya<

delta 658
zcmYjOO=uHA7@gUTxGLEF8Oj<rWCYj3)<`V26c1Iri3x~^NI}e{6nphl4^qV`5)f>s
zf*?YvZe;>WB_|KToB~@A7J3mpShX&ANb%=j*-dwy*~QSy``&xs_su+J<~EhNO=ayc
z99cq4BMIhZi1av(GXb+Ak%X1F4@t~Nf;ixXo`;srMG}ZLH}SOcpCEQ)UbmP`Vm8bd
zWU){0!84Z{Xjw5IK8RkI+m18QKu`T&b$@F`S)UJE4McXc?up&UGCswdzw7>YrjW1`
za*R3=9yQ#^|LcZ+7dKDK5H_KFPEqxJ;KT8g2LSj6R6&}T53R{YN5@FVvW{(?0TPl3
zSE)HLG;v$2APqlBk)`-P#V;w&2z;cr@hc?8uJ>v}P@^)Nx*HT0@*`Cvb*BuTB$oxm
zdpvJ{ImZ$b24UZ&p9k{F{}FM<ih7Vv=2xjIO~Na*Z4C}Cp&Cn`gGINyGyVg9BwZfA
zvO#YgoiRd0z`L)Az?X^JTL85RP-!lItzazctd7rqVg|ACuu#vq%Get^Zk3LRLvNCv
z8=AMELt-~dtN4z)R!Qbv`qr{9@}KMO@J@EAyPffE{&F?G={Sx#6*XF5(Yy0=%=8l9
z+&j_&3p}-_lqFWBR$+bgm<Tc^f~4#MXMvsZt9^I6&t_Bh0!r|HalQywi<0&aSnLU3

diff --git a/MINESWEEPER.s b/MINESWEEPER.s
index 2fe5464..7383665 100644
--- a/MINESWEEPER.s
+++ b/MINESWEEPER.s
@@ -75,7 +75,7 @@ STROBE       EQU   $C010
 SPEAKER      EQU   $C030
 VBL          EQU   $C02E
 RDVBLBAR     EQU   $C019       ;not VBL (VBL signal low
-
+WAIT		 EQU   $FCA8 
 RAMWRTAUX    EQU   $C005
 RAMWRTMAIN   EQU   $C004
 SETAN3       EQU   $C05E       ;Set annunciator-3 output to 0
@@ -225,8 +225,9 @@ ROWLOOP3								; (ROW 7 to 0)
 COLUMNLOOP3		CLC						; clear CARRY to 0 
 				DEY
 				STY COLUMN				; store column for later retrieval
-				
-				LDA $C030				; get byte, pseudorandom source?
+				LDA #$05				; SLIGHT DELAY
+				JSR WAIT
+				LDA SPEAKER				; get byte, pseudorandom source?
 				ROL						; random bit into Carry
 				ROL						; random bit into Carry
 				ROL BOARDORIGIN,X		; random bit into row byte
@@ -368,7 +369,23 @@ END				JSR HOME
 
 MARKMINE		STA STROBE				; solve current square and move to next space
 
-				JSR DRAWMINE			; solve square
+										; if current square is already solved, ignore
+				LDA ROW					; get ROW and COLUMN
+				CLC
+				ROL						
+				ROL						; offset = ROW * 8 + COLUMN
+				ROL
+				CLC
+				ADC COLUMN
+				TAX			
+				LDA PROGRESSORIGIN,X	; is progress already marked?
+				CLC
+				CMP #$FF
+				BEQ	GOMARKMINE			; STILL UNMARKED
+				JSR BONK				; ignore the mark, keep as solved.
+				RTS
+
+GOMARKMINE		JSR DRAWMINE			; solve square
 				
 				JMP NEXTSQUARE
 ;/MARKMINE
@@ -660,7 +677,7 @@ SHOWSOLVED		CLC
 *	puts * in selected square by ROW, COLUMN, increments score
 **************************************************
 
-DRAWMINE								; puts * in selected square
+DRAWMINE		JSR BEEP				; puts * in selected square
 				LDA ROW					; get ROW and COLUMN
 				CLC
 				ROL						
@@ -709,6 +726,7 @@ DRAWMINE								; puts * in selected square
 *	puts # of adjacent bombs in selected square by ROW, COLUMN, increments progress
 **************************************************
 DRAWSOLVEDSQUARE						; puts number in selected/solved square
+				JSR CLICK				; little sound clicks
 				LDA ROW					; get ROW and COLUMN
 				CLC
 				ROL						
@@ -736,8 +754,9 @@ DRAWSOLVEDSQUARE						; puts number in selected/solved square
 				STA PROGRESSORIGIN,X	; store progress
 				CMP #$08				; IF >= F0, found a bomb
 				BMI	SOLVENOBOMB	
+				JSR BONK				; BONK!
 				LDA #$52				; FOUND BOMB. YOU LOSE.
-				
+								
 SOLVENOBOMB		CLC
 				ADC #$30				; add #$30  (becomes #)
 				STA CHAR				; store as CHAR 
@@ -757,7 +776,7 @@ SOLVENOBOMB		CLC
 SOLVEBOMB		LDA #$FF				; unmark as bomb
 				STA PROGRESSORIGIN,X	;
 										; decrement bombs found
-				LDA SCORE				; inc as decimal for printy printy.
+				LDA SCORE				; decrement as decimal for printy printy.
 				SED
 				SEC
 				SBC #1
@@ -765,6 +784,14 @@ SOLVEBOMB		LDA #$FF				; unmark as bomb
 				STA SCORE
 				JSR PRINTSCORE
 
+				LDA PROGRESS				; decrement progress as well, so it will increment properly on jump
+				SED
+				SEC
+				SBC #1
+				CLD
+				STA PROGRESS
+				JSR PRINTPROGRESS
+
 				JMP DRAWSOLVEDSQUARE	; go back and solve it as normal
 
 
@@ -880,6 +907,37 @@ PLOTCHAR
 
 RESET			JMP DRAWBOARD
 
+**************************************************
+*	CLICKS and BEEPS
+**************************************************
+CLICK			LDX #$06
+CLICKLOOP		LDA #$10				; SLIGHT DELAY
+				JSR WAIT
+				LDA SPEAKER				
+				DEX
+				BNE CLICKLOOP
+				RTS
+;/CLICK
+
+BEEP			LDX #$30
+BEEPLOOP		LDA #$08				; short DELAY
+				JSR WAIT
+				LDA SPEAKER				
+				DEX
+				BNE BEEPLOOP
+				RTS
+;/BEEP
+
+
+BONK			LDX #$50
+BONKLOOP		LDA #$20				; longer DELAY
+				JSR WAIT
+				LDA SPEAKER				
+				DEX
+				BNE BONKLOOP
+				RTS
+;/BONK
+
 
 
 **************************************************