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

Match pal modesel (#570)

Browse source 
* Match modesel.c

Also fully matches modules

* Match pal modesel
This commit is contained in:
Liam Coleman 2025-03-14 19:34:25 -05:00 • committed by GitHub
parent ece392140e
commit 4ee46b3396
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 127 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/REL/modeseldll/filesel.c
View file

@ -122,6 +122,9 @@ s32 fn_1_37DC(void)
}
if (!SLSaveFlagGet()) {
GWGameStatReset();
#if VERSION_PAL
_ClearFlag(0x1000B);
#endif
GWGameStat.sound_mode = msmSysGetOutputMode();
result = 1;
break;
@ -428,7 +431,11 @@ loop_exit:
temp_r29 = 0;
if (temp_r28 == -2) {
HuWinInsertMesSet(lbl_1_bss_148, MAKE_MESSID_PTR(lbl_1_data_278[temp_r31]), 0);
#if VERSION_PAL
HuWinMesSet(lbl_1_bss_148, MAKE_MESSID(16, 0x39));
#else
HuWinMesSet(lbl_1_bss_148, MAKE_MESSID(16, 0x37));
#endif
HuWinMesWait(lbl_1_bss_148);
temp_r29 = 1;
}
@ -970,6 +977,9 @@ s32 fn_1_61B4(void)
sp8 = OSGetTime();
SLSaveDataMake(1, &sp8);
GWGameStatReset();
#if VERSION_PAL
_ClearFlag(0x1000B);
#endif
GWGameStat.sound_mode = msmSysGetOutputMode();
SLCommonSet();
fn_1_B8CC(MAKE_MESSID(16, 0x3C));
@ -1011,6 +1021,13 @@ s32 fn_1_61B4(void)
if (SLCheckSumCheck()) {
fn_1_9E14();
SLLoadGameStat();
#if VERSION_PAL
if(GwLanguageSave != -1) {
GWGameStat.language = GwLanguageSave;
}
GwLanguage = GWGameStat.language;
_ClearFlag(0x1000B);
#endif
temp_r31 = 1;
break;
}
@ -1172,7 +1189,11 @@ s32 fn_1_76B4(char *name, s16 slotno)
}
if (result == -2) {
HuWinInsertMesSet(lbl_1_bss_148, MAKE_MESSID_PTR(lbl_1_data_278[slotno]), 0);
#if VERSION_PAL
HuWinMesSet(lbl_1_bss_148, MAKE_MESSID(16, 0x39));
#else
HuWinMesSet(lbl_1_bss_148, MAKE_MESSID(16, 0x37));
#endif
HuWinMesWait(lbl_1_bss_148);
return result;
}
@ -2002,6 +2023,16 @@ void fn_1_AAB8(void)
HuSprGrpPosSet(lbl_1_bss_110[temp_r30], sp14.x, sp14.y);
HuSprGrpScaleSet(lbl_1_bss_110[temp_r30], temp_f31, temp_f31);
OSTicksToCalendarTime(lbl_1_bss_D0[temp_r30], &sp20);
#if VERSION_PAL
temp_r29 = sp20.mday;
HuSprBankSet(lbl_1_bss_110[temp_r30], 0, temp_r29 / 10);
temp_r29 -= (temp_r29 / 10) * 10;
HuSprBankSet(lbl_1_bss_110[temp_r30], 1, temp_r29);
temp_r29 = sp20.mon+1;
HuSprBankSet(lbl_1_bss_110[temp_r30], 3, temp_r29 / 10);
temp_r29 -= (temp_r29 / 10) * 10;
HuSprBankSet(lbl_1_bss_110[temp_r30], 4, temp_r29);
#else
temp_r29 = sp20.mon + 1;
HuSprBankSet(lbl_1_bss_110[temp_r30], 0, temp_r29 / 10);
temp_r29 -= (temp_r29 / 10) * 10;
@ -2010,6 +2041,7 @@ void fn_1_AAB8(void)
HuSprBankSet(lbl_1_bss_110[temp_r30], 3, temp_r29 / 10);
temp_r29 -= (temp_r29 / 10) * 10;
HuSprBankSet(lbl_1_bss_110[temp_r30], 4, temp_r29);
#endif
temp_r29 = sp20.hour;
HuSprBankSet(lbl_1_bss_110[temp_r30], 6, temp_r29 / 10);
temp_r29 -= (temp_r29 / 10) * 10;

25
src/REL/modeseldll/main.c
View file

@ -84,17 +84,30 @@ void fn_1_414(void)
while (WipeStatGet()) {
HuPrcVSleep();
}
#if VERSION_PAL
if(GwLanguageSave != -1) {
GWGameStat.language = GwLanguageSave;
} else if(GwLanguage != -1) {
GWGameStat.language = GwLanguage;
}
#endif
omOvlReturnEx(1, 1);
while (1) {
HuPrcVSleep();
}
}
else {
s16 group = HuSprGrpCreate(1);
s16 sprite = HuTHPSprCreateVol("movie/opmov_s00.thp", 0, 3000, 70.0);
HuSprGrpMemberSet(group, 0, sprite);
HuSprPosSet(group, 0, 288, 240);
HuSprDrawNoSet(group, 0, 127);
s16 grpId;
s16 sprId;
#if VERSION_PAL
HuWinAllKill();
HuWinInit(1);
#endif
grpId = HuSprGrpCreate(1);
sprId = HuTHPSprCreateVol("movie/opmov_s00.thp", 0, 3000, 70.0);
HuSprGrpMemberSet(grpId, 0, sprId);
HuSprPosSet(grpId, 0, 288, 240);
HuSprDrawNoSet(grpId, 0, 127);
HuPrcSleep(2);
espAttrSet(lbl_1_bss_152[0], HUSPR_ATTR_DISPOFF);
HuAudFXStop(lbl_1_data_100);
@ -102,7 +115,7 @@ void fn_1_414(void)
HuPrcVSleep();
}
HuTHPClose();
HuSprGrpKill(group);
HuSprGrpKill(grpId);
}
}
espAttrReset(lbl_1_bss_152[9], HUSPR_ATTR_DISPOFF);

4
src/REL/modeseldll/modesel.c
View file

@ -213,7 +213,11 @@ s32 fn_1_2490(void)
}
_ClearFlag(FLAG_ID_MAKE(1, 11));
WipeColorSet(255, 255, 255);
#if VERSION_PAL
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 30);
#else
WipeCreate(WIPE_MODE_OUT, WIPE_TYPE_NORMAL, 10);
#endif
while (WipeStatGet()) {
HuPrcVSleep();
}