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

Some fixups

Browse source
This commit is contained in:
dbalatoni13 2025-04-05 14:38:14 +02:00
parent 6a27eb7356
commit 1acc0961d4
27 changed files with 107 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/GMPE01_00/rels/resultDll/symbols.txt
View file

@ -207,4 +207,4 @@ lbl_1_bss_19F8 = .bss:0x000019F8; // type:object size:0x20
lbl_1_bss_1A18 = .bss:0x00001A18; // type:object size:0x2
stageSprId = .bss:0x00001A1A; // type:object size:0x42 data:2byte
stageMotId = .bss:0x00001A5C; // type:object size:0x40 data:2byte
stageSprId = .bss:0x00001A9C; // type:object size:0x40 data:2byte
stageMdlId = .bss:0x00001A9C; // type:object size:0x40 data:2byte

8
src/REL/m406Dll/map.c
View file

@ -2956,7 +2956,7 @@ void fn_1_BC18(ModelData *arg0, float (*arg1)[4])
if (HmfInverseMtxF3X3(arg1, sp128) == 0) {
MTXIdentity(sp128);
}
Reorder(sp128, sp8);
MTXReorder(sp128, sp8);
if (var_r31->unk_4C) {
var_r18 = var_r31->unk_4C;
var_r18(arg0, var_r31, arg1);
@ -2964,7 +2964,7 @@ void fn_1_BC18(ModelData *arg0, float (*arg1)[4])
var_r29 = var_r31->unk_3C;
var_r30 = var_r31->unk_40;
var_r28 = var_r31->unk_44;
ROMultVecArray(sp8, lbl_1_data_8E0, &sp38[0], 4);
MTXROMultVecArray(sp8, lbl_1_data_8E0, &sp38[0], 4);
for (var_r26 = 0; var_r26 < var_r31->unk_26; var_r26++, var_r29++) {
if (!var_r29->unk_28) {
var_r30->x = var_r30->y = var_r30->z = 0.0f;
@ -3169,7 +3169,7 @@ void fn_1_C86C(ModelData *arg0, Mtx arg1)
if (HmfInverseMtxF3X3(arg1, sp9C) == 0) {
MTXIdentity(sp9C);
}
Reorder(sp9C, spC);
MTXReorder(sp9C, spC);
if (var_r31->unk_4C) {
var_r23 = var_r31->unk_4C;
var_r23(arg0, var_r31, arg1);
@ -3177,7 +3177,7 @@ void fn_1_C86C(ModelData *arg0, Mtx arg1)
var_r29 = var_r31->unk_3C;
var_r30 = var_r31->unk_40;
sp8 = var_r31->unk_44;
ROMultVecArray(spC, lbl_1_data_930, (Vec *)sp3C, 4);
MTXROMultVecArray(spC, lbl_1_data_930, (Vec *)sp3C, 4);
for (var_r25 = 0; var_r25 < var_r31->unk_26; var_r25++, var_r29++) {
if (!var_r29->unk_28) {
var_r30->x = var_r30->y = var_r30->z = 0.0f;

2
src/REL/m407dll/player.c
View file

@ -8,7 +8,7 @@
#include "game/objsub.h"
#include "game/pad.h"
#include "game/process.h"
#include "math.h"
#include "ext_math.h"
#include "REL/m407dll.h"

4
src/REL/m409Dll/main.c
View file

@ -1385,7 +1385,7 @@ void fn_1_602C(ModelData *arg0, f32 (*arg1)[4])
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_TEX_ST, GX_F32, 0);
GXSetArray(GX_VA_TEX0, temp_r30->unk20, 8);
fn_1_40A4(arg1, sp128);
Reorder(sp128, spF8);
MTXReorder(sp128, spF8);
if (((u8)omPauseChk() == 0) && (temp_r30->unkC)) {
var_r23 = temp_r30->unkC;
var_r23(arg0, temp_r30, arg1);
@ -1393,7 +1393,7 @@ void fn_1_602C(ModelData *arg0, f32 (*arg1)[4])
var_r29 = temp_r30->unk18;
var_r31 = temp_r30->unk1C;
var_r26 = temp_r30->unk20;
ROMultVecArray(spF8, &temp_r30->unk2C, &sp68[0], 4);
MTXROMultVecArray(spF8, &temp_r30->unk2C, &sp68[0], 4);
for (var_r25 = 0; var_r25 < temp_r30->unk0; var_r25++, var_r29++, var_r26 += 4) {
if (var_r29->unk4E == 0) {

4
src/REL/m417Dll/water.c
View file

@ -574,8 +574,8 @@ void fn_1_4E64(omObjData *object)
MTXScale(spC8, var_f31, var_f31, var_f31 * var_r31->unk_28);
MTXConcat(sp68, spC8, sp98);
MTXInverse(sp98, spC8);
Reorder(spC8, sp38);
ROMultVecArray(sp38, lbl_1_bss_178.unk_2C, lbl_1_bss_178.unk_34, lbl_1_bss_178.unk_18);
MTXReorder(spC8, sp38);
MTXROMultVecArray(sp38, lbl_1_bss_178.unk_2C, lbl_1_bss_178.unk_34, lbl_1_bss_178.unk_18);
sp2C.x = (0.15f * var_r31->unk_18) * (var_r31->unk_24 * sind(var_r31->unk_10));
sp2C.y = 0.0f;
sp2C.z = (0.15f * var_r31->unk_18) * (var_r31->unk_24 * cosd(var_r31->unk_10));

4
src/REL/m423Dll/main.c
View file

@ -5148,7 +5148,7 @@ void fn_1_11900(ModelData *arg0, Mtx arg1)
if (HmfInverseMtxF3X3(arg1, sp128) == 0) {
MTXIdentity(sp128);
}
Reorder(sp128, sp8);
MTXReorder(sp128, sp8);
if (temp_r31->unk4C) {
var_r18 = temp_r31->unk4C;
var_r18(arg0, temp_r31, arg1);
@ -5156,7 +5156,7 @@ void fn_1_11900(ModelData *arg0, Mtx arg1)
var_r29 = temp_r31->unk3C;
var_r30 = temp_r31->unk40;
var_r28 = temp_r31->unk44;
ROMultVecArray(sp8, lbl_1_data_8C4, sp38, 4);
MTXROMultVecArray(sp8, lbl_1_data_8C4, sp38, 4);
for (i = 0; i < temp_r31->unk26; i++, var_r29++) {
if (!var_r29->unk30) {
var_r30->x = var_r30->y = var_r30->z = 0.0f;

6
src/REL/m425Dll/thwomp.c
View file

@ -2131,7 +2131,7 @@ void fn_1_101C4(ModelData *var_r29, Mtx var_r28)
if (HmfInverseMtxF3X3(var_r28, sp50) == 0) {
MTXIdentity(sp50);
}
Reorder(sp50, sp20);
MTXReorder(sp50, sp20);
GXClearVtxDesc();
GXSetVtxDesc(GX_VA_POS, GX_INDEX16);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0);
@ -2694,7 +2694,7 @@ void fn_1_11EE0(ModelData *var_r24, Mtx var_r21)
if (HmfInverseMtxF3X3(var_r21, sp128) == 0) {
MTXIdentity(sp128);
}
Reorder(sp128, &sp8[0]);
MTXReorder(sp128, &sp8[0]);
if (var_r31->unk_4C) {
var_r18 = var_r31->unk_4C;
var_r18(var_r24, var_r31, var_r21);
@ -2702,7 +2702,7 @@ void fn_1_11EE0(ModelData *var_r24, Mtx var_r21)
var_r29 = var_r31->unk_3C;
var_r30 = var_r31->unk_40;
var_r26 = var_r31->unk_44;
ROMultVecArray(sp8, lbl_1_data_19C, &sp38[0], 4);
MTXROMultVecArray(sp8, lbl_1_data_19C, &sp38[0], 4);
for (var_r23 = 0; var_r23 < var_r31->unk_24; var_r23++, var_r29++) {
if (!var_r29->unk_28) {
var_r30->x = var_r30->y = var_r30->z = 0.0f;

4
src/REL/m426Dll/main.c
View file

@ -3045,7 +3045,7 @@ void fn_1_80DC(ModelData *arg0, Mtx arg1)
if (!HmfInverseMtxF3X3(arg1, sp128)) {
MTXIdentity(sp128);
}
Reorder(sp128, sp8);
MTXReorder(sp128, sp8);
if (var_r31->unk_4C) {
var_r18 = var_r31->unk_4C;
var_r18(arg0, var_r31, arg1);
@ -3053,7 +3053,7 @@ void fn_1_80DC(ModelData *arg0, Mtx arg1)
var_r29 = var_r31->unk_3C;
var_r30 = var_r31->unk_40;
var_r26 = var_r31->unk_44;
ROMultVecArray(sp8, lbl_1_data_22C, &sp38[0], 4);
MTXROMultVecArray(sp8, lbl_1_data_22C, &sp38[0], 4);
for (var_r23 = 0; var_r23 < var_r31->unk_24; var_r23++, var_r29++) {
if (!var_r29->unk_28) {
var_r30->x = var_r30->y = var_r30->z = 0.0f;

10
src/REL/m427Dll/map.c
View file

@ -3028,7 +3028,7 @@ void fn_1_DCD4(ModelData *model, Mtx matrix)
sp128[0][3] = 0.0f;
sp128[1][3] = 0.0f;
sp128[2][3] = 0.0f;
Reorder(sp128, spF8);
MTXReorder(sp128, spF8);
if ((omPauseChk() == 0) && (var_r30->unk_0C)) {
var_r23 = var_r30->unk_0C;
var_r23(model, var_r30, matrix);
@ -3036,7 +3036,7 @@ void fn_1_DCD4(ModelData *model, Mtx matrix)
var_r29 = var_r30->unk_18;
var_r31 = var_r30->unk_1C;
var_r26 = var_r30->unk_20;
ROMultVecArray(spF8, &var_r30->unk_2C, sp68, 4);
MTXROMultVecArray(spF8, &var_r30->unk_2C, sp68, 4);
for (var_r25 = 0; var_r25 < var_r30->unk_00; var_r25++, var_r29++, var_r26 += 4) {
if (var_r29->unk_62 == 0) {
var_r31->x = var_r31->y = var_r31->z = 0.0f;
@ -3058,9 +3058,9 @@ void fn_1_DCD4(ModelData *model, Mtx matrix)
}
else {
fn_1_E420(&var_r30->unk_2C, &sp38, &var_r29->unk_48, 4);
RotRad(spC8, 0x5A, MTXDegToRad(var_r29->unk_44));
Concat(sp128, spC8, sp98);
MultVecArray(sp98, &sp38, &sp8, 4);
MTXRotRad(spC8, 0x5A, MTXDegToRad(var_r29->unk_44));
MTXConcat(sp128, spC8, sp98);
MTXMultVecArray(sp98, &sp38, &sp8, 4);
PSVECAdd(&sp8, &var_r29->unk_54, var_r31++);
PSVECAdd(&sp14, &var_r29->unk_54, var_r31++);
PSVECAdd(&sp20, &var_r29->unk_54, var_r31++);

2
src/REL/m427Dll/player.c
View file

@ -1645,7 +1645,7 @@ void fn_1_13FBC(ModelData *model, Mtx matrix)
var_r27 = &lbl_1_bss_578[*var_r25];
var_r24 = lbl_1_bss_56C[*var_r25];
GXLoadPosMtxImm(matrix, 0);
InvXpose(matrix, sp70);
MTXInvXpose(matrix, sp70);
GXLoadNrmMtxImm(sp70, 0);
GXSetNumTevStages(1);
GXSetNumTexGens(1);

4
src/REL/m428Dll/player.c
View file

@ -3109,7 +3109,7 @@ void fn_1_134C0(ModelData *var_r23, Mtx var_r22)
if (HmfInverseMtxF3X3(var_r22, &sp128[0]) == 0) {
MTXIdentity(sp128);
}
Reorder(sp128, sp8);
MTXReorder(sp128, sp8);
if (var_r31->unk_4C) {
var_r18 = var_r31->unk_4C;
var_r18(var_r23, var_r31, var_r22);
@ -3117,7 +3117,7 @@ void fn_1_134C0(ModelData *var_r23, Mtx var_r22)
var_r29 = var_r31->unk_3C;
var_r30 = var_r31->unk_40;
var_r28 = var_r31->unk_44;
ROMultVecArray(sp8, lbl_1_data_6A4, &sp38[0], 4);
MTXROMultVecArray(sp8, lbl_1_data_6A4, &sp38[0], 4);
for (var_r26 = 0; var_r26 < var_r31->unk_26; var_r26++, var_r29++) {
if (!var_r29->unk_30) {
var_r30->x = var_r30->y = var_r30->z = 0.0f;

4
src/REL/m431Dll/main.c
View file

@ -2095,7 +2095,7 @@ void fn_1_72B4(ModelData *model, Mtx mtx)
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_TEX_ST, GX_F32, 0);
GXSetArray(GX_VA_TEX0, temp_r30->unk20, sizeof(HsfVector2f));
fn_1_79FC(mtx, sp128);
Reorder(sp128, spF8);
MTXReorder(sp128, spF8);
if (!omPauseChk() && temp_r30->unkC) {
temp_r23 = temp_r30->unkC;
temp_r23(model, temp_r30, mtx);
@ -2103,7 +2103,7 @@ void fn_1_72B4(ModelData *model, Mtx mtx)
temp_r29 = temp_r30->unk18;
temp_r31 = temp_r30->unk1C;
temp_r27 = temp_r30->unk20;
ROMultVecArray(spF8, temp_r30->unk2C, sp68, 4);
MTXROMultVecArray(spF8, temp_r30->unk2C, sp68, 4);
for (temp_r26 = 0; temp_r26 < temp_r30->unk0; temp_r26++, temp_r29++, temp_r27 += 4) {
if (temp_r29->unk56 == 0) {
temp_r31->x = temp_r31->y = temp_r31->z = 0;

66
src/REL/m438Dll/fire.c
View file

@ -64,17 +64,17 @@ void fn_1_E790(M438UnkStruct2 *arg0)
s32 var_r19;
mtxRot(sp60, arg0->unk_18.x, arg0->unk_18.y, arg0->unk_18.z);
Scale(sp90, arg0->unk_24.x, arg0->unk_24.y, arg0->unk_24.z);
Concat(sp60, sp90, sp90);
MTXScale(sp90, arg0->unk_24.x, arg0->unk_24.y, arg0->unk_24.z);
MTXConcat(sp60, sp90, sp90);
mtxTransCat(sp90, arg0->unk_0C.x, arg0->unk_0C.y, arg0->unk_0C.z);
Concat(Hu3DCameraMtx, sp90, spC0);
MTXConcat(Hu3DCameraMtx, sp90, spC0);
var_r29 = 0;
var_r28 = 0;
sp8 = 0;
for (var_r27 = GX_TEXMAP0; var_r27 < arg0->unk_04; var_r27++) {
if (arg0->unk_34[var_r27] != 0) {
temp_r26 = &lbl_1_bss_DE4.unk_3C[arg0->unk_34[var_r27]];
Copy(temp_r26->unk_18, sp30);
MTXCopy(temp_r26->unk_18, sp30);
mtxTransCat(sp30, temp_r26->unk_0C.x, temp_r26->unk_0C.y, temp_r26->unk_0C.z);
switch (temp_r26->unk_04) {
case 0:
@ -141,14 +141,14 @@ void fn_1_E790(M438UnkStruct2 *arg0)
break;
case 4:
mtxRot(sp60, arg0->unk_18.x, arg0->unk_18.y, arg0->unk_18.z);
Scale(sp90, arg0->unk_24.x, arg0->unk_24.y, arg0->unk_24.z);
Concat(sp60, sp90, sp90);
MTXScale(sp90, arg0->unk_24.x, arg0->unk_24.y, arg0->unk_24.z);
MTXConcat(sp60, sp90, sp90);
mtxTransCat(sp90, arg0->unk_0C.x, arg0->unk_0C.y, arg0->unk_0C.z);
Concat(Hu3DCameraMtx, sp90, sp30);
Inverse(Hu3DCameraMtx, sp60);
Concat(sp60, sp30, sp60);
Concat(Hu3DShadowData.unk_68, Hu3DShadowData.unk_38, sp90);
Concat(sp90, sp60, sp30);
MTXConcat(Hu3DCameraMtx, sp90, sp30);
MTXInverse(Hu3DCameraMtx, sp60);
MTXConcat(sp60, sp30, sp60);
MTXConcat(Hu3DShadowData.unk_68, Hu3DShadowData.unk_38, sp90);
MTXConcat(sp90, sp60, sp30);
GXLoadTexMtxImm(sp30, texMtxTbl[var_r28], GX_MTX3x4);
var_r19 = texMtxTbl[var_r28];
GXSetTexCoordGen2(var_r28, GX_TG_MTX3x4, GX_TG_POS, var_r19, 0, 0x7D);
@ -184,42 +184,42 @@ void fn_1_E790(M438UnkStruct2 *arg0)
case 0:
mtxRot(sp60, var_r31->unk_0C.x, var_r31->unk_0C.y, var_r31->unk_0C.z);
if (var_r31->unk_31 == 2) {
Concat(lbl_1_bss_DE4.unk_00, sp60, sp60);
MTXConcat(lbl_1_bss_DE4.unk_00, sp60, sp60);
}
else if (var_r31->unk_31 == 1) {
RotRad(sp90, 0x59, MTXDegToRad(CRot.y));
Concat(sp90, sp60, sp60);
MTXRotRad(sp90, 0x59, MTXDegToRad(CRot.y));
MTXConcat(sp90, sp60, sp60);
}
Scale(sp90, var_r31->unk_18.x, var_r31->unk_18.y, var_r31->unk_18.z);
Trans(sp30, var_r31->unk_24.x, var_r31->unk_24.y, var_r31->unk_24.z);
Concat(sp90, sp30, sp90);
Concat(sp60, sp90, sp90);
MTXScale(sp90, var_r31->unk_18.x, var_r31->unk_18.y, var_r31->unk_18.z);
MTXTrans(sp30, var_r31->unk_24.x, var_r31->unk_24.y, var_r31->unk_24.z);
MTXConcat(sp90, sp30, sp90);
MTXConcat(sp60, sp90, sp90);
mtxTransCat(sp90, var_r31->unk_00.x, var_r31->unk_00.y, var_r31->unk_00.z);
Concat(Hu3DCameraMtx, sp90, spF0);
MTXConcat(Hu3DCameraMtx, sp90, spF0);
break;
case 1:
mtxRot(sp60, var_r31->unk_0C.x, var_r31->unk_0C.y, var_r31->unk_0C.z);
if (var_r31->unk_31 == 2) {
if (HmfInverseMtxF3X3(spC0, sp90) == 0) {
Identity(sp90);
MTXIdentity(sp90);
}
Concat(sp90, sp60, sp60);
MTXConcat(sp90, sp60, sp60);
}
else if (var_r31->unk_31 == 1) {
RotRad(sp90, 0x59, MTXDegToRad(CRot.y));
Concat(sp90, sp60, sp60);
MTXRotRad(sp90, 0x59, MTXDegToRad(CRot.y));
MTXConcat(sp90, sp60, sp60);
}
Scale(sp90, var_r31->unk_18.x, var_r31->unk_18.y, var_r31->unk_18.z);
Trans(sp30, var_r31->unk_24.x, var_r31->unk_24.y, var_r31->unk_24.z);
Concat(sp90, sp30, sp90);
Concat(sp60, sp90, sp90);
MTXScale(sp90, var_r31->unk_18.x, var_r31->unk_18.y, var_r31->unk_18.z);
MTXTrans(sp30, var_r31->unk_24.x, var_r31->unk_24.y, var_r31->unk_24.z);
MTXConcat(sp90, sp30, sp90);
MTXConcat(sp60, sp90, sp90);
mtxTransCat(sp90, var_r31->unk_00.x, var_r31->unk_00.y, var_r31->unk_00.z);
Concat(spC0, sp90, spF0);
MTXConcat(spC0, sp90, spF0);
break;
}
GXLoadPosMtxImm(spF0, 0);
Inverse(spF0, sp90);
Transpose(sp90, sp60);
MTXInverse(spF0, sp90);
MTXTranspose(sp90, sp60);
GXLoadNrmMtxImm(sp60, 0);
GXSetChanAmbColor(GX_COLOR0A0, var_r31->unk_50);
GXSetChanMatColor(GX_COLOR0A0, var_r31->unk_54);
@ -291,8 +291,8 @@ void fn_1_F538(ModelData *arg0, Mtx arg1)
var_r31 = lbl_1_bss_DE4.unk_40;
GXLoadPosMtxImm(arg1, 0);
Inverse(arg1, sp38);
Transpose(sp38, sp8);
MTXInverse(arg1, sp38);
MTXTranspose(sp38, sp8);
GXLoadNrmMtxImm(sp8, 0);
HmfInverseMtxF3X3(Hu3DCameraMtx, lbl_1_bss_DE4.unk_00);
@ -780,7 +780,7 @@ s16 fn_1_10910(u32 arg0, s16 arg1, s16 arg2)
}
var_r31->unk_48.r = var_r31->unk_48.g = var_r31->unk_48.b = 0xFF;
var_r31->unk_48.a = 0xFF;
Identity(var_r31->unk_18);
MTXIdentity(var_r31->unk_18);
var_r31->unk_0C.x = var_r31->unk_0C.y = var_r31->unk_0C.z = 0.0f;
return var_r29;
}

4
src/REL/m440Dll/main.c
View file

@ -2460,7 +2460,7 @@ void fn_1_9C04(ModelData *arg0, Mtx arg1)
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_TEX_ST, GX_F32, 0);
GXSetArray(GX_VA_TEX0, temp_r30->unk20, 8);
fn_1_9344(arg1, sp128);
Reorder(sp128, spF8);
MTXReorder(sp128, spF8);
if (((u8)omPauseChk() == 0) && (temp_r30->unkC)) {
var_r23 = temp_r30->unkC;
var_r23(arg0, temp_r30, arg1);
@ -2468,7 +2468,7 @@ void fn_1_9C04(ModelData *arg0, Mtx arg1)
var_r29 = temp_r30->unk18;
var_r31 = temp_r30->unk1C;
var_r27 = temp_r30->unk20;
ROMultVecArray(spF8, &temp_r30->unk2C, (Vec *)&sp68[0], 4);
MTXROMultVecArray(spF8, &temp_r30->unk2C, (Vec *)&sp68[0], 4);
for (var_r26 = 0; var_r26 < temp_r30->unk0; var_r26++, var_r29++, var_r27 += 4) {
if (var_r29->unk62 == 0) {

4
src/REL/m442Dll/main.c
View file

@ -1531,8 +1531,8 @@ void fn_1_485C(ModelData *model, Mtx mtx)
GXSetProjection(sp40, GX_PERSPECTIVE);
MTXInverse(mtx, spA0);
spA0[0][3] = spA0[1][3] = spA0[2][3] = 0.0f;
Reorder(spA0, sp70);
ROMultVecArray(sp70, &lbl_1_data_1C0[0], &sp10, 4);
MTXReorder(spA0, sp70);
MTXROMultVecArray(sp70, &lbl_1_data_1C0[0], &sp10, 4);
GXLoadPosMtxImm(mtx, 0);
var_r31 = lbl_1_bss_5C;
for (var_r30 = 0; var_r30 < 1024; var_r30++, var_r31++) {

4
src/REL/m450Dll/main.c
View file

@ -1608,7 +1608,7 @@ void fn_1_56C4(ModelData *arg0, Mtx arg1)
sp130[0][3] = 0.0f;
sp130[1][3] = 0.0f;
sp130[2][3] = 0.0f;
Reorder(sp130, sp100);
MTXReorder(sp130, sp100);
if ((omPauseChk() == 0) && (var_r31->unk_00)) {
spC = var_r31->unk_00;
spC(arg0, var_r31, arg1);
@ -1616,7 +1616,7 @@ void fn_1_56C4(ModelData *arg0, Mtx arg1)
var_r29 = var_r31->unk_10;
var_r30 = var_r31->unk_14;
var_r27 = var_r31->unk_18;
ROMultVecArray(sp100, &var_r31->unk_28, sp70, 4);
MTXROMultVecArray(sp100, &var_r31->unk_28, sp70, 4);
for (var_r19 = 0; var_r19 < var_r31->unk_64; var_r19++, var_r29++, var_r27 += 4) {
if (var_r29->unk_3E < 0) {
var_r30->x = var_r30->y = var_r30->z = 0.0f;

2
src/dolphin/os/OSAlloc.c
View file

@ -246,7 +246,7 @@ void *OSAllocFixed(void **rstart, void **rend)
ASSERTMSG(0x1F3, MINOBJSIZE <= (char *)cellEnd - (char *)end);
newCell = (struct Cell *)end;
newCell->size = (intptr_t)((char *)cellEnd - (char *)end);
newCell->size = (uintptr_t)((char *)cellEnd - (char *)end);
newCell->next = cell->next;
if (newCell->next) {
newCell->next->prev = newCell;

2
src/game/board/item.c
View file

@ -1035,7 +1035,7 @@ static void ExecItemSwap(void)
}
BoardModelRotGet(suitMdl, &sp3C);
Hu3DCameraSet(0, sp108);
Inverse(sp108, spD8);
MTXInverse(sp108, spD8);
Hu3DMtxRotGet(spD8, &sp48);
sp3C.x = sp48.x;
for (var_r31 = 0; var_r31 < var_r28 / 2; var_r31++) {

8
src/game/board/lottery.c
View file

@ -964,19 +964,19 @@ static void ExecBallPrize(void)
temp_r29 = ballMdl[currPrize & 3];
BoardModelPosGet(lotteryMdl[0], &sp30);
BoardModelRotGet(lotteryMdl[0], &sp18);
RotRad(sp6C, 'Y', MTXDegToRad(sp18.y));
MTXRotRad(sp6C, 'Y', MTXDegToRad(sp18.y));
var_r27 = BoardModelIDGet(lotteryMdl[0]);
temp_r3 = Hu3DModelObjPtrGet(var_r27, "toto_gara");
temp_f28 = sp30.y + temp_r3->data.curr.pos.y + 100.0f;
Trans(sp3C, temp_r3->data.curr.pos.x, temp_r3->data.curr.pos.y + 210.0f, temp_r3->data.curr.pos.z + -40.0f);
Concat(sp6C, sp3C, sp3C);
MTXTrans(sp3C, temp_r3->data.curr.pos.x, temp_r3->data.curr.pos.y + 210.0f, temp_r3->data.curr.pos.z + -40.0f);
MTXConcat(sp6C, sp3C, sp3C);
Hu3DMtxTransGet(sp3C, &spC);
VECAdd(&spC, &sp30, &sp30);
BoardModelVisibilitySet(temp_r29, 1);
sp24.x = 10.5f;
sp24.y = -3.0f;
sp24.z = 0.0f;
MultVec(sp6C, &sp24, &sp24);
MTXMultVec(sp6C, &sp24, &sp24);
var_f29 = 0.0f;
var_f30 = 1.8f;
temp_f27 = 0.016666668f;

17
src/game/board/pause.c
View file

@ -18,7 +18,6 @@
#include "game/window.h"
#include "game/wipe.h"
typedef struct {
struct {
u8 unk00_field0 : 1;
@ -441,7 +440,7 @@ static void DeletePauseScreen(void)
HuSprGrpKill(pauseCursorPos);
pauseCursorPos = -1;
}
Identity(sp8);
MTXIdentity(sp8);
BoardModelLayerSet(hostMdl, hostOldLayer);
BoardModelVisibilitySet(hostMdl, 1);
BoardModelMtxSet(hostMdl, &sp8);
@ -1568,11 +1567,11 @@ static void RotateBox(float arg0, float arg1, Mtx arg2)
Mtx sp20;
BoardCameraRotGet(&sp14);
RotRad(spB0, 'x', MTXDegToRad(sp14.x));
RotRad(sp80, 'y', MTXDegToRad(sp14.y));
RotRad(sp50, 'x', MTXDegToRad(arg0));
RotRad(sp20, 'y', MTXDegToRad(arg1));
Concat(sp80, spB0, sp80);
Concat(sp50, sp20, sp20);
Concat(sp80, sp20, arg2);
MTXRotRad(spB0, 'x', MTXDegToRad(sp14.x));
MTXRotRad(sp80, 'y', MTXDegToRad(sp14.y));
MTXRotRad(sp50, 'x', MTXDegToRad(arg0));
MTXRotRad(sp20, 'y', MTXDegToRad(arg1));
MTXConcat(sp80, spB0, sp80);
MTXConcat(sp50, sp20, sp20);
MTXConcat(sp80, sp20, arg2);
}

9
src/game/board/shop.c
View file

@ -21,7 +21,6 @@
#include "game/process.h"
#include "game/sprite.h"
#include "dolphin.h"
#include "ext_math.h"
@ -537,9 +536,9 @@ static void UpdateShopWin(omObjData *arg0)
}
arg0->rot.y = BoardDAngleCalc(arg0->rot.y + 2.0f);
BoardCameraRotGet(&spC);
RotRad(sp48, 'y', MTXDegToRad(arg0->rot.y));
RotRad(sp18, 'x', MTXDegToRad(spC.x + 10.0f));
Concat(sp18, sp48, sp48);
MTXRotRad(sp48, 'y', MTXDegToRad(arg0->rot.y));
MTXRotRad(sp18, 'x', MTXDegToRad(spC.x + 10.0f));
MTXConcat(sp18, sp48, sp48);
BoardModelMtxSet(itemMdl, &sp48);
BoardModelRotSet(itemMdl, 0.0f, 0.0f, 0.0f);
BoardModelPosSet(itemMdl, arg0->trans.x, arg0->trans.y + var_f29, arg0->trans.z);
@ -602,7 +601,7 @@ void StartItemGive(void)
BoardModelMotionStart(itemMdl, 0, 0);
BoardModelMotionSpeedSet(itemMdl, 0.0f);
BoardModelPosGet(itemMdl, &sp14);
Identity(sp20);
MTXIdentity(sp20);
BoardModelMtxSet(itemMdl, &sp20);
OSs16tof32(&angleVal, &temp_r30->scale.z);
temp_r30->scale.z = -temp_r30->scale.z / 40.0f;

9
src/game/board/star.c
View file

@ -22,7 +22,6 @@
#include "game/window.h"
#include "game/wipe.h"
#include "ext_math.h"
typedef struct {
@ -699,9 +698,9 @@ void BoardStarShowNext(s32 arg0)
Hu3D2Dto3D(&sp44, 1, &sp44);
BoardModelPosSetV(BoardStarHostMdlGet(), &sp44);
BoardCameraRotGet(&sp2C);
RotRad(sp5C, 'y', MTXDegToRad(10.0f));
RotRad(sp8C, 'x', MTXDegToRad(sp2C.x));
Concat(sp8C, sp5C, spBC);
MTXRotRad(sp5C, 'y', MTXDegToRad(10.0f));
MTXRotRad(sp8C, 'x', MTXDegToRad(sp2C.x));
MTXConcat(sp8C, sp5C, spBC);
BoardModelMtxSet(BoardStarHostMdlGet(), &spBC);
BoardModelRotSet(BoardStarHostMdlGet(), 0.0f, 0.0f, 0.0f);
BoardModelScaleSet(BoardStarHostMdlGet(), 0.09f, 0.09f, 0.09f);
@ -748,7 +747,7 @@ void BoardStarShowNext(s32 arg0)
HuPrcVSleep();
}
BoardViewWait();
Identity(spBC);
MTXIdentity(spBC);
BoardModelMtxSet(BoardStarHostMdlGet(), &spBC);
HideNextHost(1);
while (showNextObj) {

7
src/game/board/ui.c
View file

@ -19,7 +19,6 @@
#include "game/sprite.h"
#include "game/window.h"
#include "ext_math.h"
typedef struct {
@ -1946,9 +1945,9 @@ static void UpdateItemWindow(omObjData *arg0)
Hu3D2Dto3D(&sp14, 1, &sp14);
BoardModelPosSetV(temp_r31->unk06[i], &sp14);
BoardCameraRotGet(&sp8);
RotRad(sp2C, 'y', MTXDegToRad(arg0->trans.x));
RotRad(sp5C, 'x', MTXDegToRad(sp8.x + 10.0f));
Concat(sp5C, sp2C, sp2C);
MTXRotRad(sp2C, 'y', MTXDegToRad(arg0->trans.x));
MTXRotRad(sp5C, 'x', MTXDegToRad(sp8.x + 10.0f));
MTXConcat(sp5C, sp2C, sp2C);
BoardModelMtxSet(temp_r31->unk06[i], &sp2C);
BoardModelRotSet(temp_r31->unk06[i], 0.0f, 0.0f, 0.0f);
}

7
src/game/board/view.c
View file

@ -9,7 +9,6 @@
#include "game/sprite.h"
#include "game/wipe.h"
#include "game/board/main.h"
#include "game/board/model.h"
#include "game/board/player.h"
@ -593,9 +592,9 @@ static void UpdateOverheadView(omObjData *arg0)
sp20.y = var_r29[1];
sp20.z = 1000.0f;
BoardCameraRotGet(&sp8);
RotRad(sp5C, 'x', MTXDegToRad(sp8.x));
RotRad(sp2C, 'y', MTXDegToRad(sp8.y));
Concat(sp2C, sp5C, sp2C);
MTXRotRad(sp5C, 'x', MTXDegToRad(sp8.x));
MTXRotRad(sp2C, 'y', MTXDegToRad(sp8.y));
MTXConcat(sp2C, sp5C, sp2C);
BoardModelMtxSet(temp_r31->unk04, &sp2C);
Hu3D2Dto3D(&sp20, 1, &sp20);
BoardModelPosSetV(temp_r31->unk04, &sp20);

4
src/game/data.c
View file

@ -279,8 +279,8 @@ BOOL HuDataGetAsyncStat(s32 status)
static void GetFileInfo(DataReadStat *read_stat, s32 file_num)
{
u32 *temp_ptr;
temp_ptr = (u32 *)PTR_OFFSET(read_stat->dir, (file_num * 4))+1;
uintptr_t *temp_ptr;
temp_ptr = (uintptr_t *)PTR_OFFSET(read_stat->dir, (file_num * 4))+1;
read_stat->file = PTR_OFFSET(read_stat->dir, *temp_ptr);
temp_ptr = read_stat->file;
read_stat->raw_len = *temp_ptr++;

2
src/game/main.c
View file

@ -125,7 +125,7 @@ void main(void)
GWPlayerCfg[i].character = -1;
}
// omMasterInit(0, _ovltbl, OVL_COUNT, OVL_BOOT);
omMasterInit(0, _ovltbl, OVL_COUNT, OVL_BOOT);
VIWaitForRetrace();
if (VIGetNextField() == 0) {

11
src/port/stubs.c
View file

@ -4,6 +4,9 @@
#include <stdio.h>
#include <types.h>
#include <game/dvd.h>
#include <game/object.h>
// Credits: Super Monkey Ball
void OSReport(const char *msg, ...)
@ -640,7 +643,8 @@ void GXPosition2s16(const s16 x, const s16 y)
puts("GXPosition2s16 is a stub");
}
void GXColor1x8(u8 index) {
void GXColor1x8(u8 index)
{
puts("GXColor1x8 is a stub");
}
@ -691,3 +695,8 @@ void MGSeqMain(void)
{
puts("MGSeqMain is a stub");
}
void omMasterInit(s32 prio, FileListEntry *ovl_list, s32 ovl_count, OverlayID start_ovl)
{
puts("omMasterInit is a stub");
}