diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-21 12:38:16 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-21 12:38:16 -0400 |
| commit | d3d2e573a3b07075909b1680ef5e83a2429b0427 (patch) | |
| tree | 4861f65ef5ebe15206fa99bb6f986ac5345c5afb | |
| parent | abef348eaec42668d3708d3513a4442043b4c1af (diff) | |
Fix sfx separation
| -rw-r--r-- | audio.asm | 2 | ||||
| -rw-r--r-- | audio/sfx/unknown_802b5.asm | 13 | ||||
| -rwxr-xr-x | audio/sfx/unknown_802cc.asm | 5 | ||||
| -rwxr-xr-x | audio/sfx/unknown_802d7.asm | 6 | ||||
| -rw-r--r-- | audio/sfx/unknown_80e71.asm | 97 |
5 files changed, 13 insertions, 110 deletions
@@ -392,6 +392,8 @@ INCLUDE "audio/sfx/unknown_8024c.asm" INCLUDE "audio/sfx/unknown_80250.asm" INCLUDE "audio/sfx/unknown_8026a.asm" INCLUDE "audio/sfx/unknown_802b5.asm" +INCLUDE "audio/sfx/unknown_802cc.asm" +INCLUDE "audio/sfx/unknown_802d7.asm" INCLUDE "audio/sfx/unknown_802e1.asm" INCLUDE "audio/sfx/get_item2_4.asm" INCLUDE "audio/sfx/unknown_80337.asm" diff --git a/audio/sfx/unknown_802b5.asm b/audio/sfx/unknown_802b5.asm index c837730c..4d3d2f06 100644 --- a/audio/sfx/unknown_802b5.asm +++ b/audio/sfx/unknown_802b5.asm @@ -6,16 +6,3 @@ SFX_802b5_4_Ch4: unknownsfx0x20 0, 164, 96, 7 unknownsfx0x20 15, 193, 96, 7 endchannel - -SFX_802cc_4_Ch4: - duty $02 - unknownsfx0x20 3, 180, 192, 7 - unknownsfx0x20 0, 161, 128, 7 - endchannel - -SFX_802d7_4_Ch7: - unknownnoise0x20 2, 241, 50 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 4, 230, 33 - endchannel - diff --git a/audio/sfx/unknown_802cc.asm b/audio/sfx/unknown_802cc.asm new file mode 100755 index 00000000..d7a398a5 --- /dev/null +++ b/audio/sfx/unknown_802cc.asm @@ -0,0 +1,5 @@ +SFX_802cc_4_Ch4: + duty $02 + unknownsfx0x20 3, 180, 192, 7 + unknownsfx0x20 0, 161, 128, 7 + endchannel diff --git a/audio/sfx/unknown_802d7.asm b/audio/sfx/unknown_802d7.asm new file mode 100755 index 00000000..4a1f1ab4 --- /dev/null +++ b/audio/sfx/unknown_802d7.asm @@ -0,0 +1,6 @@ +SFX_802d7_4_Ch7: + unknownnoise0x20 2, 241, 50 + unknownnoise0x20 2, 0, 0 + unknownnoise0x20 4, 230, 33 + endchannel + diff --git a/audio/sfx/unknown_80e71.asm b/audio/sfx/unknown_80e71.asm index 932fbf59..1b8241fb 100644 --- a/audio/sfx/unknown_80e71.asm +++ b/audio/sfx/unknown_80e71.asm @@ -1,32 +1,3 @@ -SFX_80e71_4_Ch5: - executemusic - vibrato 8, 2, 7 - duty 2 - notetype 4, 12, 1 - octave 4 - E_ 2 - E_ 2 - E_ 2 - notetype 12, 12, 3 - B_ 4 - endchannel - -SFX_80e81_4_Ch6: - executemusic - notetype 4, 1, 0 - octave 4 - B_ 1 - rest 1 - B_ 1 - rest 1 - B_ 1 - rest 1 - notetype 12, 1, 0 - octave 4 - B_ 2 - rest 2 - endchannel - SFX_80e91_4_Ch4: executemusic tempo 256 @@ -72,71 +43,3 @@ SFX_80eb8_4_Ch6: B_ 2 rest 2 endchannel - -SFX_80ec8_4_Ch4: - executemusic - tempo 256 - volume 7, 7 - duty 2 - toggleperfectpitch - notetype 5, 11, 4 - octave 4 - D_ 4 - C_ 4 - octave 3 - A_ 8 - notetype 5, 11, 2 - octave 4 - D# 2 - D# 2 - D_ 2 - C_ 2 - C_ 2 - octave 3 - A# 2 - notetype 5, 11, 4 - octave 4 - C_ 8 - endchannel - -SFX_80ee7_4_Ch5: - executemusic - vibrato 8, 2, 7 - duty 2 - notetype 5, 12, 5 - octave 4 - A_ 4 - F_ 4 - C_ 8 - notetype 5, 12, 2 - A# 2 - A# 2 - A# 2 - G_ 2 - G_ 2 - A# 2 - notetype 5, 12, 4 - A_ 8 - endchannel - -SFX_80eff_4_Ch6: - executemusic - notetype 5, 1, 0 - octave 5 - F_ 4 - D# 4 - C_ 8 - D# 1 - rest 1 - D# 1 - rest 1 - E_ 1 - rest 1 - F_ 1 - rest 1 - F_ 1 - rest 1 - G_ 1 - rest 1 - A_ 8 - endchannel |