diff --git a/src/overlays/actors/ovl_En_Tk/z_en_tk.c b/src/overlays/actors/ovl_En_Tk/z_en_tk.c index 0f102ba52d..ffaa51f375 100644 --- a/src/overlays/actors/ovl_En_Tk/z_en_tk.c +++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.c @@ -69,7 +69,7 @@ void EnTkEff_Create(EnTk *this, Vec3f *pos, Vec3f *speed, Vec3f *accel, { eff->size = size; eff->growth = growth; - eff->time_total = eff->time_left = duration; + eff->timeTotal = eff->timeLeft = duration; eff->active = 1; eff->pos = *pos; eff->accel = *accel; @@ -90,8 +90,8 @@ void EnTkEff_Update(EnTk *this) { if (eff->active != 0) { - eff->time_left--; - if (eff->time_left == 0) + eff->timeLeft--; + if (eff->timeLeft == 0) { eff->active = 0; } @@ -125,10 +125,10 @@ void EnTkEff_Draw(EnTk *this, GlobalContext *ctxt) EnTkEff *eff = this->eff; GraphicsContext *gfx; - s16 gfx_setup; + s16 gfxSetup; s16 i; s16 alpha; - s16 image_idx; + s16 imageIdx; Gfx *pgdl[4]; /* @@ -139,7 +139,7 @@ void EnTkEff_Draw(EnTk *this, GlobalContext *ctxt) gfx = ctxt->state.gfxCtx; func_800C6AC4(pgdl, ctxt->state.gfxCtx, "../z_en_tk_eff.c", 114); - gfx_setup = 0; + gfxSetup = 0; /* * Same code is generated without the if, @@ -151,15 +151,15 @@ void EnTkEff_Draw(EnTk *this, GlobalContext *ctxt) { if (eff->active != 0) { - if (gfx_setup == 0) + if (gfxSetup == 0) { gfx->polyXlu.p = func_80093774(gfx->polyXlu.p, 0); gSPDisplayList(gfx->polyXlu.p++, &D_0600BC90); gDPSetEnvColor(gfx->polyXlu.p++, 0x64, 0x3C, 0x14, 0x00); - gfx_setup = 1; + gfxSetup = 1; } - alpha = eff->time_left * (255.f / eff->time_total); + alpha = eff->timeLeft * (255.f / eff->timeTotal); gDPSetPrimColor(gfx->polyXlu.p++, 0, 0, 0xAA, 0x82, 0x5A, alpha); gDPPipeSync(gfx->polyXlu.p++); @@ -171,10 +171,10 @@ void EnTkEff_Draw(EnTk *this, GlobalContext *ctxt) 140), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - image_idx = eff->time_left * - ((f32)ARRAY_COUNT(images) / eff->time_total); + imageIdx = eff->timeLeft * + ((f32)ARRAY_COUNT(images) / eff->timeTotal); gSPSegment(gfx->polyXlu.p++, 0x08, - SEGMENTED_TO_VIRTUAL(images[image_idx])); + SEGMENTED_TO_VIRTUAL(images[imageIdx])); gSPDisplayList(gfx->polyXlu.p++, &D_0600BCA0); } @@ -185,12 +185,12 @@ void EnTkEff_Draw(EnTk *this, GlobalContext *ctxt) } s32 EnTkEff_CreateDflt(EnTk *this, Vec3f *pos, u8 duration, f32 size, - f32 growth, f32 y_accel_max) + f32 growth, f32 yAccelMax) { Vec3f speed = {0.f, 0.f, 0.f}; Vec3f accel = {0.f, 0.3f, 0.f}; - accel.y += Math_Rand_ZeroOne() * y_accel_max; + accel.y += Math_Rand_ZeroOne() * yAccelMax; EnTkEff_Create(this, pos, &speed, &accel, duration, size, growth); @@ -225,11 +225,11 @@ void EnTk_RestAnim(EnTk *this, GlobalContext *ctxt) { UNK_PTR anim = &D_06002F84; - SkelAnime_ChangeAnimation(&this->skel_anim, (u32)anim, 1.f, 0.f, + SkelAnime_ChangeAnimation(&this->skelAnim, (u32)anim, 1.f, 0.f, SkelAnime_GetFrameCount((u32)&D_06002F84), 0, -10.f); - this->action_countdown = Math_Rand_S16Offset(60, 60); + this->actionCountdown = Math_Rand_S16Offset(60, 60); this->actor.speedXZ = 0.f; } @@ -237,45 +237,45 @@ void EnTk_WalkAnim(EnTk *this, GlobalContext *ctxt) { UNK_PTR anim = &D_06001FA8; - SkelAnime_ChangeAnimation(&this->skel_anim, (u32)anim, 1.f, 0.f, + SkelAnime_ChangeAnimation(&this->skelAnim, (u32)anim, 1.f, 0.f, SkelAnime_GetFrameCount((u32)&D_06002F84), 0, -10.f); - this->action_countdown = Math_Rand_S16Offset(240, 240); + this->actionCountdown = Math_Rand_S16Offset(240, 240); } void EnTk_DigAnim(EnTk *this, GlobalContext *ctxt) { UNK_PTR anim = &D_06001144; - SkelAnime_ChangeAnimation(&this->skel_anim, (u32)anim, 1.f, 0.f, + SkelAnime_ChangeAnimation(&this->skelAnim, (u32)anim, 1.f, 0.f, SkelAnime_GetFrameCount((u32)&D_06001144), 0, -10.f); if (EnTk_CheckNextSpot(this, ctxt) >= 0) { - this->valid_dig_here = 1; + this->validDigHere = 1; } } void EnTk_UpdateEyes(EnTk *this) { - if (DECR(this->blink_countdown) == 0) + if (DECR(this->blinkCountdown) == 0) { - this->eye_image_idx++; - if (this->eye_image_idx > 2) + this->eyeImageIdx++; + if (this->eyeImageIdx > 2) { - this->blink_cycles--; - if (this->blink_cycles < 0) + this->blinkCycles--; + if (this->blinkCycles < 0) { - this->blink_countdown = Math_Rand_S16Offset(30, 30); - this->blink_cycles = 2; + this->blinkCountdown = Math_Rand_S16Offset(30, 30); + this->blinkCycles = 2; if (Math_Rand_ZeroOne() > 0.5f) { - this->blink_cycles++; + this->blinkCycles++; } } - this->eye_image_idx = 0; + this->eyeImageIdx = 0; } } } @@ -292,7 +292,7 @@ s32 EnTk_CheckFacingPlayer(EnTk *this) v0 = this->actor.shape.rot.y; v0 -= this->h_21E; - v0 -= this->head_rot; + v0 -= this->headRot; v1 = this->actor.rotTowardsLinkY - v0; if (ABS(v1) < 0x1554) @@ -321,7 +321,7 @@ s32 EnTk_CheckNextSpot(EnTk *this, GlobalContext *ctxt) continue; } - if (prop == this->current_spot) + if (prop == this->currentSpot) { prop = prop->next; continue; @@ -335,7 +335,7 @@ s32 EnTk_CheckNextSpot(EnTk *this, GlobalContext *ctxt) continue; } - this->current_spot = prop; + this->currentSpot = prop; return prop->params; } @@ -347,49 +347,49 @@ void EnTk_CheckCurrentSpot(EnTk *this) f32 dxz; f32 dy; - if (this->current_spot != NULL) + if (this->currentSpot != NULL) { - dy = this->current_spot->posRot.pos.y - this->actor.unk_80; - dxz = func_8002DB8C(&this->actor, this->current_spot); + dy = this->currentSpot->posRot.pos.y - this->actor.unk_80; + dxz = func_8002DB8C(&this->actor, this->currentSpot); if (dxz > 40.f || dy > 10.f) { - this->current_spot = NULL; + this->currentSpot = NULL; } } } f32 EnTk_Step(EnTk *this, GlobalContext *ctxt) { - f32 step_frames[] = {36.f, 10.f}; + f32 stepFrames[] = {36.f, 10.f}; f32 a1_; s32 i; - if (this->skel_anim.animCurrentFrame == 0.f || - this->skel_anim.animCurrentFrame == 25.f) + if (this->skelAnim.animCurrentFrame == 0.f || + this->skelAnim.animCurrentFrame == 25.f) { Audio_PlayActorSound2(&this->actor, NA_SE_EN_MORIBLIN_WALK); } - if (this->skel_anim.animCurrent != (u32)&D_06001FA8) + if (this->skelAnim.animCurrent != (u32)&D_06001FA8) { return 0.f; } - a1_ = this->skel_anim.animCurrentFrame; - for (i = 0; i < ARRAY_COUNT(step_frames); i++) + a1_ = this->skelAnim.animCurrentFrame; + for (i = 0; i < ARRAY_COUNT(stepFrames); i++) { - if (a1_ < step_frames[i] + 12.f && a1_ >= step_frames[i]) + if (a1_ < stepFrames[i] + 12.f && a1_ >= stepFrames[i]) { break; } } - if (i >= ARRAY_COUNT(step_frames)) + if (i >= ARRAY_COUNT(stepFrames)) { return 0.f; } else { - a1_ = (0x8000 / 12.f) * (a1_ - step_frames[i]); + a1_ = (0x8000 / 12.f) * (a1_ - stepFrames[i]); return Math_Sins(a1_) * 2.f; } } @@ -407,8 +407,8 @@ s32 EnTk_Orient(EnTk *this, GlobalContext *ctxt) } path = &ctxt->setupPathList[0]; - point = SEGMENTED_TO_VIRTUAL(path->point_array); - point += this->current_waypoint; + point = SEGMENTED_TO_VIRTUAL(path->pointArray); + point += this->currentWaypoint; dx = point->x - this->actor.posRot.pos.x; dz = point->z - this->actor.posRot.pos.z; @@ -420,10 +420,10 @@ s32 EnTk_Orient(EnTk *this, GlobalContext *ctxt) if (SQ(dx) + SQ(dz) < 10.f) { - this->current_waypoint++; - if (this->current_waypoint >= path->n_points) + this->currentWaypoint++; + if (this->currentWaypoint >= path->nPoints) { - this->current_waypoint = 0; + this->currentWaypoint = 0; } return 0; @@ -570,69 +570,69 @@ s32 EnTk_ChooseReward(EnTk *this) { case 0: { - if (this->reward_count[0] < 8) + if (this->rewardCount[0] < 8) { - this->reward_count[0] += 1; + this->rewardCount[0] += 1; return reward; } break; } case 1: { - if (this->reward_count[1] < 4) + if (this->rewardCount[1] < 4) { - this->reward_count[1] += 1; + this->rewardCount[1] += 1; return reward; } break; } case 2: { - if (this->reward_count[2] < 2) + if (this->rewardCount[2] < 2) { - this->reward_count[2] += 1; + this->rewardCount[2] += 1; return reward; } break; } case 3: { - if (this->reward_count[3] < 1) + if (this->rewardCount[3] < 1) { - this->reward_count[3] += 1; + this->rewardCount[3] += 1; return reward; } break; } } - if (this->reward_count[0] < 8) + if (this->rewardCount[0] < 8) { - this->reward_count[0] += 1; + this->rewardCount[0] += 1; reward = 0; } - else if (this->reward_count[1] < 4) + else if (this->rewardCount[1] < 4) { - this->reward_count[1] += 1; + this->rewardCount[1] += 1; reward = 1; } - else if (this->reward_count[2] < 2) + else if (this->rewardCount[2] < 2) { - this->reward_count[2] += 1; + this->rewardCount[2] += 1; reward = 2; } - else if (this->reward_count[3] < 1) + else if (this->rewardCount[3] < 1) { - this->reward_count[3] += 1; + this->rewardCount[3] += 1; reward = 3; } else { reward = 0; - this->reward_count[0] = 1; - this->reward_count[1] = 0; - this->reward_count[2] = 0; - this->reward_count[3] = 0; + this->rewardCount[0] = 1; + this->rewardCount[1] = 0; + this->rewardCount[2] = 0; + this->rewardCount[3] = 0; } return reward; @@ -644,8 +644,8 @@ void EnTk_DigEff(EnTk *this) Vec3f speed = {0.f, 0.f, 0.f}; Vec3f accel = {0.f, 0.3f, 0.f}; - if (this->skel_anim.animCurrentFrame >= 32.f && - this->skel_anim.animCurrentFrame < 40.f) + if (this->skelAnim.animCurrentFrame >= 32.f && + this->skelAnim.animCurrentFrame < 40.f) { pos.x = (Math_Rand_ZeroOne() - 0.5f) * 12.f + this->v3f_304.x; pos.y = (Math_Rand_ZeroOne() - 0.5f) * 8.f + this->v3f_304.y; @@ -661,9 +661,9 @@ void EnTk_Init(Actor *this, GlobalContext *ctxt) ActorShape_Init(&tk->actor.shape, 0, ActorShadow_DrawFunc_Circle, 24.f); - func_800A46F8(ctxt, &tk->skel_anim, (u32)&D_0600BE40, 0, tk->hz_22A, + func_800A46F8(ctxt, &tk->skelAnim, (u32)&D_0600BE40, 0, tk->hz_22A, tk->hz_296, 18); - SkelAnime_ChangeAnimation(&tk->skel_anim, (u32)anim, 1.f, 0.f, + SkelAnime_ChangeAnimation(&tk->skelAnim, (u32)anim, 1.f, 0.f, SkelAnime_GetFrameCount((u32)&D_06002F84), 0, 0.f); @@ -685,9 +685,9 @@ void EnTk_Init(Actor *this, GlobalContext *ctxt) tk->actor.unk_1F = 6; tk->actor.gravity = -0.1f; - tk->current_reward = -1; - tk->current_spot = NULL; - tk->action_func = EnTk_Rest; + tk->currentReward = -1; + tk->currentSpot = NULL; + tk->actionFunc = EnTk_Rest; } void EnTk_Destroy(Actor *this, GlobalContext *ctxt) @@ -711,7 +711,7 @@ void EnTk_Rest(EnTk *this, GlobalContext *ctxt) { EnTk_DigAnim(this, ctxt); this->h_1E0 = 0; - this->action_func = EnTk_Dig; + this->actionFunc = EnTk_Dig; return; } @@ -725,7 +725,7 @@ void EnTk_Rest(EnTk *this, GlobalContext *ctxt) v1 -= this->h_21E; v1 = this->actor.rotTowardsLinkY - v1; - this->action_countdown = 0; + this->actionCountdown = 0; func_800343CC(ctxt, &this->actor, &this->h_1E0, this->collider.dim.radius + 30.f, func_80B1C54C, func_80B1C5A0); @@ -736,13 +736,13 @@ void EnTk_Rest(EnTk *this, GlobalContext *ctxt) v1 -= this->h_21E; v1 = this->actor.rotTowardsLinkY - v1; - this->action_countdown = 0; + this->actionCountdown = 0; this->h_1E0 = 1; } - else if (DECR(this->action_countdown) == 0) + else if (DECR(this->actionCountdown) == 0) { EnTk_WalkAnim(this, ctxt); - this->action_func = EnTk_Walk; + this->actionFunc = EnTk_Walk; /*! @bug v1 is uninitialized past this branch */ } @@ -752,7 +752,7 @@ void EnTk_Rest(EnTk *this, GlobalContext *ctxt) } a1_ = CLAMP(-v1, 1270, 10730); - Math_SmoothScaleMaxMinS(&this->head_rot, a1_, 6, 1000, 1); + Math_SmoothScaleMaxMinS(&this->headRot, a1_, 6, 1000, 1); } void EnTk_Walk(EnTk *this, GlobalContext *ctxt) @@ -761,29 +761,29 @@ void EnTk_Walk(EnTk *this, GlobalContext *ctxt) { EnTk_DigAnim(this, ctxt); this->h_1E0 = 0; - this->action_func = EnTk_Dig; + this->actionFunc = EnTk_Dig; } else { this->actor.speedXZ = EnTk_Step(this, ctxt); EnTk_Orient(this, ctxt); - Math_SmoothScaleMaxMinS(&this->head_rot, 0, 6, 1000, 1); + Math_SmoothScaleMaxMinS(&this->headRot, 0, 6, 1000, 1); EnTk_CheckCurrentSpot(this); - DECR(this->action_countdown); - if (EnTk_CheckFacingPlayer(this) != 0 || this->action_countdown == 0) + DECR(this->actionCountdown); + if (EnTk_CheckFacingPlayer(this) != 0 || this->actionCountdown == 0) { EnTk_RestAnim(this, ctxt); - this->action_func = EnTk_Rest; + this->actionFunc = EnTk_Rest; } } } void EnTk_Dig(EnTk *this, GlobalContext *ctxt) { - Vec3f reward_origin; - Vec3f reward_pos; - s32 reward_params[] = + Vec3f rewardOrigin; + Vec3f rewardPos; + s32 rewardParams[] = { 0x0000, /* Green rupee */ 0x0001, /* Blue rupee */ @@ -794,28 +794,28 @@ void EnTk_Dig(EnTk *this, GlobalContext *ctxt) EnTk_DigEff(this); - if (this->skel_anim.animCurrentFrame == 32.f) + if (this->skelAnim.animCurrentFrame == 32.f) { /* What's gonna come out? */ Audio_PlayActorSound2(&this->actor, NA_SE_EV_DIG_UP); - this->reward_timer = 0; + this->rewardTimer = 0; - if (this->valid_dig_here == 1) + if (this->validDigHere == 1) { - reward_origin.x = 0.f; - reward_origin.y = 0.f; - reward_origin.z = -40.f; + rewardOrigin.x = 0.f; + rewardOrigin.y = 0.f; + rewardOrigin.z = -40.f; Matrix_RotateY(this->actor.shape.rot.y, 0); - Matrix_MultVec3f(&reward_origin, &reward_pos); + Matrix_MultVec3f(&rewardOrigin, &rewardPos); - reward_pos.x += this->actor.posRot.pos.x; - reward_pos.y += this->actor.posRot.pos.y; - reward_pos.z += this->actor.posRot.pos.z; + rewardPos.x += this->actor.posRot.pos.x; + rewardPos.y += this->actor.posRot.pos.y; + rewardPos.z += this->actor.posRot.pos.z; - this->current_reward = EnTk_ChooseReward(this); - if (this->current_reward == 3) + this->currentReward = EnTk_ChooseReward(this); + if (this->currentReward == 3) { /* * Upgrade the purple rupee reward to the heart piece if this @@ -824,24 +824,24 @@ void EnTk_Dig(EnTk *this, GlobalContext *ctxt) if ((gSaveContext.item_get_inf[1] & 0x1000) == 0) { gSaveContext.item_get_inf[1] |= 0x1000; - this->current_reward = 4; + this->currentReward = 4; } } - Item_DropCollectible(ctxt, &reward_pos, - reward_params[this->current_reward]); + Item_DropCollectible(ctxt, &rewardPos, + rewardParams[this->currentReward]); } } - if (this->skel_anim.animCurrentFrame >= 32.f && this->reward_timer == 10) + if (this->skelAnim.animCurrentFrame >= 32.f && this->rewardTimer == 10) { /* Play a reward sound shortly after digging */ - if (this->valid_dig_here == 0) + if (this->validDigHere == 0) { /* Bad dig spot */ Audio_PlayActorSound2(&this->actor, NA_SE_SY_ERROR); } - else if (this->current_reward == 4) + else if (this->currentReward == 4) { /* Heart piece */ Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &D_801333D4, 4, @@ -853,11 +853,11 @@ void EnTk_Dig(EnTk *this, GlobalContext *ctxt) Audio_PlayActorSound2(&this->actor, NA_SE_SY_TRE_BOX_APPEAR); } } - this->reward_timer++; + this->rewardTimer++; - if (func_800A56C8(&this->skel_anim, this->skel_anim.animFrameCount) != 0) + if (func_800A56C8(&this->skelAnim, this->skelAnim.animFrameCount) != 0) { - if (this->current_reward < 0) + if (this->currentReward < 0) { /* "Nope, nothing here!" */ func_8010B680(ctxt, 0x501A, 0); @@ -869,9 +869,9 @@ void EnTk_Dig(EnTk *this, GlobalContext *ctxt) EnTk_RestAnim(this, ctxt); - this->current_reward = -1; - this->valid_dig_here = 0; - this->action_func = EnTk_Rest; + this->currentReward = -1; + this->validDigHere = 0; + this->actionFunc = EnTk_Rest; } } @@ -883,13 +883,13 @@ void EnTk_Update(Actor *this, GlobalContext *ctxt) ActorCollider_Cylinder_Update(&tk->actor, collider); Actor_CollisionCheck_SetOT(ctxt, &ctxt->sub_11E60, collider); - SkelAnime_FrameUpdateMatrix(&tk->skel_anim); + SkelAnime_FrameUpdateMatrix(&tk->skelAnim); Actor_MoveForward(&tk->actor); func_8002E4B4(ctxt, &tk->actor, 40.f, 10.f, 0.f, 5); - tk->action_func(tk, ctxt); + tk->actionFunc(tk, ctxt); EnTkEff_Update(tk); @@ -926,7 +926,7 @@ s32 func_80B1D278(s16 a0, UNK_TYPE a1, UNK_TYPE a2, UNK_TYPE a3, Vec3s *sp10, case 16: { tk->h_21E += sp10->y; - sp10->y += tk->head_rot; + sp10->y += tk->headRot; break; } } @@ -957,7 +957,7 @@ void func_80B1D2E4(GlobalContext *ctxt, UNK_TYPE a1, UNK_TYPE a2, UNK_TYPE a3, void EnTk_Draw(Actor *this, GlobalContext *ctxt) { - static u32 eye_images[] = + static u32 eyeImages[] = { (u32)&D_06003B40, (u32)&D_06004340, @@ -978,10 +978,10 @@ void EnTk_Draw(Actor *this, GlobalContext *ctxt) func_80093D18(ctxt->state.gfxCtx); gSPSegment(gfx->polyOpa.p++, 0x08, - SEGMENTED_TO_VIRTUAL(eye_images[tk->eye_image_idx])); + SEGMENTED_TO_VIRTUAL(eyeImages[tk->eyeImageIdx])); - func_800A1AC8(ctxt, tk->skel_anim.limbIndex, - tk->skel_anim.actorDrawTbl, tk->skel_anim.dListCount, + func_800A1AC8(ctxt, tk->skelAnim.limbIndex, + tk->skelAnim.actorDrawTbl, tk->skelAnim.dListCount, func_80B1D278, func_80B1D2E4, &tk->actor); func_800C6B54(pgdl, ctxt->state.gfxCtx, "../z_en_tk.c", 1312); diff --git a/src/overlays/actors/ovl_En_Tk/z_en_tk.h b/src/overlays/actors/ovl_En_Tk/z_en_tk.h index 52a1f357b5..f35741d3f4 100644 --- a/src/overlays/actors/ovl_En_Tk/z_en_tk.h +++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.h @@ -8,8 +8,8 @@ typedef struct { /* 0x0000 */ u8 active; - /* 0x0001 */ u8 time_left; - /* 0x0002 */ u8 time_total; + /* 0x0001 */ u8 timeLeft; + /* 0x0002 */ u8 timeTotal; /* 0x0004 */ f32 size; /* 0x0008 */ f32 growth; /* 0x000C */ char unk_C[0x8]; @@ -26,25 +26,25 @@ typedef void EnTkFunc(EnTk *this, GlobalContext *ctxt); struct EnTk { /* 0x0000 */ Actor actor; - /* 0x014C */ SkelAnime skel_anim; - /* 0x0190 */ EnTkFunc *action_func; + /* 0x014C */ SkelAnime skelAnim; + /* 0x0190 */ EnTkFunc *actionFunc; /* 0x0194 */ ColliderCylinderMain collider; /* 0x01E0 */ s16 h_1E0; /* 0x01E2 */ char unk_1E2[0x26]; - /* 0x0208 */ u8 valid_dig_here; - /* 0x0209 */ u8 reward_count[4]; - /* 0x0210 */ Actor *current_spot; - /* 0x0214 */ s32 current_reward; - /* 0x0218 */ s16 blink_cycles; - /* 0x021A */ s16 reward_timer; - /* 0x021C */ s16 action_countdown; + /* 0x0208 */ u8 validDigHere; + /* 0x0209 */ u8 rewardCount[4]; + /* 0x0210 */ Actor *currentSpot; + /* 0x0214 */ s32 currentReward; + /* 0x0218 */ s16 blinkCycles; + /* 0x021A */ s16 rewardTimer; + /* 0x021C */ s16 actionCountdown; /* 0x021E */ s16 h_21E; /* 0x0220 */ char unk_220[0x2]; - /* 0x0222 */ s16 eye_image_idx; - /* 0x0224 */ s16 blink_countdown; - /* 0x0226 */ s16 head_rot; - /* 0x0228 */ s16 current_waypoint; + /* 0x0222 */ s16 eyeImageIdx; + /* 0x0224 */ s16 blinkCountdown; + /* 0x0226 */ s16 headRot; + /* 0x0228 */ s16 currentWaypoint; /* 0x022A */ u16 hz_22A[54]; /* 0x022A */ u16 hz_296[55]; /* 0x0304 */ Vec3f v3f_304;