aboutsummaryrefslogtreecommitdiffstats
path: root/constants/music_constants.asm
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 /constants/music_constants.asm
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 'constants/music_constants.asm')
-rw-r--r--constants/music_constants.asm2
1 files changed, 1 insertions, 1 deletions
diff --git a/constants/music_constants.asm b/constants/music_constants.asm
index 74d747ba..71ff1aba 100644
--- a/constants/music_constants.asm
+++ b/constants/music_constants.asm
@@ -96,7 +96,7 @@ ENDM
; AUDIO_4
music_const MUSIC_SURFING_PIKACHU, Music_SurfingPikachu
- music_const MUSIC_JESSIE_AND_JAMES, Music_JessieAndJames
+ music_const MUSIC_MEET_JESSIE_JAMES, Music_MeetJessieJames
music_const MUSIC_YELLOW_UNUSED_SONG, Music_YellowUnusedSong
music_const MUSIC_GB_PRINTER, Music_GBPrinter