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

Port boards to JP

Browse source
This commit is contained in:
dbalatoni13 2024-12-14 22:42:43 +01:00
parent b5c05240c0
commit 9ddf82f14e
33 changed files with 1060 additions and 3349 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/REL/w01Dll/mg_item.c
View file

@ -83,10 +83,28 @@ static s16 lbl_1_bss_7A8;
static s32 lbl_1_bss_7A4;
static AnimData *lbl_1_bss_7A0;
static s32 lbl_1_data_F08[] = { DATA_MAKE_NUM(DATADIR_BOARD, 109), DATA_MAKE_NUM(DATADIR_BOARD, 110), DATA_MAKE_NUM(DATADIR_BOARD, 111),
DATA_MAKE_NUM(DATADIR_BOARD, 112), DATA_MAKE_NUM(DATADIR_BOARD, 113), DATA_MAKE_NUM(DATADIR_BOARD, 114), DATA_MAKE_NUM(DATADIR_BOARD, 115),
DATA_MAKE_NUM(DATADIR_BOARD, 116), DATA_MAKE_NUM(DATADIR_BOARD, 118), DATA_MAKE_NUM(DATADIR_BOARD, 119), DATA_MAKE_NUM(DATADIR_BOARD, 120),
DATA_MAKE_NUM(DATADIR_BOARD, 121), DATA_MAKE_NUM(DATADIR_BOARD, 122), DATA_MAKE_NUM(DATADIR_BOARD, 123) };
#if VERSION_JP
#define MDL_ID_SHIFT 0
#else
#define MDL_ID_SHIFT 1
#endif
static s32 lbl_1_data_F08[] = {
DATA_MAKE_NUM(DATADIR_BOARD, 108 + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 109 + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 110 + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 111 + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 112 + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 113 + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 114 + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 115 + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 117 + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 118 + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 119 + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 120 + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 121 + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 122 + MDL_ID_SHIFT),
};
static s32 lbl_1_data_F40[8] = { DATA_MAKE_NUM(DATADIR_MARIOMOT, 23), DATA_MAKE_NUM(DATADIR_LUIGIMOT, 23), DATA_MAKE_NUM(DATADIR_PEACHMOT, 23),
DATA_MAKE_NUM(DATADIR_YOSHIMOT, 23), DATA_MAKE_NUM(DATADIR_WARIOMOT, 23), DATA_MAKE_NUM(DATADIR_DONKEYMOT, 23),

34
src/REL/w02Dll/mg_item.c
View file

@ -10,21 +10,27 @@
#include "game/minigame_seq.h"
#if VERSION_JP
#define MDL_ID_SHIFT 0
#else
#define MDL_ID_SHIFT 1
#endif
s32 lbl_1_data_428[14] = {
DATA_MAKE_NUM(DATADIR_BOARD, 0x6D),
DATA_MAKE_NUM(DATADIR_BOARD, 0x6E),
DATA_MAKE_NUM(DATADIR_BOARD, 0x6F),
DATA_MAKE_NUM(DATADIR_BOARD, 0x70),
DATA_MAKE_NUM(DATADIR_BOARD, 0x71),
DATA_MAKE_NUM(DATADIR_BOARD, 0x72),
DATA_MAKE_NUM(DATADIR_BOARD, 0x73),
DATA_MAKE_NUM(DATADIR_BOARD, 0x74),
DATA_MAKE_NUM(DATADIR_BOARD, 0x76),
DATA_MAKE_NUM(DATADIR_BOARD, 0x77),
DATA_MAKE_NUM(DATADIR_BOARD, 0x78),
DATA_MAKE_NUM(DATADIR_BOARD, 0x79),
DATA_MAKE_NUM(DATADIR_BOARD, 0x7A),
DATA_MAKE_NUM(DATADIR_BOARD, 0x7B),
DATA_MAKE_NUM(DATADIR_BOARD, 0x6C + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 0x6D + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 0x6E + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 0x6F + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 0x70 + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 0x71 + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 0x72 + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 0x73 + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 0x75 + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 0x76 + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 0x77 + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 0x78 + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 0x79 + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 0x7A + MDL_ID_SHIFT),
};
char *lbl_1_data_474[3] = { "item", "item1", "item2" };

34
src/REL/w03Dll/mg_item.c
View file

@ -106,21 +106,27 @@ s8 lbl_1_data_4E6[] = { 1, 1, 3, 3, 2, 2, 2, 1, 2, 3, 0, 4, 5, 0 };
char *lbl_1_data_508[] = { "item", "item1", "item2" };
#if VERSION_JP
#define MDL_ID_SHIFT 0
#else
#define MDL_ID_SHIFT 1
#endif
s32 lbl_1_data_514[] = {
DATA_MAKE_NUM(DATADIR_BOARD, 0x6D),
DATA_MAKE_NUM(DATADIR_BOARD, 0x6E),
DATA_MAKE_NUM(DATADIR_BOARD, 0x6F),
DATA_MAKE_NUM(DATADIR_BOARD, 0x70),
DATA_MAKE_NUM(DATADIR_BOARD, 0x71),
DATA_MAKE_NUM(DATADIR_BOARD, 0x72),
DATA_MAKE_NUM(DATADIR_BOARD, 0x73),
DATA_MAKE_NUM(DATADIR_BOARD, 0x74),
DATA_MAKE_NUM(DATADIR_BOARD, 0x76),
DATA_MAKE_NUM(DATADIR_BOARD, 0x77),
DATA_MAKE_NUM(DATADIR_BOARD, 0x78),
DATA_MAKE_NUM(DATADIR_BOARD, 0x79),
DATA_MAKE_NUM(DATADIR_BOARD, 0x7A),
DATA_MAKE_NUM(DATADIR_BOARD, 0x7B),
DATA_MAKE_NUM(DATADIR_BOARD, 0x6C + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 0x6D + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 0x6E + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 0x6F + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 0x70 + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 0x71 + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 0x72 + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 0x73 + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 0x75 + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 0x76 + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 0x77 + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 0x78 + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 0x79 + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 0x7A + MDL_ID_SHIFT),
};
// BSS

2
src/REL/w04Dll/big_boo.c
View file

@ -913,7 +913,7 @@ static void fn_1_8A60(void) {
HuPrcVSleep();
}
fn_1_7300();
#if VERSION_NTSC
#if VERSION_ENG
sprintf(sp10, "%d", var_r29);
BoardWinCreate(2, MAKE_MESSID(32, 11), 9);
BoardWinInsertMesSet(MAKE_MESSID_PTR(sp10), 0);

34
src/REL/w04Dll/mg_item.c
View file

@ -45,21 +45,27 @@ static s32 lbl_1_data_534[] = {
0x00000468
};
#if VERSION_JP
#define MDL_ID_SHIFT 0
#else
#define MDL_ID_SHIFT 1
#endif
static s32 lbl_1_data_540[] = {
DATA_MAKE_NUM(DATADIR_BOARD, 109),
DATA_MAKE_NUM(DATADIR_BOARD, 110),
DATA_MAKE_NUM(DATADIR_BOARD, 111),
DATA_MAKE_NUM(DATADIR_BOARD, 112),
DATA_MAKE_NUM(DATADIR_BOARD, 113),
DATA_MAKE_NUM(DATADIR_BOARD, 114),
DATA_MAKE_NUM(DATADIR_BOARD, 115),
DATA_MAKE_NUM(DATADIR_BOARD, 116),
DATA_MAKE_NUM(DATADIR_BOARD, 118),
DATA_MAKE_NUM(DATADIR_BOARD, 119),
DATA_MAKE_NUM(DATADIR_BOARD, 120),
DATA_MAKE_NUM(DATADIR_BOARD, 121),
DATA_MAKE_NUM(DATADIR_BOARD, 122),
DATA_MAKE_NUM(DATADIR_BOARD, 123),
DATA_MAKE_NUM(DATADIR_BOARD, 108 + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 109 + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 110 + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 111 + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 112 + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 113 + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 114 + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 115 + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 117 + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 118 + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 119 + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 120 + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 121 + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 122 + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_W02, 24),
DATA_MAKE_NUM(DATADIR_W02, 25),
DATA_MAKE_NUM(DATADIR_W02, 26),

34
src/REL/w05Dll/mg_item.c
View file

@ -172,21 +172,27 @@ void fn_1_7400(void)
HuPrcEnd();
}
#if VERSION_JP
#define MDL_ID_SHIFT 0
#else
#define MDL_ID_SHIFT 1
#endif
s32 lbl_1_data_350[14] = {
DATA_MAKE_NUM(DATADIR_BOARD, 0x6D),
DATA_MAKE_NUM(DATADIR_BOARD, 0x6E),
DATA_MAKE_NUM(DATADIR_BOARD, 0x6F),
DATA_MAKE_NUM(DATADIR_BOARD, 0x70),
DATA_MAKE_NUM(DATADIR_BOARD, 0x71),
DATA_MAKE_NUM(DATADIR_BOARD, 0x72),
DATA_MAKE_NUM(DATADIR_BOARD, 0x73),
DATA_MAKE_NUM(DATADIR_BOARD, 0x74),
DATA_MAKE_NUM(DATADIR_BOARD, 0x76),
DATA_MAKE_NUM(DATADIR_BOARD, 0x77),
DATA_MAKE_NUM(DATADIR_BOARD, 0x78),
DATA_MAKE_NUM(DATADIR_BOARD, 0x79),
DATA_MAKE_NUM(DATADIR_BOARD, 0x7A),
DATA_MAKE_NUM(DATADIR_BOARD, 0x7B),
DATA_MAKE_NUM(DATADIR_BOARD, 0x6C + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 0x6D + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 0x6E + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 0x6F + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 0x70 + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 0x71 + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 0x72 + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 0x73 + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 0x75 + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 0x76 + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 0x77 + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 0x78 + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 0x79 + MDL_ID_SHIFT),
DATA_MAKE_NUM(DATADIR_BOARD, 0x7A + MDL_ID_SHIFT),
};
s16 lbl_1_data_388[92] = { 0, 1, -1, 2, 0, -1, 1, 2, 0, -1, 2, 1, 0, 2, -1, 1, 0, 2, 1, -1, 1, 2, -1, 0, 1, 2, 0, -1, 1, -1, 0, 2, 1, -1, 2, 0, 1, 0,

8
src/REL/w06Dll/bowser.c
View file

@ -89,6 +89,12 @@ static s32 lbl_1_data_4CC[8] = {
0x000002E3
};
#if VERSION_JP
#define MDL_ID_SHIFT 0
#else
#define MDL_ID_SHIFT 1
#endif
static s32 lbl_1_data_4EC[] = {
DATA_MAKE_NUM(DATADIR_BKOOPA, 8),
DATA_MAKE_NUM(DATADIR_BKOOPA, 10),
@ -1036,7 +1042,7 @@ static void fn_1_C40C(void) {
BoardCameraMotionWait();
BoardCameraTargetModelSet(-1);
BoardModelRotYSet(lbl_1_data_498, var_f30);
lbl_1_data_4A0 = BoardModelCreate(DATA_MAKE_NUM(DATADIR_BOARD, 99), NULL, 0);
lbl_1_data_4A0 = BoardModelCreate(DATA_MAKE_NUM(DATADIR_BOARD, 98 + MDL_ID_SHIFT), NULL, 0);
BoardModelVisibilitySet(lbl_1_data_4A0, 0);
BoardModelLayerSet(lbl_1_data_4A0, 2);
var_r29 = BoardSpaceStarGet(lbl_1_bss_0->unk04 - 1);