diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-09-09 12:33:38 -0700 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2017-09-09 12:34:18 -0700 |
| commit | bd89e966c639c1322695fb5d992e323e81a78be1 (patch) | |
| tree | 3846cc5a6308e7984aba5dddfc87a2f677797c3e | |
| parent | 4b59cbae1d0f6e4058e40e82b1e1bd986489007b (diff) | |
Use song constants and labels. Swap red and blue field music to be correct
38 files changed, 2258 insertions, 2252 deletions
diff --git a/audio/engine_0f.asm b/audio/engine_0f.asm index 395c3c5..b4376d4 100644 --- a/audio/engine_0f.asm +++ b/audio/engine_0f.asm @@ -2068,7 +2068,7 @@ ChannelPointers_BankF: ; 0x3cc92 SongHeaderPointers_BankF: ; 0x3cca2 dw Music_Nothing0F - dw Music_BlueField + dw Music_RedField dw Music_CatchEmRed dw Music_HurryUpRed dw Music_Pokedex @@ -2077,7 +2077,7 @@ SongHeaderPointers_BankF: ; 0x3cca2 dw Music_GengarInTheGraveyard INCLUDE "audio/music/nothing0f.asm" -INCLUDE "audio/music/bluefield.asm" +INCLUDE "audio/music/redfield.asm" INCLUDE "audio/music/catchemred.asm" INCLUDE "audio/music/pokedex.asm" INCLUDE "audio/music/hurryupred.asm" diff --git a/audio/engine_10.asm b/audio/engine_10.asm index 7f525c7..08dabd2 100644 --- a/audio/engine_10.asm +++ b/audio/engine_10.asm @@ -2063,14 +2063,14 @@ ChannelPointers_Bank10: SongHeaderPointers_Bank10: dw Music_Nothing10 - dw Music_RedField + dw Music_BlueField dw Music_CatchEmBlue dw Music_HurryUpBlue dw Music_HiScore dw Music_GameOver INCLUDE "audio/music/nothing10.asm" -INCLUDE "audio/music/redfield.asm" +INCLUDE "audio/music/bluefield.asm" INCLUDE "audio/music/catchemblue.asm" INCLUDE "audio/music/hiscore.asm" INCLUDE "audio/music/gameover.asm" diff --git a/audio/music/bluefield.asm b/audio/music/bluefield.asm index b85c4b9..d43b47c 100644 --- a/audio/music/bluefield.asm +++ b/audio/music/bluefield.asm @@ -1,1423 +1,1469 @@ -Music_BlueField: ; 3ccbf +Music_BlueField: ; 40cbb dbw $c0, Music_BlueField_Ch1 dbw $01, Music_BlueField_Ch2 dbw $02, Music_BlueField_Ch3 dbw $03, Music_BlueField_Ch4 -; 3cccb +; 40cc7 -Music_BlueField_Ch1: ; 3cccb +Music_BlueField_Ch1: ; 40cc7 tempo 144 volume $77 - dutycycle $3 - vibrato $12, $34 + vibrato $9, $34 tone $0001 - notetype $8, $b3 - octave 3 - note D#, 4 - intensity $83 - octave 2 - note F#, 2 - note B_, 2 - octave 3 - note D#, 2 - intensity $b3 - note D#, 8 - intensity $83 - octave 2 - note F#, 2 + notetype $8, $a2 + dutycycle $3 octave 3 + note A_, 4 + intensity $a1 note C_, 2 - note D#, 2 - intensity $b3 - note F_, 4 - intensity $82 - note E_, 2 - note D#, 4 + note F_, 2 + note A_, 2 intensity $a3 - note G#, 6 - note __, 8 + note A_, 7 + note __, 1 + intensity $a1 + note C_, 2 + note F#, 2 + note A_, 2 + intensity $a2 + note B_, 4 + intensity $a1 + note A#, 2 + note A_, 2 + note __, 2 + note D_, 2 + note __, 12 -Music_BlueField_branch_3ccf9: ; 3ccf9 - note __, 8 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - intensity $83 - octave 4 - note C#, 4 - intensity $82 - octave 3 - note B_, 6 - note G#, 6 - intensity $84 - note F_, 16 - note __, 6 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 +Music_BlueField_branch_40cf1: ; 40cf1 + notetype $8, $61 + dutycycle $2 + note __, 12 + note __, 12 note __, 10 - intensity $83 - octave 4 - note C#, 4 - intensity $82 - octave 3 - note B_, 6 - note G#, 6 - intensity $84 - note F_, 16 - note __, 6 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 6 - intensity $21 note A#, 2 - intensity $41 - octave 4 - note C#, 2 - intensity $61 - octave 3 - note A#, 2 - intensity $81 - octave 4 - note C#, 2 + note __, 4 + intensity $91 + note G_, 2 intensity $a1 - octave 3 note A#, 2 + note __, 2 intensity $c1 - octave 4 - note C#, 12 - note __, 5 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 + note A#, 2 + notetype $c, $b3 note __, 16 - note __, 1 - loopchannel 0, Music_BlueField_branch_3ccf9 - -Music_BlueField_Ch2: ; 3cd5b - dutycycle $2 - vibrato $12, $34 - notetype $8, $c4 - octave 3 - note A#, 4 - intensity $a2 - octave 2 + notetype $8, $a2 + dutycycle $3 note B_, 2 + note __, 2 + octave 4 + note D_, 2 octave 3 - note D#, 2 - note F#, 2 - intensity $c4 - note A#, 8 - intensity $a2 - octave 2 note B_, 2 - octave 3 - note D#, 2 - note F#, 2 - intensity $c3 - note A#, 4 - intensity $a2 + note __, 2 + note G_, 2 + note __, 6 + note D_, 2 + note F_, 2 + note G_, 2 + note F#, 1 + note G_, 5 + note __, 4 + note E_, 6 + note __, 8 + note A_, 1 + note A#, 5 + note __, 4 + note A#, 2 + note __, 4 + intensity $91 + dutycycle $2 + octave 5 + note G_, 2 note A_, 2 - note G#, 4 - intensity $c5 - octave 4 - note C#, 14 - -Music_BlueField_branch_3cd81: ; 3cd81 - callchannel Music_BlueField_branch_3cf69 - dutycycle $3 - intensity $a3 - octave 4 - note F_, 4 + note __, 2 + note A#, 2 intensity $a2 - note F#, 6 - note G_, 6 - intensity $a4 - note G#, 8 - callchannel Music_BlueField_branch_3cfa5 - note A#, 4 - note F#, 2 - intensity $92 - panning $f - note A#, 4 - note F#, 2 - intensity $72 - panning $f0 - note A#, 4 - note F#, 2 - panning $f - intensity $42 - note A#, 4 - note F#, 10 - panning $ff - note __, 16 - callchannel Music_BlueField_branch_3cf69 dutycycle $3 - intensity $a3 - octave 4 - note F_, 4 - intensity $a2 - note F#, 6 - note G_, 6 - intensity $a6 - note G#, 8 - callchannel Music_BlueField_branch_3cfa5 - intensity $b2 - note A#, 4 - intensity $a2 - note F#, 16 + octave 3 + note G#, 1 + note A_, 2 + note __, 1 + note A_, 2 + note A_, 2 + note __, 2 + note F_, 2 + note __, 4 + note F_, 2 note __, 4 - intensity $1d + note A_, 2 + note B_, 2 + note __, 2 + note D_, 2 + note G_, 2 + note __, 2 + note B_, 2 note __, 12 - octave 4 - note E_, 12 - dutycycle $0 - intensity $a2 + intensity $91 + dutycycle $2 + note __, 12 + note __, 4 octave 5 - note D#, 2 - intensity $52 + note C_, 2 + note __, 6 + note __, 12 + note __, 4 octave 4 - note D#, 2 - note F#, 2 - note A#, 2 - note F#, 2 - note D#, 2 - octave 3 note B_, 2 - octave 4 - note D#, 2 - note F#, 2 - intensity $a2 + note __, 6 + note __, 12 + note __, 4 note B_, 2 - intensity $52 - note F#, 2 - note D#, 2 - intensity $a2 - octave 5 - note F#, 2 - intensity $52 - octave 4 - note D#, 2 + note __, 6 + note __, 4 + note G_, 1 + note __, 11 + note G_, 2 + note __, 6 + note __, 12 + note __, 4 note F_, 2 - note G#, 2 + note __, 6 + note __, 12 + note __, 4 note F_, 2 - note D#, 2 - intensity $a2 - octave 5 - note G#, 2 - intensity $52 + note __, 6 + intensity $41 + octave 3 + note G_, 2 + note B_, 2 + note G_, 2 + note B_, 2 + intensity $51 + note G_, 2 + intensity $61 + note B_, 2 + note __, 4 + intensity $91 octave 4 - note D#, 2 + note G_, 2 + note __, 6 intensity $a2 - octave 5 - note F#, 2 - note F_, 2 - intensity $52 + dutycycle $3 + octave 3 + note F#, 1 + note G_, 4 + note __, 1 + note E_, 4 + note __, 2 + note A#, 4 + note __, 2 octave 4 - note F#, 2 - intensity $a2 - octave 5 - note D#, 2 note C#, 2 - intensity $52 + note __, 2 + note D#, 1 + note E_, 5 + intensity $91 + dutycycle $2 + note __, 2 + octave 5 + note C_, 2 + note __, 2 + intensity $a2 + dutycycle $3 + octave 3 + note A_, 2 + note __, 4 octave 4 - note C#, 2 - note F_, 2 - note G#, 2 - note F_, 2 - note C#, 2 + note E_, 2 + intensity $91 + dutycycle $2 + octave 5 + note C_, 2 + note __, 2 + intensity $a2 + dutycycle $3 octave 3 + note A_, 2 + note G_, 1 note G#, 2 - octave 4 - note C#, 2 + note __, 1 note F_, 2 + intensity $91 + dutycycle $2 + octave 5 + note D_, 2 + note __, 2 intensity $a2 - note A#, 2 - intensity $52 + dutycycle $3 + octave 3 note F_, 2 - note C#, 2 - intensity $a2 + note __, 4 + note G#, 2 + intensity $91 + dutycycle $2 octave 5 - note C#, 2 - intensity $52 + note D_, 2 + note __, 2 + intensity $a2 + dutycycle $3 octave 4 - note E_, 2 - note G#, 2 + note C_, 2 + octave 3 + note A#, 1 + note B_, 3 + note __, 2 + intensity $91 + dutycycle $2 octave 5 - note C#, 2 + note D_, 2 + note __, 2 + intensity $a2 + dutycycle $3 + octave 3 + note G_, 2 + note __, 4 + note B_, 2 + intensity $91 + dutycycle $2 + octave 5 + note D_, 2 + note __, 2 + intensity $a2 + dutycycle $3 + octave 3 + note G_, 2 + octave 4 + note F#, 1 + note G_, 3 + note __, 2 + note A_, 2 + note __, 2 note E_, 2 - note G#, 2 - octave 6 - note C#, 2 + note __, 6 + intensity $91 + dutycycle $2 octave 5 - note G#, 2 note E_, 2 - note C#, 2 + note __, 4 + note F_, 2 + note C_, 2 octave 4 - note G#, 2 - note E_, 2 - intensity $a2 - note G#, 2 - intensity $52 + note A_, 2 + note F_, 2 + note C_, 2 octave 3 + note A_, 2 + note F_, 2 + note D_, 2 + note C_, 2 + note D_, 2 + note C_, 2 + note D_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 note B_, 2 - octave 4 - note D#, 2 - note F#, 2 - note D#, 2 - octave 3 + note D_, 2 note B_, 2 - note G#, 2 + note D_, 2 note B_, 2 - intensity $a2 - octave 4 - note G#, 2 - note A#, 2 - intensity $52 - note D#, 2 - intensity $a2 + intensity $41 + note G_, 2 note B_, 2 - intensity $52 - note D#, 2 - note F_, 2 - intensity $a2 + note G_, 2 + note B_, 2 + intensity $51 + note G_, 2 + intensity $61 + note B_, 2 + intensity $71 + note G_, 2 + intensity $81 + note B_, 2 + intensity $91 + note G_, 2 + intensity $a1 + note B_, 2 + intensity $b1 + note G_, 2 + intensity $c1 note B_, 2 - note A#, 2 - intensity $52 - note F_, 2 - note C#, 2 intensity $a2 - note G#, 2 - intensity $52 - note D#, 2 - note F_, 2 + dutycycle $3 + note G#, 1 + intensity $a4 + note A_, 9 intensity $a2 - note B_, 2 - intensity $52 note F_, 2 - note C#, 2 - intensity $a2 - note A#, 2 - intensity $52 + note __, 4 + note F_, 2 + note __, 4 + note D_, 2 + intensity $a7 + note F#, 1 + note G_, 11 + note B_, 12 + notetype $c, $b3 + note __, 16 + loopchannel 0, Music_BlueField_branch_40cf1 + +Music_BlueField_Ch2: ; 40e48 + vibrato $9, $34 + notetype $8, $b2 + dutycycle $3 + octave 4 + note E_, 4 + intensity $b1 octave 3 - note A#, 2 + note F_, 2 + note A_, 2 octave 4 - note C#, 2 + note C_, 2 + intensity $b3 + note E_, 7 + note __, 1 + intensity $b1 + octave 3 note F_, 2 - note C#, 2 + note A_, 2 + octave 4 + note C_, 2 + intensity $b2 + note E_, 4 + intensity $b1 + note D#, 2 + note D_, 2 + note __, 2 octave 3 - note A#, 2 - note F#, 2 + note G_, 2 + note __, 4 + intensity $b2 + note G_, 2 + note A_, 2 + note __, 2 + note B_, 2 + +Music_BlueField_branch_40e75: ; 40e75 + notetype $8, $b2 octave 4 - note C#, 2 - note F_, 2 - intensity $a2 - note F#, 2 - intensity $52 - note C#, 2 + note C#, 1 + note D_, 5 + intensity $81 + dutycycle $2 octave 3 - note A#, 2 - intensity $a2 - octave 5 - note C#, 2 - intensity $52 + note G_, 2 + note A_, 2 + intensity $b2 + dutycycle $3 + octave 4 + note C_, 6 + intensity $81 + dutycycle $2 octave 3 - note A#, 2 + note G_, 2 + note A_, 2 + note __, 2 + note G_, 2 + intensity $b2 + dutycycle $3 octave 4 - note E_, 2 + note D#, 1 + note E_, 5 + intensity $41 + dutycycle $2 octave 3 note A#, 2 + intensity $51 + note G_, 2 + intensity $b2 + dutycycle $3 octave 4 - note E_, 2 + note F_, 2 + intensity $71 + dutycycle $2 octave 3 + note G_, 2 + intensity $81 note A#, 2 + intensity $b2 + dutycycle $3 octave 4 - note C#, 2 - note E_, 2 - note C#, 2 note E_, 2 + note F_, 2 + intensity $b1 + dutycycle $2 + octave 3 note G_, 2 - note A#, 2 - intensity $a2 - octave 5 - note D#, 2 - intensity $52 + intensity $b2 + dutycycle $3 octave 4 + note G_, 2 + note D#, 1 + note E_, 2 + note __, 1 note D#, 2 - note F#, 2 - note A#, 2 - note F#, 2 - note D#, 2 + note D_, 2 + intensity $81 + dutycycle $2 + octave 3 + note A_, 2 + intensity $b2 + dutycycle $3 + octave 4 + note C_, 2 + intensity $81 + dutycycle $2 octave 3 + note F_, 2 + note G_, 2 + intensity $b2 + dutycycle $3 + note A_, 2 + intensity $81 + dutycycle $2 + note A#, 2 note B_, 2 + intensity $b2 + dutycycle $3 octave 4 - note D#, 2 - note F#, 2 - intensity $a2 + note C_, 2 + note E_, 2 + note __, 2 + note G_, 2 + note E_, 2 + note __, 2 + note D_, 2 + note __, 6 + octave 3 + note G_, 2 + note A_, 2 note B_, 2 - intensity $52 - note F#, 2 - note D#, 2 - intensity $a2 - octave 5 - note F#, 2 - intensity $52 octave 4 - note D#, 2 - note F_, 2 - note G#, 2 - note F_, 2 - note D#, 2 - intensity $a2 - octave 5 - note G#, 2 - intensity $52 + note C#, 1 + note D_, 5 + intensity $81 + dutycycle $2 + octave 3 + note G_, 2 + note A_, 2 + intensity $b2 + dutycycle $3 octave 4 - note D#, 2 - intensity $a2 + note C_, 6 + intensity $91 + dutycycle $2 octave 5 + note G_, 2 note F#, 2 + note __, 2 note F_, 2 - intensity $52 + intensity $b2 + dutycycle $3 octave 4 - note F#, 2 - intensity $a2 - octave 5 - note D#, 2 - note C#, 2 - intensity $52 + note D#, 1 + note E_, 5 + intensity $81 + dutycycle $2 + octave 3 + note G_, 2 + note A#, 2 + intensity $b2 + dutycycle $3 octave 4 - note C#, 2 note F_, 2 - note G#, 2 - note F_, 2 - note C#, 2 + intensity $81 + dutycycle $2 octave 3 - note G#, 2 + note A#, 2 octave 4 note C#, 2 - intensity $a2 - octave 5 - note C#, 2 + intensity $b2 + dutycycle $3 + note E_, 2 + note F_, 2 + note __, 2 + note G_, 2 + note D#, 1 + note E_, 2 + note __, 1 note D#, 2 - intensity $52 - octave 4 + note D_, 2 + note __, 2 + note C_, 2 + intensity $81 + dutycycle $2 + octave 3 note F_, 2 - intensity $a2 - octave 5 - note E_, 4 - intensity $52 + note G_, 2 + intensity $b2 + dutycycle $3 + note A_, 2 + intensity $81 + dutycycle $2 + note A#, 2 + note B_, 2 + intensity $b2 + dutycycle $3 octave 4 + note C_, 2 note E_, 2 - note G#, 2 - intensity $a2 - octave 5 - note D#, 2 - intensity $52 + note __, 2 + note G_, 2 note E_, 2 - note G#, 2 - intensity $a2 - note C#, 2 - intensity $52 - note G#, 2 + note __, 2 + note D_, 2 + note __, 6 note E_, 2 - intensity $a2 + note F_, 2 + note G_, 2 + note G#, 1 + note A_, 3 + intensity $91 + dutycycle $2 + octave 5 + note C_, 2 + octave 3 + note E_, 2 + note F_, 2 + note A_, 2 octave 4 - note A#, 2 - intensity $52 - note G#, 2 + note C_, 2 + note __, 2 + intensity $b2 + dutycycle $3 note E_, 2 - intensity $a2 + note __, 4 + note D_, 6 + intensity $91 + dutycycle $2 note B_, 2 - intensity $52 octave 3 + note D_, 2 + note E_, 2 + note A_, 2 note B_, 2 + note __, 2 + intensity $b2 + dutycycle $3 octave 4 - note D#, 2 - note F#, 2 - note D#, 2 - octave 3 - note B_, 2 - note G#, 2 + note D_, 2 + note E_, 2 + note __, 2 + note F_, 2 + note G_, 4 + intensity $91 + dutycycle $2 note B_, 2 - intensity $a2 + octave 3 + note E_, 2 + note G_, 2 + intensity $b2 + dutycycle $3 octave 4 + note D_, 2 + intensity $91 + dutycycle $2 + octave 3 note B_, 2 - octave 5 - note C#, 2 - intensity $52 octave 4 - note D#, 2 - intensity $a2 - octave 5 note D_, 2 - intensity $52 + intensity $b2 + dutycycle $3 + note G_, 2 + intensity $91 + dutycycle $2 + octave 3 + note G_, 2 + note B_, 2 + intensity $b2 + dutycycle $3 octave 4 note D_, 2 - note F#, 2 + note C#, 1 + note D_, 2 + note __, 1 + note C_, 2 + octave 3 note B_, 2 - intensity $a2 - octave 5 - note C#, 2 - intensity $52 + note __, 2 octave 4 - note F#, 2 - note D_, 2 - intensity $a2 + note C_, 2 + intensity $91 + dutycycle $2 + octave 3 + note C_, 2 + note E_, 2 + intensity $b2 + dutycycle $3 note B_, 2 - intensity $52 - note D_, 2 - note F#, 2 - intensity $a2 - octave 5 - note D_, 2 - intensity $52 + intensity $91 + dutycycle $2 + note E_, 2 + note G_, 2 + intensity $b2 + dutycycle $3 octave 4 - note F#, 2 - intensity $a2 - octave 5 - note C#, 2 - intensity $52 + note C_, 2 octave 3 - note F#, 2 - note A#, 2 + note A_, 4 + intensity $91 + dutycycle $2 octave 4 - note C#, 2 note F_, 2 - note C#, 2 octave 3 - note A#, 2 - note F#, 2 - note A#, 2 + note A_, 2 octave 4 - note C#, 2 + note C_, 2 + intensity $b2 + dutycycle $3 note F_, 2 - note C#, 2 + intensity $91 + dutycycle $2 octave 3 - note A#, 2 - note G#, 2 - note B_, 2 + note F_, 2 + note A_, 2 + intensity $b2 + dutycycle $3 octave 4 - note D#, 2 - note F#, 2 - note D#, 2 + note E_, 2 + intensity $91 + dutycycle $2 + octave 3 + note D_, 2 + note F_, 2 + intensity $b2 + dutycycle $3 + octave 4 + note D_, 2 + note C_, 4 + intensity $91 + dutycycle $2 + note F_, 2 octave 3 + note D_, 2 + note F_, 2 + intensity $b2 + dutycycle $3 note B_, 2 - note G#, 2 + intensity $91 + dutycycle $2 + note F_, 2 + note G_, 2 + intensity $b2 + dutycycle $3 + octave 4 + note C_, 2 + intensity $91 + dutycycle $2 + octave 3 + note G_, 2 note B_, 2 + intensity $b2 + dutycycle $3 octave 4 - note D#, 2 - note F#, 2 - note D#, 2 + note D_, 2 + intensity $b4 + note E_, 12 + intensity $71 + dutycycle $2 octave 3 + note G_, 2 + intensity $81 note B_, 2 - loopchannel 0, Music_BlueField_branch_3cd81 -; 3cf69 - -Music_BlueField_branch_3cf69: ; 3cf69 + intensity $91 + note G_, 2 + intensity $a1 + note B_, 2 + intensity $b1 + note G_, 2 + intensity $c1 + note B_, 2 + intensity $b2 + dutycycle $3 + octave 4 + note C#, 1 + note D_, 4 + note __, 1 + note C#, 4 + note __, 2 + note F_, 4 + note __, 2 + note G_, 2 + note __, 2 + note G#, 1 + note A_, 5 + intensity $91 dutycycle $2 - intensity $c2 + octave 5 + note C_, 2 + octave 3 + note E_, 2 + note F_, 2 + intensity $b2 + dutycycle $3 octave 4 + note E_, 2 + note __, 4 + note A_, 2 + note __, 4 + note E_, 2 + note D#, 1 + note E_, 2 + note __, 1 + note D_, 2 note C#, 2 - intensity $72 - octave 3 + note __, 2 + note D_, 2 + note __, 4 note C#, 2 - note F#, 2 - intensity $c2 + note __, 4 + note D_, 2 + note F#, 1 + note G_, 3 + intensity $91 + dutycycle $2 note B_, 2 - intensity $72 - note C#, 2 - note F#, 2 - intensity $c2 - note A#, 4 - intensity $72 - note C#, 2 - note D#, 4 - note C#, 2 - note E_, 4 - intensity $c2 - note A#, 2 - note B_, 4 + octave 3 + note D_, 2 + note E_, 2 + intensity $b2 + dutycycle $3 octave 4 - note C#, 6 - note C#, 2 + note D_, 2 + intensity $91 + dutycycle $2 octave 3 - note B_, 4 - note A#, 2 - note B_, 4 - note G#, 2 - intensity $92 - panning $f0 - note B_, 4 - note G#, 2 - intensity $72 - panning $f - note B_, 4 - note G#, 2 - panning $f0 - intensity $42 - note B_, 4 - note G#, 2 - panning $ff - endchannel -; 3cfa5 - -Music_BlueField_branch_3cfa5: ; 3cfa5 + note E_, 2 + note G_, 2 + intensity $b2 + dutycycle $3 + octave 4 + note G_, 2 + intensity $91 dutycycle $2 - intensity $c2 octave 3 + note G_, 2 note B_, 2 - intensity $72 - note D#, 2 - note F#, 2 - intensity $c2 - note A#, 2 - intensity $72 - note D#, 2 - note F#, 2 - intensity $c2 - note G#, 4 - intensity $72 - note D_, 2 - note F#, 4 + intensity $b2 + dutycycle $3 + octave 4 note D_, 2 - note G#, 4 - intensity $c2 - note G#, 2 - note A#, 4 - intensity $c3 - note B_, 6 - intensity $c2 - note B_, 2 - note A#, 4 - note G#, 2 - endchannel - -Music_BlueField_Ch3: ; 3cfcc - notetype $8, $23 - octave 2 - note B_, 4 - note __, 6 + note A#, 1 + note B_, 3 + intensity $91 + dutycycle $2 + note A_, 2 + intensity $b2 + dutycycle $3 + octave 5 + note C_, 2 + note __, 2 + octave 4 + note A_, 2 + note __, 4 + intensity $91 + dutycycle $2 + note A_, 2 + intensity $b2 + dutycycle $3 octave 3 - note C_, 7 - note __, 7 - note C#, 4 - note __, 6 + note A_, 2 + note __, 2 octave 4 - note F_, 6 + note C_, 2 + note E_, 1 + note F_, 3 + intensity $91 + dutycycle $2 + note A_, 2 + note A_, 2 note __, 2 + intensity $b2 + dutycycle $3 + note C_, 2 + intensity $b1 + notetype $8, $91 + dutycycle $2 octave 3 - note G#, 1 - note __, 1 - note F_, 1 - note __, 1 - note C#, 1 - note __, 1 - -Music_BlueField_branch_3cfe1: ; 3cfe1 - octave 2 - note F#, 1 - note __, 3 + note A_, 2 + octave 4 + note C_, 2 + intensity $b2 + dutycycle $3 + note F_, 2 + intensity $91 + dutycycle $2 + note A_, 2 + note F_, 2 + intensity $b2 + dutycycle $3 + note C_, 2 octave 3 - note F#, 1 + note B_, 1 + octave 4 + note C_, 2 note __, 1 - note F_, 4 - note __, 2 - note E_, 4 - note __, 2 - note D#, 4 + octave 3 + note B_, 2 + note A_, 2 note __, 2 - note G_, 4 + note B_, 2 + note __, 6 + note G_, 6 + octave 4 + note D#, 1 + notetype $c, $b7 + note E_, 14 + notetype $8, $b2 note __, 2 - note G_, 1 - note __, 1 - note E_, 1 - note __, 1 note C#, 1 - note __, 1 - octave 2 - note A#, 4 - note A#, 1 - note __, 1 + intensity $b4 + note D_, 9 + intensity $b2 + note C_, 2 + note __, 4 + note C_, 2 + note __, 4 + octave 3 + note A_, 2 + octave 4 + note D#, 1 + notetype $c, $b7 + note E_, 14 + notetype $8, $b2 + note __, 2 + intensity $93 + dutycycle $2 + octave 3 note B_, 1 - note __, 3 + octave 4 + note C_, 5 octave 3 - note C#, 1 - note __, 1 - note D#, 4 + note A_, 6 + note B_, 4 + intensity $b2 + dutycycle $3 + note G_, 2 + note A_, 2 note __, 2 - note D#, 1 - note __, 1 + note B_, 2 + loopchannel 0, Music_BlueField_branch_40e75 + +Music_BlueField_Ch3: ; 4111e + forceoctave $10 + notetype $8, $22 + octave 3 + note F_, 4 + note __, 6 + note F#, 7 + note __, 7 + note G_, 4 + note __, 6 octave 2 + note G_, 2 + note __, 12 + +Music_BlueField_branch_4112d: ; 4112d + callchannel Music_BlueField_branch_412dd note B_, 1 note __, 1 - note G#, 1 - note __, 1 - note F#, 1 - note __, 3 note G_, 1 note __, 1 - note G#, 1 - note __, 3 - octave 3 - note D#, 1 + note F_, 1 note __, 1 - note F_, 4 - note G#, 1 - note __, 5 - note B_, 1 - note __, 5 - octave 4 - note C#, 6 + note D_, 2 note __, 2 + note B_, 2 + note __, 6 + note D_, 2 octave 2 - note G#, 1 - note __, 3 - octave 3 - note G#, 1 + note B_, 2 + note G_, 2 + callchannel Music_BlueField_branch_412dd + note B_, 1 note __, 1 - note G_, 4 - note __, 2 - note F#, 4 - note __, 2 - note D#, 4 - note __, 2 - note F_, 4 - note __, 2 - note F_, 1 + note G_, 1 note __, 1 - note D_, 1 + note F_, 1 note __, 1 + note D_, 2 + note __, 2 octave 2 - note B_, 1 - note __, 1 - note G#, 4 - note B_, 1 + note G_, 2 + note __, 12 + note F_, 2 + note __, 2 + octave 6 + note E_, 1 note __, 1 - octave 3 - note D_, 1 - note __, 3 + octave 2 note F_, 1 note __, 1 - note F#, 1 - note __, 1 - note C#, 1 + octave 3 + note E_, 1 note __, 1 note C_, 1 note __, 1 octave 2 - note B_, 4 - octave 3 - note C#, 1 + note F_, 2 + note __, 2 + octave 6 + note E_, 1 note __, 1 octave 2 - note A#, 4 - octave 3 - note C#, 1 + note F_, 2 + note __, 2 + note F_, 1 note __, 1 - octave 2 - note G#, 4 - octave 3 - note C#, 1 + note F_, 2 + note __, 2 + octave 6 + note D_, 1 note __, 1 octave 2 - note F#, 1 - note __, 1 - note A#, 1 + note F_, 1 note __, 1 octave 3 - note C#, 1 - note __, 1 - note D#, 4 - note E_, 1 - note __, 1 - note F_, 4 - note E_, 1 - note __, 1 - note D#, 4 note D_, 1 note __, 1 octave 2 - note F#, 1 - note __, 3 - octave 3 - note F#, 1 + note B_, 1 note __, 1 - note F_, 4 - note __, 2 - note E_, 4 + note F_, 2 note __, 2 - note D#, 4 + octave 6 + note D_, 1 + note __, 1 + octave 2 + note F_, 2 note __, 2 - note G_, 4 + note F_, 1 + note __, 1 + note E_, 2 note __, 2 - note G_, 1 + octave 6 + note D_, 1 note __, 1 + octave 2 note E_, 1 note __, 1 - note C#, 1 + octave 3 + note D_, 1 note __, 1 octave 2 - note A#, 4 - note A#, 1 - note __, 1 note B_, 1 - note __, 3 - octave 3 - note C#, 1 note __, 1 - note D#, 4 + note E_, 2 note __, 2 - note D#, 1 + octave 6 + note D_, 1 note __, 1 octave 2 - note B_, 1 - note __, 1 - note G#, 1 + note E_, 2 + note __, 2 + note E_, 1 note __, 1 - note F#, 1 - note __, 3 - note G_, 1 + note E_, 2 + note __, 2 + octave 6 + note C_, 1 note __, 1 - note G#, 1 - note __, 3 + octave 2 + note E_, 2 octave 3 - note D#, 1 + note C_, 1 note __, 1 - note F_, 4 - note G#, 1 - note __, 5 - note B_, 1 - note __, 5 - octave 4 - note C#, 6 - note __, 2 octave 2 - note G#, 1 - note __, 3 - octave 3 - note G#, 1 + note A_, 1 note __, 1 - note G_, 4 - note __, 2 - note F#, 4 - note __, 2 - note D#, 4 - note __, 2 - note F_, 4 + note E_, 2 note __, 2 - note F_, 1 - note __, 1 - note D_, 1 + octave 6 + note C_, 1 note __, 1 octave 2 - note B_, 1 - note __, 1 - note G#, 4 - note B_, 1 + note E_, 2 + note A_, 1 note __, 1 octave 3 - note D_, 1 - note __, 3 - note F_, 1 - note __, 1 - note F#, 1 - note __, 1 - note C#, 1 - note __, 1 note C_, 1 note __, 1 octave 2 - note B_, 4 - octave 3 - note C#, 1 + note D_, 2 + note __, 2 + octave 6 + note C_, 1 note __, 1 octave 2 - note A#, 4 - octave 3 - note C#, 1 + note D_, 1 note __, 1 - octave 2 - note G#, 4 octave 3 - note C#, 1 + note C_, 1 note __, 1 octave 2 - note F#, 2 - note __, 10 - octave 3 - note E_, 1 + note A_, 1 note __, 1 - note C#, 1 + note D_, 2 + note __, 2 + octave 6 + note C_, 1 note __, 1 octave 2 - note A#, 1 - note __, 1 - note E_, 1 - note __, 1 - note G_, 1 + note D_, 2 + note __, 2 + note D_, 1 note __, 1 - octave 3 - note E_, 1 + note D_, 2 + note __, 2 + octave 5 + note B_, 1 note __, 1 octave 2 - note B_, 3 + note D_, 1 note __, 1 note B_, 1 note __, 1 - note F#, 1 + note G_, 1 note __, 1 + note D_, 2 + note __, 2 + octave 5 note B_, 1 note __, 1 - note F#, 1 + octave 2 + note D_, 2 + note __, 2 + note D_, 1 note __, 1 + note C_, 2 + note __, 2 + octave 5 note B_, 1 - note __, 3 - note B_, 1 - note __, 7 - note B_, 3 + note __, 1 + octave 2 + note C_, 1 note __, 1 note B_, 1 note __, 1 - note G#, 1 + note G_, 1 note __, 1 + note C_, 2 + note __, 2 + octave 5 note B_, 1 note __, 1 - note G#, 1 + octave 2 + note C_, 1 note __, 1 note B_, 1 - note __, 3 - note B_, 1 - note __, 7 - note A#, 3 - note __, 1 - note A#, 1 note __, 1 - note G#, 1 + note G_, 1 note __, 1 - note A#, 1 + note C#, 2 + note __, 2 + note C#, 1 note __, 1 - note G#, 1 + note C#, 1 note __, 1 note A#, 1 - note __, 3 - note A#, 1 - note __, 7 - note A#, 3 note __, 1 - note A#, 1 + note G_, 1 note __, 1 - note G#, 1 + note C#, 2 + note __, 2 + note C_, 2 + note C#, 2 + note __, 2 + note G_, 2 + note F_, 2 + note __, 2 + octave 6 + note D#, 2 + note E_, 1 note __, 1 - note A#, 1 + octave 3 + note F_, 1 note __, 1 - note G#, 1 + note C_, 1 note __, 1 - note A#, 3 + octave 2 + note F_, 2 + note __, 4 + octave 6 + note E_, 1 note __, 1 - note A#, 1 + octave 2 + note F_, 1 note __, 1 - note A#, 1 - note __, 5 - note G#, 3 + octave 6 + note E_, 1 note __, 1 - note G#, 1 + octave 2 + note F_, 2 + note __, 2 + octave 6 + note E_, 2 + note F_, 1 note __, 1 - note F#, 1 + octave 3 + note D_, 1 note __, 1 - note G#, 1 + note C_, 1 note __, 1 - note F#, 1 + octave 2 + note F_, 2 + note __, 4 + octave 6 + note F_, 1 note __, 1 - note G#, 1 - note __, 3 - note G#, 1 - note __, 7 - note G#, 3 + octave 2 + note F_, 1 note __, 1 - note G#, 1 + octave 6 + note F_, 1 note __, 1 - note F#, 1 + octave 2 + note E_, 2 + note __, 2 + octave 6 + note F#, 2 + note G_, 1 note __, 1 - note G#, 1 + octave 3 + note D_, 1 note __, 1 - note F#, 1 + octave 2 + note B_, 1 note __, 1 - note G#, 1 + note E_, 2 + note __, 4 + octave 6 + note G_, 1 note __, 3 - note G#, 1 - note __, 7 - note F#, 3 + note G_, 1 note __, 1 - note F#, 1 + octave 2 + note E_, 2 + note __, 2 + octave 6 + note G#, 2 + note A_, 1 note __, 1 - note F_, 1 + octave 3 + note C_, 1 note __, 1 - note F#, 1 + octave 2 + note A_, 1 note __, 1 - note F_, 1 + note E_, 2 + note __, 4 + octave 6 + note A_, 1 note __, 1 - note F#, 1 - note __, 3 - note F#, 1 - note __, 7 - note G_, 3 + octave 2 + note A_, 1 note __, 1 - note G_, 1 + octave 6 + note A_, 1 note __, 1 - note E_, 1 + octave 2 + note D_, 2 + note __, 2 + octave 6 + note C#, 2 + note D_, 1 note __, 1 - note G_, 1 + octave 3 + note C_, 1 note __, 1 - note E_, 1 + octave 2 + note A_, 1 note __, 1 - note G_, 1 + note D_, 2 + note __, 4 + octave 6 + note D_, 1 note __, 3 - note G_, 1 - note __, 1 - note G_, 1 - note __, 5 - note B_, 3 + note D_, 1 note __, 1 + octave 2 + note D_, 2 + note __, 2 + octave 5 + note A#, 2 note B_, 1 note __, 1 - note F#, 1 - note __, 1 + octave 2 note B_, 1 note __, 1 - note F#, 1 + note G_, 1 note __, 1 - note B_, 1 - note __, 3 - note B_, 1 - note __, 7 - note B_, 3 + note D_, 2 + note __, 2 + note D_, 1 note __, 1 + octave 5 note B_, 1 note __, 1 - note G#, 1 - note __, 1 + octave 2 note B_, 1 note __, 1 - note G#, 1 - note __, 1 - note B_, 1 - note __, 3 + octave 5 note B_, 1 - note __, 7 - note A#, 3 note __, 1 - note A#, 1 + octave 2 + note C_, 2 + note __, 2 + note C_, 1 note __, 1 - note G#, 1 + note C_, 1 note __, 1 - note A#, 1 + note B_, 1 note __, 1 - note G#, 1 + note G_, 1 note __, 1 - note A#, 1 + note C_, 2 + note __, 2 + note C_, 1 + note __, 1 + note C_, 1 note __, 3 - note A#, 1 - note __, 7 - note A#, 3 + note C_, 1 note __, 1 - note A#, 1 + note D_, 2 + note __, 2 + note D_, 1 note __, 1 - note G#, 1 + note D_, 1 note __, 1 - note A#, 1 + octave 3 + note C_, 1 note __, 1 - note G#, 1 + octave 2 + note A_, 1 note __, 1 - note A#, 3 + note D_, 2 + note __, 2 + note D_, 1 note __, 1 - note A#, 1 + note D_, 1 + note __, 3 + note D_, 1 note __, 1 - note A#, 1 - note __, 5 - note G#, 3 + note C_, 2 + note __, 2 + note C_, 1 note __, 1 - note G#, 1 + note C_, 1 note __, 1 - note F#, 1 + note B_, 1 note __, 1 - note G#, 1 + note G_, 1 note __, 1 - note F#, 1 + note C_, 2 + note __, 2 + note C_, 1 note __, 1 - note G#, 1 + note C_, 1 note __, 3 - note G#, 1 - note __, 7 - note G#, 3 - note __, 1 - note G#, 1 - note __, 1 - octave 3 - note F#, 2 - octave 2 - note G#, 1 - note __, 1 - note D_, 1 + note C_, 1 note __, 1 - octave 3 note D_, 2 note __, 2 - octave 2 - note G#, 1 - note __, 1 - note G#, 2 - note __, 4 - note F#, 3 + note D_, 1 note __, 1 - note F#, 1 + note D_, 1 note __, 1 - note F_, 1 + octave 3 + note C_, 1 note __, 1 - note F#, 1 + octave 2 + note A_, 1 note __, 1 - note F_, 1 + note D_, 2 + note __, 2 + note D_, 1 note __, 1 - note F#, 1 + note D_, 1 note __, 3 - note F#, 1 - note __, 7 - note G#, 3 - note __, 1 - note G#, 1 - note __, 1 - note F#, 1 - note __, 1 - note G#, 1 + note D_, 1 note __, 1 - note F#, 1 + loopchannel 0, Music_BlueField_branch_4112d +; 412dd + +Music_BlueField_branch_412dd: ; 412dd + octave 3 + note C_, 3 note __, 1 - note G#, 1 + octave 4 + note C_, 2 + octave 3 + note B_, 3 note __, 3 - note G#, 1 + note A#, 3 + note __, 3 + note A_, 3 + note __, 3 + note G_, 2 + note E_, 1 note __, 1 - octave 3 - note G#, 1 + note C#, 1 note __, 1 - note F_, 1 + octave 2 + note A#, 6 + octave 3 + note A#, 6 + note A_, 2 + note __, 2 + note E_, 2 + note D_, 2 + note __, 4 + octave 4 + note D_, 1 note __, 1 note C#, 1 note __, 1 - loopchannel 0, Music_BlueField_branch_3cfe1 + note C_, 1 + note __, 1 + octave 3 + note A_, 2 + note __, 2 + note F_, 2 + note D_, 2 + note __, 2 + note A_, 2 + endchannel -Music_BlueField_Ch4: ; 3d1cd +Music_BlueField_Ch4: ; 41306 togglenoise $0 notetype $8 - note G_, 4 - note G_, 2 - note G_, 2 - note G_, 2 + note F#, 4 note G_, 2 - note G_, 4 note G_, 2 note G_, 2 + note F#, 8 note G_, 2 note G_, 2 - note G_, 4 note G_, 2 - note G_, 4 + note F#, 4 note G_, 2 note G_, 4 - note G_, 2 - note G_, 2 - note G_, 2 - note G_, 2 + note F#, 2 + note D#, 4 + note D_, 2 + note D#, 2 + note D_, 2 + note D_, 2 -Music_BlueField_branch_3d1e4: ; 3d1e4 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 2 - note G_, 2 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 2 - note G_, 2 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 2 - note G_, 2 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 2 - note G_, 2 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 2 - note G_, 2 - note G_, 2 - note G_, 2 - note G_, 2 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 2 - note G_, 2 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 2 - note G_, 2 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 2 - note G_, 2 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 +Music_BlueField_branch_4131b: ; 4131b + note F#, 4 note G_, 2 note G_, 4 note G_, 2 - note G_, 2 - note G_, 2 - note G_, 2 + note D#, 4 + note F#, 2 note G_, 4 note G_, 2 note G_, 4 note G_, 2 note G_, 4 note G_, 2 + note D#, 4 + note F#, 2 note G_, 2 note G_, 2 note G_, 2 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note G_, 8 - note __, 16 - note G_, 4 + note F#, 4 note G_, 2 - note D_, 4 note G_, 2 - note G_, 4 note G_, 2 - note D_, 4 note G_, 2 note G_, 4 note G_, 2 - note D_, 4 - note G_, 2 - note G_, 4 + note C_, 4 note G_, 2 - note D_, 4 + note C#, 2 + note C#, 2 note D_, 2 - note G_, 4 - note G_, 2 - note D_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note D_, 4 - note G_, 2 - note G_, 4 - note G_, 2 note D_, 4 + note D#, 2 + note F#, 6 note G_, 2 - note G_, 4 - note G_, 2 - note D_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note D_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note D_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note D_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note D_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note D_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note D_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note D_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note D_, 4 note G_, 2 - note G_, 4 note G_, 2 - note D_, 4 + +Music_BlueField_branch_4133e: ; 4133e + note D#, 4 note G_, 2 - note G_, 4 + note F#, 4 note G_, 2 - note D_, 4 + note D#, 4 note G_, 2 note G_, 4 + note D#, 2 + loopchannel 3, Music_BlueField_branch_4133e + note D#, 4 note G_, 2 - note D_, 4 - note G_, 2 - note G_, 4 + note F#, 4 note G_, 2 - note D_, 4 + note __, 6 + note C#, 2 + note C#, 2 note D_, 2 - note G_, 4 - note G_, 2 - note D_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note D_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note D_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note D_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note D_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note D_, 4 - note G_, 2 - note G_, 4 - note G_, 2 - note D_, 4 - note G_, 2 - note G_, 4 - note G_, 2 + callchannel Music_BlueField_branch_41386 + callchannel Music_BlueField_branch_41386 + note D#, 4 + note F#, 2 note D_, 4 note G_, 2 - note G_, 4 - note G_, 2 + note D#, 4 + note D_, 2 + note F#, 2 + note D#, 2 + note D_, 2 + note D#, 4 + note F#, 2 note D_, 4 - note G_, 2 - note G_, 4 - note G_, 2 + note D_, 2 + note D#, 4 + note F#, 2 note D_, 4 - note G_, 2 - note G_, 4 - note G_, 2 + note D_, 2 + +Music_BlueField_branch_41369: ; 41369 + callchannel Music_BlueField_branch_41386 + loopchannel 3, Music_BlueField_branch_41369 + note F#, 4 + note D#, 2 + note C#, 2 + note C#, 2 + note D_, 2 + note D_, 2 + note F#, 2 + note C#, 2 + note C#, 2 + note D_, 2 + note D_, 2 + +Music_BlueField_branch_4137b: ; 4137b + callchannel Music_BlueField_branch_41386 + loopchannel 10, Music_BlueField_branch_4137b + loopchannel 0, Music_BlueField_branch_4131b +; 41386 + +Music_BlueField_branch_41386: ; 41386 + note D#, 4 + note F#, 2 note D_, 4 note G_, 2 - note G_, 4 - note G_, 2 + note D#, 4 + note F#, 2 note D_, 4 - note G_, 2 - loopchannel 0, Music_BlueField_branch_3d1e4 -; 3d2ed + note D#, 2 + endchannel +; 4138f diff --git a/audio/music/redfield.asm b/audio/music/redfield.asm index 01dd3ce..575f3a7 100644 --- a/audio/music/redfield.asm +++ b/audio/music/redfield.asm @@ -1,1469 +1,1423 @@ -Music_RedField: ; 40cbb +Music_RedField: ; 3ccbf dbw $c0, Music_RedField_Ch1 dbw $01, Music_RedField_Ch2 dbw $02, Music_RedField_Ch3 dbw $03, Music_RedField_Ch4 -; 40cc7 +; 3cccb -Music_RedField_Ch1: ; 40cc7 +Music_RedField_Ch1: ; 3cccb tempo 144 volume $77 - vibrato $9, $34 - tone $0001 - notetype $8, $a2 dutycycle $3 + vibrato $12, $34 + tone $0001 + notetype $8, $b3 + octave 3 + note D#, 4 + intensity $83 + octave 2 + note F#, 2 + note B_, 2 + octave 3 + note D#, 2 + intensity $b3 + note D#, 8 + intensity $83 + octave 2 + note F#, 2 octave 3 - note A_, 4 - intensity $a1 note C_, 2 - note F_, 2 - note A_, 2 + note D#, 2 + intensity $b3 + note F_, 4 + intensity $82 + note E_, 2 + note D#, 4 intensity $a3 - note A_, 7 - note __, 1 - intensity $a1 - note C_, 2 - note F#, 2 - note A_, 2 - intensity $a2 - note B_, 4 - intensity $a1 - note A#, 2 - note A_, 2 - note __, 2 - note D_, 2 - note __, 12 + note G#, 6 + note __, 8 -Music_RedField_branch_40cf1: ; 40cf1 - notetype $8, $61 - dutycycle $2 - note __, 12 - note __, 12 +Music_RedField_branch_3ccf9: ; 3ccf9 + note __, 8 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + intensity $83 + octave 4 + note C#, 4 + intensity $82 + octave 3 + note B_, 6 + note G#, 6 + intensity $84 + note F_, 16 + note __, 6 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 note __, 10 + intensity $83 + octave 4 + note C#, 4 + intensity $82 + octave 3 + note B_, 6 + note G#, 6 + intensity $84 + note F_, 16 + note __, 6 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 6 + intensity $21 note A#, 2 - note __, 4 - intensity $91 - note G_, 2 + intensity $41 + octave 4 + note C#, 2 + intensity $61 + octave 3 + note A#, 2 + intensity $81 + octave 4 + note C#, 2 intensity $a1 + octave 3 note A#, 2 - note __, 2 intensity $c1 - note A#, 2 - notetype $c, $b3 + octave 4 + note C#, 12 + note __, 5 note __, 16 - notetype $8, $a2 - dutycycle $3 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 1 + loopchannel 0, Music_RedField_branch_3ccf9 + +Music_RedField_Ch2: ; 3cd5b + dutycycle $2 + vibrato $12, $34 + notetype $8, $c4 + octave 3 + note A#, 4 + intensity $a2 + octave 2 note B_, 2 - note __, 2 - octave 4 - note D_, 2 octave 3 + note D#, 2 + note F#, 2 + intensity $c4 + note A#, 8 + intensity $a2 + octave 2 note B_, 2 - note __, 2 - note G_, 2 - note __, 6 - note D_, 2 - note F_, 2 - note G_, 2 - note F#, 1 - note G_, 5 - note __, 4 - note E_, 6 - note __, 8 - note A_, 1 - note A#, 5 - note __, 4 - note A#, 2 - note __, 4 - intensity $91 - dutycycle $2 - octave 5 - note G_, 2 + octave 3 + note D#, 2 + note F#, 2 + intensity $c3 + note A#, 4 + intensity $a2 note A_, 2 - note __, 2 - note A#, 2 + note G#, 4 + intensity $c5 + octave 4 + note C#, 14 + +Music_RedField_branch_3cd81: ; 3cd81 + callchannel Music_RedField_branch_3cf69 + dutycycle $3 + intensity $a3 + octave 4 + note F_, 4 intensity $a2 + note F#, 6 + note G_, 6 + intensity $a4 + note G#, 8 + callchannel Music_RedField_branch_3cfa5 + note A#, 4 + note F#, 2 + intensity $92 + panning $f + note A#, 4 + note F#, 2 + intensity $72 + panning $f0 + note A#, 4 + note F#, 2 + panning $f + intensity $42 + note A#, 4 + note F#, 10 + panning $ff + note __, 16 + callchannel Music_RedField_branch_3cf69 dutycycle $3 - octave 3 - note G#, 1 - note A_, 2 - note __, 1 - note A_, 2 - note A_, 2 - note __, 2 - note F_, 2 - note __, 4 - note F_, 2 + intensity $a3 + octave 4 + note F_, 4 + intensity $a2 + note F#, 6 + note G_, 6 + intensity $a6 + note G#, 8 + callchannel Music_RedField_branch_3cfa5 + intensity $b2 + note A#, 4 + intensity $a2 + note F#, 16 note __, 4 - note A_, 2 - note B_, 2 - note __, 2 - note D_, 2 - note G_, 2 - note __, 2 - note B_, 2 + intensity $1d note __, 12 - intensity $91 - dutycycle $2 - note __, 12 - note __, 4 + octave 4 + note E_, 12 + dutycycle $0 + intensity $a2 octave 5 - note C_, 2 - note __, 6 - note __, 12 - note __, 4 + note D#, 2 + intensity $52 octave 4 - note B_, 2 - note __, 6 - note __, 12 - note __, 4 - note B_, 2 - note __, 6 - note __, 4 - note G_, 1 - note __, 11 - note G_, 2 - note __, 6 - note __, 12 - note __, 4 - note F_, 2 - note __, 6 - note __, 12 - note __, 4 - note F_, 2 - note __, 6 - intensity $41 + note D#, 2 + note F#, 2 + note A#, 2 + note F#, 2 + note D#, 2 octave 3 - note G_, 2 note B_, 2 - note G_, 2 - note B_, 2 - intensity $51 - note G_, 2 - intensity $61 - note B_, 2 - note __, 4 - intensity $91 octave 4 - note G_, 2 - note __, 6 + note D#, 2 + note F#, 2 intensity $a2 - dutycycle $3 - octave 3 - note F#, 1 - note G_, 4 - note __, 1 - note E_, 4 - note __, 2 - note A#, 4 - note __, 2 - octave 4 - note C#, 2 - note __, 2 - note D#, 1 - note E_, 5 - intensity $91 - dutycycle $2 - note __, 2 - octave 5 - note C_, 2 - note __, 2 + note B_, 2 + intensity $52 + note F#, 2 + note D#, 2 intensity $a2 - dutycycle $3 - octave 3 - note A_, 2 - note __, 4 - octave 4 - note E_, 2 - intensity $91 - dutycycle $2 octave 5 - note C_, 2 - note __, 2 - intensity $a2 - dutycycle $3 - octave 3 - note A_, 2 - note G_, 1 + note F#, 2 + intensity $52 + octave 4 + note D#, 2 + note F_, 2 note G#, 2 - note __, 1 note F_, 2 - intensity $91 - dutycycle $2 - octave 5 - note D_, 2 - note __, 2 + note D#, 2 intensity $a2 - dutycycle $3 - octave 3 - note F_, 2 - note __, 4 + octave 5 note G#, 2 - intensity $91 - dutycycle $2 + intensity $52 + octave 4 + note D#, 2 + intensity $a2 octave 5 - note D_, 2 - note __, 2 + note F#, 2 + note F_, 2 + intensity $52 + octave 4 + note F#, 2 intensity $a2 - dutycycle $3 + octave 5 + note D#, 2 + note C#, 2 + intensity $52 octave 4 - note C_, 2 + note C#, 2 + note F_, 2 + note G#, 2 + note F_, 2 + note C#, 2 octave 3 - note A#, 1 - note B_, 3 - note __, 2 - intensity $91 - dutycycle $2 - octave 5 - note D_, 2 - note __, 2 + note G#, 2 + octave 4 + note C#, 2 + note F_, 2 intensity $a2 - dutycycle $3 - octave 3 - note G_, 2 - note __, 4 - note B_, 2 - intensity $91 - dutycycle $2 - octave 5 - note D_, 2 - note __, 2 + note A#, 2 + intensity $52 + note F_, 2 + note C#, 2 intensity $a2 - dutycycle $3 - octave 3 - note G_, 2 + octave 5 + note C#, 2 + intensity $52 octave 4 - note F#, 1 - note G_, 3 - note __, 2 - note A_, 2 - note __, 2 note E_, 2 - note __, 6 - intensity $91 - dutycycle $2 + note G#, 2 octave 5 + note C#, 2 note E_, 2 - note __, 4 - note F_, 2 - note C_, 2 + note G#, 2 + octave 6 + note C#, 2 + octave 5 + note G#, 2 + note E_, 2 + note C#, 2 octave 4 - note A_, 2 - note F_, 2 - note C_, 2 + note G#, 2 + note E_, 2 + intensity $a2 + note G#, 2 + intensity $52 octave 3 - note A_, 2 - note F_, 2 - note D_, 2 - note C_, 2 - note D_, 2 - note C_, 2 - note D_, 2 - note D_, 2 - note G_, 2 - note D_, 2 - note G_, 2 - note D_, 2 - note G_, 2 - note D_, 2 - note B_, 2 - note D_, 2 - note B_, 2 - note D_, 2 - note B_, 2 - intensity $41 - note G_, 2 - note B_, 2 - note G_, 2 - note B_, 2 - intensity $51 - note G_, 2 - intensity $61 note B_, 2 - intensity $71 - note G_, 2 - intensity $81 - note B_, 2 - intensity $91 - note G_, 2 - intensity $a1 + octave 4 + note D#, 2 + note F#, 2 + note D#, 2 + octave 3 note B_, 2 - intensity $b1 - note G_, 2 - intensity $c1 + note G#, 2 note B_, 2 intensity $a2 - dutycycle $3 - note G#, 1 - intensity $a4 - note A_, 9 + octave 4 + note G#, 2 + note A#, 2 + intensity $52 + note D#, 2 intensity $a2 + note B_, 2 + intensity $52 + note D#, 2 note F_, 2 - note __, 4 + intensity $a2 + note B_, 2 + note A#, 2 + intensity $52 note F_, 2 - note __, 4 - note D_, 2 - intensity $a7 - note F#, 1 - note G_, 11 - note B_, 12 - notetype $c, $b3 - note __, 16 - loopchannel 0, Music_RedField_branch_40cf1 - -Music_RedField_Ch2: ; 40e48 - vibrato $9, $34 - notetype $8, $b2 - dutycycle $3 - octave 4 - note E_, 4 - intensity $b1 - octave 3 + note C#, 2 + intensity $a2 + note G#, 2 + intensity $52 + note D#, 2 note F_, 2 - note A_, 2 - octave 4 - note C_, 2 - intensity $b3 - note E_, 7 - note __, 1 - intensity $b1 - octave 3 + intensity $a2 + note B_, 2 + intensity $52 note F_, 2 - note A_, 2 - octave 4 - note C_, 2 - intensity $b2 - note E_, 4 - intensity $b1 - note D#, 2 - note D_, 2 - note __, 2 + note C#, 2 + intensity $a2 + note A#, 2 + intensity $52 octave 3 - note G_, 2 - note __, 4 - intensity $b2 - note G_, 2 - note A_, 2 - note __, 2 - note B_, 2 - -Music_RedField_branch_40e75: ; 40e75 - notetype $8, $b2 + note A#, 2 octave 4 - note C#, 1 - note D_, 5 - intensity $81 - dutycycle $2 + note C#, 2 + note F_, 2 + note C#, 2 octave 3 - note G_, 2 - note A_, 2 - intensity $b2 - dutycycle $3 + note A#, 2 + note F#, 2 octave 4 - note C_, 6 - intensity $81 - dutycycle $2 + note C#, 2 + note F_, 2 + intensity $a2 + note F#, 2 + intensity $52 + note C#, 2 octave 3 - note G_, 2 - note A_, 2 - note __, 2 - note G_, 2 - intensity $b2 - dutycycle $3 - octave 4 - note D#, 1 - note E_, 5 - intensity $41 - dutycycle $2 + note A#, 2 + intensity $a2 + octave 5 + note C#, 2 + intensity $52 octave 3 note A#, 2 - intensity $51 - note G_, 2 - intensity $b2 - dutycycle $3 octave 4 - note F_, 2 - intensity $71 - dutycycle $2 + note E_, 2 octave 3 - note G_, 2 - intensity $81 note A#, 2 - intensity $b2 - dutycycle $3 octave 4 note E_, 2 - note F_, 2 - intensity $b1 - dutycycle $2 octave 3 - note G_, 2 - intensity $b2 - dutycycle $3 + note A#, 2 octave 4 - note G_, 2 - note D#, 1 + note C#, 2 note E_, 2 - note __, 1 + note C#, 2 + note E_, 2 + note G_, 2 + note A#, 2 + intensity $a2 + octave 5 note D#, 2 - note D_, 2 - intensity $81 - dutycycle $2 - octave 3 - note A_, 2 - intensity $b2 - dutycycle $3 + intensity $52 octave 4 - note C_, 2 - intensity $81 - dutycycle $2 - octave 3 - note F_, 2 - note G_, 2 - intensity $b2 - dutycycle $3 - note A_, 2 - intensity $81 - dutycycle $2 + note D#, 2 + note F#, 2 note A#, 2 + note F#, 2 + note D#, 2 + octave 3 note B_, 2 - intensity $b2 - dutycycle $3 octave 4 - note C_, 2 - note E_, 2 - note __, 2 - note G_, 2 - note E_, 2 - note __, 2 - note D_, 2 - note __, 6 - octave 3 - note G_, 2 - note A_, 2 + note D#, 2 + note F#, 2 + intensity $a2 note B_, 2 + intensity $52 + note F#, 2 + note D#, 2 + intensity $a2 + octave 5 + note F#, 2 + intensity $52 octave 4 - note C#, 1 - note D_, 5 - intensity $81 - dutycycle $2 - octave 3 - note G_, 2 - note A_, 2 - intensity $b2 - dutycycle $3 + note D#, 2 + note F_, 2 + note G#, 2 + note F_, 2 + note D#, 2 + intensity $a2 + octave 5 + note G#, 2 + intensity $52 octave 4 - note C_, 6 - intensity $91 - dutycycle $2 + note D#, 2 + intensity $a2 octave 5 - note G_, 2 note F#, 2 - note __, 2 note F_, 2 - intensity $b2 - dutycycle $3 + intensity $52 octave 4 - note D#, 1 - note E_, 5 - intensity $81 - dutycycle $2 - octave 3 - note G_, 2 - note A#, 2 - intensity $b2 - dutycycle $3 + note F#, 2 + intensity $a2 + octave 5 + note D#, 2 + note C#, 2 + intensity $52 octave 4 + note C#, 2 note F_, 2 - intensity $81 - dutycycle $2 + note G#, 2 + note F_, 2 + note C#, 2 octave 3 - note A#, 2 + note G#, 2 octave 4 note C#, 2 - intensity $b2 - dutycycle $3 - note E_, 2 - note F_, 2 - note __, 2 - note G_, 2 - note D#, 1 - note E_, 2 - note __, 1 + intensity $a2 + octave 5 + note C#, 2 note D#, 2 - note D_, 2 - note __, 2 - note C_, 2 - intensity $81 - dutycycle $2 - octave 3 - note F_, 2 - note G_, 2 - intensity $b2 - dutycycle $3 - note A_, 2 - intensity $81 - dutycycle $2 - note A#, 2 - note B_, 2 - intensity $b2 - dutycycle $3 + intensity $52 octave 4 - note C_, 2 - note E_, 2 - note __, 2 - note G_, 2 - note E_, 2 - note __, 2 - note D_, 2 - note __, 6 - note E_, 2 note F_, 2 - note G_, 2 - note G#, 1 - note A_, 3 - intensity $91 - dutycycle $2 + intensity $a2 octave 5 - note C_, 2 - octave 3 - note E_, 2 - note F_, 2 - note A_, 2 + note E_, 4 + intensity $52 octave 4 - note C_, 2 - note __, 2 - intensity $b2 - dutycycle $3 note E_, 2 - note __, 4 - note D_, 6 - intensity $91 - dutycycle $2 - note B_, 2 - octave 3 - note D_, 2 + note G#, 2 + intensity $a2 + octave 5 + note D#, 2 + intensity $52 note E_, 2 - note A_, 2 - note B_, 2 - note __, 2 - intensity $b2 - dutycycle $3 + note G#, 2 + intensity $a2 + note C#, 2 + intensity $52 + note G#, 2 + note E_, 2 + intensity $a2 octave 4 - note D_, 2 + note A#, 2 + intensity $52 + note G#, 2 note E_, 2 - note __, 2 - note F_, 2 - note G_, 4 - intensity $91 - dutycycle $2 + intensity $a2 note B_, 2 + intensity $52 octave 3 - note E_, 2 - note G_, 2 - intensity $b2 - dutycycle $3 + note B_, 2 octave 4 - note D_, 2 - intensity $91 - dutycycle $2 + note D#, 2 + note F#, 2 + note D#, 2 octave 3 note B_, 2 + note G#, 2 + note B_, 2 + intensity $a2 octave 4 - note D_, 2 - intensity $b2 - dutycycle $3 - note G_, 2 - intensity $91 - dutycycle $2 - octave 3 - note G_, 2 note B_, 2 - intensity $b2 - dutycycle $3 + octave 5 + note C#, 2 + intensity $52 octave 4 + note D#, 2 + intensity $a2 + octave 5 note D_, 2 - note C#, 1 + intensity $52 + octave 4 note D_, 2 - note __, 1 - note C_, 2 - octave 3 + note F#, 2 note B_, 2 - note __, 2 + intensity $a2 + octave 5 + note C#, 2 + intensity $52 octave 4 - note C_, 2 - intensity $91 - dutycycle $2 - octave 3 - note C_, 2 - note E_, 2 - intensity $b2 - dutycycle $3 + note F#, 2 + note D_, 2 + intensity $a2 note B_, 2 - intensity $91 - dutycycle $2 - note E_, 2 - note G_, 2 - intensity $b2 - dutycycle $3 - octave 4 - note C_, 2 - octave 3 - note A_, 4 - intensity $91 - dutycycle $2 + intensity $52 + note D_, 2 + note F#, 2 + intensity $a2 + octave 5 + note D_, 2 + intensity $52 octave 4 - note F_, 2 + note F#, 2 + intensity $a2 + octave 5 + note C#, 2 + intensity $52 octave 3 - note A_, 2 + note F#, 2 + note A#, 2 octave 4 - note C_, 2 - intensity $b2 - dutycycle $3 - note F_, 2 - intensity $91 - dutycycle $2 - octave 3 + note C#, 2 note F_, 2 - note A_, 2 - intensity $b2 - dutycycle $3 - octave 4 - note E_, 2 - intensity $91 - dutycycle $2 + note C#, 2 octave 3 - note D_, 2 - note F_, 2 - intensity $b2 - dutycycle $3 + note A#, 2 + note F#, 2 + note A#, 2 octave 4 - note D_, 2 - note C_, 4 - intensity $91 - dutycycle $2 + note C#, 2 note F_, 2 + note C#, 2 octave 3 - note D_, 2 - note F_, 2 - intensity $b2 - dutycycle $3 + note A#, 2 + note G#, 2 note B_, 2 - intensity $91 - dutycycle $2 - note F_, 2 - note G_, 2 - intensity $b2 - dutycycle $3 octave 4 - note C_, 2 - intensity $91 - dutycycle $2 + note D#, 2 + note F#, 2 + note D#, 2 octave 3 - note G_, 2 note B_, 2 - intensity $b2 - dutycycle $3 + note G#, 2 + note B_, 2 octave 4 - note D_, 2 - intensity $b4 - note E_, 12 - intensity $71 - dutycycle $2 + note D#, 2 + note F#, 2 + note D#, 2 octave 3 - note G_, 2 - intensity $81 note B_, 2 - intensity $91 - note G_, 2 - intensity $a1 - note B_, 2 - intensity $b1 - note G_, 2 - intensity $c1 - note B_, 2 - intensity $b2 - dutycycle $3 - octave 4 - note C#, 1 - note D_, 4 - note __, 1 - note C#, 4 - note __, 2 - note F_, 4 - note __, 2 - note G_, 2 - note __, 2 - note G#, 1 - note A_, 5 - intensity $91 + loopchannel 0, Music_RedField_branch_3cd81 +; 3cf69 + +Music_RedField_branch_3cf69: ; 3cf69 dutycycle $2 - octave 5 - note C_, 2 - octave 3 - note E_, 2 - note F_, 2 - intensity $b2 - dutycycle $3 + intensity $c2 octave 4 - note E_, 2 - note __, 4 - note A_, 2 - note __, 4 - note E_, 2 - note D#, 1 - note E_, 2 - note __, 1 - note D_, 2 note C#, 2 - note __, 2 - note D_, 2 - note __, 4 + intensity $72 + octave 3 note C#, 2 - note __, 4 - note D_, 2 - note F#, 1 - note G_, 3 - intensity $91 - dutycycle $2 + note F#, 2 + intensity $c2 note B_, 2 - octave 3 - note D_, 2 - note E_, 2 - intensity $b2 - dutycycle $3 + intensity $72 + note C#, 2 + note F#, 2 + intensity $c2 + note A#, 4 + intensity $72 + note C#, 2 + note D#, 4 + note C#, 2 + note E_, 4 + intensity $c2 + note A#, 2 + note B_, 4 octave 4 - note D_, 2 - intensity $91 - dutycycle $2 + note C#, 6 + note C#, 2 octave 3 - note E_, 2 - note G_, 2 - intensity $b2 - dutycycle $3 - octave 4 - note G_, 2 - intensity $91 + note B_, 4 + note A#, 2 + note B_, 4 + note G#, 2 + intensity $92 + panning $f0 + note B_, 4 + note G#, 2 + intensity $72 + panning $f + note B_, 4 + note G#, 2 + panning $f0 + intensity $42 + note B_, 4 + note G#, 2 + panning $ff + endchannel +; 3cfa5 + +Music_RedField_branch_3cfa5: ; 3cfa5 dutycycle $2 + intensity $c2 octave 3 - note G_, 2 note B_, 2 - intensity $b2 - dutycycle $3 - octave 4 + intensity $72 + note D#, 2 + note F#, 2 + intensity $c2 + note A#, 2 + intensity $72 + note D#, 2 + note F#, 2 + intensity $c2 + note G#, 4 + intensity $72 note D_, 2 - note A#, 1 - note B_, 3 - intensity $91 - dutycycle $2 - note A_, 2 - intensity $b2 - dutycycle $3 - octave 5 - note C_, 2 - note __, 2 - octave 4 - note A_, 2 - note __, 4 - intensity $91 - dutycycle $2 - note A_, 2 - intensity $b2 - dutycycle $3 - octave 3 - note A_, 2 - note __, 2 - octave 4 - note C_, 2 - note E_, 1 - note F_, 3 - intensity $91 - dutycycle $2 - note A_, 2 - note A_, 2 - note __, 2 - intensity $b2 - dutycycle $3 - note C_, 2 - intensity $b1 - notetype $8, $91 - dutycycle $2 - octave 3 - note A_, 2 - octave 4 - note C_, 2 - intensity $b2 - dutycycle $3 - note F_, 2 - intensity $91 - dutycycle $2 - note A_, 2 - note F_, 2 - intensity $b2 - dutycycle $3 - note C_, 2 - octave 3 - note B_, 1 - octave 4 - note C_, 2 - note __, 1 - octave 3 - note B_, 2 - note A_, 2 - note __, 2 + note F#, 4 + note D_, 2 + note G#, 4 + intensity $c2 + note G#, 2 + note A#, 4 + intensity $c3 + note B_, 6 + intensity $c2 note B_, 2 + note A#, 4 + note G#, 2 + endchannel + +Music_RedField_Ch3: ; 3cfcc + notetype $8, $23 + octave 2 + note B_, 4 note __, 6 - note G_, 6 - octave 4 - note D#, 1 - notetype $c, $b7 - note E_, 14 - notetype $8, $b2 - note __, 2 - note C#, 1 - intensity $b4 - note D_, 9 - intensity $b2 - note C_, 2 - note __, 4 - note C_, 2 - note __, 4 octave 3 - note A_, 2 + note C_, 7 + note __, 7 + note C#, 4 + note __, 6 octave 4 - note D#, 1 - notetype $c, $b7 - note E_, 14 - notetype $8, $b2 + note F_, 6 note __, 2 - intensity $93 - dutycycle $2 - octave 3 - note B_, 1 - octave 4 - note C_, 5 octave 3 - note A_, 6 - note B_, 4 - intensity $b2 - dutycycle $3 - note G_, 2 - note A_, 2 - note __, 2 - note B_, 2 - loopchannel 0, Music_RedField_branch_40e75 + note G#, 1 + note __, 1 + note F_, 1 + note __, 1 + note C#, 1 + note __, 1 -Music_RedField_Ch3: ; 4111e - forceoctave $10 - notetype $8, $22 +Music_RedField_branch_3cfe1: ; 3cfe1 + octave 2 + note F#, 1 + note __, 3 octave 3 + note F#, 1 + note __, 1 note F_, 4 - note __, 6 - note F#, 7 - note __, 7 + note __, 2 + note E_, 4 + note __, 2 + note D#, 4 + note __, 2 note G_, 4 - note __, 6 - octave 2 - note G_, 2 - note __, 12 - -Music_RedField_branch_4112d: ; 4112d - callchannel Music_RedField_branch_412dd - note B_, 1 - note __, 1 + note __, 2 note G_, 1 note __, 1 - note F_, 1 + note E_, 1 note __, 1 - note D_, 2 + note C#, 1 + note __, 1 + octave 2 + note A#, 4 + note A#, 1 + note __, 1 + note B_, 1 + note __, 3 + octave 3 + note C#, 1 + note __, 1 + note D#, 4 note __, 2 - note B_, 2 - note __, 6 - note D_, 2 + note D#, 1 + note __, 1 octave 2 - note B_, 2 - note G_, 2 - callchannel Music_RedField_branch_412dd note B_, 1 note __, 1 + note G#, 1 + note __, 1 + note F#, 1 + note __, 3 note G_, 1 note __, 1 - note F_, 1 + note G#, 1 + note __, 3 + octave 3 + note D#, 1 note __, 1 - note D_, 2 + note F_, 4 + note G#, 1 + note __, 5 + note B_, 1 + note __, 5 + octave 4 + note C#, 6 note __, 2 octave 2 - note G_, 2 - note __, 12 - note F_, 2 + note G#, 1 + note __, 3 + octave 3 + note G#, 1 + note __, 1 + note G_, 4 note __, 2 - octave 6 - note E_, 1 + note F#, 4 + note __, 2 + note D#, 4 + note __, 2 + note F_, 4 + note __, 2 + note F_, 1 + note __, 1 + note D_, 1 note __, 1 octave 2 - note F_, 1 + note B_, 1 + note __, 1 + note G#, 4 + note B_, 1 note __, 1 octave 3 - note E_, 1 + note D_, 1 + note __, 3 + note F_, 1 + note __, 1 + note F#, 1 + note __, 1 + note C#, 1 note __, 1 note C_, 1 note __, 1 octave 2 - note F_, 2 - note __, 2 - octave 6 - note E_, 1 + note B_, 4 + octave 3 + note C#, 1 note __, 1 octave 2 - note F_, 2 - note __, 2 - note F_, 1 + note A#, 4 + octave 3 + note C#, 1 note __, 1 - note F_, 2 - note __, 2 - octave 6 - note D_, 1 + octave 2 + note G#, 4 + octave 3 + note C#, 1 note __, 1 octave 2 - note F_, 1 + note F#, 1 + note __, 1 + note A#, 1 note __, 1 octave 3 - note D_, 1 + note C#, 1 note __, 1 - octave 2 - note B_, 1 + note D#, 4 + note E_, 1 note __, 1 - note F_, 2 - note __, 2 - octave 6 + note F_, 4 + note E_, 1 + note __, 1 + note D#, 4 note D_, 1 note __, 1 octave 2 - note F_, 2 - note __, 2 - note F_, 1 + note F#, 1 + note __, 3 + octave 3 + note F#, 1 note __, 1 - note E_, 2 + note F_, 4 note __, 2 - octave 6 - note D_, 1 + note E_, 4 + note __, 2 + note D#, 4 + note __, 2 + note G_, 4 + note __, 2 + note G_, 1 note __, 1 - octave 2 note E_, 1 note __, 1 - octave 3 - note D_, 1 + note C#, 1 note __, 1 octave 2 + note A#, 4 + note A#, 1 + note __, 1 note B_, 1 + note __, 3 + octave 3 + note C#, 1 note __, 1 - note E_, 2 + note D#, 4 note __, 2 - octave 6 - note D_, 1 + note D#, 1 note __, 1 octave 2 - note E_, 2 - note __, 2 - note E_, 1 + note B_, 1 note __, 1 - note E_, 2 - note __, 2 - octave 6 - note C_, 1 + note G#, 1 note __, 1 - octave 2 - note E_, 2 + note F#, 1 + note __, 3 + note G_, 1 + note __, 1 + note G#, 1 + note __, 3 octave 3 - note C_, 1 + note D#, 1 note __, 1 + note F_, 4 + note G#, 1 + note __, 5 + note B_, 1 + note __, 5 + octave 4 + note C#, 6 + note __, 2 octave 2 - note A_, 1 + note G#, 1 + note __, 3 + octave 3 + note G#, 1 note __, 1 - note E_, 2 + note G_, 4 note __, 2 - octave 6 - note C_, 1 + note F#, 4 + note __, 2 + note D#, 4 + note __, 2 + note F_, 4 + note __, 2 + note F_, 1 + note __, 1 + note D_, 1 note __, 1 octave 2 - note E_, 2 - note A_, 1 + note B_, 1 + note __, 1 + note G#, 4 + note B_, 1 note __, 1 octave 3 + note D_, 1 + note __, 3 + note F_, 1 + note __, 1 + note F#, 1 + note __, 1 + note C#, 1 + note __, 1 note C_, 1 note __, 1 octave 2 - note D_, 2 - note __, 2 - octave 6 - note C_, 1 + note B_, 4 + octave 3 + note C#, 1 note __, 1 octave 2 - note D_, 1 + note A#, 4 + octave 3 + note C#, 1 note __, 1 + octave 2 + note G#, 4 octave 3 - note C_, 1 + note C#, 1 note __, 1 octave 2 - note A_, 1 + note F#, 2 + note __, 10 + octave 3 + note E_, 1 note __, 1 - note D_, 2 - note __, 2 - octave 6 - note C_, 1 + note C#, 1 note __, 1 octave 2 - note D_, 2 - note __, 2 - note D_, 1 + note A#, 1 note __, 1 - note D_, 2 - note __, 2 - octave 5 - note B_, 1 + note E_, 1 + note __, 1 + note G_, 1 + note __, 1 + octave 3 + note E_, 1 note __, 1 octave 2 - note D_, 1 + note B_, 3 note __, 1 note B_, 1 note __, 1 - note G_, 1 + note F#, 1 note __, 1 - note D_, 2 - note __, 2 - octave 5 note B_, 1 note __, 1 - octave 2 - note D_, 2 - note __, 2 - note D_, 1 + note F#, 1 note __, 1 - note C_, 2 - note __, 2 - octave 5 note B_, 1 - note __, 1 - octave 2 - note C_, 1 + note __, 3 + note B_, 1 + note __, 7 + note B_, 3 note __, 1 note B_, 1 note __, 1 - note G_, 1 + note G#, 1 note __, 1 - note C_, 2 - note __, 2 - octave 5 note B_, 1 note __, 1 - octave 2 - note C_, 1 + note G#, 1 note __, 1 note B_, 1 + note __, 3 + note B_, 1 + note __, 7 + note A#, 3 note __, 1 - note G_, 1 + note A#, 1 note __, 1 - note C#, 2 - note __, 2 - note C#, 1 + note G#, 1 note __, 1 - note C#, 1 + note A#, 1 + note __, 1 + note G#, 1 note __, 1 note A#, 1 + note __, 3 + note A#, 1 + note __, 7 + note A#, 3 note __, 1 - note G_, 1 + note A#, 1 note __, 1 - note C#, 2 - note __, 2 - note C_, 2 - note C#, 2 - note __, 2 - note G_, 2 - note F_, 2 - note __, 2 - octave 6 - note D#, 2 - note E_, 1 + note G#, 1 note __, 1 - octave 3 - note F_, 1 + note A#, 1 note __, 1 - note C_, 1 + note G#, 1 note __, 1 - octave 2 - note F_, 2 - note __, 4 - octave 6 - note E_, 1 + note A#, 3 note __, 1 - octave 2 - note F_, 1 + note A#, 1 note __, 1 - octave 6 - note E_, 1 + note A#, 1 + note __, 5 + note G#, 3 note __, 1 - octave 2 - note F_, 2 - note __, 2 - octave 6 - note E_, 2 - note F_, 1 + note G#, 1 note __, 1 - octave 3 - note D_, 1 + note F#, 1 note __, 1 - note C_, 1 + note G#, 1 note __, 1 - octave 2 - note F_, 2 - note __, 4 - octave 6 - note F_, 1 + note F#, 1 note __, 1 - octave 2 - note F_, 1 + note G#, 1 + note __, 3 + note G#, 1 + note __, 7 + note G#, 3 note __, 1 - octave 6 - note F_, 1 + note G#, 1 note __, 1 - octave 2 - note E_, 2 - note __, 2 - octave 6 - note F#, 2 - note G_, 1 + note F#, 1 note __, 1 - octave 3 - note D_, 1 + note G#, 1 note __, 1 - octave 2 - note B_, 1 + note F#, 1 note __, 1 - note E_, 2 - note __, 4 - octave 6 - note G_, 1 + note G#, 1 note __, 3 - note G_, 1 + note G#, 1 + note __, 7 + note F#, 3 note __, 1 - octave 2 - note E_, 2 - note __, 2 - octave 6 - note G#, 2 - note A_, 1 + note F#, 1 note __, 1 - octave 3 - note C_, 1 + note F_, 1 note __, 1 - octave 2 - note A_, 1 + note F#, 1 note __, 1 - note E_, 2 - note __, 4 - octave 6 - note A_, 1 + note F_, 1 note __, 1 - octave 2 - note A_, 1 + note F#, 1 + note __, 3 + note F#, 1 + note __, 7 + note G_, 3 note __, 1 - octave 6 - note A_, 1 + note G_, 1 note __, 1 - octave 2 - note D_, 2 - note __, 2 - octave 6 - note C#, 2 - note D_, 1 + note E_, 1 note __, 1 - octave 3 - note C_, 1 + note G_, 1 note __, 1 - octave 2 - note A_, 1 + note E_, 1 note __, 1 - note D_, 2 - note __, 4 - octave 6 - note D_, 1 + note G_, 1 note __, 3 - note D_, 1 + note G_, 1 note __, 1 - octave 2 - note D_, 2 - note __, 2 - octave 5 - note A#, 2 - note B_, 1 + note G_, 1 + note __, 5 + note B_, 3 note __, 1 - octave 2 note B_, 1 note __, 1 - note G_, 1 - note __, 1 - note D_, 2 - note __, 2 - note D_, 1 + note F#, 1 note __, 1 - octave 5 note B_, 1 note __, 1 - octave 2 + note F#, 1 + note __, 1 note B_, 1 + note __, 3 + note B_, 1 + note __, 7 + note B_, 3 note __, 1 - octave 5 note B_, 1 note __, 1 - octave 2 - note C_, 2 - note __, 2 - note C_, 1 + note G#, 1 note __, 1 - note C_, 1 + note B_, 1 + note __, 1 + note G#, 1 note __, 1 note B_, 1 + note __, 3 + note B_, 1 + note __, 7 + note A#, 3 note __, 1 - note G_, 1 + note A#, 1 note __, 1 - note C_, 2 - note __, 2 - note C_, 1 + note G#, 1 note __, 1 - note C_, 1 + note A#, 1 + note __, 1 + note G#, 1 + note __, 1 + note A#, 1 note __, 3 - note C_, 1 + note A#, 1 + note __, 7 + note A#, 3 note __, 1 - note D_, 2 - note __, 2 - note D_, 1 + note A#, 1 note __, 1 - note D_, 1 + note G#, 1 note __, 1 - octave 3 - note C_, 1 + note A#, 1 note __, 1 - octave 2 - note A_, 1 + note G#, 1 note __, 1 - note D_, 2 - note __, 2 - note D_, 1 + note A#, 3 note __, 1 - note D_, 1 - note __, 3 - note D_, 1 + note A#, 1 note __, 1 - note C_, 2 - note __, 2 - note C_, 1 + note A#, 1 + note __, 5 + note G#, 3 note __, 1 - note C_, 1 + note G#, 1 note __, 1 - note B_, 1 + note F#, 1 note __, 1 - note G_, 1 + note G#, 1 note __, 1 - note C_, 2 - note __, 2 - note C_, 1 + note F#, 1 note __, 1 - note C_, 1 + note G#, 1 note __, 3 - note C_, 1 - note __, 1 - note D_, 2 - note __, 2 - note D_, 1 + note G#, 1 + note __, 7 + note G#, 3 note __, 1 - note D_, 1 + note G#, 1 note __, 1 octave 3 - note C_, 1 - note __, 1 + note F#, 2 octave 2 - note A_, 1 + note G#, 1 + note __, 1 + note D_, 1 note __, 1 + octave 3 note D_, 2 note __, 2 - note D_, 1 + octave 2 + note G#, 1 note __, 1 - note D_, 1 - note __, 3 - note D_, 1 + note G#, 2 + note __, 4 + note F#, 3 note __, 1 - loopchannel 0, Music_RedField_branch_4112d -; 412dd - -Music_RedField_branch_412dd: ; 412dd - octave 3 - note C_, 3 + note F#, 1 note __, 1 - octave 4 - note C_, 2 - octave 3 - note B_, 3 - note __, 3 - note A#, 3 - note __, 3 - note A_, 3 + note F_, 1 + note __, 1 + note F#, 1 + note __, 1 + note F_, 1 + note __, 1 + note F#, 1 note __, 3 - note G_, 2 - note E_, 1 + note F#, 1 + note __, 7 + note G#, 3 note __, 1 - note C#, 1 + note G#, 1 note __, 1 - octave 2 - note A#, 6 - octave 3 - note A#, 6 - note A_, 2 - note __, 2 - note E_, 2 - note D_, 2 - note __, 4 - octave 4 - note D_, 1 + note F#, 1 note __, 1 - note C#, 1 + note G#, 1 note __, 1 - note C_, 1 + note F#, 1 + note __, 1 + note G#, 1 + note __, 3 + note G#, 1 note __, 1 octave 3 - note A_, 2 - note __, 2 - note F_, 2 - note D_, 2 - note __, 2 - note A_, 2 - endchannel + note G#, 1 + note __, 1 + note F_, 1 + note __, 1 + note C#, 1 + note __, 1 + loopchannel 0, Music_RedField_branch_3cfe1 -Music_RedField_Ch4: ; 41306 +Music_RedField_Ch4: ; 3d1cd togglenoise $0 notetype $8 - note F#, 4 + note G_, 4 note G_, 2 note G_, 2 note G_, 2 - note F#, 8 + note G_, 2 + note G_, 4 note G_, 2 note G_, 2 note G_, 2 - note F#, 4 note G_, 2 note G_, 4 - note F#, 2 - note D#, 4 - note D_, 2 - note D#, 2 - note D_, 2 - note D_, 2 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 2 + note G_, 2 + note G_, 2 -Music_RedField_branch_4131b: ; 4131b - note F#, 4 +Music_RedField_branch_3d1e4: ; 3d1e4 + note G_, 4 note G_, 2 note G_, 4 note G_, 2 - note D#, 4 - note F#, 2 note G_, 4 note G_, 2 note G_, 4 note G_, 2 note G_, 4 note G_, 2 - note D#, 4 - note F#, 2 note G_, 2 note G_, 2 note G_, 2 - note F#, 4 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 note G_, 2 note G_, 2 note G_, 2 note G_, 2 note G_, 4 note G_, 2 - note C_, 4 + note G_, 4 note G_, 2 - note C#, 2 - note C#, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 2 + note G_, 2 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 2 + note G_, 2 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 2 + note G_, 2 + note G_, 2 + note G_, 2 + note G_, 2 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 2 + note G_, 2 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 2 + note G_, 2 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 2 + note G_, 2 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 2 + note G_, 2 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 2 + note G_, 2 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 8 + note __, 16 + note G_, 4 + note G_, 2 + note D_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note D_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note D_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note D_, 4 note D_, 2 + note G_, 4 + note G_, 2 note D_, 4 - note D#, 2 - note F#, 6 note G_, 2 + note G_, 4 note G_, 2 + note D_, 4 note G_, 2 - -Music_RedField_branch_4133e: ; 4133e - note D#, 4 + note G_, 4 note G_, 2 - note F#, 4 + note D_, 4 note G_, 2 - note D#, 4 + note G_, 4 + note G_, 2 + note D_, 4 note G_, 2 note G_, 4 - note D#, 2 - loopchannel 3, Music_RedField_branch_4133e - note D#, 4 note G_, 2 - note F#, 4 + note D_, 4 + note G_, 2 + note G_, 4 note G_, 2 - note __, 6 - note C#, 2 - note C#, 2 - note D_, 2 - callchannel Music_RedField_branch_41386 - callchannel Music_RedField_branch_41386 - note D#, 4 - note F#, 2 note D_, 4 note G_, 2 - note D#, 4 - note D_, 2 - note F#, 2 - note D#, 2 - note D_, 2 - note D#, 4 - note F#, 2 + note G_, 4 + note G_, 2 note D_, 4 - note D_, 2 - note D#, 4 - note F#, 2 + note G_, 2 + note G_, 4 + note G_, 2 + note D_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note D_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note D_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note D_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note D_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note D_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note D_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note D_, 4 + note G_, 2 + note G_, 4 + note G_, 2 note D_, 4 note D_, 2 - -Music_RedField_branch_41369: ; 41369 - callchannel Music_RedField_branch_41386 - loopchannel 3, Music_RedField_branch_41369 - note F#, 4 - note D#, 2 - note C#, 2 - note C#, 2 - note D_, 2 - note D_, 2 - note F#, 2 - note C#, 2 - note C#, 2 - note D_, 2 - note D_, 2 - -Music_RedField_branch_4137b: ; 4137b - callchannel Music_RedField_branch_41386 - loopchannel 10, Music_RedField_branch_4137b - loopchannel 0, Music_RedField_branch_4131b -; 41386 - -Music_RedField_branch_41386: ; 41386 - note D#, 4 - note F#, 2 + note G_, 4 + note G_, 2 note D_, 4 note G_, 2 - note D#, 4 - note F#, 2 + note G_, 4 + note G_, 2 note D_, 4 - note D#, 2 - endchannel -; 4138f + note G_, 2 + note G_, 4 + note G_, 2 + note D_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note D_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note D_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note D_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note D_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note D_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note D_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note D_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note D_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note D_, 4 + note G_, 2 + loopchannel 0, Music_RedField_branch_3d1e4 +; 3d2ed diff --git a/constants/song_constants.asm b/constants/song_constants.asm index b1aae4d..4f71615 100644 --- a/constants/song_constants.asm +++ b/constants/song_constants.asm @@ -1,7 +1,9 @@ NUM_SONGS EQU $17 -MUSIC_NOTHING_0F EQU $00 -MUSIC_BLUE_FIELD EQU $01 +MUSIC_NOTHING EQU $00 + +; Bank $F Songs +MUSIC_RED_FIELD EQU $01 MUSIC_CATCH_EM_RED EQU $02 MUSIC_HURRY_UP_RED EQU $03 MUSIC_POKEDEX EQU $04 @@ -9,21 +11,25 @@ MUSIC_GASTLY_GRAVEYARD EQU $05 MUSIC_HAUNTER_GRAVEYARD EQU $06 MUSIC_GENGAR_GRAVEYARD EQU $07 -MUSIC_RED_FIELD EQU $01 +; Bank $10 Songs +MUSIC_BLUE_FIELD EQU $01 MUSIC_CATCH_EM_BLUE EQU $02 MUSIC_HURRY_UP_BLUE EQU $03 MUSIC_HI_SCORE EQU $04 MUSIC_GAME_OVER EQU $05 +; Bank $11 Songs MUSIC_WHACK_DIGLETT EQU $01 MUSIC_WHACK_DUGTRIO EQU $02 MUSIC_SEEL_STAGE EQU $03 MUSIC_TITLE_SCREEN EQU $04 +; Bank $12 Songs MUSIC_MEWTWO_STAGE EQU $01 MUSIC_OPTIONS EQU $02 MUSIC_FIELD_SELECT EQU $03 MUSIC_MEOWTH_STAGE EQU $04 +; Bank $13 Songs MUSIC_END_CREDITS EQU $01 MUSIC_NAME_ENTRY EQU $02 diff --git a/engine/field_select_screen.asm b/engine/field_select_screen.asm index f500d01..6a3d3a6 100644 --- a/engine/field_select_screen.asm +++ b/engine/field_select_screen.asm @@ -24,9 +24,9 @@ LoadFieldSelectScreen: ; 0xd6dd ld a, $8
ld [wFieldSelectBlinkingBorderFrame], a
call SetAllPalettesWhite
- ld a, $12
+ ld a, Bank(Music_FieldSelect)
call SetSongBank
- ld de, $0003
+ ld de, MUSIC_FIELD_SELECT
call PlaySong
call EnableLCD
call FadeIn
diff --git a/engine/high_scores_screen.asm b/engine/high_scores_screen.asm index 048ac07..c08436c 100644 --- a/engine/high_scores_screen.asm +++ b/engine/high_scores_screen.asm @@ -152,16 +152,16 @@ Func_cb14: ; 0xcb14 ld a, [wda81]
and a
jr nz, .asm_cb9b
- ld a, $13
+ ld a, Bank(Music_EndCredits)
call SetSongBank
- ld de, $0001
+ ld de, MUSIC_END_CREDITS
call PlaySong
jr .asm_cba6
.asm_cb9b
- ld a, $13
+ ld a, Bank(Music_NameEntry)
call SetSongBank
- ld de, $0002
+ ld de, MUSIC_NAME_ENTRY
call PlaySong
.asm_cba6
call EnableLCD
@@ -175,9 +175,9 @@ Func_cb14: ; 0xcb14 ret
.asm_cbbd
- ld a, $10
+ ld a, Bank(Music_HiScore)
call SetSongBank
- ld de, $0004
+ ld de, MUSIC_HI_SCORE
call PlaySong
call EnableLCD
ld bc, $0009
@@ -389,12 +389,12 @@ Func_cd6c: ; 0xcd6c ld a, [wd8f0]
and a
jr z, .asm_cdbb
- ld de, $0000
+ ld de, MUSIC_NOTHING
call PlaySong
rst AdvanceFrame
call Func_cdce
push af
- ld de, $0004
+ ld de, MUSIC_HI_SCORE
call PlaySong
pop af
jr nc, .asm_cdc6
diff --git a/engine/options_screen.asm b/engine/options_screen.asm index a5e4958..f490f8d 100644 --- a/engine/options_screen.asm +++ b/engine/options_screen.asm @@ -32,9 +32,9 @@ Func_c35a: ; 0xc35a call Func_c43a
call Func_c948
call SetAllPalettesWhite
- ld a, $12
+ ld a, Bank(Music_Options)
call SetSongBank
- ld de, $0002
+ ld de, MUSIC_OPTIONS
call PlaySong
call EnableLCD
ld a, [wSoundTestCurrentBackgroundMusic]
@@ -138,7 +138,7 @@ Func_c447: ; 0xc447 ret
.asm_c477
- ld de, $0000
+ ld de, MUSIC_NOTHING
call PlaySong
ld a, $5
ld [wScreenState], a
@@ -456,14 +456,14 @@ Func_c691: ; 0xc91 ld a, [hNewlyPressedButtons]
bit BIT_B_BUTTON, a
ret z
- ld de, $0000
+ ld de, MUSIC_NOTHING
call PlaySong
rst AdvanceFrame
rst AdvanceFrame
rst AdvanceFrame
- ld a, $12
+ ld a, Bank(Music_Options)
call SetSongBank
- ld de, $0002
+ ld de, MUSIC_OPTIONS
call PlaySong
lb de, $00, $01
call PlaySoundEffect
@@ -507,7 +507,7 @@ Func_c6e8: ; 0xc6e8 ld a, [hNewlyPressedButtons]
bit BIT_A_BUTTON, a
jr z, UpdateSoundTestBackgroundMusicSelection
- ld de, $0000
+ ld de, MUSIC_NOTHING
call PlaySong
rst AdvanceFrame
rst AdvanceFrame
@@ -601,15 +601,15 @@ RedrawSoundTestID: ; 0xc76c ret
SongBanks: ; 0xc77e
- db MUSIC_NOTHING_0F,BANK(Music_Nothing0F)
- db MUSIC_BLUE_FIELD,BANK(Music_BlueField)
+ db MUSIC_NOTHING,BANK(Music_Nothing0F)
+ db MUSIC_RED_FIELD,BANK(Music_RedField)
db MUSIC_CATCH_EM_RED,BANK(Music_CatchEmRed)
db MUSIC_HURRY_UP_RED,BANK(Music_HurryUpRed)
db MUSIC_POKEDEX,BANK(Music_Pokedex)
db MUSIC_GASTLY_GRAVEYARD,BANK(Music_GastlyInTheGraveyard)
db MUSIC_HAUNTER_GRAVEYARD,BANK(Music_HaunterInTheGraveyard)
db MUSIC_GENGAR_GRAVEYARD,BANK(Music_GengarInTheGraveyard)
- db MUSIC_RED_FIELD,BANK(Music_RedField)
+ db MUSIC_BLUE_FIELD,BANK(Music_BlueField)
db MUSIC_CATCH_EM_BLUE,BANK(Music_CatchEmBlue)
db MUSIC_HURRY_UP_BLUE,BANK(Music_HurryUpBlue)
db MUSIC_HI_SCORE,BANK(Music_HiScore)
diff --git a/engine/pinball_game.asm b/engine/pinball_game.asm index 292d5f4..34a7d4c 100644 --- a/engine/pinball_game.asm +++ b/engine/pinball_game.asm @@ -244,7 +244,7 @@ GameScreenFunction_EndBall: ; 0xdab2 ret
.goingToBonusStage
- ld de, $0000
+ ld de, MUSIC_NOTHING
call PlaySong
ld bc, $0004
call AdvanceFrames
@@ -271,7 +271,7 @@ GameScreenFunction_EndBall: ; 0xdab2 ret
.returningFromBonusStage
- ld de, $0000
+ ld de, MUSIC_NOTHING
call PlaySong
ld bc, $0004
call AdvanceFrames
@@ -295,7 +295,7 @@ GameScreenFunction_EndBall: ; 0xdab2 TransitionToHighScoresScreen: ; 0xdb5d
xor a
ld [wGameOver], a
- ld de, $0000
+ ld de, MUSIC_NOTHING
call PlaySong
ld bc, $0004
call AdvanceFrames
diff --git a/engine/pinball_game/ball_init/ball_init_blue_field.asm b/engine/pinball_game/ball_init/ball_init_blue_field.asm index 532746b..3dd1dd7 100644 --- a/engine/pinball_game/ball_init/ball_init_blue_field.asm +++ b/engine/pinball_game/ball_init/ball_init_blue_field.asm @@ -58,9 +58,9 @@ InitBallBlueField: ; 0x1c08d ld a, $3
ld [wd610], a
call GetBCDForNextBonusMultiplier_BlueField
- ld a, $10
+ ld a, Bank(Music_BlueField)
call SetSongBank
- ld de, $0001
+ ld de, MUSIC_BLUE_FIELD
call PlaySong
ret
@@ -83,8 +83,8 @@ StartBallAfterBonusStageBlueField: ; 0x1c129 ld [wFlippersDisabled], a
ld a, [wBallTypeBackup]
ld [wBallType], a
- ld a, $10
+ ld a, Bank(Music_BlueField)
call SetSongBank
- ld de, $0001
+ ld de, MUSIC_BLUE_FIELD
call PlaySong
ret
diff --git a/engine/pinball_game/ball_init/ball_init_red_field.asm b/engine/pinball_game/ball_init/ball_init_red_field.asm index f266020..4e948ea 100644 --- a/engine/pinball_game/ball_init/ball_init_red_field.asm +++ b/engine/pinball_game/ball_init/ball_init_red_field.asm @@ -63,9 +63,9 @@ InitBallRedField: ; 0x3007d ld a, $3
ld [wd610], a
callba GetBCDForNextBonusMultiplier_RedField
- ld a, $f
+ ld a, Bank(Music_RedField)
call SetSongBank
- ld de, $0001
+ ld de, MUSIC_RED_FIELD
call PlaySong
ret
@@ -88,8 +88,8 @@ StartBallAfterBonusStageRedField: ; 0x30128 ld [wFlippersDisabled], a
ld a, [wBallTypeBackup]
ld [wBallType], a
- ld a, $f
+ ld a, Bank(Music_RedField)
call SetSongBank
- ld de, $0001
+ ld de, MUSIC_RED_FIELD
call PlaySong
ret
diff --git a/engine/pinball_game/ball_loss/ball_loss_blue_field.asm b/engine/pinball_game/ball_loss/ball_loss_blue_field.asm index 40d8e15..4991af3 100644 --- a/engine/pinball_game/ball_loss/ball_loss_blue_field.asm +++ b/engine/pinball_game/ball_loss/ball_loss_blue_field.asm @@ -22,7 +22,7 @@ HandleBallLossBlueField: ; 0xde4f ret
.youLose
- ld de, $0000
+ ld de, MUSIC_NOTHING
call PlaySong
ld bc, $001e
call AdvanceFrames
diff --git a/engine/pinball_game/ball_loss/ball_loss_red_field.asm b/engine/pinball_game/ball_loss/ball_loss_red_field.asm index 1b3f591..ff03310 100644 --- a/engine/pinball_game/ball_loss/ball_loss_red_field.asm +++ b/engine/pinball_game/ball_loss/ball_loss_red_field.asm @@ -22,7 +22,7 @@ HandleBallLossRedField: ; 0xdd76 ret
.youLose
- ld de, $0000
+ ld de, MUSIC_NOTHING
call PlaySong
ld bc, $001e
call AdvanceFrames
diff --git a/engine/pinball_game/catchem_mode.asm b/engine/pinball_game/catchem_mode.asm index fc5194b..1d7fc58 100644 --- a/engine/pinball_game/catchem_mode.asm +++ b/engine/pinball_game/catchem_mode.asm @@ -793,7 +793,7 @@ CapturePokemon: ; 0x1052d cp $1
ret nz
call MainLoopUntilTextIsClear
- ld de, $0000
+ ld de, MUSIC_NOTHING
call PlaySong
rst AdvanceFrame
lb de, $23, $29
@@ -818,7 +818,7 @@ CapturePokemon: ; 0x1052d ld [wEnableBallGravityAndTilt], a
callba RestoreBallSaverAfterCatchEmMode
call ConcludeCatchEmMode
- ld de, $0001
+ ld de, MUSIC_BLUE_FIELD ; This is either MUSIC_BLUE_FIELD or MUSIC_RED_FIELD, they just happen to be the same song id in their respective audio Banks.
call PlaySong
ld hl, wNumPokemonCaughtInBallBonus
call Increment_Max100
@@ -1252,7 +1252,7 @@ Func_10871: ; 0x10871 call Func_107b0
ld a, $4
ld [wd7ad], a
- ld de, $0002
+ ld de, MUSIC_CATCH_EM_BLUE ; This is either MUSIC_CATCH_EM_BLUE or MUSIC_CATCH_EM_RED. They happen to have the same id in their respective audio Banks.
call PlaySong
ld a, [wCurrentStage]
bit 0, a
@@ -1385,7 +1385,7 @@ Func_1098c: ; 0x1098c xor a
ld [wRightAlleyCount], a
callba CloseSlotCave
- ld de, $0002
+ ld de, MUSIC_CATCH_EM_BLUE ; This is either MUSIC_CATCH_EM_BLUE or MUSIC_CATCH_EM_RED. They happen to have the same id in their respective audio
call PlaySong
ld a, [wCurrentStage]
bit 0, a
diff --git a/engine/pinball_game/catchem_mode/catchem_mode_blue_field.asm b/engine/pinball_game/catchem_mode/catchem_mode_blue_field.asm index b990c8d..1d3fadc 100644 --- a/engine/pinball_game/catchem_mode/catchem_mode_blue_field.asm +++ b/engine/pinball_game/catchem_mode/catchem_mode_blue_field.asm @@ -206,7 +206,7 @@ Func_2048f: ; 0x2048f call FillBottomMessageBufferWithBlackTile
callba RestoreBallSaverAfterCatchEmMode
callba ConcludeCatchEmMode
- ld de, $0001
+ ld de, MUSIC_BLUE_FIELD
call PlaySong
scf
ret
diff --git a/engine/pinball_game/catchem_mode/catchem_mode_red_field.asm b/engine/pinball_game/catchem_mode/catchem_mode_red_field.asm index e0e4f60..8290ce4 100644 --- a/engine/pinball_game/catchem_mode/catchem_mode_red_field.asm +++ b/engine/pinball_game/catchem_mode/catchem_mode_red_field.asm @@ -204,7 +204,7 @@ Func_201ce: ; 0x201ce call FillBottomMessageBufferWithBlackTile
callba RestoreBallSaverAfterCatchEmMode
callba ConcludeCatchEmMode
- ld de, $0001
+ ld de, MUSIC_RED_FIELD
call PlaySong
scf
ret
diff --git a/engine/pinball_game/end_of_ball_bonus.asm b/engine/pinball_game/end_of_ball_bonus.asm index 6e577c1..13bb680 100644 --- a/engine/pinball_game/end_of_ball_bonus.asm +++ b/engine/pinball_game/end_of_ball_bonus.asm @@ -81,9 +81,9 @@ ShowBallBonusSummary: ; 0xf5a0 ld a, [wGameOver]
and a
ret z
- ld a, $10
+ ld a, Bank(Music_GameOver)
call SetSongBank
- ld de, $0005
+ ld de, MUSIC_GAME_OVER
call PlaySong
ld hl, wBottomMessageText
ld bc, $0040
diff --git a/engine/pinball_game/evolution_mode.asm b/engine/pinball_game/evolution_mode.asm index 164b92b..08fb05b 100755 --- a/engine/pinball_game/evolution_mode.asm +++ b/engine/pinball_game/evolution_mode.asm @@ -632,7 +632,7 @@ StartEvolutionMode_RedField: ; 0x10ebb call Func_107b0
ld a, $2
ld [wd7ad], a
- ld de, $0002
+ ld de, MUSIC_CATCH_EM_BLUE ; Either MUSIC_CATCH_EM_BLUE or MUSIC_CATCH_EM_RED. They have the same id in their respective audio Banks.
call PlaySong
call SetPokemonSeenFlag
ld a, [wCurrentStage]
@@ -768,7 +768,7 @@ StartEvolutionMode_BlueField: ; 0x11061 callba CloseSlotCave
ld a, $2
ld [wd7ad], a
- ld de, $0002
+ ld de, MUSIC_CATCH_EM_BLUE ; Either MUSIC_CATCH_EM_BLUE or MUSIC_CATCH_EM_RED. They have the same id in their respective audio Banks.
call PlaySong
call SetPokemonSeenFlag
ld a, [wCurrentStage]
diff --git a/engine/pinball_game/evolution_mode/evolution_mode_blue_field.asm b/engine/pinball_game/evolution_mode/evolution_mode_blue_field.asm index 3370e79..1563e7d 100644 --- a/engine/pinball_game/evolution_mode/evolution_mode_blue_field.asm +++ b/engine/pinball_game/evolution_mode/evolution_mode_blue_field.asm @@ -176,7 +176,7 @@ Func_20d30: ; 0x20d30 callba RestoreBallSaverAfterCatchEmMode
callba PlaceEvolutionInParty
callba ConcludeEvolutionMode
- ld de, $0001
+ ld de, MUSIC_BLUE_FIELD
call PlaySong
ld hl, wNumPokemonEvolvedInBallBonus
call Increment_Max100
@@ -202,7 +202,7 @@ Func_20d7c: ; 0x20d7c call FillBottomMessageBufferWithBlackTile
callba RestoreBallSaverAfterCatchEmMode
callba ConcludeEvolutionMode
- ld de, $0001
+ ld de, MUSIC_BLUE_FIELD
call PlaySong
scf
ret
@@ -716,7 +716,7 @@ Func_2112a: ; 0x2112a .asm_211a8
callba Func_10e0a
call MainLoopUntilTextIsClear
- ld de, $0000
+ ld de, MUSIC_NOTHING
call PlaySong
rst AdvanceFrame
lb de, $2d, $26
diff --git a/engine/pinball_game/evolution_mode/evolution_mode_red_field.asm b/engine/pinball_game/evolution_mode/evolution_mode_red_field.asm index fab2fa7..8be3abe 100644 --- a/engine/pinball_game/evolution_mode/evolution_mode_red_field.asm +++ b/engine/pinball_game/evolution_mode/evolution_mode_red_field.asm @@ -179,7 +179,7 @@ Func_2070b: ; 0x2070b callba RestoreBallSaverAfterCatchEmMode
callba PlaceEvolutionInParty
callba ConcludeEvolutionMode
- ld de, $0001
+ ld de, MUSIC_RED_FIELD
call PlaySong
ld hl, wNumPokemonEvolvedInBallBonus
call Increment_Max100
@@ -205,7 +205,7 @@ Func_20757: ; 0x20757 call FillBottomMessageBufferWithBlackTile
callba RestoreBallSaverAfterCatchEmMode
callba ConcludeEvolutionMode
- ld de, $0001
+ ld de, MUSIC_RED_FIELD
call PlaySong
scf
ret
@@ -718,7 +718,7 @@ Func_20b02: ; 0x20b02 .asm_20b80
callba Func_10e0a
call MainLoopUntilTextIsClear
- ld de, $0000
+ ld de, MUSIC_NOTHING
call PlaySong
rst AdvanceFrame
lb de, $2d, $26
diff --git a/engine/pinball_game/map_move.asm b/engine/pinball_game/map_move.asm index 27fcf1f..37f7f42 100755 --- a/engine/pinball_game/map_move.asm +++ b/engine/pinball_game/map_move.asm @@ -120,7 +120,7 @@ Func_311b4: ; 0x311b4 callba Func_107b0
ld a, $4
ld [wd7ad], a
- ld de, $0003
+ ld de, MUSIC_HURRY_UP_BLUE ; Either MUSIC_HURRY_UP_BLUE or MUSIC_HURRY_UP_RED. They have the same id in their respective audio Banks.
call PlaySong
ld a, [wCurrentStage]
bit 0, a
@@ -297,7 +297,7 @@ Func_31326: ; 0x31326 ld a, $1
ld [wd644], a
callba CloseSlotCave
- ld de, $0003
+ ld de, MUSIC_HURRY_UP_BLUE ; Either MUSIC_HURRY_UP_BLUE or MUSIC_HURRY_UP_RED. They have the same id in their respective audio Banks.
call PlaySong
ld a, [wCurrentStage]
bit 0, a
@@ -465,7 +465,7 @@ Func_314f1: ; 0x314f1 Func_314f3: ; 0x314f3
callba Func_3022b
- ld de, $0001
+ ld de, MUSIC_BLUE_FIELD ; Either MUSIC_BLUE_FIELD or MUSIC_RED_FIELD. They have the same id in their respective audio Banks.
call PlaySong
scf
ret
@@ -476,7 +476,7 @@ Func_31505: ; 0x31505 ret nz
call FillBottomMessageBufferWithBlackTile
callba Func_3022b
- ld de, $0001
+ ld de, MUSIC_BLUE_FIELD ; Either MUSIC_BLUE_FIELD or MUSIC_RED_FIELD. They have the same id in their respective audio Banks.
call PlaySong
scf
ret
@@ -554,7 +554,7 @@ OpenRedMapMoveSlotFromRight: ; 0x315b3 ret
ResolveSucsessfulRedMapMove: ; 0x315d5
- ld de, $0000
+ ld de, MUSIC_NOTHING
call PlaySong
rst AdvanceFrame
callba ChooseNextMap_RedField
@@ -615,7 +615,7 @@ Func_3165e: ; 0x3165e Func_31660: ; 0x31660
callba Func_3022b
- ld de, $0001
+ ld de, MUSIC_BLUE_FIELD ; Either MUSIC_BLUE_FIELD or MUSIC_RED_FIELD. They have the same id in their respective audio Banks.
call PlaySong
scf
ret
@@ -626,7 +626,7 @@ Func_31672: ; 0x31672 ret nz
call FillBottomMessageBufferWithBlackTile
callba Func_3022b
- ld de, $0001
+ ld de, MUSIC_BLUE_FIELD ; Either MUSIC_BLUE_FIELD or MUSIC_RED_FIELD. They have the same id in their respective audio Banks.
call PlaySong
scf
ret
@@ -708,7 +708,7 @@ Func_3172a: ; 0x3172a ret
Func_3174c: ; 0x3174c
- ld de, $0000
+ ld de, MUSIC_NOTHING
call PlaySong
rst AdvanceFrame
callba ChooseNextMap_BlueField
diff --git a/engine/pinball_game/object_collision/blue_stage_resolve_collision.asm b/engine/pinball_game/object_collision/blue_stage_resolve_collision.asm index 2d5367c..d03ebd9 100644 --- a/engine/pinball_game/object_collision/blue_stage_resolve_collision.asm +++ b/engine/pinball_game/object_collision/blue_stage_resolve_collision.asm @@ -2669,7 +2669,7 @@ ShowScrollingGoToBonusText_BlueField: ; 0x1e8c3 ld de, GoToMewtwoStageText
.loadText
call LoadScrollingText
- ld de, $0000
+ ld de, MUSIC_NOTHING
call PlaySong
rst AdvanceFrame
lb de, $3c, $23
diff --git a/engine/pinball_game/object_collision/diglett_bonus_resolve_collision.asm b/engine/pinball_game/object_collision/diglett_bonus_resolve_collision.asm index 3e1b663..f24ca52 100644 --- a/engine/pinball_game/object_collision/diglett_bonus_resolve_collision.asm +++ b/engine/pinball_game/object_collision/diglett_bonus_resolve_collision.asm @@ -185,7 +185,7 @@ Func_19c52: ; 0x19c52 ld a, $1
ld [wDugrioState], a
call Func_1ac2c
- ld de, $0002
+ ld de, MUSIC_WHACK_DUGTRIO
call PlaySong
.asm_19cc8
call Func_19cdd
@@ -660,7 +660,7 @@ Func_1ab30: ; 0x1ab30 ld a, [wDugtrioAnimationIndex]
cp $1
jr nz, .asm_1abf2
- ld de, $0000
+ ld de, MUSIC_NOTHING
call PlaySong
ret
diff --git a/engine/pinball_game/object_collision/gengar_bonus_resolve_collision.asm b/engine/pinball_game/object_collision/gengar_bonus_resolve_collision.asm index 9aa99c3..cacf565 100644 --- a/engine/pinball_game/object_collision/gengar_bonus_resolve_collision.asm +++ b/engine/pinball_game/object_collision/gengar_bonus_resolve_collision.asm @@ -346,7 +346,7 @@ Func_18562: ; 0x18562 ld [wd659], a
ld [wd662], a
ld [wd66b], a
- ld de, $0006
+ ld de, MUSIC_HAUNTER_GRAVEYARD
call PlaySong
ret
@@ -585,7 +585,7 @@ Func_186f7: ; 0x186f7 ld [wd656], a
call Func_18d72
call Func_18d91
- ld de, $0000
+ ld de, MUSIC_NOTHING
call PlaySong
ret
@@ -721,7 +721,7 @@ Func_187b1: ; 0x187b1 ld [wFlippersDisabled], a
call LoadFlippersPalette
callba StopTimer
- ld de, $0000
+ ld de, MUSIC_NOTHING
call PlaySong
.asm_18826
ld bc, FiveMillionPoints
@@ -1027,7 +1027,7 @@ Func_189af: ; 0x189af inc de
xor a
ld [de], a
- ld de, $0007
+ ld de, MUSIC_GENGAR_GRAVEYARD
call PlaySong
ret
diff --git a/engine/pinball_game/object_collision/meowth_bonus_resolve_collision.asm b/engine/pinball_game/object_collision/meowth_bonus_resolve_collision.asm index 1c7e194..0db1d1a 100644 --- a/engine/pinball_game/object_collision/meowth_bonus_resolve_collision.asm +++ b/engine/pinball_game/object_collision/meowth_bonus_resolve_collision.asm @@ -196,7 +196,7 @@ ResolveMeowthBonusGameObjectCollisions: ; 0x2442a ld [wNextBonusStage], a
ld a, $96
ld [wd739], a
- ld de, $0000
+ ld de, MUSIC_NOTHING
call PlaySong
ld a, $1
ld [wCompletedBonusStage], a
@@ -214,7 +214,7 @@ ResolveMeowthBonusGameObjectCollisions: ; 0x2442a ld a, [wSFXTimer]
and a
jr nz, .asm_244b0
- ld de, $0004
+ ld de, MUSIC_MEOWTH_STAGE
call PlaySong
ld a, $5
ld [wd712], a
diff --git a/engine/pinball_game/object_collision/mewtwo_bonus_resolve_collision.asm b/engine/pinball_game/object_collision/mewtwo_bonus_resolve_collision.asm index 1e1a925..6432985 100644 --- a/engine/pinball_game/object_collision/mewtwo_bonus_resolve_collision.asm +++ b/engine/pinball_game/object_collision/mewtwo_bonus_resolve_collision.asm @@ -207,7 +207,7 @@ Func_19531: ; 0x19531 ld [wFlippersDisabled], a
call LoadFlippersPalette
callba StopTimer
- ld de, $0000
+ ld de, MUSIC_NOTHING
call PlaySong
.asm_195a2
call Func_195ac
diff --git a/engine/pinball_game/object_collision/red_stage_resolve_collision.asm b/engine/pinball_game/object_collision/red_stage_resolve_collision.asm index c20ac5e..a1a776d 100644 --- a/engine/pinball_game/object_collision/red_stage_resolve_collision.asm +++ b/engine/pinball_game/object_collision/red_stage_resolve_collision.asm @@ -2121,7 +2121,7 @@ ShowScrollingGoToBonusText_RedField: ; 0x163f2 ld de, GoToMewtwoStageText
.asm_1640f
call LoadScrollingText
- ld de, $0000
+ ld de, MUSIC_NOTHING
call PlaySong
rst AdvanceFrame
lb de, $3c, $23
diff --git a/engine/pinball_game/object_collision/seel_bonus_resolve_collision.asm b/engine/pinball_game/object_collision/seel_bonus_resolve_collision.asm index 4eb7406..2b343c5 100644 --- a/engine/pinball_game/object_collision/seel_bonus_resolve_collision.asm +++ b/engine/pinball_game/object_collision/seel_bonus_resolve_collision.asm @@ -9,7 +9,7 @@ ResolveSeelBonusGameObjectCollisions: ; 0x25c5a jr nc, .asm_25c98
ld a, BONUS_STAGE_ORDER_MEWTWO
ld [wNextBonusStage], a
- ld de, $0000
+ ld de, MUSIC_NOTHING
call PlaySong
ld a, $1
ld [wCompletedBonusStage], a
@@ -29,7 +29,7 @@ ResolveSeelBonusGameObjectCollisions: ; 0x25c5a ld a, [wSFXTimer]
and a
jr nz, .asm_25cb0
- ld de, $0003
+ ld de, MUSIC_SEEL_STAGE
call PlaySong
ld a, $5
ld [wd794], a
diff --git a/engine/pinball_game/save_game.asm b/engine/pinball_game/save_game.asm index c1d65a8..0efa5f1 100644 --- a/engine/pinball_game/save_game.asm +++ b/engine/pinball_game/save_game.asm @@ -1,5 +1,5 @@ SaveGame: ; 0xda05
- ld de, $0000
+ ld de, MUSIC_NOTHING
call PlaySong
ld bc, $0004
call AdvanceFrames
diff --git a/engine/pinball_game/stage_init/init_blue_field.asm b/engine/pinball_game/stage_init/init_blue_field.asm index 9605e4a..5073e2c 100644 --- a/engine/pinball_game/stage_init/init_blue_field.asm +++ b/engine/pinball_game/stage_init/init_blue_field.asm @@ -48,8 +48,8 @@ InitBlueField: ; 0x1c000 ld [wPoliwagState], a
callba Start20SecondSaverTimer
callba GetBCDForNextBonusMultiplier_BlueField
- ld a, $10
+ ld a, Bank(Music_BlueField)
call SetSongBank
- ld de, $0001
+ ld de, MUSIC_BLUE_FIELD
call PlaySong
ret
diff --git a/engine/pinball_game/stage_init/init_diglett_bonus.asm b/engine/pinball_game/stage_init/init_diglett_bonus.asm index dc1e26a..7f35c4b 100644 --- a/engine/pinball_game/stage_init/init_diglett_bonus.asm +++ b/engine/pinball_game/stage_init/init_diglett_bonus.asm @@ -27,8 +27,8 @@ InitDiglettBonusStage: ; 0x199f2 xor a
ld [wDugtrioAnimationIndex], a
ld [wDugrioState], a
- ld a, $11
+ ld a, Bank(Music_WhackTheDiglett)
call SetSongBank
- ld de, $0001
+ ld de, MUSIC_WHACK_DIGLETT
call PlaySong
ret
diff --git a/engine/pinball_game/stage_init/init_gengar_bonus.asm b/engine/pinball_game/stage_init/init_gengar_bonus.asm index 9d59584..b1cc8bc 100644 --- a/engine/pinball_game/stage_init/init_gengar_bonus.asm +++ b/engine/pinball_game/stage_init/init_gengar_bonus.asm @@ -43,9 +43,9 @@ InitGengarBonusStage: ; 0x18099 ld [wd656], a
ld bc, $0130 ; 1 minute 30 seconds
callba StartTimer
- ld a, $f
+ ld a, Bank(Music_GastlyInTheGraveyard)
call SetSongBank
- ld de, $0005
+ ld de, MUSIC_GASTLY_GRAVEYARD
call PlaySong
ret
diff --git a/engine/pinball_game/stage_init/init_meowth_bonus.asm b/engine/pinball_game/stage_init/init_meowth_bonus.asm index cf4428a..fb04f01 100644 --- a/engine/pinball_game/stage_init/init_meowth_bonus.asm +++ b/engine/pinball_game/stage_init/init_meowth_bonus.asm @@ -27,8 +27,8 @@ InitMeowthBonusStage: ; 0x24000 ld [wd739], a
ld bc, $0100 ; 1 minute 0 seconds
callba StartTimer
- ld a, $12
+ ld a, Bank(Music_MeowthStage)
call SetSongBank
- ld de, $0004
+ ld de, MUSIC_MEOWTH_STAGE
call PlaySong
ret
diff --git a/engine/pinball_game/stage_init/init_mewtwo_bonus.asm b/engine/pinball_game/stage_init/init_mewtwo_bonus.asm index c17937d..b0a7bd2 100644 --- a/engine/pinball_game/stage_init/init_mewtwo_bonus.asm +++ b/engine/pinball_game/stage_init/init_mewtwo_bonus.asm @@ -41,9 +41,9 @@ InitMewtwoBonusStage: ; 0x1924f jr nz, .loop2
ld bc, $0200 ; 2 minutes 0 seconds
callba StartTimer
- ld a, $12
+ ld a, Bank(Music_MewtwoStage)
call SetSongBank
- ld de, $0001
+ ld de, MUSIC_MEWTWO_STAGE
call PlaySong
ret
diff --git a/engine/pinball_game/stage_init/init_red_field.asm b/engine/pinball_game/stage_init/init_red_field.asm index 12494e1..e6b2dde 100644 --- a/engine/pinball_game/stage_init/init_red_field.asm +++ b/engine/pinball_game/stage_init/init_red_field.asm @@ -42,8 +42,8 @@ InitRedField: ; 0x30000 ld [wIndicatorStates + 1], a
callba Start20SecondSaverTimer
callba GetBCDForNextBonusMultiplier_RedField
- ld a, $f
+ ld a, Bank(Music_RedField)
call SetSongBank
- ld de, $0001
+ ld de, MUSIC_RED_FIELD
call PlaySong
ret
diff --git a/engine/pinball_game/stage_init/init_seel_bonus.asm b/engine/pinball_game/stage_init/init_seel_bonus.asm index 92627a6..5b5d97e 100644 --- a/engine/pinball_game/stage_init/init_seel_bonus.asm +++ b/engine/pinball_game/stage_init/init_seel_bonus.asm @@ -27,9 +27,9 @@ InitSeelBonusStage: ; 0x25a7c ld [wd739], a
ld bc, $0130 ; 1 minute 30 seconds
callba StartTimer
- ld a, $11
+ ld a, Bank(Music_SeelStage)
call SetSongBank
- ld de, $0003
+ ld de, MUSIC_SEEL_STAGE
call PlaySong
ret
diff --git a/engine/pokedex.asm b/engine/pokedex.asm index f3ad04a..d13f13e 100644 --- a/engine/pokedex.asm +++ b/engine/pokedex.asm @@ -60,9 +60,9 @@ LoadPokedexScreen: ; 0x2800e call Func_28add
call CountNumSeenOwnedMons
call SetAllPalettesWhite
- ld a, $f
+ ld a, Bank(Music_Pokedex)
call SetSongBank
- ld de, $0004
+ ld de, MUSIC_POKEDEX
call PlaySong
call EnableLCD
call FadeIn
diff --git a/engine/titlescreen.asm b/engine/titlescreen.asm index 6157eed..1da1b30 100644 --- a/engine/titlescreen.asm +++ b/engine/titlescreen.asm @@ -30,9 +30,9 @@ FadeInTitlescreen: ; 0xc00e ld [wTitleScreenPokeballAnimationCounter], a
call HandleTitlescreenAnimations
call SetAllPalettesWhite
- ld a, $11
+ ld a, Bank(Music_Title)
call SetSongBank
- ld de, $0004
+ ld de, MUSIC_TITLE_SCREEN
call PlaySong
call EnableLCD
call FadeIn
@@ -82,7 +82,7 @@ TitlescreenLoop: ; 0xc089 ret
.noPreviouslySavedGame
- ld de, $0000
+ ld de, MUSIC_NOTHING
call PlaySong
rst AdvanceFrame
lb de, $00, $27
@@ -137,7 +137,7 @@ Func_c10e: ; 0xc10e ld a, [hNewlyPressedButtons]
bit 0, a
jr z, .asm_c17c
- ld de, $0000
+ ld de, MUSIC_NOTHING
call PlaySong
rst AdvanceFrame
lb de, $00, $27
|