~rabbits/uxn

6829863d6d6557e67a1f3678d368928b7637ccc3 — Andrew Alderwick 2 months ago 16f51cb
Changed samples from s8 to u8 format
M projects/demos/drum-rack.usm => projects/demos/drum-rack.usm +1 -1
@@ 370,7 370,7 @@ RTN
			#01 .Screen/color DEO
		&no-dot
		OVR TOS #0010 MUL2 [ DUP2r STH2r ] ADD2 LDA 
		#02 DIV #40 ADD DUP #07 SFT #80 MUL SUB 
		#02 DIV
		TOS #0004 DIV2 .wav-view/y1 PEK2 ADD2 .Screen/y DEO2
		.Screen/x DEI2 ++ .Screen/x DEO2
		( draw ) #02 .Screen/color DEO

M projects/demos/musictracker.usm => projects/demos/musictracker.usm +27 -27
@@ 601,39 601,39 @@ RTN
]

@square-wave
	a8 58
	28 d8
	&end

@triangle-wave
	0002 0406 080a 0c0e 1012 1416 181a 1c1e 2022 2426 282a 2c2e
	3032 3436 383a 3c3e 4041 4345 4749 4b4d 4f51 5355 5759 5b5d
	5f61 6365 6769 6b6d 6f71 7375 7779 7b7d 7f7d 7b79 7775 7371
	6f6d 6b69 6765 6361 5f5d 5b59 5755 5351 4f4d 4b49 4745 4341
	403e 3c3a 3836 3432 302e 2c2a 2826 2422 201e 1c1a 1816 1412
	100e 0c0a 0806 0402 00fe fcfa f8f6 f4f2 f0ee ecea e8e6 e4e2
	e0de dcda d8d6 d4d2 d0ce ccca c8c6 c4c2 c1bf bdbb b9b7 b5b3
	b1af adab a9a7 a5a3 a19f 9d9b 9997 9593 918f 8d8b 8987 8583
	8183 8587 898b 8d8f 9193 9597 999b 9d9f a1a3 a5a7 a9ab adaf
	b1b3 b5b7 b9bb bdbf c1c2 c4c6 c8ca ccce d0d2 d4d6 d8da dcde
	e0e2 e4e6 e8ea ecee f0f2 f4f6 f8fa fcfe
	8082 8486 888a 8c8e 9092 9496 989a 9c9e a0a2 a4a6 a8aa acae
	b0b2 b4b6 b8ba bcbe c0c1 c3c5 c7c9 cbcd cfd1 d3d5 d7d9 dbdd
	dfe1 e3e5 e7e9 ebed eff1 f3f5 f7f9 fbfd fffd fbf9 f7f5 f3f1
	efed ebe9 e7e5 e3e1 dfdd dbd9 d7d5 d3d1 cfcd cbc9 c7c5 c3c1
	c0be bcba b8b6 b4b2 b0ae acaa a8a6 a4a2 a09e 9c9a 9896 9492
	908e 8c8a 8886 8482 807e 7c7a 7876 7472 706e 6c6a 6866 6462
	605e 5c5a 5856 5452 504e 4c4a 4846 4442 413f 3d3b 3937 3533
	312f 2d2b 2927 2523 211f 1d1b 1917 1513 110f 0d0b 0907 0503
	0103 0507 090b 0d0f 1113 1517 191b 1d1f 2123 2527 292b 2d2f
	3133 3537 393b 3d3f 4142 4446 484a 4c4e 5052 5456 585a 5c5e
	6062 6466 686a 6c6e 7072 7476 787a 7c7e
	&end

@sine-wave
	0004 090e 1217 1c20 2529 2e32 363b 3f43 474b 4e52 5659 5c60
	6365 686b 6d70 7274 7677 797a 7b7c 7d7e 7e7e 7e7e 7e7e 7d7c
	7b7a 7978 7674 7270 6e6b 6966 6360 5d5a 5753 4f4c 4844 403c
	3833 2f2a 2621 1d18 140f 0a05 01fc f7f2 eee9 e4e0 dbd7 d2ce
	cac5 c1bd b9b5 b1ae aaa7 a3a0 9d9a 9795 9290 8e8c 8a88 8785
	8483 8282 8181 8181 8181 8282 8384 8687 898a 8c8e 9193 9598
	9b9e a1a4 a8ab afb2 b6ba bec2 c6cb cfd3 d8dc e1e6 eaef f4f8
	fd02 070b 1015 191e 2327 2c30 3439 3d41 4549 4d50 5457 5b5e
	6164 676a 6c6e 7173 7576 7879 7b7c 7d7d 7e7e 7e7e 7e7e 7d7d
	7c7b 7a78 7775 7371 6f6d 6a68 6562 5f5c 5855 514e 4a46 423e
	3a35 312d 2824 1f1b 1611 0d08 03fe faf5 f0eb e7e2 ded9 d5d0
	ccc7 c3bf bbb7 b3b0 aca8 a5a2 9f9c 9996 9491 8f8d 8b89 8786
	8584 8382 8181 8181 8181 8182 8384 8586 8889 8b8d 8f92 9497
	9a9c 9fa3 a6a9 adb1 b4b8 bcc0 c4c9 cdd1 d6da dfe3 e8ed f1f6
	fb
	8084 898e 9297 9ca0 a5a9 aeb2 b6bb bfc3 c7cb ced2 d6d9 dce0
	e3e5 e8eb edf0 f2f4 f6f7 f9fa fbfc fdfe fefe fefe fefe fdfc
	fbfa f9f8 f6f4 f2f0 eeeb e9e6 e3e0 ddda d7d3 cfcc c8c4 c0bc
	b8b3 afaa a6a1 9d98 948f 8a85 817c 7772 6e69 6460 5b57 524e
	4a45 413d 3935 312e 2a27 2320 1d1a 1715 1210 0e0c 0a08 0705
	0403 0202 0101 0101 0101 0202 0304 0607 090a 0c0e 1113 1518
	1b1e 2124 282b 2f32 363a 3e42 464b 4f53 585c 6166 6a6f 7478
	7d82 878b 9095 999e a3a7 acb0 b4b9 bdc1 c5c9 cdd0 d4d7 dbde
	e1e4 e7ea ecee f1f3 f5f6 f8f9 fbfc fdfd fefe fefe fefe fdfd
	fcfb faf8 f7f5 f3f1 efed eae8 e5e2 dfdc d8d5 d1ce cac6 c2be
	bab5 b1ad a8a4 9f9b 9691 8d88 837e 7a75 706b 6762 5e59 5550
	4c47 433f 3b37 3330 2c28 2522 1f1c 1916 1411 0f0d 0b09 0706
	0504 0302 0101 0101 0101 0102 0304 0506 0809 0b0d 0f12 1417
	1a1c 1f23 2629 2d31 3438 3c40 4449 4d51 565a 5f63 686d 7176
	7b
	&end

@noise-wave-end

M projects/demos/piano.usm => projects/demos/piano.usm +1 -1
@@ 360,7 360,7 @@ RTN
			#03 .Screen/color DEO
		&no-dot
		OVR TOS .Audio0/addr DEI2 ADD2 LDA 
		#02 DIV #40 ADD DUP #07 SFT #80 MUL SUB 
		#02 DIV
		TOS #0004 DIV2 .wave-view/y1 PEK2 ADD2 .Screen/y DEO2
		.Screen/x DEI2 ++ .Screen/x DEO2
		( draw ) OVR .Audio0/length DEI2 SWP POP GTH #02 MUL #01 ADD .Screen/color DEO

M projects/sounds/bdr1.pcm => projects/sounds/bdr1.pcm +0 -0
M projects/sounds/bdr2.pcm => projects/sounds/bdr2.pcm +0 -0
M projects/sounds/chat.pcm => projects/sounds/chat.pcm +0 -0
M projects/sounds/cym1.pcm => projects/sounds/cym1.pcm +0 -0
M projects/sounds/kck1.pcm => projects/sounds/kck1.pcm +0 -0
M projects/sounds/kck2.pcm => projects/sounds/kck2.pcm +0 -0
M projects/sounds/ohat.pcm => projects/sounds/ohat.pcm +0 -0
M projects/sounds/pad1.pcm => projects/sounds/pad1.pcm +0 -0
M projects/sounds/ride.pcm => projects/sounds/ride.pcm +0 -0
M projects/sounds/sid1.pcm => projects/sounds/sid1.pcm +0 -0
M projects/sounds/sid2.pcm => projects/sounds/sid2.pcm +0 -0
M projects/sounds/sin.pcm => projects/sounds/sin.pcm +0 -0
M projects/sounds/snr1.pcm => projects/sounds/snr1.pcm +0 -0
M projects/sounds/snr2.pcm => projects/sounds/snr2.pcm +0 -0
M projects/sounds/sqr.pcm => projects/sounds/sqr.pcm +0 -0
M projects/sounds/sub1.pcm => projects/sounds/sub1.pcm +0 -0
M projects/sounds/syn1.pcm => projects/sounds/syn1.pcm +0 -0
M projects/sounds/syn2.pcm => projects/sounds/syn2.pcm +0 -0
M projects/sounds/tri.pcm => projects/sounds/tri.pcm +0 -0
M src/apu.c => src/apu.c +1 -1
@@ 53,7 53,7 @@ apu_render(Apu *c, Sint16 *sample, Sint16 *end)
			}
			c->i %= c->len;
		}
		s = (Sint8)(c->addr[c->i]) * envelope(c, c->age++);
		s = (Sint8)(c->addr[c->i] + 0x80) * envelope(c, c->age++);
		*sample++ += s * c->volume[0] / 0x180;
		*sample++ += s * c->volume[1] / 0x180;
	}