falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

En_Gk (#580) 

* En_Gk

* Merge

* Merge

* TrasnformDraw

* PR

* a

* Ok

* PR
This commit is contained in:
Maide 2022-02-28 03:03:03 +00:00 committed by GitHub
parent d60f3fcf2c
commit 8b7cbb1273
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 1226 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/functions.h
View File

@ -3753,7 +3753,7 @@ void Audio_PreNMI(void);
// void func_801A44C4(void);
// void func_801A44D4(void);
s32 func_801A46F8(void);
// void func_801A4748(void);
void func_801A4748(Vec3f* pos, u16 sfxId);
void func_801A479C(Vec3f* arg0, u16 sfxId, s32 arg2);
// void func_801A47DC(void);
// void func_801A48E0(void);

3
spec
View File

@ -4098,8 +4098,7 @@ beginseg
name "ovl_En_Gk"
compress
include "build/src/overlays/actors/ovl_En_Gk/z_en_gk.o"
include "build/data/ovl_En_Gk/ovl_En_Gk.data.o"
include "build/data/ovl_En_Gk/ovl_En_Gk.reloc.o"
include "build/src/overlays/actors/ovl_En_Gk/ovl_En_Gk_reloc.o"
endseg
beginseg

1231
src/overlays/actors/ovl_En_Gk/z_en_gk.c
View File

File diff suppressed because it is too large Load Diff

46
src/overlays/actors/ovl_En_Gk/z_en_gk.h
View File

@ -7,11 +7,53 @@ struct EnGk;
typedef void (*EnGkActionFunc)(struct EnGk*, GlobalContext*);
#define ENGK_GET_F(thisx) ((thisx)->params & 0xF)
#define ENGK_GET_F0(thisx) (((thisx)->params & 0xF0) >> 4)
#define ENGK_GET_3F00(thisx) (((thisx)->params & 0x3F00) >> 8)
enum {
/* 0 */ ENGK_F_0,
/* 1 */ ENGK_F_1,
/* 2 */ ENGK_F_2,
/* 3 */ ENGK_F_3,
/* 4 */ ENGK_F_4,
/* 5 */ ENGK_F_5,
};
typedef struct EnGk {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x90];
/* 0x0144 */ ColliderCylinder collider;
/* 0x0190 */ SkelAnime skelAnime;
/* 0x01D4 */ EnGkActionFunc actionFunc;
/* 0x01D8 */ char unk_1D8[0x180];
/* 0x01D8 */ Vec3s unk_1D8;
/* 0x01DE */ Vec3s unk_1DE;
/* 0x01E4 */ u16 unk_1E4;
/* 0x01E8 */ Path* path;
/* 0x01EC */ s32 unk_1EC;
/* 0x01F0 */ Vec3s jointTable[20];
/* 0x01F0 */ Vec3s morphTable[20];
/* 0x02E0 */ s16 unk_2E0;
/* 0x02E2 */ s16 unk_2E2;
/* 0x02E4 */ s16 unk_2E4;
/* 0x02E8 */ Vec3f unk_2E8;
/* 0x02F4 */ Vec3f unk_2F4;
/* 0x0300 */ Vec3f unk_300;
/* 0x030C */ Vec3f unk_30C;
/* 0x0318 */ s16 unk_318;
/* 0x031A */ u8 unk_31A;
/* 0x031B */ u8 unk_31B;
/* 0x031C */ u16 unk_31C;
/* 0x031E */ s16 unk_31E;
/* 0x0320 */ s16 unk_320;
/* 0x0322 */ s16 unk_322;
/* 0x0324 */ s16 unk_324;
/* 0x0328 */ Vec3f unk_328;
/* 0x0334 */ Vec3s unk_334;
/* 0x033C */ Vec3f unk_33C;
/* 0x0348 */ Vec3s unk_348;
/* 0x034E */ s16 unk_34E;
/* 0x0350 */ s16 unk_350;
/* 0x0354 */ f32 unk_354;
} EnGk; // size = 0x358
extern const ActorInit En_Gk_InitVars;

6
tools/disasm/functions.txt
View File

@ -14003,9 +14003,9 @@
0x80B526FC:("EnGk_Init",),
0x80B529B8:("EnGk_Destroy",),
0x80B529E4:("EnGk_Update",),
0x80B52AD4:("func_80B52AD4",),
0x80B52AF0:("func_80B52AF0",),
0x80B52D8C:("func_80B52D8C",),
0x80B52AD4:("EnGk_OverrideLimbDraw",),
0x80B52AF0:("EnGk_PostLimbDraw",),
0x80B52D8C:("EnGk_TransformDraw",),
0x80B52F74:("EnGk_Draw",),
0x80B53840:("func_80B53840",),
0x80B539CC:("func_80B539CC",),

7
undefined_syms.txt
View File

@ -1372,13 +1372,6 @@ D_0600A808 = 0x0600A808;
D_0600F578 = 0x0600F578;
D_0600F6C0 = 0x0600F6C0;
// ovl_En_Gk
D_06006680 = 0x06006680;
D_06006688 = 0x06006688;
D_0600787C = 0x0600787C;
D_060079C0 = 0x060079C0;
// ovl_En_Goron_Oyu
D_06000988 = 0x06000988;