mirror/mk64
1
0
Fork 0
mirror of https://github.com/n64decomp/mk64 synced 2026-06-20 07:01: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/camera.c
+4 -4
View File
@@ -1024,7 +1024,7 @@ void func_8001F394(Player* player, f32* arg1) {
}
if (D_80164A08[playerIndex] == 0) {
if (player->triggers & DRAG_ITEM_EFFECT) {
if (player->soundEffects & HOLD_BANANA_SOUND_EFFECT) {
D_80164A08[playerIndex] = 1;
}
if ((player->effects & BOOST_EFFECT) == BOOST_EFFECT) {
@@ -1033,7 +1033,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->triggers & THWOMP_SQUISH_TRIGGER) == THWOMP_SQUISH_TRIGGER) {
if ((player->soundEffects & 0x100) == 0x100) {
D_80164A08[playerIndex] = 4;
}
if (((player->effects & 0x80) == 0x80) || ((player->effects & 0x40) == 0x40)) {
@@ -1043,7 +1043,7 @@ void func_8001F394(Player* player, f32* arg1) {
}
switch (D_80164A08[playerIndex]) {
case 1:
if (player->triggers & DRAG_ITEM_EFFECT) {
if (player->soundEffects & HOLD_BANANA_SOUND_EFFECT) {
move_f32_towards(&D_80164498[playerIndex], 20.0f, 0.2f);
} else {
if (D_80164498[playerIndex] > 1.0f) {
@@ -1082,7 +1082,7 @@ void func_8001F394(Player* player, f32* arg1) {
}
break;
case 4:
if ((player->triggers & THWOMP_SQUISH_TRIGGER) == THWOMP_SQUISH_TRIGGER) {
if ((player->soundEffects & 0x100) == 0x100) {
move_f32_towards(&D_80164498[playerIndex], 25.0f, 1.0f);
} else {
if (D_80164498[playerIndex] > 1.0f) {