From 4e51b7d5b6a9b89deb5ef135deec0ee5f0087e7c Mon Sep 17 00:00:00 2001 From: coco875 <59367621+coco875@users.noreply.github.com> Date: Sat, 13 Dec 2025 20:08:59 +0100 Subject: [PATCH] Document sound effects (pr 735 from the decomp) (#589) Co-authored-by: Jed Grabman Co-authored-by: MegaMech --- include/common_structs.h | 2 +- include/defines.h | 44 +++++-- src/actors/banana/update.inc.c | 2 +- src/actors/fake_item_box/update.inc.c | 2 +- src/camera.c | 8 +- src/code_80005FD0.c | 50 ++++---- src/code_80086E70.c | 8 +- src/effects.c | 74 ++++++------ src/effects.h | 18 +-- src/engine/objects/BombKart.cpp | 6 +- src/engine/objects/Mole.cpp | 2 +- src/engine/objects/Thwomp.cpp | 6 +- src/engine/vehicles/Boat.cpp | 2 +- src/engine/vehicles/Bus.cpp | 2 +- src/engine/vehicles/Car.cpp | 2 +- src/engine/vehicles/TankerTruck.cpp | 2 +- src/engine/vehicles/Train.cpp | 6 +- src/engine/vehicles/Truck.cpp | 2 +- src/player_controller.c | 159 ++++++++++++++------------ src/player_controller.h | 2 +- src/racing/actors.c | 30 ++--- src/racing/actors_extended.c | 22 ++-- src/racing/race_logic.c | 14 +-- src/render_player.c | 4 +- src/spawn_players.c | 2 +- 25 files changed, 254 insertions(+), 217 deletions(-) diff --git a/include/common_structs.h b/include/common_structs.h index 25a12dc53..39c501b31 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -268,7 +268,7 @@ typedef struct { /* 0x0006 */ u16 unk_006; /* 0x0008 */ s16 lapCount; /* 0x000A */ char unk_00A[0x2]; - /* 0x000C */ s32 soundEffects; // Bitflag. + /* 0x000C */ s32 triggers; // Bitflag. /* 0x0010 */ s16 currentItemCopy; // Has no effect on what item the players has, It is just a synced copy /* 0x0012 */ s16 unk_012; /* 0x0014 */ Vec3f pos; diff --git a/include/defines.h b/include/defines.h index e5cdf6963..8b53f5206 100644 --- a/include/defines.h +++ b/include/defines.h @@ -356,19 +356,39 @@ enum PLACE { FIRST_PLACE, SECOND_PLACE, THIRD_PLACE, FOURTH_PLACE }; #define MAX_TIME 0x927C0 /** - * @brief sound effect of player's - * for soundEffect + * @brief triggers indicating that an effect should be applied to a kart */ -#define HIT_SOUND_EFFECT 0x100 // hitting an object -#define BOOST_SOUND_EFFECT 0x200 // being boosted by trigger a mushroom -#define BOO_SOUND_EFFECT 0x800 // being a boo -#define STAR_SOUND_EFFECT 0x2000 // being a star -#define HIT_ROTATING_SOUND_EFFECT 0x4000 // hitting a rotating object -#define BOOST_RAMP_WOOD_SOUND_EFFECT 0x8000 // being boosted by a ramp -#define HOLD_BANANA_SOUND_EFFECT 0x40000 // holding a banana -#define REVERSE_SOUND_EFFECT 0x400000 // being in the wrong direction -#define BOOST_RAMP_ASPHALT_SOUND_EFFECT 0x800000 // being boosted by a boost pad -#define HIT_BY_ITEM_SOUND_EFFECT 0x1000000 // being hit by an item +#define HIT_BANANA_TRIGGER 0x1 // hits a banana +#define HIGH_TUMBLE_TRIGGER 0x2 // hit by a red shell, blue shell, or hit a mole +#define LOW_TUMBLE_TRIGGER 0x4 // hit by a green shell +#define DRIVING_SPINOUT_TRIGGER 0x80 // spinning out from erratic driving +#define THWOMP_SQUISH_TRIGGER 0x100 // stomped by thwomp +#define SHROOM_TRIGGER 0x200 // being boosted by trigger a mushroom +#define BOO_TRIGGER 0x800 // being a boo +#define UNUSED_TRIGGER_0x1000 0x1000 // Unused +#define STAR_TRIGGER 0x2000 // Starting a star +#define LIGHTNING_STRIKE_TRIGGER 0x4000 // Struck by lightning +#define BOOST_RAMP_WOOD_TRIGGER 0x8000 // being boosted by a ramp +#define UNUSED_TRIGGER_0x20000 0x20000 // Unused +#define DRAG_ITEM_EFFECT 0x40000 // holding a non-shell item behind you +#define HIT_PADDLE_BOAT_TRIGGER 0x80000 // hit paddle boat +#define UNUSED_TRIGGER_0x10000 0x100000 // Unused +#define SPINOUT_TRIGGER 0x200000 // hit crab or spiny spinout or losing versus race +#define VERTICAL_TUMBLE_TRIGGER 0x400000 // hitting a fake item / bomb / snowman / car / train +#define BOOST_RAMP_ASPHALT_TRIGGER 0x800000 // being boosted by a boost pad +#define HIT_BY_STAR_TRIGGER 0x1000000 // being hit by a star +#define START_BOOST_TRIGGER 0x2000000 // Start boost +#define LOSE_BATTLE_EFFECT 0x4000000 // When losing battle mode +#define BECOME_BOMB_EFFECT 0x8000000 // When becoming a bomb in battle mode +#define START_SPINOUT_TRIGGER 0x10000000 // Spinning out by holding gas at start of race + +#define ALL_TRIGGERS (0xFFFFFFFF) +#define RACING_SPINOUT_TRIGGERS (SPINOUT_TRIGGER | DRIVING_SPINOUT_TRIGGER | HIT_BANANA_TRIGGER) // 0x200081 +#define RAMP_BOOST_TRIGGERS (BOOST_RAMP_ASPHALT_TRIGGER | BOOST_RAMP_WOOD_TRIGGER) // 0x00808000 +#define ANY_BOOST_TRIGGERS (RAMP_BOOST_TRIGGERS | SHROOM_TRIGGER) // 0x00808200 +#define STATE_TRANSITION_TRIGGERS (STAR_TRIGGER | BOO_TRIGGER | UNUSED_TRIGGER_0x1000 | UNUSED_TRIGGER_0x20000)// 0x00023800 +#define HIT_TRIGGERS (HIT_BY_STAR_TRIGGER | VERTICAL_TUMBLE_TRIGGER | \ + LIGHTNING_STRIKE_TRIGGER | LOW_TUMBLE_TRIGGER | HIGH_TUMBLE_TRIGGER | THWOMP_SQUISH_TRIGGER) // 0x01404106 /** * @brief effect of player's diff --git a/src/actors/banana/update.inc.c b/src/actors/banana/update.inc.c index 331585703..eabe4ba5b 100644 --- a/src/actors/banana/update.inc.c +++ b/src/actors/banana/update.inc.c @@ -60,7 +60,7 @@ void update_actor_banana(struct BananaActor* banana) { controller->buttonDepressed &= ~Z_TRIG; banana->state = 1; banana->unk_04 = 0x00B4; - player->soundEffects &= ~HOLD_BANANA_SOUND_EFFECT; + player->triggers &= ~DRAG_ITEM_EFFECT; func_800C9060(player - gPlayerOne, SOUND_ARG_LOAD(0x19, 0x00, 0x80, 0x12)); pad3 = controller->rawStickY; if ((pad3 > 30.0f) && (controller->rawStickX < 10) && (controller->rawStickX >= -9)) { diff --git a/src/actors/fake_item_box/update.inc.c b/src/actors/fake_item_box/update.inc.c index efb834a80..48fbedf50 100644 --- a/src/actors/fake_item_box/update.inc.c +++ b/src/actors/fake_item_box/update.inc.c @@ -45,7 +45,7 @@ void update_actor_fake_item_box(struct FakeItemBox* fake_item_box) { if ((temp_v1_3->buttonDepressed & Z_TRIG) != 0) { temp_v1_3->buttonDepressed &= 0xDFFF; func_802A1064(fake_item_box); - temp_v0_4->soundEffects &= 0xFFFBFFFF; + temp_v0_4->triggers &= 0xFFFBFFFF; func_800C9060((u8) (temp_v0_4 - gPlayerOne), SOUND_ARG_LOAD(0x19, 0x00, 0x80, 0x12)); } } diff --git a/src/camera.c b/src/camera.c index 6d3ed90b9..577af222e 100644 --- a/src/camera.c +++ b/src/camera.c @@ -1156,7 +1156,7 @@ void func_8001F394(Player* player, f32* arg1) { } if (D_80164A08[playerIndex] == 0) { - if (player->soundEffects & HOLD_BANANA_SOUND_EFFECT) { + if (player->triggers & DRAG_ITEM_EFFECT) { D_80164A08[playerIndex] = 1; } if ((player->effects & BOOST_EFFECT) == BOOST_EFFECT) { @@ -1165,7 +1165,7 @@ void func_8001F394(Player* player, f32* arg1) { if ((player->effects & BOOST_RAMP_ASPHALT_EFFECT) == BOOST_RAMP_ASPHALT_EFFECT) { D_80164A08[playerIndex] = 3; } - if ((player->soundEffects & 0x100) == 0x100) { + if ((player->triggers & THWOMP_SQUISH_TRIGGER) == THWOMP_SQUISH_TRIGGER) { D_80164A08[playerIndex] = 4; } if (((player->effects & 0x80) == 0x80) || ((player->effects & 0x40) == 0x40)) { @@ -1175,7 +1175,7 @@ void func_8001F394(Player* player, f32* arg1) { } switch (D_80164A08[playerIndex]) { case 1: - if (player->soundEffects & HOLD_BANANA_SOUND_EFFECT) { + if (player->triggers & DRAG_ITEM_EFFECT) { move_f32_towards(&D_80164498[playerIndex], 20.0f, 0.2f); } else { if (D_80164498[playerIndex] > 1.0f) { @@ -1214,7 +1214,7 @@ void func_8001F394(Player* player, f32* arg1) { } break; case 4: - if ((player->soundEffects & 0x100) == 0x100) { + if ((player->triggers & THWOMP_SQUISH_TRIGGER) == THWOMP_SQUISH_TRIGGER) { move_f32_towards(&D_80164498[playerIndex], 25.0f, 1.0f); } else { if (D_80164498[playerIndex] > 1.0f) { diff --git a/src/code_80005FD0.c b/src/code_80005FD0.c index 444e18858..ee25db35c 100644 --- a/src/code_80005FD0.c +++ b/src/code_80005FD0.c @@ -1100,8 +1100,8 @@ void regulate_cpu_speed(s32 playerId, f32 targetSpeed, Player* player) { var_f2 = player->speed; if (!(player->effects & 0x80) && !(player->effects & 0x40) && !(player->effects & 0x20000) && - !(player->soundEffects & 0x400000) && !(player->soundEffects & 0x01000000) && !(player->soundEffects & 2) && - !(player->soundEffects & 4)) { + !(player->triggers & VERTICAL_TUMBLE_TRIGGER) && !(player->triggers & HIT_BY_STAR_TRIGGER) && !(player->triggers & HIGH_TUMBLE_TRIGGER) && + !(player->triggers & LOW_TUMBLE_TRIGGER)) { if (IsPodiumCeremony()) { func_80007FA4(playerId, player, var_f2); } else if ((bStopAICrossing[playerId] == 1) && !(player->effects & (STAR_EFFECT | BOO_EFFECT))) { @@ -1568,8 +1568,8 @@ void play_cpu_sound_effect(s32 arg0, Player* player) { } } if (D_801633B0[arg0] >= 0xB) { - if ((player->soundEffects & REVERSE_EFFECT) || (player->soundEffects & 0x01000000) || - (player->soundEffects & 2) || (player->soundEffects & 4) || (player->effects & HIT_EFFECT)) { + if ((player->triggers & REVERSE_EFFECT) || (player->triggers & HIT_BY_STAR_TRIGGER) || + (player->triggers & HIGH_TUMBLE_TRIGGER) || (player->triggers & LOW_TUMBLE_TRIGGER) || (player->effects & HIT_EFFECT)) { func_800C92CC(arg0, SOUND_ARG_LOAD(0x29, 0x00, 0x80, 0x0B)); D_801633B0[arg0] = 0; } @@ -3114,7 +3114,7 @@ void func_8000DF8C(s32 bombKartId) { if ((((temp_f0 * temp_f0) + (temp_f2 * temp_f2)) + (temp_f12 * temp_f12)) < 25.0f) { var_s1 = 0; sp7E = 4; - var_v0->soundEffects |= 0x400000; + var_v0->triggers |= VERTICAL_TUMBLE_TRIGGER; var_v0->type &= ~0x2000; } } @@ -3130,9 +3130,9 @@ void func_8000DF8C(s32 bombKartId) { sp7E = 4; var_s1 = 0; if (IsFrappeSnowland()) { - var_v0->soundEffects |= 0x01000000; + var_v0->triggers |= HIT_BY_STAR_TRIGGER; } else { - var_v0->soundEffects |= 0x400000; + var_v0->triggers |= VERTICAL_TUMBLE_TRIGGER; } } } @@ -3689,7 +3689,7 @@ void init_players(void) { for (i = 0; i < NUM_PLAYERS; i++) { if (D_80163330[i] == 1) { - gPlayers[i].soundEffects |= 0x02000000; + gPlayers[i].triggers |= START_BOOST_TRIGGER; } } } @@ -4652,14 +4652,14 @@ void handle_trains_interactions(s32 playerId, Player* player) { if ((z_dist > -100.0) && (z_dist < 100.0)) { if (is_collide_with_vehicle(trainCar->position[0], trainCar->position[2], trainCar->velocity[0], trainCar->velocity[2], 60.0f, 20.0f, playerPosX, playerPosZ) == 1) { - player->soundEffects |= REVERSE_SOUND_EFFECT; + player->triggers |= VERTICAL_TUMBLE_TRIGGER; } trainCar = &gTrainList[trainIndex].tender; if (trainCar->isActive == 1) { if (is_collide_with_vehicle(trainCar->position[0], trainCar->position[2], trainCar->velocity[0], trainCar->velocity[2], 30.0f, 20.0f, playerPosX, playerPosZ) == 1) { - player->soundEffects |= REVERSE_SOUND_EFFECT; + player->triggers |= VERTICAL_TUMBLE_TRIGGER; } } } @@ -4676,7 +4676,7 @@ void handle_trains_interactions(s32 playerId, Player* player) { if (is_collide_with_vehicle(trainCar->position[0], trainCar->position[2], trainCar->velocity[0], trainCar->velocity[2], 30.0f, 20.0f, playerPosX, playerPosZ) == 1) { - player->soundEffects |= REVERSE_SOUND_EFFECT; + player->triggers |= VERTICAL_TUMBLE_TRIGGER; } } } @@ -4902,7 +4902,7 @@ void handle_paddle_boats_interactions(Player* player) { tempPaddleWheelBoat->velocity[0], tempPaddleWheelBoat->velocity[2], 200.0f, 60.0f, playerX, playerZ) == 1) && (y_diff < 60.0)) { - player->soundEffects |= 0x80000; + player->triggers |= HIT_PADDLE_BOAT_TRIGGER; } } } @@ -5086,7 +5086,7 @@ void handle_vehicle_interactions(s32 playerId, Player* player, VehicleStuff* veh if (((temp_f14) > -100.0) && ((temp_f14) < 100.0)) { if (is_collide_with_vehicle(vehicle->position[0], vehicle->position[2], vehicle->velocity[0], vehicle->velocity[2], arg3, arg4, spC4, spBC) == (s32) 1) { - player->soundEffects |= REVERSE_SOUND_EFFECT; + player->triggers |= VERTICAL_TUMBLE_TRIGGER; } } } @@ -7223,7 +7223,7 @@ void cpu_use_item_strategy(s32 playerId) { } else if (cpuStrategy->branch == CPU_STRATEGY_ITEM_BANANA) { cpuStrategy->actorIndex = use_banana_item(player); if ((cpuStrategy->actorIndex >= 0) && (cpuStrategy->actorIndex < 100)) { - player->soundEffects |= HOLD_BANANA_SOUND_EFFECT; + player->triggers |= DRAG_ITEM_EFFECT; cpuStrategy->branch = CPU_STRATEGY_HOLD_BANANA; cpuStrategy->timer = 0; cpuStrategy->numItemUse += 1; @@ -7248,7 +7248,7 @@ void cpu_use_item_strategy(s32 playerId) { cpuStrategy->branch = CPU_STRATEGY_WAIT_NEXT_ITEM; cpuStrategy->timer = 0; - player->soundEffects &= ~HOLD_BANANA_SOUND_EFFECT; + player->triggers &= ~DRAG_ITEM_EFFECT; } else if (cpuStrategy->timeBeforeThrow < cpuStrategy->timer) { cpuStrategy->branch = CPU_STRATEGY_DROP_BANANA; } @@ -7277,7 +7277,7 @@ void cpu_use_item_strategy(s32 playerId) { (BANANA_ACTOR(actor)->boundingBoxSize + 1.0f); } } - player->soundEffects &= ~HOLD_BANANA_SOUND_EFFECT; + player->triggers &= ~DRAG_ITEM_EFFECT; cpuStrategy->timer = 0; cpuStrategy->branch = CPU_STRATEGY_WAIT_NEXT_ITEM; break; @@ -7287,7 +7287,7 @@ void cpu_use_item_strategy(s32 playerId) { if ((cpuStrategy->actorIndex >= 0) && (cpuStrategy->actorIndex < 100)) { actor = GET_ACTOR(cpuStrategy->actorIndex); BANANA_ACTOR(actor)->state = BANANA_ON_GROUND; - player->soundEffects |= HOLD_BANANA_SOUND_EFFECT; + player->triggers |= DRAG_ITEM_EFFECT; cpuStrategy->branch = CPU_STRATEGY_HOLD_THROW_BANANA; cpuStrategy->timer = 0; cpuStrategy->numItemUse += 1; @@ -7320,7 +7320,7 @@ void cpu_use_item_strategy(s32 playerId) { cpuStrategy->timer = 0; cpuStrategy->branch = CPU_STRATEGY_WAIT_NEXT_ITEM; - player->soundEffects &= ~HOLD_BANANA_SOUND_EFFECT; + player->triggers &= ~DRAG_ITEM_EFFECT; } else { BANANA_ACTOR(actor)->velocity[1] -= 0.4; BANANA_ACTOR(actor)->pos[0] += BANANA_ACTOR(actor)->velocity[0]; @@ -7354,7 +7354,7 @@ void cpu_use_item_strategy(s32 playerId) { BANANA_ACTOR(actor)->pos[2]) + (BANANA_ACTOR(actor)->boundingBoxSize + 1.0f); } - player->soundEffects &= ~HOLD_BANANA_SOUND_EFFECT; + player->triggers &= ~DRAG_ITEM_EFFECT; cpuStrategy->branch = CPU_STRATEGY_WAIT_NEXT_ITEM; cpuStrategy->timer = 0; break; @@ -7652,7 +7652,7 @@ void cpu_use_item_strategy(s32 playerId) { break; case CPU_STRATEGY_ITEM_STAR: - player->soundEffects |= STAR_SOUND_EFFECT; + player->triggers |= STAR_TRIGGER; cpuStrategy->branch = CPU_STRATEGY_END_ITEM_STAR; cpuStrategy->timer = 0; cpuStrategy->numItemUse += 1; @@ -7666,7 +7666,7 @@ void cpu_use_item_strategy(s32 playerId) { break; case CPU_STRATEGY_ITEM_BOO: - player->soundEffects |= BOO_SOUND_EFFECT; + player->triggers |= BOO_TRIGGER; cpuStrategy->branch = CPU_STRATEGY_WAIT_END_BOO; cpuStrategy->timer = 0; cpuStrategy->numItemUse += 1; @@ -7680,7 +7680,7 @@ void cpu_use_item_strategy(s32 playerId) { break; case CPU_STRATEGY_ITEM_MUSHROOM: - player->soundEffects |= BOOST_SOUND_EFFECT; + player->triggers |= SHROOM_TRIGGER; cpuStrategy->branch = CPU_STRATEGY_WAIT_NEXT_ITEM; cpuStrategy->timer = 0; cpuStrategy->numItemUse += 1; @@ -7688,7 +7688,7 @@ void cpu_use_item_strategy(s32 playerId) { case CPU_STRATEGY_ITEM_DOUBLE_MUSHROOM: if (cpuStrategy->timer >= 0x3D) { - player->soundEffects |= BOOST_SOUND_EFFECT; + player->triggers |= SHROOM_TRIGGER; cpuStrategy->branch = CPU_STRATEGY_ITEM_MUSHROOM; cpuStrategy->timer = 0; } @@ -7696,7 +7696,7 @@ void cpu_use_item_strategy(s32 playerId) { case CPU_STRATEGY_ITEM_TRIPLE_MUSHROOM: if (cpuStrategy->timer >= 0x3D) { - player->soundEffects |= BOOST_SOUND_EFFECT; + player->triggers |= SHROOM_TRIGGER; cpuStrategy->branch = CPU_STRATEGY_ITEM_DOUBLE_MUSHROOM; cpuStrategy->timer = 0; } @@ -7710,7 +7710,7 @@ void cpu_use_item_strategy(s32 playerId) { case CPU_STRATEGY_USE_SUPER_MUSHROOM: if ((((s16) cpuStrategy->timer) % 60) == 0) { - player->soundEffects |= BOOST_SOUND_EFFECT; + player->triggers |= SHROOM_TRIGGER; if (cpuStrategy->timeBeforeThrow < cpuStrategy->timer) { cpuStrategy->timer = 0; cpuStrategy->branch = CPU_STRATEGY_WAIT_NEXT_ITEM; diff --git a/src/code_80086E70.c b/src/code_80086E70.c index b84c55696..4c94b3fcf 100644 --- a/src/code_80086E70.c +++ b/src/code_80086E70.c @@ -1167,7 +1167,7 @@ s32 func_80089B50(s32 objectIndex) { (player->type & PLAYER_EXISTS) && !(player->type & PLAYER_INVISIBLE_OR_BOMB) && (has_collided_horizontally_with_player(objectIndex, player) != 0)) { if (!(player->effects & STAR_EFFECT)) { - player->soundEffects |= REVERSE_SOUND_EFFECT; + player->triggers |= VERTICAL_TUMBLE_TRIGGER; if (is_obj_flag_status_active(objectIndex, 0x04000000) != 0) { func_80072180(); } @@ -1194,7 +1194,7 @@ s32 func_80089CBC(s32 objectIndex, f32 arg1) { if ((player->type & PLAYER_EXISTS) && !(player->type & PLAYER_INVISIBLE_OR_BOMB) && (has_collided_with_player_and_within_height(objectIndex, player, arg1) != 0)) { if (!(player->effects & STAR_EFFECT)) { - player->soundEffects |= REVERSE_SOUND_EFFECT; + player->triggers |= VERTICAL_TUMBLE_TRIGGER; if (is_obj_flag_status_active(objectIndex, 0x04000000) != 0) { func_80072180(); } @@ -1221,7 +1221,7 @@ s32 func_80089E18(s32 objectIndex) { if (player->effects & STAR_EFFECT) { var_s6 = 1; } else { - player->soundEffects |= 1; + player->triggers |= HIT_BANANA_TRIGGER; } } } @@ -1245,7 +1245,7 @@ s32 func_80089F24(s32 objectIndex) { if (is_obj_flag_status_active(objectIndex, 0x04000000) != 0) { func_80072180(); } - player->soundEffects |= 0x200000; + player->triggers |= SPINOUT_TRIGGER; } } } diff --git a/src/effects.c b/src/effects.c index 21d175021..03159f8d5 100644 --- a/src/effects.c +++ b/src/effects.c @@ -134,8 +134,8 @@ UNUSED void func_unnamed33(void) { } void func_8008C310(Player* player) { - if ((player->soundEffects & 2) || (player->soundEffects & 4) || ((player->soundEffects << 9) < 0) || - (player->soundEffects & HIT_BY_ITEM_SOUND_EFFECT)) { + if ((player->triggers & HIGH_TUMBLE_TRIGGER) || (player->triggers & LOW_TUMBLE_TRIGGER) || ((player->triggers << 9) < 0) || + (player->triggers & HIT_BY_STAR_TRIGGER)) { player->unk_0B6 = ((u16) player->unk_0B6 | 0x1000); } } @@ -216,7 +216,7 @@ void func_8008C528(Player* player, s8 arg1) { } else { play_cpu_sound_effect(arg1, player); } - player->soundEffects = (s32) (player->soundEffects & ~4); + player->triggers = (s32) (player->triggers & ~LOW_TUMBLE_TRIGGER); } void func_8008C62C(Player* player, s8 arg1) { @@ -311,7 +311,7 @@ void func_8008C8C4(Player* player, s8 playerId) { } if ((gModeSelection == VERSUS) && ((player->type & PLAYER_CPU) == PLAYER_CPU) && (!gDemoMode) && ((player->unk_0CA & 2) == 0) && (gGPCurrentRaceRankByPlayerId[playerId] != 0)) { - player->soundEffects = (s32) (player->soundEffects | REVERSE_SOUND_EFFECT); + player->triggers = (s32) (player->triggers | VERTICAL_TUMBLE_TRIGGER); } } @@ -372,7 +372,7 @@ void func_8008C9EC(Player* player, s8 arg1) { void func_8008CDC0(Player* player, s8 arg1) { clean_effect(player, arg1); - player->soundEffects &= ~1; + player->triggers &= ~HIT_BANANA_TRIGGER; player->unk_0B4 = 0; player->unk_0B8 = 3.0f; player->unk_0AC = 1; @@ -444,7 +444,7 @@ void func_8008D0E4(Player* player, UNUSED s8 arg1) { void func_8008D0FC(Player* player, s8 arg1) { clean_effect(player, arg1); - player->soundEffects &= ~0x80; + player->triggers &= ~DRIVING_SPINOUT_TRIGGER; player->unk_0B4 = 0; player->unk_0B8 = 2.0f; player->unk_0AC = 1; @@ -506,12 +506,12 @@ void func_8008D3B0(Player* player, UNUSED s8 arg1) { player->unk_044 &= 0xBFFF; } -void apply_boost_sound_effect(Player* player, s8 arg1) { +void trigger_shroom(Player* player, s8 arg1) { clean_effect(player, arg1); player->effects |= BOOST_EFFECT; - player->soundEffects &= ~BOOST_SOUND_EFFECT; + player->triggers &= ~SHROOM_TRIGGER; player->unk_DB4.unk0 = 0; player->unk_DB4.unk8 = 8.0f; @@ -559,7 +559,7 @@ void func_8008D570(Player* player, s8 arg1) { player->unk_0AE = player->rotation[1]; player->effects |= 0x80000; player->effects &= ~0x10; - player->soundEffects &= ~0x1000; + player->triggers &= ~UNUSED_TRIGGER_0x1000; player->kartHopJerk = D_800E3730[player->characterId]; player->kartHopAcceleration = 0.0f; player->kartHopVelocity = (f32) D_800E3710[player->characterId]; @@ -618,7 +618,7 @@ void func_8008D7B0(Player* player, s8 arg1) { player->unk_0AE = player->rotation[1]; player->effects |= 0x800000; player->effects &= ~0x10; - player->soundEffects &= ~0x20000; + player->triggers &= ~UNUSED_TRIGGER_0x20000; player->kartHopJerk = D_800E3770[player->characterId]; player->kartHopAcceleration = 0.0f; player->kartHopVelocity = D_800E3750[player->characterId]; @@ -687,7 +687,7 @@ void func_8008D9C0(Player* player) { } } -void apply_hit_sound_effect(Player* player, s8 arg1) { +void trigger_squish(Player* player, s8 arg1) { clean_effect(player, arg1); if ((player->effects & HIT_EFFECT) == 0) { @@ -704,7 +704,7 @@ void apply_hit_sound_effect(Player* player, s8 arg1) { player->unk_D9C = 0.0f; player->unk_DA0 = 65.0f; - if ((player->soundEffects & 0x100) != 0) { + if ((player->triggers & THWOMP_SQUISH_TRIGGER) != 0) { player->unk_046 |= 0x80; } @@ -738,7 +738,7 @@ void apply_hit_effect(Player* player, s8 arg1) { } if ((player->unk_046 & 0x80) != 0) { - if ((player->soundEffects & 0x100) == 0) { + if ((player->triggers & THWOMP_SQUISH_TRIGGER) == 0) { D_8018D990[arg1] = 1; player->unk_238 = 0; if ((player->type & PLAYER_HUMAN) != 0) { @@ -827,10 +827,10 @@ void apply_hit_effect(Player* player, s8 arg1) { } } -void apply_hit_rotating_sound_effect(Player* player, s8 arg1) { +void trigger_lightning_strike(Player* player, s8 arg1) { clean_effect(player, arg1); - player->soundEffects &= ~HIT_ROTATING_SOUND_EFFECT; + player->triggers &= ~LIGHTNING_STRIKE_TRIGGER; player->effects |= 0x40020000; player->effects &= ~0x10; player->kartPropulsionStrength *= 0.6; @@ -874,7 +874,7 @@ void apply_lightning_effect(Player* player, s8 arg1) { D_80165190[1][arg1] = 1; D_80165190[2][arg1] = 1; D_80165190[3][arg1] = 1; - apply_hit_sound_effect(player, arg1); + trigger_squish(player, arg1); } else if ((player->effects & 0x20000) == 0x20000) { player->rotation[1] -= 0x5B0; D_8018D920[arg1] -= 0x5B0; @@ -992,12 +992,12 @@ void func_8008E4A4(Player* player, s8 arg1) { } } -void apply_reverse_sound_effect(Player* player, s8 arg1) { +void trigger_vertical_tumble(Player* player, s8 arg1) { clean_effect(player, arg1); func_8008C310(player); player->unk_0A8 = 0; - player->effects |= 0x01000000; + player->effects |= HIT_BY_STAR_TRIGGER; player->effects &= ~0x10; player->kartHopJerk = 0.0f; player->kartHopAcceleration = 0.0f; @@ -1025,7 +1025,7 @@ void apply_reverse_sound_effect(Player* player, s8 arg1) { play_cpu_sound_effect(arg1, player); } - player->soundEffects &= ~(REVERSE_SOUND_EFFECT | 0x80000); + player->triggers &= ~(VERTICAL_TUMBLE_TRIGGER | HIT_PADDLE_BOAT_TRIGGER); player->unk_0B6 |= 0x40; gTimerBoostTripleACombo[arg1] = 0; gIsPlayerTripleAButtonCombo[arg1] = false; @@ -1101,7 +1101,7 @@ void apply_hit_by_item_effect(Player* player, s8 arg1) { } } -void apply_hit_by_item_sound_effect(Player* player, s8 arg1) { +void trigger_high_tumble(Player* player, s8 arg1) { clean_effect(player, arg1); func_8008C310(player); @@ -1126,7 +1126,7 @@ void apply_hit_by_item_sound_effect(Player* player, s8 arg1) { player->effects |= HIT_BY_ITEM_EFFECT; player->unk_0B6 |= 0x40; - player->soundEffects &= ~0x01000002; + player->triggers &= ~(HIT_BY_STAR_TRIGGER | HIGH_TUMBLE_TRIGGER); gTimerBoostTripleACombo[arg1] = 0; gIsPlayerTripleAButtonCombo[arg1] = false; @@ -1145,11 +1145,11 @@ void remove_hit_by_item_effect(Player* player, s8 arg1) { player->unk_042 = 0; } -void apply_boost_ramp_asphalt_sound_effect(Player* player, s8 playerId) { +void trigger_asphalt_ramp_boost(Player* player, s8 playerId) { clean_effect(player, playerId); player->effects |= BOOST_RAMP_ASPHALT_EFFECT; - player->soundEffects &= ~BOOST_RAMP_ASPHALT_SOUND_EFFECT; + player->triggers &= ~BOOST_RAMP_ASPHALT_TRIGGER; player->unk_DB4.unk0 = 0; player->unk_DB4.unk8 = 8.0f; if (D_8015F890 != 1) { @@ -1193,11 +1193,11 @@ void remove_boost_ramp_asphalt_effect(Player* player) { player->boostPower = 0.0f; } -void apply_boost_ramp_wood_sound_effect(Player* player, s8 playerId) { +void trigger_wood_ramp_boost(Player* player, s8 playerId) { clean_effect(player, playerId); player->effects |= BOOST_RAMP_WOOD_EFFECT; - player->soundEffects &= ~BOOST_RAMP_WOOD_SOUND_EFFECT; + player->triggers &= ~BOOST_RAMP_WOOD_TRIGGER; if (D_8015F890 != 1) { if (((player->type & PLAYER_HUMAN) == PLAYER_HUMAN) && ((player->type & PLAYER_INVISIBLE_OR_BOMB) == 0)) { @@ -1395,11 +1395,11 @@ void apply_star_effect(Player* player, s8 arg1) { } // Star item -void apply_star_sound_effect(Player* player, s8 arg1) { +void trigger_star(Player* player, s8 arg1) { clean_effect(player, arg1); player->effects |= STAR_EFFECT; - player->soundEffects &= ~STAR_SOUND_EFFECT; + player->triggers &= ~STAR_TRIGGER; gPlayerStarEffectStartTime[arg1] = gCourseTimer; D_8018D900[arg1] = 1; @@ -1467,7 +1467,7 @@ void apply_boo_effect(Player* player, s8 playerIndex) { } } -void apply_boo_sound_effect(Player* player, s8 playerIndex) { +void trigger_boo(Player* player, s8 playerIndex) { s16 temp_v1; if ((player->type & PLAYER_HUMAN) != 0) { @@ -1483,7 +1483,7 @@ void apply_boo_sound_effect(Player* player, s8 playerIndex) { clean_effect(player, playerIndex); player->effects |= BOO_EFFECT; - player->soundEffects &= ~BOO_SOUND_EFFECT; + player->triggers &= ~BOO_TRIGGER; gPlayerBooEffectStartTime[playerIndex] = gCourseTimer; gPlayerOtherScreensAlpha[playerIndex] = ALPHA_MAX; @@ -1529,8 +1529,8 @@ void func_8008FC64(Player* player, s8 playerIndex) { player->alpha -= ALPHA_CHANGE_MEDIUM; if (player->alpha <= ALPHA_CHANGE_MEDIUM) { player->alpha = ALPHA_MIN; - player->soundEffects &= 0xFBFFFFFF; - player->soundEffects |= 0x08000000; + player->triggers &= ~LOSE_BATTLE_EFFECT; + player->triggers |= BECOME_BOMB_EFFECT; player->type |= PLAYER_UNKNOWN_0x40; func_8008FDA8(player, playerIndex); func_800569F4(playerIndex); @@ -1541,7 +1541,7 @@ void func_8008FCDC(Player* player, s8 arg1) { player->alpha += ALPHA_CHANGE_SMALL; if (player->alpha > ALPHA_MAX - (ALPHA_CHANGE_LARGE * 2)) { player->alpha = ALPHA_MAX; - player->soundEffects &= ~0x08000000; + player->triggers &= ~BECOME_BOMB_EFFECT; } func_80056A40(arg1, (u32) player->alpha); } @@ -1549,7 +1549,7 @@ void func_8008FCDC(Player* player, s8 arg1) { void func_8008FD4C(Player* player, UNUSED s8 arg1) { s16 temp_v0; - player->soundEffects |= 0x04000000; + player->triggers |= LOSE_BATTLE_EFFECT; player->unk_044 |= 0x200; for (temp_v0 = 0; temp_v0 < 10; ++temp_v0) { @@ -1576,21 +1576,21 @@ void func_8008FDF4(Player* player, UNUSED s8 arg1) { player->kartHopJerk = D_800E37F0[player->characterId]; player->kartHopAcceleration = 0.0f; player->kartHopVelocity = D_800E37D0[player->characterId]; - player->soundEffects &= ~0x00100000; - player->effects |= 0x10000000; + player->triggers &= ~UNUSED_TRIGGER_0x10000; + player->effects |= UNKNOWN_EFFECT_0x10000000; } void func_8008FE84(Player* player, UNUSED s8 arg1) { player->effects &= ~0x10; if ((player->effects & 8) != 8) { - player->effects &= ~0x10000000; + player->effects &= ~UNKNOWN_EFFECT_0x10000000; player->currentSpeed /= 2; player->kartPropulsionStrength /= 2; } } void func_8008FEDC(Player* player, UNUSED s8 arg1) { - player->effects &= ~0x10000000; + player->effects &= ~UNKNOWN_EFFECT_0x10000000; player->kartHopJerk = 0.0f; player->kartHopVelocity = 0.0f; player->kartHopAcceleration = 0.0f; diff --git a/src/effects.h b/src/effects.h index 99b80ecc5..2bd2996c1 100644 --- a/src/effects.h +++ b/src/effects.h @@ -59,7 +59,7 @@ void func_8008D0E4(Player*, s8); void func_8008D0FC(Player*, s8); void func_8008D170(Player*, s8); void func_8008D3B0(Player*, s8); -void apply_boost_sound_effect(Player*, s8); +void trigger_shroom(Player*, s8); void apply_boost_effect(Player*); void remove_boost_effect(Player*); void func_8008D570(Player*, s8); @@ -69,21 +69,21 @@ void func_8008D7B0(Player*, s8); void func_8008D8B4(Player*, s8); void func_8008D97C(Player*); void func_8008D9C0(Player*); -void apply_hit_sound_effect(Player*, s8); +void trigger_squish(Player*, s8); void apply_hit_effect(Player*, s8); -void apply_hit_rotating_sound_effect(Player*, s8); +void trigger_lightning_strike(Player*, s8); void apply_lightning_effect(Player*, s8); void remove_lightning_effect(Player*, s8); void func_8008E4A4(Player*, s8); -void apply_reverse_sound_effect(Player*, s8); +void trigger_vertical_tumble(Player*, s8); void func_8008E884(Player*, s8); void apply_hit_by_item_effect(Player*, s8); -void apply_hit_by_item_sound_effect(Player*, s8); +void trigger_high_tumble(Player*, s8); void remove_hit_by_item_effect(Player*, s8); -void apply_boost_ramp_asphalt_sound_effect(Player*, s8); +void trigger_asphalt_ramp_boost(Player*, s8); void apply_boost_ramp_asphalt_effect(Player*); void remove_boost_ramp_asphalt_effect(Player*); -void apply_boost_ramp_wood_sound_effect(Player*, s8); +void trigger_wood_ramp_boost(Player*, s8); void apply_boost_ramp_wood_effect(Player*); void remove_boost_ramp_wood_effect(Player*); void func_8008F104(Player*, s8); @@ -93,10 +93,10 @@ void func_8008F3F4(Player*, s8); void func_8008F494(Player*, s8); void func_8008F5A4(Player*, s8); void apply_star_effect(Player*, s8); -void apply_star_sound_effect(Player*, s8); +void trigger_star(Player*, s8); void func_8008F86C(Player*, s8); void apply_boo_effect(Player*, s8); -void apply_boo_sound_effect(Player*, s8); +void trigger_boo(Player*, s8); void func_8008FB30(Player*, s8); void func_8008FC1C(Player*); void func_8008FC64(Player*, s8); diff --git a/src/engine/objects/BombKart.cpp b/src/engine/objects/BombKart.cpp index 4ba5ff843..3ba60d98a 100644 --- a/src/engine/objects/BombKart.cpp +++ b/src/engine/objects/BombKart.cpp @@ -148,7 +148,7 @@ void OBombKart::Tick() { circleTimer = 0; state = States::EXPLODE; Behaviour = States::EXPLODE; - player->soundEffects |= 0x400000; + player->triggers |= VERTICAL_TUMBLE_TRIGGER; player->type &= ~0x2000; } } @@ -165,9 +165,9 @@ void OBombKart::Tick() { Behaviour = States::EXPLODE; circleTimer = 0; if (IsFrappeSnowland()) { - player->soundEffects |= 0x01000000; + player->triggers |= HIT_BY_STAR_TRIGGER; } else { - player->soundEffects |= 0x400000; + player->triggers |= VERTICAL_TUMBLE_TRIGGER; } } } diff --git a/src/engine/objects/Mole.cpp b/src/engine/objects/Mole.cpp index 92d357873..8cdfd0599 100644 --- a/src/engine/objects/Mole.cpp +++ b/src/engine/objects/Mole.cpp @@ -217,7 +217,7 @@ void OMole::func_80081D34(s32 objectIndex) { if (player->effects & 0x200) { func_800C9060(i, 0x1900A046U); } else { - player->soundEffects |= 2; + player->triggers |= HIGH_TUMBLE_TRIGGER; } object->direction_angle[1] = camera->rot[1]; object->velocity[1] = (player->speed / 2) + 3.0; diff --git a/src/engine/objects/Thwomp.cpp b/src/engine/objects/Thwomp.cpp index b658b50ff..4a699c217 100644 --- a/src/engine/objects/Thwomp.cpp +++ b/src/engine/objects/Thwomp.cpp @@ -644,7 +644,7 @@ void OThwomp::func_80080B28(s32 objectIndex, s32 playerId) { player = &gPlayerOne[playerId]; if (is_obj_flag_status_active(objectIndex, 0x00000200) != 0) { - if (!(player->soundEffects & 0x100)) { + if (!(player->triggers & THWOMP_SQUISH_TRIGGER)) { temp_f0 = func_80088F54(objectIndex, player); if ((temp_f0 <= 9.0) && !(player->effects & 0x04000000) && (has_collided_horizontally_with_player(objectIndex, player) != 0)) { @@ -675,7 +675,7 @@ void OThwomp::func_80080B28(s32 objectIndex, s32 playerId) { func_800722A4(objectIndex, 2); player->unk_040 = (s16) objectIndex; player->unk_046 |= 2; - player->soundEffects |= 0x100; + player->triggers |= THWOMP_SQUISH_TRIGGER; reset_player_speed_and_velocity(player); } } @@ -816,7 +816,7 @@ void OThwomp::func_80080DE4(s32 arg0) { player = gPlayerOne; for (var_v1 = 0; var_v1 < NUM_PLAYERS; var_v1++, player++) { if (arg0 == player->unk_040) { - player->soundEffects &= ~0x100; + player->triggers &= ~THWOMP_SQUISH_TRIGGER; player->unk_040 = -1; } } diff --git a/src/engine/vehicles/Boat.cpp b/src/engine/vehicles/Boat.cpp index 5a74dc664..9a47fe1e1 100644 --- a/src/engine/vehicles/Boat.cpp +++ b/src/engine/vehicles/Boat.cpp @@ -205,7 +205,7 @@ void ABoat::VehicleCollision(s32 playerId, Player* player) { if ((is_collide_with_vehicle(Position[0], Position[2], Velocity[0], Velocity[2], 200.0f, 60.0f, playerX, playerZ) == 1) && (y_diff < 60.0)) { - player->soundEffects |= 0x80000; + player->triggers |= HIT_PADDLE_BOAT_TRIGGER; } } } diff --git a/src/engine/vehicles/Bus.cpp b/src/engine/vehicles/Bus.cpp index 07057d7b0..f1252c303 100644 --- a/src/engine/vehicles/Bus.cpp +++ b/src/engine/vehicles/Bus.cpp @@ -204,7 +204,7 @@ void ABus::VehicleCollision(s32 playerId, Player* player) { if (((temp_f14) > -100.0) && ((temp_f14) < 100.0)) { if (is_collide_with_vehicle(Position[0], Position[2], Velocity[0], Velocity[2], SomeArg3, SomeArg4, spC4, spBC) == (s32) 1) { - player->soundEffects |= REVERSE_SOUND_EFFECT; + player->triggers |= VERTICAL_TUMBLE_TRIGGER; } } } diff --git a/src/engine/vehicles/Car.cpp b/src/engine/vehicles/Car.cpp index 8873d5248..9438a7332 100644 --- a/src/engine/vehicles/Car.cpp +++ b/src/engine/vehicles/Car.cpp @@ -205,7 +205,7 @@ void ACar::VehicleCollision(s32 playerId, Player* player) { if (((temp_f14) > -100.0) && ((temp_f14) < 100.0)) { if (is_collide_with_vehicle(Position[0], Position[2], Velocity[0], Velocity[2], SomeArg3, SomeArg4, spC4, spBC) == (s32) 1) { - player->soundEffects |= REVERSE_SOUND_EFFECT; + player->triggers |= VERTICAL_TUMBLE_TRIGGER; } } } diff --git a/src/engine/vehicles/TankerTruck.cpp b/src/engine/vehicles/TankerTruck.cpp index f8a3d3d2a..ea9993652 100644 --- a/src/engine/vehicles/TankerTruck.cpp +++ b/src/engine/vehicles/TankerTruck.cpp @@ -204,7 +204,7 @@ void ATankerTruck::VehicleCollision(s32 playerId, Player* player) { if (((temp_f14) > -100.0) && ((temp_f14) < 100.0)) { if (is_collide_with_vehicle(Position[0], Position[2], Velocity[0], Velocity[2], SomeArg3, SomeArg4, spC4, spBC) == (s32) 1) { - player->soundEffects |= REVERSE_SOUND_EFFECT; + player->triggers |= VERTICAL_TUMBLE_TRIGGER; } } } diff --git a/src/engine/vehicles/Train.cpp b/src/engine/vehicles/Train.cpp index 8b728375e..f76592756 100644 --- a/src/engine/vehicles/Train.cpp +++ b/src/engine/vehicles/Train.cpp @@ -272,13 +272,13 @@ void ATrain::VehicleCollision(s32 playerId, Player* player) { if ((z_dist > -100.0) && (z_dist < 100.0)) { if (is_collide_with_vehicle(trainCar->position[0], trainCar->position[2], trainCar->velocity[0], trainCar->velocity[2], 60.0f, 20.0f, playerPosX, playerPosZ) == 1) { - player->soundEffects |= REVERSE_SOUND_EFFECT; + player->triggers |= VERTICAL_TUMBLE_TRIGGER; } trainCar = &Tender; if (trainCar->isActive == 1) { if (is_collide_with_vehicle(trainCar->position[0], trainCar->position[2], trainCar->velocity[0], trainCar->velocity[2], 30.0f, 20.0f, playerPosX, playerPosZ) == 1) { - player->soundEffects |= REVERSE_SOUND_EFFECT; + player->triggers |= VERTICAL_TUMBLE_TRIGGER; } } } @@ -294,7 +294,7 @@ void ATrain::VehicleCollision(s32 playerId, Player* player) { if (is_collide_with_vehicle(trainCar->position[0], trainCar->position[2], trainCar->velocity[0], trainCar->velocity[2], 30.0f, 20.0f, playerPosX, playerPosZ) == 1) { - player->soundEffects |= REVERSE_SOUND_EFFECT; + player->triggers |= VERTICAL_TUMBLE_TRIGGER; } } } diff --git a/src/engine/vehicles/Truck.cpp b/src/engine/vehicles/Truck.cpp index 76914418b..a191aec37 100644 --- a/src/engine/vehicles/Truck.cpp +++ b/src/engine/vehicles/Truck.cpp @@ -204,7 +204,7 @@ void ATruck::VehicleCollision(s32 playerId, Player* player) { if (((temp_f14) > -100.0) && ((temp_f14) < 100.0)) { if (is_collide_with_vehicle(Position[0], Position[2], Velocity[0], Velocity[2], SomeArg3, SomeArg4, spC4, spBC) == (s32) 1) { - player->soundEffects |= REVERSE_SOUND_EFFECT; + player->triggers |= VERTICAL_TUMBLE_TRIGGER; } } } diff --git a/src/player_controller.c b/src/player_controller.c index 83a46b2a7..10c9ee2e0 100644 --- a/src/player_controller.c +++ b/src/player_controller.c @@ -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) { diff --git a/src/player_controller.h b/src/player_controller.h index 4a3f397ce..6893f64e0 100644 --- a/src/player_controller.h +++ b/src/player_controller.h @@ -38,7 +38,7 @@ void func_8002AE30(void); void func_8002AE38(Player*, s8, f32, f32, f32, f32); void func_8002B218(Player*); -void apply_sound_effect(Player*, s8, s8); +void apply_triggers(Player*, s8, s8); void func_8002B5C0(Player*, s8, s8); void func_8002B830(Player*, s8, s8); void func_8002B8A4(Player*, Player*); diff --git a/src/racing/actors.c b/src/racing/actors.c index abdb51c68..2bad85025 100644 --- a/src/racing/actors.c +++ b/src/racing/actors.c @@ -1553,13 +1553,13 @@ bool collision_yoshi_egg(Player* player, struct YoshiValleyEgg* egg) { func_800C98B8(player->pos, player->velocity, SOUND_ARG_LOAD(0x19, 0x01, 0x80, 0x10)); func_800C90F4(player - gPlayerOne, (player->characterId * 0x10) + SOUND_ARG_LOAD(0x29, 0x00, 0x80, 0x0D)); } else { - apply_hit_sound_effect(player, player - gPlayerOne); + trigger_squish(player, player - gPlayerOne); if ((gModeSelection == TIME_TRIALS) && ((player->type & PLAYER_CPU) == 0)) { gPostTimeTrialReplayCannotSave = 1; } } } else { - apply_hit_sound_effect(player, player - gPlayerOne); + trigger_squish(player, player - gPlayerOne); } return true; @@ -1757,7 +1757,7 @@ void destroy_destructable_actor(struct Actor* actor) { break; case HELD_BANANA: player = &gPlayers[banana->playerId]; - player->soundEffects &= ~0x00040000; + player->triggers &= ~DRAG_ITEM_EFFECT; /* fallthrough */ case BANANA_ON_GROUND: banana->flags = -0x8000; @@ -1852,7 +1852,7 @@ void destroy_destructable_actor(struct Actor* actor) { fakeItemBox = (struct FakeItemBox*) actor; player = &gPlayers[(s16) fakeItemBox->playerId]; if (fakeItemBox->state == HELD_FAKE_ITEM_BOX) { - player->soundEffects &= ~0x00040000; + player->triggers &= ~DRAG_ITEM_EFFECT; } fakeItemBox->state = DESTROYED_FAKE_ITEM_BOX; fakeItemBox->flags = -0x8000; @@ -1977,7 +1977,7 @@ void evaluate_collision_between_player_actor(Player* player, struct Actor* actor if (player->effects & (BOO_EFFECT | 0x8C0)) { break; } - if (player->soundEffects & 1) { + if (player->triggers & HIT_BANANA_TRIGGER) { break; } temp_v1 = actor->rot[0]; @@ -1985,7 +1985,7 @@ void evaluate_collision_between_player_actor(Player* player, struct Actor* actor (query_collision_player_vs_actor_item(player, actor) != COLLISION)) { break; } - player->soundEffects |= 1; + player->triggers |= HIT_BANANA_TRIGGER; owner = &gPlayers[temp_v1]; if (owner->type & 0x4000) { if (actor->flags & 0xF) { @@ -2006,7 +2006,7 @@ void evaluate_collision_between_player_actor(Player* player, struct Actor* actor if (player->effects & 0x80000400) { break; } - if (player->soundEffects & 4) { + if (player->triggers & LOW_TUMBLE_TRIGGER) { break; } temp_v1 = actor->rot[2]; @@ -2014,7 +2014,7 @@ void evaluate_collision_between_player_actor(Player* player, struct Actor* actor (query_collision_player_vs_actor_item(player, actor) != COLLISION)) { break; } - player->soundEffects |= 4; + player->triggers |= LOW_TUMBLE_TRIGGER; func_800C98B8(player->pos, player->velocity, SOUND_ARG_LOAD(0x19, 0x01, 0x80, 0x10)); owner = &gPlayers[temp_v1]; if ((owner->type & 0x4000) && (temp_lo != temp_v1)) { @@ -2023,7 +2023,7 @@ void evaluate_collision_between_player_actor(Player* player, struct Actor* actor destroy_destructable_actor(actor); break; case ACTOR_BLUE_SPINY_SHELL: - if (player->soundEffects & 2) { + if (player->triggers & HIGH_TUMBLE_TRIGGER) { break; } temp_v1 = actor->rot[2]; @@ -2032,7 +2032,7 @@ void evaluate_collision_between_player_actor(Player* player, struct Actor* actor break; } if (!(player->effects & BOO_EFFECT)) { - player->soundEffects |= 2; + player->triggers |= HIGH_TUMBLE_TRIGGER; func_800C98B8(player->pos, player->velocity, SOUND_ARG_LOAD(0x19, 0x01, 0x80, 0x10)); } owner = &gPlayers[temp_v1]; @@ -2048,7 +2048,7 @@ void evaluate_collision_between_player_actor(Player* player, struct Actor* actor if (player->effects & 0x01000000) { break; } - if (player->soundEffects & 2) { + if (player->triggers & HIGH_TUMBLE_TRIGGER) { break; } temp_v1 = actor->rot[2]; @@ -2057,7 +2057,7 @@ void evaluate_collision_between_player_actor(Player* player, struct Actor* actor break; } if (!(player->effects & BOO_EFFECT)) { - player->soundEffects |= 2; + player->triggers |= HIGH_TUMBLE_TRIGGER; func_800C98B8(player->pos, player->velocity, SOUND_ARG_LOAD(0x19, 0x01, 0x80, 0x10)); } owner = &gPlayers[temp_v1]; @@ -2102,7 +2102,7 @@ void evaluate_collision_between_player_actor(Player* player, struct Actor* actor if (player->effects & STAR_EFFECT) { actor->velocity[1] = 10.0f; } else { - apply_hit_sound_effect(player, player - gPlayerOne); + trigger_squish(player, player - gPlayerOne); } } } @@ -2117,7 +2117,7 @@ void evaluate_collision_between_player_actor(Player* player, struct Actor* actor (query_collision_player_vs_actor_item(player, actor) != COLLISION)) { break; } - player->soundEffects |= REVERSE_SOUND_EFFECT; + player->triggers |= VERTICAL_TUMBLE_TRIGGER; owner = &gPlayers[temp_v1]; if (owner->type & 0x4000) { if (actor->flags & 0xF) { @@ -2132,7 +2132,7 @@ void evaluate_collision_between_player_actor(Player* player, struct Actor* actor } } if (actor->state == 0) { - owner->soundEffects &= ~0x00040000; + owner->triggers &= ~DRAG_ITEM_EFFECT; } } actor->state = 2; diff --git a/src/racing/actors_extended.c b/src/racing/actors_extended.c index c21eb6918..ed2710674 100644 --- a/src/racing/actors_extended.c +++ b/src/racing/actors_extended.c @@ -294,7 +294,7 @@ void update_actor_banana_bunch(struct BananaBunchParent* banana_bunch) { } if (someCount == 0) { destroy_actor((struct Actor*) banana_bunch); - owner->soundEffects &= ~HOLD_BANANA_SOUND_EFFECT; + owner->triggers &= ~DRAG_ITEM_EFFECT; } else if ((owner->type & 0x4000) != 0) { controller = &gControllers[banana_bunch->playerId]; if ((controller->buttonPressed & Z_TRIG) != 0) { @@ -526,7 +526,7 @@ s32 use_banana_bunch_item(Player* player) { bananaBunch = (struct BananaBunchParent*) GET_ACTOR(actorIndex); bananaBunch->state = 0; bananaBunch->playerId = player - gPlayerOne; - player->soundEffects |= HOLD_BANANA_SOUND_EFFECT; + player->triggers |= DRAG_ITEM_EFFECT; return actorIndex; } @@ -804,7 +804,7 @@ s32 use_fake_itembox_item(Player* player) { itemBox = (struct FakeItemBox*) GET_ACTOR(actorIndex); itemBox->playerId = (player - gPlayerOne); itemBox->state = HELD_FAKE_ITEM_BOX; - player->soundEffects |= HOLD_BANANA_SOUND_EFFECT; + player->triggers |= DRAG_ITEM_EFFECT; return actorIndex; } @@ -851,7 +851,7 @@ s32 use_banana_item(Player* player) { banana->playerId = playerId; banana->state = HELD_BANANA; banana->unk_04 = 0x0014; - player->soundEffects |= HOLD_BANANA_SOUND_EFFECT; + player->triggers |= DRAG_ITEM_EFFECT; return actorIndex; } @@ -873,7 +873,7 @@ void use_thunder_item(Player* player) { for (index = 0; index < NUM_PLAYERS; index++) { otherPlayer = &gPlayers[index]; if (player != otherPlayer) { - otherPlayer->soundEffects |= HIT_ROTATING_SOUND_EFFECT; + otherPlayer->triggers |= LIGHTNING_STRIKE_TRIGGER; } } } @@ -899,22 +899,22 @@ void player_use_item(Player* player) { use_banana_bunch_item(player); break; case ITEM_MUSHROOM: - player->soundEffects |= BOOST_SOUND_EFFECT; + player->triggers |= SHROOM_TRIGGER; break; case ITEM_DOUBLE_MUSHROOM: - player->soundEffects |= BOOST_SOUND_EFFECT; + player->triggers |= SHROOM_TRIGGER; break; case ITEM_TRIPLE_MUSHROOM: - player->soundEffects |= BOOST_SOUND_EFFECT; + player->triggers |= SHROOM_TRIGGER; break; case ITEM_SUPER_MUSHROOM: - player->soundEffects |= BOOST_SOUND_EFFECT; + player->triggers |= SHROOM_TRIGGER; break; case ITEM_BOO: - player->soundEffects |= BOO_SOUND_EFFECT; + player->triggers |= BOO_TRIGGER; break; case ITEM_STAR: - player->soundEffects |= STAR_SOUND_EFFECT; + player->triggers |= STAR_TRIGGER; break; case ITEM_THUNDERBOLT: use_thunder_item(player); diff --git a/src/racing/race_logic.c b/src/racing/race_logic.c index f640d74a7..099d0d626 100644 --- a/src/racing/race_logic.c +++ b/src/racing/race_logic.c @@ -533,7 +533,7 @@ void func_8028EF28(void) { } gRaceState = RACE_FINISHED; i = gPlayerPositionLUT[1]; - gPlayers[i].soundEffects |= 0x200000; + gPlayers[i].triggers |= SPINOUT_TRIGGER; gPlayers[i].type |= PLAYER_CPU; func_800CA118((u8) i); break; @@ -551,7 +551,7 @@ void func_8028EF28(void) { if (*(gNmiUnknown2 + i * 3 + 2) > 99) { *(gNmiUnknown2 + i * 3 + 2) = 99; } - gPlayers[i].soundEffects |= 0x200000; + gPlayers[i].triggers |= SPINOUT_TRIGGER; gPlayers[i].type |= PLAYER_CPU; func_800CA118((u8) i); } @@ -566,7 +566,7 @@ void func_8028EF28(void) { if (currentPosition == 2) { gRaceState = RACE_FINISHED; i = gPlayerPositionLUT[3]; - gPlayers[i].soundEffects |= 0x200000; + gPlayers[i].triggers |= SPINOUT_TRIGGER; gPlayers[i].type |= PLAYER_CPU; func_800CA118((u8) i); } @@ -1127,22 +1127,22 @@ void func_802903D8(Player* playerOne, Player* playerTwo) { func_800C9060((playerTwo - gPlayerOne), 0x19008001U); return; } else { - playerTwo->soundEffects |= REVERSE_SOUND_EFFECT; + playerTwo->triggers |= VERTICAL_TUMBLE_TRIGGER; func_8008FC1C(playerOne); func_800C9060((playerTwo - gPlayerOne), 0x19008001U); } } else if (playerTwo->type & PLAYER_UNKNOWN_0x40) { - playerOne->soundEffects |= REVERSE_SOUND_EFFECT; + playerOne->triggers |= VERTICAL_TUMBLE_TRIGGER; func_8008FC1C(playerTwo); func_800C9060(playerOne - gPlayerOne, 0x19008001U); return; } if (playerOne->effects & 0x200) { if (!(playerTwo->effects & 0x200)) { - playerTwo->soundEffects |= HIT_BY_ITEM_SOUND_EFFECT; + playerTwo->triggers |= HIT_BY_STAR_TRIGGER; } } else if (playerTwo->effects & 0x200) { - playerOne->soundEffects |= HIT_BY_ITEM_SOUND_EFFECT; + playerOne->triggers |= HIT_BY_STAR_TRIGGER; } else { playerOne->effects |= 0x8000; playerTwo->effects |= 0x8000; diff --git a/src/render_player.c b/src/render_player.c index e188d8bfd..c5a3ac6da 100644 --- a/src/render_player.c +++ b/src/render_player.c @@ -1392,8 +1392,8 @@ void render_kart(Player* player, s8 playerId, s8 screenId, s8 flipOffset) { AA_EN | Z_CMP | Z_UPD | IM_RD | CVG_DST_WRAP | ZMODE_XLU | CVG_X_ALPHA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)); } - } else if (((player->unk_0CA & 4) == 4) || (player->soundEffects & 0x08000000) || - (player->soundEffects & 0x04000000)) { + } else if (((player->unk_0CA & 4) == 4) || (player->triggers & BECOME_BOMB_EFFECT) || + (player->triggers & LOSE_BATTLE_EFFECT)) { gSPMatrix(gDisplayListHead++, GetKartMatrix(playerId + (screenId * 8)), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(gDisplayListHead++, common_setting_render_character); diff --git a/src/spawn_players.c b/src/spawn_players.c index 61bc1b1be..0d2f23346 100644 --- a/src/spawn_players.c +++ b/src/spawn_players.c @@ -177,7 +177,7 @@ void spawn_player(Player* player, s8 playerIndex, f32 startingRow, f32 startingC player->unk_DAC = 0.0f; player->unk_044 = 0; player->unk_046 = 0; - player->soundEffects = 0; + player->triggers = 0; player->alpha = ALPHA_MAX; player->unk_206 = 0;