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

Port ztardll to PAL

Browse source
This commit is contained in:
dbalatoni13 2024-12-15 23:14:45 +01:00
parent 9c915a08fd
commit 55901c1020
4 changed files with 294 additions and 214 deletions
Download patch file Download diff file Expand all files Collapse all files

70
src/REL/ztardll/font.c
View file

@ -56,10 +56,32 @@ s32 lbl_1_data_B0[0xC6] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
DATA_MAKE_NUM(DATADIR_INSTFONT, 0x00), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x00), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x0B),
DATA_MAKE_NUM(DATADIR_INSTFONT, 0x0C), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x00), DATA_MAKE_NUM(DATADIR_INSTFONT, 0x00) };
#elif VERSION_PAL
s32 lbl_1_data_B0[0x130] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0x00140025, 0x00140026, 0x00140027, 0x00140028, 0x00140029, 0x0014002A, 0x0014002B, 0x0014002C, 0x0014002D, 0x0014002E,
0x00140025, 0x00140025, 0x00140025, 0x0014002F, 0x00140025, 0x00140025, 0x00140025, 0x00140035, 0x00140036, 0x00140037, 0x00140038, 0x00140039,
0x0014003A, 0x0014003B, 0x0014003C, 0x0014003D, 0x0014003E, 0x0014003F, 0x00140040, 0x00140041, 0x00140042, 0x00140043, 0x00140044, 0x00140045,
0x00140046, 0x00140047, 0x00140048, 0x00140049, 0x0014004A, 0x0014004B, 0x0014004C, 0x0014004D, 0x0014004E, 0x00140043, 0x00140032, 0x00140043,
0x00140043, 0x00140043, 0x00140043, 0x0014004F, 0x00140050, 0x00140051, 0x00140052, 0x00140053, 0x00140054, 0x00140055, 0x00140056, 0x00140057,
0x00140058, 0x00140059, 0x0014005A, 0x0014005B, 0x0014005C, 0x0014005D, 0x0014005E, 0x0014005F, 0x00140060, 0x00140061, 0x00140062, 0x00140063,
0x00140064, 0x00140065, 0x00140066, 0x00140067, 0x00140068, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025,
0x00140025, 0x00140025, 0x0014002F, 0x00140033, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025,
0x00140025, 0x00140025, 0x00140025, 0x00140069, 0x0014006A, 0x0014006B, 0x0014006C, 0x0014006D, 0x0014006E, 0x0014006F, 0x00140070, 0x00140071,
0x00140072, 0x00140073, 0x00140074, 0x00140075, 0x00140076, 0x00140077, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025,
0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025,
0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025,
0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140030, 0x00140031, 0x00140025, 0x00140025, 0x0014008F, 0x0014008E, 0x00140025, 0x00140025,
0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140078, 0x00140079, 0x0014007A, 0x0014007B, 0x0014007C,
0x0014007D, 0x0014007E, 0x0014007F, 0x00140080, 0x00140081, 0x00140082, 0x00140083, 0x00140084, 0x00140085, 0x00140086, 0x00140087, 0x00140088,
0x00140089, 0x0014008A, 0x0014008B, 0x0014008C, 0x0014008D, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025,
0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025,
0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025,
0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025,
0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025,
0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025,
0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025, 0x00140025 };
#else
s32 lbl_1_data_B0[0x132] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0x00150000, 0x00150001, 0x00150002, 0x00150003, 0x00150004, 0x00150005, 0x00150006, 0x00150007, 0x00150008, 0x00150009,
s32 lbl_1_data_B0[0x132] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0x00150000, 0x00150001, 0x00150002, 0x00150003, 0x00150004, 0x00150005, 0x00150006, 0x00150007, 0x00150008, 0x00150009,
0x0013000A, 0x0013000A, 0x0013000A, 0x0015000A, 0x0013000A, 0x0013000A, 0x0013000A, 0x00130014, 0x00130015, 0x00130016, 0x00130017, 0x00130018,
0x00130019, 0x001500AE, 0x0013001B, 0x0013001C, 0x0013001D, 0x0013001E, 0x0013001F, 0x00130020, 0x00130021, 0x001500AF, 0x00130023, 0x00130024,
0x00130025, 0x00130026, 0x00130027, 0x00130028, 0x00130029, 0x0013002A, 0x0013002B, 0x0013002C, 0x0013002D, 0x00130022, 0x00130022, 0x00130022,
@ -97,6 +119,7 @@ s32 fn_1_7754(SeqWork *work, char *mess)
AnimData **var_r21;
s16 var_r20;
s16 var_r19;
s32 var_r19_2;
var_r27 = lbl_1_data_B0;
for (var_r25 = 0; var_r25 < 0x10; var_r25++) {
@ -114,6 +137,46 @@ s32 fn_1_7754(SeqWork *work, char *mess)
if (var_r31[0] == 0x20 || var_r31[0] == 0x10) {
var_r30 += VERSION_JP ? 0x1C : 0xE;
}
#if VERSION_PAL
else if (*var_r31 >= 0x30) {
var_r19_2 = var_r27[*var_r31];
var_r21[var_r28] = HuSprAnimReadFile(var_r19_2);
var_r22[var_r28] = var_r30;
if ((*var_r31 >= 0x61) && (*var_r31 <= 0x7A)) {
var_r29[var_r28] = 2;
var_r30 += 0x12;
}
else if ((*var_r31 == 0xC2) || (*var_r31 == 0xC3) || (*var_r31 == 0xC7)) {
var_r29[var_r28] = 0;
var_r30 += 0x12;
}
else if (*var_r31 == 0xC6) {
var_r29[var_r28] = 0;
var_r30 += 0x18;
}
else if (*var_r31 == 0x5C) {
var_r29[var_r28] = 0;
var_r30 += 8;
}
else if ((*var_r31 >= 0x90) && (*var_r31 <= 0x9F)) {
var_r29[var_r28] = -2;
var_r30 += 0x18;
}
else if ((*var_r31 >= 0xD0) && (*var_r31 <= 0xEF)) {
var_r29[var_r28] = -2;
var_r30 += 0x12;
}
else if ((*var_r31 == 0x3D) || (*var_r31 == 0x84)) {
var_r29[var_r28] = 0;
var_r30 += 0x14;
}
else {
var_r29[var_r28] = 0;
var_r30 += 0x1C;
}
var_r28++;
}
#else
else if (var_r31[0] < 0x30) {
}
else if (var_r31[0] == 0x80) {
@ -180,6 +243,7 @@ s32 fn_1_7754(SeqWork *work, char *mess)
}
var_r28++;
}
#endif
}
var_r20 = HuSprGrpCreate(var_r28);
work->spr_grp[var_r25] = var_r20;

17
src/REL/ztardll/main.c
View file

@ -13,6 +13,8 @@
#include "REL/ztardll.h"
extern s32 charVoiceGroupStat[8];
void fn_1_1774(void);
void fn_1_1CF0(void);
void fn_1_1DA0(void);
@ -1106,7 +1108,7 @@ void fn_1_51BC(s16 arg0)
while (WipeStatGet() != 0) {
HuPrcVSleep();
}
#if VERSION_JP
#if !VERSION_ENG
if ((GWPlayerCfg->character >= 8) && (GWPlayerCfg->character >= 8) && (GWPlayerCfg->character >= 8) && (GWPlayerCfg->character >= 8)) {
msmMusStopAll(1, 0);
msmSeStopAll(1, 0);
@ -1122,6 +1124,11 @@ void fn_1_51BC(s16 arg0)
}
}
msmSysDelGroupBase(0);
#if VERSION_PAL
for (var_r31 = 0; var_r31 < 8; var_r31++) {
charVoiceGroupStat[var_r31] = 0;
}
#endif
}
#endif
var_r30 = omOvlHisGet(0);
@ -1258,6 +1265,9 @@ s32 fn_1_524C(s32 arg0)
var_r22 = &winData[var_r24];
HuWinPriSet(var_r24, 5);
HuWinPosSet(var_r24, (576.0f - var_r22->w) / 2, 300.0f);
#if VERSION_PAL
HuWinScaleSet(var_r24, 0.95f, 1.0f);
#endif
HuWinAttrSet(var_r24, 0x800);
var_r30 = 0;
var_r23 = 0;
@ -1419,6 +1429,11 @@ void fn_1_66F8(void)
for (var_r31 = 0; var_r31 < 4; var_r31++) {
GWPlayerCfg[var_r31].character = -1;
}
#if VERSION_PAL
for (var_r31 = 0; var_r31 < 8; var_r31++) {
charVoiceGroupStat[var_r31] = 0;
}
#endif
mgPracticeEnableF = 0;
omOvlReturnEx(1, 1);
HuPrcEnd();