Refresh 3

This commit is contained in:
n64
2019-11-03 14:36:27 -05:00
parent 6b8bc9b9ec
commit a7c423cb43
4603 changed files with 475500 additions and 437701 deletions
@@ -0,0 +1,28 @@
// 0x07018630 - 0x070186B4
const Collision wdw_seg7_collision_rect_floating_platform[] = {
COL_INIT(),
COL_VERTEX_INIT(0x8),
COL_VERTEX(256, -63, 640),
COL_VERTEX(-255, -63, 640),
COL_VERTEX(-255, -63, -639),
COL_VERTEX(256, -63, -639),
COL_VERTEX(256, 64, 640),
COL_VERTEX(-255, 64, 640),
COL_VERTEX(-255, 64, -639),
COL_VERTEX(256, 64, -639),
COL_TRI_INIT(SURFACE_DEFAULT, 12),
COL_TRI(0, 1, 2),
COL_TRI(0, 2, 3),
COL_TRI(0, 4, 5),
COL_TRI(0, 5, 1),
COL_TRI(3, 4, 0),
COL_TRI(1, 5, 6),
COL_TRI(1, 6, 2),
COL_TRI(2, 6, 7),
COL_TRI(2, 7, 3),
COL_TRI(3, 7, 4),
COL_TRI(7, 5, 4),
COL_TRI(7, 6, 5),
COL_TRI_STOP(),
COL_END(),
};
@@ -1,26 +0,0 @@
glabel wdw_seg7_collision_rect_floating_platform # 0x07018630 - 0x070186B4
colInit
colVertexInit 0x8
colVertex 256, -63, 640
colVertex -255, -63, 640
colVertex -255, -63, -639
colVertex 256, -63, -639
colVertex 256, 64, 640
colVertex -255, 64, 640
colVertex -255, 64, -639
colVertex 256, 64, -639
colTriInit SURFACE_DEFAULT, 12
colTri 0, 1, 2
colTri 0, 2, 3
colTri 0, 4, 5
colTri 0, 5, 1
colTri 3, 4, 0
colTri 1, 5, 6
colTri 1, 6, 2
colTri 2, 6, 7
colTri 2, 7, 3
colTri 3, 7, 4
colTri 7, 5, 4
colTri 7, 6, 5
colTriStop
colEnd
@@ -0,0 +1,8 @@
// 0x0E000628
const GeoLayout wdw_geo_000628[] = {
GEO_CULLING_RADIUS(900),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, wdw_seg7_dl_07013E40),
GEO_CLOSE_NODE(),
GEO_END(),
};
@@ -1,6 +0,0 @@
glabel wdw_geo_000628 # 0x0E000628
geo_culling_radius 900
geo_open_node
geo_display_list LAYER_OPAQUE, wdw_seg7_dl_07013E40
geo_close_node
geo_end
@@ -0,0 +1,86 @@
// 0x07013BE8 - 0x07013BF0
static const Ambient wdw_seg7_light_07013BE8 = {
{{0x99, 0x99, 0x99}, 0, {0x99, 0x99, 0x99}, 0}
};
// 0x07013BF0 - 0x07013C00
static const Light wdw_seg7_light_07013BF0 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
// 0x07013C00 - 0x07013D00
static const Vtx wdw_seg7_vertex_07013C00[] = {
{{{ 256, -63, 640}, 0, { 0, 0}, {0x00, 0x00, 0x7f, 0xff}}},
{{{ 256, 64, 640}, 0, { 990, 0}, {0x00, 0x00, 0x7f, 0xff}}},
{{{ -255, 64, 640}, 0, { 990, 990}, {0x00, 0x00, 0x7f, 0xff}}},
{{{ -255, -63, 640}, 0, { 0, 990}, {0x00, 0x00, 0x7f, 0xff}}},
{{{ -255, -63, 640}, 0, { 0, 990}, {0x81, 0x00, 0x00, 0xff}}},
{{{ -255, 64, 640}, 0, { 990, 990}, {0x81, 0x00, 0x00, 0xff}}},
{{{ -255, 64, -639}, 0, { 990, 0}, {0x81, 0x00, 0x00, 0xff}}},
{{{ -255, -63, -639}, 0, { 0, 0}, {0x81, 0x00, 0x00, 0xff}}},
{{{ -255, -63, -639}, 0, { 0, 990}, {0x00, 0x00, 0x81, 0xff}}},
{{{ 256, 64, -639}, 0, { 990, 0}, {0x00, 0x00, 0x81, 0xff}}},
{{{ 256, -63, -639}, 0, { 0, 0}, {0x00, 0x00, 0x81, 0xff}}},
{{{ 256, -63, -639}, 0, { 0, 0}, {0x7f, 0x00, 0x00, 0xff}}},
{{{ 256, 64, 640}, 0, { 990, 990}, {0x7f, 0x00, 0x00, 0xff}}},
{{{ 256, -63, 640}, 0, { 0, 990}, {0x7f, 0x00, 0x00, 0xff}}},
{{{ 256, 64, -639}, 0, { 990, 0}, {0x7f, 0x00, 0x00, 0xff}}},
{{{ -255, 64, -639}, 0, { 990, 990}, {0x00, 0x00, 0x81, 0xff}}},
};
// 0x07013D00 - 0x07013D80
static const Vtx wdw_seg7_vertex_07013D00[] = {
{{{ 256, -63, 640}, 0, { 990, 990}, {0x00, 0x81, 0x00, 0xff}}},
{{{ -255, -63, 640}, 0, { 990, 0}, {0x00, 0x81, 0x00, 0xff}}},
{{{ -255, -63, -639}, 0, { 0, 0}, {0x00, 0x81, 0x00, 0xff}}},
{{{ 256, -63, -639}, 0, { 0, 990}, {0x00, 0x81, 0x00, 0xff}}},
{{{ 256, 64, -639}, 0, { 990, -1054}, {0x00, 0x7f, 0x00, 0xff}}},
{{{ -255, 64, 640}, 0, { 0, 990}, {0x00, 0x7f, 0x00, 0xff}}},
{{{ 256, 64, 640}, 0, { 990, 990}, {0x00, 0x7f, 0x00, 0xff}}},
{{{ -255, 64, -639}, 0, { 0, -1054}, {0x00, 0x7f, 0x00, 0xff}}},
};
// 0x07013D80 - 0x07013DF8
static const Gfx wdw_seg7_dl_07013D80[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wdw_seg7_texture_07000800),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&wdw_seg7_light_07013BF0, 1),
gsSPLight(&wdw_seg7_light_07013BE8, 2),
gsSPVertex(wdw_seg7_vertex_07013C00, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0),
gsSP2Triangles( 8, 9, 10, 0x0, 11, 12, 13, 0x0),
gsSP2Triangles(11, 14, 12, 0x0, 8, 15, 9, 0x0),
gsSPEndDisplayList(),
};
// 0x07013DF8 - 0x07013E40
static const Gfx wdw_seg7_dl_07013DF8[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, grass_09006800),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPVertex(wdw_seg7_vertex_07013D00, 8, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0),
gsSPEndDisplayList(),
};
// 0x07013E40 - 0x07013EB8
const Gfx wdw_seg7_dl_07013E40[] = {
gsDPPipeSync(),
gsDPSetCombineMode(G_CC_MODULATERGB, G_CC_MODULATERGB),
gsSPClearGeometryMode(G_SHADING_SMOOTH),
gsDPSetTile(G_IM_FMT_RGBA, 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),
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, 5, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, 5, G_TX_NOLOD),
gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (32 - 1) << G_TEXTURE_IMAGE_FRAC),
gsSPDisplayList(wdw_seg7_dl_07013D80),
gsSPDisplayList(wdw_seg7_dl_07013DF8),
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
gsDPPipeSync(),
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
gsSPSetGeometryMode(G_SHADING_SMOOTH),
gsSPEndDisplayList(),
};
@@ -1,73 +0,0 @@
wdw_seg7_light_07013BE8: # 0x07013BE8 - 0x07013BF0
.byte 0x99, 0x99, 0x99, 0x00, 0x99, 0x99, 0x99, 0x00
wdw_seg7_light_07013BF0: # 0x07013BF0 - 0x07013C00
.byte 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0x00
.byte 0x28, 0x28, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00
wdw_seg7_vertex_07013C00: # 0x07013C00 - 0x07013D00
vertex 256, -63, 640, 0, 0, 0x00, 0x00, 0x7F, 0xFF
vertex 256, 64, 640, 990, 0, 0x00, 0x00, 0x7F, 0xFF
vertex -255, 64, 640, 990, 990, 0x00, 0x00, 0x7F, 0xFF
vertex -255, -63, 640, 0, 990, 0x00, 0x00, 0x7F, 0xFF
vertex -255, -63, 640, 0, 990, 0x81, 0x00, 0x00, 0xFF
vertex -255, 64, 640, 990, 990, 0x81, 0x00, 0x00, 0xFF
vertex -255, 64, -639, 990, 0, 0x81, 0x00, 0x00, 0xFF
vertex -255, -63, -639, 0, 0, 0x81, 0x00, 0x00, 0xFF
vertex -255, -63, -639, 0, 990, 0x00, 0x00, 0x81, 0xFF
vertex 256, 64, -639, 990, 0, 0x00, 0x00, 0x81, 0xFF
vertex 256, -63, -639, 0, 0, 0x00, 0x00, 0x81, 0xFF
vertex 256, -63, -639, 0, 0, 0x7F, 0x00, 0x00, 0xFF
vertex 256, 64, 640, 990, 990, 0x7F, 0x00, 0x00, 0xFF
vertex 256, -63, 640, 0, 990, 0x7F, 0x00, 0x00, 0xFF
vertex 256, 64, -639, 990, 0, 0x7F, 0x00, 0x00, 0xFF
vertex -255, 64, -639, 990, 990, 0x00, 0x00, 0x81, 0xFF
wdw_seg7_vertex_07013D00: # 0x07013D00 - 0x07013D80
vertex 256, -63, 640, 990, 990, 0x00, 0x81, 0x00, 0xFF
vertex -255, -63, 640, 990, 0, 0x00, 0x81, 0x00, 0xFF
vertex -255, -63, -639, 0, 0, 0x00, 0x81, 0x00, 0xFF
vertex 256, -63, -639, 0, 990, 0x00, 0x81, 0x00, 0xFF
vertex 256, 64, -639, 990, -1054, 0x00, 0x7F, 0x00, 0xFF
vertex -255, 64, 640, 0, 990, 0x00, 0x7F, 0x00, 0xFF
vertex 256, 64, 640, 990, 990, 0x00, 0x7F, 0x00, 0xFF
vertex -255, 64, -639, 0, -1054, 0x00, 0x7F, 0x00, 0xFF
wdw_seg7_dl_07013D80: # 0x07013D80 - 0x07013DF8
gsDPSetTextureImage G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, wdw_seg7_texture_07000800
gsDPLoadSync
gsDPLoadBlock 7, 0, 0, 0x3FF, 0x100
gsSPLight wdw_seg7_light_07013BF0, 1
gsSPLight wdw_seg7_light_07013BE8, 2
gsSPVertex wdw_seg7_vertex_07013C00, 16, 0
gsSP2Triangles 0, 1, 2, 0x0, 0, 2, 3, 0x0
gsSP2Triangles 4, 5, 6, 0x0, 4, 6, 7, 0x0
gsSP2Triangles 8, 9, 10, 0x0, 11, 12, 13, 0x0
gsSP2Triangles 11, 14, 12, 0x0, 8, 15, 9, 0x0
gsSPEndDisplayList
wdw_seg7_dl_07013DF8: # 0x07013DF8 - 0x07013E40
gsDPSetTextureImage G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, grass_09006800
gsDPLoadSync
gsDPLoadBlock 7, 0, 0, 0x3FF, 0x100
gsSPVertex wdw_seg7_vertex_07013D00, 8, 0
gsSP2Triangles 0, 1, 2, 0x0, 0, 2, 3, 0x0
gsSP2Triangles 4, 5, 6, 0x0, 4, 7, 5, 0x0
gsSPEndDisplayList
glabel wdw_seg7_dl_07013E40 # 0x07013E40 - 0x07013EB8
gsDPPipeSync
gsDPSetCombineModeLERP1Cycle G_CCMUX_TEXEL0, G_CCMUX_0, G_CCMUX_SHADE, G_CCMUX_0, G_ACMUX_0, G_ACMUX_0, G_ACMUX_0, G_ACMUX_SHADE
gsSPClearGeometryMode G_SHADING_SMOOTH
gsDPSetTile G_IM_FMT_RGBA, 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
gsSPTexture -1, -1, 0, 0, 1
gsDPTileSync
gsDPSetTile G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, 5, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, 5, G_TX_NOLOD
gsDPSetTileSize 0, 0, 0, 124, 124
gsSPDisplayList wdw_seg7_dl_07013D80
gsSPDisplayList wdw_seg7_dl_07013DF8
gsSPTexture -1, -1, 0, 0, 0
gsDPPipeSync
gsDPSetCombineModeLERP1Cycle G_CCMUX_0, G_CCMUX_0, G_CCMUX_0, G_CCMUX_SHADE, G_ACMUX_0, G_ACMUX_0, G_ACMUX_0, G_ACMUX_SHADE
gsSPSetGeometryMode G_SHADING_SMOOTH
gsSPEndDisplayList