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

* 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

View file

@ -127,7 +127,8 @@ s32 lbl_1_data_0[0x12] = {
0x610000,
};
s32 lbl_1_data_48[0x12] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
s32 lbl_1_data_90[4] = { 0x5F0000, 0x500000, 0x5F0017, 0x5F0085 };
s32 lbl_1_data_90[4]
= { DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x00), 0x500000, DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x17), DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x85) };
s32 lbl_1_data_A0[4] = { 0x50001C, 0x50001E, 0x50001D, 0x50001F };
u8 lbl_1_data_B0[0x38] = { 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x08,
0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08,