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_Peehat (#444)

Browse Source 
* En_Peehat

* Fix

* Revert m2ctx

* PR

* Warning

* PR
This commit is contained in:
Maide
2022-01-04 04:17:40 +00:00
committed by GitHub
parent 429a5ee9ff
commit 22a759a923
5 changed files with 854 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spec
+1 -2
View File
@@ -877,8 +877,7 @@ beginseg
name "ovl_En_Peehat"
compress
include "build/src/overlays/actors/ovl_En_Peehat/z_en_peehat.o"
include "build/data/ovl_En_Peehat/ovl_En_Peehat.data.o"
include "build/data/ovl_En_Peehat/ovl_En_Peehat.reloc.o"
include "build/src/overlays/actors/ovl_En_Peehat/ovl_En_Peehat_reloc.o"
endseg
beginseg
src/overlays/actors/ovl_En_Peehat/z_en_peehat.c
+826 -71
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Peehat/z_en_peehat.h
+25 -4
View File
@@ -8,10 +8,31 @@ struct EnPeehat;
typedef void (*EnPeehatActionFunc)(struct EnPeehat*, GlobalContext*);
typedef struct EnPeehat {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x164];
/* 0x02A8 */ EnPeehatActionFunc actionFunc;
/* 0x02AC */ char unk_2AC[0x294];
/* 0x000 */ Actor actor;
/* 0x144 */ SkelAnime skelAnime;
/* 0x188 */ Vec3s jointTable[24];
/* 0x188 */ Vec3s morphTable[24];
/* 0x2A8 */ EnPeehatActionFunc actionFunc;
/* 0x2AC */ u8 unk_2AC;
/* 0x2AD */ s8 unk_2AD;
/* 0x2AE */ u8 unk_2AE;
/* 0x2B0 */ s16 unk_2B0;
/* 0x2B2 */ s16 unk_2B2;
/* 0x2B4 */ s16 unk_2B4;
/* 0x2B6 */ s16 unk_2B6;
/* 0x2B8 */ f32 unk_2B8;
/* 0x2BC */ f32 unk_2BC;
/* 0x2C0 */ f32 unk_2C0;
/* 0x2C4 */ f32 unk_2C4;
/* 0x2C8 */ f32 unk_2C8;
/* 0x2CC */ f32 unk_2CC;
/* 0x2D0 */ f32 unk_2D0;
/* 0x2D4 */ Vec3f unk_2D4[2];
/* 0x2EC */ Vec3f unk_2EC[18];
/* 0x3C4 */ ColliderCylinder colliderCylinder;
/* 0x410 */ ColliderSphere colliderSphere;
/* 0x468 */ ColliderTris colliderTris;
/* 0x488 */ ColliderTrisElement colliderTriElements[2];
} EnPeehat; // size = 0x540
extern const ActorInit En_Peehat_InitVars;
tools/disasm/functions.txt
+2 -2
View File
@@ -5527,8 +5527,8 @@
0x808986A4:("func_808986A4",),
0x8089874C:("func_8089874C",),
0x80898A28:("EnPeehat_Update",),
0x80898E74:("func_80898E74",),
0x80899024:("func_80899024",),
0x80898E74:("EnPeehat_OverrideLimbDraw",),
0x80899024:("EnPeehat_PostLimbDraw",),
0x80899218:("EnPeehat_Draw",),
0x80899960:("EnHoll_SetupAction",),
0x808999B0:("EnHoll_SetPlayerSide",),
undefined_syms.txt
-8
View File
@@ -3124,14 +3124,6 @@ D_060073E8 = 0x060073E8;
D_0600D5A0 = 0x0600D5A0;
// ovl_En_Peehat
D_06000350 = 0x06000350;
D_060005C4 = 0x060005C4;
D_06000844 = 0x06000844;
D_060009C4 = 0x060009C4;
D_06001C80 = 0x06001C80;
// ovl_En_Pm
D_06008348 = 0x06008348;