add a few arrays that were missed and more //mod: comments for extended arrays

This commit is contained in:
Rainchus 2024-08-02 18:33:51 -05:00
parent 0b964b2f98
commit eacafb838b
9 changed files with 29 additions and 10 deletions

View file

@ -150,6 +150,7 @@ static void ExecBattle(void) {
s32 var_r23; s32 var_r23;
MgInfo *var_r29; MgInfo *var_r29;
s32 var_r27 = 0; s32 var_r27 = 0;
//mod: extend for custom board
s32 sp8[] = { s32 sp8[] = {
DATADIR_W01, DATADIR_W01,
DATADIR_W02, DATADIR_W02,

View file

@ -189,7 +189,15 @@ static s32 hostMess[] = {
MAKE_MESSID(7, 26), MAKE_MESSID(7, 26),
MAKE_MESSID(7, 32), MAKE_MESSID(7, 32),
MAKE_MESSID(7, 38), MAKE_MESSID(7, 38),
MAKE_MESSID(7, 44) MAKE_MESSID(7, 44),
//dummy data for tutorial and extra board
MAKE_MESSID(7, 44),
MAKE_MESSID(7, 44),
MAKE_MESSID(7, 44),
//custom board data
MAKE_MESSID(7, 44),
}; };
static s32 ballMdlTbl[] = { static s32 ballMdlTbl[] = {

View file

@ -21,7 +21,7 @@
static s16 houseMdl[6]; static s16 houseMdl[6];
// data // data
//mod: add entry for custom board //mod: extend for custom board
static s32 hostMesTbl[10][9] = { static s32 hostMesTbl[10][9] = {
/* [BOARD_ID_MAIN1] */ { 0x7000C, 0x7000D, 0x7000E, 0x7000F, 0x70010, 0x70011 }, /* [BOARD_ID_MAIN1] */ { 0x7000C, 0x7000D, 0x7000E, 0x7000F, 0x70010, 0x70011 },
/* [BOARD_ID_MAIN2] */ { 0x70012, 0x70013, 0x70014, 0x70015, 0x70016, 0x70017 }, /* [BOARD_ID_MAIN2] */ { 0x70012, 0x70013, 0x70014, 0x70015, 0x70016, 0x70017 },
@ -30,7 +30,7 @@ static s32 hostMesTbl[10][9] = {
/* [BOARD_ID_MAIN5] */ { 0x70024, 0x70025, 0x70026, 0x70027, 0x70028, 0x70029 }, /* [BOARD_ID_MAIN5] */ { 0x70024, 0x70025, 0x70026, 0x70027, 0x70028, 0x70029 },
/* [BOARD_ID_MAIN6] */ { 0x7002A, 0x7002B, 0x7002C, 0x7002D, 0x7002E, 0x7002F }, /* [BOARD_ID_MAIN6] */ { 0x7002A, 0x7002B, 0x7002C, 0x7002D, 0x7002E, 0x7002F },
//dummy data //dummy data for tutorial and extra board
/* [BOARD_ID_TUTORIAL] */ { 0x7002A, 0x7002B, 0x7002C, 0x7002D, 0x7002E, 0x7002F }, /* [BOARD_ID_TUTORIAL] */ { 0x7002A, 0x7002B, 0x7002C, 0x7002D, 0x7002E, 0x7002F },
/* [BOARD_ID_EXTRA2] */ { 0x7002A, 0x7002B, 0x7002C, 0x7002D, 0x7002E, 0x7002F }, /* [BOARD_ID_EXTRA2] */ { 0x7002A, 0x7002B, 0x7002C, 0x7002D, 0x7002E, 0x7002F },
@ -38,7 +38,7 @@ static s32 hostMesTbl[10][9] = {
/* [BOARD_ID_CUSTOM] */ { 0x7002A, 0x7002B, 0x7002C, 0x7002D, 0x7002E, 0x7002F }, /* [BOARD_ID_CUSTOM] */ { 0x7002A, 0x7002B, 0x7002C, 0x7002D, 0x7002E, 0x7002F },
}; };
//mod: add entry for custom board //mod: extend for custom board
static BoardModelParam houseMdlTbl[10] = { static BoardModelParam houseMdlTbl[10] = {
/* [BOARD_ID_MAIN1] */ { 0x90000, { 0, 1, 0, 0, 0 }, 0xFFFF }, /* [BOARD_ID_MAIN1] */ { 0x90000, { 0, 1, 0, 0, 0 }, 0xFFFF },
/* [BOARD_ID_MAIN2] */ { 0x90001, { 1, 1, 0, 0, 0 }, 0xFFFF }, /* [BOARD_ID_MAIN2] */ { 0x90001, { 1, 1, 0, 0, 0 }, 0xFFFF },
@ -47,7 +47,7 @@ static BoardModelParam houseMdlTbl[10] = {
/* [BOARD_ID_MAIN5] */ { 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 }, /* [BOARD_ID_MAIN6] */ { 0x90007, { 0, 1, 0, 0, 0 }, 0xFFFF },
//dummy data //dummy data for tutorial and extra board
/* [BOARD_ID_TUTORIAL] */ { 0x90007, { 0, 1, 0, 0, 0 }, 0xFFFF }, /* [BOARD_ID_TUTORIAL] */ { 0x90007, { 0, 1, 0, 0, 0 }, 0xFFFF },
/* [BOARD_ID_EXTRA1] */ { 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 }, /* [BOARD_ID_EXTRA2] */ { 0x90007, { 0, 1, 0, 0, 0 }, 0xFFFF },

View file

@ -208,7 +208,7 @@ static s32 callAttackMotTbl[] = {
DATA_MAKE_NUM(DATADIR_W05, 7), DATA_MAKE_NUM(DATADIR_W05, 7),
DATA_MAKE_NUM(DATADIR_W06, 19), DATA_MAKE_NUM(DATADIR_W06, 19),
//dummy data for extra boards //dummy data for tutorial and extra board
DATA_MAKE_NUM(DATADIR_W06, 19), DATA_MAKE_NUM(DATADIR_W06, 19),
DATA_MAKE_NUM(DATADIR_W06, 19), DATA_MAKE_NUM(DATADIR_W06, 19),
DATA_MAKE_NUM(DATADIR_W06, 19), DATA_MAKE_NUM(DATADIR_W06, 19),

View file

@ -260,7 +260,7 @@ static void CreateModel(void) {
DATA_MAKE_NUM(DATADIR_BKUJIYA, 3), DATA_MAKE_NUM(DATADIR_BKUJIYA, 3),
DATA_MAKE_NUM(DATADIR_BKUJIYA, 4) DATA_MAKE_NUM(DATADIR_BKUJIYA, 4)
}; };
//Mod TODO: fix custom data for board //mod: extend for custom board
s32 sp20[10][4] = { s32 sp20[10][4] = {
{ {
DATA_MAKE_NUM(DATADIR_BGUEST, 1), DATA_MAKE_NUM(DATADIR_BGUEST, 1),

View file

@ -682,6 +682,7 @@ static void CreateBoard(void)
static void DestroyBoard(void) static void DestroyBoard(void)
{ {
//mod: extend for custom board
s32 dir_table[] = { s32 dir_table[] = {
DATADIR_W01, DATADIR_W01,
DATADIR_W02, DATADIR_W02,
@ -691,7 +692,8 @@ static void DestroyBoard(void)
DATADIR_W06, DATADIR_W06,
DATADIR_W10, DATADIR_W10,
DATADIR_W20, DATADIR_W20,
DATADIR_W21 DATADIR_W21,
DATADIR_W07
}; };
BoardTauntKill(); BoardTauntKill();
BoardAudSeqFadeOutAll(); BoardAudSeqFadeOutAll();

View file

@ -114,6 +114,7 @@ static s8 defaultItemTbl[5] = {
0x05, 0x07, 0x02, 0x03, 0x00 0x05, 0x07, 0x02, 0x03, 0x00
}; };
//mod: extend for custom board
static s32 hostMessTbl[] = { static s32 hostMessTbl[] = {
0x000F0004, 0x000F0004,
0x000F0007, 0x000F0007,
@ -123,6 +124,8 @@ static s32 hostMessTbl[] = {
0x000F0013, 0x000F0013,
0x000F0004, 0x000F0004,
0x000F0024, 0x000F0024,
0x000F0024,
//Mod TODO: fix for custom board data
0x000F0024 0x000F0024
}; };
@ -133,7 +136,8 @@ static s8 itemPriceTbl[] = {
30, 30, 0, 0 30, 30, 0, 0
}; };
static s32 shopMotTbl[9][3] = { //mod: extend for custom data
static s32 shopMotTbl[10][3] = {
{ 0x00020001, 0x00020003, 0x00020004 }, { 0x00020001, 0x00020003, 0x00020004 },
{ 0x00020009, 0x0002000B, 0x0002000C }, { 0x00020009, 0x0002000B, 0x0002000C },
{ 0x0002000E, 0x00020010, 0x00020011 }, { 0x0002000E, 0x00020010, 0x00020011 },
@ -142,6 +146,9 @@ static s32 shopMotTbl[9][3] = {
{ 0x00020022, 0x00020024, 0x00020025 }, { 0x00020022, 0x00020024, 0x00020025 },
{ 0x00020009, 0x0002000B, 0x0002000C }, { 0x00020009, 0x0002000B, 0x0002000C },
{ 0x0002002A, 0x0002002C, 0x0002002D }, { 0x0002002A, 0x0002002C, 0x0002002D },
{ 0x0002002A, 0x0002002C, 0x0002002D },
//Mod TODO: fix for custom data
{ 0x0002002A, 0x0002002C, 0x0002002D } { 0x0002002A, 0x0002002C, 0x0002002D }
}; };

View file

@ -123,7 +123,7 @@ static s32 hostMotTbl[10][2] = {
{ DATA_MAKE_NUM(DATADIR_W05, 9), DATA_MAKE_NUM(DATADIR_BOARD, 161) }, { DATA_MAKE_NUM(DATADIR_W05, 9), DATA_MAKE_NUM(DATADIR_BOARD, 161) },
{ DATA_MAKE_NUM(DATADIR_W06, 21), DATA_MAKE_NUM(DATADIR_BOARD, 162) }, { DATA_MAKE_NUM(DATADIR_W06, 21), DATA_MAKE_NUM(DATADIR_BOARD, 162) },
//dummy data //dummy data for tutorial and extra board
{ 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) }, { 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) },

View file

@ -89,6 +89,7 @@ static s32 hitFX[4] = {
-1, -1, -1, -1 -1, -1, -1, -1
}; };
//mod: extend for custom data
static s32 startMesTbl[10][5] = { static s32 startMesTbl[10][5] = {
{ 0x00150001, 0x00150007, 0x0015000D, 0x00150016, 0x0015001C }, { 0x00150001, 0x00150007, 0x0015000D, 0x00150016, 0x0015001C },
{ 0x00150002, 0x00150008, 0x0015000E, 0x00150017, 0x0015001D }, { 0x00150002, 0x00150008, 0x0015000E, 0x00150017, 0x0015001D },