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

Fix mstory2 data locality and apply DATA_MAKE_NUM macros (#522)

Browse source 
* Make rodata and strings local in mstory2

* use DATA_MAKE_NUM macros
This commit is contained in:
dbalatoni13 2025-01-11 15:50:52 +01:00 • committed by GitHub
parent f28e9d19aa
commit f79a3f88b1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
18 changed files with 2589 additions and 2337 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/REL/m458Dll/main.c
View file

@ -77,16 +77,16 @@ void fn_1_6D9C(omObjData *arg0);
s32 lbl_1_data_0[2] = { 0x570025, 0x570026 };
s32 lbl_1_data_8[2] = { 0, 0 };
s32 lbl_1_data_10[0xA] = {
0x5F0000,
0x5F0002,
0x5F0003,
0x5F0005,
0x5F0006,
0x5F0036,
0x5F002F,
0x5F001A,
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x00),
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x02),
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x03),
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x05),
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x06),
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x36),
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x2F),
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x1A),
0x570000,
0x5F0017,
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x17),
};
u32 lbl_1_data_38[0xA] = { 0, 0, 0, 0, 0, 0, 0, 0, 1, 0 };
u32 lbl_1_data_60[0xA] = { 0x30008, 0, 0, 0x3000A, 0, 0, 0x57002A, 0x570028, 0x570029, 0x570027 };