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

Label board/model.c

Browse source
This commit is contained in:
gamemasterplc 2023-12-28 17:22:09 -06:00
parent 9012193413
commit 7d9dcbb47b
6 changed files with 139 additions and 139 deletions
Download patch file Download diff file Expand all files Collapse all files

66
src/REL/w10Dll/w10Dll.c
View file

@ -87,41 +87,41 @@ void fn_1_E0(void) {
fn_800772EC(MAKE_DATA_NUM(DATADIR_W10, 0));
temp = fn_800745F0(0, 1);
fn_800B4274(temp, 1);
lbl_1_data_28 = fn_8006D9A4(MAKE_DATA_NUM(DATADIR_W10, 1), NULL, 0);
lbl_1_data_28 = BoardModelCreate(MAKE_DATA_NUM(DATADIR_W10, 1), NULL, 0);
fn_8006DDE8(lbl_1_data_28, -1.0f);
fn_8006F1A8(lbl_1_data_28, 0.0f, 0.0f, 0.0f);
fn_8006E2B8(lbl_1_data_28, 0, 0x40000001);
fn_8006E878(lbl_1_data_28, 1.0f);
lbl_1_data_2A = fn_8006D9A4(MAKE_DATA_NUM(DATADIR_W10, 2), NULL, 0);
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);
fn_8006DDE8(lbl_1_data_2A, -1.0f);
fn_8006F1A8(lbl_1_data_2A, 0.0f, 0.0f, 0.0f);
fn_8006E2B8(lbl_1_data_2A, 0, 0x40000001);
lbl_1_data_2C = fn_8006D9A4(MAKE_DATA_NUM(DATADIR_W10, 17), lbl_1_data_54, 0);
fn_8006F1A8(lbl_1_data_2C, 0.0f, 0.0f, 0.0f);
fn_8006E2B8(lbl_1_data_2C, 1, 0x40000001);
lbl_1_data_2E = fn_8006D9A4(MAKE_DATA_NUM(DATADIR_BGUEST, 5), lbl_1_data_5C, 0);
fn_8006E2B8(lbl_1_data_2E, 1, 0x40000001);
lbl_1_data_32 = fn_8006D9A4(MAKE_DATA_NUM(DATADIR_BGUEST, 18), lbl_1_data_64, 0);
fn_8006E2B8(lbl_1_data_32, 1, 0x40000001);
lbl_1_data_30 = fn_8006D9A4(MAKE_DATA_NUM(DATADIR_BGUEST, 13), lbl_1_data_6C, 0);
fn_8006E2B8(lbl_1_data_30, 1, 0x40000001);
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);
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);
BoardModelMotionStart(lbl_1_data_2E, 1, 0x40000001);
lbl_1_data_32 = BoardModelCreate(MAKE_DATA_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);
BoardModelMotionStart(lbl_1_data_30, 1, 0x40000001);
fn_8005D10C(&fn_1_8C0, &fn_1_904);
for (i = 0; i < ARRAY_COUNT(lbl_1_data_0); i++) {
temp_r30 = &lbl_1_data_0[i];
if (temp_r30->unk24 != -1) {
lbl_1_bss_8 = NULL;
lbl_1_bss_10[i] = fn_8006D9A4(temp_r30->unk24, lbl_1_bss_8, 0);
fn_8006F158(lbl_1_bss_10[i], temp_r30);
fn_8006F220(lbl_1_bss_10[i], &temp_r30->unk0C);
fn_8006F2E8(lbl_1_bss_10[i], &temp_r30->unk18);
lbl_1_bss_10[i] = BoardModelCreate(temp_r30->unk24, lbl_1_bss_8, 0);
BoardModelPosSetV(lbl_1_bss_10[i], temp_r30);
BoardModelRotSetV(lbl_1_bss_10[i], &temp_r30->unk0C);
BoardModelScaleSetV(lbl_1_bss_10[i], &temp_r30->unk18);
fn_8006F50C(lbl_1_bss_10[i], 1);
if (lbl_1_bss_8 != NULL) {
fn_8006E2B8(lbl_1_bss_10[i], 0, 0x40000001);
BoardModelMotionStart(lbl_1_bss_10[i], 0, 0x40000001);
}
}
}
fn_8006F50C(lbl_1_bss_10[0], 0);
lbl_1_bss_0->unk8 = fn_8006D9A4(0x7000A, NULL, 0);
lbl_1_bss_0->unk8 = BoardModelCreate(0x7000A, NULL, 0);
fn_8006F50C(lbl_1_bss_0->unk8, 0);
fn_80073FF4(&fn_1_90C);
fn_80073FFC(&fn_1_91C);
@ -142,42 +142,42 @@ void fn_1_6D8(void) {
s32 i;
for (i = 0; i < 1; i++) {
if (lbl_1_bss_10[i] != 0) {
fn_8006DB90(lbl_1_bss_10[i]);
BoardModelKill(lbl_1_bss_10[i]);
lbl_1_bss_10[i] = 0;
}
}
if (lbl_1_data_32 != -1) {
fn_8006DB90(lbl_1_data_32);
BoardModelKill(lbl_1_data_32);
lbl_1_data_32 = -1;
}
if (lbl_1_data_2E != -1) {
fn_8006DB90(lbl_1_data_2E);
BoardModelKill(lbl_1_data_2E);
lbl_1_data_2E = -1;
}
if (lbl_1_data_30 != -1) {
fn_8006DB90(lbl_1_data_30);
BoardModelKill(lbl_1_data_30);
lbl_1_data_30 = -1;
}
if (lbl_1_data_2C != -1) {
fn_8006DB90(lbl_1_data_2C);
BoardModelKill(lbl_1_data_2C);
lbl_1_data_2C = -1;
}
if (lbl_1_data_28 != -1) {
fn_8006DB90(lbl_1_data_28);
BoardModelKill(lbl_1_data_28);
lbl_1_data_28 = -1;
}
if (lbl_1_data_2A != -1) {
fn_8006DB90(lbl_1_data_2A);
BoardModelKill(lbl_1_data_2A);
lbl_1_data_2A = -1;
}
fn_8006DB90(lbl_1_bss_0->unk8);
BoardModelKill(lbl_1_bss_0->unk8);
fn_1_1DEC();
HuWinKill(lbl_1_bss_E);
fn_80077A3C();
}
void fn_1_8C0(void) {
s32 temp = fn_8006DBD4(lbl_1_data_28);
s32 temp = BoardModelIDGet(lbl_1_data_28);
Hu3DModelLightInfoSet(temp, 1);
}
@ -206,7 +206,7 @@ s32 fn_1_920(s32 arg0, f32 arg8, f32 arg9) {
f32 var_f31;
var_r31 = 0;
var_f31 = fn_8006F128(arg0);
var_f31 = BoardModelRotYGet(arg0);
arg8 = fmod(arg8, 360.0);
if (var_f31 < 0.0f) {
var_f31 += 360.0f;
@ -236,7 +236,7 @@ s32 fn_1_920(s32 arg0, f32 arg8, f32 arg9) {
if (var_f31 >= 360.0f) {
var_f31 -= 360.0f;
}
fn_8006F0D4(arg0, var_f31);
BoardModelRotYSet(arg0, var_f31);
} else {
var_r31 = 1;
}

18
src/REL/w10Dll/w10Dll2.c
View file

@ -13,10 +13,10 @@ Vec lbl_1_data_80[2] = {
void fn_1_AEC(void) {
lbl_1_bss_1C = 0;
lbl_1_bss_1E = fn_8006D9A4(MAKE_DATA_NUM(DATADIR_W10, 15), &lbl_1_data_78, 0);
fn_8006E2B8(lbl_1_bss_1E, 1, 0x40000001);
lbl_1_bss_1E = BoardModelCreate(MAKE_DATA_NUM(DATADIR_W10, 15), &lbl_1_data_78, 0);
BoardModelMotionStart(lbl_1_bss_1E, 1, 0x40000001);
fn_800B42BC(lbl_1_bss_1E);
fn_8006F61C(lbl_1_bss_1E, 6);
BoardModelLayerSet(lbl_1_bss_1E, 6);
lbl_1_bss_18 = HuPrcCreate(fn_1_C20, 0x1FFF, 0x1800, 0);
}
@ -46,18 +46,18 @@ void fn_1_C20(void) {
Vec sp8;
while (1) {
if (fn_8005B6A8() != 0) {
fn_8006DB90(lbl_1_bss_1E);
if (BoardIsKill() != 0) {
BoardModelKill(lbl_1_bss_1E);
fn_800B42BC(-1);
HuPrcEnd();
}
Hu3D2Dto3D(&lbl_1_data_80[lbl_1_bss_1C], 1, &sp14);
fn_8006F158(lbl_1_bss_1E, &sp14);
BoardModelPosSetV(lbl_1_bss_1E, &sp14);
BoardCameraRotGet(&sp8);
PSMTXRotRad(sp20, 'y', 0.2617994f);
fn_8006EFBC(lbl_1_bss_1E, sp20);
fn_8006F270(lbl_1_bss_1E, sp8.x, 0.0f, 0.0f);
fn_8006F338(lbl_1_bss_1E, 0.2f, 0.2f, 0.2f);
BoardModelMtxSet(lbl_1_bss_1E, sp20);
BoardModelRotSet(lbl_1_bss_1E, sp8.x, 0.0f, 0.0f);
BoardModelScaleSet(lbl_1_bss_1E, 0.2f, 0.2f, 0.2f);
HuPrcVSleep();
}
}

20
src/REL/w10Dll/w10Dll3.c
View file

@ -184,34 +184,34 @@ void fn_1_13A4(void) {
sp8.y = sp8.z = 0.0f;
temp_r3_2 = fn_800745F0(0, 0x80000);
fn_80074210(0, temp_r3_2, &sp14);
fn_8006F158(lbl_1_bss_0->unk8, &sp14);
BoardModelPosSetV(lbl_1_bss_0->unk8, &sp14);
BoardCameraStartMotion2(lbl_1_bss_0->unk8, &sp8, 0, 3200.0f, -1.0f, 0x1E);
fn_8005E0C0();
BoardCameraMotionWait();
fn_1_BA0(0x2E002C);
fn_8007A360(temp_r3_2);
BoardCameraStartMotion2(lbl_1_bss_0->unk8, &sp8, 0, 3200.0f, -1.0f, 0x1E);
fn_8005E0C0();
BoardCameraMotionWait();
temp_r3_2 = fn_800745F0(0, 0x10000000);
fn_80074210(0, temp_r3_2, &sp14);
fn_8006F158(lbl_1_bss_0->unk8, &sp14);
BoardModelPosSetV(lbl_1_bss_0->unk8, &sp14);
BoardCameraStartMotion2(lbl_1_bss_0->unk8, &sp8, 0, 3200.0f, -1.0f, 0x1E);
fn_8005E0C0();
BoardCameraMotionWait();
fn_1_BA0(0x2E002E);
fn_8007F894();
BoardCameraStartMotion2(lbl_1_bss_0->unk8, &sp8, 0, 3200.0f, -1.0f, 0x1E);
fn_8005E0C0();
BoardCameraMotionWait();
temp_r3_2 = fn_800745F0(0, 0x08000000);
fn_80074210(0, temp_r3_2, &sp14);
fn_8006F158(lbl_1_bss_0->unk8, &sp14);
BoardModelPosSetV(lbl_1_bss_0->unk8, &sp14);
BoardCameraStartMotion2(lbl_1_bss_0->unk8, &sp8, 0, 3200.0f, -1.0f, 0x1E);
fn_8005E0C0();
BoardCameraMotionWait();
fn_1_BA0(0x2E0030);
fn_800A6B10();
BoardCameraStartMotion2(lbl_1_bss_0->unk8, &sp8, 0, 3200.0f, -1.0f, 0x1E);
fn_8005E0C0();
BoardCameraMotionWait();
fn_1_BA0(0x2E0032);
BoardCameraTargetSetModel(fn_80083F84());
fn_8005E0C0();
BoardCameraMotionWait();
fn_1_BA0(0x2E0033);
fn_1_BA0(0x2E0034);
fn_1_1E3C(8, 0x122, 0x8C);

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

@ -137,7 +137,7 @@ void fn_1_1984(void) {
return;
}
HuWinDispOn(lbl_1_bss_E);
if (fn_8005B6A8() != 0) {
if (BoardIsKill() != 0) {
return;
}
for (i = 0; i < ARRAY_COUNT(GWPlayer); i++) {
@ -167,7 +167,7 @@ int fn_1_1AAC(s16 arg0, s32 arg1) {
HuWinDispOff(lbl_1_bss_E);
} else {
HuWinDispOn(lbl_1_bss_E);
if (fn_8005B6A8() == 0) {
if (BoardIsKill() == 0) {
s32 contPortIndex;
for (i = 0; i < ARRAY_COUNT(GWPlayer); i++) {
contPortIndex = GWPlayer[i].port;