Merge branch 'main' of https://github.com/abnormalhare/marioparty4
This commit is contained in:
commit
a6d8b8bb66
114 changed files with 4697 additions and 364 deletions
|
|
@ -14,7 +14,7 @@ typedef void (*VoidFunc)(void);
|
|||
extern const VoidFunc _ctors[];
|
||||
extern const VoidFunc _dtors[];
|
||||
|
||||
extern void ModuleProlog(void);
|
||||
extern void ObjectSetup(void);
|
||||
extern void ModuleEpilog(void);
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
|
|
|||
|
|
@ -4,16 +4,36 @@
|
|||
#include "game/object.h"
|
||||
#include "game/process.h"
|
||||
|
||||
typedef struct UnkM406Struct2 {
|
||||
/* 0x00 */ float unk_00;
|
||||
/* 0x04 */ float unk_04;
|
||||
/* 0x08 */ Vec unk_08;
|
||||
/* 0x14 */ Vec unk_14;
|
||||
} UnkM406Struct2; /* size = 0x20 */
|
||||
|
||||
s32 fn_1_122C(void);
|
||||
void fn_1_123C(void);
|
||||
void fn_1_1274(s32 arg0);
|
||||
void fn_1_1284(void);
|
||||
void fn_1_12BC(void);
|
||||
|
||||
omObjData *fn_1_2308(Process *arg0);
|
||||
void fn_1_2BEC(void);
|
||||
void fn_1_3064(s32 arg0);
|
||||
void fn_1_696C(float arg8);
|
||||
void fn_1_6B5C(void);
|
||||
void fn_1_69C0(Vec *arg0);
|
||||
s32 fn_1_6A44(Vec arg0);
|
||||
void fn_1_6BB4(Vec *arg0);
|
||||
void fn_1_82C8(Mtx arg0, s32 arg1, float arg8);
|
||||
s32 fn_1_94C0(Mtx arg0, s32 arg1, s32 arg2);
|
||||
void fn_1_B104(float arg8);
|
||||
void fn_1_B25C(void);
|
||||
void fn_1_B41C(void);
|
||||
void fn_1_D65C(Process *arg0);
|
||||
void fn_1_D8B0(void);
|
||||
|
||||
extern UnkM406Struct2 *lbl_1_bss_B8;
|
||||
extern s32 lbl_1_bss_B4;
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -297,7 +297,7 @@ extern f32 lbl_1_data_250;
|
|||
|
||||
////// FUNCTIONS //////
|
||||
// main.c
|
||||
extern void ModuleProlog(void);
|
||||
extern void ObjectSetup(void);
|
||||
extern void fn_1_3C4(omObjData* object);
|
||||
extern void fn_1_434(omObjData* object);
|
||||
extern s32 fn_1_4A4(void);
|
||||
|
|
@ -393,4 +393,4 @@ extern void fn_1_F168(void);
|
|||
extern void fn_1_F228(void);
|
||||
extern u16 fn_1_F4C0(unkObjStruct*, u16);
|
||||
extern void fn_1_F4D4(unkObjStruct*, u16, u16);
|
||||
extern s32 fn_1_F4FC(s32);
|
||||
extern s32 fn_1_F4FC(s32);
|
||||
|
|
|
|||
|
|
@ -234,7 +234,7 @@ extern Vec lbl_1_data_4B4[3];
|
|||
|
||||
////// PROTOTYPES //////
|
||||
// main.c
|
||||
extern void ModuleProlog(void);
|
||||
extern void ObjectSetup(void);
|
||||
extern void fn_1_13C(omObjData*);
|
||||
extern unkStruct* m446FlowCreate(void);
|
||||
extern void fn_1_3FC(unkStruct*);
|
||||
|
|
@ -363,4 +363,4 @@ extern unkStruct9* m446StageCreate(void);
|
|||
extern void fn_1_83F0(unkStruct9*);
|
||||
extern void fn_1_84AC(unkStruct9*);
|
||||
extern void fn_1_852C(unkStruct9*);
|
||||
extern void fn_1_860C(unkStruct9*);
|
||||
extern void fn_1_860C(unkStruct9*);
|
||||
|
|
|
|||
|
|
@ -1,15 +0,0 @@
|
|||
#ifndef STAFFDLL_H
|
||||
#define STAFFDLL_H
|
||||
|
||||
#include "dolphin/types.h"
|
||||
|
||||
typedef struct UnkStaffDllStruct {
|
||||
/* 0x00 */ u32 unk_00;
|
||||
/* 0x04 */ s32 unk_04;
|
||||
/* 0x08 */ float unk_08;
|
||||
/* 0x0C */ u32 unk_0C;
|
||||
/* 0x10 */ s32 unk_10;
|
||||
/* 0x14 */ s32 unk_14;
|
||||
} UnkStaffDllStruct;
|
||||
|
||||
#endif
|
||||
Loading…
Add table
Add a link
Reference in a new issue