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

16
src/REL/w05Dll/hotel.c
View file

@ -12,7 +12,8 @@
// data
s32 lbl_1_data_150[5] = {
0x790021, 0x790022, 0x790023, 0x790024, 0x790025,
DATA_MAKE_NUM(DATADIR_W05, 0x21), DATA_MAKE_NUM(DATADIR_W05, 0x22), DATA_MAKE_NUM(DATADIR_W05, 0x23),
DATA_MAKE_NUM(DATADIR_W05, 0x24), DATA_MAKE_NUM(DATADIR_W05, 0x25),
};
s16 lbl_1_data_164 = 0xFFFF;
@ -36,7 +37,7 @@ void fn_1_14D0(void) {
}
u32 lbl_1_data_170[4] = { 0, 10, 25, 40 };
s32 lbl_1_data_180 = 0x79000C;
s32 lbl_1_data_180 = DATA_MAKE_NUM(DATADIR_W05, 0x0C);
s16 fn_1_14FC(void) {
s16 var_r31;
@ -112,10 +113,10 @@ void fn_1_155C(void) {
sprintf(sp18, "%d", lbl_1_bss_0->unk_00);
if (var_r30 > 0) {
if (var_r30 >= 5) {
var_r27 = 0x270001;
var_r27 = MAKE_MESSID(0x27, 0x01);
var_r30 = 5;
} else {
var_r27 = 0x270002;
var_r27 = MAKE_MESSID(0x27, 0x02);
}
sprintf(sp8, "%d", var_r30);
BoardWinCreate(2, var_r27, 7);
@ -198,7 +199,10 @@ void fn_1_155C(void) {
BoardRollDispSet(1);
}
s32 lbl_1_data_188[4] = { 0x79000C, 0x79000E, 0x79000F, 0x790010 };
s32 lbl_1_data_188[4] = {
DATA_MAKE_NUM(DATADIR_W05, 0x0C), DATA_MAKE_NUM(DATADIR_W05, 0x0E),
DATA_MAKE_NUM(DATADIR_W05, 0x0F),DATA_MAKE_NUM(DATADIR_W05, 0x10)
};
s32 lbl_1_data_198[2] = { 28, 25 };
void fn_1_1E44(void) {
@ -279,7 +283,7 @@ void fn_1_1E44(void) {
BoardWinWait();
BoardWinKill();
} else {
temp_r3 = BoardModelCreate(0x790004, NULL, 0);
temp_r3 = BoardModelCreate(DATA_MAKE_NUM(DATADIR_W05, 0x04), NULL, 0);
BoardModelVisibilitySet(temp_r3, 0);
BoardModelLayerSet(temp_r3, 2U);
if (lbl_1_bss_0->unk_00 > BoardPlayerCoinsGet(lbl_1_bss_28)) {