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 /engine | |
| 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 'engine')
| -rw-r--r-- | engine/credits.asm | 4 | ||||
| -rw-r--r-- | engine/scripting.asm | 10 | ||||
| -rw-r--r-- | engine/title.asm | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/engine/credits.asm b/engine/credits.asm index d5e4399b9..2cfac86f1 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 39a56950e..dcd266f6e 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -588,7 +588,7 @@ Script_specialsound: ; 0x96fe4 jr z, .play ld de, SFX_ITEM .play - call StartSFX + call PlaySFX call WaitSFX ret ; 0x96ffe @@ -917,7 +917,7 @@ Script_playmusic: ; 0x97189 ; music_pointer (MultiByteParam) ld de, $0000 - call StartMusic + call PlayMusic xor a ld [$c2a7], a call MaxVolume @@ -925,7 +925,7 @@ Script_playmusic: ; 0x97189 ld e, a call GetScriptByte ld d, a - call StartMusic + call PlayMusic ret ; 0x971a2 @@ -954,7 +954,7 @@ Script_playsound: ; 0x971b7 ld e, a call GetScriptByte ld d, a - call StartSFX + call PlaySFX ret ; 0x971c3 @@ -971,7 +971,7 @@ Script_warpsound: ; 0x971c7 ld a, $5 ld hl, $4a07 rst $8 - call StartSFX + call PlaySFX ret ; 0x971d1 diff --git a/engine/title.asm b/engine/title.asm index 3772b052f..97428430c 100644 --- a/engine/title.asm +++ b/engine/title.asm @@ -225,7 +225,7 @@ _TitleScreen: ; 10ed67 ; Play starting sound effect call SFXChannelsOff ld de, SFX_TITLE_SCREEN_ENTRANCE - call StartSFX + call PlaySFX ret ; 10eea7 |