diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-08 00:35:33 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-08 00:35:33 -0400 |
| commit | 5da4ad3d5c62292f062d4f7b4382e6c09b7faaea (patch) | |
| tree | 97319f45578efa0901fb1986678c16bbdeda6bcc /scripts/silphco11.asm | |
| parent | e181c27c5e396aea254b471b182df3237eeb03ce (diff) | |
| parent | 2bb64d11e6015e39e934e7359697c08636645994 (diff) | |
Merge branch 'master' of github.com:pret/pokeyellow
Diffstat (limited to 'scripts/silphco11.asm')
| -rwxr-xr-x | scripts/silphco11.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/silphco11.asm b/scripts/silphco11.asm index a2354a69..42e8d574 100755 --- a/scripts/silphco11.asm +++ b/scripts/silphco11.asm @@ -229,8 +229,8 @@ SilphCo11Script_6229c: SetEventReuseHL EVENT_781 .asm_622c3 call StopAllMusic - ld c, BANK(Music_JessieAndJames) - ld a, MUSIC_JESSIE_AND_JAMES + ld c, BANK(Music_MeetJessieJames) + ld a, MUSIC_MEET_JESSIE_JAMES call PlayMusic xor a ld [hJoyHeld], a @@ -417,8 +417,8 @@ SilphCo11Script12: xor a ld [wDoNotWaitForButtonPressAfterDisplayingText], a call StopAllMusic - ld c, BANK(Music_JessieAndJames) - ld a, MUSIC_JESSIE_AND_JAMES + ld c, BANK(Music_MeetJessieJames) + ld a, MUSIC_MEET_JESSIE_JAMES call PlayMusic ld a, $ff ld [wJoyIgnore], a |