Game-Decompilation/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2024-11-23 12:59:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

En_Goroiwa (3 non-matching) (#375)

Browse Source 
* En_Goroiwa

* Fix names

* Params

* Revert PR
This commit is contained in:
Maide 2021-11-04 17:42:01 +00:00 committed by GitHub
parent ad4c16d40f
commit 31e4089a4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 1625 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/functions.h
View File

@ -544,8 +544,8 @@ void func_800AE5A0(GlobalContext* globalCtx);
// void func_800AE5E4(void);
void func_800AE778(GlobalContext* globalCtx, Color_RGBA8* color, s16 param_3, s16 param_4);
void func_800AE8EC(GlobalContext* globalCtx);
void func_800AE930(CollisionContext* colCtx, s32 param_2, float* param_3, f32 param_4, s16 param_5, CollisionPoly* param_6, s32 param_7);
// void func_800AEF44(void);
void func_800AE930(CollisionContext* colCtx, s32 param_2, Vec3f* param_3, f32 param_4, s16 param_5, CollisionPoly* param_6, s32 param_7);
void func_800AEF44(s32 arg0);
void EffectTireMark_InitParticle(EffTireMarkParticle* particle);
void EffectTireMark_Init(EffTireMarkParams* params, EffTireMarkInit* init);
void EffectTireMark_Destroy(EffTireMarkParams* params);
@ -984,7 +984,7 @@ f32 func_800C4000(GlobalContext* globalCtx, CollisionContext* colCtx, s32* arg2,
// void func_800C4058(void);
f32 func_800C40B4(CollisionContext* colCtx, CollisionPoly** arg1, s32* arg2, Vec3f* pos);
f32 func_800C411C(CollisionContext* colCtx, CollisionPoly** arg1, s32* arg2, Actor* actor, Vec3f* pos);
// void func_800C4188(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6);
f32 func_800C4188(GlobalContext* globalCtx, CollisionContext* colCtx, CollisionPoly** outPoly, s32* bgId, Actor* actor, Vec3f* pos);
// void func_800C41E4(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6);
// void func_800C4240(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6);
// void func_800C42A8(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5);

5
spec
View File

@ -1557,8 +1557,11 @@ beginseg
name "ovl_En_Goroiwa"
compress
include "build/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.o"
include "build/data/ovl_En_Goroiwa/ovl_En_Goroiwa.data.o"
#ifdef NON_MATCHING
include "build/src/overlays/actors/ovl_En_Goroiwa/ovl_En_Goroiwa_reloc.o"
#else
include "build/data/ovl_En_Goroiwa/ovl_En_Goroiwa.reloc.o"
#endif
endseg
beginseg

1609
src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c
View File

File diff suppressed because it is too large Load Diff

71
src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.h
View File

@ -6,12 +6,79 @@
struct EnGoroiwa;
typedef void (*EnGoroiwaActionFunc)(struct EnGoroiwa*, GlobalContext*);
typedef s32 (*EnGoroiwaUnkFunc)(struct EnGoroiwa*);
#define ENGOROIWA_GET_C000(thisx) (((thisx)->params >> 0xE) & 3)
#define ENGOROIWA_GET_3000(thisx) (((thisx)->params >> 0xC) & 3)
#define ENGOROIWA_GET_400(thisx) (((thisx)->params >> 0xA) & 1)
#define ENGOROIWA_GET_300(thisx) (((thisx)->params >> 0x8) & 3)
#define ENGOROIWA_GET_FF(thisx) ((thisx)->params & 0xFF)
enum {
/* 0 */ ENGOROIWA_300_0,
/* 1 */ ENGOROIWA_300_1,
/* 3 */ ENGOROIWA_300_3 = 3,
};
enum {
/* 0 */ ENGOROIWA_400_0,
/* 1 */ ENGOROIWA_400_1,
};
enum {
/* 0 */ ENGOROIWA_3000_0,
/* 1 */ ENGOROIWA_3000_1,
/* 2 */ ENGOROIWA_3000_2,
};
enum {
/* 1 */ ENGOROIWA_C000_1 = 1,
/* 2 */ ENGOROIWA_C000_2,
};
typedef struct {
/* 0x00 */ Vec3f unk_00;
/* 0x0C */ f32 unk_0C;
/* 0x10 */ f32 unk_10;
/* 0x14 */ f32 unk_14;
/* 0x18 */ f32 unk_18;
/* 0x1C */ s16 unk_1C;
/* 0x1E */ s16 unk_1E;
/* 0x20 */ s16 unk_20;
/* 0x22 */ s16 unk_22;
/* 0x24 */ s16 unk_24;
/* 0x26 */ s16 unk_26;
/* 0x28 */ CollisionPoly* unk_28;
/* 0x2C */ u8 unk_2C;
/* 0x2D */ u8 unk_2D;
} EnGoroiwaStruct; // size = 0x30
typedef struct EnGoroiwa {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x60];
/* 0x0144 */ ColliderJntSph collider;
/* 0x0164 */ ColliderJntSphElement colliderElements[1];
/* 0x01A4 */ EnGoroiwaActionFunc actionFunc;
/* 0x01A8 */ char unk_1A8[0xA4];
/* 0x01A8 */ Vec3f unk_1A8;
/* 0x01B4 */ Vec3f unk_1B4;
/* 0x01C0 */ f32 unk_1C0;
/* 0x01C4 */ f32 unk_1C4;
/* 0x01C8 */ s16 unk_1C8;
/* 0x01CA */ s16 unk_1CA;
/* 0x01CC */ s16 unk_1CC;
/* 0x01CE */ s16 unk_1CE;
/* 0x01D0 */ Vec3s* unk_1D0;
/* 0x01D4 */ s16 unk_1D4;
/* 0x01D6 */ s16 unk_1D6;
/* 0x01D8 */ s16 unk_1D8;
/* 0x01DA */ s16 unk_1DA;
/* 0x01DC */ f32 unk_1DC;
/* 0x01E0 */ f32 unk_1E0;
/* 0x01E4 */ s8 unk_1E4;
/* 0x01E5 */ u8 unk_1E5;
/* 0x01E6 */ s8 unk_1E6;
/* 0x01E7 */ s8 unk_1E7;
/* 0x01E8 */ EnGoroiwaStruct unk_1E8[2];
/* 0x0248 */ s32 unk_248;
} EnGoroiwa; // size = 0x24C
extern const ActorInit En_Goroiwa_InitVars;

12
undefined_syms.txt
View File

@ -2388,6 +2388,18 @@ D_06014D00 = 0x06014D00;
D_060032E0 = 0x060032E0;
D_060082D0 = 0x060082D0;
D_06005C20 = 0x06005C20;
D_06003B40 = 0x06003B40;
D_06008B90 = 0x06008B90;
D_060042B0 = 0x060042B0;
D_06004960 = 0x06004960;
D_06004EF0 = 0x06004EF0;
D_060003B0 = 0x060003B0;
D_060028E0 = 0x060028E0;
D_06002D70 = 0x06002D70;
D_060072F0 = 0x060072F0;
D_060077D0 = 0x060077D0;
D_06007C60 = 0x06007C60;
// ovl_En_Grasshopper