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

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;