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

En_Rail_Skb (#418) 

* En_Rail_Skb

* PR

* PR

* Object

* undef
This commit is contained in:
Maide 2021-12-27 01:55:16 +00:00 committed by GitHub
parent 2df8e5d433
commit ddb3405219
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 1040 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spec
View File

@ -4279,8 +4279,7 @@ beginseg
name "ovl_En_Rail_Skb" name "ovl_En_Rail_Skb"
compress compress
include "build/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.o" include "build/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.o"
include "build/data/ovl_En_Rail_Skb/ovl_En_Rail_Skb.data.o" include "build/src/overlays/actors/ovl_En_Rail_Skb/ovl_En_Rail_Skb_reloc.o"
include "build/data/ovl_En_Rail_Skb/ovl_En_Rail_Skb.reloc.o"
endseg endseg
beginseg beginseg

1076
src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.c
View File

File diff suppressed because it is too large Load Diff

36
src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.h
View File

@ -6,12 +6,40 @@
struct EnRailSkb; struct EnRailSkb;
typedef void (*EnRailSkbActionFunc)(struct EnRailSkb*, GlobalContext*); typedef void (*EnRailSkbActionFunc)(struct EnRailSkb*, GlobalContext*);
typedef void (*EnRailSkbUnkFunc)(struct EnRailSkb*);
#define ENRAILSKB_GET_FF00(thisx) (((thisx)->params >> 8) & 0xFF)
#define ENRAILSKB_GET_FF(thisx) ((thisx)->params & 0xFF)
typedef struct EnRailSkb { typedef struct EnRailSkb {
/* 0x0000 */ Actor actor; /* 0x000 */ Actor actor;
/* 0x0144 */ char unk_144[0xE4]; /* 0x144 */ ColliderJntSph collider;
/* 0x0228 */ EnRailSkbActionFunc actionFunc; /* 0x164 */ ColliderJntSphElement colliderElements[2];
/* 0x022C */ char unk_22C[0x1D8]; /* 0x1E4 */ SkelAnime skelAnime;
/* 0x228 */ EnRailSkbActionFunc actionFunc;
/* 0x22C */ ObjHakaisi* unk_22C;
/* 0x230 */ Vec3s* unk_230;
/* 0x234 */ Vec3f unk_234[14];
/* 0x2DC */ s32 unk_2DC;
/* 0x2E0 */ s32 unk_2E0;
/* 0x2E4 */ s32 unk_2E4;
/* 0x2E8 */ s32 unk_2E8;
/* 0x2EC */ f32 unk_2EC;
/* 0x2F0 */ f32 unk_2F0;
/* 0x2F4 */ Vec3s jointTable[20];
/* 0x36C */ Vec3s morphTable[20];
/* 0x3E4 */ UNK_TYPE1 unk3E4[0xC];
/* 0x3F0 */ s16 unk_3F0;
/* 0x3F2 */ s16 unk_3F2;
/* 0x3F4 */ s16 unk_3F4;
/* 0x3F6 */ s16 unk_3F6;
/* 0x3F8 */ s16 unk_3F8;
/* 0x3FA */ s16 unk_3FA;
/* 0x3FC */ s16 unk_3FC;
/* 0x3FE */ s16 unk_3FE;
/* 0x400 */ u16 unk_400;
/* 0x402 */ u8 unk_402;
/* 0x403 */ u8 unk_403;
} EnRailSkb; // size = 0x404 } EnRailSkb; // size = 0x404
extern const ActorInit En_Rail_Skb_InitVars; extern const ActorInit En_Rail_Skb_InitVars;

4
src/overlays/actors/ovl_Obj_Hakaisi/z_obj_hakaisi.h
View File

@ -11,7 +11,9 @@ typedef struct ObjHakaisi {
/* 0x0000 */ Actor actor; /* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x18]; /* 0x0144 */ char unk_144[0x18];
/* 0x015C */ ObjHakaisiActionFunc actionFunc; /* 0x015C */ ObjHakaisiActionFunc actionFunc;
/* 0x0160 */ char unk_160[0x40]; /* 0x0160 */ char unk_160[0x38];
/* 0x0198 */ s16 unk_198;
/* 0x019A */ char unk_19A[0x6];
} ObjHakaisi; // size = 0x1A0 } ObjHakaisi; // size = 0x1A0
extern const ActorInit Obj_Hakaisi_InitVars; extern const ActorInit Obj_Hakaisi_InitVars;

4
tools/disasm/functions.txt
View File

@ -14404,8 +14404,8 @@
0x80B72880:("func_80B72880",), 0x80B72880:("func_80B72880",),
0x80B72970:("func_80B72970",), 0x80B72970:("func_80B72970",),
0x80B72DBC:("EnRailSkb_Update",), 0x80B72DBC:("EnRailSkb_Update",),
0x80B72E88:("func_80B72E88",), 0x80B72E88:("EnRailSkb_OverrideLimbDraw",),
0x80B7302C:("func_80B7302C",), 0x80B7302C:("EnRailSkb_PostLimbDraw",),
0x80B731EC:("EnRailSkb_Draw",), 0x80B731EC:("EnRailSkb_Draw",),
0x80B73A90:("func_80B73A90",), 0x80B73A90:("func_80B73A90",),
0x80B73AE4:("func_80B73AE4",), 0x80B73AE4:("func_80B73AE4",),

5
undefined_syms.txt
View File

@ -3417,11 +3417,6 @@ D_06001600 = 0x06001600;
D_060009C4 = 0x060009C4; D_060009C4 = 0x060009C4;
D_06000F1C = 0x06000F1C; D_06000F1C = 0x06000F1C;
// ovl_En_Rail_Skb
D_06005EF8 = 0x06005EF8;
D_060064E0 = 0x060064E0;
// ovl_En_Rat // ovl_En_Rat
D_06000174 = 0x06000174; D_06000174 = 0x06000174;