This commit is contained in:
petrie911
2023-05-01 09:56:28 -05:00
parent 21826bec78
commit 690c773f5c
2 changed files with 1173 additions and 1158 deletions
File diff suppressed because it is too large Load Diff
@@ -86,67 +86,67 @@ typedef void (*EnInvadepohFaceFunc) (EnInvadePohFaceInfo*, EnInvadepohFaceAnim**
typedef struct EnInvadepoh {
/* 0x000 */ Actor actor;
/* 0x144 */ SkelAnime skelAnime;
/* 0x188 */ Vec3s unk_188[EN_INVADEPOH_LIMB_MAX];
/* 0x212 */ Vec3s unk_212[EN_INVADEPOH_LIMB_MAX];
/* 0x29C */ s8 unk_29C;
/* 0x2A0 */ ColliderCylinder unk_2A0;
/* 0x188 */ Vec3s jointTable[EN_INVADEPOH_LIMB_MAX];
/* 0x212 */ Vec3s morphTable[EN_INVADEPOH_LIMB_MAX];
/* 0x29C */ s8 finishedAnim;
/* 0x2A0 */ ColliderCylinder collider;
/* 0x2EC */ EnInvadepohActionFunc actionFunc;
/* 0x2F0 */ s16 unk_2F0;
/* 0x2F2 */ s16 unk_2F2;
/* 0x2F4 */ s8 unk_2F4;
/* 0x2F0 */ s16 actionTimer;
/* 0x2F2 */ s16 stateTimer;
/* 0x2F4 */ s8 bankIndex;
/* 0x2F8 */ f32 unk_2F8;
/* 0x2FC */ char unk_2FC[4]; // unused? f32?
/* 0x300 */ f32 unk_300;
/* 0x304 */ s16 unk_304;
/* 0x306 */ s16 unk_306;
/* 0x308 */ s8 unk_308;
/* 0x309 */ s8 unk_309;
/* 0x30A */ s8 unk_30A;
/* 0x30C */ Vec3s *unk_30C;
/* 0x310 */ f32 unk_310;
/* 0x308 */ s8 endPoint;
/* 0x309 */ s8 currentPoint;
/* 0x30A */ s8 pathStep;
/* 0x30C */ Vec3s *pathPoints;
/* 0x310 */ f32 pathLength;
/* 0x314 */ Vec3f unk_314;
/* 0x320 */ f32 unk_320;
/* 0x320 */ f32 progress;
/* 0x324 */ EnInvadePohUnkStruct_324 unk_324;
/* 0x370 */ s16 unk_370;
/* 0x372 */ s16 unk_372;
/* 0x374 */ s8 unk_374;
/* 0x376 */ u16 unk_376;
/* 0x376 */ u16 textId;
/* 0x378 */ s8 unk_378;
/* 0x379 */ s8 unk_379;
/* 0x37C */ f32 unk_37C[3];
/* 0x379 */ s8 spawnCount;
/* 0x37C */ f32 checkpoints[3];
/* 0x388 */ char unk_388; // unused?
/* 0x389 */ u8 unk_389;
/* 0x38A */ s8 unk_38A;
/* 0x38B */ s8 unk_38B;
/* 0x38C */ s8 unk_38C;
/* 0x38D */ u8 unk_38D;
/* 0x390 */ Vec3f unk_390;
/* 0x39C */ f32 unk_39C;
/* 0x3A0 */ f32 unk_3A0;
/* 0x3A4 */ f32 unk_3A4;
/* 0x3A8 */ s16 unk_3A8;
/* 0x3AA */ s16 unk_3AA;
/* 0x3AC */ s8 unk_3AC;
/* 0x389 */ u8 alpha;
/* 0x38A */ s8 atBarn;
/* 0x38B */ s8 present;
/* 0x38C */ s8 drawDeathFlash;
/* 0x38D */ u8 eyeBeamAlpha;
/* 0x390 */ Vec3f deathFlashScale;
/* 0x39C */ f32 pulseScale;
/* 0x3A0 */ f32 pulseScaleTarget;
/* 0x3A4 */ f32 pulseScaleRate;
/* 0x3A8 */ s16 pulsePhase;
/* 0x3AA */ s16 pulseRate;
/* 0x3AC */ s8 lightBallTarget;
/* 0x3AD */ char pad3AD[3];
/* 0x3B0 */ char pad3B0[0xC]; // unused? Vec3f?
/* 0x3BC */ s8 unk_3BC;
/* 0x3BC */ s8 dogTargetPoint;
} EnInvadepoh; // size = 0x3C0
typedef enum {
ENINVADEPOH_HANDLER, // Invasion event handler
ENINVADEPOH_ALIEN_INVADER, // Alien invader
ENINVADEPOH_COW, // Abudcted cow, spawned by unused alien abductor
ENINVADEPOH_COW_TAIL, // Abducted cow tail, spawned by abducted cow
ENINVADEPOH_ROMANI_ABDUCTED, // Abducted Romani, spawned by unused alien abductor
ENINVADEPOH_ROMANI_CONFUSED, // Returned, confused Romani
ENINVADEPOH_LIGHT_BALL, // Light ball spaceship
ENINVADEPOH_ROMANI_NIGHT_1, // Romani running to barn on night 1
ENINVADEPOH_ROMANI_UNKNOWN, // Unknown, possible duplicate of previous
ENINVADEPOH_ROMANI_REWARD, // Romani rewarding you for defeating invasion
ENINVADEPOH_DOG, // Dog during alien invasion
ENINVADEPOH_CREMIA_NIGHT_3, // Cremia walking from barn to house on night 3
ENINVADEPOH_ROMANI_NIGHT_3, // Romnani walking from barn to house on night 3
ENINVADEPOH_ALIEN_ABDUCTOR, // Alien abductor, unused, carries cow or Romani
/* 0x0 */ ENINVADEPOH_HANDLER, // Invasion event handler
/* 0x1 */ ENINVADEPOH_ALIEN_INVADER, // Alien invader
/* 0x2 */ ENINVADEPOH_COW, // Abudcted cow, spawned by unused alien abductor
/* 0x3 */ ENINVADEPOH_COW_TAIL, // Abducted cow tail, spawned by abducted cow
/* 0x4 */ ENINVADEPOH_ROMANI_ABDUCTED, // Abducted Romani, spawned by unused alien abductor
/* 0x5 */ ENINVADEPOH_ROMANI_CONFUSED, // Returned, confused Romani
/* 0x6 */ ENINVADEPOH_LIGHT_BALL, // Light ball spaceship
/* 0x7 */ ENINVADEPOH_ROMANI_NIGHT_1, // Romani running to barn on night 1
/* 0x8 */ ENINVADEPOH_ROMANI_BARN, // Romani in the barn on night 1
/* 0x9 */ ENINVADEPOH_ROMANI_REWARD, // Romani rewarding you for defeating invasion
/* 0xA */ ENINVADEPOH_DOG, // Dog during alien invasion
/* 0xB */ ENINVADEPOH_CREMIA_NIGHT_3, // Cremia walking from barn to house on night 3
/* 0xC */ ENINVADEPOH_ROMANI_NIGHT_3, // Romnani walking from barn to house on night 3
/* 0xD */ ENINVADEPOH_ALIEN_ABDUCTOR, // Alien abductor, unused, carries cow or Romani
} EnInvadepohParamsTypes;
#define ENINVADEPOH_GET_PARAM_7(thisx) ((thisx)->params & 7)