diff options
Diffstat (limited to 'src/engine/objects/Lakitu.cpp')
| -rw-r--r-- | src/engine/objects/Lakitu.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/engine/objects/Lakitu.cpp b/src/engine/objects/Lakitu.cpp index a4f580952..be3474cb0 100644 --- a/src/engine/objects/Lakitu.cpp +++ b/src/engine/objects/Lakitu.cpp @@ -197,13 +197,13 @@ void OLakitu::func_800791F0(s32 objectIndex, s32 playerId) { if ((gObjectList[objectIndex].unk_0D8 != 3) && (gObjectList[objectIndex].unk_0D8 != 7)) { func_800722CC(objectIndex, 1); if (CM_GetProps()->LakituTowType == LakituTowType::ICE) { - player->unk_0CA &= 0xFFEF; + player->lakituProps &= ~FRIGID_EFFECT; } } if (CM_GetProps()->LakituTowType == LakituTowType::ICE) { func_800722CC(objectIndex, 0x00000010); - player->unk_0CA &= 0xFFDF; + player->lakituProps &= ~THAWING_EFFECT; } func_800C9018(playerId, SOUND_ARG_LOAD(0x01, 0x00, 0xFA, 0x28)); } @@ -429,10 +429,10 @@ void OLakitu::func_800797AC(s32 playerId) { objectIndex = gIndexLakituList[playerId]; player = &gPlayerOne[playerId]; - // if ((IsSherbetLand()) && (player->unk_0CA & 1)) { - if ((CM_GetProps()->LakituTowType == LakituTowType::ICE) && (player->unk_0CA & 1)) { + // if ((IsSherbetLand()) && (player->lakituProps & 1)) { + if ((CM_GetProps()->LakituTowType == LakituTowType::ICE) && (player->lakituProps & LAKITU_RETRIEVAL)) { init_object(objectIndex, 7); - player->unk_0CA |= 0x10; + player->lakituProps |= FRIGID_EFFECT; } else { init_object(objectIndex, 3); } @@ -447,14 +447,14 @@ void OLakitu::func_80079860(s32 playerId) { player = &gPlayerOne[playerId]; if ((func_80072354(objectIndex, 1) != 0) && (((func_802ABDF4(player->collision.meshIndexZX) != 0) && (player->collision.surfaceDistance[2] <= 3.0f)) || - (player->unk_0CA & 1) || ((player->surfaceType == OUT_OF_BOUNDS) && !(player->effects & 8)))) { + (player->lakituProps & LAKITU_RETRIEVAL) || ((player->surfaceType == OUT_OF_BOUNDS) && !(player->effects & 8)))) { func_80090778(player); OLakitu::func_800797AC(playerId); } } void OLakitu::func_8007993C(s32 objectIndex, Player* player) { - if (player->unk_0CA & 4) { + if (player->lakituProps & LAKITU_FIZZLE) { func_800722A4(objectIndex, 2); gObjectList[objectIndex].primAlpha = player->alpha; return; @@ -544,7 +544,7 @@ void OLakitu::update_object_lakitu_fishing(s32 objectIndex, s32 playerId) { func_80073654(objectIndex); break; case 3: - if (!(player->unk_0CA & 2)) { + if (!(player->lakituProps & HELD_BY_LAKITU)) { func_80086EAC(objectIndex, 0, 3); func_80073654(objectIndex); } @@ -579,7 +579,7 @@ void OLakitu::update_object_lakitu_fishing2(s32 objectIndex, s32 playerId) { case 2: /* switch 1 */ set_object_flag(objectIndex, 0x00000010); func_800736E0(objectIndex); - player->unk_0CA |= 0x80; + player->lakituProps |= FROZEN_EFFECT; object_next_state(objectIndex); break; case 3: /* switch 1 */ @@ -599,11 +599,11 @@ void OLakitu::update_object_lakitu_fishing2(s32 objectIndex, s32 playerId) { func_80073654(objectIndex); break; case 3: - if ((player->surfaceType == ICE) && !(player->unk_0CA & 1) && + if ((player->surfaceType == ICE) && !(player->lakituProps & LAKITU_RETRIEVAL) && ((f64) player->collision.surfaceDistance[2] <= 30.0)) { func_800722A4(objectIndex, 8); } - if (!(player->unk_0CA & 2)) { + if (!(player->lakituProps & HELD_BY_LAKITU)) { func_80086EAC(objectIndex, 0, 3); func_80073654(objectIndex); } @@ -612,7 +612,7 @@ void OLakitu::update_object_lakitu_fishing2(s32 objectIndex, s32 playerId) { func_8007375C(objectIndex, 0x0000001E); break; case 5: - player->unk_0CA &= 0xFF7F; + player->lakituProps &= ~FROZEN_EFFECT; func_800722A4(objectIndex, 0x00000010); func_800722A4(objectIndex, 0x00000020); func_800722CC(objectIndex, 4); @@ -623,8 +623,8 @@ void OLakitu::update_object_lakitu_fishing2(s32 objectIndex, s32 playerId) { case 6: if (func_8007375C(objectIndex, 0x000000A0) != 0) { func_800722CC(objectIndex, 0x00000010); - player->unk_0CA &= 0xFFEF; - player->unk_0CA |= 0x20; + player->lakituProps &= ~FRIGID_EFFECT; + player->lakituProps |= THAWING_EFFECT; } break; case 7: @@ -633,7 +633,7 @@ void OLakitu::update_object_lakitu_fishing2(s32 objectIndex, s32 playerId) { case 8: func_80073720(objectIndex); func_80072428(objectIndex); - player->unk_0CA &= 0xFFDF; + player->lakituProps &= ~THAWING_EFFECT; func_800722CC(objectIndex, 1); func_800C9018((u8) playerId, SOUND_ARG_LOAD(0x01, 0x00, 0xFA, 0x28)); break; |