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

Introduce enums for specific data directories

Browse source
This commit is contained in:
gamemasterplc 2024-02-03 16:06:31 -06:00
parent ce056b82a0
commit 6d67132ca4
21 changed files with 603 additions and 535 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/REL/w10Dll/host.c
View file

@ -3,7 +3,7 @@
#include "game/board/window.h"
s32 lbl_1_data_78[2] = {
MAKE_DATA_NUM(DATADIR_W10, 16),
DATA_MAKE_NUM(DATADIR_W10, 16),
-1
};
@ -14,7 +14,7 @@ Vec lbl_1_data_80[2] = {
void fn_1_AEC(void) {
lbl_1_bss_1C = 0;
lbl_1_bss_1E = BoardModelCreate(MAKE_DATA_NUM(DATADIR_W10, 15), lbl_1_data_78, 0);
lbl_1_bss_1E = BoardModelCreate(DATA_MAKE_NUM(DATADIR_W10, 15), lbl_1_data_78, 0);
BoardModelMotionStart(lbl_1_bss_1E, 1, 0x40000001);
BoardTutorialHostSet(lbl_1_bss_1E);
BoardModelLayerSet(lbl_1_bss_1E, 6);

24
src/REL/w10Dll/main.c
View file

@ -22,7 +22,7 @@ unkw10Dll lbl_1_data_0[1] = {
3300.0f, 100.0f, -900.0f,
0.0f, 0.0f, 0.0f,
1.0f, 1.0f, 1.0f,
MAKE_DATA_NUM(DATADIR_W10, 3)
DATA_MAKE_NUM(DATADIR_W10, 3)
};
@ -42,22 +42,22 @@ s32 lbl_1_data_34[] = {
};
s32 lbl_1_data_54[2] = {
MAKE_DATA_NUM(DATADIR_W10, 18),
DATA_MAKE_NUM(DATADIR_W10, 18),
DATA_NUM_LISTEND
};
s32 lbl_1_data_5C[2] = {
MAKE_DATA_NUM(DATADIR_BGUEST, 9),
DATA_MAKE_NUM(DATADIR_BGUEST, 9),
DATA_NUM_LISTEND
};
s32 lbl_1_data_64[2] = {
MAKE_DATA_NUM(DATADIR_BGUEST, 24),
DATA_MAKE_NUM(DATADIR_BGUEST, 24),
DATA_NUM_LISTEND
};
s32 lbl_1_data_6C[2] = {
MAKE_DATA_NUM(DATADIR_BGUEST, 14),
DATA_MAKE_NUM(DATADIR_BGUEST, 14),
DATA_NUM_LISTEND
};
@ -85,26 +85,26 @@ void BoardCreate(void) {
fn_1_AEC();
fn_1_1D68();
lbl_1_bss_C = 0;
BoardSpaceInit(MAKE_DATA_NUM(DATADIR_W10, 0));
BoardSpaceInit(DATA_MAKE_NUM(DATADIR_W10, 0));
temp = BoardSpaceFlagSearch(0, 1);
BoardTutorialBlockSetPos(temp, 1);
lbl_1_data_28 = BoardModelCreate(MAKE_DATA_NUM(DATADIR_W10, 1), NULL, 0);
lbl_1_data_28 = BoardModelCreate(DATA_MAKE_NUM(DATADIR_W10, 1), NULL, 0);
fn_8006DDE8(lbl_1_data_28, -1.0f);
BoardModelPosSet(lbl_1_data_28, 0.0f, 0.0f, 0.0f);
BoardModelMotionStart(lbl_1_data_28, 0, 0x40000001);
BoardModelMotionSpeedSet(lbl_1_data_28, 1.0f);
lbl_1_data_2A = BoardModelCreate(MAKE_DATA_NUM(DATADIR_W10, 2), NULL, 0);
lbl_1_data_2A = BoardModelCreate(DATA_MAKE_NUM(DATADIR_W10, 2), NULL, 0);
fn_8006DDE8(lbl_1_data_2A, -1.0f);
BoardModelPosSet(lbl_1_data_2A, 0.0f, 0.0f, 0.0f);
BoardModelMotionStart(lbl_1_data_2A, 0, 0x40000001);
lbl_1_data_2C = BoardModelCreate(MAKE_DATA_NUM(DATADIR_W10, 17), lbl_1_data_54, 0);
lbl_1_data_2C = BoardModelCreate(DATA_MAKE_NUM(DATADIR_W10, 17), lbl_1_data_54, 0);
BoardModelPosSet(lbl_1_data_2C, 0.0f, 0.0f, 0.0f);
BoardModelMotionStart(lbl_1_data_2C, 1, 0x40000001);
lbl_1_data_2E = BoardModelCreate(MAKE_DATA_NUM(DATADIR_BGUEST, 5), lbl_1_data_5C, 0);
lbl_1_data_2E = BoardModelCreate(DATA_MAKE_NUM(DATADIR_BGUEST, 5), lbl_1_data_5C, 0);
BoardModelMotionStart(lbl_1_data_2E, 1, 0x40000001);
lbl_1_data_32 = BoardModelCreate(MAKE_DATA_NUM(DATADIR_BGUEST, 18), lbl_1_data_64, 0);
lbl_1_data_32 = BoardModelCreate(DATA_MAKE_NUM(DATADIR_BGUEST, 18), lbl_1_data_64, 0);
BoardModelMotionStart(lbl_1_data_32, 1, 0x40000001);
lbl_1_data_30 = BoardModelCreate(MAKE_DATA_NUM(DATADIR_BGUEST, 13), lbl_1_data_6C, 0);
lbl_1_data_30 = BoardModelCreate(DATA_MAKE_NUM(DATADIR_BGUEST, 13), lbl_1_data_6C, 0);
BoardModelMotionStart(lbl_1_data_30, 1, 0x40000001);
BoardLightHookSet(&fn_1_8C0, &fn_1_904);
for (i = 0; i < ARRAY_COUNT(lbl_1_data_0); i++) {

22
src/REL/w10Dll/tutorial.c
View file

@ -68,17 +68,17 @@ w10DllUnk04 lbl_1_data_108[42] = {
char lbl_1_data_258[] = "Tutorial Hook P0:%d P1:%d P2:%d P3:%d SCEN:%d CUE:%d PRM:%d DICE:%d MSG:%d\n";
s32 lbl_1_data_2A8[11] = {
MAKE_DATA_NUM(DATADIR_W10, 4),
MAKE_DATA_NUM(DATADIR_W10, 5),
MAKE_DATA_NUM(DATADIR_W10, 6),
MAKE_DATA_NUM(DATADIR_W10, 7),
MAKE_DATA_NUM(DATADIR_W10, 8),
MAKE_DATA_NUM(DATADIR_W10, 9),
MAKE_DATA_NUM(DATADIR_W10, 10),
MAKE_DATA_NUM(DATADIR_W10, 11),
MAKE_DATA_NUM(DATADIR_W10, 12),
MAKE_DATA_NUM(DATADIR_W10, 13),
MAKE_DATA_NUM(DATADIR_W10, 14)
DATA_MAKE_NUM(DATADIR_W10, 4),
DATA_MAKE_NUM(DATADIR_W10, 5),
DATA_MAKE_NUM(DATADIR_W10, 6),
DATA_MAKE_NUM(DATADIR_W10, 7),
DATA_MAKE_NUM(DATADIR_W10, 8),
DATA_MAKE_NUM(DATADIR_W10, 9),
DATA_MAKE_NUM(DATADIR_W10, 10),
DATA_MAKE_NUM(DATADIR_W10, 11),
DATA_MAKE_NUM(DATADIR_W10, 12),
DATA_MAKE_NUM(DATADIR_W10, 13),
DATA_MAKE_NUM(DATADIR_W10, 14)
};
void fn_1_176C(void) {