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

Tons of warning/error fixes

Browse source
This commit is contained in:
dbalatoni13 2025-04-13 04:28:21 +02:00
parent ada77fe830
commit 236ce75a28
62 changed files with 298 additions and 231 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/REL/m401Dll/main.c
View file

@ -17,6 +17,10 @@
#include "ext_math.h"
#include "math.h"
#ifndef __MWERKS__
#include "game/audio.h"
#endif
float lbl_2_data_0 = -7.1875f;
s16 lbl_2_data_4[] = { 0, 1, 2, 3, 4, 5, 6, 7 };

6
src/REL/m401Dll/main_ex.c
View file

@ -11,6 +11,10 @@
#include "REL/m401Dll.h"
#ifndef __MWERKS__
extern s32 rand8(void);
#endif
struct Bss13EData {
s16 unk0;
s16 unk2[3];
@ -319,7 +323,6 @@ void fn_2_113AC(omObjData *object)
M401WorkPlayer *temp_r28;
omObjData *temp_r27;
ParticleData *temp_r25;
s16 temp_r24;
temp_r30 = object->data;
temp_r30->unk0.z += (lbl_2_bss_50 * 0.5f);
object->trans.x = temp_r30->unk0.x;
@ -564,7 +567,6 @@ void fn_2_123F8(ModelData *model, ParticleData *particle, Mtx matrix)
HsfanimStruct01 *temp_r31;
s32 temp_r29;
s32 temp_r28;
UnkWork10A88 *temp_r27;
if (!particle->unk_02) {
particle->unk_02 = 1;
temp_r31 = particle->unk_48;

2
src/REL/m402Dll/main.c
View file

@ -682,7 +682,9 @@ static void fn_1_1FC4(Vec *arg0, float *arg1, s32 arg2, s32 arg3)
VECAdd((Vec *)&arg0, &sp18, (Vec *)&arg0);
}
#ifdef __MWERKS__
#include "src/REL/executor.c"
#endif
static void fn_1_2454(void)
{

8
src/REL/m405Dll/main.c
View file

@ -8,6 +8,7 @@
#include "game/gamework_data.h"
#include "game/hsfanim.h"
#include "game/hsfdraw.h"
#include <game/hsfex.h>
#include "game/hsfman.h"
#include "game/hsfmotion.h"
#include "game/memory.h"
@ -23,6 +24,11 @@
#include "dolphin.h"
#include "ext_math.h"
#ifndef __MWERKS__
#include "game/audio.h"
#endif
#undef ABS
#define ABS(x) ((0 > (x)) ? -(x) : (x))
@ -1277,7 +1283,9 @@ float fn_1_5664(Vec *arg0)
return lbl_1_bss_5AC.unk04[fn_1_23B4(arg0)].y;
}
#ifdef __MWERKS__
#include "src/REL/executor.c"
#endif
Vec lbl_1_data_100 = { 0.0f, 1.0f, 0.0f };
Vec lbl_1_data_10C = { 450.0f, 300.0f, 500.0f };

2
src/REL/m406Dll/map.c
View file

@ -455,7 +455,7 @@ UnkM406Struct5 lbl_1_bss_48;
Vec lbl_1_bss_3C;
s32 lbl_1_bss_30[3];
extern LightData Hu3DLocalLight[0x20];
SHARED_SYM extern LightData Hu3DLocalLight[0x20];
omObjData *fn_1_2308(Process *arg0)
{

3
src/REL/m407dll/whomp.c
View file

@ -74,7 +74,6 @@ ObjFuncs lbl_1_data_258[] = {
void fn_1_2354(Process *arg0)
{
Process *sp8;
u32 i;
u32 j;
@ -123,7 +122,7 @@ void fn_1_2564(void)
void fn_1_25C0(void)
{
u32 i, j;
u32 i;
lbl_1_bss_38 = 0;

7
src/REL/m409Dll/cursor.c
View file

@ -6,8 +6,7 @@
void fn_1_BF88(s16 arg0, s16 arg1)
{
s32 var_r31;
s32 var_r31_2;
s32 i;
unkStruct8 *var_r29;
unkStruct9Sub *var_r30;
@ -20,11 +19,11 @@ void fn_1_BF88(s16 arg0, s16 arg1)
var_r30 = HuMemDirectMallocNum(HEAP_SYSTEM, arg1 * sizeof(unkStruct9Sub), MEMORY_DEFAULT_NUM);
lbl_1_bss_F0.unkC = var_r30;
for (var_r31 = 0; var_r31 < arg0; var_r31++, var_r29++) {
for (i = 0; i < arg0; i++, var_r29++) {
var_r29->unk8 = 0;
}
for (var_r31 = 0; var_r31 < arg1; var_r31++, var_r30++) {
for (i = 0; i < arg1; i++, var_r30++) {
var_r30->unk6 = 0;
var_r30->unk8 = 0;
}

32
src/REL/m409Dll/main.c
View file

@ -212,12 +212,7 @@ void fn_1_DDC(omObjData *object)
void fn_1_F70(omObjData *object)
{
s16 *sp8;
s16 temp_r3;
s16 temp_r3_2;
s32 var_r31;
sp8 = (s16 *)object->data;
s16 *sp8 = (s16 *)object->data;
switch (fn_1_2454(7)) {
case 1:
if (lbl_1_bss_6 == 0) {
@ -225,10 +220,11 @@ void fn_1_F70(omObjData *object)
WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 0x3C);
}
if (WipeStatGet() == 0) {
s32 i;
fn_1_2414(7, 2);
for (var_r31 = 0; var_r31 < 4; var_r31++) {
omVibrate(var_r31, 0xC8, 6, 6);
for (i = 0; i < 4; i++) {
omVibrate(i, 0xC8, 6, 6);
}
}
break;
@ -382,13 +378,7 @@ s8 fn_1_10E8(omObjData *object)
s8 fn_1_1B74(omObjData *object)
{
f32 temp_f30;
f32 temp_f31;
s16 temp_r27;
s32 temp_r28;
unkStruct4 *temp_r30;
temp_r30 = (unkStruct4 *)object->data;
unkStruct4 *temp_r30 = object->data;
switch (lbl_1_bss_8) {
case 0:
temp_r30->unk2 = MGSeqCreate(3, 1);
@ -440,14 +430,12 @@ s8 fn_1_1B74(omObjData *object)
void fn_1_2098(omObjData *object)
{
ModelData *temp_r31;
f32 var_f28;
f32 var_f29;
f32 var_f31;
f32 var_f30;
s32 var_r30;
temp_r31 = &Hu3DData[lbl_1_bss_DC->model[4]];
ModelData *temp_r31 = &Hu3DData[lbl_1_bss_DC->model[4]];
if (fn_1_2454(0x18) != 0x18) {
lbl_1_bss_18 += 0.008f;
if (lbl_1_bss_18 >= 1.0f) {
@ -584,10 +572,6 @@ void fn_1_2484(omObjData *object)
void fn_1_2DCC(omObjData *object)
{
u16 spE;
u16 spC;
u16 spA;
u16 sp8;
ModelData *temp_r30;
f32 temp_f29;
f32 var_f31;
@ -597,8 +581,6 @@ void fn_1_2DCC(omObjData *object)
s16 var_r28;
s16 var_r27;
s16 var_r29;
s32 temp_r16;
s16 var_r18;
unkStruct4 *var_r31;
if ((lbl_1_bss_24.unk0 == 0) || (fn_1_2454(0x18) == 0x18)) {
@ -991,7 +973,6 @@ void fn_1_4FFC(s16 arg0, f32 arg1, f32 arg2, f32 arg3, s16 arg4)
Vec sp2C;
Vec sp20;
GXColor sp1A;
s16 sp18;
f32 temp_f31;
s16 var_r30;
unkStruct5 *temp_r31;
@ -1179,7 +1160,6 @@ unkStruct5 *fn_1_58E0(s16 arg0, Vec *arg1, Vec *arg2, f32 arg3, GXColor *arg4)
s16 fn_1_5A18(AnimData *arg0, s16 arg1, f32 arg8, s16 arg2, s16 arg3)
{
ModelData *temp_r28;
f32 temp_f0;
s16 var_r21;
s16 var_r22;
s16 var_r30;

24
src/REL/m409Dll/player.c
View file

@ -174,17 +174,11 @@ void fn_1_7344(omObjData *arg0)
f32 temp_f28;
f32 temp_f29;
f32 temp_f30;
f32 var_f25;
f32 var_f26;
f32 var_f27;
f32 var_f31;
s16 temp_r0;
s32 temp_r19;
s16 temp_r22;
s16 temp_r26;
s16 temp_r25;
s16 var_r20;
s16 var_r21;
s16 var_r27;
s16 var_r28;
s32 var_r24;
@ -379,23 +373,15 @@ void fn_1_7FE8(omObjData *arg0)
{
Vec sp20;
Vec sp14;
s32 sp10;
f32 spC;
s16 sp8;
unkStruct10 *var_r30;
unkStruct8Sub *temp_r29;
f32 temp_f0;
f32 temp_f0_2;
f32 temp_f1;
f32 temp_f29;
f32 temp_f30;
f32 var_f28;
s32 var_r28;
unkStruct7 *temp_r31;
temp_r31 = (unkStruct7 *)arg0->data;
sp10 = arg0->model[0];
sp8 = temp_r31->unk1C;
unkStruct7 *temp_r31 = (unkStruct7 *)arg0->data;
s32 sp10 = arg0->model[0];
s16 sp8 = temp_r31->unk1C;
temp_r31->unkE = temp_r31->unk10 = 0;
temp_r29 = fn_1_CCCC(temp_r31->unk57, 0);
sp20.x = sp20.y = sp20.z = 0.0f;
@ -1023,10 +1009,8 @@ s32 fn_1_A584(unkStruct10 *arg0)
s8 fn_1_A9C0(Vec *arg0, f32 *arg1)
{
f32 sp8;
f32 temp_f29;
f32 var_f30;
f32 var_f28;
s32 var_r27;
s32 var_r29;
unkStruct10 *var_r31;
@ -1080,8 +1064,6 @@ void fn_1_AC08(s32 *arg0, s32 arg1)
f32 fn_1_AD40(f32 arg0, f32 arg1, f32 arg2)
{
f32 var_f31;
f32 var_f30;
f32 var_f29;
var_f31 = fmodf(arg1 - arg0, 360.0);
if (var_f31 < 0.0f) {

14
src/REL/m410Dll/game.c
View file

@ -535,7 +535,6 @@ float fn_1_4FEC(Vec arg0, Vec arg1, float arg8, Vec arg2, Vec arg3, float arg9,
float sp2C;
float var_f28;
float var_f26;
float var_f25;
float var_f24;
float var_f23;
@ -777,19 +776,6 @@ void fn_1_61DC(UnkM410Struct2 *arg0, UnkM410Struct2 *arg1)
Vec sp68;
Vec sp5C;
Vec sp50;
Vec sp44;
Vec sp38;
Vec sp2C;
Vec sp20;
Vec sp14;
Vec sp8;
Vec *var_r29;
Vec *var_r28;
Vec *var_r27;
Vec *var_r26;
Vec *var_r25;
Vec *var_r24;
if (arg0->unk_00_field1 || arg1->unk_00_field1) {
if (arg0->unk_00_field1) {

18
src/REL/m410Dll/main.c
View file

@ -8,6 +8,8 @@
#include "REL/m410Dll.h"
#include <game/audio.h>
Process *lbl_1_bss_28;
omObjData *lbl_1_bss_24;
omObjData *lbl_1_bss_20;
@ -223,11 +225,7 @@ void fn_1_DEC(omObjData *object)
void fn_1_FF0(omObjData *object)
{
void *var_r31;
UnkM410Struct *var_r29;
void *var_r28;
var_r29 = object->data;
UnkM410Struct *var_r29 = object->data;
fn_1_5A8(object);
switch (var_r29->unk_14) {
@ -265,11 +263,8 @@ void fn_1_FF0(omObjData *object)
void fn_1_139C(omObjData *object)
{
UnkM410Struct *var_r29;
s32 var_r27;
var_r29 = object->data;
var_r27 = 0;
UnkM410Struct *var_r29 = object->data;
s32 var_r27 = 0;
fn_1_5A8(object);
if (!--var_r29->unk_20) {
@ -470,9 +465,6 @@ s32 fn_1_28DC(void)
void fn_1_2914(Vec *arg0, Vec *arg1)
{
Vec sp10;
float var_f29;
float var_f28;
float var_f27;
sp10.x = arg1->x - arg0->x;
sp10.y = arg1->y - arg0->y;

19
src/REL/m410Dll/player.c
View file

@ -259,14 +259,8 @@ void fn_1_8414(omObjData *object)
void fn_1_8678(omObjData *object)
{
float var_f31;
float var_f30;
float var_f29;
UnkM410Struct5 *var_r31;
s32 var_r29;
var_r31 = object->data;
var_r29 = 0;
UnkM410Struct5 *var_r31 = object->data;
s32 var_r29 = 0;
var_r31->unk_10 = 0;
if (fn_1_281C() == 2) {
var_r31->unk_10 = HuPadBtnDown[GWPlayerCfg[object->work[0]].pad_idx];
@ -465,8 +459,6 @@ void fn_1_9040(omObjData *object)
Mtx sp38;
Vec sp2C;
Vec sp20;
Vec sp14;
Vec sp8;
float var_f31;
float var_f30;
@ -475,18 +467,11 @@ void fn_1_9040(omObjData *object)
float var_f27;
float var_f26;
float var_f25;
float var_f24;
float var_f23;
float var_f22;
double var_f21;
double var_f20;
UnkM410Struct5 *var_r31;
s32 var_r29;
s32 var_r28;
s16 var_r27;
Vec *var_r26;
Vec *var_r25;
var_r31 = object->data;
fn_1_79F8(object->model[0], lbl_1_data_16C[var_r31->unk_08], sp38);

25
src/REL/m412Dll/main.c
View file

@ -569,8 +569,6 @@ void fn_1_2064(void)
Vec sp28;
Vec sp1C;
Vec sp10;
f32 spC;
f32 sp8;
Process *temp_r26;
s32 var_r30;
unkStruct *temp_r28;
@ -701,10 +699,6 @@ s32 fn_1_2708(void)
f32 fn_1_27C4(s32 arg0, f32 arg8, f32 arg9)
{
f32 temp_f31;
f32 var_f25;
f32 var_f26;
f32 var_f27;
f32 var_f28;
f32 var_f29;
temp_f31 = arg8 - fn_1_1D08(arg9);
@ -922,18 +916,11 @@ void fn_1_3950(void)
f32 sp5C;
volatile f32 sp58;
f32 sp54;
f32 temp_f27;
f32 var_f29;
f32 temp_f31;
f32 temp_f30;
f32 var_f18;
f32 var_f19;
f32 var_f20;
f32 var_f21;
f32 var_f22;
f32 var_f23;
f32 var_f24;
s32 var_r28;
s32 var_r24;
s32 var_r25;
s32 var_r29;
@ -1269,9 +1256,6 @@ void fn_1_5838(unkStruct3 *arg0)
Vec spA8;
Vec sp9C;
Vec sp90;
Vec sp84;
Vec sp78;
Vec sp6C;
s32 sp68;
f32 sp64;
f32 sp60;
@ -1593,13 +1577,6 @@ void fn_1_6814(unkStruct3 *arg0)
void fn_1_7C60(void)
{
Vec sp1A0;
Vec sp188;
Vec sp17C;
Vec sp170;
Vec sp164;
Vec sp158;
Vec sp14C;
Vec sp140;
f32 sp13C;
f32 sp138;
f32 sp134;
@ -2020,8 +1997,6 @@ void fn_1_AA88(ModelData *model, ParticleData *particle, f32 (*matrix)[4])
void fn_1_ADC8(void)
{
Vec sp14;
Vec sp8;
f32 var_f31;
void *temp_r28;
Process *var_r29;

2
src/REL/m413Dll/main.c
View file

@ -19,7 +19,7 @@
#include "game/hsfex.h"
#endif
s32 rand8(void);
extern s32 rand8(void);
typedef struct struct_bss_2A6C StructBss2A6C;

2
src/REL/m425Dll/thwomp.c
View file

@ -27,7 +27,7 @@
#include "REL/m425Dll.h"
extern u32 GlobalCounter;
extern LightData Hu3DLocalLight[0x20];
SHARED_SYM extern LightData Hu3DLocalLight[0x20];
typedef struct M425DllUnkStruct4 {
s16 unk_00;

2
src/REL/m427Dll/map.c
View file

@ -18,7 +18,7 @@
#include "string.h"
extern s32 rand8(void);
extern LightData Hu3DLocalLight[0x20];
SHARED_SYM extern LightData Hu3DLocalLight[0x20];
#define FABS(value) ((value < 0) ? -(value) : (value))

2
src/REL/m449Dll/main.c
View file

@ -26,7 +26,7 @@
#include "game/hsfex.h"
#endif
s32 rand8(void);
extern s32 rand8(void);
typedef struct UnkCameraStruct {
/* 0x00 */ float unk_00;

2
src/REL/m457Dll/main.c
View file

@ -21,7 +21,7 @@
#include "ext_math.h"
#include "version.h"
s32 rand8(void);
extern s32 rand8(void);
#define MSM_SE_BOWSER_LAUGH 0x3A
#define MSM_SE_BOWSER_HOWL 0x3E

2
src/REL/mpexDll/mpex.c
View file

@ -44,7 +44,7 @@ typedef struct MpexDllUnkStruct4 {
/* 0x2C */ char unk2C[0x1C];
} MpexDllUnkStruct4; /* size = 0x48 */
s32 rand8(void);
extern s32 rand8(void);
float fn_1_1B52C(float arg8, float arg9, float argA, float argB);
float fn_1_1B574(float arg0, float arg1, float arg2, float arg3);
float fn_1_1B64C(float arg0, float arg1, float arg2, float arg3);

9
src/game/board/basic_space.c
View file

@ -1,3 +1,4 @@
#include "game/audio.h"
#include "game/board/basic_space.h"
#include "game/board/main.h"
#include "game/board/model.h"
@ -236,10 +237,10 @@ static void CreateCoinChg(coinChg *coin_chg, Vec *pos) {
BoardModelMotionSpeedSet(coin_chg->sign_model, 0.0f);
BoardModelMotionSpeedSet(coin_chg->tens_model, 0.0f);
BoardModelMotionSpeedSet(coin_chg->ones_model, 0.0f);
BoardModelScaleSet(coin_chg->sign_model, 0.001, 0.001, 0.001);
BoardModelScaleSet(coin_chg->tens_model, 0.001, 0.001, 0.001);
BoardModelScaleSet(coin_chg->ones_model, 0.001, 0.001, 0.001);
BoardModelScaleSet(coin_chg->coin_model, 0.001, 0.001, 0.001);
BoardModelScaleSet(coin_chg->sign_model, 0.001f, 0.001f, 0.001f);
BoardModelScaleSet(coin_chg->tens_model, 0.001f, 0.001f, 0.001f);
BoardModelScaleSet(coin_chg->ones_model, 0.001f, 0.001f, 0.001f);
BoardModelScaleSet(coin_chg->coin_model, 0.001f, 0.001f, 0.001f);
BoardModelLayerSet(coin_chg->sign_model, 1);
BoardModelLayerSet(coin_chg->tens_model, 1);
BoardModelLayerSet(coin_chg->ones_model, 1);

2
src/game/board/battle.c
View file

@ -19,6 +19,8 @@
#include "ext_math.h"
#include <game/hsfex.h>
typedef struct {
struct {
u8 unk00_field0 : 1;

3
src/game/board/block.c
View file

@ -1,4 +1,5 @@
#include "ext_math.h"
#include "game/audio.h"
#include "game/board/main.h"
#include "game/board/model.h"
#include "game/board/player.h"
@ -8,6 +9,8 @@
#include "game/objsub.h"
#include "game/process.h"
#include <game/board/audio.h>
#include <game/board/tutorial.h>
#define BLOCK_SPAWN 0
#define BLOCK_HIT 2

5
src/game/board/boo_house.c
View file

@ -1,5 +1,5 @@
#include "game/audio.h"
#include "game/board/boo_house.h"
#include "game/board/audio.h"
#include "game/board/boo.h"
#include "game/board/com.h"
@ -16,6 +16,9 @@
#include "ext_math.h"
#include <game/board/tutorial.h>
#include <game/hsfex.h>
// bss
static s16 houseMdl[6];

5
src/game/board/bowser.c
View file

@ -15,6 +15,10 @@
#include "ext_math.h"
#include "string.h"
#include <game/board/tutorial.h>
#include <game/chrman.h>
#include <game/hsfex.h>
typedef struct bowser_event_data {
s16 sprite[3];
s16 delay[3];
@ -1215,7 +1219,6 @@ static void ConfigBowserEvent(void)
for(coins=i=0; i<4; i++) {
coins += BoardPlayerCoinsGet(i);
}
retry:
while(1) {
chance = BoardRandMod(100);
if(chance >= 95) {

2
src/game/board/com.c
View file

@ -12,6 +12,8 @@
#include "ext_math.h"
#include <game/board/boo_house.h>
typedef BOOL (*UseCheckFunc)(s32 player, s32 item);
static void ExecComKeyLeft(void);

5
src/game/board/fortune.c
View file

@ -8,6 +8,10 @@
#include "game/wipe.h"
#include <game/audio.h>
#include <game/board/window.h>
#include <game/objsub.h>
static Vec camTargetFortune;
static Vec camPosFortune;
@ -197,7 +201,6 @@ static void FortunePostMG(void)
static void CreateFortunePlatform(void)
{
PlayerState *player;
Vec pos, rot;
PlatformWork *work;
fortunePlatformObj = omAddObjEx(boardObjMan, 257, 0, 0, -1, ExecFortunePlatform);

7
src/game/board/item.c
View file

@ -28,6 +28,13 @@
#include "ext_math.h"
#include <game/msm.h>
#ifndef __MWERKS__
#include <game/hsfex.h>
extern s32 rand8(void);
#endif
typedef struct {
/* 0x00 */ s16 unk00;
/* 0x02 */ s16 unk02;

6
src/game/board/last5.c
View file

@ -340,7 +340,7 @@ static void SetTeamResultTarget(s32 team, Vec *pos);
static void KillTeamResult(void);
static void UpdateTeamResult(omObjData *object);
void BoardLast5Exec()
void BoardLast5Exec(void)
{
GWSystem.player_curr = -1;
last5Proc = HuPrcChildCreate(ExecLast5, 8200, 14336, 0, boardMainProc);
@ -703,10 +703,10 @@ static void Last5Main(void)
temp_r20 = GetLast5RouletteResult();
GWSystem.last5_effect = temp_r20;
if(GWSystem.last5_effect == 2) {
BoardSpaceTypeForce(2, 3);
BoardSpaceTypeForce(2, 3);
}
if(GWSystem.last5_effect == 3) {
BoardSpaceTypeForce(2, 7);
BoardSpaceTypeForce(2, 7);
}
temp_r24 = 18+messBase+temp_r20;
BoardWinCreate(2, temp_r24, BoardWinPortraitGetStar());

4
src/game/board/lottery.c
View file

@ -24,6 +24,10 @@
#include "ext_math.h"
#include "stdlib.h"
#ifndef __MWERKS__
#include <game/board/shop.h>
#endif
typedef struct {
struct {
u8 unk00_field0 : 1;

34
src/game/board/main.c
View file

@ -1,15 +1,7 @@
#include "game/gamework_data.h"
#include "game/board/main.h"
#include "ext_math.h"
#include "game/object.h"
#include "game/flag.h"
#include "game/data.h"
#include "game/wipe.h"
#include "string.h"
#include "game/hsfman.h"
#include "game/hsfdraw.h"
#include "game/board/battle.h"
#include "game/board/lottery.h"
#include "game/board/main.h"
#include "game/board/model.h"
#include "game/board/pause.h"
#include "game/board/player.h"
@ -18,9 +10,30 @@
#include "game/board/start.h"
#include "game/board/tutorial.h"
#include "game/board/ui.h"
#include "game/pad.h"
#include "game/data.h"
#include "game/disp.h"
#include "game/flag.h"
#include "game/gamework_data.h"
#include "game/hsfdraw.h"
#include "game/hsfman.h"
#include "game/msm.h"
#include "game/object.h"
#include "game/pad.h"
#include "game/wipe.h"
#include "string.h"
#include <game/armem.h>
#include <game/audio.h>
#include <game/board/audio.h>
#include <game/board/boo_house.h>
#include <game/board/bowser.h>
#include <game/board/fortune.h>
#include <game/board/mg_setup.h>
#include <game/board/roll.h>
#include <game/board/window.h>
#include <game/chrman.h>
extern void BoardLast5Exec(void);
typedef struct camera_view {
s16 x_rot;
@ -297,7 +310,6 @@ void BoardSaveInit(s32 board)
GWSystem.block_pos = 0;
memset(GWSystem.board_data, 0, sizeof(GWSystem.board_data));
for(i=0; i<4; i++) {
s32 party_flag;
BoardPlayerAutoSizeSet(i, 0);
GWPlayer[i].draw_ticket = 0;
GWPlayer[i].color = 0;

11
src/game/board/mushroom.c
View file

@ -9,8 +9,13 @@
#include "game/objsub.h"
#include "math.h"
#include "ext_math.h"
#include "math.h"
#include <game/audio.h>
#include <game/board/tutorial.h>
#include <game/board/window.h>
#include <game/hsfex.h>
extern s32 boardTutorialData[4];
@ -70,9 +75,6 @@ static void WaitItemGive(void);
static void MushroomMain(void) {
Vec sp14[2];
Vec sp8;
s32 temp_r0;
s32 temp_r0_2;
s32 var_r30;
s32 curPlayer;
s8 var_r29;
boxObjWork* box;
@ -236,7 +238,6 @@ static void ShowBox(ItemGiveWork2*, omObjData*);
static void BoxMain(omObjData* arg0) {
s32 temp_r0;
ItemGiveWork2* temp_r30;
temp_r30 = OM_GET_WORK_PTR(arg0, ItemGiveWork2);

3
src/game/board/pause.c
View file

@ -18,6 +18,9 @@
#include "game/window.h"
#include "game/wipe.h"
#include <game/board/audio.h>
#include <game/hsfex.h>
typedef struct {
struct {
u8 unk00_field0 : 1;

33
src/game/board/player.c
View file

@ -21,6 +21,8 @@
#include "ext_math.h"
#include "stdlib.h"
#include <game/audio.h>
static void InitJunction(s32, s32, f32);
static void UpdateJunctionGfx(omObjData *);
static void StopJunctionPlayer(s32);
@ -266,7 +268,6 @@ void BoardPlayerModelInit(void)
s32 temp_r25;
s32 temp_r24;
s16 temp_r3;
s32 temp_r4;
PlayerState *temp_r27;
s32 ro0[8] = { DATA_MAKE_NUM(DATADIR_MARIOMDL1, 0x00), DATA_MAKE_NUM(DATADIR_LUIGIMDL1, 0x00), DATA_MAKE_NUM(DATADIR_PEACHMDL1, 0x00),
@ -337,7 +338,6 @@ void BoardPlayerModelKill(void)
{
s32 var_r31;
PlayerState *temp_r30;
PlayerState *temp_r29;
for (var_r31 = 0; var_r31 < 4; var_r31++) {
temp_r30 = BoardPlayerGet(var_r31);
@ -689,7 +689,6 @@ s32 BoardPlayerCoinsGet(s32 arg0)
void BoardPlayerCoinsAdd(s32 arg0, s32 arg1)
{
PlayerState *player;
s16 coins;
player = BoardPlayerGet(arg0);
if ((arg1 > 0) && (player->coins_total < 0x3E7)) {
@ -833,7 +832,6 @@ void BoardPlayerTurnExec(s32 arg0)
void BoardPlayerTurnRollExec(s32 arg0)
{
s32 temp_r28;
s32 temp_r30;
GWPlayer[arg0].roll = 0;
@ -876,8 +874,6 @@ void BoardPlayerTurnMoveExec(s32 arg0)
s32 temp_r30;
s32 var_r29;
s32 var_r28;
s32 temp_r0;
s32 temp_r1;
BoardPauseDisableSet(1);
var_r28 = 0;
@ -977,7 +973,6 @@ void BoardPlayerTurnMoveExec(s32 arg0)
GWSystem.bowser_event = 0xF;
}
BoardPlayerZoomRestore(arg0);
return;
}
void BoardPlayerPostTurnHookExec(s32 arg0)
@ -1067,9 +1062,6 @@ static inline GetLinkCount(s32 playerIdx, s32 boardIdx)
s32 linkCount;
BoardSpace *boardSpaceLink;
BoardSpace *boardSpaceFlag;
PlayerState *player;
s32 color;
s32 temp;
linkCount = 0;
boardSpaceLink = BoardSpaceGet(0, boardIdx);
@ -1325,7 +1317,6 @@ static s32 DoDebugMove(s32 arg0, s16 *arg1)
s32 var_r21;
s32 var_r20;
s32 var_r18;
bitcopy *var_r17;
var_r18 = -1;
@ -1653,7 +1644,6 @@ void BoardPlayerMoveTo(s32 arg0, s32 arg1)
{
Vec sp18;
Vec spC;
PlayerState *player;
BoardModelPosGet(BoardPlayerModelGet(arg0), &sp18);
BoardSpacePosGet(0, arg1, &spC);
@ -1667,8 +1657,6 @@ void BoardPlayerMoveBetween(s32 arg0, s32 arg1, s32 arg2)
{
Vec sp1C;
Vec sp10;
s32 spC;
s32 sp8;
BoardSpacePosGet(0, arg1, &sp1C);
BoardSpacePosGet(0, arg2, &sp10);
@ -1682,7 +1670,6 @@ void BoardPlayerMoveToAsync(s32 arg0, s32 arg1)
{
Vec sp18;
Vec spC;
s32 sp8;
BoardModelPosGet(BoardPlayerModelGet(arg0), &sp18);
BoardSpacePosGet(0, arg1, &spC);
@ -1868,11 +1855,8 @@ static void DiceJumpFunc(omObjData *arg0)
{
Vec sp38;
f32 temp_f31;
PlayerState *var_r30;
bitcopy2 *temp_r31;
s16 var_r28;
s32 var_r23;
s32 var_r17;
temp_r31 = OM_GET_WORK_PTR(arg0, bitcopy2);
if ((temp_r31->field00_bit0 != 0) || (BoardIsKill() != 0)) {
@ -1938,7 +1922,6 @@ void BoardPlayerMotBlendSet(s32 arg0, s16 arg1, s16 arg2)
f32 var_f27;
f32 var_f22;
f32 var_f21;
f32 var_f19;
omObjData *temp_r3;
s32 var_r22;
s32 var_r20;
@ -2212,11 +2195,7 @@ static void UpdateRoll(omObjData *arg0)
void BoardPlayerBtnDownWait(s32 arg0, u32 arg1)
{
s32 spC;
s32 sp8;
s32 temp_r31;
temp_r31 = GWPlayer[arg0].port;
s32 temp_r31 = GWPlayer[arg0].port;
while (1) {
if ((HuPadBtnDown[temp_r31] & arg1) != 0)
return;
@ -2226,9 +2205,7 @@ void BoardPlayerBtnDownWait(s32 arg0, u32 arg1)
void BoardPlayerAutoSizeSet(s32 player, s32 value)
{
PlayerState *temp_r28;
temp_r28 = BoardPlayerGet(player);
PlayerState *temp_r28 = BoardPlayerGet(player);
if ((temp_r28->auto_size != 0) || (value == 0)) {
BoardStatusHammerKill(player);
}
@ -2360,8 +2337,6 @@ void BoardBowserSuitInit(s32 arg0)
void BoardBowserSuitKill(s32 arg0)
{
bitcopy3 *temp;
if (bowserSuitObj != 0) {
OM_GET_WORK_PTR(bowserSuitObj, bitcopy3)->field00_bit0 = 1;
}

3
src/game/board/shop.c
View file

@ -24,6 +24,8 @@
#include "dolphin.h"
#include "ext_math.h"
#include <game/hsfex.h>
typedef struct {
struct {
u8 unk00_field0 : 1;
@ -981,7 +983,6 @@ static void CreateShopItemChoice(s32 arg0, s32 arg1)
omObjData *temp_r30;
ItemChoiceWork *var_r31;
s16 spC;
s16 i;
#if VERSION_PAL
for (i = 0; i < 6; i++) {
cursorPosTbl[i][0] = 190;

17
src/game/board/space.c
View file

@ -17,6 +17,17 @@
#include "ext_math.h"
#include "string.h"
#include <game/audio.h>
#include <game/board/basic_space.h>
#include <game/board/bowser.h>
#include <game/board/fortune.h>
#include <game/board/warp.h>
s32 BoardBlockExec(s32 player, s32 space); // wrong
extern void BoardMushroomExec(s32 player, s32 space); // wrong
extern void BoardBooHouseExec(s32 player, s32 space); // wrong
extern void BoardBlockHouseExec(s32 player, s32 space); // wrong
static BoardSpace spaceData[2][256];
s16 boardSpaceStarTbl[8];
static GXTexObj spaceHiliteTex;
@ -300,7 +311,6 @@ void BoardSpaceHostSet(s32 space)
{
s16 host_space;
Vec pos;
BoardSpace *space_plat;
BoardSpaceTypeSet(0, space, 8);
host_space = BoardSpaceLinkFlagSearch(0, space, 0x04000000);
BoardSpacePosGet(0, host_space, &pos);
@ -1079,14 +1089,11 @@ void BoardSpaceInit(s32 data_num)
if (_CheckFlag(FLAG_ID_MAKE(1, 1))) {
Vec pos;
Vec rot;
s16 space;
BoardModelVisibilitySet(starPlatMdl, 1);
GWSystem.star_flag |= (u8)(1 << GWSystem.star_pos);
BoardSpaceTypeSet(0, boardSpaceStarTbl[GWSystem.star_pos], 8);
{
int space;
BoardSpace *space_plat;
space = BoardSpaceLinkFlagSearch(0, BoardSpaceStarGetCurr(), 0x04000000);
int space = BoardSpaceLinkFlagSearch(0, BoardSpaceStarGetCurr(), 0x04000000);
BoardSpacePosGet(0, space, &pos);
BoardModelPosSetV(StarPlatGetMdl(), &pos);
BoardSpaceRotGet(0, space, &rot);

5
src/game/board/star.c
View file

@ -21,9 +21,14 @@
#include "game/objsub.h"
#include "game/window.h"
#include "game/wipe.h"
#include "game/hsfex.h"
#include "ext_math.h"
#ifndef __MWERKS__
#include <game/board/view.h>
#endif
typedef struct {
struct {
u8 unk00_field0 : 1;

6
src/game/board/tutorial.c
View file

@ -1,9 +1,11 @@
#include "game/board/tutorial.h"
#include "game/board/main.h"
#include "game/board/model.h"
#include "game/flag.h"
#include "game/gamework_data.h"
#include "game/process.h"
#include "game/board/main.h"
#include "game/board/model.h"
#include <game/board/space.h>
s32 boardTutorialData[4]; // maybe a single s32 + padding?
static void (*tutorialHook)(s16, s32);

4
src/game/board/view.c
View file

@ -127,8 +127,6 @@ static inline void BoardViewInlineFunc00(Vec *arg0, Vec *arg1, u16 arg2)
void BoardViewFocusSet(Vec *arg0, u16 arg1)
{
u16 var_r31;
if (BoardPauseDisableGet() == 0) {
BoardPauseDisableSet(1);
pauseDisableF = 1;
@ -143,8 +141,6 @@ void BoardViewFocusSet(Vec *arg0, u16 arg1)
void BoardViewMoveStart(Vec *arg0, Vec *arg1, u16 arg2)
{
u16 var_r31;
if (BoardPauseDisableGet() == 0) {
BoardPauseDisableSet(1);
pauseDisableF = 1;

14
src/game/hsfman.c
View file

@ -23,18 +23,18 @@
#define SHADOW_HEAP_SIZE 0x9000
SHARED_SYM ModelData Hu3DData[HU3D_MODEL_MAX];
CameraData Hu3DCamera[HU3D_CAM_MAX];
SHARED_SYM CameraData Hu3DCamera[HU3D_CAM_MAX];
static s16 layerNum[8];
static void (*layerHook[8])(s16);
AnimData *reflectAnim[5];
AnimData *hiliteAnim[4];
SHARED_SYM AnimData *hiliteAnim[4];
ThreeDProjectionStruct Hu3DProjection[4];
ShadowData Hu3DShadowData;
SHARED_SYM ShadowData Hu3DShadowData;
HsfScene FogData;
Mtx Hu3DCameraMtx;
Mtx Hu3DCameraMtxXPose;
LightData Hu3DGlobalLight[0x8];
LightData Hu3DLocalLight[0x20];
SHARED_SYM Mtx Hu3DCameraMtx;
SHARED_SYM Mtx Hu3DCameraMtxXPose;
SHARED_SYM LightData Hu3DGlobalLight[0x8];
SHARED_SYM LightData Hu3DLocalLight[0x20];
Mtx lbl_8018D39C;
GXColor BGColor;

2
src/game/hsfmotion.c
View file

@ -18,7 +18,7 @@
static s32 SearchObjectIndex(HsfData *arg0, u32 arg1);
static s32 SearchAttributeIndex(HsfData *arg0, u32 arg1);
MotionData Hu3DMotion[HU3D_MOTION_MAX];
SHARED_SYM MotionData Hu3DMotion[HU3D_MOTION_MAX];
static HsfBitmap *bitMapPtr;

2
src/game/init.c
View file

@ -31,7 +31,7 @@ void *DemoFrameBuffer2;
void *DemoCurrentBuffer;
u32 minimumVcount;
float minimumVcountf;
u32 worstVcount;
SHARED_SYM u32 worstVcount;
static BOOL DemoStatEnable;

4
src/game/objsub.c
View file

@ -6,7 +6,7 @@
#include "game/window.h"
MgInfo mgInfoTbl[] = {
SHARED_SYM MgInfo mgInfoTbl[] = {
{
OVL_M401, // ovl
0, // type
@ -1170,7 +1170,7 @@ u8 lbl_801D3E94;
u32 mgRecordExtra;
SHARED_SYM s32 mgQuitExtraF;
SHARED_SYM s32 mgPracticeEnableF;
s32 mgInstExitEnableF;
SHARED_SYM s32 mgInstExitEnableF;
SHARED_SYM u8 mgBoardHostEnableF;
s16 mgTicTacToeGrid[3][3];

2
src/game/printfunc.c
View file

@ -24,7 +24,7 @@ struct strline_data {
static struct strline_data strline[256];
static char pfStrBuf[256];
int fontcolor;
SHARED_SYM int fontcolor;
u16 empstrline;
u16 strlinecnt;
BOOL saftyFrameF;

2
src/port/audio.c
View file

@ -352,7 +352,7 @@ s32 HuAudSStreamStatGet(s32 seNo) {
// return msmStreamGetStatus(seNo);
}
SNDGRPTBL sndGrpTable[] = {
SHARED_SYM SNDGRPTBL sndGrpTable[] = {
{ OVL_BOOT, -1, 0, 1, -1, -1 },
{ OVL_INST, -1, 0, 1, -1, -1 },
{ OVL_M401, 18, 0, 2, 64, 64 },