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

Matched REL/w01/main + some data cleanup

Browse source
This commit is contained in:
mrshigure 2024-03-23 22:45:09 -07:00
parent 59f39c0331
commit 538ac0a01a
10 changed files with 2919 additions and 328 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,6 +2,7 @@
#include "game/audio.h"
#include "game/chrman.h"
#include "game/data.h"
#include "game/flag.h"
#include "game/gamework.h"
#include "game/object.h"
#include "game/objsub.h"
@ -84,7 +85,7 @@ static omObjData *battleObj;
static Process *battleProc;
static const s8 battleCoinTbl[] = {
0x05, 0x0A, 0x14, 0x1E, 0x32
5, 10, 20, 30, 50
};
static float battleCursorPosTbl[] = {
@ -133,7 +134,7 @@ void BoardBattleExec(s32 player, s32 space) {
}
static void DestroyBattle(void) {
HuDataDirClose(0x10000);
HuDataDirClose(DATADIR_BBATTLE);
battleProc = NULL;
}
@ -201,13 +202,13 @@ static void ExecBattle(void) {
HuPrcVSleep();
}
_ClearFlag(0x1001C);
HuPrcSleep(0x3C);
HuPrcSleep(60);
HuPrcEnd();
}
HuAudFXPlay(0x34A);
omVibrate(GWSystem.player_curr, 0xC, 6, 6);
BoardAudSeqPause(0, 1, 0x1F4);
temp_r22 = BoardDataDirReadAsync(0x10000);
omVibrate(GWSystem.player_curr, 12, 6, 6);
BoardAudSeqPause(0, 1, 500);
temp_r22 = BoardDataDirReadAsync(DATADIR_BBATTLE);
BoardCameraViewSet(3);
BoardCameraMotionWait();
BoardPlayerMotBlendSet(currPlayer, 0, 0xF);
@ -217,7 +218,7 @@ static void ExecBattle(void) {
BoardDataAsyncWait(temp_r22);
SetBattleCoinValue();
BoardMusStart(1, 4, 0x7F, 0);
omVibrate(GWSystem.player_curr, 0xC, 6, 6);
omVibrate(GWSystem.player_curr, 12, 6, 6);
InitExplode();
while (CheckExplode() == 0) {
HuPrcVSleep();
@ -235,13 +236,13 @@ static void ExecBattle(void) {
}
}
if (var_r26 == 0) {
BoardWinCreate(2, 0x20001, 1);
BoardWinCreate(2, MAKE_MESSID(2, 1), 1);
BoardWinWait();
BoardWinKill();
var_r27 = 1;
} else {
HuAudFXPlay(0x4F);
BoardWinCreate(2, 0x20000, 1);
BoardWinCreate(2, MAKE_MESSID(2, 0), 1);
BoardWinWait();
BoardWinKill();
SetBattleBombState(3);
@ -260,7 +261,7 @@ static void ExecBattle(void) {
var_r23 = 1;
}
var_r25 = var_r23;
HuPrcSleep(0x3C);
HuPrcSleep(60);
} else {
var_r25 = -1;
}
@ -279,15 +280,15 @@ static void ExecBattle(void) {
BoardMusVolPanSet(0, 0, 1);
BoardAudSeqPause(0, 0, 1);
if (var_r27 == 0) {
HuDataDirClose(0x70000);
HuDataDirClose(0x20000);
HuDataDirClose(DATADIR_BOARD);
HuDataDirClose(DATADIR_BGUEST);
HuDataDirClose(sp8[GWBoardGet()]);
HuPrcSleep(2);
temp_r28 = battleMGList[battleMGIdx[mgChoice]];
GWMGAvailSet(temp_r28);
GWSystem.mg_next = temp_r28 - 401;
if (_CheckFlag(0xB)) {
var_r24 = 0x140000;
var_r24 = DATADIR_INST;
} else {
var_r24 = mgInfoTbl[temp_r28 - 401].data_dir;
}
@ -375,12 +376,12 @@ static void TakeCoins(void) {
HuAudFXPlay(0xF);
sprintf(totalCoinStr, "%d", var_r30);
if (var_r30 != coinTakeMax * 4) {
var_r24 = 0x20003;
var_r24 = MAKE_MESSID(2, 3);
} else {
var_r24 = 0x20002;
var_r24 = MAKE_MESSID(2, 2);
}
BoardWinCreate(2, var_r24, 1);
BoardWinInsertMesSet((u32) totalCoinStr, 0);
BoardWinInsertMesSet(MAKE_MESSID_PTR(totalCoinStr), 0);
BoardWinWait();
BoardWinKill();
}
@ -403,7 +404,7 @@ static void InitExplode(void) {
temp_r31->unk00_field0 = 0;
temp_r31->unk00_field1 = 0;
temp_r31->unk01 = 0x10;
temp_r31->unk02 = BoardModelCreate(0x20026, NULL, 0);
temp_r31->unk02 = BoardModelCreate(DATA_MAKE_NUM(DATADIR_BGUEST, 38), NULL, 0);
BoardModelLayerSet(temp_r31->unk02, 2);
explodeObj->trans.x = sp14.x;
explodeObj->trans.y = sp14.y - 100.0f;
@ -411,7 +412,7 @@ static void InitExplode(void) {
BoardModelPosSet(temp_r31->unk02, explodeObj->trans.x, explodeObj->trans.y, explodeObj->trans.z);
BoardModelMotionStart(temp_r31->unk02, 0, 0x40000001);
for (i = 0; i < 4; i++) {
temp_r31->unk04[i] = BoardModelCreate(0x70066, NULL, 0);
temp_r31->unk04[i] = BoardModelCreate(DATA_MAKE_NUM(DATADIR_BOARD, 102), NULL, 0);
sp8.x = sp14.x + sp20[i][0];
sp8.y = sp14.y;
sp8.z = sp14.z + sp20[i][1];
@ -534,7 +535,7 @@ static void CreateBattleMain(void) {
}
HuSprGrpPosSet(temp_r31->unk08, 288.0f, 240.0f);
battleObj->trans.x = -308.0f;
BoardFilterFadeInit(0x1E, 0xA0);
BoardFilterFadeInit(30, 0xA0);
}
static void UpdateBattleMain(omObjData *arg0) {
@ -614,7 +615,7 @@ static void ShowBattleGame(BattleWork *arg0, omObjData *arg1) {
float var_r29;
if (arg0->unk01 == 0) {
if (BoardFilterFadePauseCheck() != 0) {
if (BoardFilterFadePauseCheck()) {
arg0->unk01 = 1;
arg1->trans.z = 0.01f;
arg1->trans.y = 0.0f;
@ -711,7 +712,7 @@ static void ShowBattleCoin(BattleWork *arg0, omObjData *arg1) {
while (var_f30 > 180.0f) {
var_f30 -= 180.0f;
}
temp_f29 = 0.8999999761581421 + sin(var_f30 * M_PI / 180.0);
temp_f29 = 0.9f + sin(var_f30 * M_PI / 180.0);
HuSprScaleSet(arg0->unk08, 1, temp_f29, temp_f29);
}
@ -750,7 +751,7 @@ static void VibratePad(BattleWork *arg0, omObjData *arg1) {
s32 i;
for (i = 0; i < 4; i++) {
omVibrate(i, 0xC, 0xC, 0);
omVibrate(i, 12, 0xC, 0);
}
arg0->unk00_field1 = 8;
}

162
src/game/board/pause.c
View file

@ -114,15 +114,15 @@ static float padConfigPosTbl[4][2] = {
};
static s32 boardLogoTbl[] = {
0x00070057,
0x00070058,
0x00070059,
0x0007005A,
0x0007005B,
0x0007005C,
0x00070057,
0x0007005D,
0x0007005E
DATA_MAKE_NUM(DATADIR_BOARD, 87),
DATA_MAKE_NUM(DATADIR_BOARD, 88),
DATA_MAKE_NUM(DATADIR_BOARD, 89),
DATA_MAKE_NUM(DATADIR_BOARD, 90),
DATA_MAKE_NUM(DATADIR_BOARD, 91),
DATA_MAKE_NUM(DATADIR_BOARD, 92),
DATA_MAKE_NUM(DATADIR_BOARD, 87),
DATA_MAKE_NUM(DATADIR_BOARD, 93),
DATA_MAKE_NUM(DATADIR_BOARD, 94)
};
static float turnDigitPosTbl[] = {
@ -130,14 +130,14 @@ static float turnDigitPosTbl[] = {
};
static s32 boxMdlTbl[] = {
0x00080008,
0x00080009,
0x0008000A,
0x0008000B,
0x0008000C,
0x0008000D,
0x0008000E,
0x0008000F
DATA_MAKE_NUM(DATADIR_BPAUSE, 8),
DATA_MAKE_NUM(DATADIR_BPAUSE, 9),
DATA_MAKE_NUM(DATADIR_BPAUSE, 10),
DATA_MAKE_NUM(DATADIR_BPAUSE, 11),
DATA_MAKE_NUM(DATADIR_BPAUSE, 12),
DATA_MAKE_NUM(DATADIR_BPAUSE, 13),
DATA_MAKE_NUM(DATADIR_BPAUSE, 14),
DATA_MAKE_NUM(DATADIR_BPAUSE, 15)
};
void BoardPauseStart(void) {
@ -168,7 +168,7 @@ static void PauseExit(void) {
DeletePauseScreen();
DeletePauseControlWin();
BoardEventFlagReset();
HuDataDirClose(0x80000);
HuDataDirClose(DATADIR_BPAUSE);
pausePad = -1;
omSysPauseCtrl(0);
if (GWMGExplainGet()) {
@ -197,8 +197,8 @@ static void PauseProcess(void) {
pauseQuitF = 0;
mainScreenF = 1;
BoardFilterFadeInit(0x1E, 0xA0);
temp_r31 = BoardDataDirReadAsync(0x80000);
BoardFilterFadeInit(30, 0xA0);
temp_r31 = BoardDataDirReadAsync(DATADIR_BPAUSE);
BoardRollWinDispSet(0);
BoardDiceDigit2DShowSet(0);
BoardStatusItemSet(0);
@ -219,12 +219,12 @@ static void PauseProcess(void) {
DeletePauseScreen();
DeletePauseControlWin();
if (pauseQuitF != 0) {
HuPrcSleep(0x14);
HuPrcSleep(20);
WipeColorSet(0, 0, 0);
BoardKill();
} else {
BoardFilterFadeOut(0x1E);
HuPrcSleep(0x1E);
BoardFilterFadeOut(30);
HuPrcSleep(30);
}
HuPrcEnd();
}
@ -262,28 +262,28 @@ void CreatePauseScreen(void) {
temp_r27->trans.y = -32.0f + boxPosTbl[cursorPos][1];
pauseCursorPos = HuSprGrpCreate(2);
HuSprGrpPosSet(pauseCursorPos, 0.0f, 0.0f);
BoardSpriteCreate(0x70055, 0x2BC, 0, &sp8);
BoardSpriteCreate(DATA_MAKE_NUM(DATADIR_BOARD, 85), 700, 0, &sp8);
HuSprGrpMemberSet(pauseCursorPos, 0, sp8);
HuSprZRotSet(pauseCursorPos, 0, 45.0f);
HuSprAttrSet(pauseCursorPos, 0, 4);
HuSprAttrSet(pauseCursorPos, 0, 8);
HuSprPosSet(pauseCursorPos, 0, temp_r27->trans.x, temp_r27->trans.y);
BoardSpriteCreate(0x80007, 0x2EE, 0, &sp8);
BoardSpriteCreate(DATA_MAKE_NUM(DATADIR_BPAUSE, 7), 750, 0, &sp8);
HuSprGrpMemberSet(pauseCursorPos, 1, sp8);
HuSprAttrSet(pauseCursorPos, 1, 4);
HuSprAttrSet(pauseCursorPos, 1, 8);
pauseSprGrp = HuSprGrpCreate(7);
HuSprGrpPosSet(pauseSprGrp, 0.0f, 0.0f);
BoardSpriteCreate(boardLogoTbl[GWBoardGet()], 0x384, 0, &sp8);
BoardSpriteCreate(boardLogoTbl[GWBoardGet()], 900, 0, &sp8);
HuSprGrpMemberSet(pauseSprGrp, 0, sp8);
HuSprPosSet(pauseSprGrp, 0, 288.0f, 120.0f);
HuSprAttrSet(pauseSprGrp, 0, 4);
HuSprAttrSet(pauseSprGrp, 0, 8);
BoardSpriteCreate(0x80005, 0x384, 0, &sp8);
BoardSpriteCreate(DATA_MAKE_NUM(DATADIR_BPAUSE, 5), 900, 0, &sp8);
HuSprGrpMemberSet(pauseSprGrp, 1, sp8);
HuSprPosSet(pauseSprGrp, 1, 288.0f, 302.0f);
HuSprAttrSet(pauseSprGrp, 1, 8);
BoardSpriteCreate(0x80004, 0x320, 0, &sp8);
BoardSpriteCreate(DATA_MAKE_NUM(DATADIR_BPAUSE, 4), 800, 0, &sp8);
HuSprGrpMemberSet(pauseSprGrp, 2, sp8);
HuSprZRotSet(pauseSprGrp, 2, -30.0f);
HuSprPosSet(pauseSprGrp, 2, 87.0f, 245.0f);
@ -301,32 +301,32 @@ void CreatePauseScreen(void) {
HuSprBankSet(pauseSprGrp, 2, 1);
}
for (i = 0; i < 4; i++) {
BoardSpriteCreate(0x80006, 0x320, 0, &sp8);
BoardSpriteCreate(DATA_MAKE_NUM(DATADIR_BPAUSE, 6), 800, 0, &sp8);
HuSprGrpMemberSet(pauseSprGrp, i + 3, sp8);
HuSprPosSet(pauseSprGrp, i + 3, turnDigitPosTbl[i], 301.0f);
HuSprAttrSet(pauseSprGrp, i + 3, 8);
HuSprAttrSet(pauseSprGrp, i + 3, 1);
}
padConfigSprGrp = HuSprGrpCreate(0xD);
padConfigSprGrp = HuSprGrpCreate(13);
HuSprGrpPosSet(padConfigSprGrp, 0.0f, 0.0f);
for (i = 0; i < 4; i++) {
BoardSpriteCreate(0x80000, 0x38E, 0, &sp8);
BoardSpriteCreate(DATA_MAKE_NUM(DATADIR_BPAUSE, 0), 910, 0, &sp8);
HuSprGrpMemberSet(padConfigSprGrp, i, sp8);
HuSprAttrSet(padConfigSprGrp, i, 8);
HuSprAttrSet(padConfigSprGrp, i, 1);
BoardSpriteCreate(0x80001, 0x2BC, 0, &sp8);
BoardSpriteCreate(DATA_MAKE_NUM(DATADIR_BPAUSE, 1), 700, 0, &sp8);
HuSprGrpMemberSet(padConfigSprGrp, i + 4, sp8);
HuSprAttrSet(padConfigSprGrp, i + 4, 8);
HuSprAttrSet(padConfigSprGrp, i + 4, 1);
BoardSpriteCreate(0x80002, 0x320, 0, &sp8);
BoardSpriteCreate(DATA_MAKE_NUM(DATADIR_BPAUSE, 2), 800, 0, &sp8);
HuSprGrpMemberSet(padConfigSprGrp, i + 8, sp8);
HuSprAttrSet(padConfigSprGrp, i + 8, 8);
HuSprAttrSet(padConfigSprGrp, i + 8, 1);
}
BoardSpriteCreate(0x80003, 0x3E8, 0, &sp8);
HuSprGrpMemberSet(padConfigSprGrp, 0xC, sp8);
HuSprAttrSet(padConfigSprGrp, 0xC, 4);
HuSprDrawNoSet(padConfigSprGrp, 0xC, 0x40);
BoardSpriteCreate(DATA_MAKE_NUM(DATADIR_BPAUSE, 3), 1000, 0, &sp8);
HuSprGrpMemberSet(padConfigSprGrp, 12, sp8);
HuSprAttrSet(padConfigSprGrp, 12, 4);
HuSprDrawNoSet(padConfigSprGrp, 12, 0x40);
CreatePadConfigSprite();
ShowPadConfigSprite(0);
hostOldLayer = BoardModelLayerGet(hostMdl);
@ -551,15 +551,15 @@ static void PauseConfigObjFunc(omObjData *arg0) {
switch (boxState[5]) {
case 0:
GWSystem.mess_speed = 2;
GWSystem.mess_delay = 0x30;
GWSystem.mess_delay = 48;
break;
case 1:
GWSystem.mess_speed = 1;
GWSystem.mess_delay = 0x20;
GWSystem.mess_delay = 32;
break;
case 2:
GWSystem.mess_speed = 0;
GWSystem.mess_delay = 0x10;
GWSystem.mess_delay = 16;
break;
}
}
@ -608,14 +608,14 @@ static void UpdatePauseText(s32 arg0) {
switch (arg0) {
case 0:
HuWinMesSet(settingsWin, 0x10001C);
HuWinMesSet(settingsWin, MAKE_MESSID(16, 28));
for (i = 0; i < 4; i++) {
for (j = 0; j < 4; j++) {
if (i == GWPlayer[j].port) {
if (GWPlayer[j].com) {
var_r28 = 0x10001E;
var_r28 = MAKE_MESSID(16, 30);
} else {
var_r28 = 0x10001D;
var_r28 = MAKE_MESSID(16, 29);
}
HuWinInsertMesSet(settingsWin, var_r28, i);
break;
@ -625,66 +625,66 @@ static void UpdatePauseText(s32 arg0) {
break;
case 1:
if (boxState[arg0] != 0) {
HuWinMesSet(settingsWin, 0x100021);
HuWinMesSet(settingsWin, MAKE_MESSID(16, 33));
} else {
HuWinMesSet(settingsWin, 0x100022);
HuWinMesSet(settingsWin, MAKE_MESSID(16, 34));
}
break;
case 2:
if (boxState[arg0] != 0) {
HuWinMesSet(settingsWin, 0x100023);
HuWinMesSet(settingsWin, MAKE_MESSID(16, 35));
} else {
HuWinMesSet(settingsWin, 0x100024);
HuWinMesSet(settingsWin, MAKE_MESSID(16, 36));
}
break;
case 3:
switch (boxState[arg0]) {
case 0:
HuWinMesSet(settingsWin, 0x100026);
HuWinMesSet(settingsWin, MAKE_MESSID(16, 38));
break;
case 1:
HuWinMesSet(settingsWin, 0x100025);
HuWinMesSet(settingsWin, MAKE_MESSID(16, 37));
break;
case 2:
HuWinMesSet(settingsWin, 0x100027);
HuWinMesSet(settingsWin, MAKE_MESSID(16, 39));
break;
}
break;
case 4:
if (boxState[arg0] != 0) {
HuWinMesSet(settingsWin, 0x100028);
HuWinMesSet(settingsWin, MAKE_MESSID(16, 40));
} else {
HuWinMesSet(settingsWin, 0x100029);
HuWinMesSet(settingsWin, MAKE_MESSID(16, 41));
}
break;
case 5:
switch (boxState[arg0]) {
case 0:
HuWinMesSet(settingsWin, 0x10002C);
HuWinMesSet(settingsWin, MAKE_MESSID(16, 44));
break;
case 1:
HuWinMesSet(settingsWin, 0x10002B);
HuWinMesSet(settingsWin, MAKE_MESSID(16, 43));
break;
case 2:
HuWinMesSet(settingsWin, 0x10002A);
HuWinMesSet(settingsWin, MAKE_MESSID(16, 42));
break;
}
break;
case 6:
switch (boxState[arg0]) {
case 0:
HuWinMesSet(settingsWin, 0x10002F);
HuWinMesSet(settingsWin, MAKE_MESSID(16, 47));
break;
case 1:
HuWinMesSet(settingsWin, 0x10002D);
HuWinMesSet(settingsWin, MAKE_MESSID(16, 45));
break;
case 2:
HuWinMesSet(settingsWin, 0x10002E);
HuWinMesSet(settingsWin, MAKE_MESSID(16, 46));
break;
}
break;
case 7:
HuWinMesSet(settingsWin, 0x100030);
HuWinMesSet(settingsWin, MAKE_MESSID(16, 48));
break;
}
}
@ -699,16 +699,16 @@ static void InitPauseQuit(omObjData *arg0, ConfigWork *arg1) {
HuPrcSetStat(quitProcess, 0xC);
HuPrcDestructorSet2(quitProcess, DeletePauseQuit);
arg1->unk01 = 1;
arg1->unk06 = 0xA;
arg1->unk06 = 10;
HuSprAttrSet(pauseCursorPos, 0, 4);
HuSprAttrSet(pauseCursorPos, 1, 4);
break;
case 1:
if (quitWin != -1 && HuWinStatGet(quitWin) == 3) {
if (HuWinChoiceNowGet(quitWin) != 0) {
HuWinMesSet(settingsWin, 0x100033);
HuWinMesSet(settingsWin, MAKE_MESSID(16, 51));
} else {
HuWinMesSet(settingsWin, 0x100032);
HuWinMesSet(settingsWin, MAKE_MESSID(16, 50));
}
}
if (!quitProcess) {
@ -741,7 +741,7 @@ static void PauseQuitProcess(void) {
float sp10[2];
float sp8[2];
HuWinMesMaxSizeGet(1, sp8, 0x100031);
HuWinMesMaxSizeGet(1, sp8, MAKE_MESSID(16, 49));
sp10[0] = -10000.0f;
sp10[1] = 140.0f;
quitWin = HuWinExCreate(sp10[0], sp10[1], sp8[0], sp8[1], -1);
@ -749,10 +749,10 @@ static void PauseQuitProcess(void) {
temp_r31->active_pad = (1 << pausePad);
HuWinExAnimIn(quitWin);
HuWinMesSpeedSet(quitWin, 0);
HuWinMesSet(quitWin, 0x100031);
HuWinMesSet(quitWin, MAKE_MESSID(16, 49));
HuWinMesWait(quitWin);
if (HuWinChoiceGet(quitWin, 0) == 1) {
HuPrcSleep(0x3C);
HuPrcSleep(60);
pauseQuitF = 1;
_SetFlag(0x1001B);
}
@ -764,7 +764,7 @@ static void DeletePauseQuit(void) {
HuWinExCleanup(quitWin);
quitWin = -1;
}
HuDataDirClose(0x80000);
HuDataDirClose(DATADIR_BPAUSE);
quitProcess = NULL;
}
@ -807,7 +807,7 @@ static void CreatePadConfig(omObjData *arg0, ConfigWork *arg1) {
arg0->rot.x = 576.0f;
arg0->rot.y = 112.0f;
arg0->rot.z = (32.0f - arg0->rot.x) / 20.0f;
arg1->unk07 = 0x14;
arg1->unk07 = 20;
ShowPadConfigSprite(1);
HuSprGrpPosSet(padConfigSprGrp, arg0->rot.x, arg0->rot.y);
arg1->unk04 = 0;
@ -864,7 +864,7 @@ static void CursorMovePadConfig(omObjData *arg0, ConfigWork *arg1) {
s32 temp_r29;
u32 temp_r30;
HuWinMesSet(settingsWin, 0x10001F);
HuWinMesSet(settingsWin, MAKE_MESSID(16, 31));
temp_r30 = HuPadDStkRep[pausePad] | HuPadBtnDown[pausePad];
temp_r29 = CheckPort(arg1->unk04);
if (temp_r30 == 0x100) {
@ -910,9 +910,9 @@ static void ChangeDiffPadConfig(omObjData *arg0, ConfigWork *arg1) {
u32 var_r30;
var_r30 = 0;
if (HuPadStkX[pausePad] < -0x14) {
if (HuPadStkX[pausePad] < -20) {
var_r30 |= 1;
} else if (HuPadStkX[pausePad] > 0x14) {
} else if (HuPadStkX[pausePad] > 20) {
var_r30 |= 2;
}
temp_r29 = CheckPort(arg1->unk04);
@ -921,10 +921,10 @@ static void ChangeDiffPadConfig(omObjData *arg0, ConfigWork *arg1) {
} else {
var_r27 = 3;
}
HuWinMesSet(settingsWin, 0x100020);
HuWinMesSet(settingsWin, MAKE_MESSID(16, 32));
if (var_r30 != 0) {
if (arg1->unk0C != 0 && arg1->unk0C == var_r30) {
if (arg1->unk09++ < 0xA) {
if (arg1->unk09++ < 10) {
return;
}
} else {
@ -1061,7 +1061,7 @@ static s32 UpdatePauseBox(omObjData *arg0, ConfigWork *arg1, s32 arg2) {
}
var_f29 = arg0->rot.x;
arg0->rot.y = (var_f30 - var_f29) / 30.0f;
arg1->unk07 = 0x1E;
arg1->unk07 = 30;
arg1->unk01 = 2;
}
break;
@ -1161,7 +1161,7 @@ static s32 UpdatePauseBoxExt(omObjData *arg0, ConfigWork *arg1, s32 arg2) {
}
var_f29 = arg0->rot.x;
arg0->rot.y = (var_f30 - var_f29) / 30.0f;
arg1->unk07 = 0x1E;
arg1->unk07 = 30;
arg1->unk01 = 2;
}
break;
@ -1280,7 +1280,7 @@ static void CreatePauseControlWin(void) {
float var_f30;
u32 var_r31;
var_r31 = 0x100035;
var_r31 = MAKE_MESSID(16, 53);
HuWinMesMaxSizeGet(1, sp8, var_r31);
var_f31 = 152.0f;
var_f30 = 280.0f;
@ -1290,9 +1290,9 @@ static void CreatePauseControlWin(void) {
HuWinMesSet(settingsControlWin, var_r31);
HuWinDispOff(settingsControlWin);
if (GWBoardGet() == 7 || GWBoardGet() == 8) {
var_r31 = 0x100049;
var_r31 = MAKE_MESSID(16, 73);
} else {
var_r31 = 0x100034;
var_r31 = MAKE_MESSID(16, 52);
}
HuWinMesMaxSizeGet(1, sp8, var_r31);
var_f31 = -10000.0f;
@ -1418,7 +1418,7 @@ static void CreatePadConfigSprite(void) {
break;
}
}
temp_f31 = i * 0x60 + 0xB2;
temp_f31 = i * 96 + 178;
temp_f30 = 64.0f;
temp_r28 = GWPlayer[j].character;
temp_r27 = GWPlayer[j].diff;
@ -1434,7 +1434,7 @@ static void CreatePadConfigSprite(void) {
HuSprPosSet(padConfigSprGrp, i + 4, temp_f31, temp_f30);
HuSprPosSet(padConfigSprGrp, i + 8, temp_f31, temp_f30);
}
HuSprPosSet(padConfigSprGrp, 0xC, 260.0f, 64.0f);
HuSprPosSet(padConfigSprGrp, 12, 260.0f, 64.0f);
HuSprGrpPosSet(padConfigSprGrp, 0.0f, 0.0f);
}
@ -1455,9 +1455,9 @@ static void ShowPadConfigSprite(s32 arg0) {
}
}
if (arg0 != 0) {
HuSprAttrReset(padConfigSprGrp, 0xC, 4);
HuSprAttrReset(padConfigSprGrp, 12, 4);
} else {
HuSprAttrSet(padConfigSprGrp, 0xC, 4);
HuSprAttrSet(padConfigSprGrp, 12, 4);
}
}