mirror/mk64
1
0
Fork 0
mirror of https://github.com/n64decomp/mk64 synced 2026-07-02 19:26:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Document sound effects (#735)" (#741)

Browse Source 
This reverts commit e88f33fb18.
This commit is contained in:
MegaMech
2025-07-17 20:52:44 -06:00
committed by GitHub
parent e88f33fb18
commit 0a27fbbba0
20 changed files with 200 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cpu_vehicles_camera_path.c
+15 -15
View File
@@ -1359,8 +1359,8 @@ void play_cpu_sound_effect(s32 arg0, Player* player) {
}
}
if (D_801633B0[arg0] >= 0xB) {
if ((player->triggers & VERTICAL_TUMBLE_TRIGGER) || (player->triggers & HIT_BY_STAR_TRIGGER) ||
(player->triggers & HIGH_TUMBLE_TRIGGER) || (player->triggers & LOW_TUMBLE_TRIGGER) || (player->effects & HIT_EFFECT)) {
if ((player->soundEffects & REVERSE_EFFECT) || (player->soundEffects & 0x01000000) ||
(player->soundEffects & 2) || (player->soundEffects & 4) || (player->effects & HIT_EFFECT)) {
func_800C92CC(arg0, SOUND_ARG_LOAD(0x29, 0x00, 0x80, 0x0B));
D_801633B0[arg0] = 0;
}
@@ -2215,7 +2215,7 @@ void init_players(void) {
for (i = 0; i < NUM_PLAYERS; i++) {
if (D_80163330[i] == 1) {
gPlayers[i].triggers |= START_BOOST_TRIGGER;
gPlayers[i].soundEffects |= 0x02000000;
}
}
}
@@ -3942,7 +3942,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->triggers |= DRAG_ITEM_EFFECT;
player->soundEffects |= HOLD_BANANA_SOUND_EFFECT;
cpuStrategy->branch = CPU_STRATEGY_HOLD_BANANA;
cpuStrategy->timer = 0;
cpuStrategy->numItemUse += 1;
@@ -3967,7 +3967,7 @@ void cpu_use_item_strategy(s32 playerId) {
cpuStrategy->branch = CPU_STRATEGY_WAIT_NEXT_ITEM;
cpuStrategy->timer = 0;
player->triggers &= ~DRAG_ITEM_EFFECT;
player->soundEffects &= ~HOLD_BANANA_SOUND_EFFECT;
} else if (cpuStrategy->timeBeforeThrow < cpuStrategy->timer) {
cpuStrategy->branch = CPU_STRATEGY_DROP_BANANA;
}
@@ -3996,7 +3996,7 @@ void cpu_use_item_strategy(s32 playerId) {
(BANANA_ACTOR(actor)->boundingBoxSize + 1.0f);
}
}
player->triggers &= ~DRAG_ITEM_EFFECT;
player->soundEffects &= ~HOLD_BANANA_SOUND_EFFECT;
cpuStrategy->timer = 0;
cpuStrategy->branch = CPU_STRATEGY_WAIT_NEXT_ITEM;
break;
@@ -4006,7 +4006,7 @@ void cpu_use_item_strategy(s32 playerId) {
if ((cpuStrategy->actorIndex >= 0) && (cpuStrategy->actorIndex < 100)) {
actor = &gActorList[cpuStrategy->actorIndex];
BANANA_ACTOR(actor)->state = BANANA_ON_GROUND;
player->triggers |= DRAG_ITEM_EFFECT;
player->soundEffects |= HOLD_BANANA_SOUND_EFFECT;
cpuStrategy->branch = CPU_STRATEGY_HOLD_THROW_BANANA;
cpuStrategy->timer = 0;
cpuStrategy->numItemUse += 1;
@@ -4039,7 +4039,7 @@ void cpu_use_item_strategy(s32 playerId) {
cpuStrategy->timer = 0;
cpuStrategy->branch = CPU_STRATEGY_WAIT_NEXT_ITEM;
player->triggers &= ~DRAG_ITEM_EFFECT;
player->soundEffects &= ~HOLD_BANANA_SOUND_EFFECT;
} else {
BANANA_ACTOR(actor)->velocity[1] -= 0.4;
BANANA_ACTOR(actor)->pos[0] += BANANA_ACTOR(actor)->velocity[0];
@@ -4072,7 +4072,7 @@ void cpu_use_item_strategy(s32 playerId) {
get_surface_height(BANANA_ACTOR(actor)->pos[0], BANANA_ACTOR(actor)->pos[1] + 30.0, BANANA_ACTOR(actor)->pos[2]) +
(BANANA_ACTOR(actor)->boundingBoxSize + 1.0f);
}
player->triggers &= ~DRAG_ITEM_EFFECT;
player->soundEffects &= ~HOLD_BANANA_SOUND_EFFECT;
cpuStrategy->branch = CPU_STRATEGY_WAIT_NEXT_ITEM;
cpuStrategy->timer = 0;
break;
@@ -4366,7 +4366,7 @@ void cpu_use_item_strategy(s32 playerId) {
break;
case CPU_STRATEGY_ITEM_STAR:
player->triggers |= STAR_TRIGGER;
player->soundEffects |= STAR_SOUND_EFFECT;
cpuStrategy->branch = CPU_STRATEGY_END_ITEM_STAR;
cpuStrategy->timer = 0;
cpuStrategy->numItemUse += 1;
@@ -4380,7 +4380,7 @@ void cpu_use_item_strategy(s32 playerId) {
break;
case CPU_STRATEGY_ITEM_BOO:
player->triggers |= BOO_TRIGGER;
player->soundEffects |= BOO_SOUND_EFFECT;
cpuStrategy->branch = CPU_STRATEGY_WAIT_END_BOO;
cpuStrategy->timer = 0;
cpuStrategy->numItemUse += 1;
@@ -4394,7 +4394,7 @@ void cpu_use_item_strategy(s32 playerId) {
break;
case CPU_STRATEGY_ITEM_MUSHROOM:
player->triggers |= SHROOM_TRIGGER;
player->soundEffects |= BOOST_SOUND_EFFECT;
cpuStrategy->branch = CPU_STRATEGY_WAIT_NEXT_ITEM;
cpuStrategy->timer = 0;
cpuStrategy->numItemUse += 1;
@@ -4402,7 +4402,7 @@ void cpu_use_item_strategy(s32 playerId) {
case CPU_STRATEGY_ITEM_DOUBLE_MUSHROOM:
if (cpuStrategy->timer >= 0x3D) {
player->triggers |= SHROOM_TRIGGER;
player->soundEffects |= BOOST_SOUND_EFFECT;
cpuStrategy->branch = CPU_STRATEGY_ITEM_MUSHROOM;
cpuStrategy->timer = 0;
}
@@ -4410,7 +4410,7 @@ void cpu_use_item_strategy(s32 playerId) {
case CPU_STRATEGY_ITEM_TRIPLE_MUSHROOM:
if (cpuStrategy->timer >= 0x3D) {
player->triggers |= SHROOM_TRIGGER;
player->soundEffects |= BOOST_SOUND_EFFECT;
cpuStrategy->branch = CPU_STRATEGY_ITEM_DOUBLE_MUSHROOM;
cpuStrategy->timer = 0;
}
@@ -4424,7 +4424,7 @@ void cpu_use_item_strategy(s32 playerId) {
case CPU_STRATEGY_USE_SUPER_MUSHROOM:
if ((((s16) cpuStrategy->timer) % 60) == 0) {
player->triggers |= SHROOM_TRIGGER;
player->soundEffects |= BOOST_SOUND_EFFECT;
if (cpuStrategy->timeBeforeThrow < cpuStrategy->timer) {
cpuStrategy->timer = 0;
cpuStrategy->branch = CPU_STRATEGY_WAIT_NEXT_ITEM;