mirror/SpaghettiKart
1
0
Fork 0
mirror of https://github.com/HarbourMasters/SpaghettiKart synced 2026-09-08 03:56:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Document sound effects (pr 735 from the decomp) (#589)

Browse Source 
Co-authored-by: Jed Grabman <JedGrabman@users.noreply.github.com>
Co-authored-by: MegaMech <MegaMech@users.noreply.github.com>
This commit is contained in:
coco875
2025-12-13 20:08:59 +01:00
committed by GitHub
parent b934e98fc3
commit 4e51b7d5b6
25 changed files with 254 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/player_controller.c
+88 -71
View File
@@ -725,12 +725,12 @@ void func_80029B4C(Player* player, UNUSED f32 arg1, f32 arg2, UNUSED f32 arg3) {
if (player->surfaceType == BOOST_RAMP_ASPHALT) {
if (((player->effects & BOOST_RAMP_ASPHALT_EFFECT) != BOOST_RAMP_ASPHALT_EFFECT) &&
((player->effects & 8) != 8)) {
player->soundEffects |= BOOST_RAMP_ASPHALT_SOUND_EFFECT;
player->triggers |= BOOST_RAMP_ASPHALT_TRIGGER;
}
}
if (player->surfaceType == BOOST_RAMP_WOOD) {
if (((player->effects & BOOST_RAMP_WOOD_EFFECT) != BOOST_RAMP_WOOD_EFFECT) && ((player->effects & 8) != 8)) {
player->soundEffects |= BOOST_RAMP_WOOD_SOUND_EFFECT;
player->triggers |= BOOST_RAMP_WOOD_TRIGGER;
}
}
}
@@ -810,12 +810,12 @@ void func_8002A194(Player* player, f32 x, f32 y, f32 z) {
if (player->surfaceType == BOOST_RAMP_ASPHALT) {
if (((player->effects & BOOST_RAMP_ASPHALT_EFFECT) != BOOST_RAMP_ASPHALT_EFFECT) &&
((player->effects & 8) != 8)) {
player->soundEffects |= BOOST_RAMP_ASPHALT_SOUND_EFFECT;
player->triggers |= BOOST_RAMP_ASPHALT_TRIGGER;
}
}
if (player->surfaceType == BOOST_RAMP_WOOD) {
if (((player->effects & BOOST_RAMP_WOOD_EFFECT) != BOOST_RAMP_WOOD_EFFECT) && ((player->effects & 8) != 8)) {
player->soundEffects |= BOOST_RAMP_WOOD_SOUND_EFFECT;
player->triggers |= BOOST_RAMP_WOOD_TRIGGER;
}
}
}
@@ -856,7 +856,7 @@ void func_8002A5F4(Vec3f arg0, f32 arg1, Vec3f arg2, f32 arg3, f32 arg4) {
void func_8002A704(Player* player, s8 arg1) {
player->effects |= BOOST_EFFECT;
player->soundEffects &= ~0x02000000;
player->triggers &= ~START_BOOST_TRIGGER;
if (((player->type & PLAYER_HUMAN) == PLAYER_HUMAN) &&
((player->type & PLAYER_INVISIBLE_OR_BOMB) != PLAYER_INVISIBLE_OR_BOMB)) {
func_800C90F4(0U, (player->characterId * 0x10) + 0x29008001);
@@ -938,7 +938,7 @@ void kart_hop(Player* player) {
player->kartHopJerk = gKartHopJerkTable[player->characterId];
player->kartHopAcceleration = 0.0f;
player->kartHopVelocity = gKartHopInitialVelocityTable[player->characterId];
player->effects |= 2;
player->effects |= HIGH_TUMBLE_TRIGGER;
player->unk_DAC = 3.0f;
player->kartGravity = 500.0f;
func_80036C5C(player);
@@ -1121,123 +1121,138 @@ void func_8002B218(Player* player) {
}
}
void apply_sound_effect(Player* player, s8 playerId, UNUSED s8 screenId) {
if ((player->soundEffects & 2) == 2) {
apply_hit_by_item_sound_effect(player, playerId);
void apply_triggers(Player* player, s8 playerId, UNUSED s8 screenId) {
if ((player->triggers & HIGH_TUMBLE_TRIGGER) == HIGH_TUMBLE_TRIGGER) {
trigger_high_tumble(player, playerId);
}
if ((player->soundEffects & 4) == 4) {
if ((player->triggers & LOW_TUMBLE_TRIGGER) == LOW_TUMBLE_TRIGGER) {
func_8008C528(player, playerId);
}
if ((player->soundEffects & 1) == 1) {
if ((player->triggers & HIT_BANANA_TRIGGER) == HIT_BANANA_TRIGGER) {
func_8008CDC0(player, playerId);
}
if ((player->soundEffects & BOOST_SOUND_EFFECT) == BOOST_SOUND_EFFECT) {
apply_boost_sound_effect(player, playerId);
if ((player->triggers & SHROOM_TRIGGER) == SHROOM_TRIGGER) {
trigger_shroom(player, playerId);
}
if ((player->soundEffects & 0x02000000) == 0x02000000) {
if ((player->triggers & START_BOOST_TRIGGER) == START_BOOST_TRIGGER) {
func_8002A704(player, playerId);
}
if ((player->soundEffects & 0x1000) == 0x1000) {
if ((player->triggers & UNUSED_TRIGGER_0x1000) == UNUSED_TRIGGER_0x1000) {
func_8008D570(player, playerId);
}
if ((player->soundEffects & 0x20000) == 0x20000) {
if ((player->triggers & UNUSED_TRIGGER_0x20000) == UNUSED_TRIGGER_0x20000) {
func_8008D7B0(player, playerId);
}
if ((player->soundEffects & HIT_SOUND_EFFECT) == HIT_SOUND_EFFECT) {
apply_hit_sound_effect(player, playerId);
if ((player->triggers & THWOMP_SQUISH_TRIGGER) == THWOMP_SQUISH_TRIGGER) {
trigger_squish(player, playerId);
}
if ((player->soundEffects & HIT_ROTATING_SOUND_EFFECT) == HIT_ROTATING_SOUND_EFFECT) {
apply_hit_rotating_sound_effect(player, playerId);
if ((player->triggers & LIGHTNING_STRIKE_TRIGGER) == LIGHTNING_STRIKE_TRIGGER) {
trigger_lightning_strike(player, playerId);
}
if ((player->soundEffects & 0x200000) == 0x200000) {
if ((player->triggers & SPINOUT_TRIGGER) == SPINOUT_TRIGGER) {
func_8008C73C(player, playerId);
}
if ((player->soundEffects & REVERSE_SOUND_EFFECT) == REVERSE_SOUND_EFFECT) {
apply_reverse_sound_effect(player, playerId);
if ((player->triggers & VERTICAL_TUMBLE_TRIGGER) == VERTICAL_TUMBLE_TRIGGER) {
trigger_vertical_tumble(player, playerId);
}
if ((player->soundEffects & HIT_BY_ITEM_SOUND_EFFECT) == HIT_BY_ITEM_SOUND_EFFECT) {
apply_hit_by_item_sound_effect(player, playerId);
if ((player->triggers & HIT_BY_STAR_TRIGGER) == HIT_BY_STAR_TRIGGER) {
trigger_high_tumble(player, playerId);
}
if ((player->soundEffects & BOOST_RAMP_ASPHALT_SOUND_EFFECT) == BOOST_RAMP_ASPHALT_SOUND_EFFECT) {
apply_boost_ramp_asphalt_sound_effect(player, playerId);
if ((player->triggers & BOOST_RAMP_ASPHALT_TRIGGER) == BOOST_RAMP_ASPHALT_TRIGGER) {
trigger_asphalt_ramp_boost(player, playerId);
}
if ((player->soundEffects & BOOST_RAMP_WOOD_SOUND_EFFECT) == BOOST_RAMP_WOOD_SOUND_EFFECT) {
apply_boost_ramp_wood_sound_effect(player, playerId);
if ((player->triggers & BOOST_RAMP_WOOD_TRIGGER) == BOOST_RAMP_WOOD_TRIGGER) {
trigger_wood_ramp_boost(player, playerId);
}
if ((player->soundEffects & STAR_SOUND_EFFECT) == STAR_SOUND_EFFECT) {
apply_star_sound_effect(player, playerId);
if ((player->triggers & STAR_TRIGGER) == STAR_TRIGGER) {
trigger_star(player, playerId);
}
if ((player->soundEffects & BOO_SOUND_EFFECT) == BOO_SOUND_EFFECT) {
apply_boo_sound_effect(player, playerId);
if ((player->triggers & BOO_TRIGGER) == BOO_TRIGGER) {
trigger_boo(player, playerId);
}
if (player->soundEffects & 0x80) {
if (player->triggers & DRIVING_SPINOUT_TRIGGER) {
func_8008D0FC(player, playerId);
}
if (player->soundEffects & 0x80000) {
apply_reverse_sound_effect(player, playerId);
if (player->triggers & HIT_PADDLE_BOAT_TRIGGER) {
trigger_vertical_tumble(player, playerId);
}
}
void func_8002B5C0(Player* player, UNUSED s8 playerId, UNUSED s8 screenId) {
if (((player->unk_0CA & 8) != 0) || ((player->unk_0CA & 2) != 0)) {
player->soundEffects &= 0xFE1D0478;
player->triggers &= ALL_TRIGGERS & ~(HIT_TRIGGERS | ANY_BOOST_TRIGGERS | RACING_SPINOUT_TRIGGERS | STATE_TRANSITION_TRIGGERS);
}
// Green shell
if ((player->effects & 0x400) == 0x400) {
player->soundEffects &= 0xFF5D457E;
player->triggers &= ALL_TRIGGERS & ~(ANY_BOOST_TRIGGERS | RACING_SPINOUT_TRIGGERS | STATE_TRANSITION_TRIGGERS);
}
// Spinout (banana or driving)
if (((player->effects & 0x80) == 0x80) || ((player->effects & 0x40) == 0x40)) {
player->soundEffects &= 0xFF5F457E;
player->triggers &= (ALL_TRIGGERS & ~(ANY_BOOST_TRIGGERS | RACING_SPINOUT_TRIGGERS | STATE_TRANSITION_TRIGGERS)) | UNUSED_TRIGGER_0x20000;
}
// Near spinout (banana)
if ((player->effects & 0x800) == 0x800) {
player->soundEffects &= 0xFF5D457E;
player->triggers &= ALL_TRIGGERS & ~(ANY_BOOST_TRIGGERS | RACING_SPINOUT_TRIGGERS | STATE_TRANSITION_TRIGGERS);
}
if ((player->unk_044 & 0x4000) != 0) {
player->soundEffects &= 0xFF5D457E;
player->triggers &= ALL_TRIGGERS & ~(ANY_BOOST_TRIGGERS | RACING_SPINOUT_TRIGGERS | STATE_TRANSITION_TRIGGERS);
}
//unclear
if ((player->effects & 0x80000) == 0x80000) {
player->soundEffects &= 0xFE1D4478;
player->triggers &= ALL_TRIGGERS & ~((HIT_TRIGGERS ^ LIGHTNING_STRIKE_TRIGGER) | ANY_BOOST_TRIGGERS | RACING_SPINOUT_TRIGGERS | STATE_TRANSITION_TRIGGERS);
}
//unclear
if ((player->effects & 0x800000) == 0x800000) {
player->soundEffects &= 0xFE1D0478;
player->triggers &= ALL_TRIGGERS & ~(HIT_TRIGGERS | ANY_BOOST_TRIGGERS | RACING_SPINOUT_TRIGGERS | STATE_TRANSITION_TRIGGERS);
}
//squished
if ((player->effects & HIT_EFFECT) == HIT_EFFECT) {
player->soundEffects &= 0xFE1D0578;
player->triggers &= (ALL_TRIGGERS & ~(HIT_TRIGGERS | ANY_BOOST_TRIGGERS | RACING_SPINOUT_TRIGGERS | STATE_TRANSITION_TRIGGERS)) | THWOMP_SQUISH_TRIGGER;
}
if ((player->effects & 0x01000000) == 0x01000000) {
player->soundEffects &= 0xFE1D4478;
//explosion crash
if ((player->effects & UNKNOWN_EFFECT_0x1000000) == UNKNOWN_EFFECT_0x1000000) {
player->triggers &= ALL_TRIGGERS & ~((HIT_TRIGGERS ^ LIGHTNING_STRIKE_TRIGGER) | ANY_BOOST_TRIGGERS | RACING_SPINOUT_TRIGGERS | STATE_TRANSITION_TRIGGERS);
}
// hit by star or red shell
if ((player->effects & HIT_BY_ITEM_EFFECT) == HIT_BY_ITEM_EFFECT) {
player->soundEffects &= 0xFE1D4478;
player->triggers &= ALL_TRIGGERS & ~((HIT_TRIGGERS ^ LIGHTNING_STRIKE_TRIGGER) | ANY_BOOST_TRIGGERS | RACING_SPINOUT_TRIGGERS | STATE_TRANSITION_TRIGGERS);
}
// boost asphalt
if ((player->effects & BOOST_RAMP_ASPHALT_EFFECT) == BOOST_RAMP_ASPHALT_EFFECT) {
player->soundEffects &= 0xFE1D0478;
player->triggers &= ALL_TRIGGERS & ~(HIT_TRIGGERS | ANY_BOOST_TRIGGERS | RACING_SPINOUT_TRIGGERS | STATE_TRANSITION_TRIGGERS);
}
// boost ramp
if ((player->effects & BOOST_RAMP_WOOD_EFFECT) == BOOST_RAMP_WOOD_EFFECT) {
player->soundEffects &= 0xFE1D0478;
player->triggers &= ALL_TRIGGERS & ~(HIT_TRIGGERS | ANY_BOOST_TRIGGERS | RACING_SPINOUT_TRIGGERS | STATE_TRANSITION_TRIGGERS);
}
if ((player->effects & 0x10000) == 0x10000) {
player->soundEffects &= 0xFE1D0478;
// Terrain tumble
if ((player->effects & UNKNOWN_EFFECT_0x10000) == UNKNOWN_EFFECT_0x10000) {
player->triggers &= ALL_TRIGGERS & ~(HIT_TRIGGERS | ANY_BOOST_TRIGGERS | RACING_SPINOUT_TRIGGERS | STATE_TRANSITION_TRIGGERS);
}
// star
if ((player->effects & STAR_EFFECT) == STAR_EFFECT) {
player->soundEffects &= 0xFE9D8478;
player->triggers &= ALL_TRIGGERS & ~(HIT_TRIGGERS | SHROOM_TRIGGER | RACING_SPINOUT_TRIGGERS | STATE_TRANSITION_TRIGGERS);
}
// boo
if ((player->effects & BOO_EFFECT) == BOO_EFFECT) {
player->soundEffects &= 0xFE9D8678;
player->triggers &= ALL_TRIGGERS & ~(HIT_TRIGGERS | RACING_SPINOUT_TRIGGERS | STATE_TRANSITION_TRIGGERS);
}
// early start spinout
if ((player->effects & 0x4000) == 0x4000) {
player->soundEffects &= 0xFF5D45FF;
player->triggers &= ALL_TRIGGERS & ~(ANY_BOOST_TRIGGERS | SPINOUT_TRIGGER | STATE_TRANSITION_TRIGGERS);
}
// CPU_FAST_EFFECTS
if ((player->effects & 0x20000) == 0x20000) {
player->soundEffects &= 0xFE1D0478;
player->triggers &= ALL_TRIGGERS & ~(HIT_TRIGGERS | ANY_BOOST_TRIGGERS | RACING_SPINOUT_TRIGGERS | STATE_TRANSITION_TRIGGERS);
}
}
void func_8002B830(Player* player, s8 playerId, s8 screenId) {
if (player->soundEffects != 0) {
if (player->triggers != 0) {
func_8002B5C0(player, playerId, screenId);
}
if (player->soundEffects != 0) {
apply_sound_effect(player, playerId, screenId);
if (player->triggers != 0) {
apply_triggers(player, playerId, screenId);
}
if ((player->unk_044 & 0x400) != 0) {
func_800911B4(player, playerId);
@@ -1751,10 +1766,10 @@ void apply_effect(Player* player, s8 arg1, s8 arg2) {
player_decelerate_alternative(player, 10.0f);
}
if (gRaceState != RACE_FINISHED) {
if (player->soundEffects & 0x04000000) {
if (player->triggers & LOSE_BATTLE_EFFECT) {
func_8008FC64(player, arg1);
}
if (player->soundEffects & 0x08000000) {
if (player->triggers & BECOME_BOMB_EFFECT) {
func_8008FCDC(player, arg1);
}
}
@@ -3093,9 +3108,10 @@ void player_accelerate_alternative(Player* player) {
player->kartPropulsionStrength = (player->currentSpeed * player->currentSpeed) / 25.0f;
}
player->unk_044 |= 0x20;
if ((player->soundEffects * 8) < 0) {
// Hacky way to check for START_SPINOUT_TRIGGER
if ((player->triggers * 8) < 0) {
func_8008F104(player, player_index);
player->soundEffects &= 0xEFFFFFFF;
player->triggers &= ~START_SPINOUT_TRIGGER;
}
}
@@ -3117,9 +3133,10 @@ void player_decelerate_alternative(Player* player, f32 speed) {
player->kartPropulsionStrength = (player->currentSpeed * player->currentSpeed) / 25.0f;
}
player->unk_044 &= 0xFFDF;
if ((player->soundEffects * 8) < 0) {
// Hacky way to check for START_SPINOUT_TRIGGER
if ((player->triggers * 8) < 0) {
func_8008F104(player, player_index);
player->soundEffects &= 0xEFFFFFFF;
player->triggers &= ~START_SPINOUT_TRIGGER;
}
}
@@ -3359,11 +3376,11 @@ void player_accelerate_during_start_sequence(Player* player) {
var_v0 = 8;
}
if ((test < var_v0) && ((player->unk_044 & 0x20) != 0x20)) {
player->soundEffects |= 0x02000000;
player->triggers |= START_BOOST_TRIGGER;
} else if ((player->topSpeed * 0.9f) <= player->currentSpeed) {
if ((player->soundEffects & 0x02000000) != 0x02000000) {
player->soundEffects |= 0x10000000;
player->soundEffects &= ~0x02000000;
if ((player->triggers & START_BOOST_TRIGGER) != START_BOOST_TRIGGER) {
player->triggers |= START_SPINOUT_TRIGGER;
player->triggers &= ~START_BOOST_TRIGGER;
}
}
}
@@ -3383,9 +3400,9 @@ void player_decelerate_during_start_sequence(Player* player, f32 speedReduction)
player->currentSpeed = player->topSpeed;
}
if ((f64) player->currentSpeed <= (player->topSpeed * 0.7)) {
player->soundEffects &= ~0x10000000;
player->triggers &= ~START_SPINOUT_TRIGGER;
}
player->soundEffects &= ~0x02000000;
player->triggers &= ~START_BOOST_TRIGGER;
player->unk_044 &= ~0x0020;
player->unk_098 = (player->currentSpeed * player->currentSpeed) / 25.0f;
}
@@ -3633,7 +3650,7 @@ void func_80033AE0(Player* player, struct Controller* controller, s8 arg2) {
(!(player->effects & 8))) &&
(((player->speed / 18.0f) * 216.0f) >= 40.0f)) &&
(player->driftDuration == 0)) {
player->soundEffects |= 0x80;
player->triggers |= DRIVING_SPINOUT_TRIGGER;
}
}
if (((s32) player->tyres[BACK_RIGHT].surfaceType) < 0xF) {