Merge pull request #55 from jsmolina/feat-realpacman

ay sounds for game (thanks to Pope!)
jsmolina · Dec 22, 2021 · fbca252 · fbca252
2 parents 6453358 + a553491
commit fbca252
Show file tree

Hide file tree

Showing 20 changed files with 1,237 additions and 252 deletions.
diff --git a/Makefile b/Makefile
@@ -29,13 +29,13 @@ compile:
 	png2sp1sprite ./build/cerezas.png -b -i cerezas -f 16 -s rodata_user > ./build/cerezas.asm
 	png2sp1sprite ./build/letterboxes.png -b -i letterboxes -f 72 -s rodata_user > ./build/letterboxes.asm
 
-	zcc +zx -v -startup=31 -DWFRAMES=3 -clib=sdcc_iy -Cz--screen=intro.scr -SO3 --max-allocs-per-node10000 @zproject.lst -pragma-include:zpragma.inc -o msnampac -create-app	#zcc +zx -v -m -startup=31 -clib=sdcc_iy -SO3 --max-allocs-per-node10000 @zproject.lst -pragma-include:zpragma.inc -o alley
-	#appmake +zx -b screen.scr --org 16384 --noloader --blockname screen -o screen.tap
-	#appmake +zx -b alley_CODE.bin --org 24500 --noloader --blockname code -o code.tap
-	#appmake +zx -b alley_BANK_6.bin --org 49152 --noloader --blockname bank6 -o bank6.tap
-	#touch alley.tap
-	#rm alley.tap
-	#cat loader.tap screen.tap code.tap bank6.tap > alley.tap
+	zcc +zx -v -m -startup=31 -clib=sdcc_iy -SO3 --max-allocs-per-node200000 @zproject.lst -pragma-include:zpragma.inc -o msnampac
+	appmake +zx -b intro.scr --org 16384 --noloader --blockname screen -o screen.tap
+	appmake +zx -b msnampac_CODE.bin --org 24500 --noloader --blockname code -o code.tap
+	appmake +zx -b msnampac_BANK_6.bin --org 49152 --noloader --blockname bank6 -o bank6.tap
+	touch msnampac.tap
+	rm msnampac.tap
+	cat loader.tap screen.tap code.tap bank6.tap > msnampac.tap
 
 deps: 
 	@gcc utils/bas2tap.c -o utils/bas2tap

diff --git a/README.md b/README.md
@@ -450,3 +450,32 @@ https://github.com/jsmolina/z88dk-tutorial-sp1/pull/46
 Credits to jarlaxe for the graphics.
 
 
+### Assembly
+Credits to ThePoPe for Assemby and AY code.
+
+```
+playSirena:
+    ld hl, tabla_offsets
+    ld a, (current_siren)
+    dec a
+    add a,a
+    ld l,a
+    jr nc, no_acarrea
+    inc h
+    no_acarrea:
+        ld a,(hl)
+        inc hl
+        ld h,(hl)
+        ld l,a
+        ld a, 2
+        call FxStop
+        ld a, 2
+	    call Load_Fx
+        ret
+tabla_offsets:
+    dw fxSirena1
+    dw fxSirena2
+    dw fxSirena3
+    dw fxSirena4
+    dw fxSirena5
+```
diff --git a/build/cerezas.asm b/build/cerezas.asm
@@ -2,6 +2,8 @@ SECTION rodata_user
 
 ; Original: 80, 24 (=10 x 3 chars)
 ; Blocks: 2
+; sprite
+ defb @00000000
  defb @00000000
  defb @00000000
  defb @00000000
@@ -13,6 +15,8 @@ SECTION rodata_user
 PUBLIC _cerezas1
 ._cerezas1
 
+PUBLIC _cerezas1_f1
+._cerezas1_f1
  defb @00000000
  defb @00000000
  defb @00000000
@@ -47,6 +51,7 @@ PUBLIC _cerezas1
  defb @00000000
  defb @00000000
 
+PUBLIC _cerezas1_f2
 ._cerezas1_f2
  defb @00000000
  defb @00000000
@@ -82,6 +87,7 @@ PUBLIC _cerezas1
  defb @00000000
  defb @00000000
 
+PUBLIC _cerezas1_f3
 ._cerezas1_f3
  defb @00000000
  defb @00000000
@@ -117,6 +123,7 @@ PUBLIC _cerezas1
  defb @00000000
  defb @00000000
 
+PUBLIC _cerezas1_f4
 ._cerezas1_f4
  defb @00000000
  defb @00000000
@@ -152,6 +159,7 @@ PUBLIC _cerezas1
  defb @00000000
  defb @00000000
 
+PUBLIC _cerezas1_f5
 ._cerezas1_f5
  defb @00000000
  defb @00000000
@@ -190,6 +198,8 @@ PUBLIC _cerezas1
 PUBLIC _cerezas2
 ._cerezas2
 
+PUBLIC _cerezas2_f1
+._cerezas2_f1
  defb @00000000
  defb @00000000
  defb @00000000
@@ -224,6 +234,7 @@ PUBLIC _cerezas2
  defb @00000000
  defb @00000000
 
+PUBLIC _cerezas2_f2
 ._cerezas2_f2
  defb @00000000
  defb @00000000
@@ -259,6 +270,7 @@ PUBLIC _cerezas2
  defb @00000000
  defb @00000000
 
+PUBLIC _cerezas2_f3
 ._cerezas2_f3
  defb @00000000
  defb @00010000
@@ -294,6 +306,7 @@ PUBLIC _cerezas2
  defb @00000000
  defb @00000000
 
+PUBLIC _cerezas2_f4
 ._cerezas2_f4
  defb @00000000
  defb @00000000
@@ -329,6 +342,7 @@ PUBLIC _cerezas2
  defb @00000000
  defb @00000000
 
+PUBLIC _cerezas2_f5
 ._cerezas2_f5
  defb @00000000
  defb @00000000

diff --git a/build/letterboxes.asm b/build/letterboxes.asm
@@ -2,6 +2,8 @@ SECTION rodata_user
 
 ; Original: 144, 16 (=18 x 2 chars)
 ; Blocks: 9
+; sprite
+ defb @00000000
  defb @00000000
  defb @00000000
  defb @00000000
@@ -13,6 +15,8 @@ SECTION rodata_user
 PUBLIC _letterboxes1
 ._letterboxes1
 
+PUBLIC _letterboxes1_f1
+._letterboxes1_f1
  defb @00000000
  defb @00011111
  defb @00110000
@@ -39,6 +43,7 @@ PUBLIC _letterboxes1
  defb @00000000
  defb @00000000
 
+PUBLIC _letterboxes1_f2
 ._letterboxes1_f2
  defb @00000000
  defb @00000000
@@ -69,6 +74,8 @@ PUBLIC _letterboxes1
 PUBLIC _letterboxes2
 ._letterboxes2
 
+PUBLIC _letterboxes2_f1
+._letterboxes2_f1
  defb @00000000
  defb @00011100
  defb @00110110
@@ -95,6 +102,7 @@ PUBLIC _letterboxes2
  defb @00000000
  defb @00000000
 
+PUBLIC _letterboxes2_f2
 ._letterboxes2_f2
  defb @00000000
  defb @00000011
@@ -125,6 +133,8 @@ PUBLIC _letterboxes2
 PUBLIC _letterboxes3
 ._letterboxes3
 
+PUBLIC _letterboxes3_f1
+._letterboxes3_f1
  defb @00000000
  defb @01100011
  defb @01110111
@@ -151,6 +161,7 @@ PUBLIC _letterboxes3
  defb @00000000
  defb @00000000
 
+PUBLIC _letterboxes3_f2
 ._letterboxes3_f2
  defb @00000000
  defb @11110001
@@ -181,6 +192,8 @@ PUBLIC _letterboxes3
 PUBLIC _letterboxes4
 ._letterboxes4
 
+PUBLIC _letterboxes4_f1
+._letterboxes4_f1
  defb @00000000
  defb @01111111
  defb @01100000
@@ -207,6 +220,7 @@ PUBLIC _letterboxes4
  defb @00000000
  defb @00000000
 
+PUBLIC _letterboxes4_f2
 ._letterboxes4_f2
  defb @00000000
  defb @11111000
@@ -237,6 +251,8 @@ PUBLIC _letterboxes4
 PUBLIC _letterboxes5
 ._letterboxes5
 
+PUBLIC _letterboxes5_f1
+._letterboxes5_f1
  defb @00000000
  defb @00000000
  defb @00000000
@@ -263,6 +279,7 @@ PUBLIC _letterboxes5
  defb @00000000
  defb @00000000
 
+PUBLIC _letterboxes5_f2
 ._letterboxes5_f2
  defb @00000000
  defb @11100011
@@ -293,6 +310,8 @@ PUBLIC _letterboxes5
 PUBLIC _letterboxes6
 ._letterboxes6
 
+PUBLIC _letterboxes6_f1
+._letterboxes6_f1
  defb @00000000
  defb @00111110
  defb @01100011
@@ -319,6 +338,7 @@ PUBLIC _letterboxes6
  defb @00000000
  defb @00000000
 
+PUBLIC _letterboxes6_f2
 ._letterboxes6_f2
  defb @00000000
  defb @11100001
@@ -349,6 +369,8 @@ PUBLIC _letterboxes6
 PUBLIC _letterboxes7
 ._letterboxes7
 
+PUBLIC _letterboxes7_f1
+._letterboxes7_f1
  defb @00000000
  defb @01100011
  defb @01100011
@@ -375,6 +397,7 @@ PUBLIC _letterboxes7
  defb @00000000
  defb @00000000
 
+PUBLIC _letterboxes7_f2
 ._letterboxes7_f2
  defb @00000000
  defb @10011000
@@ -405,6 +428,8 @@ PUBLIC _letterboxes7
 PUBLIC _letterboxes8
 ._letterboxes8
 
+PUBLIC _letterboxes8_f1
+._letterboxes8_f1
  defb @00000000
  defb @01111111
  defb @01100000
@@ -431,6 +456,7 @@ PUBLIC _letterboxes8
  defb @00000000
  defb @00000000
 
+PUBLIC _letterboxes8_f2
 ._letterboxes8_f2
  defb @00000000
  defb @01110000
@@ -461,6 +487,8 @@ PUBLIC _letterboxes8
 PUBLIC _letterboxes9
 ._letterboxes9
 
+PUBLIC _letterboxes9_f1
+._letterboxes9_f1
  defb @00000000
  defb @01111110
  defb @01100011
@@ -487,6 +515,7 @@ PUBLIC _letterboxes9
  defb @00000000
  defb @00000000
 
+PUBLIC _letterboxes9_f2
 ._letterboxes9_f2
  defb @00000000
  defb @00000000