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

En_Kusa2 (#363) 

* En_Kusa2

* PR

* Warnings

* PR

* Match

* pepega
This commit is contained in:
Maide 2022-01-01 18:09:44 +00:00 committed by GitHub
parent 44ccdbe0d5
commit 3d883491e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 1351 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/variables.h
View File

@ -3937,8 +3937,8 @@ extern UNK_TYPE D_04050D10;
extern UNK_TYPE D_04051180;
extern UNK_TYPE D_04051238;
extern AnimationHeader D_0405140C;
extern UNK_TYPE D_040527F0;
extern UNK_TYPE D_040528B0;
extern Gfx D_040527F0[];
extern Gfx D_040528B0[];
extern Gfx D_04054A90[];
extern u64 D_04054F20[];
extern UNK_TYPE D_04055628;
@ -4006,8 +4006,8 @@ extern UNK_TYPE D_05006420;
extern UNK_TYPE D_050066B0;
extern UNK_TYPE D_05007498;
extern Gfx D_05007890[];
extern UNK_TYPE D_050078A0;
extern UNK_TYPE D_05007938;
extern Gfx D_050078A0[];
extern Gfx D_05007938[];
extern Gfx D_05007980[];
extern UNK_TYPE D_05007E00;
extern UNK_TYPE D_05008018;

4
spec
View File

@ -3052,9 +3052,7 @@ beginseg
name "ovl_En_Kusa2"
compress
include "build/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.o"
include "build/data/ovl_En_Kusa2/ovl_En_Kusa2.data.o"
include "build/data/ovl_En_Kusa2/ovl_En_Kusa2.bss.o"
include "build/data/ovl_En_Kusa2/ovl_En_Kusa2.reloc.o"
include "build/src/overlays/actors/ovl_En_Kusa2/ovl_En_Kusa2_reloc.o"
endseg
beginseg

1352
src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c
View File

File diff suppressed because it is too large Load Diff

71
src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.h
View File

@ -4,14 +4,81 @@
#include "global.h"
struct EnKusa2;
struct EnKusa2UnkBssSubStruct;
typedef void (*EnKusa2ActionFunc)(struct EnKusa2*, GlobalContext*);
typedef void (*EnKusa2BssFunc)(struct EnKusa2UnkBssSubStruct*);
#define ENKUSA2_GET_1(thisx) (((thisx)->params) & 1)
#define ENKUSA2_GET_7F00(thisx) (u8)((((thisx)->params) >> 8) & 0x7F)
typedef struct EnKusa2UnkBssSubStruct {
/* 0x00 */ Vec3f unk_00;
/* 0x0C */ Vec3f unk_0C;
/* 0x18 */ f32 unk_18;
/* 0x1C */ f32 unk_1C;
/* 0x20 */ s16 unk_20;
/* 0x22 */ s16 unk_22;
/* 0x24 */ s16 unk_24;
/* 0x26 */ s16 unk_26;
/* 0x28 */ EnKusa2BssFunc unk_28;
/* 0x2C */ f32 unk_2C;
/* 0x30 */ f32 unk_30;
/* 0x34 */ f32 unk_34;
/* 0x38 */ f32 unk_38;
/* 0x3C */ f32 unk_3C;
/* 0x40 */ f32 unk_40;
/* 0x44 */ f32 unk_44;
/* 0x48 */ f32 unk_48;
/* 0x4C */ f32 unk_4C;
/* 0x50 */ f32 unk_50;
/* 0x54 */ f32 unk_54;
/* 0x58 */ f32 unk_58;
/* 0x5C */ f32 unk_5C;
/* 0x60 */ f32 unk_60;
/* 0x64 */ f32 unk_64;
/* 0x68 */ f32 unk_68;
/* 0x6C */ f32 unk_6C;
/* 0x70 */ f32 unk_70;
/* 0x74 */ f32 unk_74;
/* 0x78 */ f32 unk_78;
/* 0x7C */ f32 unk_7C;
} EnKusa2UnkBssSubStruct; // size = 0x80
typedef struct {
/* 0x00 */ f32 unk_00;
/* 0x04 */ Vec3f unk_04;
/* 0x10 */ Vec3f unk_10;
/* 0x1C */ f32 unk_1C;
/* 0x20 */ Vec3s unk_20;
/* 0x26 */ Vec3s unk_26;
/* 0x2C */ s16 unk_2C;
/* 0x2C */ UNK_TYPE1 unk2E[0x2];
} EnKusa2UnkBssSubStruct2; // size = 0x30
typedef struct {
/* 0x0000 */ EnKusa2UnkBssSubStruct unk_0000[9];
/* 0x0480 */ EnKusa2UnkBssSubStruct2 unk_0480[100];
} EnKusa2UnkBssStruct; // size = 0x1740
typedef struct EnKusa2 {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x4C];
/* 0x0144 */ ColliderCylinder collider;
/* 0x0190 */ EnKusa2ActionFunc actionFunc;
/* 0x0194 */ char unk_194[0x40];
/* 0x0194 */ struct EnKusa2* unk_194[9];
/* 0x01B8 */ EnKusa2UnkBssSubStruct* unk_1B8;
/* 0x01BC */ s16 unk_1BC;
/* 0x01BE */ s8 unk_1BE;
/* 0x01C0 */ struct EnKusa2* unk_1C0;
/* 0x01C4 */ s16 unk_1C4;
/* 0x01C6 */ UNK_TYPE1 unk1C6[0x2];
/* 0x01C8 */ s16 unk_1C8;
/* 0x01CA */ s16 unk_1CA;
/* 0x01CC */ s16 unk_1CC;
/* 0x01CE */ s8 unk_1CE;
/* 0x01CF */ u8 unk_1CF;
/* 0x01D0 */ s8 unk_1D0;
/* 0x01D1 */ s8 unk_1D1;
} EnKusa2; // size = 0x1D4
extern const ActorInit En_Kusa2_InitVars;

6
tools/disasm/variables.txt
View File

@ -12051,10 +12051,8 @@
0x80A5EAFE:("D_80A5EAFE","UNK_TYPE2","",0x2),
0x80A5EB00:("D_80A5EB00","UNK_TYPE2","",0x2),
0x80A5EB04:("D_80A5EB04","UNK_TYPE2","",0x2),
0x80A5EB0C:("D_80A5EB0C","f32","",0x4),
0x80A5EB14:("D_80A5EB14","f32","",0x4),
0x80A5EB18:("D_80A5EB18","f32","",0x4),
0x80A5EB20:("D_80A5EB20","f32","",0x4),
0x80A5EB0C:("D_80A5EB0C","Vec3f","",0xC),
0x80A5EB18:("D_80A5EB18","Vec3f","",0xC),
0x80A5EB24:("D_80A5EB24","UNK_TYPE1","",0x1),
0x80A5EB48:("D_80A5EB48","UNK_TYPE4","",0x4),
0x80A5EB4C:("D_80A5EB4C","UNK_TYPE1","",0x1),