summaryrefslogtreecommitdiff
path: root/src/boss.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/boss.cpp19
1 files changed, 13 insertions, 6 deletions
diff --git a/src/boss.cpp b/src/boss.cpp
index df553fb..d34ae9b 100644
--- a/src/boss.cpp
+++ b/src/boss.cpp
@@ -104,7 +104,8 @@ void OutroSetup(daBoss *actor) {
bool ShrinkBoss(daBoss *actor, Vec *pos, float scale, int timer) {
- PlaySound(actor, SE_BOSS_CMN_DAMAGE_LAST);
+ nw4r::snd::SoundHandle handle;
+ PlaySoundWithFunctionB4(SoundRelatedClass, &handle, SE_BOSS_CMN_DAMAGE_LAST, 1);
// Adjust actor to equal the scale of your boss / 80.
actor->scale.x -= scale / 80.0;
@@ -133,15 +134,21 @@ void BossExplode(daBoss *actor, Vec *pos) {
actor->dying = 1;
actor->timer = 0;
- PlaySound(actor, STRM_BGM_SHIRO_BOSS_CLEAR);
+ nw4r::snd::SoundHandle handle;
+ PlaySoundWithFunctionB4(SoundRelatedClass, &handle, STRM_BGM_SHIRO_BOSS_CLEAR, 1);
MakeMarioEnterDemoMode();
}
void PlayerVictoryCries(daBoss *actor) {
UpdateGameMgr();
- if (GetSpecificPlayerActor(0) != 0) { PlaySound(actor, SE_VOC_MA_CLEAR_BOSS); }
- if (GetSpecificPlayerActor(1) != 0) { PlaySound(actor, SE_VOC_LU_CLEAR_BOSS); }
- if (GetSpecificPlayerActor(2) != 0) { PlaySound(actor, SE_VOC_KO_CLEAR_BOSS); }
- if (GetSpecificPlayerActor(3) != 0) { PlaySound(actor, SE_VOC_KO2_CLEAR_BOSS); }
+ nw4r::snd::SoundHandle handle1, handle2, handle3, handle4;
+ if (GetSpecificPlayerActor(0) != 0)
+ PlaySoundWithFunctionB4(SoundRelatedClass, &handle1, SE_VOC_MA_CLEAR_BOSS, 1);
+ if (GetSpecificPlayerActor(1) != 0)
+ PlaySoundWithFunctionB4(SoundRelatedClass, &handle2, SE_VOC_LU_CLEAR_BOSS, 1);
+ if (GetSpecificPlayerActor(2) != 0)
+ PlaySoundWithFunctionB4(SoundRelatedClass, &handle3, SE_VOC_KO_CLEAR_BOSS, 1);
+ if (GetSpecificPlayerActor(3) != 0)
+ PlaySoundWithFunctionB4(SoundRelatedClass, &handle4, SE_VOC_KO2_CLEAR_BOSS, 1);
}