diff options
| author | Freya Murphy <freya@freyacat.org> | 2025-11-22 16:00:35 -0500 |
|---|---|---|
| committer | Freya Murphy <freya@freyacat.org> | 2025-11-22 16:29:28 -0500 |
| commit | fbfb3ad0f70ebbc5db9e5d5fc41c53c15b082d9d (patch) | |
| tree | a41968431e016403aa3956bbdc075dd4a2203e1e /audio/src/data.rs | |
| parent | audio: refactor into seperate crate (diff) | |
| download | DungeonCrawl-fbfb3ad0f70ebbc5db9e5d5fc41c53c15b082d9d.tar.gz DungeonCrawl-fbfb3ad0f70ebbc5db9e5d5fc41c53c15b082d9d.tar.bz2 DungeonCrawl-fbfb3ad0f70ebbc5db9e5d5fc41c53c15b082d9d.zip | |
audio: some changes
Diffstat (limited to 'audio/src/data.rs')
| -rw-r--r-- | audio/src/data.rs | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/audio/src/data.rs b/audio/src/data.rs index 2d1bdc5..e63254d 100644 --- a/audio/src/data.rs +++ b/audio/src/data.rs @@ -11,20 +11,29 @@ macro_rules! load_asm { Program::parse(&src, true)? } }}; - ($first:tt, $($arg:tt)*) => { + ($first:tt, $($arg:tt),*) => { load_asm!($first)$(.merge(load_asm!($arg)))* }; } pub struct Data { + pub explore: Program, pub megalovania: Program, } impl Data { pub fn load() -> crate::Result<Self> { + let explore = load_asm!( + "assets/asm/explore_melody.asm", + "assets/asm/explore_harmony1.asm", + "assets/asm/explore_harmony2.asm" + ); let megalovania = load_asm!( "assets/asm/megalovania_melody.asm", "assets/asm/megalovania_base.asm" ); - Ok(Self { megalovania }) + Ok(Self { + explore, + megalovania, + }) } } |