diff options
| author | yenatch <yenatch@gmail.com> | 2013-10-25 16:48:29 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2013-10-25 16:48:29 -0400 |
| commit | bd49428c4a4e98f9a7bbbcdd79d75d461c0c12b1 (patch) | |
| tree | d4222982858e6dc1513cb35525f2905003ee14d7 /audio | |
| parent | 2a08b8b7ce7d0f49cfdae97ee68d0ed4a3651afe (diff) | |
| parent | 789469c465aa18850e1888785b0eb816fd80a18a (diff) | |
Merge commit '789469c' into merge-mrwint
Conflicts:
main.asm
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/trainer_encounters.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/audio/trainer_encounters.asm b/audio/trainer_encounters.asm index 7c64d586a..7ddc38f06 100644 --- a/audio/trainer_encounters.asm +++ b/audio/trainer_encounters.asm @@ -8,7 +8,7 @@ PlayTrainerEncounterMusic: ; e900a ; play nothing for one frame push de ld de, $0000 ; id: Music_Nothing - call StartMusic + call PlayMusic call DelayFrame ; play new song call MaxVolume @@ -17,7 +17,7 @@ PlayTrainerEncounterMusic: ; e900a ld hl, TrainerEncounterMusic add hl, de ld e, [hl] - call StartMusic + call PlayMusic ret ; e9027 |