diff --git a/src/game/bondgun.c b/src/game/bondgun.c index 1490e2ffb..2ca9993a1 100644 --- a/src/game/bondgun.c +++ b/src/game/bondgun.c @@ -21381,11 +21381,11 @@ glabel var7f1aca90 // s32 stack[2]; // s32 k; // -// (rodata->vertices + j)->unk0a -= g_Vars.lvupdate240 * PALUP(25); +// (rodata->vertices + j)->t -= g_Vars.lvupdate240 * PALUP(25); // -// if ((rodata->vertices + j)->unk0a < -0x6000) { +// if ((rodata->vertices + j)->t < -0x6000) { // for (k = 0; k < rodata->numvertices; k++) { -// (rodata->vertices + k)->unk0a += 0x2000; +// (rodata->vertices + k)->t += 0x2000; // } // } // } diff --git a/src/game/credits.c b/src/game/credits.c index dafc4c6de..234466d76 100644 --- a/src/game/credits.c +++ b/src/game/credits.c @@ -67,17 +67,17 @@ void func0f1371b0(struct gfxvtx *vertices, f32 arg1, f32 arg2, f32 arg3, f32 arg f32 a = arg2 * sinf(arg1) + arg3 * cosf(arg1); f32 b = arg2 * cosf(arg1) - arg3 * sinf(arg1); - vertices[0].unk08 = (sinf(arg4) + cosf(arg4)) * arg5 + a; - vertices[0].unk0a = (cosf(arg4) - sinf(arg4)) * arg6 + b; + vertices[0].s = (sinf(arg4) + cosf(arg4)) * arg5 + a; + vertices[0].t = (cosf(arg4) - sinf(arg4)) * arg6 + b; - vertices[1].unk08 = (sinf(arg4 + 1.5707963705063f) + cosf(arg4 + 1.5707963705063f)) * arg5 + a; - vertices[1].unk0a = (cosf(arg4 + 1.5707963705063f) - sinf(arg4 + 1.5707963705063f)) * arg6 + b; + vertices[1].s = (sinf(arg4 + 1.5707963705063f) + cosf(arg4 + 1.5707963705063f)) * arg5 + a; + vertices[1].t = (cosf(arg4 + 1.5707963705063f) - sinf(arg4 + 1.5707963705063f)) * arg6 + b; - vertices[2].unk08 = (sinf(arg4 + 3.1415927410126f) + cosf(arg4 + 3.1415927410126f)) * arg5 + a; - vertices[2].unk0a = (cosf(arg4 + 3.1415927410126f) - sinf(arg4 + 3.1415927410126f)) * arg6 + b; + vertices[2].s = (sinf(arg4 + 3.1415927410126f) + cosf(arg4 + 3.1415927410126f)) * arg5 + a; + vertices[2].t = (cosf(arg4 + 3.1415927410126f) - sinf(arg4 + 3.1415927410126f)) * arg6 + b; - vertices[3].unk08 = (sinf(arg4 + 4.7123889923096f) + cosf(arg4 + 4.7123889923096f)) * arg5 + a; - vertices[3].unk0a = (cosf(arg4 + 4.7123889923096f) - sinf(arg4 + 4.7123889923096f)) * arg6 + b; + vertices[3].s = (sinf(arg4 + 4.7123889923096f) + cosf(arg4 + 4.7123889923096f)) * arg5 + a; + vertices[3].t = (cosf(arg4 + 4.7123889923096f) - sinf(arg4 + 4.7123889923096f)) * arg6 + b; } void func0f137430(struct gfxvtx *vertices, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6) @@ -85,32 +85,32 @@ void func0f137430(struct gfxvtx *vertices, f32 arg1, f32 arg2, f32 arg3, f32 arg f32 a = arg2 * sinf(arg1) + arg3 * cosf(arg1); f32 b = arg2 * cosf(arg1) - arg3 * sinf(arg1); - vertices[0].unk08 = (sinf(arg4) + cosf(arg4)) * arg5 + a; - vertices[0].unk0a = (cosf(arg4) - sinf(arg4)) * arg6 + b; + vertices[0].s = (sinf(arg4) + cosf(arg4)) * arg5 + a; + vertices[0].t = (cosf(arg4) - sinf(arg4)) * arg6 + b; - vertices[2].unk08 = (sinf(arg4 + 1.5707963705063f) + cosf(arg4 + 1.5707963705063f)) * arg5 + a; - vertices[2].unk0a = (cosf(arg4 + 1.5707963705063f) - sinf(arg4 + 1.5707963705063f)) * arg6 + b; + vertices[2].s = (sinf(arg4 + 1.5707963705063f) + cosf(arg4 + 1.5707963705063f)) * arg5 + a; + vertices[2].t = (cosf(arg4 + 1.5707963705063f) - sinf(arg4 + 1.5707963705063f)) * arg6 + b; - vertices[8].unk08 = (sinf(arg4 + 3.1415927410126f) + cosf(arg4 + 3.1415927410126f)) * arg5 + a; - vertices[8].unk0a = (cosf(arg4 + 3.1415927410126f) - sinf(arg4 + 3.1415927410126f)) * arg6 + b; + vertices[8].s = (sinf(arg4 + 3.1415927410126f) + cosf(arg4 + 3.1415927410126f)) * arg5 + a; + vertices[8].t = (cosf(arg4 + 3.1415927410126f) - sinf(arg4 + 3.1415927410126f)) * arg6 + b; - vertices[6].unk08 = (sinf(arg4 + 4.7123889923096f) + cosf(arg4 + 4.7123889923096f)) * arg5 + a; - vertices[6].unk0a = (cosf(arg4 + 4.7123889923096f) - sinf(arg4 + 4.7123889923096f)) * arg6 + b; + vertices[6].s = (sinf(arg4 + 4.7123889923096f) + cosf(arg4 + 4.7123889923096f)) * arg5 + a; + vertices[6].t = (cosf(arg4 + 4.7123889923096f) - sinf(arg4 + 4.7123889923096f)) * arg6 + b; - vertices[1].unk08 = (vertices[0].unk08 + vertices[2].unk08) / 2; - vertices[1].unk0a = (vertices[0].unk0a + vertices[2].unk0a) / 2; + vertices[1].s = (vertices[0].s + vertices[2].s) / 2; + vertices[1].t = (vertices[0].t + vertices[2].t) / 2; - vertices[3].unk08 = (vertices[0].unk08 + vertices[6].unk08) / 2; - vertices[3].unk0a = (vertices[0].unk0a + vertices[6].unk0a) / 2; + vertices[3].s = (vertices[0].s + vertices[6].s) / 2; + vertices[3].t = (vertices[0].t + vertices[6].t) / 2; - vertices[5].unk08 = (vertices[8].unk08 + vertices[2].unk08) / 2; - vertices[5].unk0a = (vertices[8].unk0a + vertices[2].unk0a) / 2; + vertices[5].s = (vertices[8].s + vertices[2].s) / 2; + vertices[5].t = (vertices[8].t + vertices[2].t) / 2; - vertices[7].unk08 = (vertices[6].unk08 + vertices[8].unk08) / 2; - vertices[7].unk0a = (vertices[6].unk0a + vertices[8].unk0a) / 2; + vertices[7].s = (vertices[6].s + vertices[8].s) / 2; + vertices[7].t = (vertices[6].t + vertices[8].t) / 2; - vertices[4].unk08 = (vertices[3].unk08 + vertices[5].unk08) / 2; - vertices[4].unk0a = (vertices[3].unk0a + vertices[5].unk0a) / 2; + vertices[4].s = (vertices[3].s + vertices[5].s) / 2; + vertices[4].t = (vertices[3].t + vertices[5].t) / 2; } /** @@ -821,14 +821,14 @@ Gfx *creditsDrawSprites(Gfx *gdl) vertices[3].y = pos.f[1] + f20 * (f2 + f0); vertices[3].z = pos.f[2]; - vertices[0].unk08 = g_CreditSpriteConfigs[confignum].unk04 * 32; - vertices[0].unk0a = g_CreditSpriteConfigs[confignum].unk06 * 32; - vertices[1].unk08 = g_CreditSpriteConfigs[confignum].unk04 * 32; - vertices[1].unk0a = g_CreditSpriteConfigs[confignum].unk0a * 32; - vertices[2].unk08 = g_CreditSpriteConfigs[confignum].unk08 * 32; - vertices[2].unk0a = g_CreditSpriteConfigs[confignum].unk0a * 32; - vertices[3].unk08 = g_CreditSpriteConfigs[confignum].unk08 * 32; - vertices[3].unk0a = g_CreditSpriteConfigs[confignum].unk06 * 32; + vertices[0].s = g_CreditSpriteConfigs[confignum].unk04 * 32; + vertices[0].t = g_CreditSpriteConfigs[confignum].unk06 * 32; + vertices[1].s = g_CreditSpriteConfigs[confignum].unk04 * 32; + vertices[1].t = g_CreditSpriteConfigs[confignum].unk0a * 32; + vertices[2].s = g_CreditSpriteConfigs[confignum].unk08 * 32; + vertices[2].t = g_CreditSpriteConfigs[confignum].unk0a * 32; + vertices[3].s = g_CreditSpriteConfigs[confignum].unk08 * 32; + vertices[3].t = g_CreditSpriteConfigs[confignum].unk06 * 32; if (1); offset = (g_CreditsData->sprites[i].unk14 + ((s32) (frac * 14.99f) * 4)) * 4; diff --git a/src/game/dyntex.c b/src/game/dyntex.c index 2ab2540b4..44ce0e025 100644 --- a/src/game/dyntex.c +++ b/src/game/dyntex.c @@ -81,8 +81,8 @@ void dyntexUpdateLinear(struct gfxvtx *vertices, struct dyntextype *type) for (i = 0; i < type->numvertices; i++) { struct gfxvtx *vertex = (struct gfxvtx *)((s32)vertices + g_DyntexVertices[type->vertexlistoffset + i].offset); - vertex->unk0a = g_DyntexVertices[type->vertexlistoffset + i].t + tmp; - vertex->unk08 = g_DyntexVertices[type->vertexlistoffset + i].s; + vertex->t = g_DyntexVertices[type->vertexlistoffset + i].t + tmp; + vertex->s = g_DyntexVertices[type->vertexlistoffset + i].s; } } @@ -93,8 +93,8 @@ void dyntexUpdateReset(struct gfxvtx *vertices, struct dyntextype *type) for (i = 0; i < type->numvertices; i++) { struct gfxvtx *vertex = (struct gfxvtx *)((s32)vertices + g_DyntexVertices[type->vertexlistoffset + i].offset); - vertex->unk08 = 0; - vertex->unk0a = 0; + vertex->s = 0; + vertex->t = 0; } } @@ -106,8 +106,8 @@ void dyntexUpdateMonitor(struct gfxvtx *vertices, struct dyntextype *type) for (i = 0; i < type->numvertices; i++) { struct gfxvtx *vertex = (struct gfxvtx *)((s32)vertices + g_DyntexVertices[type->vertexlistoffset + i].offset); - vertex->unk0a = g_DyntexVertices[type->vertexlistoffset + i].t - tmp; - vertex->unk08 = g_DyntexVertices[type->vertexlistoffset + i].s; + vertex->t = g_DyntexVertices[type->vertexlistoffset + i].t - tmp; + vertex->s = g_DyntexVertices[type->vertexlistoffset + i].s; } } @@ -127,10 +127,10 @@ void dyntexUpdateOcean(struct gfxvtx *vertices, struct dyntextype *type) struct gfxvtx *vertex = (struct gfxvtx *)((s32)vertices + g_DyntexVertices[type->vertexlistoffset + i].offset); angle = ((g_DyntexVertices[type->vertexlistoffset + i].t % modula) / (f32) modula + f24) * M_BADTAU; - vertex->unk0a = g_DyntexVertices[type->vertexlistoffset + i].t + (s16) (sinf(angle) * ripsize); + vertex->t = g_DyntexVertices[type->vertexlistoffset + i].t + (s16) (sinf(angle) * ripsize); angle = (((g_DyntexVertices[type->vertexlistoffset + i].s + 22) % modula) / (f32) modula + f24) * M_BADTAU; - vertex->unk08 = g_DyntexVertices[type->vertexlistoffset + i].s + (s16) (cosf(angle) * ripsize); + vertex->s = g_DyntexVertices[type->vertexlistoffset + i].s + (s16) (cosf(angle) * ripsize); } } @@ -142,8 +142,8 @@ void dyntexUpdateArrows(struct gfxvtx *vertices, struct dyntextype *type) for (i = 0; i < type->numvertices; i++) { struct gfxvtx *vertex = (struct gfxvtx *)((s32)vertices + g_DyntexVertices[type->vertexlistoffset + i].offset); - vertex->unk08 = g_DyntexVertices[type->vertexlistoffset + i].s + tmp; - vertex->unk0a = g_DyntexVertices[type->vertexlistoffset + i].t; + vertex->s = g_DyntexVertices[type->vertexlistoffset + i].s + tmp; + vertex->t = g_DyntexVertices[type->vertexlistoffset + i].t; } } @@ -184,23 +184,23 @@ void dyntexTickRoom(s32 roomnum, struct gfxvtx *vertices) for (i = 0; i < type->numvertices; i++) { struct gfxvtx *vertex = (struct gfxvtx *)((s32)vertices + g_DyntexVertices[type->vertexlistoffset + i].offset); - g_DyntexVertices[type->vertexlistoffset + i].s = vertex->unk08; - g_DyntexVertices[type->vertexlistoffset + i].t = vertex->unk0a; + g_DyntexVertices[type->vertexlistoffset + i].s = vertex->s; + g_DyntexVertices[type->vertexlistoffset + i].t = vertex->t; - if (vertex->unk08 < mins) { - mins = vertex->unk08; + if (vertex->s < mins) { + mins = vertex->s; } - if (vertex->unk0a < mint) { - mint = vertex->unk0a; + if (vertex->t < mint) { + mint = vertex->t; } - if (vertex->unk08 > maxs) { - maxs = vertex->unk08; + if (vertex->s > maxs) { + maxs = vertex->s; } - if (vertex->unk0a > maxt) { - maxt = vertex->unk0a; + if (vertex->t > maxt) { + maxt = vertex->t; } } diff --git a/src/game/explosions.c b/src/game/explosions.c index 13540e14e..72300c2f5 100644 --- a/src/game/explosions.c +++ b/src/game/explosions.c @@ -1516,26 +1516,26 @@ Gfx *explosionRenderPart(struct explosion *exp, struct explosionpart *part, Gfx vertices[0].x = x - spbc.f[0] - sp98.f[0] - coord->f[0]; vertices[0].y = y - spbc.f[1] - sp98.f[1] - coord->f[1]; vertices[0].z = z - spbc.f[2] - sp98.f[2] - coord->f[2]; - vertices[0].unk08 = 1760; - vertices[0].unk0a = 0; + vertices[0].s = 1760; + vertices[0].t = 0; vertices[1].x = x + spb0.f[0] - spa4.f[0] - coord->f[0]; vertices[1].y = y + spb0.f[1] - spa4.f[1] - coord->f[1]; vertices[1].z = z + spb0.f[2] - spa4.f[2] - coord->f[2]; - vertices[1].unk08 = 0; - vertices[1].unk0a = 0; + vertices[1].s = 0; + vertices[1].t = 0; vertices[2].x = x + spbc.f[0] + sp98.f[0] - coord->f[0]; vertices[2].y = y + spbc.f[1] + sp98.f[1] - coord->f[1]; vertices[2].z = z + spbc.f[2] + sp98.f[2] - coord->f[2]; - vertices[2].unk08 = 0; - vertices[2].unk0a = 1760; + vertices[2].s = 0; + vertices[2].t = 1760; vertices[3].x = x - spb0.f[0] + spa4.f[0] - coord->f[0]; vertices[3].y = y - spb0.f[1] + spa4.f[1] - coord->f[1]; vertices[3].z = z - spb0.f[2] + spa4.f[2] - coord->f[2]; - vertices[3].unk08 = 1760; - vertices[3].unk0a = 1760; + vertices[3].s = 1760; + vertices[3].t = 1760; for (j = 0; j < 4; j++) { vertices[j].colour = 0; diff --git a/src/game/gunfx.c b/src/game/gunfx.c index dcd398b77..655fa3a7a 100644 --- a/src/game/gunfx.c +++ b/src/game/gunfx.c @@ -4544,14 +4544,14 @@ glabel var7f1acd8c // // vertices[0].colour = vertices[1].colour = vertices[2].colour = vertices[3].colour = 0; // -// vertices[0].unk08 = 0; -// vertices[0].unk0a = 0; -// vertices[1].unk08 = 512; -// vertices[1].unk0a = 0; -// vertices[2].unk08 = 512; -// vertices[2].unk0a = 512; -// vertices[3].unk08 = 0; -// vertices[3].unk0a = 512; +// vertices[0].s = 0; +// vertices[0].t = 0; +// vertices[1].s = 512; +// vertices[1].t = 0; +// vertices[2].s = 512; +// vertices[2].t = 512; +// vertices[3].s = 0; +// vertices[3].t = 512; // // vertices[0].x = pos.f[0] + ((-f20 * f22) + (f20 * f14)); // vertices[0].y = pos.f[1] + 0.0f + (f20 * f16); @@ -5217,18 +5217,18 @@ glabel var7f1acd90 // vertices[4].colour = 4; // vertices[5].colour = 4; // -// vertices[0].unk08 = 0; -// vertices[0].unk0a = 0; -// vertices[1].unk08 = 0; -// vertices[1].unk0a = 256; -// vertices[2].unk08 = 32; -// vertices[2].unk0a = 0; -// vertices[3].unk08 = 32; -// vertices[3].unk0a = 256; -// vertices[4].unk08 = 0; -// vertices[4].unk0a = 0; -// vertices[5].unk08 = 0; -// vertices[5].unk0a = 256; +// vertices[0].s = 0; +// vertices[0].t = 0; +// vertices[1].s = 0; +// vertices[1].t = 256; +// vertices[2].s = 32; +// vertices[2].t = 0; +// vertices[3].s = 32; +// vertices[3].t = 256; +// vertices[4].s = 0; +// vertices[4].t = 0; +// vertices[5].s = 0; +// vertices[5].t = 256; // // vertices[0].x = spcc.f[0] - spa8.f[0] * 15; // vertices[0].y = spcc.f[1] - spa8.f[1] * 15; diff --git a/src/game/menugfx.c b/src/game/menugfx.c index 377fe8b39..da1c39c3c 100644 --- a/src/game/menugfx.c +++ b/src/game/menugfx.c @@ -1528,8 +1528,8 @@ void func0f0e0cbc(s32 arg0, s32 arg1, s16 arg2, s16 arg3, struct gfxvtx *vertex, mtx4TransformVecInPlace(arg5, &sp24); - vertex->unk08 = sp24.x * 32; - vertex->unk0a = sp24.y * 32; + vertex->s = sp24.x * 32; + vertex->t = sp24.y * 32; } Gfx *menugfxRenderDialogBackground(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, struct menudialog *dialog, u32 colour1, u32 colour2, f32 arg8) diff --git a/src/game/nbomb.c b/src/game/nbomb.c index 7118178ac..fa6550bdc 100644 --- a/src/game/nbomb.c +++ b/src/game/nbomb.c @@ -2768,11 +2768,11 @@ Gfx *nbombCreateGdl(void) vertices = gfxAllocateVertices(1); vertices[0].z = 0; - vertices[0].unk0a = 0; + vertices[0].t = 0; vertices[0].colour = 0; vertices[0].y = vertices[0].z; vertices[0].x = vertices[0].z; - vertices[0].unk08 = vertices[0].unk0a; + vertices[0].s = vertices[0].t; gDPSetVerticeArray(gdl++, osVirtualToPhysical(vertices), 1); @@ -4602,14 +4602,14 @@ glabel nbombRenderOverlay // vertices[3].x = viewleft; // vertices[3].y = viewbottom; // -// vertices[0].unk08 = s2; -// vertices[0].unk0a = sp5e; -// vertices[1].unk08 = s2 + 160; -// vertices[1].unk0a = sp5e; -// vertices[2].unk08 = s2 + 160; -// vertices[2].unk0a = sp5e + 960; -// vertices[3].unk08 = s2; -// vertices[3].unk0a = sp5e + 960; +// vertices[0].s = s2; +// vertices[0].t = sp5e; +// vertices[1].s = s2 + 160; +// vertices[1].t = sp5e; +// vertices[2].s = s2 + 160; +// vertices[2].t = sp5e + 960; +// vertices[3].s = s2; +// vertices[3].t = sp5e + 960; // // vertices[0].colour = 0; // vertices[1].colour = 0; @@ -5356,8 +5356,8 @@ const u32 var7f1a7eac[] = {0x00000090}; // vertices[5].z = -10; // vertices[6].z = -10; // vertices[7].z = -10; -// vertices[0].unk08 = sVar15; -// vertices[0].unk0a = sp72; +// vertices[0].s = sVar15; +// vertices[0].t = sp72; // vertices[1].y = viewtop; // vertices[4].y = viewtop; // vertices[5].y = viewtop; @@ -5372,28 +5372,28 @@ const u32 var7f1a7eac[] = {0x00000090}; // vertices[2].x = viewright; // vertices[5].x = viewright; // vertices[6].x = viewright; -// vertices[1].unk08 = sVar15 + 960; -// vertices[2].unk08 = sVar15 + 960; -// vertices[2].unk0a = sp72 + 640; -// vertices[3].unk08 = sVar15; -// vertices[3].unk0a = sp72 + 640; +// vertices[1].s = sVar15 + 960; +// vertices[2].s = sVar15 + 960; +// vertices[2].t = sp72 + 640; +// vertices[3].s = sVar15; +// vertices[3].t = sp72 + 640; // vertices[0].colour = 0; // vertices[1].colour = 0; // vertices[2].colour = 0; // vertices[3].colour = 0; -// vertices[1].unk0a = sp72; -// vertices[4].unk0a = spfa; -// vertices[4].unk08 = sp76; -// vertices[5].unk08 = sp76 + 640; -// vertices[6].unk08 = sp76 + 640; -// vertices[6].unk0a = spfa + 480; -// vertices[7].unk0a = spfa + 480; +// vertices[1].t = sp72; +// vertices[4].t = spfa; +// vertices[4].s = sp76; +// vertices[5].s = sp76 + 640; +// vertices[6].s = sp76 + 640; +// vertices[6].t = spfa + 480; +// vertices[7].t = spfa + 480; // vertices[4].colour = 0; // vertices[5].colour = 0; // vertices[6].colour = 0; // vertices[7].colour = 0; -// vertices[5].unk0a = spfa; -// vertices[7].unk08 = sp76; +// vertices[5].t = spfa; +// vertices[7].s = sp76; // // colours[0] = 0x3faf1100 | (u32)(alphafrac * 127.0f); // diff --git a/src/game/propobj.c b/src/game/propobj.c index b51a3beac..897b401b2 100644 --- a/src/game/propobj.c +++ b/src/game/propobj.c @@ -52223,14 +52223,14 @@ glabel var7f1aa824 // f16 *= f22; // } // -// vertices[0].unk08 = tconfig->width * (screen->xmid + f20) * 32; -// vertices[0].unk0a = tconfig->height * (screen->ymid + f24) * 32; -// vertices[1].unk08 = tconfig->width * (screen->xmid - f14) * 32; -// vertices[1].unk0a = tconfig->height * (screen->ymid + f16) * 32; -// vertices[2].unk08 = tconfig->width * (screen->xmid - f20) * 32; -// vertices[2].unk0a = tconfig->height * (screen->ymid - f24) * 32; -// vertices[3].unk08 = tconfig->width * (screen->xmid + f14) * 32; -// vertices[3].unk0a = tconfig->height * (screen->ymid - f16) * 32; +// vertices[0].s = tconfig->width * (screen->xmid + f20) * 32; +// vertices[0].t = tconfig->height * (screen->ymid + f24) * 32; +// vertices[1].s = tconfig->width * (screen->xmid - f14) * 32; +// vertices[1].t = tconfig->height * (screen->ymid + f16) * 32; +// vertices[2].s = tconfig->width * (screen->xmid - f20) * 32; +// vertices[2].t = tconfig->height * (screen->ymid - f24) * 32; +// vertices[3].s = tconfig->width * (screen->xmid + f14) * 32; +// vertices[3].t = tconfig->height * (screen->ymid - f16) * 32; // } // // if (tconfig); @@ -52458,14 +52458,14 @@ Gfx *gfxRenderRadialShadow(Gfx *gdl, f32 x, f32 y, f32 z, f32 angle, f32 radius, vertices[3].z = base3 - radius; if (tconfig) { - vertices[0].unk08 = 0; - vertices[0].unk0a = 0; - vertices[1].unk08 = tconfig->width * 32 - 1; - vertices[1].unk0a = 0; - vertices[2].unk08 = tconfig->width * 32 - 1; - vertices[2].unk0a = tconfig->height * 32 - 1; - vertices[3].unk08 = 0; - vertices[3].unk0a = tconfig->height * 32 - 1; + vertices[0].s = 0; + vertices[0].t = 0; + vertices[1].s = tconfig->width * 32 - 1; + vertices[1].t = 0; + vertices[2].s = tconfig->width * 32 - 1; + vertices[2].t = tconfig->height * 32 - 1; + vertices[3].s = 0; + vertices[3].t = tconfig->height * 32 - 1; texSelect(&gdl, tconfig, 4, 1, 2, 1, NULL); } else { diff --git a/src/game/savebuffer.c b/src/game/savebuffer.c index e255a504d..0fe7ea456 100644 --- a/src/game/savebuffer.c +++ b/src/game/savebuffer.c @@ -753,14 +753,14 @@ glabel func0f0d4d0c // a1_2 = var80061630 * sp30 * 64.0f * 32.0f; // } // -// vertices[0].unk08 = sp2e + t1; -// vertices[0].unk0a = sp2a + a1_2; -// vertices[1].unk08 = sp2c + t1; -// vertices[1].unk0a = sp2a + a1_2; -// vertices[3].unk08 = sp2c + t1; -// vertices[3].unk0a = sp28 + a1_2; -// vertices[2].unk08 = sp2e + t1; -// vertices[2].unk0a = sp28 + a1_2; +// vertices[0].s = sp2e + t1; +// vertices[0].t = sp2a + a1_2; +// vertices[1].s = sp2c + t1; +// vertices[1].t = sp2a + a1_2; +// vertices[3].s = sp2c + t1; +// vertices[3].t = sp28 + a1_2; +// vertices[2].s = sp2e + t1; +// vertices[2].t = sp28 + a1_2; // // if (type == 7) { // vertices[0].colour = 0; diff --git a/src/game/shards.c b/src/game/shards.c index ff53212b7..ac98e2c95 100644 --- a/src/game/shards.c +++ b/src/game/shards.c @@ -139,8 +139,8 @@ void shardCreate(s16 room, struct coord *pos, f32 rotx, f32 size, s32 type) for (i = 0; i < 3; i++) { g_Shards[g_NextShardNum].vertices[i].z = 0; - g_Shards[g_NextShardNum].vertices[i].unk08 = 0; - g_Shards[g_NextShardNum].vertices[i].unk0a = 0; + g_Shards[g_NextShardNum].vertices[i].s = 0; + g_Shards[g_NextShardNum].vertices[i].t = 0; g_Shards[g_NextShardNum].vertices[i].colour = i * 4; } diff --git a/src/game/sparks.c b/src/game/sparks.c index b47627d7e..4900970d8 100644 --- a/src/game/sparks.c +++ b/src/game/sparks.c @@ -449,8 +449,8 @@ Gfx *sparksRender(Gfx *gdl) f32 f2; for (k = 0; k < 3U; k++) { - vertices[k].unk08 = 0; - vertices[k].unk0a = 0; + vertices[k].s = 0; + vertices[k].t = 0; } f2 = sqrtf(spark->speed.f[0] * spark->speed.f[0] + spark->speed.f[1] * spark->speed.f[1] + spark->speed.f[2] * spark->speed.f[2]); @@ -471,12 +471,12 @@ Gfx *sparksRender(Gfx *gdl) vertices[2].z = spark->pos.z + spark->speed.f[2] * f2; vertices[2].colour = 0; - vertices[0].unk08 = 128; - vertices[0].unk0a = -256; - vertices[1].unk08 = -32; - vertices[1].unk0a = 496; - vertices[2].unk08 = 288; - vertices[2].unk0a = 496; + vertices[0].s = 128; + vertices[0].t = -256; + vertices[1].s = -32; + vertices[1].t = 496; + vertices[2].s = 288; + vertices[2].t = 496; switch (axis) { case 0: diff --git a/src/include/types.h b/src/include/types.h index e8e0a3195..f769aa655 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -5927,8 +5927,8 @@ struct gfxvtx { }; /*0x06*/ u8 flags; /*0x07*/ u8 colour; - /*0x08*/ s16 unk08; - /*0x0a*/ s16 unk0a; + /*0x08*/ s16 s; + /*0x0a*/ s16 t; }; struct shard { diff --git a/src/lib/model.c b/src/lib/model.c index 8681d9549..bf32dfdf6 100644 --- a/src/lib/model.c +++ b/src/lib/model.c @@ -6483,14 +6483,14 @@ glabel var70054454 // // centre = tconfig->width << 4; // -// vertices[0].unk08 = centre - sp5c; -// vertices[0].unk0a = centre - sp58; -// vertices[1].unk08 = centre + sp58; -// vertices[1].unk0a = centre - sp5c; -// vertices[2].unk08 = centre + sp5c; -// vertices[2].unk0a = centre + sp58; -// vertices[3].unk08 = centre - sp58; -// vertices[3].unk0a = centre + sp5c; +// vertices[0].s = centre - sp5c; +// vertices[0].t = centre - sp58; +// vertices[1].s = centre + sp58; +// vertices[1].t = centre - sp5c; +// vertices[2].s = centre + sp5c; +// vertices[2].t = centre + sp58; +// vertices[3].s = centre - sp58; +// vertices[3].t = centre + sp5c; // // model000216cc(renderdata, tconfig, 4); // } else {