Skip to content

Commit 0a27fbb

Browse files
MegaMechMegaMech
authored
Revert "Document sound effects (#735)" (#741)
This reverts commit e88f33f.
1 parent e88f33f commit 0a27fbb

20 files changed

+200
-238
lines changed

‎include/common_structs.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ typedef struct {
253253
/* 0x0006 */ u16 unk_006;
254254
/* 0x0008 */ s16 lapCount;
255255
/* 0x000A */ char unk_00A[0x2];
256-
/* 0x000C */ s32 triggers; // Bitflag.
256+
/* 0x000C */ s32 soundEffects; // Bitflag.
257257
/* 0x0010 */ s16 currentItemCopy; // Has no effect on what item the players has, It is just a synced copy
258258
/* 0x0012 */ s16 unk_012;
259259
/* 0x0014 */ Vec3f pos;

‎include/defines.h‎

Lines changed: 13 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -328,40 +328,20 @@ enum PLACE { FIRST_PLACE, SECOND_PLACE, THIRD_PLACE, FOURTH_PLACE };
328328
*/
329329
#define MAX_TIME 0x927C0
330330

331-
/*
332-
* @brief triggers indicating that an effect should be applied to a kart
331+
/**
332+
* @brief sound effect of player's
333+
* for soundEffect
333334
*/
334-
#define HIT_BANANA_TRIGGER 0x1 // hits a banana
335-
#define HIGH_TUMBLE_TRIGGER 0x2 // hit by a red shell, blue shell, or hit a mole
336-
#define LOW_TUMBLE_TRIGGER 0x4 // hit by a green shell
337-
#define DRIVING_SPINOUT_TRIGGER 0x80 // spinning out from erratic driving
338-
#define THWOMP_SQUISH_TRIGGER 0x100 // stomped by thwomp
339-
#define SHROOM_TRIGGER 0x200 // being boosted by trigger a mushroom
340-
#define BOO_TRIGGER 0x800 // being a boo
341-
#define UNUSED_TRIGGER_0x1000 0x1000 // Unused
342-
#define STAR_TRIGGER 0x2000 // Starting a star
343-
#define LIGHTNING_STRIKE_TRIGGER 0x4000 // Struck by lightning
344-
#define BOOST_RAMP_WOOD_TRIGGER 0x8000 // being boosted by a ramp
345-
#define UNUSED_TRIGGER_0x20000 0x20000 // Unused
346-
#define DRAG_ITEM_EFFECT 0x40000 // holding a non-shell item behind you
347-
#define HIT_PADDLE_BOAT_TRIGGER 0x80000 // hit paddle boat
348-
#define UNUSED_TRIGGER_0x10000 0x100000 // Unused
349-
#define SPINOUT_TRIGGER 0x200000 // hit crab or spiny spinout or losing versus race
350-
#define VERTICAL_TUMBLE_TRIGGER 0x400000 // hitting a fake item / bomb / snowman / car / train
351-
#define BOOST_RAMP_ASPHALT_TRIGGER 0x800000 // being boosted by a boost pad
352-
#define HIT_BY_STAR_TRIGGER 0x1000000 // being hit by a star
353-
#define START_BOOST_TRIGGER 0x2000000 // Start boost
354-
#define LOSE_BATTLE_EFFECT 0x4000000 // When losing battle mode
355-
#define BECOME_BOMB_EFFECT 0x8000000 // When becoming a bomb in battle mode
356-
#define START_SPINOUT_TRIGGER 0x10000000 // Spinning out by holding gas at start of race
357-
358-
#define ALL_TRIGGERS (0xFFFFFFFF)
359-
#define RACING_SPINOUT_TRIGGERS (SPINOUT_TRIGGER | DRIVING_SPINOUT_TRIGGER | HIT_BANANA_TRIGGER) // 0x200081
360-
#define RAMP_BOOST_TRIGGERS (BOOST_RAMP_ASPHALT_TRIGGER | BOOST_RAMP_WOOD_TRIGGER) // 0x00808000
361-
#define ANY_BOOST_TRIGGERS (RAMP_BOOST_TRIGGERS | SHROOM_TRIGGER) // 0x00808200
362-
#define STATE_TRANSITION_TRIGGERS (STAR_TRIGGER | BOO_TRIGGER | UNUSED_TRIGGER_0x1000 | UNUSED_TRIGGER_0x20000)// 0x00023800
363-
#define HIT_TRIGGERS (HIT_BY_STAR_TRIGGER | VERTICAL_TUMBLE_TRIGGER | \
364-
LIGHTNING_STRIKE_TRIGGER | LOW_TUMBLE_TRIGGER | HIGH_TUMBLE_TRIGGER | THWOMP_SQUISH_TRIGGER) // 0x01404106
335+
#define HIT_SOUND_EFFECT 0x100 // hitting an object
336+
#define BOOST_SOUND_EFFECT 0x200 // being boosted by trigger a mushroom
337+
#define BOO_SOUND_EFFECT 0x800 // being a boo
338+
#define STAR_SOUND_EFFECT 0x2000 // being a star
339+
#define HIT_ROTATING_SOUND_EFFECT 0x4000 // hitting a rotating object
340+
#define BOOST_RAMP_WOOD_SOUND_EFFECT 0x8000 // being boosted by a ramp
341+
#define HOLD_BANANA_SOUND_EFFECT 0x40000 // holding a banana
342+
#define REVERSE_SOUND_EFFECT 0x400000 // being in the wrong direction
343+
#define BOOST_RAMP_ASPHALT_SOUND_EFFECT 0x800000 // being boosted by a boost pad
344+
#define HIT_BY_ITEM_SOUND_EFFECT 0x1000000 // being hit by an item
365345

366346
/**
367347
* @brief effect of player's

‎src/actors/banana/update.inc.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ void update_actor_banana(struct BananaActor* banana) {
6060
controller->buttonDepressed &= ~Z_TRIG;
6161
banana->state = DROPPED_BANANA;
6262
banana->unk_04 = 0x00B4;
63-
player->triggers &= ~DRAG_ITEM_EFFECT;
63+
player->soundEffects &= ~HOLD_BANANA_SOUND_EFFECT;
6464
func_800C9060(player - gPlayerOne, SOUND_ARG_LOAD(0x19, 0x00, 0x80, 0x12));
6565
pad3 = controller->rawStickY;
6666
if ((pad3 > 30.0f) && (controller->rawStickX < 10) && (controller->rawStickX >= -9)) {

‎src/actors/fake_item_box/update.inc.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ void update_actor_fake_item_box(struct FakeItemBox* fake_item_box) {
4545
if ((temp_v1_3->buttonDepressed & Z_TRIG) != 0) {
4646
temp_v1_3->buttonDepressed &= 0xDFFF;
4747
func_802A1064(fake_item_box);
48-
temp_v0_4->triggers &= ~DRAG_ITEM_EFFECT;
48+
temp_v0_4->soundEffects &= 0xFFFBFFFF;
4949
func_800C9060((u8) (temp_v0_4 - gPlayerOne), SOUND_ARG_LOAD(0x19, 0x00, 0x80, 0x12));
5050
}
5151
}

‎src/camera.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1024,7 +1024,7 @@ void func_8001F394(Player* player, f32* arg1) {
10241024
}
10251025

10261026
if (D_80164A08[playerIndex] == 0) {
1027-
if (player->triggers & DRAG_ITEM_EFFECT) {
1027+
if (player->soundEffects & HOLD_BANANA_SOUND_EFFECT) {
10281028
D_80164A08[playerIndex] = 1;
10291029
}
10301030
if ((player->effects & BOOST_EFFECT) == BOOST_EFFECT) {
@@ -1033,7 +1033,7 @@ void func_8001F394(Player* player, f32* arg1) {
10331033
if ((player->effects & BOOST_RAMP_ASPHALT_EFFECT) == BOOST_RAMP_ASPHALT_EFFECT) {
10341034
D_80164A08[playerIndex] = 3;
10351035
}
1036-
if ((player->triggers & THWOMP_SQUISH_TRIGGER) == THWOMP_SQUISH_TRIGGER) {
1036+
if ((player->soundEffects & 0x100) == 0x100) {
10371037
D_80164A08[playerIndex] = 4;
10381038
}
10391039
if (((player->effects & 0x80) == 0x80) || ((player->effects & 0x40) == 0x40)) {
@@ -1043,7 +1043,7 @@ void func_8001F394(Player* player, f32* arg1) {
10431043
}
10441044
switch (D_80164A08[playerIndex]) {
10451045
case 1:
1046-
if (player->triggers & DRAG_ITEM_EFFECT) {
1046+
if (player->soundEffects & HOLD_BANANA_SOUND_EFFECT) {
10471047
move_f32_towards(&D_80164498[playerIndex], 20.0f, 0.2f);
10481048
} else {
10491049
if (D_80164498[playerIndex] > 1.0f) {
@@ -1082,7 +1082,7 @@ void func_8001F394(Player* player, f32* arg1) {
10821082
}
10831083
break;
10841084
case 4:
1085-
if ((player->triggers & THWOMP_SQUISH_TRIGGER) == THWOMP_SQUISH_TRIGGER) {
1085+
if ((player->soundEffects & 0x100) == 0x100) {
10861086
move_f32_towards(&D_80164498[playerIndex], 25.0f, 1.0f);
10871087
} else {
10881088
if (D_80164498[playerIndex] > 1.0f) {

‎src/code_80086E70.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1185,7 +1185,7 @@ s32 func_80089B50(s32 objectIndex) {
11851185
(player->type & PLAYER_EXISTS) && !(player->type & PLAYER_INVISIBLE_OR_BOMB) &&
11861186
(has_collided_horizontally_with_player(objectIndex, player) != 0)) {
11871187
if (!(player->effects & STAR_EFFECT)) {
1188-
player->triggers |= VERTICAL_TUMBLE_TRIGGER;
1188+
player->soundEffects |= REVERSE_SOUND_EFFECT;
11891189
if (is_obj_flag_status_active(objectIndex, 0x04000000) != 0) {
11901190
func_80072180();
11911191
}
@@ -1212,7 +1212,7 @@ s32 func_80089CBC(s32 objectIndex, f32 arg1) {
12121212
if ((player->type & PLAYER_EXISTS) && !(player->type & PLAYER_INVISIBLE_OR_BOMB) &&
12131213
(has_collided_with_player_and_within_height(objectIndex, player, arg1) != 0)) {
12141214
if (!(player->effects & STAR_EFFECT)) {
1215-
player->triggers |= VERTICAL_TUMBLE_TRIGGER;
1215+
player->soundEffects |= REVERSE_SOUND_EFFECT;
12161216
if (is_obj_flag_status_active(objectIndex, 0x04000000) != 0) {
12171217
func_80072180();
12181218
}
@@ -1239,7 +1239,7 @@ s32 func_80089E18(s32 objectIndex) {
12391239
if (player->effects & STAR_EFFECT) {
12401240
var_s6 = 1;
12411241
} else {
1242-
player->triggers |= HIT_BANANA_TRIGGER;
1242+
player->soundEffects |= 1;
12431243
}
12441244
}
12451245
}
@@ -1263,7 +1263,7 @@ s32 func_80089F24(s32 objectIndex) {
12631263
if (is_obj_flag_status_active(objectIndex, 0x04000000) != 0) {
12641264
func_80072180();
12651265
}
1266-
player->triggers |= SPINOUT_TRIGGER;
1266+
player->soundEffects |= 0x200000;
12671267
}
12681268
}
12691269
}

‎src/cpu_vehicles_camera_path.c‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1359,8 +1359,8 @@ void play_cpu_sound_effect(s32 arg0, Player* player) {
13591359
}
13601360
}
13611361
if (D_801633B0[arg0] >= 0xB) {
1362-
if ((player->triggers & VERTICAL_TUMBLE_TRIGGER) || (player->triggers & HIT_BY_STAR_TRIGGER) ||
1363-
(player->triggers & HIGH_TUMBLE_TRIGGER) || (player->triggers & LOW_TUMBLE_TRIGGER) || (player->effects & HIT_EFFECT)) {
1362+
if ((player->soundEffects & REVERSE_EFFECT) || (player->soundEffects & 0x01000000) ||
1363+
(player->soundEffects & 2) || (player->soundEffects & 4) || (player->effects & HIT_EFFECT)) {
13641364
func_800C92CC(arg0, SOUND_ARG_LOAD(0x29, 0x00, 0x80, 0x0B));
13651365
D_801633B0[arg0] = 0;
13661366
}
@@ -2215,7 +2215,7 @@ void init_players(void) {
22152215

22162216
for (i = 0; i < NUM_PLAYERS; i++) {
22172217
if (D_80163330[i] == 1) {
2218-
gPlayers[i].triggers |= START_BOOST_TRIGGER;
2218+
gPlayers[i].soundEffects |= 0x02000000;
22192219
}
22202220
}
22212221
}
@@ -3942,7 +3942,7 @@ void cpu_use_item_strategy(s32 playerId) {
39423942
} else if (cpuStrategy->branch == CPU_STRATEGY_ITEM_BANANA) {
39433943
cpuStrategy->actorIndex = use_banana_item(player);
39443944
if ((cpuStrategy->actorIndex >= 0) && (cpuStrategy->actorIndex < 100)) {
3945-
player->triggers |= DRAG_ITEM_EFFECT;
3945+
player->soundEffects |= HOLD_BANANA_SOUND_EFFECT;
39463946
cpuStrategy->branch = CPU_STRATEGY_HOLD_BANANA;
39473947
cpuStrategy->timer = 0;
39483948
cpuStrategy->numItemUse += 1;
@@ -3967,7 +3967,7 @@ void cpu_use_item_strategy(s32 playerId) {
39673967

39683968
cpuStrategy->branch = CPU_STRATEGY_WAIT_NEXT_ITEM;
39693969
cpuStrategy->timer = 0;
3970-
player->triggers &= ~DRAG_ITEM_EFFECT;
3970+
player->soundEffects &= ~HOLD_BANANA_SOUND_EFFECT;
39713971
} else if (cpuStrategy->timeBeforeThrow < cpuStrategy->timer) {
39723972
cpuStrategy->branch = CPU_STRATEGY_DROP_BANANA;
39733973
}
@@ -3996,7 +3996,7 @@ void cpu_use_item_strategy(s32 playerId) {
39963996
(BANANA_ACTOR(actor)->boundingBoxSize + 1.0f);
39973997
}
39983998
}
3999-
player->triggers &= ~DRAG_ITEM_EFFECT;
3999+
player->soundEffects &= ~HOLD_BANANA_SOUND_EFFECT;
40004000
cpuStrategy->timer = 0;
40014001
cpuStrategy->branch = CPU_STRATEGY_WAIT_NEXT_ITEM;
40024002
break;
@@ -4006,7 +4006,7 @@ void cpu_use_item_strategy(s32 playerId) {
40064006
if ((cpuStrategy->actorIndex >= 0) && (cpuStrategy->actorIndex < 100)) {
40074007
actor = &gActorList[cpuStrategy->actorIndex];
40084008
BANANA_ACTOR(actor)->state = BANANA_ON_GROUND;
4009-
player->triggers |= DRAG_ITEM_EFFECT;
4009+
player->soundEffects |= HOLD_BANANA_SOUND_EFFECT;
40104010
cpuStrategy->branch = CPU_STRATEGY_HOLD_THROW_BANANA;
40114011
cpuStrategy->timer = 0;
40124012
cpuStrategy->numItemUse += 1;
@@ -4039,7 +4039,7 @@ void cpu_use_item_strategy(s32 playerId) {
40394039

40404040
cpuStrategy->timer = 0;
40414041
cpuStrategy->branch = CPU_STRATEGY_WAIT_NEXT_ITEM;
4042-
player->triggers &= ~DRAG_ITEM_EFFECT;
4042+
player->soundEffects &= ~HOLD_BANANA_SOUND_EFFECT;
40434043
} else {
40444044
BANANA_ACTOR(actor)->velocity[1] -= 0.4;
40454045
BANANA_ACTOR(actor)->pos[0] += BANANA_ACTOR(actor)->velocity[0];
@@ -4072,7 +4072,7 @@ void cpu_use_item_strategy(s32 playerId) {
40724072
get_surface_height(BANANA_ACTOR(actor)->pos[0], BANANA_ACTOR(actor)->pos[1] + 30.0, BANANA_ACTOR(actor)->pos[2]) +
40734073
(BANANA_ACTOR(actor)->boundingBoxSize + 1.0f);
40744074
}
4075-
player->triggers &= ~DRAG_ITEM_EFFECT;
4075+
player->soundEffects &= ~HOLD_BANANA_SOUND_EFFECT;
40764076
cpuStrategy->branch = CPU_STRATEGY_WAIT_NEXT_ITEM;
40774077
cpuStrategy->timer = 0;
40784078
break;
@@ -4366,7 +4366,7 @@ void cpu_use_item_strategy(s32 playerId) {
43664366
break;
43674367

43684368
case CPU_STRATEGY_ITEM_STAR:
4369-
player->triggers |= STAR_TRIGGER;
4369+
player->soundEffects |= STAR_SOUND_EFFECT;
43704370
cpuStrategy->branch = CPU_STRATEGY_END_ITEM_STAR;
43714371
cpuStrategy->timer = 0;
43724372
cpuStrategy->numItemUse += 1;
@@ -4380,7 +4380,7 @@ void cpu_use_item_strategy(s32 playerId) {
43804380
break;
43814381

43824382
case CPU_STRATEGY_ITEM_BOO:
4383-
player->triggers |= BOO_TRIGGER;
4383+
player->soundEffects |= BOO_SOUND_EFFECT;
43844384
cpuStrategy->branch = CPU_STRATEGY_WAIT_END_BOO;
43854385
cpuStrategy->timer = 0;
43864386
cpuStrategy->numItemUse += 1;
@@ -4394,23 +4394,23 @@ void cpu_use_item_strategy(s32 playerId) {
43944394
break;
43954395

43964396
case CPU_STRATEGY_ITEM_MUSHROOM:
4397-
player->triggers |= SHROOM_TRIGGER;
4397+
player->soundEffects |= BOOST_SOUND_EFFECT;
43984398
cpuStrategy->branch = CPU_STRATEGY_WAIT_NEXT_ITEM;
43994399
cpuStrategy->timer = 0;
44004400
cpuStrategy->numItemUse += 1;
44014401
break;
44024402

44034403
case CPU_STRATEGY_ITEM_DOUBLE_MUSHROOM:
44044404
if (cpuStrategy->timer >= 0x3D) {
4405-
player->triggers |= SHROOM_TRIGGER;
4405+
player->soundEffects |= BOOST_SOUND_EFFECT;
44064406
cpuStrategy->branch = CPU_STRATEGY_ITEM_MUSHROOM;
44074407
cpuStrategy->timer = 0;
44084408
}
44094409
break;
44104410

44114411
case CPU_STRATEGY_ITEM_TRIPLE_MUSHROOM:
44124412
if (cpuStrategy->timer >= 0x3D) {
4413-
player->triggers |= SHROOM_TRIGGER;
4413+
player->soundEffects |= BOOST_SOUND_EFFECT;
44144414
cpuStrategy->branch = CPU_STRATEGY_ITEM_DOUBLE_MUSHROOM;
44154415
cpuStrategy->timer = 0;
44164416
}
@@ -4424,7 +4424,7 @@ void cpu_use_item_strategy(s32 playerId) {
44244424

44254425
case CPU_STRATEGY_USE_SUPER_MUSHROOM:
44264426
if ((((s16) cpuStrategy->timer) % 60) == 0) {
4427-
player->triggers |= SHROOM_TRIGGER;
4427+
player->soundEffects |= BOOST_SOUND_EFFECT;
44284428
if (cpuStrategy->timeBeforeThrow < cpuStrategy->timer) {
44294429
cpuStrategy->timer = 0;
44304430
cpuStrategy->branch = CPU_STRATEGY_WAIT_NEXT_ITEM;

‎src/cpu_vehicles_camera_path/bomb_kart.inc.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ void func_8000DF8C(s32 bombKartId) {
139139
if ((((temp_f0 * temp_f0) + (temp_f2 * temp_f2)) + (temp_f12 * temp_f12)) < 25.0f) {
140140
var_s1 = 0;
141141
sp7E = 4;
142-
var_v0->triggers |= VERTICAL_TUMBLE_TRIGGER;
142+
var_v0->soundEffects |= 0x400000;
143143
var_v0->type &= ~0x2000;
144144
}
145145
}
@@ -155,9 +155,9 @@ void func_8000DF8C(s32 bombKartId) {
155155
sp7E = 4;
156156
var_s1 = 0;
157157
if (gCurrentCourseId == COURSE_FRAPPE_SNOWLAND) {
158-
var_v0->triggers |= HIT_BY_STAR_TRIGGER;
158+
var_v0->soundEffects |= 0x01000000;
159159
} else {
160-
var_v0->triggers |= VERTICAL_TUMBLE_TRIGGER;
160+
var_v0->soundEffects |= 0x400000;
161161
}
162162
}
163163
}

‎src/cpu_vehicles_camera_path/cpu_speed_control.inc.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@ void regulate_cpu_speed(s32 playerId, f32 targetSpeed, Player* player) {
134134

135135
speed = player->speed;
136136
if (!(player->effects & 0x80) && !(player->effects & 0x40) && !(player->effects & 0x20000) &&
137-
!(player->triggers & VERTICAL_TUMBLE_TRIGGER) && !(player->triggers & HIT_BY_STAR_TRIGGER) && !(player->triggers & HIGH_TUMBLE_TRIGGER) &&
138-
!(player->triggers & LOW_TUMBLE_TRIGGER)) {
137+
!(player->soundEffects & 0x400000) && !(player->soundEffects & 0x01000000) && !(player->soundEffects & 2) &&
138+
!(player->soundEffects & 4)) {
139139
if (gCurrentCourseId == COURSE_AWARD_CEREMONY) {
140140
func_80007FA4(playerId, player, speed);
141141
} else if ((bStopAICrossing[playerId] == true) && !(player->effects & (STAR_EFFECT | BOO_EFFECT))) {

‎src/cpu_vehicles_camera_path/vehicle_utils.inc.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -372,14 +372,14 @@ void handle_trains_interactions(s32 playerId, Player* player) {
372372
if ((z_dist > -100.0) && (z_dist < 100.0)) {
373373
if (is_collide_with_vehicle(trainCar->position[0], trainCar->position[2], trainCar->velocity[0],
374374
trainCar->velocity[2], 60.0f, 20.0f, playerPosX, playerPosZ) == 1) {
375-
player->triggers |= VERTICAL_TUMBLE_TRIGGER;
375+
player->soundEffects |= REVERSE_SOUND_EFFECT;
376376
}
377377
trainCar = &gTrainList[trainIndex].tender;
378378
if (trainCar->isActive == 1) {
379379
if (is_collide_with_vehicle(trainCar->position[0], trainCar->position[2],
380380
trainCar->velocity[0], trainCar->velocity[2], 30.0f, 20.0f,
381381
playerPosX, playerPosZ) == 1) {
382-
player->triggers |= VERTICAL_TUMBLE_TRIGGER;
382+
player->soundEffects |= REVERSE_SOUND_EFFECT;
383383
}
384384
}
385385
}
@@ -395,7 +395,7 @@ void handle_trains_interactions(s32 playerId, Player* player) {
395395
if (is_collide_with_vehicle(trainCar->position[0], trainCar->position[2],
396396
trainCar->velocity[0], trainCar->velocity[2], 30.0f, 20.0f,
397397
playerPosX, playerPosZ) == 1) {
398-
player->triggers |= VERTICAL_TUMBLE_TRIGGER;
398+
player->soundEffects |= REVERSE_SOUND_EFFECT;
399399
}
400400
}
401401
}
@@ -621,7 +621,7 @@ void handle_paddle_boats_interactions(Player* player) {
621621
tempPaddleWheelBoat->velocity[0], tempPaddleWheelBoat->velocity[2],
622622
200.0f, 60.0f, playerX, playerZ) == 1) &&
623623
(y_diff < 60.0)) {
624-
player->triggers |= HIT_PADDLE_BOAT_TRIGGER;
624+
player->soundEffects |= 0x80000;
625625
}
626626
}
627627
}
@@ -805,7 +805,7 @@ void handle_vehicle_interactions(s32 playerId, Player* player, VehicleStuff* veh
805805
if (is_collide_with_vehicle(vehicle->position[0], vehicle->position[2], vehicle->velocity[0],
806806
vehicle->velocity[2], distanceX, distanceY, playerX,
807807
playerZ) == (s32) 1) {
808-
player->triggers |= VERTICAL_TUMBLE_TRIGGER;
808+
player->soundEffects |= REVERSE_SOUND_EFFECT;
809809
}
810810
}
811811
}

0 commit comments

Comments
 (0)