From 546c17ad37b1e0cfd91ea630e0bbc044c28b3e6a Mon Sep 17 00:00:00 2001 From: yenatch Date: Tue, 8 Oct 2013 13:10:36 -0400 Subject: rename 'StartSFX' to 'PlaySFX' --- engine/scripting.asm | 6 +++--- engine/title.asm | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'engine') diff --git a/engine/scripting.asm b/engine/scripting.asm index 39a56950e..06364a27c 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 @@ -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 -- cgit v1.2.3 From 789469c465aa18850e1888785b0eb816fd80a18a Mon Sep 17 00:00:00 2001 From: yenatch Date: Tue, 8 Oct 2013 13:21:15 -0400 Subject: rename 'StartMusic' to 'PlayMusic' --- engine/credits.asm | 4 ++-- engine/scripting.asm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'engine') 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 06364a27c..dcd266f6e 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -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 -- cgit v1.2.3