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_St (#443)

Browse Source 
* En_St

* Warning

* PR

* undef

* PR
This commit is contained in:
Maide
2022-01-04 04:09:32 +00:00
committed by GitHub
parent 6b50345831
commit 429a5ee9ff
7 changed files with 873 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+2 -1
View File
@@ -591,7 +591,8 @@ void EffectSsKiraKira_SpawnDispersed(GlobalContext* globalCtx, Vec3f* pos, Vec3f
void EffectSsBomb2_SpawnLayered(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale,
s16 scaleStep);
// void EffectSsBlast_Spawn(UNK_TYPE4 uParm1, Vec3f* pzParm2, Vec3f* pzParm3, Vec3f* pzParm4, Color_RGBA8* param_5, Color_RGBA8* param_6, UNK_TYPE2 param_7, UNK_TYPE2 param_8, UNK_TYPE2 param_9, UNK_TYPE2 param_10);
// void EffectSsBlast_SpawnWhiteCustomScale(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5, UNK_TYPE2 param_6, UNK_TYPE2 param_7);
void EffectSsBlast_SpawnWhiteCustomScale(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale,
s16 scaleStep, s16 life);
// void EffectSsBlast_SpawnShockwave(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_TYPE2 param_7);
void EffectSsBlast_SpawnWhiteShockwave(GlobalContext* globalCtx, Vec3f* arg1, Vec3f* arg2, Vec3f* arg3);
// void EffectSsGSpk_SpawnAccel(UNK_TYPE4 uParm1, UNK_TYPE4 uParm2, Vec3f* pzParm3, Vec3f* pzParm4, Vec3f* param_5, Color_RGBA8* param_6, Color_RGBA8* param_7, UNK_TYPE2 param_8, UNK_TYPE2 param_9);
include/variables.h
+2 -1
View File
@@ -3895,7 +3895,8 @@ extern Gfx D_04023210[];
extern UNK_TYPE D_04023288;
extern Gfx D_04023348[];
extern Gfx D_04023428[];
extern UNK_TYPE D_04025850;
extern Gfx D_04025850[];
extern Gfx D_04025970[];
extern UNK_TYPE D_04025DD0;
extern UNK_TYPE D_040281DC;
extern UNK_TYPE D_04028FEC;
spec
+1 -2
View File
@@ -961,8 +961,7 @@ beginseg
name "ovl_En_St"
compress
include "build/src/overlays/actors/ovl_En_St/z_en_st.o"
include "build/data/ovl_En_St/ovl_En_St.data.o"
include "build/data/ovl_En_St/ovl_En_St.reloc.o"
include "build/src/overlays/actors/ovl_En_St/ovl_En_St_reloc.o"
endseg
beginseg
src/overlays/actors/ovl_En_St/z_en_st.c
+829 -59
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_St/z_en_st.h
+38 -4
View File
@@ -7,11 +7,45 @@ struct EnSt;
typedef void (*EnStActionFunc)(struct EnSt*, GlobalContext*);
#define ENST_GET_3F(thisx) (((thisx)->params & 0x3F) & 0xFF)
#define ENST_GET_1C0(thisx) ((((thisx)->params & 0x1C0) >> 6) & 0xFF)
#define ENST_3F_63 63
#define ENST_1C0_1 1
typedef struct EnSt {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x44];
/* 0x0188 */ EnStActionFunc actionFunc;
/* 0x018C */ char unk_18C[0x3C4];
/* 0x000 */ Actor actor;
/* 0x144 */ SkelAnime skelAnime;
/* 0x188 */ EnStActionFunc actionFunc;
/* 0x18C */ u16 unk_18C;
/* 0x18E */ u8 unk_18E;
/* 0x190 */ ColliderCylinder collider1;
/* 0x1DC */ ColliderCylinder collider2;
/* 0x228 */ ColliderCylinder collider3;
/* 0x274 */ ColliderCylinder collider4;
/* 0x2C0 */ s8 unk_2C0;
/* 0x2C4 */ f32 unk_2C4;
/* 0x2C8 */ f32 unk_2C8;
/* 0x2CC */ f32 unk_2CC;
/* 0x2D0 */ f32 unk_2D0;
/* 0x2D4 */ f32 unk_2D4;
/* 0x2D8 */ f32 unk_2D8;
/* 0x2DC */ f32 unk_2DC[12];
/* 0x30C */ s16 unk_30C;
/* 0x30E */ s16 unk_30E;
/* 0x310 */ s16 unk_310;
/* 0x312 */ s16 unk_312;
/* 0x314 */ s16 unk_314;
/* 0x316 */ s16 unk_316;
/* 0x318 */ s16 unk_318;
/* 0x31A */ s16 unk_31A;
/* 0x31C */ s16 unk_31C[12];
/* 0x334 */ s16 unk_334[12];
/* 0x34C */ f32 unk_34C;
/* 0x350 */ UNK_TYPE1 unk_350[0x8];
/* 0x358 */ Vec3f unk_358[12];
/* 0x3E8 */ Vec3s jointTable[30];
/* 0x49C */ Vec3s morphTable[30];
} EnSt; // size = 0x550
extern const ActorInit En_St_InitVars;
tools/disasm/functions.txt
+1 -1
View File
@@ -5736,7 +5736,7 @@
0x808A7138:("EnSt_Init",),
0x808A71D0:("EnSt_Destroy",),
0x808A7230:("EnSt_Update",),
0x808A73E8:("func_808A73E8",),
0x808A73E8:("EnSt_OverrideLimbDraw",),
0x808A7478:("func_808A7478",),
0x808A7930:("ObjWturn_Init",),
0x808A7954:("func_808A7954",),
undefined_syms.txt
-4
View File
@@ -3450,10 +3450,6 @@ D_06005850 = 0x06005850;
D_06005F78 = 0x06005F78;
D_06006470 = 0x06006470;
// ovl_En_St
D_06005298 = 0x06005298;
// ovl_En_Sth
D_060031F8 = 0x060031F8;