Change lemonade_tone_patched to lemonade_tone and LEMONADE TONE PATCHED to LEMONADE...

diff --git a/apple_io.py b/apple_io.py
index df09933..bf78760 100644 (file)
--- a/apple_io.py
+++ b/apple_io.py
@@ -175,7 +175,7 @@ colors = [
   0xf, # white -> intense white
 ]
 
-# see lemonade_tone_patched.lst
+# see lemonade_tone.lst
 LEMONADE_TONE_PERIOD = 0x300
 LEMONADE_TONE_DUR = 0x301
 LEMONADE_TONE_TONE = 0x302
@@ -537,7 +537,7 @@ def call(addr):
     #else:
     #  time.sleep(duration)
   elif addr == LEMONADE_TONE_TONE or addr == LEMONADE_TONE_TONE1:
-    # for lemonade, see test/lemonade_tone_patched.py
+    # for lemonade, see test/lemonade_tone.py
     period_count = ((low_mem[LEMONADE_TONE_PERIOD] - 1) & 0xff) + 1
     duration_count = ((low_mem[LEMONADE_TONE_DUR] - 1) & 0xff) + 1
     cycles = 1.37788799e-02 + duration_count * (

diff --git a/lemonade/Makefile b/lemonade/Makefile
index 187dc3a..39dd779 100644 (file)
--- a/lemonade/Makefile
+++ b/lemonade/Makefile
@@ -6,7 +6,7 @@ TOK_TO_BAS=../tok_to_bas.py
 BAS_TO_TOK=../bas_to_tok.py
 
 .PHONY: all
-all: lemonade_patched.dsk lemonade_tone_patched.obj
+all: lemonade_patched.dsk lemonade_tone.obj
 
 lemonade_patched.dsk: lemonade_patched.bin tone.obj lemonade_flash_patched.obj bootable.dsk
        cp bootable.dsk $@
@@ -55,30 +55,26 @@ LC_ALL=C tr '\000-\177' '\200-\377' >__temp__.asm
        ${DOS33} __temp__.dsk LOAD TONE.OBJ $@
        rm DOS_Tool_Kit_v1.0_1980_Apple.do __temp__.asm __temp__.dsk
 
-lemonade_tone_patched.obj: \
-lemonade_tone_patched.asm \
-lemonade_tone_patched_asm.txt \
+lemonade_tone.obj: \
+lemonade_tone.asm \
+lemonade_tone_asm.txt \
 bootable.dsk \
 ../orig/DOS_Tool_Kit_v1.0_1980_Apple.do
        cp ../orig/DOS_Tool_Kit_v1.0_1980_Apple.do .
-       tr '\t\na-z' ' \rA-Z' <lemonade_tone_patched.asm |\
+       tr '\t\na-z' ' \rA-Z' <lemonade_tone.asm |\
 LC_ALL=C tr '\000-\177' '\200-\377' >__temp__.asm
        ${MKDOS33FS} __temp__.dsk
-       ${DOS33} __temp__.dsk SAVE T __temp__.asm "LEMONADE TONE PATCHED.ASM"
+       ${DOS33} __temp__.dsk SAVE T __temp__.asm "LEMONADE TONE.ASM"
        rm -f ../linapple-pie/Printer.txt
-       tr '\n' '\r' <lemonade_tone_patched_asm.txt |\
+       tr '\n' '\r' <lemonade_tone_asm.txt |\
 ( \
   cd ../linapple-pie && \
   ./linapple -b -1 ../lemonade/DOS_Tool_Kit_v1.0_1980_Apple.do -2 ../lemonade/__temp__.dsk \
 )
-       tr -d '\r' <../linapple-pie/Printer.txt >lemonade_tone_patched.lst
-       ${DOS33} __temp__.dsk LOAD "LEMONADE TONE PATCHED.OBJ" $@
+       tr -d '\r' <../linapple-pie/Printer.txt >lemonade_tone.lst
+       ${DOS33} __temp__.dsk LOAD "LEMONADE TONE.OBJ" $@
        rm DOS_Tool_Kit_v1.0_1980_Apple.do __temp__.asm __temp__.dsk
 
-lemonade_tone_patched.asm: lemonade_tone.asm lemonade_tone.asm.patch
-       cp lemonade_tone.asm $@
-       patch $@ <lemonade_tone.asm.patch
-
 lemonade_tone.asm: \
 lemonade_tone_disasm.txt \
 lemonade_tone_disasm.sed \

diff --git a/lemonade/lemonade_flash.asm.patch b/lemonade/lemonade_flash.asm.patch
index 1a6a253..64224c9 100644 (file)
--- a/lemonade/lemonade_flash.asm.patch
+++ b/lemonade/lemonade_flash.asm.patch
@@ -1,5 +1,5 @@
---- lemonade_flash.asm 2022-05-20 00:26:41.208369571 +1000
-+++ lemonade_flash_patched.asm 2022-05-20 00:50:06.744426222 +1000
+--- lemonade_flash.asm 2022-05-24 18:00:43.096932476 +1000
++++ lemonade_flash_patched.asm 2022-05-24 18:01:01.936933235 +1000
 @@ -3,7 +3,6 @@
  l.25  equ     $25
  l.28  equ     $28
@@ -17,8 +17,3 @@
        sta     l.24                    85 24
        lda     l.36a3                  ad a3 36
        sta     l.25                    85 25
-@@ -69,4 +68,3 @@
-       and     #$f0                    29 f0
-       sta     l.36a5                  8d a5 36
-       rts                             60
--      dfb     0                       00

diff --git a/lemonade/lemonade_flash_disasm.sed b/lemonade/lemonade_flash_disasm.sed
index 6fca5b1..9440094 100644 (file)
--- a/lemonade/lemonade_flash_disasm.sed
+++ b/lemonade/lemonade_flash_disasm.sed
@@ -1,10 +1,9 @@
-/^3600-/,/^367B-/{
+/^3600-/,/^367A-/{
   y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
   s/^\([^ ]\{4\}\)-   \([^ ]\{2\}\( [^ ]\{2\}\)*\) \+\([^ ]\{3\}\)   \(.*\)/l.\1\t\4\t\5\t\t\t\2/
   s/\$/l./
   s/#l\./#$/
   s/\(,[xy]\)\t/\1/
-  s/brk\t/dfb\t0/
   s/^l.3600/\torg\t$3600\n&/
   p
 }

diff --git a/lemonade/lemonade_tone.asm.patch b/lemonade/lemonade_tone.asm.patch
deleted file mode 100644 (file)
index fc4505e..0000000
--- a/lemonade/lemonade_tone.asm.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- lemonade_tone.asm  2022-05-20 00:27:07.748370641 +1000
-+++ lemonade_tone_patched.asm  2022-05-20 00:50:41.208427611 +1000
-@@ -13,5 +13,3 @@
-       ldx     l.0300                  ae 00 03
-       jmp     l.0302                  4c 02 03
- l.0316        rts                             60
--      dfb     0                       00
--      dfb     0                       00

diff --git a/lemonade/lemonade_tone_asm.txt b/lemonade/lemonade_tone_asm.txt
new file mode 100644 (file)
index 0000000..7b4f5b4
--- /dev/null
+++ b/lemonade/lemonade_tone_asm.txt
@@ -0,0 +1,5 @@
+BRUN EDASM.OBJ
+PR#1
+DR 2
+ASM LEMONADE TONE.ASM,LEMONADE TONE.OBJ
+

diff --git a/lemonade/lemonade_tone_disasm.sed b/lemonade/lemonade_tone_disasm.sed
index db422a7..3073bbe 100644 (file)
--- a/lemonade/lemonade_tone_disasm.sed
+++ b/lemonade/lemonade_tone_disasm.sed
@@ -1,10 +1,9 @@
-/^0302-/,/^0318-/{
+/^0302-/,/^0316-/{
   y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
   s/^\([^ ]\{4\}\)-   \([^ ]\{2\}\( [^ ]\{2\}\)*\) \+\([^ ]\{3\}\)   \(.*\)/l.\1\t\4\t\5\t\t\t\2/
   s/\$/l./
   s/#l\./#$/
   s/\(,[xy]\)\t/\1/
-  s/brk\t/dfb\t0/
   s/^l.0302/\torg\t$0302\n&/
   p
 }

diff --git a/lemonade/lemonade_tone_patched_asm.txt b/lemonade/lemonade_tone_patched_asm.txt
deleted file mode 100644 (file)
index cdca704..0000000
--- a/lemonade/lemonade_tone_patched_asm.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-BRUN EDASM.OBJ
-PR#1
-DR 2
-ASM LEMONADE TONE PATCHED.ASM,LEMONADE TONE PATCHED.OBJ
-

diff --git a/test/lemonade_tone_patched.py b/test/lemonade_tone.py
similarity index 97%
rename from test/lemonade_tone_patched.py
rename to test/lemonade_tone.py
index 645b3a0..89561b4 100755 (executable)
--- a/test/lemonade_tone_patched.py
+++ b/test/lemonade_tone.py
@@ -16,7 +16,7 @@ def bload(bin_in):
     assert len(bin) == load_size + 4
   mem[load_addr:load_addr + load_size] = bin[4:]
 
-bload('../lemonade/lemonade_tone_patched.obj')
+bload('../lemonade/lemonade_tone.obj')
 
 # jsr 0x0302
 #mem[0x400:0x403] = [0x20, 0x02, 0x03]