Merge branch 'main' into main

This commit is contained in:
CreateSource 2025-01-15 19:54:23 -05:00 committed by GitHub
commit eb91e8162a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
234 changed files with 47605 additions and 9728 deletions

15
include/REL/m425Dll.h Normal file
View file

@ -0,0 +1,15 @@
#ifndef M425DLL_H
#define M425DLL_H
#include "game/object.h"
omObjData *fn_1_6A0C(Process *process, s32 arg1);
void fn_1_6C08(void);
void fn_1_6CD0(s32 arg0, Vec *arg1);
s32 fn_1_109EC(s32 arg0, s32 arg1, Vec *arg2, Vec *arg3, Vec *arg4, s32 arg5);
float fn_1_10CF4(s32 arg0);
void fn_1_10DB4(s32 arg0);
void fn_1_10E3C(s32 arg0);
float fn_1_10EF8(s32 arg0, s32 arg1, float arg8, float arg9);
#endif

26
include/REL/m430Dll.h Normal file
View file

@ -0,0 +1,26 @@
#ifndef M430DLL_H
#define M430DLL_H
#include "game/object.h"
s32 fn_1_4030(void);
u32 fn_1_4058(void);
u32 fn_1_4070(void);
u32 fn_1_4088(void);
void fn_1_40D0(s32 arg0);
void fn_1_4100(s32 arg0);
float fn_1_4130(void);
float fn_1_48B0(float arg8, float arg9, float argA);
void fn_1_4A80(Process *process);
void fn_1_4C48(void);
float fn_1_7FBC(s32 arg0);
void fn_1_7FFC(s32 arg0, float arg8);
void fn_1_AEE0(s32 arg0, Vec *arg1, float arg8, float arg9);
void fn_1_B570(s32 arg0, Vec *arg1, float arg8, float arg9, Vec *arg2);
void fn_1_BB98(u32 arg0);
void fn_1_BBC4(Process *process);
void fn_1_C00C(void);
#endif

43
include/REL/m433Dll.h Normal file
View file

@ -0,0 +1,43 @@
#ifndef M4303LL_H
#define M4303LL_H
#include "game/object.h"
typedef struct M433DllWork {
u32 unk_00;
s32 unk_04;
s32 unk_08;
s32 unk_0C;
s32 unk_10;
s32 unk_14;
s32 unk_18;
u32 unk_1C;
u32 unk_20;
s32 unk_24;
u32 unk_28;
s32 unk_2C[2];
u32 unk_34;
s32 unk_38;
s32 unk_3C;
} M433DllWork; /* size = 0x40 */
void fn_1_584(omObjData *object);
void fn_1_618(omObjData *object);
u32 fn_1_216C(void);
u32 fn_1_2184(void);
void fn_1_219C(s32 arg0, s32 arg1, s32 arg2);
void fn_1_21E4(s32 arg0);
void fn_1_2214(s32 arg0);
s32 fn_1_2244(void);
float fn_1_26C4(float arg8, float arg9, float argA);
void fn_1_2894(Process *process);
void fn_1_2984(void);
omObjFunc fn_1_29A4(Process *process, omObjData *object);
void fn_1_58D8(s32);
void fn_1_5904(Process *process);
void fn_1_5B74(void);
s32 fn_1_10FA4(s32 arg0);
#endif

View file

@ -5,12 +5,13 @@
#include "game/objsub.h"
#include "game/object.h"
#include "ext_math.h"
// -------------------------------------------------------------------------- //
#define US_PER_60TH_SEC (1000000.0f / 60.0f)
#define US_TO_60TH_SEC(us) ((us) / US_PER_60TH_SEC)
#define FB_SIZE(width, height) width * height * 2
#define ABS(x) ((x) < 0 ? -(x) : (x))
// -------------------------------------------------------------------------- //
@ -44,4 +45,4 @@ omObjFunc2 fn_1_F9C;
#endif
// -------------------------------------------------------------------------- //
// -------------------------------------------------------------------------- //

114
include/REL/mstory2Dll.h Normal file
View file

@ -0,0 +1,114 @@
#ifndef MSTORY2DLL_H
#define MSTORY2DLL_H
#include "game/object.h"
#include "game/process.h"
#include "dolphin/types.h"
typedef struct {
/* 0x00 */ void (*unk00)(void);
/* 0x04 */ void (*unk04)(void);
/* 0x08 */ Vec unk08;
/* 0x14 */ float unk14;
/* 0x18 */ float unk18;
/* 0x1C */ float unk1C;
/* 0x20 */ Vec unk20;
/* 0x2C */ float unk2C;
/* 0x30 */ float unk30;
/* 0x34 */ float unk34;
/* 0x38 */ float unk38;
/* 0x3C */ float unk3C;
/* 0x40 */ s32 unk40;
} StructBss24; // Size 0x44
typedef struct {
/* 0x00 */ s32 unk00;
/* 0x04 */ s32 unk04;
/* 0x08 */ s32 unk08;
/* 0x0C */ s32 unk0C;
/* 0x10 */ s32 unk10;
/* 0x14 */ s32 unk14;
/* 0x18 */ s32 unk18;
/* 0x1C */ char unk1C[0x18];
} StructFn357C; // Size 0x34
typedef struct {
/* 0x00 */ omObjData* unk00;
/* 0x04 */ void (*unk04)(omObjData*, ...);
/* 0x08 */ s32 unk08;
/* 0x0C */ s32 unk0C;
/* 0x10 */ char unk10[0x18];
} StructBss16C; // Size 0x28
// main.c
float fn_1_864(float arg0, float arg1, float arg2, float arg3);
float fn_1_88C(float arg0, float arg1, float arg2);
float fn_1_8AC(float arg0, float arg1, float arg2, float arg3);
float fn_1_984(float arg0, float arg1, float arg2, float arg3);
float fn_1_A4C(float arg0, float arg1, float arg2, float arg3);
float fn_1_B08(float arg0, float arg1, float arg2, float arg3);
void fn_1_BC8(void);
void fn_1_BE8(s32 arg0);
void fn_1_C30(void);
s32 fn_1_185C(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4);
void fn_1_1A94(s32 arg0);
void fn_1_1AFC(s32 arg0, s32 arg1);
BOOL fn_1_1BA8(s32 arg0, s32 arg1);
BOOL fn_1_1C64(s32 arg0);
void fn_1_1D18(s32 arg0, s32 arg1);
void fn_1_1D4C(s32 arg0, s32 arg1, s32 arg2);
void fn_1_1DFC(omObjData* arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4);
void fn_1_2264(omObjData* arg0, s32 arg1, s32 arg2, s32 arg3);
void fn_1_2750(void (*arg0)(void));
void fn_1_2828(Process* arg0, void (*arg1)(void));
void fn_1_2948(omObjData* arg0, s32 arg1, Vec arg2, float arg3, float arg4, float arg5);
void fn_1_2D00(omObjData* arg0, s32 arg1, Vec arg2, float arg3, float arg4, float arg5);
void fn_1_357C(StructFn357C* arg0, s32 arg1);
void fn_1_42A0(StructBss24* arg0, StructBss24* arg1, float arg2, float arg3, float arg4);
s32 fn_1_3668(s32 arg0);
void fn_1_3754(void);
void fn_1_3854(StructBss24* arg0);
void fn_1_3B04(StructBss24* arg0, float arg1);
void fn_1_4FEC(StructBss24* arg0, StructBss24* arg1, float arg2, float arg3, float arg4);
void fn_1_6004(StructBss24* arg0, StructBss24* arg1, float arg2, float arg3, float arg4);
int fn_1_66CC(int modelId);
void fn_1_6704(omObjData* arg0);
void fn_1_67D8(omObjData* arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4);
void fn_1_6A90(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4);
void fn_1_6D78(s32 arg0, s32 arg1, s32 arg2, s32 arg3);
void fn_1_6DBC(s32 arg0, s32 arg1, s32 arg2, s32 arg3);
s32 fn_1_7064(s32 arg0, s32 arg1);
void fn_1_71DC(s32 arg0);
void fn_1_7244(s16 modelId, char *objName, u32 constAttr, float ofs);
void fn_1_7384(int modelId, int charNo, float ofs, s32 maxTime, BOOL flag);
// board_clear.c
void fn_1_7F54(Process* arg0, s32 arg1);
// board_clear.c
void fn_1_B3E4(Process* arg0, s32 arg1);
// board_miss.c
void fn_1_EA2C(Process* arg0, s32 arg1);
// mg_clear.c
void fn_1_1256C(Process* arg0, s32 arg1);
// mg_miss.c
void fn_1_16060(Process* arg0, s32 arg1);
// ending.c
void fn_1_188F0(Process* arg0, s32 arg1);
// ending.c
void fn_1_1B90C(Process* arg0);
extern s32 lbl_1_bss_88[16];
extern s32 lbl_1_bss_78[4];
extern s32 lbl_1_bss_68[];
extern StructBss24 lbl_1_bss_24;
extern s32 lbl_1_data_0[][4];
#endif

96
include/REL/mstoryDll.h Executable file
View file

@ -0,0 +1,96 @@
#ifndef MSTORYDLL_H
#define MSTORYDLL_H
#include "game/object.h"
#include "game/process.h"
#include "dolphin/types.h"
typedef struct {
/* 0x00 */ void (*unk00)(void);
/* 0x04 */ void (*unk04)(void);
/* 0x08 */ Vec unk08;
/* 0x14 */ float unk14;
/* 0x18 */ float unk18;
/* 0x1C */ float unk1C;
/* 0x20 */ Vec unk20;
/* 0x2C */ float unk2C;
/* 0x30 */ float unk30;
/* 0x34 */ float unk34;
/* 0x38 */ float unk38;
/* 0x3C */ float unk3C;
/* 0x40 */ s32 unk40;
} StructBss4; // Size 0x44
typedef struct {
/* 0x00 */ s32 unk00;
/* 0x04 */ s32 unk04;
/* 0x08 */ s32 unk08;
/* 0x0C */ s32 unk0C;
/* 0x10 */ s32 unk10;
/* 0x14 */ s32 unk14;
/* 0x18 */ s32 unk18;
/* 0x1C */ char unk1C[0x18];
} StructFn352C; // Size 0x34
typedef struct {
/* 0x00 */ omObjData* unk00;
/* 0x04 */ void (*unk04)(omObjData*, ...);
/* 0x08 */ s32 unk08;
/* 0x0C */ s32 unk0C;
/* 0x10 */ char unk10[0x18];
} StructBss19C; // Size 0x28
// main.c
float fn_1_828(float arg0, float arg1, float arg2, float arg3);
float fn_1_870(float arg0, float arg1, float arg2, float arg3);
float fn_1_948(float arg0, float arg1, float arg2, float arg3);
float fn_1_ACC(float arg0, float arg1, float arg2, float arg3);
void fn_1_B8C(void);
void fn_1_BAC(s32 arg0);
void fn_1_BF4(void);
s32 fn_1_1834(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4);
void fn_1_1A64(s32 arg0);
void fn_1_1ACC(s32 arg0, s32 arg1);
BOOL fn_1_1B78(s32 arg0, s32 arg1);
BOOL fn_1_1C34(s32 arg0);
void fn_1_1CE8(s32 arg0, s32 arg1);
void fn_1_1D1C(s32 arg0, s32 arg1, s32 arg2);
void fn_1_1DCC(omObjData* arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4);
void fn_1_2224(omObjData* arg0, s32 arg1, s32 arg2, s32 arg3);
void fn_1_2710(void (*arg0)(void));
void fn_1_27E8(Process* arg0, void (*arg1)(void));
void fn_1_2908(omObjData* arg0, s32 arg1, Vec arg2, float arg3, float arg4, float arg5);
void fn_1_2CB0(omObjData* arg0, s32 arg1, Vec arg2, float arg3, float arg4, float arg5);
void fn_1_352C(StructFn352C* arg0, s32 arg1);
s32 fn_1_3618(s32 arg0);
void fn_1_3704(void);
void fn_1_3804(StructBss4* arg0);
void fn_1_3ABC(StructBss4* arg0, float arg1);
void fn_1_51D0(StructBss4* arg0, StructBss4* arg1, float arg2, float arg3, float arg4);
void fn_1_61E8(StructBss4* arg0, StructBss4* arg1, float arg2, float arg3, float arg4);
void fn_1_6C1C(s32 arg0, s32 arg1, s32 arg2, s32 arg3);
s32 fn_1_6EB8(s32 arg0, s32 arg1);
void fn_1_7028(s32 arg0);
// board_clear.c
void fn_1_79B8(Process* arg0, s32 arg1, s32 arg2);
// board_miss.c
void fn_1_ACFC(Process* arg0, s32 arg1, s32 arg2);
// mg_clear.c
void fn_1_E710(Process* arg0, s32 arg1, s32 arg2);
// mg_miss.c
void fn_1_11624(Process* arg0, s32 arg1, s32 arg2);
// save.c
void fn_1_14150(Process* arg0);
extern s32 lbl_1_bss_68;
extern s32 lbl_1_bss_58[];
extern StructBss4 lbl_1_bss_4;
extern s32 lbl_1_data_0[][4];
#endif