Matched REL/m405 + some code cleanup

This commit is contained in:
mrshigure 2024-05-15 18:56:45 -07:00
parent 440e47ec2c
commit 66ba618452
34 changed files with 2683 additions and 216 deletions

View file

@ -133,7 +133,7 @@ typedef struct UnkPresentNestedInnerStruct {
typedef struct UnkPresentNestedOuterStruct {
/* 0x00 */ s32 unk00;
/* 0x04 */ UnkPresentNestedInnerStruct unk_04[11];
/* 0x04 */ UnkPresentNestedInnerStruct unk_04[11];
} UnkPresentNestedOuterStruct;
typedef struct UnkPresentStruct7 {

View file

@ -8,7 +8,7 @@
#define ARRAY_COUNT(arr) (s32)(sizeof(arr) / sizeof(arr[0]))
enum {
MAPOBJ_MAX = 12
MAPOBJ_MAX = 12
};
typedef struct w03UnkStruct2{

View file

@ -5,8 +5,8 @@
#include "game/window.h"
enum {
MAPOBJ_MELON = 0,
MAPOBJ_MAX,
MAPOBJ_MELON = 0,
MAPOBJ_MAX,
};
typedef struct w10_board_work {

View file

@ -5,8 +5,8 @@
#include "dolphin/mtx.h"
typedef struct vec2f {
float x;
float y;
float x;
float y;
} Vec2f;
#define ABS(x) (((x) < 0) ? -(x) : (x))

View file

@ -42,6 +42,6 @@ void fn_8004F52C(s16 character, s32 arg1);
void CharModelEffectEnableSet(s16 character, s32 arg1);
s32 CharModelEffectNpcInit(s16 arg0, s16 arg1, s16 arg2, s16 arg3);
s32 CharModelEffectNpcInitSilent(s16 arg0, s16 arg1, s16 arg2);
s32 CharModelStepTypeSet(s16 character, s32 arg1);
void CharModelStepTypeSet(s16 character, s32 arg1);
#endif

View file

@ -150,7 +150,7 @@ typedef struct hsf_face {
s16 mat;
union {
struct {
s16 indices[3][4];
s16 indices[3][4];
u32 count;
s16 *data;
} strip;

View file

@ -38,9 +38,9 @@ typedef struct model_data {
u32 motion_attr;
Point3d unk_58;
f32 unk_64;
f32 unk_68;
f32 unk_6C;
f32 unk_70;
f32 unk_68;
f32 unk_6C;
f32 unk_70;
f32 unk_74;
f32 unk_78;
f32 unk_7C;
@ -55,10 +55,10 @@ typedef struct model_data {
f32 unk_A0;
f32 unk_A4[4];
f32 unk_B4[4];
union {
HsfData *hsfData;
ModelHookFunc hook;
};
union {
HsfData *hsfData;
ModelHookFunc hook;
};
HsfData *unk_C8;
Vec pos;
Vec rot;