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

En_Go (3 non-matching) (#405) 

* En_Go

* PR

* PR

* Object

* Undef

* PR
This commit is contained in:
Maide 2022-01-04 03:45:36 +00:00 committed by GitHub
parent 3af87ca611
commit 0b45e0f87a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 2016 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
assets/xml/objects/object_oF1d_map.xml
View File

@ -7,9 +7,9 @@
<DList Name="object_oF1d_map_DL_000D50" Offset="0xD50" />
<DList Name="object_oF1d_map_DL_000DD8" Offset="0xDD8" />
<DList Name="object_oF1d_map_DL_001560" Offset="0x1560" />
<!-- <Blob Name="object_oF1d_map_Blob_001750" Size="0x20" Offset="0x1750" /> -->
<Blob Name="object_oF1d_map_Blob_001750" Size="0x20" Offset="0x1750" />
<Texture Name="object_oF1d_map_Tex_001770" OutName="tex_001770" Format="rgba16" Width="32" Height="64" Offset="0x1770" />
<!-- <Blob Name="object_oF1d_map_Blob_002770" Size="0x800" Offset="0x2770" /> -->
<Blob Name="object_oF1d_map_Blob_002770" Size="0x800" Offset="0x2770" />
<Texture Name="object_oF1d_map_Tex_002F70" OutName="tex_002F70" Format="i4" Width="32" Height="32" Offset="0x2F70" />
<DList Name="object_oF1d_map_DL_0031A0" Offset="0x31A0" />
<DList Name="object_oF1d_map_DL_003258" Offset="0x3258" />

6
include/functions.h
View File

@ -593,7 +593,7 @@ void EffectSsBomb2_SpawnLayered(GlobalContext* globalCtx, Vec3f* pos, Vec3f* vel
// void EffectSsBlast_Spawn(UNK_TYPE4 uParm1, Vec3f* pzParm2, Vec3f* pzParm3, Vec3f* pzParm4, Color_RGBA8* param_5, Color_RGBA8* param_6, UNK_TYPE2 param_7, UNK_TYPE2 param_8, UNK_TYPE2 param_9, UNK_TYPE2 param_10);
// void EffectSsBlast_SpawnWhiteCustomScale(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5, UNK_TYPE2 param_6, UNK_TYPE2 param_7);
// void EffectSsBlast_SpawnShockwave(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6, UNK_TYPE2 param_7);
// void EffectSsBlast_SpawnWhiteShockwave(void);
void EffectSsBlast_SpawnWhiteShockwave(GlobalContext* globalCtx, Vec3f* arg1, Vec3f* arg2, Vec3f* arg3);
// void EffectSsGSpk_SpawnAccel(UNK_TYPE4 uParm1, UNK_TYPE4 uParm2, Vec3f* pzParm3, Vec3f* pzParm4, Vec3f* param_5, Color_RGBA8* param_6, Color_RGBA8* param_7, UNK_TYPE2 param_8, UNK_TYPE2 param_9);
// void EffectSsGSpk_SpawnNoAccel(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6, UNK_TYPE4 param_7, UNK_TYPE2 param_8, UNK_TYPE2 param_9);
// void EffectSsGSpk_SpawnFuse(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5);
@ -1533,8 +1533,8 @@ void func_800EDF24(Actor* actor, GlobalContext* globalCtx, u32 arg2);
void func_800EDF78(Actor* actor, GlobalContext* globalCtx, s32 iParm3);
void func_800EE0CC(Actor* actor, GlobalContext* globalCtx, s32 iParm3);
s32 func_800EE1D8(GlobalContext* globalCtx);
u32 func_800EE200(GlobalContext* globalCtx, u32 uParm2);
u32 func_800EE29C(GlobalContext* globalCtx, u32 uParm2);
u32 func_800EE200(GlobalContext* globalCtx, u16 uParm2);
u32 func_800EE29C(GlobalContext* globalCtx, u16 uParm2);
u32 func_800EE2F4(GlobalContext* globalCtx);
void GetItem_Draw(GlobalContext* globalCtx, s16 index);
void func_800EE364(GlobalContext* globalCtx, s16 index);

5
spec
View File

@ -2610,8 +2610,11 @@ beginseg
name "ovl_En_Go"
compress
include "build/src/overlays/actors/ovl_En_Go/z_en_go.o"
include "build/data/ovl_En_Go/ovl_En_Go.data.o"
#ifdef NON_MATCHING
include "build/src/overlays/actors/ovl_En_Go/ovl_En_Go_reloc.o"
#else
include "build/data/ovl_En_Go/ovl_En_Go.reloc.o"
#endif
endseg
beginseg

2012
src/overlays/actors/ovl_En_Go/z_en_go.c
View File

File diff suppressed because it is too large Load Diff

91
src/overlays/actors/ovl_En_Go/z_en_go.h
View File

@ -7,11 +7,98 @@ struct EnGo;
typedef void (*EnGoActionFunc)(struct EnGo*, GlobalContext*);
#define ENGO_GET_F(thisx) (((thisx)->params & 0xF) & 0xFF)
#define ENGO_GET_70(thisx) ((((thisx)->params & 0x70) >> 4) & 0xFF)
#define ENGO_GET_7F80(thisx) ((((thisx)->params & 0x7F80) >> 7) & 0xFF)
enum {
/* 0 */ ENGO_F_0,
/* 1 */ ENGO_F_1,
/* 2 */ ENGO_F_2,
/* 3 */ ENGO_F_3,
/* 4 */ ENGO_F_4,
/* 5 */ ENGO_F_5,
/* 6 */ ENGO_F_6,
/* 7 */ ENGO_F_7,
/* 8 */ ENGO_F_8,
};
enum {
/* 0 */ ENGO_70_0,
/* 1 */ ENGO_70_1,
/* 2 */ ENGO_70_2,
/* 3 */ ENGO_70_3,
/* 4 */ ENGO_70_4,
/* 5 */ ENGO_70_5,
};
typedef struct {
/* 0x00 */ u8 unk_00;
/* 0x01 */ u8 unk_01;
/* 0x02 */ u8 unk_02;
/* 0x04 */ Vec3s unk_04;
/* 0x0A */ Vec3s unk_0A;
/* 0x10 */ Vec3f unk_10;
/* 0x1C */ Vec3f unk_1C;
/* 0x28 */ Vec3f unk_28;
/* 0x34 */ f32 unk_34;
/* 0x38 */ f32 unk_38;
} EnGoStruct; // size = 0x3C;
typedef struct EnGo {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x44];
/* 0x0144 */ SkelAnime skelAnime;
/* 0x0188 */ EnGoActionFunc actionFunc;
/* 0x018C */ char unk_18C[0x9EC];
/* 0x018C */ EnGoActionFunc unk_18C;
/* 0x0190 */ EnGoActionFunc unk_190;
/* 0x0194 */ ColliderCylinder colliderCylinder;
/* 0x01E0 */ UNK_TYPE1 unk1E0[0x4C];
/* 0x022C */ ColliderSphere colliderSphere;
/* 0x0284 */ Path* unk_284;
/* 0x0288 */ s8 unk_288;
/* 0x0289 */ s8 unk_289;
/* 0x028C */ s32 unk_28C;
/* 0x0290 */ Vec3f unk_290;
/* 0x029C */ Vec3f unk_29C;
/* 0x02A8 */ Vec3s unk_2A8;
/* 0x02AE */ Vec3s unk_2AE;
/* 0x02B4 */ Vec3s jointTable[18];
/* 0x0320 */ Vec3s morphTable[18];
/* 0x038C */ Actor* unk_38C;
/* 0x0390 */ u16 unk_390;
/* 0x0392 */ u16 unk_392;
/* 0x0394 */ u8 unk_394;
/* 0x0398 */ f32 unk_398;
/* 0x039C */ f32 unk_39C;
/* 0x03A0 */ f32 unk_3A0;
/* 0x03A4 */ f32 unk_3A4;
/* 0x03A8 */ f32 unk_3A8;
/* 0x03AC */ UNK_TYPE1 unk3AC[0x2];
/* 0x03AE */ s16 unk_3AE;
/* 0x03B0 */ s16 unk_3B0;
/* 0x03B2 */ s16 unk_3B2;
/* 0x03B4 */ s16 unk_3B4;
/* 0x03B6 */ s16 unk_3B6;
/* 0x03B8 */ s16 unk_3B8;
/* 0x03BA */ s16 unk_3BA;
/* 0x03BC */ s16 unk_3BC;
/* 0x03BE */ s16 unk_3BE;
/* 0x03C0 */ s16 unk_3C0;
/* 0x03C2 */ s16 unk_3C2;
/* 0x03C4 */ s16 unk_3C4;
/* 0x03C6 */ s16 unk_3C6;
/* 0x03C8 */ s16 unk_3C8[3];
/* 0x03CE */ s16 unk_3CE[3];
/* 0x03D4 */ s16 unk_3D4;
/* 0x03D8 */ void* unk_3D8;
/* 0x03DC */ s32 unk_3DC;
/* 0x03E0 */ UNK_TYPE1 unk3E0[0x4];
/* 0x03E4 */ s32 unk_3E4;
/* 0x03E8 */ s32 unk_3E8;
/* 0x03EC */ s32 unk_3EC;
/* 0x03F0 */ s32 unk_3F0;
/* 0x03F4 */ s32 unk_3F4;
/* 0x03F8 */ EnGoStruct unk_3F8[32];
} EnGo; // size = 0xB78
extern const ActorInit En_Go_InitVars;

4
tools/disasm/functions.txt
View File

@ -9742,8 +9742,8 @@
0x80A15960:("EnGo_Destroy",),
0x80A159B0:("EnGo_Update",),
0x80A15B80:("func_80A15B80",),
0x80A15D04:("func_80A15D04",),
0x80A15E38:("func_80A15E38",),
0x80A15D04:("EnGo_OverrideLimbDraw",),
0x80A15E38:("EnGo_UnkDraw",),
0x80A15FEC:("func_80A15FEC",),
0x80A16D40:("func_80A16D40",),
0x80A16D6C:("func_80A16D6C",),

16
undefined_syms.txt
View File

@ -2375,22 +2375,6 @@ D_0600B990 = 0x0600B990;
D_0600BA80 = 0x0600BA80;
D_0600C03C = 0x0600C03C;
// ovl_En_Go
D_060003D0 = 0x060003D0;
D_06000458 = 0x06000458;
D_060008C0 = 0x060008C0;
D_06000948 = 0x06000948;
D_06000D50 = 0x06000D50;
D_06000DD8 = 0x06000DD8;
D_06001560 = 0x06001560;
D_060031A0 = 0x060031A0;
D_06003258 = 0x06003258;
D_060091A8 = 0x060091A8;
D_06011AC8 = 0x06011AC8;
D_06014CF0 = 0x06014CF0;
D_06014D00 = 0x06014D00;
// ovl_En_Goroiwa
D_060032E0 = 0x060032E0;