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

En_Railgibud (#268) 

* En_Railgibud

* Match func_80BA57F8 (thanks Petrie, Simon, Anghelo)

* Match func_80BA5E18, thanks to engineer

* a

* PR
This commit is contained in:
Maide 2021-09-20 02:46:56 +01:00 committed by GitHub
parent 9312fe4d11
commit 4796e6f61d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 1079 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/functions.h
View File

@ -769,7 +769,7 @@ float func_800B6FC8(Player* player);
// void func_800B7090(void); // void func_800B7090(void);
// void func_800B7118(void); // void func_800B7118(void);
// void func_800B7128(void); // void func_800B7128(void);
// void func_800B715C(void); s32 func_800B715C(GlobalContext* globalCtx);
// void func_800B7170(void); // void func_800B7170(void);
// void func_800B71DC(void); // void func_800B71DC(void);
u32 func_800B7200(s32 param_1); u32 func_800B7200(s32 param_1);
@ -2236,7 +2236,7 @@ s32 func_80123810(GlobalContext* globalCtx);
void func_80123D50(GlobalContext* globalCtx, Player* player, UNK_TYPE arg2, UNK_TYPE arg3); void func_80123D50(GlobalContext* globalCtx, Player* player, UNK_TYPE arg2, UNK_TYPE arg3);
void func_80123DA4(Player* player); void func_80123DA4(Player* player);
// void func_80123DC0(void); // void func_80123DC0(void);
// void func_80123E90(void); void func_80123E90(GlobalContext* globalCtx, Actor* actor);
// void func_80123F2C(void); // void func_80123F2C(void);
// void func_80123F48(void); // void func_80123F48(void);
// void func_80124020(void); // void func_80124020(void);

3
spec
View File

@ -4600,8 +4600,7 @@ beginseg
name "ovl_En_Railgibud" name "ovl_En_Railgibud"
compress compress
include "build/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.o" include "build/src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.o"
include "build/data/ovl_En_Railgibud/ovl_En_Railgibud.data.o" include "build/src/overlays/actors/ovl_En_Railgibud/ovl_En_Railgibud_reloc.o"
include "build/data/ovl_En_Railgibud/ovl_En_Railgibud.reloc.o"
endseg endseg
beginseg beginseg

1089
src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.c
View File

File diff suppressed because it is too large Load Diff

37
src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.h
View File

@ -7,11 +7,44 @@ struct EnRailgibud;
typedef void (*EnRailgibudActionFunc)(struct EnRailgibud*, GlobalContext*); typedef void (*EnRailgibudActionFunc)(struct EnRailgibud*, GlobalContext*);
#define ENRAILGIBUD_GET_7F(thisx) ((thisx)->params & 0x7F)
#define ENRAILGIBUD_GET_80(thisx) ((thisx)->params & 0x80)
#define ENRAILGIBUD_GET_FF00(thisx) (((thisx)->params & 0xFF00) >> 8)
typedef struct EnRailgibud { typedef struct EnRailgibud {
/* 0x0000 */ Actor actor; /* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x90]; /* 0x0144 */ ColliderCylinder collider;
/* 0x0190 */ SkelAnime skelAnime;
/* 0x01D4 */ EnRailgibudActionFunc actionFunc; /* 0x01D4 */ EnRailgibudActionFunc actionFunc;
/* 0x01D8 */ char unk_1D8[0x230]; /* 0x01D8 */ Vec3f unk_1D8[15];
/* 0x028C */ s32 unk_28C;
/* 0x0290 */ UNK_TYPE1 unk290[0x4];
/* 0x0294 */ Vec3s* unk_294;
/* 0x0298 */ s32 unk_298;
/* 0x029C */ s32 unk_29C;
/* 0x02A0 */ f32 unk_2A0;
/* 0x02A4 */ f32 unk_2A4;
/* 0x02A8 */ Vec3s jointTable[26];
/* 0x0344 */ Vec3s morphTable[26];
/* 0x03E0 */ UNK_TYPE1 unk3E0[0x2];
/* 0x03E2 */ s16 unk_3E2;
/* 0x03E4 */ UNK_TYPE1 unk3E4[0x4];
/* 0x03E8 */ s16 unk_3E8;
/* 0x03EA */ UNK_TYPE1 unk3EA[0x2];
/* 0x03EC */ s16 unk_3EC;
/* 0x03EE */ s16 unk_3EE;
/* 0x03F0 */ s16 unk_3F0;
/* 0x03F2 */ s16 unk_3F2;
/* 0x03F4 */ s16 unk_3F4;
/* 0x03F6 */ s16 unk_3F6;
/* 0x03F8 */ s16 unk_3F8;
/* 0x03FA */ s16 unk_3FA;
/* 0x03FC */ u16 unk_3FC;
/* 0x03FE */ u16 unk_3FE;
/* 0x0400 */ u16 unk_400;
/* 0x0402 */ s16 unk_402;
/* 0x0404 */ u8 unk_404;
/* 0x0405 */ s8 unk_405;
} EnRailgibud; // size = 0x408 } EnRailgibud; // size = 0x408
extern const ActorInit En_Railgibud_InitVars; extern const ActorInit En_Railgibud_InitVars;

2
tools/disasm/variables.txt
View File

@ -15758,7 +15758,7 @@
0x80BA51D0:("D_80BA51D0","f32","",0x4), 0x80BA51D0:("D_80BA51D0","f32","",0x4),
0x80BA51D4:("D_80BA51D4","f32","",0x4), 0x80BA51D4:("D_80BA51D4","f32","",0x4),
0x80BA80A0:("En_Railgibud_InitVars","UNK_TYPE1","",0x1), 0x80BA80A0:("En_Railgibud_InitVars","UNK_TYPE1","",0x1),
0x80BA80C0:("D_80BA80C0","UNK_PTR","",0x4), 0x80BA80C0:("sAnimations","UNK_PTR","",0x4),
0x80BA82A0:("D_80BA82A0","UNK_TYPE1","",0x1), 0x80BA82A0:("D_80BA82A0","UNK_TYPE1","",0x1),
0x80BA82CC:("D_80BA82CC","UNK_TYPE1","",0x1), 0x80BA82CC:("D_80BA82CC","UNK_TYPE1","",0x1),
0x80BA82EC:("D_80BA82EC","UNK_PTR","",0x4), 0x80BA82EC:("D_80BA82EC","UNK_PTR","",0x4),

19
undefined_syms.txt
View File

@ -3173,6 +3173,25 @@ D_06003428 = 0x06003428;
D_060053E8 = 0x060053E8; D_060053E8 = 0x060053E8;
D_0600ABE0 = 0x0600ABE0; D_0600ABE0 = 0x0600ABE0;
D_06010B88 = 0x06010B88; D_06010B88 = 0x06010B88;
D_06006678 = 0x06006678;
D_06006B08 = 0x06006B08;
D_06006EEC = 0x06006EEC;
D_060073A4 = 0x060073A4;
D_06007BBC = 0x06007BBC;
D_060081A8 = 0x060081A8;
D_06009298 = 0x06009298;
D_06009900 = 0x06009900;
D_0600A450 = 0x0600A450;
D_060113EC = 0x060113EC;
D_0601216C = 0x0601216C;
D_060118D8 = 0x060118D8;
D_06011DB8 = 0x06011DB8;
D_0600A450 = 0x0600A450;
D_06005DF4 = 0x06005DF4;
D_060061E4 = 0x060061E4;
D_06001600 = 0x06001600;
D_060009C4 = 0x060009C4;
D_06000F1C = 0x06000F1C;
// ovl_En_Rail_Skb // ovl_En_Rail_Skb