@@ -16,8 +16,6 @@

 %8//  { #03 SFT2 }

 %8**  { #30 SFT2 }

-%WAVEFORM { #1000 }

-

 ( devices )

 |00 @System     [ &vector $2 &pad      $6 &r      $2 &g     $2 &b      $2 ]

@@ -57,14 +55,6 @@

 	;on-mouse   .Mouse/vector DEO2

 	;on-midi    .Midi/vector DEO2

-	( load waveform )

-	;piano-path  .File/name DEO2 #0100 .File/length DEO2 WAVEFORM .File/load DEO2

-	;violin-path .File/name DEO2 #0100 .File/length DEO2 WAVEFORM #0100 ++  .File/load DEO2

-	;sin-path   .File/name DEO2 #0100 .File/length DEO2 WAVEFORM #0200 ++ .File/load DEO2

-	;tri-path   .File/name DEO2 #0100 .File/length DEO2 WAVEFORM #0300 ++ .File/load DEO2

-	;sqr-path   .File/name DEO2 #0100 .File/length DEO2 WAVEFORM #0400 ++ .File/load DEO2

-	;saw-path   .File/name DEO2 #0100 .File/length DEO2 WAVEFORM #0500 ++ .File/load DEO2

-

 	( find center )

 	.Screen/width DEI2 2// .center/x STZ2

 	.Screen/height DEI2 2// .center/y STZ2

@@ -91,7 +81,7 @@

 	#ff .last-note STZ

 	#041c .Audio0/adsr DEO2

 	#88 .Audio0/volume DEO

-	WAVEFORM .Audio0/addr DEO2

+	;piano-pcm .Audio0/addr DEO2

 	#0100 .Audio0/length DEO2

 	( inital drawing ) 

@@ -527,9 +517,92 @@ RTN

 	007c 8280 8080 827c 00fc 8282 8282 82fc

 	007c 8280 f080 827c 007c 8280 f080 8080 

-@piano-path "projects/sounds/piano.pcm $1

-@violin-path "projects/sounds/violin.pcm $1

-@sin-path "projects/sounds/sin.pcm $1

-@tri-path "projects/sounds/tri.pcm $1

-@sqr-path "projects/sounds/sqr.pcm $1

-@saw-path "projects/sounds/saw.pcm $1

+@piano-pcm

+	8182 8588 8d91 959b a1a6 aaad b2b5 b8bd

+	c1c7 cbd0 d5d9 dde1 e5e5 e4e4 e1dc d7d1

+	cbc5 bfb8 b2ac a6a2 9c97 928d 8884 807c

+	7977 7574 7372 7272 7273 7372 706d 6964

+	605b 5650 4d49 4643 4342 4244 4548 4a4d

+	5052 5556 5758 5554 5150 4c4a 4744 423f

+	3d3c 3a38 3835 3431 3030 2f31 3336 393e

+	4449 4e54 5a60 666b 7175 7b82 8990 989e

+	a6ab b1b6 babd bebf bfbe bbb9 b6b3 b0ae

+	aaa8 a6a3 a19e 9c9a 9997 9696 9798 9b9e

+	a1a4 a6a9 a9ac adad adae aeaf b0b0 b1b1

+	b3b3 b4b4 b4b3 b3b1 b0ad abab a9a9 a8a8

+	a7a5 a19d 9891 8b84 7e77 726e 6b6b 6b6c

+	6f71 7477 7776 7370 6c65 5e56 4e48 423f

+	3d3c 3b3a 3a39 3838 3839 393a 3c3e 4146

+	4a50 575b 6064 686a 6e70 7274 7677 7a7d

+

+@violin-pcm

+	8186 8d94 9ba0 a3a7 acb1 b5bc c2c7 cacc

+	cecf d0d1 d3d5 d8db dee1 e3e5 e6e5 e5e3

+	dfdc d7d0 c8c2 bbb2 a99f 968c 847c 746e

+	675f 5851 4b43 3e3a 3533 312e 2c2b 2826

+	2422 2122 2327 2d34 3c44 4c57 5f68 7075

+	7b80 8487 8789 8a8c 8d90 9397 999c 9ea0

+	a2a2 a2a0 9c97 9491 8f8e 908f 918f 8e88

+	827a 726a 6058 5047 423f 3f40 4245 4748

+	4949 4746 4545 4a4f 5863 717f 8b9a a6b1

+	b8be c1c1 bfbd bab5 b1af acac aeb1 b7bc

+	c2c9 cfd3 d5d4 d3d3 d1ce cbc6 c0ba b3ab

+	a39a 8f85 7b72 6c67 6462 605f 5e5d 5b58

+	5550 4d49 4848 4949 4a4d 5052 5558 5b5e

+	6164 686c 7074 7677 7979 7a7b 7b7a 7977

+	7473 6f6e 6b69 696b 6f72 7576 7574 716b

+	655d 554e 4742 3f3f 4045 4b52 5a62 6b74

+

+@sin-pcm

+	8083 8689 8c8f 9295 989b 9ea1 a4a7 aaad

+	b0b3 b6b9 bbbe c1c3 c6c9 cbce d0d2 d5d7

+	d9db dee0 e2e4 e6e7 e9eb ecee f0f1 f2f4

+	f5f6 f7f8 f9fa fbfb fcfd fdfe fefe fefe

+	fffe fefe fefe fdfd fcfb fbfa f9f8 f7f6

+	f5f4 f2f1 f0ee eceb e9e7 e6e4 e2e0 dedb

+	d9d7 d5d2 d0ce cbc9 c6c3 c1be bbb9 b6b3

+	b0ad aaa7 a4a1 9e9b 9895 928f 8c89 8683

+	807d 7a77 7471 6e6b 6865 625f 5c59 5653

+	504d 4a47 4542 3f3d 3a37 3532 302e 2b29

+	2725 2220 1e1c 1a19 1715 1412 100f 0e0c

+	0b0a 0908 0706 0505 0403 0302 0202 0202

+	0102 0202 0202 0303 0405 0506 0708 090a

+	0b0c 0e0f 1012 1415 1719 1a1c 1e20 2225

+	2729 2b2e 3032 3537 3a3d 3f42 4547 4a4d

+	5053 5659 5c5f 6265 686b 6e71 7477 7a7d

+

+@tri-pcm

+	8082 8486 888a 8c8e 9092 9496 989a 9c9e

+	a0a2 a4a6 a8aa acae b0b2 b4b6 b8ba bcbe

+	c0c2 c4c6 c8ca ccce d0d2 d4d6 d8da dcde

+	e0e2 e4e6 e8ea ecee f0f2 f4f6 f8fa fcfe

+	fffd fbf9 f7f5 f3f1 efed ebe9 e7e5 e3e1

+	dfdd dbd9 d7d5 d3d1 cfcd cbc9 c7c5 c3c1

+	bfbd bbb9 b7b5 b3b1 afad aba9 a7a5 a3a1

+	9f9d 9b99 9795 9391 8f8d 8b89 8785 8381

+	7f7d 7b79 7775 7371 6f6d 6b69 6765 6361

+	5f5d 5b59 5755 5351 4f4d 4b49 4745 4341

+	3f3d 3b39 3735 3331 2f2d 2b29 2725 2321

+	1f1d 1b19 1715 1311 0f0d 0b09 0705 0301

+	0103 0507 090b 0d0f 1113 1517 191b 1d1f

+	2123 2527 292b 2d2f 3133 3537 393b 3d3f

+	4143 4547 494b 4d4f 5153 5557 595b 5d5f

+	6163 6567 696b 6d6f 7173 7577 797b 7d7f

+

+@saw-pcm

+	8282 8183 8384 8685 8888 8889 8a8b 8c8c

+	8e8e 8f90 9092 9193 9494 9596 9699 9899

+	9b9a 9c9c 9c9d 9ea0 a1a0 a2a2 a3a5 a4a6

+	a7a7 a9a8 a9aa aaac adad aeae b0b0 b1b3

+	b2b4 b5b5 b6b7 b9b8 b9bb babc bdbc bdbe

+	bfc1 bfc1 c3c1 c4c5 c5c6 c6c7 c9c7 cbca

+	cbcc cdcd cfcf d2d0 d2d2 d2d5 d4d5 d6d7

+	d8d8 d9dc d9df dadf dce1 dde5 dce6 dceb

+	cb1f 1b1e 1c21 1c21 1f23 2025 2127 2329

+	2529 2829 2a2b 2b2e 2d2f 302f 3231 3234

+	3334 3536 3836 3939 3a3b 3b3d 3e3d 3f40

+	4042 4242 4444 4646 4748 474a 4a4b 4d4c

+	4e4e 4f50 5052 5252 5554 5557 5759 5959

+	5b5b 5c5d 5d5f 5e60 6160 6264 6365 6566

+	6867 6969 6a6c 6c6d 6d6e 706f 7071 7174

+	7475 7576 7777 797a 7a7c 7b7c 7e7d 7f7f

@@ -106,7 +106,7 @@ int

 init(void)

 {

 	SDL_AudioSpec as;

-	if(!initppu(&ppu, 48, 32))

+	if(!initppu(&ppu, 64, 40))

 		return error("PPU", "Init failure");

 	gRect.x = PAD;

 	gRect.y = PAD;