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

Label first board translation unit

Browse source
This commit is contained in:
gamemasterplc 2023-12-28 13:00:17 -06:00
parent 9b1cf2c3c7
commit 55ec1e65f7
10 changed files with 127 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -53,7 +53,7 @@ void fn_1_C20(void) {
}
Hu3D2Dto3D(&lbl_1_data_80[lbl_1_bss_1C], 1, &sp14);
fn_8006F158(lbl_1_bss_1E, &sp14);
fn_8005D5C0(&sp8);
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);

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

@ -185,33 +185,32 @@ void fn_1_13A4(void) {
temp_r3_2 = fn_800745F0(0, 0x80000);
fn_80074210(0, temp_r3_2, &sp14);
fn_8006F158(lbl_1_bss_0->unk8, &sp14);
fn_8005DB6C(lbl_1_bss_0->unk8, &sp8, 0, 3200.0f, -1.0f, 0x1E);
BoardCameraStartMotion2(lbl_1_bss_0->unk8, &sp8, 0, 3200.0f, -1.0f, 0x1E);
fn_8005E0C0();
fn_1_BA0(0x2E002C);
fn_8007A360(temp_r3_2);
fn_8005DB6C(lbl_1_bss_0->unk8, &sp8, 0, 3200.0f, -1.0f, 0x1E);
BoardCameraStartMotion2(lbl_1_bss_0->unk8, &sp8, 0, 3200.0f, -1.0f, 0x1E);
fn_8005E0C0();
temp_r3_2 = fn_800745F0(0, 0x10000000);
fn_80074210(0, temp_r3_2, &sp14);
fn_8006F158(lbl_1_bss_0->unk8, &sp14);
fn_8005DB6C(lbl_1_bss_0->unk8, &sp8, 0, 3200.0f, -1.0f, 0x1E);
BoardCameraStartMotion2(lbl_1_bss_0->unk8, &sp8, 0, 3200.0f, -1.0f, 0x1E);
fn_8005E0C0();
fn_1_BA0(0x2E002E);
fn_8007F894();
fn_8005DB6C(lbl_1_bss_0->unk8, &sp8, 0, 3200.0f, -1.0f, 0x1E);
BoardCameraStartMotion2(lbl_1_bss_0->unk8, &sp8, 0, 3200.0f, -1.0f, 0x1E);
fn_8005E0C0();
temp_r3_2 = fn_800745F0(0, 0x08000000);
fn_80074210(0, temp_r3_2, &sp14);
fn_8006F158(lbl_1_bss_0->unk8, &sp14);
fn_8005DB6C(lbl_1_bss_0->unk8, &sp8, 0, 3200.0f, -1.0f, 0x1E);
BoardCameraStartMotion2(lbl_1_bss_0->unk8, &sp8, 0, 3200.0f, -1.0f, 0x1E);
fn_8005E0C0();
fn_1_BA0(0x2E0030);
fn_800A6B10();
fn_8005DB6C(lbl_1_bss_0->unk8, &sp8, 0, 3200.0f, -1.0f, 0x1E);
BoardCameraStartMotion2(lbl_1_bss_0->unk8, &sp8, 0, 3200.0f, -1.0f, 0x1E);
fn_8005E0C0();
fn_1_BA0(0x2E0032);
fn_80083F84();
fn_8005D8E8();
BoardCameraTargetSetModel(fn_80083F84());
fn_8005E0C0();
fn_1_BA0(0x2E0033);
fn_1_BA0(0x2E0034);
@ -229,7 +228,7 @@ void fn_1_13A4(void) {
if (lbl_1_bss_C == 0) {
lbl_1_bss_C = 1;
fn_80070EE8(0, 0x1F3);
fn_8005B5FC();
BoardKill();
}
fn_800B3FD8(NULL);
while (1) {

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

@ -153,7 +153,7 @@ void fn_1_1984(void) {
lbl_1_bss_C = 1;
OSReport(lbl_1_data_98);
fn_80070EE8(0, 0x1F3);
fn_8005B5FC();
BoardKill();
fn_800B3FD8(NULL);
}
}
@ -182,7 +182,7 @@ int fn_1_1AAC(s16 arg0, s32 arg1) {
lbl_1_bss_C = 1;
OSReport(lbl_1_data_98);
fn_80070EE8(0, 0x1F3);
fn_8005B5FC();
BoardKill();
fn_800B3FD8(NULL);
}
}

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

@ -1,7 +1,7 @@
#include "include/REL/w10Dll.h"
void fn_1_0(void) {
fn_8005B150(&fn_1_E0, &fn_1_6D8);
BoardInit(&fn_1_E0, &fn_1_6D8);
}
int _prolog(void) {
@ -10,7 +10,7 @@ int _prolog(void) {
(**ctors)();
ctors++;
}
fn_8005B150(&fn_1_E0, &fn_1_6D8);
fn_1_0();
return 0;
}

8
src/game/hsfman.c
View file

@ -1165,7 +1165,7 @@ void Hu3DCameraPosSet(s32 cam, f32 x, f32 y, f32 z, f32 ux, f32 uy, f32 uz, f32
}
}
void Hu3DCameraPosSetV(s32 cam, Vec pos, Vec up, Vec target) {
void Hu3DCameraPosSetV(s32 cam, Vec *pos, Vec *up, Vec *target) {
s16 mask;
s16 i;
CameraData* cam_ptr;
@ -1173,9 +1173,9 @@ void Hu3DCameraPosSetV(s32 cam, Vec pos, Vec up, Vec target) {
for (i = 0, mask = 1; i < 0x10; i++, mask <<= 1) {
if ((cam & mask) != 0) {
cam_ptr = &Hu3DCamera[i];
cam_ptr->pos = pos;
cam_ptr->up = up;
cam_ptr->target = target;
cam_ptr->pos = *pos;
cam_ptr->up = *up;
cam_ptr->target = *target;
}
}
}