Game-Decompilation/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2024-11-23 12:59:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

En_Poh (#291)

Browse Source 
* En_Poh

* PR

* PR

* Fix wrong float
This commit is contained in:
Maide 2021-10-11 14:21:17 +01:00 committed by GitHub
parent f059baa87f
commit 1774416598
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 914 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/functions.h
View File

@ -4002,7 +4002,7 @@ void func_801A5CFC(u16 sfxId, Vec3f* param_2, u8 param_3, f32* param_4, f32* par
// void func_801A7168(void);
// void func_801A7284(void);
void func_801A72CC(Vec3f* uParm1);
// void func_801A7328(void);
void func_801A7328(Vec3f* pos, u16 sfxId);
// void func_801A7484(void);
// void func_801A75E8(void);
// void func_801A7720(void);

3
spec
View File

@ -4073,8 +4073,7 @@ beginseg
name "ovl_En_Poh"
compress
include "build/src/overlays/actors/ovl_En_Poh/z_en_poh.o"
include "build/data/ovl_En_Poh/ovl_En_Poh.data.o"
include "build/data/ovl_En_Poh/ovl_En_Poh.reloc.o"
include "build/src/overlays/actors/ovl_En_Poh/ovl_En_Poh_reloc.o"
endseg
beginseg

965
src/overlays/actors/ovl_En_Poh/z_en_poh.c
View File

File diff suppressed because it is too large Load Diff

27
src/overlays/actors/ovl_En_Poh/z_en_poh.h
View File

@ -9,9 +9,32 @@ typedef void (*EnPohActionFunc)(struct EnPoh*, GlobalContext*);
typedef struct EnPoh {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x44];
/* 0x0144 */ SkelAnime skelAnime;
/* 0x0188 */ EnPohActionFunc actionFunc;
/* 0x018C */ char unk_18C[0x28C];
/* 0x018C */ u8 unk_18C;
/* 0x018D */ u8 unk_18D;
/* 0x018E */ s16 unk_18E;
/* 0x0190 */ s16 unk_190;
/* 0x0192 */ s16 unk_192;
/* 0x0194 */ u8 unk_194;
/* 0x0195 */ u8 unk_195;
/* 0x0196 */ u8 unk_196;
/* 0x0197 */ u8 unk_197;
/* 0x0198 */ u8 unk_198;
/* 0x0199 */ u8 unk_199;
/* 0x019A */ u8 unk_19A;
/* 0x019B */ u8 unk_19B;
/* 0x019C */ Vec3s jointTable[21];
/* 0x021A */ Vec3s morphTable[21];
/* 0x0298 */ f32 unk_298;
/* 0x029C */ f32 unk_29C;
/* 0x02A0 */ Vec3f unk_2A0[10];
/* 0x0318 */ LightNode* lightNode;
/* 0x031C */ LightInfo lightInfo;
/* 0x032C */ ColliderCylinder colliderCylinder;
/* 0x0378 */ ColliderJntSph colliderSph;
/* 0x0398 */ ColliderJntSphElement colliderSphElements[1];
/* 0x03D8 */ MtxF unk_3D8;
} EnPoh; // size = 0x418
extern const ActorInit En_Poh_InitVars;

4
tools/disasm/functions.txt
View File

@ -13434,8 +13434,8 @@
0x80B2E6C0:("func_80B2E6C0",),
0x80B2E8E0:("func_80B2E8E0",),
0x80B2EACC:("EnPoh_Update",),
0x80B2ED14:("func_80B2ED14",),
0x80B2EDD0:("func_80B2EDD0",),
0x80B2ED14:("EnPoh_OverrideLimbDraw",),
0x80B2EDD0:("EnPoh_PostLimbDraw",),
0x80B2F0A4:("EnPoh_Draw",),
0x80B2F328:("func_80B2F328",),
0x80B2F37C:("func_80B2F37C",),