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_Dai (#229)

Browse Source 
* Dai

* Stuff

* NBS
This commit is contained in:
Maide
2021-08-04 18:41:40 -04:00
committed by GitHub
parent 51111676c4
commit ee2344bc8a
5 changed files with 747 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+3 -3
View File
@@ -2093,7 +2093,7 @@ void func_8010A33C(GlobalContext* globalCtx, s16 param_2);
// void func_8010BEBC(void);
// void func_8010BEF0(void);
// void func_8010BF24(void);
// void func_8010BF58(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5);
s32 func_8010BF58(Actor* actor, GlobalContext* globalCtx, s32* param_2, s32 param_3, s32 param_4);
// void Nmi_Init(void);
// void Nmi_SetPrenmiStart(void);
// s32 Nmi_GetPrenmiHasStarted(void);
@@ -2688,7 +2688,7 @@ s16 func_8013A504(s16 val);
s32 func_8013A530(GlobalContext* globalCtx, Actor* actor, s32 flag, Vec3f* pos, Vec3s* rot, f32 distanceMin, f32 distanceMax, s16 angleError);
// void func_8013A7C0(void);
// void func_8013A860(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6, UNK_TYPE4 param_7, UNK_TYPE4 param_8, UNK_TYPE4 param_9, UNK_TYPE4 param_10);
// void func_8013AB00(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6, UNK_TYPE4 param_7, UNK_TYPE4 param_8, UNK_TYPE4 param_9);
Gfx* func_8013AB00(GlobalContext *globalCtx, void** skeleton, Vec3s* limbDrawTable, s32 dListCount, void* func1, void* func2, void* func3, Actor* actor, Gfx* gfx);
s32 func_8013AD6C(GlobalContext* globalCtx);
// void func_8013AD9C(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6);
void func_8013AED4(u16* param_1, u16 param_2, u16 param_3);
@@ -2706,7 +2706,7 @@ UNK_TYPE func_8013BC6C(SkelAnime* skelAnime, ActorAnimationEntryS* arg1, s32 arg
// void func_8013C068(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5);
// void func_8013C624(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6);
// void func_8013C8B8(void);
// void func_8013C964(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE1 param_5, UNK_TYPE4 param_6);
void func_8013C964(Actor* actor, GlobalContext* globalCtx, f32 arg2, f32 arg3, s32 arg4, s32 arg5);
// void func_8013CC2C(void);
// void func_8013CD64(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE1 param_5, UNK_TYPE4 param_6, UNK_TYPE4 param_7);
// void func_8013CF04(void);
spec
+1 -2
View File
@@ -4199,8 +4199,7 @@ beginseg
name "ovl_En_Dai"
compress
include "build/src/overlays/actors/ovl_En_Dai/z_en_dai.o"
include "build/data/ovl_En_Dai/ovl_En_Dai.data.o"
include "build/data/ovl_En_Dai/ovl_En_Dai.reloc.o"
include "build/src/overlays/actors/ovl_En_Dai/ovl_En_Dai_reloc.o"
endseg
beginseg
src/overlays/actors/ovl_En_Dai/z_en_dai.c
+696 -34
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Dai/z_en_dai.h
+34 -4
View File
@@ -7,11 +7,41 @@ struct EnDai;
typedef void (*EnDaiActionFunc)(struct EnDai* this, GlobalContext* globalCtx);
typedef struct EnDaiParticle {
/* 0x00 */ u8 isEnabled;
/* 0x01 */ u8 unk_01;
/* 0x02 */ u8 unk_02;
/* 0x03 */ UNK_TYPE1 unk_03[0xD];
/* 0x10 */ Vec3f unk_10;
/* 0x1C */ Vec3f unk_1C;
/* 0x28 */ Vec3f unk_28;
/* 0x34 */ f32 unk_34;
/* 0x38 */ f32 unk_38;
} EnDaiParticle; // size = 0x3C
typedef struct EnDai {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x44];
/* 0x0188 */ EnDaiActionFunc actionFunc;
/* 0x018C */ char unk_18C[0x8E8];
/* 0x000 */ Actor actor;
/* 0x144 */ SkelAnime skelAnime;
/* 0x188 */ EnDaiActionFunc actionFunc;
/* 0x18C */ MtxF unk_18C;
/* 0x1CC */ u8 unk_1CC;
/* 0x1CD */ u8 unk_1CD;
/* 0x1CE */ u16 unk_1CE;
/* 0x1D0 */ s32 unk_1D0;
/* 0x1D4 */ s16 unk_1D4;
/* 0x1D6 */ s16 unk_1D6;
/* 0x1D8 */ s16 unk_1D8;
/* 0x1DA */ s16 unk_1DA;
/* 0x1DC */ s16 unk_1DC;
/* 0x1E0 */ f32 unk_1E0;
/* 0x1E4 */ Vec3f unk_1E4;
/* 0x1F0 */ Vec3f unk_1F0;
/* 0x1FC */ Vec3f unk_1FC;
/* 0x208 */ Vec3s jointTable[19];
/* 0x27A */ Vec3s morphTable[19];
/* 0x2EC */ EnDaiParticle particles[32];
/* 0xA6C */ s32 unk_A6C;
/* 0xA70 */ s32 unk_A70;
} EnDai; // size = 0xA74
extern const ActorInit En_Dai_InitVars;
undefined_syms.txt
+13
View File
@@ -1694,6 +1694,19 @@ D_06000230 = 0x06000230;
D_060002E8 = 0x060002E8;
D_0600C538 = 0x0600C538;
D_060130D0 = 0x060130D0;
D_060107B0 = 0x060107B0;
D_06010FB0 = 0x06010FB0;
D_060117B0 = 0x060117B0;
D_06010FB0 = 0x06010FB0;
D_06011FB0 = 0x06011FB0;
D_060127B0 = 0x060127B0;
D_060079E4 = 0x060079E4;
D_06007354 = 0x06007354;
D_06000CEC = 0x06000CEC;
D_060069DC = 0x060069DC;
D_0600563C = 0x0600563C;
D_06002E58 = 0x06002E58;
D_06006590 = 0x06006590;
// ovl_En_Daiku