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

Applied DATA_MAKE_NUM and MAKE_MESSID macros

Browse source
This commit is contained in:
kabiskac 2024-08-09 01:37:36 +02:00
parent c1c506360c
commit a0ebc7588d
116 changed files with 38174 additions and 37156 deletions
Download patch file Download diff file Expand all files Collapse all files

162
src/REL/modeltestDll/modeltest01.c
View file

@ -177,114 +177,114 @@ void fn_1_5A60(omObjData *object)
}
u32 lbl_1_data_3B0[] = {
0x005D0000, 0x00000000,
0x005E0000, 0x00000000,
0x005E0001, 0x00000000,
0x005F0006, 0x00000001,
0x005F0000, 0x00000001,
0x005F0002, 0x00000001,
0x005F0003, 0x00000001,
0x005F0005, 0x00000000,
0x005F0017, 0x00000000,
0x005F0018, 0x00000000,
DATA_MAKE_NUM(DATADIR_MARIOMDL0, 0x00), 0x00000000,
DATA_MAKE_NUM(DATADIR_MARIOMDL1, 0x00), 0x00000000,
DATA_MAKE_NUM(DATADIR_MARIOMDL1, 0x01), 0x00000000,
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x06), 0x00000001,
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x00), 0x00000001,
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x02), 0x00000001,
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x03), 0x00000001,
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x05), 0x00000000,
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x17), 0x00000000,
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x18), 0x00000000,
0x00000000, 0x00000000
};
u32 lbl_1_data_408[] = {
0x00170000, 0x00000000,
0x00170002, 0x00000000,
0x00170003, 0x00000000,
0x0017000D, 0x00000001,
0x00170005, 0x00000001,
0x00170007, 0x00000001,
0x00170008, 0x00000001,
0x0017000C, 0x00000000,
0x00170028, 0x00000000,
0x00170029, 0x00000000,
DATA_MAKE_NUM(DATADIR_LUIGI, 0x00), 0x00000000,
DATA_MAKE_NUM(DATADIR_LUIGI, 0x02), 0x00000000,
DATA_MAKE_NUM(DATADIR_LUIGI, 0x03), 0x00000000,
DATA_MAKE_NUM(DATADIR_LUIGI, 0x0D), 0x00000001,
DATA_MAKE_NUM(DATADIR_LUIGI, 0x05), 0x00000001,
DATA_MAKE_NUM(DATADIR_LUIGI, 0x07), 0x00000001,
DATA_MAKE_NUM(DATADIR_LUIGI, 0x08), 0x00000001,
DATA_MAKE_NUM(DATADIR_LUIGI, 0x0C), 0x00000000,
DATA_MAKE_NUM(DATADIR_LUIGI, 0x28), 0x00000000,
DATA_MAKE_NUM(DATADIR_LUIGI, 0x29), 0x00000000,
0x00000000, 0x00000000
};
u32 lbl_1_data_460[] = {
0x006A0000, 0x00000000,
0x006A0002, 0x00000000,
0x006A0003, 0x00000000,
0x006A000D, 0x00000001,
0x006A0005, 0x00000001,
0x006A0007, 0x00000001,
0x006A0008, 0x00000001,
0x006A000C, 0x00000000,
0x006A0028, 0x00000000,
0x006A0029, 0x00000000,
DATA_MAKE_NUM(DATADIR_PEACH, 0x00), 0x00000000,
DATA_MAKE_NUM(DATADIR_PEACH, 0x02), 0x00000000,
DATA_MAKE_NUM(DATADIR_PEACH, 0x03), 0x00000000,
DATA_MAKE_NUM(DATADIR_PEACH, 0x0D), 0x00000001,
DATA_MAKE_NUM(DATADIR_PEACH, 0x05), 0x00000001,
DATA_MAKE_NUM(DATADIR_PEACH, 0x07), 0x00000001,
DATA_MAKE_NUM(DATADIR_PEACH, 0x08), 0x00000001,
DATA_MAKE_NUM(DATADIR_PEACH, 0x0C), 0x00000000,
DATA_MAKE_NUM(DATADIR_PEACH, 0x28), 0x00000000,
DATA_MAKE_NUM(DATADIR_PEACH, 0x29), 0x00000000,
0x00000000, 0x00000000
};
u32 lbl_1_data_4B8[] = {
0x00870000, 0x00000000,
0x00870002, 0x00000000,
0x00870003, 0x00000000,
0x0087000D, 0x00000001,
0x00870005, 0x00000001,
0x00870007, 0x00000001,
0x00870008, 0x00000001,
0x0087000C, 0x00000000,
0x00870028, 0x00000000,
0x00870029, 0x00000000,
DATA_MAKE_NUM(DATADIR_YOSHI, 0x00), 0x00000000,
DATA_MAKE_NUM(DATADIR_YOSHI, 0x02), 0x00000000,
DATA_MAKE_NUM(DATADIR_YOSHI, 0x03), 0x00000000,
DATA_MAKE_NUM(DATADIR_YOSHI, 0x0D), 0x00000001,
DATA_MAKE_NUM(DATADIR_YOSHI, 0x05), 0x00000001,
DATA_MAKE_NUM(DATADIR_YOSHI, 0x07), 0x00000001,
DATA_MAKE_NUM(DATADIR_YOSHI, 0x08), 0x00000001,
DATA_MAKE_NUM(DATADIR_YOSHI, 0x0C), 0x00000000,
DATA_MAKE_NUM(DATADIR_YOSHI, 0x28), 0x00000000,
DATA_MAKE_NUM(DATADIR_YOSHI, 0x29), 0x00000000,
0x00000000, 0x00000000
};
u32 lbl_1_data_510[] = {
0x00820000, 0x00000000,
0x00820002, 0x00000000,
0x00820003, 0x00000000,
0x0082000D, 0x00000001,
0x00820005, 0x00000001,
0x00820007, 0x00000001,
0x00820008, 0x00000001,
0x0082000C, 0x00000000,
0x00820028, 0x00000000,
0x00820029, 0x00000000,
DATA_MAKE_NUM(DATADIR_WARIO, 0x00), 0x00000000,
DATA_MAKE_NUM(DATADIR_WARIO, 0x02), 0x00000000,
DATA_MAKE_NUM(DATADIR_WARIO, 0x03), 0x00000000,
DATA_MAKE_NUM(DATADIR_WARIO, 0x0D), 0x00000001,
DATA_MAKE_NUM(DATADIR_WARIO, 0x05), 0x00000001,
DATA_MAKE_NUM(DATADIR_WARIO, 0x07), 0x00000001,
DATA_MAKE_NUM(DATADIR_WARIO, 0x08), 0x00000001,
DATA_MAKE_NUM(DATADIR_WARIO, 0x0C), 0x00000000,
DATA_MAKE_NUM(DATADIR_WARIO, 0x28), 0x00000000,
DATA_MAKE_NUM(DATADIR_WARIO, 0x29), 0x00000000,
0x00000000, 0x00000000
};
u32 lbl_1_data_568[] = {
0x000E0000, 0x00000000,
0x000E0002, 0x00000000,
0x000E0003, 0x00000000,
0x000E000D, 0x00000001,
0x000E0005, 0x00000001,
0x000E0007, 0x00000001,
0x000E0008, 0x00000001,
0x000E000C, 0x00000000,
0x000E0028, 0x00000000,
0x000E0029, 0x00000000,
DATA_MAKE_NUM(DATADIR_DONKEY, 0x00), 0x00000000,
DATA_MAKE_NUM(DATADIR_DONKEY, 0x02), 0x00000000,
DATA_MAKE_NUM(DATADIR_DONKEY, 0x03), 0x00000000,
DATA_MAKE_NUM(DATADIR_DONKEY, 0x0D), 0x00000001,
DATA_MAKE_NUM(DATADIR_DONKEY, 0x05), 0x00000001,
DATA_MAKE_NUM(DATADIR_DONKEY, 0x07), 0x00000001,
DATA_MAKE_NUM(DATADIR_DONKEY, 0x08), 0x00000001,
DATA_MAKE_NUM(DATADIR_DONKEY, 0x0C), 0x00000000,
DATA_MAKE_NUM(DATADIR_DONKEY, 0x28), 0x00000000,
DATA_MAKE_NUM(DATADIR_DONKEY, 0x29), 0x00000000,
0x00000000, 0x00000000
};
u32 lbl_1_data_5C0[] = {
0x000A0000, 0x00000000,
0x000A0002, 0x00000000,
0x000A0003, 0x00000000,
0x000A000D, 0x00000001,
0x000A0005, 0x00000001,
0x000A0007, 0x00000001,
0x000A0008, 0x00000001,
0x000A000C, 0x00000000,
0x000A0028, 0x00000000,
0x000A0029, 0x00000000,
DATA_MAKE_NUM(DATADIR_DAISY, 0x00), 0x00000000,
DATA_MAKE_NUM(DATADIR_DAISY, 0x02), 0x00000000,
DATA_MAKE_NUM(DATADIR_DAISY, 0x03), 0x00000000,
DATA_MAKE_NUM(DATADIR_DAISY, 0x0D), 0x00000001,
DATA_MAKE_NUM(DATADIR_DAISY, 0x05), 0x00000001,
DATA_MAKE_NUM(DATADIR_DAISY, 0x07), 0x00000001,
DATA_MAKE_NUM(DATADIR_DAISY, 0x08), 0x00000001,
DATA_MAKE_NUM(DATADIR_DAISY, 0x0C), 0x00000000,
DATA_MAKE_NUM(DATADIR_DAISY, 0x28), 0x00000000,
DATA_MAKE_NUM(DATADIR_DAISY, 0x29), 0x00000000,
0x00000000, 0x00000000
};
u32 lbl_1_data_618[] = {
0x007E0000, 0x00000000,
0x007E0002, 0x00000000,
0x007E0003, 0x00000000,
0x007E000D, 0x00000001,
0x007E0005, 0x00000001,
0x007E0007, 0x00000001,
0x007E0008, 0x00000001,
0x007E000C, 0x00000000,
0x007E0028, 0x00000000,
0x007E0029, 0x00000000,
DATA_MAKE_NUM(DATADIR_WALUIGI, 0x00), 0x00000000,
DATA_MAKE_NUM(DATADIR_WALUIGI, 0x02), 0x00000000,
DATA_MAKE_NUM(DATADIR_WALUIGI, 0x03), 0x00000000,
DATA_MAKE_NUM(DATADIR_WALUIGI, 0x0D), 0x00000001,
DATA_MAKE_NUM(DATADIR_WALUIGI, 0x05), 0x00000001,
DATA_MAKE_NUM(DATADIR_WALUIGI, 0x07), 0x00000001,
DATA_MAKE_NUM(DATADIR_WALUIGI, 0x08), 0x00000001,
DATA_MAKE_NUM(DATADIR_WALUIGI, 0x0C), 0x00000000,
DATA_MAKE_NUM(DATADIR_WALUIGI, 0x28), 0x00000000,
DATA_MAKE_NUM(DATADIR_WALUIGI, 0x29), 0x00000000,
0x00000000, 0x00000000
};
@ -750,4 +750,4 @@ void fn_1_83B4(void)
}
HuPrcVSleep();
}
}
}