mirror of
https://github.com/zeldaret/oot
synced 2026-06-07 03:57:35 -04:00
Macroify PlaySfxGeneral calls: introduce SFX_PLAY_CENTERED and SFX_PLAY_AT_POS (#2633)
* Add `SFX_PLAY_CENTERED` * Add `SFX_PLAY_AT_POS`
This commit is contained in:
Dragorn421
+21
-51
@@ -2191,9 +2191,7 @@ void Interface_SetNaviCall(PlayState* play, u16 naviCallState) {
|
||||
if (((naviCallState == 0x1D) || (naviCallState == 0x1E)) && !interfaceCtx->naviCalling &&
|
||||
(play->csCtx.state == CS_STATE_IDLE)) {
|
||||
// clang-format off
|
||||
if (naviCallState == 0x1E) { Audio_PlaySfxGeneral(NA_SE_VO_NAVY_CALL, &gSfxDefaultPos, 4,
|
||||
&gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
|
||||
&gSfxDefaultReverb);
|
||||
if (naviCallState == 0x1E) { SFX_PLAY_CENTERED(NA_SE_VO_NAVY_CALL);
|
||||
}
|
||||
// clang-format on
|
||||
|
||||
@@ -2244,8 +2242,7 @@ s32 Health_ChangeBy(PlayState* play, s16 amount) {
|
||||
gSaveContext.save.info.playerData.health, gSaveContext.save.info.playerData.healthCapacity);
|
||||
|
||||
// clang-format off
|
||||
if (amount > 0) { Audio_PlaySfxGeneral(NA_SE_SY_HP_RECOVER, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
|
||||
&gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
|
||||
if (amount > 0) { SFX_PLAY_CENTERED(NA_SE_SY_HP_RECOVER);
|
||||
} else if (gSaveContext.save.info.playerData.isDoubleDefenseAcquired && (amount < 0)) {
|
||||
amount >>= 1;
|
||||
PRINTF(T("ハート減少半分！！＝%d\n", "Heart decrease halved!! = %d\n"), amount);
|
||||
@@ -2382,8 +2379,7 @@ s32 Magic_RequestChange(PlayState* play, s16 amount, s16 type) {
|
||||
|
||||
if ((type != MAGIC_ADD) && (gSaveContext.save.info.playerData.magic - amount) < 0) {
|
||||
if (gSaveContext.magicCapacity != 0) {
|
||||
Audio_PlaySfxGeneral(NA_SE_SY_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
|
||||
&gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
|
||||
SFX_PLAY_CENTERED(NA_SE_SY_ERROR);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
@@ -2401,8 +2397,7 @@ s32 Magic_RequestChange(PlayState* play, s16 amount, s16 type) {
|
||||
gSaveContext.magicState = MAGIC_STATE_CONSUME_SETUP;
|
||||
return true;
|
||||
} else {
|
||||
Audio_PlaySfxGeneral(NA_SE_SY_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
|
||||
&gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
|
||||
SFX_PLAY_CENTERED(NA_SE_SY_ERROR);
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -2419,8 +2414,7 @@ s32 Magic_RequestChange(PlayState* play, s16 amount, s16 type) {
|
||||
gSaveContext.magicState = MAGIC_STATE_METER_FLASH_3;
|
||||
return true;
|
||||
} else {
|
||||
Audio_PlaySfxGeneral(NA_SE_SY_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
|
||||
&gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
|
||||
SFX_PLAY_CENTERED(NA_SE_SY_ERROR);
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -2451,8 +2445,7 @@ s32 Magic_RequestChange(PlayState* play, s16 amount, s16 type) {
|
||||
gSaveContext.magicState = MAGIC_STATE_METER_FLASH_2;
|
||||
return true;
|
||||
} else {
|
||||
Audio_PlaySfxGeneral(NA_SE_SY_ERROR, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
|
||||
&gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
|
||||
SFX_PLAY_CENTERED(NA_SE_SY_ERROR);
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -2520,8 +2513,7 @@ void Magic_Update(PlayState* play) {
|
||||
gSaveContext.save.info.playerData.magic += 4;
|
||||
|
||||
if (gSaveContext.gameMode == GAMEMODE_NORMAL && !IS_CUTSCENE_LAYER) {
|
||||
Audio_PlaySfxGeneral(NA_SE_SY_GAUGE_UP - SFX_FLAG, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
|
||||
&gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
|
||||
SFX_PLAY_CENTERED(NA_SE_SY_GAUGE_UP - SFX_FLAG);
|
||||
}
|
||||
|
||||
PRINTF(T("蓄電 MAGIC_NOW=%d (%d)\n", "Storage MAGIC_NOW=%d (%d)\n"),
|
||||
@@ -2611,8 +2603,7 @@ void Magic_Update(PlayState* play) {
|
||||
!play->actorCtx.lensActive) {
|
||||
// Force lens off and set magic meter state to idle
|
||||
play->actorCtx.lensActive = false;
|
||||
Audio_PlaySfxGeneral(NA_SE_SY_GLASSMODE_OFF, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
|
||||
&gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
|
||||
SFX_PLAY_CENTERED(NA_SE_SY_GLASSMODE_OFF);
|
||||
gSaveContext.magicState = MAGIC_STATE_IDLE;
|
||||
sMagicBorderR = sMagicBorderG = sMagicBorderB = 255;
|
||||
break;
|
||||
@@ -2664,8 +2655,7 @@ void Magic_Update(PlayState* play) {
|
||||
case MAGIC_STATE_ADD:
|
||||
// Add magic until target is reached
|
||||
gSaveContext.save.info.playerData.magic += 4;
|
||||
Audio_PlaySfxGeneral(NA_SE_SY_GAUGE_UP - SFX_FLAG, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
|
||||
&gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
|
||||
SFX_PLAY_CENTERED(NA_SE_SY_GAUGE_UP - SFX_FLAG);
|
||||
if (gSaveContext.save.info.playerData.magic >= gSaveContext.magicTarget) {
|
||||
gSaveContext.save.info.playerData.magic = gSaveContext.magicTarget;
|
||||
gSaveContext.magicState = gSaveContext.prevMagicState;
|
||||
@@ -3711,22 +3701,16 @@ void Interface_Draw(PlayState* play) {
|
||||
} else if (gSaveContext.timerSeconds > 60) {
|
||||
// Beep at "xx:x1" (every 10 seconds)
|
||||
if (sTimerDigits[4] == 1) {
|
||||
Audio_PlaySfxGeneral(NA_SE_SY_MESSAGE_WOMAN, &gSfxDefaultPos, 4,
|
||||
&gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
|
||||
&gSfxDefaultReverb);
|
||||
SFX_PLAY_CENTERED(NA_SE_SY_MESSAGE_WOMAN);
|
||||
}
|
||||
} else if (gSaveContext.timerSeconds > 10) {
|
||||
// Beep on alternating seconds
|
||||
if ((sTimerDigits[4] % 2) != 0) {
|
||||
Audio_PlaySfxGeneral(NA_SE_SY_WARNING_COUNT_N, &gSfxDefaultPos, 4,
|
||||
&gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
|
||||
&gSfxDefaultReverb);
|
||||
SFX_PLAY_CENTERED(NA_SE_SY_WARNING_COUNT_N);
|
||||
}
|
||||
} else {
|
||||
// Beep every second
|
||||
Audio_PlaySfxGeneral(NA_SE_SY_WARNING_COUNT_E, &gSfxDefaultPos, 4,
|
||||
&gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
|
||||
&gSfxDefaultReverb);
|
||||
SFX_PLAY_CENTERED(NA_SE_SY_WARNING_COUNT_E);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -3775,9 +3759,7 @@ void Interface_Draw(PlayState* play) {
|
||||
sTimerStateTimer = 40;
|
||||
gSaveContext.timerState = TIMER_STATE_UP_FREEZE;
|
||||
} else {
|
||||
Audio_PlaySfxGeneral(NA_SE_SY_WARNING_COUNT_N, &gSfxDefaultPos, 4,
|
||||
&gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
|
||||
&gSfxDefaultReverb);
|
||||
SFX_PLAY_CENTERED(NA_SE_SY_WARNING_COUNT_N);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -3912,22 +3894,16 @@ void Interface_Draw(PlayState* play) {
|
||||
} else if (gSaveContext.subTimerSeconds > 60) {
|
||||
// Beep at "xx:x1" (every 10 seconds)
|
||||
if (sTimerDigits[4] == 1) {
|
||||
Audio_PlaySfxGeneral(NA_SE_SY_MESSAGE_WOMAN, &gSfxDefaultPos, 4,
|
||||
&gSfxDefaultFreqAndVolScale,
|
||||
&gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
|
||||
SFX_PLAY_CENTERED(NA_SE_SY_MESSAGE_WOMAN);
|
||||
}
|
||||
} else if (gSaveContext.subTimerSeconds > 10) {
|
||||
// Beep on alternating seconds
|
||||
if ((sTimerDigits[4] % 2) != 0) {
|
||||
Audio_PlaySfxGeneral(NA_SE_SY_WARNING_COUNT_N, &gSfxDefaultPos, 4,
|
||||
&gSfxDefaultFreqAndVolScale,
|
||||
&gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
|
||||
SFX_PLAY_CENTERED(NA_SE_SY_WARNING_COUNT_N);
|
||||
}
|
||||
} else {
|
||||
// Beep every second
|
||||
Audio_PlaySfxGeneral(NA_SE_SY_WARNING_COUNT_E, &gSfxDefaultPos, 4,
|
||||
&gSfxDefaultFreqAndVolScale,
|
||||
&gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
|
||||
SFX_PLAY_CENTERED(NA_SE_SY_WARNING_COUNT_E);
|
||||
}
|
||||
} else { // SUBTIMER_STATE_UP_TICK
|
||||
gSaveContext.subTimerSeconds++;
|
||||
@@ -3944,9 +3920,7 @@ void Interface_Draw(PlayState* play) {
|
||||
|
||||
// Beep at the minute mark
|
||||
if ((gSaveContext.subTimerSeconds % 60) == 0) {
|
||||
Audio_PlaySfxGeneral(NA_SE_SY_WARNING_COUNT_N, &gSfxDefaultPos, 4,
|
||||
&gSfxDefaultFreqAndVolScale, &gSfxDefaultFreqAndVolScale,
|
||||
&gSfxDefaultReverb);
|
||||
SFX_PLAY_CENTERED(NA_SE_SY_WARNING_COUNT_N);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -4192,8 +4166,7 @@ void Interface_Update(PlayState* play) {
|
||||
gSaveContext.save.info.playerData.health += 4;
|
||||
|
||||
if ((gSaveContext.save.info.playerData.health & 0xF) < 4) {
|
||||
Audio_PlaySfxGeneral(NA_SE_SY_HP_RECOVER, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
|
||||
&gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
|
||||
SFX_PLAY_CENTERED(NA_SE_SY_HP_RECOVER);
|
||||
}
|
||||
|
||||
PRINTF("now_life=%d max_life=%d\n", gSaveContext.save.info.playerData.health,
|
||||
@@ -4233,8 +4206,7 @@ void Interface_Update(PlayState* play) {
|
||||
if (gSaveContext.save.info.playerData.rupees < CUR_CAPACITY(UPG_WALLET)) {
|
||||
gSaveContext.rupeeAccumulator--;
|
||||
gSaveContext.save.info.playerData.rupees++;
|
||||
Audio_PlaySfxGeneral(NA_SE_SY_RUPY_COUNT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
|
||||
&gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
|
||||
SFX_PLAY_CENTERED(NA_SE_SY_RUPY_COUNT);
|
||||
} else {
|
||||
PRINTF(T("ルピー数ＭＡＸ = %d\n", "Rupee Amount MAX = %d\n"), CUR_CAPACITY(UPG_WALLET));
|
||||
gSaveContext.save.info.playerData.rupees = CUR_CAPACITY(UPG_WALLET);
|
||||
@@ -4249,13 +4221,11 @@ void Interface_Update(PlayState* play) {
|
||||
gSaveContext.save.info.playerData.rupees = 0;
|
||||
}
|
||||
|
||||
Audio_PlaySfxGeneral(NA_SE_SY_RUPY_COUNT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
|
||||
&gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
|
||||
SFX_PLAY_CENTERED(NA_SE_SY_RUPY_COUNT);
|
||||
} else {
|
||||
gSaveContext.rupeeAccumulator++;
|
||||
gSaveContext.save.info.playerData.rupees--;
|
||||
Audio_PlaySfxGeneral(NA_SE_SY_RUPY_COUNT, &gSfxDefaultPos, 4, &gSfxDefaultFreqAndVolScale,
|
||||
&gSfxDefaultFreqAndVolScale, &gSfxDefaultReverb);
|
||||
SFX_PLAY_CENTERED(NA_SE_SY_RUPY_COUNT);
|
||||
}
|
||||
} else {
|
||||
gSaveContext.rupeeAccumulator = 0;
|
||||
|
||||
Reference in New Issue
Block a user