diff options
| author | Daniel Harding <33dannye@gmail.com> | 2020-05-20 20:17:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-20 20:17:30 -0500 |
| commit | 500d99c258145d233af8d14cdb5c6e0200dfc1d8 (patch) | |
| tree | 7dbe7b152dde8a6e9b56664b5b8cdfc0d6be1253 /audio/headers/musicheaders4.asm | |
| parent | Merge pull request #39 from TiKevin83/master (diff) | |
| parent | Merge remote-tracking branch 'pokered/master' (diff) | |
| download | pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.tar.gz pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.tar.xz pokeyellow-500d99c258145d233af8d14cdb5c6e0200dfc1d8.zip | |
Merge pull request #50 from dannye/master
merge pokered
Diffstat (limited to 'audio/headers/musicheaders4.asm')
| -rw-r--r-- | audio/headers/musicheaders4.asm | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/audio/headers/musicheaders4.asm b/audio/headers/musicheaders4.asm index be5d822a..8c537ff9 100644 --- a/audio/headers/musicheaders4.asm +++ b/audio/headers/musicheaders4.asm @@ -1,18 +1,11 @@ Music_SurfingPikachu:: - dbw ((3 - 1) << 6) | CH0, Music_SurfingPikachu_Ch1 - dbw CH1, Music_SurfingPikachu_Ch2 - dbw CH2, Music_SurfingPikachu_Ch3 + audio_header Music_SurfingPikachu, Ch1, Ch2, Ch3 Music_MeetJessieJames:: - dbw ((3 - 1) << 6) | CH0, Music_MeetJessieJames_Ch1 - dbw CH1, Music_MeetJessieJames_Ch2 - dbw CH2, Music_MeetJessieJames_Ch3 + audio_header Music_MeetJessieJames, Ch1, Ch2, Ch3 Music_YellowUnusedSong:: - dbw ((4 - 1) << 6) | CH0, Music_YellowUnusedSong_Ch1 - dbw CH1, Music_YellowUnusedSong_Ch2 - dbw CH2, Music_YellowUnusedSong_Ch3 - dbw CH3, Music_YellowUnusedSong_Ch4 + audio_header Music_YellowUnusedSong, Ch1, Ch2, Ch3, Ch4 Music_GBPrinter:: - dbw ((1 - 1) << 6) | CH2, Music_GBPrinter_Ch3 + audio_header Music_GBPrinter, Ch3 |