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/rockethideout4.asm | |
| parent | Is this an OAM printer? (diff) | |
| parent | Clean up main.asm (diff) | |
| download | pokeyellow-5da4ad3d5c62292f062d4f7b4382e6c09b7faaea.tar.gz pokeyellow-5da4ad3d5c62292f062d4f7b4382e6c09b7faaea.tar.xz pokeyellow-5da4ad3d5c62292f062d4f7b4382e6c09b7faaea.zip | |
Merge branch 'master' of github.com:pret/pokeyellow
Diffstat (limited to 'scripts/rockethideout4.asm')
| -rwxr-xr-x | scripts/rockethideout4.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/rockethideout4.asm b/scripts/rockethideout4.asm index 75cb7912..30ed3f24 100755 --- a/scripts/rockethideout4.asm +++ b/scripts/rockethideout4.asm @@ -93,8 +93,8 @@ RocketHideout4Script_455a5: ld a, $fc ld [wJoyIgnore], 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 call UpdateSprites call Delay3 @@ -237,8 +237,8 @@ RocketHideout4Script11: 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 |