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

Matched m462Dll (US); applying some sprite macros

Browse source
This commit is contained in:
mrshigure 2025-01-03 07:45:25 -08:00
parent 37e9989b96
commit 3c5a9a68fe
18 changed files with 1975 additions and 313 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -619,7 +619,7 @@ static void ShowBattleGame(BattleWork *arg0, omObjData *arg1) {
arg0->unk01 = 1;
arg1->trans.z = 0.01f;
arg1->trans.y = 0.0f;
HuSprAttrReset(arg0->unk08, 0, 4);
HuSprAttrReset(arg0->unk08, 0, HUSPR_ATTR_DISPOFF);
HuSprPosSet(arg0->unk08, 0, 0.0f, 0.0f);
} else {
return;
@ -682,8 +682,8 @@ static void UpdateBattleCoin(BattleWork *arg0, omObjData *arg1) {
HuSprBankSet(arg0->unk08, 1, temp_r28);
return;
}
HuSprAttrReset(arg0->unk08, 2, 4);
HuSprAttrReset(arg0->unk08, 1, 5);
HuSprAttrReset(arg0->unk08, 2, HUSPR_ATTR_DISPOFF);
HuSprAttrReset(arg0->unk08, 1, HUSPR_ATTR_NOANIM | HUSPR_ATTR_DISPOFF);
HuSprPosSet(arg0->unk08, 2, 0.0f, 40.0f);
HuSprPosSet(arg0->unk08, 1, 34.0f, 40.0f);
HuSprScaleSet(arg0->unk08, 1, 0.9f, 0.9f);
@ -726,10 +726,10 @@ static void InitBattleGameSpr(BattleWork *arg0, omObjData *arg1) {
temp_r30 = battleMGIdx[0];
temp_r29 = battleMGIdx[1];
HuSprAttrReset(arg0->unk08, 3, 4);
HuSprAttrReset(arg0->unk08, 4, 4);
HuSprAttrReset(arg0->unk08, temp_r30 + 5, 4);
HuSprAttrReset(arg0->unk08, temp_r29 + 5, 4);
HuSprAttrReset(arg0->unk08, 3, HUSPR_ATTR_DISPOFF);
HuSprAttrReset(arg0->unk08, 4, HUSPR_ATTR_DISPOFF);
HuSprAttrReset(arg0->unk08, temp_r30 + 5, HUSPR_ATTR_DISPOFF);
HuSprAttrReset(arg0->unk08, temp_r29 + 5, HUSPR_ATTR_DISPOFF);
HuSprPosSet(arg0->unk08, 3, sp8[0][0], sp8[0][1]);
HuSprPosSet(arg0->unk08, 4, sp8[1][0], sp8[1][1]);
HuSprPosSet(arg0->unk08, temp_r30 + 5, sp8[0][0], sp8[0][1]);

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

@ -368,14 +368,14 @@ static void StopCharWheel(CharWheelWork *arg0) {
}
var_r30 = arg0->unk03 % 6;
if (var_r30 < 3) {
HuSprAttrSet(wheelSprGrp, wheelPos + 10, 4);
HuSprAttrSet(wheelSprGrp, wheelPos + 10, HUSPR_ATTR_DISPOFF);
} else {
HuSprAttrReset(wheelSprGrp, wheelPos + 10, 4);
HuSprAttrReset(wheelSprGrp, wheelPos + 10, HUSPR_ATTR_DISPOFF);
}
if (arg0->unk03 < 90) {
arg0->unk03++;
} else {
HuSprAttrReset(wheelSprGrp, wheelPos + 10, 4);
HuSprAttrReset(wheelSprGrp, wheelPos + 10, HUSPR_ATTR_DISPOFF);
arg0->unk00_field3 = 4;
}
}

24
src/game/board/mg_setup.c
View file

@ -787,7 +787,7 @@ static void PopupVS(bitcopy* arg0, omObjData* arg1) {
temp_r29 = arg0->unk_0C;
if (arg0->unk_02 == 0) {
HuSprAttrReset(temp_r29->unk_00[0], 0, 4);
HuSprAttrReset(temp_r29->unk_00[0], 0, HUSPR_ATTR_DISPOFF);
HuSprAttrSet(temp_r29->unk_00[0], 0, 8);
HuSprScaleSet(temp_r29->unk_00[0], 0, 0.001f, 0.001f);
HuSprPosSet(temp_r29->unk_00[0], 0, 0.0f, 64.0f);
@ -832,7 +832,7 @@ static void FallMGType(bitcopy* arg0, omObjData* arg1) {
temp_r31 = arg0->unk_0C;
temp_r30 = sp8[mgType];
if (arg0->unk_02 == 0) {
HuSprAttrReset(temp_r31->unk_00[0], temp_r30, 4);
HuSprAttrReset(temp_r31->unk_00[0], temp_r30, HUSPR_ATTR_DISPOFF);
temp_r31->unk_1C[0][temp_r30].y = -284.0f;
temp_r31->unk_1C[1][temp_r30].y = -128.0f;
arg0->unk_02 = 1;
@ -872,7 +872,7 @@ static void LuckyMGFall(bitcopy* arg0, omObjData* arg1) {
temp_r27 = &temp_r29->unk_1C[0][temp_r24];
switch (arg0->unk_02) {
case 0:
HuSprAttrReset(temp_r29->unk_00[0], 4, 4);
HuSprAttrReset(temp_r29->unk_00[0], 4, HUSPR_ATTR_DISPOFF);
temp_r28->y = -284.0f;
temp_r25->y = -128.0f;
arg0->unk_02 = 1;
@ -889,7 +889,7 @@ static void LuckyMGFall(bitcopy* arg0, omObjData* arg1) {
case 2:
temp_r27->y += 10.0f;
if (328.0f < temp_r27->y) {
HuSprAttrReset(temp_r29->unk_00[0], temp_r24, 4);
HuSprAttrReset(temp_r29->unk_00[0], temp_r24, HUSPR_ATTR_DISPOFF);
temp_r26 = (bitcopy*) mgSetupObj->work;
temp_r26->field00_bit1 = 7;
temp_r26->unk_02 = 0;
@ -935,8 +935,8 @@ static void UpdateLuckyValue(bitcopy* arg0, omObjData* arg1) {
temp_r27 = arg0->unk_0C;
switch (arg0->unk_02) {
case 0:
HuSprAttrReset(temp_r27->unk_00[0], 8, 4);
HuSprAttrReset(temp_r27->unk_00[0], 9, 4);
HuSprAttrReset(temp_r27->unk_00[0], 8, HUSPR_ATTR_DISPOFF);
HuSprAttrReset(temp_r27->unk_00[0], 9, HUSPR_ATTR_DISPOFF);
HuSprAttrSet(temp_r27->unk_00[0], 8, 8);
HuSprAttrSet(temp_r27->unk_00[0], 9, 8);
HuSprPosSet(temp_r27->unk_00[0], 8, 0.0f, 0.0f);
@ -1042,10 +1042,10 @@ static void UpdateMGList(bitcopy* arg0, omObjData* arg1) {
temp_r24 = arg0->unk_0C;
temp_r22 = mgType + 5;
switch (arg0->unk_02) { /* irregular */
switch (arg0->unk_02) {
case 0:
HuSprAttrSet(temp_r24->unk_00[0], temp_r22, 8);
HuSprAttrReset(temp_r24->unk_00[0], temp_r22, 4);
HuSprAttrReset(temp_r24->unk_00[0], temp_r22, HUSPR_ATTR_DISPOFF);
HuSprPosSet(temp_r24->unk_00[0], temp_r22, 0.0f, 32.0f);
HuSprScaleSet(temp_r24->unk_00[0], temp_r22, 0.001f, 0.001f);
arg0->unk_04 = 0;
@ -1084,11 +1084,11 @@ static void UpdateMGList(bitcopy* arg0, omObjData* arg1) {
for (var_r23 = 0; var_r23 < arg0->field01_bit0; var_r23++) {
HuWinDispOn(activeMG[var_r23].unk_00);
}
HuSprAttrReset(temp_r24->unk_00[0], 0xA, 4);
HuSprAttrReset(temp_r24->unk_00[0], 0xA, HUSPR_ATTR_DISPOFF);
HuSprAttrSet(temp_r24->unk_00[0], 0xA, 8);
HuSprPosSet(temp_r24->unk_00[0], 0xA, -148.0f, cursorYTbl[0]);
temp_r18 = &hiliteColTbl[mgType];
HuSprAttrReset(temp_r24->unk_00[0], 0xC, 4);
HuSprAttrReset(temp_r24->unk_00[0], 0xC, HUSPR_ATTR_DISPOFF);
HuSprPosSet(temp_r24->unk_00[0], 0xC, 0.0f, hiliteYTbl[0]);
HuSprTPLvlSet(temp_r24->unk_00[0], 0xC, 0.7f);
HuSprScaleSet(temp_r24->unk_00[0], 0xC, 32.0f, 3.5f);
@ -1158,10 +1158,10 @@ static void UpdateMGList(bitcopy* arg0, omObjData* arg1) {
hiliteTimer = 0;
}
if (hiliteShowF != 0) {
HuSprAttrReset(temp_r24->unk_00[0], 0xC, 4);
HuSprAttrReset(temp_r24->unk_00[0], 0xC, HUSPR_ATTR_DISPOFF);
return;
}
HuSprAttrSet(temp_r24->unk_00[0], 0xC, 4);
HuSprAttrSet(temp_r24->unk_00[0], 0xC, HUSPR_ATTR_DISPOFF);
return;
case 5:
if (arg0->unk_03 < 0x5A) {

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

@ -717,9 +717,9 @@ static void InitPauseQuit(omObjData *arg0, ConfigWork *arg1) {
SetBoxVisible(1);
var_f31 = 0.5f;
BoardModelScaleSet(boxModelID[7], var_f31, var_f31, var_f31);
HuSprAttrReset(pauseCursorPos, 0, 4);
HuSprAttrReset(pauseCursorPos, 0, HUSPR_ATTR_DISPOFF);
if (GWPartyGet() == 0) {
HuSprAttrReset(pauseCursorPos, 1, 4);
HuSprAttrReset(pauseCursorPos, 1, HUSPR_ATTR_DISPOFF);
}
break;
}
@ -822,7 +822,7 @@ static void ScrollInPadConfig(omObjData *arg0, ConfigWork *arg1) {
s32 i;
if (arg1->unk07 == 0) {
HuSprAttrReset(pauseCursorPos, 0, 4);
HuSprAttrReset(pauseCursorPos, 0, HUSPR_ATTR_DISPOFF);
if (arg1->unk00_field2 != 0) {
for (i = 0; i < 8; i++) {
if (i != 0) {
@ -1332,8 +1332,8 @@ static s32 WaitPauseInput(void) {
}
HuWinDispOn(controlWin);
SetBoxVisible(0);
HuSprAttrReset(pauseSprGrp, 0, 4);
HuSprAttrSet(pauseCursorPos, 0, 4);
HuSprAttrReset(pauseSprGrp, 0, HUSPR_ATTR_DISPOFF);
HuSprAttrSet(pauseCursorPos, 0, HUSPR_ATTR_DISPOFF);
PauseCreateNumber(0, GWSystem.turn);
PauseCreateNumber(1, GWSystem.max_turn);
HuPrcSleep(4);
@ -1376,15 +1376,15 @@ static void ShowPauseConfig(void) {
HuWinDispOn(settingsControlWin);
HuWinDispOn(settingsWin);
SetBoxVisible(1);
HuSprAttrReset(pauseCursorPos, 0, 4);
HuSprAttrReset(pauseCursorPos, 0, HUSPR_ATTR_DISPOFF);
BoardModelVisibilitySet(hostMdl, 1);
if (GWPartyGet() == 0) {
var_f31 = boxPosTbl[0][0];
var_f30 = boxPosTbl[0][1];
HuSprPosSet(pauseCursorPos, 1, var_f31, var_f30);
HuSprAttrReset(pauseCursorPos, 1, 4);
HuSprAttrReset(pauseCursorPos, 1, HUSPR_ATTR_DISPOFF);
} else {
HuSprAttrSet(pauseCursorPos, 1, 4);
HuSprAttrSet(pauseCursorPos, 1, HUSPR_ATTR_DISPOFF);
}
while (configObj) {
HuPrcVSleep();
@ -1434,19 +1434,19 @@ static void ShowPadConfigSprite(s32 arg0) {
for (i = 0; i < 4; i++) {
temp_r31 = GWPlayer[i].port;
if (arg0 != 0) {
HuSprAttrReset(padConfigSprGrp, temp_r31, 4);
HuSprAttrReset(padConfigSprGrp, temp_r31 + 4, 4);
HuSprAttrReset(padConfigSprGrp, temp_r31 + 8, 4);
HuSprAttrReset(padConfigSprGrp, temp_r31, HUSPR_ATTR_DISPOFF);
HuSprAttrReset(padConfigSprGrp, temp_r31 + 4, HUSPR_ATTR_DISPOFF);
HuSprAttrReset(padConfigSprGrp, temp_r31 + 8, HUSPR_ATTR_DISPOFF);
} else {
HuSprAttrSet(padConfigSprGrp, temp_r31, 4);
HuSprAttrSet(padConfigSprGrp, temp_r31 + 4, 4);
HuSprAttrSet(padConfigSprGrp, temp_r31 + 8, 4);
HuSprAttrSet(padConfigSprGrp, temp_r31, HUSPR_ATTR_DISPOFF);
HuSprAttrSet(padConfigSprGrp, temp_r31 + 4, HUSPR_ATTR_DISPOFF);
HuSprAttrSet(padConfigSprGrp, temp_r31 + 8, HUSPR_ATTR_DISPOFF);
}
}
if (arg0 != 0) {
HuSprAttrReset(padConfigSprGrp, 12, 4);
HuSprAttrReset(padConfigSprGrp, 12, HUSPR_ATTR_DISPOFF);
} else {
HuSprAttrSet(padConfigSprGrp, 12, 4);
HuSprAttrSet(padConfigSprGrp, 12, HUSPR_ATTR_DISPOFF);
}
}

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

@ -2127,15 +2127,15 @@ void BoardRollDispSet(s32 arg0)
if (arg0 != 0) {
temp_r31->field00_bit1 = 1;
if ((var_r30 == 1) && (GWPlayer[temp_r31->unk_02].roll / 10 == 0)) {
HuSprAttrSet(temp_r31->unk_04, var_r30, 4);
HuSprAttrSet(temp_r31->unk_04, var_r30, HUSPR_ATTR_DISPOFF);
}
else {
HuSprAttrReset(temp_r31->unk_04, var_r30, 4);
HuSprAttrReset(temp_r31->unk_04, var_r30, HUSPR_ATTR_DISPOFF);
}
}
else {
temp_r31->field00_bit1 = 0;
HuSprAttrSet(temp_r31->unk_04, var_r30, 4);
HuSprAttrSet(temp_r31->unk_04, var_r30, HUSPR_ATTR_DISPOFF);
}
}
UpdateRollSprite(rollObj);
@ -2163,7 +2163,7 @@ static void UpdateRollSprite(omObjData *arg0)
for (var_r30 = 0; var_r30 < 2; var_r30++) {
if (((var_r30 == 1) && (sp14[1] == 0)) || (temp_r31->field00_bit1 == 0)) {
HuSprAttrSet(temp_r31->unk_04, var_r30, 4);
HuSprAttrSet(temp_r31->unk_04, var_r30, HUSPR_ATTR_DISPOFF);
}
else {
if ((sp14[1] == 0) && (var_r30 == 0)) {
@ -2173,7 +2173,7 @@ static void UpdateRollSprite(omObjData *arg0)
sp1C.x = spC[var_r30];
}
sp1C.y = (HU_DISP_HEIGHTF * 176) / 480;
HuSprAttrReset(temp_r31->unk_04, var_r30, 4);
HuSprAttrReset(temp_r31->unk_04, var_r30, HUSPR_ATTR_DISPOFF);
HuSprBankSet(temp_r31->unk_04, var_r30, sp14[var_r30]);
HuSprPosSet(temp_r31->unk_04, var_r30, sp1C.x, sp1C.y);
}

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

@ -453,10 +453,10 @@ void BoardStatusHammerShowSet(s32 arg0, s32 arg1) {
if (temp_r31->unk00_bit6) {
if (arg1 != 0) {
HuSprAttrSet(temp_r31->unk02, 0x10, 2);
HuSprAttrSet(temp_r31->unk02, 0x10, HUSPR_ATTR_LOOP);
} else {
HuSprAttrReset(temp_r31->unk02, 0x10, 2);
HuSprAttrSet(temp_r31->unk02, 0x10, 1);
HuSprAttrReset(temp_r31->unk02, 0x10, HUSPR_ATTR_LOOP);
HuSprAttrSet(temp_r31->unk02, 0x10, HUSPR_ATTR_NOANIM);
}
}
}
@ -618,15 +618,15 @@ static s32 UpdateBoardStatus(void) {
temp_r27 = GWPlayer[i].items[j];
if (temp_r27 != -1 && temp_r31->unk00_bit5) {
UpdateStatusItem(temp_r31, j, temp_r27);
HuSprAttrReset(temp_r31->unk02, j + 0xD, 4);
HuSprAttrReset(temp_r31->unk02, j + 0xD, HUSPR_ATTR_DISPOFF);
} else {
HuSprAttrSet(temp_r31->unk02, j + 0xD, 4);
HuSprAttrSet(temp_r31->unk02, j + 0xD, HUSPR_ATTR_DISPOFF);
}
}
if (GWPlayer[i].com) {
HuSprAttrReset(temp_r31->unk02, 0xC, 4);
HuSprAttrReset(temp_r31->unk02, 0xC, HUSPR_ATTR_DISPOFF);
} else {
HuSprAttrSet(temp_r31->unk02, 0xC, 4);
HuSprAttrSet(temp_r31->unk02, 0xC, HUSPR_ATTR_DISPOFF);
}
temp_r28 = statusColTbl[GWPlayer[i].color];
HuSprColorSet(temp_r31->unk02, 0, temp_r28[0], temp_r28[1], temp_r28[2]);
@ -685,7 +685,7 @@ void BoardSpriteDigitUpdate(s16 arg0, s16 arg1, s32 arg2) {
} else {
HuSprBankSet(arg0, arg1 + 1, temp_r28);
HuSprBankSet(arg0, arg1, temp_r27);
HuSprAttrReset(arg0, arg1, 4);
HuSprAttrReset(arg0, arg1, HUSPR_ATTR_DISPOFF);
}
}
@ -1616,8 +1616,8 @@ static void UpdateItemPickGfx(omObjData *arg0) {
if (!temp_r30->unk00_bit7) {
temp_r30->unk00_bit3 = 1;
HuSprBankSet(temp_r30->unk04, 0, 1);
HuSprAttrSet(temp_r30->unk04, 0, 2);
HuSprAttrReset(temp_r30->unk04, 0, 1);
HuSprAttrSet(temp_r30->unk04, 0, HUSPR_ATTR_LOOP);
HuSprAttrReset(temp_r30->unk04, 0, HUSPR_ATTR_NOANIM);
arg0->func = UpdateItemPickup;
HuWinDispOff(temp_r30->unk06);
} else {

8
src/game/board/view.c
View file

@ -577,15 +577,15 @@ static void UpdateOverheadView(omObjData *arg0) {
BoardModelVisibilitySet(temp_r31->unk04, 0);
} else if (temp_r31->unk01 != 0) {
if (i != 4) {
HuSprAttrReset(temp_r31->unk02, i, 4);
HuSprAttrReset(temp_r31->unk02, i, HUSPR_ATTR_DISPOFF);
}
HuSprAttrReset(temp_r31->unk02, var_r28, 4);
HuSprAttrReset(temp_r31->unk02, var_r28, HUSPR_ATTR_DISPOFF);
BoardModelVisibilitySet(temp_r31->unk04, 1);
} else {
if (i != 4) {
HuSprAttrSet(temp_r31->unk02, i, 4);
HuSprAttrSet(temp_r31->unk02, i, HUSPR_ATTR_DISPOFF);
}
HuSprAttrSet(temp_r31->unk02, var_r28, 4);
HuSprAttrSet(temp_r31->unk02, var_r28, HUSPR_ATTR_DISPOFF);
BoardModelVisibilitySet(temp_r31->unk04, 0);
}
}

2
src/game/thpmain.c
View file

@ -161,7 +161,7 @@ static void THPTestProc(void)
Hu3DModelAttrReset(SimpleControl.unk19E, HU3D_ATTR_DISPOFF);
}
else {
HuSprAttrReset(SimpleControl.unk19E, 0, 4);
HuSprAttrReset(SimpleControl.unk19E, 0, HUSPR_ATTR_DISPOFF);
}
while (1) {
if (THPStat == 2) {