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

Merge pull request #202 from gamemasterplc/main

Browse source 
Nearly match board/player.c
This commit is contained in:
gamemasterplc 2024-03-09 21:21:55 -06:00 • committed by GitHub
commit 4008d02dda
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
16 changed files with 389 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/REL/w03Dll/mg_coin.c
View file

@ -541,7 +541,7 @@ void fn_1_9044(omObjData* arg0, someBits3* arg1) {
arg0->trans.x *= 0.5f;
if (arg0->trans.x <= 1.0f) {
arg0->trans.y = 0.0f;
BoardRotateDiceNumbers(arg1->unk00_bit5);
BoardPlayerIdleSet(arg1->unk00_bit5);
BoardModelMotionShiftSet(lbl_1_bss_C[10], 1, 0.0f, 10.0f, 0x40000001U);
arg1->unk00_bit0 = 1;
}

4
src/REL/w03Dll/mg_item.c
View file

@ -248,7 +248,7 @@ s32 fn_1_9CF4(s32 arg0) {
while (GWPlayer[arg0].moving != 0) {
HuPrcVSleep();
}
BoardRotateDiceNumbers(arg0);
BoardPlayerIdleSet(arg0);
HuPrcSleep(0x3C);
fn_1_B0A4(arg0);
fn_1_9F78();
@ -526,7 +526,7 @@ void fn_1_ACD8(s32 arg0) {
temp_r31->unk00_bit1 = arg0;
switch (arg0) {
case 0:
BoardRotateDiceNumbers(temp_r31->unk00_bit4);
BoardPlayerIdleSet(temp_r31->unk00_bit4);
return;
case 2:
temp_r31->unk00_bit6 = 1;

6
src/REL/w03Dll/river.c
View file

@ -168,7 +168,7 @@ s32 fn_1_6898(s32 arg0) {
s32 i, j;
s32 temp, temp2;
BoardRotateDiceNumbers(arg0);
BoardPlayerIdleSet(arg0);
BoardCameraViewSet(2);
BoardCameraMotionWait();
@ -351,7 +351,7 @@ void fn_1_6F9C(s32 arg0) {
BoardPlayerMotionShiftSet(arg0, 5, 0.0f, 8.0f, 0U);
HuPrcSleep(10);
BoardRotateDiceNumbers(arg0);
BoardPlayerIdleSet(arg0);
if (GWPlayer[arg0].bowser_suit != 0) {
BoardModelHookSet(lbl_1_data_388, "chara01", BoardPlayerModelGet(arg0));
} else {
@ -410,7 +410,7 @@ void fn_1_735C(s32 arg0) {
while (BoardPlayerMotBlendCheck(arg0) == 0) {
HuPrcVSleep();
}
BoardRotateDiceNumbers(arg0);
BoardPlayerIdleSet(arg0);
GWPlayer[arg0].space_curr = temp_r29;
GWPlayer[arg0].space_prev = -1;
BoardPlayerPostTurnHookSet(arg0, fn_1_6698);

12
src/REL/w03Dll/statue.c
View file

@ -172,7 +172,7 @@ s32 fn_1_1650(s32 arg0) {
f32 temp;
s32 temp2;
BoardRotateDiceNumbers(arg0);
BoardPlayerIdleSet(arg0);
if (lbl_1_bss_0->unk2) {
BoardWinCreate(0, 0x160000, -1);
@ -207,7 +207,7 @@ s32 fn_1_1650(s32 arg0) {
HuPrcVSleep();
}
BoardRotateDiceNumbers(arg0);
BoardPlayerIdleSet(arg0);
BoardWinCreate(2, 0x160001, 2);
BoardWinWait();
BoardWinCreateChoice(0, 0x160002, -1, 0);
@ -284,7 +284,7 @@ void fn_1_19DC(s32 arg0, s32 arg1) {
HuPrcVSleep();
}
}
BoardRotateDiceNumbers(arg0);
BoardPlayerIdleSet(arg0);
HuPrcSleep(0x14);
temp = (180.0f + BoardPlayerRotYGet(arg0));
BoardPlayerMotBlendSet(arg0, temp, 0xF);
@ -376,7 +376,7 @@ void fn_1_1ED4(s32 arg0) {
while (BoardFilterFadePauseCheck() == 0) {
HuPrcVSleep();
}
BoardRotateDiceNumbers(arg0);
BoardPlayerIdleSet(arg0);
while (BoardMusStatusGet(1) != 0) {
HuPrcVSleep();
@ -448,7 +448,7 @@ void fn_1_20E0(s32 arg0) {
BoardCameraMotionWait();
}
BoardRotateDiceNumbers(arg0);
BoardPlayerIdleSet(arg0);
while (BoardMusStatusGet(1) != 0) {
HuPrcVSleep();
}
@ -520,7 +520,7 @@ void fn_1_26E0(s32 arg0) {
}
BoardCameraMotionWait();
BoardModelMotionStart(lbl_1_bss_C[1], 0, 0);
BoardRotateDiceNumbers(arg0);
BoardPlayerIdleSet(arg0);
}
void fn_1_2818(void) {