izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

En_Death new build system edition

Browse Source
This commit is contained in:
Thar0
2021-08-04 06:18:09 +01:00
parent 7743e5a2c4
commit 61b579a9ed
4 changed files with 1302 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+7 -7
View File
@@ -2559,16 +2559,16 @@ void SkelAnime_DrawSV(GlobalContext* globalCtx, void** skeleton, Vec3s* limbDraw
void func_80134148(GlobalContext* globalCtx, s32 limbIndex, void** skeleton, Vec3s* limbDrawTable, OverrideLimbDraw overrideLimbDraw, PostLimbDraw postLimbDraw, UnkActorDraw unkDraw, Actor* actor, RSPMatrix** mtx);
void func_801343C0(GlobalContext* globalCtx, void** skeleton, Vec3s* limbDrawTable, s32 dListCount, OverrideLimbDraw overrideLimbDraw, PostLimbDraw postLimbDraw, UnkActorDraw unkDraw, Actor* actor);
void SkelAnime_AnimateFrame(AnimationHeader* animationSeg, s32 currentFrame, s32 limbCount, Vec3s* dst);
s16 SkelAnime_GetTotalFrames(AnimationHeaderCommon* animationSeg);
s16 SkelAnime_GetFrameCount(AnimationHeaderCommon* animationSeg);
s16 SkelAnime_GetTotalFrames(void* animationSeg);
s16 SkelAnime_GetFrameCount(void* animationSeg);
Gfx* SkelAnime_Draw2Limb(GlobalContext* globalCtx, s32 limbIndex, void** skeleton, Vec3s* limbDrawTable, OverrideLimbDraw2 overrideLimbDraw, PostLimbDraw2 postLimbDraw, Actor* actor, Gfx* gfx);
Gfx* SkelAnime_Draw2(GlobalContext* globalCtx, void** skeleton, Vec3s* limbDrawTable, OverrideLimbDraw2 overrideLimbDraw, PostLimbDraw2 postLimbDraw, Actor* actor, Gfx* gfx);
Gfx* SkelAnime_DrawLimbSV2(GlobalContext* globalCtx, s32 limbIndex, void** skeleton, Vec3s* limbDrawTable, OverrideLimbDraw2 overrideLimbDraw, PostLimbDraw2 postLimbDraw, Actor* actor, RSPMatrix** mtx, Gfx* gfx);
Gfx* SkelAnime_DrawSV2(GlobalContext* globalCtx, void** skeleton, Vec3s* limbDrawTable, s32 dListCount, OverrideLimbDraw2 overrideLimbDraw, PostLimbDraw2 postLimbDraw, Actor* actor, Gfx* gfx);
s32 func_80134FFC(s32 arg0, s32 arg1, Vec3s* dst);
s16 func_801353D4(AnimationHeaderCommon* animationSeg);
s16 SkelAnime_GetTotalFrames2(AnimationHeaderCommon* animationSeg);
s16 SkelAnime_GetFrameCount2(AnimationHeaderCommon* animationSeg);
s16 func_801353D4(void* animationSeg);
s16 SkelAnime_GetTotalFrames2(void* animationSeg);
s16 SkelAnime_GetFrameCount2(void* animationSeg);
void SkelAnime_InterpolateVec3s(s32 limbCount, Vec3s* dst, Vec3s* vec2, Vec3s* vec3, f32 unkf);
void SkelAnime_AnimationCtxReset(AnimationContext* animationCtx);
void func_801358D4(GlobalContext* globalCtx);
@@ -3041,7 +3041,7 @@ void func_80169600(GlobalContext* globalCtx, s16 param_2);
Camera* Play_GetCamera(GlobalContext* globalCtx, s16 index);
s32 func_8016970C(GlobalContext* globalCtx, s16 camId, Vec3f* at, Vec3f* eye);
// void func_8016981C(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5);
// void func_80169940(void);
void func_80169940(GlobalContext* globalCtx, s16 arg1, f32 arg2);
// void func_80169988(void);
void func_801699D4(GlobalContext* globalCtx, s16 arg1, s16 arg2);
// void func_80169A50(void);
@@ -3964,7 +3964,7 @@ void Audio_PreNMI(void);
// void func_801A44D4(void);
// void func_801A46F8(void);
// void func_801A4748(void);
// void func_801A479C(void);
void func_801A479C(Vec3f*, u16, u16);
// void func_801A47DC(void);
// void func_801A48E0(void);
// void func_801A4A28(void);
src/code/z_skelanime.c
+5 -5
View File
@@ -618,12 +618,12 @@ void SkelAnime_AnimateFrame(AnimationHeader* animationSeg, s32 currentFrame, s32
}
}
s16 SkelAnime_GetTotalFrames(AnimationHeaderCommon* animationSeg) {
s16 SkelAnime_GetTotalFrames(void* animationSeg) {
AnimationHeaderCommon* animation = Lib_SegmentedToVirtual(animationSeg);
return animation->frameCount;
}
s16 SkelAnime_GetFrameCount(AnimationHeaderCommon* animationSeg) {
s16 SkelAnime_GetFrameCount(void* animationSeg) {
AnimationHeaderCommon* animation = Lib_SegmentedToVirtual(animationSeg);
return (u16)animation->frameCount - 1;
@@ -851,7 +851,7 @@ Gfx* SkelAnime_DrawSV2(GlobalContext* globalCtx, void** skeleton, Vec3s* limbDra
// Function is unused.
#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_80134FFC.s")
s16 func_801353D4(AnimationHeaderCommon* animationSeg) {
s16 func_801353D4(void* animationSeg) {
AnimationHeaderCommon* animation = Lib_SegmentedToVirtual(animationSeg);
return animation->unk02;
@@ -861,7 +861,7 @@ s16 func_801353D4(AnimationHeaderCommon* animationSeg) {
* Appears to be unused anywhere in the game. Appears to be a clone of
* SkelAnime_GetTotalFrames
*/
s16 SkelAnime_GetTotalFrames2(AnimationHeaderCommon* animationSeg) {
s16 SkelAnime_GetTotalFrames2(void* animationSeg) {
AnimationHeaderCommon* animation = Lib_SegmentedToVirtual(animationSeg);
return animation->frameCount;
@@ -871,7 +871,7 @@ s16 SkelAnime_GetTotalFrames2(AnimationHeaderCommon* animationSeg) {
* Appears to be unused anywhere in the game. Appears to be a clone of
* SkelAnime_GetFrameCount
*/
s16 SkelAnime_GetFrameCount2(AnimationHeaderCommon* animationSeg) {
s16 SkelAnime_GetFrameCount2(void* animationSeg) {
AnimationHeaderCommon* animation = Lib_SegmentedToVirtual(animationSeg);
return animation->frameCount - 1;
src/overlays/actors/ovl_En_Death/z_en_death.c
+1240 -64
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Death/z_en_death.h
+50 -4
View File
@@ -8,10 +8,56 @@ struct EnDeath;
typedef void (*EnDeathActionFunc)(struct EnDeath* this, GlobalContext* globalCtx);
typedef struct EnDeath {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x44];
/* 0x0188 */ EnDeathActionFunc actionFunc;
/* 0x018C */ char unk_18C[0x7AC];
/* 0x000 */ Actor actor;
/* 0x144 */ SkelAnime skelAnime;
/* 0x188 */ EnDeathActionFunc unk_188;
/* 0x18C */ u8 unk_18C;
/* 0x18D */ u8 unk_18D;
/* 0x18E */ u8 unk_18E;
/* 0x18F */ u8 unk_18F;
/* 0x190 */ s8 unk_190;
/* 0x191 */ u8 unk_191;
/* 0x192 */ u8 unk_192;
/* 0x193 */ char unk_193[0x16];
/* 0x1A9 */ u8 unk_1A9[56];
/* 0x1E1 */ char unk_1E1[1]; // likely padding
/* 0x1E2 */ Vec3s unk_1E2[22];
/* 0x266 */ Vec3s unk_266[22];
/* 0x2EA */ s16 unk_2EA;
/* 0x2EC */ s16 unk_2EC;
/* 0x2EE */ s16 unk_2EE;
/* 0x2F0 */ char unk_2F0[0x2];
/* 0x2F2 */ s16 unk_2F2;
/* 0x2F4 */ s16 unk_2F4;
/* 0x2F6 */ s16 unk_2F6;
/* 0x2F8 */ s16 unk_2F8;
/* 0x2FA */ s16 unk_2FA;
/* 0x2FC */ s16 unk_2FC;
/* 0x2FE */ char unk_2FE[0x2];
/* 0x300 */ s32 unk_300; // effectIdx
/* 0x304 */ f32 unk_304;
/* 0x308 */ f32 unk_308;
/* 0x30C */ f32 unk_30C;
/* 0x310 */ f32 unk_310;
/* 0x314 */ f32 unk_314;
/* 0x318 */ f32 unk_318;
/* 0x31C */ f32 unk_31C;
/* 0x320 */ Vec3f unk_320;
/* 0x32C */ Vec3f unk_32C;
/* 0x338 */ Vec3f unk_338;
/* 0x344 */ Vec3f unk_344;
/* 0x350 */ Vec3f unk_350;
/* 0x35C */ Vec3f unk_35C[2]; // TODO size
/* 0x374 */ char unk_374[0x330];
/* 0x6A4 */ MtxF unk_6A4;
/* 0x6E4 */ Actor* unk_6E4[20];
/* 0x734 */ AnimatedMaterial* unk_734;
/* 0x738 */ AnimatedMaterial* unk_738;
/* 0x73C */ ColliderCylinder unk_73C;
/* 0x788 */ ColliderQuad unk_788;
/* 0x808 */ ColliderSphere unk_808;
/* 0x860 */ ColliderTris unk_860;
/* 0x880 */ ColliderTrisElement unk_880[2];
} EnDeath; // size = 0x938
extern const ActorInit En_Death_InitVars;