summaryrefslogtreecommitdiff
path: root/assets
diff options
context:
space:
mode:
authorFreya Murphy <freya@freyacat.org>2025-11-22 13:21:41 -0500
committerFreya Murphy <freya@freyacat.org>2025-11-22 13:21:41 -0500
commitd0adf3c6813bb9e357d74f7a606352c957530686 (patch)
treeaddea6486c8cd8c18f2d8b3f0111268c6c2c1236 /assets
parentaudio: fix merge (diff)
downloadDungeonCrawl-d0adf3c6813bb9e357d74f7a606352c957530686.tar.gz
DungeonCrawl-d0adf3c6813bb9e357d74f7a606352c957530686.tar.bz2
DungeonCrawl-d0adf3c6813bb9e357d74f7a606352c957530686.zip
audio: move 'asm' files out of data segment
Diffstat (limited to 'assets')
-rw-r--r--assets/asm/megalovania_base.asm27
-rw-r--r--assets/asm/megalovania_melody.asm29
-rw-r--r--assets/bmp/atlas.bmp (renamed from assets/atlas.bmp)bin16522 -> 16522 bytes
-rw-r--r--assets/bmp/error.bmp (renamed from assets/error.bmp)bin650 -> 650 bytes
-rw-r--r--assets/bmp/font.bmp (renamed from assets/font.bmp)bin3218 -> 3218 bytes
-rw-r--r--assets/bmp/player.bmp (renamed from assets/player.bmp)bin4234 -> 4234 bytes
-rw-r--r--assets/bmp/zombie.bmp (renamed from assets/zombie.bmp)bin8330 -> 8330 bytes
-rw-r--r--assets/speak.oggbin5916 -> 0 bytes
-rw-r--r--assets/wav/noise_0.wav (renamed from assets/noise_0.wav)bin88244 -> 88244 bytes
-rw-r--r--assets/wav/noise_1.wav (renamed from assets/noise_1.wav)bin88244 -> 88244 bytes
-rw-r--r--assets/wav/pulse_12.wav (renamed from assets/pulse_12.wav)bin244 -> 244 bytes
-rw-r--r--assets/wav/pulse_25.wav (renamed from assets/pulse_25.wav)bin244 -> 244 bytes
-rw-r--r--assets/wav/pulse_50.wav (renamed from assets/pulse_50.wav)bin244 -> 244 bytes
-rw-r--r--assets/wav/pulse_75.wav (renamed from assets/pulse_75.wav)bin244 -> 244 bytes
-rw-r--r--assets/wav/triangle.wav (renamed from assets/triangle.wav)bin244 -> 244 bytes
15 files changed, 56 insertions, 0 deletions
diff --git a/assets/asm/megalovania_base.asm b/assets/asm/megalovania_base.asm
new file mode 100644
index 0000000..11fdf1f
--- /dev/null
+++ b/assets/asm/megalovania_base.asm
@@ -0,0 +1,27 @@
+; megalovania
+; track: base
+
+; wait for melody
+P4
+-128
+
+; setup
+b v100 d50
+
+%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
+
+notes d2 d2
+notes c2 c2
+notes b2 b2
+notes b2 c2
diff --git a/assets/asm/megalovania_melody.asm b/assets/asm/megalovania_melody.asm
new file mode 100644
index 0000000..237f301
--- /dev/null
+++ b/assets/asm/megalovania_melody.asm
@@ -0,0 +1,29 @@
+; megalovania
+; track: melody
+
+; setup
+a v100 d50
+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
+
+notes d3
+notes c3
+notes b3
+notes b3b
+
+notes d3
+notes c3
+notes b3
+notes b3b
diff --git a/assets/atlas.bmp b/assets/bmp/atlas.bmp
index 3f7c4eb..3f7c4eb 100644
--- a/assets/atlas.bmp
+++ b/assets/bmp/atlas.bmp
Binary files differ
diff --git a/assets/error.bmp b/assets/bmp/error.bmp
index d857ade..d857ade 100644
--- a/assets/error.bmp
+++ b/assets/bmp/error.bmp
Binary files differ
diff --git a/assets/font.bmp b/assets/bmp/font.bmp
index eb8e838..eb8e838 100644
--- a/assets/font.bmp
+++ b/assets/bmp/font.bmp
Binary files differ
diff --git a/assets/player.bmp b/assets/bmp/player.bmp
index b6d39db..b6d39db 100644
--- a/assets/player.bmp
+++ b/assets/bmp/player.bmp
Binary files differ
diff --git a/assets/zombie.bmp b/assets/bmp/zombie.bmp
index effca5e..effca5e 100644
--- a/assets/zombie.bmp
+++ b/assets/bmp/zombie.bmp
Binary files differ
diff --git a/assets/speak.ogg b/assets/speak.ogg
deleted file mode 100644
index dc3ef20..0000000
--- a/assets/speak.ogg
+++ /dev/null
Binary files differ
diff --git a/assets/noise_0.wav b/assets/wav/noise_0.wav
index dc1d2db..dc1d2db 100644
--- a/assets/noise_0.wav
+++ b/assets/wav/noise_0.wav
Binary files differ
diff --git a/assets/noise_1.wav b/assets/wav/noise_1.wav
index c20882f..c20882f 100644
--- a/assets/noise_1.wav
+++ b/assets/wav/noise_1.wav
Binary files differ
diff --git a/assets/pulse_12.wav b/assets/wav/pulse_12.wav
index 0127fbb..0127fbb 100644
--- a/assets/pulse_12.wav
+++ b/assets/wav/pulse_12.wav
Binary files differ
diff --git a/assets/pulse_25.wav b/assets/wav/pulse_25.wav
index 0bc51c7..0bc51c7 100644
--- a/assets/pulse_25.wav
+++ b/assets/wav/pulse_25.wav
Binary files differ
diff --git a/assets/pulse_50.wav b/assets/wav/pulse_50.wav
index 83e4676..83e4676 100644
--- a/assets/pulse_50.wav
+++ b/assets/wav/pulse_50.wav
Binary files differ
diff --git a/assets/pulse_75.wav b/assets/wav/pulse_75.wav
index 11f7364..11f7364 100644
--- a/assets/pulse_75.wav
+++ b/assets/wav/pulse_75.wav
Binary files differ
diff --git a/assets/triangle.wav b/assets/wav/triangle.wav
index 0c9bb9e..0c9bb9e 100644
--- a/assets/triangle.wav
+++ b/assets/wav/triangle.wav
Binary files differ