diff --git a/src/rooms/mermaid_spring.asm b/src/rooms/mermaid_spring.asm index f683a8f..63c48e5 100644 --- a/src/rooms/mermaid_spring.asm +++ b/src/rooms/mermaid_spring.asm @@ -47,6 +47,7 @@ .IMPORT DataA_Text0_MermaidSpringAlex_Part5_u8_arr .IMPORT DataA_Text0_MermaidSpringSign_Closed_u8_arr .IMPORT DataA_Text0_MermaidSpringSign_Open_u8_arr +.IMPORT FuncA_Cutscene_PlaySfxClick .IMPORT FuncA_Machine_Error .IMPORT FuncA_Machine_GenericTryMoveY .IMPORT FuncA_Machine_PumpTick @@ -496,6 +497,7 @@ _RaindropVelY_u8_arr: act_WaitFrames 60 act_SetActorState1 kAlexActorIndex, eNpcChild::AlexKneeling act_WaitUntilZ _DropMonitorPlatform + act_CallFunc FuncA_Cutscene_PlaySfxClick act_WaitFrames 15 act_CallFunc _FixConsole act_SetDeviceAnim kConsoleDeviceIndex, kConsoleAnimCountdown diff --git a/src/rooms/prison_upper.asm b/src/rooms/prison_upper.asm index 7db0b21..0deff33 100644 --- a/src/rooms/prison_upper.asm +++ b/src/rooms/prison_upper.asm @@ -57,6 +57,7 @@ .IMPORT DataA_Text0_PrisonUpperMarie_StandCareful_u8_arr .IMPORT DataA_Text0_PrisonUpperNora_u8_arr .IMPORT Data_Empty_sDialog +.IMPORT FuncA_Cutscene_PlaySfxClick .IMPORT FuncA_Objects_DrawStepstonePlatform .IMPORT FuncC_Prison_DrawGatePlatform .IMPORT FuncC_Prison_OpenGateAndFlipLever @@ -548,10 +549,10 @@ _WalkAvatar_sCutscene: act_ForkStop $ff _PushBrick_sCutscene: act_WaitFrames 20 + act_CallFunc FuncA_Cutscene_PlaySfxClick act_CallFunc _PlaceStepstone act_ForkStop $ff _PlaceStepstone: - ;; TODO: play a sound for pushing the stepstone lda #ePlatform::Solid sta Ram_PlatformType_ePlatform_arr + kStepstonePlatformIndex ldx #eFlag::PrisonUpperLoosenedBrick ; param: flag @@ -611,10 +612,16 @@ _OpenGate: act_CallFunc Func_PlaySfxMetallicDing act_WaitFrames 12 act_CallFunc Func_PlaySfxMetallicDing + act_WaitFrames 12 + act_CallFunc FuncA_Cutscene_PlaySfxClick act_WaitFrames 70 act_CallFunc Func_PlaySfxMetallicDing act_WaitFrames 12 act_CallFunc Func_PlaySfxMetallicDing + act_WaitFrames 12 + act_CallFunc Func_PlaySfxMetallicDing + act_WaitFrames 12 + act_CallFunc FuncA_Cutscene_PlaySfxClick act_WaitFrames 10 act_ForkStart 2, _NinaEscape_sCutscene act_WaitFrames 31 diff --git a/src/sounds/rocket.asm b/src/sounds/rocket.asm index 89d5d80..11c764d 100644 --- a/src/sounds/rocket.asm +++ b/src/sounds/rocket.asm @@ -59,8 +59,8 @@ _Func: rts .ENDPROC -;;; SFX data for the "rocket transfer" sound effect. -.PROC Data_RocketTransfer_sSfx +;;; SFX data for a clicking sound effect. +.PROC Data_Click_sSfx sfx_SetEnvTimer (bEnvelope::NoLength | 0), $08a sfx_Wait 3 sfx_SetTimerLo $88 @@ -70,6 +70,18 @@ _Func: ;;;=========================================================================;;; +.SEGMENT "PRGA_Cutscene" + +;;; Starts playing the sound for when a stepstone is pushed into position. +;;; @preserve T0+ +.EXPORT FuncA_Cutscene_PlaySfxClick +.PROC FuncA_Cutscene_PlaySfxClick + ldya #Data_Click_sSfx + jmp Func_PlaySfxOnNoiseChannel ; preserves T0+ +.ENDPROC + +;;;=========================================================================;;; + .SEGMENT "PRGA_Machine" ;;; Starts playing a rocket launch sound. @@ -85,7 +97,7 @@ _Func: ;;; @preserve T0+ .EXPORT FuncA_Machine_PlaySfxRocketTransfer .PROC FuncA_Machine_PlaySfxRocketTransfer - ldya #Data_RocketTransfer_sSfx + ldya #Data_Click_sSfx jmp Func_PlaySfxOnNoiseChannel ; preserves T0+ .ENDPROC