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

En_Rd (#316) 

* En_Rd

* PR

* a
This commit is contained in:
Maide 2021-09-28 03:17:28 +01:00 committed by GitHub
parent 14ad66b4ed
commit 27e41b73a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 1184 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/functions.h
View File

@ -887,13 +887,13 @@ Actor* func_800BC444(GlobalContext* globalCtx, Actor* actor, f32 arg2);
// void func_800BC4EC(void); // void func_800BC4EC(void);
// void func_800BC5B8(void); // void func_800BC5B8(void);
s32 func_800BC5EC(GlobalContext* globalCtx, Actor* actor); s32 func_800BC5EC(GlobalContext* globalCtx, Actor* actor);
void func_800BC620(Vec3f* arg0, Vec3f* arg1, UNK_TYPE arg2, GlobalContext* globalCtx); void func_800BC620(Vec3f* arg0, Vec3f* arg1, u8 arg2, GlobalContext* globalCtx);
// void func_800BC770(void); // void func_800BC770(void);
// void func_800BC7D8(void); // void func_800BC7D8(void);
// void func_800BC848(void); // void func_800BC848(void);
// void func_800BC8B8(void); // void func_800BC8B8(void);
// void func_800BCB50(void); // void func_800BCB50(void);
void func_800BCB70(Actor* actor, s16 arg1, s16 arg2, s16 arg3, s16 arg4); void func_800BCB70(Actor* actor, u16 arg1, u16 arg2, s16 arg3, s16 arg4);
void func_800BCBF4(Vec3f* uParm1, GlobalContext* globalCtx); void func_800BCBF4(Vec3f* uParm1, GlobalContext* globalCtx);
void func_800BCC68(Vec3f* param_1, GlobalContext* globalCtx); void func_800BCC68(Vec3f* param_1, GlobalContext* globalCtx);
UNK_RET func_800BCCDC(Vec3s* points, u8 pathcount, Vec3f* pos1, Vec3f* pos2, UNK_TYPE parm5); UNK_RET func_800BCCDC(Vec3s* points, u8 pathcount, Vec3f* pos1, Vec3f* pos2, UNK_TYPE parm5);

3
spec
View File

@ -1182,8 +1182,7 @@ beginseg
name "ovl_En_Rd" name "ovl_En_Rd"
compress compress
include "build/src/overlays/actors/ovl_En_Rd/z_en_rd.o" include "build/src/overlays/actors/ovl_En_Rd/z_en_rd.o"
include "build/data/ovl_En_Rd/ovl_En_Rd.data.o" include "build/src/overlays/actors/ovl_En_Rd/ovl_En_Rd_reloc.o"
include "build/data/ovl_En_Rd/ovl_En_Rd.reloc.o"
endseg endseg
beginseg beginseg

1209
src/overlays/actors/ovl_En_Rd/z_en_rd.c
View File

File diff suppressed because it is too large Load Diff

46
src/overlays/actors/ovl_En_Rd/z_en_rd.h
View File

@ -6,12 +6,54 @@
struct EnRd; struct EnRd;
typedef void (*EnRdActionFunc)(struct EnRd*, GlobalContext*); typedef void (*EnRdActionFunc)(struct EnRd*, GlobalContext*);
typedef void (*EnRdFunc)(struct EnRd*);
#define ENRD_GET_80(thisx) ((thisx)->params & 0x80)
#define ENRD_GET_FF00(thisx) (((thisx)->params & 0xFF00) >> 8)
enum {
/* -2 */ ENRD_GET_MINUS_2 = -2,
/* -1 */ ENRD_GET_MINUS_1 = -1,
/* 0x00 */ ENRD_GET_0 = 0,
/* 0x01 */ ENRD_GET_1,
/* 0x02 */ ENRD_GET_2,
/* 0x03 */ ENRD_GET_3,
/* 0x04 */ ENRD_GET_4,
/* 0x05 */ ENRD_GET_5,
};
typedef struct EnRd { typedef struct EnRd {
/* 0x0000 */ Actor actor; /* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x44]; /* 0x0144 */ SkelAnime skelAnime;
/* 0x0188 */ EnRdActionFunc actionFunc; /* 0x0188 */ EnRdActionFunc actionFunc;
/* 0x018C */ char unk_18C[0x268]; /* 0x018C */ EnRdFunc unkFunc;
/* 0x0190 */ ColliderCylinder collider;
/* 0x01DC */ Vec3f unk_1DC[15];
/* 0x0290 */ s32 unk_290;
/* 0x0294 */ f32 unk_294;
/* 0x0298 */ f32 unk_298;
/* 0x029C */ Vec3s jointTable[26];
/* 0x0338 */ Vec3s morphTable[26];
/* 0x03D4 */ s16 unk_3D4;
/* 0x03D6 */ s16 unk_3D6;
/* 0x03D8 */ s16 unk_3D8;
/* 0x03DA */ s16 unk_3DA;
/* 0x03DC */ s16 unk_3DC;
/* 0x03DE */ s16 unk_3DE;
/* 0x03E0 */ s16 unk_3E0;
/* 0x03E2 */ s16 unk_3E2;
/* 0x03E4 */ s16 unk_3E4;
/* 0x03E6 */ s16 unk_3E6;
/* 0x03E8 */ u8 unk_3E8;
/* 0x03E9 */ u8 unk_3E9;
/* 0x03EA */ u8 unk_3EA;
/* 0x03EB */ u8 unk_3EB;
/* 0x03EC */ u8 unk_3EC;
/* 0x03ED */ u8 unk_3ED;
/* 0x03EE */ u8 unk_3EE;
/* 0x03EF */ u8 unk_3EF;
/* 0x03F0 */ u8 unk_3F0;
/* 0x03F1 */ s8 unk_3F1;
} EnRd; // size = 0x3F4 } EnRd; // size = 0x3F4
extern const ActorInit En_Rd_InitVars; extern const ActorInit En_Rd_InitVars;

4
tools/disasm/functions.txt
View File

@ -6392,8 +6392,8 @@
0x808D6A94:("func_808D6A94",), 0x808D6A94:("func_808D6A94",),
0x808D6B64:("func_808D6B64",), 0x808D6B64:("func_808D6B64",),
0x808D6C10:("EnRd_Update",), 0x808D6C10:("EnRd_Update",),
0x808D6DA0:("func_808D6DA0",), 0x808D6DA0:("EnRd_OverrideLimbDraw",),
0x808D6DFC:("func_808D6DFC",), 0x808D6DFC:("EnRd_PostLimbDraw",),
0x808D6ED8:("EnRd_Draw",), 0x808D6ED8:("EnRd_Draw",),
0x808D7550:("BgF40Flift_Init",), 0x808D7550:("BgF40Flift_Init",),
0x808D75BC:("BgF40Flift_Destroy",), 0x808D75BC:("BgF40Flift_Destroy",),