Merge branch 'Rainchus:main' into main
This commit is contained in:
commit
8243ade01d
30 changed files with 3706 additions and 509 deletions
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue