diff options
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/engine_1.asm | 6 | ||||
| -rw-r--r-- | audio/engine_2.asm | 4 | ||||
| -rw-r--r-- | audio/headers/musicheaders4.asm | 8 | ||||
| -rwxr-xr-x | audio/music/jessieandjames.asm | 303 | ||||
| -rw-r--r-- | audio/sfx/unknown_80e71.asm | 45 | ||||
| -rwxr-xr-x | audio/unknown_832b9.bin | bin | 3399 -> 3398 bytes |
6 files changed, 9 insertions, 357 deletions
diff --git a/audio/engine_1.asm b/audio/engine_1.asm index 0eb4d5d7..adf4cfde 100644 --- a/audio/engine_1.asm +++ b/audio/engine_1.asm @@ -967,7 +967,7 @@ Audio1_ApplyWavePatternAndFrequency: ; 0x964b ld a, $80 ld [wTempoModifier], a ret - + Audio1_SetSfxTempo: ; 9657 (2:5657) call Audio1_IsCry jr c, .isCry @@ -1070,7 +1070,7 @@ Audio1_96c3: ; 96c3 (2:56c3) .asm_96de scf ret - + Audio1_ApplyPitchBend: ; 0x96f9 ld hl, wChannelFlags1 add hl, bc @@ -1566,7 +1566,7 @@ Audio1_9972: ; 9972 (2:5972) pop bc pop af ret - + Audio1_HWChannelEnableMasks: ; 9985 (2:5985) db HW_CH1_ENABLE_MASK, HW_CH2_ENABLE_MASK, HW_CH3_ENABLE_MASK, HW_CH4_ENABLE_MASK ; channels 0-3 db HW_CH1_ENABLE_MASK, HW_CH2_ENABLE_MASK, HW_CH3_ENABLE_MASK, HW_CH4_ENABLE_MASK ; channels 4-7 diff --git a/audio/engine_2.asm b/audio/engine_2.asm index a5cec3ee..b09e3d1e 100644 --- a/audio/engine_2.asm +++ b/audio/engine_2.asm @@ -207,7 +207,7 @@ Audio2_OverwriteChannelPointer: ; 219e6 (8:59e6) ret INCLUDE "audio/sfx/pokeflute_ch1_ch2.asm" - + Audio2_InitMusicVariables:: ; 219f8 (8:59f8) xor a ld [wUnusedC000], a @@ -407,7 +407,7 @@ Audio2_StopAllAudio:: ; 21b3f (8:5b3f) ld a, $ff ld [wStereoPanning], a ret - + FillAudioRAM2: ; 21b94 (8:5b94) ld b, d .loop diff --git a/audio/headers/musicheaders4.asm b/audio/headers/musicheaders4.asm index 7f26601e..be5d822a 100644 --- a/audio/headers/musicheaders4.asm +++ b/audio/headers/musicheaders4.asm @@ -3,10 +3,10 @@ Music_SurfingPikachu:: dbw CH1, Music_SurfingPikachu_Ch2 dbw CH2, Music_SurfingPikachu_Ch3 -Music_JessieAndJames:: - dbw ((3 - 1) << 6) | CH0, Music_JessieAndJames_Ch1 - dbw CH1, Music_JessieAndJames_Ch2 - dbw CH2, Music_JessieAndJames_Ch3 +Music_MeetJessieJames:: + dbw ((3 - 1) << 6) | CH0, Music_MeetJessieJames_Ch1 + dbw CH1, Music_MeetJessieJames_Ch2 + dbw CH2, Music_MeetJessieJames_Ch3 Music_YellowUnusedSong:: dbw ((4 - 1) << 6) | CH0, Music_YellowUnusedSong_Ch1 diff --git a/audio/music/jessieandjames.asm b/audio/music/jessieandjames.asm deleted file mode 100755 index 0d349ddb..00000000 --- a/audio/music/jessieandjames.asm +++ /dev/null @@ -1,303 +0,0 @@ -Music_JessieAndJames_Ch1: - tempo 144 - volume 7, 7 - duty 3 - vibrato 8, 1, 4 - notetype 12, 11, 2 - octave 3 - G# 1 - G_ 1 - F# 2 - F_ 2 - E_ 2 - D# 2 - D_ 2 - C# 2 - C_ 2 - notetype 12, 11, 6 - D# 12 - C_ 4 -.loop - notetype 12, 11, 2 - octave 4 - D_ 16 - rest 12 - notetype 12, 11, 4 - octave 3 - A# 4 - rest 16 - rest 8 - notetype 12, 11, 2 - octave 2 - A_ 2 - octave 3 - A# 2 - A_ 4 - D_ 1 - D# 1 - D# 2 - D# 2 - D_ 2 - D# 2 - D_ 2 - D# 2 - F_ 2 - D_ 1 - D# 1 - D# 2 - D# 2 - D_ 2 - octave 2 - A# 4 - notetype 12, 11, 4 - octave 3 - B_ 4 - notetype 12, 11, 2 - D_ 1 - D# 1 - D# 2 - D# 2 - D_ 2 - D# 2 - D_ 2 - D# 2 - F_ 2 - D_ 1 - D# 1 - D# 2 - D# 2 - D_ 2 - octave 2 - A# 2 - octave 3 - B_ 2 - notetype 12, 11, 4 - A# 4 - loopchannel 0, .loop - -Music_JessieAndJames_Ch2: - duty 3 - vibrato 6, 1, 5 - notetype 12, 12, 2 - octave 4 - D_ 1 - C# 1 - C_ 2 - octave 3 - B_ 2 - A# 2 - A_ 2 - G# 2 - G_ 2 - F# 2 - notetype 12, 12, 7 - A_ 12 - octave 4 - C# 4 -.loop - notetype 12, 12, 2 - octave 3 - C# 1 - D_ 1 - D_ 2 - D_ 2 - C# 2 - D_ 2 - C# 2 - D_ 2 - E_ 2 - C# 1 - D_ 1 - D_ 2 - D_ 2 - C# 2 - octave 2 - A_ 4 - notetype 12, 12, 5 - octave 4 - C# 4 - notetype 12, 12, 2 - D_ 1 - octave 3 - D_ 1 - D_ 2 - D_ 2 - C# 2 - D_ 2 - C# 2 - D_ 2 - E_ 2 - C# 1 - D_ 1 - D_ 2 - D_ 2 - C# 2 - notetype 12, 12, 6 - octave 4 - D_ 8 - notetype 12, 12, 2 - D# 6 - F_ 4 - D# 4 - octave 3 - A# 2 - octave 4 - D# 6 - F_ 4 - D# 2 - notetype 12, 12, 5 - D_ 4 - notetype 12, 12, 2 - D# 6 - F_ 4 - D# 4 - octave 3 - A# 2 - octave 4 - D# 4 - F_ 4 - notetype 12, 12, 5 - D# 8 - loopchannel 0, .loop - -Music_JessieAndJames_Ch3: - notetype 12, 1, 0 - rest 16 - rest 8 - octave 4 - D_ 2 - octave 3 - A_ 2 - octave 4 - C_ 2 - D# 2 -.loop - D_ 1 - rest 1 - A_ 1 - rest 1 - D_ 1 - rest 1 - A_ 1 - rest 1 - D_ 1 - rest 1 - A_ 1 - rest 1 - D_ 1 - rest 1 - A_ 1 - rest 1 - D_ 1 - rest 1 - A_ 1 - rest 1 - D_ 1 - rest 1 - A_ 1 - rest 1 - D_ 1 - rest 1 - A# 2 - A_ 2 - D# 2 - D_ 1 - rest 1 - A_ 1 - rest 1 - D_ 1 - rest 1 - A_ 1 - rest 1 - D_ 1 - rest 1 - A_ 1 - rest 1 - D_ 1 - rest 1 - A_ 1 - rest 1 - D_ 1 - rest 1 - A_ 1 - rest 1 - D_ 1 - rest 1 - A_ 1 - rest 1 - D_ 1 - rest 1 - octave 3 - A_ 2 - octave 4 - C_ 2 - D_ 2 - D# 1 - rest 1 - A# 1 - rest 1 - D# 1 - rest 1 - A# 1 - rest 1 - D# 1 - rest 1 - A# 1 - rest 1 - D# 1 - rest 1 - A# 1 - rest 1 - D# 1 - rest 1 - A# 1 - rest 1 - D# 1 - rest 1 - A# 1 - rest 1 - D# 1 - rest 1 - octave 3 - A# 1 - rest 1 - octave 4 - C# 1 - rest 1 - E_ 1 - rest 1 - D# 1 - rest 1 - A# 1 - rest 1 - D# 1 - rest 1 - A# 1 - rest 1 - D# 1 - rest 1 - A# 1 - rest 1 - D# 1 - rest 1 - A# 1 - rest 1 - D# 1 - rest 1 - A# 1 - rest 1 - D# 1 - rest 1 - A# 1 - rest 1 - D# 1 - rest 1 - octave 3 - A# 1 - rest 1 - octave 4 - C# 1 - rest 1 - E_ 1 - rest 1 - loopchannel 0, .loop diff --git a/audio/sfx/unknown_80e71.asm b/audio/sfx/unknown_80e71.asm deleted file mode 100644 index 1b8241fb..00000000 --- a/audio/sfx/unknown_80e71.asm +++ /dev/null @@ -1,45 +0,0 @@ -SFX_80e91_4_Ch4: - executemusic - tempo 256 - volume 7, 7 - vibrato 6, 2, 6 - duty 2 - toggleperfectpitch - notetype 4, 11, 1 - octave 3 - G# 2 - G# 2 - G# 2 - notetype 12, 11, 3 - octave 4 - E_ 4 - endchannel - -SFX_80ea8_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_80eb8_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 diff --git a/audio/unknown_832b9.bin b/audio/unknown_832b9.bin Binary files differindex 96a64283..1c14816a 100755 --- a/audio/unknown_832b9.bin +++ b/audio/unknown_832b9.bin |