diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-15 12:38:59 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-15 12:38:59 -0500 |
| commit | 253c09949b421ec09a688af2945eb3df1fc00777 (patch) | |
| tree | 640ec980aa6a518be527c11e7accd25dd46a058a /audio | |
| parent | 94722aa8f08ceaef8233d73a87f534b6c3f0475f (diff) | |
Move data/audio/ back into audio/
Keep trainer data together
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/engine.asm | 4 | ||||
| -rw-r--r-- | audio/notes.asm | 27 | ||||
| -rw-r--r-- | audio/wave_samples.asm | 14 |
3 files changed, 43 insertions, 2 deletions
diff --git a/audio/engine.asm b/audio/engine.asm index 4fd618940..da90e19ec 100644 --- a/audio/engine.asm +++ b/audio/engine.asm @@ -2882,9 +2882,9 @@ LoadMusicByte:: ; e8d76 ; e8d80 -INCLUDE "data/audio/notes.asm" +INCLUDE "audio/notes.asm" -INCLUDE "data/audio/wave_samples.asm" +INCLUDE "audio/wave_samples.asm" INCLUDE "audio/drumkits.asm" diff --git a/audio/notes.asm b/audio/notes.asm new file mode 100644 index 000000000..543672a4a --- /dev/null +++ b/audio/notes.asm @@ -0,0 +1,27 @@ +FrequencyTable: ; e8d80 + dw 0 ; __ + dw $f82c ; C_ + dw $f89d ; C# + dw $f907 ; D_ + dw $f96b ; D# + dw $f9ca ; E_ + dw $fa23 ; F_ + dw $fa77 ; F# + dw $fac7 ; G_ + dw $fb12 ; G# + dw $fb58 ; A_ + dw $fb9b ; A# + dw $fbda ; B_ + dw $fc16 ; C_ + dw $fc4e ; C# + dw $fc83 ; D_ + dw $fcb5 ; D# + dw $fce5 ; E_ + dw $fd11 ; F_ + dw $fd3b ; F# + dw $fd63 ; G_ + dw $fd89 ; G# + dw $fdac ; A_ + dw $fdcd ; A# + dw $fded ; B_ +; e8db2 diff --git a/audio/wave_samples.asm b/audio/wave_samples.asm new file mode 100644 index 000000000..8c5bafa75 --- /dev/null +++ b/audio/wave_samples.asm @@ -0,0 +1,14 @@ +WaveSamples: ; e8db2 + ; these are streams of 32 4-bit values used as wavepatterns + ; nothing interesting here! + dn 0, 2, 4, 6, 8, 10, 12, 14, 15, 15, 15, 14, 14, 13, 13, 12, 12, 11, 10, 9, 8, 7, 6, 5, 4, 4, 3, 3, 2, 2, 1, 1 + dn 0, 2, 4, 6, 8, 10, 12, 14, 14, 15, 15, 15, 15, 14, 14, 14, 13, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 2, 1, 1 + dn 1, 3, 6, 9, 11, 13, 14, 14, 14, 14, 15, 15, 15, 15, 14, 13, 13, 14, 15, 15, 15, 15, 14, 14, 14, 14, 13, 11, 9, 6, 3, 1 + dn 0, 2, 4, 6, 8, 10, 12, 13, 14, 15, 15, 14, 13, 14, 15, 15, 14, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 + dn 0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 13, 14, 14, 15, 7, 7, 15, 14, 14, 13, 12, 10, 8, 7, 6, 5, 4, 3, 2, 1, 0 + dn 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 3, 3, 2, 2, 1, 1, 15, 15, 14, 14, 12, 12, 10, 10, 8, 8, 10, 10, 12, 12, 14, 14 + dn 0, 2, 4, 6, 8, 10, 12, 14, 12, 11, 10, 9, 8, 7, 6, 5, 15, 15, 15, 14, 14, 13, 13, 12, 4, 4, 3, 3, 2, 2, 1, 1 + dn 12, 0, 10, 9, 8, 7, 15, 5, 15, 15, 15, 14, 14, 13, 13, 12, 4, 4, 3, 3, 2, 2, 15, 1, 0, 2, 4, 6, 8, 10, 12, 14 + dn 4, 4, 3, 3, 2, 2, 1, 15, 0, 0, 4, 6, 8, 10, 12, 14, 15, 8, 15, 14, 14, 13, 13, 12, 12, 11, 10, 9, 8, 7, 6, 5 + dn 1, 1, 0, 0, 0, 0, 0, 8, 0, 0, 1, 3, 5, 7, 9, 10, 11, 4, 11, 10, 10, 9, 9, 8, 8, 7, 6, 5, 4, 3, 2, 1 +; e8e52 |