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

View File

@@ -0,0 +1,31 @@
// Checkerboard Platform
// 0x0800D710 - 0x0800D794
const s16 checkerboard_platform_seg8_collision_0800D710[] = {
COL_INIT(),
COL_VERTEX_INIT(0x8),
COL_VERTEX(256, -25, -153),
COL_VERTEX(256, 26, -153),
COL_VERTEX(256, 26, 154),
COL_VERTEX(-255, 26, -153),
COL_VERTEX(-255, 26, 154),
COL_VERTEX(-255, -25, -153),
COL_VERTEX(-255, -25, 154),
COL_VERTEX(256, -25, 154),
COL_TRI_INIT(SURFACE_WALL_MISC, 12),
COL_TRI(0, 1, 2),
COL_TRI(1, 3, 4),
COL_TRI(1, 4, 2),
COL_TRI(5, 3, 1),
COL_TRI(5, 1, 0),
COL_TRI(6, 4, 3),
COL_TRI(6, 3, 5),
COL_TRI(7, 4, 6),
COL_TRI(7, 2, 4),
COL_TRI(0, 2, 7),
COL_TRI(7, 6, 5),
COL_TRI(7, 5, 0),
COL_TRI_STOP(),
COL_END(),
};

View File

@@ -1,29 +0,0 @@
# Checkerboard Platform
glabel checkerboard_platform_seg8_collision_0800D710 # 0x0800D710 - 0x0800D794
colInit
colVertexInit 0x8
colVertex 256, -25, -153
colVertex 256, 26, -153
colVertex 256, 26, 154
colVertex -255, 26, -153
colVertex -255, 26, 154
colVertex -255, -25, -153
colVertex -255, -25, 154
colVertex 256, -25, 154
colTriInit SURFACE_WALL_MISC, 12
colTri 0, 1, 2
colTri 1, 3, 4
colTri 1, 4, 2
colTri 5, 3, 1
colTri 5, 1, 0
colTri 6, 4, 3
colTri 6, 3, 5
colTri 7, 4, 6
colTri 7, 2, 4
colTri 0, 2, 7
colTri 7, 6, 5
colTri 7, 5, 0
colTriStop
colEnd

View File

@@ -0,0 +1,8 @@
// 0x0F0004E4
const GeoLayout checkerboard_platform_geo[] = {
GEO_CULLING_RADIUS(400),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, checkerboard_platform_seg8_dl_0800D680),
GEO_CLOSE_NODE(),
GEO_END(),
};

View File

@@ -1,6 +0,0 @@
glabel checkerboard_platform_geo # 0x0F0004E4
geo_culling_radius 400
geo_open_node
geo_display_list LAYER_OPAQUE, checkerboard_platform_seg8_dl_0800D680
geo_close_node
geo_end

View File

@@ -0,0 +1,102 @@
// Checkerboard Platform
// 0x0800C828
static const Ambient checkerboard_platform_seg8_light_0800C828 = {
{{0x3f, 0x3f, 0x3f}, 0, {0x3f, 0x3f, 0x3f}, 0}
};
// 0x0800C830
static const Light checkerboard_platform_seg8_light_0800C830 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
// 0x0800C840
ALIGNED8 static const u8 checkerboard_platform_seg8_texture_0800C840[] = {
#include "actors/checkerboard_platform/checkerboard_platform_side.rgba16.inc.c"
};
// 0x0800CC40
ALIGNED8 static const u8 checkerboard_platform_seg8_texture_0800CC40[] = {
#include "actors/checkerboard_platform/checkerboard_platform.rgba16.inc.c"
};
// 0x0800D440
static const Vtx checkerboard_platform_seg8_vertex_0800D440[] = {
{{{ -255, -25, 154}, 0, { 1504, 480}, {0x81, 0x00, 0x00, 0xff}}},
{{{ -255, 26, 154}, 0, { 1504, 0}, {0x81, 0x00, 0x00, 0xff}}},
{{{ -255, 26, -153}, 0, { 0, 0}, {0x81, 0x00, 0x00, 0xff}}},
{{{ -255, -25, -153}, 0, { 0, 480}, {0x81, 0x00, 0x00, 0xff}}},
{{{ 256, -25, -153}, 0, { 1504, 480}, {0x7f, 0x00, 0x00, 0xff}}},
{{{ 256, 26, 154}, 0, { 0, 0}, {0x7f, 0x00, 0x00, 0xff}}},
{{{ 256, -25, 154}, 0, { 0, 480}, {0x7f, 0x00, 0x00, 0xff}}},
{{{ 256, 26, -153}, 0, { 1504, 0}, {0x7f, 0x00, 0x00, 0xff}}},
};
// 0x0800D4C0
static const Vtx checkerboard_platform_seg8_vertex_0800D4C0[] = {
{{{ 256, -25, 154}, 0, { 2528, 992}, {0x00, 0x81, 0x00, 0xff}}},
{{{ -255, -25, -153}, 0, { 0, -512}, {0x00, 0x81, 0x00, 0xff}}},
{{{ 256, -25, -153}, 0, { 2528, -512}, {0x00, 0x81, 0x00, 0xff}}},
{{{ 256, 26, -153}, 0, { 2528, -512}, {0x00, 0x7f, 0x00, 0xff}}},
{{{ -255, 26, 154}, 0, { 0, 992}, {0x00, 0x7f, 0x00, 0xff}}},
{{{ 256, 26, 154}, 0, { 2528, 992}, {0x00, 0x7f, 0x00, 0xff}}},
{{{ -255, 26, -153}, 0, { 0, -512}, {0x00, 0x7f, 0x00, 0xff}}},
{{{ -255, -25, -153}, 0, { 2528, 480}, {0x00, 0x00, 0x81, 0xff}}},
{{{ -255, 26, -153}, 0, { 2528, 0}, {0x00, 0x00, 0x81, 0xff}}},
{{{ 256, 26, -153}, 0, { 0, 0}, {0x00, 0x00, 0x81, 0xff}}},
{{{ 256, -25, -153}, 0, { 0, 480}, {0x00, 0x00, 0x81, 0xff}}},
{{{ 256, -25, 154}, 0, { 2528, 480}, {0x00, 0x00, 0x7f, 0xff}}},
{{{ -255, 26, 154}, 0, { 0, 0}, {0x00, 0x00, 0x7f, 0xff}}},
{{{ -255, -25, 154}, 0, { 0, 480}, {0x00, 0x00, 0x7f, 0xff}}},
{{{ 256, 26, 154}, 0, { 2528, 0}, {0x00, 0x00, 0x7f, 0xff}}},
{{{ -255, -25, 154}, 0, { 0, 992}, {0x00, 0x81, 0x00, 0xff}}},
};
// 0x0800D5C0 - 0x0800D618
const Gfx checkerboard_platform_seg8_dl_0800D5C0[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, checkerboard_platform_seg8_texture_0800C840),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 16 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&checkerboard_platform_seg8_light_0800C830, 1),
gsSPLight(&checkerboard_platform_seg8_light_0800C828, 2),
gsSPVertex(checkerboard_platform_seg8_vertex_0800D440, 8, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0),
gsSPEndDisplayList(),
};
// 0x0800D618 - 0x0800D680
const Gfx checkerboard_platform_seg8_dl_0800D618[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, checkerboard_platform_seg8_texture_0800CC40),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPVertex(checkerboard_platform_seg8_vertex_0800D4C0, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0),
gsSP2Triangles( 7, 9, 10, 0x0, 11, 12, 13, 0x0),
gsSP2Triangles(11, 14, 12, 0x0, 0, 15, 1, 0x0),
gsSPEndDisplayList(),
};
// 0x0800D680 - 0x0800D710
const Gfx checkerboard_platform_seg8_dl_0800D680[] = {
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, 4, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, 5, G_TX_NOLOD),
gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (16 - 1) << G_TEXTURE_IMAGE_FRAC),
gsSPDisplayList(checkerboard_platform_seg8_dl_0800D5C0),
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(checkerboard_platform_seg8_dl_0800D618),
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
gsDPPipeSync(),
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
gsSPSetGeometryMode(G_SHADING_SMOOTH),
gsSPEndDisplayList(),
};

View File

@@ -1,85 +0,0 @@
# Checkerboard Platform
checkerboard_platform_seg8_light_0800C828: # 0x0800C828
.byte 0x3F, 0x3F, 0x3F, 0x00, 0x3F, 0x3F, 0x3F, 0x00
checkerboard_platform_seg8_light_0800C830: # 0x0800C830
.byte 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0x00
.byte 0x28, 0x28, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00
checkerboard_platform_seg8_texture_0800C840: # 0x0800C840
.incbin "actors/checkerboard_platform/checkerboard_platform_side.rgba16"
checkerboard_platform_seg8_texture_0800CC40: # 0x0800CC40
.incbin "actors/checkerboard_platform/checkerboard_platform.rgba16"
checkerboard_platform_seg8_vertex_0800D440: # 0x0800D440
vertex -255, -25, 154, 1504, 480, 0x81, 0x00, 0x00, 0xFF
vertex -255, 26, 154, 1504, 0, 0x81, 0x00, 0x00, 0xFF
vertex -255, 26, -153, 0, 0, 0x81, 0x00, 0x00, 0xFF
vertex -255, -25, -153, 0, 480, 0x81, 0x00, 0x00, 0xFF
vertex 256, -25, -153, 1504, 480, 0x7F, 0x00, 0x00, 0xFF
vertex 256, 26, 154, 0, 0, 0x7F, 0x00, 0x00, 0xFF
vertex 256, -25, 154, 0, 480, 0x7F, 0x00, 0x00, 0xFF
vertex 256, 26, -153, 1504, 0, 0x7F, 0x00, 0x00, 0xFF
checkerboard_platform_seg8_vertex_0800D4C0: # 0x0800D4C0
vertex 256, -25, 154, 2528, 992, 0x00, 0x81, 0x00, 0xFF
vertex -255, -25, -153, 0, -512, 0x00, 0x81, 0x00, 0xFF
vertex 256, -25, -153, 2528, -512, 0x00, 0x81, 0x00, 0xFF
vertex 256, 26, -153, 2528, -512, 0x00, 0x7F, 0x00, 0xFF
vertex -255, 26, 154, 0, 992, 0x00, 0x7F, 0x00, 0xFF
vertex 256, 26, 154, 2528, 992, 0x00, 0x7F, 0x00, 0xFF
vertex -255, 26, -153, 0, -512, 0x00, 0x7F, 0x00, 0xFF
vertex -255, -25, -153, 2528, 480, 0x00, 0x00, 0x81, 0xFF
vertex -255, 26, -153, 2528, 0, 0x00, 0x00, 0x81, 0xFF
vertex 256, 26, -153, 0, 0, 0x00, 0x00, 0x81, 0xFF
vertex 256, -25, -153, 0, 480, 0x00, 0x00, 0x81, 0xFF
vertex 256, -25, 154, 2528, 480, 0x00, 0x00, 0x7F, 0xFF
vertex -255, 26, 154, 0, 0, 0x00, 0x00, 0x7F, 0xFF
vertex -255, -25, 154, 0, 480, 0x00, 0x00, 0x7F, 0xFF
vertex 256, 26, 154, 2528, 0, 0x00, 0x00, 0x7F, 0xFF
vertex -255, -25, 154, 0, 992, 0x00, 0x81, 0x00, 0xFF
glabel checkerboard_platform_seg8_dl_0800D5C0 # 0x0800D5C0 - 0x0800D618
gsDPSetTextureImage G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, checkerboard_platform_seg8_texture_0800C840
gsDPLoadSync
gsDPLoadBlock 7, 0, 0, 0x1FF, 0x100
gsSPLight checkerboard_platform_seg8_light_0800C830, 1
gsSPLight checkerboard_platform_seg8_light_0800C828, 2
gsSPVertex checkerboard_platform_seg8_vertex_0800D440, 8, 0
gsSP2Triangles 0, 1, 2, 0x0, 0, 2, 3, 0x0
gsSP2Triangles 4, 5, 6, 0x0, 4, 7, 5, 0x0
gsSPEndDisplayList
glabel checkerboard_platform_seg8_dl_0800D618 # 0x0800D618 - 0x0800D680
gsDPSetTextureImage G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, checkerboard_platform_seg8_texture_0800CC40
gsDPLoadSync
gsDPLoadBlock 7, 0, 0, 0x3FF, 0x100
gsSPVertex checkerboard_platform_seg8_vertex_0800D4C0, 16, 0
gsSP2Triangles 0, 1, 2, 0x0, 3, 4, 5, 0x0
gsSP2Triangles 3, 6, 4, 0x0, 7, 8, 9, 0x0
gsSP2Triangles 7, 9, 10, 0x0, 11, 12, 13, 0x0
gsSP2Triangles 11, 14, 12, 0x0, 0, 15, 1, 0x0
gsSPEndDisplayList
glabel checkerboard_platform_seg8_dl_0800D680 # 0x0800D680 - 0x0800D710
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, 4, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, 5, G_TX_NOLOD
gsDPSetTileSize 0, 0, 0, 124, 60
gsSPDisplayList checkerboard_platform_seg8_dl_0800D5C0
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 checkerboard_platform_seg8_dl_0800D618
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