print_n_panic/Microtransactions64
0
0
Fork 0
mirror of https://github.com/Print-and-Panic/Microtransactions64.git synced 2026-01-21 10:17:19 -08:00
Code Issues Packages Projects Releases Wiki Activity

More model fixes

Browse Source
This commit is contained in:
Arceveti
2021-09-22 17:51:59 -07:00
parent d2c1564eed
commit 5beba37d0e
10 changed files with 24 additions and 460 deletions
Download Patch File Download Diff File Expand all files Collapse all files

349
actors/amp/model.inc.c
View File

@@ -148,352 +148,3 @@ const Gfx dAmpBodyDl[] = {
gsSPSetGeometryMode(G_LIGHTING),
gsSPEndDisplayList(),
};
/**
* Everything beyond this point is unused, and seems to be an attempt at a 3D modelled
* amp. The model and attempt are overall slightly buggy, with misread lights and a slightly
* broken model.
*/
UNUSED static const Lights1 dAmpUnused3DLights = gdSPDefLights1(
0x33, 0x3f, 0x00,
0xcf, 0xff, 0x00, 0x28, 0x28, 0x28
);
UNUSED static const Vtx dAmpUnused3DVtx01[] = {
{{{ 280, 0, 35}, 0, { 0, 0}, {0x7b, 0xe2, 0x00, 0x00}}},
{{{ 240, -160, 0}, 0, { 0, 0}, {0x7b, 0xe2, 0x00, 0x00}}},
{{{ 280, 0, -35}, 0, { 0, 0}, {0x7b, 0xe2, 0x00, 0x00}}},
{{{ 280, 0, -35}, 0, { 0, 0}, {0x7b, 0x1e, 0x00, 0xff}}},
{{{ 240, 160, 0}, 0, { 0, 0}, {0x7b, 0x1e, 0x00, 0xff}}},
{{{ 280, 0, 35}, 0, { 0, 0}, {0x7b, 0x1e, 0x00, 0xff}}},
};
UNUSED static const Vtx dAmpUnused3DVtx02[] = {
{{{ 280, 0, 35}, 0, { 0, 0}, {0x7b, 0xe2, 0x00, 0x00}}},
{{{ 240, -160, 0}, 0, { 0, 0}, {0x7b, 0xe2, 0x00, 0x00}}},
{{{ 280, 0, -35}, 0, { 0, 0}, {0x7b, 0xe2, 0x00, 0x00}}},
{{{ 280, 0, -35}, 0, { 0, 0}, {0x7b, 0x1e, 0x00, 0xff}}},
{{{ 240, 160, 0}, 0, { 0, 0}, {0x7b, 0x1e, 0x00, 0xff}}},
{{{ 280, 0, 35}, 0, { 0, 0}, {0x7b, 0x1e, 0x00, 0xff}}},
};
UNUSED static const Vtx dAmpUnused3DVtx03[] = {
{{{ 280, 0, 35}, 0, { 0, 0}, {0x7b, 0xe2, 0x00, 0x00}}},
{{{ 240, -160, 0}, 0, { 0, 0}, {0x7b, 0xe2, 0x00, 0x00}}},
{{{ 280, 0, -35}, 0, { 0, 0}, {0x7b, 0xe2, 0x00, 0x00}}},
{{{ 280, 0, -35}, 0, { 0, 0}, {0x7b, 0x1e, 0x00, 0xff}}},
{{{ 240, 160, 0}, 0, { 0, 0}, {0x7b, 0x1e, 0x00, 0xff}}},
{{{ 280, 0, 35}, 0, { 0, 0}, {0x7b, 0x1e, 0x00, 0xff}}},
};
UNUSED static const Vtx dAmpUnused3DVtx04[] = {
{{{ 280, 0, -35}, 0, { 0, 0}, {0x7b, 0x1e, 0x00, 0x00}}},
{{{ 240, 160, 0}, 0, { 0, 0}, {0x7b, 0x1e, 0x00, 0x00}}},
{{{ 280, 0, 35}, 0, { 0, 0}, {0x7b, 0x1e, 0x00, 0x00}}},
{{{ 280, 0, 35}, 0, { 0, 0}, {0x7b, 0xe2, 0x00, 0xff}}},
{{{ 240, -160, 0}, 0, { 0, 0}, {0x7b, 0xe2, 0x00, 0xff}}},
{{{ 280, 0, -35}, 0, { 0, 0}, {0x7b, 0xe2, 0x00, 0xff}}},
};
UNUSED static const Vtx dAmpUnused3DVtx05[] = {
{{{ -184, -54, -54}, 0, { 0, 0}, {0x8b, 0xde, 0xde, 0x00}}},
{{{ -184, -76, 0}, 0, { 0, 0}, {0x8b, 0xd0, 0x00, 0x00}}},
{{{ -200, 0, 0}, 0, { 0, 0}, {0x81, 0x00, 0x00, 0x00}}},
{{{ -141, -100, -100}, 0, { 0, 0}, {0xa6, 0xc1, 0xc1, 0xff}}},
{{{ -141, -141, 0}, 0, { 0, 0}, {0xa6, 0xa7, 0x00, 0xff}}},
{{{ -76, -130, -130}, 0, { 0, 0}, {0xd0, 0xae, 0xae, 0xff}}},
{{{ -76, -184, 0}, 0, { 0, 0}, {0xd0, 0x8b, 0x00, 0xff}}},
{{{ 0, -141, -141}, 0, { 0, 0}, {0x00, 0xa7, 0xa7, 0xff}}},
{{{ 0, -200, 0}, 0, { 0, 0}, {0x00, 0x81, 0x00, 0xff}}},
{{{ 76, -130, -130}, 0, { 0, 0}, {0x30, 0xae, 0xae, 0xff}}},
{{{ 76, -184, 0}, 0, { 0, 0}, {0x30, 0x8b, 0x00, 0xff}}},
{{{ 141, -100, -100}, 0, { 0, 0}, {0x5a, 0xc1, 0xc1, 0xff}}},
{{{ 141, -141, 0}, 0, { 0, 0}, {0x5a, 0xa7, 0x00, 0xff}}},
{{{ 184, -54, -54}, 0, { 0, 0}, {0x75, 0xde, 0xde, 0xff}}},
{{{ 184, -76, 0}, 0, { 0, 0}, {0x75, 0xd0, 0x00, 0xff}}},
{{{ 200, 0, 0}, 0, { 0, 0}, {0x7f, 0x00, 0x00, 0xff}}},
};
UNUSED static const Vtx dAmpUnused3DVtx06[] = {
{{{ -184, 0, -76}, 0, { 0, 0}, {0x8b, 0x00, 0xd0, 0xff}}},
{{{ -184, -54, -54}, 0, { 0, 0}, {0x8b, 0xde, 0xde, 0x00}}},
{{{ -200, 0, 0}, 0, { 0, 0}, {0x81, 0x00, 0x00, 0x00}}},
{{{ -141, 0, -141}, 0, { 0, 0}, {0xa6, 0x00, 0xa7, 0xff}}},
{{{ -141, -100, -100}, 0, { 0, 0}, {0xa6, 0xc1, 0xc1, 0xff}}},
{{{ -76, 0, -184}, 0, { 0, 0}, {0xd0, 0x00, 0x8b, 0xff}}},
{{{ -76, -130, -130}, 0, { 0, 0}, {0xd0, 0xae, 0xae, 0xff}}},
{{{ 0, 0, -200}, 0, { 0, 0}, {0x00, 0x00, 0x81, 0xff}}},
{{{ 0, -141, -141}, 0, { 0, 0}, {0x00, 0xa7, 0xa7, 0xff}}},
{{{ 76, 0, -184}, 0, { 0, 0}, {0x30, 0x00, 0x8b, 0xff}}},
{{{ 76, -130, -130}, 0, { 0, 0}, {0x30, 0xae, 0xae, 0xff}}},
{{{ 141, 0, -141}, 0, { 0, 0}, {0x5a, 0x00, 0xa7, 0xff}}},
{{{ 141, -100, -100}, 0, { 0, 0}, {0x5a, 0xc1, 0xc1, 0xff}}},
{{{ 184, 0, -76}, 0, { 0, 0}, {0x75, 0x00, 0xd0, 0xff}}},
{{{ 184, -54, -54}, 0, { 0, 0}, {0x75, 0xde, 0xde, 0xff}}},
{{{ 200, 0, 0}, 0, { 0, 0}, {0x7f, 0x00, 0x00, 0xff}}},
};
UNUSED static const Vtx dAmpUnused3DVtx07[] = {
{{{ -184, 54, -54}, 0, { 0, 0}, {0x8b, 0x22, 0xde, 0xff}}},
{{{ -184, 0, -76}, 0, { 0, 0}, {0x8b, 0x00, 0xd0, 0x00}}},
{{{ -200, 0, 0}, 0, { 0, 0}, {0x81, 0x00, 0x00, 0x00}}},
{{{ -141, 100, -100}, 0, { 0, 0}, {0xa6, 0x3f, 0xc1, 0xff}}},
{{{ -141, 0, -141}, 0, { 0, 0}, {0xa6, 0x00, 0xa7, 0xff}}},
{{{ -76, 130, -130}, 0, { 0, 0}, {0xd0, 0x52, 0xae, 0xff}}},
{{{ -76, 0, -184}, 0, { 0, 0}, {0xd0, 0x00, 0x8b, 0xff}}},
{{{ 0, 141, -141}, 0, { 0, 0}, {0x00, 0x59, 0xa7, 0xff}}},
{{{ 0, 0, -200}, 0, { 0, 0}, {0x00, 0x00, 0x81, 0xff}}},
{{{ 76, 130, -130}, 0, { 0, 0}, {0x30, 0x52, 0xae, 0xff}}},
{{{ 76, 0, -184}, 0, { 0, 0}, {0x30, 0x00, 0x8b, 0xff}}},
{{{ 141, 100, -100}, 0, { 0, 0}, {0x5a, 0x3f, 0xc1, 0xff}}},
{{{ 141, 0, -141}, 0, { 0, 0}, {0x5a, 0x00, 0xa7, 0xff}}},
{{{ 184, 54, -54}, 0, { 0, 0}, {0x75, 0x22, 0xde, 0xff}}},
{{{ 184, 0, -76}, 0, { 0, 0}, {0x75, 0x00, 0xd0, 0xff}}},
{{{ 200, 0, 0}, 0, { 0, 0}, {0x7f, 0x00, 0x00, 0xff}}},
};
UNUSED static const Vtx dAmpUnused3DVtx08[] = {
{{{ -184, 76, 0}, 0, { 0, 0}, {0x8b, 0x30, 0x00, 0xff}}},
{{{ -184, 54, -54}, 0, { 0, 0}, {0x8b, 0x22, 0xde, 0x00}}},
{{{ -200, 0, 0}, 0, { 0, 0}, {0x81, 0x00, 0x00, 0x00}}},
{{{ -141, 141, 0}, 0, { 0, 0}, {0xa6, 0x59, 0x00, 0xff}}},
{{{ -141, 100, -100}, 0, { 0, 0}, {0xa6, 0x3f, 0xc1, 0xff}}},
{{{ -76, 184, 0}, 0, { 0, 0}, {0xd0, 0x75, 0x00, 0xff}}},
{{{ -76, 130, -130}, 0, { 0, 0}, {0xd0, 0x52, 0xae, 0xff}}},
{{{ 0, 200, 0}, 0, { 0, 0}, {0x00, 0x7f, 0x00, 0xff}}},
{{{ 0, 141, -141}, 0, { 0, 0}, {0x00, 0x59, 0xa7, 0xff}}},
{{{ 76, 184, 0}, 0, { 0, 0}, {0x30, 0x75, 0x00, 0xff}}},
{{{ 76, 130, -130}, 0, { 0, 0}, {0x30, 0x52, 0xae, 0xff}}},
{{{ 141, 141, 0}, 0, { 0, 0}, {0x5a, 0x59, 0x00, 0xff}}},
{{{ 141, 100, -100}, 0, { 0, 0}, {0x5a, 0x3f, 0xc1, 0xff}}},
{{{ 184, 76, 0}, 0, { 0, 0}, {0x75, 0x30, 0x00, 0xff}}},
{{{ 184, 54, -54}, 0, { 0, 0}, {0x75, 0x22, 0xde, 0xff}}},
{{{ 200, 0, 0}, 0, { 0, 0}, {0x7f, 0x00, 0x00, 0xff}}},
};
UNUSED static const Vtx dAmpUnused3DVtx09[] = {
{{{ -184, 54, 54}, 0, { 0, 0}, {0x8b, 0x22, 0x22, 0xff}}},
{{{ -184, 76, 0}, 0, { 0, 0}, {0x8b, 0x30, 0x00, 0x00}}},
{{{ -200, 0, 0}, 0, { 0, 0}, {0x81, 0x00, 0x00, 0x00}}},
{{{ -141, 100, 100}, 0, { 0, 0}, {0xa6, 0x3f, 0x3f, 0xff}}},
{{{ -141, 141, 0}, 0, { 0, 0}, {0xa6, 0x59, 0x00, 0xff}}},
{{{ -76, 130, 130}, 0, { 0, 0}, {0xd0, 0x52, 0x52, 0xff}}},
{{{ -76, 184, 0}, 0, { 0, 0}, {0xd0, 0x75, 0x00, 0xff}}},
{{{ 0, 141, 141}, 0, { 0, 0}, {0x00, 0x59, 0x59, 0xff}}},
{{{ 0, 200, 0}, 0, { 0, 0}, {0x00, 0x7f, 0x00, 0xff}}},
{{{ 76, 130, 130}, 0, { 0, 0}, {0x30, 0x52, 0x52, 0xff}}},
{{{ 76, 184, 0}, 0, { 0, 0}, {0x30, 0x75, 0x00, 0xff}}},
{{{ 141, 100, 100}, 0, { 0, 0}, {0x5a, 0x3f, 0x3f, 0xff}}},
{{{ 141, 141, 0}, 0, { 0, 0}, {0x5a, 0x59, 0x00, 0xff}}},
{{{ 184, 54, 54}, 0, { 0, 0}, {0x75, 0x22, 0x22, 0xff}}},
{{{ 184, 76, 0}, 0, { 0, 0}, {0x75, 0x30, 0x00, 0xff}}},
{{{ 200, 0, 0}, 0, { 0, 0}, {0x7f, 0x00, 0x00, 0xff}}},
};
UNUSED static const Vtx dAmpUnused3DVtx10[] = {
{{{ -184, 0, 76}, 0, { 0, 0}, {0x8b, 0x00, 0x30, 0xff}}},
{{{ -184, 54, 54}, 0, { 0, 0}, {0x8b, 0x22, 0x22, 0x00}}},
{{{ -200, 0, 0}, 0, { 0, 0}, {0x81, 0x00, 0x00, 0x00}}},
{{{ -141, 0, 141}, 0, { 0, 0}, {0xa6, 0x00, 0x59, 0xff}}},
{{{ -141, 100, 100}, 0, { 0, 0}, {0xa6, 0x3f, 0x3f, 0xff}}},
{{{ -76, 0, 184}, 0, { 0, 0}, {0xd0, 0x00, 0x75, 0xff}}},
{{{ -76, 130, 130}, 0, { 0, 0}, {0xd0, 0x52, 0x52, 0xff}}},
{{{ 0, 0, 200}, 0, { 0, 0}, {0x00, 0x00, 0x7f, 0xff}}},
{{{ 0, 141, 141}, 0, { 0, 0}, {0x00, 0x59, 0x59, 0xff}}},
{{{ 76, 0, 184}, 0, { 0, 0}, {0x30, 0x00, 0x75, 0xff}}},
{{{ 76, 130, 130}, 0, { 0, 0}, {0x30, 0x52, 0x52, 0xff}}},
{{{ 141, 0, 141}, 0, { 0, 0}, {0x5a, 0x00, 0x59, 0xff}}},
{{{ 141, 100, 100}, 0, { 0, 0}, {0x5a, 0x3f, 0x3f, 0xff}}},
{{{ 184, 0, 76}, 0, { 0, 0}, {0x75, 0x00, 0x30, 0xff}}},
{{{ 184, 54, 54}, 0, { 0, 0}, {0x75, 0x22, 0x22, 0xff}}},
{{{ 200, 0, 0}, 0, { 0, 0}, {0x7f, 0x00, 0x00, 0xff}}},
};
UNUSED static const Vtx dAmpUnused3DVtx11[] = {
{{{ -184, -54, 54}, 0, { 0, 0}, {0x8b, 0xde, 0x22, 0xff}}},
{{{ -184, 0, 76}, 0, { 0, 0}, {0x8b, 0x00, 0x30, 0x00}}},
{{{ -200, 0, 0}, 0, { 0, 0}, {0x81, 0x00, 0x00, 0x00}}},
{{{ -141, -100, 100}, 0, { 0, 0}, {0xa6, 0xc1, 0x3f, 0xff}}},
{{{ -141, 0, 141}, 0, { 0, 0}, {0xa6, 0x00, 0x59, 0xff}}},
{{{ -76, -130, 130}, 0, { 0, 0}, {0xd0, 0xae, 0x52, 0xff}}},
{{{ -76, 0, 184}, 0, { 0, 0}, {0xd0, 0x00, 0x75, 0xff}}},
{{{ 0, -141, 141}, 0, { 0, 0}, {0x00, 0xa7, 0x59, 0xff}}},
{{{ 0, 0, 200}, 0, { 0, 0}, {0x00, 0x00, 0x7f, 0xff}}},
{{{ 76, -130, 130}, 0, { 0, 0}, {0x30, 0xae, 0x52, 0xff}}},
{{{ 76, 0, 184}, 0, { 0, 0}, {0x30, 0x00, 0x75, 0xff}}},
{{{ 141, -100, 100}, 0, { 0, 0}, {0x5a, 0xc1, 0x3f, 0xff}}},
{{{ 141, 0, 141}, 0, { 0, 0}, {0x5a, 0x00, 0x59, 0xff}}},
{{{ 184, -54, 54}, 0, { 0, 0}, {0x75, 0xde, 0x22, 0xff}}},
{{{ 184, 0, 76}, 0, { 0, 0}, {0x75, 0x00, 0x30, 0xff}}},
{{{ 200, 0, 0}, 0, { 0, 0}, {0x7f, 0x00, 0x00, 0xff}}},
};
UNUSED static const Vtx dAmpUnused3DVtx12[] = {
{{{ -184, -76, 0}, 0, { 0, 0}, {0x8b, 0xd0, 0x00, 0xff}}},
{{{ -184, -54, 54}, 0, { 0, 0}, {0x8b, 0xde, 0x22, 0x00}}},
{{{ -200, 0, 0}, 0, { 0, 0}, {0x81, 0x00, 0x00, 0x00}}},
{{{ -141, -141, 0}, 0, { 0, 0}, {0xa6, 0xa7, 0x00, 0xff}}},
{{{ -141, -100, 100}, 0, { 0, 0}, {0xa6, 0xc1, 0x3f, 0xff}}},
{{{ -76, -184, 0}, 0, { 0, 0}, {0xd0, 0x8b, 0x00, 0xff}}},
{{{ -76, -130, 130}, 0, { 0, 0}, {0xd0, 0xae, 0x52, 0xff}}},
{{{ 0, -200, 0}, 0, { 0, 0}, {0x00, 0x81, 0x00, 0xff}}},
{{{ 0, -141, 141}, 0, { 0, 0}, {0x00, 0xa7, 0x59, 0xff}}},
{{{ 76, -184, 0}, 0, { 0, 0}, {0x30, 0x8b, 0x00, 0xff}}},
{{{ 76, -130, 130}, 0, { 0, 0}, {0x30, 0xae, 0x52, 0xff}}},
{{{ 141, -141, 0}, 0, { 0, 0}, {0x5a, 0xa7, 0x00, 0xff}}},
{{{ 141, -100, 100}, 0, { 0, 0}, {0x5a, 0xc1, 0x3f, 0xff}}},
{{{ 184, -76, 0}, 0, { 0, 0}, {0x75, 0xd0, 0x00, 0xff}}},
{{{ 184, -54, 54}, 0, { 0, 0}, {0x75, 0xde, 0x22, 0xff}}},
{{{ 200, 0, 0}, 0, { 0, 0}, {0x7f, 0x00, 0x00, 0xff}}},
};
UNUSED static const Vtx dAmpUnused3DVtx13[] = {
{{{ -37, 90, 205}, 0, { 0, 0}, {0xcc, 0x00, 0x73, 0x00}}},
{{{ -129, 90, 163}, 0, { 0, 0}, {0xcc, 0x00, 0x73, 0x00}}},
{{{ -129, -90, 163}, 0, { 0, 0}, {0xcc, 0x00, 0x73, 0x00}}},
{{{ -37, -90, 205}, 0, { 0, 0}, {0xcc, 0x00, 0x73, 0xff}}},
};
UNUSED static const Vtx dAmpUnused3DVtx14[] = {
{{{ 112, -7, 182}, 0, { 0, 0}, {0x4c, 0xd8, 0x5c, 0x00}}},
{{{ 66, -139, 162}, 0, { 0, 0}, {0x4c, 0xd8, 0x5c, 0x00}}},
{{{ 175, -77, 98}, 0, { 0, 0}, {0x4c, 0xd8, 0x5c, 0x00}}},
};
UNUSED static const Vtx dAmpUnused3DVtx15[] = {
{{{ 63, 90, 198}, 0, { 0, 0}, {0x08, 0x00, 0x7e, 0x00}}},
{{{ -35, 90, 205}, 0, { 0, 0}, {0x08, 0x00, 0x7e, 0x00}}},
{{{ -35, -90, 205}, 0, { 0, 0}, {0x08, 0x00, 0x7e, 0x00}}},
{{{ 63, -90, 198}, 0, { 0, 0}, {0x08, 0x00, 0x7e, 0xff}}},
};
UNUSED const Gfx dAmpUnused3DElectricDl1[] = {
gsSPLight(&dAmpUnused3DLights.l, 1),
gsSPLight(&dAmpUnused3DLights.a, 2),
gsSPVertex(dAmpUnused3DVtx01, 6, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSPEndDisplayList(),
};
UNUSED const Gfx dAmpUnused3DElectricDl2[] = {
gsSPLight(&dAmpUnused3DLights.l, 1),
gsSPLight(&dAmpUnused3DLights.a, 2),
gsSPVertex(dAmpUnused3DVtx02, 6, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSPEndDisplayList(),
};
UNUSED const Gfx dAmpUnused3DElectricDl3[] = {
gsSPLight(&dAmpUnused3DLights.l, 1),
gsSPLight(&dAmpUnused3DLights.a, 2),
gsSPVertex(dAmpUnused3DVtx03, 6, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSPEndDisplayList(),
};
UNUSED const Gfx dAmpUnused3DElectricDl4[] = {
gsSPLight(&dAmpUnused3DLights.l, 1),
gsSPLight(&dAmpUnused3DLights.a, 2),
gsSPVertex(dAmpUnused3DVtx04, 6, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSPEndDisplayList(),
};
UNUSED const Gfx dAmpUnused3DModelDl[] = {
//! Vertex interpreted as light
gsSPLight((const u8*)dAmpUnused3DVtx01 + 0x8, 1),
gsSPLight((const u8*)dAmpUnused3DVtx01, 2),
gsSPVertex(dAmpUnused3DVtx05, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 1, 0, 3, 0x0),
gsSP2Triangles( 1, 3, 4, 0x0, 4, 3, 5, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 6, 5, 7, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 8, 7, 9, 0x0),
gsSP2Triangles( 8, 9, 10, 0x0, 10, 9, 11, 0x0),
gsSP2Triangles(10, 11, 12, 0x0, 12, 11, 13, 0x0),
gsSP2Triangles(12, 13, 14, 0x0, 14, 13, 15, 0x0),
gsSPVertex(dAmpUnused3DVtx06, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 1, 0, 3, 0x0),
gsSP2Triangles( 1, 3, 4, 0x0, 4, 3, 5, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 6, 5, 7, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 8, 7, 9, 0x0),
gsSP2Triangles( 8, 9, 10, 0x0, 10, 9, 11, 0x0),
gsSP2Triangles(10, 11, 12, 0x0, 12, 11, 13, 0x0),
gsSP2Triangles(12, 13, 14, 0x0, 14, 13, 15, 0x0),
gsSPVertex(dAmpUnused3DVtx07, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 1, 0, 3, 0x0),
gsSP2Triangles( 1, 3, 4, 0x0, 4, 3, 5, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 6, 5, 7, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 8, 7, 9, 0x0),
gsSP2Triangles( 8, 9, 10, 0x0, 10, 9, 11, 0x0),
gsSP2Triangles(10, 11, 12, 0x0, 12, 11, 13, 0x0),
gsSP2Triangles(12, 13, 14, 0x0, 14, 13, 15, 0x0),
gsSPVertex(dAmpUnused3DVtx08, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 1, 0, 3, 0x0),
gsSP2Triangles( 1, 3, 4, 0x0, 4, 3, 5, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 6, 5, 7, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 8, 7, 9, 0x0),
gsSP2Triangles( 8, 9, 10, 0x0, 10, 9, 11, 0x0),
gsSP2Triangles(10, 11, 12, 0x0, 12, 11, 13, 0x0),
gsSP2Triangles(12, 13, 14, 0x0, 14, 13, 15, 0x0),
gsSPVertex(dAmpUnused3DVtx09, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 1, 0, 3, 0x0),
gsSP2Triangles( 1, 3, 4, 0x0, 4, 3, 5, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 6, 5, 7, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 8, 7, 9, 0x0),
gsSP2Triangles( 8, 9, 10, 0x0, 10, 9, 11, 0x0),
gsSP2Triangles(10, 11, 12, 0x0, 12, 11, 13, 0x0),
gsSP2Triangles(12, 13, 14, 0x0, 14, 13, 15, 0x0),
gsSPVertex(dAmpUnused3DVtx10, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 1, 0, 3, 0x0),
gsSP2Triangles( 1, 3, 4, 0x0, 4, 3, 5, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 6, 5, 7, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 8, 7, 9, 0x0),
gsSP2Triangles( 8, 9, 10, 0x0, 10, 9, 11, 0x0),
gsSP2Triangles(10, 11, 12, 0x0, 12, 11, 13, 0x0),
gsSP2Triangles(12, 13, 14, 0x0, 14, 13, 15, 0x0),
gsSPVertex(dAmpUnused3DVtx11, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 1, 0, 3, 0x0),
gsSP2Triangles( 1, 3, 4, 0x0, 4, 3, 5, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 6, 5, 7, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 8, 7, 9, 0x0),
gsSP2Triangles( 8, 9, 10, 0x0, 10, 9, 11, 0x0),
gsSP2Triangles(10, 11, 12, 0x0, 12, 11, 13, 0x0),
gsSP2Triangles(12, 13, 14, 0x0, 14, 13, 15, 0x0),
gsSPVertex(dAmpUnused3DVtx12, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 1, 0, 3, 0x0),
gsSP2Triangles( 1, 3, 4, 0x0, 4, 3, 5, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 6, 5, 7, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 8, 7, 9, 0x0),
gsSP2Triangles( 8, 9, 10, 0x0, 10, 9, 11, 0x0),
gsSP2Triangles(10, 11, 12, 0x0, 12, 11, 13, 0x0),
gsSP2Triangles(12, 13, 14, 0x0, 14, 13, 15, 0x0),
gsSPEndDisplayList(),
};
UNUSED const Gfx dAmpUnused3DElectricDl5[] = {
//! Vertex interpreted as light
gsSPLight((const u8*)dAmpUnused3DVtx01 + 0x8, 1),
gsSPLight((const u8*)dAmpUnused3DVtx01, 2),
gsSPVertex(dAmpUnused3DVtx13, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSPEndDisplayList(),
};
UNUSED const Gfx dAmpUnused3DElectricDl6[] = {
//! Vertex interpreted as light
gsSPLight((const u8*)dAmpUnused3DVtx01 + 0x8, 1),
gsSPLight((const u8*)dAmpUnused3DVtx01, 2),
gsSPVertex(dAmpUnused3DVtx14, 3, 0),
gsSP1Triangle( 0, 1, 2, 0x0),
gsSPEndDisplayList(),
};
UNUSED const Gfx dAmpUnused3DElectricDl7[] = {
//! Vertex interpreted as light
gsSPLight((const u8*)dAmpUnused3DVtx01 + 0x8, 1),
gsSPLight((const u8*)dAmpUnused3DVtx01, 2),
gsSPVertex(dAmpUnused3DVtx15, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSPEndDisplayList(),
};

21
actors/bully/model.inc.c
View File

@@ -83,7 +83,6 @@ static const Lights1 bully_seg5_lights_05000450 = gdSPDefLights1(
0x00, 0x00, 0x00, 0x28, 0x28, 0x28
);
// //! There's another malformed light entry here.
// 0x05000468
ALIGNED8 static const Texture bully_seg5_texture_05000468[] = {
#include "actors/bully/bully_left_side.rgba16.inc.c"
@@ -151,16 +150,6 @@ static const Vtx bully_seg5_vertex_05002E68[] = {
{{{ 90, 28, 0}, 0, { 0, 0}, {0xff, 0x7f, 0x00, 0xff}}},
};
// 0x05002EA8
static const Vtx bully_seg5_vertex_05002EA8[] = {
{{{ 60, 143, 0}, 0, { 0, 0}, {0x0c, 0x7e, 0x00, 0x00}}},
{{{ 57, 127, -67}, 0, { 0, 0}, {0x0c, 0x7a, 0xe3, 0x00}}},
{{{ -46, 137, -67}, 0, { 0, 0}, {0x0c, 0x7a, 0xe3, 0x00}}},
{{{ -42, 153, 0}, 0, { 0, 0}, {0x0c, 0x7e, 0x00, 0xff}}},
{{{ -46, 137, 67}, 0, { 0, 0}, {0x0c, 0x7a, 0x1d, 0xff}}},
{{{ 57, 127, 67}, 0, { 0, 0}, {0x0c, 0x7a, 0x1d, 0xff}}},
};
// 0x05002F08
static const Vtx bully_seg5_vertex_05002F08[] = {
{{{ -133, -40, 39}, 0, { 0, 0}, {0x8b, 0xdd, 0x22, 0x00}}},
@@ -353,16 +342,6 @@ const Gfx bully_seg5_dl_050037A0[] = {
gsSPEndDisplayList(),
};
// 0x05003838 - 0x05003878
const Gfx bully_seg5_dl_05003838[] = {
gsSPLight((u8*)bully_seg5_texture_05000468 + 0x8, 1), //! yet another malformed light...
gsSPLight(bully_seg5_texture_05000468, 2),
gsSPVertex(bully_seg5_vertex_05002EA8, 6, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 3, 4, 5, 0x0, 3, 5, 0, 0x0),
gsSPEndDisplayList(),
};
// 0x05003878 - 0x05003C50
const Gfx bully_seg5_dl_05003878[] = {
gsSPLight(&bully_seg5_lights_05000450.l, 1),

1
actors/group2.h
View File

@@ -17,7 +17,6 @@ extern const Gfx bully_seg5_dl_050002E0[];
extern const Gfx bully_seg5_dl_05000398[];
extern const Gfx bully_seg5_dl_05003708[];
extern const Gfx bully_seg5_dl_050037A0[];
extern const Gfx bully_seg5_dl_05003838[];
extern const Gfx bully_seg5_dl_05003878[];
extern const Gfx bully_seg5_dl_05003CD0[];
extern const Gfx bully_seg5_dl_05003D08[];

80
actors/hoot/model.inc.c
View File

@@ -360,7 +360,6 @@ ALIGNED8 static const Texture hoot_seg5_texture_05002650[] = {
#include "actors/hoot/hoot_wing_tip.rgba16.inc.c"
};
// //! The vertex macro which calls this has too large of a size.
// 0x05002E50
static const Vtx hoot_seg5_vertex_05002E50[] = {
{{{ 126, 0, -62}, 0, { 1780, 228}, {0x00, 0x7f, 0x00, 0x00}}},
@@ -371,13 +370,6 @@ static const Vtx hoot_seg5_vertex_05002E50[] = {
{{{ 168, 0, 125}, 0, { 2288, 2352}, {0x00, 0x7f, 0x00, 0x00}}},
};
// vertex -752, 0, 1280, -2800, 0, 0x07, 0x00, 0x00, 0x00
// vertex -6656, 0, 0, -3328, 0, 0x07, 0x3F, 0xF1, 0x00
// vertex -2800, 4096, 0, -3584, 0, 0x00, 0x07, 0xC0, 0x7C
// vertex 902, 16, 1280, 904, 16, 0x05, 0x00, 0x1E, 0x38
// vertex 1200, 192, 1280, -16640, 0, 0x00, 0x00, 0x0A, 0x14
// vertex -16640, 0, 30, -18432, 0, 0x00, 0x00, 0x00, 0x00
// 0x05002EB0 - 0x05002F10
const Gfx hoot_seg5_dl_05002EB0[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, hoot_seg5_texture_05002650),
@@ -388,7 +380,7 @@ const Gfx hoot_seg5_dl_05002EB0[] = {
gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (32 - 1) << G_TEXTURE_IMAGE_FRAC),
gsSPLight(&hoot_seg5_lights_05001E38.l, 1),
gsSPLight(&hoot_seg5_lights_05001E38.a, 2),
gsSPVertex(hoot_seg5_vertex_05002E50, 12, 0),
gsSPVertex(hoot_seg5_vertex_05002E50, 6, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSPEndDisplayList(),
};
@@ -413,7 +405,6 @@ static const Lights1 hoot_seg5_lights_05002F60 = gdSPDefLights1(
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// //! The vertex macro which calls this has too large of a size.
// 0x05002F78
static const Vtx hoot_seg5_vertex_05002F78[] = {
{{{ 119, 0, -85}, 0, { 1972, 68}, {0x00, 0x7f, 0x00, 0x00}}},
@@ -424,13 +415,6 @@ static const Vtx hoot_seg5_vertex_05002F78[] = {
{{{ 0, 0, 96}, 0, { 964, 2040}, {0x00, 0x7f, 0x00, 0x00}}},
};
// vertex -752, 0, 1280, -2800, 0, 0x07, 0x00, 0x00, 0x00
// vertex -6656, 0, 0, -3328, 0, 0x07, 0x3F, 0xF1, 0x00
// vertex -2800, 4096, 0, -3584, 0, 0x00, 0x07, 0xC0, 0x7C
// vertex 902, 16, 1280, 904, 16, 0x05, 0x00, 0x2F, 0x60
// vertex 1200, 192, 1280, -16640, 0, 0x00, 0x00, 0x0A, 0x14
// vertex -16640, 0, 30, -18432, 0, 0x00, 0x00, 0x00, 0x00
// 0x05002FD8 - 0x05003038
const Gfx hoot_seg5_dl_05002FD8[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, hoot_seg5_texture_05001E50),
@@ -441,7 +425,7 @@ const Gfx hoot_seg5_dl_05002FD8[] = {
gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (32 - 1) << G_TEXTURE_IMAGE_FRAC),
gsSPLight(&hoot_seg5_lights_05002F60.l, 1),
gsSPLight(&hoot_seg5_lights_05002F60.a, 2),
gsSPVertex(hoot_seg5_vertex_05002F78, 12, 0),
gsSPVertex(hoot_seg5_vertex_05002F78, 6, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSPEndDisplayList(),
};
@@ -466,7 +450,6 @@ static const Lights1 hoot_seg5_lights_05003088 = gdSPDefLights1(
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// //! The vertex macro which calls this has too large of a size.
// 0x050030A0
static const Vtx hoot_seg5_vertex_050030A0[] = {
{{{ 89, 1, -46}, 0, { 928, 456}, {0x00, 0x7f, 0x00, 0x00}}},
@@ -477,13 +460,6 @@ static const Vtx hoot_seg5_vertex_050030A0[] = {
{{{ 89, 1, 95}, 0, { 924, 2076}, {0x00, 0x7f, 0x00, 0x00}}},
};
// vertex -752, 0, 1280, -2800, 0, 0x07, 0x00, 0x00, 0x00
// vertex -6656, 0, 0, -3328, 0, 0x07, 0x3F, 0xF1, 0x00
// vertex -2800, 4096, 0, -3584, 0, 0x00, 0x07, 0xC0, 0x7C
// vertex 902, 16, 1280, 904, 16, 0x05, 0x00, 0x30, 0x88
// vertex 1200, 192, 1280, -16640, 0, 0x00, 0x00, 0x0A, 0x14
// vertex -16640, 0, 30, -18432, 0, 0x00, 0x00, 0x00, 0x00
// 0x05003100 - 0x05003160
const Gfx hoot_seg5_dl_05003100[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, hoot_seg5_texture_05001E50),
@@ -494,7 +470,7 @@ const Gfx hoot_seg5_dl_05003100[] = {
gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (32 - 1) << G_TEXTURE_IMAGE_FRAC),
gsSPLight(&hoot_seg5_lights_05003088.l, 1),
gsSPLight(&hoot_seg5_lights_05003088.a, 2),
gsSPVertex(hoot_seg5_vertex_050030A0, 12, 0),
gsSPVertex(hoot_seg5_vertex_050030A0, 6, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSPEndDisplayList(),
};
@@ -519,7 +495,6 @@ static const Lights1 hoot_seg5_lights_050031B0 = gdSPDefLights1(
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// //! The vertex macro which calls this has too large of a size.
// 0x050031C8
static const Vtx hoot_seg5_vertex_050031C8[] = {
{{{ 37, 1, -66}, 0, { 380, 184}, {0x00, 0x7f, 0x00, 0x00}}},
@@ -530,13 +505,6 @@ static const Vtx hoot_seg5_vertex_050031C8[] = {
{{{ 37, 1, 28}, 0, { 400, 1356}, {0x00, 0x7f, 0x00, 0x00}}},
};
// vertex -752, 0, 1280, -2800, 0, 0x07, 0x00, 0x00, 0x00
// vertex -6656, 0, 0, -3328, 0, 0x07, 0x3F, 0xF1, 0x00
// vertex -2800, 4096, 0, -3584, 0, 0x00, 0x07, 0xC0, 0x7C
// vertex 902, 16, 1280, 904, 16, 0x05, 0x00, 0x31, 0xB0
// vertex 1200, 192, 1280, -16640, 0, 0x00, 0x00, 0x0A, 0x14
// vertex -16640, 0, 30, -18432, 0, 0x00, 0x00, 0x00, 0x00
// 0x05003228 - 0x05003288
const Gfx hoot_seg5_dl_05003228[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, hoot_seg5_texture_05001E50),
@@ -547,7 +515,7 @@ const Gfx hoot_seg5_dl_05003228[] = {
gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (32 - 1) << G_TEXTURE_IMAGE_FRAC),
gsSPLight(&hoot_seg5_lights_050031B0.l, 1),
gsSPLight(&hoot_seg5_lights_050031B0.a, 2),
gsSPVertex(hoot_seg5_vertex_050031C8, 12, 0),
gsSPVertex(hoot_seg5_vertex_050031C8, 6, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSPEndDisplayList(),
};
@@ -572,7 +540,6 @@ static const Lights1 hoot_seg5_lights_050032D8 = gdSPDefLights1(
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// //! The vertex macro which calls this has too large of a size.
// 0x050032F0
static const Vtx hoot_seg5_vertex_050032F0[] = {
{{{ 168, 0, -124}, 0, { 2340, 2408}, {0x00, 0x7f, 0x00, 0x00}}},
@@ -583,13 +550,6 @@ static const Vtx hoot_seg5_vertex_050032F0[] = {
{{{ 0, 0, 88}, 0, { 424, -4}, {0x00, 0x7f, 0x00, 0x00}}},
};
// vertex -752, 0, 1280, -2800, 0, 0x07, 0x00, 0x00, 0x00
// vertex -6656, 0, 0, -3328, 0, 0x07, 0x3F, 0xF1, 0x00
// vertex -2800, 4096, 0, -3584, 0, 0x00, 0x07, 0xC0, 0x7C
// vertex 902, 16, 1280, 904, 16, 0x05, 0x00, 0x32, 0xD8
// vertex 1200, 192, 1280, -16640, 0, 0x00, 0x00, 0x0A, 0x14
// vertex -16640, 0, 30, -18432, 0, 0x00, 0x00, 0x00, 0x00
// 0x05003350 - 0x050033B0
const Gfx hoot_seg5_dl_05003350[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, hoot_seg5_texture_05002650),
@@ -600,7 +560,7 @@ const Gfx hoot_seg5_dl_05003350[] = {
gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (32 - 1) << G_TEXTURE_IMAGE_FRAC),
gsSPLight(&hoot_seg5_lights_050032D8.l, 1),
gsSPLight(&hoot_seg5_lights_050032D8.a, 2),
gsSPVertex(hoot_seg5_vertex_050032F0, 12, 0),
gsSPVertex(hoot_seg5_vertex_050032F0, 6, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSPEndDisplayList(),
};
@@ -625,7 +585,6 @@ static const Lights1 hoot_seg5_lights_05003400 = gdSPDefLights1(
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// //! The vertex macro which calls this has too large of a size.
// 0x05003418
static const Vtx hoot_seg5_vertex_05003418[] = {
{{{ 119, 0, -76}, 0, { 1988, 1892}, {0x00, 0x7f, 0x00, 0x00}}},
@@ -636,13 +595,6 @@ static const Vtx hoot_seg5_vertex_05003418[] = {
{{{ 119, 0, 86}, 0, { 1984, 36}, {0x00, 0x7f, 0x00, 0x00}}},
};
// vertex -752, 0, 1280, -2800, 0, 0x07, 0x00, 0x00, 0x00
// vertex -6656, 0, 0, -3328, 0, 0x07, 0x3F, 0xF1, 0x00
// vertex -2800, 4096, 0, -3584, 0, 0x00, 0x07, 0xC0, 0x7C
// vertex 902, 16, 1280, 904, 16, 0x05, 0x00, 0x34, 0x00
// vertex 1200, 192, 1280, -16640, 0, 0x00, 0x00, 0x0A, 0x14
// vertex -16640, 0, 30, -18432, 0, 0x00, 0x00, 0x00, 0x00
// 0x05003478 - 0x050034D8
const Gfx hoot_seg5_dl_05003478[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, hoot_seg5_texture_05001E50),
@@ -653,7 +605,7 @@ const Gfx hoot_seg5_dl_05003478[] = {
gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (32 - 1) << G_TEXTURE_IMAGE_FRAC),
gsSPLight(&hoot_seg5_lights_05003400.l, 1),
gsSPLight(&hoot_seg5_lights_05003400.a, 2),
gsSPVertex(hoot_seg5_vertex_05003418, 12, 0),
gsSPVertex(hoot_seg5_vertex_05003418, 6, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSPEndDisplayList(),
};
@@ -678,7 +630,6 @@ static const Lights1 hoot_seg5_lights_05003528 = gdSPDefLights1(
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// //! The vertex macro which calls this has too large of a size.
// 0x05003540
static const Vtx hoot_seg5_vertex_05003540[] = {
{{{ 89, 1, -94}, 0, { 984, 2096}, {0x00, 0x7f, 0x00, 0x00}}},
@@ -689,13 +640,6 @@ static const Vtx hoot_seg5_vertex_05003540[] = {
{{{ 37, 1, 67}, 0, { 368, 192}, {0x00, 0x7f, 0x00, 0x00}}},
};
// vertex -752, 0, 1280, -2800, 0, 0x07, 0x00, 0x00, 0x00
// vertex -6656, 0, 0, -3328, 0, 0x07, 0x3F, 0xF1, 0x00
// vertex -2800, 4096, 0, -3584, 0, 0x00, 0x07, 0xC0, 0x7C
// vertex 902, 16, 1280, 904, 16, 0x05, 0x00, 0x35, 0x28
// vertex 1200, 192, 1280, -16640, 0, 0x00, 0x00, 0x0A, 0x14
// vertex -16640, 0, 30, -18432, 0, 0x00, 0x00, 0x00, 0x00
// 0x050035A0 - 0x05003600
const Gfx hoot_seg5_dl_050035A0[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, hoot_seg5_texture_05001E50),
@@ -706,7 +650,7 @@ const Gfx hoot_seg5_dl_050035A0[] = {
gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (32 - 1) << G_TEXTURE_IMAGE_FRAC),
gsSPLight(&hoot_seg5_lights_05003528.l, 1),
gsSPLight(&hoot_seg5_lights_05003528.a, 2),
gsSPVertex(hoot_seg5_vertex_05003540, 12, 0),
gsSPVertex(hoot_seg5_vertex_05003540, 6, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSPEndDisplayList(),
};
@@ -731,7 +675,6 @@ static const Lights1 hoot_seg5_lights_05003650 = gdSPDefLights1(
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// //! The vertex macro which calls this has too large of a size.
// 0x05003668
static const Vtx hoot_seg5_vertex_05003668[] = {
{{{ 37, 1, -27}, 0, { 428, 1324}, {0x00, 0x7f, 0x00, 0x00}}},
@@ -742,13 +685,6 @@ static const Vtx hoot_seg5_vertex_05003668[] = {
{{{ 2, 1, 40}, 0, { -24, 512}, {0x00, 0x7f, 0x00, 0x00}}},
};
// vertex -752, 0, 1280, -2800, 0, 0x07, 0x00, 0x00, 0x00
// vertex -6656, 0, 0, -3328, 0, 0x07, 0x3F, 0xF1, 0x00
// vertex -2800, 4096, 0, -3584, 0, 0x00, 0x07, 0xC0, 0x7C
// vertex 902, 16, 1280, 904, 16, 0x05, 0x00, 0x36, 0x50
// vertex 1200, 192, 1280, -16640, 0, 0x00, 0x00, 0x0A, 0x14
// vertex -16640, 0, 30, -18432, 0, 0x00, 0x00, 0x00, 0x00
// 0x050036C8 - 0x05003728
const Gfx hoot_seg5_dl_050036C8[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, hoot_seg5_texture_05001E50),
@@ -759,7 +695,7 @@ const Gfx hoot_seg5_dl_050036C8[] = {
gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (32 - 1) << G_TEXTURE_IMAGE_FRAC),
gsSPLight(&hoot_seg5_lights_05003650.l, 1),
gsSPLight(&hoot_seg5_lights_05003650.a, 2),
gsSPVertex(hoot_seg5_vertex_05003668, 12, 0),
gsSPVertex(hoot_seg5_vertex_05003668, 6, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSPEndDisplayList(),
};

16
actors/koopa/model.inc.c
View File

@@ -49,11 +49,11 @@ static const Lights1 koopa_seg6_lights_06002630 = gdSPDefLights1(
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// //! There is a malformed light entry here pointing to this texture + 0x18.
// It results in the koopa actor 'wearing' what appears to be pink shorts
// beneath its shell, despite the fact it was intended to be white like
// the rest of its body. This is evident because once the mistake is corrected
// it turns back to being white like the other polygons.
// There is a malformed light entry here pointing to this texture + 0x18.
// It results in the koopa actor 'wearing' what appears to be pink shorts
// beneath its shell, despite the fact it was intended to be white like
// the rest of its body. This is evident because once the mistake is corrected
// it turns back to being white like the other polygons.
// 0x06002648
ALIGNED8 static const Texture koopa_seg6_texture_06002648[] = {
#include "actors/koopa/koopa_shell_front.rgba16.inc.c"
@@ -2077,8 +2077,10 @@ const Gfx koopa_seg6_dl_0600C498[] = {
gsSPVertex(koopa_seg6_vertex_0600B560, 9, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP1Triangle( 6, 7, 8, 0x0),
gsSPLight((u8*)koopa_seg6_texture_06002648 + 0x20, 1), //! this malformed light results in a
gsSPLight((u8*)koopa_seg6_texture_06002648 + 0x18, 2), //! koopa appearing to wear pink shorts.
#ifdef KOOPA_KEEP_PINK_SHORTS
gsSPLight((u8*)koopa_seg6_texture_06002648 + 0x20, 1), // this malformed light results in a
gsSPLight((u8*)koopa_seg6_texture_06002648 + 0x18, 2), // koopa appearing to wear pink shorts.
#endif
gsSPVertex(koopa_seg6_vertex_0600B5F0, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 0, 0x0, 8, 5, 9, 0x0),

2
actors/star/model.inc.c
View File

@@ -56,7 +56,7 @@ const Gfx star_seg3_dl_0302B870[] = {
gsSPSetGeometryMode(G_TEXTURE_GEN),
gsDPSetEnvColor(255, 255, 255, 255),
gsDPSetCombineMode(G_CC_DECALFADE, G_CC_DECALFADE),
gsDPLoadTextureBlock(star_seg3_texture_0302A6F0, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 64, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_WRAP | G_TX_NOMIRROR, 5, 6, G_TX_NOLOD, G_TX_NOLOD), //! Dimensions loaded as 32x64 despite this texture having only 32x32 dimensions, harmless due to environment mapping (G_TEXTURE_GEN & gsSPTexture values)
gsDPLoadTextureBlock(star_seg3_texture_0302A6F0, G_IM_FMT_RGBA, G_IM_SIZ_16b, 32, 32, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_WRAP | G_TX_NOMIRROR, 5, 5, G_TX_NOLOD, G_TX_NOLOD),
gsSPTexture(0x07C0, 0x07C0, 0, G_TX_RENDERTILE, G_ON),
gsSPDisplayList(star_seg3_dl_0302B7B0),
gsDPPipeSync(),

1
data/behavior_data.c
View File

@@ -1524,7 +1524,6 @@ const BehaviorScript bhvBlackSmokeMario[] = {
BEGIN(OBJ_LIST_UNIMPORTANT),
OR_INT(oFlags, (OBJ_FLAG_SET_FACE_YAW_TO_MOVE_YAW | OBJ_FLAG_MOVE_XZ_USING_FVEL | OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE)),
BILLBOARD(),
SET_INT(oAnimState, 4), //! burn_smoke_geo has no GEO_SWITCH_ANIM_STATE.
SET_FLOAT(oGraphYOffset, 50),
BEGIN_REPEAT(8),
CALL_NATIVE(bhv_black_smoke_mario_loop),

2
include/config.h
View File

@@ -110,6 +110,8 @@
#define FIX_SHADOW_TRANSPARENCY
// Fixes the game reading the ia8 burn smoke texture as an rgba16
#define BURN_SMOKE_FIX
// Disable the fix to Koopa's unshelled model
#define KOOPA_KEEP_PINK_SHORTS
// Automatically calculate the optimal collision distance for an object based on its vertices.
#define AUTO_COLLISION_DISTANCE

3
include/model_ids.h
View File

@@ -212,9 +212,6 @@
// vcutm
#define MODEL_VCUTM_SEESAW_PLATFORM 0x36 // vcutm_geo_0001F0
#define MODEL_VCUTM_CHECKERBOARD_PLATFORM_SPAWNER 0x37 //! @bug this object doesn't have a geo associated with it, yet is placed in vcutm.
// This causes a crash when the player quickly looks towards the
// checkerboard platforms after spawning but before it is unloaded.
// bitfs
#define MODEL_BITFS_PLATFORM_ON_TRACK 0x36 // bitfs_geo_000758

9
levels/vcutm/script.c
View File

@@ -19,11 +19,10 @@
static const LevelScript script_func_local_1[] = {
OBJECT(/*model*/ MODEL_VCUTM_SEESAW_PLATFORM, /*pos*/ 154, -1919, -6256, /*angle*/ 0, 270, 0, /*behParam*/ 0x00070000, /*beh*/ bhvSeesawPlatform),
OBJECT(/*model*/ MODEL_VCUTM_SEESAW_PLATFORM, /*pos*/ -2047, -3378, -2047, /*angle*/ 0, 0, 0, /*behParam*/ 0x00070000, /*beh*/ bhvSeesawPlatform),
//! @bug invalid model IDs - model ID 0x37 isn't loaded
OBJECT(/*model*/ MODEL_VCUTM_CHECKERBOARD_PLATFORM_SPAWNER, /*pos*/ 3251, -1082, -6256, /*angle*/ 0, 270, 0, /*behParam*/ 0x014B0000, /*beh*/ bhvCheckerboardElevatorGroup),
OBJECT(/*model*/ MODEL_VCUTM_CHECKERBOARD_PLATFORM_SPAWNER, /*pos*/ 2355, -1901, -6256, /*angle*/ 0, 270, 0, /*behParam*/ 0x014B0000, /*beh*/ bhvCheckerboardElevatorGroup),
OBJECT(/*model*/ MODEL_VCUTM_CHECKERBOARD_PLATFORM_SPAWNER, /*pos*/ 1459, -1594, -6256, /*angle*/ 0, 90, 0, /*behParam*/ 0x014B0000, /*beh*/ bhvCheckerboardElevatorGroup),
OBJECT(/*model*/ MODEL_VCUTM_CHECKERBOARD_PLATFORM_SPAWNER, /*pos*/ -1151, -2413, -6256, /*angle*/ 0, 270, 0, /*behParam*/ 0x014B0000, /*beh*/ bhvCheckerboardElevatorGroup),
OBJECT(/*model*/ MODEL_NONE, /*pos*/ 3251, -1082, -6256, /*angle*/ 0, 270, 0, /*behParam*/ 0x014B0000, /*beh*/ bhvCheckerboardElevatorGroup),
OBJECT(/*model*/ MODEL_NONE, /*pos*/ 2355, -1901, -6256, /*angle*/ 0, 270, 0, /*behParam*/ 0x014B0000, /*beh*/ bhvCheckerboardElevatorGroup),
OBJECT(/*model*/ MODEL_NONE, /*pos*/ 1459, -1594, -6256, /*angle*/ 0, 90, 0, /*behParam*/ 0x014B0000, /*beh*/ bhvCheckerboardElevatorGroup),
OBJECT(/*model*/ MODEL_NONE, /*pos*/ -1151, -2413, -6256, /*angle*/ 0, 270, 0, /*behParam*/ 0x014B0000, /*beh*/ bhvCheckerboardElevatorGroup),
RETURN(),
};