1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-05-10 11:03:46 +00:00

Document z_lib Sfx Functions (#1470)

* document lib sfx

* rename functions
This commit is contained in:
engineer124 2023-08-15 15:44:20 +10:00 committed by GitHub
parent 18d609c1a3
commit b8aa2a251e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
112 changed files with 399 additions and 388 deletions

View file

@ -382,7 +382,7 @@ void func_80A87CEC(EnJj *this, PlayState *play) {
func_8003EBF8(play, &play->colCtx.dyna, (s32) temp_v1->bgId); func_8003EBF8(play, &play->colCtx.dyna, (s32) temp_v1->bgId);
func_8005B1A4(play->cameraPtrs[play->activeCamId]); func_8005B1A4(play->cameraPtrs[play->activeCamId]);
gSaveContext.unkEDA = (u16) (gSaveContext.unkEDA | 0x400); gSaveContext.unkEDA = (u16) (gSaveContext.unkEDA | 0x400);
func_80078884((u16)0x4802U); Sfx_PlaySfxCentered((u16)0x4802U);
} }
``` ```
@ -420,7 +420,7 @@ void func_80A87CEC(EnJj *this, PlayState *play) {
func_8003EBF8(play, &play->colCtx.dyna, child->bgId); func_8003EBF8(play, &play->colCtx.dyna, child->bgId);
func_8005B1A4(GET_ACTIVE_CAM(play)); func_8005B1A4(GET_ACTIVE_CAM(play));
gSaveContext.save.info.eventChkInf[3] |= 0x400; gSaveContext.save.info.eventChkInf[3] |= 0x400;
func_80078884(NA_SE_SY_CORRECT_CHIME); Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
} }
``` ```
@ -439,7 +439,7 @@ void func_80A87CEC(EnJj* this, PlayState* play) {
func_8003EBF8(play, &play->colCtx.dyna, child->bgId); func_8003EBF8(play, &play->colCtx.dyna, child->bgId);
func_8005B1A4(GET_ACTIVE_CAM(play)); func_8005B1A4(GET_ACTIVE_CAM(play));
gSaveContext.save.info.eventChkInf[3] |= 0x400; gSaveContext.save.info.eventChkInf[3] |= 0x400;
func_80078884(NA_SE_SY_CORRECT_CHIME); Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
} }
} }
``` ```

View file

@ -877,9 +877,9 @@ f32 Math_SmoothStepToDegF(f32* pValue, f32 target, f32 fraction, f32 step, f32 m
s16 Math_SmoothStepToS(s16* pValue, s16 target, s16 scale, s16 step, s16 minStep); s16 Math_SmoothStepToS(s16* pValue, s16 target, s16 scale, s16 step, s16 minStep);
void Math_ApproachS(s16* pValue, s16 target, s16 scale, s16 step); void Math_ApproachS(s16* pValue, s16 target, s16 scale, s16 step);
void Color_RGBA8_Copy(Color_RGBA8* dst, Color_RGBA8* src); void Color_RGBA8_Copy(Color_RGBA8* dst, Color_RGBA8* src);
void func_80078884(u16 sfxId); void Sfx_PlaySfxCentered(u16 sfxId);
void func_800788CC(u16 sfxId); void Sfx_PlaySfxCentered2(u16 sfxId);
void func_80078914(Vec3f* arg0, u16 sfxId); void Sfx_PlaySfxAtPos(Vec3f* projectedPos, u16 sfxId);
void Health_InitMeter(PlayState* play); void Health_InitMeter(PlayState* play);
void Health_UpdateMeter(PlayState* play); void Health_UpdateMeter(PlayState* play);
void Health_DrawMeter(PlayState* play); void Health_DrawMeter(PlayState* play);

View file

@ -489,7 +489,7 @@ void func_8002C7BC(TargetContext* targetCtx, Player* player, Actor* actorArg, Pl
lockOnSfxId = CHECK_FLAG_ALL(actorArg->flags, ACTOR_FLAG_0 | ACTOR_FLAG_2) ? NA_SE_SY_LOCK_ON lockOnSfxId = CHECK_FLAG_ALL(actorArg->flags, ACTOR_FLAG_0 | ACTOR_FLAG_2) ? NA_SE_SY_LOCK_ON
: NA_SE_SY_LOCK_ON_HUMAN; : NA_SE_SY_LOCK_ON_HUMAN;
func_80078884(lockOnSfxId); Sfx_PlaySfxCentered(lockOnSfxId);
} }
targetCtx->targetCenterPos.x = actorArg->world.pos.x; targetCtx->targetCenterPos.x = actorArg->world.pos.x;
@ -1751,7 +1751,7 @@ void Player_PlaySfx(Player* player, u16 sfxId) {
* Play a sound effect at the actor's position * Play a sound effect at the actor's position
*/ */
void Actor_PlaySfx(Actor* actor, u16 sfxId) { void Actor_PlaySfx(Actor* actor, u16 sfxId) {
func_80078914(&actor->projectedPos, sfxId); Sfx_PlaySfxAtPos(&actor->projectedPos, sfxId);
} }
void func_8002F850(PlayState* play, Actor* actor) { void func_8002F850(PlayState* play, Actor* actor) {
@ -1767,8 +1767,8 @@ void func_8002F850(PlayState* play, Actor* actor) {
surfaceSfxOffset = SurfaceType_GetSfxOffset(&play->colCtx, actor->floorPoly, actor->floorBgId); surfaceSfxOffset = SurfaceType_GetSfxOffset(&play->colCtx, actor->floorPoly, actor->floorBgId);
} }
func_80078914(&actor->projectedPos, NA_SE_EV_BOMB_BOUND); Sfx_PlaySfxAtPos(&actor->projectedPos, NA_SE_EV_BOMB_BOUND);
func_80078914(&actor->projectedPos, NA_SE_PL_WALK_GROUND + surfaceSfxOffset); Sfx_PlaySfxAtPos(&actor->projectedPos, NA_SE_PL_WALK_GROUND + surfaceSfxOffset);
} }
void func_8002F8F0(Actor* actor, u16 sfxId) { void func_8002F8F0(Actor* actor, u16 sfxId) {
@ -1965,7 +1965,8 @@ void Actor_DrawFaroresWindPointer(PlayState* play) {
//! @bug One of the conditions for this block checks an entrance index to see if the light ball should draw. //! @bug One of the conditions for this block checks an entrance index to see if the light ball should draw.
//! This does not account for the fact that some dungeons have multiple entrances. //! This does not account for the fact that some dungeons have multiple entrances.
//! If a dungeon is entered through a different entrance than the one that was saved, the light ball will not draw. //! If a dungeon is entered through a different entrance than the one that was saved, the light ball will not
//! draw.
if ((play->csCtx.state == CS_STATE_IDLE) && if ((play->csCtx.state == CS_STATE_IDLE) &&
(((void)0, gSaveContext.respawn[RESPAWN_MODE_TOP].entranceIndex) == (((void)0, gSaveContext.respawn[RESPAWN_MODE_TOP].entranceIndex) ==
((void)0, gSaveContext.save.entranceIndex)) && ((void)0, gSaveContext.save.entranceIndex)) &&
@ -1998,8 +1999,8 @@ void Actor_DrawFaroresWindPointer(PlayState* play) {
gSPDisplayList(POLY_XLU_DISP++, gEffFlash1DL); gSPDisplayList(POLY_XLU_DISP++, gEffFlash1DL);
} }
//! @bug This function call is not contained in the above block, meaning the light for Farore's Wind will draw in //! @bug This function call is not contained in the above block, meaning the light for Farore's Wind will draw
//! every scene at the same position that it was originally set. //! in every scene at the same position that it was originally set.
Lights_PointNoGlowSetInfo(&D_8015BC00, ((void)0, gSaveContext.respawn[RESPAWN_MODE_TOP].pos.x), Lights_PointNoGlowSetInfo(&D_8015BC00, ((void)0, gSaveContext.respawn[RESPAWN_MODE_TOP].pos.x),
((void)0, gSaveContext.respawn[RESPAWN_MODE_TOP].pos.y) + yOffset, ((void)0, gSaveContext.respawn[RESPAWN_MODE_TOP].pos.y) + yOffset,
((void)0, gSaveContext.respawn[RESPAWN_MODE_TOP].pos.z), 255, 255, 255, lightRadius); ((void)0, gSaveContext.respawn[RESPAWN_MODE_TOP].pos.z), 255, 255, 255, lightRadius);
@ -2214,7 +2215,7 @@ void Actor_UpdateAll(PlayState* play, ActorContext* actorCtx) {
actor = NULL; actor = NULL;
if (actorCtx->targetCtx.unk_4B != 0) { if (actorCtx->targetCtx.unk_4B != 0) {
actorCtx->targetCtx.unk_4B = 0; actorCtx->targetCtx.unk_4B = 0;
func_80078884(NA_SE_SY_LOCK_OFF); Sfx_PlaySfxCentered(NA_SE_SY_LOCK_OFF);
} }
} }
@ -2316,13 +2317,13 @@ void func_80030ED8(Actor* actor) {
Audio_PlaySfxGeneral(actor->sfx, &actor->projectedPos, 4, &gSfxDefaultFreqAndVolScale, Audio_PlaySfxGeneral(actor->sfx, &actor->projectedPos, 4, &gSfxDefaultFreqAndVolScale,
&gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
} else if (actor->flags & ACTOR_FLAG_20) { } else if (actor->flags & ACTOR_FLAG_20) {
func_80078884(actor->sfx); Sfx_PlaySfxCentered(actor->sfx);
} else if (actor->flags & ACTOR_FLAG_21) { } else if (actor->flags & ACTOR_FLAG_21) {
func_800788CC(actor->sfx); Sfx_PlaySfxCentered2(actor->sfx);
} else if (actor->flags & ACTOR_FLAG_28) { } else if (actor->flags & ACTOR_FLAG_28) {
func_800F4C58(&gSfxDefaultPos, NA_SE_SY_TIMER - SFX_FLAG, (s8)(actor->sfx - 1)); func_800F4C58(&gSfxDefaultPos, NA_SE_SY_TIMER - SFX_FLAG, (s8)(actor->sfx - 1));
} else { } else {
func_80078914(&actor->projectedPos, actor->sfx); Sfx_PlaySfxAtPos(&actor->projectedPos, actor->sfx);
} }
} }

View file

@ -6220,7 +6220,7 @@ s32 Camera_Demo5(Camera* camera) {
framesDiff = sDemo5PrevSfxFrame - camera->play->state.frames; framesDiff = sDemo5PrevSfxFrame - camera->play->state.frames;
if ((framesDiff > 50) || (framesDiff < -50)) { if ((framesDiff > 50) || (framesDiff < -50)) {
func_80078884((u32)camera->data1); Sfx_PlaySfxCentered((u32)camera->data1);
} }
sDemo5PrevSfxFrame = camera->play->state.frames; sDemo5PrevSfxFrame = camera->play->state.frames;
@ -7456,11 +7456,11 @@ s32 Camera_DbgChangeMode(Camera* camera) {
if (!gDebugCamEnabled && camera->play->activeCamId == CAM_ID_MAIN) { if (!gDebugCamEnabled && camera->play->activeCamId == CAM_ID_MAIN) {
if (CHECK_BTN_ALL(D_8015BD7C->state.input[2].press.button, BTN_CUP)) { if (CHECK_BTN_ALL(D_8015BD7C->state.input[2].press.button, BTN_CUP)) {
osSyncPrintf("attention sound URGENCY\n"); osSyncPrintf("attention sound URGENCY\n");
func_80078884(NA_SE_SY_ATTENTION_URGENCY); Sfx_PlaySfxCentered(NA_SE_SY_ATTENTION_URGENCY);
} }
if (CHECK_BTN_ALL(D_8015BD7C->state.input[2].press.button, BTN_CDOWN)) { if (CHECK_BTN_ALL(D_8015BD7C->state.input[2].press.button, BTN_CDOWN)) {
osSyncPrintf("attention sound NORMAL\n"); osSyncPrintf("attention sound NORMAL\n");
func_80078884(NA_SE_SY_ATTENTION_ON); Sfx_PlaySfxCentered(NA_SE_SY_ATTENTION_ON);
} }
if (CHECK_BTN_ALL(D_8015BD7C->state.input[2].press.button, BTN_CRIGHT)) { if (CHECK_BTN_ALL(D_8015BD7C->state.input[2].press.button, BTN_CRIGHT)) {
@ -7884,7 +7884,7 @@ s32 Camera_ChangeModeFlags(Camera* camera, s16 mode, u8 flags) {
if (!((sCameraSettings[camera->setting].unk_00 & 0x3FFFFFFF) & (1 << mode))) { if (!((sCameraSettings[camera->setting].unk_00 & 0x3FFFFFFF) & (1 << mode))) {
if (mode == CAM_MODE_FIRST_PERSON) { if (mode == CAM_MODE_FIRST_PERSON) {
osSyncPrintf("camera: error sound\n"); osSyncPrintf("camera: error sound\n");
func_80078884(NA_SE_SY_ERROR); Sfx_PlaySfxCentered(NA_SE_SY_ERROR);
} }
if (camera->mode != CAM_MODE_NORMAL) { if (camera->mode != CAM_MODE_NORMAL) {
@ -7972,20 +7972,20 @@ s32 Camera_ChangeModeFlags(Camera* camera, s16 mode, u8 flags) {
if (camera->status == CAM_STAT_ACTIVE) { if (camera->status == CAM_STAT_ACTIVE) {
switch (modeChangeFlags) { switch (modeChangeFlags) {
case 1: case 1:
func_80078884(0); Sfx_PlaySfxCentered(0);
break; break;
case 2: case 2:
if (camera->play->roomCtx.curRoom.behaviorType1 == ROOM_BEHAVIOR_TYPE1_1) { if (camera->play->roomCtx.curRoom.behaviorType1 == ROOM_BEHAVIOR_TYPE1_1) {
func_80078884(NA_SE_SY_ATTENTION_URGENCY); Sfx_PlaySfxCentered(NA_SE_SY_ATTENTION_URGENCY);
} else { } else {
func_80078884(NA_SE_SY_ATTENTION_ON); Sfx_PlaySfxCentered(NA_SE_SY_ATTENTION_ON);
} }
break; break;
case 4: case 4:
func_80078884(NA_SE_SY_ATTENTION_URGENCY); Sfx_PlaySfxCentered(NA_SE_SY_ATTENTION_URGENCY);
break; break;
case 8: case 8:
func_80078884(NA_SE_SY_ATTENTION_ON); Sfx_PlaySfxCentered(NA_SE_SY_ATTENTION_ON);
break; break;
} }
} }

View file

@ -317,7 +317,7 @@ void CutsceneCmd_Misc(PlayState* play, CutsceneContext* csCtx, CsCmdMisc* cmd) {
} }
if (csCtx->curFrame == 783) { if (csCtx->curFrame == 783) {
func_80078884(NA_SE_EV_DEKU_DEATH); Sfx_PlaySfxCentered(NA_SE_EV_DEKU_DEATH);
} else if (csCtx->curFrame == 717) { } else if (csCtx->curFrame == 717) {
play->roomCtx.unk_74[0] = 0; play->roomCtx.unk_74[0] = 0;
} }
@ -333,7 +333,7 @@ void CutsceneCmd_Misc(PlayState* play, CutsceneContext* csCtx, CsCmdMisc* cmd) {
case CS_MISC_TRIFORCE_FLASH: case CS_MISC_TRIFORCE_FLASH:
if (play->roomCtx.unk_74[1] == 0) { if (play->roomCtx.unk_74[1] == 0) {
func_80078884(NA_SE_EV_TRIFORCE_FLASH); Sfx_PlaySfxCentered(NA_SE_EV_TRIFORCE_FLASH);
} }
if (play->roomCtx.unk_74[1] < 255) { if (play->roomCtx.unk_74[1] < 255) {
@ -471,7 +471,7 @@ void CutsceneCmd_Misc(PlayState* play, CutsceneContext* csCtx, CsCmdMisc* cmd) {
play->envCtx.sandstormState = SANDSTORM_FILL; play->envCtx.sandstormState = SANDSTORM_FILL;
} }
func_800788CC(NA_SE_EV_SAND_STORM - SFX_FLAG); Sfx_PlaySfxCentered2(NA_SE_EV_SAND_STORM - SFX_FLAG);
break; break;
case CS_MISC_SUNSSONG_START: case CS_MISC_SUNSSONG_START:
@ -1435,7 +1435,7 @@ void CutsceneCmd_Transition(PlayState* play, CutsceneContext* csCtx, CsCmdTransi
Audio_PlaySfxGeneral(NA_SE_EV_WHITE_OUT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, Audio_PlaySfxGeneral(NA_SE_EV_WHITE_OUT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
&gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
} else if ((lerp == 0.0f) && (play->sceneId == SCENE_INSIDE_GANONS_CASTLE)) { } else if ((lerp == 0.0f) && (play->sceneId == SCENE_INSIDE_GANONS_CASTLE)) {
func_800788CC(NA_SE_EV_WHITE_OUT); Sfx_PlaySfxCentered2(NA_SE_EV_WHITE_OUT);
} }
} else { } else {
play->envCtx.screenFillColor[3] = (1.0f - lerp) * 255.0f; play->envCtx.screenFillColor[3] = (1.0f - lerp) * 255.0f;

View file

@ -912,10 +912,10 @@ void Environment_Update(PlayState* play, EnvironmentContext* envCtx, LightContex
// delaying the chicken crow or dog howl sfx by 15 frames when loading the new area. // delaying the chicken crow or dog howl sfx by 15 frames when loading the new area.
if (((void)0, gSaveContext.nextDayTime) == (NEXT_TIME_DAY_SET - (15 * 0x10))) { if (((void)0, gSaveContext.nextDayTime) == (NEXT_TIME_DAY_SET - (15 * 0x10))) {
func_80078884(NA_SE_EV_CHICKEN_CRY_M); Sfx_PlaySfxCentered(NA_SE_EV_CHICKEN_CRY_M);
gSaveContext.nextDayTime = NEXT_TIME_NONE; gSaveContext.nextDayTime = NEXT_TIME_NONE;
} else if (((void)0, gSaveContext.nextDayTime) == (NEXT_TIME_NIGHT_SET - (15 * 0x10))) { } else if (((void)0, gSaveContext.nextDayTime) == (NEXT_TIME_NIGHT_SET - (15 * 0x10))) {
func_800788CC(NA_SE_EV_DOG_CRY_EVENING); Sfx_PlaySfxCentered2(NA_SE_EV_DOG_CRY_EVENING);
gSaveContext.nextDayTime = NEXT_TIME_NONE; gSaveContext.nextDayTime = NEXT_TIME_NONE;
} }
} }
@ -2122,7 +2122,7 @@ void Environment_PlayTimeBasedSequence(PlayState* play) {
case TIMESEQ_NIGHT_BEGIN_SFX: case TIMESEQ_NIGHT_BEGIN_SFX:
if (gSaveContext.save.dayTime > CLOCK_TIME(18, 0)) { if (gSaveContext.save.dayTime > CLOCK_TIME(18, 0)) {
func_800788CC(NA_SE_EV_DOG_CRY_EVENING); Sfx_PlaySfxCentered2(NA_SE_EV_DOG_CRY_EVENING);
play->envCtx.timeSeqState++; play->envCtx.timeSeqState++;
} }
break; break;
@ -2158,7 +2158,7 @@ void Environment_PlayTimeBasedSequence(PlayState* play) {
gSaveContext.save.totalDays++; gSaveContext.save.totalDays++;
gSaveContext.save.bgsDayCount++; gSaveContext.save.bgsDayCount++;
gSaveContext.dogIsLost = true; gSaveContext.dogIsLost = true;
func_80078884(NA_SE_EV_CHICKEN_CRY_M); Sfx_PlaySfxCentered(NA_SE_EV_CHICKEN_CRY_M);
if ((Inventory_ReplaceItem(play, ITEM_WEIRD_EGG, ITEM_CHICKEN) || if ((Inventory_ReplaceItem(play, ITEM_WEIRD_EGG, ITEM_CHICKEN) ||
Inventory_ReplaceItem(play, ITEM_POCKET_EGG, ITEM_POCKET_CUCCO)) && Inventory_ReplaceItem(play, ITEM_POCKET_EGG, ITEM_POCKET_CUCCO)) &&

View file

@ -590,16 +590,26 @@ void Color_RGBA8_Copy(Color_RGBA8* dst, Color_RGBA8* src) {
dst->a = src->a; dst->a = src->a;
} }
void func_80078884(u16 sfxId) { /**
* Play a sound effect at the center of the screen.
*/
void Sfx_PlaySfxCentered(u16 sfxId) {
Audio_PlaySfxGeneral(sfxId, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, Audio_PlaySfxGeneral(sfxId, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
&gSfxDefaultReverb); &gSfxDefaultReverb);
} }
void func_800788CC(u16 sfxId) { /**
* Play a sound effect at the center of the screen. Identical to `Sfx_PlaySfxCentered`.
*/
void Sfx_PlaySfxCentered2(u16 sfxId) {
Audio_PlaySfxGeneral(sfxId, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, Audio_PlaySfxGeneral(sfxId, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
&gSfxDefaultReverb); &gSfxDefaultReverb);
} }
void func_80078914(Vec3f* arg0, u16 sfxId) { /**
Audio_PlaySfxGeneral(sfxId, arg0, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); * Play a sound effect at the requested position.
*/
void Sfx_PlaySfxAtPos(Vec3f* projectedPos, u16 sfxId) {
Audio_PlaySfxGeneral(sfxId, projectedPos, 4, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
&gSfxDefaultReverb);
} }

View file

@ -508,7 +508,7 @@ void Health_UpdateBeatingHeart(PlayState* play) {
interfaceCtx->beatingHeartOscillatorDirection = 0; interfaceCtx->beatingHeartOscillatorDirection = 0;
if (!Player_InCsMode(play) && (play->pauseCtx.state == 0) && (play->pauseCtx.debugState == 0) && if (!Player_InCsMode(play) && (play->pauseCtx.state == 0) && (play->pauseCtx.debugState == 0) &&
Health_IsCritical() && !Play_InCsMode(play)) { Health_IsCritical() && !Play_InCsMode(play)) {
func_80078884(NA_SE_SY_HITPOINT_ALARM); Sfx_PlaySfxCentered(NA_SE_SY_HITPOINT_ALARM);
} }
} }
} else { } else {

View file

@ -489,7 +489,7 @@ s32 OnePointCutscene_SetInfo(PlayState* play, s16 subCamId, s16 csId, Actor* act
Play_ChangeCameraSetting(play, subCamId, CAM_SET_CS_3); Play_ChangeCameraSetting(play, subCamId, CAM_SET_CS_3);
func_8002DF54(play, &player->actor, PLAYER_CSMODE_5); func_8002DF54(play, &player->actor, PLAYER_CSMODE_5);
OnePointCutscene_SetCsCamPoints(subCam, D_80120304 | 0x2000, D_80120300, D_8012013C, D_8012021C); OnePointCutscene_SetCsCamPoints(subCam, D_80120304 | 0x2000, D_80120300, D_8012013C, D_8012021C);
func_80078884(NA_SE_SY_CORRECT_CHIME); Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
OnePointCutscene_Vec3sToVec3f(&mainCam->at, &D_8012013C[D_801202FC - 2].pos); OnePointCutscene_Vec3sToVec3f(&mainCam->at, &D_8012013C[D_801202FC - 2].pos);
OnePointCutscene_Vec3sToVec3f(&mainCam->eye, &D_8012021C[D_801202FC - 2].pos); OnePointCutscene_Vec3sToVec3f(&mainCam->eye, &D_8012021C[D_801202FC - 2].pos);
D_8012013C[D_801202FC - 3].pos.x += D_8012013C[D_801202FC - 3].pos.x +=

View file

@ -332,7 +332,7 @@ void Play_Init(GameState* thisx) {
gSaveContext.sceneLayer == 6) { gSaveContext.sceneLayer == 6) {
osSyncPrintf("エンディングはじまるよー\n"); // "The ending starts" osSyncPrintf("エンディングはじまるよー\n"); // "The ending starts"
((void (*)(void))0x81000000)(); ((void (*)(void))0x81000000)();
osSyncPrintf("出戻り?\n"); // "Return?" osSyncPrintf("出戻り?\n"); // "Return?"
} }
Cutscene_HandleEntranceTriggers(this); Cutscene_HandleEntranceTriggers(this);

View file

@ -233,7 +233,7 @@ void func_8086EE40(BgBombwall* this, PlayState* play) {
func_8086EE94(this, play); func_8086EE94(this, play);
if (((this->dyna.actor.params >> 0xF) & 1) != 0) { if (((this->dyna.actor.params >> 0xF) & 1) != 0) {
func_80078884(NA_SE_SY_CORRECT_CHIME); Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
} }
} }
} }

View file

@ -103,7 +103,7 @@ void func_8087B938(BgHaka* this, PlayState* play) {
this->dyna.unk_150 = 0.0f; this->dyna.unk_150 = 0.0f;
player->stateFlags2 &= ~PLAYER_STATE2_4; player->stateFlags2 &= ~PLAYER_STATE2_4;
if (this->dyna.actor.params == 1) { if (this->dyna.actor.params == 1) {
func_80078884(NA_SE_SY_CORRECT_CHIME); Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
} else if (!IS_DAY && play->sceneId == SCENE_GRAVEYARD) { } else if (!IS_DAY && play->sceneId == SCENE_GRAVEYARD) {
Actor_Spawn(&play->actorCtx, play, ACTOR_EN_POH, this->dyna.actor.home.pos.x, this->dyna.actor.home.pos.y, Actor_Spawn(&play->actorCtx, play, ACTOR_EN_POH, this->dyna.actor.home.pos.x, this->dyna.actor.home.pos.y,
this->dyna.actor.home.pos.z, 0, this->dyna.actor.shape.rot.y, 0, 1); this->dyna.actor.home.pos.z, 0, this->dyna.actor.shape.rot.y, 0, 1);

View file

@ -240,7 +240,7 @@ void BgHakaGate_FloorClosed(BgHakaGate* this, PlayState* play) {
sPuzzleState = SKULL_OF_TRUTH_FOUND; sPuzzleState = SKULL_OF_TRUTH_FOUND;
this->actionFunc = BgHakaGate_DoNothing; this->actionFunc = BgHakaGate_DoNothing;
} else { } else {
func_80078884(NA_SE_SY_ERROR); Sfx_PlaySfxCentered(NA_SE_SY_ERROR);
Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_GROUND_GATE_OPEN); Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_GROUND_GATE_OPEN);
DynaPoly_DisableCollision(play, &play->colCtx.dyna, this->dyna.bgId); DynaPoly_DisableCollision(play, &play->colCtx.dyna, this->dyna.bgId);
this->vTimer = 60; this->vTimer = 60;

View file

@ -230,6 +230,6 @@ void BgHakaShip_Draw(Actor* thisx, PlayState* play) {
sp2C.z = this->dyna.actor.world.pos.z; sp2C.z = this->dyna.actor.world.pos.z;
SkinMatrix_Vec3fMtxFMultXYZ(&play->viewProjectionMtxF, &sp2C, &this->bellSfxPos); SkinMatrix_Vec3fMtxFMultXYZ(&play->viewProjectionMtxF, &sp2C, &this->bellSfxPos);
func_80078914(&this->bellSfxPos, NA_SE_EV_SHIP_BELL - SFX_FLAG); Sfx_PlaySfxAtPos(&this->bellSfxPos, NA_SE_EV_SHIP_BELL - SFX_FLAG);
} }
} }

View file

@ -544,6 +544,6 @@ void BgHakaTrap_Draw(Actor* thisx, PlayState* play) {
sp2C.y = this->dyna.actor.world.pos.y + 110.0f; sp2C.y = this->dyna.actor.world.pos.y + 110.0f;
SkinMatrix_Vec3fMtxFMultXYZ(&play->viewProjectionMtxF, &sp2C, &this->unk_16C); SkinMatrix_Vec3fMtxFMultXYZ(&play->viewProjectionMtxF, &sp2C, &this->unk_16C);
func_80078914(&this->unk_16C, NA_SE_EV_BRIDGE_CLOSE - SFX_FLAG); Sfx_PlaySfxAtPos(&this->unk_16C, NA_SE_EV_BRIDGE_CLOSE - SFX_FLAG);
} }
} }

View file

@ -161,7 +161,7 @@ void BgHakaTubo_DropCollectible(BgHakaTubo* this, PlayState* play) {
if (sPotsDestroyed == 3) { if (sPotsDestroyed == 3) {
// All 3 pots destroyed // All 3 pots destroyed
collectibleParams = -1; collectibleParams = -1;
func_80078884(NA_SE_SY_CORRECT_CHIME); Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
// Drop rupees // Drop rupees
for (i = 0; i < 9; i++) { for (i = 0; i < 9; i++) {
collectible = Item_DropCollectible( collectible = Item_DropCollectible(
@ -177,7 +177,7 @@ void BgHakaTubo_DropCollectible(BgHakaTubo* this, PlayState* play) {
Actor_Spawn(&play->actorCtx, play, ACTOR_EN_FIREFLY, this->dyna.actor.world.pos.x, Actor_Spawn(&play->actorCtx, play, ACTOR_EN_FIREFLY, this->dyna.actor.world.pos.x,
this->dyna.actor.world.pos.y + 80.0f, this->dyna.actor.world.pos.z, 0, this->dyna.actor.world.pos.y + 80.0f, this->dyna.actor.world.pos.z, 0,
this->dyna.actor.shape.rot.y, 0, 2); this->dyna.actor.shape.rot.y, 0, 2);
func_80078884(NA_SE_SY_ERROR); Sfx_PlaySfxCentered(NA_SE_SY_ERROR);
} else { } else {
// Random rewards // Random rewards
if (rnd < 0.4f) { if (rnd < 0.4f) {
@ -189,16 +189,16 @@ void BgHakaTubo_DropCollectible(BgHakaTubo* this, PlayState* play) {
} else { } else {
collectibleParams = ITEM00_ARROWS_SMALL; collectibleParams = ITEM00_ARROWS_SMALL;
} }
func_80078884(NA_SE_SY_TRE_BOX_APPEAR); Sfx_PlaySfxCentered(NA_SE_SY_TRE_BOX_APPEAR);
} }
} else if (Flags_GetCollectible(play, this->dyna.actor.params) != 0) { } else if (Flags_GetCollectible(play, this->dyna.actor.params) != 0) {
// If small key already collected, drop recovery heart instead // If small key already collected, drop recovery heart instead
collectibleParams = ITEM00_RECOVERY_HEART; collectibleParams = ITEM00_RECOVERY_HEART;
func_80078884(NA_SE_SY_TRE_BOX_APPEAR); Sfx_PlaySfxCentered(NA_SE_SY_TRE_BOX_APPEAR);
} else { } else {
// Drops a small key and sets a collect flag // Drops a small key and sets a collect flag
collectibleParams = ((this->dyna.actor.params & 0x3F) << 8) | ITEM00_SMALL_KEY; collectibleParams = ((this->dyna.actor.params & 0x3F) << 8) | ITEM00_SMALL_KEY;
func_80078884(NA_SE_SY_CORRECT_CHIME); Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
} }
if (collectibleParams != -1) { if (collectibleParams != -1) {
collectible = Item_DropCollectible(play, &spawnPos, collectibleParams); collectible = Item_DropCollectible(play, &spawnPos, collectibleParams);

View file

@ -378,7 +378,7 @@ void func_80888A58(BgHidanHamstep* this, PlayState* play) {
func_808884C8(this, play); func_808884C8(this, play);
if ((this->dyna.actor.params & 0xFF) == 5) { if ((this->dyna.actor.params & 0xFF) == 5) {
func_80078884(NA_SE_SY_CORRECT_CHIME); Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
} }
osSyncPrintf("B(%d)\n", this->dyna.actor.params); osSyncPrintf("B(%d)\n", this->dyna.actor.params);

View file

@ -312,7 +312,7 @@ void BgHidanKowarerukabe_Update(Actor* thisx, PlayState* play) {
SfxSource_PlaySfxAtFixedWorldPos(play, &this->dyna.actor.world.pos, 40, NA_SE_EV_WALL_BROKEN); SfxSource_PlaySfxAtFixedWorldPos(play, &this->dyna.actor.world.pos, 40, NA_SE_EV_WALL_BROKEN);
} }
func_80078884(NA_SE_SY_CORRECT_CHIME); Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
Actor_Kill(&this->dyna.actor); Actor_Kill(&this->dyna.actor);
return; return;
} }

View file

@ -393,7 +393,7 @@ void BgHidanRock_Draw(Actor* thisx, PlayState* play) {
SkinMatrix_Vec3fMtxFMultXYZ(&play->viewProjectionMtxF, &this->dyna.actor.home.pos, &this->unk_170); SkinMatrix_Vec3fMtxFMultXYZ(&play->viewProjectionMtxF, &this->dyna.actor.home.pos, &this->unk_170);
} }
func_80078914(&this->unk_170, NA_SE_EV_FIRE_PILLAR - SFX_FLAG); Sfx_PlaySfxAtPos(&this->unk_170, NA_SE_EV_FIRE_PILLAR - SFX_FLAG);
func_8088BC40(play, this); func_8088BC40(play, this);
} }
} }

View file

@ -432,7 +432,7 @@ void BgIceShelter_Melt(BgIceShelter* this, PlayState* play) {
} }
if (type == RED_ICE_KING_ZORA) { if (type == RED_ICE_KING_ZORA) {
func_80078884(NA_SE_SY_CORRECT_CHIME); Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
} }
Actor_Kill(&this->dyna.actor); Actor_Kill(&this->dyna.actor);

View file

@ -278,7 +278,7 @@ void BgJyaMegami_Explode(BgJyaMegami* this, PlayState* play) {
func_80033480(play, &sp8C, 100.0f, 1, 150, 100, 1); func_80033480(play, &sp8C, 100.0f, 1, 150, 100, 1);
} }
if (this->explosionTimer == 60) { if (this->explosionTimer == 60) {
func_80078884(NA_SE_SY_CORRECT_CHIME); Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
} }
if (this->explosionTimer >= 100) { if (this->explosionTimer >= 100) {
Actor_Kill(&this->dyna.actor); Actor_Kill(&this->dyna.actor);

View file

@ -108,7 +108,7 @@ void BgMenkuriEye_Update(Actor* thisx, PlayState* play) {
this->framesUntilDisable = 416; this->framesUntilDisable = 416;
if (D_8089C1A0 == 4) { if (D_8089C1A0 == 4) {
Flags_SetSwitch(play, this->actor.params); Flags_SetSwitch(play, this->actor.params);
func_80078884(NA_SE_SY_CORRECT_CHIME); Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
} }
} }
if (this->framesUntilDisable == -1) { if (this->framesUntilDisable == -1) {

View file

@ -203,7 +203,7 @@ void func_808A3E54(BgMoriHineri* this, PlayState* play) {
this->moriHineriObjIdx = objBankIndex; this->moriHineriObjIdx = objBankIndex;
this->dyna.actor.params ^= 1; this->dyna.actor.params ^= 1;
sSubCamId = SUB_CAM_ID_DONE; sSubCamId = SUB_CAM_ID_DONE;
func_80078884(NA_SE_SY_TRE_BOX_APPEAR); Sfx_PlaySfxCentered(NA_SE_SY_TRE_BOX_APPEAR);
} else { } else {
this->dyna.actor.draw = NULL; this->dyna.actor.draw = NULL;
this->actionFunc = func_808A3D58; this->actionFunc = func_808A3D58;

View file

@ -133,9 +133,9 @@ void BgMoriIdomizu_Main(BgMoriIdomizu* this, PlayState* play) {
BgMoriIdomizu_SetWaterLevel(play, thisx->world.pos.y); BgMoriIdomizu_SetWaterLevel(play, thisx->world.pos.y);
if (this->drainTimer > 0) { if (this->drainTimer > 0) {
if (switchFlagSet) { if (switchFlagSet) {
func_800788CC(NA_SE_EV_WATER_LEVEL_DOWN - SFX_FLAG); Sfx_PlaySfxCentered2(NA_SE_EV_WATER_LEVEL_DOWN - SFX_FLAG);
} else { } else {
func_800788CC(NA_SE_EV_WATER_LEVEL_DOWN - SFX_FLAG); Sfx_PlaySfxCentered2(NA_SE_EV_WATER_LEVEL_DOWN - SFX_FLAG);
} }
} }
} }

View file

@ -136,11 +136,11 @@ void BgMoriKaitenkabe_Rotate(BgMoriKaitenkabe* this, PlayState* play) {
thisx->home.rot.y -= 0x2000; thisx->home.rot.y -= 0x2000;
} }
thisx->world.rot.y = thisx->shape.rot.y = thisx->home.rot.y; thisx->world.rot.y = thisx->shape.rot.y = thisx->home.rot.y;
func_800788CC(NA_SE_EV_STONEDOOR_STOP); Sfx_PlaySfxCentered2(NA_SE_EV_STONEDOOR_STOP);
} else { } else {
rotY = this->rotYdeg * (0x10000 / 360.0f); rotY = this->rotYdeg * (0x10000 / 360.0f);
thisx->world.rot.y = thisx->shape.rot.y = thisx->home.rot.y + rotY; thisx->world.rot.y = thisx->shape.rot.y = thisx->home.rot.y + rotY;
func_800788CC(NA_SE_EV_WALL_SLIDE - SFX_FLAG); Sfx_PlaySfxCentered2(NA_SE_EV_WALL_SLIDE - SFX_FLAG);
} }
if (fabsf(this->dyna.unk_150) > 0.001f) { if (fabsf(this->dyna.unk_150) > 0.001f) {
this->dyna.unk_150 = 0.0f; this->dyna.unk_150 = 0.0f;

View file

@ -133,7 +133,7 @@ void BgMoriRakkatenjo_Wait(BgMoriRakkatenjo* this, PlayState* play) {
} }
} }
if (this->timer < 20) { if (this->timer < 20) {
func_800788CC(NA_SE_EV_BLOCKSINK - SFX_FLAG); Sfx_PlaySfxCentered2(NA_SE_EV_BLOCKSINK - SFX_FLAG);
} }
} }
@ -156,7 +156,7 @@ void BgMoriRakkatenjo_Fall(BgMoriRakkatenjo* this, PlayState* play) {
} else { } else {
if (this->bounceCount == 0) { if (this->bounceCount == 0) {
this->fallCount++; this->fallCount++;
func_800788CC(NA_SE_EV_STONE_BOUND); Sfx_PlaySfxCentered2(NA_SE_EV_STONE_BOUND);
Rumble_Request(SQ(thisx->yDistToPlayer), 255, 20, 150); Rumble_Request(SQ(thisx->yDistToPlayer), 255, 20, 150);
} }
thisx->world.pos.y = thisx->world.pos.y =

View file

@ -341,7 +341,7 @@ void BgPoEvent_BlockIdle(BgPoEvent* this, PlayState* play) {
if (amy != NULL) { if (amy != NULL) {
OnePointCutscene_Init(play, 3170, 30, amy, CAM_ID_MAIN); OnePointCutscene_Init(play, 3170, 30, amy, CAM_ID_MAIN);
} }
func_80078884(NA_SE_SY_CORRECT_CHIME); Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
gSaveContext.timerState = TIMER_STATE_STOP; gSaveContext.timerState = TIMER_STATE_STOP;
} }
} else { } else {
@ -535,7 +535,7 @@ void BgPoEvent_PaintingPresent(BgPoEvent* this, PlayState* play) {
Actor_Spawn(&play->actorCtx, play, ACTOR_EN_PO_SISTERS, thisx->world.pos.x, thisx->world.pos.y - 40.0f, Actor_Spawn(&play->actorCtx, play, ACTOR_EN_PO_SISTERS, thisx->world.pos.x, thisx->world.pos.y - 40.0f,
thisx->world.pos.z, 0, thisx->shape.rot.y, 0, thisx->params + ((this->type - 1) << 8)); thisx->world.pos.z, 0, thisx->shape.rot.y, 0, thisx->params + ((this->type - 1) << 8));
OnePointCutscene_Init(play, 3160, 80, thisx, CAM_ID_MAIN); OnePointCutscene_Init(play, 3160, 80, thisx, CAM_ID_MAIN);
func_80078884(NA_SE_SY_CORRECT_CHIME); Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
} else { } else {
Actor_PlaySfx(thisx, NA_SE_EN_PO_LAUGH2); Actor_PlaySfx(thisx, NA_SE_EN_PO_LAUGH2);

View file

@ -148,7 +148,7 @@ void func_808A9234(BgRelayObjects* this, PlayState* play) {
Rumble_Request(this->dyna.actor.xyzDistToPlayerSq, 180, 20, 100); Rumble_Request(this->dyna.actor.xyzDistToPlayerSq, 180, 20, 100);
Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_STONE_BOUND); Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_STONE_BOUND);
if (this->unk_169 != play->roomCtx.curRoom.num) { if (this->unk_169 != play->roomCtx.curRoom.num) {
func_800788CC(NA_SE_EN_PO_LAUGH); Sfx_PlaySfxCentered2(NA_SE_EN_PO_LAUGH);
this->timer = 5; this->timer = 5;
this->actionFunc = func_808A932C; this->actionFunc = func_808A932C;
return; return;
@ -171,7 +171,7 @@ void func_808A932C(BgRelayObjects* this, PlayState* play) {
} }
if (this->timer == 0) { if (this->timer == 0) {
if (!Player_InCsMode(play)) { if (!Player_InCsMode(play)) {
func_80078884(NA_SE_OC_ABYSS); Sfx_PlaySfxCentered(NA_SE_OC_ABYSS);
Play_TriggerRespawn(play); Play_TriggerRespawn(play);
this->actionFunc = BgRelayObjects_DoNothing; this->actionFunc = BgRelayObjects_DoNothing;
} }

View file

@ -49,7 +49,7 @@ ActorInit Bg_Spot01_Idohashira_InitVars = {
}; };
void BgSpot01Idohashira_PlayBreakSfx1(BgSpot01Idohashira* this) { void BgSpot01Idohashira_PlayBreakSfx1(BgSpot01Idohashira* this) {
func_80078914(&this->dyna.actor.projectedPos, NA_SE_EV_BOX_BREAK); Sfx_PlaySfxAtPos(&this->dyna.actor.projectedPos, NA_SE_EV_BOX_BREAK);
} }
void BgSpot01Idohashira_PlayBreakSfx2(BgSpot01Idohashira* this, PlayState* play) { void BgSpot01Idohashira_PlayBreakSfx2(BgSpot01Idohashira* this, PlayState* play) {

View file

@ -208,7 +208,7 @@ void func_808ACC34(BgSpot02Objects* this, PlayState* play) {
} }
if (play->csCtx.curFrame == 245 || play->csCtx.curFrame == 351) { if (play->csCtx.curFrame == 245 || play->csCtx.curFrame == 351) {
func_800788CC(NA_SE_EV_LIGHTNING); Sfx_PlaySfxCentered2(NA_SE_EV_LIGHTNING);
} }
} }

View file

@ -186,7 +186,7 @@ void BgSpot08Bakudankabe_Update(Actor* thisx, PlayState* play) {
func_808B0324(this, play); func_808B0324(this, play);
Flags_SetSwitch(play, (this->dyna.actor.params & 0x3F)); Flags_SetSwitch(play, (this->dyna.actor.params & 0x3F));
SfxSource_PlaySfxAtFixedWorldPos(play, &this->dyna.actor.world.pos, 40, NA_SE_EV_WALL_BROKEN); SfxSource_PlaySfxAtFixedWorldPos(play, &this->dyna.actor.world.pos, 40, NA_SE_EV_WALL_BROKEN);
func_80078884(NA_SE_SY_CORRECT_CHIME); Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
Actor_Kill(&this->dyna.actor); Actor_Kill(&this->dyna.actor);
} else if (this->dyna.actor.xzDistToPlayer < 800.0f) { } else if (this->dyna.actor.xzDistToPlayer < 800.0f) {
CollisionCheck_SetAC(play, &play->colChkCtx, &this->collider.base); CollisionCheck_SetAC(play, &play->colChkCtx, &this->collider.base);

View file

@ -138,7 +138,7 @@ void BgSpot11Bakudankabe_Update(Actor* thisx, PlayState* play) {
func_808B2218(this, play); func_808B2218(this, play);
Flags_SetSwitch(play, (this->dyna.actor.params & 0x3F)); Flags_SetSwitch(play, (this->dyna.actor.params & 0x3F));
SfxSource_PlaySfxAtFixedWorldPos(play, &D_808B2738, 40, NA_SE_EV_WALL_BROKEN); SfxSource_PlaySfxAtFixedWorldPos(play, &D_808B2738, 40, NA_SE_EV_WALL_BROKEN);
func_80078884(NA_SE_SY_CORRECT_CHIME); Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
Actor_Kill(&this->dyna.actor); Actor_Kill(&this->dyna.actor);
return; return;
} }

View file

@ -109,7 +109,7 @@ void func_808B29F0(BgSpot11Oasis* this, PlayState* play) {
func_808B2AA8(this); func_808B2AA8(this);
Actor_Spawn(&play->actorCtx, play, ACTOR_EN_ELF, this->actor.world.pos.x, this->actor.world.pos.y + 40.0f, Actor_Spawn(&play->actorCtx, play, ACTOR_EN_ELF, this->actor.world.pos.x, this->actor.world.pos.y + 40.0f,
this->actor.world.pos.z, 0, 0, 0, FAIRY_SPAWNER); this->actor.world.pos.z, 0, 0, 0, FAIRY_SPAWNER);
func_80078884(NA_SE_SY_CORRECT_CHIME); Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
} }
func_808B27F0(play, this->actor.world.pos.y); func_808B27F0(play, this->actor.world.pos.y);
} }

View file

@ -286,7 +286,7 @@ void func_808B4194(BgSpot15Rrbox* this, PlayState* play) {
Actor_PlaySfx(actor, NA_SE_EV_WOOD_BOUND); Actor_PlaySfx(actor, NA_SE_EV_WOOD_BOUND);
} }
if (func_808B3A40(this, play)) { if (func_808B3A40(this, play)) {
func_80078884(NA_SE_SY_CORRECT_CHIME); Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
} }
actor->home.pos.x = actor->world.pos.x; actor->home.pos.x = actor->world.pos.x;
actor->home.pos.z = actor->world.pos.z; actor->home.pos.z = actor->world.pos.z;

View file

@ -472,7 +472,7 @@ void func_808B5A94(BgSpot16Bombstone* this, PlayState* play) {
func_808B5240(this, play); func_808B5240(this, play);
if (this->unk_154 == 56) { if (this->unk_154 == 56) {
func_80078884(NA_SE_SY_CORRECT_CHIME); Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
} }
if (this->unk_154 > 60) { if (this->unk_154 > 60) {

View file

@ -117,7 +117,7 @@ void BgSpot17Bakudankabe_Update(Actor* thisx, PlayState* play) {
func_808B6BC0(this, play); func_808B6BC0(this, play);
Flags_SetSwitch(play, (this->dyna.actor.params & 0x3F)); Flags_SetSwitch(play, (this->dyna.actor.params & 0x3F));
SfxSource_PlaySfxAtFixedWorldPos(play, &this->dyna.actor.world.pos, 40, NA_SE_EV_WALL_BROKEN); SfxSource_PlaySfxAtFixedWorldPos(play, &this->dyna.actor.world.pos, 40, NA_SE_EV_WALL_BROKEN);
func_80078884(NA_SE_SY_CORRECT_CHIME); Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
Actor_Kill(&this->dyna.actor); Actor_Kill(&this->dyna.actor);
} }
} }

View file

@ -415,9 +415,9 @@ void func_808B81A0(BgSpot18Basket* this, PlayState* play) {
} }
} else if (this->unk_216 == 2) { } else if (this->unk_216 == 2) {
if (this->unk_218 == 2) { if (this->unk_218 == 2) {
func_80078884(NA_SE_SY_CORRECT_CHIME); Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
} else { } else {
func_80078884(NA_SE_SY_TRE_BOX_APPEAR); Sfx_PlaySfxCentered(NA_SE_SY_TRE_BOX_APPEAR);
} }
} else if (this->unk_216 == 200) { } else if (this->unk_216 == 200) {
func_808B7BB0(this); func_808B7BB0(this);

View file

@ -258,7 +258,7 @@ void func_808B8F08(BgSpot18Obj* this, PlayState* play) {
this->dyna.unk_150 = 0.0f; this->dyna.unk_150 = 0.0f;
player->stateFlags2 &= ~PLAYER_STATE2_4; player->stateFlags2 &= ~PLAYER_STATE2_4;
Flags_SetSwitch(play, (this->dyna.actor.params >> 8) & 0x3F); Flags_SetSwitch(play, (this->dyna.actor.params >> 8) & 0x3F);
func_80078884(NA_SE_SY_CORRECT_CHIME); Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_BLOCK_BOUND); Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_BLOCK_BOUND);
} else { } else {
func_8002F974(&this->dyna.actor, NA_SE_EV_ROCK_SLIDE - SFX_FLAG); func_8002F974(&this->dyna.actor, NA_SE_EV_ROCK_SLIDE - SFX_FLAG);

View file

@ -148,7 +148,7 @@ void func_808BF078(BgYdanMaruta* this, PlayState* play) {
if (this->collider.base.acFlags & AC_HIT) { if (this->collider.base.acFlags & AC_HIT) {
this->unk_16A = 20; this->unk_16A = 20;
Flags_SetSwitch(play, this->switchFlag); Flags_SetSwitch(play, this->switchFlag);
func_80078884(NA_SE_SY_CORRECT_CHIME); Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
this->actionFunc = func_808BF108; this->actionFunc = func_808BF108;
OnePointCutscene_Init(play, 3010, 50, &this->dyna.actor, CAM_ID_MAIN); OnePointCutscene_Init(play, 3010, 50, &this->dyna.actor, CAM_ID_MAIN);
} else { } else {

View file

@ -169,7 +169,7 @@ void BgYdanSp_UpdateFloorWebCollision(BgYdanSp* this) {
void BgYdanSp_BurnWeb(BgYdanSp* this, PlayState* play) { void BgYdanSp_BurnWeb(BgYdanSp* this, PlayState* play) {
this->timer = 30; this->timer = 30;
this = this; this = this;
func_80078884(NA_SE_SY_CORRECT_CHIME); Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
Flags_SetSwitch(play, this->isDestroyedSwitchFlag); Flags_SetSwitch(play, this->isDestroyedSwitchFlag);
if (this->dyna.actor.params == WEB_FLOOR) { if (this->dyna.actor.params == WEB_FLOOR) {
this->actionFunc = BgYdanSp_BurnFloorWeb; this->actionFunc = BgYdanSp_BurnFloorWeb;
@ -252,7 +252,7 @@ void BgYdanSp_FloorWebBreaking(BgYdanSp* this, PlayState* play) {
if (this->dyna.actor.home.pos.y - this->dyna.actor.world.pos.y > 190.0f) { if (this->dyna.actor.home.pos.y - this->dyna.actor.world.pos.y > 190.0f) {
DynaPoly_DisableCollision(play, &play->colCtx.dyna, this->dyna.bgId); DynaPoly_DisableCollision(play, &play->colCtx.dyna, this->dyna.bgId);
this->timer = 40; this->timer = 40;
func_80078884(NA_SE_SY_CORRECT_CHIME); Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
Flags_SetSwitch(play, this->isDestroyedSwitchFlag); Flags_SetSwitch(play, this->isDestroyedSwitchFlag);
this->actionFunc = BgYdanSp_FloorWebBroken; this->actionFunc = BgYdanSp_FloorWebBroken;
pos.y = this->dyna.actor.world.pos.y - 60.0f; pos.y = this->dyna.actor.world.pos.y - 60.0f;

View file

@ -670,7 +670,7 @@ void BossDodongo_Walk(BossDodongo* this, PlayState* play) {
} }
if (this->unk_1BC != 0) { if (this->unk_1BC != 0) {
func_80078884(NA_SE_EN_DODO_K_WALK); Sfx_PlaySfxCentered(NA_SE_EN_DODO_K_WALK);
} else { } else {
Actor_PlaySfx(&this->actor, NA_SE_EN_DODO_K_WALK); Actor_PlaySfx(&this->actor, NA_SE_EN_DODO_K_WALK);
} }

View file

@ -691,7 +691,7 @@ void BossGanon_IntroCutscene(BossGanon* this, PlayState* play) {
this->fwork[GDF_TRIFORCE_PRIM_A] = 0.0f; this->fwork[GDF_TRIFORCE_PRIM_A] = 0.0f;
this->fwork[GDF_TRIFORCE_PRIM_B] = 255.0f; this->fwork[GDF_TRIFORCE_PRIM_B] = 255.0f;
this->fwork[GDF_TRIFORCE_ENV_G] = 100.0f; this->fwork[GDF_TRIFORCE_ENV_G] = 100.0f;
func_80078884(NA_SE_EV_TRIFORCE_MARK); Sfx_PlaySfxCentered(NA_SE_EV_TRIFORCE_MARK);
play->envCtx.lightBlend = 0.0f; play->envCtx.lightBlend = 0.0f;
FALLTHROUGH; FALLTHROUGH;
case 7: case 7:
@ -738,7 +738,7 @@ void BossGanon_IntroCutscene(BossGanon* this, PlayState* play) {
this->fwork[GDF_TRIFORCE_PRIM_A] = 0.0f; this->fwork[GDF_TRIFORCE_PRIM_A] = 0.0f;
this->fwork[GDF_TRIFORCE_PRIM_B] = 255.0f; this->fwork[GDF_TRIFORCE_PRIM_B] = 255.0f;
this->fwork[GDF_TRIFORCE_ENV_G] = 100.0f; this->fwork[GDF_TRIFORCE_ENV_G] = 100.0f;
func_80078884(NA_SE_EV_TRIFORCE_MARK); Sfx_PlaySfxCentered(NA_SE_EV_TRIFORCE_MARK);
play->envCtx.lightBlend = 0.0f; play->envCtx.lightBlend = 0.0f;
FALLTHROUGH; FALLTHROUGH;
case 9: case 9:
@ -943,7 +943,7 @@ void BossGanon_IntroCutscene(BossGanon* this, PlayState* play) {
if (this->csTimer >= 30) { if (this->csTimer >= 30) {
if (this->csTimer == 30) { if (this->csTimer == 30) {
func_80078884(NA_SE_EV_TRIFORCE_MARK); Sfx_PlaySfxCentered(NA_SE_EV_TRIFORCE_MARK);
} }
// fade in ganondorf's triforce // fade in ganondorf's triforce
@ -1435,7 +1435,7 @@ void BossGanon_DeathAndTowerCutscene(BossGanon* this, PlayState* play) {
this->unk_70C = Math_SinS(this->csTimer * 0x6300) * 0.2f; this->unk_70C = Math_SinS(this->csTimer * 0x6300) * 0.2f;
func_80078884(NA_SE_EV_EARTHQUAKE - SFX_FLAG); Sfx_PlaySfxCentered(NA_SE_EV_EARTHQUAKE - SFX_FLAG);
skip_cam_and_quake: skip_cam_and_quake:
this->envLightMode = 15; this->envLightMode = 15;
@ -1482,7 +1482,7 @@ void BossGanon_DeathAndTowerCutscene(BossGanon* this, PlayState* play) {
} }
this->unk_70C = Math_SinS(this->csTimer * 0x6300) * this->unk_710; this->unk_70C = Math_SinS(this->csTimer * 0x6300) * this->unk_710;
func_80078884(NA_SE_EV_EARTHQUAKE - SFX_FLAG); Sfx_PlaySfxCentered(NA_SE_EV_EARTHQUAKE - SFX_FLAG);
if (this->csTimer < 100) { if (this->csTimer < 100) {
this->windowShatterState = GDF_WINDOW_SHATTER_PARTIAL; this->windowShatterState = GDF_WINDOW_SHATTER_PARTIAL;
@ -1679,7 +1679,7 @@ void BossGanon_DeathAndTowerCutscene(BossGanon* this, PlayState* play) {
case 1055: case 1055:
this->unk_70C = Math_SinS(this->csTimer * 0x6300) * 0.3f; this->unk_70C = Math_SinS(this->csTimer * 0x6300) * 0.3f;
func_80078884(NA_SE_EV_EARTHQUAKE - SFX_FLAG); Sfx_PlaySfxCentered(NA_SE_EV_EARTHQUAKE - SFX_FLAG);
if (this->csTimer == 20) { if (this->csTimer == 20) {
sZelda->unk_3C8 = 5; sZelda->unk_3C8 = 5;
@ -1694,7 +1694,7 @@ void BossGanon_DeathAndTowerCutscene(BossGanon* this, PlayState* play) {
case 1056: case 1056:
this->unk_70C = Math_SinS(this->csTimer * 0x6300) * 0.3f; this->unk_70C = Math_SinS(this->csTimer * 0x6300) * 0.3f;
func_80078884(NA_SE_EV_EARTHQUAKE - SFX_FLAG); Sfx_PlaySfxCentered(NA_SE_EV_EARTHQUAKE - SFX_FLAG);
this->csCamEye.x = -503.0f; this->csCamEye.x = -503.0f;
this->csCamEye.y = 4128.0f; this->csCamEye.y = 4128.0f;
@ -1712,7 +1712,7 @@ void BossGanon_DeathAndTowerCutscene(BossGanon* this, PlayState* play) {
case 1057: case 1057:
this->unk_70C = Math_SinS(this->csTimer * 0x6300) * (50.0f * this->csCamMovementScale); this->unk_70C = Math_SinS(this->csTimer * 0x6300) * (50.0f * this->csCamMovementScale);
func_80078884(NA_SE_EV_EARTHQUAKE - SFX_FLAG); Sfx_PlaySfxCentered(NA_SE_EV_EARTHQUAKE - SFX_FLAG);
Math_ApproachF(&this->csCamEye.x, -1200.0f, 0.1f, this->csCamMovementScale * 697.0f); Math_ApproachF(&this->csCamEye.x, -1200.0f, 0.1f, this->csCamMovementScale * 697.0f);
Math_ApproachF(&this->csCamEye.y, 4241.0f, 0.1f, this->csCamMovementScale * 113.0f); Math_ApproachF(&this->csCamEye.y, 4241.0f, 0.1f, this->csCamMovementScale * 113.0f);
@ -1736,7 +1736,7 @@ void BossGanon_DeathAndTowerCutscene(BossGanon* this, PlayState* play) {
this->csCamAt.z = sZelda->actor.world.pos.z - 25.0f; this->csCamAt.z = sZelda->actor.world.pos.z - 25.0f;
this->unk_70C = Math_SinS(this->csTimer * 0x6300) * 0.3f; this->unk_70C = Math_SinS(this->csTimer * 0x6300) * 0.3f;
func_80078884(NA_SE_EV_EARTHQUAKE - SFX_FLAG); Sfx_PlaySfxCentered(NA_SE_EV_EARTHQUAKE - SFX_FLAG);
if (this->csTimer == 70) { if (this->csTimer == 70) {
sZelda->unk_3C8 = 6; sZelda->unk_3C8 = 6;
@ -1756,7 +1756,7 @@ void BossGanon_DeathAndTowerCutscene(BossGanon* this, PlayState* play) {
case 107: case 107:
this->unk_70C = Math_SinS(this->csTimer * 0x6300) * 0.8f; this->unk_70C = Math_SinS(this->csTimer * 0x6300) * 0.8f;
func_80078884(NA_SE_EV_EARTHQUAKE - SFX_FLAG); Sfx_PlaySfxCentered(NA_SE_EV_EARTHQUAKE - SFX_FLAG);
this->csCamEye.x = -380.0f; this->csCamEye.x = -380.0f;
this->csCamEye.y = 4154.0f; this->csCamEye.y = 4154.0f;
@ -1775,7 +1775,7 @@ void BossGanon_DeathAndTowerCutscene(BossGanon* this, PlayState* play) {
case 108: case 108:
this->unk_70C = Math_SinS(this->csTimer * 0x6300) * 0.8f; this->unk_70C = Math_SinS(this->csTimer * 0x6300) * 0.8f;
func_80078884(NA_SE_EV_EARTHQUAKE - SFX_FLAG); Sfx_PlaySfxCentered(NA_SE_EV_EARTHQUAKE - SFX_FLAG);
this->csCamAt.x = (sZelda->actor.world.pos.x - 5.0f) - 30.0f; this->csCamAt.x = (sZelda->actor.world.pos.x - 5.0f) - 30.0f;
this->csCamAt.y = (sZelda->actor.world.pos.y + 40.0f + 5.0f) - 20.0f; this->csCamAt.y = (sZelda->actor.world.pos.y + 40.0f + 5.0f) - 20.0f;
@ -1798,7 +1798,7 @@ void BossGanon_DeathAndTowerCutscene(BossGanon* this, PlayState* play) {
break; break;
case 109: case 109:
func_80078884(NA_SE_EV_EARTHQUAKE - SFX_FLAG); Sfx_PlaySfxCentered(NA_SE_EV_EARTHQUAKE - SFX_FLAG);
break; break;
} }
@ -2241,7 +2241,7 @@ void BossGanon_Wait(BossGanon* this, PlayState* play) {
this->actor.world.pos.y += this->actor.velocity.y; this->actor.world.pos.y += this->actor.velocity.y;
Math_ApproachS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 5, 0xBB8); Math_ApproachS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 5, 0xBB8);
func_80078914(&this->actor.projectedPos, NA_SE_EN_FANTOM_FLOAT - SFX_FLAG); Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_EN_FANTOM_FLOAT - SFX_FLAG);
} }
void BossGanon_SetupChargeLightBall(BossGanon* this, PlayState* play) { void BossGanon_SetupChargeLightBall(BossGanon* this, PlayState* play) {
@ -2738,7 +2738,7 @@ void BossGanon_UpdateDamage(BossGanon* this, PlayState* play) {
BossGanon_SetupDeathCutscene(this, play); BossGanon_SetupDeathCutscene(this, play);
Actor_PlaySfx(&this->actor, NA_SE_EN_GANON_DEAD); Actor_PlaySfx(&this->actor, NA_SE_EN_GANON_DEAD);
Actor_PlaySfx(&this->actor, NA_SE_EN_GANON_DD_THUNDER); Actor_PlaySfx(&this->actor, NA_SE_EN_GANON_DD_THUNDER);
func_80078914(&sZeroVec, NA_SE_EN_LAST_DAMAGE); Sfx_PlaySfxAtPos(&sZeroVec, NA_SE_EN_LAST_DAMAGE);
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM_MAIN, 1); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM_MAIN, 1);
this->screenFlashTimer = 4; this->screenFlashTimer = 4;
} else { } else {
@ -2919,7 +2919,7 @@ void BossGanon_Update(Actor* thisx, PlayState* play2) {
// player hit, spawn shock and play sound effect // player hit, spawn shock and play sound effect
if (this->unk_2E8 != 0) { if (this->unk_2E8 != 0) {
func_80078914(&player->actor.projectedPos, NA_SE_PL_SPARK - SFX_FLAG); Sfx_PlaySfxAtPos(&player->actor.projectedPos, NA_SE_PL_SPARK - SFX_FLAG);
BossGanonEff_SpawnShock(play, 700.0f, GDF_SHOCK_PLAYER_YELLOW); BossGanonEff_SpawnShock(play, 700.0f, GDF_SHOCK_PLAYER_YELLOW);
} }
} }
@ -4229,8 +4229,8 @@ void func_808E1EB4(Actor* thisx, PlayState* play2) {
this->actor.speed = 0.0f; this->actor.speed = 0.0f;
if (this->actor.params == 0xC8) { if (this->actor.params == 0xC8) {
func_80078884(NA_SE_EN_GANON_DAMAGE2); Sfx_PlaySfxCentered(NA_SE_EN_GANON_DAMAGE2);
func_80078884(NA_SE_EN_GANON_DD_THUNDER); Sfx_PlaySfxCentered(NA_SE_EN_GANON_DD_THUNDER);
for (i = 0; i < 150; i++) { for (i = 0; i < 150; i++) {
@ -4735,7 +4735,7 @@ void BossGanon_UpdateEffects(PlayState* play) {
Math_ApproachF(&eff->unk_40, 4.0f, 1.0f, 0.15f); Math_ApproachF(&eff->unk_40, 4.0f, 1.0f, 0.15f);
} else if (eff->type == GDF_EFF_IMPACT_DUST_LIGHT) { } else if (eff->type == GDF_EFF_IMPACT_DUST_LIGHT) {
if (i == 0) { if (i == 0) {
func_80078884(NA_SE_EN_GANON_WAVE_GND - SFX_FLAG); Sfx_PlaySfxCentered(NA_SE_EN_GANON_WAVE_GND - SFX_FLAG);
} }
eff->unk_30++; // unused eff->unk_30++; // unused

View file

@ -295,7 +295,7 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) {
Math_ApproachF(&this->subCamAt.y, player->actor.world.pos.y + 47.0f + 7.0f, 0.1f, 2.0f); Math_ApproachF(&this->subCamAt.y, player->actor.world.pos.y + 47.0f + 7.0f, 0.1f, 2.0f);
this->unk_339 = 4; this->unk_339 = 4;
if (this->unk_398 == 10) { if (this->unk_398 == 10) {
func_80078914(&D_80906D6C, NA_SE_EV_STONE_BOUND); Sfx_PlaySfxAtPos(&D_80906D6C, NA_SE_EV_STONE_BOUND);
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM_MAIN, 0); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM_MAIN, 0);
} }
if (this->unk_398 == 20) { if (this->unk_398 == 20) {
@ -359,7 +359,7 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) {
this->subCamAt.y = (player->actor.world.pos.y + 200.0f) - 160.0f; this->subCamAt.y = (player->actor.world.pos.y + 200.0f) - 160.0f;
this->subCamAt.z = player->actor.world.pos.z; this->subCamAt.z = player->actor.world.pos.z;
if (this->unk_398 >= 20) { if (this->unk_398 >= 20) {
func_80078884(NA_SE_EN_GOMA_LAST - SFX_FLAG); Sfx_PlaySfxCentered(NA_SE_EN_GOMA_LAST - SFX_FLAG);
Math_ApproachF(&this->unk_324, 255.0f, 1.0f, 10.0f); Math_ApproachF(&this->unk_324, 255.0f, 1.0f, 10.0f);
this->unk_339 = 5; this->unk_339 = 5;
if (this->unk_398 == 20) { if (this->unk_398 == 20) {
@ -380,7 +380,7 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) {
break; break;
case 11: case 11:
this->unk_339 = 5; this->unk_339 = 5;
func_80078884(NA_SE_EN_GOMA_LAST - SFX_FLAG); Sfx_PlaySfxCentered(NA_SE_EN_GOMA_LAST - SFX_FLAG);
player->actor.world.pos.x = 490.0f; player->actor.world.pos.x = 490.0f;
player->actor.world.pos.y = 1086.0f; player->actor.world.pos.y = 1086.0f;
player->actor.world.pos.z = -166.0f; player->actor.world.pos.z = -166.0f;
@ -396,10 +396,10 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) {
this->subCamAt.y = ((player->actor.world.pos.y + 200.0f) - 151.0f) - 2.0f; this->subCamAt.y = ((player->actor.world.pos.y + 200.0f) - 151.0f) - 2.0f;
this->subCamAt.z = player->actor.world.pos.z + 2.0f; this->subCamAt.z = player->actor.world.pos.z + 2.0f;
if (this->unk_398 == 10) { if (this->unk_398 == 10) {
func_80078914(&D_80906D6C, NA_SE_EV_STONE_BOUND); Sfx_PlaySfxAtPos(&D_80906D6C, NA_SE_EV_STONE_BOUND);
} }
if (this->unk_398 == 20) { if (this->unk_398 == 20) {
func_80078884(NA_SE_EV_STONE_BOUND); Sfx_PlaySfxCentered(NA_SE_EV_STONE_BOUND);
} }
if (this->unk_398 == 30) { if (this->unk_398 == 30) {
func_8002DF54(play, &this->actor, PLAYER_CSMODE_82); func_8002DF54(play, &this->actor, PLAYER_CSMODE_82);
@ -434,7 +434,7 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) {
Rumble_Override(0.0f, 200, 20, 20); Rumble_Override(0.0f, 200, 20, 20);
} }
if (this->unk_398 == 30) { if (this->unk_398 == 30) {
func_80078884(NA_SE_EV_GRAVE_EXPLOSION); Sfx_PlaySfxCentered(NA_SE_EV_GRAVE_EXPLOSION);
} }
if (this->unk_398 >= 30) { if (this->unk_398 >= 30) {
Math_ApproachF(&this->actor.world.pos.y, 1289.0f, 0.1f, 10.0f); Math_ApproachF(&this->actor.world.pos.y, 1289.0f, 0.1f, 10.0f);
@ -693,8 +693,8 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) {
this->unk_312 = 2; this->unk_312 = 2;
} }
if ((this->unk_398 == 166) || (this->unk_398 == 185) || (this->unk_398 == 200)) { if ((this->unk_398 == 166) || (this->unk_398 == 185) || (this->unk_398 == 200)) {
func_80078884(NA_SE_EN_MGANON_SWORD); Sfx_PlaySfxCentered(NA_SE_EN_MGANON_SWORD);
func_80078884(NA_SE_EN_MGANON_ROAR); Sfx_PlaySfxCentered(NA_SE_EN_MGANON_ROAR);
} }
if (this->unk_398 == 215) { if (this->unk_398 == 215) {
this->unk_39C = 23; this->unk_39C = 23;
@ -708,8 +708,8 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) {
this->unk_312 = 2; this->unk_312 = 2;
} }
if (this->unk_398 == 222) { if (this->unk_398 == 222) {
func_80078884(NA_SE_EN_MGANON_SWORD); Sfx_PlaySfxCentered(NA_SE_EN_MGANON_SWORD);
func_80078884(NA_SE_EN_MGANON_ROAR); Sfx_PlaySfxCentered(NA_SE_EN_MGANON_ROAR);
} }
this->subCamEye.x = (player->actor.world.pos.x - 40.0f) + 6.0f; this->subCamEye.x = (player->actor.world.pos.x - 40.0f) + 6.0f;
this->subCamEye.y = player->actor.world.pos.y + 40.0f; this->subCamEye.y = player->actor.world.pos.y + 40.0f;
@ -718,7 +718,7 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) {
this->subCamAt.y = ((player->actor.world.pos.y + 10.0f + 60.0f) - 20.0f) - 2.0f; this->subCamAt.y = ((player->actor.world.pos.y + 10.0f + 60.0f) - 20.0f) - 2.0f;
this->subCamAt.z = player->actor.world.pos.z; this->subCamAt.z = player->actor.world.pos.z;
if (this->unk_398 == 228) { if (this->unk_398 == 228) {
func_80078884(NA_SE_IT_SHIELD_REFLECT_SW); Sfx_PlaySfxCentered(NA_SE_IT_SHIELD_REFLECT_SW);
func_8002DF54(play, &this->actor, PLAYER_CSMODE_86); func_8002DF54(play, &this->actor, PLAYER_CSMODE_86);
Rumble_Override(0.0f, 255, 10, 50); Rumble_Override(0.0f, 255, 10, 50);
} }
@ -753,7 +753,7 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) {
this->subCamEye.z = effects[0].position.z + 70.0f; this->subCamEye.z = effects[0].position.z + 70.0f;
} }
if ((this->unk_398 & 3) == 0) { if ((this->unk_398 & 3) == 0) {
func_80078884(NA_SE_IT_SWORD_SWING); Sfx_PlaySfxCentered(NA_SE_IT_SWORD_SWING);
} }
if (this->unk_398 == 25) { if (this->unk_398 == 25) {
func_8002DF54(play, &this->actor, PLAYER_CSMODE_87); func_8002DF54(play, &this->actor, PLAYER_CSMODE_87);
@ -935,11 +935,11 @@ void func_808FF898(BossGanon2* this, PlayState* play) {
} }
if (this->unk_392 == 4) { if (this->unk_392 == 4) {
func_80078884(NA_SE_EV_GRAVE_EXPLOSION); Sfx_PlaySfxCentered(NA_SE_EV_GRAVE_EXPLOSION);
} }
if (this->unk_392 == 3) { if (this->unk_392 == 3) {
func_80078884(NA_SE_EN_MGANON_SWDIMP); Sfx_PlaySfxCentered(NA_SE_EN_MGANON_SWDIMP);
} }
} }
} }
@ -1309,7 +1309,7 @@ void func_80900890(BossGanon2* this, PlayState* play) {
FALLTHROUGH; FALLTHROUGH;
case 1: case 1:
if (this->unk_1A2[1] == 50) { if (this->unk_1A2[1] == 50) {
func_80078884(NA_SE_EN_MGANON_WALK); Sfx_PlaySfxCentered(NA_SE_EN_MGANON_WALK);
} }
Matrix_RotateY(BINANG_TO_RAD_ALT(this->actor.shape.rot.y) + 0.3f, MTXMODE_NEW); Matrix_RotateY(BINANG_TO_RAD_ALT(this->actor.shape.rot.y) + 0.3f, MTXMODE_NEW);
sp5C.x = 0.0f; sp5C.x = 0.0f;
@ -1506,12 +1506,12 @@ void func_8090120C(BossGanon2* this, PlayState* play) {
Math_ApproachZeroF(&play->envCtx.lightBlend, 1.0f, 0.08f); Math_ApproachZeroF(&play->envCtx.lightBlend, 1.0f, 0.08f);
} }
if (this->unk_398 == 50) { if (this->unk_398 == 50) {
func_80078884(NA_SE_EN_MGANON_WALK); Sfx_PlaySfxCentered(NA_SE_EN_MGANON_WALK);
} }
if (this->unk_398 > 90) { if (this->unk_398 > 90) {
Math_ApproachF(&this->unk_380, 0.25f, 1.0f, 0.0125f); Math_ApproachF(&this->unk_380, 0.25f, 1.0f, 0.0125f);
this->unk_37C = 200.0f; this->unk_37C = 200.0f;
func_80078884(NA_SE_EV_TIMETRIP_LIGHT - SFX_FLAG); Sfx_PlaySfxCentered(NA_SE_EV_TIMETRIP_LIGHT - SFX_FLAG);
} }
if (this->unk_398 >= 110) { if (this->unk_398 >= 110) {
if (this->unk_398 == 110) { if (this->unk_398 == 110) {
@ -1546,7 +1546,7 @@ void func_8090120C(BossGanon2* this, PlayState* play) {
case 2: case 2:
this->unk_339 = 22; this->unk_339 = 22;
Math_ApproachF(&play->envCtx.lightBlend, 1.0f, 1.0f, 0.1f); Math_ApproachF(&play->envCtx.lightBlend, 1.0f, 1.0f, 0.1f);
func_80078884(NA_SE_EV_TIMETRIP_LIGHT - SFX_FLAG); Sfx_PlaySfxCentered(NA_SE_EV_TIMETRIP_LIGHT - SFX_FLAG);
this->subCamEye.x = 250; this->subCamEye.x = 250;
this->subCamEye.y = 1150.0f; this->subCamEye.y = 1150.0f;
this->subCamEye.z = 0.0f; this->subCamEye.z = 0.0f;
@ -1560,7 +1560,7 @@ void func_8090120C(BossGanon2* this, PlayState* play) {
break; break;
case 3: case 3:
this->unk_339 = 22; this->unk_339 = 22;
func_80078884(NA_SE_EV_TIMETRIP_LIGHT - SFX_FLAG); Sfx_PlaySfxCentered(NA_SE_EV_TIMETRIP_LIGHT - SFX_FLAG);
this->subCamEye.x = 330.0f; this->subCamEye.x = 330.0f;
this->subCamEye.y = 1120.0f; this->subCamEye.y = 1120.0f;
this->subCamEye.z = -150.0f; this->subCamEye.z = -150.0f;
@ -1597,7 +1597,7 @@ void func_8090120C(BossGanon2* this, PlayState* play) {
this->unk_339 = 23; this->unk_339 = 23;
if ((this->unk_398 >= 60) && (this->unk_398 <= 90)) { if ((this->unk_398 >= 60) && (this->unk_398 <= 90)) {
if (this->unk_398 == 62) { if (this->unk_398 == 62) {
func_80078884(NA_SE_EV_TRIFORCE_FLASH); Sfx_PlaySfxCentered(NA_SE_EV_TRIFORCE_FLASH);
} }
Math_ApproachF(&this->unk_38C, 200.0f, 1.0f, 8.0f); Math_ApproachF(&this->unk_38C, 200.0f, 1.0f, 8.0f);
} else { } else {
@ -1657,12 +1657,12 @@ void func_8090120C(BossGanon2* this, PlayState* play) {
player->actor.shape.rot.y = -0x4000; player->actor.shape.rot.y = -0x4000;
player->actor.world.pos.z = 30.0f; player->actor.world.pos.z = 30.0f;
if ((this->unk_398 == 20) || (this->unk_398 == 30) || (this->unk_398 == 65) || (this->unk_398 == 40)) { if ((this->unk_398 == 20) || (this->unk_398 == 30) || (this->unk_398 == 65) || (this->unk_398 == 40)) {
func_80078884(NA_SE_VO_LI_SWORD_N); Sfx_PlaySfxCentered(NA_SE_VO_LI_SWORD_N);
func_80078884(NA_SE_IT_SWORD_SWING_HARD); Sfx_PlaySfxCentered(NA_SE_IT_SWORD_SWING_HARD);
} }
if ((this->unk_398 == 22) || (this->unk_398 == 35) || (this->unk_398 == 72) || (this->unk_398 == 45)) { if ((this->unk_398 == 22) || (this->unk_398 == 35) || (this->unk_398 == 72) || (this->unk_398 == 45)) {
func_80078884(NA_SE_EN_MGANON_DAMAGE); Sfx_PlaySfxCentered(NA_SE_EN_MGANON_DAMAGE);
func_80078884(NA_SE_IT_SHIELD_BOUND); Sfx_PlaySfxCentered(NA_SE_IT_SHIELD_BOUND);
play->envCtx.lightBlend = 1.0f; play->envCtx.lightBlend = 1.0f;
} }
if ((this->unk_398 == 22) || (this->unk_398 == 35) || (this->unk_398 == 72) || (this->unk_398 == 45)) { if ((this->unk_398 == 22) || (this->unk_398 == 35) || (this->unk_398 == 72) || (this->unk_398 == 45)) {
@ -2005,7 +2005,7 @@ void BossGanon2_Update(Actor* thisx, PlayState* play) {
if (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) { if (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) {
if (this->actor.velocity.y < -5.0f) { if (this->actor.velocity.y < -5.0f) {
Actor_RequestQuakeAndRumble(&this->actor, play, 5, 20); Actor_RequestQuakeAndRumble(&this->actor, play, 5, 20);
func_80078884(NA_SE_IT_BOMB_EXPLOSION); Sfx_PlaySfxCentered(NA_SE_IT_BOMB_EXPLOSION);
} }
this->actor.velocity.y = 0.0f; this->actor.velocity.y = 0.0f;
} }
@ -2091,7 +2091,7 @@ void BossGanon2_Update(Actor* thisx, PlayState* play) {
if (Rand_ZeroOne() < 0.5f) { if (Rand_ZeroOne() < 0.5f) {
D_8090EB20.z = Rand_ZeroFloat(1000.0f); D_8090EB20.z = Rand_ZeroFloat(1000.0f);
} }
func_80078914(&D_8090EB20, NA_SE_EV_LIGHTNING); Sfx_PlaySfxAtPos(&D_8090EB20, NA_SE_EV_LIGHTNING);
this->unk_328 = 0xFF; this->unk_328 = 0xFF;
this->unk_330 = 5; this->unk_330 = 5;
this->unk_32C = 0.0f; this->unk_32C = 0.0f;
@ -2856,7 +2856,7 @@ void BossGanon2_UpdateEffects(BossGanon2* this, PlayState* play) {
if (effect->velocity.y < -10.0f) { if (effect->velocity.y < -10.0f) {
sp78 = effect->position; sp78 = effect->position;
sp78.y = 1086.0f; sp78.y = 1086.0f;
func_80078884(NA_SE_IT_SHIELD_REFLECT_SW); Sfx_PlaySfxCentered(NA_SE_IT_SHIELD_REFLECT_SW);
CollisionCheck_SpawnShieldParticlesMetal(play, &sp78); CollisionCheck_SpawnShieldParticlesMetal(play, &sp78);
} }
effect->velocity.y = 0.0f; effect->velocity.y = 0.0f;

View file

@ -358,7 +358,7 @@ void BossGanondrof_Intro(BossGanondrof* this, PlayState* play) {
} }
if (this->timers[1] == 30) { if (this->timers[1] == 30) {
func_80078914(&sAudioVec, NA_SE_EN_FANTOM_TRANSFORM); Sfx_PlaySfxAtPos(&sAudioVec, NA_SE_EN_FANTOM_TRANSFORM);
} }
if (horse->bossGndSignal == FHG_LIGHTNING) { if (horse->bossGndSignal == FHG_LIGHTNING) {

View file

@ -594,7 +594,7 @@ void BossMo_Tentacle(BossMo* this, PlayState* play) {
case MO_TENT_READY: case MO_TENT_READY:
case MO_TENT_SWING: case MO_TENT_SWING:
if (sMorphaCore->csState == MO_BATTLE) { if (sMorphaCore->csState == MO_BATTLE) {
func_80078914(&this->tentTipPos, NA_SE_EN_MOFER_APPEAR - SFX_FLAG); Sfx_PlaySfxAtPos(&this->tentTipPos, NA_SE_EN_MOFER_APPEAR - SFX_FLAG);
} }
Math_ApproachF(&this->waterLevelMod, -5.0f, 0.1f, 0.4f); Math_ApproachF(&this->waterLevelMod, -5.0f, 0.1f, 0.4f);
for (indS1 = 0; indS1 < 41; indS1++) { for (indS1 = 0; indS1 < 41; indS1++) {
@ -647,7 +647,7 @@ void BossMo_Tentacle(BossMo* this, PlayState* play) {
break; break;
case MO_TENT_ATTACK: case MO_TENT_ATTACK:
this->actor.flags |= ACTOR_FLAG_24; this->actor.flags |= ACTOR_FLAG_24;
func_80078914(&this->tentTipPos, NA_SE_EN_MOFER_ATTACK - SFX_FLAG); Sfx_PlaySfxAtPos(&this->tentTipPos, NA_SE_EN_MOFER_ATTACK - SFX_FLAG);
Math_ApproachF(&this->waterLevelMod, -5.0f, 0.1f, 0.4f); Math_ApproachF(&this->waterLevelMod, -5.0f, 0.1f, 0.4f);
for (indS1 = 0; indS1 < 41; indS1++) { for (indS1 = 0; indS1 < 41; indS1++) {
Math_ApproachF(&this->tentStretch[indS1].y, Math_ApproachF(&this->tentStretch[indS1].y,
@ -729,7 +729,7 @@ void BossMo_Tentacle(BossMo* this, PlayState* play) {
if (play->grabPlayer(play, player)) { if (play->grabPlayer(play, player)) {
player->actor.parent = &this->actor; player->actor.parent = &this->actor;
this->work[MO_TENT_ACTION_STATE] = MO_TENT_GRAB; this->work[MO_TENT_ACTION_STATE] = MO_TENT_GRAB;
func_80078914(&this->tentTipPos, NA_SE_EN_MOFER_CATCH); Sfx_PlaySfxAtPos(&this->tentTipPos, NA_SE_EN_MOFER_CATCH);
Audio_PlaySfxGeneral(NA_SE_VO_LI_DAMAGE_S, &player->actor.projectedPos, 4, Audio_PlaySfxGeneral(NA_SE_VO_LI_DAMAGE_S, &player->actor.projectedPos, 4,
&gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
&gSfxDefaultReverb); &gSfxDefaultReverb);
@ -861,7 +861,7 @@ void BossMo_Tentacle(BossMo* this, PlayState* play) {
} }
break; break;
case MO_TENT_CUT: case MO_TENT_CUT:
func_80078914(&this->tentTipPos, NA_SE_EV_WATER_WALL - SFX_FLAG); Sfx_PlaySfxAtPos(&this->tentTipPos, NA_SE_EV_WATER_WALL - SFX_FLAG);
if (&this->actor == player->actor.parent) { if (&this->actor == player->actor.parent) {
player->unk_850 = 0x65; player->unk_850 = 0x65;
player->actor.parent = NULL; player->actor.parent = NULL;
@ -1079,7 +1079,7 @@ void BossMo_Tentacle(BossMo* this, PlayState* play) {
this->drawActor = false; this->drawActor = false;
this->work[MO_TENT_ACTION_STATE] = MO_TENT_DEATH_6; this->work[MO_TENT_ACTION_STATE] = MO_TENT_DEATH_6;
this->timers[0] = 60; this->timers[0] = 60;
func_80078914(&this->tentTipPos, NA_SE_EN_MOFER_CORE_JUMP); Sfx_PlaySfxAtPos(&this->tentTipPos, NA_SE_EN_MOFER_CORE_JUMP);
for (indS1 = 0; indS1 < 300; indS1++) { for (indS1 = 0; indS1 < 300; indS1++) {
spC8.x = 0.0; spC8.x = 0.0;
spC8.y = 0.0; spC8.y = 0.0;
@ -1150,7 +1150,7 @@ void BossMo_TentCollisionCheck(BossMo* this, PlayState* play) {
hurtbox = this->tentCollider.elements[i1].info.acHitInfo; hurtbox = this->tentCollider.elements[i1].info.acHitInfo;
this->work[MO_TENT_INVINC_TIMER] = 5; this->work[MO_TENT_INVINC_TIMER] = 5;
if (hurtbox->toucher.dmgFlags & DMG_MAGIC_FIRE) { if (hurtbox->toucher.dmgFlags & DMG_MAGIC_FIRE) {
func_80078914(&this->tentTipPos, NA_SE_EN_MOFER_CUT); Sfx_PlaySfxAtPos(&this->tentTipPos, NA_SE_EN_MOFER_CUT);
this->cutIndex = 15; this->cutIndex = 15;
this->meltIndex = this->cutIndex + 1; this->meltIndex = this->cutIndex + 1;
this->work[MO_TENT_ACTION_STATE] = MO_TENT_CUT; this->work[MO_TENT_ACTION_STATE] = MO_TENT_CUT;
@ -1262,7 +1262,7 @@ void BossMo_IntroCs(BossMo* this, PlayState* play) {
EffectSsBubble_Spawn(play, &bubblePos, 0.0f, 10.0f, 50.0f, Rand_ZeroFloat(0.05f) + 0.13f); EffectSsBubble_Spawn(play, &bubblePos, 0.0f, 10.0f, 50.0f, Rand_ZeroFloat(0.05f) + 0.13f);
} }
if (this->timers[2] == 40) { if (this->timers[2] == 40) {
func_80078914(&sAudioZeroVec, NA_SE_EN_MOFER_BUBLE_DEMO); Sfx_PlaySfxAtPos(&sAudioZeroVec, NA_SE_EN_MOFER_BUBLE_DEMO);
} }
break; break;
case MO_INTRO_SWIM: case MO_INTRO_SWIM:
@ -1295,7 +1295,7 @@ void BossMo_IntroCs(BossMo* this, PlayState* play) {
Math_ApproachF(&this->subCamVelFactor, 0.02f, 1.0f, 0.001f); Math_ApproachF(&this->subCamVelFactor, 0.02f, 1.0f, 0.001f);
} }
if (this->work[MO_TENT_MOVE_TIMER] == 190) { if (this->work[MO_TENT_MOVE_TIMER] == 190) {
func_80078914(&sAudioZeroVec, NA_SE_EN_MOFER_BUBLE_DEMO); Sfx_PlaySfxAtPos(&sAudioZeroVec, NA_SE_EN_MOFER_BUBLE_DEMO);
} }
if ((this->work[MO_TENT_MOVE_TIMER] > 150) && (this->work[MO_TENT_MOVE_TIMER] < 180)) { if ((this->work[MO_TENT_MOVE_TIMER] > 150) && (this->work[MO_TENT_MOVE_TIMER] < 180)) {
bubblePos2.x = (this->subCamEye.x + 20.0f) + 10.0f; bubblePos2.x = (this->subCamEye.x + 20.0f) + 10.0f;
@ -1489,9 +1489,9 @@ void BossMo_IntroCs(BossMo* this, PlayState* play) {
} }
if ((this->csState > MO_INTRO_START) && (this->work[MO_TENT_MOVE_TIMER] > 540)) { if ((this->csState > MO_INTRO_START) && (this->work[MO_TENT_MOVE_TIMER] > 540)) {
func_80078914(&sMorphaTent1->tentTipPos, NA_SE_EN_MOFER_APPEAR - SFX_FLAG); Sfx_PlaySfxAtPos(&sMorphaTent1->tentTipPos, NA_SE_EN_MOFER_APPEAR - SFX_FLAG);
} else if (this->csState >= MO_INTRO_START) { } else if (this->csState >= MO_INTRO_START) {
func_80078914(&sAudioZeroVec, NA_SE_EN_MOFER_MOVE_DEMO - SFX_FLAG); Sfx_PlaySfxAtPos(&sAudioZeroVec, NA_SE_EN_MOFER_MOVE_DEMO - SFX_FLAG);
} }
} }
@ -1693,13 +1693,13 @@ void BossMo_DeathCs(BossMo* this, PlayState* play) {
} }
if ((this->csState > MO_DEATH_START) && (this->csState < MO_DEATH_FINISH)) { if ((this->csState > MO_DEATH_START) && (this->csState < MO_DEATH_FINISH)) {
if (this->work[MO_TENT_MOVE_TIMER] < 500) { if (this->work[MO_TENT_MOVE_TIMER] < 500) {
func_80078914(&sAudioZeroVec, NA_SE_EN_MOFER_APPEAR - SFX_FLAG); Sfx_PlaySfxAtPos(&sAudioZeroVec, NA_SE_EN_MOFER_APPEAR - SFX_FLAG);
} }
if ((this->work[MO_TENT_MOVE_TIMER] < 490) && (this->work[MO_TENT_MOVE_TIMER] > 230)) { if ((this->work[MO_TENT_MOVE_TIMER] < 490) && (this->work[MO_TENT_MOVE_TIMER] > 230)) {
func_80078914(&sAudioZeroVec, NA_SE_EV_DROP_FALL - SFX_FLAG); Sfx_PlaySfxAtPos(&sAudioZeroVec, NA_SE_EV_DROP_FALL - SFX_FLAG);
} }
if (this->work[MO_TENT_MOVE_TIMER] < 220) { if (this->work[MO_TENT_MOVE_TIMER] < 220) {
func_80078914(&sAudioZeroVec, NA_SE_EV_SCOOPUP_WATER - SFX_FLAG); Sfx_PlaySfxAtPos(&sAudioZeroVec, NA_SE_EV_SCOOPUP_WATER - SFX_FLAG);
} }
} }
if (sMorphaCore->waterLevel < -200.0f) { if (sMorphaCore->waterLevel < -200.0f) {
@ -1795,7 +1795,7 @@ void BossMo_CoreCollisionCheck(BossMo* this, PlayState* play) {
this->work[MO_TENT_INVINC_TIMER] = 10; this->work[MO_TENT_INVINC_TIMER] = 10;
} else if (!(hurtbox->toucher.dmgFlags & DMG_SHIELD) && (hurtbox->toucher.dmgFlags & DMG_HOOKSHOT)) { } else if (!(hurtbox->toucher.dmgFlags & DMG_SHIELD) && (hurtbox->toucher.dmgFlags & DMG_HOOKSHOT)) {
if (this->work[MO_TENT_ACTION_STATE] >= MO_CORE_ATTACK) { if (this->work[MO_TENT_ACTION_STATE] >= MO_CORE_ATTACK) {
func_80078914(&sMorphaTent1->tentTipPos, NA_SE_EN_MOFER_CUT); Sfx_PlaySfxAtPos(&sMorphaTent1->tentTipPos, NA_SE_EN_MOFER_CUT);
sMorphaTent1->cutIndex = this->work[MO_CORE_POS_IN_TENT]; sMorphaTent1->cutIndex = this->work[MO_CORE_POS_IN_TENT];
sMorphaTent1->meltIndex = sMorphaTent1->cutIndex + 1; sMorphaTent1->meltIndex = sMorphaTent1->cutIndex + 1;
sMorphaTent1->cutScale = 1.0f; sMorphaTent1->cutScale = 1.0f;
@ -2361,7 +2361,7 @@ void BossMo_UpdateTent(Actor* thisx, PlayState* play) {
} else { } else {
i = 0; i = 0;
if (this->work[MO_TENT_ACTION_STATE] < MO_TENT_CUT) { if (this->work[MO_TENT_ACTION_STATE] < MO_TENT_CUT) {
func_80078914(&this->tentTipPos, NA_SE_EN_MOFER_CORE_ROLL - SFX_FLAG); Sfx_PlaySfxAtPos(&this->tentTipPos, NA_SE_EN_MOFER_CORE_ROLL - SFX_FLAG);
} }
} }
bubblePos.x = this->tentPos[i].x + sp7C.x; bubblePos.x = this->tentPos[i].x + sp7C.x;
@ -3582,7 +3582,7 @@ void BossMo_Unknown(void) {
if (BREG(32) != 0) { if (BREG(32) != 0) {
BREG(32)--; BREG(32)--;
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM_MAIN, 1); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM_MAIN, 1);
func_80078914(&zeroVec, unkSfx[BREG(33)]); Sfx_PlaySfxAtPos(&zeroVec, unkSfx[BREG(33)]);
} }
if (BREG(34) != 0) { if (BREG(34) != 0) {
BREG(34) = 0; BREG(34) = 0;

View file

@ -2512,7 +2512,7 @@ void BossSst_HandSetInvulnerable(BossSst* this, s32 isInv) {
} }
void BossSst_HeadSfx(BossSst* this, u16 sfxId) { void BossSst_HeadSfx(BossSst* this, u16 sfxId) {
func_80078914(&this->center, sfxId); Sfx_PlaySfxAtPos(&this->center, sfxId);
} }
void BossSst_HandCollisionCheck(BossSst* this, PlayState* play) { void BossSst_HandCollisionCheck(BossSst* this, PlayState* play) {

View file

@ -881,7 +881,7 @@ s32 BossTw_CheckBeamReflection(BossTw* this, PlayState* play) {
BossTw_AddShieldDeflectEffect(play, 10.0f, this->actor.params); BossTw_AddShieldDeflectEffect(play, 10.0f, this->actor.params);
play->envCtx.lightBlend = 1.0f; play->envCtx.lightBlend = 1.0f;
this->timers[0] = 10; this->timers[0] = 10;
func_80078884(NA_SE_IT_SHIELD_REFLECT_MG2); Sfx_PlaySfxCentered(NA_SE_IT_SHIELD_REFLECT_MG2);
} }
sBeamDivertTimer++; sBeamDivertTimer++;
@ -1108,7 +1108,7 @@ void BossTw_ShootBeam(BossTw* this, PlayState* play) {
} }
this->beamShootState = 1; this->beamShootState = 1;
func_80078914(&player->actor.projectedPos, NA_SE_IT_SHIELD_REFLECT_MG); Sfx_PlaySfxAtPos(&player->actor.projectedPos, NA_SE_IT_SHIELD_REFLECT_MG);
Matrix_MtxFToYXZRotS(&player->shieldMf, &sp128, 0); Matrix_MtxFToYXZRotS(&player->shieldMf, &sp128, 0);
sp128.y += 0x8000; sp128.y += 0x8000;
sp128.x = -sp128.x; sp128.x = -sp128.x;
@ -1698,7 +1698,7 @@ void BossTw_TwinrovaMergeCS(BossTw* this, PlayState* play) {
if (this->timers[1] == 8) { if (this->timers[1] == 8) {
this->work[TW_BLINK_IDX] = 8; this->work[TW_BLINK_IDX] = 8;
func_80078884(NA_SE_EN_TWINROBA_YOUNG_WINK); Sfx_PlaySfxCentered(NA_SE_EN_TWINROBA_YOUNG_WINK);
} }
if (this->timers[2] == 4) { if (this->timers[2] == 4) {
sEnvType = 0; sEnvType = 0;
@ -1776,12 +1776,12 @@ void BossTw_TwinrovaIntroCS(BossTw* this, PlayState* play) {
Player* player = GET_PLAYER(play); Player* player = GET_PLAYER(play);
if (this->csSfxTimer > 220 && this->csSfxTimer < 630) { if (this->csSfxTimer > 220 && this->csSfxTimer < 630) {
func_80078884(NA_SE_EN_TWINROBA_UNARI - SFX_FLAG); Sfx_PlaySfxCentered(NA_SE_EN_TWINROBA_UNARI - SFX_FLAG);
} }
if (this->csSfxTimer == 180) { if (this->csSfxTimer == 180) {
func_80078914(&D_8094A7D0, NA_SE_EN_TWINROBA_LAUGH); Sfx_PlaySfxAtPos(&D_8094A7D0, NA_SE_EN_TWINROBA_LAUGH);
func_80078914(&D_8094A7D0, NA_SE_EN_TWINROBA_LAUGH2); Sfx_PlaySfxAtPos(&D_8094A7D0, NA_SE_EN_TWINROBA_LAUGH2);
SEQCMD_PLAY_SEQUENCE(SEQ_PLAYER_BGM_MAIN, 0, 0, NA_BGM_KOTAKE_KOUME); SEQCMD_PLAY_SEQUENCE(SEQ_PLAYER_BGM_MAIN, 0, 0, NA_BGM_KOTAKE_KOUME);
} }
@ -1842,7 +1842,7 @@ void BossTw_TwinrovaIntroCS(BossTw* this, PlayState* play) {
} }
if (this->work[CS_TIMER_1] == 180) { if (this->work[CS_TIMER_1] == 180) {
func_80078884(NA_SE_EN_TWINROBA_APPEAR_MS); Sfx_PlaySfxCentered(NA_SE_EN_TWINROBA_APPEAR_MS);
} }
if (this->work[CS_TIMER_1] > 180) { if (this->work[CS_TIMER_1] > 180) {
@ -2455,7 +2455,7 @@ void BossTw_DeathCSMsgSfx(BossTw* this, PlayState* play) {
} }
if (this->work[CS_TIMER_2] > 440 && this->work[CS_TIMER_2] < 860) { if (this->work[CS_TIMER_2] > 440 && this->work[CS_TIMER_2] < 860) {
func_80078884(NA_SE_EN_TWINROBA_FIGHT - SFX_FLAG); Sfx_PlaySfxCentered(NA_SE_EN_TWINROBA_FIGHT - SFX_FLAG);
} }
if (this->work[CS_TIMER_2] == 430) { if (this->work[CS_TIMER_2] == 430) {
@ -2650,7 +2650,7 @@ void BossTw_TwinrovaDeathCS(BossTw* this, PlayState* play) {
Vec3f spBC; Vec3f spBC;
Vec3f spB0; Vec3f spB0;
Vec3f spA4 = { 0.0f, 0.0f, 0.0f }; Vec3f spA4 = { 0.0f, 0.0f, 0.0f };
func_80078884(NA_SE_EN_TWINROBA_TRANSFORM); Sfx_PlaySfxCentered(NA_SE_EN_TWINROBA_TRANSFORM);
for (i = 0; i < 100; i++) { for (i = 0; i < 100; i++) {
spB0.x = Rand_CenteredFloat(5.0f); spB0.x = Rand_CenteredFloat(5.0f);
spB0.y = Rand_CenteredFloat(5.0f); spB0.y = Rand_CenteredFloat(5.0f);
@ -2762,7 +2762,7 @@ void BossTw_TwinrovaDeathCS(BossTw* this, PlayState* play) {
Actor_SetScale(&sKotakePtr->actor, 0.0f); Actor_SetScale(&sKotakePtr->actor, 0.0f);
sKoumePtr->visible = 1; sKoumePtr->visible = 1;
sKotakePtr->visible = 1; sKotakePtr->visible = 1;
func_80078884(NA_SE_EN_TWINROBA_TRANSFORM); Sfx_PlaySfxCentered(NA_SE_EN_TWINROBA_TRANSFORM);
SEQCMD_PLAY_SEQUENCE(SEQ_PLAYER_BGM_MAIN, 0, 0, NA_BGM_KOTAKE_KOUME); SEQCMD_PLAY_SEQUENCE(SEQ_PLAYER_BGM_MAIN, 0, 0, NA_BGM_KOTAKE_KOUME);
this->csState2 = 3; this->csState2 = 3;
this->work[CS_TIMER_2] = 0; this->work[CS_TIMER_2] = 0;
@ -3162,8 +3162,8 @@ void BossTw_TwinrovaUpdate(Actor* thisx, PlayState* play2) {
if (sFreezeState == 1) { if (sFreezeState == 1) {
sFreezeState = 2; sFreezeState = 2;
BossTw_AddPlayerFreezeEffect(play, NULL); BossTw_AddPlayerFreezeEffect(play, NULL);
func_80078914(&player->actor.projectedPos, NA_SE_VO_LI_FREEZE); Sfx_PlaySfxAtPos(&player->actor.projectedPos, NA_SE_VO_LI_FREEZE);
func_80078914(&player->actor.projectedPos, NA_SE_PL_FREEZE); Sfx_PlaySfxAtPos(&player->actor.projectedPos, NA_SE_PL_FREEZE);
if (sShieldFireCharge != 0) { if (sShieldFireCharge != 0) {
sShieldFireCharge = 4; sShieldFireCharge = 4;
@ -3686,11 +3686,11 @@ void BossTw_ShieldChargeDraw(BossTw* this, PlayState* play) {
temp_t0 = sShieldFireCharge | sShieldIceCharge; temp_t0 = sShieldFireCharge | sShieldIceCharge;
if (temp_t0 == 1) { if (temp_t0 == 1) {
func_80078884(NA_SE_IT_SHIELD_CHARGE_LV1 & ~SFX_FLAG); Sfx_PlaySfxCentered(NA_SE_IT_SHIELD_CHARGE_LV1 & ~SFX_FLAG);
} else if (temp_t0 == 2) { } else if (temp_t0 == 2) {
func_80078884(NA_SE_IT_SHIELD_CHARGE_LV2 & ~SFX_FLAG); Sfx_PlaySfxCentered(NA_SE_IT_SHIELD_CHARGE_LV2 & ~SFX_FLAG);
} else if (temp_t0 == 3) { } else if (temp_t0 == 3) {
func_80078884(NA_SE_IT_SHIELD_CHARGE_LV3 & ~SFX_FLAG); Sfx_PlaySfxCentered(NA_SE_IT_SHIELD_CHARGE_LV3 & ~SFX_FLAG);
} }
if (temp_t0 != 0 && temp_t0 < 4) { if (temp_t0 != 0 && temp_t0 < 4) {
@ -4376,7 +4376,7 @@ s32 BossTw_BlastShieldCheck(BossTw* this, PlayState* play) {
sEnvType = 0; sEnvType = 0;
sShieldIceCharge = 0; sShieldIceCharge = 0;
sShieldFireCharge = 0; sShieldFireCharge = 0;
func_80078884(NA_SE_IT_SHIELD_REFLECT_MG2); Sfx_PlaySfxCentered(NA_SE_IT_SHIELD_REFLECT_MG2);
} }
ret = true; ret = true;

View file

@ -231,7 +231,7 @@ void func_80966E98(Demo6K* this, PlayState* play) {
} }
if (this->timer1 == 39) { if (this->timer1 == 39) {
func_800788CC(NA_SE_EV_CONSENTRATION); Sfx_PlaySfxCentered2(NA_SE_EV_CONSENTRATION);
Actor_Spawn(&play->actorCtx, play, ACTOR_DEMO_6K, this->actor.world.pos.x, this->actor.world.pos.y + 10.0f, Actor_Spawn(&play->actorCtx, play, ACTOR_DEMO_6K, this->actor.world.pos.x, this->actor.world.pos.y + 10.0f,
this->actor.world.pos.z, 0, 0, 0, 2); this->actor.world.pos.z, 0, 0, 0, 2);
} }

View file

@ -303,14 +303,14 @@ void DemoDu_InitCs_GoronsRuby(DemoDu* this, PlayState* play) {
// Cutscene: Darunia gives Link the Goron's Ruby. // Cutscene: Darunia gives Link the Goron's Ruby.
// Sfx played when Darunia lands at the floor at the start of the cutscene. // Sfx played when Darunia lands at the floor at the start of the cutscene.
void DemoDu_CsPlaySfx_GoronLanding(DemoDu* this) { void DemoDu_CsPlaySfx_GoronLanding(DemoDu* this) {
func_80078914(&this->actor.projectedPos, NA_SE_EN_GOLON_LAND_BIG); Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_EN_GOLON_LAND_BIG);
} }
// Cutscene: Darunia gives Link the Goron's Ruby. // Cutscene: Darunia gives Link the Goron's Ruby.
// Sfx played when Darunia is falling at the start of the cutscene. // Sfx played when Darunia is falling at the start of the cutscene.
void DemoDu_CsPlaySfx_DaruniaFalling(PlayState* play) { void DemoDu_CsPlaySfx_DaruniaFalling(PlayState* play) {
if (play->csCtx.curFrame == 160) { if (play->csCtx.curFrame == 160) {
func_800788CC(NA_SE_EV_OBJECT_FALL); Sfx_PlaySfxCentered2(NA_SE_EV_OBJECT_FALL);
} }
} }
@ -319,14 +319,14 @@ void DemoDu_CsPlaySfx_DaruniaHitsLink(PlayState* play) {
Player* player = GET_PLAYER(play); Player* player = GET_PLAYER(play);
s32 pad; s32 pad;
func_80078914(&player->actor.projectedPos, NA_SE_EN_DARUNIA_HIT_LINK); Sfx_PlaySfxAtPos(&player->actor.projectedPos, NA_SE_EN_DARUNIA_HIT_LINK);
Audio_PlaySfxGeneral(NA_SE_VO_LI_DAMAGE_S_KID, &player->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, Audio_PlaySfxGeneral(NA_SE_VO_LI_DAMAGE_S_KID, &player->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
&gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
} }
// Cutscene: Darunia gives Link the Goron's Ruby. // Cutscene: Darunia gives Link the Goron's Ruby.
void DemoDu_CsPlaySfx_HitBreast(DemoDu* this) { void DemoDu_CsPlaySfx_HitBreast(DemoDu* this) {
func_80078914(&this->actor.projectedPos, NA_SE_EN_DARUNIA_HIT_BREAST - SFX_FLAG); Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_EN_DARUNIA_HIT_BREAST - SFX_FLAG);
} }
// Cutscene: Darunia gives Link the Goron's Ruby. // Cutscene: Darunia gives Link the Goron's Ruby.
@ -709,7 +709,7 @@ void DemoDu_InitCs_AfterGanon(DemoDu* this, PlayState* play) {
} }
void DemoDu_CsPlaySfx_WhiteOut(void) { void DemoDu_CsPlaySfx_WhiteOut(void) {
func_800788CC(NA_SE_SY_WHITE_OUT_T); Sfx_PlaySfxCentered2(NA_SE_SY_WHITE_OUT_T);
} }
void DemoDu_CsAfterGanon_SpawnDemo6K(DemoDu* this, PlayState* play) { void DemoDu_CsAfterGanon_SpawnDemo6K(DemoDu* this, PlayState* play) {

View file

@ -627,7 +627,7 @@ void DemoEffect_UpdateGetItem(DemoEffect* this, PlayState* play) {
if (gSaveContext.save.entranceIndex == ENTR_TEMPLE_OF_TIME_0) { if (gSaveContext.save.entranceIndex == ENTR_TEMPLE_OF_TIME_0) {
Actor_PlaySfx(thisx, NA_SE_EV_MEDAL_APPEAR_L - SFX_FLAG); Actor_PlaySfx(thisx, NA_SE_EV_MEDAL_APPEAR_L - SFX_FLAG);
} else { } else {
func_800788CC(NA_SE_EV_MEDAL_APPEAR_S - SFX_FLAG); Sfx_PlaySfxCentered2(NA_SE_EV_MEDAL_APPEAR_S - SFX_FLAG);
} }
if (this->getItem.drawId != GID_ARROW_LIGHT) { if (this->getItem.drawId != GID_ARROW_LIGHT) {
this->actor.shape.rot.y += 0x3E80; this->actor.shape.rot.y += 0x3E80;
@ -642,7 +642,7 @@ void DemoEffect_UpdateGetItem(DemoEffect* this, PlayState* play) {
if (gSaveContext.save.entranceIndex == ENTR_TEMPLE_OF_TIME_0) { if (gSaveContext.save.entranceIndex == ENTR_TEMPLE_OF_TIME_0) {
Actor_PlaySfx(thisx, NA_SE_EV_MEDAL_APPEAR_L - SFX_FLAG); Actor_PlaySfx(thisx, NA_SE_EV_MEDAL_APPEAR_L - SFX_FLAG);
} else { } else {
func_800788CC(NA_SE_EV_MEDAL_APPEAR_S - SFX_FLAG); Sfx_PlaySfxCentered2(NA_SE_EV_MEDAL_APPEAR_S - SFX_FLAG);
} }
break; break;
case 4: case 4:
@ -946,7 +946,7 @@ void DemoEffect_UpdateCreationFireball(DemoEffect* this, PlayState* play) {
Actor_SetScale(&effect->actor, 0.2f); Actor_SetScale(&effect->actor, 0.2f);
} }
func_800788CC(NA_SE_IT_DM_RING_EXPLOSION); Sfx_PlaySfxCentered2(NA_SE_IT_DM_RING_EXPLOSION);
Actor_Kill(&this->actor); Actor_Kill(&this->actor);
} }
@ -1761,13 +1761,13 @@ void DemoEffect_DrawGodLgt(Actor* thisx, PlayState* play) {
if (gSaveContext.save.entranceIndex == ENTR_CUTSCENE_MAP_0) { if (gSaveContext.save.entranceIndex == ENTR_CUTSCENE_MAP_0) {
if (gSaveContext.sceneLayer == 4) { if (gSaveContext.sceneLayer == 4) {
if (play->csCtx.curFrame <= 680) { if (play->csCtx.curFrame <= 680) {
func_80078914(&this->actor.projectedPos, NA_SE_EV_GOD_FLYING - SFX_FLAG); Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_EV_GOD_FLYING - SFX_FLAG);
} }
} else { } else {
func_80078914(&this->actor.projectedPos, NA_SE_EV_GOD_FLYING - SFX_FLAG); Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_EV_GOD_FLYING - SFX_FLAG);
} }
} else { } else {
func_80078914(&this->actor.projectedPos, NA_SE_EV_GOD_FLYING - SFX_FLAG); Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_EV_GOD_FLYING - SFX_FLAG);
} }
gSPSegment(POLY_XLU_DISP++, 8, gSPSegment(POLY_XLU_DISP++, 8,

View file

@ -103,14 +103,14 @@ void func_8097C930(DemoGo* this) {
} }
void func_8097C9B8(DemoGo* this) { void func_8097C9B8(DemoGo* this) {
func_80078914(&this->actor.projectedPos, NA_SE_EN_DODO_M_GND); Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_EN_DODO_M_GND);
} }
void func_8097C9DC(DemoGo* this) { void func_8097C9DC(DemoGo* this) {
s32 pad[2]; s32 pad[2];
if (Animation_OnFrame(&this->skelAnime, 12.0f) || Animation_OnFrame(&this->skelAnime, 25.0f)) { if (Animation_OnFrame(&this->skelAnime, 12.0f) || Animation_OnFrame(&this->skelAnime, 25.0f)) {
func_80078914(&this->actor.projectedPos, NA_SE_EN_MORIBLIN_WALK); Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_EN_MORIBLIN_WALK);
} }
} }

View file

@ -20,7 +20,7 @@ void DemoGt_Destroy(Actor* thisx, PlayState* play) {
} }
void DemoGt_PlayEarthquakeSfx(void) { void DemoGt_PlayEarthquakeSfx(void) {
func_800788CC(NA_SE_EV_EARTHQUAKE - SFX_FLAG); Sfx_PlaySfxCentered2(NA_SE_EV_EARTHQUAKE - SFX_FLAG);
} }
void DemoGt_PlayExplosion1Sfx(PlayState* play, Vec3f* pos) { void DemoGt_PlayExplosion1Sfx(PlayState* play, Vec3f* pos) {
@ -1189,7 +1189,7 @@ void func_80980F58(DemoGt* this, PlayState* play) {
u16 csCurFrame = play->csCtx.curFrame; u16 csCurFrame = play->csCtx.curFrame;
if (csCurFrame == 244) { if (csCurFrame == 244) {
func_80078914(&this->dyna.actor.projectedPos, NA_SE_EV_TOWER_PARTS_BROKEN - SFX_FLAG); Sfx_PlaySfxAtPos(&this->dyna.actor.projectedPos, NA_SE_EV_TOWER_PARTS_BROKEN - SFX_FLAG);
} }
} }
@ -1312,7 +1312,7 @@ void func_80981424(DemoGt* this, PlayState* play) {
u16 csCurFrame = play->csCtx.curFrame; u16 csCurFrame = play->csCtx.curFrame;
if (csCurFrame == 789) { if (csCurFrame == 789) {
func_80078914(&this->dyna.actor.projectedPos, NA_SE_EV_TOWER_PARTS_BROKEN - SFX_FLAG); Sfx_PlaySfxAtPos(&this->dyna.actor.projectedPos, NA_SE_EV_TOWER_PARTS_BROKEN - SFX_FLAG);
} }
} }
@ -1430,7 +1430,7 @@ void func_809818FC(DemoGt* this, PlayState* play) {
u16 csCurFrame = play->csCtx.curFrame; u16 csCurFrame = play->csCtx.curFrame;
if (csCurFrame == 845) { if (csCurFrame == 845) {
func_80078914(&this->dyna.actor.projectedPos, NA_SE_EV_TOWER_PARTS_BROKEN - SFX_FLAG); Sfx_PlaySfxAtPos(&this->dyna.actor.projectedPos, NA_SE_EV_TOWER_PARTS_BROKEN - SFX_FLAG);
} }
} }
void func_80981930(DemoGt* this, PlayState* play) { void func_80981930(DemoGt* this, PlayState* play) {
@ -1521,7 +1521,7 @@ void func_80981CEC(DemoGt* this, PlayState* play) {
u16 csCurFrame = play->csCtx.curFrame; u16 csCurFrame = play->csCtx.curFrame;
if (csCurFrame == 183) { if (csCurFrame == 183) {
func_80078914(&this->dyna.actor.projectedPos, NA_SE_EV_TOWER_PARTS_BROKEN - SFX_FLAG); Sfx_PlaySfxAtPos(&this->dyna.actor.projectedPos, NA_SE_EV_TOWER_PARTS_BROKEN - SFX_FLAG);
} }
} }
@ -1612,7 +1612,7 @@ void func_809820AC(DemoGt* this, PlayState* play) {
u16 csCurFrame = play->csCtx.curFrame; u16 csCurFrame = play->csCtx.curFrame;
if (csCurFrame == 154) { if (csCurFrame == 154) {
func_80078914(&this->dyna.actor.projectedPos, NA_SE_EV_TOWER_PARTS_BROKEN - SFX_FLAG); Sfx_PlaySfxAtPos(&this->dyna.actor.projectedPos, NA_SE_EV_TOWER_PARTS_BROKEN - SFX_FLAG);
} }
} }

View file

@ -431,7 +431,7 @@ void func_80985860(DemoIm* this, PlayState* play) {
} }
void func_809858A8(void) { void func_809858A8(void) {
func_800788CC(NA_SE_SY_WHITE_OUT_T); Sfx_PlaySfxCentered2(NA_SE_SY_WHITE_OUT_T);
} }
void DemoIm_SpawnLightBall(DemoIm* this, PlayState* play) { void DemoIm_SpawnLightBall(DemoIm* this, PlayState* play) {

View file

@ -251,7 +251,7 @@ void DemoKekkai_TrialBarrierIdle(Actor* thisx, PlayState* play) {
CollisionCheck_SetAT(play, &play->colChkCtx, &this->collider1.base); CollisionCheck_SetAT(play, &play->colChkCtx, &this->collider1.base);
CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider1.base); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider1.base);
if (this->collider2.base.acFlags & AC_HIT) { if (this->collider2.base.acFlags & AC_HIT) {
func_80078884(NA_SE_SY_CORRECT_CHIME); Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
// "I got it" // "I got it"
LOG_STRING("当ったよ", "../z_demo_kekkai.c", 572); LOG_STRING("当ったよ", "../z_demo_kekkai.c", 572);
this->actor.update = DemoKekkai_TrialBarrierDispel; this->actor.update = DemoKekkai_TrialBarrierDispel;

View file

@ -376,7 +376,7 @@ void func_8098EDB0(DemoSa* this) {
} }
void func_8098EE08(void) { void func_8098EE08(void) {
func_800788CC(NA_SE_SY_WHITE_OUT_T); Sfx_PlaySfxCentered2(NA_SE_SY_WHITE_OUT_T);
} }
void func_8098EE28(DemoSa* this, PlayState* play) { void func_8098EE28(DemoSa* this, PlayState* play) {

View file

@ -54,7 +54,7 @@ void EfcErupc_UpdateAction(EfcErupc* this, PlayState* play) {
if (play->csCtx.actorCues[1] != NULL) { if (play->csCtx.actorCues[1] != NULL) {
if (play->csCtx.actorCues[1]->id == 2) { if (play->csCtx.actorCues[1]->id == 2) {
if (this->unk_150 == 30) { if (this->unk_150 == 30) {
func_800788CC(NA_SE_IT_EARTHQUAKE); Sfx_PlaySfxCentered2(NA_SE_IT_EARTHQUAKE);
} }
if (this->unk_150 <= 64) { if (this->unk_150 <= 64) {
if (this->unk_154 < 200) { if (this->unk_154 < 200) {

View file

@ -260,7 +260,7 @@ void EnAni_Update(Actor* thisx, PlayState* play) {
} }
if (play->csCtx.curFrame == 100) { if (play->csCtx.curFrame == 100) {
func_800788CC(NA_SE_IT_EARTHQUAKE); Sfx_PlaySfxCentered2(NA_SE_IT_EARTHQUAKE);
} }
} else { } else {
if (SkelAnime_Update(&this->skelAnime)) { if (SkelAnime_Update(&this->skelAnime)) {

View file

@ -105,7 +105,7 @@ void EnBomBowlPit_DetectHit(EnBomBowlPit* this, PlayState* play) {
this->actor.textId = 0xF; this->actor.textId = 0xF;
Message_StartTextbox(play, this->actor.textId, NULL); Message_StartTextbox(play, this->actor.textId, NULL);
this->unk_154 = TEXT_STATE_EVENT; this->unk_154 = TEXT_STATE_EVENT;
func_80078884(NA_SE_EV_HIT_SOUND); Sfx_PlaySfxCentered(NA_SE_EV_HIT_SOUND);
func_8002DF54(play, NULL, PLAYER_CSMODE_8); func_8002DF54(play, NULL, PLAYER_CSMODE_8);
this->status = 1; this->status = 1;
this->actionFunc = EnBomBowlPit_CameraDollyIn; this->actionFunc = EnBomBowlPit_CameraDollyIn;

View file

@ -245,7 +245,7 @@ void EnCs_HandleTalking(EnCs* this, PlayState* play) {
} }
if (this->actor.textId == 0x2023) { if (this->actor.textId == 0x2023) {
func_80078884(NA_SE_SY_TRE_BOX_APPEAR); Sfx_PlaySfxCentered(NA_SE_SY_TRE_BOX_APPEAR);
} }
this->talkState = 1; this->talkState = 1;

View file

@ -129,7 +129,7 @@ s32 EnDivingGame_HasMinigameFinished(EnDivingGame* this, PlayState* play) {
// Failed. // Failed.
gSaveContext.timerState = TIMER_STATE_OFF; gSaveContext.timerState = TIMER_STATE_OFF;
func_800F5B58(); func_800F5B58();
func_80078884(NA_SE_SY_FOUND); Sfx_PlaySfxCentered(NA_SE_SY_FOUND);
this->actor.textId = 0x71AD; this->actor.textId = 0x71AD;
Message_StartTextbox(play, this->actor.textId, NULL); Message_StartTextbox(play, this->actor.textId, NULL);
this->unk_292 = TEXT_STATE_EVENT; this->unk_292 = TEXT_STATE_EVENT;

View file

@ -243,7 +243,7 @@ void EnDntNomal_TargetWait(EnDntNomal* this, PlayState* play) {
scorePos.z = this->actor.world.pos.z; scorePos.z = this->actor.world.pos.z;
EffectSsExtra_Spawn(play, &scorePos, &scoreVel, &scoreAccel, 4, 2); EffectSsExtra_Spawn(play, &scorePos, &scoreVel, &scoreAccel, 4, 2);
Audio_StopSfxById(NA_SE_SY_TRE_BOX_APPEAR); Audio_StopSfxById(NA_SE_SY_TRE_BOX_APPEAR);
func_80078884(NA_SE_SY_TRE_BOX_APPEAR); Sfx_PlaySfxCentered(NA_SE_SY_TRE_BOX_APPEAR);
// "Big hit" // "Big hit"
osSyncPrintf(VT_FGCOL(CYAN) "☆☆☆☆☆ 大当り ☆☆☆☆☆ %d\n" VT_RST, this->hitCounter); osSyncPrintf(VT_FGCOL(CYAN) "☆☆☆☆☆ 大当り ☆☆☆☆☆ %d\n" VT_RST, this->hitCounter);
if (!LINK_IS_ADULT && !GET_ITEMGETINF(ITEMGETINF_1D)) { if (!LINK_IS_ADULT && !GET_ITEMGETINF(ITEMGETINF_1D)) {
@ -586,7 +586,7 @@ void EnDntNomal_StageDance(EnDntNomal* this, PlayState* play) {
void EnDntNomal_SetupStageHide(EnDntNomal* this, PlayState* play) { void EnDntNomal_SetupStageHide(EnDntNomal* this, PlayState* play) {
if (this->timer3 != 0) { if (this->timer3 != 0) {
if ((this->timer3 == 1) && (this->ignore == 1)) { if ((this->timer3 == 1) && (this->ignore == 1)) {
func_80078884(NA_SE_SY_ERROR); Sfx_PlaySfxCentered(NA_SE_SY_ERROR);
} }
} else { } else {
this->endFrame = (f32)Animation_GetLastFrame(&gDntStageHideAnim); this->endFrame = (f32)Animation_GetLastFrame(&gDntStageHideAnim);
@ -627,7 +627,7 @@ void EnDntNomal_StageHide(EnDntNomal* this, PlayState* play) {
if (rupee->colorIdx == 2) { if (rupee->colorIdx == 2) {
rupee->actor.velocity.y = 7.0f; rupee->actor.velocity.y = 7.0f;
} }
func_80078884(NA_SE_SY_TRE_BOX_APPEAR); Sfx_PlaySfxCentered(NA_SE_SY_TRE_BOX_APPEAR);
} }
this->action = DNT_ACTION_NONE; this->action = DNT_ACTION_NONE;
this->actionFunc = EnDntNomal_SetupStageWait; this->actionFunc = EnDntNomal_SetupStageWait;

View file

@ -35,7 +35,7 @@ ActorInit En_Eg_InitVars = {
}; };
void EnEg_PlayVoidOutSFX(void) { void EnEg_PlayVoidOutSFX(void) {
func_800788CC(NA_SE_OC_ABYSS); Sfx_PlaySfxCentered2(NA_SE_OC_ABYSS);
} }
void EnEg_Destroy(Actor* thisx, PlayState* play) { void EnEg_Destroy(Actor* thisx, PlayState* play) {

View file

@ -157,7 +157,7 @@ void EnExItem_WaitForObject(EnExItem* this, PlayState* play) {
this->prizeRotateTimer = 35; this->prizeRotateTimer = 35;
this->scale = 0.5f; this->scale = 0.5f;
if (!onCounter) { if (!onCounter) {
func_80078884(NA_SE_SY_PIECE_OF_HEART); Sfx_PlaySfxCentered(NA_SE_SY_PIECE_OF_HEART);
this->actionFunc = EnExItem_BowlPrize; this->actionFunc = EnExItem_BowlPrize;
} else { } else {
this->actionFunc = EnExItem_SetupBowlCounter; this->actionFunc = EnExItem_SetupBowlCounter;

View file

@ -210,7 +210,7 @@ void EnExRuppy_DropIntoWater(EnExRuppy* this, PlayState* play) {
this->actor.shape.rot.y += 0x7A8; this->actor.shape.rot.y += 0x7A8;
Math_ApproachF(&this->actor.gravity, -2.0f, 0.3f, 1.0f); Math_ApproachF(&this->actor.gravity, -2.0f, 0.3f, 1.0f);
EnExRuppy_SpawnSparkles(this, play, 2, 0); EnExRuppy_SpawnSparkles(this, play, 2, 0);
func_80078884(NA_SE_EV_RAINBOW_SHOWER - SFX_FLAG); Sfx_PlaySfxCentered(NA_SE_EV_RAINBOW_SHOWER - SFX_FLAG);
divingGame = (EnDivingGame*)this->actor.parent; divingGame = (EnDivingGame*)this->actor.parent;
if ((divingGame != NULL) && (divingGame->actor.update != NULL) && if ((divingGame != NULL) && (divingGame->actor.update != NULL) &&
((divingGame->unk_296 == 0) || (this->actor.bgCheckFlags & BGCHECKFLAG_WATER) || (this->timer == 0))) { ((divingGame->unk_296 == 0) || (this->actor.bgCheckFlags & BGCHECKFLAG_WATER) || (this->timer == 0))) {
@ -218,7 +218,7 @@ void EnExRuppy_DropIntoWater(EnExRuppy* this, PlayState* play) {
this->actor.speed = 0.0f; this->actor.speed = 0.0f;
this->actor.velocity.x = this->actor.velocity.y = this->actor.velocity.z = 0.0f; this->actor.velocity.x = this->actor.velocity.y = this->actor.velocity.z = 0.0f;
this->actor.gravity = 0.0f; this->actor.gravity = 0.0f;
func_80078914(&this->actor.projectedPos, NA_SE_EV_BOMB_DROP_WATER); Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_EV_BOMB_DROP_WATER);
this->actionFunc = EnExRuppy_EnterWater; this->actionFunc = EnExRuppy_EnterWater;
} }
} }
@ -255,7 +255,7 @@ void EnExRuppy_Sink(EnExRuppy* this, PlayState* play) {
this->actor.velocity.y = -1.0f; this->actor.velocity.y = -1.0f;
this->actor.gravity = -0.2f; this->actor.gravity = -0.2f;
EffectSsGSplash_Spawn(play, &pos, NULL, NULL, 0, 800); EffectSsGSplash_Spawn(play, &pos, NULL, NULL, 0, 800);
func_80078914(&this->actor.projectedPos, NA_SE_EV_BOMB_DROP_WATER); Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_EV_BOMB_DROP_WATER);
this->actionFunc = EnExRuppy_WaitInGame; this->actionFunc = EnExRuppy_WaitInGame;
} }
divingGame = (EnDivingGame*)this->actor.parent; divingGame = (EnDivingGame*)this->actor.parent;
@ -284,7 +284,7 @@ void EnExRuppy_WaitInGame(EnExRuppy* this, PlayState* play) {
if (1) {} if (1) {}
} else if (this->actor.xyzDistToPlayerSq < SQ(localConst)) { } else if (this->actor.xyzDistToPlayerSq < SQ(localConst)) {
Rupees_ChangeBy(this->rupeeValue); Rupees_ChangeBy(this->rupeeValue);
func_80078884(NA_SE_SY_GET_RUPY); Sfx_PlaySfxCentered(NA_SE_SY_GET_RUPY);
divingGame->grabbedRupeesCounter++; divingGame->grabbedRupeesCounter++;
Actor_Kill(&this->actor); Actor_Kill(&this->actor);
} }
@ -347,7 +347,7 @@ void EnExRuppy_WaitAsCollectible(EnExRuppy* this, PlayState* play) {
f32 localConst = 30.0f; f32 localConst = 30.0f;
if (this->actor.xyzDistToPlayerSq < SQ(localConst)) { if (this->actor.xyzDistToPlayerSq < SQ(localConst)) {
func_80078884(NA_SE_SY_GET_RUPY); Sfx_PlaySfxCentered(NA_SE_SY_GET_RUPY);
Item_DropCollectible(play, &this->actor.world.pos, (sEnExRuppyCollectibleTypes[this->colorIdx] | 0x8000)); Item_DropCollectible(play, &this->actor.world.pos, (sEnExRuppyCollectibleTypes[this->colorIdx] | 0x8000));
Actor_Kill(&this->actor); Actor_Kill(&this->actor);
} }

View file

@ -737,7 +737,7 @@ void EnFr_ChildSong(EnFr* this, PlayState* play) {
EnFr_SetupReward(this, play, false); EnFr_SetupReward(this, play, false);
} else if (!FROG_HAS_SONG_BEEN_PLAYED(songIndex)) { } else if (!FROG_HAS_SONG_BEEN_PLAYED(songIndex)) {
frog = sEnFrPointers.frogs[sSongToFrog[songIndex]]; frog = sEnFrPointers.frogs[sSongToFrog[songIndex]];
func_80078884(NA_SE_SY_CORRECT_CHIME); Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
if (frog->actionFunc == EnFr_ChooseJumpFromLogSpot) { if (frog->actionFunc == EnFr_ChooseJumpFromLogSpot) {
frog->isJumpingUp = true; frog->isJumpingUp = true;
frog->isActive = true; frog->isActive = true;
@ -855,7 +855,7 @@ s32 EnFr_IsFrogSongComplete(EnFr* this, PlayState* play) {
void EnFr_OcarinaMistake(EnFr* this, PlayState* play) { void EnFr_OcarinaMistake(EnFr* this, PlayState* play) {
Message_CloseTextbox(play); Message_CloseTextbox(play);
this->reward = GI_NONE; this->reward = GI_NONE;
func_80078884(NA_SE_SY_OCARINA_ERROR); Sfx_PlaySfxCentered(NA_SE_SY_OCARINA_ERROR);
AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_OFF); AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_OFF);
sEnFrPointers.flags = 12; sEnFrPointers.flags = 12;
EnFr_DeactivateButterfly(); EnFr_DeactivateButterfly();
@ -916,9 +916,9 @@ void EnFr_ContinueFrogSong(EnFr* this, PlayState* play) {
void EnFr_SetupReward(EnFr* this, PlayState* play, u8 unkCondition) { void EnFr_SetupReward(EnFr* this, PlayState* play, u8 unkCondition) {
EnFr_DeactivateButterfly(); EnFr_DeactivateButterfly();
if (unkCondition) { if (unkCondition) {
func_80078884(NA_SE_SY_TRE_BOX_APPEAR); Sfx_PlaySfxCentered(NA_SE_SY_TRE_BOX_APPEAR);
} else { } else {
func_80078884(NA_SE_SY_CORRECT_CHIME); Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
} }
AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_OFF); AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_OFF);

View file

@ -169,7 +169,7 @@ void func_80A1DBD4(EnFu* this, PlayState* play) {
play->msgCtx.ocarinaMode = OCARINA_MODE_04; play->msgCtx.ocarinaMode = OCARINA_MODE_04;
this->actor.flags &= ~ACTOR_FLAG_16; this->actor.flags &= ~ACTOR_FLAG_16;
} else if (play->msgCtx.ocarinaMode == OCARINA_MODE_03) { } else if (play->msgCtx.ocarinaMode == OCARINA_MODE_03) {
func_80078884(NA_SE_SY_CORRECT_CHIME); Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
this->actionFunc = func_80A1DB60; this->actionFunc = func_80A1DB60;
this->actor.flags &= ~ACTOR_FLAG_16; this->actor.flags &= ~ACTOR_FLAG_16;
play->csCtx.script = SEGMENTED_TO_VIRTUAL(gSongOfStormsCs); play->csCtx.script = SEGMENTED_TO_VIRTUAL(gSongOfStormsCs);

View file

@ -225,10 +225,10 @@ void EnGSwitch_SilverRupeeTracker(EnGSwitch* this, PlayState* play) {
if ((play->sceneId == SCENE_GERUDO_TRAINING_GROUND) && (this->actor.room == 2)) { if ((play->sceneId == SCENE_GERUDO_TRAINING_GROUND) && (this->actor.room == 2)) {
Flags_SetTempClear(play, this->actor.room); Flags_SetTempClear(play, this->actor.room);
} else { } else {
func_80078884(NA_SE_SY_CORRECT_CHIME); Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
Flags_SetSwitch(play, this->switchFlag); Flags_SetSwitch(play, this->switchFlag);
} }
func_80078884(NA_SE_SY_GET_RUPY); Sfx_PlaySfxCentered(NA_SE_SY_GET_RUPY);
Actor_Kill(&this->actor); Actor_Kill(&this->actor);
} }
} }
@ -240,7 +240,7 @@ void EnGSwitch_SilverRupeeIdle(EnGSwitch* this, PlayState* play) {
if (this->actor.xyzDistToPlayerSq < SQ(30.0f)) { if (this->actor.xyzDistToPlayerSq < SQ(30.0f)) {
Rupees_ChangeBy(5); Rupees_ChangeBy(5);
sCollectedCount++; sCollectedCount++;
func_80078884(NA_SE_SY_GET_RUPY); Sfx_PlaySfxCentered(NA_SE_SY_GET_RUPY);
this->actor.world.pos = player->actor.world.pos; this->actor.world.pos = player->actor.world.pos;
this->actor.world.pos.y += 40.0f; this->actor.world.pos.y += 40.0f;
if (LINK_IS_ADULT) { if (LINK_IS_ADULT) {
@ -342,8 +342,8 @@ void EnGSwitch_GalleryRupee(EnGSwitch* this, PlayState* play) {
if (gallery->actor.update != NULL) { if (gallery->actor.update != NULL) {
gallery->hitCount++; gallery->hitCount++;
gallery->targetState[this->index] = ENSYATEKIHIT_HIT; gallery->targetState[this->index] = ENSYATEKIHIT_HIT;
func_80078884(NA_SE_EV_HIT_SOUND); Sfx_PlaySfxCentered(NA_SE_EV_HIT_SOUND);
func_80078884(NA_SE_SY_GET_RUPY); Sfx_PlaySfxCentered(NA_SE_SY_GET_RUPY);
// "Yeah !" // "Yeah !"
osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ いぇぇーす!HIT!! ☆☆☆☆☆ %d\n" VT_RST, gallery->hitCount); osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ いぇぇーす!HIT!! ☆☆☆☆☆ %d\n" VT_RST, gallery->hitCount);
EnGSwitch_Break(this, play); EnGSwitch_Break(this, play);

View file

@ -243,7 +243,7 @@ void EnGe1_SpotPlayer(EnGe1* this, PlayState* play) {
this->cutsceneTimer = 30; this->cutsceneTimer = 30;
this->actionFunc = EnGe1_KickPlayer; this->actionFunc = EnGe1_KickPlayer;
func_8002DF54(play, &this->actor, PLAYER_CSMODE_95); func_8002DF54(play, &this->actor, PLAYER_CSMODE_95);
func_80078884(NA_SE_SY_FOUND); Sfx_PlaySfxCentered(NA_SE_SY_FOUND);
Message_StartTextbox(play, 0x6000, &this->actor); Message_StartTextbox(play, 0x6000, &this->actor);
} }

View file

@ -481,7 +481,7 @@ void EnGe2_SetupCapturePlayer(EnGe2* this, PlayState* play) {
this->actor.speed = 0.0f; this->actor.speed = 0.0f;
EnGe2_ChangeAction(this, GE2_ACTION_CAPTURETURN); EnGe2_ChangeAction(this, GE2_ACTION_CAPTURETURN);
func_8002DF54(play, &this->actor, PLAYER_CSMODE_95); func_8002DF54(play, &this->actor, PLAYER_CSMODE_95);
func_80078884(NA_SE_SY_FOUND); Sfx_PlaySfxCentered(NA_SE_SY_FOUND);
Message_StartTextbox(play, 0x6000, &this->actor); Message_StartTextbox(play, 0x6000, &this->actor);
} }

View file

@ -370,7 +370,7 @@ void EnHeishi1_WaitNight(EnHeishi1* this, PlayState* play) {
if (this->actor.xzDistToPlayer < 100.0f) { if (this->actor.xzDistToPlayer < 100.0f) {
Message_StartTextbox(play, 0x702D, &this->actor); Message_StartTextbox(play, 0x702D, &this->actor);
func_80078884(NA_SE_SY_FOUND); Sfx_PlaySfxCentered(NA_SE_SY_FOUND);
osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 発見! ☆☆☆☆☆ \n" VT_RST); // "Discovered!" osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 発見! ☆☆☆☆☆ \n" VT_RST); // "Discovered!"
func_8002DF54(play, &this->actor, PLAYER_CSMODE_1); func_8002DF54(play, &this->actor, PLAYER_CSMODE_1);
this->actionFunc = EnHeishi1_SetupKick; this->actionFunc = EnHeishi1_SetupKick;
@ -453,7 +453,7 @@ void EnHeishi1_Update(Actor* thisx, PlayState* play) {
this->linkDetected = false; this->linkDetected = false;
// this 60 unit height check is so the player doesn't get caught when on the upper path // this 60 unit height check is so the player doesn't get caught when on the upper path
if (fabsf(player->actor.world.pos.y - this->actor.world.pos.y) < 60.0f) { if (fabsf(player->actor.world.pos.y - this->actor.world.pos.y) < 60.0f) {
func_80078884(NA_SE_SY_FOUND); Sfx_PlaySfxCentered(NA_SE_SY_FOUND);
// "Discovered!" // "Discovered!"
osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 発見! ☆☆☆☆☆ \n" VT_RST); osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 発見! ☆☆☆☆☆ \n" VT_RST);
func_8002DF54(play, &this->actor, PLAYER_CSMODE_1); func_8002DF54(play, &this->actor, PLAYER_CSMODE_1);

View file

@ -404,7 +404,7 @@ void func_80A53AD4(EnHeishi2* this, PlayState* play) {
if (Actor_ProcessTalkRequest(&this->actor, play)) { if (Actor_ProcessTalkRequest(&this->actor, play)) {
exchangeItemId = func_8002F368(play); exchangeItemId = func_8002F368(play);
if (exchangeItemId == EXCH_ITEM_ZELDAS_LETTER) { if (exchangeItemId == EXCH_ITEM_ZELDAS_LETTER) {
func_80078884(NA_SE_SY_CORRECT_CHIME); Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
player->actor.textId = 0x2010; player->actor.textId = 0x2010;
this->unk_300 = TEXT_STATE_EVENT; this->unk_300 = TEXT_STATE_EVENT;
this->actionFunc = func_80A53C0C; this->actionFunc = func_80A53C0C;
@ -725,7 +725,7 @@ void func_80A5475C(EnHeishi2* this, PlayState* play) {
if (this->unk_300 == TEXT_STATE_CHOICE) { if (this->unk_300 == TEXT_STATE_CHOICE) {
this->unk_309 = 1; this->unk_309 = 1;
func_80078884(NA_SE_SY_TRE_BOX_APPEAR); Sfx_PlaySfxCentered(NA_SE_SY_TRE_BOX_APPEAR);
this->actionFunc = func_80A540C0; this->actionFunc = func_80A540C0;
} }
return; return;

View file

@ -131,7 +131,7 @@ void EnHeishi3_StandSentinelInGrounds(EnHeishi3* this, PlayState* play) {
(fabsf(player->actor.world.pos.y - this->actor.world.pos.y) < 100.0f) && (sPlayerCaught == 0)) { (fabsf(player->actor.world.pos.y - this->actor.world.pos.y) < 100.0f) && (sPlayerCaught == 0)) {
sPlayerCaught = 1; sPlayerCaught = 1;
Message_StartTextbox(play, 0x702D, &this->actor); Message_StartTextbox(play, 0x702D, &this->actor);
func_80078884(NA_SE_SY_FOUND); Sfx_PlaySfxCentered(NA_SE_SY_FOUND);
osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 発見! ☆☆☆☆☆ \n" VT_RST); // "Discovered!" osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 発見! ☆☆☆☆☆ \n" VT_RST); // "Discovered!"
func_8002DF54(play, &this->actor, PLAYER_CSMODE_1); func_8002DF54(play, &this->actor, PLAYER_CSMODE_1);
this->actionFunc = EnHeishi3_CatchStart; this->actionFunc = EnHeishi3_CatchStart;
@ -159,7 +159,7 @@ void EnHeishi3_StandSentinelInCastle(EnHeishi3* this, PlayState* play) {
} }
sPlayerCaught = 1; sPlayerCaught = 1;
Message_StartTextbox(play, 0x702D, &this->actor); Message_StartTextbox(play, 0x702D, &this->actor);
func_80078884(NA_SE_SY_FOUND); Sfx_PlaySfxCentered(NA_SE_SY_FOUND);
osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 発見! ☆☆☆☆☆ \n" VT_RST); // "Discovered!" osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 発見! ☆☆☆☆☆ \n" VT_RST); // "Discovered!"
func_8002DF54(play, &this->actor, PLAYER_CSMODE_1); func_8002DF54(play, &this->actor, PLAYER_CSMODE_1);
this->actionFunc = EnHeishi3_CatchStart; this->actionFunc = EnHeishi3_CatchStart;

View file

@ -210,7 +210,7 @@ void EnHintnuts_SetupFreeze(EnHintnuts* this) {
this->animFlagAndTimer = 0; this->animFlagAndTimer = 0;
Actor_PlaySfx(&this->actor, NA_SE_EN_NUTS_FAINT); Actor_PlaySfx(&this->actor, NA_SE_EN_NUTS_FAINT);
if (sPuzzleCounter == -3) { if (sPuzzleCounter == -3) {
func_80078884(NA_SE_SY_ERROR); Sfx_PlaySfxCentered(NA_SE_SY_ERROR);
sPuzzleCounter = -4; sPuzzleCounter = -4;
} }
this->actionFunc = EnHintnuts_Freeze; this->actionFunc = EnHintnuts_Freeze;

View file

@ -212,7 +212,7 @@ void func_80A6E9AC(EnHs* this, PlayState* play) {
Animation_Change(&this->skelAnime, &object_hs_Anim_000304, 1.0f, 0.0f, Animation_Change(&this->skelAnime, &object_hs_Anim_000304, 1.0f, 0.0f,
Animation_GetLastFrame(&object_hs_Anim_000304), ANIMMODE_LOOP, 8.0f); Animation_GetLastFrame(&object_hs_Anim_000304), ANIMMODE_LOOP, 8.0f);
this->unk_2AA = 40; this->unk_2AA = 40;
func_80078884(NA_SE_SY_TRE_BOX_APPEAR); Sfx_PlaySfxCentered(NA_SE_SY_TRE_BOX_APPEAR);
} else { } else {
player->actor.textId = 0x10B1; player->actor.textId = 0x10B1;
func_80A6E3A0(this, func_80A6E6D8); func_80A6E3A0(this, func_80A6E6D8);

View file

@ -674,7 +674,7 @@ void EnInsect_Dropped(EnInsect* this, PlayState* play) {
if (this->soilActor != NULL) { if (this->soilActor != NULL) {
if (!(GET_GS_FLAGS(((this->soilActor->actor.params >> 8) & 0x1F) - 1) & if (!(GET_GS_FLAGS(((this->soilActor->actor.params >> 8) & 0x1F) - 1) &
(this->soilActor->actor.params & 0xFF))) { (this->soilActor->actor.params & 0xFF))) {
func_80078884(NA_SE_SY_TRE_BOX_APPEAR); Sfx_PlaySfxCentered(NA_SE_SY_TRE_BOX_APPEAR);
} }
} }
this->insectFlags |= INSECT_FLAG_7; this->insectFlags |= INSECT_FLAG_7;

View file

@ -220,7 +220,7 @@ void EnJj_BeginCutscene(EnJj* this, PlayState* play) {
DynaPoly_DisableCollision(play, &play->colCtx.dyna, bodyCollisionActor->bgId); DynaPoly_DisableCollision(play, &play->colCtx.dyna, bodyCollisionActor->bgId);
func_8005B1A4(GET_ACTIVE_CAM(play)); func_8005B1A4(GET_ACTIVE_CAM(play));
SET_EVENTCHKINF(EVENTCHKINF_3A); SET_EVENTCHKINF(EVENTCHKINF_3A);
func_80078884(NA_SE_SY_CORRECT_CHIME); Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
} }
} }

View file

@ -126,7 +126,7 @@ void func_80A90264(EnKakasi2* this, PlayState* play) {
OnePointCutscene_Attention(play, &this->actor); OnePointCutscene_Attention(play, &this->actor);
this->actor.flags |= ACTOR_FLAG_0 | ACTOR_FLAG_27; this->actor.flags |= ACTOR_FLAG_0 | ACTOR_FLAG_27;
func_80078884(NA_SE_SY_CORRECT_CHIME); Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
if (this->switchFlag >= 0) { if (this->switchFlag >= 0) {
Flags_SetSwitch(play, this->switchFlag); Flags_SetSwitch(play, this->switchFlag);
} }
@ -149,7 +149,7 @@ void func_80A90264(EnKakasi2* this, PlayState* play) {
Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit); Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit);
SkelAnime_InitFlex(play, &this->skelAnime, &object_ka_Skel_0065B0, &object_ka_Anim_000214, NULL, NULL, 0); SkelAnime_InitFlex(play, &this->skelAnime, &object_ka_Skel_0065B0, &object_ka_Anim_000214, NULL, NULL, 0);
OnePointCutscene_Attention(play, &this->actor); OnePointCutscene_Attention(play, &this->actor);
func_80078884(NA_SE_SY_CORRECT_CHIME); Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
this->actor.flags |= ACTOR_FLAG_0 | ACTOR_FLAG_27; this->actor.flags |= ACTOR_FLAG_0 | ACTOR_FLAG_27;
this->actionFunc = func_80A904D8; this->actionFunc = func_80A904D8;

View file

@ -254,7 +254,7 @@ void EnMk_Wait(EnMk* this, PlayState* play) {
Animation_GetLastFrame(&object_mk_Anim_000368), ANIMMODE_ONCE, -4.0f); Animation_GetLastFrame(&object_mk_Anim_000368), ANIMMODE_ONCE, -4.0f);
this->flags &= ~2; this->flags &= ~2;
gSaveContext.subTimerState = SUBTIMER_STATE_OFF; gSaveContext.subTimerState = SUBTIMER_STATE_OFF;
func_80078884(NA_SE_SY_TRE_BOX_APPEAR); Sfx_PlaySfxCentered(NA_SE_SY_TRE_BOX_APPEAR);
break; break;
default: default:
player->actor.textId = 0x4018; player->actor.textId = 0x4018;
@ -334,7 +334,7 @@ void EnMk_Update(Actor* thisx, PlayState* play) {
if (!(this->flags & 4) && (this->swimFlag >= 8)) { if (!(this->flags & 4) && (this->swimFlag >= 8)) {
this->flags |= 4; this->flags |= 4;
func_80078884(NA_SE_SY_CORRECT_CHIME); Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
} }
} }
} }

View file

@ -294,7 +294,7 @@ void func_80AADCD0(EnMm* this, PlayState* play) {
if (this->curAnimIndex != 5) { if (this->curAnimIndex != 5) {
if ((this->actor.textId == 0x202A) || (this->actor.textId == 0x202B)) { if ((this->actor.textId == 0x202A) || (this->actor.textId == 0x202B)) {
EnMm_ChangeAnim(this, RM_ANIM_EXCITED, &this->curAnimIndex); EnMm_ChangeAnim(this, RM_ANIM_EXCITED, &this->curAnimIndex);
func_80078884(NA_SE_SY_TRE_BOX_APPEAR); Sfx_PlaySfxCentered(NA_SE_SY_TRE_BOX_APPEAR);
} }
} }
} else { } else {

View file

@ -460,7 +460,7 @@ void EnNb_SetupLightArrowOrSealingCs(EnNb* this, PlayState* play) {
} }
void EnNb_PlaySealingSfx(void) { void EnNb_PlaySealingSfx(void) {
func_800788CC(NA_SE_SY_WHITE_OUT_T); Sfx_PlaySfxCentered2(NA_SE_SY_WHITE_OUT_T);
} }
void EnNb_InitializeDemo6K(EnNb* this, PlayState* play) { void EnNb_InitializeDemo6K(EnNb* this, PlayState* play) {
@ -575,13 +575,13 @@ void EnNb_InitKidnap(EnNb* this, PlayState* play) {
void EnNb_PlayCrySFX(EnNb* this, PlayState* play) { void EnNb_PlayCrySFX(EnNb* this, PlayState* play) {
if (play->csCtx.curFrame == 3) { if (play->csCtx.curFrame == 3) {
func_80078914(&this->actor.projectedPos, NA_SE_VO_NB_CRY_0); Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_VO_NB_CRY_0);
} }
} }
void EnNb_PlayAgonySFX(EnNb* this, PlayState* play) { void EnNb_PlayAgonySFX(EnNb* this, PlayState* play) {
if (play->csCtx.curFrame == 420) { if (play->csCtx.curFrame == 420) {
func_80078914(&this->actor.projectedPos, NA_SE_VO_NB_AGONY); Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_VO_NB_AGONY);
} }
} }
@ -709,8 +709,8 @@ void EnNb_PlayKnuckleDefeatSFX(EnNb* this, PlayState* play) {
s32 pad[2]; s32 pad[2];
if (play->csCtx.curFrame == 548) { if (play->csCtx.curFrame == 548) {
func_80078914(&this->actor.projectedPos, NA_SE_VO_NB_CRY_0); Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_VO_NB_CRY_0);
func_80078914(&this->actor.projectedPos, NA_SE_EN_FANTOM_HIT_THUNDER); Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_EN_FANTOM_HIT_THUNDER);
} }
} }
@ -719,7 +719,7 @@ void EnNb_PlayKneelingOnGroundSFX(EnNb* this) {
if ((this->skelAnime.mode == 2) && if ((this->skelAnime.mode == 2) &&
(Animation_OnFrame(&this->skelAnime, 18.0f) || Animation_OnFrame(&this->skelAnime, 25.0f))) { (Animation_OnFrame(&this->skelAnime, 18.0f) || Animation_OnFrame(&this->skelAnime, 25.0f))) {
func_80078914(&this->actor.projectedPos, NA_SE_EV_HUMAN_BOUND); Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_EV_HUMAN_BOUND);
} }
} }
@ -727,7 +727,7 @@ void EnNb_PlayLookRightSFX(EnNb* this) {
s32 pad[2]; s32 pad[2];
if ((this->skelAnime.mode == 2) && Animation_OnFrame(&this->skelAnime, 9.0f)) { if ((this->skelAnime.mode == 2) && Animation_OnFrame(&this->skelAnime, 9.0f)) {
func_80078914(&this->actor.projectedPos, NA_SE_PL_WALK_GROUND + SURFACE_SFX_OFFSET_STONE); Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_PL_WALK_GROUND + SURFACE_SFX_OFFSET_STONE);
} }
} }
@ -735,7 +735,7 @@ void EnNb_PlayLookLeftSFX(EnNb* this) {
s32 pad[2]; s32 pad[2];
if (Animation_OnFrame(&this->skelAnime, 9.0f) || Animation_OnFrame(&this->skelAnime, 13.0f)) { if (Animation_OnFrame(&this->skelAnime, 9.0f) || Animation_OnFrame(&this->skelAnime, 13.0f)) {
func_80078914(&this->actor.projectedPos, NA_SE_PL_WALK_GROUND + SURFACE_SFX_OFFSET_STONE); Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_PL_WALK_GROUND + SURFACE_SFX_OFFSET_STONE);
} }
} }
@ -1154,7 +1154,7 @@ void func_80AB359C(EnNb* this) {
} }
void EnNb_SetNoticeSFX(EnNb* this) { void EnNb_SetNoticeSFX(EnNb* this) {
func_80078914(&this->actor.projectedPos, NA_SE_VO_NB_NOTICE); Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_VO_NB_NOTICE);
} }
s32 EnNb_GetNoticedStatus(EnNb* this, PlayState* play) { s32 EnNb_GetNoticedStatus(EnNb* this, PlayState* play) {

View file

@ -260,7 +260,7 @@ void func_80ABA244(EnNiwLady* this, PlayState* play) {
osSyncPrintf("\n\n"); osSyncPrintf("\n\n");
if (Text_GetFaceReaction(play, 8) == 0) { if (Text_GetFaceReaction(play, 8) == 0) {
if (this->actor.textId == 0x503C) { if (this->actor.textId == 0x503C) {
func_80078884(NA_SE_SY_ERROR); Sfx_PlaySfxCentered(NA_SE_SY_ERROR);
this->unk_26C = 2; this->unk_26C = 2;
this->unk_262 = TEXT_STATE_EVENT; this->unk_262 = TEXT_STATE_EVENT;
this->actionFunc = func_80ABA654; this->actionFunc = func_80ABA654;
@ -268,7 +268,7 @@ void func_80ABA244(EnNiwLady* this, PlayState* play) {
} }
this->unk_26E = phi_s1 + 1; this->unk_26E = phi_s1 + 1;
if (phi_s1 == 7) { if (phi_s1 == 7) {
func_80078884(NA_SE_SY_TRE_BOX_APPEAR); Sfx_PlaySfxCentered(NA_SE_SY_TRE_BOX_APPEAR);
this->unk_26C = 1; this->unk_26C = 1;
this->unk_262 = TEXT_STATE_EVENT; this->unk_262 = TEXT_STATE_EVENT;
this->unk_26A = this->cuccosInPen; this->unk_26A = this->cuccosInPen;
@ -285,9 +285,9 @@ void func_80ABA244(EnNiwLady* this, PlayState* play) {
} }
if (this->unk_26A != this->cuccosInPen) { if (this->unk_26A != this->cuccosInPen) {
if (this->cuccosInPen < this->unk_26A) { if (this->cuccosInPen < this->unk_26A) {
func_80078884(NA_SE_SY_ERROR); Sfx_PlaySfxCentered(NA_SE_SY_ERROR);
} else if (phi_s1 + 1 < 9) { } else if (phi_s1 + 1 < 9) {
func_80078884(NA_SE_SY_TRE_BOX_APPEAR); Sfx_PlaySfxCentered(NA_SE_SY_TRE_BOX_APPEAR);
} }
} }
if (this->unk_26A < this->cuccosInPen) { if (this->unk_26A < this->cuccosInPen) {
@ -367,7 +367,7 @@ void func_80ABA878(EnNiwLady* this, PlayState* play) {
if (Actor_ProcessTalkRequest(&this->actor, play)) { if (Actor_ProcessTalkRequest(&this->actor, play)) {
playerExchangeItemId = func_8002F368(play); playerExchangeItemId = func_8002F368(play);
if ((playerExchangeItemId == EXCH_ITEM_POCKET_CUCCO) && GET_EVENTCHKINF(EVENTCHKINF_TALON_WOKEN_IN_KAKARIKO)) { if ((playerExchangeItemId == EXCH_ITEM_POCKET_CUCCO) && GET_EVENTCHKINF(EVENTCHKINF_TALON_WOKEN_IN_KAKARIKO)) {
func_80078884(NA_SE_SY_TRE_BOX_APPEAR); Sfx_PlaySfxCentered(NA_SE_SY_TRE_BOX_APPEAR);
player->actor.textId = sTradeItemTextIds[5]; player->actor.textId = sTradeItemTextIds[5];
this->unk_26E = this->unk_27A + 21; this->unk_26E = this->unk_27A + 21;
this->unk_262 = TEXT_STATE_CHOICE; this->unk_262 = TEXT_STATE_CHOICE;

View file

@ -156,7 +156,7 @@ void func_80ABF0CC(EnOkarinaTag* this, PlayState* play) {
(play->sceneId != SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS)) { (play->sceneId != SCENE_GREAT_FAIRYS_FOUNTAIN_SPELLS)) {
play->msgCtx.ocarinaMode = OCARINA_MODE_04; play->msgCtx.ocarinaMode = OCARINA_MODE_04;
} }
func_80078884(NA_SE_SY_CORRECT_CHIME); Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
this->actionFunc = func_80ABEF2C; this->actionFunc = func_80ABEF2C;
return; return;
} }
@ -169,7 +169,7 @@ void func_80ABF0CC(EnOkarinaTag* this, PlayState* play) {
Flags_SetSwitch(play, this->switchFlag); Flags_SetSwitch(play, this->switchFlag);
} }
play->msgCtx.ocarinaMode = OCARINA_MODE_04; play->msgCtx.ocarinaMode = OCARINA_MODE_04;
func_80078884(NA_SE_SY_CORRECT_CHIME); Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
this->actionFunc = func_80ABEF2C; this->actionFunc = func_80ABEF2C;
return; return;
} }
@ -232,7 +232,7 @@ void func_80ABF4C8(EnOkarinaTag* this, PlayState* play) {
if (play->msgCtx.ocarinaMode == OCARINA_MODE_04) { if (play->msgCtx.ocarinaMode == OCARINA_MODE_04) {
this->actionFunc = func_80ABF28C; this->actionFunc = func_80ABF28C;
} else if (play->msgCtx.ocarinaMode == OCARINA_MODE_03) { } else if (play->msgCtx.ocarinaMode == OCARINA_MODE_03) {
func_80078884(NA_SE_SY_CORRECT_CHIME); Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
if (this->switchFlag >= 0) { if (this->switchFlag >= 0) {
Flags_SetSwitch(play, this->switchFlag); Flags_SetSwitch(play, this->switchFlag);
} }
@ -257,7 +257,7 @@ void func_80ABF4C8(EnOkarinaTag* this, PlayState* play) {
: SEGMENTED_TO_VIRTUAL(spot02_scene_Cs_005020); : SEGMENTED_TO_VIRTUAL(spot02_scene_Cs_005020);
gSaveContext.cutsceneTrigger = 1; gSaveContext.cutsceneTrigger = 1;
SET_EVENTCHKINF(EVENTCHKINF_1D); SET_EVENTCHKINF(EVENTCHKINF_1D);
func_80078884(NA_SE_SY_CORRECT_CHIME); Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
break; break;
default: default:
break; break;

View file

@ -725,7 +725,7 @@ void EnOssan_ChooseTalkToOwner(PlayState* play, EnOssan* this) {
} }
void EnOssan_SetLookToShopkeeperFromShelf(PlayState* play, EnOssan* this) { void EnOssan_SetLookToShopkeeperFromShelf(PlayState* play, EnOssan* this) {
func_80078884(NA_SE_SY_CURSOR); Sfx_PlaySfxCentered(NA_SE_SY_CURSOR);
this->drawCursor = 0; this->drawCursor = 0;
this->stateFlag = OSSAN_STATE_LOOK_SHOPKEEPER; this->stateFlag = OSSAN_STATE_LOOK_SHOPKEEPER;
} }
@ -898,7 +898,7 @@ void EnOssan_State_StartConversation(EnOssan* this, PlayState* play, Player* pla
} }
} }
} else if (dialogState == TEXT_STATE_EVENT && Message_ShouldAdvance(play)) { } else if (dialogState == TEXT_STATE_EVENT && Message_ShouldAdvance(play)) {
func_80078884(NA_SE_SY_MESSAGE_PASS); Sfx_PlaySfxCentered(NA_SE_SY_MESSAGE_PASS);
switch (this->happyMaskShopState) { switch (this->happyMaskShopState) {
case OSSAN_HAPPY_STATE_ALL_MASKS_SOLD: case OSSAN_HAPPY_STATE_ALL_MASKS_SOLD:
@ -950,7 +950,7 @@ void EnOssan_State_FacingShopkeeper(EnOssan* this, PlayState* play, Player* play
if ((Message_GetState(&play->msgCtx) == TEXT_STATE_CHOICE) && if ((Message_GetState(&play->msgCtx) == TEXT_STATE_CHOICE) &&
!EnOssan_TestEndInteraction(this, play, &play->state.input[0])) { !EnOssan_TestEndInteraction(this, play, &play->state.input[0])) {
if (Message_ShouldAdvance(play) && EnOssan_FacingShopkeeperDialogResult(this, play)) { if (Message_ShouldAdvance(play) && EnOssan_FacingShopkeeperDialogResult(this, play)) {
func_80078884(NA_SE_SY_DECIDE); Sfx_PlaySfxCentered(NA_SE_SY_DECIDE);
return; return;
} }
// Stick Left // Stick Left
@ -961,7 +961,7 @@ void EnOssan_State_FacingShopkeeper(EnOssan* this, PlayState* play, Player* play
this->stateFlag = OSSAN_STATE_LOOK_SHELF_LEFT; this->stateFlag = OSSAN_STATE_LOOK_SHELF_LEFT;
Interface_SetDoAction(play, DO_ACTION_DECIDE); Interface_SetDoAction(play, DO_ACTION_DECIDE);
this->stickLeftPrompt.isEnabled = false; this->stickLeftPrompt.isEnabled = false;
func_80078884(NA_SE_SY_CURSOR); Sfx_PlaySfxCentered(NA_SE_SY_CURSOR);
} }
} else if (this->stickAccumX > 0) { } else if (this->stickAccumX > 0) {
nextIndex = EnOssan_SetCursorIndexFromNeutral(this, 0); nextIndex = EnOssan_SetCursorIndexFromNeutral(this, 0);
@ -970,7 +970,7 @@ void EnOssan_State_FacingShopkeeper(EnOssan* this, PlayState* play, Player* play
this->stateFlag = OSSAN_STATE_LOOK_SHELF_RIGHT; this->stateFlag = OSSAN_STATE_LOOK_SHELF_RIGHT;
Interface_SetDoAction(play, DO_ACTION_DECIDE); Interface_SetDoAction(play, DO_ACTION_DECIDE);
this->stickRightPrompt.isEnabled = false; this->stickRightPrompt.isEnabled = false;
func_80078884(NA_SE_SY_CURSOR); Sfx_PlaySfxCentered(NA_SE_SY_CURSOR);
} }
} }
} }
@ -1126,23 +1126,23 @@ s32 EnOssan_HasPlayerSelectedItem(PlayState* play, EnOssan* this, Input* input)
case SI_ZORA_MASK: case SI_ZORA_MASK:
case SI_GORON_MASK: case SI_GORON_MASK:
case SI_GERUDO_MASK: case SI_GERUDO_MASK:
func_80078884(NA_SE_SY_DECIDE); Sfx_PlaySfxCentered(NA_SE_SY_DECIDE);
this->drawCursor = 0; this->drawCursor = 0;
this->stateFlag = OSSAN_STATE_SELECT_ITEM_MASK; this->stateFlag = OSSAN_STATE_SELECT_ITEM_MASK;
return true; return true;
case SI_MILK_BOTTLE: case SI_MILK_BOTTLE:
func_80078884(NA_SE_SY_DECIDE); Sfx_PlaySfxCentered(NA_SE_SY_DECIDE);
this->drawCursor = 0; this->drawCursor = 0;
this->stateFlag = OSSAN_STATE_SELECT_ITEM_BOTTLE_MILK_FULL; this->stateFlag = OSSAN_STATE_SELECT_ITEM_BOTTLE_MILK_FULL;
return true; return true;
case SI_WEIRD_EGG: case SI_WEIRD_EGG:
func_80078884(NA_SE_SY_DECIDE); Sfx_PlaySfxCentered(NA_SE_SY_DECIDE);
this->drawCursor = 0; this->drawCursor = 0;
this->stateFlag = OSSAN_STATE_SELECT_ITEM_WEIRD_EGG; this->stateFlag = OSSAN_STATE_SELECT_ITEM_WEIRD_EGG;
return true; return true;
case SI_19: case SI_19:
case SI_20: case SI_20:
func_80078884(NA_SE_SY_ERROR); Sfx_PlaySfxCentered(NA_SE_SY_ERROR);
this->drawCursor = 0; this->drawCursor = 0;
this->stateFlag = OSSAN_STATE_SELECT_ITEM_UNIMPLEMENTED; this->stateFlag = OSSAN_STATE_SELECT_ITEM_UNIMPLEMENTED;
return true; return true;
@ -1151,18 +1151,18 @@ s32 EnOssan_HasPlayerSelectedItem(PlayState* play, EnOssan* this, Input* input)
case SI_BOMBS_20: case SI_BOMBS_20:
case SI_BOMBS_30: case SI_BOMBS_30:
case SI_BOMBS_5_R35: case SI_BOMBS_5_R35:
func_80078884(NA_SE_SY_DECIDE); Sfx_PlaySfxCentered(NA_SE_SY_DECIDE);
this->drawCursor = 0; this->drawCursor = 0;
this->stateFlag = OSSAN_STATE_SELECT_ITEM_BOMBS; this->stateFlag = OSSAN_STATE_SELECT_ITEM_BOMBS;
return true; return true;
default: default:
func_80078884(NA_SE_SY_DECIDE); Sfx_PlaySfxCentered(NA_SE_SY_DECIDE);
this->drawCursor = 0; this->drawCursor = 0;
this->stateFlag = OSSAN_STATE_SELECT_ITEM; this->stateFlag = OSSAN_STATE_SELECT_ITEM;
return true; return true;
} }
} }
func_80078884(NA_SE_SY_ERROR); Sfx_PlaySfxCentered(NA_SE_SY_ERROR);
return true; return true;
} }
return false; return false;
@ -1223,7 +1223,7 @@ void EnOssan_State_BrowseLeftShelf(EnOssan* this, PlayState* play, Player* playe
EnOssan_CursorUpDown(this); EnOssan_CursorUpDown(this);
if (this->cursorIndex != prevIndex) { if (this->cursorIndex != prevIndex) {
Message_ContinueTextbox(play, this->shelfSlots[this->cursorIndex]->actor.textId); Message_ContinueTextbox(play, this->shelfSlots[this->cursorIndex]->actor.textId);
func_80078884(NA_SE_SY_CURSOR); Sfx_PlaySfxCentered(NA_SE_SY_CURSOR);
} }
} }
} }
@ -1282,7 +1282,7 @@ void EnOssan_State_BrowseRightShelf(EnOssan* this, PlayState* play, Player* play
EnOssan_CursorUpDown(this); EnOssan_CursorUpDown(this);
if (this->cursorIndex != prevIndex) { if (this->cursorIndex != prevIndex) {
Message_ContinueTextbox(play, this->shelfSlots[this->cursorIndex]->actor.textId); Message_ContinueTextbox(play, this->shelfSlots[this->cursorIndex]->actor.textId);
func_80078884(NA_SE_SY_CURSOR); Sfx_PlaySfxCentered(NA_SE_SY_CURSOR);
} }
} }
} }
@ -1362,19 +1362,19 @@ void EnOssan_HandleCanBuyItem(PlayState* play, EnOssan* this) {
selectedItem->setOutOfStockFunc(play, selectedItem); selectedItem->setOutOfStockFunc(play, selectedItem);
break; break;
case CANBUY_RESULT_CANT_GET_NOW: case CANBUY_RESULT_CANT_GET_NOW:
func_80078884(NA_SE_SY_ERROR); Sfx_PlaySfxCentered(NA_SE_SY_ERROR);
EnOssan_SetStateCantGetItem(play, this, 0x86); EnOssan_SetStateCantGetItem(play, this, 0x86);
break; break;
case CANBUY_RESULT_NEED_BOTTLE: case CANBUY_RESULT_NEED_BOTTLE:
func_80078884(NA_SE_SY_ERROR); Sfx_PlaySfxCentered(NA_SE_SY_ERROR);
EnOssan_SetStateCantGetItem(play, this, 0x96); EnOssan_SetStateCantGetItem(play, this, 0x96);
break; break;
case CANBUY_RESULT_NEED_RUPEES: case CANBUY_RESULT_NEED_RUPEES:
func_80078884(NA_SE_SY_ERROR); Sfx_PlaySfxCentered(NA_SE_SY_ERROR);
EnOssan_SetStateCantGetItem(play, this, 0x85); EnOssan_SetStateCantGetItem(play, this, 0x85);
break; break;
case CANBUY_RESULT_CANT_GET_NOW_5: case CANBUY_RESULT_CANT_GET_NOW_5:
func_80078884(NA_SE_SY_ERROR); Sfx_PlaySfxCentered(NA_SE_SY_ERROR);
EnOssan_SetStateCantGetItem(play, this, 0x86); EnOssan_SetStateCantGetItem(play, this, 0x86);
break; break;
} }
@ -1423,11 +1423,11 @@ void EnOssan_HandleCanBuyWeirdEgg(PlayState* play, EnOssan* this) {
item->setOutOfStockFunc(play, item); item->setOutOfStockFunc(play, item);
break; break;
case CANBUY_RESULT_CANT_GET_NOW: case CANBUY_RESULT_CANT_GET_NOW:
func_80078884(NA_SE_SY_ERROR); Sfx_PlaySfxCentered(NA_SE_SY_ERROR);
EnOssan_SetStateCantGetItem(play, this, 0x9D); EnOssan_SetStateCantGetItem(play, this, 0x9D);
break; break;
case CANBUY_RESULT_NEED_RUPEES: case CANBUY_RESULT_NEED_RUPEES:
func_80078884(NA_SE_SY_ERROR); Sfx_PlaySfxCentered(NA_SE_SY_ERROR);
EnOssan_SetStateCantGetItem(play, this, 0x85); EnOssan_SetStateCantGetItem(play, this, 0x85);
break; break;
} }
@ -1446,11 +1446,11 @@ void EnOssan_HandleCanBuyBombs(PlayState* play, EnOssan* this) {
item->setOutOfStockFunc(play, item); item->setOutOfStockFunc(play, item);
break; break;
case CANBUY_RESULT_CANT_GET_NOW: case CANBUY_RESULT_CANT_GET_NOW:
func_80078884(NA_SE_SY_ERROR); Sfx_PlaySfxCentered(NA_SE_SY_ERROR);
EnOssan_SetStateCantGetItem(play, this, 0x86); EnOssan_SetStateCantGetItem(play, this, 0x86);
break; break;
case CANBUY_RESULT_NEED_RUPEES: case CANBUY_RESULT_NEED_RUPEES:
func_80078884(NA_SE_SY_ERROR); Sfx_PlaySfxCentered(NA_SE_SY_ERROR);
EnOssan_SetStateCantGetItem(play, this, 0x85); EnOssan_SetStateCantGetItem(play, this, 0x85);
break; break;
} }

View file

@ -948,7 +948,7 @@ void func_80ACC00C(EnOwl* this, PlayState* play) {
break; break;
} }
func_80078884(NA_SE_SY_TRE_BOX_APPEAR); Sfx_PlaySfxCentered(NA_SE_SY_TRE_BOX_APPEAR);
gSaveContext.cutsceneTrigger = 1; gSaveContext.cutsceneTrigger = 1;
func_800F44EC(0x14, 0xA); func_800F44EC(0x14, 0xA);
this->actionFunc = EnOwl_WaitDefault; this->actionFunc = EnOwl_WaitDefault;

View file

@ -324,7 +324,7 @@ void func_80AD42B0(EnPoField* this) {
this->actor.scale.y = 0.0f; this->actor.scale.y = 0.0f;
Actor_PlaySfx(&this->actor, NA_SE_EV_METAL_BOX_BOUND); Actor_PlaySfx(&this->actor, NA_SE_EV_METAL_BOX_BOUND);
if (this->actor.params == EN_PO_FIELD_BIG) { if (this->actor.params == EN_PO_FIELD_BIG) {
func_80078884(NA_SE_SY_TRE_BOX_APPEAR); Sfx_PlaySfxCentered(NA_SE_SY_TRE_BOX_APPEAR);
} }
this->actionFunc = func_80AD587C; this->actionFunc = func_80AD587C;
} }

View file

@ -817,7 +817,7 @@ void func_80ADB17C(EnPoSisters* this, PlayState* play) {
Flags_UnsetSwitch(play, 0x1B); Flags_UnsetSwitch(play, 0x1B);
} }
play->envCtx.lightSettingOverride = LIGHT_SETTING_OVERRIDE_NONE; play->envCtx.lightSettingOverride = LIGHT_SETTING_OVERRIDE_NONE;
func_80078884(NA_SE_SY_CORRECT_CHIME); Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
Actor_Kill(&this->actor); Actor_Kill(&this->actor);
} else if (this->unk_19A < 32) { } else if (this->unk_19A < 32) {
func_80AD9240(this, this->unk_19A, &this->actor.world.pos); func_80AD9240(this, this->unk_19A, &this->actor.world.pos);

View file

@ -289,7 +289,7 @@ void EnRiverSound_Draw(Actor* thisx, PlayState* play) {
} else if ((this->actor.params == RS_SANDSTORM) || (this->actor.params == RS_CHAMBER_OF_SAGES_1) || } else if ((this->actor.params == RS_SANDSTORM) || (this->actor.params == RS_CHAMBER_OF_SAGES_1) ||
(this->actor.params == RS_CHAMBER_OF_SAGES_2) || (this->actor.params == RS_RUMBLING)) { (this->actor.params == RS_CHAMBER_OF_SAGES_2) || (this->actor.params == RS_RUMBLING)) {
// Play sfx in the fixed center of the screen // Play sfx in the fixed center of the screen
func_800788CC(soundEffects[this->actor.params]); Sfx_PlaySfxCentered2(soundEffects[this->actor.params]);
} else { } else {
// Play sfx at the location of riverSounds projected position // Play sfx at the location of riverSounds projected position
Actor_PlaySfx(&this->actor, soundEffects[this->actor.params]); Actor_PlaySfx(&this->actor, soundEffects[this->actor.params]);

View file

@ -558,14 +558,14 @@ void func_80AEBA2C(EnRu1* this, PlayState* play) {
void func_80AEBAFC(EnRu1* this) { void func_80AEBAFC(EnRu1* this) {
if (this->unk_298 == 0) { if (this->unk_298 == 0) {
func_80078914(&this->actor.projectedPos, NA_SE_EV_DIVE_INTO_WATER); Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_EV_DIVE_INTO_WATER);
this->unk_298 = 1; this->unk_298 = 1;
} }
} }
void func_80AEBB3C(EnRu1* this) { void func_80AEBB3C(EnRu1* this) {
if (Animation_OnFrame(&this->skelAnime, 5.0f)) { if (Animation_OnFrame(&this->skelAnime, 5.0f)) {
func_80078914(&this->actor.projectedPos, NA_SE_PL_FACE_UP); Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_PL_FACE_UP);
} }
} }
@ -574,13 +574,13 @@ void func_80AEBB78(EnRu1* this) {
if (Animation_OnFrame(skelAnime, 4.0f) || Animation_OnFrame(skelAnime, 13.0f) || if (Animation_OnFrame(skelAnime, 4.0f) || Animation_OnFrame(skelAnime, 13.0f) ||
Animation_OnFrame(skelAnime, 22.0f) || Animation_OnFrame(skelAnime, 31.0f)) { Animation_OnFrame(skelAnime, 22.0f) || Animation_OnFrame(skelAnime, 31.0f)) {
func_80078914(&this->actor.projectedPos, NA_SE_PL_SWIM); Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_PL_SWIM);
} }
} }
void func_80AEBBF4(EnRu1* this) { void func_80AEBBF4(EnRu1* this) {
if (Animation_OnFrame(&this->skelAnime, 8.0f)) { if (Animation_OnFrame(&this->skelAnime, 8.0f)) {
func_80078914(&this->actor.projectedPos, NA_SE_PL_SUBMERGE); Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_PL_SUBMERGE);
} }
} }
@ -596,7 +596,7 @@ void func_80AEBC30(PlayState* play) {
void func_80AEBC84(EnRu1* this, PlayState* play) { void func_80AEBC84(EnRu1* this, PlayState* play) {
if (play->csCtx.curFrame == 130) { if (play->csCtx.curFrame == 130) {
func_80078914(&this->actor.projectedPos, NA_SE_VO_RT_LAUGH_0); Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_VO_RT_LAUGH_0);
} }
} }
@ -831,14 +831,14 @@ void func_80AEC650(EnRu1* this) {
if (this->unk_280 == 0) { if (this->unk_280 == 0) {
if (Animation_OnFrame(&this->skelAnime, 2.0f) || Animation_OnFrame(&this->skelAnime, 7.0f)) { if (Animation_OnFrame(&this->skelAnime, 2.0f) || Animation_OnFrame(&this->skelAnime, 7.0f)) {
func_80078914(&this->actor.projectedPos, NA_SE_PL_WALK_GROUND + SURFACE_SFX_OFFSET_JABU); Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_PL_WALK_GROUND + SURFACE_SFX_OFFSET_JABU);
} }
} }
} }
void func_80AEC6B0(EnRu1* this) { void func_80AEC6B0(EnRu1* this) {
func_80078914(&this->actor.projectedPos, NA_SE_EV_FALL_DOWN_DIRT); Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_EV_FALL_DOWN_DIRT);
func_80078914(&this->actor.projectedPos, NA_SE_VO_RT_FALL); Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_VO_RT_FALL);
} }
void func_80AEC6E4(EnRu1* this, PlayState* play) { void func_80AEC6E4(EnRu1* this, PlayState* play) {
@ -1189,7 +1189,7 @@ void func_80AED44C(EnRu1* this, PlayState* play) {
} }
void func_80AED4FC(EnRu1* this) { void func_80AED4FC(EnRu1* this) {
func_80078914(&this->actor.projectedPos, NA_SE_EV_LAND_DIRT); Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_EV_LAND_DIRT);
} }
void func_80AED520(EnRu1* this, PlayState* play) { void func_80AED520(EnRu1* this, PlayState* play) {
@ -1197,25 +1197,25 @@ void func_80AED520(EnRu1* this, PlayState* play) {
Audio_PlaySfxGeneral(NA_SE_PL_PULL_UP_RUTO, &player->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale, Audio_PlaySfxGeneral(NA_SE_PL_PULL_UP_RUTO, &player->actor.projectedPos, 4, &gSfxDefaultFreqAndVolScale,
&gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb); &gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
func_80078914(&this->actor.projectedPos, NA_SE_VO_RT_LIFT); Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_VO_RT_LIFT);
} }
void func_80AED57C(EnRu1* this) { void func_80AED57C(EnRu1* this) {
if (this->actor.speed != 0.0f) { if (this->actor.speed != 0.0f) {
func_80078914(&this->actor.projectedPos, NA_SE_VO_RT_THROW); Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_VO_RT_THROW);
} }
} }
void func_80AED5B8(EnRu1* this) { void func_80AED5B8(EnRu1* this) {
func_80078914(&this->actor.projectedPos, NA_SE_VO_RT_CRASH); Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_VO_RT_CRASH);
} }
void func_80AED5DC(EnRu1* this) { void func_80AED5DC(EnRu1* this) {
func_80078914(&this->actor.projectedPos, NA_SE_VO_RT_UNBALLANCE); Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_VO_RT_UNBALLANCE);
} }
void func_80AED600(EnRu1* this) { void func_80AED600(EnRu1* this) {
func_80078914(&this->actor.projectedPos, NA_SE_VO_RT_DISCOVER); Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_VO_RT_DISCOVER);
} }
s32 func_80AED624(EnRu1* this, PlayState* play) { s32 func_80AED624(EnRu1* this, PlayState* play) {
@ -1804,7 +1804,7 @@ void func_80AEEFEC(EnRu1* this, PlayState* play) {
void func_80AEF080(EnRu1* this) { void func_80AEF080(EnRu1* this) {
if (Animation_OnFrame(&this->skelAnime, 11.0f)) { if (Animation_OnFrame(&this->skelAnime, 11.0f)) {
func_80078914(&this->actor.projectedPos, NA_SE_EV_LAND_DIRT); Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_EV_LAND_DIRT);
} }
} }
@ -1897,7 +1897,7 @@ void func_80AEF40C(EnRu1* this) {
if (Animation_OnFrame(skelAnime, 2.0f) || Animation_OnFrame(skelAnime, 7.0f) || if (Animation_OnFrame(skelAnime, 2.0f) || Animation_OnFrame(skelAnime, 7.0f) ||
Animation_OnFrame(skelAnime, 12.0f) || Animation_OnFrame(skelAnime, 18.0f) || Animation_OnFrame(skelAnime, 12.0f) || Animation_OnFrame(skelAnime, 18.0f) ||
Animation_OnFrame(skelAnime, 25.0f) || Animation_OnFrame(skelAnime, 33.0f)) { Animation_OnFrame(skelAnime, 25.0f) || Animation_OnFrame(skelAnime, 33.0f)) {
func_80078914(&this->actor.projectedPos, NA_SE_PL_WALK_GROUND + SURFACE_SFX_OFFSET_JABU); Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_PL_WALK_GROUND + SURFACE_SFX_OFFSET_JABU);
} }
} }
@ -1907,12 +1907,12 @@ void func_80AEF4A8(EnRu1* this, PlayState* play) {
void func_80AEF4E0(EnRu1* this) { void func_80AEF4E0(EnRu1* this) {
if (Animation_OnFrame(&this->skelAnime, 5.0f)) { if (Animation_OnFrame(&this->skelAnime, 5.0f)) {
func_80078914(&this->actor.projectedPos, NA_SE_VO_RT_LAUGH_0); Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_VO_RT_LAUGH_0);
} }
} }
void func_80AEF51C(EnRu1* this) { void func_80AEF51C(EnRu1* this) {
func_80078914(&this->actor.projectedPos, NA_SE_VO_RT_THROW); Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_VO_RT_THROW);
} }
void func_80AEF540(EnRu1* this) { void func_80AEF540(EnRu1* this) {

View file

@ -382,7 +382,7 @@ void func_80AF2E1C(EnRu2* this, PlayState* play) {
} }
void func_80AF2E64(void) { void func_80AF2E64(void) {
func_800788CC(NA_SE_SY_WHITE_OUT_T); Sfx_PlaySfxCentered2(NA_SE_SY_WHITE_OUT_T);
} }
void func_80AF2E84(EnRu2* this, PlayState* play) { void func_80AF2E84(EnRu2* this, PlayState* play) {

View file

@ -917,7 +917,7 @@ void EnSkj_WaitInRange(EnSkj* this, PlayState* play) {
player->actor.world.pos.y = sSmallStumpSkullKid.skullkid->actor.world.pos.y; player->actor.world.pos.y = sSmallStumpSkullKid.skullkid->actor.world.pos.y;
player->actor.world.pos.z = sSmallStumpSkullKid.skullkid->actor.world.pos.z; player->actor.world.pos.z = sSmallStumpSkullKid.skullkid->actor.world.pos.z;
if ((Player_GetMask(play) == PLAYER_MASK_SKULL) && !GET_ITEMGETINF(ITEMGETINF_39)) { if ((Player_GetMask(play) == PLAYER_MASK_SKULL) && !GET_ITEMGETINF(ITEMGETINF_39)) {
func_80078884(NA_SE_SY_TRE_BOX_APPEAR); Sfx_PlaySfxCentered(NA_SE_SY_TRE_BOX_APPEAR);
EnSkj_SetupMaskTrade(this); EnSkj_SetupMaskTrade(this);
} else { } else {
EnSkj_SetupTalk(this); EnSkj_SetupTalk(this);
@ -977,7 +977,7 @@ void EnSkj_WaitForSong(EnSkj* this, PlayState* play) {
if (!GET_ITEMGETINF(ITEMGETINF_16)) { if (!GET_ITEMGETINF(ITEMGETINF_16)) {
// Saria's song has been played for the first titme // Saria's song has been played for the first titme
play->msgCtx.ocarinaMode = OCARINA_MODE_04; play->msgCtx.ocarinaMode = OCARINA_MODE_04;
func_80078884(NA_SE_SY_CORRECT_CHIME); Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
player->unk_6A8 = &this->actor; player->unk_6A8 = &this->actor;
func_8002F2CC(&this->actor, play, EnSkj_GetItemXzRange(this)); func_8002F2CC(&this->actor, play, EnSkj_GetItemXzRange(this));
this->textId = 0x10BB; this->textId = 0x10BB;
@ -1423,7 +1423,7 @@ void EnSkj_WaitForPlayback(EnSkj* this, PlayState* play) {
this->textId = 0x102D; this->textId = 0x102D;
this->actionFunc = EnSkj_FailedMiniGame; this->actionFunc = EnSkj_FailedMiniGame;
} else if (play->msgCtx.ocarinaMode == OCARINA_MODE_0F) { // completed the game } else if (play->msgCtx.ocarinaMode == OCARINA_MODE_0F) { // completed the game
func_80078884(NA_SE_SY_CORRECT_CHIME); Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
Message_CloseTextbox(play); Message_CloseTextbox(play);
play->msgCtx.ocarinaMode = OCARINA_MODE_04; play->msgCtx.ocarinaMode = OCARINA_MODE_04;
player->unk_6A8 = &this->actor; player->unk_6A8 = &this->actor;
@ -1457,7 +1457,7 @@ void EnSkj_WaitForPlayback(EnSkj* this, PlayState* play) {
if (this->songFailTimer != 0) { if (this->songFailTimer != 0) {
this->songFailTimer--; this->songFailTimer--;
} else { // took too long, game failed } else { // took too long, game failed
func_80078884(NA_SE_SY_OCARINA_ERROR); Sfx_PlaySfxCentered(NA_SE_SY_OCARINA_ERROR);
Message_CloseTextbox(play); Message_CloseTextbox(play);
play->msgCtx.ocarinaMode = OCARINA_MODE_04; play->msgCtx.ocarinaMode = OCARINA_MODE_04;
player->unk_6A8 = &this->actor; player->unk_6A8 = &this->actor;

View file

@ -157,7 +157,7 @@ void EnSyatekiItm_StartRound(EnSyatekiItm* this, PlayState* play) {
this->timer = (this->roundNum == 1) ? 50 : 30; this->timer = (this->roundNum == 1) ? 50 : 30;
func_80078884(NA_SE_SY_FOUND); Sfx_PlaySfxCentered(NA_SE_SY_FOUND);
this->actionFunc = EnSyatekiItm_SpawnTargets; this->actionFunc = EnSyatekiItm_SpawnTargets;
} }
} }

View file

@ -803,7 +803,7 @@ void EnTa_RunCuccoGame(EnTa* this, PlayState* play) {
if ((gSaveContext.timerSeconds == 0) && !Play_InCsMode(play)) { if ((gSaveContext.timerSeconds == 0) && !Play_InCsMode(play)) {
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM_MAIN, 0); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM_MAIN, 0);
this->stateFlags &= ~TALON_STATE_FLAG_RESTORE_BGM_ON_DESTROY; this->stateFlags &= ~TALON_STATE_FLAG_RESTORE_BGM_ON_DESTROY;
func_80078884(NA_SE_SY_FOUND); Sfx_PlaySfxCentered(NA_SE_SY_FOUND);
gSaveContext.timerState = TIMER_STATE_OFF; gSaveContext.timerState = TIMER_STATE_OFF;
func_8002DF54(play, &this->actor, PLAYER_CSMODE_1); func_8002DF54(play, &this->actor, PLAYER_CSMODE_1);

View file

@ -238,7 +238,7 @@ u32 EnToryo_ReactToExchangeItem(EnToryo* this, PlayState* play) {
if (this->exchangeItemId != EXCH_ITEM_NONE) { if (this->exchangeItemId != EXCH_ITEM_NONE) {
if (this->exchangeItemId == EXCH_ITEM_POACHERS_SAW) { if (this->exchangeItemId == EXCH_ITEM_POACHERS_SAW) {
func_80078884(NA_SE_SY_TRE_BOX_APPEAR); Sfx_PlaySfxCentered(NA_SE_SY_TRE_BOX_APPEAR);
if (GET_INFTABLE(INFTABLE_171)) { if (GET_INFTABLE(INFTABLE_171)) {
ret = 0x606E; ret = 0x606E;
} else { } else {

View file

@ -89,7 +89,7 @@ void EnWallTubo_DetectChu(EnWallTubo* this, PlayState* play) {
(fabsf(chuPosDiff.z) < 40.0f || (BREG(2)))) { (fabsf(chuPosDiff.z) < 40.0f || (BREG(2)))) {
this->chuGirl->wallStatus[this->actor.params] = 1; this->chuGirl->wallStatus[this->actor.params] = 1;
chu->timer = 2; chu->timer = 2;
func_80078884(NA_SE_SY_TRE_BOX_APPEAR); Sfx_PlaySfxCentered(NA_SE_SY_TRE_BOX_APPEAR);
this->timer = 60; this->timer = 60;
EffectSsBomb2_SpawnLayered(play, &this->explosionCenter, &effVelocity, &effAccel, 200, 40); EffectSsBomb2_SpawnLayered(play, &this->explosionCenter, &effVelocity, &effAccel, 200, 40);
quakeIndex = Quake_Request(GET_ACTIVE_CAM(play), QUAKE_TYPE_1); quakeIndex = Quake_Request(GET_ACTIVE_CAM(play), QUAKE_TYPE_1);

View file

@ -470,7 +470,7 @@ void EnWallmas_TakePlayer(EnWallmas* this, PlayState* play) {
Math_StepToF(&this->actor.world.pos.z, player->actor.world.pos.z, 3.0f); Math_StepToF(&this->actor.world.pos.z, player->actor.world.pos.z, 3.0f);
if (this->timer == 0x1E) { if (this->timer == 0x1E) {
func_80078884(NA_SE_OC_ABYSS); Sfx_PlaySfxCentered(NA_SE_OC_ABYSS);
Play_TriggerRespawn(play); Play_TriggerRespawn(play);
} }
} }

View file

@ -74,7 +74,7 @@ void EnWonderItem_DropCollectible(EnWonderItem* this, PlayState* play, s32 autoC
s32 i; s32 i;
s32 randomDrop; s32 randomDrop;
func_80078884(NA_SE_SY_GET_ITEM); Sfx_PlaySfxCentered(NA_SE_SY_GET_ITEM);
if (this->dropCount == 0) { if (this->dropCount == 0) {
this->dropCount++; this->dropCount++;

View file

@ -379,7 +379,7 @@ void EnXc_SetWalkingSFX(EnXc* this, PlayState* play) {
if (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) { if (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) {
sfxId = NA_SE_PL_WALK_GROUND; sfxId = NA_SE_PL_WALK_GROUND;
sfxId += SurfaceType_GetSfxOffset(&play->colCtx, this->actor.floorPoly, this->actor.floorBgId); sfxId += SurfaceType_GetSfxOffset(&play->colCtx, this->actor.floorPoly, this->actor.floorBgId);
func_80078914(&this->actor.projectedPos, sfxId); Sfx_PlaySfxAtPos(&this->actor.projectedPos, sfxId);
} }
} }
} }
@ -393,11 +393,11 @@ void EnXc_SetNutThrowSFX(EnXc* this, PlayState* play) {
if (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) { if (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) {
sfxId = NA_SE_PL_WALK_GROUND; sfxId = NA_SE_PL_WALK_GROUND;
sfxId += SurfaceType_GetSfxOffset(&play->colCtx, this->actor.floorPoly, this->actor.floorBgId); sfxId += SurfaceType_GetSfxOffset(&play->colCtx, this->actor.floorPoly, this->actor.floorBgId);
func_80078914(&this->actor.projectedPos, sfxId); Sfx_PlaySfxAtPos(&this->actor.projectedPos, sfxId);
} }
} }
if (Animation_OnFrame(&this->skelAnime, 20.0f)) { if (Animation_OnFrame(&this->skelAnime, 20.0f)) {
func_80078914(&this->actor.projectedPos, NA_SE_VO_SK_SHOUT); Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_VO_SK_SHOUT);
} }
} }
@ -409,7 +409,7 @@ void EnXc_SetLandingSFX(EnXc* this, PlayState* play) {
if (Animation_OnFrame(&this->skelAnime, 11.0f)) { if (Animation_OnFrame(&this->skelAnime, 11.0f)) {
sfxId = NA_SE_PL_WALK_GROUND; sfxId = NA_SE_PL_WALK_GROUND;
sfxId += SurfaceType_GetSfxOffset(&play->colCtx, this->actor.floorPoly, this->actor.floorBgId); sfxId += SurfaceType_GetSfxOffset(&play->colCtx, this->actor.floorPoly, this->actor.floorBgId);
func_80078914(&this->actor.projectedPos, sfxId); Sfx_PlaySfxAtPos(&this->actor.projectedPos, sfxId);
} }
} }
} }
@ -429,13 +429,13 @@ void EnXc_SetColossusAppearSFX(EnXc* this, PlayState* play) {
Vec3f pos = { -611.0f, 728.0f, -2.0f }; Vec3f pos = { -611.0f, 728.0f, -2.0f };
SkinMatrix_Vec3fMtxFMultXYZW(&play->viewProjectionMtxF, &pos, &sXyzDist, wDest); SkinMatrix_Vec3fMtxFMultXYZW(&play->viewProjectionMtxF, &pos, &sXyzDist, wDest);
func_80078914(&sXyzDist, NA_SE_EV_JUMP_CONC); Sfx_PlaySfxAtPos(&sXyzDist, NA_SE_EV_JUMP_CONC);
} else if (csCurFrame == 164) { } else if (csCurFrame == 164) {
Vec3f pos = { -1069.0f, 38.0f, 0.0f }; Vec3f pos = { -1069.0f, 38.0f, 0.0f };
s32 pad; s32 pad;
SkinMatrix_Vec3fMtxFMultXYZW(&play->viewProjectionMtxF, &pos, &sXyzDist, wDest); SkinMatrix_Vec3fMtxFMultXYZW(&play->viewProjectionMtxF, &pos, &sXyzDist, wDest);
func_80078914(&sXyzDist, NA_SE_PL_WALK_GROUND + SURFACE_SFX_OFFSET_STONE); Sfx_PlaySfxAtPos(&sXyzDist, NA_SE_PL_WALK_GROUND + SURFACE_SFX_OFFSET_STONE);
} }
} }
} }
@ -445,7 +445,7 @@ void func_80B3D118(PlayState* play) {
s16 sceneId; s16 sceneId;
if ((gSaveContext.sceneLayer != 4) || (sceneId = play->sceneId, sceneId != SCENE_DESERT_COLOSSUS)) { if ((gSaveContext.sceneLayer != 4) || (sceneId = play->sceneId, sceneId != SCENE_DESERT_COLOSSUS)) {
func_800788CC(NA_SE_PL_SKIP); Sfx_PlaySfxCentered2(NA_SE_PL_SKIP);
} }
} }
@ -1369,14 +1369,14 @@ void func_80B3F3C8(EnXc* this, PlayState* play) {
} }
void func_80B3F3D8(void) { void func_80B3F3D8(void) {
func_800788CC(NA_SE_PL_SKIP); Sfx_PlaySfxCentered2(NA_SE_PL_SKIP);
} }
void EnXc_PlayDiveSFX(Vec3f* src, PlayState* play) { void EnXc_PlayDiveSFX(Vec3f* src, PlayState* play) {
f32 wDest[2]; f32 wDest[2];
SkinMatrix_Vec3fMtxFMultXYZW(&play->viewProjectionMtxF, src, &D_80B42DA0, wDest); SkinMatrix_Vec3fMtxFMultXYZW(&play->viewProjectionMtxF, src, &D_80B42DA0, wDest);
func_80078914(&D_80B42DA0, NA_SE_EV_DIVE_INTO_WATER); Sfx_PlaySfxAtPos(&D_80B42DA0, NA_SE_EV_DIVE_INTO_WATER);
} }
void EnXc_LakeHyliaDive(PlayState* play) { void EnXc_LakeHyliaDive(PlayState* play) {
@ -1552,7 +1552,7 @@ void EnXc_PlayTriforceSFX(Actor* thisx, PlayState* play) {
void func_80B3FAE0(EnXc* this) { void func_80B3FAE0(EnXc* this) {
if (Animation_OnFrame(&this->skelAnime, 38.0f)) { if (Animation_OnFrame(&this->skelAnime, 38.0f)) {
func_80078914(&this->actor.projectedPos, NA_SE_VO_SK_SHOUT); Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_VO_SK_SHOUT);
func_80B3FA2C(); func_80B3FA2C();
} }
} }
@ -1754,14 +1754,14 @@ void EnXc_SetThrownAroundSFX(EnXc* this) {
SkelAnime* skelAnime = &this->skelAnime; SkelAnime* skelAnime = &this->skelAnime;
if (Animation_OnFrame(skelAnime, 9.0f)) { if (Animation_OnFrame(skelAnime, 9.0f)) {
func_80078914(&this->actor.projectedPos, NA_SE_PL_BOUND + SURFACE_SFX_OFFSET_GRASS); Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_PL_BOUND + SURFACE_SFX_OFFSET_GRASS);
func_80078914(&this->actor.projectedPos, NA_SE_VO_SK_CRASH); Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_VO_SK_CRASH);
} else if (Animation_OnFrame(skelAnime, 26.0f)) { } else if (Animation_OnFrame(skelAnime, 26.0f)) {
func_80078914(&this->actor.projectedPos, NA_SE_PL_BOUND + SURFACE_SFX_OFFSET_GRASS); Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_PL_BOUND + SURFACE_SFX_OFFSET_GRASS);
} else if (Animation_OnFrame(skelAnime, 28.0f)) { } else if (Animation_OnFrame(skelAnime, 28.0f)) {
func_80078914(&this->actor.projectedPos, NA_SE_PL_WALK_GROUND + SURFACE_SFX_OFFSET_GRASS); Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_PL_WALK_GROUND + SURFACE_SFX_OFFSET_GRASS);
} else if (Animation_OnFrame(skelAnime, 34.0f)) { } else if (Animation_OnFrame(skelAnime, 34.0f)) {
func_80078914(&this->actor.projectedPos, NA_SE_PL_WALK_GROUND + SURFACE_SFX_OFFSET_GRASS); Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_PL_WALK_GROUND + SURFACE_SFX_OFFSET_GRASS);
} }
} }
@ -1775,9 +1775,9 @@ void EnXc_SetCrySFX(EnXc* this, PlayState* play) {
CutsceneContext* csCtx = &play->csCtx; CutsceneContext* csCtx = &play->csCtx;
if (csCtx->curFrame == 869) { if (csCtx->curFrame == 869) {
func_80078914(&this->actor.projectedPos, NA_SE_VO_SK_CRY_0); Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_VO_SK_CRY_0);
} else if (csCtx->curFrame == 939) { } else if (csCtx->curFrame == 939) {
func_80078914(&this->actor.projectedPos, NA_SE_VO_SK_CRY_1); Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_VO_SK_CRY_1);
} }
} }

View file

@ -176,10 +176,10 @@ void func_80B42F74(EnYabusameMark* this, PlayState* play) {
} }
if (scoreIndex == 1) { if (scoreIndex == 1) {
Audio_StopSfxById(NA_SE_SY_TRE_BOX_APPEAR); Audio_StopSfxById(NA_SE_SY_TRE_BOX_APPEAR);
func_80078884(NA_SE_SY_TRE_BOX_APPEAR); Sfx_PlaySfxCentered(NA_SE_SY_TRE_BOX_APPEAR);
} }
if (scoreIndex == 0) { if (scoreIndex == 0) {
func_80078884(NA_SE_SY_DECIDE); Sfx_PlaySfxCentered(NA_SE_SY_DECIDE);
} }
EffectSsExtra_Spawn(play, &arrowHitPos, &effectVelocity, &effectAccel, 5, scoreIndex); EffectSsExtra_Spawn(play, &arrowHitPos, &effectVelocity, &effectAccel, 5, scoreIndex);
} }

View file

@ -590,34 +590,34 @@ void func_80B4FD90(EnZl2* this, PlayState* play) {
void func_80B4FDD4(EnZl2* this) { void func_80B4FDD4(EnZl2* this) {
if (Animation_OnFrame(&this->skelAnime, 14.0f)) { if (Animation_OnFrame(&this->skelAnime, 14.0f)) {
func_80078914(&this->actor.projectedPos, NA_SE_PL_WALK_GROUND + SURFACE_SFX_OFFSET_STONE); Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_PL_WALK_GROUND + SURFACE_SFX_OFFSET_STONE);
} }
} }
void func_80B4FE10(PlayState* play) { void func_80B4FE10(PlayState* play) {
if ((play->csCtx.curFrame >= 830) && (play->csCtx.curFrame < 1081)) { if ((play->csCtx.curFrame >= 830) && (play->csCtx.curFrame < 1081)) {
func_800788CC(NA_SE_EV_EARTHQUAKE - SFX_FLAG); Sfx_PlaySfxCentered2(NA_SE_EV_EARTHQUAKE - SFX_FLAG);
} }
} }
void func_80B4FE48(EnZl2* this) { void func_80B4FE48(EnZl2* this) {
func_80078914(&this->actor.projectedPos, NA_SE_EV_GOTO_HEAVEN - SFX_FLAG); Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_EV_GOTO_HEAVEN - SFX_FLAG);
} }
void func_80B4FE6C(EnZl2* this) { void func_80B4FE6C(EnZl2* this) {
func_80078914(&this->actor.projectedPos, NA_SE_EN_GANON_LAUGH); Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_EN_GANON_LAUGH);
} }
void func_80B4FE90(EnZl2* this) { void func_80B4FE90(EnZl2* this) {
func_80078914(&this->actor.projectedPos, NA_SE_VO_Z1_SURPRISE); Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_VO_Z1_SURPRISE);
} }
void func_80B4FEB4(EnZl2* this) { void func_80B4FEB4(EnZl2* this) {
func_80078914(&this->actor.projectedPos, NA_SE_VO_Z1_PAIN); Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_VO_Z1_PAIN);
} }
void func_80B4FED8(EnZl2* this) { void func_80B4FED8(EnZl2* this) {
func_80078914(&this->actor.projectedPos, NA_SE_VO_Z1_CRY_0); Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_VO_Z1_CRY_0);
} }
void EnZl2_GiveLightArrows(EnZl2* this, PlayState* play) { void EnZl2_GiveLightArrows(EnZl2* this, PlayState* play) {
@ -1446,7 +1446,7 @@ void func_80B51D24(EnZl2* this, PlayState* play) {
if (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) { if (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) {
sfxId = NA_SE_PL_WALK_GROUND; sfxId = NA_SE_PL_WALK_GROUND;
sfxId += SurfaceType_GetSfxOffset(&play->colCtx, this->actor.floorPoly, this->actor.floorBgId); sfxId += SurfaceType_GetSfxOffset(&play->colCtx, this->actor.floorPoly, this->actor.floorBgId);
func_80078914(&this->actor.projectedPos, sfxId); Sfx_PlaySfxAtPos(&this->actor.projectedPos, sfxId);
} }
} }
} }

View file

@ -759,7 +759,7 @@ void func_80B54EA4(EnZl3* this, PlayState* play) {
} }
void func_80B54EF4(EnZl3* this) { void func_80B54EF4(EnZl3* this) {
func_80078914(&this->actor.projectedPos, NA_SE_VO_Z1_PAIN); Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_VO_Z1_PAIN);
} }
void func_80B54F18(EnZl3* this, PlayState* play) { void func_80B54F18(EnZl3* this, PlayState* play) {
@ -997,7 +997,7 @@ void func_80B55780(EnZl3* this, PlayState* play) {
} }
void func_80B55808(EnZl3* this) { void func_80B55808(EnZl3* this) {
func_80078914(&this->actor.projectedPos, NA_SE_VO_Z1_PAIN); Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_VO_Z1_PAIN);
} }
static Vec3f D_80B5A488 = { 0.0f, 0.0f, 0.0f }; static Vec3f D_80B5A488 = { 0.0f, 0.0f, 0.0f };
@ -1010,7 +1010,7 @@ void func_80B5585C(EnZl3* this) {
SkelAnime* skelAnime = &this->skelAnime; SkelAnime* skelAnime = &this->skelAnime;
if ((skelAnime->mode == 2) && Animation_OnFrame(skelAnime, 4.0f)) { if ((skelAnime->mode == 2) && Animation_OnFrame(skelAnime, 4.0f)) {
func_80078914(&this->actor.projectedPos, NA_SE_VO_Z1_PAIN); Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_VO_Z1_PAIN);
} }
} }
@ -1519,18 +1519,18 @@ void func_80B56D44(EnZl3* this, PlayState* play) {
} }
void func_80B56DA4(EnZl3* this) { void func_80B56DA4(EnZl3* this) {
func_800788CC(NA_SE_EV_ZELDA_POWER); Sfx_PlaySfxCentered2(NA_SE_EV_ZELDA_POWER);
} }
void func_80B56DC8(EnZl3* this) { void func_80B56DC8(EnZl3* this) {
func_80078914(&this->actor.projectedPos, NA_SE_VO_Z1_PAIN); Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_VO_Z1_PAIN);
} }
void func_80B56DEC(EnZl3* this) { void func_80B56DEC(EnZl3* this) {
SkelAnime* skelAnime = &this->skelAnime; SkelAnime* skelAnime = &this->skelAnime;
if ((skelAnime->mode == 2) && Animation_OnFrame(skelAnime, 9.0f) != 0) { if ((skelAnime->mode == 2) && Animation_OnFrame(skelAnime, 9.0f) != 0) {
func_80078914(&this->actor.projectedPos, NA_SE_VO_Z1_OPENDOOR); Sfx_PlaySfxAtPos(&this->actor.projectedPos, NA_SE_VO_Z1_OPENDOOR);
} }
} }
@ -1543,7 +1543,7 @@ void func_80B56E38(EnZl3* this, PlayState* play) {
(this->actor.bgCheckFlags & BGCHECKFLAG_GROUND)) { (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND)) {
sfxId = NA_SE_PL_WALK_GROUND; sfxId = NA_SE_PL_WALK_GROUND;
sfxId += SurfaceType_GetSfxOffset(&play->colCtx, this->actor.floorPoly, this->actor.floorBgId); sfxId += SurfaceType_GetSfxOffset(&play->colCtx, this->actor.floorPoly, this->actor.floorBgId);
func_80078914(&this->actor.projectedPos, sfxId); Sfx_PlaySfxAtPos(&this->actor.projectedPos, sfxId);
} }
} }

Some files were not shown because too many files have changed in this diff Show more