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

Document Sound Effects (#742)

Browse Source 
* Naming sound effects

* Update sound effect names and categorize

* Add bomb effect and fix bug

* HIT_FAKE_ITEM -> EXPLOSION_CRASH

* Rename sound_effects to triggers

* Merge branch 'master' into sound_effects

---------

Co-authored-by: MegaMech <MegaMech@users.noreply.github.com>
This commit is contained in:
Jed Grabman
2025-07-21 14:04:04 -04:00
committed by GitHub
parent f5caebc5de
commit 4f63d1759c
20 changed files with 240 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/update_objects.c
+4 -4
View File
@@ -5973,7 +5973,7 @@ void func_80080B28(s32 objectIndex, s32 playerId) {
temp_s0 = &gPlayerOne[playerId];
if (is_obj_flag_status_active(objectIndex, 0x00000200) != 0) {
if (!(temp_s0->soundEffects & 0x100)) {
if (!(temp_s0->triggers & THWOMP_SQUISH_TRIGGER)) {
temp_f0 = func_80088F54(objectIndex, temp_s0);
if ((temp_f0 <= 9.0) && !(temp_s0->effects & SQUISH_EFFECT) &&
(has_collided_horizontally_with_player(objectIndex, temp_s0) != 0)) {
@@ -6004,7 +6004,7 @@ void func_80080B28(s32 objectIndex, s32 playerId) {
func_800722A4(objectIndex, 2);
temp_s0->unk_040 = (s16) objectIndex;
temp_s0->unk_046 |= 2;
temp_s0->soundEffects |= 0x100;
temp_s0->triggers |= THWOMP_SQUISH_TRIGGER;
func_80088FF0(temp_s0);
}
}
@@ -6021,7 +6021,7 @@ void 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;
}
}
@@ -6389,7 +6389,7 @@ void func_80081D34(s32 objectIndex) {
if (player->effects & STAR_EFFECT) {
func_800C9060(playerIndex, 0x1900A046U);
} else {
player->soundEffects |= 2;
player->triggers |= HIGH_TUMBLE_TRIGGER;
}
object->direction_angle[1] = var_s4->rot[1];
object->velocity[1] = (player->speed / 2) + 3.0;