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

Split Japanese DOL till board/player.c

Browse source
This commit is contained in:
dbalatoni13 2024-11-26 19:12:16 +01:00
parent 3b50a4bdb7
commit 17020537fc
7 changed files with 263 additions and 177 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1988,11 +1988,15 @@ void BoardLast5GfxInit(void)
} else {
prio = 1400;
}
#if !VERSION_JPN
spr_file = last5GfxSprTbl[i];
if(i == 2 && work->is_last && GWLanguageGet() != 0) {
spr_file = DATA_MAKE_NUM(DATADIR_BOARD, 98);
}
BoardSpriteCreate(spr_file, prio, NULL, &work->sprites[i]);
#else
BoardSpriteCreate(last5GfxSprTbl[i], prio, NULL, &work->sprites[i]);
#endif
HuSprGrpMemberSet(work->group, i, work->sprites[i]);
HuSprAttrSet(work->group, i, HUSPR_ATTR_LINEAR);
HuSprPosSet(work->group, i, last5GfxPosTbl[lastF][i][0], last5GfxPosTbl[lastF][i][1]);
@ -2203,4 +2207,4 @@ void BoardDataAsyncWait(s32 status)
while(!HuDataGetAsyncStat(status)) {
HuPrcVSleep();
}
}
}

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

@ -137,6 +137,18 @@ static s32 bowserSuitCharMdlTbl[] = {
static s32 bowserSuitMotTbl[] = { DATA_MAKE_NUM(DATADIR_BKOOPASUIT, 0x19), DATA_MAKE_NUM(DATADIR_BKOOPASUIT, 0x1A),
DATA_MAKE_NUM(DATADIR_BKOOPASUIT, 0x1B), DATA_MAKE_NUM(DATADIR_BKOOPASUIT, 0x1E), DATA_MAKE_NUM(DATADIR_BKOOPASUIT, 0x1F) };
#if VERSION_JPN
static s32 sparkMotTbl[] = {
DATA_MAKE_NUM(DATADIR_BOARD, 0x94),
DATA_MAKE_NUM(DATADIR_BOARD, 0x95),
DATA_MAKE_NUM(DATADIR_BOARD, 0x96),
DATA_MAKE_NUM(DATADIR_BOARD, 0x97),
DATA_MAKE_NUM(DATADIR_BOARD, 0x98),
DATA_MAKE_NUM(DATADIR_BOARD, 0x99),
DATA_MAKE_NUM(DATADIR_BOARD, 0x9A),
DATA_MAKE_NUM(DATADIR_BOARD, 0x9B),
};
#else
static s32 sparkMotTbl[] = {
DATA_MAKE_NUM(DATADIR_BOARD, 0x95),
DATA_MAKE_NUM(DATADIR_BOARD, 0x96),
@ -147,6 +159,7 @@ static s32 sparkMotTbl[] = {
DATA_MAKE_NUM(DATADIR_BOARD, 0x9B),
DATA_MAKE_NUM(DATADIR_BOARD, 0x9C),
};
#endif
static s32 boardSparkSfxTbl[] = {
0x128,
@ -2499,7 +2512,7 @@ static s32 DoSparkSpace(s32 player, s32 pause_cam)
BoardCameraMotionWait();
BoardCameraTargetPlayerSet(player);
BoardPlayerIdleSet(player);
temp_r28 = BoardModelCreate(DATA_MAKE_NUM(DATADIR_BOARD, 0x74), NULL, 0);
temp_r28 = BoardModelCreate(DATA_MAKE_NUM(DATADIR_BOARD, VERSION_JPN ? 0x73 : 0x74), NULL, 0);
BoardModelMotionStart(temp_r28, 0, 0x40000002);
BoardModelMotionTimeSet(temp_r28, 30.0f);
BoardModelAttrSet(temp_r28, 0x40000002);
@ -2507,7 +2520,7 @@ static s32 DoSparkSpace(s32 player, s32 pause_cam)
BoardModelScaleSet(temp_r28, 2.0f, 2.0f, 2.0f);
BoardModelVisibilitySet(temp_r28, 0);
BoardModelLayerSet(temp_r28, 1);
sp2E = BoardModelCreate(DATA_MAKE_NUM(DATADIR_BOARD, 0x67), NULL, 0);
sp2E = BoardModelCreate(DATA_MAKE_NUM(DATADIR_BOARD, VERSION_JPN ? 0x66 : 0x67), NULL, 0);
BoardModelLayerSet(sp2E, 1);
BoardModelMotionStart(sp2E, 0, 0);
HuAudFXPlay(796);

29
src/game/sreset.c
View file

@ -22,7 +22,11 @@ extern s32 HuDvdErrWait;
static s32 SR_PreRstChk[4] = {};
#if VERSION_NTSC
#if VERSION_JPN
static s32 padding[4] = {};
#endif
#if VERSION_ENG
#include "coveropen_en.inc"
#include "fatalerror_en.inc"
@ -31,7 +35,7 @@ static s32 SR_PreRstChk[4] = {};
#include "retryerror_en.inc"
#include "wrongdisc_en.inc"
#else
#elif VERSION_PAL
#include "coveropen_en.inc"
#include "fatalerror_en.inc"
@ -68,6 +72,15 @@ static s32 SR_PreRstChk[4] = {};
#include "retryerror_sp.inc"
#include "wrongdisc_sp.inc"
#else
#include "coveropen_jp.inc"
#include "fatalerror_jp.inc"
#include "loading_jp.inc"
#include "nodisc_jp.inc"
#include "retryerror_jp.inc"
#include "wrongdisc_jp.inc"
#endif
static s16 SR_PushTime[4] = {};
@ -287,11 +300,11 @@ static void ToeDispCheck(void)
static void _HuDvdErrDispXFB(s32 error)
{
#if VERSION_NTSC
#if VERSION_ENG
static void *bmpMes[][6] = {
loading_en, coveropen_en, nodisc_en, wrongdisc_en, retryerror_en, fatalerror_en
loading_en, coveropen_en, nodisc_en, wrongdisc_en, retryerror_en, fatalerror_en
};
#else
#elif VERSION_PAL
static void *bmpMes[][6] = {
loading_en, coveropen_en, nodisc_en, wrongdisc_en, retryerror_en, fatalerror_en,
loading_fr, coveropen_fr, nodisc_fr, wrongdisc_fr, retryerror_fr, fatalerror_fr,
@ -299,6 +312,10 @@ static void _HuDvdErrDispXFB(s32 error)
loading_it, coveropen_it, nodisc_it, wrongdisc_it, retryerror_it, fatalerror_it,
loading_sp, coveropen_sp, nodisc_sp, wrongdisc_sp, retryerror_sp, fatalerror_sp
};
#else
static void *bmpMes[][6] = {
loading_jp, coveropen_jp, nodisc_jp, wrongdisc_jp, retryerror_jp, fatalerror_jp
};
#endif
s16 *bmpData;
@ -524,4 +541,4 @@ static void HuSoftResetPostProc(void)
HuPadRumbleAllStop();
SR_ExecReset = TRUE;
}
}
}