mirror/mk64
1
0
Fork 0
mirror of https://github.com/n64decomp/mk64 synced 2026-08-16 20:47:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into text-documentation

Browse Source
This commit is contained in:
coco875
2024-09-26 11:22:47 +02:00
parent e6f33c4326 eb90cd7a00
commit 55a0a3cb74
3 changed files with 36 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code_80091750.c
+30 -43
View File
@@ -94,14 +94,6 @@ u8 D_8018ED90;
u8 D_8018ED91;
s32 s8018ED94;
f32 D_8018ED98; // Rotation
f32 D_8018ED9C; // Rotation
f32 D_8018EDA0; // Rotation
f32 D_8018EDA4;
f32 D_8018EDA8;
f32 D_8018EDAC;
Unk_D_800E70A0 D_800E70A0[] = {
{ 0x3d, 0x11, 0x00, 0x00 }, { 0x15, 0x3e, 0x00, 0x00 }, { 0x5c, 0x3e, 0x00, 0x00 },
{ 0xa3, 0x3e, 0x00, 0x00 }, { 0xea, 0x3e, 0x00, 0x00 }, { 0x10a, 0xc8, 0x00, 0x00 },
@@ -8111,53 +8103,48 @@ void func_800A638C(MenuItem* arg0) {
}
}
#ifndef NON_MATCHING
void guMtxCatL(Mtx*, Mtx*, Mtx*);
// https://decomp.me/scratch/GUqCE
// All the math stuff at the top is messed up
void func_800A66A8(MenuItem* arg0, Unk_D_800E70A0* arg1) {
Mtx* temp_s0;
Mtx* temp_s1;
f32 temp_f2;
f32 temp_f12;
f32 temp_f14;
Mtx* mtx;
f32 tmp;
static float x2, y2, z2;
static float x1, y1, z1;
temp_s1 = &gGfxPool->mtxEffect[gMatrixEffectCount];
mtx = &gGfxPool->mtxEffect[gMatrixEffectCount];
if (arg0->unk24 > 1.5) {
arg0->unk24 *= 0.95;
} else {
arg0->unk24 = 1.5f;
arg0->unk24 = 1.5;
}
temp_f2 = arg0->unk24 * 3.0f * arg0->unk8;
temp_f12 = arg0->unk24 * 4.0f;
temp_f14 = arg0->unk24 * 2.0f;
D_8018EDA4 = temp_f2;
D_8018EDA8 = temp_f12;
D_8018EDAC = temp_f14;
D_8018ED98 += D_8018EDA4;
D_8018ED9C += D_8018EDA8;
D_8018EDA0 += D_8018EDAC;
guScale(temp_s1, 1.2f, 1.2f, 1.2f);
temp_s0 = temp_s1 + 1;
guRotate(temp_s0, D_8018ED9C, 0.0f, 1.0f, 0.0f);
guMtxCatL(temp_s1, temp_s0, temp_s1);
guRotate(temp_s0, D_8018EDA0, 0.0f, 0.0f, 1.0f);
guMtxCatL(temp_s1, temp_s0, temp_s1);
guRotate(temp_s0, D_8018ED98, 1.0f, 0.0f, 0.0f);
guMtxCatL(temp_s1, temp_s0, temp_s1);
guTranslate(temp_s0, arg1->column, arg1->row, 0.0f);
guMtxCatL(temp_s1, temp_s0, temp_s1);
gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxEffect[gMatrixEffectCount]),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
tmp = arg0->unk24;
x1 = (tmp * 3) * arg0->unk8;
y1 = tmp * 4;
z1 = tmp * 2;
x2 += x1;
y2 += y1;
z2 += z1;
// clang-format off
if (x2); if (y2); if (z2);
// clang-format on
guScale(mtx, 1.2f, 1.2f, 1.2f);
guRotate(mtx + 1, y2, 0.0f, 1.0f, 0.0f);
guMtxCatL(mtx, mtx + 1, mtx);
guRotate(mtx + 1, z2, 0.0f, 0.0f, 1.0f);
guMtxCatL(mtx, mtx + 1, mtx);
guRotate(mtx + 1, x2, 1.0f, 0.0f, 0.0f);
guMtxCatL(mtx, mtx + 1, mtx);
guTranslate(mtx + 1, arg1->column, arg1->row, 0.0f);
guMtxCatL(mtx, mtx + 1, mtx);
gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxEffect[gMatrixEffectCount++]),
(G_MTX_NOPUSH | G_MTX_LOAD) | G_MTX_MODELVIEW);
gSPClearGeometryMode(gDisplayListHead++, G_LIGHTING);
gDPSetCombineMode(gDisplayListHead++, G_CC_MODULATEIA, G_CC_MODULATEIA);
gDPNoOp(gDisplayListHead++);
gDPSetRenderMode(gDisplayListHead++, G_RM_CLD_SURF, G_RM_CLD_SURF2);
gSPDisplayList(gDisplayListHead++, D_0D003090);
}
#else
GLOBAL_ASM("asm/non_matchings/code_80091750/func_800A66A8.s")
#endif
void func_800A69C8(UNUSED MenuItem* arg0) {
Unk_D_800E70A0* thing;