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

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

@ -305,7 +305,7 @@ 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;
@ -314,6 +314,7 @@ loop_1:
sp30 = sp3C; sp30 = sp3C;
sp30.y += 20.0f; sp30.y += 20.0f;
BoardPlayerPosSetV(lbl_1_bss_68, &sp30); BoardPlayerPosSetV(lbl_1_bss_68, &sp30);
break;
} else { } else {
PSVECAdd(&sp3C, &sp24, &sp3C); PSVECAdd(&sp3C, &sp24, &sp3C);
BoardModelPosSetV(lbl_1_bss_64, &sp3C); BoardModelPosSetV(lbl_1_bss_64, &sp3C);
@ -321,7 +322,7 @@ loop_1:
sp30.y += 20.0f; sp30.y += 20.0f;
BoardPlayerPosSetV(lbl_1_bss_68, &sp30); BoardPlayerPosSetV(lbl_1_bss_68, &sp30);
HuPrcVSleep(); HuPrcVSleep();
goto loop_1; }
} }
HuAudFXStop(temp_r28); HuAudFXStop(temp_r28);
temp_r30->work[1] = 1; temp_r30->work[1] = 1;
@ -346,7 +347,7 @@ 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);
@ -361,9 +362,11 @@ loop_14:
} else { } else {
BoardPlayerPosSetV(lbl_1_bss_68, &sp30); BoardPlayerPosSetV(lbl_1_bss_68, &sp30);
HuPrcVSleep(); HuPrcVSleep();
goto loop_14; continue;
} }
BoardPlayerPosSetV(lbl_1_bss_68, &sp30); BoardPlayerPosSetV(lbl_1_bss_68, &sp30);
break;
}
} }
void fn_1_5648(void) { void fn_1_5648(void) {
@ -375,7 +378,7 @@ 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;
@ -385,7 +388,7 @@ loop_3:
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,7 +443,7 @@ 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)));
@ -451,6 +454,7 @@ loop_4:
sp4C = sp58; sp4C = sp58;
sp4C.y += 20.0f; sp4C.y += 20.0f;
BoardPlayerPosSetV(lbl_1_bss_68, &sp4C); BoardPlayerPosSetV(lbl_1_bss_68, &sp4C);
break;
} else { } else {
PSVECAdd(&sp58, &sp40, &sp58); PSVECAdd(&sp58, &sp40, &sp58);
sp64 = sp58; sp64 = sp58;
@ -495,7 +499,7 @@ loop_4:
fn_1_64BC(); fn_1_64BC();
BoardCameraTargetSet(sp58.x, -50.0f, sp58.z); BoardCameraTargetSet(sp58.x, -50.0f, sp58.z);
HuPrcVSleep(); HuPrcVSleep();
goto loop_4; }
} }
HuAudFXStop(var_r28); HuAudFXStop(var_r28);
var_r26->work[1] = 1; var_r26->work[1] = 1;
@ -519,7 +523,7 @@ 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);
@ -531,10 +535,11 @@ loop_32:
} }
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;
break;
} else { } else {
BoardPlayerPosSetV(lbl_1_bss_68, &sp4C); BoardPlayerPosSetV(lbl_1_bss_68, &sp4C);
HuPrcVSleep(); HuPrcVSleep();
goto loop_32; }
} }
BoardPlayerPosSetV(lbl_1_bss_68, &sp4C); BoardPlayerPosSetV(lbl_1_bss_68, &sp4C);
HuPrcKill(temp_r23); HuPrcKill(temp_r23);

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

@ -401,7 +401,7 @@ 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;
@ -428,9 +428,10 @@ loop_10:
} }
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) {