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

Applying HU3D defines across the board (1/?)

Browse source
This commit is contained in:
mrshigure 2024-08-26 13:51:03 -07:00
parent dc3ada0adc
commit 27e67cb66c
89 changed files with 634 additions and 635 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/REL/w01Dll/main.c
View file

@ -920,7 +920,7 @@ static void fn_1_276C(void) {
BoardPlayerMotionStart(lbl_1_bss_6B4, lbl_1_bss_5CC[1], 0);
BoardPlayerMotionTimeSet(lbl_1_bss_6B4, temp_f26);
} else {
BoardPlayerMotionShiftSet(lbl_1_bss_6B4, lbl_1_bss_5CC[0], 0.0f, 10.0f, 0x40000001);
BoardPlayerMotionShiftSet(lbl_1_bss_6B4, lbl_1_bss_5CC[0], 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
}
fn_1_2F18();
}
@ -1257,7 +1257,7 @@ static s32 fn_1_48B4(void) {
lbl_1_bss_6B2 = 0;
lbl_1_bss_6B4 = GWSystem.player_curr;
temp_r30 = GWPlayer[lbl_1_bss_6B4].space_curr;
BoardPlayerMotionShiftSet(lbl_1_bss_6B4, 1, 0.0f, 14.0f, 0x40000001);
BoardPlayerMotionShiftSet(lbl_1_bss_6B4, 1, 0.0f, 14.0f, HU3D_MOTATTR_LOOP);
BoardWinCreateChoice(0, MAKE_MESSID(13, 0), -1, 0);
if (GWPlayer[lbl_1_bss_6B4].com) {
fn_1_9D00(lbl_1_bss_6B4);
@ -1699,7 +1699,7 @@ static void fn_1_6194(Bss18Work *arg0, omObjData *arg1) {
arg1->scale.x = sp2C.x;
arg1->scale.y = sp2C.y;
arg1->scale.z = sp2C.z;
BoardPlayerMotionShiftSet(GWSystem.player_curr, 4, 15.0f, 5.0f, 0);
BoardPlayerMotionShiftSet(GWSystem.player_curr, 4, 15.0f, 5.0f, HU3D_MOTATTR_NONE);
arg0->unk00_field1 = 2;
arg0->unk01 = 0;
}
@ -1731,7 +1731,7 @@ static void fn_1_63F0(Bss18Work *arg0, omObjData *arg1) {
}
if (arg0->unk01 == 25) {
BoardPlayerPosSet(GWSystem.player_curr, arg1->scale.x, arg1->scale.y, arg1->scale.z);
BoardPlayerMotionShiftSet(GWSystem.player_curr, 5, 0.0f, 8.0f, 0);
BoardPlayerMotionShiftSet(GWSystem.player_curr, 5, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
}
if (arg0->unk01 < 25) {
OSu8tof32(&arg0->unk01, &temp_f29);
@ -1778,7 +1778,7 @@ static void fn_1_6A14(Bss18Work *arg0, omObjData *arg1) {
arg1->scale.x = sp20.x;
arg1->scale.y = sp20.y;
arg1->scale.z = sp20.z;
BoardPlayerMotionShiftSet(GWSystem.player_curr, 4, 15.0f, 5.0f, 0);
BoardPlayerMotionShiftSet(GWSystem.player_curr, 4, 15.0f, 5.0f, HU3D_MOTATTR_NONE);
BoardPlayerRotYSet(GWSystem.player_curr, atan2d(sp8.x, sp8.z));
arg0->unk00_field1 = 3;
arg0->unk01 = 0;
@ -1804,7 +1804,7 @@ static void fn_1_6BC0(Bss18Work *arg0, omObjData *arg1) {
}
if (arg0->unk01 == 25) {
BoardPlayerPosSet(GWSystem.player_curr, arg1->scale.x, arg1->scale.y, arg1->scale.z);
BoardPlayerMotionShiftSet(GWSystem.player_curr, 5, 0.0f, 8.0f, 0);
BoardPlayerMotionShiftSet(GWSystem.player_curr, 5, 0.0f, 8.0f, HU3D_MOTATTR_NONE);
}
if (arg0->unk01 < 25) {
OSu8tof32(&arg0->unk01, &temp_f29);

10
src/REL/w01Dll/mg_coin.c
View file

@ -669,7 +669,7 @@ static void fn_1_BAF8(omObjData *arg0) {
if ((temp_r31->unk20 += 1.0f) == 30.0f) {
sp14.y = sp8.y + 5.0f;
BoardPlayerPosSetV(lbl_1_bss_798, &sp14);
BoardPlayerMotionShiftSet(lbl_1_bss_798, 2, 0.0f, 10.0f, 0);
BoardPlayerMotionShiftSet(lbl_1_bss_798, 2, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
arg0->func = fn_1_BCDC;
}
BoardPlayerPosSetV(lbl_1_bss_798, &sp14);
@ -686,7 +686,7 @@ static void fn_1_BCDC(omObjData *arg0) {
sp8 = sp14;
sp8.z += 100.0f;
if (fn_1_CB44(&sp8, 10.0f) == 1) {
BoardPlayerMotionShiftSet(lbl_1_bss_798, 1, 0.0f, 10.0f, 0);
BoardPlayerMotionShiftSet(lbl_1_bss_798, 1, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
temp_r29->unk1C = 90;
lbl_1_bss_710->work[0] = 1;
lbl_1_bss_714[lbl_1_bss_730]->work[2] = 3;
@ -746,7 +746,7 @@ static void fn_1_C000(void) {
temp_r31->unk10.y = 10.0f;
temp_r31->unk10.z = 3.0f;
temp_r31->unk20 = 0.0f;
BoardPlayerMotionShiftSet(lbl_1_bss_798, 4, 0.0f, 10.0f, 0);
BoardPlayerMotionShiftSet(lbl_1_bss_798, 4, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
temp_r30->func = fn_1_C0FC;
HuPrcKill(NULL);
while (TRUE) {
@ -765,7 +765,7 @@ static void fn_1_C0FC(omObjData *arg0) {
sp8.z += temp_r31->unk10.z;
temp_r31->unk20 += 1.0f;
if (sp8.y <= lbl_1_bss_738.y) {
BoardPlayerMotionShiftSet(lbl_1_bss_798, 1, 0.0f, 10.0f, 0x40000001);
BoardPlayerMotionShiftSet(lbl_1_bss_798, 1, 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
sp8.y = lbl_1_bss_738.y;
lbl_1_bss_75C = HuPrcCreate(fn_1_C25C, 0x2004, 0x1000, 0);
lbl_1_bss_75C->user_data = arg0;
@ -826,7 +826,7 @@ static void fn_1_C25C(void) {
var_f31 = -20.0f;
}
if (var_r30 == lbl_1_bss_728) {
BoardPlayerMotionShiftSet(lbl_1_bss_798, 7, 0.0f, 10.0f, 0);
BoardPlayerMotionShiftSet(lbl_1_bss_798, 7, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
break;
}
HuPrcVSleep();

12
src/REL/w01Dll/mg_item.c
View file

@ -312,7 +312,7 @@ static void fn_1_E44C(omObjData *arg0) {
arg0->rot.y = 10.0f;
arg0->rot.z = sp18.y;
arg0->scale.x = 0.0f;
BoardPlayerMotionShiftSet(lbl_1_bss_7E4, 4, 0.0f, 5.0f, 0);
BoardPlayerMotionShiftSet(lbl_1_bss_7E4, 4, 0.0f, 5.0f, HU3D_MOTATTR_NONE);
arg0->func = fn_1_E914;
}
BoardModelMotionSpeedSet(lbl_1_bss_6C4[17], lbl_1_bss_7EC);
@ -338,7 +338,7 @@ static void fn_1_E914(omObjData *arg0) {
for (i = 0; i < 4; i++) {
lbl_1_bss_7FC[i]->func = fn_1_FED0;
}
BoardPlayerMotionShiftSet(lbl_1_bss_7E4, lbl_1_bss_7B8, 0.0f, 5.0f, 0x40000001);
BoardPlayerMotionShiftSet(lbl_1_bss_7E4, lbl_1_bss_7B8, 0.0f, 5.0f, HU3D_MOTATTR_LOOP);
lbl_1_bss_7D6 = MGSeqStartCreate();
BoardMusStart(1, 0xE, 0x7F, 0);
arg0->func = fn_1_ECD4;
@ -465,7 +465,7 @@ static void fn_1_F3F8(omObjData *arg0) {
arg0->rot.y = 0.016666668f * (arg0->scale.y / 2) * (arg0->scale.y / 2);
arg0->rot.z = sp18.y;
arg0->scale.x = 0.0f;
BoardPlayerMotionShiftSet(lbl_1_bss_7E4, 4, 0.0f, 5.0f, 0);
BoardPlayerMotionShiftSet(lbl_1_bss_7E4, 4, 0.0f, 5.0f, HU3D_MOTATTR_NONE);
VECSubtract(&lbl_1_bss_7C4, &sp18, &spC);
VECNormalize(&spC, &spC);
BoardPlayerRotSet(lbl_1_bss_7E4, 0.0f, fn_1_10EB8(&spC), 0.0f);
@ -494,7 +494,7 @@ static void fn_1_F890(omObjData *arg0) {
BoardPlayerRotGet(lbl_1_bss_7E4, &sp8);
if (sp8.y == 0.0f) {
BoardPlayerMotionShiftSet(lbl_1_bss_7E4, 1, 0.0f, 10.0f, 0x40000001);
BoardPlayerMotionShiftSet(lbl_1_bss_7E4, 1, 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
lbl_1_bss_7F0->work[0] = 0;
lbl_1_bss_7F0->func = fn_1_10820;
arg0->func = fn_1_FA1C;
@ -516,7 +516,7 @@ static void fn_1_F890(omObjData *arg0) {
static void fn_1_FA1C(omObjData *arg0) {
if (lbl_1_bss_7F0->work[0] == 1) {
BoardPlayerMotionShiftSet(lbl_1_bss_7E4, lbl_1_bss_7BC, 0.0f, 10.0f, 0);
BoardPlayerMotionShiftSet(lbl_1_bss_7E4, lbl_1_bss_7BC, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
arg0->work[0] = 30;
lbl_1_bss_7A4 = HuAudSStreamPlay(2);
arg0->func = fn_1_FABC;
@ -546,7 +546,7 @@ static void fn_1_FB58(void) {
BoardWinWait();
BoardWinKill();
temp_r31 = HuPrcCurrentGet()->user_data;
BoardPlayerMotionShiftSet(lbl_1_bss_7E4, 1, 0.0f, 10.0f, 0);
BoardPlayerMotionShiftSet(lbl_1_bss_7E4, 1, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
lbl_1_bss_7F0->work[0] = 0;
HuAudFXPlay(0x30D);
HuAudFXFadeOut(lbl_1_bss_7AC, 1000);