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

@ -3,7 +3,6 @@
#include "game/object.h"
#include "game/objsub.h"
#include "game/hsfmotion.h"
#include "game/pad.h"
@ -15,7 +14,6 @@
#include "game/minigame_seq.h"
#include "game/wipe.h"
#include "ext_math.h"
#include "math.h"
@ -329,15 +327,15 @@ s32 fn_1_C90(void)
s32 fn_1_3214(void);
u32 lbl_1_data_E0[5][2] = {
0x5F0000,
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x00),
0,
0x540024,
1,
0x54001C,
1,
0x5F0017,
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x17),
0,
0x5F0018,
DATA_MAKE_NUM(DATADIR_MARIOMOT, 0x18),
0,
};