diff --git a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c index 0544489fd1..5dc2bfed13 100644 --- a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c +++ b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c @@ -237,16 +237,16 @@ void func_809C4BC4(EnBomBowlMan* this, PlayState* play) { code = gSaveContext.save.saveInfo.bomberCode[i]; if (code == 1) { Math_Vec3f_Copy(&this->actor.world.pos, &D_809C61A0[i]); - this->unk_2D8[code] = this; + this->unk_2DC[code - 1] = this; } else { Math_Vec3f_Copy(&sp7C, &D_809C61A0[i]); bomBowlMan = (EnBomBowlMan*)Actor_SpawnAsChild(&play->actorCtx, &this->actor, play, ACTOR_EN_BOM_BOWL_MAN, sp7C.x, sp7C.y, sp7C.z, 0, this->actor.world.rot.y, 0, code); if (bomBowlMan != NULL) { if (i == 2) { - this->unk_2D8[0] = bomBowlMan; + this->unk_2D8 = bomBowlMan; } - this->unk_2D8[code] = bomBowlMan; + this->unk_2DC[code - 1] = bomBowlMan; } } } @@ -308,7 +308,7 @@ void func_809C4DA4(EnBomBowlMan* this, PlayState* play) { this->unk_2C0 = 1; D_809C6104 = 1; Camera_SetTargetActor(Play_GetCamera(play, CutsceneManager_GetCurrentSubCamId(this->csId1)), - &this->unk_2D8[0]->actor); + &this->unk_2D8->actor); this->unk_2D4 = 0; this->unk_2BC = 10; EnBomBowlMan_ChangeAnim(this, ENBOMBOWLMAN_ANIM_17, 1.0f); @@ -642,7 +642,7 @@ void func_809C5BF4(EnBomBowlMan* this, PlayState* play) { Player* player = GET_PLAYER(play); Message_CloseTextbox(play); - Camera_SetTargetActor(subCam, &this->unk_2D8[0]->actor); + Camera_SetTargetActor(subCam, &this->unk_2D8->actor); EnBomBowlMan_ChangeAnim(this, ENBOMBOWLMAN_ANIM_13, 1.0f); D_809C6100 = 0; if (player->transformation == PLAYER_FORM_HUMAN) { @@ -657,7 +657,7 @@ void func_809C5BF4(EnBomBowlMan* this, PlayState* play) { } else { s32 idx = D_809C6100 - 1; - Camera_SetTargetActor(subCam, &this->unk_2D8[1 + idx]->actor); + Camera_SetTargetActor(subCam, &this->unk_2DC[idx]->actor); } } } diff --git a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.h b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.h index b6b7490766..76f4d191e6 100644 --- a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.h +++ b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.h @@ -49,8 +49,8 @@ typedef struct EnBomBowlMan { /* 0x2D2 */ s16 csId2; /* 0x2D4 */ s16 unk_2D4; /* 0x2D6 */ s16 csId3; - /* 0x2D8 */ struct EnBomBowlMan* unk_2D8[5]; - /* 0x2EC */ UNK_TYPE1 unk2EC[0x4]; + /* 0x2D8 */ struct EnBomBowlMan* unk_2D8; + /* 0x2DC */ struct EnBomBowlMan* unk_2DC[5]; /* 0x2F0 */ s16 unk_2F0; /* 0x2F2 */ s16 unk_2F2; /* 0x2F4 */ s16 unk_2F4;