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

Matched REL/w04/big_boo + applying new macros

Browse source
This commit is contained in:
mrshigure 2024-04-25 05:15:29 -07:00
parent 818428e4ff
commit 4229bfe0c1
19 changed files with 1449 additions and 277 deletions
Download patch file Download diff file Expand all files Collapse all files

52
src/REL/w01Dll/main.c
View file

@ -29,7 +29,7 @@
#include "game/board/map_object.h"
#include "dolphin.h"
#include "math.h"
#include "ext_math.h"
typedef struct {
struct {
@ -768,8 +768,8 @@ static void fn_1_1B3C(void) {
PSMTXConcat(lbl_1_bss_678, sp48, lbl_1_bss_678);
} else {
if (sp30.z != 0.0f || sp30.x != 0.0f) {
lbl_1_bss_660.y = 180.0 * (atan2(sp30.x, sp30.z) / M_PI);
lbl_1_bss_660.x = -(180.0 * (atan2(sp30.y, sqrtf(sp30.x * sp30.x + sp30.z * sp30.z)) / M_PI));
lbl_1_bss_660.y = atan2d(sp30.x, sp30.z);
lbl_1_bss_660.x = -atan2d(sp30.y, VECMagXZ(&sp30));
} else {
lbl_1_bss_660.x = lbl_1_bss_660.y = 0.0f;
}
@ -816,7 +816,7 @@ static void fn_1_1FA4(void) {
PSVECAdd(&spC, &lbl_1_bss_618, &lbl_1_bss_618);
PSVECSubtract(&lbl_1_bss_654, &lbl_1_bss_648, &spC);
if (spC.x != 0.0f || spC.z != 0.0f) {
temp_f29 = atan2f(spC.y, sqrtf(spC.x * spC.x + spC.z * spC.z));
temp_f29 = atan2f(spC.y, VECMagXZ(&spC));
temp_f28 = atan2f(-spC.x, -spC.z);
} else {
temp_f29 = temp_f28 = 0.0f;
@ -833,9 +833,9 @@ static void fn_1_1FA4(void) {
} else {
var_f27 = 2500.0f;
}
sp18.x = sp18.x + var_f27 * sin(1.4137166738510132); // 81 * M_PI / 180.0
sp18.x = sp18.x + var_f27 * sin(1.4137166738510132); // TODO: should be sind(81)
sp18.y = sp18.y + -150.0f;
sp18.z = sp18.z + var_f27 * cos(1.4137166738510132); // 81 * M_PI / 180.0
sp18.z = sp18.z + var_f27 * cos(1.4137166738510132); // TODO: should be cosd(81)
PSVECSubtract(&sp18, &lbl_1_bss_630, &spC);
PSVECScale(&spC, &spC, lbl_1_bss_66C);
PSVECAdd(&spC, &lbl_1_bss_630, &lbl_1_bss_630);
@ -880,7 +880,7 @@ static float fn_1_2524(void) {
return 0.0f;
}
PSVECSubtract(&sp18, &sp24, &spC);
var_f30 = 180.0 * (atan2(spC.x, spC.z) / M_PI);
var_f30 = atan2d(spC.x, spC.z);
if (var_f30 > 0.0f) {
var_f30 = 45.0f;
} else {
@ -946,8 +946,8 @@ static void fn_1_2F18(void) {
BoardModelPosGet(lbl_1_bss_6C4[0], &spC);
PSVECSubtract(&lbl_1_bss_654, &lbl_1_bss_648, &sp18);
if (sp18.z != 0.0f || sp18.x != 0.0f) {
sp24.y = 180.0 * (atan2(sp18.x, sp18.z) / M_PI);
sp24.x = -(180.0 * (atan2(sp18.y, sqrtf(sp18.x * sp18.x + sp18.z * sp18.z)) / M_PI));
sp24.y = atan2d(sp18.x, sp18.z);
sp24.x = -atan2d(sp18.y, VECMagXZ(&sp18));
} else {
sp24.x = sp24.y = 0.0f;
}
@ -1096,9 +1096,9 @@ static void fn_1_3624(void) {
BoardCameraMotionStartEx(lbl_1_bss_6C4[0], &sp30, NULL, 150.0f, -1.0f, 2);
BoardCameraMotionWait();
BoardModelPosGet(lbl_1_bss_6C4[0], &lbl_1_bss_618);
lbl_1_bss_630.x = lbl_1_bss_618.x + 1000.0 * (sin(sp30.y * M_PI / 180.0) * cos(sp30.x * M_PI / 180.0));
lbl_1_bss_630.y = lbl_1_bss_618.y + 1000.0 * -sin(sp30.x * M_PI / 180.0);
lbl_1_bss_630.z = lbl_1_bss_618.z + 1000.0 * (cos(sp30.y * M_PI / 180.0) * cos(sp30.x * M_PI / 180.0));
lbl_1_bss_630.x = lbl_1_bss_618.x + 1000.0 * (sind(sp30.y) * cosd(sp30.x));
lbl_1_bss_630.y = lbl_1_bss_618.y + 1000.0 * -sind(sp30.x);
lbl_1_bss_630.z = lbl_1_bss_618.z + 1000.0 * (cosd(sp30.y) * cosd(sp30.x));
PSMTXRotRad(lbl_1_bss_678, 'y', MTXDegToRad(lbl_1_bss_63C));
BoardModelMtxSet(lbl_1_bss_6C4[0], &lbl_1_bss_678);
BoardPlayerMtxSet(lbl_1_bss_6B4, &lbl_1_bss_678);
@ -1273,7 +1273,7 @@ static s32 fn_1_48B4(void) {
BoardSpacePosGet(0, temp_r28, &sp14);
PSVECSubtract(&sp14, &sp20, &sp8);
PSVECNormalize(&sp8, &sp8);
var_f31 = 180.0 * (atan2(-sp8.x, -sp8.z) / M_PI);
var_f31 = atan2d(-sp8.x, -sp8.z);
BoardPlayerRotSet(lbl_1_bss_6B4, 0.0f, var_f31, 0.0f);
BoardPlayerMoveBetween(lbl_1_bss_6B4, temp_r30, temp_r28);
while (GWPlayer[lbl_1_bss_6B4].moving) {
@ -1331,7 +1331,7 @@ static s32 fn_1_48B4(void) {
BoardCameraTargetPlayerSet(lbl_1_bss_6B4);
PSVECSubtract(&sp20, &sp14, &sp8);
PSVECNormalize(&sp8, &sp8);
var_f31 = 180.0 * (atan2(-sp8.x, -sp8.z) / M_PI);
var_f31 = atan2d(-sp8.x, -sp8.z);
BoardPlayerRotSet(lbl_1_bss_6B4, 0.0f, var_f31, 0.0f);
BoardPlayerMoveBetween(lbl_1_bss_6B4, temp_r28, temp_r30);
while (GWPlayer[lbl_1_bss_6B4].moving) {
@ -1410,13 +1410,13 @@ static void fn_1_50D4(void) {
}
PSVECSubtract(&sp14, &temp_r31->pos, &sp8);
PSVECNormalize(&sp8, &sp8);
var_f31 = 180.0 * (atan2(sp8.z, sp8.x) / M_PI);
var_f31 = atan2d(sp8.z, sp8.x);
if (var_r27 != 0) {
var_f31 += 180.0f;
}
sp20.x = temp_r31->pos.x + temp_f30 * sin(var_f31 * M_PI / 180.0);
sp20.x = temp_r31->pos.x + temp_f30 * sind(var_f31);
sp20.y = temp_r31->pos.y + 80.0f;
sp20.z = temp_r31->pos.z + temp_f30 * cos(var_f31 * M_PI / 180.0);
sp20.z = temp_r31->pos.z + temp_f30 * cosd(var_f31);
BoardModelPosSetV(lbl_1_bss_5D0[i], &sp20);
BoardModelVisibilitySet(lbl_1_bss_5D0[i], 1);
sp14 = temp_r31->pos;
@ -1752,7 +1752,7 @@ static void fn_1_63F0(Bss18Work *arg0, omObjData *arg1) {
OSu8tof32(&arg0->unk01, &temp_f29);
temp_f29 -= 12.0f;
temp_f29 = 90.0f * (temp_f29 / 12.5f);
var_f28 = cos(temp_f29 * M_PI / 180.0);
var_f28 = cosd(temp_f29);
if (var_f28 < 0.1f) {
var_f28 = 0.1f;
}
@ -1779,7 +1779,7 @@ static void fn_1_6A14(Bss18Work *arg0, omObjData *arg1) {
arg1->scale.y = sp20.y;
arg1->scale.z = sp20.z;
BoardPlayerMotionShiftSet(GWSystem.player_curr, 4, 15.0f, 5.0f, 0);
BoardPlayerRotYSet(GWSystem.player_curr, 180.0 * (atan2(sp8.x, sp8.z) / M_PI));
BoardPlayerRotYSet(GWSystem.player_curr, atan2d(sp8.x, sp8.z));
arg0->unk00_field1 = 3;
arg0->unk01 = 0;
}
@ -1820,7 +1820,7 @@ static void fn_1_6BC0(Bss18Work *arg0, omObjData *arg1) {
OSu8tof32(&arg0->unk01, &temp_f29);
temp_f29 -= 12.0f;
temp_f29 = 90.0f * (temp_f29 / 12.5f);
var_f28 = sin(temp_f29 * M_PI / 180.0);
var_f28 = sind(temp_f29);
if (var_f28 < 0.1f) {
var_f28 = 0.1f;
}
@ -2157,7 +2157,7 @@ static void fn_1_8988(BssCData *arg0, omObjData *arg1) {
BoardModelPosGet(*lbl_1_bss_6C4, &sp20);
BoardPlayerPosGet(arg0->unk01, &sp14);
PSVECSubtract(&sp20, &sp14, &sp8);
BoardPlayerRotYSet(arg0->unk01, 180.0 * (atan2(sp8.x, sp8.z) / M_PI));
BoardPlayerRotYSet(arg0->unk01, atan2d(sp8.x, sp8.z));
arg0->unk00 = 1;
}
@ -2199,7 +2199,7 @@ static void fn_1_8B6C(BssCData *arg0, omObjData *arg1) {
BoardPlayerPosGet(arg0->unk01, &arg0->unk14);
BoardModelPosGet(lbl_1_bss_6C4[0], &sp20);
PSVECSubtract(&sp20, &arg0->unk14, &sp14);
BoardPlayerRotYSet(arg0->unk01, -(180.0 * (atan2(sp14.x, sp14.z) / M_PI)));
BoardPlayerRotYSet(arg0->unk01, -atan2d(sp14.x, sp14.z));
BoardPlayerMotionStart(arg0->unk01, 3, 0x40000001);
BoardPlayerMotionSpeedSet(arg0->unk01, 2.0f);
temp_f30 = BoardModelMotionTimeGet(lbl_1_bss_6AE);
@ -2265,8 +2265,8 @@ static void fn_1_8DDC(BssCData *arg0, omObjData *arg1) {
PSMTXTranspose(sp54, arg0->unk20);
} else {
if (sp24.z != 0.0f || sp24.x != 0.0f) {
sp3C.y = 180.0 * (atan2(sp24.x, sp24.z) / M_PI);
sp3C.x = -(180.0 * (atan2(sp24.y, sqrtf(sp24.x * sp24.x + sp24.z * sp24.z)) / M_PI));
sp3C.y = atan2d(sp24.x, sp24.z);
sp3C.x = -atan2d(sp24.y, VECMagXZ(&sp24));
} else {
sp3C.x = sp3C.y = 0.0f;
}
@ -2296,7 +2296,7 @@ static void fn_1_918C(BssCData *arg0, omObjData *arg1) {
BoardPlayerPosGet(arg0->unk01, &sp14);
BoardPlayerMtxSet(arg0->unk01, &arg0->unk20);
PSVECSubtract(&sp20, &sp14, &sp8);
BoardPlayerRotYSet(arg0->unk01, 180.0 * (atan2(-sp8.z, -sp8.x) / M_PI));
BoardPlayerRotYSet(arg0->unk01, atan2d(-sp8.z, -sp8.x));
BoardPlayerPosLerpStart(arg0->unk01, &sp14, &sp20, 20);
arg0->unk00 = 5;
}
@ -2547,7 +2547,7 @@ static void fn_1_9BBC(Bss20Work *arg0) {
BoardModelVisibilitySet(temp_r31->unk02, 0);
} else {
if (temp_r31->unk00 <= 3) {
temp_r31->unk04 = sin(30.0f * temp_r31->unk00 * M_PI / 180.0);
temp_r31->unk04 = sind(30.0f * temp_r31->unk00);
}
PSVECAdd(&temp_r31->unk08, &temp_r31->unk14, &temp_r31->unk08);
BoardModelMtxSet(temp_r31->unk02, &lbl_1_bss_678);

12
src/REL/w01Dll/mg_coin.c
View file

@ -22,7 +22,7 @@
#include "game/board/window.h"
#include "dolphin.h"
#include "math.h"
#include "ext_math.h"
typedef struct {
/* 0x00 */ Vec unk00;
@ -640,7 +640,7 @@ static void fn_1_B478(omObjData *arg0) {
MGSeqParamSet(lbl_1_bss_744, 2, -1);
lbl_1_bss_714[lbl_1_bss_730]->work[1] = 1;
BoardPlayerPosGet(lbl_1_bss_798, &spC);
var_f28 = sqrtf((temp_r31->unk04.x - spC.x) * (temp_r31->unk04.x - spC.x) + (temp_r31->unk04.z - spC.z) * (temp_r31->unk04.z - spC.z));
var_f28 = VECDistanceXZ(&temp_r31->unk04, &spC);
fn_1_C94C(&spC, &temp_r31->unk04, &temp_r31->unk10);
temp_r31->unk10.y = 0.0f;
temp_r31->unk10.x *= var_f28 / 30.0f;
@ -664,7 +664,7 @@ static void fn_1_BAF8(omObjData *arg0) {
BoardPlayerPosGet(lbl_1_bss_798, &sp14);
sp14.x += temp_r31->unk10.x;
sp14.z += temp_r31->unk10.z;
sp14.y = lbl_1_bss_738.y + 80.0 * sin(6.0f * temp_r31->unk20 * M_PI / 180.0);
sp14.y = lbl_1_bss_738.y + 80.0 * sind(6.0f * temp_r31->unk20);
BoardModelPosGet(lbl_1_bss_714[lbl_1_bss_730]->work[0], &sp8);
if ((temp_r31->unk20 += 1.0f) == 30.0f) {
sp14.y = sp8.y + 5.0f;
@ -892,7 +892,7 @@ static float fn_1_C998(Vec *arg0) {
return 270.0f;
}
}
temp_f31 = 180.0 * (atan2(arg0->z, arg0->x) / M_PI);
temp_f31 = atan2d(arg0->z, arg0->x);
if (arg0->z < 0.0f) {
temp_f31 = 90.0f - temp_f31;
} else {
@ -1051,8 +1051,8 @@ static void fn_1_D114(ModelData *model, ParticleData *particle, Mtx matrix) {
var_r31->unk24 = 0.0f;
}
temp_r26 = 80.0f * (2.0f * ((sp8.x - var_r31->unk08.x) / 15.0f) - rand8() / 255.0f);
var_r31->unk20 = 8.0 * sin(temp_r26 * M_PI / 180.0);
var_r31->unk28 = 8.0 * cos(temp_r26 * M_PI / 180.0);
var_r31->unk20 = 8.0 * sind(temp_r26);
var_r31->unk28 = 8.0 * cosd(temp_r26);
}
var_r31->unk24 -= 0.35f;
if ((var_r31->unk14.x -= 25.5f) < 0.0f) {

34
src/REL/w01Dll/mg_item.c
View file

@ -23,7 +23,7 @@
#include "game/board/window.h"
#include "dolphin.h"
#include "math.h"
#include "ext_math.h"
static void fn_1_E100(void);
static void fn_1_E154(void);
@ -308,7 +308,7 @@ static void fn_1_E44C(omObjData *arg0) {
arg0->trans.x = spC.x;
arg0->trans.y = spC.y;
arg0->trans.z = spC.z;
arg0->rot.x = sqrtf((lbl_1_bss_7D8.x - sp18.x) * (lbl_1_bss_7D8.x - sp18.x) + (lbl_1_bss_7D8.z - sp18.z) * (lbl_1_bss_7D8.z - sp18.z));
arg0->rot.x = VECDistanceXZ(&lbl_1_bss_7D8, &sp18);
arg0->rot.y = 10.0f;
arg0->rot.z = sp18.y;
arg0->scale.x = 0.0f;
@ -327,7 +327,7 @@ static void fn_1_E914(omObjData *arg0) {
spC.z += arg0->trans.z * arg0->rot.x / 32.760002f;
spC.y += arg0->rot.y - 0.016666668f * arg0->scale.x * arg0->scale.x;
arg0->scale.x += 1.0f;
if (sqrtf((lbl_1_bss_7D8.x - spC.x) * (lbl_1_bss_7D8.x - spC.x) + (lbl_1_bss_7D8.z - spC.z) * (lbl_1_bss_7D8.z - spC.z)) < 2.0f) {
if (VECDistanceXZ(&lbl_1_bss_7D8, &spC) < 2.0f) {
spC = lbl_1_bss_7D8;
BoardPlayerRotSet(lbl_1_bss_7E4, 0.0f, fn_1_10BB0(arg0->work[2]), 0.0f);
lbl_1_bss_7EC = 0.05f;
@ -460,7 +460,7 @@ static void fn_1_F3F8(omObjData *arg0) {
arg0->trans.x = spC.x;
arg0->trans.y = spC.y;
arg0->trans.z = spC.z;
arg0->rot.x = sqrtf((lbl_1_bss_7C4.x - sp18.x) * (lbl_1_bss_7C4.x - sp18.x) + (lbl_1_bss_7C4.z - sp18.z) * (lbl_1_bss_7C4.z - sp18.z));
arg0->rot.x = VECDistanceXZ(&lbl_1_bss_7C4, &sp18);
arg0->scale.y = 20.0f + 40.0f * (arg0->rot.x / 445.0f);
arg0->rot.y = 0.016666668f * (arg0->scale.y / 2) * (arg0->scale.y / 2);
arg0->rot.z = sp18.y;
@ -673,8 +673,8 @@ static void fn_1_101B8(s16 arg0) {
if (var_f31 >= 360.0f) {
var_f31 -= 360.0f;
}
temp_f30 = lbl_1_bss_80C.x - 100.0 * cos(var_f31 * M_PI / 180.0);
temp_f28 = lbl_1_bss_80C.z - 100.0 * sin(var_f31 * M_PI / 180.0);
temp_f30 = lbl_1_bss_80C.x - 100.0 * cosd(var_f31);
temp_f28 = lbl_1_bss_80C.z - 100.0 * sind(var_f31);
temp_f29 = lbl_1_bss_80C.y + 66.0f + 1.0f;
omSetTra(var_r31, temp_f30, temp_f29, temp_f28);
var_r31->work[0] = 0;
@ -715,7 +715,7 @@ static void fn_1_10664(omObjData *arg0) {
}
omSetSca(arg0, var_f31, var_f31, var_f31);
} else {
arg0->trans.y += sin(temp_r31[1] * M_PI / 180.0);
arg0->trans.y += sind(temp_r31[1]);
temp_r31[1] += 4.0f;
if (temp_r31[1] >= 360.0f) {
temp_r31[1] -= 360.0f;
@ -739,7 +739,7 @@ static void fn_1_10820(omObjData *arg0) {
sp24.y = 0.0f;
PSVECSubtract(&sp24, &sp18, &spC);
PSVECNormalize(&spC, &spC);
var_f28 = sqrtf((sp24.x - sp18.x) * (sp24.x - sp18.x) + (sp24.z - sp18.z) * (sp24.z - sp18.z));
var_f28 = VECDistanceXZ(&sp24, &sp18);
if (var_f28 < 8.0f) {
arg0->trans.x = sp24.x;
arg0->trans.z = sp24.z;
@ -749,7 +749,7 @@ static void fn_1_10820(omObjData *arg0) {
arg0->trans.z += 8.0f * spC.z;
}
}
arg0->trans.y += sin(temp_r30[1] * M_PI / 180.0);
arg0->trans.y += sind(temp_r30[1]);
temp_r30[1] += 4.0f;
if (temp_r30[1] >= 360.0f) {
temp_r30[1] -= 360.0f;
@ -836,7 +836,7 @@ static float fn_1_10EB8(Vec *arg0) {
return 270.0f;
}
}
var_f31 = 180.0 * (atan2(arg0->z, arg0->x) / M_PI);
var_f31 = atan2d(arg0->z, arg0->x);
if (arg0->z < 0.0f) {
var_f31 = 90.0f - var_f31;
} else {
@ -877,8 +877,8 @@ static void fn_1_11064(ModelData *model, ParticleData *particle, Mtx matrix) {
if (var_r28 != particle->unk_30) {
temp_f30 = 0.003921569f * frand8() * 360.0f;
temp_f29 = 0.003921569f * frand8() * 70.0f * temp_f31;
var_r31->unk34.x = lbl_1_bss_7F0->trans.x + temp_f29 * sin(temp_f30 * M_PI / 180.0);
var_r31->unk34.z = lbl_1_bss_7F0->trans.z + temp_f29 * cos(temp_f30 * M_PI / 180.0);
var_r31->unk34.x = lbl_1_bss_7F0->trans.x + temp_f29 * sind(temp_f30);
var_r31->unk34.z = lbl_1_bss_7F0->trans.z + temp_f29 * cosd(temp_f30);
var_r31->unk34.y = lbl_1_bss_7F0->trans.y + temp_f31 * (-30.0f + 0.003921569f * frand8() * 60.0f);
var_r31->unk08.x = 0.5f + 0.003921569f * frand8() * 3.0f;
var_r31->unk08.y = 0.3f + 0.003921569f * frand8() * 2.0f;
@ -919,14 +919,14 @@ static void fn_1_11484(ModelData *model, ParticleData *particle, Mtx matrix) {
for (var_r28 = 0; var_r28 < particle->unk_30; var_r28++, var_r31++) {
temp_f30 = 0.003921569f * frand8() * 360.0f;
temp_f31 = 0.003921569f * frand8() * 50.0f;
var_r31->unk08.x = temp_f31 * cos(temp_f30 * M_PI / 180.0);
var_r31->unk08.x = temp_f31 * cosd(temp_f30);
var_r31->unk08.y = 2.0f + 0.003921569f * frand8() * 4.0f;
var_r31->unk08.z = temp_f31 * sin(temp_f30 * M_PI / 180.0);
var_r31->unk08.z = temp_f31 * sind(temp_f30);
temp_f29 = 60.0f + 20.0f * frand8() * 0.003921569f;
temp_f31 = 4.0f + 5.0f * frand8() * 0.003921569f;
var_r31->unk14.x = temp_f31 * sin(temp_f30 * M_PI / 180.0) * cos(temp_f29 * M_PI / 180.0);
var_r31->unk14.y = temp_f31 * sin(temp_f29 * M_PI / 180.0);
var_r31->unk14.z = temp_f31 * cos(temp_f30 * M_PI / 180.0) * cos(temp_f29 * M_PI / 180.0);
var_r31->unk14.x = temp_f31 * sind(temp_f30) * cosd(temp_f29);
var_r31->unk14.y = temp_f31 * sind(temp_f29);
var_r31->unk14.z = temp_f31 * cosd(temp_f30) * cosd(temp_f29);
var_r31->unk20 = 1.0f;
var_r31->unk40.a = 0xB4;
var_r31->unk2C = 9.0f + 0.003921569f * frand8() * 4.0f;

1175
src/REL/w04Dll/big_boo.c Executable file
View file

File diff suppressed because it is too large Load diff

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

@ -21,7 +21,7 @@
#include "game/frand.h"
#include "dolphin.h"
#include "math.h"
#include "ext_math.h"
typedef struct {
/* 0x00 */ char unk00[0x50];
@ -46,7 +46,6 @@ typedef struct {
/* 0x2C */ Process *unk2C;
} BssE4Data; // Size 0x30
static void fn_1_2044(void);
static void fn_1_20EC(void);
static void fn_1_28BC(void);
static void fn_1_2B8C(void);
@ -137,21 +136,6 @@ static float lbl_1_data_358[] = {
-150.00001f, -170.00001f, -30.0f, -220.0f
};
static void fn_1_2044(void) {
lbl_1_bss_38 = NULL;
}
void fn_1_2058(void) {
s32 sp8;
sp8 = GWSystem.player_curr;
lbl_1_bss_38 = HuPrcChildCreate(fn_1_1618, 0x2003, 0x2000, 0, boardMainProc);
HuPrcDestructorSet2(lbl_1_bss_38, fn_1_2044);
while (lbl_1_bss_38) {
HuPrcVSleep();
}
}
static void fn_1_20EC(void) {
Vec sp20;
Vec sp14;
@ -223,7 +207,7 @@ static void fn_1_20EC(void) {
lbl_1_bss_74 = lbl_1_bss_78 = var_r27->link[0];
BoardSpacePosGet(0, lbl_1_bss_78, &sp14);
BoardModelPosGet(lbl_1_bss_FA, &sp20);
while (fn_1_1130(lbl_1_bss_FA, 180.0 * (atan2(sp14.x - sp20.x, sp14.z - sp20.z) / M_PI), 2.0f) == 0) {
while (fn_1_1130(lbl_1_bss_FA, atan2d(sp14.x - sp20.x, sp14.z - sp20.z), 2.0f) == 0) {
HuPrcVSleep();
}
PSVECSubtract(&sp14, &sp20, &sp8);
@ -236,7 +220,7 @@ static void fn_1_20EC(void) {
BoardAudSeqPause(0, 1, 1000);
BoardModelPosSetV(lbl_1_bss_FA, &sp14);
BoardPlayerPosGet(temp_r30, &sp14);
while (fn_1_1130(lbl_1_bss_FA, 180.0 * (atan2(sp14.x - sp20.x, sp14.z - sp20.z) / M_PI), 3.0f) == 0) {
while (fn_1_1130(lbl_1_bss_FA, atan2d(sp14.x - sp20.x, sp14.z - sp20.z), 3.0f) == 0) {
HuPrcVSleep();
}
fn_1_2EE8(1);
@ -306,7 +290,7 @@ static void fn_1_28BC(void) {
}
BoardSpacePosGet(0, var_r31, &sp20);
BoardModelPosGet(lbl_1_bss_FA, &sp14);
temp_f30 = 180.0 * (atan2(sp20.x - sp14.x, sp20.z - sp14.z) / M_PI);
temp_f30 = atan2d(sp20.x - sp14.x, sp20.z - sp14.z);
BoardModelRotYSet(lbl_1_bss_FA, temp_f30);
PSVECSubtract(&sp20, &sp14, &sp8);
PSVECScale(&sp8, &sp8, 0.022222223f);
@ -427,7 +411,7 @@ static void fn_1_2FDC(void) {
temp_r31 = HuPrcCurrentGet()->user_data;
while (TRUE) {
BoardModelPosGet(temp_r31->unk04, &sp8);
sp8.y = temp_r31->unk1C + 4.0 * sin(temp_r31->unk14 * M_PI / 180.0);
sp8.y = temp_r31->unk1C + 4.0 * sind(temp_r31->unk14);
BoardModelPosSetV(temp_r31->unk04, &sp8);
if (temp_r31->unk08 != -1) {
sp8.y += 50.0f;
@ -484,7 +468,7 @@ static void fn_1_30A4(void) {
}
fn_1_5980(temp_r22);
BoardModelPosGet(temp_r31->unk04, &sp20);
temp_f31 = 180.0 * (atan2(temp_r31->unk20.x - sp20.x, temp_r31->unk20.z - sp20.z) / M_PI);
temp_f31 = atan2d(temp_r31->unk20.x - sp20.x, temp_r31->unk20.z - sp20.z);
while (fn_1_1130(temp_r31->unk04, temp_f31, 5.0f) == 0) {
HuPrcVSleep();
}
@ -543,7 +527,7 @@ static void fn_1_30A4(void) {
break;
case 3:
BoardModelPosGet(temp_r31->unk04, &sp20);
temp_f31 = 180.0 * (atan2(temp_r31->unk20.x - sp20.x, temp_r31->unk20.z - sp20.z) / M_PI);
temp_f31 = atan2d(temp_r31->unk20.x - sp20.x, temp_r31->unk20.z - sp20.z);
BoardModelRotYSet(temp_r31->unk04, temp_f31);
if (temp_r31->unk08 != -1) {
BoardPlayerRotYSet(temp_r31->unk08, temp_f31);
@ -623,7 +607,7 @@ static void fn_1_38D8(void) {
sp18 = lbl_1_bss_80[temp_r31];
GWPlayer[temp_r31].space_curr = lbl_1_bss_B0;
BoardPlayerPosGet(temp_r31, &sp24);
var_f28 = 180.0 * (atan2(sp18.x - sp24.x, sp18.z - sp24.z) / M_PI);
var_f28 = atan2d(sp18.x - sp24.x, sp18.z - sp24.z);
BoardPlayerRotYSet(temp_r31, var_f28);
PSVECSubtract(&sp18, &sp24, &spC);
PSVECScale(&spC, &spC, 0.025f);
@ -637,7 +621,7 @@ static void fn_1_38D8(void) {
sp24.y = sp18.y;
break;
}
var_f28 = sqrtf((sp18.x - sp24.x) * (sp18.x - sp24.x) + (sp18.z - sp24.z) * (sp18.z - sp24.z));
var_f28 = VECDistanceXZ(&sp18, &sp24);
if (var_f28 <= 1.0f) {
spC.x = spC.z = 0.0f;
}
@ -712,7 +696,7 @@ static s32 fn_1_3C9C(void) {
BoardSpacePosGet(0, sp20[i], &sp44);
sp50.y = sp44.y;
PSVECSubtract(&sp44, &sp50, &sp38);
var_f31 = 180.0 * (atan2(sp38.x, sp38.z) / M_PI);
var_f31 = atan2d(sp38.x, sp38.z);
if (var_f31 < 0.0f) {
var_f31 += 360.0f;
}
@ -768,7 +752,7 @@ static s32 fn_1_3C9C(void) {
var_r25 = 0;
}
if (var_r26 != 0 || var_r25 != 0) {
var_f30 = 180.0 * (atan2(-var_r26, var_r25) / M_PI) - 180.0;
var_f30 = atan2d(-var_r26, var_r25) - 180.0;
var_f30 += var_f29;
if (var_f30 >= 360.0f) {
var_f30 -= 360.0f;
@ -793,7 +777,7 @@ static s32 fn_1_3C9C(void) {
}
for (i = 0; i < var_r29; i++) {
if (var_r27 == i) {
sp38.x = sp38.y = sp38.z = 1.7999999523162842 + sin(var_f31 * M_PI / 180.0);
sp38.x = sp38.y = sp38.z = 1.8f + sind(var_f31);
var_f31 += 8.0f;
if (var_f31 > 180.0f) {
var_f31 -= 180.0f;
@ -925,7 +909,7 @@ static void fn_1_4848(void) {
BoardPlayerMotBlendSet(temp_r30, BoardModelRotYGet(lbl_1_bss_FA) - 180.0f, 0xA);
while (!BoardPlayerMotBlendCheck(temp_r30)) {
BoardModelPosGet(lbl_1_bss_FA, &sp14);
temp_f28 = sqrtf((sp20.x - sp14.x) * (sp20.x - sp14.x) + (sp20.z - sp14.z) * (sp20.z - sp14.z));
temp_f28 = VECDistanceXZ(&sp20, &sp14);
if (temp_f28 <= 200.0f) {
HuAudPlayerVoicePlay(temp_r30, 0x128);
goto block_A;
@ -936,7 +920,7 @@ static void fn_1_4848(void) {
HuAudPlayerVoicePlay(temp_r30, 0x128);
for (i = 0; i < 65; i++) {
BoardModelPosGet(lbl_1_bss_FA, &sp14);
temp_f28 = sqrtf((sp20.x - sp14.x) * (sp20.x - sp14.x) + (sp20.z - sp14.z) * (sp20.z - sp14.z));
temp_f28 = VECDistanceXZ(&sp20, &sp14);
if (temp_f28 <= 200.0f) {
goto block_A;
}
@ -944,7 +928,7 @@ static void fn_1_4848(void) {
}
BoardPlayerMotionShiftSet(temp_r30, 1, 0.0f, 5.0f, 0);
BoardModelPosGet(lbl_1_bss_FA, &sp14);
temp_f28 = sqrtf((sp20.x - sp14.x) * (sp20.x - sp14.x) + (sp20.z - sp14.z) * (sp20.z - sp14.z));
temp_f28 = VECDistanceXZ(&sp20, &sp14);
if (temp_f28 > 200.0f) {
HuPrcVSleep();
}
@ -1006,7 +990,7 @@ static void fn_1_5018(void) {
BoardModelPosGet(lbl_1_bss_FA, &spC);
for (i = 0; i < lbl_1_bss_C2; i++) {
BoardPlayerPosGet(lbl_1_bss_BA[i], &sp18);
var_f29 = sqrtf((sp18.x - spC.x) * (sp18.x - spC.x) + (sp18.z - spC.z) * (sp18.z - spC.z));
var_f29 = VECDistanceXZ(&sp18, &spC);
if (var_f29 < 900.0f && lbl_1_bss_B2[lbl_1_bss_BA[i]] == 0) {
temp_r3 = HuPrcChildCreate(fn_1_4848, 0x2003, 0x2000, 0, boardMainProc);
lbl_1_bss_D4[lbl_1_bss_BA[i]] = temp_r3;
@ -1191,10 +1175,10 @@ static void fn_1_5A2C(ModelData *model, ParticleData *particle, Mtx matrix) {
var_r26 = 0;
for (i = 0; i < particle->unk_30; i++, var_r31++) {
if (var_r31->unk08.z != 0.0f) {
var_r31->unk34.x += var_r31->unk28 * sin(var_r31->unk08.x * M_PI / 180.0);
var_r31->unk34.x += var_r31->unk28 * sind(var_r31->unk08.x);
var_r31->unk34.y += var_r31->unk08.y;
var_r31->unk34.z += var_r31->unk28 * cos(var_r31->unk08.x * M_PI / 180.0);
var_r31->unk08.x += var_r31->unk24 * sin(var_r31->unk08.x * M_PI / 180.0);
var_r31->unk34.z += var_r31->unk28 * cosd(var_r31->unk08.x);
var_r31->unk08.x += var_r31->unk24 * sind(var_r31->unk08.x);
if (var_r31->unk08.x >= 360.0f) {
var_r31->unk08.x -= 360.0f;
}

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

@ -12,7 +12,7 @@
#include "game/board/window.h"
#include "dolphin.h"
#include "math.h"
#include "ext_math.h"
static void fn_1_17B4(s16 arg0, s16 arg1);
static void fn_1_191C(void);
@ -20,9 +20,10 @@ static void fn_1_1B98(s16 arg0);
static void fn_1_1C2C(void);
static void fn_1_1E60(void);
static void fn_1_2008(void);
static void fn_1_2044(void);
static Process *lbl_1_bss_3C[3];
Process *lbl_1_bss_38;
static Process *lbl_1_bss_38;
static s32 lbl_1_data_298[] = {
DATA_MAKE_NUM(DATADIR_W04, 32),
@ -61,7 +62,7 @@ void fn_1_12FC(void) {
sp8.x = sp8.y = sp8.z = 2.0f;
BoardModelScaleSetV(lbl_1_bss_14[11], &sp8);
fn_1_1C2C();
if (lbl_1_bss_0[0] & 1) {
if (lbl_1_bss_0->unk00 & 1) {
BoardModelMotionStartEndSet(lbl_1_bss_14[5], 0, 180);
BoardModelMotionTimeSet(lbl_1_bss_14[5], 108.0f);
fn_1_17B4(0, 1);
@ -106,7 +107,7 @@ void fn_1_1618(void) {
HuPrcVSleep();
}
BoardCameraMotionWait();
*lbl_1_bss_0 ^= 1;
lbl_1_bss_0->unk00 ^= 1;
fn_1_191C();
fn_1_1C2C();
HuAudPlayerVoicePlay(temp_r31, 0x128);
@ -115,7 +116,7 @@ void fn_1_1618(void) {
HuPrcVSleep();
}
HuPrcSleep(30);
if (!(*lbl_1_bss_0 & 1)) {
if (!(lbl_1_bss_0->unk00 & 1)) {
BoardWinCreate(2, MAKE_MESSID(32, 24), 11);
BoardWinWait();
BoardWinKill();
@ -164,7 +165,7 @@ static void fn_1_191C(void) {
s32 var_r30;
HuAudFXPlay(0x4B);
if (*lbl_1_bss_0 & 1) {
if (lbl_1_bss_0->unk00 & 1) {
BoardWinCreate(2, MAKE_MESSID(32, 23), 11);
BoardWinWait();
BoardWinKill();
@ -219,7 +220,7 @@ static void fn_1_1C2C(void) {
s16 *var_r28;
s32 i;
if (*lbl_1_bss_0 == 0) {
if (lbl_1_bss_0->unk00 == 0) {
BoardModelMotionStartEndSet(lbl_1_bss_14[3], 0, 80);
BoardModelMotionTimeSet(lbl_1_bss_14[3], 0.0f);
BoardModelVisibilitySet(lbl_1_bss_14[0], 1);
@ -262,10 +263,10 @@ static void fn_1_1E60(void) {
BoardSpacePosGet(0, var_r28, &sp8);
PSVECSubtract(&sp8, &sp14, &sp20);
PSVECScale(&sp20, &sp20, 0.008333334f);
temp_f31 = 180.0 * (atan2(sp8.x - sp14.x, sp8.z - sp14.z) / M_PI);
temp_f31 = atan2d(sp8.x - sp14.x, sp8.z - sp14.z);
BoardModelPosGet(temp_r31[1], &sp14);
while (fn_1_1130(temp_r31[1], temp_f31, 2.5f) == 0) {
if (*lbl_1_bss_0 == 0) {
if (lbl_1_bss_0->unk00 == 0) {
BoardModelAlphaSet(temp_r31[1], 0xFF);
} else {
BoardModelAlphaSet(temp_r31[1], 0);
@ -273,7 +274,7 @@ static void fn_1_1E60(void) {
HuPrcVSleep();
}
for (i = 0; i < 120; i++) {
if (*lbl_1_bss_0 == 0) {
if (lbl_1_bss_0->unk00 == 0) {
BoardModelAlphaSet(temp_r31[1], 0xFF);
} else {
BoardModelAlphaSet(temp_r31[1], 0);
@ -295,3 +296,18 @@ static void fn_1_2008(void) {
BoardModelKill(temp_r31[1]);
HuMemDirectFree(temp_r31);
}
static void fn_1_2044(void) {
lbl_1_bss_38 = NULL;
}
void fn_1_2058(void) {
s32 sp8;
sp8 = GWSystem.player_curr;
lbl_1_bss_38 = HuPrcChildCreate(fn_1_1618, 0x2003, 0x2000, 0, boardMainProc);
HuPrcDestructorSet2(lbl_1_bss_38, fn_1_2044);
while (lbl_1_bss_38) {
HuPrcVSleep();
}
}

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

@ -55,7 +55,7 @@ BoardMapObject lbl_1_data_0[MAPOBJ_MAX] = {
static s32 *lbl_1_bss_10;
static s16 lbl_1_bss_8[4];
static Process *lbl_1_bss_4;
s8 *lbl_1_bss_0;
UnkW04BoardData *lbl_1_bss_0;
static s16 lbl_1_data_280 = -1;
static s16 lbl_1_data_282 = -1;
@ -79,7 +79,7 @@ void BoardCreate(void) {
omDBGMenuButton = 1;
sp8 = GWBoardGet();
lbl_1_bss_0 = (s8*) GWSystem.board_data;
lbl_1_bss_0 = (UnkW04BoardData*) GWSystem.board_data;
BoardSpaceInit(DATA_MAKE_NUM(DATADIR_W04, 0));
lbl_1_data_280 = BoardModelCreate(DATA_MAKE_NUM(DATADIR_W04, 1), NULL, 0);
fn_8006DDE8(lbl_1_data_280, -1.0f);
@ -204,7 +204,7 @@ static s32 fn_1_7FC(void) {
return 1;
}
if (temp_r3->flag & 0x100) {
if (lbl_1_bss_0[0] & 1) {
if (lbl_1_bss_0->unk00 & 1) {
fn_1_55B4();
} else {
BoardDiceDigit2DShowSet(0);
@ -422,12 +422,12 @@ s32 fn_1_1130(s16 arg0, float arg1, float arg2) {
}
if (var_f29 < 180.0f) {
if (var_f29 > arg2) {
var_f31 = var_f31 + arg2;
var_f31 += arg2;
} else {
var_f31 = arg1;
}
} else if (360.0f - var_f29 > arg2) {
var_f31 = var_f31 - arg2;
var_f31 -= arg2;
} else {
var_f31 = arg1;
}

22
src/REL/w06Dll/bowser.c
View file

@ -20,7 +20,7 @@
#include "game/board/window.h"
#include "dolphin.h"
#include "math.h"
#include "ext_math.h"
typedef struct {
struct {
@ -260,7 +260,7 @@ static void fn_1_95AC(s32 arg0) {
sp14.y = 150.0f;
sp14.z = 0.0f;
sp8.x = -14.0f;
sp8.y = 180.0 * (atan2(-sp20.x, -sp20.z) / M_PI);
sp8.y = atan2d(-sp20.x, -sp20.z);
sp8.z = 0.0f;
BoardCameraMotionStartEx(lbl_1_data_49A, &sp8, &sp14, 1620.0f, -1.0f, 21);
BoardCameraMotionWait();
@ -394,7 +394,7 @@ static void fn_1_9E5C(s32 arg0) {
sp14.y = 150.0f;
sp14.z = 0.0f;
sp8.x = -14.0f;
sp8.y = 180.0 * (atan2(-sp20.x, -sp20.z) / M_PI);
sp8.y = atan2d(-sp20.x, -sp20.z);
sp8.z = 0.0f;
BoardCameraMotionStartEx(lbl_1_data_49A, &sp8, &sp14, 1620.0f, -1.0f, 21);
BoardCameraMotionWait();
@ -510,7 +510,7 @@ static void fn_1_A408(s32 arg0) {
sp14.y = 250.0f;
sp14.z = 0.0f;
sp8.x = -8.0f;
sp8.y = 180.0 * (atan2(-sp20.x, -sp20.z) / M_PI) - 45.0;
sp8.y = atan2d(-sp20.x, -sp20.z) - 45.0;
sp8.z = 0.0f;
BoardCameraMotionStartEx(lbl_1_data_49A, &sp8, &sp14, 1700.0f, -1.0f, 63);
BoardCameraMotionWait();
@ -658,13 +658,13 @@ static void fn_1_AB4C(s32 arg0, s32 arg1) {
BoardModelPosGet(lbl_1_data_49A, &sp30);
PSVECSubtract(&sp30, &sp3C, &sp24);
PSVECNormalize(&sp24, &sp24);
BoardPlayerRotYSet(arg0, 180.0 * (atan2(sp24.x, sp24.z) / M_PI));
BoardPlayerRotYSet(arg0, atan2d(sp24.x, sp24.z));
BoardPlayerSizeSet(arg0, 2);
sp18.x = 0.0f;
sp18.y = 150.0f;
sp18.z = 0.0f;
spC.x = -25.0f;
spC.y = 180.0 * (atan2(-sp24.x, -sp24.z) / M_PI);
spC.y = atan2d(-sp24.x, -sp24.z);
spC.z = 0.0f;
BoardCameraMotionStartEx(lbl_1_data_49A, &spC, &sp18, 2000.0f, -1.0f, 2);
BoardCameraMotionWait();
@ -783,7 +783,7 @@ static void fn_1_B27C(s32 arg0) {
sp14.y = 150.0f;
sp14.z = 0.0f;
sp8.x = -14.0f;
sp8.y = 180.0 * (atan2(-sp20.x, -sp20.z) / M_PI);
sp8.y = atan2d(-sp20.x, -sp20.z);
sp8.z = 0.0f;
BoardCameraMotionStartEx(lbl_1_data_49A, &sp8, &sp14, 1620.0f, -1.0f, 21);
BoardCameraMotionWait();
@ -890,7 +890,7 @@ static void fn_1_B8E0(omObjData *arg0) {
// Bug? Likely to be "%=" instead.
temp_r30->unk0C % 360;
OSs16tof32(&temp_r30->unk0C, &temp_f30);
temp_f30 = 0.5 * sin(temp_f30 * M_PI / 180.0);
temp_f30 = 0.5 * sind(temp_f30);
BoardModelPosGet(lbl_1_data_49A, &sp8);
sp8.y += temp_f30;
BoardModelPosSetV(lbl_1_data_49A, &sp8);
@ -961,7 +961,7 @@ static void fn_1_BD8C(s32 arg0) {
BoardPlayerPosGet(arg0, &sp18);
BoardModelPosGet(lbl_1_data_49A, &sp24);
PSVECSubtract(&sp18, &sp24, &spC);
var_f26 = 180.0 * (atan2(spC.x, spC.z) / M_PI);
var_f26 = atan2d(spC.x, spC.z);
BoardPlayerMotBlendSet(arg0, var_f26 + 180.0f, 0x14);
fn_1_B6A0(var_f25, 20);
while (!BoardPlayerMotBlendCheck(arg0)) {
@ -1043,8 +1043,8 @@ static void fn_1_C40C(void) {
var_r29 = BoardSpaceLinkFlagSearch(0, var_r29, 0x04000000);
BoardSpacePosGet(0, var_r29, &sp14);
BoardModelPosGet(lbl_1_data_498, &sp20);
sp20.x += -100.0 * sin(BoardModelRotYGet(lbl_1_data_498) * M_PI / 180.0);
sp20.z += -100.0 * cos(BoardModelRotYGet(lbl_1_data_498) * M_PI / 180.0);
sp20.x += -100.0 * sind(BoardModelRotYGet(lbl_1_data_498));
sp20.z += -100.0 * cosd(BoardModelRotYGet(lbl_1_data_498));
sp20.y += 250.0f;
BoardModelPosSetV(lbl_1_data_4A0, &sp20);
BoardModelScaleSet(lbl_1_data_4A0, 10.0f, 10.0f, 10.0f);

4
src/REL/w06Dll/bridge.c
View file

@ -13,7 +13,7 @@
#include "game/board/window.h"
#include "dolphin.h"
#include "math.h"
#include "ext_math.h"
typedef struct {
struct {
@ -227,7 +227,7 @@ static s32 fn_1_8490(s32 arg0, s8 arg1) {
BoardPlayerPosGet(arg0, &sp18);
BoardSpacePosGet(0, lbl_1_bss_E2, &sp24);
PSVECSubtract(&sp24, &sp18, &spC);
temp_f30 = 180.0 * (atan2(spC.x, spC.z) / M_PI);
temp_f30 = atan2d(spC.x, spC.z);
BoardPlayerMotBlendSet(arg0, temp_f30, 0xF);
while (!BoardPlayerMotBlendCheck(arg0)) {
HuPrcVSleep();

4
src/REL/w06Dll/fire.c
View file

@ -12,7 +12,7 @@
#include "game/board/window.h"
#include "dolphin.h"
#include "math.h"
#include "ext_math.h"
static void fn_1_6F80(void);
static void fn_1_7210(void);
@ -162,7 +162,7 @@ static void fn_1_72CC(s32 arg0) {
lbl_1_bss_C2[i] = 0;
}
}
fn_1_73EC(180.0 * (atan2(spC.x, spC.z) / M_PI));
fn_1_73EC(atan2d(spC.x, spC.z));
}
static void fn_1_73EC(float arg0) {

26
src/REL/w06Dll/mg_coin.c
View file

@ -18,7 +18,7 @@
#include "game/board/window.h"
#include "dolphin.h"
#include "math.h"
#include "ext_math.h"
typedef struct {
struct {
@ -205,7 +205,7 @@ static s32 fn_1_4BF8(s32 arg0) {
sp38.z += 115.0 * cos(M_PI);
PSVECSubtract(&sp38, &sp2C, &sp20);
PSVECNormalize(&sp20, &sp20);
BoardPlayerRotYSet(arg0, 180.0 * (atan2(-sp20.x, -sp20.z) / M_PI));
BoardPlayerRotYSet(arg0, atan2d(-sp20.x, -sp20.z));
BoardPlayerPosLerpStart(arg0, &sp2C, &sp38, 40);
BoardModelPosGet(lbl_1_bss_C[5], &sp2C);
BoardModelMotionShiftSet(lbl_1_bss_C[5], lbl_1_data_1DA, 0.0f, 8.0f, 0x40000001);
@ -213,7 +213,7 @@ static s32 fn_1_4BF8(s32 arg0) {
while (GWPlayer[arg0].moving) {
BoardPlayerPosGet(arg0, &sp38);
PSVECSubtract(&sp38, &sp2C, &sp20);
BoardModelRotYSet(lbl_1_bss_C[5], 180.0 * (atan2(sp20.x, sp20.z) / M_PI));
BoardModelRotYSet(lbl_1_bss_C[5], atan2d(sp20.x, sp20.z));
HuPrcVSleep();
}
BoardModelMotionShiftSet(lbl_1_bss_C[5], 1, 0.0f, 8.0f, 0x40000001);
@ -286,7 +286,7 @@ static void fn_1_519C(s32 arg0) {
while (GWPlayer[arg0].moving) {
BoardPlayerPosGet(arg0, &sp14);
PSVECSubtract(&sp14, &sp20, &sp8);
BoardModelRotYSet(lbl_1_bss_C[5], 180.0 * (atan2(sp8.x, sp8.z) / M_PI));
BoardModelRotYSet(lbl_1_bss_C[5], atan2d(sp8.x, sp8.z));
HuPrcVSleep();
}
BoardModelMotionShiftSet(lbl_1_bss_C[5], 1, 0.0f, 8.0f, 0x40000001);
@ -346,7 +346,7 @@ static void fn_1_5490(s32 arg0) {
BoardModelPosSetV(temp_r31->unk04, &sp3C);
BoardModelScaleSet(temp_r31->unk04, temp_f31, temp_f31, temp_f31);
BoardModelVisibilitySet(temp_r31->unk04, 0);
BoardModelRotYSet(temp_r31->unk04, 180.0 * (atan2(sp18.x, sp18.z) / M_PI));
BoardModelRotYSet(temp_r31->unk04, atan2d(sp18.x, sp18.z));
BoardModelMotionStart(temp_r31->unk04, 1, 0x40000001);
BoardModelMotionStart(lbl_1_data_1DC, 0, 0);
}
@ -436,8 +436,8 @@ static void fn_1_59D0(s32 arg0) {
temp_r31 = OM_GET_WORK_PTR(lbl_1_bss_4C, Bss4CWork);
temp_r31->unk00_field1 = arg0;
if (arg0 == 1) {
lbl_1_bss_4C->trans.x = 0.96666666f * sin(90 * M_PI / 180.0);
lbl_1_bss_4C->trans.z = 0.96666666f * cos(90 * M_PI / 180.0);
lbl_1_bss_4C->trans.x = 0.96666666f * sind(90);
lbl_1_bss_4C->trans.z = 0.96666666f * cosd(90);
temp_r31->unk01 = 60;
return;
}
@ -520,8 +520,8 @@ static void fn_1_5CE4(s32 arg0) {
BoardPlayerMotionStart(temp_r31->unk00_field1, temp_r31->unk02, 0x40000001);
omVibrate(temp_r31->unk00_field1, 12, 4, 2);
fn_1_5968(&sp14);
sp8.x = sp14.x + 18.0 * sin(90 * M_PI / 180.0);
sp8.z = sp14.z + 18.0 * cos(90 * M_PI / 180.0);
sp8.x = sp14.x + 18.0 * sind(90);
sp8.z = sp14.z + 18.0 * cosd(90);
BoardPlayerPosSetV(temp_r31->unk00_field1, &sp8);
BoardModelPosSetV(temp_r31->unk04, &sp8);
return;
@ -641,8 +641,8 @@ static void fn_1_606C(omObjData *arg0) {
}
fn_1_5968(&sp64);
BoardPlayerPosGet(temp_r31->unk00_field1, &sp58);
sp58.x = sp64.x + 18.0 * sin(90 * M_PI / 180.0);
sp58.z = sp64.z + 18.0 * cos(90 * M_PI / 180.0);
sp58.x = sp64.x + 18.0 * sind(90);
sp58.z = sp64.z + 18.0 * cosd(90);
BoardPlayerPosSetV(temp_r31->unk00_field1, &sp58);
BoardModelPosSetV(temp_r31->unk04, &sp58);
BoardModelRotYSet(temp_r31->unk04, BoardPlayerRotYGet(temp_r31->unk00_field1));
@ -737,8 +737,8 @@ static void fn_1_6C4C(s32 arg0) {
}
temp_r31 = &temp_r30->unk0C[i];
temp_r31->unk00 = 1;
temp_r31->unk08.x = sp8.x + 50.0 * sin(360.0f * var_f31 * M_PI / 180.0);
temp_r31->unk08.z = sp8.z + 50.0 * cos(360.0f * var_f31 * M_PI / 180.0);
temp_r31->unk08.x = sp8.x + 50.0 * sind(360.0f * var_f31);
temp_r31->unk08.z = sp8.z + 50.0 * cosd(360.0f * var_f31);
temp_r31->unk08.y = sp8.y + 600.0f + 500.0f * BoardRandFloat();
temp_r31->unk01 = 0;
temp_r31->unk04 = 360.0f * BoardRandFloat();

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

@ -21,9 +21,7 @@
#include "game/board/window.h"
#include "dolphin.h"
#include "math.h"
#define ABS(x) ((x) < 0 ? -(x) : (x))
#include "ext_math.h"
typedef struct {
struct {
@ -277,7 +275,7 @@ static s32 fn_1_12A0(s32 arg0) {
BoardSpacePosGet(0, lbl_1_bss_34, &sp38);
PSVECSubtract(&sp38, &sp2C, &sp20);
PSVECNormalize(&sp20, &sp20);
BoardPlayerRotYSet(arg0, 180.0 * (atan2(-sp20.x, -sp20.z) / M_PI));
BoardPlayerRotYSet(arg0, atan2d(-sp20.x, -sp20.z));
BoardPlayerPosLerpStart(arg0, &sp2C, &sp38, 20);
while (GWPlayer[arg0].moving) {
HuPrcVSleep();
@ -983,7 +981,7 @@ static void fn_1_3698(s8 arg0) {
}
PSVECSubtract(&sp18, &sp24, &spC);
lbl_1_bss_28->trans.y = temp_f31 / var_f30;
BoardModelRotYSet(lbl_1_bss_C[4], 180.0 * (atan2(spC.x, spC.z) / M_PI));
BoardModelRotYSet(lbl_1_bss_C[4], atan2d(spC.x, spC.z));
BoardModelMotionShiftSet(lbl_1_bss_C[4], temp_r31->unk08, 0.0f, 8.0f, 0x40000001);
BoardModelMotionSpeedSet(lbl_1_bss_C[4], 2.0f);
}
@ -1175,8 +1173,8 @@ static void fn_1_4460(ModelData *model, ParticleData *particle, Mtx matrix) {
if (j != particle->unk_30) {
temp_f30 = 0.003921569f * frand8() * 360.0f;
temp_f29 = var_f31 * (20.0f + 0.003921569f * frand8() * 60.0f);
var_r31->unk34.x = sp8.x + temp_f29 * sin(temp_f30 * M_PI / 180.0);
var_r31->unk34.z = sp8.z + temp_f29 * cos(temp_f30 * M_PI / 180.0);
var_r31->unk34.x = sp8.x + temp_f29 * sind(temp_f30);
var_r31->unk34.z = sp8.z + temp_f29 * cosd(temp_f30);
var_r31->unk34.y = sp8.y + var_f31 * (-30.0f + 0.003921569f * frand8() * 40.0f);
var_r31->unk08.x = 0.5f + 0.003921569f * frand8() * 3.0f;
var_r31->unk08.y = 0.3f + 0.003921569f * frand8() * 2.0f;

6
src/game/board/battle.c
View file

@ -17,7 +17,7 @@
#include "game/board/ui.h"
#include "game/board/window.h"
#define ABS(x) ((x) < 0 ? -(x) : (x))
#include "ext_math.h"
typedef struct {
struct {
@ -630,7 +630,7 @@ static void ShowBattleGame(BattleWork *arg0, omObjData *arg1) {
arg0->unk01 = 90;
}
OSs8tof32((s8*) &arg0->unk01, &var_r29);
arg1->trans.z = sin(var_r29 * M_PI / 180.0);
arg1->trans.z = sind(var_r29);
arg0->unk01 += 4;
}
@ -712,7 +712,7 @@ static void ShowBattleCoin(BattleWork *arg0, omObjData *arg1) {
while (var_f30 > 180.0f) {
var_f30 -= 180.0f;
}
temp_f29 = 0.9f + sin(var_f30 * M_PI / 180.0);
temp_f29 = 0.9f + sind(var_f30);
HuSprScaleSet(arg0->unk08, 1, temp_f29, temp_f29);
}

18
src/game/board/lottery.c
View file

@ -21,11 +21,9 @@
#include "game/board/ui.h"
#include "game/board/window.h"
#include "math.h"
#include "ext_math.h"
#include "stdlib.h"
#define ABS(x) (((x) < 0) ? -(x) : (x))
typedef struct {
struct {
u8 unk00_field0 : 1;
@ -510,7 +508,7 @@ static void ExecLottery(void) {
PSVECScale(&sp20, &sp20, 0.95f);
PSVECAdd(&sp20, &sp38, &sp2C);
}
temp_r26 = 180.0 * (atan2(-sp20.x, -sp20.z) / M_PI);
temp_r26 = atan2d(-sp20.x, -sp20.z);
if (BoardPlayerSizeGet(temp_r31) == 1) {
BoardModelVisibilitySet(gripMdl[0], 0);
BoardModelVisibilitySet(gripMdl[1], 1);
@ -550,7 +548,7 @@ static void ExecLottery(void) {
BoardPlayerPosGet(i, &sp38);
PSVECSubtract(&sp2C, &sp38, &sp20);
PSVECNormalize(&sp20, &sp20);
BoardPlayerMotBlendSet(i, 180.0 * (atan2(sp20.x, sp20.z) / M_PI), 7);
BoardPlayerMotBlendSet(i, atan2d(sp20.x, sp20.z), 7);
}
}
BoardMusStart(1, 2, 0x7F, 0);
@ -971,7 +969,7 @@ static void ExecBallGame(void) {
} else {
OSs8tof32(&spB, &var_f26);
OSs8tof32(&spA, &var_f19);
var_f25 = 180.0 * (atan2(var_f26, var_f19) / M_PI);
var_f25 = atan2d(var_f26, var_f19);
if (var_f25 < 0.0f) {
var_f25 += 360.0f;
}
@ -1162,7 +1160,7 @@ static void ExecScratchTicket(s32 arg0) {
BoardModelLayerSet(lotteryMdl[4], 6);
BoardModelPassSet(lotteryMdl[4], 0);
BoardCameraDirGet(&spC);
BoardModelRotYSet(lotteryMdl[4], 180.0 * (atan2(-spC.x, -spC.z) / M_PI));
BoardModelRotYSet(lotteryMdl[4], atan2d(-spC.x, -spC.z));
BoardModelScaleSet(lotteryMdl[4], 3.0f, 3.0f, 3.0f);
sp24.x = 320.0f;
sp24.y = 480.0f;
@ -1511,7 +1509,7 @@ static void ExecTicketFocus(s32 arg0) {
}
temp_r29 = OM_GET_WORK_PTR(ticketObj[arg0], TicketWork);
for (var_f31 = 0.0f; var_f31 < 90.0f; var_f31 += 2.0f) {
temp_f30 = 1.0 + 1.3f * sin(var_f31 * M_PI / 180.0);
temp_f30 = 1.0 + 1.3f * sind(var_f31);
HuSprScaleSet(ticketSprGrp, temp_r29->unk00_field2, temp_f30, temp_f30);
HuSprScaleSet(ticketSprGrp, temp_r29->unk00_field2 + 12, temp_f30, temp_f30);
HuPrcVSleep();
@ -1790,7 +1788,7 @@ static void ExecItemPrize(void) {
for (i = 0; i < 30; i++) {
sp14.y += temp_f29;
var_f30 = BoardDAngleCalc(15.0f + var_f30);
var_f31 = cos(var_f28 * M_PI / 180.0);
var_f31 = cosd(var_f28);
if (var_f31 <= 0.0f) {
var_f31 = 0.01f;
}
@ -2031,7 +2029,7 @@ void BoardLotteryTutorialExec(void) {
BoardSpacePosGet(0, temp_r29, &sp2C);
PSVECSubtract(&sp2C, &sp38, &sp20);
PSVECNormalize(&sp20, &sp20);
temp_r28 = 180.0 * (atan2(-sp20.x, -sp20.z) / M_PI);
temp_r28 = atan2d(-sp20.x, -sp20.z);
sp14.x = -3.0f;
sp14.y = temp_r28;
sp14.z = 0.0f;

10
src/game/board/ui.c
View file

@ -18,9 +18,7 @@
#include "game/board/player.h"
#include "game/board/tutorial.h"
#include "math.h"
#define ABS(x) (((x) < 0) ? -(x) : (x))
#include "ext_math.h"
typedef struct {
/* 0x00 */ struct {
@ -964,7 +962,7 @@ static void GrowYourTurn(UnkUiWork02 *arg0, omObjData *arg1) {
arg0->unk00_bit3 = 1;
}
OSs8tof32(&arg0->unk01, &temp_f30);
temp_f30 = 1.2999999523162842 * sin(M_PI * temp_f30 / 180.0);
temp_f30 = 1.3f * sind(temp_f30);
HuSprScaleSet(yourTurnSprGrp, 0, temp_f30, temp_f30);
}
@ -977,7 +975,7 @@ static void WaitYourTurn(UnkUiWork02 *arg0, omObjData *arg1) {
arg0->unk00_bit0 = 1;
}
OSs8tof32(&arg0->unk01, &temp_f30);
temp_f30 = sin(M_PI * temp_f30 / 180.0);
temp_f30 = sind(temp_f30);
HuSprScaleSet(yourTurnSprGrp, 0, 1.3f + temp_f30, 1.3f + temp_f30);
HuSprTPLvlSet(yourTurnSprGrp, 0, 1.0f - temp_f30);
}
@ -1398,7 +1396,7 @@ static void UpdateItemPick(omObjData *arg0) {
for (j = 0; j < 3; j++) {
if (itemMdlId[i][j] != -1) {
OSs8tof32(&temp_r28->unk03, &temp_f30);
temp_f30 = 1.0 + 0.5 * sin(M_PI * temp_f30 / 180.0);
temp_f30 = 1.0 + 0.5 * sind(temp_f30);
BoardModelScaleSet(itemMdlId[i][j], temp_f30, temp_f30, temp_f30);
sp14.x = temp_r27[i][j + 2].x;
sp14.y = temp_r27[i][j + 2].y;