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_Wf (#370)

Browse Source 
* En_Wf

* PR

* Fix make and actorfixer

* Format

* Warnings
This commit is contained in:
Maide
2021-11-01 11:47:04 -03:00
committed by GitHub
parent 829d1d4c2a
commit 5a4bceea2c
7 changed files with 1457 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/overlays/actors/ovl_En_Tite/z_en_tite.c
+1 -1
View File
@@ -1071,7 +1071,7 @@ void EnTite_Update(Actor* thisx, GlobalContext* globalCtx) {
Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 25.0f, 40.0f, 20.0f, this->unk_2C0);
func_808963B4(this, globalCtx);
if (this->actor.bgCheckFlags & 1) {
func_800BE3D0(&this->actor, this->actor.shape.rot.y, &this->actor.shape.rot.x);
func_800BE3D0(&this->actor, this->actor.shape.rot.y, &this->actor.shape.rot);
if (this->unk_2B9 != 0) {
this->actor.shape.rot.z = BINANG_ROT180(this->actor.shape.rot.z);
}
src/overlays/actors/ovl_En_Wf/z_en_wf.c
+1419 -101
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Wf/z_en_wf.h
+24 -2
View File
@@ -7,11 +7,33 @@ struct EnWf;
typedef void (*EnWfActionFunc)(struct EnWf*, GlobalContext*);
#define ENWF_GET_80(thisx) ((thisx)->params & 0x80)
typedef struct EnWf {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x14C];
/* 0x0144 */ SkelAnime skelAnime;
/* 0x0188 */ Vec3s jointTable[22];
/* 0x020C */ Vec3s morphTable[22];
/* 0x0290 */ EnWfActionFunc actionFunc;
/* 0x0294 */ char unk_294[0x254];
/* 0x0294 */ u8 unk_294;
/* 0x0295 */ u8 unk_295;
/* 0x0296 */ u8 unk_296;
/* 0x0298 */ s16 unk_298;
/* 0x029A */ s16 unk_29A;
/* 0x029C */ s16 unk_29C;
/* 0x029E */ s16 unk_29E;
/* 0x02A0 */ s16 unk_2A0;
/* 0x02A2 */ u16 unk_2A2;
/* 0x02A4 */ f32 unk_2A4;
/* 0x02A8 */ f32 unk_2A8;
/* 0x02AC */ f32 unk_2AC;
/* 0x02B0 */ f32 unk_2B0;
/* 0x02B4 */ f32 unk_2B4;
/* 0x02B8 */ Vec3f unk_2B8[10];
/* 0x0330 */ ColliderJntSph collider1;
/* 0x0350 */ ColliderJntSphElement collider1Elements[4];
/* 0x0450 */ ColliderCylinder collider2;
/* 0x049C */ ColliderCylinder collider3;
} EnWf; // size = 0x4E8
extern const ActorInit En_Wf_InitVars;
src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.h
+2 -1
View File
@@ -10,7 +10,8 @@ typedef void (*ObjIcePolyActionFunc)(struct ObjIcePoly*, GlobalContext*);
typedef struct ObjIcePoly {
/* 0x0000 */ Actor actor;
/* 0x0144 */ ObjIcePolyActionFunc actionFunc;
/* 0x0148 */ char unk_144[0x134];
/* 0x0148 */ u8 unk_148;
/* 0x0149 */ char unk_149[0x133];
} ObjIcePoly; // size = 0x27C
extern const ActorInit Obj_Ice_Poly_InitVars;