diff options
author | Bryan Bishop <kanzure@gmail.com> | 2013-10-14 11:53:12 -0700 |
---|---|---|
committer | Bryan Bishop <kanzure@gmail.com> | 2013-10-14 11:53:12 -0700 |
commit | 80329c54897a545b9b8b3e82b686b09f295bb67a (patch) | |
tree | 322ca10c3e768cabfba250f1c7879b246a0781b6 /audio/trainer_encounters.asm | |
parent | 94d4c89e093b76a0964114bd7a370046e70e965e (diff) | |
parent | cf966bb824ce0ffe384291cd51aa96a2dd86e839 (diff) |
Merge pull request #210 from yenatch/master
contest mons, fixed dumb labels, fixed more lz dumps, game freak logo, roofs
Diffstat (limited to 'audio/trainer_encounters.asm')
-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 |