From bb670049840e64e96b9bf0bf72897d6f3a928194 Mon Sep 17 00:00:00 2001 From: Freya Murphy Date: Sun, 23 Nov 2025 14:50:31 -0500 Subject: audio: refactor everything --- assets/asm/explore_harmony1.asm | 90 +++++++++++++++++++------------------- assets/asm/explore_harmony2.asm | 14 +++--- assets/asm/explore_melody.asm | 32 +++++++------- assets/asm/megalovania_base.asm | 26 +++++------ assets/asm/megalovania_melody.asm | 26 +++++------ assets/wav/noise_0.wav | Bin 88244 -> 0 bytes assets/wav/noise_1.wav | Bin 88244 -> 0 bytes assets/wav/pulse_12.wav | Bin 244 -> 0 bytes assets/wav/pulse_25.wav | Bin 244 -> 0 bytes assets/wav/pulse_50.wav | Bin 244 -> 0 bytes assets/wav/pulse_75.wav | Bin 244 -> 0 bytes assets/wav/triangle.wav | Bin 244 -> 0 bytes 12 files changed, 94 insertions(+), 94 deletions(-) delete mode 100644 assets/wav/noise_0.wav delete mode 100644 assets/wav/noise_1.wav delete mode 100644 assets/wav/pulse_12.wav delete mode 100644 assets/wav/pulse_25.wav delete mode 100644 assets/wav/pulse_50.wav delete mode 100644 assets/wav/pulse_75.wav delete mode 100644 assets/wav/triangle.wav (limited to 'assets') diff --git a/assets/asm/explore_harmony1.asm b/assets/asm/explore_harmony1.asm index d313de2..019f07e 100644 --- a/assets/asm/explore_harmony1.asm +++ b/assets/asm/explore_harmony1.asm @@ -3,61 +3,61 @@ ; setup P5 -a d12 +a w12 -%define first +%macro first -- -a v50 -a pe3 -- -a pa4 -- -a pc4 -- -a pe4 -- -a pc4 -- -a pa4 -- -a pe3 -- -a v0 -%end +a v 50 +a p e3 -- +a p a4 -- +a p c4 -- +a p e4 -- +a p c4 -- +a p a4 -- +a p e3 -- +a v 0 +%endmacro -%define second +%macro second -- -a v50 -a pe3 -- -a pg3 -- -a pb4 -- -a pe4 -- -a pb4 -- -a pg3 -- -a pe3 -- -a v0 -%end +a v 50 +a p e3 -- +a p g3 -- +a p b4 -- +a p e4 -- +a p b4 -- +a p g3 -- +a p e3 -- +a v 0 +%endmacro -%define third +%macro third -- -a v50 -a pe3 v50 -- -a pg3 v50 -- -a pc4 v50 -- -a pe4 v50 -- -a pc4 v50 -- -a pg3 v50 -- -a pe3 v50 -- -a v0 -%end +a v 50 +a p e3 v 50 -- +a p g3 v 50 -- +a p c4 v 50 -- +a p e4 v 50 -- +a p c4 v 50 -- +a p g3 v 50 -- +a p e3 v 50 -- +a v 0 +%endmacro -%define fourth +%macro fourth -- a v50 -a pd3 v50 -- -a pg3 v50 -- -a pb4 v50 -- -a pd4 v50 -- -a pb4 v50 -- -a pg3 v50 -- -a pd3 v50 -- +a p d3 v 50 -- +a p g3 v 50 -- +a p b4 v 50 -- +a p d4 v 50 -- +a p b4 v 50 -- +a p g3 v 50 -- +a p d3 v 50 -- a v0 -%end +%endmacro -%define notes +%macro notes first first second @@ -66,7 +66,7 @@ third third fourth fourth -%end +%endmacro notes notes diff --git a/assets/asm/explore_harmony2.asm b/assets/asm/explore_harmony2.asm index 9046fbb..e1560cf 100644 --- a/assets/asm/explore_harmony2.asm +++ b/assets/asm/explore_harmony2.asm @@ -3,13 +3,13 @@ ; setup P5 -t v50 +t v 50 -%define note -t p$1 -32 -%end +%macro note +t p $1 -32 +%endmacro -%define notes +%macro notes note a5 note b5 note c5 @@ -18,9 +18,7 @@ note b5b note a5 note b5b note b5 -%end +%endmacro notes notes -notes -notes diff --git a/assets/asm/explore_melody.asm b/assets/asm/explore_melody.asm index 4642395..23c0ff9 100644 --- a/assets/asm/explore_melody.asm +++ b/assets/asm/explore_melody.asm @@ -5,37 +5,37 @@ -256 ; setup -b v100 d50 +b v100 w50 -%define rest +%macro rest b v0 -1 b v100 -%end +%endmacro -%define erest +%macro erest b v0 -4 b v100 -%end +%endmacro -%define snote +%macro snote b p$1 -2 -%end +%endmacro -%define enote +%macro enote b p$1 -4 -%end +%endmacro -%define qnote +%macro qnote b p$1 -8 -%end +%endmacro -%define hnote +%macro hnote b p$1 -16 -%end +%endmacro -%define cnote +%macro cnote b p$1 -$2 -%end +%endmacro qnote a4 qnote e3 @@ -78,3 +78,5 @@ cnote b4 11 enote c4 qnote b4 qnote g3 + +b v0 diff --git a/assets/asm/megalovania_base.asm b/assets/asm/megalovania_base.asm index 11fdf1f..4f4f2bf 100644 --- a/assets/asm/megalovania_base.asm +++ b/assets/asm/megalovania_base.asm @@ -6,20 +6,20 @@ P4 -128 ; setup -b v100 d50 +b v 100 w 50 -%define notes -b p$1 v100 -- b v0 -- -b p$1 v100 -- b v0 -- -b p$1 v100 - b v0 - -b p$1 v100 - b v0 - -- -b p$2 v100 - b v0 - -- -b p$2 v100 - b v0 - -- -b p$2 v100 - b v0 - -b p$2 v100 - b v0 - -b p$2 v100 - b v0 - -b p$2 v100 -- b v0 -- -%end +%macro notes +b p $1 v 100 -- b v 0 -- +b p $1 v 100 -- b v 0 -- +b p $1 v 100 - b v 0 - +b p $1 v 100 - b v 0 - -- +b p $2 v 100 - b v 0 - -- +b p $2 v 100 - b v 0 - -- +b p $2 v 100 - b v 0 - +b p $2 v 100 - b v 0 - +b p $2 v 100 - b v 0 - +b p $2 v 100 -- b v 0 -- +%endmacro notes d2 d2 notes c2 c2 diff --git a/assets/asm/megalovania_melody.asm b/assets/asm/megalovania_melody.asm index 237f301..9644550 100644 --- a/assets/asm/megalovania_melody.asm +++ b/assets/asm/megalovania_melody.asm @@ -2,21 +2,21 @@ ; track: melody ; setup -a v100 d50 +a v 100 w 50 P4 -%define notes -a p$1 v100 - a v0 - -a p$1 v100 - a v0 - -a pd4 v100 -- a v0 -- -a pa4 v100 -- a v0 -- -- -a pg3# v100 - a v0 - -- -a pg3 v100 - a v0 - -- -a pf3 v100 --- a v0 - -a pd3 v100 - a v0 - -a pf3 v100 - a v0 - -a pg3 v100 - a v0 - -%end +%macro notes +a p $1 v 100 - a v 0 - +a p $1 v 100 - a v 0 - +a p d4 v 100 -- a v 0 -- +a p a4 v 100 -- a v 0 -- -- +a p g3# v 100 - a v 0 - -- +a p g3 v 100 - a v 0 - -- +a p f3 v 100 --- a v 0 - +a p d3 v 100 - a v 0 - +a p f3 v 100 - a v 0 - +a p g3 v 100 - a v 0 - +%endmacro notes d3 notes c3 diff --git a/assets/wav/noise_0.wav b/assets/wav/noise_0.wav deleted file mode 100644 index dc1d2db..0000000 Binary files a/assets/wav/noise_0.wav and /dev/null differ diff --git a/assets/wav/noise_1.wav b/assets/wav/noise_1.wav deleted file mode 100644 index c20882f..0000000 Binary files a/assets/wav/noise_1.wav and /dev/null differ diff --git a/assets/wav/pulse_12.wav b/assets/wav/pulse_12.wav deleted file mode 100644 index 0127fbb..0000000 Binary files a/assets/wav/pulse_12.wav and /dev/null differ diff --git a/assets/wav/pulse_25.wav b/assets/wav/pulse_25.wav deleted file mode 100644 index 0bc51c7..0000000 Binary files a/assets/wav/pulse_25.wav and /dev/null differ diff --git a/assets/wav/pulse_50.wav b/assets/wav/pulse_50.wav deleted file mode 100644 index 83e4676..0000000 Binary files a/assets/wav/pulse_50.wav and /dev/null differ diff --git a/assets/wav/pulse_75.wav b/assets/wav/pulse_75.wav deleted file mode 100644 index 11f7364..0000000 Binary files a/assets/wav/pulse_75.wav and /dev/null differ diff --git a/assets/wav/triangle.wav b/assets/wav/triangle.wav deleted file mode 100644 index 0c9bb9e..0000000 Binary files a/assets/wav/triangle.wav and /dev/null differ -- cgit v1.2.3-freya