diff options
| author | coco875 <59367621+coco875@users.noreply.github.com> | 2025-12-13 20:08:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-13 12:08:59 -0700 |
| commit | 4e51b7d5b6a9b89deb5ef135deec0ee5f0087e7c (patch) | |
| tree | 5c9d1156a8785e1f0736a89c6fa512fae8e4a3d1 /src/engine/objects | |
| parent | b934e98fc34964970ab5efacb2fb7c3372ae0b1a (diff) | |
Document sound effects (pr 735 from the decomp) (#589)
Co-authored-by: Jed Grabman <JedGrabman@users.noreply.github.com>
Co-authored-by: MegaMech <MegaMech@users.noreply.github.com>
Diffstat (limited to 'src/engine/objects')
| -rw-r--r-- | src/engine/objects/BombKart.cpp | 6 | ||||
| -rw-r--r-- | src/engine/objects/Mole.cpp | 2 | ||||
| -rw-r--r-- | src/engine/objects/Thwomp.cpp | 6 |
3 files changed, 7 insertions, 7 deletions
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; } } |