mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-02 07:46:01 +00:00
Code Issues Projects Releases Wiki Activity

remove generally unrelated changes

Browse source
This commit is contained in:
feacur 2024-11-07 02:01:08 +01:00
parent 1fcacd202e
commit 51cddce871
14 changed files with 39 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/overlays/actors/ovl_En_Go/z_en_go.c
View file

@ -1033,7 +1033,7 @@ void EnGo_Update(Actor* thisx, PlayState* play) {
if (this->actionFunc == EnGo_BiggoronActionFunc || this->actionFunc == EnGo_FireGenericActionFunc || if (this->actionFunc == EnGo_BiggoronActionFunc || this->actionFunc == EnGo_FireGenericActionFunc ||
this->actionFunc == func_80A40B1C) { this->actionFunc == func_80A40B1C) {
Actor_UpdateFidgetTables(play, this->fidgetTableY, this->fidgetTableZ, GORON_LIMB_MAX); Actor_UpdateFidgetTables(play, this->fidgetTableY, this->fidgetTableZ, 18);
} }
EnGo_UpdateShadow(this); EnGo_UpdateShadow(this);

6
src/overlays/actors/ovl_En_Go/z_en_go.h
View file

@ -24,8 +24,6 @@ typedef s16 (*callback2_80A3ED24)(PlayState*, struct EnGo*);
#define EN_GO_EFFECT_COUNT 20 #define EN_GO_EFFECT_COUNT 20
#define GORON_LIMB_MAX 18
typedef struct EnGoEffect { typedef struct EnGoEffect {
/* 0x0000 */ u8 type; /* 0x0000 */ u8 type;
/* 0x0001 */ u8 timer; /* 0x0001 */ u8 timer;
@ -56,8 +54,8 @@ typedef struct EnGo {
/* 0x021A */ s16 unk_21A; /* 0x021A */ s16 unk_21A;
/* 0x021C */ s16 unk_21C; /* 0x021C */ s16 unk_21C;
/* 0x021E */ s16 unk_21E; /* 0x021E */ s16 unk_21E;
/* 0x0220 */ s16 fidgetTableY[GORON_LIMB_MAX]; /* 0x0220 */ s16 fidgetTableY[18];
/* 0x0244 */ s16 fidgetTableZ[GORON_LIMB_MAX]; /* 0x0244 */ s16 fidgetTableZ[18];
/* 0x0268 */ EnGoEffect effects[EN_GO_EFFECT_COUNT]; /* 0x0268 */ EnGoEffect effects[EN_GO_EFFECT_COUNT];
} EnGo; // size = 0x06C8 } EnGo; // size = 0x06C8

2
src/overlays/actors/ovl_En_Go2/z_en_go2.c
View file

@ -1995,7 +1995,7 @@ void EnGo2_Update(Actor* thisx, PlayState* play) {
#endif #endif
this->actionFunc(this, play); this->actionFunc(this, play);
if (this->unk_211 == true) { if (this->unk_211 == true) {
Actor_UpdateFidgetTables(play, this->fidgetTableY, this->fidgetTableZ, GORON2_LIMB_MAX); Actor_UpdateFidgetTables(play, this->fidgetTableY, this->fidgetTableZ, 18);
} }
func_80A45288(this, play); func_80A45288(this, play);
EnGo2_EyeMouthTexState(this); EnGo2_EyeMouthTexState(this);

10
src/overlays/actors/ovl_En_Go2/z_en_go2.h
View file

@ -67,8 +67,6 @@ typedef struct EnGo2DustEffectData {
#define EN_GO2_EFFECT_COUNT 10 #define EN_GO2_EFFECT_COUNT 10
#define GORON2_LIMB_MAX 18
typedef struct EnGo2 { typedef struct EnGo2 {
/* 0x0000 */ Actor actor; /* 0x0000 */ Actor actor;
/* 0x014C */ SkelAnime skelAnime; /* 0x014C */ SkelAnime skelAnime;
@ -94,14 +92,14 @@ typedef struct EnGo2 {
/* 0x021C */ char unk_21C[0x04]; /* 0x021C */ char unk_21C[0x04];
/* 0x0220 */ f32 alpha; // Set to 0, used by func_80A45360, smoothed to this->actor.shape.shadowAlpha from either 0 or 255.0f /* 0x0220 */ f32 alpha; // Set to 0, used by func_80A45360, smoothed to this->actor.shape.shadowAlpha from either 0 or 255.0f
/* 0x0224 */ s16 blinkTimer; /* 0x0224 */ s16 blinkTimer;
/* 0x0226 */ s16 fidgetTableY[GORON2_LIMB_MAX]; /* 0x0226 */ s16 fidgetTableY[18];
/* 0x024A */ s16 fidgetTableZ[GORON2_LIMB_MAX]; /* 0x024A */ s16 fidgetTableZ[18];
/* 0x026E */ u16 trackingMode; /* 0x026E */ u16 trackingMode;
/* 0x0270 */ EnGoEffect effects[EN_GO2_EFFECT_COUNT]; /* 0x0270 */ EnGoEffect effects[EN_GO2_EFFECT_COUNT];
/* 0x04A0 */ Vec3f subCamEye; /* 0x04A0 */ Vec3f subCamEye;
/* 0x04AC */ Vec3f subCamAt; /* 0x04AC */ Vec3f subCamAt;
/* 0x04B8 */ Vec3s jointTable[GORON2_LIMB_MAX]; /* 0x04B8 */ Vec3s jointTable[18];
/* 0x0524 */ Vec3s morphTable[GORON2_LIMB_MAX]; /* 0x0524 */ Vec3s morphTable[18];
/* 0x0590 */ s16 unk_590; // timer /* 0x0590 */ s16 unk_590; // timer
/* 0x0592 */ s16 animTimer; // animTimer. Plays NA_SE_EN_MORIBLIN_WALK, NA_SE_EV_IRON_DOOR_OPEN, NA_SE_EV_IRON_DOOR_CLOSE /* 0x0592 */ s16 animTimer; // animTimer. Plays NA_SE_EN_MORIBLIN_WALK, NA_SE_EV_IRON_DOOR_OPEN, NA_SE_EV_IRON_DOOR_CLOSE
/* 0x0594 */ s32 getItemId; /* 0x0594 */ s32 getItemId;

2
src/overlays/actors/ovl_En_Guest/z_en_guest.c
View file

@ -157,7 +157,7 @@ void func_80A505CC(Actor* thisx, PlayState* play) {
} }
Npc_TrackPoint(&this->actor, &this->interactInfo, 6, NPC_TRACKING_HEAD_AND_TORSO); Npc_TrackPoint(&this->actor, &this->interactInfo, 6, NPC_TRACKING_HEAD_AND_TORSO);
Actor_UpdateFidgetTables(play, this->fidgetTableY, this->fidgetTableZ, GUEST_LIMB_MAX); Actor_UpdateFidgetTables(play, this->fidgetTableY, this->fidgetTableZ, 16);
gSegments[6] = VIRTUAL_TO_PHYSICAL(play->objectCtx.slots[this->osAnimeObjectSlot].segment); gSegments[6] = VIRTUAL_TO_PHYSICAL(play->objectCtx.slots[this->osAnimeObjectSlot].segment);

10
src/overlays/actors/ovl_En_Guest/z_en_guest.h
View file

@ -8,20 +8,18 @@ struct EnGuest;
typedef void (*EnGuestActionFunc)(struct EnGuest* this, PlayState* play); typedef void (*EnGuestActionFunc)(struct EnGuest* this, PlayState* play);
#define GUEST_LIMB_MAX 16
typedef struct EnGuest { typedef struct EnGuest {
/* 0x0000 */ Actor actor; /* 0x0000 */ Actor actor;
/* 0x014C */ SkelAnime skelAnime; /* 0x014C */ SkelAnime skelAnime;
/* 0x0190 */ Vec3s jointTable[GUEST_LIMB_MAX]; /* 0x0190 */ Vec3s jointTable[16];
/* 0x01F0 */ Vec3s morphTable[GUEST_LIMB_MAX]; /* 0x01F0 */ Vec3s morphTable[16];
/* 0x0250 */ EnGuestActionFunc actionFunc; /* 0x0250 */ EnGuestActionFunc actionFunc;
/* 0x0254 */ ColliderCylinder collider; /* 0x0254 */ ColliderCylinder collider;
/* 0x02A0 */ NpcInteractInfo interactInfo; /* 0x02A0 */ NpcInteractInfo interactInfo;
/* 0x02C8 */ s16 unk_2C8; /* 0x02C8 */ s16 unk_2C8;
/* 0x02CA */ s16 unk_2CA; /* 0x02CA */ s16 unk_2CA;
/* 0x02CC */ s16 fidgetTableY[GUEST_LIMB_MAX]; /* 0x02CC */ s16 fidgetTableY[16];
/* 0x02EC */ s16 fidgetTableZ[GUEST_LIMB_MAX]; /* 0x02EC */ s16 fidgetTableZ[16];
/* 0x030C */ s8 osAnimeObjectSlot; /* 0x030C */ s8 osAnimeObjectSlot;
/* 0x030D */ u8 unk_30D; /* 0x030D */ u8 unk_30D;
/* 0x030E */ u8 unk_30E; /* 0x030E */ u8 unk_30E;

14
src/overlays/actors/ovl_En_Ko/z_en_ko.c
View file

@ -709,7 +709,7 @@ s32 func_80A97D68(EnKo* this, PlayState* play) {
s32 func_80A97E18(EnKo* this, PlayState* play) { s32 func_80A97E18(EnKo* this, PlayState* play) {
s16 trackingMode; s16 trackingMode;
Actor_UpdateFidgetTables(play, this->fidgetTableY, this->fidgetTableZ, KOKIRI_LIMB_MAX); Actor_UpdateFidgetTables(play, this->fidgetTableY, this->fidgetTableZ, 16);
if (EnKo_IsWithinTalkAngle(this) == true) { if (EnKo_IsWithinTalkAngle(this) == true) {
trackingMode = NPC_TRACKING_HEAD_AND_TORSO; trackingMode = NPC_TRACKING_HEAD_AND_TORSO;
} else { } else {
@ -728,7 +728,7 @@ s32 func_80A97EB0(EnKo* this, PlayState* play) {
s16 trackingMode; s16 trackingMode;
s32 result; s32 result;
Actor_UpdateFidgetTables(play, this->fidgetTableY, this->fidgetTableZ, KOKIRI_LIMB_MAX); Actor_UpdateFidgetTables(play, this->fidgetTableY, this->fidgetTableZ, 16);
result = EnKo_IsWithinTalkAngle(this); result = EnKo_IsWithinTalkAngle(this);
trackingMode = (result == true) ? NPC_TRACKING_HEAD_AND_TORSO : NPC_TRACKING_NONE; trackingMode = (result == true) ? NPC_TRACKING_HEAD_AND_TORSO : NPC_TRACKING_NONE;
Npc_TrackPoint(&this->actor, &this->interactInfo, 2, trackingMode); Npc_TrackPoint(&this->actor, &this->interactInfo, 2, trackingMode);
@ -736,7 +736,7 @@ s32 func_80A97EB0(EnKo* this, PlayState* play) {
} }
s32 func_80A97F20(EnKo* this, PlayState* play) { s32 func_80A97F20(EnKo* this, PlayState* play) {
Actor_UpdateFidgetTables(play, this->fidgetTableY, this->fidgetTableZ, KOKIRI_LIMB_MAX); Actor_UpdateFidgetTables(play, this->fidgetTableY, this->fidgetTableZ, 16);
Npc_TrackPoint(&this->actor, &this->interactInfo, 2, NPC_TRACKING_FULL_BODY); Npc_TrackPoint(&this->actor, &this->interactInfo, 2, NPC_TRACKING_FULL_BODY);
return 1; return 1;
} }
@ -748,7 +748,7 @@ s32 func_80A97F70(EnKo* this, PlayState* play) {
if ((this->skelAnime.animation == &gKokiriBlockingAnim) == false) { if ((this->skelAnime.animation == &gKokiriBlockingAnim) == false) {
Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENKO_ANIM_BLOCKING_STATIC); Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENKO_ANIM_BLOCKING_STATIC);
} }
Actor_UpdateFidgetTables(play, this->fidgetTableY, this->fidgetTableZ, KOKIRI_LIMB_MAX); Actor_UpdateFidgetTables(play, this->fidgetTableY, this->fidgetTableZ, 16);
trackingMode = NPC_TRACKING_HEAD_AND_TORSO; trackingMode = NPC_TRACKING_HEAD_AND_TORSO;
} else { } else {
if ((this->skelAnime.animation == &gKokiriCuttingGrassAnim) == false) { if ((this->skelAnime.animation == &gKokiriCuttingGrassAnim) == false) {
@ -768,7 +768,7 @@ s32 func_80A98034(EnKo* this, PlayState* play) {
if ((this->skelAnime.animation == &gKokiriBlockingAnim) == false) { if ((this->skelAnime.animation == &gKokiriBlockingAnim) == false) {
Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENKO_ANIM_BLOCKING_STATIC); Animation_ChangeByInfo(&this->skelAnime, sAnimationInfo, ENKO_ANIM_BLOCKING_STATIC);
} }
Actor_UpdateFidgetTables(play, this->fidgetTableY, this->fidgetTableZ, KOKIRI_LIMB_MAX); Actor_UpdateFidgetTables(play, this->fidgetTableY, this->fidgetTableZ, 16);
result = EnKo_IsWithinTalkAngle(this); result = EnKo_IsWithinTalkAngle(this);
trackingMode = (result == true) ? NPC_TRACKING_HEAD_AND_TORSO : NPC_TRACKING_NONE; trackingMode = (result == true) ? NPC_TRACKING_HEAD_AND_TORSO : NPC_TRACKING_NONE;
} else { } else {
@ -784,7 +784,7 @@ s32 func_80A98034(EnKo* this, PlayState* play) {
// Same as func_80A97F20 // Same as func_80A97F20
s32 func_80A98124(EnKo* this, PlayState* play) { s32 func_80A98124(EnKo* this, PlayState* play) {
Actor_UpdateFidgetTables(play, this->fidgetTableY, this->fidgetTableZ, KOKIRI_LIMB_MAX); Actor_UpdateFidgetTables(play, this->fidgetTableY, this->fidgetTableZ, 16);
Npc_TrackPoint(&this->actor, &this->interactInfo, 2, NPC_TRACKING_FULL_BODY); Npc_TrackPoint(&this->actor, &this->interactInfo, 2, NPC_TRACKING_FULL_BODY);
return 1; return 1;
} }
@ -798,7 +798,7 @@ s32 func_80A98174(EnKo* this, PlayState* play) {
this->skelAnime.playSpeed = 1.0f; this->skelAnime.playSpeed = 1.0f;
} }
if (this->skelAnime.playSpeed == 0.0f) { if (this->skelAnime.playSpeed == 0.0f) {
Actor_UpdateFidgetTables(play, this->fidgetTableY, this->fidgetTableZ, KOKIRI_LIMB_MAX); Actor_UpdateFidgetTables(play, this->fidgetTableY, this->fidgetTableZ, 16);
} }
Npc_TrackPoint(&this->actor, &this->interactInfo, 2, Npc_TrackPoint(&this->actor, &this->interactInfo, 2,
(this->skelAnime.playSpeed == 0.0f) ? NPC_TRACKING_HEAD_AND_TORSO : NPC_TRACKING_NONE); (this->skelAnime.playSpeed == 0.0f) ? NPC_TRACKING_HEAD_AND_TORSO : NPC_TRACKING_NONE);

10
src/overlays/actors/ovl_En_Ko/z_en_ko.h
View file

@ -8,8 +8,6 @@ struct EnKo;
typedef void (*EnKoActionFunc)(struct EnKo*, PlayState*); typedef void (*EnKoActionFunc)(struct EnKo*, PlayState*);
#define KOKIRI_LIMB_MAX 16
typedef struct EnKo { typedef struct EnKo {
/* 0x0000 */ Actor actor; /* 0x0000 */ Actor actor;
/* 0x014C */ SkelAnime skelAnime; /* 0x014C */ SkelAnime skelAnime;
@ -28,10 +26,10 @@ typedef struct EnKo {
/* 0x0218 */ f32 appearDist; /* 0x0218 */ f32 appearDist;
/* 0x021C */ f32 lookDist; // distance to start looking at player /* 0x021C */ f32 lookDist; // distance to start looking at player
/* 0x0220 */ f32 modelAlpha; /* 0x0220 */ f32 modelAlpha;
/* 0x0224 */ Vec3s jointTable[KOKIRI_LIMB_MAX]; /* 0x0224 */ Vec3s jointTable[16];
/* 0x0284 */ Vec3s morphTable[KOKIRI_LIMB_MAX]; /* 0x0284 */ Vec3s morphTable[16];
/* 0x02E4 */ s16 fidgetTableY[KOKIRI_LIMB_MAX]; /* 0x02E4 */ s16 fidgetTableY[16];
/* 0x0304 */ s16 fidgetTableZ[KOKIRI_LIMB_MAX]; /* 0x0304 */ s16 fidgetTableZ[16];
} EnKo; // size = 0x0324 } EnKo; // size = 0x0324
typedef enum KokiriChildren { typedef enum KokiriChildren {

4
src/overlays/actors/ovl_En_Kz/z_en_kz.c
View file

@ -416,7 +416,7 @@ void EnKz_PreMweepWait(EnKz* this, PlayState* play) {
this->interactInfo.talkState = NPC_TALK_STATE_IDLE; this->interactInfo.talkState = NPC_TALK_STATE_IDLE;
this->actionFunc = EnKz_SetupMweep; this->actionFunc = EnKz_SetupMweep;
} else { } else {
Actor_UpdateFidgetTables(play, this->fidgetTableY, this->fidgetTableZ, KINGZORA_LIMB_MAX); Actor_UpdateFidgetTables(play, this->fidgetTableY, this->fidgetTableZ, 12);
} }
} }
@ -479,7 +479,7 @@ void EnKz_Wait(EnKz* this, PlayState* play) {
this->actionFunc = EnKz_SetupGetItem; this->actionFunc = EnKz_SetupGetItem;
EnKz_SetupGetItem(this, play); EnKz_SetupGetItem(this, play);
} else { } else {
Actor_UpdateFidgetTables(play, this->fidgetTableY, this->fidgetTableZ, KINGZORA_LIMB_MAX); Actor_UpdateFidgetTables(play, this->fidgetTableY, this->fidgetTableZ, 12);
} }
} }

10
src/overlays/actors/ovl_En_Kz/z_en_kz.h
View file

@ -8,8 +8,6 @@ struct EnKz;
typedef void (*EnKzActionFunc)(struct EnKz*, PlayState*); typedef void (*EnKzActionFunc)(struct EnKz*, PlayState*);
#define KINGZORA_LIMB_MAX 12
typedef struct EnKz { typedef struct EnKz {
/* 0x0000 */ Actor actor; /* 0x0000 */ Actor actor;
/* 0x014C */ SkelAnime skelanime; /* 0x014C */ SkelAnime skelanime;
@ -24,10 +22,10 @@ typedef struct EnKz {
/* 0x0210 */ s16 eyeIdx; /* 0x0210 */ s16 eyeIdx;
/* 0x0212 */ s16 subCamId; /* 0x0212 */ s16 subCamId;
/* 0x0214 */ s16 returnToCamId; /* 0x0214 */ s16 returnToCamId;
/* 0x0216 */ Vec3s jointTable[KINGZORA_LIMB_MAX]; /* 0x0216 */ Vec3s jointTable[12];
/* 0x025E */ Vec3s morphTable[KINGZORA_LIMB_MAX]; /* 0x025E */ Vec3s morphTable[12];
/* 0x02A6 */ s16 fidgetTableY[KINGZORA_LIMB_MAX]; /* 0x02A6 */ s16 fidgetTableY[12];
/* 0x02BE */ s16 fidgetTableZ[KINGZORA_LIMB_MAX]; /* 0x02BE */ s16 fidgetTableZ[12];
} EnKz; // size = 0x02D8 } EnKz; // size = 0x02D8
#endif #endif

2
src/overlays/actors/ovl_En_Mu/z_en_mu.c
View file

@ -152,7 +152,7 @@ void EnMu_Destroy(Actor* thisx, PlayState* play) {
} }
void EnMu_Pose(EnMu* this, PlayState* play) { void EnMu_Pose(EnMu* this, PlayState* play) {
Actor_UpdateFidgetTables(play, this->fidgetTableY, this->fidgetTableZ, MU_LIMB_MAX); Actor_UpdateFidgetTables(play, this->fidgetTableY, this->fidgetTableZ, 16);
} }
void EnMu_Update(Actor* thisx, PlayState* play) { void EnMu_Update(Actor* thisx, PlayState* play) {

7
src/overlays/actors/ovl_En_Mu/z_en_mu.h
View file

@ -8,9 +8,6 @@ struct EnMu;
typedef void (*EnMuActionFunc)(struct EnMu*, struct PlayState*); typedef void (*EnMuActionFunc)(struct EnMu*, struct PlayState*);
#define MU_LIMB_MAX 16 // @note: correct, because `Actor_UpdateFidgetTables` uses it
#define MU_LIMB_MAX_BUG 17 // @bug: should be the same value
typedef struct EnMu { typedef struct EnMu {
/* 0x0000 */ Actor actor; /* 0x0000 */ Actor actor;
/* 0x014C */ SkelAnime skelAnime; /* 0x014C */ SkelAnime skelAnime;
@ -18,8 +15,8 @@ typedef struct EnMu {
/* 0x0194 */ ColliderCylinder collider; /* 0x0194 */ ColliderCylinder collider;
/* 0x01E0 */ NpcInteractInfo npcInfo; /* 0x01E0 */ NpcInteractInfo npcInfo;
/* 0x0208 */ u16 defaultTextId; /* 0x0208 */ u16 defaultTextId;
/* 0x020A */ s16 fidgetTableY[MU_LIMB_MAX]; /* 0x020A */ s16 fidgetTableY[16];
/* 0x022A */ s16 fidgetTableZ[MU_LIMB_MAX_BUG]; /* 0x022A */ s16 fidgetTableZ[17]; // @note: looks like a bug, usually tables match
} EnMu; // size = 0x024C } EnMu; // size = 0x024C
#endif #endif

4
src/overlays/actors/ovl_En_Zo/z_en_zo.c
View file

@ -612,7 +612,7 @@ void EnZo_Destroy(Actor* thisx, PlayState* play) {
void EnZo_Standing(EnZo* this, PlayState* play) { void EnZo_Standing(EnZo* this, PlayState* play) {
s16 angle; s16 angle;
Actor_UpdateFidgetTables(play, this->fidgetTableY, this->fidgetTableZ, ZORA_LIMB_MAX); Actor_UpdateFidgetTables(play, this->fidgetTableY, this->fidgetTableZ, 20);
EnZo_SetAnimation(this); EnZo_SetAnimation(this);
if (this->interactInfo.talkState != NPC_TALK_STATE_IDLE) { if (this->interactInfo.talkState != NPC_TALK_STATE_IDLE) {
this->trackingMode = NPC_TRACKING_FULL_BODY; this->trackingMode = NPC_TRACKING_FULL_BODY;
@ -654,7 +654,7 @@ void EnZo_Surface(EnZo* this, PlayState* play) {
} }
void EnZo_TreadWater(EnZo* this, PlayState* play) { void EnZo_TreadWater(EnZo* this, PlayState* play) {
Actor_UpdateFidgetTables(play, this->fidgetTableY, this->fidgetTableZ, ZORA_LIMB_MAX); Actor_UpdateFidgetTables(play, this->fidgetTableY, this->fidgetTableZ, 20);
if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) { if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) {
this->canSpeak = true; this->canSpeak = true;
this->trackingMode = NPC_TRACKING_FULL_BODY; this->trackingMode = NPC_TRACKING_FULL_BODY;

10
src/overlays/actors/ovl_En_Zo/z_en_zo.h
View file

@ -21,8 +21,6 @@ typedef struct EnZoEffect {
typedef void (*EnZoActionFunc)(struct EnZo*, PlayState*); typedef void (*EnZoActionFunc)(struct EnZo*, PlayState*);
#define ZORA_LIMB_MAX 20
typedef struct EnZo { typedef struct EnZo {
/* 0x0000 */ Actor actor; /* 0x0000 */ Actor actor;
/* 0x014C */ SkelAnime skelAnime; /* 0x014C */ SkelAnime skelAnime;
@ -30,8 +28,8 @@ typedef struct EnZo {
/* 0x0194 */ NpcInteractInfo interactInfo; /* 0x0194 */ NpcInteractInfo interactInfo;
/* 0x01BC */ ColliderCylinder collider; /* 0x01BC */ ColliderCylinder collider;
/* 0x0208 */ u8 canSpeak; /* 0x0208 */ u8 canSpeak;
/* 0x020A */ Vec3s jointTable[ZORA_LIMB_MAX]; /* 0x020A */ Vec3s jointTable[20];
/* 0x0282 */ Vec3s morphTable[ZORA_LIMB_MAX]; /* 0x0282 */ Vec3s morphTable[20];
/* 0x02FC */ EnZoEffect effects[EN_ZO_EFFECT_COUNT]; /* 0x02FC */ EnZoEffect effects[EN_ZO_EFFECT_COUNT];
/* 0x0644 */ f32 dialogRadius; /* 0x0644 */ f32 dialogRadius;
/* 0x0648 */ f32 alpha; /* 0x0648 */ f32 alpha;
@ -40,8 +38,8 @@ typedef struct EnZo {
/* 0x0650 */ s16 timeToDive; /* 0x0650 */ s16 timeToDive;
/* 0x0652 */ s16 blinkTimer; /* 0x0652 */ s16 blinkTimer;
/* 0x0654 */ s16 eyeTexture; /* 0x0654 */ s16 eyeTexture;
/* 0x0656 */ s16 fidgetTableY[ZORA_LIMB_MAX]; /* 0x0656 */ s16 fidgetTableY[20];
/* 0x067E */ s16 fidgetTableZ[ZORA_LIMB_MAX]; /* 0x067E */ s16 fidgetTableZ[20];
} EnZo; // size = 0x06A8 } EnZo; // size = 0x06A8
#endif #endif