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

Matched REL/w01/mg_item + some data cleanup

Browse source
This commit is contained in:
mrshigure 2024-03-31 17:59:41 -07:00
parent fc06ca8f49
commit 9dcac2c156
18 changed files with 1142 additions and 197 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -206,7 +206,7 @@ s32 fn_1_3478(s32 arg0) {
sp8.y = 0.0f;
sp8.z = 0.0f;
BoardCameraMotionStartEx(lbl_1_data_310, &sp8, &sp14, 1900.0f, -1.0f, 0x15);
BoardCameraMotionStartEx(lbl_1_data_310, &sp8, &sp14, 1900.0f, -1.0f, 21);
temp_r28 = GWPlayer[arg0].space_curr;
BoardPlayerPosGet(arg0, &sp2C);
temp = BoardSpaceLinkFlagSearch(0, temp_r28, 0x02000000);
@ -392,7 +392,7 @@ void fn_1_3968(s32 arg0) {
sp18.y = 180.0f;
sp18.z = 0.0f;
BoardCameraMotionStartEx(lbl_1_data_310, &sp18, 0, 4000.0f, -1.0f, 0x150);
BoardCameraMotionStartEx(lbl_1_data_310, &sp18, NULL, 4000.0f, -1.0f, 336);
for (var_r28 = 0, sp8 = 0; ; sp8++) {
if (var_r28 == 0) {

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

@ -162,7 +162,7 @@ s32 fn_1_7D18(s32 arg0) {
sp8.y = 0.0f;
sp8.z = 0.0f;
BoardCameraMotionStartEx(lbl_1_bss_C[7], &sp8, &sp14, 1500.0f, -1.0f, 0x15);
BoardCameraMotionStartEx(lbl_1_bss_C[7], &sp8, &sp14, 1500.0f, -1.0f, 21);
space = GWPlayer[arg0].space_curr;
temp_r28 = BoardSpaceLinkFlagSearch(0, space, 0x02000000);
BoardPlayerPosGet(arg0, &sp2C);
@ -400,7 +400,7 @@ void fn_1_8698(omObjData* arg0, someBits3* arg1) {
arg0->rot.y = 16.666666f * arg0->rot.x;
arg0->scale.x = BoardModelMotionMaxTimeGet(lbl_1_bss_C[7]);
HuWinDispOff(lbl_1_data_454);
BoardCameraMotionStartEx(-1, 0, 0, 1900.0f, -1.0f, 0x15);
BoardCameraMotionStartEx(-1, NULL, NULL, 1900.0f, -1.0f, 21);
return;
}

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

@ -241,7 +241,7 @@ s32 fn_1_9CF4(s32 arg0) {
sp8.y = 0.0f;
sp8.z = 0.0f;
BoardCameraMotionStartEx(lbl_1_bss_C[8], &sp8, &sp14, 1500.0f, -1.0f, 0x15);
BoardCameraMotionStartEx(lbl_1_bss_C[8], &sp8, &sp14, 1500.0f, -1.0f, 21);
spaceCur = GWPlayer[arg0].space_curr;
temp_r29 = BoardSpaceLinkFlagSearch(0, spaceCur, 0x02000000);
BoardPlayerPosGet(arg0, &sp2C);

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

@ -165,7 +165,7 @@ s32 fn_1_1650(s32 arg0) {
sp8.x = -20.0f;
sp8.y = 0.0f;
sp8.z = 0.0f;
BoardCameraMotionStartEx(lbl_1_bss_6C, &sp8, &sp14, 1360.0f, -1.0f, 0x15);
BoardCameraMotionStartEx(lbl_1_bss_6C, &sp8, &sp14, 1360.0f, -1.0f, 21);
BoardPlayerPosLerpStart(arg0, &sp2C, &sp38, 0x28);
while (GWPlayer[arg0].moving) {
@ -471,9 +471,9 @@ void fn_1_20E0(s32 arg0) {
fn_1_2AC0();
for (i = 0; i < 3; i++) {
BoardCameraMotionStartEx(-1, NULL, 0, 680.0f, -1.0f, 13);
BoardCameraMotionStartEx(-1, NULL, NULL, 680.0f, -1.0f, 13);
BoardCameraMotionWait();
BoardCameraMotionStartEx(-1, NULL, 0, 1360.0f, -1.0f, 13);
BoardCameraMotionStartEx(-1, NULL, NULL, 1360.0f, -1.0f, 13);
BoardCameraMotionWait();
}
@ -498,7 +498,7 @@ void fn_1_20E0(s32 arg0) {
sp18.x = -20.0f;
sp18.y = 0.0f;
sp18.z = 0.0f;
BoardCameraMotionStartEx(lbl_1_bss_C[1], &sp18, &sp24, 3000.0f, -1.0f, 0x3C);
BoardCameraMotionStartEx(lbl_1_bss_C[1], &sp18, &sp24, 3000.0f, -1.0f, 60);
BoardCameraMotionWait();
omVibrate(arg0, 0x1E, 6, 6);
HuPrcSleep(0x1E);
@ -526,7 +526,7 @@ void fn_1_20E0(s32 arg0) {
sp18.x = -20.0f;
sp18.y = 0.0f;
sp18.z = 0.0f;
BoardCameraMotionStartEx(lbl_1_bss_6C, &sp18, &sp24, 1360.0f, -1.0f, 0x3C);
BoardCameraMotionStartEx(lbl_1_bss_6C, &sp18, &sp24, 1360.0f, -1.0f, 60);
BoardCameraMotionWait();
HuPrcSleep(0x3C);
}