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

Port some RELs to PAL (#465)

Browse source
This commit is contained in:
Liam Coleman 2024-11-16 15:01:59 -06:00 • committed by GitHub
parent d0a5c85d3e
commit ae81b60c47
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 349 additions and 197 deletions
Download patch file Download diff file Expand all files Collapse all files

64
src/REL/instDll/main.c
View file

@ -689,7 +689,11 @@ static void fn_1_2804(void)
HuWinMesPalSet(window, 7, 0, 0, 192);
HuWinPosSet(window_other, 142.0f, 320.0f);
for (i = 0; i <= 10; i++) {
#if VERSION_NTSC
HuWinPosSet(window_other, 30.0 * sind(i * 9.0f) + 142.0, 160.0 * (1.0 - cosd(i * 9.0f)) + 320.0);
#else
HuWinPosSet(window_other, 30.0 * sind(i * 9.0f) + 142.0, 180.0 * (1.0 - cosd(i * 9.0f)) + 320.0);
#endif
HuPrcVSleep();
}
HuPrcSleep(5);
@ -711,6 +715,12 @@ static void fn_1_2804(void)
static float lbl_1_data_124[] = { 420, 70, 488, 186, 476, 242, 400, 292 };
#if VERSION_NTSC
#define WIN_ANIM_OFS 201
#else
#define WIN_ANIM_OFS 219
#endif
static void fn_1_2FA0(void)
{
float temp_f31;
@ -763,20 +773,39 @@ static void fn_1_2FA0(void)
temp_r29++;
}
#if VERSION_NTSC
if (temp_r26 == 1) {
temp_r22 = spC[0];
temp_r28 = HuSprAnimReadFile(DATA_MAKE_NUM(DATADIR_INST, 18));
temp_f29 = ((576.0f - temp_r22) - 24.0f) - 16.0f + 227.0f;
temp_f29 = ((576.0f - temp_r22) - 24.0f) - 16.0f + 227;
temp_f28 = 78;
temp_f27 = 0.5f;
}
else {
temp_r22 = (spC[0] > spC[1]) ? spC[0] : spC[1];
temp_r28 = HuSprAnimReadFile(DATA_MAKE_NUM(DATADIR_INST, 15));
temp_f29 = ((576.0f - temp_r22) - 24.0f) - 16.0f + 172.0f;
temp_f28 = 84;
temp_f27 = 1.0f;
}
#else
if (temp_r26 == 1) {
temp_r22 = spC[0];
temp_r28 = HuSprAnimReadFile(DATA_MAKE_NUM(DATADIR_INST, 18));
temp_f29 = ((576.0f - temp_r22) - 24.0f) - 16.0f + 235;
temp_f28 = 78;
temp_f27 = 0.5f;
}
else {
temp_r22 = (spC[0] > spC[1]) ? spC[0] : spC[1];
temp_r28 = HuSprAnimReadFile(DATA_MAKE_NUM(DATADIR_INST, 15));
temp_f29 = ((576.0f - temp_r22) - 24.0f) - 16.0f + 235;
temp_f28 = 84;
temp_f27 = 1.0f;
}
#endif
temp_r25 = HuSprGrpCreate(1);
temp_r17 = HuSprCreate(temp_r28, 0, 0);
HuSprGrpMemberSet(temp_r25, 0, temp_r17);
@ -809,13 +838,13 @@ static void fn_1_2FA0(void)
HuWinMesSet(sp10[2], lbl_1_bss_10 + MAKE_MESSID(0x24, 0x02));
HuWinBGTPLvlSet(sp10[2], 0.0f);
HuWinMesSpeedSet(sp10[2], 0);
temp_r31 = HuWinAnimSet(sp10[2], temp_r28, 0, 201, 18);
temp_r31 = HuWinAnimSet(sp10[2], temp_r28, 0, WIN_ANIM_OFS, 18);
HuWinSprPriSet(sp10[2], temp_r31, 1000);
temp_r27 = HuWinCreate(1000, 292, 456, 42, 0);
HuWinBGTPLvlSet(temp_r27, 0.0f);
HuWinMesSpeedSet(temp_r27, 0);
HuWinMesSet(temp_r27, lbl_1_bss_10 + MAKE_MESSID(0x24, 0x02));
temp_r31 = HuWinAnimSet(temp_r27, temp_r28, 0, 201, 18);
temp_r31 = HuWinAnimSet(temp_r27, temp_r28, 0, WIN_ANIM_OFS, 18);
HuWinPriSet(temp_r27, 10);
HuWinSprPriSet(temp_r27, temp_r31, 11);
while (lbl_1_data_0 != 0) {
@ -824,12 +853,21 @@ static void fn_1_2FA0(void)
for (temp_r31 = 0; temp_r31 < 36; temp_r31++) {
temp_f30 = temp_r31;
if (temp_f30 <= 20.0f) {
#if VERSION_NTSC
temp_f31 = 300.0 * cosd(4.5f * temp_f30) + temp_f29;
HuSprGrpPosSet(temp_r25, temp_f31, temp_f28);
temp_f31 = 300.0 * cosd(4.5f * temp_f30) + (576.0f - (temp_r22 / 2) - 24.0f);
for (temp_r30 = 0; temp_r30 < temp_r26; temp_r30++) {
HuSprGrpPosSet(work.spr_grp[temp_r30], temp_f31, (temp_r30 * 28) + 70);
}
#else
temp_f31 = 500.0 * cosd(4.5f * temp_f30) + temp_f29;
HuSprGrpPosSet(temp_r25, temp_f31, temp_f28);
temp_f31 = 500.0 * cosd(4.5f * temp_f30) + (576.0f - (temp_r22 / 2) - 24.0f);
for (temp_r30 = 0; temp_r30 < temp_r26; temp_r30++) {
HuSprGrpPosSet(work.spr_grp[temp_r30], temp_f31, (temp_r30 * 28) + 70);
}
#endif
}
temp_f30 = temp_r31 - 3;
if (temp_f30 > 0.0f) {
@ -837,7 +875,11 @@ static void fn_1_2FA0(void)
temp_f31 = 300.0 * cosd(4.5f * temp_f30) + lbl_1_data_124[2];
HuSprGrpPosSet(temp_r24, temp_f31, 186.0f);
temp_f31 = 300.0 * cosd(4.5f * temp_f30) + (lbl_1_data_124[2] - 88.0f);
#if VERSION_NTSC
HuWinPosSet(sp10[0], 16.0f + temp_f31, 168.0f);
#else
HuWinPosSet(sp10[0], 8.0f + temp_f31, 168.0f);
#endif
}
}
temp_f30 = temp_r31 - 6;
@ -846,13 +888,17 @@ static void fn_1_2FA0(void)
temp_f31 = 300.0 * cosd(4.5f * temp_f30) + lbl_1_data_124[4];
HuSprGrpPosSet(temp_r23, temp_f31, 242.0f);
temp_f31 = 300.0 * cosd(4.5f * temp_f30) + (lbl_1_data_124[4] - 100.0f);
#if VERSION_NTSC
HuWinPosSet(sp10[1], 16.0f + temp_f31, 224.0f);
#else
HuWinPosSet(sp10[1], 8.0f + temp_f31, 224.0f);
#endif
}
}
temp_f30 = temp_r31 - 9;
if (temp_f30 > 0.0f) {
if (temp_f30 <= 20.0f) {
temp_f31 = 300.0 * cosd(4.5f * temp_f30) + (lbl_1_data_124[6] - 217.0f);
temp_f31 = 300.0 * cosd(4.5f * temp_f30) + (lbl_1_data_124[6] - (WIN_ANIM_OFS+16));
HuWinPosSet(sp10[2], 16.0f + temp_f31, 274.0f);
}
}
@ -860,7 +906,7 @@ static void fn_1_2FA0(void)
}
while (lbl_1_data_0 != 3) {
if (temp_r21 != lbl_1_bss_6) {
temp_f31 = 16.0f + (lbl_1_data_124[6] - 217.0f);
temp_f31 = 16.0f + (lbl_1_data_124[6] - (WIN_ANIM_OFS+16));
HuWinMesSet(temp_r27, MAKE_MESSID(0x24, 0x02) + lbl_1_bss_10 + temp_r21);
temp_r21 = lbl_1_bss_6;
if (lbl_1_bss_6 == 1) {
@ -875,7 +921,11 @@ static void fn_1_2FA0(void)
HuWinMesSet(sp10[2], MAKE_MESSID(0x24, 0x02) + lbl_1_bss_10 + lbl_1_bss_6);
}
for (temp_r31 = 0; temp_r31 <= 10; temp_r31++) {
#if VERSION_NTSC
HuWinPosSet(temp_r27, 30.0 * sind(temp_r31 * 9.0f) + temp_f31, 200.0 * (1.0 - cosd(temp_r31 * 9.0f)) + 274.0);
#else
HuWinPosSet(temp_r27, 30.0 * sind(temp_r31 * 9.0f) + temp_f31, 220.0 * (1.0 - cosd(temp_r31 * 9.0f)) + 274.0);
#endif
HuPrcVSleep();
}
}
@ -897,7 +947,11 @@ static void fn_1_2FA0(void)
HuSprGrpPosSet(temp_r23, temp_f31, 242.0f);
temp_f31 = (lbl_1_data_124[4] - 100.0f) + (300.0f * temp_f30);
HuWinPosSet(sp10[1], 16.0f + temp_f31, 224);
#if VERSION_NTSC
temp_f31 = (lbl_1_data_124[6] - 184.0f) + (400.0f * temp_f30);
#else
temp_f31 = (lbl_1_data_124[6] - 235.0f) + (400.0f * temp_f30);
#endif
HuWinPosSet(sp10[2], 16.0f + temp_f31, 274);
HuPrcVSleep();
}

55
src/REL/mentDll/main.c
View file

@ -3768,6 +3768,8 @@ s32 lbl_1_data_5BC[4][2] = {
{ 0x77, 0x18 },
{ 0xA5, 0x18 },
};
#if VERSION_NTSC
float lbl_1_data_5DC[5][5] = {
{ 262.0f, 119.0f, 1.3f, 227.0f, 455.0f },
{ 314.0f, 168.0f, 0.75f, 265.0f, 416.0f },
@ -3775,6 +3777,16 @@ float lbl_1_data_5DC[5][5] = {
{ 418.0f, 240.0f, 0.75f, 300.0f, 381.0f },
{ -1.0f, 289.0f, 1.3f, 220.0f, 460.0f },
};
#else
float lbl_1_data_5DC[5][5] = {
{ 262.0f, 119.0f, 1.3f, 227.0f, 455.0f },
{ 314.0f, 168.0f, 0.75f, 300.0f, 381.0f },
{ 366.0f, 204.0f, 0.75f, 240.0f, 440.0f },
{ 418.0f, 240.0f, 0.75f, 300.0f, 381.0f },
{ -1.0f, 289.0f, 1.3f, 220.0f, 460.0f },
};
#endif
s32 lbl_1_data_640[4][5] = {
{ 0xB4, 0x60, 0x87, 0, 0 },
{ 0xFC, 0xB8, 0xF6, 0xD4, 0x1D4 },
@ -4633,6 +4645,18 @@ void fn_1_18F74(omObjData *arg0, MentDllUnkBss35BCStruct *arg1)
}
}
#if VERSION_PAL
#define POSX1 353
#define POSX2 325
#else
#define POSX1 321
#define POSX2 295
#endif
void fn_1_190E8(void)
{
s32 var_r31;
@ -4690,16 +4714,18 @@ void fn_1_190E8(void)
HuSprPosSet(var_r30, 0x47, 340.0f, lbl_1_data_5DC[0][1]);
HuSprScaleSet(var_r30, 0x47, 0.0f, 0.0f);
HuSprAttrReset(var_r30, 0x47, 4);
#if VERSION_NTSC
HuSprAttrReset(var_r30, 0x48, 4);
HuSprPosSet(var_r30, 0x48, 366.0f, lbl_1_data_5DC[1][1]);
HuSprAttrReset(var_r30, 0x49, 4);
HuSprPosSet(var_r30, 0x49, 367.0f, 2.0f + lbl_1_data_5DC[1][1]);
#endif
for (var_r31 = 0; var_r31 < 2; var_r31++) {
HuSprAttrReset(var_r30, var_r31 + 0x4A, 4);
HuSprPosSet(var_r30, var_r31 + 0x4A, 0x141 - (var_r31 * 0x1A), lbl_1_data_5DC[1][1]);
HuSprPosSet(var_r30, var_r31 + 0x4A, POSX1 - (var_r31 * (POSX1-POSX2)), lbl_1_data_5DC[1][1]);
HuSprBankSet(var_r30, var_r31 + 0x4A, var_r31);
HuSprAttrReset(var_r30, var_r31 + 0x4C, 4);
HuSprPosSet(var_r30, var_r31 + 0x4C, 0x142 - (var_r31 * 0x1A), 2.0f + lbl_1_data_5DC[1][1]);
HuSprPosSet(var_r30, var_r31 + 0x4C, POSX1+1 - (var_r31 * (POSX1-POSX2)), 2.0f + lbl_1_data_5DC[1][1]);
HuSprBankSet(var_r30, var_r31 + 0x4C, var_r31);
}
HuSprAttrReset(var_r30, 0x4E, 4);
@ -4964,23 +4990,29 @@ void fn_1_19C98(omObjData *arg0, MentDllUnkBss35BCStruct *arg1)
break;
case 1:
if (var_r26 == 1) {
#if VERSION_NTSC
HuSprPosSet(var_r30, 0x48, 366.0f + var_f31, lbl_1_data_5DC[1][1]);
HuSprPosSet(var_r30, 0x49, 367.0f + var_f31, 2.0f + lbl_1_data_5DC[1][1]);
HuSprPosSet(var_r30, 0x4A, 321.0f + var_f31, lbl_1_data_5DC[1][1]);
HuSprPosSet(var_r30, 0x4C, 322.0f + var_f31, 2.0f + lbl_1_data_5DC[1][1]);
HuSprPosSet(var_r30, 0x4B, 295.0f + var_f31, lbl_1_data_5DC[1][1]);
HuSprPosSet(var_r30, 0x4D, 296.0f + var_f31, 2.0f + lbl_1_data_5DC[1][1]);
#endif
HuSprPosSet(var_r30, 0x4A, POSX1 + var_f31, lbl_1_data_5DC[1][1]);
HuSprPosSet(var_r30, 0x4C, POSX1+1 + var_f31, 2.0f + lbl_1_data_5DC[1][1]);
HuSprPosSet(var_r30, 0x4B, POSX2 + var_f31, lbl_1_data_5DC[1][1]);
HuSprPosSet(var_r30, 0x4D, POSX2+1 + var_f31, 2.0f + lbl_1_data_5DC[1][1]);
}
else {
#if VERSION_NTSC
HuSprPosSet(var_r30, 0x48, 366.0f - var_f31, lbl_1_data_5DC[1][1]);
HuSprPosSet(var_r30, 0x49, 367.0f - var_f31, 2.0f + lbl_1_data_5DC[1][1]);
HuSprPosSet(var_r30, 0x4A, 321.0f - var_f31, lbl_1_data_5DC[1][1]);
HuSprPosSet(var_r30, 0x4C, 322.0f - var_f31, 2.0f + lbl_1_data_5DC[1][1]);
HuSprPosSet(var_r30, 0x4B, 295.0f - var_f31, lbl_1_data_5DC[1][1]);
HuSprPosSet(var_r30, 0x4D, 296.0f - var_f31, 2.0f + lbl_1_data_5DC[1][1]);
#endif
HuSprPosSet(var_r30, 0x4A, POSX1 - var_f31, lbl_1_data_5DC[1][1]);
HuSprPosSet(var_r30, 0x4C, POSX1+1 - var_f31, 2.0f + lbl_1_data_5DC[1][1]);
HuSprPosSet(var_r30, 0x4B, POSX2 - var_f31, lbl_1_data_5DC[1][1]);
HuSprPosSet(var_r30, 0x4D, POSX2+1 - var_f31, 2.0f + lbl_1_data_5DC[1][1]);
}
#if VERSION_NTSC
HuSprScaleSet(var_r30, 0x48, 1.0f, var_f30);
HuSprScaleSet(var_r30, 0x49, 1.0f, var_f30);
#endif
HuSprScaleSet(var_r30, 0x4A, 1.0f, var_f30);
HuSprScaleSet(var_r30, 0x4C, 1.0f, var_f30);
HuSprScaleSet(var_r30, 0x4B, 1.0f, var_f30);
@ -5103,6 +5135,9 @@ void fn_1_19C98(omObjData *arg0, MentDllUnkBss35BCStruct *arg1)
}
}
#undef POSX2
#undef POSX1
void fn_1_1BB2C(MentDllUnkBss35BCStruct *arg0, s32 arg1, s32 arg2, s32 arg3)
{
s32 var_r31;