Replace most of f32 with float

This commit is contained in:
dbalatoni13 2025-04-01 06:37:15 +02:00
parent 77635b51e3
commit dd2c167c8e
15 changed files with 713 additions and 712 deletions

View file

@ -27,10 +27,10 @@ void fn_1_15D8(void);
void fn_1_1B1C(Process *arg0); void fn_1_1B1C(Process *arg0);
void fn_1_1CA8(void); void fn_1_1CA8(void);
void fn_1_1CAC(f32, f32, f32); void fn_1_1CAC(float, float, float);
void fn_1_1CD4(f32* arg0, f32* arg1, f32* arg2); void fn_1_1CD4(float *arg0, float *arg1, float *arg2);
s32 fn_1_1D88(void); s32 fn_1_1D88(void);
void fn_1_1DB0(Point3d *arg0, Point3d *arg1, f32 *arg2, s32 arg3, s32 arg4); void fn_1_1DB0(Point3d *arg0, Point3d *arg1, float *arg2, s32 arg3, s32 arg4);
void fn_1_2354(Process *arg0); void fn_1_2354(Process *arg0);
void fn_1_2564(void); void fn_1_2564(void);
@ -47,7 +47,7 @@ void fn_1_3B68(void);
void fn_1_41CC(Process *arg0); void fn_1_41CC(Process *arg0);
void fn_1_44F4(void); void fn_1_44F4(void);
void fn_1_4980(Process* arg0); void fn_1_4980(Process *arg0);
void fn_1_4C6C(omObjData *obj); void fn_1_4C6C(omObjData *obj);
void fn_1_5C5C(Process *arg0, s16 arg1); void fn_1_5C5C(Process *arg0, s16 arg1);

View file

@ -3,17 +3,18 @@
#include "dolphin.h" #include "dolphin.h"
#include "game/object.h"
#include "game/animdata.h" #include "game/animdata.h"
#include "game/hsfanim.h" #include "game/hsfanim.h"
#include "game/object.h"
extern s32 rand8(void); extern s32 rand8(void);
// types // types
typedef void (*m409Func6)(ModelData*, struct _unkStruct6*, Mtx); typedef void (*m409Func6)(ModelData *, struct _unkStruct6 *, Mtx);
typedef void (*m409PlayerFunc8)(struct _unkStruct8*); typedef void (*m409PlayerFunc8)(struct _unkStruct8 *);
typedef struct _unkStruct { typedef struct _unkStruct {
f32 zoom; float zoom;
Vec center; Vec center;
Vec rot; Vec rot;
} unkStruct; } unkStruct;
@ -27,14 +28,14 @@ typedef struct _unkStruct3 {
s8 unk0; s8 unk0;
s8 unk1; s8 unk1;
s16 unk2; s16 unk2;
struct _unkStruct4* unk4; struct _unkStruct4 *unk4;
s16 unk8; s16 unk8;
s16 unkA; s16 unkA;
s16 unkC; s16 unkC;
s16 unkE; s16 unkE;
s16 unk10; s16 unk10;
s16 unk12; s16 unk12;
f32 unk14; float unk14;
} unkStruct3; } unkStruct3;
typedef struct _unkStruct4 { typedef struct _unkStruct4 {
@ -49,26 +50,26 @@ typedef struct _unkStruct4 {
s16 unkA; s16 unkA;
s16 unkC; s16 unkC;
s16 unkE; s16 unkE;
f32 unk10; float unk10;
s16 unk14; s16 unk14;
s16 unk16; s16 unk16;
f32 unk18; float unk18;
f32 unk1C; float unk1C;
struct _unkStruct4* unk20; struct _unkStruct4 *unk20;
} unkStruct4; // sizeof 0x24 } unkStruct4; // sizeof 0x24
typedef struct _unkStruct5 { typedef struct _unkStruct5 {
Vec unk0; Vec unk0;
Vec unkC; Vec unkC;
f32 unk18; float unk18;
f32 unk1C; float unk1C;
f32 unk20; float unk20;
f32 unk24; float unk24;
s16 unk28; s16 unk28;
s16 unk2A; s16 unk2A;
s16 unk2C; s16 unk2C;
s16 unk2E; s16 unk2E;
f32 unk30; float unk30;
Vec unk34; Vec unk34;
Vec unk40; Vec unk40;
s16 unk4C; s16 unk4C;
@ -81,20 +82,20 @@ typedef struct _unkStruct6 {
u32 unk4; u32 unk4;
u8 unk8; u8 unk8;
m409Func6 unkC; m409Func6 unkC;
AnimData* unk10; AnimData *unk10;
s16 unk14; s16 unk14;
unkStruct5* unk18; unkStruct5 *unk18;
Vec* unk1C; Vec *unk1C;
HsfVector2f* unk20; HsfVector2f *unk20;
GXColor* unk24; GXColor *unk24;
void* unk28; void *unk28;
Vec unk2C; Vec unk2C;
Vec unk38; Vec unk38;
Vec unk44; Vec unk44;
Vec unk50; Vec unk50;
HsfVector2f* unk5C; HsfVector2f *unk5C;
f32 unk60; float unk60;
f32 unk64; float unk64;
} unkStruct6; // sizeof 0x68 } unkStruct6; // sizeof 0x68
typedef struct _unkStruct7 { typedef struct _unkStruct7 {
@ -147,22 +148,22 @@ typedef struct _unkStruct8Sub {
u8 unk32; u8 unk32;
u32 unk34; u32 unk34;
s16 unk38; s16 unk38;
void* unk3C; void *unk3C;
void* unk40; void *unk40;
void* unk44; void *unk44;
Vec* unk48; Vec *unk48;
GXColor unk4C; GXColor unk4C;
GXColor unk50; GXColor unk50;
struct _unkStruct12* unk54; struct _unkStruct12 *unk54;
Vec unk58; Vec unk58;
Vec unk64; Vec unk64;
union { union {
s16 unk70[0x10]; s16 unk70[0x10];
struct { struct {
s16 unk70s; s16 unk70s;
f32 unk74; float unk74;
f32 unk78; float unk78;
f32 unk7C; float unk7C;
}; };
}; };
} unkStruct8Sub; // sizeof 0x90 } unkStruct8Sub; // sizeof 0x90
@ -177,9 +178,9 @@ typedef struct _unkStruct8 {
Vec unk18; Vec unk18;
Vec unk24; Vec unk24;
m409PlayerFunc8 unk30; m409PlayerFunc8 unk30;
s16* unk34; s16 *unk34;
char unk38[0x4]; char unk38[0x4];
unkStruct8Sub* unk3C; unkStruct8Sub *unk3C;
char unk40[0x8]; char unk40[0x8];
Vec unk48; Vec unk48;
Vec unk54; Vec unk54;
@ -187,7 +188,7 @@ typedef struct _unkStruct8 {
} unkStruct8; // sizeof 0xA0 } unkStruct8; // sizeof 0xA0
typedef struct _unkStruct9Sub { typedef struct _unkStruct9Sub {
AnimData* unk0; AnimData *unk0;
s16 unk4; s16 unk4;
s16 unk6; s16 unk6;
u32 unk8; u32 unk8;
@ -197,10 +198,10 @@ typedef struct _unkStruct9Sub {
u8 unk4C; u8 unk4C;
s16 unk4E; s16 unk4E;
s16 unk50; s16 unk50;
f32 unk54; float unk54;
f32 unk58; float unk58;
f32 unk5C; float unk5C;
f32 unk60; float unk60;
} unkStruct9Sub; // sizeof 0x64 } unkStruct9Sub; // sizeof 0x64
typedef struct _unkStruct9 { typedef struct _unkStruct9 {
@ -210,8 +211,8 @@ typedef struct _unkStruct9 {
s16 unk6; s16 unk6;
s16 unk8; s16 unk8;
s16 unkA; s16 unkA;
unkStruct9Sub* unkC; unkStruct9Sub *unkC;
unkStruct8* unk10; unkStruct8 *unk10;
} unkStruct9; // sizeof 0x14 } unkStruct9; // sizeof 0x14
typedef struct _unkStruct10 { typedef struct _unkStruct10 {
@ -221,7 +222,7 @@ typedef struct _unkStruct10 {
u8 unk3; u8 unk3;
u8 unk4; u8 unk4;
char unk5[0x3]; char unk5[0x3];
f32 unk8; float unk8;
Vec unkC; Vec unkC;
Vec unk18; Vec unk18;
Vec unk24; Vec unk24;
@ -229,7 +230,7 @@ typedef struct _unkStruct10 {
Vec unk3C; Vec unk3C;
s8 unk48; s8 unk48;
char unk49[0x3]; char unk49[0x3];
f32 unk4C; float unk4C;
} unkStruct10; // sizeof 0x50 } unkStruct10; // sizeof 0x50
typedef struct unkStruct11 { typedef struct unkStruct11 {
@ -243,11 +244,11 @@ typedef struct _unkStruct12 {
s8 unk0; s8 unk0;
s8 unk1; s8 unk1;
s16 unk2; s16 unk2;
HsfVector2f* unk4; HsfVector2f *unk4;
u8 unk8; u8 unk8;
s16 unkA; s16 unkA;
f32 unkC; float unkC;
f32 unk10; float unk10;
} unkStruct12; } unkStruct12;
// bss // bss
@ -255,78 +256,78 @@ extern unkStruct9 lbl_1_bss_F0;
// prototypes // prototypes
void ObjectSetup(void); void ObjectSetup(void);
void fn_1_434(omObjData* object); void fn_1_434(omObjData *object);
void fn_1_4DC(omObjData* object); void fn_1_4DC(omObjData *object);
s8 fn_1_524(void); s8 fn_1_524(void);
s8 fn_1_B80(void); s8 fn_1_B80(void);
void fn_1_DDC(omObjData* object); void fn_1_DDC(omObjData *object);
void fn_1_F70(omObjData* object); void fn_1_F70(omObjData *object);
s8 fn_1_10E8(omObjData* object); s8 fn_1_10E8(omObjData *object);
s8 fn_1_1B74(omObjData* object); s8 fn_1_1B74(omObjData *object);
void fn_1_2098(omObjData* object); void fn_1_2098(omObjData *object);
void fn_1_23EC(s16); void fn_1_23EC(s16);
void fn_1_2414(u16, u16); void fn_1_2414(u16, u16);
u16 fn_1_2454(u16); u16 fn_1_2454(u16);
void fn_1_2484(omObjData* object); void fn_1_2484(omObjData *object);
void fn_1_2DCC(omObjData* object); void fn_1_2DCC(omObjData *object);
void fn_1_3840(void); void fn_1_3840(void);
void fn_1_3988(unkStruct4*, s16, s16); void fn_1_3988(unkStruct4 *, s16, s16);
s32 fn_1_3AD8(s32, f32, f32, f32, f32, f32, f32); s32 fn_1_3AD8(s32, float, float, float, float, float, float);
void fn_1_40A4(Mtx, Mtx); void fn_1_40A4(Mtx, Mtx);
f32 fn_1_4120(f32, f32, f32, f32); float fn_1_4120(float, float, float, float);
void fn_1_417C(void); void fn_1_417C(void);
void fn_1_44F0(s16, f32, f32, f32, s8, s16); void fn_1_44F0(s16, float, float, float, s8, s16);
void fn_1_4FFC(s16, f32, f32, f32, s16); void fn_1_4FFC(s16, float, float, float, s16);
void fn_1_5408(ModelData*, unkStruct6*, Mtx); void fn_1_5408(ModelData *, unkStruct6 *, Mtx);
void fn_1_55E0(ModelData*, unkStruct6*, Mtx); void fn_1_55E0(ModelData *, unkStruct6 *, Mtx);
void fn_1_57DC(ModelData*, unkStruct6*, Mtx); void fn_1_57DC(ModelData *, unkStruct6 *, Mtx);
unkStruct5* fn_1_58E0(s16, Vec*, Vec*, f32, GXColor*); unkStruct5 *fn_1_58E0(s16, Vec *, Vec *, float, GXColor *);
s16 fn_1_5A18(AnimData*, s16, f32, s16, s16); s16 fn_1_5A18(AnimData *, s16, float, s16, s16);
void fn_1_5F5C(s16); void fn_1_5F5C(s16);
void fn_1_5FBC(s16, m409Func6); void fn_1_5FBC(s16, m409Func6);
void fn_1_5FF4(s16, u8); void fn_1_5FF4(s16, u8);
void fn_1_602C(ModelData*, Mtx); void fn_1_602C(ModelData *, Mtx);
void fn_1_6608(HsfVector2f*, s16, s16, f32, f32); void fn_1_6608(HsfVector2f *, s16, s16, float, float);
void fn_1_66D4(HsfVector2f*, HsfVector2f*, s16, f32, f32); void fn_1_66D4(HsfVector2f *, HsfVector2f *, s16, float, float);
void fn_1_6778(Vec*, Vec*, Vec*, s16); void fn_1_6778(Vec *, Vec *, Vec *, s16);
// player.c // player.c
void fn_1_67E0(Process*); void fn_1_67E0(Process *);
void fn_1_6900(void); void fn_1_6900(void);
void fn_1_6928(omObjData*); void fn_1_6928(omObjData *);
void fn_1_7344(omObjData*); void fn_1_7344(omObjData *);
void fn_1_7FE8(omObjData*); void fn_1_7FE8(omObjData *);
void fn_1_8838(unkStruct8*); void fn_1_8838(unkStruct8 *);
s8 fn_1_8D08(u8); s8 fn_1_8D08(u8);
void fn_1_8D6C(unkStruct8*); void fn_1_8D6C(unkStruct8 *);
void fn_1_91C0(omObjData*); void fn_1_91C0(omObjData *);
void fn_1_962C(omObjData*); void fn_1_962C(omObjData *);
s32 fn_1_A584(unkStruct10*); s32 fn_1_A584(unkStruct10 *);
s8 fn_1_A9C0(Vec*, f32*); s8 fn_1_A9C0(Vec *, float *);
s32 fn_1_ABB4(void); s32 fn_1_ABB4(void);
void fn_1_AC08(s32*, s32); void fn_1_AC08(s32 *, s32);
f32 fn_1_AD40(f32, f32, f32); float fn_1_AD40(float, float, float);
f32 fn_1_AE94(f32, f32, f32, f32); float fn_1_AE94(float, float, float, float);
void fn_1_AF0C(f32*, f32*, f32*, f32*, f32); void fn_1_AF0C(float *, float *, float *, float *, float);
f32 fn_1_B028(f32, f32, f32, f32); float fn_1_B028(float, float, float, float);
void fn_1_B0A0(f32*, f32*, f32*, f32*, f32); void fn_1_B0A0(float *, float *, float *, float *, float);
f32 fn_1_B378(Vec*); float fn_1_B378(Vec *);
f32 fn_1_B6A4(Vec*, Vec*, Vec*); float fn_1_B6A4(Vec *, Vec *, Vec *);
f32 fn_1_B9E0(Vec*, Vec*, Vec*, Vec*, Vec*); float fn_1_B9E0(Vec *, Vec *, Vec *, Vec *, Vec *);
f32 fn_1_BF38(s16); float fn_1_BF38(s16);
// cursor.c // cursor.c
void fn_1_BF88(s16, s16); void fn_1_BF88(s16, s16);
void fn_1_C0C0(void); void fn_1_C0C0(void);
void fn_1_C164(unkStruct8*); void fn_1_C164(unkStruct8 *);
void fn_1_CB98(ModelData* model, Mtx matrix); void fn_1_CB98(ModelData *model, Mtx matrix);
unkStruct8* fn_1_CCB0(s16 idx); unkStruct8 *fn_1_CCB0(s16 idx);
unkStruct8Sub* fn_1_CCCC(s16, s16); unkStruct8Sub *fn_1_CCCC(s16, s16);
void fn_1_CCF8(unkStruct11**, s16, f32, f32); void fn_1_CCF8(unkStruct11 **, s16, float, float);
void fn_1_CE7C(Vec**, s16, Vec*); void fn_1_CE7C(Vec **, s16, Vec *);
void fn_1_CF1C(GXColor**, s16, GXColor*); void fn_1_CF1C(GXColor **, s16, GXColor *);
void fn_1_CFC4(Vec**, s16, Vec*); void fn_1_CFC4(Vec **, s16, Vec *);
void fn_1_D050(HsfVector2f**, s16, HsfVector2f*); void fn_1_D050(HsfVector2f **, s16, HsfVector2f *);
void fn_1_D0E8(unkStruct8Sub*); void fn_1_D0E8(unkStruct8Sub *);
void fn_1_D430(unkStruct8*); void fn_1_D430(unkStruct8 *);
s16 fn_1_DA48(u8, u8); s16 fn_1_DA48(u8, u8);
void fn_1_DDB8(s16); void fn_1_DDB8(s16);
void fn_1_DEF4(s16, s16, u8); void fn_1_DEF4(s16, s16, u8);
@ -334,19 +335,19 @@ s16 fn_1_DF20(u32, s16, s16);
void fn_1_E228(s16); void fn_1_E228(s16);
s32 fn_1_E2A8(s16, u8, u32, s16, s16); s32 fn_1_E2A8(s16, u8, u32, s16, s16);
s32 fn_1_E7C8(s16, u8, u32); s32 fn_1_E7C8(s16, u8, u32);
void fn_1_E818(s16, f32, f32, f32); void fn_1_E818(s16, float, float, float);
void fn_1_E85C(s16, s16, f32, f32, f32); void fn_1_E85C(s16, s16, float, float, float);
void fn_1_E8CC(s16, f32, f32, f32); void fn_1_E8CC(s16, float, float, float);
void fn_1_E940(s16, f32, f32, f32); void fn_1_E940(s16, float, float, float);
void fn_1_E99C(s16, s16, f32, f32, f32); void fn_1_E99C(s16, s16, float, float, float);
void fn_1_E940(s16, f32, f32, f32); void fn_1_E940(s16, float, float, float);
void fn_1_EA24(s16, f32, f32, f32); void fn_1_EA24(s16, float, float, float);
void fn_1_EAB0(s16, f32, f32, f32); void fn_1_EAB0(s16, float, float, float);
void fn_1_EAF4(s16, s16, f32, f32, f32); void fn_1_EAF4(s16, s16, float, float, float);
void fn_1_EB64(s16, f32, f32, f32); void fn_1_EB64(s16, float, float, float);
void fn_1_EBD8(s16, f32, f32, f32); void fn_1_EBD8(s16, float, float, float);
void fn_1_EC1C(s16, s16, f32, f32, f32); void fn_1_EC1C(s16, s16, float, float, float);
void fn_1_EC8C(s16, f32, f32, f32); void fn_1_EC8C(s16, float, float, float);
void fn_1_ED00(s16, s32); void fn_1_ED00(s16, s32);
void fn_1_ED44(s16, s16, s32); void fn_1_ED44(s16, s16, s32);
void fn_1_EDB4(s16, s32); void fn_1_EDB4(s16, s32);
@ -360,9 +361,9 @@ void fn_1_F098(s16, u8, u8, u8, u8);
void fn_1_F110(s16, s16, u8); void fn_1_F110(s16, s16, u8);
void fn_1_F17C(s16, s16, u8, u8); void fn_1_F17C(s16, s16, u8, u8);
void fn_1_F1F4(s16, u8); void fn_1_F1F4(s16, u8);
void fn_1_F28C(s16, s16, f32); void fn_1_F28C(s16, s16, float);
void fn_1_F2F8(s16, s16, u8, f32); void fn_1_F2F8(s16, s16, u8, float);
void fn_1_F370(s16, f32); void fn_1_F370(s16, float);
void fn_1_F408(s16, s16, u8); void fn_1_F408(s16, s16, u8);
void fn_1_F478(s16, s16, u8, u8); void fn_1_F478(s16, s16, u8, u8);
void fn_1_F4F0(s16, u8); void fn_1_F4F0(s16, u8);

View file

@ -3,8 +3,9 @@
#include "dolphin.h" #include "dolphin.h"
#include "game/object.h"
#include "game/hsfman.h" #include "game/hsfman.h"
#include "game/object.h"
// types // types
typedef struct _unkStruct { typedef struct _unkStruct {
@ -18,8 +19,8 @@ typedef struct _unkStruct {
Vec unk10; Vec unk10;
HsfVector2f unk1C; HsfVector2f unk1C;
Vec unk24; Vec unk24;
f32 unk30; float unk30;
f32 unk34; float unk34;
} unkStruct; } unkStruct;
typedef struct _unkStruct2 { typedef struct _unkStruct2 {
@ -58,7 +59,7 @@ typedef struct _unkStruct3 {
HsfVector2f unk4C; HsfVector2f unk4C;
Vec unk54; Vec unk54;
Vec unk60; Vec unk60;
f32 unk6C; float unk6C;
char unk70[0xC]; char unk70[0xC];
Vec unk7C; Vec unk7C;
s8 unk88; s8 unk88;
@ -68,7 +69,7 @@ typedef struct _unkStruct3 {
u16 unk8C; u16 unk8C;
u16 unk8E; u16 unk8E;
HsfVector2f unk90; HsfVector2f unk90;
f32 unk98; float unk98;
s32 unk9C; s32 unk9C;
s32 unkA0; s32 unkA0;
s32 unkA4; s32 unkA4;
@ -83,38 +84,38 @@ typedef struct _unkStruct4 {
// prototypes // prototypes
void ObjectSetup(void); void ObjectSetup(void);
void* fn_1_6EC(f32, f32, f32, s32); void *fn_1_6EC(float, float, float, s32);
void fn_1_73C(void); void fn_1_73C(void);
void fn_1_7BC(void); void fn_1_7BC(void);
void fn_1_894(omObjData* object); void fn_1_894(omObjData *object);
void fn_1_898(omObjData* object); void fn_1_898(omObjData *object);
void fn_1_8BC(void); void fn_1_8BC(void);
f32 fn_1_1D08(f32); float fn_1_1D08(float);
void fn_1_1D88(void); void fn_1_1D88(void);
void fn_1_1DBC(void); void fn_1_1DBC(void);
void fn_1_2014(void); void fn_1_2014(void);
void fn_1_2064(void); void fn_1_2064(void);
s32 fn_1_2708(void); s32 fn_1_2708(void);
f32 fn_1_27C4(s32, f32, f32); float fn_1_27C4(s32, float, float);
void fn_1_2A1C(void); void fn_1_2A1C(void);
void fn_1_3950(void); void fn_1_3950(void);
s8 fn_1_4BE4(s32, s32); s8 fn_1_4BE4(s32, s32);
void fn_1_4C9C(Vec*, f32, f32); void fn_1_4C9C(Vec *, float, float);
s8 fn_1_4E58(s32, s32); s8 fn_1_4E58(s32, s32);
u8 fn_1_525C(s32, s32); u8 fn_1_525C(s32, s32);
u16 fn_1_531C(s32); u16 fn_1_531C(s32);
u16 fn_1_5388(s32); u16 fn_1_5388(s32);
s32 fn_1_53F4(unkStruct3*, f32, f32, f32); s32 fn_1_53F4(unkStruct3 *, float, float, float);
s32 fn_1_561C(unkStruct3*, s32*); s32 fn_1_561C(unkStruct3 *, s32 *);
void fn_1_5838(unkStruct3*); void fn_1_5838(unkStruct3 *);
f32 fn_1_6594(f32, f32, f32); float fn_1_6594(float, float, float);
f32 fn_1_6698(f32, f32, unkStruct3*); float fn_1_6698(float, float, unkStruct3 *);
void fn_1_6814(unkStruct3*); void fn_1_6814(unkStruct3 *);
void fn_1_7C60(void); void fn_1_7C60(void);
void fn_1_A01C(ModelData* model, ParticleData* particle, Mtx matrix); void fn_1_A01C(ModelData *model, ParticleData *particle, Mtx matrix);
void fn_1_A618(ModelData* model, ParticleData* particle, Mtx matrix); void fn_1_A618(ModelData *model, ParticleData *particle, Mtx matrix);
//... //...
void fn_1_AA88(ModelData* model, ParticleData* particle, Mtx matrix); // * void fn_1_AA88(ModelData *model, ParticleData *particle, Mtx matrix); // *
void fn_1_B160(void); // * void fn_1_B160(void); // *
void fn_1_B1C0(void); // * void fn_1_B1C0(void); // *

View file

@ -53,10 +53,10 @@ typedef struct _unkStruct3 {
s16 unk16; s16 unk16;
s16 unk18; s16 unk18;
s16 unk1A; s16 unk1A;
f32 unk1C; float unk1C;
f32 unk20; float unk20;
f32 unk24; float unk24;
f32 unk28; float unk28;
Vec unk2C; Vec unk2C;
Vec unk38; Vec unk38;
Vec unk44; Vec unk44;
@ -64,7 +64,7 @@ typedef struct _unkStruct3 {
u8 unk5C; u8 unk5C;
u8 unk5D; u8 unk5D;
union { union {
s32* unk60; s32 *unk60;
struct { struct {
s16 unk60s; s16 unk60s;
s16 unk62s; s16 unk62s;
@ -90,18 +90,18 @@ typedef struct _unkStruct4 {
Vec unk88[3]; Vec unk88[3];
Vec unkAC[3]; Vec unkAC[3];
Vec unkD0[3]; Vec unkD0[3];
f32 unkF4[3]; float unkF4[3];
f32 unk100[3]; float unk100[3];
f32 unk10C[3]; float unk10C[3];
f32 unk118[3]; float unk118[3];
f32 unk124[3]; float unk124[3];
f32 unk130; float unk130;
f32 unk134; float unk134;
f32 unk138; float unk138;
f32 unk13C; float unk13C;
f32 unk140; float unk140;
f32 unk144; float unk144;
f32 unk148; float unk148;
} unkStruct4; } unkStruct4;
typedef struct _unkSubStruct4 { typedef struct _unkSubStruct4 {
@ -111,8 +111,8 @@ typedef struct _unkSubStruct4 {
HsfVector2f unk4[4]; HsfVector2f unk4[4];
u8 unk24; u8 unk24;
char unk25[0x3]; char unk25[0x3];
f32 unk28; float unk28;
f32 unk2C; float unk2C;
} unkSubStruct4; } unkSubStruct4;
// taken from m438 // taken from m438
@ -127,24 +127,24 @@ typedef struct _unkSubStruct {
u8 unk33; u8 unk33;
u32 unk34; u32 unk34;
s16 unk38; s16 unk38;
void* unk3C; void *unk3C;
Vec* unk40; Vec *unk40;
GXColor* unk44; GXColor *unk44;
Vec* unk48; Vec *unk48;
GXColor unk4C; GXColor unk4C;
GXColor unk50; GXColor unk50;
unkSubStruct4* unk54; unkSubStruct4 *unk54;
u8 unk58; u8 unk58;
char unk59[0x3]; char unk59[0x3];
Vec unk5C; Vec unk5C;
Vec unk68; Vec unk68;
s16 unk74[2]; s16 unk74[2];
s16* unk78; s16 *unk78;
s16* unk7C; s16 *unk7C;
char unk80[0x14]; char unk80[0x14];
} unkSubStruct; /* size = 0x94 */ } unkSubStruct; /* size = 0x94 */
typedef void (*unkSubStruct2Func)(struct _unkSubStruct2*); typedef void (*unkSubStruct2Func)(struct _unkSubStruct2 *);
typedef struct _unkSubStruct2 { typedef struct _unkSubStruct2 {
s16 unk0; s16 unk0;
@ -154,18 +154,18 @@ typedef struct _unkSubStruct2 {
Vec unkC; Vec unkC;
Vec unk18; Vec unk18;
Vec unk24; Vec unk24;
void (*unk30)(struct _unkSubStruct2*); void (*unk30)(struct _unkSubStruct2 *);
s16* unk34; s16 *unk34;
s16 unk38; s16 unk38;
char unk3A[2]; char unk3A[2];
unkSubStruct *unk3C; unkSubStruct *unk3C;
char unk40[0x8]; char unk40[0x8];
s16 unk48; s16 unk48;
char* unk4C; char *unk4C;
Vec* unk50; Vec *unk50;
GXColor* unk54; GXColor *unk54;
Vec* unk58; Vec *unk58;
unkSubStruct4* unk5C; unkSubStruct4 *unk5C;
u8 unk60; u8 unk60;
char unk61[0x3]; char unk61[0x3];
Vec unk64; Vec unk64;
@ -186,7 +186,7 @@ typedef struct _unkSubStruct2 {
} unkSubStruct2; /* size = 0xBC */ } unkSubStruct2; /* size = 0xBC */
typedef struct _unkSubStruct3 { typedef struct _unkSubStruct3 {
AnimData* unk0; AnimData *unk0;
s16 unk4; s16 unk4;
s16 unk6; s16 unk6;
u32 unk8; u32 unk8;
@ -198,10 +198,10 @@ typedef struct _unkSubStruct3 {
s16 unk4E; s16 unk4E;
s16 unk50; s16 unk50;
char unk52[0x2]; char unk52[0x2];
f32 unk54; float unk54;
f32 unk58; float unk58;
f32 unk5C; float unk5C;
f32 unk60; float unk60;
} unkSubStruct3; /* size = 0x64 */ } unkSubStruct3; /* size = 0x64 */
typedef struct _unkStruct5 { typedef struct _unkStruct5 {
@ -228,38 +228,38 @@ extern unkStruct5 lbl_1_bss_36C;
// prototypes // prototypes
// main.c // main.c
void fn_1_43C(omObjData* object); void fn_1_43C(omObjData *object);
void fn_1_4B0(omObjData* object); void fn_1_4B0(omObjData *object);
void fn_1_7D8(omObjData* object); void fn_1_7D8(omObjData *object);
void fn_1_14C0(omObjData* object); void fn_1_14C0(omObjData *object);
void fn_1_15D0(omObjData* object); void fn_1_15D0(omObjData *object);
void fn_1_1960(omObjData* object); void fn_1_1960(omObjData *object);
void fn_1_2B18(omObjData* object); void fn_1_2B18(omObjData *object);
void fn_1_2C14(omObjData* object); void fn_1_2C14(omObjData *object);
void fn_1_2E88(f32, Vec*, Vec*, f32); void fn_1_2E88(float, Vec *, Vec *, float);
void fn_1_3208(omObjData* object); void fn_1_3208(omObjData *object);
void fn_1_3640(omObjData* object); void fn_1_3640(omObjData *object);
void fn_1_3764(omObjData* object); void fn_1_3764(omObjData *object);
void fn_1_3B44(omObjData* object); void fn_1_3B44(omObjData *object);
void fn_1_4660(omObjData* object); void fn_1_4660(omObjData *object);
void fn_1_5B20(unkSubStruct2*); void fn_1_5B20(unkSubStruct2 *);
void fn_1_6304(omObjData* object); void fn_1_6304(omObjData *object);
void fn_1_6368(void); void fn_1_6368(void);
void* fn_1_63A8(s32); void *fn_1_63A8(s32);
void fn_1_64DC(void); void fn_1_64DC(void);
AnimBmpData* fn_1_668C(s16); AnimBmpData *fn_1_668C(s16);
s16 fn_1_66AC(void); s16 fn_1_66AC(void);
s32 fn_1_679C(void); s32 fn_1_679C(void);
f32 fn_1_67F0(f32, f32, f32); float fn_1_67F0(float, float, float);
void fn_1_6A78(Mtx, Vec*); void fn_1_6A78(Mtx, Vec *);
void fn_1_7268(f32*, f32*, f32*, s32); void fn_1_7268(float *, float *, float *, s32);
f32 fn_1_7520(f32, f32*, f32*, f32*, s32); float fn_1_7520(float, float *, float *, float *, s32);
void fn_1_7674(f32*, Vec*, Vec*, s32); void fn_1_7674(float *, Vec *, Vec *, s32);
void fn_1_7A54(f32, Vec*, f32*, Vec*, Vec*, s32); void fn_1_7A54(float, Vec *, float *, Vec *, Vec *, s32);
// map.c // map.c
void fn_1_95C0(ModelData*, Mtx); void fn_1_95C0(ModelData *, Mtx);
AnimData** fn_1_9734(s16); AnimData **fn_1_9734(s16);
void fn_1_9DC8(unkSubStruct2*); void fn_1_9DC8(unkSubStruct2 *);
s16 fn_1_A2D0(u8, u8); s16 fn_1_A2D0(u8, u8);
void fn_1_A800(s16); void fn_1_A800(s16);
s16 fn_1_A94C(u32, s16, s16); s16 fn_1_A94C(u32, s16, s16);
@ -267,12 +267,12 @@ void fn_1_ACF4(s16, s16, s16, s16, s16, s16);
void fn_1_AF48(s16); void fn_1_AF48(s16);
u8 fn_1_AFC8(s16, u8, s32, s16, s16); u8 fn_1_AFC8(s16, u8, s32, s16, s16);
s32 fn_1_B0B8(s16, u8, s16); s32 fn_1_B0B8(s16, u8, s16);
void fn_1_B864(s16, f32, f32, f32); void fn_1_B864(s16, float, float, float);
void fn_1_BB4C(s16, f32, f32, f32); void fn_1_BB4C(s16, float, float, float);
void fn_1_BC9C(s16, f32, f32, f32); void fn_1_BC9C(s16, float, float, float);
void fn_1_BD08(s16, s16, f32, f32, f32); void fn_1_BD08(s16, s16, float, float, float);
void fn_1_C264(s16, u8); void fn_1_C264(s16, u8);
void fn_1_C2D0(s16, s16, u8); void fn_1_C2D0(s16, s16, u8);
void fn_1_C410(s16, s16, u8, u8); void fn_1_C410(s16, s16, u8, u8);
void fn_1_C58C(s16, s16, u8, f32); void fn_1_C58C(s16, s16, u8, float);
void fn_1_C81C(s16, u8); void fn_1_C81C(s16, u8);

View file

@ -18,10 +18,10 @@ typedef struct M418DllUnkStruct {
Vec unk10; // sequence center Vec unk10; // sequence center
Vec rot; Vec rot;
Vec unk28; // sequence rot Vec unk28; // sequence rot
f32 zoom; float zoom;
f32 unk38; // sequence zoom float unk38; // sequence zoom
f32 unk3C[3]; float unk3C[3];
f32 unk48; float unk48;
} M418DllUnkStruct; // sizeof 0x4C } M418DllUnkStruct; // sizeof 0x4C
typedef struct M418DllUnkStruct8 { typedef struct M418DllUnkStruct8 {
@ -32,27 +32,27 @@ typedef struct M418DllUnkStruct8 {
typedef struct M418DllUnkStruct7 { typedef struct M418DllUnkStruct7 {
s32 unk0; s32 unk0;
M418DllUnkStruct8* unk4; M418DllUnkStruct8 *unk4;
s32 unk8; s32 unk8;
s32 unkC; s32 unkC;
M418DllFunc unk10; M418DllFunc unk10;
M418DllRetFunc unk14; M418DllRetFunc unk14;
} M418DllUnkStruct7; // sizeof 0x18 } M418DllUnkStruct7; // sizeof 0x18
f32 fn_1_A920(f32, f32, f32); float fn_1_A920(float, float, float);
f32 fn_1_A940(f32, f32, f32, f32); float fn_1_A940(float, float, float, float);
f32 fn_1_AA30(f32, f32, f32, f32); float fn_1_AA30(float, float, float, float);
void fn_1_ABC4(omObjData*, s32, s32, s32, s32); void fn_1_ABC4(omObjData *, s32, s32, s32, s32);
void fn_1_AD14(omObjData*, s32, s32, s32, s32); void fn_1_AD14(omObjData *, s32, s32, s32, s32);
void fn_1_AEDC(M418DllUnkStruct7*, M418DllUnkStruct8*); void fn_1_AEDC(M418DllUnkStruct7 *, M418DllUnkStruct8 *);
s32 fn_1_AF38(M418DllUnkStruct7*); s32 fn_1_AF38(M418DllUnkStruct7 *);
s32 fn_1_B034(M418DllUnkStruct7*, s32); s32 fn_1_B034(M418DllUnkStruct7 *, s32);
s32 fn_1_B0C8(M418DllUnkStruct7*, s32); s32 fn_1_B0C8(M418DllUnkStruct7 *, s32);
void fn_1_B104(M418DllUnkStruct*, Vec, Vec); void fn_1_B104(M418DllUnkStruct *, Vec, Vec);
void fn_1_B41C(M418DllUnkStruct*); void fn_1_B41C(M418DllUnkStruct *);
void fn_1_B458(M418DllUnkStruct*); void fn_1_B458(M418DllUnkStruct *);
void fn_1_BEAC(M418DllUnkStruct*, M418DllUnkStruct*, f32, f32, f32); void fn_1_BEAC(M418DllUnkStruct *, M418DllUnkStruct *, float, float, float);
void fn_1_CBF8(M418DllUnkStruct*, M418DllUnkStruct*, f32, f32, f32); void fn_1_CBF8(M418DllUnkStruct *, M418DllUnkStruct *, float, float, float);
void fn_1_DC10(M418DllUnkStruct*, M418DllUnkStruct*, f32, f32, f32); void fn_1_DC10(M418DllUnkStruct *, M418DllUnkStruct *, float, float, float);
#endif #endif

View file

@ -5,11 +5,11 @@
typedef struct _M424DllMainStruct { typedef struct _M424DllMainStruct {
Vec rot; Vec rot;
Vec center; Vec center;
f32 zoom; float zoom;
} M424DllMainStruct; // sizeof 1C } M424DllMainStruct; // sizeof 1C
typedef struct _M424DllBallStruct2 { typedef struct _M424DllBallStruct2 {
omObjData* unk0; omObjData *unk0;
u8 unk4; u8 unk4;
u8 unk5; u8 unk5;
u8 unk6; u8 unk6;
@ -31,18 +31,18 @@ extern M424DllBallStruct2 lbl_1_bss_60[9];
extern u8 lbl_1_bss_58; extern u8 lbl_1_bss_58;
extern s16 lbl_1_bss_24[4]; extern s16 lbl_1_bss_24[4];
f32 fn_1_1358(f32, f32); float fn_1_1358(float, float);
f32 fn_1_1470(f32, f32, f32); float fn_1_1470(float, float, float);
omObjData* fn_1_1AB8(Process*); omObjData *fn_1_1AB8(Process *);
void fn_1_1B8C(void); void fn_1_1B8C(void);
f32 fn_1_213C(void); float fn_1_213C(void);
void fn_1_252C(f32, s32); void fn_1_252C(float, s32);
void fn_1_2670(s32, s32); void fn_1_2670(s32, s32);
void fn_1_2720(Process*); void fn_1_2720(Process *);
void fn_1_2880(void); void fn_1_2880(void);
Vec* fn_1_8A00(u8); Vec *fn_1_8A00(u8);
s32 fn_1_8A2C(void); s32 fn_1_8A2C(void);
omObjData* fn_1_93F0(Process*); omObjData *fn_1_93F0(Process *);
void fn_1_94A4(void); void fn_1_94A4(void);
s32 fn_1_B804(void); s32 fn_1_B804(void);
s32 fn_1_B888(void); s32 fn_1_B888(void);

View file

@ -21,9 +21,9 @@ void fn_1_EC54(void);
s32 fn_1_10FE8(s32 arg0, s32 *arg1); s32 fn_1_10FE8(s32 arg0, s32 *arg1);
void fn_1_110E8(s32, s32 *); void fn_1_110E8(s32, s32 *);
void fn_1_111C0(s32, s32 *); void fn_1_111C0(s32, s32 *);
void fn_1_11298(f32); void fn_1_11298(float);
s32 fn_1_113F0(s32); s32 fn_1_113F0(s32);
f32 fn_1_168FC(f32, f32, f32); float fn_1_168FC(float, float, float);
s32 fn_1_15F10(Vec arg0, Vec arg1, s32 arg2, s32 arg3, s32 arg4); s32 fn_1_15F10(Vec arg0, Vec arg1, s32 arg2, s32 arg3, s32 arg4);
s32 fn_1_15FD0(Vec arg0, float arg8, s32 arg1, s32 arg2, s32 arg3); s32 fn_1_15FD0(Vec arg0, float arg8, s32 arg1, s32 arg2, s32 arg3);

View file

@ -22,14 +22,14 @@ typedef struct M438UnkSubStruct {
s8 unk_00; s8 unk_00;
s8 unk_01; s8 unk_01;
char unk02[0x2]; char unk02[0x2];
f32 unk_04; float unk_04;
f32 unk_08; float unk_08;
f32 unk_0C; float unk_0C;
f32 unk_10; float unk_10;
f32 unk_14; float unk_14;
f32 unk_18; float unk_18;
f32 unk_1C; float unk_1C;
f32 unk_20; float unk_20;
u8 unk_24; u8 unk_24;
float unk_28; float unk_28;
float unk_2C; float unk_2C;
@ -47,13 +47,13 @@ typedef struct M438UnkStruct {
u8 unk_34; u8 unk_34;
u32 unk_38; u32 unk_38;
s16 unk_3C; s16 unk_3C;
void* unk_40; void *unk_40;
Vec* unk_44; Vec *unk_44;
GXColor* unk_48; GXColor *unk_48;
Vec* unk_4C; Vec *unk_4C;
GXColor unk_50; GXColor unk_50;
GXColor unk_54; GXColor unk_54;
M438UnkSubStruct* unk_58; M438UnkSubStruct *unk_58;
u8 unk_5C; u8 unk_5C;
char unk5D[0x3]; char unk5D[0x3];
Vec unk_60; Vec unk_60;
@ -90,17 +90,17 @@ typedef struct M438UnkStruct2 {
Vec unk_0C; Vec unk_0C;
Vec unk_18; Vec unk_18;
Vec unk_24; Vec unk_24;
void (*unk_30)(struct M438UnkStruct2*); void (*unk_30)(struct M438UnkStruct2 *);
s16* unk_34; s16 *unk_34;
char unk_38[0x4]; char unk_38[0x4];
M438UnkStruct *unk_3C; M438UnkStruct *unk_3C;
char unk40[0x8]; char unk40[0x8];
s16 unk_48; s16 unk_48;
void* unk_4C; void *unk_4C;
Vec* unk_50; Vec *unk_50;
GXColor* unk_54; GXColor *unk_54;
Vec* unk_58; Vec *unk_58;
M438UnkSubStruct* unk_5C; M438UnkSubStruct *unk_5C;
u8 unk_60; u8 unk_60;
char unk61[0x3]; char unk61[0x3];
Vec unk_64; Vec unk_64;
@ -121,7 +121,7 @@ typedef struct M438UnkStruct2 {
} M438UnkStruct2; /* size = 0xBC */ } M438UnkStruct2; /* size = 0xBC */
typedef struct M438UnkStruct3 { typedef struct M438UnkStruct3 {
AnimData* unk_00; AnimData *unk_00;
s16 unk_04; s16 unk_04;
s16 unk_06; s16 unk_06;
u32 unk_08; u32 unk_08;
@ -133,10 +133,10 @@ typedef struct M438UnkStruct3 {
s16 unk_4E; s16 unk_4E;
s16 unk_50; s16 unk_50;
char unk52[0x2]; char unk52[0x2];
f32 unk_54; float unk_54;
f32 unk_58; float unk_58;
f32 unk_5C; float unk_5C;
f32 unk_60; float unk_60;
} M438UnkStruct3; /* size = 0x64 */ } M438UnkStruct3; /* size = 0x64 */
typedef struct M438StructBssDE4 { typedef struct M438StructBssDE4 {

View file

@ -10,12 +10,12 @@
extern s32 rand8(void); extern s32 rand8(void);
////// TYPES ////// ////// TYPES //////
typedef void (*m440Func5)(ModelData*, struct _unkStruct5*, Mtx); typedef void (*m440Func5)(ModelData *, struct _unkStruct5 *, Mtx);
typedef void (*m440Func6)(struct _unkStruct6*); typedef void (*m440Func6)(struct _unkStruct6 *);
typedef void (*m440Func14)(struct _unkStruct14*); typedef void (*m440Func14)(struct _unkStruct14 *);
typedef struct _unkStruct { typedef struct _unkStruct {
f32 zoom; float zoom;
Vec center; Vec center;
Vec rot; Vec rot;
} unkStruct; } unkStruct;
@ -30,37 +30,37 @@ typedef struct _unkStruct2 {
char unk10[0xC]; char unk10[0xC];
s16 unk1C; s16 unk1C;
char unk20[0x4]; char unk20[0x4];
f32 unk24; float unk24;
char unk28[0x4]; char unk28[0x4];
s16 unk2C; s16 unk2C;
s16 unk2E; s16 unk2E;
f32 unk30; float unk30;
} unkStruct2; } unkStruct2;
typedef struct _unkStruct3 { typedef struct _unkStruct3 {
char unk0[0x34]; char unk0[0x34];
f32 unk34; float unk34;
char unk38[0x8]; char unk38[0x8];
f32 unk40; float unk40;
} unkStruct3; } unkStruct3;
typedef struct _unkStruct4 { typedef struct _unkStruct4 {
Vec unk0; Vec unk0;
char unkC[0xC]; char unkC[0xC];
f32 unk18; float unk18;
f32 unk1C; float unk1C;
char unk20[0x4]; char unk20[0x4];
f32 unk24; float unk24;
f32 unk28; float unk28;
f32 unk2C; float unk2C;
f32 unk30; float unk30;
s16 unk34; s16 unk34;
s16 unk36; s16 unk36;
char unk38[0x4]; char unk38[0x4];
s32 unk3C; s32 unk3C;
s16 unk40; s16 unk40;
s16 unk42; s16 unk42;
f32 unk44; float unk44;
Vec unk48; Vec unk48;
Vec unk54; Vec unk54;
s16 unk60; s16 unk60;
@ -73,20 +73,20 @@ typedef struct _unkStruct5 {
u32 unk4; u32 unk4;
u8 unk8; u8 unk8;
m440Func5 unkC; m440Func5 unkC;
AnimData* unk10; AnimData *unk10;
s16 unk14; s16 unk14;
unkStruct4* unk18; unkStruct4 *unk18;
Vec* unk1C; Vec *unk1C;
HsfVector2f* unk20; HsfVector2f *unk20;
GXColor* unk24; GXColor *unk24;
void* unk28; void *unk28;
Vec unk2C; Vec unk2C;
Vec unk38; Vec unk38;
Vec unk44; Vec unk44;
Vec unk50; Vec unk50;
HsfVector2f* unk5C; HsfVector2f *unk5C;
f32 unk60; float unk60;
f32 unk64; float unk64;
} unkStruct5; } unkStruct5;
typedef struct _unkStruct6 { typedef struct _unkStruct6 {
@ -95,16 +95,16 @@ typedef struct _unkStruct6 {
s16 unk4; s16 unk4;
s16 unk6; s16 unk6;
u32 unk8; u32 unk8;
Vec* unkC; Vec *unkC;
Vec* unk10; Vec *unk10;
Vec* unk14; Vec *unk14;
Vec* unk18; Vec *unk18;
HsfVector2f* unk1C; HsfVector2f *unk1C;
s32 unk20; s32 unk20;
struct _unkStruct8* unk24; struct _unkStruct8 *unk24;
HsfMaterial* unk28; HsfMaterial *unk28;
HsfAttribute* unk2C; HsfAttribute *unk2C;
void* unk30; void *unk30;
u32 unk34; u32 unk34;
m440Func6 unk38; m440Func6 unk38;
s16 unk3C; s16 unk3C;
@ -129,7 +129,7 @@ typedef struct _unkStruct8 {
s16 unk1E; s16 unk1E;
unkStruct11 unk20[3]; unkStruct11 unk20[3];
char unk38[0x30]; char unk38[0x30];
f32 unk68[5]; float unk68[5];
Vec unk7C; Vec unk7C;
Vec unk88; Vec unk88;
Vec unk94; Vec unk94;
@ -144,7 +144,7 @@ typedef struct _unkStruct10 {
s16 unk2; s16 unk2;
unkStruct11 unk4[3]; unkStruct11 unk4[3];
u32 unk1C; u32 unk1C;
unkStruct11* unk20; unkStruct11 *unk20;
char unk24[0xC]; char unk24[0xC];
} unkStruct10; // sizeof 0x30 } unkStruct10; // sizeof 0x30
@ -154,41 +154,41 @@ typedef struct _unkStruct12 {
u8 unkB[3]; u8 unkB[3];
u8 unkE[3]; u8 unkE[3];
char unk12[0x2]; char unk12[0x2];
f32 unk14; float unk14;
char unk18[0x4]; char unk18[0x4];
f32 unk1C; float unk1C;
char unk20[0x10]; char unk20[0x10];
u32 unk30; u32 unk30;
u32 unk34; u32 unk34;
s32* unk38; s32 *unk38;
} unkStruct12; } unkStruct12;
typedef struct _unkStruct13 { typedef struct _unkStruct13 {
char unk0[0xA]; char unk0[0xA];
u8 unkA; u8 unkA;
char unkB[0x15]; char unkB[0x15];
f32 unk20; float unk20;
char unk24[0x40]; char unk24[0x40];
u32 unk64; u32 unk64;
u32 unk68; u32 unk68;
char unk6C[0x14]; char unk6C[0x14];
struct _unkStruct15* unk80; struct _unkStruct15 *unk80;
} unkStruct13; // sizeof 0x84 } unkStruct13; // sizeof 0x84
typedef struct _unkStruct14 { typedef struct _unkStruct14 {
s16 unk0; s16 unk0;
s16 unk2; s16 unk2;
char unk4[0x8]; char unk4[0x8];
void* unkC; void *unkC;
char unk10[0x4]; char unk10[0x4];
void* unk14; void *unk14;
unkStruct4* unk18; unkStruct4 *unk18;
void* unk1C; void *unk1C;
char unk20[0x4]; char unk20[0x4];
GXColor* unk24; GXColor *unk24;
unkStruct12* unk28; unkStruct12 *unk28;
unkStruct13* unk2C; unkStruct13 *unk2C;
void* unk30; void *unk30;
u32 unk34; u32 unk34;
m440Func14 unk38; m440Func14 unk38;
s16 unk3C; s16 unk3C;
@ -202,9 +202,9 @@ typedef struct _unkStruct15 {
s16 unkC; s16 unkC;
s16 unkE; s16 unkE;
char unk10[0x4]; char unk10[0x4];
void* unk14; void *unk14;
char unk18[0x4]; char unk18[0x4];
void* unk1C; void *unk1C;
} unkStruct15; } unkStruct15;
// object.c // object.c
@ -226,20 +226,20 @@ typedef struct _unkObjStruct {
Vec unk3C; Vec unk3C;
u8 unk48; u8 unk48;
s16 unk4A; s16 unk4A;
f32 unk4C; float unk4C;
s16 unk50; s16 unk50;
s16 unk52; s16 unk52;
s16 unk54; s16 unk54;
s16 unk56; s16 unk56;
s16 unk58; s16 unk58;
s16 unk5A; s16 unk5A;
f32 unk5C; float unk5C;
s16 unk60; s16 unk60;
s16 unk62; s16 unk62;
char unk64[0x4]; char unk64[0x4];
f32 unk68; float unk68;
f32 unk6C; float unk6C;
f32 unk70; float unk70;
} unkObjStruct; } unkObjStruct;
#if VERSION_NTSC #if VERSION_NTSC
@ -249,11 +249,11 @@ typedef struct _unkObjStruct {
#endif #endif
////// BSS ////// ////// BSS //////
extern omObjData* lbl_1_bss_C0[4]; extern omObjData *lbl_1_bss_C0[4];
////// DATA ////// ////// DATA //////
// main.c // main.c
extern f32 lbl_1_data_0[5]; extern float lbl_1_data_0[5];
extern s16 lbl_1_data_14[6]; extern s16 lbl_1_data_14[6];
// object.c // object.c
extern s16 lbl_1_data_1D8; extern s16 lbl_1_data_1D8;
@ -261,14 +261,14 @@ extern s16 lbl_1_data_1D8;
////// FUNCTIONS ////// ////// FUNCTIONS //////
// main.c // main.c
void ObjectSetup(void); void ObjectSetup(void);
void fn_1_3C4(omObjData* object); void fn_1_3C4(omObjData *object);
void fn_1_434(omObjData* object); void fn_1_434(omObjData *object);
s32 fn_1_4A4(void); s32 fn_1_4A4(void);
s32 fn_1_6C8(void); s32 fn_1_6C8(void);
void fn_1_8F0(omObjData* object); void fn_1_8F0(omObjData *object);
void fn_1_AE0(omObjData* object); void fn_1_AE0(omObjData *object);
u8 fn_1_E14(omObjData* object); u8 fn_1_E14(omObjData *object);
u8 fn_1_1138(omObjData* object); u8 fn_1_1138(omObjData *object);
void fn_1_16D8(void); void fn_1_16D8(void);
void fn_1_1708(void); void fn_1_1708(void);
void fn_1_1768(void); void fn_1_1768(void);
@ -280,82 +280,82 @@ void fn_1_18E0(void);
u8 fn_1_1954(void); u8 fn_1_1954(void);
void fn_1_19B0(void); void fn_1_19B0(void);
void fn_1_1CAC(void); void fn_1_1CAC(void);
void fn_1_2240(ModelData* data, unkStruct5*, Mtx); void fn_1_2240(ModelData *data, unkStruct5 *, Mtx);
u16 fn_1_23E4(u16); u16 fn_1_23E4(u16);
void fn_1_2428(u16, u16); void fn_1_2428(u16, u16);
void fn_1_2470(omObjData* object); void fn_1_2470(omObjData *object);
void fn_1_2A74(omObjData* object); void fn_1_2A74(omObjData *object);
void fn_1_2AB4(omObjData* object); void fn_1_2AB4(omObjData *object);
void fn_1_2B04(omObjData* object); void fn_1_2B04(omObjData *object);
void fn_1_2CA8(omObjData* object); void fn_1_2CA8(omObjData *object);
void fn_1_2D28(omObjData* object); void fn_1_2D28(omObjData *object);
void fn_1_33D4(omObjData* object); void fn_1_33D4(omObjData *object);
void fn_1_3DD8(omObjData* object); void fn_1_3DD8(omObjData *object);
void fn_1_4558(omObjData* object); void fn_1_4558(omObjData *object);
void fn_1_45BC(omObjData* object); void fn_1_45BC(omObjData *object);
void fn_1_4660(omObjData* object); void fn_1_4660(omObjData *object);
void fn_1_46E0(omObjData* object); void fn_1_46E0(omObjData *object);
void fn_1_4A20(omObjData* object); void fn_1_4A20(omObjData *object);
void fn_1_4B44(omObjData* object); void fn_1_4B44(omObjData *object);
void fn_1_4E00(s16, f32); void fn_1_4E00(s16, float);
s16 fn_1_4E2C(void); s16 fn_1_4E2C(void);
s16 fn_1_4E54(s16); s16 fn_1_4E54(s16);
u16 fn_1_4EA8(u16); u16 fn_1_4EA8(u16);
void fn_1_4EEC(u16, u16); void fn_1_4EEC(u16, u16);
void fn_1_4F34(unkStruct6*); void fn_1_4F34(unkStruct6 *);
void fn_1_5010(unkStruct6*, Vec*, f32); void fn_1_5010(unkStruct6 *, Vec *, float);
void fn_1_57B4(unkStruct6*); void fn_1_57B4(unkStruct6 *);
void fn_1_5C2C(s16, HsfObject*, unkStruct6*, u16); void fn_1_5C2C(s16, HsfObject *, unkStruct6 *, u16);
void fn_1_6554(unkStruct6*, HsfObject*); void fn_1_6554(unkStruct6 *, HsfObject *);
void fn_1_6B58(unkStruct6*, HsfObject*); void fn_1_6B58(unkStruct6 *, HsfObject *);
void fn_1_71FC(unkStruct6*, Vec*, s16, Vec); void fn_1_71FC(unkStruct6 *, Vec *, s16, Vec);
void fn_1_7934(unkStruct6*, unkStruct8*, Vec*); void fn_1_7934(unkStruct6 *, unkStruct8 *, Vec *);
void fn_1_7D60(unkStruct15*, unkStruct13*, s16); void fn_1_7D60(unkStruct15 *, unkStruct13 *, s16);
void fn_1_806C(ModelData*, Mtx); void fn_1_806C(ModelData *, Mtx);
void fn_1_8470(unkStruct12*, unkStruct13*); void fn_1_8470(unkStruct12 *, unkStruct13 *);
void fn_1_8AC4(Mtx); void fn_1_8AC4(Mtx);
void fn_1_8D1C(void); void fn_1_8D1C(void);
void fn_1_91A4(Vec*, Vec*, Vec*, f32[5]); void fn_1_91A4(Vec *, Vec *, Vec *, float[5]);
f32 fn_1_927C(f32, f32, f32); float fn_1_927C(float, float, float);
void fn_1_9344(Mtx, Mtx); void fn_1_9344(Mtx, Mtx);
f32 fn_1_93C0(f32, f32, f32); float fn_1_93C0(float, float, float);
f32 fn_1_93D0(f32, f32, f32, f32); float fn_1_93D0(float, float, float, float);
unkStruct4* fn_1_942C(s16, Vec*, Vec*, f32, GXColor*); unkStruct4 *fn_1_942C(s16, Vec *, Vec *, float, GXColor *);
s16 fn_1_956C(AnimData*, s16, f32, s16, s16); s16 fn_1_956C(AnimData *, s16, float, s16, s16);
void fn_1_9AB0(s16); void fn_1_9AB0(s16);
unkStruct5* fn_1_9B10(s16); unkStruct5 *fn_1_9B10(s16);
unkStruct4* fn_1_9B3C(s16, s16); unkStruct4 *fn_1_9B3C(s16, s16);
void fn_1_9B94(s16, m440Func5); void fn_1_9B94(s16, m440Func5);
void fn_1_9BCC(s16, u8); void fn_1_9BCC(s16, u8);
void fn_1_9C04(ModelData*, Mtx); void fn_1_9C04(ModelData *, Mtx);
void fn_1_A1B8(HsfVector2f*, s16, s16, f32, f32); void fn_1_A1B8(HsfVector2f *, s16, s16, float, float);
void fn_1_A284(HsfVector2f*, HsfVector2f*, s16, f32, f32); void fn_1_A284(HsfVector2f *, HsfVector2f *, s16, float, float);
void fn_1_A328(Vec*, Vec*, Vec*, s16); void fn_1_A328(Vec *, Vec *, Vec *, s16);
void fn_1_A390(ModelData*, Mtx); void fn_1_A390(ModelData *, Mtx);
void fn_1_AA94(void); void fn_1_AA94(void);
// object.c // object.c
void fn_1_AE08(Process*); void fn_1_AE08(Process *);
void fn_1_AEE4(omObjData*); void fn_1_AEE4(omObjData *);
void fn_1_B17C(omObjData*); void fn_1_B17C(omObjData *);
void fn_1_B180(omObjData*); void fn_1_B180(omObjData *);
void fn_1_B3A4(omObjData*); void fn_1_B3A4(omObjData *);
void fn_1_B884(omObjData*, unkObjStruct*); void fn_1_B884(omObjData *, unkObjStruct *);
void fn_1_C1D4(omObjData*, unkObjStruct*); void fn_1_C1D4(omObjData *, unkObjStruct *);
void fn_1_C944(omObjData*, unkObjStruct*); void fn_1_C944(omObjData *, unkObjStruct *);
s16 fn_1_CFAC(unkObjStruct*, u8); s16 fn_1_CFAC(unkObjStruct *, u8);
void fn_1_D24C(unkObjStruct*, f32, f32); void fn_1_D24C(unkObjStruct *, float, float);
void fn_1_D34C(omObjData*, unkObjStruct*); void fn_1_D34C(omObjData *, unkObjStruct *);
void fn_1_D7F8(omObjData*, unkObjStruct*); void fn_1_D7F8(omObjData *, unkObjStruct *);
void fn_1_E034(omObjData*, unkObjStruct*); void fn_1_E034(omObjData *, unkObjStruct *);
u8 fn_1_E8AC(omObjData*, unkObjStruct*); u8 fn_1_E8AC(omObjData *, unkObjStruct *);
s32 fn_1_ED88(omObjData*, s16, u32); s32 fn_1_ED88(omObjData *, s16, u32);
void fn_1_EE78(void); void fn_1_EE78(void);
void fn_1_EF50(void); void fn_1_EF50(void);
s16 fn_1_F0FC(void); s16 fn_1_F0FC(void);
void fn_1_F168(void); void fn_1_F168(void);
void fn_1_F228(void); void fn_1_F228(void);
u16 fn_1_F4C0(unkObjStruct*, u16); u16 fn_1_F4C0(unkObjStruct *, u16);
void fn_1_F4D4(unkObjStruct*, u16, u16); void fn_1_F4D4(unkObjStruct *, u16, u16);
s32 fn_1_F4FC(s32); s32 fn_1_F4FC(s32);
#endif #endif

View file

@ -3,8 +3,9 @@
#include "dolphin/types.h" #include "dolphin/types.h"
#include "game/process.h"
#include "game/object.h" #include "game/object.h"
#include "game/process.h"
////// TYPES ////// ////// TYPES //////
typedef struct _unkStruct { typedef struct _unkStruct {
@ -17,26 +18,26 @@ typedef struct _unkStruct {
s32 unk14; s32 unk14;
s32 unk18; s32 unk18;
s32 unk1C; s32 unk1C;
struct _unkStruct6* unk20; struct _unkStruct6 *unk20;
struct _unkStruct9* unk24; struct _unkStruct9 *unk24;
struct _unkStruct5* unk28; struct _unkStruct5 *unk28;
struct _unkStruct8* unk2C[2]; struct _unkStruct8 *unk2C[2];
struct _unkStruct4* unk34; struct _unkStruct4 *unk34;
struct _unkStruct4* unk38[23]; struct _unkStruct4 *unk38[23];
s32 unk94; s32 unk94;
Process* unk98; Process *unk98;
} unkStruct; } unkStruct;
typedef struct _unkStruct2 { typedef struct _unkStruct2 {
void** unk0; void **unk0;
s32 unk4; s32 unk4;
s32 unk8; s32 unk8;
} unkStruct2; } unkStruct2;
typedef struct _unkStruct3 { typedef struct _unkStruct3 {
void* unk0; void *unk0;
struct _unkStruct3* unk4; struct _unkStruct3 *unk4;
struct _unkStruct3* unk8; struct _unkStruct3 *unk8;
} unkStruct3; } unkStruct3;
typedef struct _unkStruct4 { typedef struct _unkStruct4 {
@ -52,9 +53,9 @@ typedef struct _unkStruct4 {
Vec unk34; Vec unk34;
Vec unk40; Vec unk40;
Vec unk4C; Vec unk4C;
f32 unk58; float unk58;
f32 unk5C; float unk5C;
f32 unk60; float unk60;
s32 unk64; s32 unk64;
s32 unk68; s32 unk68;
s32 unk6C; s32 unk6C;
@ -62,24 +63,24 @@ typedef struct _unkStruct4 {
s32 unk74; s32 unk74;
s32 unk78; s32 unk78;
s32 unk7C; s32 unk7C;
f32 unk80; float unk80;
f32 unk84; float unk84;
f32 unk88; float unk88;
f32 unk8C; float unk8C;
f32 unk90; float unk90;
f32 unk94; float unk94;
} unkStruct4; } unkStruct4;
typedef struct _unkStruct5 { typedef struct _unkStruct5 {
unkStruct2* unk0; unkStruct2 *unk0;
Vec unk4; Vec unk4;
} unkStruct5; } unkStruct5;
typedef struct _unkStruct6 { typedef struct _unkStruct6 {
struct _unkStruct7* unk0; struct _unkStruct7 *unk0;
s16 unk4; s16 unk4;
s16 unk6; s16 unk6;
unkStruct4* unk8[21]; unkStruct4 *unk8[21];
s32 unk5C; s32 unk5C;
s32 unk60; s32 unk60;
s32 unk64; s32 unk64;
@ -100,16 +101,16 @@ typedef struct _unkStruct7 {
Vec unk20; Vec unk20;
Vec unk2C; Vec unk2C;
Vec unk38; Vec unk38;
f32 unk44; float unk44;
u8 unk48; u8 unk48;
f32 unk4C; float unk4C;
f32 unk50; float unk50;
} unkStruct7; } unkStruct7;
typedef struct _unkStruct8 { typedef struct _unkStruct8 {
s32 unk0; s32 unk0;
unkStruct6* unk4; unkStruct6 *unk4;
unkStruct7* unk8; unkStruct7 *unk8;
s32 unkC; s32 unkC;
s32 unk10; s32 unk10;
s32 unk14; s32 unk14;
@ -118,13 +119,13 @@ typedef struct _unkStruct8 {
s32 unk20; s32 unk20;
s32 unk24; s32 unk24;
s32 unk28; s32 unk28;
unkStruct4* unk2C[3]; unkStruct4 *unk2C[3];
s32 unk38; s32 unk38;
s16 unk3C[2]; s16 unk3C[2];
s16 unk40[4]; s16 unk40[4];
Vec unk48; Vec unk48;
Vec unk54; Vec unk54;
f32 unk60; float unk60;
u8 unk64; u8 unk64;
u8 unk65; u8 unk65;
u8 unk66; u8 unk66;
@ -141,10 +142,10 @@ typedef struct _unkStruct8 {
Vec unk9C; Vec unk9C;
Vec unkA8; Vec unkA8;
s32 unkB4; s32 unkB4;
f32 unkB8; float unkB8;
f32 unkBC; float unkBC;
f32 unkC0; float unkC0;
f32 unkC4; float unkC4;
s32 unkC8; s32 unkC8;
} unkStruct8; } unkStruct8;
@ -152,8 +153,8 @@ typedef struct _unkStruct9 {
s16 unk0[5]; s16 unk0[5];
s16 unkA[2]; s16 unkA[2];
s16 unkE; s16 unkE;
f32 unk10; float unk10;
f32 unk14; float unk14;
s32 unk18; s32 unk18;
s32 unk1C; s32 unk1C;
s32 unk20; s32 unk20;
@ -169,141 +170,141 @@ typedef struct _unkStruct10 {
} unkStruct10; } unkStruct10;
typedef void (*m446Func)(s32); typedef void (*m446Func)(s32);
typedef void (*m446Func1)(unkStruct*); typedef void (*m446Func1)(unkStruct *);
typedef void (*m446Func4)(unkStruct4*); typedef void (*m446Func4)(unkStruct4 *);
typedef void (*m446Func8)(unkStruct8*); typedef void (*m446Func8)(unkStruct8 *);
////// PROTOTYPES ////// ////// PROTOTYPES //////
// main.c // main.c
void ObjectSetup(void); void ObjectSetup(void);
void fn_1_13C(omObjData*); void fn_1_13C(omObjData *);
unkStruct* m446FlowCreate(void); unkStruct *m446FlowCreate(void);
void fn_1_3FC(unkStruct*); void fn_1_3FC(unkStruct *);
void fn_1_4B4(unkStruct*); void fn_1_4B4(unkStruct *);
void fn_1_53C(unkStruct*); void fn_1_53C(unkStruct *);
void fn_1_958(unkStruct*); void fn_1_958(unkStruct *);
void fn_1_B78(unkStruct*); void fn_1_B78(unkStruct *);
void fn_1_C0C(unkStruct*); void fn_1_C0C(unkStruct *);
void fn_1_CA0(unkStruct*); void fn_1_CA0(unkStruct *);
s32 fn_1_17FC(unkStruct*); s32 fn_1_17FC(unkStruct *);
void fn_1_183C(unkStruct*); void fn_1_183C(unkStruct *);
void fn_1_1874(unkStruct*); void fn_1_1874(unkStruct *);
void fn_1_18B0(unkStruct*); void fn_1_18B0(unkStruct *);
void fn_1_19D4(void); void fn_1_19D4(void);
// card.c // card.c
unkStruct2* fn_1_1C64(s32); unkStruct2 *fn_1_1C64(s32);
void fn_1_1CF8(unkStruct2*); void fn_1_1CF8(unkStruct2 *);
s32 fn_1_1D30(unkStruct2*, void*); s32 fn_1_1D30(unkStruct2 *, void *);
s32 fn_1_1D6C(unkStruct2*, unkStruct4**); s32 fn_1_1D6C(unkStruct2 *, unkStruct4 **);
s32 fn_1_1DA8(unkStruct2*, void**); s32 fn_1_1DA8(unkStruct2 *, void **);
BOOL fn_1_1DDC(unkStruct2*); BOOL fn_1_1DDC(unkStruct2 *);
s32 fn_1_1DEC(unkStruct2*); s32 fn_1_1DEC(unkStruct2 *);
unkStruct3* fn_1_1DF4(void*); unkStruct3 *fn_1_1DF4(void *);
void fn_1_1E5C(unkStruct3*); void fn_1_1E5C(unkStruct3 *);
void fn_1_1E84(unkStruct3**); void fn_1_1E84(unkStruct3 **);
void fn_1_1EC8(unkStruct3*, unkStruct3*); void fn_1_1EC8(unkStruct3 *, unkStruct3 *);
void fn_1_1F04(unkStruct3*); void fn_1_1F04(unkStruct3 *);
void fn_1_1F38(u8*, u8*, s32); void fn_1_1F38(u8 *, u8 *, s32);
void fn_1_1F84(u8*, s8, s32); void fn_1_1F84(u8 *, s8, s32);
void fn_1_1FC0(u8*, s32); void fn_1_1FC0(u8 *, s32);
s32 fn_1_1FFC(s8*, s8*, s32); s32 fn_1_1FFC(s8 *, s8 *, s32);
s32 fn_1_2064(void); s32 fn_1_2064(void);
void fn_1_207C(void); void fn_1_207C(void);
void fn_1_20D4(void); void fn_1_20D4(void);
unkStruct4* m446CardCreate(s32); unkStruct4 *m446CardCreate(s32);
void fn_1_2688(unkStruct4*); void fn_1_2688(unkStruct4 *);
void fn_1_272C(unkStruct4*); void fn_1_272C(unkStruct4 *);
void fn_1_2794(unkStruct4*); void fn_1_2794(unkStruct4 *);
void fn_1_27FC(unkStruct4*, Vec*, s32); void fn_1_27FC(unkStruct4 *, Vec *, s32);
void fn_1_2890(unkStruct4*, Vec*, s32, s32); void fn_1_2890(unkStruct4 *, Vec *, s32, s32);
void fn_1_2928(unkStruct4*, Vec*, s32); void fn_1_2928(unkStruct4 *, Vec *, s32);
void fn_1_29B4(unkStruct4*, f32, s32); void fn_1_29B4(unkStruct4 *, float, s32);
void fn_1_2A1C(unkStruct4*); void fn_1_2A1C(unkStruct4 *);
void fn_1_2A58(unkStruct4*); void fn_1_2A58(unkStruct4 *);
void fn_1_2A94(unkStruct4*); void fn_1_2A94(unkStruct4 *);
void fn_1_2AA8(unkStruct4*); void fn_1_2AA8(unkStruct4 *);
void fn_1_2D94(unkStruct4*); void fn_1_2D94(unkStruct4 *);
void fn_1_2DA8(unkStruct4*); void fn_1_2DA8(unkStruct4 *);
void fn_1_2EC0(unkStruct4*, s32); void fn_1_2EC0(unkStruct4 *, s32);
void fn_1_2F64(unkStruct4*); void fn_1_2F64(unkStruct4 *);
// deck.c // deck.c
unkStruct5* fn_1_3064(void); unkStruct5 *fn_1_3064(void);
void fn_1_3180(unkStruct2**); void fn_1_3180(unkStruct2 **);
void fn_1_31D8(unkStruct2**, unkStruct4**, s32*, s32); void fn_1_31D8(unkStruct2 **, unkStruct4 **, s32 *, s32);
void fn_1_34A0(unkStruct5*, unkStruct4**, s32, s32); void fn_1_34A0(unkStruct5 *, unkStruct4 **, s32, s32);
s32 m446DeckPushCard(unkStruct5*, unkStruct4*, s32); s32 m446DeckPushCard(unkStruct5 *, unkStruct4 *, s32);
s32 m446DeckPopCard(unkStruct2**, unkStruct4**); s32 m446DeckPopCard(unkStruct2 **, unkStruct4 **);
void fn_1_38B0(unkStruct2**); void fn_1_38B0(unkStruct2 **);
s32 fn_1_38F0(void); s32 fn_1_38F0(void);
// table.c // table.c
s32 fn_1_3924(void); s32 fn_1_3924(void);
void fn_1_393C(void); void fn_1_393C(void);
void fn_1_3994(void); void fn_1_3994(void);
unkStruct6* fn_1_39D0(void); unkStruct6 *fn_1_39D0(void);
void fn_1_3B4C(unkStruct6*); void fn_1_3B4C(unkStruct6 *);
s32 fn_1_3BF0(unkStruct6*, unkStruct4*, s32); s32 fn_1_3BF0(unkStruct6 *, unkStruct4 *, s32);
s32 fn_1_3EB4(unkStruct6*, unkStruct4*, s32); s32 fn_1_3EB4(unkStruct6 *, unkStruct4 *, s32);
s32 fn_1_3FD0(unkStruct6*, s32, unkStruct4**); s32 fn_1_3FD0(unkStruct6 *, s32, unkStruct4 **);
void fn_1_4000(unkStruct6*, s32); void fn_1_4000(unkStruct6 *, s32);
s32 fn_1_4088(unkStruct6*, u8, u8, s32, unkStruct4**, s32); s32 fn_1_4088(unkStruct6 *, u8, u8, s32, unkStruct4 **, s32);
void fn_1_46AC(unkStruct6*); void fn_1_46AC(unkStruct6 *);
void fn_1_46D0(unkStruct6*); void fn_1_46D0(unkStruct6 *);
s32 fn_1_4720(unkStruct6*, s32); s32 fn_1_4720(unkStruct6 *, s32);
void fn_1_4798(unkStruct6*); void fn_1_4798(unkStruct6 *);
// player.c // player.c
s32 fn_1_480C(void); s32 fn_1_480C(void);
void fn_1_4824(void); void fn_1_4824(void);
void fn_1_487C(void); void fn_1_487C(void);
unkStruct8* m446PlayerCreate(s32, unkStruct6*); unkStruct8 *m446PlayerCreate(s32, unkStruct6 *);
void fn_1_509C(unkStruct8*); void fn_1_509C(unkStruct8 *);
s32 m446PlayerAppendCard(unkStruct8*, unkStruct4*, s32); s32 m446PlayerAppendCard(unkStruct8 *, unkStruct4 *, s32);
s32 m446PlayerRemoveCard(unkStruct8*, unkStruct4*, s32); s32 m446PlayerRemoveCard(unkStruct8 *, unkStruct4 *, s32);
s32 fn_1_5648(unkStruct8*, s32, unkStruct4**); s32 fn_1_5648(unkStruct8 *, s32, unkStruct4 **);
s32 fn_1_5678(unkStruct8*, unkStruct4**, s32); s32 fn_1_5678(unkStruct8 *, unkStruct4 **, s32);
void fn_1_5B34(unkStruct8*); void fn_1_5B34(unkStruct8 *);
void fn_1_5B48(unkStruct8*); void fn_1_5B48(unkStruct8 *);
void fn_1_5C10(unkStruct8*); void fn_1_5C10(unkStruct8 *);
void fn_1_5C24(unkStruct8*); void fn_1_5C24(unkStruct8 *);
void fn_1_5CEC(unkStruct8*); void fn_1_5CEC(unkStruct8 *);
void fn_1_5D00(unkStruct8*); void fn_1_5D00(unkStruct8 *);
void fn_1_5E54(unkStruct8*, s32); void fn_1_5E54(unkStruct8 *, s32);
void fn_1_6074(unkStruct8*); void fn_1_6074(unkStruct8 *);
void fn_1_6264(unkStruct8*, Vec*, s32); void fn_1_6264(unkStruct8 *, Vec *, s32);
void fn_1_62F0(unkStruct8*, Vec*, s32); void fn_1_62F0(unkStruct8 *, Vec *, s32);
void fn_1_637C(unkStruct8*, s32); void fn_1_637C(unkStruct8 *, s32);
void fn_1_64BC(unkStruct8*, s32, s32); void fn_1_64BC(unkStruct8 *, s32, s32);
void fn_1_6578(unkStruct8*); void fn_1_6578(unkStruct8 *);
void fn_1_6620(unkStruct8*); void fn_1_6620(unkStruct8 *);
// camera.c // camera.c
s32 fn_1_6778(void); s32 fn_1_6778(void);
void fn_1_68D8(void); void fn_1_68D8(void);
void fn_1_68DC(void); void fn_1_68DC(void);
void fn_1_6EA0(Vec*); void fn_1_6EA0(Vec *);
void fn_1_6EC4(Vec*); void fn_1_6EC4(Vec *);
void fn_1_6EE8(f32); void fn_1_6EE8(float);
void fn_1_6EF8(Vec*, Vec*, f32*, s32); void fn_1_6EF8(Vec *, Vec *, float *, s32);
s32 fn_1_708C(void); s32 fn_1_708C(void);
void fn_1_709C(void); void fn_1_709C(void);
// cursor.c // cursor.c
s32 fn_1_72E0(void); s32 fn_1_72E0(void);
void fn_1_72F8(void); void fn_1_72F8(void);
void fn_1_7350(void); void fn_1_7350(void);
unkStruct7* m446CursorCreate(s32); unkStruct7 *m446CursorCreate(s32);
void fn_1_76E8(unkStruct7*); void fn_1_76E8(unkStruct7 *);
void fn_1_77C8(unkStruct7*, u8); void fn_1_77C8(unkStruct7 *, u8);
void fn_1_7884(unkStruct7*); void fn_1_7884(unkStruct7 *);
void fn_1_7908(unkStruct7*, Vec*, s32); void fn_1_7908(unkStruct7 *, Vec *, s32);
void fn_1_799C(unkStruct7*); void fn_1_799C(unkStruct7 *);
void fn_1_7A38(unkStruct7*); void fn_1_7A38(unkStruct7 *);
void fn_1_7AB4(unkStruct7*); void fn_1_7AB4(unkStruct7 *);
// stage.c // stage.c
s32 fn_1_7BF0(void); s32 fn_1_7BF0(void);
void fn_1_7C08(void); void fn_1_7C08(void);
void fn_1_7C60(void); void fn_1_7C60(void);
unkStruct9* m446StageCreate(void); unkStruct9 *m446StageCreate(void);
void fn_1_83F0(unkStruct9*); void fn_1_83F0(unkStruct9 *);
void fn_1_84AC(unkStruct9*); void fn_1_84AC(unkStruct9 *);
void fn_1_852C(unkStruct9*); void fn_1_852C(unkStruct9 *);
void fn_1_860C(unkStruct9*); void fn_1_860C(unkStruct9 *);
#endif #endif

View file

@ -4,16 +4,16 @@
#include "game/object.h" #include "game/object.h"
extern s32 lbl_1_data_0[][4]; extern s32 lbl_1_data_0[][4];
//the prev and current struct member might be vice versa // the prev and current struct member might be vice versa
typedef struct MentDllUnkBss64Struct { typedef struct MentDllUnkBss64Struct {
/* 0x00 */ void (*func)(void); /* 0x00 */ void (*func)(void);
/* 0x04 */ void (*func2)(f32 arg9); /* 0x04 */ void (*func2)(float arg9);
/* 0x08 */ Vec center; /* 0x08 */ Vec center;
/* 0x14 */ Vec prevCenter; /* 0x14 */ Vec prevCenter;
/* 0x20 */ Vec rot; /* 0x20 */ Vec rot;
/* 0x2C */ Vec prevRot; /* 0x2C */ Vec prevRot;
/* 0x38 */ float zoom; /* 0x38 */ float zoom;
/* 0x3C */ f32 prevZoom; /* 0x3C */ float prevZoom;
/* 0x40 */ s32 unk_40; /* 0x40 */ s32 unk_40;
} MentDllUnkBss64Struct; /* size = 0x44 */ } MentDllUnkBss64Struct; /* size = 0x44 */
extern MentDllUnkBss64Struct lbl_1_bss_64; extern MentDllUnkBss64Struct lbl_1_bss_64;
@ -36,10 +36,10 @@ s32 fn_1_1DD8(s32 arg0, s32 arg1, s32 arg2);
s32 fn_1_2154(s32 arg0); s32 fn_1_2154(s32 arg0);
void fn_1_2318(s32 arg0); void fn_1_2318(s32 arg0);
void fn_1_2808(void (*arg0)(void)); void fn_1_2808(void (*arg0)(void));
void fn_1_2844(Process* arg0, void (*arg1)(void)); void fn_1_2844(Process *arg0, void (*arg1)(void));
void fn_1_29A0(MentDllUnkBss64Struct* arg0); void fn_1_29A0(MentDllUnkBss64Struct *arg0);
void fn_1_4138(MentDllUnkBss64Struct* arg0, MentDllUnkBss64Struct* arg1, f32 arg8, f32 arg9, f32 argA); void fn_1_4138(MentDllUnkBss64Struct *arg0, MentDllUnkBss64Struct *arg1, float arg8, float arg9, float argA);
void fn_1_5150(MentDllUnkBss64Struct* arg0, MentDllUnkBss64Struct* arg1, f32 arg8, f32 arg9, f32 argA); void fn_1_5150(MentDllUnkBss64Struct *arg0, MentDllUnkBss64Struct *arg1, float arg8, float arg9, float argA);
void fn_1_5818(omObjData *arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4); void fn_1_5818(omObjData *arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4);
void fn_1_59A0(omObjData *arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4); void fn_1_59A0(omObjData *arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4);
void fn_1_5C08(omObjData *arg0); void fn_1_5C08(omObjData *arg0);

View file

@ -2,8 +2,9 @@
#define REL_MODELTEST_H #define REL_MODELTEST_H
#include "game/hsfdraw.h" #include "game/hsfdraw.h"
#include "game/objsub.h"
#include "game/object.h" #include "game/object.h"
#include "game/objsub.h"
#include "ext_math.h" #include "ext_math.h"
@ -11,36 +12,34 @@
#define US_PER_60TH_SEC (1000000.0f / 60.0f) #define US_PER_60TH_SEC (1000000.0f / 60.0f)
#define US_TO_60TH_SEC(us) ((us) / US_PER_60TH_SEC) #define US_TO_60TH_SEC(us) ((us) / US_PER_60TH_SEC)
#define FB_SIZE(width, height) width * height * 2 #define FB_SIZE(width, height) width *height * 2
// -------------------------------------------------------------------------- // // -------------------------------------------------------------------------- //
typedef struct typedef struct {
{
s16 unk0[7]; s16 unk0[7];
} HuUnkF9C2; } HuUnkF9C2;
typedef struct typedef struct {
{ Point3d pos; // 0000
Point3d pos; // 0000 Point3d rot; // 000C
Point3d rot; // 000C Point3d scale; // 0018
Point3d scale; // 0018
s32 unk24; s32 unk24;
s32 unk28; s32 unk28;
s32 unk2C; s32 unk2C;
HsfObject * obj; // 0030 HsfObject *obj; // 0030
} HuObjUnk; } HuObjUnk;
extern Point3d CRot; extern Point3d CRot;
extern Point3d Center; extern Point3d Center;
extern f32 CZoom; extern float CZoom;
void fn_1_29C(); void fn_1_29C();
void fn_1_28F8(Point3d * arg0, Point3d * arg1); void fn_1_28F8(Point3d *arg0, Point3d *arg1);
void fn_1_37DC(omObjData*); void fn_1_37DC(omObjData *);
void fn_1_439C(omObjData*); void fn_1_439C(omObjData *);
void fn_1_46F0(); void fn_1_46F0();
typedef void (omObjFunc2)(struct om_obj_data *); typedef void(omObjFunc2)(struct om_obj_data *);
omObjFunc2 fn_1_F9C; omObjFunc2 fn_1_F9C;
#endif #endif

View file

@ -1,50 +1,48 @@
#ifndef W02DLL #ifndef W02DLL
#define W02DLL #define W02DLL
#include "math.h"
#include "dolphin.h" #include "dolphin.h"
#include "game/process.h"
#include "game/gamework_data.h"
#include "game/board/model.h"
#include "game/board/space.h"
#include "game/board/main.h" #include "game/board/main.h"
#include "game/board/player.h"
#include "game/board/window.h"
#include "game/board/map_object.h" #include "game/board/map_object.h"
#include "game/board/model.h"
#include "game/board/player.h"
#include "game/board/space.h"
#include "game/board/window.h"
#include "game/gamework_data.h"
#include "game/process.h"
#include "math.h"
/* STRUCTS*/ /* STRUCTS*/
typedef struct m02_dice { typedef struct m02_dice {
/* 0x00 */ s16 unk00; /* 0x00 */ s16 unk00;
/* 0x02 */ s16 unk02; /* 0x02 */ s16 unk02;
/* 0x04 */ s32 unk04; /* 0x04 */ s32 unk04;
/* 0x08 */ s32 *unk08; /* 0x08 */ s32 *unk08;
/* 0x0C */ Vec unk0C; /* 0x0C */ Vec unk0C;
/* 0x18 */ s16 unk18; /* 0x18 */ s16 unk18;
/* 0x1A */ s16 unk1A; /* 0x1A */ s16 unk1A;
/* 0x1C */ u16 unk1C[3]; /* 0x1C */ u16 unk1C[3];
/* 0x22 */ s16 unk22; /* 0x22 */ s16 unk22;
/* 0x24 */ f32 unk24; /* 0x24 */ float unk24;
/* 0x28 */ s16 unk28; /* 0x28 */ s16 unk28;
/* 0x2A */ u8 unk2A[0x2]; /* 0x2A */ u8 unk2A[0x2];
/* 0x2C */ Process *unk2C; /* 0x2C */ Process *unk2C;
/* 0x30 */ s16 unk30[3]; /* 0x30 */ s16 unk30[3];
/* 0x36 */ s16 unk36[3]; /* 0x36 */ s16 unk36[3];
/* 0x3C */ omObjData *unk3C[3]; /* 0x3C */ omObjData *unk3C[3];
/* 0x48 */ s16 unk48[3]; /* 0x48 */ s16 unk48[3];
/* 0x4E */ u8 unk4E[0x2]; /* 0x4E */ u8 unk4E[0x2];
/* 0x50 */ omObjData *unk50[3]; /* 0x50 */ omObjData *unk50[3];
/* 0x5C */ u8 unk5C[0x08]; /* 0x5C */ u8 unk5C[0x08];
/* 0x64 */ Vec unk64[2]; /* 0x64 */ Vec unk64[2];
/* 0x7C */ Vec unk7C; /* 0x7C */ Vec unk7C;
/* 0x88 */ s32 unk88[3]; /* 0x88 */ s32 unk88[3];
/* 0x94 */ s16 unk94; /* 0x94 */ s16 unk94;
/* 0x96 */ s16 unk96; /* 0x96 */ s16 unk96;
/* 0x98 */ f32 unk98; /* 0x98 */ float unk98;
/* 0x9C */ s16 unk9C; /* 0x9C */ s16 unk9C;
} m02GenDice; } m02GenDice;
extern s16 lbl_1_bss_2E; extern s16 lbl_1_bss_2E;
extern s16 lbl_1_bss_2C; extern s16 lbl_1_bss_2C;
extern Vec lbl_1_bss_20; extern Vec lbl_1_bss_20;
@ -58,12 +56,12 @@ extern void fn_1_72C();
extern s32 fn_1_774(); extern s32 fn_1_774();
extern s32 fn_1_800(); extern s32 fn_1_800();
extern void fn_1_92C(); extern void fn_1_92C();
extern s32 fn_1_1128(); extern s32 fn_1_1128();
extern void fn_1_121C(u32); extern void fn_1_121C(u32);
void fn_1_1254(m02GenDice* arg0); void fn_1_1254(m02GenDice *arg0);
void fn_1_1518(m02GenDice* arg0); void fn_1_1518(m02GenDice *arg0);
s32 fn_1_17F4(m02GenDice* arg0); s32 fn_1_17F4(m02GenDice *arg0);
// roulette.c // roulette.c
extern void fn_1_D3AC(); extern void fn_1_D3AC();
@ -75,15 +73,15 @@ extern void fn_1_3BF4();
extern void fn_1_39F4(); extern void fn_1_39F4();
extern void fn_1_5CF8(); extern void fn_1_5CF8();
extern void fn_1_5D28(); extern void fn_1_5D28();
extern void fn_1_5F90(); extern void fn_1_5F90();
extern void fn_1_79BC(s16 *arg0); extern void fn_1_79BC(s16 *arg0);
extern void fn_1_8244(u16 arg0); extern void fn_1_8244(u16 arg0);
extern s32 fn_1_9250(); extern s32 fn_1_9250();
extern void fn_1_93C8(u32 arg0); extern void fn_1_93C8(u32 arg0);
extern void fn_1_BC1C(); extern void fn_1_BC1C();
extern s32 fn_1_BE88(); extern s32 fn_1_BE88();
extern s32 fn_1_C108(s32); extern s32 fn_1_C108(s32);
extern void fn_1_CD04(s32); extern void fn_1_CD04(s32);
void fn_1_E41C(void); void fn_1_E41C(void);
#endif //W02DLL #endif // W02DLL

View file

@ -51,7 +51,7 @@ void fn_1_D84(void);
void fn_1_E04(void); void fn_1_E04(void);
void fn_1_E40(void); void fn_1_E40(void);
s32 fn_1_1114(void); s32 fn_1_1114(void);
s32 fn_1_1208(s16, f32, f32); s32 fn_1_1208(s16, float, float);
void fn_1_13D4(void); void fn_1_13D4(void);
void fn_1_14D0(void); void fn_1_14D0(void);
@ -70,64 +70,64 @@ void fn_1_3E8C(void);
void fn_1_3F74(void); void fn_1_3F74(void);
void fn_1_3FD8(void); void fn_1_3FD8(void);
void fn_1_4034(s32); void fn_1_4034(s32);
void fn_1_4EB4(s32, s32, Vec*); void fn_1_4EB4(s32, s32, Vec *);
void fn_1_5648(void); void fn_1_5648(void);
void fn_1_5794(s32, s32, Vec*); void fn_1_5794(s32, s32, Vec *);
void fn_1_6670(void); void fn_1_6670(void);
omObjData* fn_1_66C0(u32, Vec*); omObjData *fn_1_66C0(u32, Vec *);
void fn_1_6914(omObjData*); void fn_1_6914(omObjData *);
void fn_1_62AC(s32, Vec*); void fn_1_62AC(s32, Vec *);
void fn_1_64BC(void); void fn_1_64BC(void);
void fn_1_65E8(void); void fn_1_65E8(void);
void fn_1_6670(void); void fn_1_6670(void);
omObjData* fn_1_66C0(u32, Vec*); omObjData *fn_1_66C0(u32, Vec *);
void fn_1_6914(omObjData*); void fn_1_6914(omObjData *);
void fn_1_6B28(void); void fn_1_6B28(void);
void fn_1_6B7C(void); void fn_1_6B7C(void);
void fn_1_7284(omObjData*); void fn_1_7284(omObjData *);
void fn_1_72E4(void); void fn_1_72E4(void);
void fn_1_7314(void); void fn_1_7314(void);
void fn_1_73C0(void); void fn_1_73C0(void);
void fn_1_74D0(s16[3]); void fn_1_74D0(s16[3]);
void fn_1_77B0(void); void fn_1_77B0(void);
void fn_1_78A0(omObjData*); void fn_1_78A0(omObjData *);
void fn_1_7928(omObjData*); void fn_1_7928(omObjData *);
void fn_1_799C(void); void fn_1_799C(void);
void fn_1_7E4C(omObjData*); void fn_1_7E4C(omObjData *);
void fn_1_7E94(dataCopy*); void fn_1_7E94(dataCopy *);
void fn_1_7F04(omObjData*); void fn_1_7F04(omObjData *);
void fn_1_80D8(omObjData*); void fn_1_80D8(omObjData *);
void fn_1_8410(omObjData*); void fn_1_8410(omObjData *);
void fn_1_850C(omObjData*); void fn_1_850C(omObjData *);
void fn_1_8668(omObjData*); void fn_1_8668(omObjData *);
void fn_1_8798(dataCopy*, s32*, s32*, s32*); void fn_1_8798(dataCopy *, s32 *, s32 *, s32 *);
void* fn_1_8884(void); void *fn_1_8884(void);
void fn_1_88B8(void); void fn_1_88B8(void);
void fn_1_896C(void); void fn_1_896C(void);
void fn_1_91DC(void); void fn_1_91DC(void);
void fn_1_9268(ModelData*, ParticleData*, f32[3][4]); void fn_1_9268(ModelData *, ParticleData *, float[3][4]);
void fn_1_9680(void); void fn_1_9680(void);
void fn_1_96B4(void); void fn_1_96B4(void);
void fn_1_9760(void); void fn_1_9760(void);
void fn_1_97AC(void); void fn_1_97AC(void);
void fn_1_9A68(omObjData*); void fn_1_9A68(omObjData *);
void fn_1_9AC0(void); void fn_1_9AC0(void);
void fn_1_9AF0(void); void fn_1_9AF0(void);
void fn_1_9B74(void); void fn_1_9B74(void);
void fn_1_9C24(omObjData*); void fn_1_9C24(omObjData *);
void fn_1_9C98(dataCopy2*); void fn_1_9C98(dataCopy2 *);
void fn_1_9D0C(omObjData*); void fn_1_9D0C(omObjData *);
void fn_1_9F24(omObjData*); void fn_1_9F24(omObjData *);
void fn_1_A224(omObjData*); void fn_1_A224(omObjData *);
void fn_1_A4F8(omObjData*); void fn_1_A4F8(omObjData *);
void fn_1_A5B0(omObjData*); void fn_1_A5B0(omObjData *);
void fn_1_A990(omObjData*); void fn_1_A990(omObjData *);
void fn_1_AB24(void); void fn_1_AB24(void);
void fn_1_B214(omObjData*); void fn_1_B214(omObjData *);
void fn_1_B2B0(omObjData*, u16*, s16*); void fn_1_B2B0(omObjData *, u16 *, s16 *);
void fn_1_B3C4(omObjData*); void fn_1_B3C4(omObjData *);
// data // data
extern BoardMapObject lbl_1_data_0[7]; extern BoardMapObject lbl_1_data_0[7];
@ -164,7 +164,7 @@ extern char *lbl_1_data_330[3];
extern s32 lbl_1_data_350[14]; extern s32 lbl_1_data_350[14];
extern s32 lbl_1_data_350[14]; extern s32 lbl_1_data_350[14];
extern s16 lbl_1_data_388[92]; extern s16 lbl_1_data_388[92];
extern f32 lbl_1_data_440[3]; extern float lbl_1_data_440[3];
extern char *lbl_1_data_464[3]; extern char *lbl_1_data_464[3];
extern s32 lbl_1_data_470[3]; extern s32 lbl_1_data_470[3];
@ -179,9 +179,9 @@ extern s16 lbl_1_bss_100;
extern s16 lbl_1_bss_FE; extern s16 lbl_1_bss_FE;
extern s16 lbl_1_bss_D6[20]; extern s16 lbl_1_bss_D6[20];
extern s16 lbl_1_bss_D4; extern s16 lbl_1_bss_D4;
extern omObjData* lbl_1_bss_D0; extern omObjData *lbl_1_bss_D0;
extern omObjData* lbl_1_bss_CC; extern omObjData *lbl_1_bss_CC;
extern omObjData* lbl_1_bss_C8; extern omObjData *lbl_1_bss_C8;
extern s16 lbl_1_bss_C6; extern s16 lbl_1_bss_C6;
extern s16 lbl_1_bss_C4; extern s16 lbl_1_bss_C4;
extern s16 lbl_1_bss_C2; extern s16 lbl_1_bss_C2;
@ -196,13 +196,13 @@ extern s16 lbl_1_bss_A4[3];
extern s16 lbl_1_bss_A2; extern s16 lbl_1_bss_A2;
extern s16 lbl_1_bss_9E[2]; extern s16 lbl_1_bss_9E[2];
extern s16 lbl_1_bss_9C; extern s16 lbl_1_bss_9C;
extern Process* lbl_1_bss_98; extern Process *lbl_1_bss_98;
extern omObjData* lbl_1_bss_94; extern omObjData *lbl_1_bss_94;
extern omObjData* lbl_1_bss_90; extern omObjData *lbl_1_bss_90;
extern omObjData* lbl_1_bss_8C; extern omObjData *lbl_1_bss_8C;
extern s32 lbl_1_bss_88; extern s32 lbl_1_bss_88;
extern s32 lbl_1_bss_7C[3]; extern s32 lbl_1_bss_7C[3];
extern AnimData* lbl_1_bss_78; extern AnimData *lbl_1_bss_78;
extern s16 lbl_1_bss_72[2]; extern s16 lbl_1_bss_72[2];
extern s16 lbl_1_bss_6C[3]; extern s16 lbl_1_bss_6C[3];
@ -221,9 +221,9 @@ extern s16 lbl_1_bss_30[4];
extern s16 lbl_1_bss_28; extern s16 lbl_1_bss_28;
extern s16 lbl_1_bss_14[7]; extern s16 lbl_1_bss_14[7];
extern s32* lbl_1_bss_10; extern s32 *lbl_1_bss_10;
extern s16 lbl_1_bss_8[4]; extern s16 lbl_1_bss_8[4];
extern Process* lbl_1_bss_4; extern Process *lbl_1_bss_4;
extern bitcopy* lbl_1_bss_0; extern bitcopy *lbl_1_bss_0;
#endif #endif

View file

@ -1,10 +1,11 @@
#ifndef _GAME_HSFMAN_H #ifndef _GAME_HSFMAN_H
#define _GAME_HSFMAN_H #define _GAME_HSFMAN_H
#include "game/data.h"
#include "game/hsfanim.h" #include "game/hsfanim.h"
#include "game/hsfformat.h" #include "game/hsfformat.h"
#include "game/memory.h" #include "game/memory.h"
#include "game/data.h"
#define HU3D_MODEL_MAX 512 #define HU3D_MODEL_MAX 512
#define HU3D_MOTION_MAX 256 #define HU3D_MOTION_MAX 256
@ -109,24 +110,24 @@ struct model_data {
u32 attr; u32 attr;
u32 motion_attr; u32 motion_attr;
Point3d unk_58; Point3d unk_58;
f32 unk_64; float unk_64;
f32 unk_68; float unk_68;
f32 unk_6C; float unk_6C;
f32 unk_70; float unk_70;
f32 unk_74; float unk_74;
f32 unk_78; float unk_78;
f32 unk_7C; float unk_7C;
f32 unk_80; float unk_80;
f32 unk_84; float unk_84;
f32 unk_88; float unk_88;
f32 unk_8C; float unk_8C;
f32 unk_90; float unk_90;
f32 unk_94; float unk_94;
f32 unk_98; float unk_98;
f32 unk_9C; float unk_9C;
f32 unk_A0; float unk_A0;
f32 unk_A4[4]; float unk_A4[4];
f32 unk_B4[4]; float unk_B4[4];
union { union {
HsfData *hsfData; HsfData *hsfData;
ModelHookFunc hook; ModelHookFunc hook;
@ -139,11 +140,11 @@ struct model_data {
void *unk_120; void *unk_120;
}; // sizeof 0x124 }; // sizeof 0x124
typedef struct camera_data { typedef struct camera_data {
f32 fov; float fov;
f32 near; float near;
f32 far; float far;
f32 aspect; float aspect;
f32 aspect_dupe; float aspect_dupe;
Vec pos; Vec pos;
Vec up; Vec up;
Vec target; Vec target;
@ -151,12 +152,12 @@ typedef struct camera_data {
s16 scissor_y; s16 scissor_y;
s16 scissor_w; s16 scissor_w;
s16 scissor_h; s16 scissor_h;
f32 viewport_x; float viewport_x;
f32 viewport_y; float viewport_y;
f32 viewport_w; float viewport_w;
f32 viewport_h; float viewport_h;
f32 near_z; float near_z;
f32 far_z; float far_z;
} CameraData; // sizeof 0x58 } CameraData; // sizeof 0x58
typedef struct ThreeDProjectionStruct { typedef struct ThreeDProjectionStruct {
u8 unk_00; u8 unk_00;
@ -173,7 +174,7 @@ typedef struct shadow_data {
u8 unk_00; u8 unk_00;
u8 unk_01; u8 unk_01;
u16 unk_02; u16 unk_02;
void* unk_04; void *unk_04;
Vec unk_08; Vec unk_08;
Vec unk_14; Vec unk_14;
Vec unk_20; Vec unk_20;
@ -184,8 +185,8 @@ typedef struct shadow_data {
typedef struct light_data { typedef struct light_data {
s16 unk_00; s16 unk_00;
s16 unk_02; s16 unk_02;
f32 unk_04; float unk_04;
f32 unk_08; float unk_08;
char unk_0C[0x10]; char unk_0C[0x10];
Vec unk_1C; Vec unk_1C;
Vec unk_28; Vec unk_28;
@ -193,8 +194,8 @@ typedef struct light_data {
GXColor color; GXColor color;
} LightData; } LightData;
extern void GXWaitDrawDone(); /* extern */ extern void GXWaitDrawDone(); /* extern */
extern void GXInitSpecularDir(GXLightObj*, f32, f32, f32); extern void GXInitSpecularDir(GXLightObj *, float, float, float);
void Hu3DInit(void); void Hu3DInit(void);
void Hu3DPreProc(void); void Hu3DPreProc(void);
@ -209,11 +210,11 @@ s16 Hu3DModelLink(s16);
s16 Hu3DHookFuncCreate(ModelHookFunc); s16 Hu3DHookFuncCreate(ModelHookFunc);
void Hu3DModelKill(s16); void Hu3DModelKill(s16);
void Hu3DModelAllKill(void); void Hu3DModelAllKill(void);
void Hu3DModelPosSet(s16, f32, f32, f32); void Hu3DModelPosSet(s16, float, float, float);
void Hu3DModelPosSetV(s16, Vec *); void Hu3DModelPosSetV(s16, Vec *);
void Hu3DModelRotSet(s16, f32, f32, f32); void Hu3DModelRotSet(s16, float, float, float);
void Hu3DModelRotSetV(s16, Vec *); void Hu3DModelRotSetV(s16, Vec *);
void Hu3DModelScaleSet(s16, f32, f32, f32); void Hu3DModelScaleSet(s16, float, float, float);
void Hu3DModelScaleSetV(s16, Vec *); void Hu3DModelScaleSetV(s16, Vec *);
void Hu3DModelAttrSet(s16, u32); void Hu3DModelAttrSet(s16, u32);
void Hu3DModelAttrReset(s16, u32); void Hu3DModelAttrReset(s16, u32);
@ -223,16 +224,16 @@ void Hu3DModelClusterAttrSet(s16, s16, s32);
void Hu3DModelClusterAttrReset(s16, s16, s32); void Hu3DModelClusterAttrReset(s16, s16, s32);
void Hu3DModelCameraSet(s16, u16); void Hu3DModelCameraSet(s16, u16);
void Hu3DModelLayerSet(s16, s16); void Hu3DModelLayerSet(s16, s16);
HsfObject* Hu3DModelObjPtrGet(s16, char *); HsfObject *Hu3DModelObjPtrGet(s16, char *);
void Hu3DModelTPLvlSet(s16, f32); void Hu3DModelTPLvlSet(s16, float);
void Hu3DModelHiliteMapSet(s16, AnimData*); void Hu3DModelHiliteMapSet(s16, AnimData *);
void Hu3DModelShadowSet(s16); void Hu3DModelShadowSet(s16);
void Hu3DModelShadowReset(s16); void Hu3DModelShadowReset(s16);
void Hu3DModelShadowDispOn(s16); void Hu3DModelShadowDispOn(s16);
void Hu3DModelShadowDispOff(s16); void Hu3DModelShadowDispOff(s16);
void Hu3DModelShadowMapSet(s16); void Hu3DModelShadowMapSet(s16);
void Hu3DModelShadowMapObjSet(s16, char *); void Hu3DModelShadowMapObjSet(s16, char *);
void Hu3DModelAmbSet(s16, f32, f32, f32); void Hu3DModelAmbSet(s16, float, float, float);
void Hu3DModelHookSet(s16, char *, s16); void Hu3DModelHookSet(s16, char *, s16);
void Hu3DModelHookReset(s16); void Hu3DModelHookReset(s16);
void Hu3DModelHookObjReset(s16, char *); void Hu3DModelHookObjReset(s16, char *);
@ -241,10 +242,10 @@ void Hu3DModelProjectionReset(s16, s16);
void Hu3DModelHiliteTypeSet(s16, s16); void Hu3DModelHiliteTypeSet(s16, s16);
void Hu3DModelReflectTypeSet(s16, s16); void Hu3DModelReflectTypeSet(s16, s16);
void Hu3DCameraCreate(s32); void Hu3DCameraCreate(s32);
void Hu3DCameraPerspectiveSet(s32, f32, f32, f32, f32); void Hu3DCameraPerspectiveSet(s32, float, float, float, float);
void Hu3DCameraViewportSet(s32, f32, f32, f32, f32, f32, f32); void Hu3DCameraViewportSet(s32, float, float, float, float, float, float);
void Hu3DCameraScissorSet(s32, u32, u32, u32, u32); void Hu3DCameraScissorSet(s32, u32, u32, u32, u32);
void Hu3DCameraPosSet(s32, f32, f32, f32, f32, f32, f32, f32, f32, f32); void Hu3DCameraPosSet(s32, float, float, float, float, float, float, float, float, float);
void Hu3DCameraPosSetV(s32 cam, Vec *pos, Vec *up, Vec *target); void Hu3DCameraPosSetV(s32 cam, Vec *pos, Vec *up, Vec *target);
void Hu3DCameraKill(s32); void Hu3DCameraKill(s32);
void Hu3DCameraAllKill(void); void Hu3DCameraAllKill(void);
@ -255,47 +256,47 @@ void Hu3DCameraMotionOn(s16, s8);
void Hu3DCameraMotionStart(s16, u16); void Hu3DCameraMotionStart(s16, u16);
void Hu3DCameraMotionOff(s16); void Hu3DCameraMotionOff(s16);
void Hu3DLighInit(void); void Hu3DLighInit(void);
s16 Hu3DGLightCreate(f32, f32, f32, f32, f32, f32, u8, u8, u8); s16 Hu3DGLightCreate(float, float, float, float, float, float, u8, u8, u8);
s16 Hu3DGLightCreateV(Vec*, Vec*, GXColor*); s16 Hu3DGLightCreateV(Vec *, Vec *, GXColor *);
s16 Hu3DLLightCreate(s16, f32, f32, f32, f32, f32, f32, u8, u8, u8); s16 Hu3DLLightCreate(s16, float, float, float, float, float, float, u8, u8, u8);
s16 Hu3DLLightCreateV(s16, Vec*, Vec*, GXColor*); s16 Hu3DLLightCreateV(s16, Vec *, Vec *, GXColor *);
void Hu3DGLightSpotSet(s16, f32, u16); void Hu3DGLightSpotSet(s16, float, u16);
void Hu3DLLightSpotSet(s16, s16, f32, u16); void Hu3DLLightSpotSet(s16, s16, float, u16);
void Hu3DGLightInfinitytSet(s16); void Hu3DGLightInfinitytSet(s16);
void Hu3DLLightInfinitytSet(s16, s16); void Hu3DLLightInfinitytSet(s16, s16);
void Hu3DGLightPointSet(s16, f32, f32, u16); void Hu3DGLightPointSet(s16, float, float, u16);
void Hu3DLLightPointSet(s16, s16, f32, f32, u16); void Hu3DLLightPointSet(s16, s16, float, float, u16);
void Hu3DGLightKill(s16); void Hu3DGLightKill(s16);
void Hu3DLLightKill(s16, s16); void Hu3DLLightKill(s16, s16);
void Hu3DLightAllKill(void); void Hu3DLightAllKill(void);
void Hu3DGLightColorSet(s16, u8, u8, u8, u8); void Hu3DGLightColorSet(s16, u8, u8, u8, u8);
void Hu3DLLightColorSet(s16, s16, u8, u8, u8, u8); void Hu3DLLightColorSet(s16, s16, u8, u8, u8, u8);
void Hu3DGLightPosSetV(s16, Vec*, Point3d*); void Hu3DGLightPosSetV(s16, Vec *, Point3d *);
void Hu3DLLightPosSetV(s16, s16, Vec*, Point3d*); void Hu3DLLightPosSetV(s16, s16, Vec *, Point3d *);
void Hu3DGLightPosSet(s16, f32, f32, f32, f32, f32, f32); void Hu3DGLightPosSet(s16, float, float, float, float, float, float);
void Hu3DLLightPosSet(s16, s16, f32, f32, f32, f32, f32, f32); void Hu3DLLightPosSet(s16, s16, float, float, float, float, float, float);
void Hu3DGLightPosAimSetV(s16, Point3d*, Point3d*); void Hu3DGLightPosAimSetV(s16, Point3d *, Point3d *);
void Hu3DLLightPosAimSetV(s16, s16, Point3d*, Point3d*); void Hu3DLLightPosAimSetV(s16, s16, Point3d *, Point3d *);
void Hu3DGLightPosAimSet(s16, f32, f32, f32, f32, f32, f32); void Hu3DGLightPosAimSet(s16, float, float, float, float, float, float);
void Hu3DLLightPosAimSet(s16, s16, f32, f32, f32, f32, f32, f32); void Hu3DLLightPosAimSet(s16, s16, float, float, float, float, float, float);
void Hu3DGLightStaticSet(s16, s32); void Hu3DGLightStaticSet(s16, s32);
void Hu3DLLightStaticSet(s16, s16, s32); void Hu3DLLightStaticSet(s16, s16, s32);
s32 Hu3DModelLightInfoSet(s16, s16); s32 Hu3DModelLightInfoSet(s16, s16);
s16 Hu3DLightSet(ModelData*, Mtx*, Mtx*, f32); s16 Hu3DLightSet(ModelData *, Mtx *, Mtx *, float);
void lightSet(LightData* arg0, s16 arg1, Mtx *arg2, Mtx *arg3, f32 arg8); void lightSet(LightData *arg0, s16 arg1, Mtx *arg2, Mtx *arg3, float arg8);
void Hu3DReflectNoSet(s16 arg0); void Hu3DReflectNoSet(s16 arg0);
void Hu3DFogSet(f32, f32, u8, u8, u8); void Hu3DFogSet(float, float, u8, u8, u8);
void Hu3DFogClear(void); void Hu3DFogClear(void);
void Hu3DShadowCreate(f32, f32, f32); void Hu3DShadowCreate(float, float, float);
void Hu3DShadowPosSet(Vec*, Vec*, Vec*); void Hu3DShadowPosSet(Vec *, Vec *, Vec *);
void Hu3DShadowTPLvlSet(f32); void Hu3DShadowTPLvlSet(float);
void Hu3DShadowSizeSet(u16); void Hu3DShadowSizeSet(u16);
void Hu3DShadowExec(void); void Hu3DShadowExec(void);
s16 Hu3DProjectionCreate(void*, f32, f32, f32); s16 Hu3DProjectionCreate(void *, float, float, float);
void Hu3DProjectionKill(s16); void Hu3DProjectionKill(s16);
void Hu3DProjectionPosSet(s16, Vec*, Vec*, Vec*); void Hu3DProjectionPosSet(s16, Vec *, Vec *, Vec *);
void Hu3DProjectionTPLvlSet(s16, f32); void Hu3DProjectionTPLvlSet(s16, float);
void Hu3DMipMapSet(char*, s16, s32, f32); void Hu3DMipMapSet(char *, s16, s32, float);
extern ModelData Hu3DData[0x200]; extern ModelData Hu3DData[0x200];
extern CameraData Hu3DCamera[0x10]; extern CameraData Hu3DCamera[0x10];