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

Finish BoardLast5GfxInit

Browse source
This commit is contained in:
gamemasterplc 2024-01-19 16:58:04 -06:00
parent 7301270cd2
commit 00d61c68d0
3 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
include/game/gamework_data.h
View file

@ -105,7 +105,7 @@ typedef struct player_state {
typedef struct game_stat { typedef struct game_stat {
/* 0x0 */ s16 unk_00; /* 0x0 */ s16 unk_00;
/* 0x2 */ s8 language; /* 0x2 */ u8 language;
/* 0x3 */ u8 sound_mode; /* 0x3 */ u8 sound_mode;
/* 0x4 */ s8 rumble; /* 0x4 */ s8 rumble;
/* 0x6 */ u16 total_stars; /* 0x6 */ u16 total_stars;
@ -147,4 +147,9 @@ extern PlayerState GWPlayer[4];
extern SystemState GWSystem; extern SystemState GWSystem;
extern GameStat GWGameStat; extern GameStat GWGameStat;
static inline s32 GWLanguageGet(void)
{
return GWGameStat.language;
}
#endif #endif

9
src/game/board/main.c
View file

@ -2042,13 +2042,8 @@ void BoardLast5GfxInit(void)
prio = 1400; prio = 1400;
} }
spr_file = last5GfxSprTbl[i]; spr_file = last5GfxSprTbl[i];
if(i == 2 && work->is_last) { if(i == 2 && work->is_last && GWLanguageGet() != 0) {
//FIXME: unnecessary extsb during comparison spr_file = MAKE_DATA_NUM(DATADIR_BOARD, 98);
s8 language = GWGameStat.language;
if(language != 0) {
spr_file = MAKE_DATA_NUM(DATADIR_BOARD, 98);
}
} }
BoardSpriteCreate(spr_file, prio, NULL, &work->sprites[i]); BoardSpriteCreate(spr_file, prio, NULL, &work->sprites[i]);
HuSprGrpMemberSet(work->group, i, work->sprites[i]); HuSprGrpMemberSet(work->group, i, work->sprites[i]);

4
src/game/window.c
View file

@ -201,14 +201,12 @@ void HuWindowInit(void) {
void HuWinInit(s32 mess_data_no) { void HuWinInit(s32 mess_data_no) {
s16 i; s16 i;
void *anim_data; void *anim_data;
s8 language;
if (!winProc) { if (!winProc) {
HuAR_ARAMtoMRAM(winAMemP); HuAR_ARAMtoMRAM(winAMemP);
winProc = HuPrcCreate(HuWinProc, 0x64, 0x1000, 0); winProc = HuPrcCreate(HuWinProc, 0x64, 0x1000, 0);
HuPrcSetStat(winProc, 0xC); HuPrcSetStat(winProc, 0xC);
language = GWGameStat.language; LanguageNo = GWLanguageGet();
LanguageNo = language;
messDataNo = mess_data_no; messDataNo = mess_data_no;
fontWidthP = (LanguageNo == 0) ? charWJTbl : charWETbl; fontWidthP = (LanguageNo == 0) ? charWJTbl : charWETbl;
HuWinMesRead(mess_data_no); HuWinMesRead(mess_data_no);