aboutsummaryrefslogtreecommitdiffstats
path: root/audio/headers
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-06-08 00:35:33 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-06-08 00:35:33 -0400
commit5da4ad3d5c62292f062d4f7b4382e6c09b7faaea (patch)
tree97319f45578efa0901fb1986678c16bbdeda6bcc /audio/headers
parentIs this an OAM printer? (diff)
parentClean up main.asm (diff)
downloadpokeyellow-5da4ad3d5c62292f062d4f7b4382e6c09b7faaea.tar.gz
pokeyellow-5da4ad3d5c62292f062d4f7b4382e6c09b7faaea.tar.xz
pokeyellow-5da4ad3d5c62292f062d4f7b4382e6c09b7faaea.zip
Merge branch 'master' of github.com:pret/pokeyellow
Diffstat (limited to 'audio/headers')
-rw-r--r--audio/headers/musicheaders4.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/audio/headers/musicheaders4.asm b/audio/headers/musicheaders4.asm
index 7f26601e..be5d822a 100644
--- a/audio/headers/musicheaders4.asm
+++ b/audio/headers/musicheaders4.asm
@@ -3,10 +3,10 @@ Music_SurfingPikachu::
dbw CH1, Music_SurfingPikachu_Ch2
dbw CH2, Music_SurfingPikachu_Ch3
-Music_JessieAndJames::
- dbw ((3 - 1) << 6) | CH0, Music_JessieAndJames_Ch1
- dbw CH1, Music_JessieAndJames_Ch2
- dbw CH2, Music_JessieAndJames_Ch3
+Music_MeetJessieJames::
+ dbw ((3 - 1) << 6) | CH0, Music_MeetJessieJames_Ch1
+ dbw CH1, Music_MeetJessieJames_Ch2
+ dbw CH2, Music_MeetJessieJames_Ch3
Music_YellowUnusedSong::
dbw ((4 - 1) << 6) | CH0, Music_YellowUnusedSong_Ch1