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

4
src/REL/w05Dll/dolphin.c
View file

@ -180,7 +180,7 @@ void fn_1_4034(s32 arg0)
}
Hu3DModelObjPosGet(BoardModelIDGet(lbl_1_data_118), lbl_1_data_22C[var_r27], &sp34);
temp_f25 = (180.0 * (atan2((sp34.x - sp40.x), (sp34.z - sp40.z)) / M_PI));
BoardModelMotionShiftSet(lbl_1_bss_64, 2, 0.0f, 10.0f, 0x40000001);
BoardModelMotionShiftSet(lbl_1_bss_64, 2, 0.0f, 10.0f, HU3D_MOTATTR_LOOP);
while (fn_1_1208(lbl_1_bss_64, temp_f25, 10.0f) == 0) {
HuPrcVSleep();
@ -244,7 +244,7 @@ loop_37:
}
fn_1_66C0(1, &sp40);
BoardModelMotionShiftSet(lbl_1_bss_64, 5, 0.0f, 5.0f, 0);
BoardModelMotionShiftSet(lbl_1_bss_64, 5, 0.0f, 5.0f, HU3D_MOTATTR_NONE);
var_r30 = 0;
var_r31 = 0;

16
src/REL/w05Dll/hotel.c
View file

@ -108,7 +108,7 @@ void fn_1_155C(void) {
while (fn_1_1208(lbl_1_bss_14[4], temp_f31, 10.0f) == 0) {
HuPrcVSleep();
}
BoardModelMotionShiftSet(lbl_1_bss_14[4], 0, 0.0f, 5.0f, 0x40000001);
BoardModelMotionShiftSet(lbl_1_bss_14[4], 0, 0.0f, 5.0f, HU3D_MOTATTR_LOOP);
var_r30 = BoardPlayerCoinsGet(lbl_1_bss_28);
sprintf(sp18, "%d", lbl_1_bss_0->unk_00);
if (var_r30 > 0) {
@ -188,7 +188,7 @@ void fn_1_155C(void) {
while (fn_1_1208(lbl_1_bss_14[4], 0.0f, 15.0f) == 0) {
HuPrcVSleep();
}
BoardModelMotionShiftSet(lbl_1_bss_14[4], 0, 0.0f, 5.0f, 0x40000001);
BoardModelMotionShiftSet(lbl_1_bss_14[4], 0, 0.0f, 5.0f, HU3D_MOTATTR_LOOP);
BoardCameraViewSet(1);
while (BoardPlayerMotBlendCheck(lbl_1_bss_28) == 0) {
@ -271,7 +271,7 @@ void fn_1_1E44(void) {
while (fn_1_1208(lbl_1_bss_14[4], temp_f31, 10.0f) == 0) {
HuPrcVSleep();
}
BoardModelMotionShiftSet(lbl_1_bss_14[4], 0, 0.0f, 5.0f, 0x40000001);
BoardModelMotionShiftSet(lbl_1_bss_14[4], 0, 0.0f, 5.0f, HU3D_MOTATTR_LOOP);
temp_f31 = 180.0 * (atan2((sp2C.x - sp50.x), (sp2C.z - sp50.z)) / M_PI);
BoardPlayerMotBlendSet(lbl_1_bss_28, temp_f31, 0xF);
@ -377,17 +377,17 @@ void fn_1_1E44(void) {
BoardWinWait();
BoardWinKill();
HuPrcSleep(0x1E);
BoardModelMotionShiftSet(lbl_1_bss_14[4], sp8[3], 0.0f, 5.0f, 0U);
BoardModelMotionShiftSet(lbl_1_bss_14[4], sp8[3], 0.0f, 5.0f, HU3D_MOTATTR_NONE);
for (var_r31 = 0; var_r31 < 4; var_r31++) {
BoardPlayerMotionShiftSet(var_r31, sp1C[var_r31][1], 0.0f, 5.0f, 0);
BoardPlayerMotionShiftSet(var_r31, sp1C[var_r31][1], 0.0f, 5.0f, HU3D_MOTATTR_NONE);
BoardPlayerVoiceEnableSet(var_r31, 6, 1);
}
HuPrcSleep(0x23);
BoardModelMotionShiftSet(lbl_1_bss_14[4], 0, 0.0f, 5.0f, 0x40000001);
BoardModelMotionShiftSet(lbl_1_bss_14[4], 0, 0.0f, 5.0f, HU3D_MOTATTR_LOOP);
for (var_r31 = 0; var_r31 < 4; var_r31++) {
BoardPlayerMotionShiftSet(var_r31, 1, 0.0f, 5.0f, 0x40000001);
BoardPlayerMotionShiftSet(var_r31, 1, 0.0f, 5.0f, HU3D_MOTATTR_LOOP);
}
}
BoardCameraViewSet(1);
@ -413,7 +413,7 @@ void fn_1_1E44(void) {
while (fn_1_1208(lbl_1_bss_14[4], 0.0f, 15.0f) == 0) {
HuPrcVSleep();
}
BoardModelMotionShiftSet(lbl_1_bss_14[4], 0, 0.0f, 5.0f, 0x40000001U);
BoardModelMotionShiftSet(lbl_1_bss_14[4], 0, 0.0f, 5.0f, HU3D_MOTATTR_LOOP);
for (var_r31 = 0; var_r31 < 4; var_r31++) {
BoardModelMotionKill(lbl_1_bss_14[4], sp8[var_r31]);

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

@ -449,7 +449,7 @@ void fn_1_AB24(void)
var_f31 = -20.0f;
}
if (var_r29 == lbl_1_bss_C6) {
BoardPlayerMotionShiftSet(lbl_1_bss_C0, 7, 0.0f, 10.0f, 0);
BoardPlayerMotionShiftSet(lbl_1_bss_C0, 7, 0.0f, 10.0f, HU3D_MOTATTR_NONE);
break;
}
else {

6
src/REL/w05Dll/mg_item.c
View file

@ -79,7 +79,7 @@ void fn_1_6B7C(void)
BoardModelMotionStartEndSet(lbl_1_bss_14[0], 0x1E, 0x5A);
BoardModelAttrReset(lbl_1_bss_14[0], 0x40000002);
BoardMusStart(1, 0x22, 0x7F, 0);
BoardPlayerMotionShiftSet(lbl_1_bss_B6, lbl_1_bss_9E[0], 0.0f, 30.0f, 0x40000001);
BoardPlayerMotionShiftSet(lbl_1_bss_B6, lbl_1_bss_9E[0], 0.0f, 30.0f, HU3D_MOTATTR_LOOP);
HuPrcSleep(0x1E);
BoardModelVisibilitySet(lbl_1_bss_A2, 1);
BoardModelHookSet(BoardPlayerModelGet(lbl_1_bss_B6), "a-itemhook-r", lbl_1_bss_A2);
@ -348,7 +348,7 @@ void fn_1_799C(void)
BoardPlayerItemAdd(lbl_1_bss_B6, lbl_1_bss_B0[temp_r31]);
omVibrate(lbl_1_bss_B6, 0xC, 6, 6);
temp_r27 = HuAudSStreamPlay(2);
BoardPlayerMotionShiftSet(lbl_1_bss_B6, 7, 0.0f, 5.0f, 0);
BoardPlayerMotionShiftSet(lbl_1_bss_B6, 7, 0.0f, 5.0f, HU3D_MOTATTR_NONE);
while (BoardPlayerMotionEndCheck(lbl_1_bss_B6) == 0) {
HuPrcVSleep();
@ -520,7 +520,7 @@ void fn_1_8668(omObjData *arg0)
if (arg0->work[0] == 0) {
BoardModelHookReset(BoardPlayerModelGet(lbl_1_bss_B6));
BoardPlayerMotionShiftSet(lbl_1_bss_B6, 1, 0.0f, 5.0f, 0x40000001);
BoardPlayerMotionShiftSet(lbl_1_bss_B6, 1, 0.0f, 5.0f, HU3D_MOTATTR_LOOP);
arg0->func = NULL;
lbl_1_bss_8C->func = fn_1_7928;
BoardModelKill(lbl_1_bss_A2);

6
src/REL/w05Dll/monkey.c
View file

@ -153,7 +153,7 @@ void fn_1_3044(void) {
void fn_1_3430(void) {
if (GWPlayer[lbl_1_bss_4C].bowser_suit == 0) {
BoardPlayerMotionShiftSet(lbl_1_bss_4C, lbl_1_bss_30[2], 0.0f, 8.0f, 0);
BoardPlayerMotionShiftSet(lbl_1_bss_4C, lbl_1_bss_30[2], 0.0f, 8.0f, HU3D_MOTATTR_NONE);
HuPrcSleep(8);
while (BoardPlayerMotionEndCheck(lbl_1_bss_4C) == 0) {
@ -178,7 +178,7 @@ void fn_1_3514(void) {
s32 var_r31;
BoardPlayerPosGet(lbl_1_bss_4C, &sp2C);
BoardPlayerMotionShiftSet(lbl_1_bss_4C, 4, 0.0f, 5.0f, 0);
BoardPlayerMotionShiftSet(lbl_1_bss_4C, 4, 0.0f, 5.0f, HU3D_MOTATTR_NONE);
VECSubtract(&lbl_1_bss_38, &sp2C, &sp20);
sp20.y = 0.0f;
VECNormalize(&sp20, &sp20);
@ -284,7 +284,7 @@ void fn_1_3514(void) {
}
HuPrcVSleep();
} else {
BoardPlayerMotionShiftSet(lbl_1_bss_4C, 6, 0.0f, 8.0f, 0x40000001U);
BoardPlayerMotionShiftSet(lbl_1_bss_4C, 6, 0.0f, 8.0f, HU3D_MOTATTR_LOOP);
break;
}
}