kobayashi90/marioparty4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'Rainchus:main' into main

Browse source
This commit is contained in:
CreateSource 2024-04-28 15:06:32 -04:00 • committed by GitHub
commit 8243ade01d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
30 changed files with 3706 additions and 509 deletions
Download patch file Download diff file Expand all files Collapse all files

52
include/REL/m401Dll.h
View file

@ -9,11 +9,63 @@ extern float lbl_2_bss_128;
extern float lbl_2_bss_124;
extern s16 lbl_2_bss_120;
typedef struct m401_work_player {
s16 unk0;
s32 unk4;
s32 unk8;
Vec unkC;
Vec unk18;
Vec unk24;
Vec unk30;
Vec unk3C;
omObjData *unk48;
omObjData *unk4C;
omObjData *unk50;
omObjData *unk54;
Vec unk58;
float unk64;
s16 unk68;
s16 unk6A;
s16 unk6C;
s16 unk6E;
s16 unk70;
s16 unk72;
s16 unk74;
s16 unk76;
s16 unk78;
s16 unk7A;
s16 unk7C;
s16 unk7E;
float unk80;
s16 unk84;
s16 unk86;
float unk88;
s16 unk8C;
s16 unk8E;
s16 unk90;
s16 unk92;
Vec unk94;
s8 unkA0;
s8 unkA1;
} M401WorkPlayer;
typedef struct unkwork_10A88 {
Vec unk0;
omObjData *unkC;
s16 unk10;
s16 unk12;
s16 unk14;
s32 unk18;
float unk1C;
} UnkWork10A88;
void fn_2_10240(Vec *arg0, Vec *arg1);
void fn_2_1041C(void);
void fn_2_10710(void);
void fn_2_1079C(void);
omObjData *fn_2_10A88(Vec *arg0, s16 arg1);
omObjData *fn_2_14640(Process *objman);
#endif

12
include/REL/w04Dll.h
View file

@ -1,7 +1,6 @@
#ifndef REL_W04_H
#define REL_W04_H
#include "game/process.h"
#include "game/board/map_object.h"
#include "dolphin/types.h"
@ -10,13 +9,18 @@ enum {
MAPOBJ_MAX = 16
};
typedef struct {
s8 unk00;
u8 unk01;
} UnkW04BoardData;
extern s32 fn_1_1130(s16 arg0, float arg1, float arg2);
extern void fn_1_12FC(void);
extern void fn_1_15C8(void);
extern void fn_1_1618(void);
extern void fn_1_2058(void);
extern void fn_1_55B4(void);
extern void fn_1_6024(void);
@ -33,8 +37,6 @@ extern void fn_1_C7D4(void);
extern s16 lbl_1_bss_14[MAPOBJ_MAX];
extern BoardMapObject lbl_1_data_0[MAPOBJ_MAX];
extern s8 *lbl_1_bss_0;
extern Process *lbl_1_bss_38;
extern UnkW04BoardData *lbl_1_bss_0;
#endif

2
include/ext_math.h
View file

@ -12,6 +12,8 @@ typedef struct vec2f {
#define ABS(x) (((x) < 0) ? -(x) : (x))
#define VECDistanceXZ(a, b) sqrtf((((a)->x-(b)->x)*((a)->x-(b)->x))+(((a)->z-(b)->z)*((a)->z-(b)->z)))
#define VECDistanceAlt(a, b) sqrtf((((a)->x-(b)->x)*((a)->x-(b)->x))+(((a)->y-(b)->y)*((a)->y-(b)->y))+(((a)->z-(b)->z)*((a)->z-(b)->z)))
#define VECMagXZ(a) sqrtf(((a)->x*(a)->x)+((a)->z*(a)->z))
#define sind(x) sin(M_PI*(x)/180.0)

2
include/game/object.h
View file

@ -45,7 +45,7 @@ typedef struct om_obj_data {
/* 0x0A */ s16 next_idx;
/* 0x0C */ s16 group;
/* 0x0E */ u16 group_idx;
/* 0x10 */ int unk10;
/* 0x10 */ u32 unk10;
/* 0x14 */ omObjFunc func;
/* 0x18 */ Vec trans;
/* 0x24 */ Vec rot;