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

name board/start.c, some m463 (#556)

Browse source 
* end naming m463, start naming board/start.c

* name everything in start, fix m463 particle names

* lol fix
This commit is contained in:
CreateSource 2025-02-04 15:00:13 -05:00 • committed by GitHub
parent 74cae4f16e
commit c15173cc66
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 352 additions and 351 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.vscode/settings.json vendored
View file

@ -62,7 +62,9 @@
"math_ppc.h": "c", "math_ppc.h": "c",
"errno.h": "c", "errno.h": "c",
"m427dll.h": "c", "m427dll.h": "c",
"sprite.h": "c" "sprite.h": "c",
"gamework_data.h": "c",
"roll.h": "c"
}, },
"search.useIgnoreFiles": false, "search.useIgnoreFiles": false,
"search.exclude": { "search.exclude": {

46
src/REL/m463Dll/main.c
View file

@ -52,8 +52,8 @@ typedef struct {
/* 0x48 */ s32 unk48; /* 0x48 */ s32 unk48;
/* 0x48 */ s32 unk4C; /* 0x48 */ s32 unk4C;
/* 0x50 */ s32 unk50; /* 0x50 */ s32 unk50;
/* 0x54 */ s16 particle; /* 0x54 */ s16 parMan;
/* 0x58 */ s32 particleTimer; /* 0x58 */ s32 parManTimer;
/* 0x5C */ s32 unk5C; /* 0x5C */ s32 unk5C;
} M463PlayerData; // Size 0x60 } M463PlayerData; // Size 0x60
@ -625,11 +625,11 @@ void fn_1_4C8(omObjData *object)
HuAudFXPlay(0x7F5); HuAudFXPlay(0x7F5);
} }
if (temp_r27 == 8) { if (temp_r27 == 8) {
if (data->particle == -1) { if (data->parMan == -1) {
lbl_1_bss_58 = data->player; lbl_1_bss_58 = data->player;
data->particle = fn_1_4474(); data->parMan = fn_1_4474();
Hu3DParManPosSet(data->particle, model2->pos.x, model2->pos.y, model2->pos.z); Hu3DParManPosSet(data->parMan, model2->pos.x, model2->pos.y, model2->pos.z);
data->particleTimer = 150; data->parManTimer = 150;
} }
Hu3DModelAttrSet(object->model[1], HU3D_ATTR_DISPOFF); Hu3DModelAttrSet(object->model[1], HU3D_ATTR_DISPOFF);
} }
@ -685,9 +685,9 @@ void fn_1_4C8(omObjData *object)
} }
} }
data->unk1C++; data->unk1C++;
if (data->unk1C == 60 && data->particle != -1) { if (data->unk1C == 60 && data->parMan != -1) {
Hu3DParManKill(data->particle); Hu3DParManKill(data->parMan);
data->particle = -1; data->parMan = -1;
} }
if (data->unk1C == 33) { if (data->unk1C == 33) {
Hu3DModelAttrSet(lbl_1_bss_32C->model[data->unk44 + 1], HU3D_MOTATTR_PAUSE); Hu3DModelAttrSet(lbl_1_bss_32C->model[data->unk44 + 1], HU3D_MOTATTR_PAUSE);
@ -736,13 +736,13 @@ void fn_1_4C8(omObjData *object)
: HU3D_MOTATTR_LOOP); : HU3D_MOTATTR_LOOP);
data->unk20 = var_r28; data->unk20 = var_r28;
} }
data->particleTimer -= (data->particleTimer > -1); data->parManTimer -= (data->parManTimer > -1);
if (data->particleTimer == 0) { if (data->parManTimer == 0) {
if (data->particle != -1) { if (data->parMan != -1) {
Hu3DParManKill(data->particle); Hu3DParManKill(data->parMan);
data->particle = -1; data->parMan = -1;
} }
data->particleTimer = -1; data->parManTimer = -1;
} }
} }
@ -969,9 +969,9 @@ void fn_1_45F8(omObjData *arg0)
lbl_1_bss_50++; lbl_1_bss_50++;
lbl_1_bss_54 = 0; lbl_1_bss_54 = 0;
for (i = 0; i < 9; i++) { for (i = 0; i < 9; i++) {
if (sp14[i]->particle != -1) { if (sp14[i]->parMan != -1) {
Hu3DParManKill(sp14[i]->particle); Hu3DParManKill(sp14[i]->parMan);
sp14[i]->particle = -1; sp14[i]->parMan = -1;
} }
} }
break; break;
@ -1285,8 +1285,8 @@ void fn_1_5850(omObjData *arg0)
Hu3DModelLayerSet(arg0->model[i + 2], 1); Hu3DModelLayerSet(arg0->model[i + 2], 1);
} }
lbl_1_bss_58 = data->player; lbl_1_bss_58 = data->player;
data->particle = fn_1_4474(); data->parMan = fn_1_4474();
Hu3DParManPosSet(data->particle, 10000.0f, -10000.0f, 10000.0f); Hu3DParManPosSet(data->parMan, 10000.0f, -10000.0f, 10000.0f);
arg0->func = fn_1_4C8; arg0->func = fn_1_4C8;
} }
@ -1369,9 +1369,9 @@ void fn_1_659C(omObjData *arg0)
for (var_r31 = 0; var_r31 < 9; var_r31++) { for (var_r31 = 0; var_r31 < 9; var_r31++) {
spC[var_r31] = playerObjs[var_r31]->data; spC[var_r31] = playerObjs[var_r31]->data;
if (spC[var_r31]->particle != -1) { if (spC[var_r31]->parMan != -1) {
Hu3DParManKill(spC[var_r31]->particle); Hu3DParManKill(spC[var_r31]->parMan);
spC[var_r31]->particle = -1; spC[var_r31]->parMan = -1;
} }
} }
if (WipeStatGet() == 0) { if (WipeStatGet() == 0) {

653
src/game/board/start.c
View file

@ -25,21 +25,20 @@
typedef struct { typedef struct {
struct { struct {
u8 unk00_field0 : 1; u8 isBoardVisible : 1;
u8 unk00_field1 : 3; u8 state : 3;
u8 unk00_field2 : 2; u8 index : 2;
u8 unk00_field3 : 1; u8 isActionable : 1;
u8 unk00_field4 : 1; u8 hasRolled : 1;
}; };
u8 unk01; u8 delay;
u8 unk02; u8 time;
s8 unk03; s8 unk03;
s8 unk04; s8 digit;
char unk05[1]; s16 yRot;
s16 unk06; s16 diceMdl;
s16 unk08; s16 model;
s16 unk0A; s16 diceParManId;
s16 unk0C;
s8 unk0E; s8 unk0E;
} PlayerStartWork; } PlayerStartWork;
@ -134,7 +133,7 @@ static void DestroyStart(void) {
} }
static void ExecStart(void) { static void ExecStart(void) {
Vec sp8; Vec pos;
s32 i; s32 i;
BoardCameraNearFarSet(100.0f, 23000.0f); BoardCameraNearFarSet(100.0f, 23000.0f);
@ -180,8 +179,8 @@ static void ExecStart(void) {
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
BoardPlayerCornerPosSet(i); BoardPlayerCornerPosSet(i);
} }
BoardSpacePosGet(0, GWPlayer->space_curr, &sp8); BoardSpacePosGet(0, GWPlayer->space_curr, &pos);
BoardPlayerPosSetV(0, &sp8); BoardPlayerPosSetV(0, &pos);
BoardCameraMoveSet(0); BoardCameraMoveSet(0);
BoardCameraViewSet(2); BoardCameraViewSet(2);
BoardCameraMotionWait(); BoardCameraMotionWait();
@ -225,10 +224,10 @@ static void ExecStart(void) {
} }
static void ShowLogo(void) { static void ShowLogo(void) {
float temp_f28; float scale;
float var_f27; float angleF;
s16 spA; s16 angleS;
s16 sp8; s16 anglePosY;
logoSprGrp = HuSprGrpCreate(1); logoSprGrp = HuSprGrpCreate(1);
BoardSpriteCreate(logoSprTbl[GWBoardGet()], 1000, 0, &logoSpr); BoardSpriteCreate(logoSprTbl[GWBoardGet()], 1000, 0, &logoSpr);
@ -237,26 +236,26 @@ static void ShowLogo(void) {
HuSprAttrSet(logoSprGrp, 0, 8); HuSprAttrSet(logoSprGrp, 0, 8);
HuSprScaleSet(logoSprGrp, 0, 0.01f, 0.01f); HuSprScaleSet(logoSprGrp, 0, 0.01f, 0.01f);
HuSprGrpPosSet(logoSprGrp, 288.0f, 240.0f); HuSprGrpPosSet(logoSprGrp, 288.0f, 240.0f);
for (spA = 0; spA < 90; spA += 4) { for (angleS = 0; angleS < 90; angleS += 4) {
OSs16tof32(&spA, &var_f27); OSs16tof32(&angleS, &angleF);
temp_f28 = sind(var_f27); scale = sind(angleF);
HuSprScaleSet(logoSprGrp, 0, temp_f28, temp_f28); HuSprScaleSet(logoSprGrp, 0, scale, scale);
HuPrcVSleep(); HuPrcVSleep();
} }
HuSprScaleSet(logoSprGrp, 0, 1.0f, 1.0f); HuSprScaleSet(logoSprGrp, 0, 1.0f, 1.0f);
for (spA = 0; spA < 540; spA += 4) { for (angleS = 0; angleS < 540; angleS += 4) {
sp8 = spA % 180; anglePosY = angleS % 180;
OSs16tof32(&sp8, &var_f27); OSs16tof32(&anglePosY, &angleF);
temp_f28 = 1.0 + 0.7f * sind(var_f27); scale = 1.0 + 0.7f * sind(angleF);
HuSprScaleSet(logoSprGrp, 0, temp_f28, temp_f28); HuSprScaleSet(logoSprGrp, 0, scale, scale);
HuPrcVSleep(); HuPrcVSleep();
} }
HuSprScaleSet(logoSprGrp, 0, 1.0f, 1.0f); HuSprScaleSet(logoSprGrp, 0, 1.0f, 1.0f);
HuPrcSleep(0x78); HuPrcSleep(0x78);
for (spA = 0; spA < 90; spA += 4) { for (angleS = 0; angleS < 90; angleS += 4) {
OSs16tof32(&spA, &var_f27); OSs16tof32(&angleS, &angleF);
temp_f28 = cosd(var_f27); scale = cosd(angleF);
HuSprScaleSet(logoSprGrp, 0, temp_f28, temp_f28); HuSprScaleSet(logoSprGrp, 0, scale, scale);
HuPrcVSleep(); HuPrcVSleep();
} }
HuSprGrpKill(logoSprGrp); HuSprGrpKill(logoSprGrp);
@ -264,75 +263,75 @@ static void ShowLogo(void) {
} }
static void FocusStart(void) { static void FocusStart(void) {
Vec sp2C; Vec boardPos;
Vec sp20; Vec offset;
Vec sp14; Vec offset2;
Vec sp8; Vec camRot;
float var_f31; float zoom;
u32 var_r31; u32 i;
for (var_f31 = 14000.0f; var_f31 >= 2000.0f; var_f31 -= 50.0f) { for (zoom = 14000.0f; zoom >= 2000.0f; zoom -= 50.0f) {
BoardCameraZoomSet(var_f31); BoardCameraZoomSet(zoom);
HuPrcVSleep(); HuPrcVSleep();
} }
BoardCameraZoomSet(2000.0f); BoardCameraZoomSet(2000.0f);
BoardModelPosGet(camFocus, &sp2C); BoardModelPosGet(camFocus, &boardPos);
sp20.x = spacePos.x + 150.0f; offset.x = spacePos.x + 150.0f;
sp20.y = spacePos.y + 100.0f; offset.y = spacePos.y + 100.0f;
sp20.z = spacePos.z + 150.0f; offset.z = spacePos.z + 150.0f;
VECSubtract(&sp20, &sp2C, &sp14); VECSubtract(&offset, &boardPos, &offset2);
sp14.x /= 120.0f; offset2.x /= 120.0f;
sp14.y /= 120.0f; offset2.y /= 120.0f;
sp14.z /= 120.0f; offset2.z /= 120.0f;
HuAudSStreamFadeOut(streamStatus, 0x1388); HuAudSStreamFadeOut(streamStatus, 0x1388);
for (var_r31 = 0; var_r31 < 120; var_r31++) { for (i = 0; i < 120; i++) {
VECAdd(&sp14, &sp2C, &sp2C); VECAdd(&offset2, &boardPos, &boardPos);
BoardModelPosSetV(camFocus, &sp2C); BoardModelPosSetV(camFocus, &boardPos);
HuPrcVSleep(); HuPrcVSleep();
} }
BoardModelPosSetV(camFocus, &sp20); BoardModelPosSetV(camFocus, &offset);
sp8.x = -22.0f; camRot.x = -22.0f;
sp8.y = 0.0f; camRot.y = 0.0f;
sp8.z = 0.0f; camRot.z = 0.0f;
BoardCameraMotionStartEx(camFocus, &sp8, NULL, 1500.0f, -1.0f, 21); BoardCameraMotionStartEx(camFocus, &camRot, NULL, 1500.0f, -1.0f, 21);
} }
static void CreatePlayerStart(void) { static void CreatePlayerStart(void) {
Vec spC; Vec boardPos;
float temp_f30; float offsetX;
omObjData *var_r29; omObjData *boardObj;
PlayerStartWork *var_r30; PlayerStartWork *boardData;
s8 i; s8 i;
BoardModelPosGet(camFocus, &spC); BoardModelPosGet(camFocus, &boardPos);
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
playerOrderOld[i] = i; playerOrderOld[i] = i;
var_r29 = omAddObjEx(boardObjMan, 0x100, 0, 0, -1, ExecPlayerStart); boardObj = omAddObjEx(boardObjMan, 0x100, 0, 0, -1, ExecPlayerStart);
playerStartObj[i] = var_r29; playerStartObj[i] = boardObj;
var_r30 = OM_GET_WORK_PTR(var_r29, PlayerStartWork); boardData = OM_GET_WORK_PTR(boardObj, PlayerStartWork);
var_r30->unk00_field0 = 0; boardData->isBoardVisible = 0;
var_r30->unk00_field2 = i; boardData->index = i;
var_r30->unk03 = -1; boardData->unk03 = -1;
var_r30->unk0A = -1; boardData->model = -1;
var_r30->unk0C = -1; boardData->diceParManId = -1;
var_r30->unk00_field1 = 1; boardData->state = 1;
var_r30->unk01 = i * 30; boardData->delay = i * 30;
var_r30->unk00_field3 = 0; boardData->isActionable = 0;
var_r30->unk00_field4 = 0; boardData->hasRolled = 0;
var_r30->unk06 = 2; boardData->yRot = 2;
var_r30->unk04 = 1; boardData->digit = 1;
var_r30->unk0E = 0x3C; boardData->unk0E = 0x3C;
var_r30->unk08 = BoardModelCreate(DATA_MAKE_NUM(DATADIR_BOARD, 0x18), NULL, 0); boardData->diceMdl = BoardModelCreate(DATA_MAKE_NUM(DATADIR_BOARD, 0x18), NULL, 0);
BoardModelVisibilitySet(var_r30->unk08, 0); BoardModelVisibilitySet(boardData->diceMdl, 0);
BoardModelMotionSpeedSet(var_r30->unk08, 0.0f); BoardModelMotionSpeedSet(boardData->diceMdl, 0.0f);
OSs8tof32(&i, &temp_f30); OSs8tof32(&i, &offsetX);
temp_f30 = 135.0f * (temp_f30 - 2.0f + 0.5f); offsetX = 135.0f * (offsetX - 2.0f + 0.5f);
BoardModelVisibilitySet(BoardPlayerModelGet(playerOrderOld[var_r30->unk00_field2]), 1); BoardModelVisibilitySet(BoardPlayerModelGet(playerOrderOld[boardData->index]), 1);
var_r29->trans.x = spC.x + temp_f30; boardObj->trans.x = boardPos.x + offsetX;
var_r29->trans.y = spC.y + 700.0f; boardObj->trans.y = boardPos.y + 700.0f;
var_r29->trans.z = spC.z + 100.0f; boardObj->trans.z = boardPos.z + 100.0f;
BoardPlayerPosSet(playerOrderOld[var_r30->unk00_field2], var_r29->trans.x, var_r29->trans.y, var_r29->trans.z); BoardPlayerPosSet(playerOrderOld[boardData->index], boardObj->trans.x, boardObj->trans.y, boardObj->trans.z);
BoardPlayerMotionShiftSet(playerOrderOld[var_r30->unk00_field2], 4, 10.0f, 1.0f, HU3D_MOTATTR_NONE); BoardPlayerMotionShiftSet(playerOrderOld[boardData->index], 4, 10.0f, 1.0f, HU3D_MOTATTR_NONE);
} }
if (!_CheckFlag(FLAG_ID_MAKE(1, 11))) { if (!_CheckFlag(FLAG_ID_MAKE(1, 11))) {
BoardMusStart(0, 0xC, 0x7F, 0); BoardMusStart(0, 0xC, 0x7F, 0);
@ -342,107 +341,107 @@ static void CreatePlayerStart(void) {
} }
} }
static void ExecPlayerStart(omObjData *arg0) { static void ExecPlayerStart(omObjData *object) {
PlayerStartWork *temp_r31 = OM_GET_WORK_PTR(arg0, PlayerStartWork); PlayerStartWork *data = OM_GET_WORK_PTR(object, PlayerStartWork);
if (temp_r31->unk00_field0 != 0 || BoardIsKill()) { if (data->isBoardVisible != 0 || BoardIsKill()) {
if (hitFX[temp_r31->unk00_field2] != -1) { if (hitFX[data->index] != -1) {
HuAudFXStop(hitFX[temp_r31->unk00_field2]); HuAudFXStop(hitFX[data->index]);
hitFX[temp_r31->unk00_field2] = -1; hitFX[data->index] = -1;
} }
playerStartObj[temp_r31->unk00_field2] = NULL; playerStartObj[data->index] = NULL;
omDelObjEx(HuPrcCurrentGet(), arg0); omDelObjEx(HuPrcCurrentGet(), object);
return; return;
} }
if (temp_r31->unk01 != 0) { if (data->delay != 0) {
temp_r31->unk01--; data->delay--;
return; return;
} }
switch (temp_r31->unk00_field1) { switch (data->state) {
case 0: case 0:
break; break;
case 1: case 1:
PlayerFall(arg0, temp_r31); PlayerFall(object, data);
break; break;
case 2: case 2:
PlayerWaitSpeak(arg0, temp_r31); PlayerWaitSpeak(object, data);
break; break;
case 3: case 3:
PlayerDiceFall(arg0, temp_r31); PlayerDiceFall(object, data);
break; break;
case 4: case 4:
PlayerDiceRoll(arg0, temp_r31); PlayerDiceRoll(object, data);
break; break;
case 5: case 5:
PlayerDiceNumShow(arg0, temp_r31); PlayerDiceNumShow(object, data);
break; break;
case 6: case 6:
PlayerDiceNumHide(arg0, temp_r31); PlayerDiceNumHide(object, data);
break; break;
} }
} }
static void PlayerFall(omObjData *arg0, PlayerStartWork *arg1) { static void PlayerFall(omObjData *object, PlayerStartWork *data) {
float temp_f31; float temp_f31;
if (arg1->unk00_field3 != 0) { if (data->isActionable != 0) {
SetPlayerStartState(playerOrderOld[arg1->unk00_field2], 0); SetPlayerStartState(playerOrderOld[data->index], 0);
BoardPlayerIdleSet(playerOrderOld[arg1->unk00_field2]); BoardPlayerIdleSet(playerOrderOld[data->index]);
if (_CheckFlag(FLAG_ID_MAKE(1, 11)) && arg1->unk00_field2 == 3) { if (_CheckFlag(FLAG_ID_MAKE(1, 11)) && data->index == 3) {
BoardTutorialHookExec(0, 0); BoardTutorialHookExec(0, 0);
} }
return; return;
} }
if (arg1->unk02 > 200) { if (data->time > 200) {
arg1->unk02 = -56; data->time = -56;
} }
OSu8tof32(&arg1->unk02, &temp_f31); OSu8tof32(&data->time, &temp_f31);
arg0->trans.y += -0.08166667f * temp_f31 * temp_f31; object->trans.y += -0.08166667f * temp_f31 * temp_f31;
if (arg0->trans.y < spacePos.y) { if (object->trans.y < spacePos.y) {
arg0->trans.y = spacePos.y; object->trans.y = spacePos.y;
arg1->unk02 = 0; data->time = 0;
BoardPlayerMotionShiftSet(playerOrderOld[arg1->unk00_field2], 5, 0.0f, 4.0f, HU3D_MOTATTR_NONE); BoardPlayerMotionShiftSet(playerOrderOld[data->index], 5, 0.0f, 4.0f, HU3D_MOTATTR_NONE);
arg1->unk01 = 0xC; data->delay = 0xC;
arg1->unk00_field3 = 1; data->isActionable = 1;
} }
arg1->unk02++; data->time++;
BoardPlayerPosSet(playerOrderOld[arg1->unk00_field2], arg0->trans.x, arg0->trans.y, arg0->trans.z); BoardPlayerPosSet(playerOrderOld[data->index], object->trans.x, object->trans.y, object->trans.z);
} }
static void PlayerWaitSpeak(omObjData *arg0, PlayerStartWork *arg1) { static void PlayerWaitSpeak(omObjData *object, PlayerStartWork *data) {
float var_f31; float yRot;
if (arg1->unk02 == 0) { if (data->time == 0) {
var_f31 = 180.0f + BoardPlayerRotYGet(playerOrderOld[arg1->unk00_field2]); yRot = 180.0f + BoardPlayerRotYGet(playerOrderOld[data->index]);
BoardPlayerMotBlendSet(playerOrderOld[arg1->unk00_field2], var_f31, 0xF); BoardPlayerMotBlendSet(playerOrderOld[data->index], yRot, 0xF);
arg1->unk02 = 1; data->time = 1;
return; return;
} }
if (BoardPlayerMotBlendCheck(playerOrderOld[arg1->unk00_field2])) { if (BoardPlayerMotBlendCheck(playerOrderOld[data->index])) {
BoardPlayerIdleSet(playerOrderOld[arg1->unk00_field2]); BoardPlayerIdleSet(playerOrderOld[data->index]);
SetPlayerStartState(playerOrderOld[arg1->unk00_field2], 0); SetPlayerStartState(playerOrderOld[data->index], 0);
} }
} }
static void PlayerDiceFall(omObjData *arg0, PlayerStartWork *arg1) { static void PlayerDiceFall(omObjData *object, PlayerStartWork *data) {
Vec sp8; Vec boardPos;
float var_f31; float max;
float var_f30; float min;
s32 i; s32 i;
if (arg1->unk02 == 0) { if (data->time == 0) {
HuAudFXPlay(0x302); HuAudFXPlay(0x302);
BoardPlayerPosGet(playerOrderOld[arg1->unk00_field2], &sp8); BoardPlayerPosGet(playerOrderOld[data->index], &boardPos);
var_f30 = 250.0f; min = 250.0f;
var_f31 = 700.0f; max = 700.0f;
arg0->rot.x = (var_f30 - var_f31) / 30.0f; object->rot.x = (min - max) / 30.0f;
sp8.y += var_f31; boardPos.y += max;
BoardModelPosSetV(arg1->unk08, &sp8); BoardModelPosSetV(data->diceMdl, &boardPos);
BoardModelVisibilitySet(arg1->unk08, 1); BoardModelVisibilitySet(data->diceMdl, 1);
} else { } else {
if (arg1->unk02 > 30.0f) { if (data->time > 30.0f) {
if (_CheckFlag(FLAG_ID_MAKE(1, 11))) { if (_CheckFlag(FLAG_ID_MAKE(1, 11))) {
if (arg1->unk00_field2 == 3) { if (data->index == 3) {
BoardTutorialHookExec(1, 0); BoardTutorialHookExec(1, 0);
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
SetPlayerStartState(playerOrderOld[i], 4); SetPlayerStartState(playerOrderOld[i], 4);
@ -450,14 +449,14 @@ static void PlayerDiceFall(omObjData *arg0, PlayerStartWork *arg1) {
} }
return; return;
} }
SetPlayerStartState(playerOrderOld[arg1->unk00_field2], 4); SetPlayerStartState(playerOrderOld[data->index], 4);
return; return;
} }
BoardModelPosGet(arg1->unk08, &sp8); BoardModelPosGet(data->diceMdl, &boardPos);
sp8.y += arg0->rot.x; boardPos.y += object->rot.x;
BoardModelPosSetV(arg1->unk08, &sp8); BoardModelPosSetV(data->diceMdl, &boardPos);
} }
arg1->unk02++; data->time++;
} }
static s32 digitMdlTbl[9] = { static s32 digitMdlTbl[9] = {
@ -472,177 +471,177 @@ static s32 playerOrderMesTbl[3] = {
MAKE_MESSID(0x15, 0x15) MAKE_MESSID(0x15, 0x15)
}; };
static void PlayerDiceRoll(omObjData *arg0, PlayerStartWork *arg1) { static void PlayerDiceRoll(omObjData *object, PlayerStartWork *data) {
Vec sp8; Vec boardPos;
float var_f30; float time;
u32 var_r28; u32 jumpCheck;
s8 var_r29; s8 player;
s8 temp_r26; s8 digit;
var_r28 = 0; jumpCheck = 0;
if (arg1->unk02 > arg1->unk06) { if (data->time > data->yRot) {
arg1->unk02 = 0; data->time = 0;
temp_r26 = arg1->unk04; digit = data->digit;
do { do {
arg1->unk04 = BoardRandMod(9); data->digit = BoardRandMod(9);
} while (arg1->unk04 == temp_r26); } while (data->digit == digit);
OSs8tof32(&arg1->unk04, &var_f30); OSs8tof32(&data->digit, &time);
BoardModelMotionTimeSet(arg1->unk08, var_f30 + 0.5f); BoardModelMotionTimeSet(data->diceMdl, time + 0.5f);
} }
if (arg1->unk00_field4 == 0) { if (data->hasRolled == 0) {
if (GWPlayer[playerOrderOld[arg1->unk00_field2]].com) { if (GWPlayer[playerOrderOld[data->index]].com) {
if (_CheckFlag(FLAG_ID_MAKE(1, 11))) { if (_CheckFlag(FLAG_ID_MAKE(1, 11))) {
if (arg1->unk0E != 0) { if (data->unk0E != 0) {
arg1->unk0E--; data->unk0E--;
} else { } else {
var_r28 = 0x100; jumpCheck = PAD_BUTTON_A;
} }
} else if (BoardRandMod(100) < 5) { } else if (BoardRandMod(100) < 5) {
var_r28 = 0x100; jumpCheck = PAD_BUTTON_A;
} }
} else { } else {
var_r28 = HuPadBtnDown[GWPlayer[playerOrderOld[arg1->unk00_field2]].port]; jumpCheck = HuPadBtnDown[GWPlayer[playerOrderOld[data->index]].port];
} }
if (var_r28 == 0x100) { if (jumpCheck == PAD_BUTTON_A) {
BoardPlayerDiceJumpStart(playerOrderOld[arg1->unk00_field2]); BoardPlayerDiceJumpStart(playerOrderOld[data->index]);
arg1->unk00_field4 = 1; data->hasRolled = 1;
} }
} else { } else {
if (BoardPlayerDiceJumpCheck(playerOrderOld[arg1->unk00_field2])) { if (BoardPlayerDiceJumpCheck(playerOrderOld[data->index])) {
SetPlayerStartState(playerOrderOld[arg1->unk00_field2], 5); SetPlayerStartState(playerOrderOld[data->index], 5);
arg1->unk06 = 360; data->yRot = 360;
arg0->rot.x = arg0->rot.y = 1.0f; object->rot.x = object->rot.y = 1.0f;
arg1->unk04 = BoardRandMod(9); data->digit = BoardRandMod(9);
HuAudFXPlay(0x303); HuAudFXPlay(0x303);
if (hitFX[arg1->unk00_field2] != -1) { if (hitFX[data->index] != -1) {
HuAudFXStop(hitFX[arg1->unk00_field2]); HuAudFXStop(hitFX[data->index]);
hitFX[arg1->unk00_field2] = -1; hitFX[data->index] = -1;
} }
var_r29 = 0; player = 0;
while (var_r29 < 4) { while (player < 4) {
if (playerOrderNew[var_r29] == arg1->unk04 && var_r29 != playerOrderOld[arg1->unk00_field2]) { if (playerOrderNew[player] == data->digit && player != playerOrderOld[data->index]) {
arg1->unk04 = BoardRandMod(9); data->digit = BoardRandMod(9);
var_r29 = 0; player = 0;
} else { } else {
var_r29++; player++;
} }
} }
if (_CheckFlag(FLAG_ID_MAKE(1, 11))) { if (_CheckFlag(FLAG_ID_MAKE(1, 11))) {
arg1->unk04 = tutorialRollTbl[arg1->unk00_field2]; data->digit = tutorialRollTbl[data->index];
} }
playerOrderNew[playerOrderOld[arg1->unk00_field2]] = arg1->unk04; playerOrderNew[playerOrderOld[data->index]] = data->digit;
arg1->unk0A = BoardModelCreate(digitMdlTbl[arg1->unk04], NULL, 0); data->model = BoardModelCreate(digitMdlTbl[data->digit], NULL, 0);
BoardModelPosGet(arg1->unk08, &sp8); BoardModelPosGet(data->diceMdl, &boardPos);
sp8.x += 50.0 * sin(0.0); boardPos.x += 50.0 * sin(0.0);
sp8.z += 50.0 * cos(0.0); boardPos.z += 50.0 * cos(0.0);
BoardModelPosSetV(arg1->unk0A, &sp8); BoardModelPosSetV(data->model, &boardPos);
BoardModelMotionStart(arg1->unk0A, 0, 0); BoardModelMotionStart(data->model, 0, 0);
BoardModelMotionSpeedSet(arg1->unk0A, 0.0f); BoardModelMotionSpeedSet(data->model, 0.0f);
BoardModelMotionTimeSet(arg1->unk0A, 0.0f); BoardModelMotionTimeSet(data->model, 0.0f);
BoardModelLayerSet(arg1->unk0A, 2); BoardModelLayerSet(data->model, 2);
arg1->unk0C = BoardDiceEffectCreate(); data->diceParManId = BoardDiceEffectCreate();
Hu3DParManPosSet(arg1->unk0C, sp8.x, sp8.y, sp8.z); Hu3DParManPosSet(data->diceParManId, boardPos.x, boardPos.y, boardPos.z);
Hu3DParManTimeLimitSet(arg1->unk0C, 0x96); Hu3DParManTimeLimitSet(data->diceParManId, 0x96);
BoardModelVisibilitySet(arg1->unk08, 0); BoardModelVisibilitySet(data->diceMdl, 0);
return; return;
} }
} }
arg1->unk02++; data->time++;
} }
static void PlayerDiceNumShow(omObjData *arg0, PlayerStartWork *arg1) { static void PlayerDiceNumShow(omObjData *object, PlayerStartWork *data) {
float var_f30; float yRot;
arg1->unk06 -= 18; data->yRot -= 18;
if (arg1->unk06 < 0) { if (data->yRot < 0) {
arg1->unk06 = 0; data->yRot = 0;
SetPlayerStartState(playerOrderOld[arg1->unk00_field2], 0); SetPlayerStartState(playerOrderOld[data->index], 0);
if (_CheckFlag(FLAG_ID_MAKE(1, 11))) { if (_CheckFlag(FLAG_ID_MAKE(1, 11))) {
BoardTutorialHookExec(2, 0); BoardTutorialHookExec(2, 0);
} }
} }
OSs16tof32(&arg1->unk06, &var_f30); OSs16tof32(&data->yRot, &yRot);
BoardModelRotYSet(arg1->unk0A, var_f30); BoardModelRotYSet(data->model, yRot);
} }
static void PlayerDiceNumHide(omObjData *arg0, PlayerStartWork *arg1) { static void PlayerDiceNumHide(omObjData *object, PlayerStartWork *data) {
float var_f28; float yRot;
switch (arg1->unk02) { switch (data->time) {
case 0: case 0:
arg1->unk06 += 18; data->yRot += 18;
if (arg1->unk06 > 360) { if (data->yRot > 360) {
arg1->unk06 = 0; data->yRot = 0;
arg1->unk02 = 1; data->time = 1;
arg0->rot.x = 1.0f; object->rot.x = 1.0f;
arg0->rot.y = 1.0f; object->rot.y = 1.0f;
} }
OSs16tof32(&arg1->unk06, &var_f28); OSs16tof32(&data->yRot, &yRot);
BoardModelRotYSet(arg1->unk0A, var_f28); BoardModelRotYSet(data->model, yRot);
return; return;
case 1: case 1:
arg1->unk06 += 9; data->yRot += 9;
if (arg1->unk06 > 180) { if (data->yRot > 180) {
arg1->unk06 = 0; data->yRot = 0;
arg1->unk02 = 2; data->time = 2;
} }
OSs16tof32(&arg1->unk06, &var_f28); OSs16tof32(&data->yRot, &yRot);
arg0->rot.x = 1.0 + 1.3f * sind(var_f28); object->rot.x = 1.0 + 1.3f * sind(yRot);
break; break;
case 2: case 2:
arg1->unk06 += 9; data->yRot += 9;
if (arg1->unk06 > 180) { if (data->yRot > 180) {
arg1->unk06 = 179; data->yRot = 179;
arg1->unk02 = 3; data->time = 3;
} }
OSs16tof32(&arg1->unk06, &var_f28); OSs16tof32(&data->yRot, &yRot);
arg0->rot.x = cosd(0.5f * var_f28); object->rot.x = cosd(0.5f * yRot);
arg0->rot.y = 1.0 + 1.3f * sind(var_f28); object->rot.y = 1.0 + 1.3f * sind(yRot);
break; break;
case 3: case 3:
BoardModelVisibilitySet(arg1->unk0A, 0); BoardModelVisibilitySet(data->model, 0);
arg1->unk00_field0 = 1; data->isBoardVisible = 1;
return; return;
} }
BoardModelScaleSet(arg1->unk0A, arg0->rot.x, arg0->rot.y, 1.0f); BoardModelScaleSet(data->model, object->rot.x, object->rot.y, 1.0f);
} }
static void SetPlayerStartState(s32 arg0, s32 arg1) { static void SetPlayerStartState(s32 player, s32 state) {
PlayerStartWork *temp_r31; PlayerStartWork *data;
omObjData *temp_r30; omObjData *object;
temp_r30 = playerStartObj[arg0]; object = playerStartObj[player];
temp_r31 = OM_GET_WORK_PTR(temp_r30, PlayerStartWork); data = OM_GET_WORK_PTR(object, PlayerStartWork);
temp_r31->unk00_field1 = arg1; data->state = state;
temp_r31->unk02 = 0; data->time = 0;
temp_r31->unk01 = 0; data->delay = 0;
switch (arg1) { switch (state) {
case 4: case 4:
hitFX[arg0] = HuAudFXPlay(0x300); hitFX[player] = HuAudFXPlay(0x300);
break; break;
case 5: case 5:
break; break;
case 6: case 6:
temp_r31->unk06 = 0; data->yRot = 0;
break; break;
} }
} }
static s32 GetPlayerStartState(s32 arg0) { static s32 GetPlayerStartState(s32 player) {
PlayerStartWork *temp_r31; PlayerStartWork *data;
omObjData *temp_r30; omObjData *object;
temp_r30 = playerStartObj[arg0]; object = playerStartObj[player];
temp_r31 = OM_GET_WORK_PTR(temp_r30, PlayerStartWork); data = OM_GET_WORK_PTR(object, PlayerStartWork);
return temp_r31->unk00_field1; return data->state;
} }
static void ExecStartRoll(void) { static void ExecStartRoll(void) {
s32 sp84[] = { 0, 1, 2, 3, 4, 5, 6, 7 }; s32 sp84[] = { 0, 1, 2, 3, 4, 5, 6, 7 };
s32 var_r29; s32 id;
s32 var_r23; s32 time;
s32 var_r22; s32 coinCount;
s32 var_r24; s32 j;
s32 i; s32 i;
if (!_CheckFlag(FLAG_ID_MAKE(1, 11))) { if (!_CheckFlag(FLAG_ID_MAKE(1, 11))) {
@ -653,11 +652,11 @@ static void ExecStartRoll(void) {
HuPrcVSleep(); HuPrcVSleep();
} }
_CheckFlag(FLAG_ID_MAKE(1, 11)); _CheckFlag(FLAG_ID_MAKE(1, 11));
var_r29 = startMesTbl[GWBoardGet()][0]; id = startMesTbl[GWBoardGet()][0];
BoardWinCreate(2, var_r29, BoardWinPortraitGetStar()); BoardWinCreate(2, id, BoardWinPortraitGetStar());
BoardWinWait(); BoardWinWait();
var_r29 = startMesTbl[GWBoardGet()][1]; id = startMesTbl[GWBoardGet()][1];
BoardWinCreate(2, var_r29, BoardWinPortraitGetStar()); BoardWinCreate(2, id, BoardWinPortraitGetStar());
BoardWinWait(); BoardWinWait();
BoardWinKill(); BoardWinKill();
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
@ -695,11 +694,11 @@ static void ExecStartRoll(void) {
BoardTutorialHookExec(3, i); BoardTutorialHookExec(3, i);
} else { } else {
if (i == 0) { if (i == 0) {
var_r29 = startMesTbl[GWBoardGet()][2]; id = startMesTbl[GWBoardGet()][2];
} else { } else {
var_r29 = playerOrderMesTbl[i - 1]; id = playerOrderMesTbl[i - 1];
} }
BoardWinCreate(0, var_r29, -1); BoardWinCreate(0, id, -1);
BoardWinInsertMesSet(BoardPlayerGetCharMess(i), i); BoardWinInsertMesSet(BoardPlayerGetCharMess(i), i);
BoardWinWait(); BoardWinWait();
} }
@ -716,23 +715,23 @@ static void ExecStartRoll(void) {
BoardPlayerIdleSet(i); BoardPlayerIdleSet(i);
} }
if (!_CheckFlag(FLAG_ID_MAKE(1, 11))) { if (!_CheckFlag(FLAG_ID_MAKE(1, 11))) {
var_r29 = startMesTbl[GWBoardGet()][3]; id = startMesTbl[GWBoardGet()][3];
BoardWinCreate(2, var_r29, BoardWinPortraitGetStar()); BoardWinCreate(2, id, BoardWinPortraitGetStar());
BoardWinWait(); BoardWinWait();
HuPrcSleep(30); HuPrcSleep(30);
if (GWBoardGet() == BOARD_ID_EXTRA1 || GWBoardGet() == BOARD_ID_EXTRA2) { if (GWBoardGet() == BOARD_ID_EXTRA1 || GWBoardGet() == BOARD_ID_EXTRA2) {
var_r22 = 100; coinCount = 100;
var_r23 = 1; time = 1;
} else { } else {
var_r22 = 10; coinCount = 10;
var_r23 = 6; time = 6;
} }
for (i = 0; i < var_r22; i++) { for (i = 0; i < coinCount; i++) {
for (var_r24 = 0; var_r24 < 4; var_r24++) { for (j = 0; j < 4; j++) {
BoardPlayerCoinsAdd(var_r24, 1); BoardPlayerCoinsAdd(j, 1);
} }
HuAudFXPlay(7); HuAudFXPlay(7);
HuPrcSleep(var_r23); HuPrcSleep(time);
} }
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
BoardPlayerMotionShiftSet(i, 7, 0.0f, 8.0f, HU3D_MOTATTR_NONE); BoardPlayerMotionShiftSet(i, 7, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
@ -749,16 +748,16 @@ static void ExecStartRoll(void) {
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
BoardPlayerIdleSet(i); BoardPlayerIdleSet(i);
} }
var_r29 = startMesTbl[GWBoardGet()][4]; id = startMesTbl[GWBoardGet()][4];
BoardWinCreate(2, var_r29, BoardWinPortraitGetStar()); BoardWinCreate(2, id, BoardWinPortraitGetStar());
BoardWinWait(); BoardWinWait();
BoardWinKill(); BoardWinKill();
} }
} }
static void InitCamera(void) { static void InitCamera(void) {
Vec sp14; Vec offset;
Vec sp8; Vec rotTarget;
camStartFocusPos.x = 0.0f; camStartFocusPos.x = 0.0f;
camStartFocusPos.y = 100.0f; camStartFocusPos.y = 100.0f;
@ -793,96 +792,96 @@ static void InitCamera(void) {
BoardModelPosSetV(camFocus, &camStartFocusPos); BoardModelPosSetV(camFocus, &camStartFocusPos);
if (_CheckFlag(FLAG_ID_MAKE(1, 11))) { if (_CheckFlag(FLAG_ID_MAKE(1, 11))) {
BoardCameraMoveSet(0); BoardCameraMoveSet(0);
sp14.x = spacePos.x + 150.0f; offset.x = spacePos.x + 150.0f;
sp14.y = spacePos.y + 100.0f; offset.y = spacePos.y + 100.0f;
sp14.z = spacePos.z + 150.0f; offset.z = spacePos.z + 150.0f;
BoardModelPosSetV(camFocus, &sp14); BoardModelPosSetV(camFocus, &offset);
sp8.x = -22.0f; rotTarget.x = -22.0f;
sp8.y = 0.0f; rotTarget.y = 0.0f;
sp8.z = 0.0f; rotTarget.z = 0.0f;
sp14.x = sp14.y = sp14.z = 0.0f; offset.x = offset.y = offset.z = 0.0f;
BoardCameraMotionStartEx(camFocus, &sp8, NULL, 1500.0f, -1.0f, 1); BoardCameraMotionStartEx(camFocus, &rotTarget, NULL, 1500.0f, -1.0f, 1);
BoardCameraMotionWait(); BoardCameraMotionWait();
BoardCameraMoveSet(1); BoardCameraMoveSet(1);
} else { } else {
sp14.x = 0.0f; offset.x = 0.0f;
sp14.y = 0.0f; offset.y = 0.0f;
sp14.z = 0.0f; offset.z = 0.0f;
sp8.x = -70.0f; rotTarget.x = -70.0f;
sp8.y = 0.0f; rotTarget.y = 0.0f;
sp8.z = 0.0f; rotTarget.z = 0.0f;
BoardCameraMoveSet(0); BoardCameraMoveSet(0);
BoardCameraMotionStartEx(camFocus, &sp8, &sp14, 14000.0f, -1.0f, 1); BoardCameraMotionStartEx(camFocus, &rotTarget, &offset, 14000.0f, -1.0f, 1);
BoardCameraMotionWait(); BoardCameraMotionWait();
BoardCameraMoveSet(1); BoardCameraMoveSet(1);
} }
} }
static void InitHost(void) { static void InitHost(void) {
Vec sp8; Vec newPos;
if (!_CheckFlag(FLAG_ID_MAKE(1, 11))) { if (!_CheckFlag(FLAG_ID_MAKE(1, 11))) {
hostMdl = BoardStarHostMdlGet(); hostMdl = BoardStarHostMdlGet();
sp8.x = spacePos.x + 150.0f; newPos.x = spacePos.x + 150.0f;
sp8.y = spacePos.y; newPos.y = spacePos.y;
sp8.z = spacePos.z - 50.0f; newPos.z = spacePos.z - 50.0f;
BoardModelPosSetV(hostMdl, &sp8); BoardModelPosSetV(hostMdl, &newPos);
BoardModelVisibilitySet(hostMdl, 1); BoardModelVisibilitySet(hostMdl, 1);
BoardModelMotionStart(hostMdl, 1, 0x40000001); BoardModelMotionStart(hostMdl, 1, 0x40000001);
} }
} }
static void CreateTapWin(void) { static void CreateTapWin(void) {
float sp8[2]; float dimensions[2];
float var_f31; float x;
float var_f30; float y;
s32 var_r31; s32 id;
if (!_CheckFlag(FLAG_ID_MAKE(1, 11))) { if (!_CheckFlag(FLAG_ID_MAKE(1, 11))) {
var_r31 = MAKE_MESSID(0x12, 0x14); id = MAKE_MESSID(0x12, 0x14);
HuWinMesMaxSizeGet(1, sp8, var_r31); HuWinMesMaxSizeGet(1, dimensions, id);
var_f31 = -10000.0f; x = -10000.0f;
var_f30 = 368.0f; y = 368.0f;
tapWin = HuWinCreate(var_f31, var_f30, sp8[0], sp8[1], 0); tapWin = HuWinCreate(x, y, dimensions[0], dimensions[1], 0);
HuWinBGTPLvlSet(tapWin, 0.0f); HuWinBGTPLvlSet(tapWin, 0.0f);
HuWinMesSpeedSet(tapWin, 0); HuWinMesSpeedSet(tapWin, 0);
HuWinMesSet(tapWin, var_r31); HuWinMesSet(tapWin, id);
HuWinDispOff(tapWin); HuWinDispOff(tapWin);
} }
} }
static void OrderPlayers(void) { static void OrderPlayers(void) {
s32 temp_r29; s32 pOrderTemp;
PlayerConfig *temp_r28; PlayerConfig *playerCfg;
PlayerState *temp_r27; PlayerState *state;
s32 i; s32 i;
s32 j; s32 j;
temp_r28 = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(GWPlayerCfg), MEMORY_DEFAULT_NUM); playerCfg = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(GWPlayerCfg), MEMORY_DEFAULT_NUM);
temp_r27 = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(GWPlayer), MEMORY_DEFAULT_NUM); state = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(GWPlayer), MEMORY_DEFAULT_NUM);
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
playerOrderOld[i] = i; playerOrderOld[i] = i;
memcpy(temp_r28 + i, &GWPlayerCfg[i], sizeof(PlayerConfig)); memcpy(playerCfg + i, &GWPlayerCfg[i], sizeof(PlayerConfig));
memcpy(temp_r27 + i, &GWPlayer[i], sizeof(PlayerState)); memcpy(state + i, &GWPlayer[i], sizeof(PlayerState));
} }
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
for (j = 3; j > i; j--) { for (j = 3; j > i; j--) {
if (playerOrderNew[j - 1] < playerOrderNew[j]) { if (playerOrderNew[j - 1] < playerOrderNew[j]) {
temp_r29 = playerOrderNew[j]; pOrderTemp = playerOrderNew[j];
playerOrderNew[j] = playerOrderNew[j - 1]; playerOrderNew[j] = playerOrderNew[j - 1];
playerOrderNew[j - 1] = temp_r29; playerOrderNew[j - 1] = pOrderTemp;
temp_r29 = playerOrderOld[j]; pOrderTemp = playerOrderOld[j];
playerOrderOld[j] = playerOrderOld[j - 1]; playerOrderOld[j] = playerOrderOld[j - 1];
playerOrderOld[j - 1] = temp_r29; playerOrderOld[j - 1] = pOrderTemp;
} }
} }
} }
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
memcpy(&GWPlayerCfg[i], temp_r28 + playerOrderOld[i], sizeof(PlayerConfig)); memcpy(&GWPlayerCfg[i], playerCfg + playerOrderOld[i], sizeof(PlayerConfig));
memcpy(&GWPlayer[i], temp_r27 + playerOrderOld[i], sizeof(PlayerState)); memcpy(&GWPlayer[i], state + playerOrderOld[i], sizeof(PlayerState));
GWPlayer[i].port = GWPlayerCfg[i].pad_idx; GWPlayer[i].port = GWPlayerCfg[i].pad_idx;
GWPlayerCfg[i].pad_idx = GWPlayerCfg[i].pad_idx; GWPlayerCfg[i].pad_idx = GWPlayerCfg[i].pad_idx;
} }
HuMemDirectFree(temp_r28); HuMemDirectFree(playerCfg);
HuMemDirectFree(temp_r27); HuMemDirectFree(state);
} }