From 491870c3554dd5c8bdeb7e3893bdb8618730af53 Mon Sep 17 00:00:00 2001 From: engineer124 <47598039+engineer124@users.noreply.github.com> Date: Sat, 17 Jun 2023 15:22:41 +1000 Subject: [PATCH] Misc Cleanup 5 (#1294) * quick cleanup * a few more * more * misc cleanup * PR Suggestion --- src/audio/lib/effects.c | 2 +- src/audio/lib/load.c | 69 ++-- src/audio/lib/playback.c | 3 + src/code/z_eff_tire_mark.c | 3 +- src/code/z_parameter.c | 6 +- .../z_bg_dblue_waterfall.c | 1 + .../ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c | 4 +- .../ovl_Bg_Last_Bwall/z_bg_last_bwall.c | 4 +- src/overlays/actors/ovl_En_Am/z_en_am.c | 2 +- src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c | 9 +- src/overlays/actors/ovl_En_Crow/z_en_crow.c | 4 +- .../actors/ovl_En_Elforg/z_en_elforg.c | 10 +- src/overlays/actors/ovl_En_Famos/z_en_famos.c | 2 +- src/overlays/actors/ovl_En_Fz/z_en_fz.c | 2 +- src/overlays/actors/ovl_En_Gk/z_en_gk.c | 5 +- .../actors/ovl_En_Hanabi/z_en_hanabi.c | 63 ++-- .../z_en_horse_link_child.c | 2 +- .../actors/ovl_En_Kakasi/z_en_kakasi.c | 1 - .../actors/ovl_En_Kanban/z_en_kanban.c | 2 +- src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c | 2 +- src/overlays/actors/ovl_En_Mkk/z_en_mkk.c | 2 +- .../actors/ovl_En_Nutsball/z_en_nutsball.c | 2 +- src/overlays/actors/ovl_En_Osk/z_en_osk.c | 2 +- src/overlays/actors/ovl_En_Ot/z_en_ot.c | 29 +- src/overlays/actors/ovl_En_Owl/z_en_owl.c | 316 ++++++++++-------- src/overlays/actors/ovl_En_Slime/z_en_slime.c | 4 +- src/overlays/actors/ovl_En_Test7/z_en_test7.c | 9 +- src/overlays/actors/ovl_En_Wiz/z_en_wiz.c | 4 +- .../actors/ovl_En_Wiz_Fire/z_en_wiz_fire.c | 2 +- .../actors/ovl_Obj_Switch/z_obj_switch.c | 2 +- .../actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c | 2 +- 31 files changed, 314 insertions(+), 256 deletions(-) diff --git a/src/audio/lib/effects.c b/src/audio/lib/effects.c index 6ef8added0..580b7fd224 100644 --- a/src/audio/lib/effects.c +++ b/src/audio/lib/effects.c @@ -10,7 +10,7 @@ void AudioEffects_SequenceChannelProcessSound(SequenceChannel* channel, s32 reca if (channel->seqPlayer->muted && (channel->muteFlags & MUTE_FLAGS_SOFTEN)) { channelVolume = channel->seqPlayer->muteVolumeScale * channelVolume; } - channel->appliedVolume = channelVolume * channelVolume; + channel->appliedVolume = SQ(channelVolume); } if (channel->changes.s.pan) { diff --git a/src/audio/lib/load.c b/src/audio/lib/load.c index 8016e9b6ad..af9de1cd1c 100644 --- a/src/audio/lib/load.c +++ b/src/audio/lib/load.c @@ -884,7 +884,6 @@ void AudioLoad_RelocateFont(s32 fontId, SoundFontData* fontDataStartAddr, Sample // The first u32 in fontData is an offset to a list of offsets to the drums soundListOffset = fontData[0]; - if (1) {} // If the soundFont has drums if ((soundListOffset != 0) && (numDrums != 0)) { @@ -897,20 +896,23 @@ void AudioLoad_RelocateFont(s32 fontId, SoundFontData* fontDataStartAddr, Sample soundOffset = ((Drum**)fontData[0])[i]; // Some drum data entries are empty, represented by an offset of 0 in the list of drum offsets - if (soundOffset != 0) { - soundOffset = RELOC_TO_RAM(soundOffset); - ((Drum**)fontData[0])[i] = drum = soundOffset; - - // The drum may be in the list multiple times and already relocated - if (!drum->isRelocated) { - AudioLoad_RelocateSample(&drum->tunedSample, fontDataStartAddr, sampleBankReloc); - - soundOffset = drum->envelope; - drum->envelope = RELOC_TO_RAM(soundOffset); - - drum->isRelocated = true; - } + if (soundOffset == 0) { + continue; } + soundOffset = RELOC_TO_RAM(soundOffset); + ((Drum**)fontData[0])[i] = drum = soundOffset; + + // The drum may be in the list multiple times and already relocated + if (drum->isRelocated) { + continue; + } + + AudioLoad_RelocateSample(&drum->tunedSample, fontDataStartAddr, sampleBankReloc); + + soundOffset = drum->envelope; + drum->envelope = RELOC_TO_RAM(soundOffset); + + drum->isRelocated = true; } } @@ -918,7 +920,6 @@ void AudioLoad_RelocateFont(s32 fontId, SoundFontData* fontDataStartAddr, Sample // The second u32 in fontData is an offset to the first sound effect entry soundListOffset = fontData[1]; - if (1) {} // If the soundFont has sound effects if ((soundListOffset != 0) && (numSfx != 0)) { @@ -932,9 +933,11 @@ void AudioLoad_RelocateFont(s32 fontId, SoundFontData* fontDataStartAddr, Sample soundEffect = (SoundEffect*)soundOffset; // Check for NULL (note: the pointer is guaranteed to be in fontData and can never be NULL) - if ((soundEffect != NULL) && (soundEffect->tunedSample.sample != NULL)) { - AudioLoad_RelocateSample(&soundEffect->tunedSample, fontDataStartAddr, sampleBankReloc); + if ((soundEffect == NULL) || (soundEffect->tunedSample.sample == NULL)) { + continue; } + + AudioLoad_RelocateSample(&soundEffect->tunedSample, fontDataStartAddr, sampleBankReloc); } } @@ -1643,9 +1646,11 @@ void AudioLoad_FinishAsyncLoad(AudioAsyncLoad* asyncLoad) { case SEQUENCE_TABLE: AudioLoad_SetSeqLoadStatus(ASYNC_ID(retMsg), ASYNC_STATUS(retMsg)); break; + case SAMPLE_TABLE: AudioLoad_SetSampleFontLoadStatusAndApplyCaches(ASYNC_ID(retMsg), ASYNC_STATUS(retMsg)); break; + case FONT_TABLE: fontId = ASYNC_ID(retMsg); sampleBankId1 = gAudioCtx.soundFontList[fontId].sampleBankId1; @@ -1659,6 +1664,9 @@ void AudioLoad_FinishAsyncLoad(AudioAsyncLoad* asyncLoad) { AudioLoad_SetFontLoadStatus(fontId, ASYNC_STATUS(retMsg)); AudioLoad_RelocateFontAndPreloadSamples(fontId, asyncLoad->ramAddr, &sampleBankReloc, true); break; + + default: + break; } doneMsg = asyncLoad->retMsg; @@ -2002,24 +2010,29 @@ s32 AudioLoad_GetSamplesForFont(s32 fontId, Sample** sampleSet) { for (i = 0; i < numDrums; i++) { Drum* drum = AudioPlayback_GetDrum(fontId, i); - if (1) {} - if (drum != NULL) { - numSamples = AudioLoad_AddToSampleSet(drum->tunedSample.sample, numSamples, sampleSet); + if (drum == NULL) { + continue; } + + numSamples = AudioLoad_AddToSampleSet(drum->tunedSample.sample, numSamples, sampleSet); } for (i = 0; i < numInstruments; i++) { Instrument* instrument = AudioPlayback_GetInstrumentInner(fontId, i); - if (instrument != NULL) { - if (instrument->normalRangeLo != 0) { - numSamples = AudioLoad_AddToSampleSet(instrument->lowPitchTunedSample.sample, numSamples, sampleSet); - } - if (instrument->normalRangeHi != 0x7F) { - numSamples = AudioLoad_AddToSampleSet(instrument->highPitchTunedSample.sample, numSamples, sampleSet); - } - numSamples = AudioLoad_AddToSampleSet(instrument->normalPitchTunedSample.sample, numSamples, sampleSet); + if (instrument == NULL) { + continue; } + + if (instrument->normalRangeLo != 0) { + numSamples = AudioLoad_AddToSampleSet(instrument->lowPitchTunedSample.sample, numSamples, sampleSet); + } + + if (instrument->normalRangeHi != 0x7F) { + numSamples = AudioLoad_AddToSampleSet(instrument->highPitchTunedSample.sample, numSamples, sampleSet); + } + + numSamples = AudioLoad_AddToSampleSet(instrument->normalPitchTunedSample.sample, numSamples, sampleSet); } // Should really also process sfx, but this method is never called diff --git a/src/audio/lib/playback.c b/src/audio/lib/playback.c index 678e010895..a626645c52 100644 --- a/src/audio/lib/playback.c +++ b/src/audio/lib/playback.c @@ -83,6 +83,9 @@ void AudioPlayback_InitSampleState(Note* note, NoteSampleState* sampleState, Not sampleState->bitField0.strongRight = stereoData.strongRight ^ strongRight; sampleState->bitField0.strongLeft = stereoData.strongLeft ^ strongLeft; break; + + default: + break; } } else if (gAudioCtx.soundMode == SOUNDMODE_MONO) { diff --git a/src/code/z_eff_tire_mark.c b/src/code/z_eff_tire_mark.c index d14d6926c8..55c15714e6 100644 --- a/src/code/z_eff_tire_mark.c +++ b/src/code/z_eff_tire_mark.c @@ -80,7 +80,8 @@ void func_800AE930(CollisionContext* colCtx, EffectTireMark* this, Vec3f* pos, f spAC->flags |= 1; } - if (spA8) {} // Necessary to match + //! FAKE: + if (spA8) {} spA8 = &this->elements[this->numElements]; spA8->flags = 0; diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index e63c9d8e5a..ae535dc9b5 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -6606,7 +6606,7 @@ void Interface_Update(PlayState* play) { case HUD_VISIBILITY_NONE: case HUD_VISIBILITY_NONE_ALT: case HUD_VISIBILITY_B: - dimmingAlpha = 255 - (gSaveContext.hudVisibilityTimer << 5); + dimmingAlpha = 255 - (gSaveContext.hudVisibilityTimer * 32); if (dimmingAlpha < 0) { dimmingAlpha = 0; } @@ -6637,7 +6637,7 @@ void Interface_Update(PlayState* play) { case HUD_VISIBILITY_B_MAGIC: case HUD_VISIBILITY_A_B: case HUD_VISIBILITY_A_B_HEARTS_MAGIC_MINIMAP: - dimmingAlpha = 255 - (gSaveContext.hudVisibilityTimer << 5); + dimmingAlpha = 255 - (gSaveContext.hudVisibilityTimer * 32); if (dimmingAlpha < 0) { dimmingAlpha = 0; } @@ -6650,7 +6650,7 @@ void Interface_Update(PlayState* play) { break; case HUD_VISIBILITY_ALL: - dimmingAlpha = 255 - (gSaveContext.hudVisibilityTimer << 5); + dimmingAlpha = 255 - (gSaveContext.hudVisibilityTimer * 32); if (dimmingAlpha < 0) { dimmingAlpha = 0; } diff --git a/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.c b/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.c index d0d0f0c3cd..10ad49d9b0 100644 --- a/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.c +++ b/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.c @@ -320,6 +320,7 @@ void func_80B84610(BgDblueWaterfall* this, PlayState* play) { player->actor.world.pos.x += sp34.x; player->actor.world.pos.z += sp34.z; + //! FAKE: if (this && this && this) {} player->pushedSpeed = 8.0f; player->pushedYaw = this->actor.yawTowardsPlayer; diff --git a/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c b/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c index 66666b82b3..f85015ea94 100644 --- a/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c +++ b/src/overlays/actors/ovl_Bg_Hakugin_Post/z_bg_hakugin_post.c @@ -829,7 +829,7 @@ void func_80A9CE1C(BgHakuginPost* this, PlayState* play) { for (i = 0; i < D_80A9E028.count; i++) { collider = D_80A9E028.unk_0000[i].collider; - if ((collider != NULL) && (collider->base.acFlags & AT_HIT) && (D_80A9E028.unk_0000[i].unk_34 == 1)) { + if ((collider != NULL) && (collider->base.acFlags & AC_HIT) && (D_80A9E028.unk_0000[i].unk_34 == 1)) { temp_f2 = this->unk_16C; yDiff = ABS_ALT(BINANG_SUB(this->dyna.actor.yawTowardsPlayer, player->actor.shape.rot.y)); temp_f0 = temp_f2 + D_80A9E028.unk_0000[i].unk_14.y; @@ -853,7 +853,7 @@ void func_80A9CE1C(BgHakuginPost* this, PlayState* play) { for (i = 0; i < D_80A9E028.count; i++) { collider = D_80A9E028.unk_0000[i].collider; if (collider != NULL) { - collider->base.acFlags &= ~AT_HIT; + collider->base.acFlags &= ~AC_HIT; } } diff --git a/src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.c b/src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.c index 6085a93a2f..a09c0fb025 100644 --- a/src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.c +++ b/src/overlays/actors/ovl_Bg_Last_Bwall/z_bg_last_bwall.c @@ -225,8 +225,8 @@ void func_80C187E4(BgLastBwall* this) { } void func_80C187F8(BgLastBwall* this, PlayState* play) { - if (this->colliderTris.base.acFlags & 2) { - this->colliderTris.base.acFlags &= ~2; + if (this->colliderTris.base.acFlags & AC_HIT) { + this->colliderTris.base.acFlags &= ~AC_HIT; Flags_SetSwitch(play, BGLASTBWALL_GET_SWITCHFLAGS(&this->dyna.actor)); func_80C1886C(this, play); } else { diff --git a/src/overlays/actors/ovl_En_Am/z_en_am.c b/src/overlays/actors/ovl_En_Am/z_en_am.c index 30775584b9..a5b3f91d6d 100644 --- a/src/overlays/actors/ovl_En_Am/z_en_am.c +++ b/src/overlays/actors/ovl_En_Am/z_en_am.c @@ -521,7 +521,7 @@ void EnAm_Update(Actor* thisx, PlayState* play) { CollisionCheck_SetAC(play, &play->colChkCtx, &this->enemyCollider.base); } CollisionCheck_SetAC(play, &play->colChkCtx, &this->interactCollider.base); - if (this->enemyCollider.base.atFlags & AC_ON) { + if (this->enemyCollider.base.atFlags & AT_ON) { this->actor.flags |= ACTOR_FLAG_1000000; CollisionCheck_SetAT(play, &play->colChkCtx, &this->enemyCollider.base); } diff --git a/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c b/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c index 762141ed45..056ca97d55 100644 --- a/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c +++ b/src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c @@ -688,21 +688,20 @@ void EnBigpo_BurnAwayDeath(EnBigpo* this, PlayState* play) { if (this->idleTimer < 8) { camYaw = Camera_GetCamDirYaw(GET_ACTIVE_CAM(play)) + 0x4800; if (this->idleTimer < 5) { - unkTemp = (this->idleTimer << 0xC) - 0x4000; - // 1.4.0...1 is NOT 1.4, the rodata demands it - tempVec.y = (((Math_SinS(unkTemp) * 23.0f) + 40.0f) * 1.4000001f) + this->actor.world.pos.y; + unkTemp = (this->idleTimer * 0x1000) - 0x4000; + tempVec.y = (((Math_SinS(unkTemp) * 23.0f) + 40.0f) * (1400.0f * 0.001f)) + this->actor.world.pos.y; unkTemp2 = Math_CosS(unkTemp) * 32.2f; tempVec.x = (Math_SinS(camYaw) * unkTemp2) + this->actor.world.pos.x; tempVec.z = (Math_CosS(camYaw) * unkTemp2) + this->actor.world.pos.z; } else { - tempVec.y = this->actor.world.pos.y + ((40.0f + (15.0f * (this->idleTimer - 5))) * 1.4000001f); + tempVec.y = this->actor.world.pos.y + ((40.0f + (15.0f * (this->idleTimer - 5))) * (1400.0f * 0.001f)); tempVec.x = (Math_SinS(camYaw) * 32.2f) + this->actor.world.pos.x; tempVec.z = (Math_CosS(camYaw) * 32.2f) + this->actor.world.pos.z; } // not sure what we're turning this into, but its based on the timer - modifiedTimer = ((f32)((this->idleTimer * 10) + 80) * 1.4000001f); + modifiedTimer = ((this->idleTimer * 10) + 80) * (1400.0f * 0.001f); func_800B3030(play, &tempVec, &D_80B6506C, &gZeroVec3f, modifiedTimer, 0, 2); tempVec.x = (2.0f * this->actor.world.pos.x) - tempVec.x; tempVec.z = (2.0f * this->actor.world.pos.z) - tempVec.z; diff --git a/src/overlays/actors/ovl_En_Crow/z_en_crow.c b/src/overlays/actors/ovl_En_Crow/z_en_crow.c index 35e6d84379..bad5f5e0ff 100644 --- a/src/overlays/actors/ovl_En_Crow/z_en_crow.c +++ b/src/overlays/actors/ovl_En_Crow/z_en_crow.c @@ -465,8 +465,8 @@ void EnCrow_Respawn(EnCrow* this, PlayState* play) { } void EnCrow_UpdateDamage(EnCrow* this, PlayState* play) { - if (this->collider.base.acFlags & AT_HIT) { - this->collider.base.acFlags &= ~AT_HIT; + if (this->collider.base.acFlags & AC_HIT) { + this->collider.base.acFlags &= ~AC_HIT; Actor_SetDropFlag(&this->actor, &this->collider.elements->info); if (this->actor.colChkInfo.damageEffect == GUAY_DMGEFF_STUN) { diff --git a/src/overlays/actors/ovl_En_Elforg/z_en_elforg.c b/src/overlays/actors/ovl_En_Elforg/z_en_elforg.c index 9b65ae2a6e..5c3e33550d 100644 --- a/src/overlays/actors/ovl_En_Elforg/z_en_elforg.c +++ b/src/overlays/actors/ovl_En_Elforg/z_en_elforg.c @@ -216,7 +216,7 @@ void EnElforg_MoveToTargetFairyFountain(EnElforg* this, Vec3f* homePos) { s16 angleAdjustment; s16 targetAngle; - this->actor.shape.yOffset += 100.0f * Math_SinS(this->timer << 9); + this->actor.shape.yOffset += 100.0f * Math_SinS(this->timer * 0x200); EnElforg_ApproachTargetYPosition(this, homePos); xDifference = this->actor.world.pos.x - homePos->x; zDifference = this->actor.world.pos.z - homePos->z; @@ -245,7 +245,7 @@ void EnElforg_MoveToTargetFairyFountain(EnElforg* this, Vec3f* homePos) { void EnElforg_MoveToTarget(EnElforg* this, Vec3f* targetPos) { s16 targetAngle; - this->actor.shape.yOffset += 100.0f * Math_SinS(this->timer << 9); + this->actor.shape.yOffset += 100.0f * Math_SinS(this->timer * 0x200); EnElforg_ApproachTargetYPosition(this, targetPos); targetAngle = Math_Atan2S_XY(-(this->actor.world.pos.z - targetPos->z), -(this->actor.world.pos.x - targetPos->x)); @@ -273,7 +273,7 @@ void EnElforg_TrappedByBubble(EnElforg* this, PlayState* play) { EnElforg_InitializeParams(this); this->actionFunc = EnElforg_FreeFloating; } else { - this->actor.shape.yOffset += 10.0f * Math_SinS(this->timer << 9); + this->actor.shape.yOffset += 10.0f * Math_SinS(this->timer * 0x200); this->actor.world.pos = this->actor.parent->world.pos; this->actor.world.pos.y += 12.0f; } @@ -391,8 +391,8 @@ void EnElforg_CirclePlayer(EnElforg* this, PlayState* play) { distanceFromPlayer = 20.0f; } - this->actor.world.pos.x = (Math_SinS(this->timer << 12) * distanceFromPlayer) + playerActor->world.pos.x; - this->actor.world.pos.z = (Math_CosS(this->timer << 12) * distanceFromPlayer) + playerActor->world.pos.z; + this->actor.world.pos.x = (Math_SinS(this->timer * 0x1000) * distanceFromPlayer) + playerActor->world.pos.x; + this->actor.world.pos.z = (Math_CosS(this->timer * 0x1000) * distanceFromPlayer) + playerActor->world.pos.z; this->actor.world.pos.y = player->bodyPartsPos[PLAYER_BODYPART_WAIST].y; EnElforg_SpawnSparkles(this, play, 16); } diff --git a/src/overlays/actors/ovl_En_Famos/z_en_famos.c b/src/overlays/actors/ovl_En_Famos/z_en_famos.c index 269866ff08..efccfb9d96 100644 --- a/src/overlays/actors/ovl_En_Famos/z_en_famos.c +++ b/src/overlays/actors/ovl_En_Famos/z_en_famos.c @@ -788,7 +788,7 @@ void EnFamos_Update(Actor* thisx, PlayState* play) { CollisionCheck_SetAC(play, &play->colChkCtx, &this->emblemCollider.base); } - if (this->collider2.base.atFlags & AC_ON) { + if (this->collider2.base.atFlags & AT_ON) { Collider_UpdateCylinder(&this->actor, &this->collider2); this->collider2.dim.pos.y = this->actor.floorHeight; CollisionCheck_SetAT(play, &play->colChkCtx, &this->collider2.base); diff --git a/src/overlays/actors/ovl_En_Fz/z_en_fz.c b/src/overlays/actors/ovl_En_Fz/z_en_fz.c index 71f980d47e..00b54400df 100644 --- a/src/overlays/actors/ovl_En_Fz/z_en_fz.c +++ b/src/overlays/actors/ovl_En_Fz/z_en_fz.c @@ -401,7 +401,7 @@ void func_80932C98(EnFz* this, PlayState* play) { } if (this->unk_BCE != 0) { - if (ENFZ_GET_8000(&this->actor) && (this->collider1.base.atFlags & AC_HIT)) { + if (ENFZ_GET_8000(&this->actor) && (this->collider1.base.atFlags & AT_HIT)) { this->unk_BCD = 0; this->unk_BBC = 0.0f; this->collider1.base.acFlags &= ~AC_HIT; diff --git a/src/overlays/actors/ovl_En_Gk/z_en_gk.c b/src/overlays/actors/ovl_En_Gk/z_en_gk.c index 1db4d7c5b6..8697f5d745 100644 --- a/src/overlays/actors/ovl_En_Gk/z_en_gk.c +++ b/src/overlays/actors/ovl_En_Gk/z_en_gk.c @@ -534,8 +534,6 @@ void func_80B51510(EnGk* this, PlayState* play) { s32 pad; s32 cueChannel; - if (this) {} - if (Cutscene_IsCueInChannel(play, CS_CMD_ACTOR_CUE_479)) { cueChannel = Cutscene_GetCueChannel(play, CS_CMD_ACTOR_CUE_479); @@ -577,6 +575,9 @@ void func_80B51510(EnGk* this, PlayState* play) { case 7: Flags_SetSwitch(play, ENGK_GET_3F00(&this->actor)); break; + + default: + break; } Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, this->unk_31A); } diff --git a/src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.c b/src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.c index 4294a83202..091525ce02 100644 --- a/src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.c +++ b/src/overlays/actors/ovl_En_Hanabi/z_en_hanabi.c @@ -149,40 +149,41 @@ void func_80B22FA8(EnHanabiStruct* arg0, PlayState* play2) { gSPDisplayList(POLY_XLU_DISP++, gSunSparkleMaterialDL); sp53 = 0xFF; - if (sp53) {} for (i = 0; i < 400; i++, arg0++) { - if (arg0->unk_00 == 1) { - Matrix_Translate(arg0->unk_08.x, arg0->unk_08.y, arg0->unk_08.z, MTXMODE_NEW); - Matrix_ReplaceRotation(&play->billboardMtxF); - if (arg0->unk_01 < 40) { - Matrix_Scale(arg0->unk_04 * 0.025f * arg0->unk_01, arg0->unk_04 * 0.025f * arg0->unk_01, 1.0f, - MTXMODE_APPLY); - } else { - Matrix_Scale(arg0->unk_04, arg0->unk_04, 1.0f, MTXMODE_APPLY); - } - Matrix_RotateZS(play->gameplayFrames * 4864, MTXMODE_APPLY); - - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - - if (sp53 != arg0->unk_02) { - gDPPipeSync(POLY_XLU_DISP++); - gDPSetEnvColor(POLY_XLU_DISP++, D_80B23C40[arg0->unk_02], D_80B23C40[arg0->unk_02 + 1], - D_80B23C40[arg0->unk_02 + 2], 255); - - sp53 = arg0->unk_02; - } - - if (arg0->unk_01 < 6) { - gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, D_80B23C2C[arg0->unk_02], D_80B23C2C[arg0->unk_02 + 1], - D_80B23C2C[arg0->unk_02 + 2], arg0->unk_01 * 50); - } else { - gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, D_80B23C2C[arg0->unk_02], D_80B23C2C[arg0->unk_02 + 1], - D_80B23C2C[arg0->unk_02 + 2], 255); - } - - gSPDisplayList(POLY_XLU_DISP++, gSunSparkleModelDL); + if (arg0->unk_00 != 1) { + continue; } + + Matrix_Translate(arg0->unk_08.x, arg0->unk_08.y, arg0->unk_08.z, MTXMODE_NEW); + Matrix_ReplaceRotation(&play->billboardMtxF); + if (arg0->unk_01 < 40) { + Matrix_Scale(arg0->unk_04 * 0.025f * arg0->unk_01, arg0->unk_04 * 0.025f * arg0->unk_01, 1.0f, + MTXMODE_APPLY); + } else { + Matrix_Scale(arg0->unk_04, arg0->unk_04, 1.0f, MTXMODE_APPLY); + } + Matrix_RotateZS(play->gameplayFrames * 4864, MTXMODE_APPLY); + + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + + if (sp53 != arg0->unk_02) { + gDPPipeSync(POLY_XLU_DISP++); + gDPSetEnvColor(POLY_XLU_DISP++, D_80B23C40[arg0->unk_02], D_80B23C40[arg0->unk_02 + 1], + D_80B23C40[arg0->unk_02 + 2], 255); + + sp53 = arg0->unk_02; + } + + if (arg0->unk_01 < 6) { + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, D_80B23C2C[arg0->unk_02], D_80B23C2C[arg0->unk_02 + 1], + D_80B23C2C[arg0->unk_02 + 2], arg0->unk_01 * 50); + } else { + gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, D_80B23C2C[arg0->unk_02], D_80B23C2C[arg0->unk_02 + 1], + D_80B23C2C[arg0->unk_02 + 2], 255); + } + + gSPDisplayList(POLY_XLU_DISP++, gSunSparkleModelDL); } CLOSE_DISPS(gfxCtx); diff --git a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c index 0217e8fa86..5079e1a57c 100644 --- a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c +++ b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c @@ -315,7 +315,7 @@ void func_808DF088(EnHorseLinkChild* this, PlayState* play) { } else { phi_v0 = -1; } - sp32 += (phi_v0 << 0xE); + sp32 += (phi_v0 * 0x4000); } else { sp32 = Math_Vec3f_Yaw(&this->actor.world.pos, &this->actor.home.pos) - this->actor.world.rot.y; } diff --git a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c index fc8d3d201d..918588326d 100644 --- a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c +++ b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c @@ -621,7 +621,6 @@ void EnKakasi_TeachingSong(EnKakasi* this, PlayState* play) { this->unkCounter1A4 = 0; CutsceneManager_Stop(this->csIdList[0]); Actor_PlaySfx(&this->picto.actor, NA_SE_EN_YASE_DEAD); - if (this) {} this->unkState196 = 2; this->subCamId = SUB_CAM_ID_DONE; this->picto.actor.textId = 0x1647; diff --git a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c index ff7e4bb082..b0efd61e8c 100644 --- a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c +++ b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c @@ -610,7 +610,7 @@ void EnKanban_Update(Actor* thisx, PlayState* play) { } } - Math_ApproachS(&this->actor.shape.rot.x, this->direction << 0xE, 1, 0x2000); + Math_ApproachS(&this->actor.shape.rot.x, this->direction * 0x4000, 1, 0x2000); } else { this->actor.shape.rot.y += this->spinVel.y; this->actor.shape.rot.x += this->direction * 0x7D0; diff --git a/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c b/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c index cfc3efdc0a..fb7df013fe 100644 --- a/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c +++ b/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c @@ -111,7 +111,7 @@ void func_80A5B160(EnKusa2* this, PlayState* play) { } for (i = 1; i < ARRAY_COUNT(this->unk_194); i++) { - temp_s1 = (i << 0xD) - 0x2000; + temp_s1 = (i * 0x2000) - 0x2000; if (this->unk_194[i] == NULL) { ptr = &this->unk_194[i]; actor = (EnKusa2*)Actor_SpawnAsChildAndCutscene( diff --git a/src/overlays/actors/ovl_En_Mkk/z_en_mkk.c b/src/overlays/actors/ovl_En_Mkk/z_en_mkk.c index 4e9af55786..16e0acbe18 100644 --- a/src/overlays/actors/ovl_En_Mkk/z_en_mkk.c +++ b/src/overlays/actors/ovl_En_Mkk/z_en_mkk.c @@ -433,7 +433,7 @@ void EnMkk_Update(Actor* thisx, PlayState* play) { if (this->collider.base.atFlags & AT_ON) { CollisionCheck_SetAT(play, &play->colChkCtx, &this->collider.base); } - if (this->collider.base.acFlags & AT_ON) { + if (this->collider.base.acFlags & AC_ON) { CollisionCheck_SetAC(play, &play->colChkCtx, &this->collider.base); } CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); diff --git a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c index bf3216fd58..f8673c3072 100644 --- a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c +++ b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c @@ -80,7 +80,7 @@ void EnNutsball_Destroy(Actor* thisx, PlayState* play) { } void EnNutsball_InitColliderParams(EnNutsball* this) { - this->collider.base.atFlags &= ~AT_TYPE_ENEMY & ~AT_BOUNCED & ~AT_HIT; + this->collider.base.atFlags &= ~(AT_HIT | AT_TYPE_ENEMY | AT_BOUNCED); this->collider.base.atFlags |= AT_TYPE_PLAYER; this->collider.info.toucher.dmgFlags = 0x400000; this->collider.info.toucher.damage = 2; diff --git a/src/overlays/actors/ovl_En_Osk/z_en_osk.c b/src/overlays/actors/ovl_En_Osk/z_en_osk.c index 9d42424d9d..9867cb9638 100644 --- a/src/overlays/actors/ovl_En_Osk/z_en_osk.c +++ b/src/overlays/actors/ovl_En_Osk/z_en_osk.c @@ -536,7 +536,7 @@ void EnOsk_Draw(Actor* thisx, PlayState* play) { Matrix_Translate(this->actor.focus.pos.x + sp80.x, this->actor.focus.pos.y + sp80.y, sp80.z = this->actor.focus.pos.z + sp80.z, MTXMODE_NEW); - sp80.z = Math_SinS(play->gameplayFrames << 0xE); + sp80.z = Math_SinS(play->gameplayFrames * 0x4000); sp80.z = ((sp80.z + 1.0f) * 0.1f) + 2.0f; Matrix_Scale(this->actor.scale.x * sp80.z, this->actor.scale.y * sp80.z, this->actor.scale.z * sp80.z, MTXMODE_APPLY); diff --git a/src/overlays/actors/ovl_En_Ot/z_en_ot.c b/src/overlays/actors/ovl_En_Ot/z_en_ot.c index df6d3708fb..137829cf50 100644 --- a/src/overlays/actors/ovl_En_Ot/z_en_ot.c +++ b/src/overlays/actors/ovl_En_Ot/z_en_ot.c @@ -1146,21 +1146,22 @@ void func_80B5E1D8(PlayState* play, EnOtUnkStruct* arg1, s32 arg2) { POLY_OPA_DISP = Gfx_SetupDL66(POLY_OPA_DISP); for (i = 0; i < arg2; i++, arg1++) { - if (arg1->unk_00) { - if (!flag) { - gSPDisplayList(POLY_OPA_DISP++, object_ot_DL_000040); - flag = true; - if (play) {} - } - - Matrix_Translate(arg1->unk_0C.x, arg1->unk_0C.y, arg1->unk_0C.z, MTXMODE_NEW); - Matrix_RotateYS(BINANG_ROT180(Camera_GetCamDirYaw(GET_ACTIVE_CAM(play))), MTXMODE_APPLY); - Matrix_Scale(arg1->unk_04, arg1->unk_04, arg1->unk_04, MTXMODE_APPLY); - - gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(gDropRecoveryHeartTex)); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, object_ot_DL_000078); + if (arg1->unk_00 == 0) { + continue; } + + if (!flag) { + gSPDisplayList(POLY_OPA_DISP++, object_ot_DL_000040); + flag = true; + } + + Matrix_Translate(arg1->unk_0C.x, arg1->unk_0C.y, arg1->unk_0C.z, MTXMODE_NEW); + Matrix_RotateYS(BINANG_ROT180(Camera_GetCamDirYaw(GET_ACTIVE_CAM(play))), MTXMODE_APPLY); + Matrix_Scale(arg1->unk_04, arg1->unk_04, arg1->unk_04, MTXMODE_APPLY); + + gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(gDropRecoveryHeartTex)); + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_OPA_DISP++, object_ot_DL_000078); } CLOSE_DISPS(play->state.gfxCtx); diff --git a/src/overlays/actors/ovl_En_Owl/z_en_owl.c b/src/overlays/actors/ovl_En_Owl/z_en_owl.c index e5b4cabe37..c23fb31485 100644 --- a/src/overlays/actors/ovl_En_Owl/z_en_owl.c +++ b/src/overlays/actors/ovl_En_Owl/z_en_owl.c @@ -169,6 +169,9 @@ void EnOwl_Init(Actor* thisx, PlayState* play) { return; } break; + + default: + break; } this->unk_3DA = 0; @@ -335,6 +338,9 @@ void func_8095AD54(EnOwl* this, PlayState* play) { Message_ContinueTextbox(play, 0x7D3); this->actionFunc = func_8095ABF0; break; + + default: + break; } } } @@ -379,6 +385,9 @@ void func_8095AF2C(EnOwl* this, PlayState* play) { func_8095ACEC(this); this->actionFunc = func_8095ABF0; break; + + default: + break; } } @@ -625,6 +634,9 @@ void func_8095BA84(EnOwl* this, PlayState* play) { func_8019F230(); Message_ContinueTextbox(play, 0xBEF); break; + + default: + break; } break; @@ -633,14 +645,20 @@ void func_8095BA84(EnOwl* this, PlayState* play) { case 0: func_8019F208(); Message_ContinueTextbox(play, 0xBF4); - return; + break; case 1: func_8019F230(); Message_ContinueTextbox(play, 0xBF3); - return; + break; + + default: + break; } break; + + default: + break; } } break; @@ -703,9 +721,15 @@ void func_8095BA84(EnOwl* this, PlayState* play) { this->actionFlags |= 8; func_8095ACEC(this); break; + + default: + break; } } break; + + default: + break; } } @@ -897,168 +921,179 @@ void EnOwl_Update(Actor* thisx, PlayState* play) { Actor_UpdateBgCheckInfo(play, &this->actor, 10.0f, 10.0f, 10.0f, UPDBGCHECKINFO_FLAG_4); Collider_UpdateCylinder(&this->actor, &this->collider); CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base); - if (this->actor.update != NULL) { - if ((this->skelAnime1.animation == &object_owl_Anim_001ADC) && Animation_OnFrame(&this->skelAnime1, 4.0f)) { - Actor_PlaySfx(&this->actor, NA_SE_EN_OWL_FLUTTER); + if (this->actor.update == NULL) { + return; + } + + if ((this->skelAnime1.animation == &object_owl_Anim_001ADC) && Animation_OnFrame(&this->skelAnime1, 4.0f)) { + Actor_PlaySfx(&this->actor, NA_SE_EN_OWL_FLUTTER); + } + + if (this->actionFlags & 2) { + this->eyeTexIndex = 2; + } else { + if (DECR(this->blinkTimer) == 0) { + this->blinkTimer = Rand_S16Offset(60, 60); } - - if (this->actionFlags & 2) { - this->eyeTexIndex = 2; - } else { - if (DECR(this->blinkTimer) == 0) { - this->blinkTimer = Rand_S16Offset(60, 60); - } - this->eyeTexIndex = this->blinkTimer; - if (this->eyeTexIndex >= 3) { - this->eyeTexIndex = 0; - } + this->eyeTexIndex = this->blinkTimer; + if (this->eyeTexIndex >= 3) { + this->eyeTexIndex = 0; } + } - if (!(this->actionFlags & 8)) { - sp36 = 0; + if (!(this->actionFlags & 8)) { + sp36 = 0; - if (this->actionFlags & 0x10) { - switch (this->unk_408) { - case 0: - this->unk_408 = 1; - this->unk_409 = 6; - break; + if (this->actionFlags & 0x10) { + switch (this->unk_408) { + case 0: + this->unk_408 = 1; + this->unk_409 = 6; + break; - case 1: - this->unk_409--; - if (this->unk_409 != 0) { - sp36 = Math_CosS(this->unk_409 * 0x2000) * 0x1000; + case 1: + this->unk_409--; + if (this->unk_409 != 0) { + sp36 = Math_CosS(this->unk_409 * 0x2000) * 0x1000; + } else { + if (this->actionFlags & 2) { + this->unk_3DA = 0; } else { - if (this->actionFlags & 2) { - this->unk_3DA = 0; - } else { - this->unk_3DA = 0x20; - } - - if (this->actionFlags & 0x20) { - this->unk_3DA -= 4; - } else { - this->unk_3DA += 4; - } - this->unk_408++; + this->unk_3DA = 0x20; } if (this->actionFlags & 0x20) { - sp36 = -sp36; - } - break; - - case 2: - if (func_8095C510(this)) { - this->actionFlags &= ~0x10; - this->unk_40A = (s32)Rand_ZeroFloat(20.0f) + 60; - this->unk_408 = 0; - func_8095AB4C(this); - } - break; - } - } else { - if (this->unk_40A > 0) { - this->unk_40A--; - } else { - if (this->unk_408 == 0) { - if (Rand_ZeroOne() < 0.3f) { - this->unk_408 = 4; - this->unk_409 = 12; + this->unk_3DA -= 4; } else { - this->unk_408 = 1; - this->unk_409 = 4; + this->unk_3DA += 4; } - } - this->unk_409--; - - switch (this->unk_408) { - case 1: - sp36 = Math_SinS((-this->unk_409 * 0x1000) + 0x4000) * 5000.0f; - if (this->unk_409 <= 0) { - this->unk_409 = (s32)(Rand_ZeroFloat(15.0f) + 5.0f); - this->unk_408 = 2; - } - break; - - case 2: - sp36 = 0x1388; - if (this->unk_409 <= 0) { - this->unk_408 = 3; - this->unk_409 = 4; - } - break; - - case 3: - sp36 = Math_SinS(this->unk_409 * 0x1000) * 5000.0f; - if (this->unk_409 <= 0) { - this->unk_40A = (s32)Rand_ZeroFloat(20.0f) + 60; - this->unk_408 = 0; - func_8095AB4C(this); - } - break; - - case 4: - sp36 = Math_SinS(this->unk_409 * 0x2000) * 5000.0f; - if (this->unk_409 <= 0) { - this->unk_40A = (s32)Rand_ZeroFloat(20.0f) + 60; - this->unk_408 = 0; - func_8095AB4C(this); - } - break; + this->unk_408++; } if (this->actionFlags & 0x20) { sp36 = -sp36; } - } + break; - if (this->unk_40D > 0) { - this->unk_40D--; - } else { - this->unk_40C--; - switch (this->unk_40B) { - case 0: - this->unk_3DE = (-this->unk_40C * 0x5DC) + 0x1770; - if (this->unk_40C <= 0) { - this->unk_40B = 1; - this->unk_40C = (s8)(Rand_ZeroFloat(15.0f) + 5.0f); - } - break; + case 2: + if (func_8095C510(this)) { + this->actionFlags &= ~0x10; + this->unk_40A = (s32)Rand_ZeroFloat(20.0f) + 60; + this->unk_408 = 0; + func_8095AB4C(this); + } + break; - case 1: - this->unk_3DE = 0x1770; - if (this->unk_40C <= 0) { - this->unk_40B = 2; - this->unk_40C = 4; - } - break; - - case 2: - this->unk_3DE = this->unk_40C * 0x5DC; - if (this->unk_40C <= 0) { - this->unk_40B = 0; - this->unk_40C = 4; - this->unk_40D = (s32)Rand_ZeroFloat(40.0f) + 160; - } - break; + default: + break; + } + } else { + if (this->unk_40A > 0) { + this->unk_40A--; + } else { + if (this->unk_408 == 0) { + if (Rand_ZeroOne() < 0.3f) { + this->unk_408 = 4; + this->unk_409 = 12; + } else { + this->unk_408 = 1; + this->unk_409 = 4; } } + this->unk_409--; + + switch (this->unk_408) { + case 1: + sp36 = Math_SinS((-this->unk_409 * 0x1000) + 0x4000) * 5000.0f; + if (this->unk_409 <= 0) { + this->unk_409 = (s32)(Rand_ZeroFloat(15.0f) + 5.0f); + this->unk_408 = 2; + } + break; + + case 2: + sp36 = 0x1388; + if (this->unk_409 <= 0) { + this->unk_408 = 3; + this->unk_409 = 4; + } + break; + + case 3: + sp36 = Math_SinS(this->unk_409 * 0x1000) * 5000.0f; + if (this->unk_409 <= 0) { + this->unk_40A = (s32)Rand_ZeroFloat(20.0f) + 60; + this->unk_408 = 0; + func_8095AB4C(this); + } + break; + + case 4: + sp36 = Math_SinS(this->unk_409 * 0x2000) * 5000.0f; + if (this->unk_409 <= 0) { + this->unk_40A = (s32)Rand_ZeroFloat(20.0f) + 60; + this->unk_408 = 0; + func_8095AB4C(this); + } + break; + + default: + break; + } + + if (this->actionFlags & 0x20) { + sp36 = -sp36; + } } - if (sp36) {} - this->unk_3DC = (u16)((this->unk_3DA << 2) << 8) + sp36; - this->unk_3D8 = ABS(this->unk_3DC) >> 3; - } else { - this->unk_3DE = 0; - if (this->actionFlags & 2) { - this->unk_3DC = -0x8000; + if (this->unk_40D > 0) { + this->unk_40D--; } else { - this->unk_3DC = 0; - } + this->unk_40C--; + switch (this->unk_40B) { + case 0: + this->unk_3DE = (-this->unk_40C * 0x5DC) + 0x1770; + if (this->unk_40C <= 0) { + this->unk_40B = 1; + this->unk_40C = (s8)(Rand_ZeroFloat(15.0f) + 5.0f); + } + break; - this->unk_3D8 = ABS(this->unk_3DC) >> 3; + case 1: + this->unk_3DE = 0x1770; + if (this->unk_40C <= 0) { + this->unk_40B = 2; + this->unk_40C = 4; + } + break; + + case 2: + this->unk_3DE = this->unk_40C * 0x5DC; + if (this->unk_40C <= 0) { + this->unk_40B = 0; + this->unk_40C = 4; + this->unk_40D = (s32)Rand_ZeroFloat(40.0f) + 160; + } + break; + + default: + break; + } + } } + + if (sp36) {} + this->unk_3DC = (u16)((this->unk_3DA << 2) << 8) + sp36; + this->unk_3D8 = ABS(this->unk_3DC) >> 3; + } else { + this->unk_3DE = 0; + if (this->actionFlags & 2) { + this->unk_3DC = -0x8000; + } else { + this->unk_3DC = 0; + } + + this->unk_3D8 = ABS(this->unk_3DC) >> 3; } } @@ -1117,6 +1152,9 @@ s32 EnOwl_OverrideLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* p rot->y += (s16)(this->unk_3D8 * 1.5f); } break; + + default: + break; } return false; diff --git a/src/overlays/actors/ovl_En_Slime/z_en_slime.c b/src/overlays/actors/ovl_En_Slime/z_en_slime.c index 5e71d1a540..6675f6b45a 100644 --- a/src/overlays/actors/ovl_En_Slime/z_en_slime.c +++ b/src/overlays/actors/ovl_En_Slime/z_en_slime.c @@ -1120,7 +1120,9 @@ void EnSlime_Update(Actor* thisx, PlayState* play) { if (this->collider.base.ocFlags1 & OC1_ON) { Actor_MoveWithGravity(thisx); - Actor_UpdateBgCheckInfo(play, thisx, 20.0f, 35.0f, 40.0f, 0x1D); + Actor_UpdateBgCheckInfo(play, thisx, 20.0f, 35.0f, 40.0f, + UPDBGCHECKINFO_FLAG_1 | UPDBGCHECKINFO_FLAG_4 | UPDBGCHECKINFO_FLAG_8 | + UPDBGCHECKINFO_FLAG_10); } Collider_UpdateCylinder(thisx, &this->collider); diff --git a/src/overlays/actors/ovl_En_Test7/z_en_test7.c b/src/overlays/actors/ovl_En_Test7/z_en_test7.c index 2606331e2c..b6f11c2e24 100644 --- a/src/overlays/actors/ovl_En_Test7/z_en_test7.c +++ b/src/overlays/actors/ovl_En_Test7/z_en_test7.c @@ -364,14 +364,13 @@ void func_80AF14FC(PlayState* play2, EnTest7Struct2* arg1) { } temp_v0 = Matrix_NewMtx(play->state.gfxCtx); - if (temp_v0 != NULL) { - gSPMatrix(POLY_OPA_DISP++, temp_v0, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, gameplay_keep_DL_081628); + if (temp_v0 == NULL) { + continue; } + gSPMatrix(POLY_OPA_DISP++, temp_v0, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(POLY_OPA_DISP++, gameplay_keep_DL_081628); } - if (ptr) {} - Matrix_Pop(); CLOSE_DISPS(play->state.gfxCtx); diff --git a/src/overlays/actors/ovl_En_Wiz/z_en_wiz.c b/src/overlays/actors/ovl_En_Wiz/z_en_wiz.c index 4356745397..208422b2f8 100644 --- a/src/overlays/actors/ovl_En_Wiz/z_en_wiz.c +++ b/src/overlays/actors/ovl_En_Wiz/z_en_wiz.c @@ -1285,8 +1285,8 @@ void EnWiz_UpdateDamage(EnWiz* this, PlayState* play) { //! colliders are effectively disabled, this doesn't cause any problems in the final //! game, but it becomes an issue if the ghost colliders are enabled. this->fightState = EN_WIZ_FIGHT_STATE_SECOND_PHASE_GHOSTS_COPY_WIZROBE; - this->ghostColliders.base.acFlags &= ~BUMP_HIT; - if (this->ghostPos[i].x != .0f || this->ghostPos[i].z != .0f) { + this->ghostColliders.base.acFlags &= ~AC_HIT; + if ((this->ghostPos[i].x != .0f) || (this->ghostPos[i].z != .0f)) { for (j = 0; j < 9; j++) { accel.x = 0.0f; accel.y = 1.0f; diff --git a/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.c b/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.c index e6fc7e7761..12d06e487e 100644 --- a/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.c +++ b/src/overlays/actors/ovl_En_Wiz_Fire/z_en_wiz_fire.c @@ -573,7 +573,7 @@ void EnWizFire_Update(Actor* thisx, PlayState* play2) { DECR(this->steamSpawnTimer); DECR(this->poolTimer); - Actor_UpdateBgCheckInfo(play, &this->actor, 20.0f, 5.0f, 10, + Actor_UpdateBgCheckInfo(play, &this->actor, 20.0f, 5.0f, 10.0f, UPDBGCHECKINFO_FLAG_1 | UPDBGCHECKINFO_FLAG_4 | UPDBGCHECKINFO_FLAG_8 | UPDBGCHECKINFO_FLAG_10); diff --git a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c index bf409e7dd6..1cab193dbe 100644 --- a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c +++ b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c @@ -509,7 +509,7 @@ void ObjSwitch_FloorSwitchUp(ObjSwitch* this, PlayState* play) { if (OBJ_SWITCH_GET_TYPE(&this->dyna.actor) == OBJSWITCH_TYPE_FLOOR_RUSTY) { if (this->colliderTris.base.acFlags & AC_HIT) { - this->colliderTris.base.acFlags &= ~AT_HIT; + this->colliderTris.base.acFlags &= ~AC_HIT; ObjSwitch_TryPlayCutsceneInit(this, play, ObjSwitch_FloorSwitchPushDownInit, true); } else { CollisionCheck_SetAC(play, &play->colChkCtx, &this->colliderTris.base); diff --git a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c index 7de6287503..641d49f492 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c +++ b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c @@ -72,7 +72,7 @@ void OceffWipe2_Draw(Actor* thisx, PlayState* play) { vtxPtr = sEponaSongFrustumVtx; if (this->timer < 32) { - z = Math_SinS(this->timer << 9) * 1220.0f; + z = Math_SinS(this->timer * 0x200) * 1220.0f; } else { z = 1220.0f; }