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

remove many gotos

Browse source
This commit is contained in:
Rainchus 2024-07-15 16:11:52 -05:00
parent 12bea8f5db
commit 1fdaa088d3
2 changed files with 146 additions and 140 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -305,23 +305,24 @@ void fn_1_4EB4(s32 arg1, s32 arg2, Vec* arg3) {
BoardModelPosGet(lbl_1_bss_64, &sp18); BoardModelPosGet(lbl_1_bss_64, &sp18);
temp_r30 = fn_1_66C0(4, &sp18); temp_r30 = fn_1_66C0(4, &sp18);
temp_r29 = fn_1_66C0(5, &sp18); temp_r29 = fn_1_66C0(5, &sp18);
loop_1: while (1) {
var_f28 = sqrtf((arg3->x - sp3C.x) * (arg3->x - sp3C.x) + (arg3->z - sp3C.z) * (arg3->z - sp3C.z)); var_f28 = sqrtf((arg3->x - sp3C.x) * (arg3->x - sp3C.x) + (arg3->z - sp3C.z) * (arg3->z - sp3C.z));
if (var_f28 <= temp_f23) { if (var_f28 <= temp_f23) {
sp3C.x = arg3->x; sp3C.x = arg3->x;
sp3C.z = arg3->z; sp3C.z = arg3->z;
BoardModelPosSetV(lbl_1_bss_64, &sp3C); BoardModelPosSetV(lbl_1_bss_64, &sp3C);
sp30 = sp3C; sp30 = sp3C;
sp30.y += 20.0f; sp30.y += 20.0f;
BoardPlayerPosSetV(lbl_1_bss_68, &sp30); BoardPlayerPosSetV(lbl_1_bss_68, &sp30);
} else { break;
PSVECAdd(&sp3C, &sp24, &sp3C); } else {
BoardModelPosSetV(lbl_1_bss_64, &sp3C); PSVECAdd(&sp3C, &sp24, &sp3C);
sp30 = sp3C; BoardModelPosSetV(lbl_1_bss_64, &sp3C);
sp30.y += 20.0f; sp30 = sp3C;
BoardPlayerPosSetV(lbl_1_bss_68, &sp30); sp30.y += 20.0f;
HuPrcVSleep(); BoardPlayerPosSetV(lbl_1_bss_68, &sp30);
goto loop_1; HuPrcVSleep();
}
} }
HuAudFXStop(temp_r28); HuAudFXStop(temp_r28);
temp_r30->work[1] = 1; temp_r30->work[1] = 1;
@ -346,24 +347,26 @@ loop_1:
var_f24 = 0.0f; var_f24 = 0.0f;
temp_f19 = 15.0f; temp_f19 = 15.0f;
loop_14: while (1) {
sp24.y = temp_f19 - (0.075f * (0.25f * (var_f24 * var_f24))); sp24.y = temp_f19 - (0.075f * (0.25f * (var_f24 * var_f24)));
var_f24++; var_f24++;
PSVECAdd(&sp30, &sp24, &sp30); PSVECAdd(&sp30, &sp24, &sp30);
var_f28 = sqrtf(((sp3C.x - sp30.x) * (sp3C.x - sp30.x)) + ((sp3C.z - sp30.z) * (sp3C.z - sp30.z))); var_f28 = sqrtf(((sp3C.x - sp30.x) * (sp3C.x - sp30.x)) + ((sp3C.z - sp30.z) * (sp3C.z - sp30.z)));
if (var_f28 < 5.0f) { if (var_f28 < 5.0f) {
sp24.x = sp24.z = 0.0f; sp24.x = sp24.z = 0.0f;
sp30.x = sp3C.x; sp30.x = sp3C.x;
sp30.z = sp3C.z; sp30.z = sp3C.z;
} }
if (sp30.y <= sp3C.y && sp24.y < 0.0f) { if (sp30.y <= sp3C.y && sp24.y < 0.0f) {
sp30.y = sp3C.y; sp30.y = sp3C.y;
} else { } else {
BoardPlayerPosSetV(lbl_1_bss_68, &sp30);
HuPrcVSleep();
continue;
}
BoardPlayerPosSetV(lbl_1_bss_68, &sp30); BoardPlayerPosSetV(lbl_1_bss_68, &sp30);
HuPrcVSleep(); break;
goto loop_14;
} }
BoardPlayerPosSetV(lbl_1_bss_68, &sp30);
} }
void fn_1_5648(void) { void fn_1_5648(void) {
@ -375,17 +378,17 @@ void fn_1_5648(void) {
sp8.y = 0.003921569f * (360.0f * frand8()); sp8.y = 0.003921569f * (360.0f * frand8());
BoardModelRotSetV(lbl_1_bss_6C[var_r31], &sp8); BoardModelRotSetV(lbl_1_bss_6C[var_r31], &sp8);
} }
loop_3: while (1) {
for (var_r31 = 0; var_r31 < 3; var_r31++) { for (var_r31 = 0; var_r31 < 3; var_r31++) {
BoardModelRotGet(lbl_1_bss_6C[var_r31], &sp8); BoardModelRotGet(lbl_1_bss_6C[var_r31], &sp8);
sp8.y += 10.0f; sp8.y += 10.0f;
if (sp8.y >= 360.0f) { if (sp8.y >= 360.0f) {
sp8.y -= 360.0f; sp8.y -= 360.0f;
}
BoardModelRotSetV(lbl_1_bss_6C[var_r31], &sp8);
} }
BoardModelRotSetV(lbl_1_bss_6C[var_r31], &sp8); HuPrcVSleep();
} }
HuPrcVSleep();
goto loop_3;
} }
void fn_1_5794(s32 arg0, s32 arg1, Vec* arg2) { void fn_1_5794(s32 arg0, s32 arg1, Vec* arg2) {
@ -440,62 +443,63 @@ void fn_1_5794(s32 arg0, s32 arg1, Vec* arg2) {
temp_r27 = fn_1_66C0(4, &sp1C); temp_r27 = fn_1_66C0(4, &sp1C);
temp_r25 = fn_1_66C0(5, &sp1C); temp_r25 = fn_1_66C0(5, &sp1C);
loop_4: while (1) {
sp18 = BoardModelRotYGet(lbl_1_bss_64); sp18 = BoardModelRotYGet(lbl_1_bss_64);
sp58 = sp64; sp58 = sp64;
var_f27 = sqrtf(((arg2->x - sp58.x) * (arg2->x - sp58.x)) + ((arg2->z - sp58.z) * (arg2->z - sp58.z))); var_f27 = sqrtf(((arg2->x - sp58.x) * (arg2->x - sp58.x)) + ((arg2->z - sp58.z) * (arg2->z - sp58.z)));
if (var_f27 <= temp_f22) { if (var_f27 <= temp_f22) {
sp58.x = arg2->x; sp58.x = arg2->x;
sp58.z = arg2->z; sp58.z = arg2->z;
BoardModelPosSetV(lbl_1_bss_64, &sp58); BoardModelPosSetV(lbl_1_bss_64, &sp58);
sp4C = sp58; sp4C = sp58;
sp4C.y += 20.0f; sp4C.y += 20.0f;
BoardPlayerPosSetV(lbl_1_bss_68, &sp4C); BoardPlayerPosSetV(lbl_1_bss_68, &sp4C);
} else { break;
PSVECAdd(&sp58, &sp40, &sp58);
sp64 = sp58;
if (var_r29 == 0) {
sp58.y += 250.0 * sin((M_PI * var_f28) / 180.0);
var_f28 -= 2.5f;
if (var_f28 < -540.0f) {
var_f28 = -540.0f;
}
if (var_r30 == 0) {
temp_r27->work[1] = 1;
temp_r25->work[1] = 1;
var_r30++;
} else if (var_r30 == 1 && var_f28 < -180.0f) {
HuAudFXStop(var_r28);
HuAudFXPlay(0x47D);
HuAudPlayerVoicePlay(lbl_1_bss_68, 0x125);
fn_1_66C0(3, &sp58);
var_r30++;
} else if ((var_r30 == 2) && (var_f28 < -360.0f)) {
var_r28 = HuAudFXPlay(0x47F);
HuAudFXPlay(0x481);
fn_1_66C0(3, &sp58);
var_r30++;
} else if ((var_r30 == 3) && (-540.0f == var_f28)) {
var_r30++;
BoardModelPosGet(lbl_1_bss_64, &sp1C);
var_r26 = fn_1_66C0(4, &sp1C);
var_r24 = fn_1_66C0(5, &sp1C);
}
} else { } else {
var_r29--; PSVECAdd(&sp58, &sp40, &sp58);
sp64 = sp58;
if (var_r29 == 0) {
sp58.y += 250.0 * sin((M_PI * var_f28) / 180.0);
var_f28 -= 2.5f;
if (var_f28 < -540.0f) {
var_f28 = -540.0f;
}
if (var_r30 == 0) {
temp_r27->work[1] = 1;
temp_r25->work[1] = 1;
var_r30++;
} else if (var_r30 == 1 && var_f28 < -180.0f) {
HuAudFXStop(var_r28);
HuAudFXPlay(0x47D);
HuAudPlayerVoicePlay(lbl_1_bss_68, 0x125);
fn_1_66C0(3, &sp58);
var_r30++;
} else if ((var_r30 == 2) && (var_f28 < -360.0f)) {
var_r28 = HuAudFXPlay(0x47F);
HuAudFXPlay(0x481);
fn_1_66C0(3, &sp58);
var_r30++;
} else if ((var_r30 == 3) && (-540.0f == var_f28)) {
var_r30++;
BoardModelPosGet(lbl_1_bss_64, &sp1C);
var_r26 = fn_1_66C0(4, &sp1C);
var_r24 = fn_1_66C0(5, &sp1C);
}
} else {
var_r29--;
}
BoardModelPosSetV(lbl_1_bss_64, &sp58);
sp28.x = sp34.x = (45.0 * -sin((M_PI * var_f28) / 180.0));
BoardModelRotSetV(lbl_1_bss_64, &sp34);
BoardPlayerRotSetV(lbl_1_bss_68, &sp28);
sp4C = sp58;
sp4C.y += 20.0f;
BoardPlayerPosSetV(lbl_1_bss_68, &sp4C);
fn_1_64BC();
BoardCameraTargetSet(sp58.x, -50.0f, sp58.z);
HuPrcVSleep();
} }
BoardModelPosSetV(lbl_1_bss_64, &sp58);
sp28.x = sp34.x = (45.0 * -sin((M_PI * var_f28) / 180.0));
BoardModelRotSetV(lbl_1_bss_64, &sp34);
BoardPlayerRotSetV(lbl_1_bss_68, &sp28);
sp4C = sp58;
sp4C.y += 20.0f;
BoardPlayerPosSetV(lbl_1_bss_68, &sp4C);
fn_1_64BC();
BoardCameraTargetSet(sp58.x, -50.0f, sp58.z);
HuPrcVSleep();
goto loop_4;
} }
HuAudFXStop(var_r28); HuAudFXStop(var_r28);
var_r26->work[1] = 1; var_r26->work[1] = 1;
@ -519,22 +523,23 @@ loop_4:
BoardPlayerMotionStart(lbl_1_bss_68, 4, 0); BoardPlayerMotionStart(lbl_1_bss_68, 4, 0);
var_f23 = 0.0f; var_f23 = 0.0f;
temp_f18 = 15.0f; temp_f18 = 15.0f;
loop_32: while (1) {
sp40.y = temp_f18 - (0.075f * (0.25f * (var_f23 * var_f23))); sp40.y = temp_f18 - (0.075f * (0.25f * (var_f23 * var_f23)));
var_f23++; var_f23++;
PSVECAdd(&sp4C, &sp40, &sp4C); PSVECAdd(&sp4C, &sp40, &sp4C);
var_f27 = sqrtf(((sp58.x - sp4C.x) * (sp58.x - sp4C.x)) + ((sp58.z - sp4C.z) * (sp58.z - sp4C.z))); var_f27 = sqrtf(((sp58.x - sp4C.x) * (sp58.x - sp4C.x)) + ((sp58.z - sp4C.z) * (sp58.z - sp4C.z)));
if (var_f27 < 5.0f) { if (var_f27 < 5.0f) {
sp40.x = sp40.z = 0.0f; sp40.x = sp40.z = 0.0f;
sp4C.x = sp58.x; sp4C.x = sp58.x;
sp4C.z = sp58.z; sp4C.z = sp58.z;
} }
if (sp4C.y <= sp58.y && sp40.y < 0.0f) { if (sp4C.y <= sp58.y && sp40.y < 0.0f) {
sp4C.y = sp58.y; sp4C.y = sp58.y;
} else { break;
BoardPlayerPosSetV(lbl_1_bss_68, &sp4C); } else {
HuPrcVSleep(); BoardPlayerPosSetV(lbl_1_bss_68, &sp4C);
goto loop_32; HuPrcVSleep();
}
} }
BoardPlayerPosSetV(lbl_1_bss_68, &sp4C); BoardPlayerPosSetV(lbl_1_bss_68, &sp4C);
HuPrcKill(temp_r23); HuPrcKill(temp_r23);

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

@ -401,36 +401,37 @@ void fn_1_AB24(void) {
var_f31 = -1.0f; var_f31 = -1.0f;
var_r29 = 0; var_r29 = 0;
loop_10: while (1) {
for (var_r31 = 0; var_r31 < lbl_1_bss_C6; var_r31++) { for (var_r31 = 0; var_r31 < lbl_1_bss_C6; var_r31++) {
if (var_r31 >= var_r29) { if (var_r31 >= var_r29) {
sp124[var_r31].y += var_f31; sp124[var_r31].y += var_f31;
BoardModelPosSetV(lbl_1_bss_D6[var_r31], &sp124[var_r31]); BoardModelPosSetV(lbl_1_bss_D6[var_r31], &sp124[var_r31]);
sp34[var_r31].y += 45.0f; sp34[var_r31].y += 45.0f;
if (sp34[var_r31].y >= 360.0f) { if (sp34[var_r31].y >= 360.0f) {
sp34[var_r31].y -= 360.0f; sp34[var_r31].y -= 360.0f;
} }
BoardModelRotSetV(lbl_1_bss_D6[var_r31], &sp34[var_r31]); BoardModelRotSetV(lbl_1_bss_D6[var_r31], &sp34[var_r31]);
if (sp124[var_r31].y <= (80.0f + sp28.y)) { if (sp124[var_r31].y <= (80.0f + sp28.y)) {
sp10 = sp124[var_r31]; sp10 = sp124[var_r31];
CharModelCoinEffectCreate(1, &sp10); CharModelCoinEffectCreate(1, &sp10);
BoardModelVisibilitySet(lbl_1_bss_D6[var_r31], 0); BoardModelVisibilitySet(lbl_1_bss_D6[var_r31], 0);
var_r29++; var_r29++;
BoardPlayerCoinsAdd(lbl_1_bss_C0, 1); BoardPlayerCoinsAdd(lbl_1_bss_C0, 1);
HuAudFXPlay(7); HuAudFXPlay(7);
omVibrate(lbl_1_bss_C0, 0xC, 6, 6); omVibrate(lbl_1_bss_C0, 0xC, 6, 6);
}
} }
} }
} var_f31 *= 1.05f;
var_f31 *= 1.05f; if (var_f31 < -20.0f) {
if (var_f31 < -20.0f) { var_f31 = -20.0f;
var_f31 = -20.0f; }
} if (var_r29 == lbl_1_bss_C6) {
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, 0); break;
} else { } else {
HuPrcVSleep(); HuPrcVSleep();
goto loop_10; }
} }
while (BoardPlayerMotionEndCheck(lbl_1_bss_C0) == 0) { while (BoardPlayerMotionEndCheck(lbl_1_bss_C0) == 0) {