Change all music to my tone routine (some differences, but not too noticeable)

diff --git a/lemonade/Makefile b/lemonade/Makefile
index 8eb3ea1..492856e 100644 (file)
--- a/lemonade/Makefile
+++ b/lemonade/Makefile
@@ -6,13 +6,13 @@ TOK_TO_BAS=../tok_to_bas.py
 BAS_TO_TOK=../bas_to_tok.py
 
 .PHONY: all
-all: lemonade_patched.dsk lemonade_tone_nick.obj
+all: lemonade_patched.dsk lemonade_tone_patched.obj
 
-lemonade_patched.dsk: lemonade_patched.bin lemonade_tone_patched.obj lemonade_flash_patched.obj bootable.dsk
+lemonade_patched.dsk: lemonade_patched.bin lemonade_tone_nick.obj lemonade_flash_patched.obj bootable.dsk
        cp bootable.dsk $@
        ${DOS33} $@ DELETE HELLO
        ${DOS33} $@ SAVE A lemonade_patched.bin "LEMONADE PATCHED"
-       ${DOS33} $@ SAVE B lemonade_tone_patched.obj "LEMONADE TONE patched.OBJ"
+       ${DOS33} $@ SAVE B lemonade_tone_nick.obj "LEMONADE TONE NICK.OBJ"
        ${DOS33} $@ SAVE B lemonade_flash_patched.obj "LEMONADE FLASH PATCHED.OBJ"
        ${DOS33} $@ HELLO "LEMONADE PATCHED"
 

diff --git a/lemonade/lemonade.bas.patch b/lemonade/lemonade.bas.patch
index 5cbe0a0..67c23c0 100644 (file)
--- a/lemonade/lemonade.bas.patch
+++ b/lemonade/lemonade.bas.patch
@@ -1,10 +1,11 @@
 --- lemonade.bas       2022-05-20 00:21:16.340356477 +1000
-+++ lemonade_patched.bas       2022-05-20 20:12:12.764062545 +1000
++++ lemonade_patched.bas       2022-05-21 04:04:49.777205493 +1000
 @@ -1,5 +1,8 @@
- 1LOMEM:14080
+-1LOMEM:14080
 -5GOSUB10000:GOSUB11000:GOSUB16000:GOTO135
-+2PRINT CHR$(4);"BLOAD LEMONADE TONE PATCHED.OBJ"
-+3PRINT CHR$(4);"BLOAD LEMONADE FLASH PATCHED.OBJ"
++1HIMEM:38272
++2PRINT CHR$(4);"BLOAD LEMONADE TONE NICK.OBJ":RE=768:TN=776:DL=777:DH=779:FL=781:FH=788
++3PRINT CHR$(4);"BLOAD LEMONADE FLASH PATCHED.OBJ":FE=38278:FI=38383
 +4IN#0:PR#0
 +5GOSUB11000
  10REM  <<< LEMONADE STAND >>>
@@ -19,15 +20,15 @@
 -1144POKE768,152:POKE769,40:CALL770
 -1146POKE768,144:POKE769,80:CALL770
 -1148POKE768,128:POKE769,200:CALL770
-+1140POKE768,152:POKE769,80:CALL784
-+1142POKE768,128:POKE769,160:CALL784
-+1144POKE768,152:POKE769,40:CALL784
-+1146POKE768,144:POKE769,80:CALL784
-+1148POKE768,128:POKE769,200:CALL784
++1140POKEDL,203:POKEDH,222:POKEFL,248:POKEFH,3:CALLTN
++1142POKEDL,157:POKEDH,189:POKEFL,185:POKEFH,4:CALLTN
++1144POKEDL,102:POKEDH,239:POKEFL,248:POKEFH,3:CALLTN
++1146POKEDL,204:POKEDH,222:POKEFL,53:POKEFH,4:CALLTN
++1148POKEDL,4:POKEDH,173:POKEFL,185:CALLTN
  1180REM  CALCULATE PROFITS
  1182IFR2=2THEN2290
  1183IFR3=3THEN2350
-@@ -201,50 +204,47 @@
+@@ -201,50 +204,44 @@
  5060GOSUB18000
  5070REM 
  5090HOME:RETURN
@@ -75,34 +76,39 @@
 -11340COLOR=12:IFI<29THENVLIN18,37ATI+11:POKE32,I+11:VTAB11:HTABI+12:PRINT:READA$:PRINTA$;
 +11340COLOR=12:IFI<29THENVLIN18,37ATI+11:COLOR=11:ONI-6GOSUB 11490,11490,11490,11490,11496,11495,11495,11495,11494,11490,11490,11493,11491,11492,11491,11491,11490,11490,11490,11490,11490,11490
  11350FORJ=14TOI+I:NEXT:NEXT:FORI=1TO1000:NEXT
- 11360COLOR=13:VLIN14,36AT12:FORI=36TO20STEP-1:HLIN8,16ATI
+-11360COLOR=13:VLIN14,36AT12:FORI=36TO20STEP-1:HLIN8,16ATI
 -11370FORJ=1TO50:NEXT:POKE768,I*3-12:POKE769,12:CALL770:NEXT:COLOR=12:VLIN14,19AT12
 -11400POKE32,0:POKE33,40:POKE34,20:POKE35,23:VTAB22
-+11370FORJ=1TO50:NEXT:POKE768,I*3-12:POKE769,12:CALL784:NEXT:COLOR=12:VLIN14,19AT12
++11360COLOR=13:VLIN14,36AT12:POKEDH,251:FORI=36TO20STEP-1:HLIN8,16ATI
++11370READJ,K,L:POKEDL,J:POKEFL,K:POKEFH,L:CALLTN:POKEDL,2:CALLRE:NEXT:COLOR=12:VLIN14,19AT12
  11410FORI=1TO4000:NEXT:I=FRE(0)
  11490RETURN
+-11500REM  DATA
+-11510DATA96,180,128,60,114,60,128,120,144,60,152,60,128,255,128,60,114,60,85,120,96,60,102,60,114,120,102,60,96,255,0,0
+-11520DATA,,,,,,L;LL;,L;LL;,;;LL;;,L;LL;,L;;;;,,,;L;;;;,;L;LL;,;L;LL;,;L;LL;,;;;LL;,,,,,*
+-11530DATA96,16,85,4,128,4,96,4,76,4,128,4,96,16,0,0
+-11540DATA114,120,144,60,114,255,1,120,128,120,144,60,128,120,114,60,144,120,171,255,228,255,0,0
+-11550DATA152,180,152,120,152,60,144,120,152,60,171,120,192,60,152,255,0,0
+-11560DATA0,160,128,255,152,40,171,80,192,40,228,255,1,40,0,160,192,255,192,40,171,80,152,40,128,255,0,0
 +11491VLIN24,25ATI+11:VLIN30,31ATI+11:RETURN:REM c right, mid
 +11492VLIN22,25ATI+11:VLIN30,33ATI+11:RETURN:REM c bar
 +11493VLIN24,31ATI+11:RETURN:REM c left
 +11494VLIN22,23ATI+11:VLIN26,33ATI+11:RETURN:REM 5 right
 +11495VLIN22,23ATI+11:VLIN26,27ATI+11:VLIN32,33ATI+11:RETURN:REM 5 mid
 +11496VLIN22,27ATI+11:VLIN32,33ATI+11:RETURN:REM 5 left
- 11500REM  DATA
- 11510DATA96,180,128,60,114,60,128,120,144,60,152,60,128,255,128,60,114,60,85,120,96,60,102,60,114,120,102,60,96,255,0,0
--11520DATA,,,,,,L;LL;,L;LL;,;;LL;;,L;LL;,L;;;;,,,;L;;;;,;L;LL;,;L;LL;,;L;LL;,;;;LL;,,,,,*
-+11520DATA*
- 11530DATA96,16,85,4,128,4,96,4,76,4,128,4,96,16,0,0
- 11540DATA114,120,144,60,114,255,1,120,128,120,144,60,128,120,114,60,144,120,171,255,228,255,0,0
- 11550DATA152,180,152,120,152,60,144,120,152,60,171,120,192,60,152,255,0,0
- 11560DATA0,160,128,255,152,40,171,80,192,40,228,255,1,40,0,160,192,255,192,40,171,80,152,40,128,255,0,0
++11500REM  WELCOME MUSIC
++11510DATA95,181,79,6,27,231,185,4,29,231,78,5,54,206,185,4,25,231,53,4,25,231,248,3,134,131,185,4,27,231,185,4,29,231,78,5,68,206,22,7,32,231,79,6,31,231,244,5,57,206,78,5,31,231,244,5,159,131,79,6,0,0,0,0
++11520REM  CUP FILLING
++11530DATA6,78,5,6,159,5,6,244,5,6,79,6,7,176,6,7,22,7,7,130,7,7,245,7,8,111,8,8,239,8,8,120,9,9,9,10,9,163,10,9,69,11,10,242,11,10,169,12,11,107,13
  11700REM  MUSIC
- 11710READI,J:IFJ=0THENRETURN
+-11710READI,J:IFJ=0THENRETURN
 -11720POKE768,I:POKE769,J:CALL770
-+11720POKE768,I:POKE769,J:CALL784
++11710READI,J,K,L:IFJ=0THENRETURN
++11720POKEDL,I:POKEDH,J:POKEFL,K:POKEFH,L:CALLTN
  11730GOTO11710
  12000REM  TITLE PAGE
  12100TEXT:HOME:PRINTCHR$(7);
-@@ -318,7 +318,7 @@
+@@ -318,7 +315,7 @@
  15151IFSC=2ORSC=7THEN15160
  15152IFSC=10THENCOLOR=15
  15157IFSC=5THENCOLOR=0
@@ -111,26 +117,28 @@
  15160IFSC=7THENCOLOR=9
  15162HLIN3,5AT1:HLIN2,6AT2:FORI=3TO6:HLIN1,7ATI:NEXT:HLIN2,6AT7:HLIN3,5AT8
  15170VTAB22:HTAB8:PRINT" LEMONSVILLE WEATHER REPORT ":PRINT
-@@ -331,7 +331,7 @@
- 15210READA$:IFA$<>"*"THEN15210
- 15220IFSC<>2THEN15300
- 15230READI,J:IFJ=0THEN15500
+@@ -327,49 +324,66 @@
+ 15182IFSC=7THENHTAB15:PRINT" HOT AND DRY ";
+ 15184IFSC=10THENHTAB17:PRINT" CLOUDY ";
+ 15186IFSC=5THENHTAB14:PRINT" THUNDERSTORMS! ";:GOSUB17000
+-15200RESTORE
+-15210READA$:IFA$<>"*"THEN15210
+-15220IFSC<>2THEN15300
+-15230READI,J:IFJ=0THEN15500
 -15240FORK=1TOJ:POKE768,I:POKE769,10:CALL770
-+15240FORK=1TOJ:POKE768,I:POKE769,10:CALL784
- 15250FORL=KTOJ:NEXT:NEXT:GOTO15230
- 15300READI,J:IFJ<>0THEN15300
- 15310IFSC=7THEN15400
-@@ -340,35 +340,18 @@
- 15340READI,J:IFJ<>0THEN15340
- 15400READI,J:IFJ=0THEN15500
- 15410IFI=1THENFORI=1TOJ:NEXT:GOTO15400
+-15250FORL=KTOJ:NEXT:NEXT:GOTO15230
+-15300READI,J:IFJ<>0THEN15300
+-15310IFSC=7THEN15400
+-15320READI,J:IFJ<>0THEN15320
+-15330IFSC=10THEN15400
+-15340READI,J:IFJ<>0THEN15340
+-15400READI,J:IFJ=0THEN15500
+-15410IFI=1THENFORI=1TOJ:NEXT:GOTO15400
 -15420POKE768,I:POKE769,J:CALL770
-+15420POKE768,I:POKE769,J:CALL784
- 15430GOTO15400
+-15430GOTO15400
 -15440IFSC=5THENGOSUB17000
 -15500IFSC=5THENGOSUB17000
-+15500GOSUB17000
- 15510I=FRE(0):FORI=1TO2000:NEXT:RETURN
+-15510I=FRE(0):FORI=1TO2000:NEXT:RETURN
 -16000POKE13824,76:POKE13825,108:POKE13826,54:POKE13827,165:POKE13828,48:POKE13829,41:POKE13830,15:POKE13831,141:POKE13832,160:POKE13833,54:
 -16010POKE13834,165:POKE13835,48:POKE13836,41:POKE13837,240:POKE13838,141:POKE13839,161:POKE13840,54:POKE13841,165:POKE13842,36:POKE13843,141:
 -16020POKE13844,162:POKE13845,54:POKE13846,165:POKE13847,37:POKE13848,141:POKE13849,163:POKE13850,54:POKE13851,169:POKE13852,0:POKE13853,133:
@@ -145,17 +153,72 @@
 -16110POKE13934,41:POKE13935,15:POKE13936,141:POKE13937,164:POKE13938,54:POKE13939,165:POKE13940,48:POKE13941,41:POKE13942,240:POKE13943,141:
 -16120POKE13944,165:POKE13945,54:POKE13946,96:POKE13947,0:
 -16130RETURN
++15200ONSCGOSUB15230,15400,15230,15230,16000,15230,15600,15230,15230,15800
++15210GOSUB17000
++15220I=FRE(0):FORI=1TO2000:NEXT
++15230RETURN
++15400REM  SUNNY MUSIC
++15410FORI=1TO16:POKEDL,5:POKEDH,252:POKEFL,79:POKEFH,6:CALLTN:POKEDL,213:POKEDH,255:CALLRE:NEXT
++15420FORI=1TO4:POKEDL,5:POKEDH,252:POKEFL,22:POKEFH,7:CALLTN:POKEDL,213:POKEDH,255:CALLRE:NEXT
++15430FORI=1TO4:POKEDL,4:POKEDH,252:POKEFL,185:POKEFH,4:CALLTN:POKEDL,213:POKEDH,255:CALLRE:NEXT
++15440FORI=1TO4:POKEDL,5:POKEDH,252:POKEFL,79:POKEFH,6:CALLTN:POKEDL,213:POKEDH,255:CALLRE:NEXT
++15450FORI=1TO4:POKEDL,6:POKEDH,252:POKEFL,245:POKEFH,7:CALLTN:POKEDL,213:POKEDH,255:CALLRE:NEXT
++15460FORI=1TO4:POKEDL,4:POKEDH,252:POKEFL,185:POKEFH,4:CALLTN:POKEDL,213:POKEDH,255:CALLRE:NEXT
++15470FORI=1TO16:POKEDL,5:POKEDH,252:POKEFL,79:POKEFH,6:CALLTN:POKEDL,213:POKEDH,255:CALLRE:NEXT
++15480RETURN
++15600REM  HOT AND DRY MUSIC 
++15610POKEDL,57:POKEDH,206:POKEFL,78:POKEFH,5:CALLTN
++15620POKEDL,25:POKEDH,231:POKEFL,53:POKEFH,4:CALLTN
++15630POKEDL,143:POKEDH,131:POKEFL,78:POKEFH,5:CALLTN
++15640POKEDL,49:POKEDH,156:CALLRE
++15650POKEDL,54:POKEDH,206:POKEFL,185:POKEFH,4:CALLTN
++15660POKEDL,25:POKEDH,231:POKEFL,53:CALLTN
++15670POKEDL,54:POKEDH,206:POKEFL,185:CALLTN
++15680POKEDL,29:POKEDH,231:POKEFL,78:POKEFH,5:CALLTN
++15690POKEDL,51:POKEDH,206:POKEFL,53:POKEFH,4:CALLTN
++15700POKEDL,116:POKEDH,131:POKEFL,137:POKEFH,3:CALLTN
++15710POKEDL,102:POKEFL,166:POKEFH,2:CALLTN
++15720RETURN
++15800REM  CLOUDY MUSIC
++15810POKEDL,74:POKEDH,181:POKEFL,248:POKEFH,3:CALLTN
++15820POKEDL,49:POKEDH,206:CALLTN
++15830POKEDL,25:POKEDH,231:CALLTN
++15840POKEDL,51:POKEDH,206:POKEFL,53:POKEFH,4:CALLTN
++15850POKEDL,25:POKEDH,231:POKEFL,248:POKEFH,3:CALLTN
++15860POKEDL,46:POKEDH,206:POKEFL,137:CALLTN
++15870POKEDL,22:POKEDH,231:POKEFL,38:CALLTN
++15880POKEDL,123:POKEDH,131:POKEFL,248:CALLTN
++15890RETURN
++16000REM  THUNDERSTORMS MUSIC
++16010POKEDL,137:POKEDH,189:POKEFL,92:POKEFH,2:CALLTN
++16020POKEDL,58:POKEDH,123:POKEFL,185:POKEFH,4:CALLTN
++16030POKEDL,102:POKEDH,239:POKEFL,248:POKEFH,3:CALLTN
++16040POKEDL,202:POKEDH,222:POKEFL,137:CALLTN
++16050POKEDL,100:POKEDH,239:POKEFL,38:CALLTN
++16060POKEDL,24:POKEDH,123:POKEFL,166:POKEFH,2:CALLTN
++16070POKEDL,187:POKEDH,222:CALLRE
++16080POKEDL,137:POKEDH,189:POKEFL,92:POKEFH,2:CALLTN
++16090POKEDL,32:POKEDH,123:POKEFL,38:POKEFH,3:CALLTN
++16100POKEDL,100:POKEDH,239:CALLTN
++16110POKEDL,202:POKEDH,222:POKEFL,137:CALLTN
++16120POKEDL,102:POKEDH,239:POKEFL,248:CALLTN
++16130POKEDL,58:POKEDH,123:POKEFL,185:POKEFH,4:CALLTN
++16140RETURN
  17000IFSC<>5THENRETURN
  17001COLOR=10:VLIN7,9AT29:HLIN30,31AT9:VLIN9,14AT32:HLIN33,34AT14:VLIN14,25AT35
  17005VLIN5,8AT8:PLOT9,8:VLIN8,13AT10:PLOT11,13:VLIN13,17AT12
-+17006CALL13824
++17006CALLFI
  17010FORRPT=1TO5
 -17020CALL13824
- 17030COLOR=7:CALL13827
+-17030COLOR=7:CALL13827
 -17040CALL13824
- 17050COLOR=9:CALL13827
+-17050COLOR=9:CALL13827
++17030COLOR=7:CALLFE
++17050COLOR=9:CALLFE
  17060NEXTRPT
 -17070CALL13824
- 17080COLOR=5:CALL13827
+-17080COLOR=5:CALL13827
++17080COLOR=5:CALLFE
  17090RETURN
  18000VTAB24:PRINT" PRESS SPACE TO CONTINUE, ESC TO END...";
+ 18010GETIN$:IFIN$<>" "ANDASC(IN$)<>27THEN18010