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

Match rest of mstory2 (#521)

Browse source
This commit is contained in:
Liam Coleman 2025-01-11 00:04:16 -06:00 • committed by GitHub
parent 98a95407ff
commit f28e9d19aa
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 2142 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/REL/mstory2Dll.h
View file

@ -46,6 +46,7 @@ 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);
@ -77,6 +78,7 @@ 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);

5
include/game/gamework_data.h
View file

@ -40,7 +40,8 @@ typedef struct system_state {
};
/* 0x09 */ s8 last5_effect;
/* 0x0A */ s8 player_curr;
/* 0x0B */ s8 unk0B[3];
/* 0x0B */ u8 unk0B;
/* 0x0C */ s8 unk0C;
/* 0x0E */ s16 block_pos;
/* 0x10 */ u8 ATTRIBUTE_ALIGN(4) board_data[32];
/* 0x30 */ u8 mess_delay;
@ -316,7 +317,7 @@ static inline s32 GWPlayerCurrGet(void)
static inline s32 GWUnkB1Get(void)
{
return GWSystem.unk0B[1];
return GWSystem.unk0C;
}
static inline s32 GWPlayerTeamGet(s32 player)