Merge branch 'mariopartyrd:main' into main
This commit is contained in:
CreateSource
GitHub
commit
106c158b75
298 changed files with 49092 additions and 4634 deletions
|
|
@ -3,113 +3,116 @@
|
|||
|
||||
#include "game/object.h"
|
||||
|
||||
#define rand16() ((rand8() << 8)|(rand8()))
|
||||
|
||||
#define rand16() ((rand8() << 8) | (rand8()))
|
||||
|
||||
typedef struct bss_12C_inner {
|
||||
Vec unk0;
|
||||
float unkC;
|
||||
s8 unk10;
|
||||
Vec unk0;
|
||||
float unkC;
|
||||
s8 unk10;
|
||||
} Bss12CInner;
|
||||
|
||||
typedef struct bss_12c_struct {
|
||||
s16 unk0[2];
|
||||
s16 unk4;
|
||||
s16 unk6;
|
||||
s16 unk8;
|
||||
Vec unkC;
|
||||
float unk18;
|
||||
Bss12CInner unk1C[10];
|
||||
float unkE4[10][2];
|
||||
s16 unk134[2];
|
||||
s16 unk138[2];
|
||||
s16 unk0[2];
|
||||
s16 unk4;
|
||||
s16 unk6;
|
||||
s16 unk8;
|
||||
Vec unkC;
|
||||
float unk18;
|
||||
Bss12CInner unk1C[10];
|
||||
float unkE4[10][2];
|
||||
s16 unk134[2];
|
||||
s16 unk138[2];
|
||||
} Bss12CStruct;
|
||||
|
||||
typedef struct bss_61C_work {
|
||||
u32 unk0;
|
||||
s16 unk4;
|
||||
s16 unk6;
|
||||
s16 unk8;
|
||||
s16 unkA;
|
||||
s16 unkC;
|
||||
float unk10;
|
||||
struct bss_61C_work *unk14;
|
||||
Vec unk18;
|
||||
Vec unk24;
|
||||
float unk30;
|
||||
omObjFunc unk34;
|
||||
s16 unk38;
|
||||
s16 unk3A;
|
||||
u32 unk3C;
|
||||
s16 unk40;
|
||||
s16 unk42;
|
||||
Vec unk44;
|
||||
s16 unk50;
|
||||
s8 unk52;
|
||||
u32 unk54;
|
||||
s16 unk58;
|
||||
s16 unk5A;
|
||||
s16 unk5C;
|
||||
s16 unk5E[8];
|
||||
s16 unk6E;
|
||||
s16 unk70;
|
||||
s16 unk72;
|
||||
u32 unk74;
|
||||
s16 unk78;
|
||||
s16 unk7A;
|
||||
s16 unk7C;
|
||||
s16 unk7E;
|
||||
s16 unk80;
|
||||
s16 unk82;
|
||||
s16 unk84;
|
||||
s16 unk86;
|
||||
float unk88;
|
||||
Vec unk8C;
|
||||
float unk98;
|
||||
Vec unk9C;
|
||||
float unkA8;
|
||||
s32 unkAC;
|
||||
s16 unkB0;
|
||||
s16 unkB2;
|
||||
s8 unkB4;
|
||||
s8 unkB5;
|
||||
u32 unk0;
|
||||
s16 unk4;
|
||||
s16 unk6;
|
||||
s16 unk8;
|
||||
s16 unkA;
|
||||
s16 unkC;
|
||||
float unk10;
|
||||
struct bss_61C_work *unk14;
|
||||
Vec unk18;
|
||||
Vec unk24;
|
||||
float unk30;
|
||||
omObjFunc unk34;
|
||||
s16 unk38;
|
||||
s16 unk3A;
|
||||
#if VERSION_PAL
|
||||
s16 unk3C_pal;
|
||||
s16 unk3E_pal;
|
||||
#endif
|
||||
u32 unk3C;
|
||||
s16 unk40;
|
||||
s16 unk42;
|
||||
Vec unk44;
|
||||
s16 unk50;
|
||||
s8 unk52;
|
||||
u32 unk54;
|
||||
s16 unk58;
|
||||
s16 unk5A;
|
||||
s16 unk5C;
|
||||
s16 unk5E[8];
|
||||
s16 unk6E;
|
||||
s16 unk70;
|
||||
s16 unk72;
|
||||
u32 unk74;
|
||||
s16 unk78;
|
||||
s16 unk7A;
|
||||
s16 unk7C;
|
||||
s16 unk7E;
|
||||
s16 unk80;
|
||||
s16 unk82;
|
||||
s16 unk84;
|
||||
s16 unk86;
|
||||
float unk88;
|
||||
Vec unk8C;
|
||||
float unk98;
|
||||
Vec unk9C;
|
||||
float unkA8;
|
||||
s32 unkAC;
|
||||
s16 unkB0;
|
||||
s16 unkB2;
|
||||
s8 unkB4;
|
||||
s8 unkB5;
|
||||
} Bss61CWork;
|
||||
|
||||
typedef void (*unkHook72B4Data18)(struct unk_72B4_data_18 *);
|
||||
typedef void (*unkHook72B4)(ModelData *, struct work_72B4 *, Mtx);
|
||||
|
||||
typedef struct unk_72B4_data_18 {
|
||||
Vec unk0;
|
||||
Vec unkC;
|
||||
char unk18[16];
|
||||
s16 unk28;
|
||||
s16 unk2A;
|
||||
s16 unk2C;
|
||||
unkHook72B4Data18 unk30;
|
||||
s16 unk34;
|
||||
float unk38;
|
||||
Vec unk3C;
|
||||
Vec unk48;
|
||||
s16 unk54;
|
||||
s8 unk56;
|
||||
Vec unk0;
|
||||
Vec unkC;
|
||||
char unk18[16];
|
||||
s16 unk28;
|
||||
s16 unk2A;
|
||||
s16 unk2C;
|
||||
unkHook72B4Data18 unk30;
|
||||
s16 unk34;
|
||||
float unk38;
|
||||
Vec unk3C;
|
||||
Vec unk48;
|
||||
s16 unk54;
|
||||
s8 unk56;
|
||||
} Unk72B4Data18;
|
||||
|
||||
typedef struct work_72B4 {
|
||||
s16 unk0;
|
||||
u32 unk4;
|
||||
u8 unk8;
|
||||
unkHook72B4 unkC;
|
||||
AnimData *unk10;
|
||||
s16 unk14;
|
||||
Unk72B4Data18 *unk18;
|
||||
Vec *unk1C;
|
||||
HsfVector2f *unk20;
|
||||
GXColor *unk24;
|
||||
void *unk28;
|
||||
Vec unk2C[4];
|
||||
HsfVector2f *unk5C;
|
||||
float unk60;
|
||||
float unk64;
|
||||
s16 unk0;
|
||||
u32 unk4;
|
||||
u8 unk8;
|
||||
unkHook72B4 unkC;
|
||||
AnimData *unk10;
|
||||
s16 unk14;
|
||||
Unk72B4Data18 *unk18;
|
||||
Vec *unk1C;
|
||||
HsfVector2f *unk20;
|
||||
GXColor *unk24;
|
||||
void *unk28;
|
||||
Vec unk2C[4];
|
||||
HsfVector2f *unk5C;
|
||||
float unk60;
|
||||
float unk64;
|
||||
} Work72B4;
|
||||
|
||||
extern s32 lbl_1_bss_4;
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
#include "datadir_enum.h"
|
||||
#include "dolphin.h"
|
||||
#include "game/hsfanim.h"
|
||||
#include "version.h"
|
||||
|
||||
typedef struct UnkM432DllBss0SubStruct {
|
||||
char *unk_00;
|
||||
|
|
@ -1202,10 +1203,10 @@ UnkM432DllBss0SubStruct lbl_1_data_EDC[0x1F] = {
|
|||
},
|
||||
};
|
||||
|
||||
UnkM432DllData1794Struct lbl_1_data_1794 = { 6300.0f, 0.7f, 10.0f, 0.4f, 1.0f, 0, 2, 6 };
|
||||
UnkM432DllData1794Struct lbl_1_data_17B4 = { 5700.0f, 0.8f, 8.0f, 0.6f, 1.0f, 0, 4, 5 };
|
||||
UnkM432DllData1794Struct lbl_1_data_17D4 = { 5100.0f, 0.9f, 6.0f, 0.8f, 1.0f, 0, 6, 4 };
|
||||
UnkM432DllData1794Struct lbl_1_data_17F4 = { 4500.0f, 1.0f, 4.0f, 1.0f, 1.0f, 0, 8, 3 };
|
||||
UnkM432DllData1794Struct lbl_1_data_1794 = { 105.0f * REFRESH_RATE, 0.7f, 10.0f, 0.4f, 1.0f, 0, 2, 6 };
|
||||
UnkM432DllData1794Struct lbl_1_data_17B4 = { 95.0f * REFRESH_RATE, 0.8f, 8.0f, 0.6f, 1.0f, 0, 4, 5 };
|
||||
UnkM432DllData1794Struct lbl_1_data_17D4 = { 85.0f * REFRESH_RATE, 0.9f, 6.0f, 0.8f, 1.0f, 0, 6, 4 };
|
||||
UnkM432DllData1794Struct lbl_1_data_17F4 = { 75.0f * REFRESH_RATE, 1.0f, 4.0f, 1.0f, 1.0f, 0, 8, 3 };
|
||||
HsfanimStruct00 lbl_1_data_1814 = {
|
||||
0x1E,
|
||||
{ 0, 0 },
|
||||
|
|
|
|||
|
|
@ -4,6 +4,8 @@
|
|||
#include "dolphin/types.h"
|
||||
#include "game/hsfman.h"
|
||||
|
||||
#include "version.h"
|
||||
|
||||
#include "game/object.h"
|
||||
extern s32 rand8(void);
|
||||
|
||||
|
|
@ -240,6 +242,11 @@ typedef struct _unkObjStruct {
|
|||
f32 unk70;
|
||||
} unkObjStruct;
|
||||
|
||||
#if VERSION_NTSC
|
||||
#define REFRESH_RATE_F 60.0f
|
||||
#else
|
||||
#define REFRESH_RATE_F 49.998f
|
||||
#endif
|
||||
|
||||
////// BSS //////
|
||||
extern omObjData* lbl_1_bss_C0[4];
|
||||
|
|
|
|||
64
include/REL/m460Dll.h
Normal file
64
include/REL/m460Dll.h
Normal file
|
|
@ -0,0 +1,64 @@
|
|||
#ifndef M460DLL_H
|
||||
#define M460DLL_H
|
||||
|
||||
#include "game/object.h"
|
||||
|
||||
typedef struct UnkM460DllStruct {
|
||||
float unk_00;
|
||||
float unk_04;
|
||||
float unk_08;
|
||||
float unk_0C;
|
||||
} UnkM460DllStruct;
|
||||
|
||||
typedef struct M460DllCameraStruct {
|
||||
s32 unk_00;
|
||||
s32 unk_04;
|
||||
s32 unk_08;
|
||||
u32 unk_0C;
|
||||
float unk_10;
|
||||
float unk_14;
|
||||
float unk_18;
|
||||
Vec unk_1C;
|
||||
Vec unk_28;
|
||||
float unk_34;
|
||||
s32 unk_38;
|
||||
s32 unk_3C;
|
||||
float unk_40;
|
||||
UnkM460DllStruct unk_44;
|
||||
char unk54[0x30];
|
||||
float unk_84;
|
||||
char unk88[0x4];
|
||||
float unk_8C;
|
||||
float unk_90;
|
||||
s32 unk_94;
|
||||
char unk98[0xC];
|
||||
} M460DllCameraStruct; /* size = 0xA4 */ // same as M443DllCameraStruct // TODO does this have to be here?
|
||||
|
||||
void fn_1_3E68(u32 arg0);
|
||||
M460DllCameraStruct *fn_1_3E90(s32 arg0);
|
||||
M460DllCameraStruct *fn_1_3F2C(s32 arg0);
|
||||
u32 fn_1_414C(void);
|
||||
u32 fn_1_4164(void);
|
||||
s32 fn_1_419C(void);
|
||||
void fn_1_41B4(s32 arg0, s32 arg1, s32 arg2);
|
||||
void fn_1_41F4(s32 arg0);
|
||||
void fn_1_4224(s32 arg0);
|
||||
void fn_1_42BC(u32 arg0);
|
||||
s32 fn_1_42F0(void);
|
||||
void fn_1_4308(void);
|
||||
s32 fn_1_4324(void);
|
||||
void fn_1_433C(void);
|
||||
s32 fn_1_4358(void);
|
||||
u32 fn_1_4370(void);
|
||||
float fn_1_47D0(float arg8, float arg9, float argA);
|
||||
|
||||
void fn_1_49A0(Process *process);
|
||||
void fn_1_4BE4(void);
|
||||
void fn_1_67B4(Process *process);
|
||||
void fn_1_6814(void);
|
||||
void fn_1_8BA0(float arg8);
|
||||
void fn_1_8CAC(Process *process, s16 arg1);
|
||||
void fn_1_8F38(void);
|
||||
void fn_1_8FAC(s32 arg0);
|
||||
|
||||
#endif
|
||||
Loading…
Add table
Add a link
Reference in a new issue