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

10
src/REL/w04Dll/big_boo.c
View file

@ -391,7 +391,7 @@ static void fn_1_6CF8(void) {
HuPrcSleep(0x78);
for (i = 0; i < 3; i++) {
BoardPlayerModelAttrReset(sp8[i], 0x40000001);
BoardPlayerMotionShiftSet(sp8[i], lbl_1_bss_114[sp8[i]][1], 0.0f, 5.0f, 0);
BoardPlayerMotionShiftSet(sp8[i], lbl_1_bss_114[sp8[i]][1], 0.0f, 5.0f, HU3D_MOTATTR_NONE);
}
BoardModelPosGet(lbl_1_bss_274, &sp10);
var_r28 = 10;
@ -407,7 +407,7 @@ static void fn_1_6CF8(void) {
HuPrcVSleep();
}
for (i = 0; i < 3; i++) {
BoardPlayerMotionShiftSet(sp8[i], 1, 0.0f, 5.0f, 0x40000001);
BoardPlayerMotionShiftSet(sp8[i], 1, 0.0f, 5.0f, HU3D_MOTATTR_LOOP);
}
}
@ -780,7 +780,7 @@ static void fn_1_7888(void) {
var_f31 = -40.0f;
}
if (var_r28 == var_r27) {
BoardPlayerMotionShiftSet(lbl_1_bss_282, 7, 0.0f, 10.0f, 0);
BoardPlayerMotionShiftSet(lbl_1_bss_282, 7, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
break;
}
HuPrcVSleep();
@ -977,7 +977,7 @@ static void fn_1_8A60(void) {
}
}
temp_r27 = HuAudSStreamPlay(6);
BoardPlayerMotionShiftSet(lbl_1_bss_282, 7, 0.0f, 10.0f, 0);
BoardPlayerMotionShiftSet(lbl_1_bss_282, 7, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
while (!BoardPlayerMotionEndCheck(lbl_1_bss_282)) {
HuPrcVSleep();
}
@ -1008,7 +1008,7 @@ static void fn_1_98A0(void) {
BoardModelPosGet(lbl_1_bss_274, &sp14);
var_f30 = BoardModelRotYGet(lbl_1_bss_274);
BoardModelMotionShiftSet(lbl_1_bss_274, 2, 0.0f, 25.0f, 0x40000001);
BoardModelMotionShiftSet(lbl_1_bss_274, 2, 0.0f, 25.0f, HU3D_MOTATTR_LOOP);
for (i = 0; i < 25; i++) {
var_f30 += 7.2f;
BoardModelRotYSet(lbl_1_bss_274, var_f30);

10
src/REL/w04Dll/boo_event.c
View file

@ -187,7 +187,7 @@ static void fn_1_20EC(void) {
HuPrcVSleep();
}
BoardCameraMotionWait();
BoardPlayerMotionShiftSet(temp_r30, lbl_1_bss_52[temp_r30][0], 0.0f, 5.0f, 0);
BoardPlayerMotionShiftSet(temp_r30, lbl_1_bss_52[temp_r30][0], 0.0f, 5.0f, HU3D_MOTATTR_NONE);
HuAudPlayerVoicePlay(temp_r30, 0x128);
BoardModelPosGet(lbl_1_bss_14[3], &sp20);
BoardModelPosSetV(lbl_1_bss_FA, &sp20);
@ -508,7 +508,7 @@ static void fn_1_30A4(void) {
}
BoardPlayerPosSetV(i, &sp14);
BoardPlayerRotYSet(i, 0.0f);
BoardPlayerMotionShiftSet(i, lbl_1_bss_52[GWSystem.player_curr][1], 0.0f, 10.0f, 0x40000001);
BoardPlayerMotionShiftSet(i, lbl_1_bss_52[GWSystem.player_curr][1], 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
temp_r31->unk08 = i;
}
if (temp_r31->unk06 == 0) {
@ -604,7 +604,7 @@ static void fn_1_38D8(void) {
temp_r30 = HuPrcCurrentGet()->user_data;
temp_r31 = temp_r30->unk08;
temp_r30->unk08 = -1;
BoardPlayerMotionShiftSet(temp_r31, 4, 0.0f, 5.0f, 0);
BoardPlayerMotionShiftSet(temp_r31, 4, 0.0f, 5.0f, HU3D_MOTATTR_NONE);
sp18 = lbl_1_bss_80[temp_r31];
GWPlayer[temp_r31].space_curr = lbl_1_bss_B0;
BoardPlayerPosGet(temp_r31, &sp24);
@ -917,7 +917,7 @@ static void fn_1_4848(void) {
}
HuPrcVSleep();
}
BoardPlayerMotionShiftSet(temp_r30, lbl_1_bss_52[temp_r30][0], 0.0f, 5.0f, 0);
BoardPlayerMotionShiftSet(temp_r30, lbl_1_bss_52[temp_r30][0], 0.0f, 5.0f, HU3D_MOTATTR_NONE);
HuAudPlayerVoicePlay(temp_r30, 0x128);
for (i = 0; i < 65; i++) {
BoardModelPosGet(lbl_1_bss_FA, &sp14);
@ -927,7 +927,7 @@ static void fn_1_4848(void) {
}
HuPrcVSleep();
}
BoardPlayerMotionShiftSet(temp_r30, 1, 0.0f, 5.0f, 0);
BoardPlayerMotionShiftSet(temp_r30, 1, 0.0f, 5.0f, HU3D_MOTATTR_NONE);
BoardModelPosGet(lbl_1_bss_FA, &sp14);
temp_f28 = VECDistanceXZ(&sp20, &sp14);
if (temp_f28 > 200.0f) {

2
src/REL/w04Dll/bridge.c
View file

@ -122,7 +122,7 @@ void fn_1_1618(void) {
BoardWinWait();
BoardWinKill();
}
BoardPlayerMotionShiftSet(temp_r31, 1, 0.0f, 10.0f, 0x40000001);
BoardPlayerMotionShiftSet(temp_r31, 1, 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
BoardCameraViewSet(1);
BoardCameraMotionWait();
BoardRollDispSet(1);

8
src/REL/w04Dll/mg_coin.c
View file

@ -156,7 +156,7 @@ void fn_1_C7D4(void) {
while (!BoardPlayerMotBlendCheck(lbl_1_bss_324)) {
HuPrcVSleep();
}
BoardPlayerMotionShiftSet(lbl_1_bss_324, 4, 0.0f, 5.0f, 0);
BoardPlayerMotionShiftSet(lbl_1_bss_324, 4, 0.0f, 5.0f, HU3D_MOTATTR_NONE);
var_f31 = 0.0f;
temp_f30 = 8.0f;
VECSubtract(&sp2C, &sp20, &sp38);
@ -411,7 +411,7 @@ static void fn_1_D770(void) {
var_f31 = -20.0f;
}
if (var_r29 == lbl_1_bss_314) {
BoardPlayerMotionShiftSet(lbl_1_bss_324, 7, 0.0f, 10.0f, 0);
BoardPlayerMotionShiftSet(lbl_1_bss_324, 7, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
break;
}
HuPrcVSleep();
@ -424,7 +424,7 @@ static void fn_1_D770(void) {
BoardWinKill();
temp_r3 = HuPrcCreate(fn_1_E004, 0x2004, 0x1000, 0);
temp_r3->user_data = NULL;
BoardPlayerMotionShiftSet(lbl_1_bss_324, 4, 0.0f, 5.0f, 0);
BoardPlayerMotionShiftSet(lbl_1_bss_324, 4, 0.0f, 5.0f, HU3D_MOTATTR_NONE);
var_f30 = 0.0f;
temp_f29 = 8.0f;
lbl_1_bss_308.z = sp18.z + 100.0f;
@ -549,7 +549,7 @@ static void fn_1_E374(omObjData *arg0) {
arg0->scale.x = sp14.x;
arg0->scale.y = sp14.y;
arg0->scale.z = sp14.z;
BoardPlayerMotionShiftSet(lbl_1_bss_324, 4, 0.0f, 5.0f, 0);
BoardPlayerMotionShiftSet(lbl_1_bss_324, 4, 0.0f, 5.0f, HU3D_MOTATTR_NONE);
arg0->func = fn_1_E4C0;
}
}

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

@ -126,7 +126,7 @@ void fn_1_A1F0(void) {
while (BoardModelMotionTimeGet(lbl_1_bss_14[10]) < BoardModelMotionMaxTimeGet(lbl_1_bss_14[10])) {
HuPrcVSleep();
}
BoardModelMotionShiftSet(lbl_1_bss_14[10], 1, 0.0f, 5.0f, 0x40000001);
BoardModelMotionShiftSet(lbl_1_bss_14[10], 1, 0.0f, 5.0f, HU3D_MOTATTR_LOOP);
BoardAudSeqPause(0, 1, 1000);
BoardModelMotionTimeSet(lbl_1_bss_14[6], 0.0f);
BoardModelAttrReset(lbl_1_bss_14[6], 0x40000002);
@ -299,7 +299,7 @@ static void fn_1_A7E8(void) {
}
BoardModelVisibilitySet(var_r28, 0);
BoardPlayerPosGet(lbl_1_bss_2AC, &sp18);
BoardPlayerMotionShiftSet(lbl_1_bss_2AC, 4, 0.0f, 5.0f, 0);
BoardPlayerMotionShiftSet(lbl_1_bss_2AC, 4, 0.0f, 5.0f, HU3D_MOTATTR_NONE);
var_f30 = 0.0f;
var_f29 = 12.0f;
sp3C = sp54[var_r30];
@ -330,7 +330,7 @@ static void fn_1_A7E8(void) {
BoardModelMotionTimeSet(lbl_1_bss_29E[var_r30], 0.0f);
BoardModelAttrReset(lbl_1_bss_29E[var_r30], 0x40000002);
BoardPlayerPosSetV(lbl_1_bss_2AC, &sp30);
BoardPlayerMotionShiftSet(lbl_1_bss_2AC, 1, 0.0f, 5.0f, 0x40000001);
BoardPlayerMotionShiftSet(lbl_1_bss_2AC, 1, 0.0f, 5.0f, HU3D_MOTATTR_LOOP);
while (BoardModelMotionTimeGet(lbl_1_bss_29E[var_r30]) < BoardModelMotionMaxTimeGet(lbl_1_bss_29E[var_r30])) {
if (BoardModelMotionTimeGet(lbl_1_bss_29E[var_r30]) >= 13.0f) {
BoardPlayerPosGet(lbl_1_bss_2AC, &sp30);
@ -375,7 +375,7 @@ static void fn_1_A7E8(void) {
while (!BoardPlayerMotBlendCheck(lbl_1_bss_2AC)) {
HuPrcVSleep();
}
BoardPlayerMotionShiftSet(lbl_1_bss_2AC, 4, 0.0f, 5.0f, 0);
BoardPlayerMotionShiftSet(lbl_1_bss_2AC, 4, 0.0f, 5.0f, HU3D_MOTATTR_NONE);
var_f30 = 0.0f;
var_f29 = 12.0f;
BoardPlayerPosGet(lbl_1_bss_2AC, &sp30);
@ -402,7 +402,7 @@ static void fn_1_A7E8(void) {
}
omVibrate(lbl_1_bss_2AC, 12, 6, 6);
BoardPlayerPosSetV(lbl_1_bss_2AC, &sp30);
BoardPlayerMotionShiftSet(lbl_1_bss_2AC, 1, 0.0f, 5.0f, 0x40000001);
BoardPlayerMotionShiftSet(lbl_1_bss_2AC, 1, 0.0f, 5.0f, HU3D_MOTATTR_LOOP);
BoardModelPosGet(lbl_1_bss_298[temp_r29], &sp24);
sp3C = sp24;
sp3C.z += 100.0f;
@ -460,7 +460,7 @@ static void fn_1_A7E8(void) {
BoardPlayerItemAdd(lbl_1_bss_2AC, lbl_1_bss_2A6[temp_r29]);
omVibrate(lbl_1_bss_2AC, 12, 6, 6);
sp8 = HuAudSStreamPlay(2);
BoardPlayerMotionShiftSet(lbl_1_bss_2AC, 7, 0.0f, 5.0f, 0);
BoardPlayerMotionShiftSet(lbl_1_bss_2AC, 7, 0.0f, 5.0f, HU3D_MOTATTR_NONE);
while (!BoardPlayerMotionEndCheck(lbl_1_bss_2AC)) {
HuPrcVSleep();
}