Skip to content

Commit 908be91

Browse files
stalechilibeansstalechilibeans
committed
thi neveraxian
needs some things to be done here and there but it's mostly there
1 parent db1af10 commit 908be91

11 files changed

Lines changed: 3309 additions & 2498 deletions

File tree

‎levels/thi/areas/1/1/model.inc.c‎

Lines changed: 1086 additions & 1277 deletions
Large diffs are not rendered by default.

‎levels/thi/areas/1/2/model.inc.c‎

Lines changed: 836 additions & 60 deletions
Large diffs are not rendered by default.

‎levels/thi/areas/1/3/model.inc.c‎

Lines changed: 234 additions & 127 deletions
Large diffs are not rendered by default.

‎levels/thi/areas/1/4/model.inc.c‎

Lines changed: 77 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,86 @@
1-
// 0x07007078 - 0x07007090
2-
static const Lights1 thi_seg7_lights_07007078 = gdSPDefLights1(
3-
0x7f/2, 0x7f/2, 0x3c/2,
4-
0xff, 0xff, 0x78, 0x28, 0x28, 0x28
5-
);
1+
Lights1 big_world_f3dlite_material_026_lights = gdSPDefLights1(
2+
0x7F, 0x7F, 0x3C,
3+
0xFF, 0xFF, 0x78, 0x49, 0x49, 0x49);
64

7-
// 0x07007090 - 0x07007180
8-
static const Vtx thi_seg7_vertex_07007090[] = {
9-
{{{ 5632, -6655, -6655}, 0, { 76, 806}, {0x00, 0x7f, 0x00, 0xff}}},
10-
{{{ 5120, -6655, -7167}, 0, { 0, 990}, {0x00, 0x7f, 0x00, 0xff}}},
11-
{{{ 4608, -6655, -5631}, 0, { 506, 990}, {0x00, 0x7f, 0x00, 0xff}}},
12-
{{{ -8191, -3583, -8191}, 0, { 1502, 990}, {0x00, 0x7f, 0x00, 0xff}}},
13-
{{{ -5119, -3583, -4607}, 0, { 0, 96}, {0x00, 0x7f, 0x00, 0xff}}},
14-
{{{ -5119, -3583, -8191}, 0, { 0, 990}, {0x00, 0x7f, 0x00, 0xff}}},
15-
{{{ -8191, -3583, -8191}, 0, { 0, 990}, {0x00, 0x7f, 0x00, 0xff}}},
16-
{{{ -8191, -3583, 8192}, 0, { 8144, 990}, {0x00, 0x7f, 0x00, 0xff}}},
17-
{{{ -5119, -3583, 8192}, 0, { 8144, 0}, {0x00, 0x7f, 0x00, 0xff}}},
18-
{{{ -5119, -3583, -4607}, 0, { 1756, 0}, {0x00, 0x7f, 0x00, 0xff}}},
19-
{{{ -5119, -3583, 8192}, 0, { 0, 990}, {0x00, 0x7f, 0x00, 0xff}}},
20-
{{{ 6963, -3583, 8192}, 0, { 5998, 990}, {0x00, 0x7f, 0x00, 0xff}}},
21-
{{{ 6963, -3583, 4608}, 0, { 5998, 96}, {0x00, 0x7f, 0x00, 0xff}}},
22-
{{{ -5119, -3583, 4608}, 0, { 0, 96}, {0x00, 0x7f, 0x00, 0xff}}},
23-
{{{ 5632, -6655, -4607}, 0, { 722, 620}, {0x00, 0x7f, 0x00, 0xff}}},
5+
Vtx big_world_4_dl_mesh_vtx_0[27] = {
6+
{{ {-8191, -3583, -8191}, 0, {1502, 990}, {0, 127, 0, 255} }},
7+
{{ {-5119, -3583, -4607}, 0, {0, 96}, {0, 127, 0, 255} }},
8+
{{ {-5119, -3583, -8191}, 0, {0, 990}, {0, 127, 0, 255} }},
9+
{{ {5632, -6655, -6655}, 0, {76, 806}, {0, 127, 0, 255} }},
10+
{{ {5120, -6655, -7167}, 0, {0, 990}, {0, 127, 0, 255} }},
11+
{{ {4608, -6655, -5631}, 0, {506, 990}, {0, 127, 0, 255} }},
12+
{{ {5632, -6655, -4607}, 0, {722, 620}, {0, 127, 0, 255} }},
13+
{{ {-8191, -3583, -8191}, 0, {0, 990}, {0, 127, 0, 255} }},
14+
{{ {-8191, -3583, 8192}, 0, {8144, 990}, {0, 127, 0, 255} }},
15+
{{ {-5119, -3583, 8192}, 0, {8144, 0}, {0, 127, 0, 255} }},
16+
{{ {-5119, -3583, -4607}, 0, {1756, 0}, {0, 127, 0, 255} }},
17+
{{ {-5119, -3583, 8192}, 0, {0, 990}, {0, 127, 0, 255} }},
18+
{{ {6963, -3583, 8192}, 0, {5998, 990}, {0, 127, 0, 255} }},
19+
{{ {6963, -3583, 4608}, 0, {5998, 96}, {0, 127, 0, 255} }},
20+
{{ {-5119, -3583, 4608}, 0, {0, 96}, {0, 127, 0, 255} }},
21+
{{ {7680, -6655, -6655}, 0, {224, 786}, {252, 216, 136, 255} }},
22+
{{ {8192, -6655, -7167}, 0, {0, 990}, {0, 127, 0, 255} }},
23+
{{ {5120, -6655, -7167}, 0, {1502, 990}, {0, 127, 0, 255} }},
24+
{{ {5632, -6655, -6655}, 0, {1246, 786}, {0, 127, 0, 255} }},
25+
{{ {-921, -6655, -5426}, 0, {1940, 990}, {0, 127, 0, 255} }},
26+
{{ {-921, -6655, -4607}, 0, {1952, 844}, {0, 127, 0, 255} }},
27+
{{ {5632, -6655, -4607}, 0, {-382, 800}, {0, 127, 0, 255} }},
28+
{{ {4608, -6655, -5631}, 0, {0, 990}, {0, 127, 0, 255} }},
29+
{{ {7680, -6655, -6655}, 0, {970, 790}, {252, 216, 136, 255} }},
30+
{{ {7680, -6655, -5631}, 0, {470, 890}, {0, 0, 129, 255} }},
31+
{{ {7680, -6655, -4607}, 0, {0, 990}, {4, 126, 12, 255} }},
32+
{{ {8192, -6655, -7167}, 0, {1270, 990}, {0, 127, 0, 255} }},
2433
};
2534

26-
// 0x07007180 - 0x07007240
27-
static const Vtx thi_seg7_vertex_07007180[] = {
28-
{{{ 7680, -6655, -6655}, 0, { 224, 786}, {0xff, 0xff, 0xff, 0xff}}},
29-
{{{ 8192, -6655, -7167}, 0, { 0, 990}, {0x00, 0x7f, 0x00, 0xff}}},
30-
{{{ 5120, -6655, -7167}, 0, { 1502, 990}, {0x00, 0x7f, 0x00, 0xff}}},
31-
{{{ 5632, -6655, -6655}, 0, { 1246, 786}, {0x00, 0x7f, 0x00, 0xff}}},
32-
{{{ -921, -6655, -5426}, 0, { 1940, 990}, {0x00, 0x7f, 0x00, 0xff}}},
33-
{{{ -921, -6655, -4607}, 0, { 1952, 844}, {0x00, 0x7f, 0x00, 0xff}}},
34-
{{{ 5632, -6655, -4607}, 0, { -382, 800}, {0x00, 0x7f, 0x00, 0xff}}},
35-
{{{ 4608, -6655, -5631}, 0, { 0, 990}, {0x00, 0x7f, 0x00, 0xff}}},
36-
{{{ 7680, -6655, -6655}, 0, { 970, 790}, {0xff, 0xff, 0xff, 0xff}}},
37-
{{{ 7680, -6655, -5631}, 0, { 470, 890}, {0xff, 0xff, 0xff, 0xff}}},
38-
{{{ 7680, -6655, -4607}, 0, { 0, 990}, {0xff, 0xff, 0xff, 0xff}}},
39-
{{{ 8192, -6655, -7167}, 0, { 1270, 990}, {0x00, 0x7f, 0x00, 0xff}}},
35+
Gfx big_world_4_dl_mesh_tri_0[] = {
36+
gsSPVertex(big_world_4_dl_mesh_vtx_0 + 0, 15, 0),
37+
gsSP1Triangle(0, 1, 2, 0),
38+
gsSP1Triangle(3, 4, 5, 0),
39+
gsSP1Triangle(3, 5, 6, 0),
40+
gsSP1Triangle(7, 8, 9, 0),
41+
gsSP1Triangle(7, 9, 10, 0),
42+
gsSP1Triangle(11, 12, 13, 0),
43+
gsSP1Triangle(11, 13, 14, 0),
44+
gsSPVertex(big_world_4_dl_mesh_vtx_0 + 15, 12, 0),
45+
gsSP1Triangle(0, 1, 2, 0),
46+
gsSP1Triangle(0, 2, 3, 0),
47+
gsSP1Triangle(4, 5, 6, 0),
48+
gsSP1Triangle(4, 6, 7, 0),
49+
gsSP1Triangle(8, 9, 10, 0),
50+
gsSP1Triangle(8, 10, 11, 0),
51+
gsSPEndDisplayList(),
4052
};
4153

42-
// 0x07007240 - 0x070072E8
43-
static const Gfx thi_seg7_dl_07007240[] = {
44-
gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b, 1, grass_0900B800),
45-
gsDPLoadSync(),
46-
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
47-
gsSPLight(&thi_seg7_lights_07007078.l, 1),
48-
gsSPLight(&thi_seg7_lights_07007078.a, 2),
49-
gsSPVertex(thi_seg7_vertex_07007090, 15, 0),
50-
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
51-
gsSP2Triangles( 6, 7, 8, 0x0, 6, 8, 9, 0x0),
52-
gsSP2Triangles(10, 11, 12, 0x0, 10, 12, 13, 0x0),
53-
gsSP1Triangle( 0, 2, 14, 0x0),
54-
gsSPVertex(thi_seg7_vertex_07007180, 12, 0),
55-
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
56-
gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0),
57-
gsSP2Triangles( 8, 9, 10, 0x0, 8, 10, 11, 0x0),
58-
gsSPEndDisplayList(),
54+
Gfx mat_big_world_f3dlite_material_026[] = {
55+
gsSPSetLights1(big_world_f3dlite_material_026_lights),
56+
gsDPPipeSync(),
57+
gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, TEXEL0, 0, SHADE, 0),
58+
gsDPSetAlphaDither(G_AD_NOISE),
59+
gsSPTexture(65535, 65535, 0, 0, 1),
60+
gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b_LOAD_BLOCK, 1, grass_0900B800),
61+
gsDPSetTile(G_IM_FMT_IA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
62+
gsDPLoadBlock(7, 0, 0, 1023, 256),
63+
gsDPSetTile(G_IM_FMT_IA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_WRAP | G_TX_NOMIRROR, 5, 0),
64+
gsDPSetTileSize(0, 0, 0, 124, 124),
65+
gsSPEndDisplayList(),
66+
};
67+
68+
Gfx mat_revert_big_world_f3dlite_material_026[] = {
69+
gsDPPipeSync(),
70+
gsDPSetAlphaDither(G_AD_DISABLE),
71+
gsSPEndDisplayList(),
5972
};
6073

6174
// 0x070072E8 - 0x07007348
62-
const Gfx thi_seg7_dl_070072E8[] = {
63-
gsDPPipeSync(),
64-
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
65-
gsDPSetTile(G_IM_FMT_IA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD),
66-
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
67-
gsDPTileSync(),
68-
gsDPSetTile(G_IM_FMT_IA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, 5, G_TX_NOLOD),
69-
gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (32 - 1) << G_TEXTURE_IMAGE_FRAC),
70-
gsSPDisplayList(thi_seg7_dl_07007240),
71-
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
72-
gsDPPipeSync(),
73-
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
74-
gsSPEndDisplayList(),
75+
Gfx big_world_4_dl_mesh[] = {
76+
gsSPDisplayList(mat_big_world_f3dlite_material_026),
77+
gsSPDisplayList(big_world_4_dl_mesh_tri_0),
78+
gsSPDisplayList(mat_revert_big_world_f3dlite_material_026),
79+
gsDPPipeSync(),
80+
gsSPSetGeometryMode(G_LIGHTING),
81+
gsSPClearGeometryMode(G_TEXTURE_GEN),
82+
gsDPSetCombineLERP(0, 0, 0, SHADE, 0, 0, 0, ENVIRONMENT, 0, 0, 0, SHADE, 0, 0, 0, ENVIRONMENT),
83+
gsSPTexture(65535, 65535, 0, 0, 0),
84+
gsSPEndDisplayList(),
7585
};
86+

‎levels/thi/areas/1/5/model.inc.c‎

Lines changed: 41 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,46 @@
1-
// 0x07007348 - 0x07007388
2-
static const Vtx thi_seg7_vertex_07007348[] = {
3-
{{{ 4690, -511, 2131}, 0, { 0, 0}, {0x00, 0x00, 0x00, 0xb4}}},
4-
{{{ 4690, -511, 2377}, 0, { 0, 990}, {0x00, 0x00, 0x00, 0xb4}}},
5-
{{{ 4936, -511, 2377}, 0, { 990, 990}, {0x00, 0x00, 0x00, 0xb4}}},
6-
{{{ 4936, -511, 2131}, 0, { 990, 0}, {0x00, 0x00, 0x00, 0xb4}}},
1+
Vtx big_world_5_dl_mesh_vtx_0[4] = {
2+
{{ {4690, -511, 2131}, 0, {0, 0}, {0, 0, 0, 180} }},
3+
{{ {4690, -511, 2377}, 0, {0, 990}, {0, 0, 0, 180} }},
4+
{{ {4936, -511, 2377}, 0, {990, 990}, {0, 0, 0, 180} }},
5+
{{ {4936, -511, 2131}, 0, {990, 0}, {0, 0, 0, 180} }},
76
};
87

9-
// 0x07007388 - 0x070073C0
10-
static const Gfx thi_seg7_dl_07007388[] = {
11-
gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b, 1, grass_0900B000),
12-
gsDPLoadSync(),
13-
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
14-
gsSPVertex(thi_seg7_vertex_07007348, 4, 0),
15-
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
16-
gsSPEndDisplayList(),
8+
Gfx big_world_5_dl_mesh_tri_0[] = {
9+
gsSPVertex(big_world_5_dl_mesh_vtx_0 + 0, 4, 0),
10+
gsSP1Triangle(0, 1, 2, 0),
11+
gsSP1Triangle(0, 2, 3, 0),
12+
gsSPEndDisplayList(),
1713
};
1814

19-
// 0x070073C0 - 0x07007430
20-
const Gfx thi_seg7_dl_070073C0[] = {
21-
gsDPPipeSync(),
22-
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
23-
gsSPClearGeometryMode(G_LIGHTING),
24-
gsDPSetTile(G_IM_FMT_IA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD),
25-
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
26-
gsDPTileSync(),
27-
gsDPSetTile(G_IM_FMT_IA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_CLAMP, 5, G_TX_NOLOD, G_TX_CLAMP, 5, G_TX_NOLOD),
28-
gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (32 - 1) << G_TEXTURE_IMAGE_FRAC),
29-
gsSPDisplayList(thi_seg7_dl_07007388),
30-
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
31-
gsDPPipeSync(),
32-
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
33-
gsSPSetGeometryMode(G_LIGHTING),
34-
gsSPEndDisplayList(),
15+
Gfx mat_big_world_f3dlite_material_027[] = {
16+
gsSPClearGeometryMode(G_LIGHTING),
17+
gsDPPipeSync(),
18+
gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, TEXEL0, 0, SHADE, 0),
19+
gsDPSetAlphaDither(G_AD_NOISE),
20+
gsSPTexture(65535, 65535, 0, 0, 1),
21+
gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_8b_LOAD_BLOCK, 1, grass_0900B000),
22+
gsDPSetTile(G_IM_FMT_IA, G_IM_SIZ_8b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0),
23+
gsDPLoadBlock(7, 0, 0, 511, 512),
24+
gsDPSetTile(G_IM_FMT_IA, G_IM_SIZ_8b, 4, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0),
25+
gsDPSetTileSize(0, 0, 0, 124, 124),
26+
gsSPEndDisplayList(),
27+
};
28+
29+
Gfx mat_revert_big_world_f3dlite_material_027[] = {
30+
gsSPSetGeometryMode(G_LIGHTING),
31+
gsDPPipeSync(),
32+
gsDPSetAlphaDither(G_AD_DISABLE),
33+
gsSPEndDisplayList(),
34+
};
35+
36+
Gfx big_world_5_dl_mesh[] = {
37+
gsSPDisplayList(mat_big_world_f3dlite_material_027),
38+
gsSPDisplayList(big_world_5_dl_mesh_tri_0),
39+
gsSPDisplayList(mat_revert_big_world_f3dlite_material_027),
40+
gsDPPipeSync(),
41+
gsSPSetGeometryMode(G_LIGHTING),
42+
gsSPClearGeometryMode(G_TEXTURE_GEN),
43+
gsDPSetCombineLERP(0, 0, 0, SHADE, 0, 0, 0, ENVIRONMENT, 0, 0, 0, SHADE, 0, 0, 0, ENVIRONMENT),
44+
gsSPTexture(65535, 65535, 0, 0, 0),
45+
gsSPEndDisplayList(),
3546
};

0 commit comments

Comments
 (0)