diff options
4 files changed, 27 insertions, 33 deletions
diff --git a/mm/src/code/z_map_disp.c b/mm/src/code/z_map_disp.c index f373bb1ac..88bd81dd7 100644 --- a/mm/src/code/z_map_disp.c +++ b/mm/src/code/z_map_disp.c @@ -1508,7 +1508,7 @@ void* MapDisp_AllocDungeonMap(PlayState* play, void* heap) { if (!foundTexture) { sPauseDungeonMap.roomSprite[sceneRoomIter] = NULL; } else { - void* dummy = sPauseDungeonMap.mapI_roomTextures[dungeonMapRoomIter]; //! FAKE: + s32 requiredScopeTemp; sPauseDungeonMap.roomSprite[sceneRoomIter] = sPauseDungeonMap.mapI_roomTextures[dungeonMapRoomIter]; } diff --git a/mm/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c b/mm/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c index af9eb2232..72f918d60 100644 --- a/mm/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c +++ b/mm/src/overlays/actors/ovl_Bg_Dblue_Balance/z_bg_dblue_balance.c @@ -567,7 +567,7 @@ void func_80B833A8(BgDblueBalance* this) { } void func_80B833C4(BgDblueBalance* this, PlayState* play) { - s32 pad; + Actor* thisx = &this->dyna.actor; s32 sp28 = false; s16 sp26; s16 sp24; @@ -586,12 +586,9 @@ void func_80B833C4(BgDblueBalance* this, PlayState* play) { this->unk_187 = Math_StepToS(&this->unk_178, 0x1F4, 5); } - sp26 = this->dyna.actor.shape.rot.x; - this->dyna.actor.shape.rot.x += this->unk_178; - sp24 = this->dyna.actor.shape.rot.x; - - //! FAKE: - if (sp24) {} + sp26 = thisx->shape.rot.x; + thisx->shape.rot.x += this->unk_178; + sp24 = thisx->shape.rot.x; if (this->isSwitchFlagSet) { if (this->unk_186 != 0) { @@ -612,7 +609,7 @@ void func_80B833C4(BgDblueBalance* this, PlayState* play) { func_80B8264C(this); if (sp28) { - this->dyna.actor.shape.rot.x = this->unk_184; + thisx->shape.rot.x = this->unk_184; func_80B83344(this); } } diff --git a/mm/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.c b/mm/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.c index 6a5ce8d8f..fd6dafbe6 100644 --- a/mm/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.c +++ b/mm/src/overlays/actors/ovl_Bg_Hakugin_Elvpole/z_bg_hakugin_elvpole.c @@ -56,37 +56,34 @@ void BgHakuginElvpole_Destroy(Actor* thisx, PlayState* play) { } void func_80ABD92C(BgHakuginElvpole* this, PlayState* play) { - s32 pad; + Actor* thisx = &this->dyna.actor; s32 sp28 = false; f32 var_fv1; if (this->unk_15E > 0) { - if ((this->dyna.actor.world.pos.y - this->dyna.actor.home.pos.y) < -120.0f) { - this->dyna.actor.world.pos.y += 4.0f; + if ((thisx->world.pos.y - thisx->home.pos.y) < -120.0f) { + thisx->world.pos.y += 4.0f; sp28 = true; } else if (this->unk_15E > 0) { if (this->unk_15E == 100) { - Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_STONEDOOR_STOP); + Actor_PlaySfx(thisx, NA_SE_EV_STONEDOOR_STOP); } - this->dyna.actor.world.pos.y = this->dyna.actor.home.pos.y - 120.0f; - - //! FAKE: - if (1) {} + thisx->world.pos.y = thisx->home.pos.y - 120.0f; this->unk_15E--; } } else if (this->unk_15E == 0) { - if ((this->dyna.actor.world.pos.y - this->dyna.actor.home.pos.y) > -320.0f) { - this->dyna.actor.world.pos.y -= 4.0f; + if ((thisx->world.pos.y - thisx->home.pos.y) > -320.0f) { + thisx->world.pos.y -= 4.0f; sp28 = true; } else { - this->dyna.actor.world.pos.y = this->dyna.actor.home.pos.y - 320.0f; - Flags_UnsetSwitch(play, BGHAKUGINELVPOLE_GET_SWITCH_FLAG(&this->dyna.actor)); + thisx->world.pos.y = thisx->home.pos.y - 320.0f; + Flags_UnsetSwitch(play, BGHAKUGINELVPOLE_GET_SWITCH_FLAG(thisx)); this->unk_15E = -1; - Actor_PlaySfx(&this->dyna.actor, NA_SE_EV_STONEDOOR_STOP); + Actor_PlaySfx(thisx, NA_SE_EV_STONEDOOR_STOP); } - } else if ((BGHAKUGINELVPOLE_GET_SWITCH_FLAG(&this->dyna.actor) != 0x7F) && - Flags_GetSwitch(play, BGHAKUGINELVPOLE_GET_SWITCH_FLAG(&this->dyna.actor))) { + } else if ((BGHAKUGINELVPOLE_GET_SWITCH_FLAG(thisx) != 0x7F) && + Flags_GetSwitch(play, BGHAKUGINELVPOLE_GET_SWITCH_FLAG(thisx))) { this->unk_15E = 0x64; this->unk_160 = true; } @@ -98,23 +95,23 @@ void func_80ABD92C(BgHakuginElvpole* this, PlayState* play) { var_fv1 = -1.0f; } this->unk_15C++; - this->dyna.actor.world.pos.x = (Math_SinS(this->unk_15C * 0x2000) * var_fv1) + this->dyna.actor.home.pos.x; - this->dyna.actor.world.pos.z = (Math_CosS(this->unk_15C * 0x2000) * var_fv1) + this->dyna.actor.home.pos.z; - Actor_PlaySfx_Flagged(&this->dyna.actor, NA_SE_EV_PLATE_LIFT_LEVEL - SFX_FLAG); + thisx->world.pos.x = (Math_SinS(this->unk_15C * 0x2000) * var_fv1) + thisx->home.pos.x; + thisx->world.pos.z = (Math_CosS(this->unk_15C * 0x2000) * var_fv1) + thisx->home.pos.z; + Actor_PlaySfx_Flagged(thisx, NA_SE_EV_PLATE_LIFT_LEVEL - SFX_FLAG); } else { this->unk_15C = 0; } if (this->unk_160) { - if (this->dyna.actor.csId == CS_ID_NONE) { + if (thisx->csId == CS_ID_NONE) { this->unk_160 = false; return; - } else if (CutsceneManager_IsNext(this->dyna.actor.csId)) { - CutsceneManager_StartWithPlayerCs(this->dyna.actor.csId, &this->dyna.actor); + } else if (CutsceneManager_IsNext(thisx->csId)) { + CutsceneManager_StartWithPlayerCs(thisx->csId, thisx); this->unk_160 = false; return; } - CutsceneManager_Queue(this->dyna.actor.csId); + CutsceneManager_Queue(thisx->csId); } } diff --git a/mm/src/overlays/actors/ovl_En_Firefly/z_en_firefly.h b/mm/src/overlays/actors/ovl_En_Firefly/z_en_firefly.h index 6174c2e87..5433a8b95 100644 --- a/mm/src/overlays/actors/ovl_En_Firefly/z_en_firefly.h +++ b/mm/src/overlays/actors/ovl_En_Firefly/z_en_firefly.h @@ -39,8 +39,8 @@ typedef struct EnFirefly { /* 0x23C */ Vec3s morphTable[FIRE_KEESE_LIMB_MAX]; /* 0x2E4 */ f32 maxAltitude; /* 0x2E8 */ f32 drawDmgEffAlpha; - /* 0x2E8 */ f32 drawDmgEffScale; - /* 0x2E8 */ f32 drawDmgEffFrozenSteamScale; + /* 0x2EC */ f32 drawDmgEffScale; + /* 0x2F0 */ f32 drawDmgEffFrozenSteamScale; /* 0x2F4 */ u32 lastDrawnFrame; /* 0x2F8 */ Vec3f bodyPartsPos[KEESE_BODYPART_MAX]; /* 0x31C */ ColliderSphere collider; |