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

Matched REL/mess + some data cleanup

Browse source
This commit is contained in:
mrshigure 2024-03-16 13:04:23 -07:00
parent d3aae72c3b
commit 6d754f108e
11 changed files with 612 additions and 227 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/REL/option/guide.c
View file

@ -67,7 +67,7 @@ omObjData *fn_1_21F8(void) {
temp_r30->unk2C = 0.0f;
temp_r30->unk34 = 0.0f;
temp_r30->unk30 = 0.0f;
var_r31->model[0] = Hu3DModelCreateFile(0x69000C);
var_r31->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 12));
Hu3DModelLayerSet(var_r31->model[0], 1);
for (i = 0; i < 3; i++) {
var_r31->motion[i] = Hu3DJointMotion(var_r31->model[0], HuDataSelHeapReadNum(lbl_1_rodata_E0[i], MEMORY_DEFAULT_NUM, HEAP_DATA));

4
src/REL/option/record.c
View file

@ -279,7 +279,7 @@ static omObjData *fn_1_8A88(void) {
omObjData *temp_r31;
temp_r31 = omAddObjEx(lbl_1_bss_8, 1003, 1, 0, 1, NULL);
temp_r31->model[0] = Hu3DModelCreateFile(0x690001);
temp_r31->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 1));
Hu3DModelAttrSet(temp_r31->model[0], 0x40000002);
Hu3DModelLayerSet(temp_r31->model[0], 0);
Hu3DMotionStartEndSet(temp_r31->model[0], 0.0f, 6.0f);
@ -315,7 +315,7 @@ static omObjData *fn_1_8C84(void) {
omObjData *temp_r31;
temp_r31 = omAddObjEx(lbl_1_bss_8, 1003, 1, 0, 1, NULL);
temp_r31->model[0] = Hu3DModelCreateFile(0x69000E);
temp_r31->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 14));
Hu3DModelLayerSet(temp_r31->model[0], 2);
Hu3DModelAttrSet(temp_r31->model[0], 0x40000001);
omSetRot(temp_r31, 30.0f, 190.0f, 0.0f);

4
src/REL/option/room.c
View file

@ -222,7 +222,7 @@ static omObjData *fn_1_2088(void) {
omObjData *temp_r31;
temp_r31 = omAddObjEx(lbl_1_bss_8, 1003, 1, 0, 1, NULL);
temp_r31->model[0] = Hu3DModelCreateFile(0x690000);
temp_r31->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 0));
Hu3DModelLayerSet(temp_r31->model[0], 0);
Hu3DModelShadowMapSet(temp_r31->model[0]);
return temp_r31;
@ -237,7 +237,7 @@ static omObjData *fn_1_2144(void) {
temp_r31 = omAddObjEx(lbl_1_bss_8, 1003, 1, 0, 1, NULL);
Hu3DModelLayerSet(temp_r31->model[0], 0);
temp_r31->model[0] = Hu3DModelCreateFile(0x690006);
temp_r31->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 6));
return temp_r31;
}

10
src/REL/option/rumble.c
View file

@ -180,7 +180,7 @@ static omObjData *fn_1_37AC(void) {
omObjData *temp_r31;
temp_r31 = omAddObjEx(lbl_1_bss_8, 1003, 1, 0, 1, NULL);
temp_r31->model[0] = Hu3DModelCreateFile(0x69000F);
temp_r31->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 15));
Hu3DModelLayerSet(temp_r31->model[0], 3);
omSetRot(temp_r31, 0.0f, 180.0f, 0.0f);
Hu3DModelAttrSet(temp_r31->model[0], 1);
@ -199,7 +199,7 @@ static omObjData *fn_1_38BC(void) {
omObjData *temp_r31;
temp_r31 = omAddObjEx(lbl_1_bss_8, 1003, 1, 0, 1, NULL);
temp_r31->model[0] = Hu3DModelCreateFile(0x690002);
temp_r31->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 2));
Hu3DModelAttrSet(temp_r31->model[0], 0x40000002);
if (GWGameStat.rumble != 0) {
Hu3DMotionTimeSet(temp_r31->model[0], 60.0f);
@ -243,7 +243,7 @@ static omObjData *fn_1_3B08(void) {
omObjData *temp_r31;
temp_r31 = omAddObjEx(lbl_1_bss_8, 1003, 1, 0, 1, NULL);
temp_r31->model[0] = Hu3DModelCreateFile(0x690009);
temp_r31->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 9));
Hu3DModelAttrSet(temp_r31->model[0], 0x40000001);
return temp_r31;
}
@ -270,7 +270,7 @@ static omObjData *fn_1_3C6C(void) {
omObjData *temp_r31;
temp_r31 = omAddObjEx(lbl_1_bss_8, 1003, 1, 0, 1, NULL);
temp_r31->model[0] = Hu3DModelCreateFile(0x69000A);
temp_r31->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 10));
Hu3DModelAttrSet(temp_r31->model[0], 0x40000002);
Hu3DModelLayerSet(temp_r31->model[0], 2);
return temp_r31;
@ -318,7 +318,7 @@ static omObjData *fn_1_3F28(void) {
omObjData *temp_r31;
temp_r31 = omAddObjEx(lbl_1_bss_8, 1003, 1, 0, 1, NULL);
temp_r31->model[0] = Hu3DModelCreateFile(0x69000B);
temp_r31->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 11));
if (GWGameStat.rumble != 0) {
Hu3DModelAttrReset(temp_r31->model[0], 1);
} else {

10
src/REL/option/sound.c
View file

@ -1156,7 +1156,7 @@ static omObjData *fn_1_61A0(void) {
omObjData *temp_r31;
temp_r31 = omAddObjEx(lbl_1_bss_8, 1003, 1, 0, 1, NULL);
temp_r31->model[0] = Hu3DModelCreateFile(0x69000D);
temp_r31->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 13));
Hu3DModelLayerSet(temp_r31->model[0], 2);
Hu3DModelAttrSet(temp_r31->model[0], 0x40000001);
omSetRot(temp_r31, -80.0f, 45.0f, 0.0f);
@ -1177,7 +1177,7 @@ static omObjData *fn_1_62F0(void) {
omObjData *temp_r31;
temp_r31 = omAddObjEx(lbl_1_bss_8, 1003, 1, 0, 1, NULL);
temp_r31->model[0] = Hu3DModelCreateFile(0x69000E);
temp_r31->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 14));
Hu3DModelLayerSet(temp_r31->model[0], 2);
Hu3DModelAttrSet(temp_r31->model[0], 0x40000001);
omSetRot(temp_r31, 0.0f, -90.0f, 0.0f);
@ -1198,7 +1198,7 @@ static omObjData *fn_1_6440(void) {
omObjData *temp_r31;
temp_r31 = omAddObjEx(lbl_1_bss_8, 1003, 1, 0, 1, NULL);
temp_r31->model[0] = Hu3DModelCreateFile(0x690003);
temp_r31->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 3));
Hu3DModelAttrSet(temp_r31->model[0], 0x40000001);
Hu3DModelLayerSet(temp_r31->model[0], 0);
return temp_r31;
@ -1223,9 +1223,9 @@ static omObjData *fn_1_6528(s32 arg0, s32 arg1) {
temp_r31 = omAddObjEx(lbl_1_bss_8, 1003, 1, 0, 1, NULL);
if (arg1 != 0) {
temp_r31->model[0] = Hu3DModelCreateFile(0x690005);
temp_r31->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 5));
} else {
temp_r31->model[0] = Hu3DModelCreateFile(0x690004);
temp_r31->model[0] = Hu3DModelCreateFile(DATA_MAKE_NUM(DATADIR_OPTION, 4));
}
Hu3DModelAttrSet(temp_r31->model[0], 0x40000001);
Hu3DModelLayerSet(temp_r31->model[0], 0);