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

8
src/REL/m406Dll/map.c
View file

@ -2446,10 +2446,10 @@ void fn_1_9F78(void)
var_r30 = lbl_1_bss_9C = HuMemDirectMallocNum(HEAP_SYSTEM, sizeof(UnkM406Struct8), MEMORY_DEFAULT_NUM);
memset(var_r30, 0, sizeof(UnkM406Struct8));
var_r30->unk_00 = HuSprAnimRead(HuDataReadNum(0x250040, MEMORY_DEFAULT_NUM));
var_r30->unk_04 = HuSprAnimRead(HuDataReadNum(0x250041, MEMORY_DEFAULT_NUM));
var_r30->unk_08 = HuSprAnimRead(HuDataReadNum(0x250042, MEMORY_DEFAULT_NUM));
var_r30->unk_0C = HuSprAnimRead(HuDataReadNum(0x250043, MEMORY_DEFAULT_NUM));
var_r30->unk_00 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_M406, 0x40), MEMORY_DEFAULT_NUM));
var_r30->unk_04 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_M406, 0x41), MEMORY_DEFAULT_NUM));
var_r30->unk_08 = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_M406, 0x42), MEMORY_DEFAULT_NUM));
var_r30->unk_0C = HuSprAnimRead(HuDataReadNum(DATA_MAKE_NUM(DATADIR_M406, 0x43), MEMORY_DEFAULT_NUM));
var_r30->unk_24 = 0.0f;
var_r30->unk_28 = 0.0f;
var_r27 = fn_1_B474(var_r30->unk_00, 1);

20
src/REL/m406Dll/player.c
View file

@ -251,16 +251,16 @@ char *lbl_1_data_1068[4] = {
};
s32 lbl_1_data_1078[10] = {
0x5F0037,
0x5F0055,
0x5F0039,
0x5F0054,
0x5F0041,
0x5F0056,
0x5F0050,
0x5F0016,
0x5F0053,
0x5F0023,
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x37),
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x55),
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x39),
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x54),
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x41),
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x56),
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x50),
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x16),
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x53),
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x23),
};
s32 lbl_1_data_10A0[8][4] = {