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 /engine | |
| parent | 2a08b8b7ce7d0f49cfdae97ee68d0ed4a3651afe (diff) | |
| parent | 789469c465aa18850e1888785b0eb816fd80a18a (diff) | |
Merge commit '789469c' into merge-mrwint
Conflicts:
main.asm
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/credits.asm | 4 | ||||
| -rw-r--r-- | engine/scripting.asm | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engine/credits.asm b/engine/credits.asm index d2dce1bee..c0cc72d97 100644 --- a/engine/credits.asm +++ b/engine/credits.asm @@ -223,10 +223,10 @@ ParseCredits: ; 1099aa ld de, MUSIC_CREDITS push de ld de, MUSIC_NONE - call StartMusic + call PlayMusic call DelayFrame pop de - call StartMusic + call PlayMusic jp .loop .wait2 diff --git a/engine/scripting.asm b/engine/scripting.asm index 0cde8921e..3d37b0206 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -889,7 +889,7 @@ Script_playmusic: ; 0x97189 ; music_pointer (MultiByteParam) ld de, $0000 - call StartMusic + call PlayMusic xor a ld [$c2a7], a call MaxVolume @@ -897,7 +897,7 @@ Script_playmusic: ; 0x97189 ld e, a call GetScriptByte ld d, a - call StartMusic + call PlayMusic ret ; 0x971a2 |