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

EnAn_Update

Browse Source
This commit is contained in:
angie
2023-09-23 19:14:17 -03:00
parent 6368519052
commit eddf0b6a39
2 changed files with 93 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/overlays/actors/ovl_En_An/z_en_an.c
+46 -3
View File
@@ -18,6 +18,19 @@ void func_80B577F0(EnAn* this, PlayState* play);
void func_80B578F8(EnAn* this, PlayState* play);
void func_80B57A44(EnAn* this, PlayState* play);
s32 func_80B53840(EnAn* this, PlayState* play);
s32 func_80B53BA8(EnAn* this, PlayState* play);
void func_80B53ED4(EnAn* this, PlayState* play);
void func_80B53F84(EnAn* this);
s32 func_80B55180(EnAn* this, PlayState* play);
s32 func_80B552E4(EnAn* this, PlayState* play);
void func_80B554E8(EnAn* this);
UNK_RET func_80B55914(EnAn* this, PlayState* play);
void func_80B57B48(EnAn* this, PlayState* play);
#if 0
ActorInit En_An_InitVars = {
ACTOR_EN_AN,
@@ -80,8 +93,6 @@ Actor* func_80B53A7C(EnAn* this, PlayState* play, u8 actorCategory, s16 actorId)
return foundActor;
}
//#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_An/func_80B53A7C.s")
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_An/func_80B53B3C.s")
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_An/func_80B53BA8.s")
@@ -216,6 +227,7 @@ void EnAn_Init(Actor* thisx, PlayState* play) {
if (temp_v1 == 0) {
this->actor.room = -1;
}
this->actionFunc = func_80B577F0;
}
@@ -225,7 +237,38 @@ void EnAn_Destroy(Actor* thisx, PlayState* play) {
Collider_DestroyCylinder(play, &this->unk_190);
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_An/EnAn_Update.s")
void EnAn_Update(Actor* thisx, PlayState* play) {
EnAn* this = (EnAn* ) thisx;
if (func_80B53840(this, play) != 0) {
return;
}
if ((this->actionFunc != func_80B577F0) && (func_80B55180(this, play) == 0) && (func_80B552E4(this, play) != 0)) {
func_80B57B48(this, play);
func_80B53BA8(this, play);
func_80B53F84(this);
return;
}
this->actionFunc(this, play);
if (this->unk_200 != 0) {
func_80B55914(this, play);
func_80B53BA8(this, play);
func_80B53F84(this);
func_80B554E8(this);
SubS_Offer(&this->actor, play, this->unk_374, 30.0f, 0, this->unk_360 & 7);
if (!(this->unk_360 & 0x40)) {
Actor_MoveWithGravity(&this->actor);
Actor_UpdateBgCheckInfo(play, &this->actor, 30.0f, 12.0f, 0.0f, 4U);
}
func_80B53ED4(this, play);
}
}
//#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_An/EnAn_Update.s")
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_An/func_80B57EE8.s")
src/overlays/actors/ovl_En_An/z_en_an.h
+47 -5
View File
@@ -11,16 +11,58 @@ typedef void (*EnAnActionFunc)(struct EnAn*, PlayState*);
typedef struct EnAn {
/* 0x000 */ Actor actor;
/* 0x144 */ UNK_TYPE1 unk_144[0x44];
/* 0x144 */ SkelAnime unk_144;
/* 0x188 */ EnAnActionFunc actionFunc;
/* 0x18C */ UNK_TYPE1 unk_18C[0x4];
/* 0x190 */ ColliderCylinder unk_190;
/* 0x1DC */ UNK_TYPE1 pad_1DC[0x214-0x1DC];
/* 0x1DC */ char pad_1DC[0x24]; /* inferred */
/* 0x200 */ u8 unk_200; /* inferred */
/* 0x201 */ char pad_201[3]; /* maybe part of unk_200[4]? */
/* 0x204 */ void* unk_204; /* inferred */
/* 0x208 */ s8 unk_208; /* inferred */
/* 0x209 */ s8 unk_209; /* inferred */
/* 0x20A */ s8 unk_20A; /* inferred */
/* 0x20B */ s8 unk_20B; /* inferred */
/* 0x20C */ s8 unk_20C; /* inferred */
/* 0x20D */ char pad_20D[3]; /* maybe part of unk_20C[4]? */
/* 0x210 */ s32 unk_210; /* inferred */
/* 0x214 */ s8 unk_214;
/* 0x215 */ UNK_TYPE1 unk_215[0x3];
/* 0x218 */ UNK_TYPE1 unk_218[0x3B8-0x218];
/* 0x215 */ char pad_215[3]; /* maybe part of unk_214[4]? */
/* 0x218 */ Actor* unk_218; /* inferred */
/* 0x21C */ char pad_21C[0x48]; /* maybe part of unk_218[0x13]? */
/* 0x264 */ Vec3s unk_264; /* inferred */
/* 0x26A */ char pad_26A[0x78]; /* maybe part of unk_264[0x15]? */
/* 0x2E2 */ Vec3s unk_2E2; /* inferred */
/* 0x2E8 */ char pad_2E8[0x78]; /* maybe part of unk_2E2[0x15]? */
/* 0x360 */ u16 unk_360; /* inferred */
/* 0x362 */ char pad_362[2]; /* inferred */
/* 0x364 */ s8 unk_364; /* inferred */
/* 0x365 */ char pad_365[3]; /* maybe part of unk_364[4]? */
/* 0x368 */ f32 unk_368; /* inferred */
/* 0x36C */ char pad_36C[8]; /* maybe part of unk_368[3]? */
/* 0x374 */ f32 unk_374; /* inferred */
/* 0x378 */ char pad_378[4]; /* inferred */
/* 0x37C */ s16 unk_37C; /* inferred */
/* 0x37E */ s16 unk_37E; /* inferred */
/* 0x380 */ char pad_380[4]; /* maybe part of unk_37E[3]? */
/* 0x384 */ s16 unk_384; /* inferred */
/* 0x386 */ char pad_386[2]; /* inferred */
/* 0x388 */ s16 unk_388; /* inferred */
/* 0x38A */ s16 unk_38A; /* inferred */
/* 0x38C */ s16 unk_38C; /* inferred */
/* 0x38E */ s16 unk_38E; /* inferred */
/* 0x390 */ s16 unk_390; /* inferred */
/* 0x392 */ s16 unk_392; /* inferred */
/* 0x394 */ char pad_394[4]; /* maybe part of unk_392[3]? */
/* 0x398 */ void* unk_398; /* inferred */
/* 0x39C */ s32 unk_39C; /* inferred */
/* 0x3A0 */ char pad_3A0[0x10]; /* maybe part of unk_39C[5]? */
/* 0x3B0 */ s32 unk_3B0; /* inferred */
/* 0x3B4 */ s32 unk_3B4; /* inferred */
/* 0x3B8 */ s32 unk_3B8;
/* 0x3BC */ UNK_TYPE1 unk_3BC[0x3C8-0x3BC];
/* 0x3BC */ char pad_3BC[4]; /* inferred */
/* 0x3C0 */ s32 unk_3C0; /* inferred */
/* 0x3C4 */ char pad_3C4[4]; /* inferred */
} EnAn; // size = 0x3C8
#endif // Z_EN_AN_H