diff options
| author | coco875 <59367621+coco875@users.noreply.github.com> | 2025-12-16 17:55:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-16 09:55:37 -0700 |
| commit | 1a5c79b641517e38d6a2925ba1f332dffdafc1e8 (patch) | |
| tree | 5c9e0844e2839651cd89c9134e9e725e02680160 /src/engine/objects/Mole.cpp | |
| parent | 6b8be33a5bc5f26c425095d8c3d0b9caa7e91ae6 (diff) | |
Player bitflag attributes (pr 750 from the decomp) (#592)
* Player bitflag attributes (pr 750 from the decomp)
Co-Authored-By: Jed Grabman <JedGrabman@users.noreply.github.com>
* remove WATER_NO_INTERACTION
---------
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/Mole.cpp')
| -rw-r--r-- | src/engine/objects/Mole.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/engine/objects/Mole.cpp b/src/engine/objects/Mole.cpp index 8cdfd0599..95c32ca0f 100644 --- a/src/engine/objects/Mole.cpp +++ b/src/engine/objects/Mole.cpp @@ -208,13 +208,13 @@ void OMole::func_80081D34(s32 objectIndex) { for (size_t i = 0; i < D_8018D158; i++, player++, camera++) { if ((is_obj_flag_status_active(objectIndex, 0x00000200) != 0) && !(player->effects & 0x80000000) && (has_collided_with_player(objectIndex, player) != 0)) { - if ((player->type & 0x8000) && !(player->type & 0x100)) { + if ((player->type & PLAYER_EXISTS) && !(player->type & PLAYER_INVISIBLE_OR_BOMB)) { var_s5 = 1; object = &gObjectList[objectIndex]; if (is_obj_flag_status_active(objectIndex, 0x04000000) != 0) { func_80072180(); } - if (player->effects & 0x200) { + if (player->effects & STAR_EFFECT) { func_800C9060(i, 0x1900A046U); } else { player->triggers |= HIGH_TUMBLE_TRIGGER; |