diff --git a/adpcm-nsf.cfg b/adpcm-nsf.cfg index 668e27c..e19be13 100644 --- a/adpcm-nsf.cfg +++ b/adpcm-nsf.cfg @@ -4,6 +4,8 @@ MEMORY { CODE: start = $8000, size = $1000, type = ro, file = %O, fill = yes, fillval = $ff; ADPCM0: start = $9000, size = $7000, type = ro, file = %O, fill = yes, fillval = $ff; ADPCM1: start = $9000, size = $7000, type = ro, file = %O, fill = yes, fillval = $ff; + ADPCM2: start = $9000, size = $7000, type = ro, file = %O, fill = yes, fillval = $ff; + ADPCM3: start = $9000, size = $7000, type = ro, file = %O, fill = yes, fillval = $ff; } SEGMENTS { @@ -12,4 +14,6 @@ SEGMENTS { CODE: load = CODE, type = ro; ADPCM0: load = ADPCM0, type = ro; ADPCM1: load = ADPCM1, type = ro; + ADPCM2: load = ADPCM2, type = ro; + ADPCM3: load = ADPCM3, type = ro; } diff --git a/adpcm.nsf b/adpcm.nsf index 9e8a526..20d5aa7 100644 Binary files a/adpcm.nsf and b/adpcm.nsf differ diff --git a/nsf.asm b/nsf.asm index 2e4a877..3c4505b 100644 --- a/nsf.asm +++ b/nsf.asm @@ -12,7 +12,7 @@ .byte 'N', 'E', 'S', 'M', $1A ; ID .byte $01 ; Version -.byte 5 ; Number of songs +.byte 7 ; Number of songs .byte 1 ; Start song .word $8000 .word INIT @@ -95,6 +95,8 @@ SampleAddrTbl: .word Sample3 .word Sample4 .word Sample5 + .word Sample6 + .word Sample7 SampleBankTbl: .byte 1 @@ -102,6 +104,8 @@ SampleBankTbl: .byte 8 .byte 8 .byte 8 + .byte 15 + .byte 22 SampleLenTbl: .word Sample1Len @@ -109,6 +113,8 @@ SampleLenTbl: .word Sample3Len .word Sample4Len .word Sample5Len + .word Sample6Len + .word Sample7Len SampleLoopTbl: .byte 0 @@ -116,6 +122,8 @@ SampleLoopTbl: .byte 0 .byte 0 .byte 1 + .byte 0 + .byte 0 .segment "ADPCM0" @@ -139,3 +147,13 @@ Sample4Len = * - Sample4 Sample5: .incbin "raws/beatles-8948.raw" Sample5Len = * - Sample5 + +.segment "ADPCM2" +Sample6: + .incbin "raws/fart1-8948.raw" +Sample6Len = * - Sample6 + +.segment "ADPCM3" +Sample7: + .incbin "raws/fart2-8948.raw" +Sample7Len = * - Sample7 diff --git a/raws/fart1-8948.raw b/raws/fart1-8948.raw new file mode 100644 index 0000000..2fb9456 Binary files /dev/null and b/raws/fart1-8948.raw differ diff --git a/raws/fart2-8948.raw b/raws/fart2-8948.raw new file mode 100644 index 0000000..8f6671f Binary files /dev/null and b/raws/fart2-8948.raw differ diff --git a/wavs/fart.wav b/wavs/fart.wav new file mode 100644 index 0000000..531fa0f Binary files /dev/null and b/wavs/fart.wav differ diff --git a/wavs/fart1.wav b/wavs/fart1.wav new file mode 100644 index 0000000..c692016 Binary files /dev/null and b/wavs/fart1.wav differ diff --git a/wavs/fart2.wav b/wavs/fart2.wav new file mode 100644 index 0000000..6478f81 Binary files /dev/null and b/wavs/fart2.wav differ