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

extend all known arrays/data for custom boards (game doesn't boot)

Browse source
This commit is contained in:
Rainchus 2024-08-02 18:24:40 -05:00
parent 75c841640c
commit 0b964b2f98
13 changed files with 237 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/datadir_table.h
View file

@ -137,4 +137,5 @@ DATADIR_DEFINE(YOSHI, "data/yoshi.bin")
DATADIR_DEFINE(YOSHIMDL0, "data/yoshimdl0.bin")
DATADIR_DEFINE(YOSHIMDL1, "data/yoshimdl1.bin")
DATADIR_DEFINE(YOSHIMOT, "data/yoshimot.bin")
DATADIR_DEFINE(ZTAR, "data/ztar.bin")
DATADIR_DEFINE(ZTAR, "data/ztar.bin")
DATADIR_DEFINE(W07, "data/w07.bin")

14
src/game/board/audio.c
View file

@ -8,10 +8,18 @@ static s16 boardSeq[2][2];
static s32 boardFX = -1;
//mod: add new music id for extra board
static s16 boardMusTbl[] = {
0x000D, 0x0011, 0x0015,
0x001C, 0x0021, 0x0025,
0x0028, 0x0029, 0x002A
/* [BOARD_ID_MAIN1] */ 0x000D,
/* [BOARD_ID_MAIN2] */ 0x0011,
/* [BOARD_ID_MAIN3] */ 0x0015,
/* [BOARD_ID_MAIN4] */ 0x001C,
/* [BOARD_ID_MAIN5] */ 0x0021,
/* [BOARD_ID_MAIN6] */ 0x0025,
/* [BOARD_ID_TUTORIAL] */ 0x0028,
/* [BOARD_ID_EXTRA1] */ 0x0029,
/* [BOARD_ID_EXTRA2] */ 0x002A,
/* [BOARD_ID_CUSTOM] */ 0x002A,
};
void BoardMusStartBoard(void) {

3
src/game/board/battle.c
View file

@ -159,7 +159,8 @@ static void ExecBattle(void) {
DATADIR_W06,
DATADIR_W10,
DATADIR_W20,
DATADIR_W21
DATADIR_W21,
DATADIR_W07
};
var_r29 = mgInfoTbl;

1
src/game/board/boo.c
View file

@ -182,6 +182,7 @@ static s32 booSfxTbl[4][8] = {
}
};
//mod: extend for custom board
static s32 hostMess[] = {
MAKE_MESSID(7, 14),
MAKE_MESSID(7, 20),

70
src/game/board/boo_house.c
View file

@ -21,35 +21,57 @@
static s16 houseMdl[6];
// data
static s32 hostMesTbl[6][6] = {
{ 0x7000C, 0x7000D, 0x7000E, 0x7000F, 0x70010, 0x70011 },
{ 0x70012, 0x70013, 0x70014, 0x70015, 0x70016, 0x70017 },
{ 0x70018, 0x70019, 0x7001A, 0x7001B, 0x7001C, 0x7001D },
{ 0x7001E, 0x7001F, 0x70020, 0x70021, 0x70022, 0x70023 },
{ 0x70024, 0x70025, 0x70026, 0x70027, 0x70028, 0x70029 },
{ 0x7002A, 0x7002B, 0x7002C, 0x7002D, 0x7002E, 0x7002F },
//mod: add entry for custom board
static s32 hostMesTbl[10][9] = {
/* [BOARD_ID_MAIN1] */ { 0x7000C, 0x7000D, 0x7000E, 0x7000F, 0x70010, 0x70011 },
/* [BOARD_ID_MAIN2] */ { 0x70012, 0x70013, 0x70014, 0x70015, 0x70016, 0x70017 },
/* [BOARD_ID_MAIN3] */ { 0x70018, 0x70019, 0x7001A, 0x7001B, 0x7001C, 0x7001D },
/* [BOARD_ID_MAIN4] */ { 0x7001E, 0x7001F, 0x70020, 0x70021, 0x70022, 0x70023 },
/* [BOARD_ID_MAIN5] */ { 0x70024, 0x70025, 0x70026, 0x70027, 0x70028, 0x70029 },
/* [BOARD_ID_MAIN6] */ { 0x7002A, 0x7002B, 0x7002C, 0x7002D, 0x7002E, 0x7002F },
//dummy data
/* [BOARD_ID_TUTORIAL] */ { 0x7002A, 0x7002B, 0x7002C, 0x7002D, 0x7002E, 0x7002F },
/* [BOARD_ID_EXTRA2] */ { 0x7002A, 0x7002B, 0x7002C, 0x7002D, 0x7002E, 0x7002F },
//custom board data
/* [BOARD_ID_CUSTOM] */ { 0x7002A, 0x7002B, 0x7002C, 0x7002D, 0x7002E, 0x7002F },
};
static BoardModelParam houseMdlTbl[6] = {
{ 0x90000, { 0, 1, 0, 0, 0 }, 0xFFFF },
{ 0x90001, { 1, 1, 0, 0, 0 }, 0xFFFF },
{ 0x90003, { 1, 1, 0, 0, 0 }, 0xFFFF },
{ 0x90004, { 1, 1, 0, 0, 0 }, 0xFFFF },
{ 0x90004, { 1, 1, 0, 0, 0 }, 0xFFFF },
{ 0x90007, { 0, 1, 0, 0, 0 }, 0xFFFF },
//mod: add entry for custom board
static BoardModelParam houseMdlTbl[10] = {
/* [BOARD_ID_MAIN1] */ { 0x90000, { 0, 1, 0, 0, 0 }, 0xFFFF },
/* [BOARD_ID_MAIN2] */ { 0x90001, { 1, 1, 0, 0, 0 }, 0xFFFF },
/* [BOARD_ID_MAIN3] */ { 0x90003, { 1, 1, 0, 0, 0 }, 0xFFFF },
/* [BOARD_ID_MAIN4] */ { 0x90004, { 1, 1, 0, 0, 0 }, 0xFFFF },
/* [BOARD_ID_MAIN5] */ { 0x90004, { 1, 1, 0, 0, 0 }, 0xFFFF },
/* [BOARD_ID_MAIN6] */ { 0x90007, { 0, 1, 0, 0, 0 }, 0xFFFF },
//dummy data
/* [BOARD_ID_TUTORIAL] */ { 0x90007, { 0, 1, 0, 0, 0 }, 0xFFFF },
/* [BOARD_ID_EXTRA1] */ { 0x90007, { 0, 1, 0, 0, 0 }, 0xFFFF },
/* [BOARD_ID_EXTRA2] */ { 0x90007, { 0, 1, 0, 0, 0 }, 0xFFFF },
//custom board data
/* [BOARD_ID_CUSTOM] */ { 0x90007, { 0, 1, 0, 0, 0 }, 0xFFFF },
};
static s32 booMotTbl[3] = {
0x20013, 0x20016, 0xFFFFFFFF
};
static s32 houseMotTbl[9][3] = {
{ 0x20001, 0x20003, 0x20004 },
{ 0x20009, 0x2000B, 0x2000C },
{ 0x2000E, 0x20010, 0x20011 },
{ 0x20018, 0x2001A, 0x2001B },
{ 0x2001D, 0x2001F, 0x20020 },
{ 0x20022, 0x20024, 0x20025 },
{ 0x20018, 0x2001A, 0x2001B },
{ 0x20001, 0x20003, 0x20004 },
{ 0x20001, 0x20003, 0x20004 }
//mod: add entry for custom board
static s32 houseMotTbl[10][3] = {
/* [BOARD_ID_MAIN1] */ { 0x20001, 0x20003, 0x20004 },
/* [BOARD_ID_MAIN2] */ { 0x20009, 0x2000B, 0x2000C },
/* [BOARD_ID_MAIN3] */ { 0x2000E, 0x20010, 0x20011 },
/* [BOARD_ID_MAIN4] */ { 0x20018, 0x2001A, 0x2001B },
/* [BOARD_ID_MAIN5] */ { 0x2001D, 0x2001F, 0x20020 },
/* [BOARD_ID_MAIN6] */ { 0x20022, 0x20024, 0x20025 },
/* [BOARD_ID_TUTORIAL] */ { 0x20018, 0x2001A, 0x2001B },
/* [BOARD_ID_EXTRA1] */ { 0x20001, 0x20003, 0x20004 },
/* [BOARD_ID_EXTRA2] */ { 0x20001, 0x20003, 0x20004 },
/* [BOARD_ID_CUSTOM] */ { 0x20001, 0x20003, 0x20004 }
};
// sbss

4
src/game/board/com.c
View file

@ -736,9 +736,9 @@ s32 BoardComJunctionInputGet(s32 item, Vec *input, s32 num_dirs, float *dirs) {
choose_path = 0;
}
if (choose_path != 0) {
if (board >= 0 && board <= 5) {
if (board >= BOARD_ID_MAIN1 && board <= BOARD_ID_MAIN6) {
space_next = BoardComPathBestGet(space);
} else if (board == 7) {
} else if (board == BOARD_ID_EXTRA1) {
space_next = BoardComPathBestGetFlag(space, 0x10000000, 10);
}
if (space_next == -1) {

26
src/game/board/item.c
View file

@ -169,7 +169,12 @@ static s32 itemMdlTbl[] = {
};
static s32 forceMoveSfxTbl[] = {
0x38, 0x45, 0x42, 0x4D, 0x48, 0x3F
0x38,
0x45,
0x42,
0x4D,
0x48,
0x3F
};
static s32 callMotTbl[] = {
@ -194,22 +199,39 @@ static char *callHookTbl[] = {
"c007m01-itemhook-r"
};
//mod: add data for custom board
static s32 callAttackMotTbl[] = {
DATA_MAKE_NUM(DATADIR_W01, 31),
DATA_MAKE_NUM(DATADIR_W02, 5),
DATA_MAKE_NUM(DATADIR_W03, 29),
DATA_MAKE_NUM(DATADIR_W04, 9),
DATA_MAKE_NUM(DATADIR_W05, 7),
DATA_MAKE_NUM(DATADIR_W06, 19),
//dummy data for extra boards
DATA_MAKE_NUM(DATADIR_W06, 19),
DATA_MAKE_NUM(DATADIR_W06, 19),
DATA_MAKE_NUM(DATADIR_W06, 19),
//Mod TODO: update this to w07
DATA_MAKE_NUM(DATADIR_W06, 19)
};
//mod: add data for custom board
static s32 callAttackMotTbl2[] = {
DATA_MAKE_NUM(DATADIR_W01, 32),
DATA_MAKE_NUM(DATADIR_W02, 6),
DATA_MAKE_NUM(DATADIR_W03, 30),
DATA_MAKE_NUM(DATADIR_W04, 10),
DATA_MAKE_NUM(DATADIR_W05, 8),
DATA_MAKE_NUM(DATADIR_W06, 20)
DATA_MAKE_NUM(DATADIR_W06, 20),
DATA_MAKE_NUM(DATADIR_W06, 20),
DATA_MAKE_NUM(DATADIR_W06, 20),
DATA_MAKE_NUM(DATADIR_W06, 20),
//Mod TODO: update this to w07
DATA_MAKE_NUM(DATADIR_W06, 20),
};
static s32 suitMotTbl[][2] = {

11
src/game/board/lottery.c
View file

@ -247,6 +247,7 @@ void BoardLotteryInit(void) {
}
}
//mod: extend for custom board
static void CreateModel(void) {
s32 i;
s32 sp10[4] = {
@ -259,7 +260,8 @@ static void CreateModel(void) {
DATA_MAKE_NUM(DATADIR_BKUJIYA, 3),
DATA_MAKE_NUM(DATADIR_BKUJIYA, 4)
};
s32 sp20[9][4] = {
//Mod TODO: fix custom data for board
s32 sp20[10][4] = {
{
DATA_MAKE_NUM(DATADIR_BGUEST, 1),
DATA_MAKE_NUM(DATADIR_BGUEST, 2),
@ -308,6 +310,13 @@ static void CreateModel(void) {
DATA_MAKE_NUM(DATADIR_BGUEST, 44),
DATA_MAKE_NUM(DATADIR_BGUEST, 45)
},
{
DATA_MAKE_NUM(DATADIR_BGUEST, 42),
DATA_MAKE_NUM(DATADIR_BGUEST, 43),
DATA_MAKE_NUM(DATADIR_BGUEST, 44),
DATA_MAKE_NUM(DATADIR_BGUEST, 45)
},
//Mod TODO: added for custom board
{
DATA_MAKE_NUM(DATADIR_BGUEST, 42),
DATA_MAKE_NUM(DATADIR_BGUEST, 43),

32
src/game/board/mg_setup.c
View file

@ -76,9 +76,19 @@ static Vec statusLayout2Vs2[4] = {
{ 406.0f, 260.0f, 0.0f },
{ 406.0f, 348.0f, 0.0f },
};
static s32 luckyMessTbl[9] = {
0x00140000, 0x00140005, 0x0014000A, 0x0014000F,
0x00140014, 0x00140019, 0x00140000, 0x00140000,
//mod: extend for custom board
static s32 luckyMessTbl[10] = {
0x00140000,
0x00140005,
0x0014000A,
0x0014000F,
0x00140014,
0x00140019,
0x00140000,
0x00140000,
0x00140000,
//added for custom board
0x00140000
};
@ -144,10 +154,18 @@ static inline s32 setupObjGet(void) {
}
static void ExecMGSetup(void) {
s32 sp60[9] = {
0x750000, 0x760000, 0x770000,
0x780000, 0x790000, 0x7A0000,
0x7B0000, 0x7C0000, 0x7D0000
s32 sp60[10] = {
0x750000,
0x760000,
0x770000,
0x780000,
0x790000,
0x7A0000,
0x7B0000,
0x7C0000,
0x7D0000,
//added for custom board
0x7D0000
};
Vec sp54;
u16 var_r24;

13
src/game/board/pause.c
View file

@ -113,6 +113,7 @@ static float padConfigPosTbl[4][2] = {
{ 458.0f, 160.0f }
};
//mod: extend for custom board
static s32 boardLogoTbl[] = {
DATA_MAKE_NUM(DATADIR_BOARD, 87),
DATA_MAKE_NUM(DATADIR_BOARD, 88),
@ -122,6 +123,8 @@ static s32 boardLogoTbl[] = {
DATA_MAKE_NUM(DATADIR_BOARD, 92),
DATA_MAKE_NUM(DATADIR_BOARD, 87),
DATA_MAKE_NUM(DATADIR_BOARD, 93),
DATA_MAKE_NUM(DATADIR_BOARD, 94),
//added for custom board
DATA_MAKE_NUM(DATADIR_BOARD, 94)
};
@ -288,7 +291,7 @@ void CreatePauseScreen(void) {
HuSprZRotSet(pauseSprGrp, 2, -30.0f);
HuSprPosSet(pauseSprGrp, 2, 87.0f, 245.0f);
HuSprAttrSet(pauseSprGrp, 2, 8);
if (GWBoardGet() == 7 || GWBoardGet() == 8) {
if (GWBoardGet() == BOARD_ID_EXTRA1 || GWBoardGet() == BOARD_ID_EXTRA2) {
HuSprAttrSet(pauseSprGrp, 2, 4);
}
if (GWPartyGet() == 1) {
@ -332,7 +335,7 @@ void CreatePauseScreen(void) {
hostOldLayer = BoardModelLayerGet(hostMdl);
BoardModelLayerSet(hostMdl, 6);
sp24.x = 68.0f;
if (GWBoardGet() == 3) {
if (GWBoardGet() == BOARD_ID_MAIN4) {
sp24.y = 464.0f;
} else {
sp24.y = 434.0f;
@ -466,7 +469,7 @@ static void DeletePauseScreen(void) {
BoardModelVisibilitySet(hostMdl, 1);
BoardModelMtxSet(hostMdl, &sp8);
BoardStarHostSet(hostMdl);
if (GWBoardGet() == 7 || GWBoardGet() == 8) {
if (GWBoardGet() == BOARD_ID_EXTRA1 || GWBoardGet() == BOARD_ID_EXTRA2) {
BoardModelVisibilitySet(hostMdl, 0);
}
}
@ -1278,7 +1281,7 @@ static void CreatePauseControlWin(void) {
HuWinMesSpeedSet(settingsControlWin, 0);
HuWinMesSet(settingsControlWin, var_r31);
HuWinDispOff(settingsControlWin);
if (GWBoardGet() == 7 || GWBoardGet() == 8) {
if (GWBoardGet() == BOARD_ID_EXTRA1 || GWBoardGet() == BOARD_ID_EXTRA2) {
var_r31 = MAKE_MESSID(16, 73);
} else {
var_r31 = MAKE_MESSID(16, 52);
@ -1325,7 +1328,7 @@ static s32 WaitPauseInput(void) {
u32 temp_r30;
mainScreenF = 1;
if (GWBoardGet() == 7 || GWBoardGet() == 8) {
if (GWBoardGet() == BOARD_ID_EXTRA1 || GWBoardGet() == BOARD_ID_EXTRA2) {
var_r28 = 1;
} else {
var_r28 = 0;

22
src/game/board/star.c
View file

@ -72,7 +72,8 @@ static Process *starProc;
static s16 starParman = -1;
static s16 hostMdl = -1;
const s32 lbl_8011E040[9] = {
//mod: extend for custom board
const s32 lbl_8011E040[10] = {
MAKE_MESSID(12, 0),
MAKE_MESSID(12, 9),
MAKE_MESSID(12, 18),
@ -81,10 +82,13 @@ const s32 lbl_8011E040[9] = {
MAKE_MESSID(12, 45),
MAKE_MESSID(12, 0),
MAKE_MESSID(12, 0),
MAKE_MESSID(12, 0),
//Mod TODO: fix for custom board data
MAKE_MESSID(12, 0)
};
const s32 lbl_8011E064[9][2] = {
//mod: extend for custom board
const s32 lbl_8011E064[10][2] = {
{ MAKE_MESSID(21, 34), MAKE_MESSID(21, 40) },
{ MAKE_MESSID(21, 35), MAKE_MESSID(21, 41) },
{ MAKE_MESSID(21, 36), MAKE_MESSID(21, 42) },
@ -93,6 +97,9 @@ const s32 lbl_8011E064[9][2] = {
{ MAKE_MESSID(21, 39), MAKE_MESSID(21, 45) },
{ MAKE_MESSID(21, 34), MAKE_MESSID(21, 40) },
{ MAKE_MESSID(21, 34), MAKE_MESSID(21, 40) },
{ MAKE_MESSID(21, 34), MAKE_MESSID(21, 40) },
//Mod TODO: fix for custom board data
{ MAKE_MESSID(21, 34), MAKE_MESSID(21, 40) }
};
@ -107,12 +114,21 @@ s32 boardStarSndTbl[] = {
0x000002E0
};
static s32 hostMotTbl[9][2] = {
//mod: extend for custom board
static s32 hostMotTbl[10][2] = {
{ DATA_MAKE_NUM(DATADIR_W01, 33), DATA_MAKE_NUM(DATADIR_BOARD, 157) },
{ DATA_MAKE_NUM(DATADIR_W02, 7), DATA_MAKE_NUM(DATADIR_BOARD, 158) },
{ DATA_MAKE_NUM(DATADIR_W03, 31), DATA_MAKE_NUM(DATADIR_BOARD, 159) },
{ DATA_MAKE_NUM(DATADIR_W04, 11), DATA_MAKE_NUM(DATADIR_BOARD, 160) },
{ DATA_MAKE_NUM(DATADIR_W05, 9), DATA_MAKE_NUM(DATADIR_BOARD, 161) },
{ DATA_MAKE_NUM(DATADIR_W06, 21), DATA_MAKE_NUM(DATADIR_BOARD, 162) },
//dummy data
{ DATA_MAKE_NUM(DATADIR_W06, 21), DATA_MAKE_NUM(DATADIR_BOARD, 162) },
{ DATA_MAKE_NUM(DATADIR_W06, 21), DATA_MAKE_NUM(DATADIR_BOARD, 162) },
{ DATA_MAKE_NUM(DATADIR_W06, 21), DATA_MAKE_NUM(DATADIR_BOARD, 162) },
//Mod TODO: fix for custom board data
{ DATA_MAKE_NUM(DATADIR_W06, 21), DATA_MAKE_NUM(DATADIR_BOARD, 162) }
};

19
src/game/board/start.c
View file

@ -89,7 +89,7 @@ static s32 hitFX[4] = {
-1, -1, -1, -1
};
static s32 startMesTbl[9][5] = {
static s32 startMesTbl[10][5] = {
{ 0x00150001, 0x00150007, 0x0015000D, 0x00150016, 0x0015001C },
{ 0x00150002, 0x00150008, 0x0015000E, 0x00150017, 0x0015001D },
{ 0x00150003, 0x00150009, 0x0015000F, 0x00150018, 0x0015001E },
@ -98,13 +98,24 @@ static s32 startMesTbl[9][5] = {
{ 0x00150006, 0x0015000C, 0x00150012, 0x0015001B, 0x00150021 },
{ 0x00150001, 0x00150007, 0x0015000D, 0x00150016, 0x0015001C },
{ 0x00150033, 0x00150034, 0x00150035, 0x00150036, 0x00150037 },
{ 0x0015003B, 0x0015003C, 0x0015003D, 0x0015003E, 0x0015003F },
//Mod TODO: fix for custom board data
{ 0x0015003B, 0x0015003C, 0x0015003D, 0x0015003E, 0x0015003F }
};
//mod: extend for custom board
static s32 logoSprTbl[] = {
0x00070057, 0x00070058, 0x00070059,
0x0007005A, 0x0007005B, 0x0007005C,
0x00070057, 0x0007005D, 0x0007005E
0x00070057,
0x00070058,
0x00070059,
0x0007005A,
0x0007005B,
0x0007005C,
0x00070057,
0x0007005D,
0x0007005E,
//Mod TODO: custom board data
0x0007005E
};
void BoardStartExec(void) {

90
src/game/board/view.c
View file

@ -58,40 +58,94 @@ static float overhead2DPos[][2] = {
{ 288.0f, 72.0f }
};
//mod: extend for custom board
static float mapViewMinZ[] = {
-2000.0f, -1500.0f, -2200.0f,
-1800.0f, -2100.0f, -3000.0f,
-3000.0f, -1800.0f, -1800.0f
-2000.0f,
-1500.0f,
-2200.0f,
-1800.0f,
-2100.0f,
-3000.0f,
-3000.0f,
-1800.0f,
-1800.0f,
//Mod TODO: fix data for custom board
-1800.0f
};
//mod: extend for custom board
static float mapViewMaxZ[] = {
2300.0f, 2500.0f, 2600.0f,
2000.0f, 2300.0f, 2500.0f,
2500.0f, 2000.0f, 2000.0f
2300.0f,
2500.0f,
2600.0f,
2000.0f,
2300.0f,
2500.0f,
2500.0f,
2000.0f,
2000.0f,
//Mod TODO: fix for custom board data
2000.0f
};
//mod: extend for custom board
static float mapViewMinX[] = {
-3000.0f, -3000.0f, -3000.0f,
-3000.0f, -3000.0f, -3000.0f,
-3000.0f, -2000.0f, -2000.0f
-3000.0f,
-3000.0f,
-3000.0f,
-3000.0f,
-3000.0f,
-3000.0f,
-3000.0f,
-2000.0f,
-2000.0f,
//Mod TODO: fix for custom board data
-2000.0f
};
//mod: extend for custom board
static float mapViewMaxX[] = {
3000.0f, 3000.0f, 3000.0f,
3000.0f, 3000.0f, 3000.0f,
3000.0f, 1600.0f, 2000.0f
3000.0f,
3000.0f,
3000.0f,
3000.0f,
3000.0f,
3000.0f,
3000.0f,
1600.0f,
2000.0f,
//Mod TODO: fix for custom board data
2000.0f,
};
//mod: extend for custom board
static float overheadCamZoom[] = {
14370.0f, 14500.0f, 15000.0f,
15000.0f, 13000.0f, 15000.0f,
100.0f, 10000.0f, 10000.0f
14370.0f,
14500.0f,
15000.0f,
15000.0f,
13000.0f,
15000.0f,
100.0f,
10000.0f,
10000.0f,
//Mod TODO: fix for custom board data
10000.0f
};
//mod: extend for custom board
static float overheadCamPosZ[] = {
0.0f, 0.0f, 0.0f,
0.0f, 0.0f, 0.0f,
0.0f, -160.0f, 0.0f
0.0f,
0.0f,
0.0f,
0.0f,
0.0f,
0.0f,
0.0f,
-160.0f,
0.0f,
//Mod TODO: fix for custom board data
0.0f
};
void BoardViewOverheadExec(s32 arg0) {