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,49 @@
// Poundable Pole
// 0x06002490 - 0x06002580
const s16 poundable_pole_collision_06002490[] = {
COL_INIT(),
COL_VERTEX_INIT(0x10),
COL_VERTEX(-39, -19, -96),
COL_VERTEX(-39, 410, -96),
COL_VERTEX(40, 410, -96),
COL_VERTEX(-96, -19, -39),
COL_VERTEX(-96, 410, -39),
COL_VERTEX(97, 410, -39),
COL_VERTEX(97, 410, 40),
COL_VERTEX(97, -19, -39),
COL_VERTEX(97, -19, 40),
COL_VERTEX(40, -19, -96),
COL_VERTEX(-96, 410, 40),
COL_VERTEX(-39, 410, 97),
COL_VERTEX(40, 410, 97),
COL_VERTEX(-96, -19, 40),
COL_VERTEX(-39, -19, 97),
COL_VERTEX(40, -19, 97),
COL_TRI_INIT(SURFACE_NO_CAM_COLLISION, 22),
COL_TRI(8, 6, 12),
COL_TRI(0, 1, 2),
COL_TRI(3, 1, 0),
COL_TRI(3, 4, 1),
COL_TRI(1, 5, 2),
COL_TRI(1, 6, 5),
COL_TRI(1, 4, 6),
COL_TRI(7, 6, 8),
COL_TRI(7, 5, 6),
COL_TRI(9, 5, 7),
COL_TRI(9, 2, 5),
COL_TRI(0, 2, 9),
COL_TRI(6, 10, 11),
COL_TRI(6, 4, 10),
COL_TRI(6, 11, 12),
COL_TRI(8, 12, 15),
COL_TRI(13, 4, 3),
COL_TRI(13, 10, 4),
COL_TRI(14, 10, 13),
COL_TRI(14, 11, 10),
COL_TRI(15, 11, 14),
COL_TRI(15, 12, 11),
COL_TRI_STOP(),
COL_END(),
};

View File

@@ -1,47 +0,0 @@
# Poundable Pole
glabel poundable_pole_collision_06002490 # 0x06002490 - 0x06002580
colInit
colVertexInit 0x10
colVertex -39, -19, -96
colVertex -39, 410, -96
colVertex 40, 410, -96
colVertex -96, -19, -39
colVertex -96, 410, -39
colVertex 97, 410, -39
colVertex 97, 410, 40
colVertex 97, -19, -39
colVertex 97, -19, 40
colVertex 40, -19, -96
colVertex -96, 410, 40
colVertex -39, 410, 97
colVertex 40, 410, 97
colVertex -96, -19, 40
colVertex -39, -19, 97
colVertex 40, -19, 97
colTriInit SURFACE_CAM_NO_COL, 22
colTri 8, 6, 12
colTri 0, 1, 2
colTri 3, 1, 0
colTri 3, 4, 1
colTri 1, 5, 2
colTri 1, 6, 5
colTri 1, 4, 6
colTri 7, 6, 8
colTri 7, 5, 6
colTri 9, 5, 7
colTri 9, 2, 5
colTri 0, 2, 9
colTri 6, 10, 11
colTri 6, 4, 10
colTri 6, 11, 12
colTri 8, 12, 15
colTri 13, 4, 3
colTri 13, 10, 4
colTri 14, 10, 13
colTri 14, 11, 10
colTri 15, 11, 14
colTri 15, 12, 11
colTriStop
colEnd

View File

@@ -0,0 +1,8 @@
// 0x0D0000B8
const GeoLayout wooden_post_geo[] = {
GEO_CULLING_RADIUS(450),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_OPAQUE, poundable_pole_seg6_dl_06002410),
GEO_CLOSE_NODE(),
GEO_END(),
};

View File

@@ -1,6 +0,0 @@
glabel wooden_post_geo # 0x0D0000B8
geo_culling_radius 450
geo_open_node
geo_display_list LAYER_OPAQUE, poundable_pole_seg6_dl_06002410
geo_close_node
geo_end

View File

@@ -0,0 +1,133 @@
// Poundable Pole
// 0x06001038
static const Ambient poundable_pole_seg6_light_06001038 = {
{{0x7f, 0x7f, 0x7f}, 0, {0x7f, 0x7f, 0x7f}, 0}
};
// 0x06001040
static const Light poundable_pole_seg6_light_06001040 = {
{{0xff, 0xff, 0xff}, 0, {0xff, 0xff, 0xff}, 0, {0x28, 0x28, 0x28}, 0}
};
// 0x06001050
ALIGNED8 static const u8 poundable_pole_seg6_texture_06001050[] = {
#include "actors/poundable_pole/poundable_pole_top.rgba16.inc.c"
};
// 0x06001850
ALIGNED8 static const u8 poundable_pole_seg6_texture_06001850[] = {
#include "actors/poundable_pole/poundable_pole_side.rgba16.inc.c"
};
// 0x06002050
static const Vtx poundable_pole_seg6_vertex_06002050[] = {
{{{ -38, 410, -94}, 0, { 78, 78}, {0xdf, 0x5c, 0xb0, 0xff}}},
{{{ -94, 410, -38}, 0, { -86, 478}, {0xa1, 0x49, 0xd9, 0xff}}},
{{{ 95, 410, 39}, 0, { 1046, 478}, {0x39, 0x6e, 0x18, 0xff}}},
{{{ 95, 410, -38}, 0, { 880, 78}, {0x5f, 0x49, 0xd9, 0xff}}},
{{{ 39, 410, -94}, 0, { 478, -88}, {0x2d, 0x2a, 0x92, 0xff}}},
{{{ -94, 410, 39}, 0, { 78, 880}, {0xa1, 0x49, 0x27, 0xff}}},
{{{ -38, 410, 95}, 0, { 480, 1044}, {0xd9, 0x49, 0x5f, 0xff}}},
{{{ 39, 410, 95}, 0, { 880, 880}, {0x2d, 0x2a, 0x6e, 0xff}}},
};
// 0x060020D0
static const Vtx poundable_pole_seg6_vertex_060020D0[] = {
{{{ -71, -19, 72}, 0, { 0, 990}, {0xa7, 0xff, 0x59, 0xff}}},
{{{ -38, 410, 95}, 0, { 990, -1012}, {0xd9, 0x49, 0x5f, 0xff}}},
{{{ -94, 410, 39}, 0, { 0, -1012}, {0xa1, 0x49, 0x27, 0xff}}},
{{{ -71, -19, -71}, 0, { -26, 990}, {0xa7, 0x00, 0xa7, 0xff}}},
{{{ -101, -19, 0}, 0, { 990, 990}, {0x82, 0xff, 0x00, 0xff}}},
{{{ -94, 410, -38}, 0, { 990, -1054}, {0xa1, 0x49, 0xd9, 0xff}}},
{{{ -38, 410, -94}, 0, { -26, -1054}, {0xdf, 0x5c, 0xb0, 0xff}}},
{{{ 0, -19, -101}, 0, { -26, 990}, {0x00, 0xff, 0x82, 0xff}}},
{{{ -71, -19, -71}, 0, { 990, 990}, {0xa7, 0x00, 0xa7, 0xff}}},
{{{ -38, 410, -94}, 0, { 990, -1054}, {0xdf, 0x5c, 0xb0, 0xff}}},
{{{ 39, 410, -94}, 0, { -26, -1054}, {0x2d, 0x2a, 0x92, 0xff}}},
{{{ -94, 410, 39}, 0, { 990, -1054}, {0xa1, 0x49, 0x27, 0xff}}},
{{{ -101, -19, 0}, 0, { 0, 990}, {0x82, 0xff, 0x00, 0xff}}},
{{{ -71, -19, 72}, 0, { 990, 990}, {0xa7, 0xff, 0x59, 0xff}}},
{{{ -94, 410, -38}, 0, { 0, -1054}, {0xa1, 0x49, 0xd9, 0xff}}},
};
// 0x060021C0
static const Vtx poundable_pole_seg6_vertex_060021C0[] = {
{{{ 102, -19, 0}, 0, { -26, 990}, {0x7e, 0xff, 0x00, 0xff}}},
{{{ 95, 410, -38}, 0, { 990, -1054}, {0x5f, 0x49, 0xd9, 0xff}}},
{{{ 95, 410, 39}, 0, { -26, -1054}, {0x39, 0x6e, 0x18, 0xff}}},
{{{ -71, -19, 72}, 0, { 0, 990}, {0xa7, 0xff, 0x59, 0xff}}},
{{{ 0, -19, 102}, 0, { 990, 990}, {0x00, 0xff, 0x7e, 0xff}}},
{{{ -38, 410, 95}, 0, { 990, -1012}, {0xd9, 0x49, 0x5f, 0xff}}},
{{{ 0, -19, 102}, 0, { -26, 990}, {0x00, 0xff, 0x7e, 0xff}}},
{{{ 39, 410, 95}, 0, { 990, -1054}, {0x2d, 0x2a, 0x6e, 0xff}}},
{{{ -38, 410, 95}, 0, { -26, -1054}, {0xd9, 0x49, 0x5f, 0xff}}},
{{{ 72, -19, 72}, 0, { 990, 990}, {0x59, 0xff, 0x59, 0xff}}},
{{{ 95, 410, 39}, 0, { 990, -1054}, {0x39, 0x6e, 0x18, 0xff}}},
{{{ 72, -19, 72}, 0, { 0, 990}, {0x59, 0xff, 0x59, 0xff}}},
{{{ 102, -19, 0}, 0, { 990, 990}, {0x7e, 0xff, 0x00, 0xff}}},
{{{ 39, 410, 95}, 0, { 0, -1054}, {0x2d, 0x2a, 0x6e, 0xff}}},
{{{ 72, -19, -71}, 0, { 990, 990}, {0x59, 0xff, 0xa7, 0xff}}},
};
// 0x060022B0
static const Vtx poundable_pole_seg6_vertex_060022B0[] = {
{{{ 39, 410, -94}, 0, { 990, -1054}, {0x2d, 0x2a, 0x92, 0xff}}},
{{{ 95, 410, -38}, 0, { -26, -1054}, {0x5f, 0x49, 0xd9, 0xff}}},
{{{ 72, -19, -71}, 0, { -26, 990}, {0x59, 0xff, 0xa7, 0xff}}},
{{{ 0, -19, -101}, 0, { 990, 990}, {0x00, 0xff, 0x82, 0xff}}},
};
// 0x060022F0 - 0x06002358
const Gfx poundable_pole_seg6_dl_060022F0[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, poundable_pole_seg6_texture_06001050),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&poundable_pole_seg6_light_06001040, 1),
gsSPLight(&poundable_pole_seg6_light_06001038, 2),
gsSPVertex(poundable_pole_seg6_vertex_06002050, 8, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 4, 0x0),
gsSP2Triangles( 0, 2, 3, 0x0, 2, 1, 5, 0x0),
gsSP2Triangles( 2, 5, 6, 0x0, 2, 6, 7, 0x0),
gsSPEndDisplayList(),
};
// 0x06002358 - 0x06002410
const Gfx poundable_pole_seg6_dl_06002358[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, poundable_pole_seg6_texture_06001850),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPVertex(poundable_pole_seg6_vertex_060020D0, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0),
gsSP2Triangles( 7, 9, 10, 0x0, 11, 12, 13, 0x0),
gsSP1Triangle(12, 11, 14, 0x0),
gsSPVertex(poundable_pole_seg6_vertex_060021C0, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 6, 9, 7, 0x0),
gsSP2Triangles(10, 11, 12, 0x0, 11, 10, 13, 0x0),
gsSP1Triangle( 1, 0, 14, 0x0),
gsSPVertex(poundable_pole_seg6_vertex_060022B0, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0),
gsSPEndDisplayList(),
};
// 0x06002410 - 0x06002490
const Gfx poundable_pole_seg6_dl_06002410[] = {
gsDPPipeSync(),
gsDPSetCombineMode(G_CC_MODULATERGB, G_CC_MODULATERGB),
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_CLAMP, 5, G_TX_NOLOD, G_TX_CLAMP, 5, G_TX_NOLOD),
gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (32 - 1) << G_TEXTURE_IMAGE_FRAC),
gsSPDisplayList(poundable_pole_seg6_dl_060022F0),
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(poundable_pole_seg6_dl_06002358),
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
gsDPPipeSync(),
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
gsSPEndDisplayList(),
};

View File

@@ -1,113 +0,0 @@
# Poundable Pole
.balign 8
poundable_pole_seg6_light_06001038: # 0x06001038
.byte 0x7F, 0x7F, 0x7F, 0x00, 0x7F, 0x7F, 0x7F, 0x00
poundable_pole_seg6_light_06001040: # 0x06001040
.byte 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0x00
.byte 0x28, 0x28, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00
poundable_pole_seg6_texture_06001050: # 0x06001050
.incbin "actors/poundable_pole/poundable_pole_top.rgba16"
poundable_pole_seg6_texture_06001850: # 0x06001850
.incbin "actors/poundable_pole/poundable_pole_side.rgba16"
poundable_pole_seg6_vertex_06002050: # 0x06002050
vertex -38, 410, -94, 78, 78, 0xDF, 0x5C, 0xB0, 0xFF
vertex -94, 410, -38, -86, 478, 0xA1, 0x49, 0xD9, 0xFF
vertex 95, 410, 39, 1046, 478, 0x39, 0x6E, 0x18, 0xFF
vertex 95, 410, -38, 880, 78, 0x5F, 0x49, 0xD9, 0xFF
vertex 39, 410, -94, 478, -88, 0x2D, 0x2A, 0x92, 0xFF
vertex -94, 410, 39, 78, 880, 0xA1, 0x49, 0x27, 0xFF
vertex -38, 410, 95, 480, 1044, 0xD9, 0x49, 0x5F, 0xFF
vertex 39, 410, 95, 880, 880, 0x2D, 0x2A, 0x6E, 0xFF
poundable_pole_seg6_vertex_060020D0: # 0x060020D0
vertex -71, -19, 72, 0, 990, 0xA7, 0xFF, 0x59, 0xFF
vertex -38, 410, 95, 990, -1012, 0xD9, 0x49, 0x5F, 0xFF
vertex -94, 410, 39, 0, -1012, 0xA1, 0x49, 0x27, 0xFF
vertex -71, -19, -71, -26, 990, 0xA7, 0x00, 0xA7, 0xFF
vertex -101, -19, 0, 990, 990, 0x82, 0xFF, 0x00, 0xFF
vertex -94, 410, -38, 990, -1054, 0xA1, 0x49, 0xD9, 0xFF
vertex -38, 410, -94, -26, -1054, 0xDF, 0x5C, 0xB0, 0xFF
vertex 0, -19, -101, -26, 990, 0x00, 0xFF, 0x82, 0xFF
vertex -71, -19, -71, 990, 990, 0xA7, 0x00, 0xA7, 0xFF
vertex -38, 410, -94, 990, -1054, 0xDF, 0x5C, 0xB0, 0xFF
vertex 39, 410, -94, -26, -1054, 0x2D, 0x2A, 0x92, 0xFF
vertex -94, 410, 39, 990, -1054, 0xA1, 0x49, 0x27, 0xFF
vertex -101, -19, 0, 0, 990, 0x82, 0xFF, 0x00, 0xFF
vertex -71, -19, 72, 990, 990, 0xA7, 0xFF, 0x59, 0xFF
vertex -94, 410, -38, 0, -1054, 0xA1, 0x49, 0xD9, 0xFF
poundable_pole_seg6_vertex_060021C0: # 0x060021C0
vertex 102, -19, 0, -26, 990, 0x7E, 0xFF, 0x00, 0xFF
vertex 95, 410, -38, 990, -1054, 0x5F, 0x49, 0xD9, 0xFF
vertex 95, 410, 39, -26, -1054, 0x39, 0x6E, 0x18, 0xFF
vertex -71, -19, 72, 0, 990, 0xA7, 0xFF, 0x59, 0xFF
vertex 0, -19, 102, 990, 990, 0x00, 0xFF, 0x7E, 0xFF
vertex -38, 410, 95, 990, -1012, 0xD9, 0x49, 0x5F, 0xFF
vertex 0, -19, 102, -26, 990, 0x00, 0xFF, 0x7E, 0xFF
vertex 39, 410, 95, 990, -1054, 0x2D, 0x2A, 0x6E, 0xFF
vertex -38, 410, 95, -26, -1054, 0xD9, 0x49, 0x5F, 0xFF
vertex 72, -19, 72, 990, 990, 0x59, 0xFF, 0x59, 0xFF
vertex 95, 410, 39, 990, -1054, 0x39, 0x6E, 0x18, 0xFF
vertex 72, -19, 72, 0, 990, 0x59, 0xFF, 0x59, 0xFF
vertex 102, -19, 0, 990, 990, 0x7E, 0xFF, 0x00, 0xFF
vertex 39, 410, 95, 0, -1054, 0x2D, 0x2A, 0x6E, 0xFF
vertex 72, -19, -71, 990, 990, 0x59, 0xFF, 0xA7, 0xFF
poundable_pole_seg6_vertex_060022B0: # 0x060022B0
vertex 39, 410, -94, 990, -1054, 0x2D, 0x2A, 0x92, 0xFF
vertex 95, 410, -38, -26, -1054, 0x5F, 0x49, 0xD9, 0xFF
vertex 72, -19, -71, -26, 990, 0x59, 0xFF, 0xA7, 0xFF
vertex 0, -19, -101, 990, 990, 0x00, 0xFF, 0x82, 0xFF
glabel poundable_pole_seg6_dl_060022F0 # 0x060022F0 - 0x06002358
gsDPSetTextureImage G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, poundable_pole_seg6_texture_06001050
gsDPLoadSync
gsDPLoadBlock 7, 0, 0, 0x3FF, 0x100
gsSPLight poundable_pole_seg6_light_06001040, 1
gsSPLight poundable_pole_seg6_light_06001038, 2
gsSPVertex poundable_pole_seg6_vertex_06002050, 8, 0
gsSP2Triangles 0, 1, 2, 0x0, 0, 3, 4, 0x0
gsSP2Triangles 0, 2, 3, 0x0, 2, 1, 5, 0x0
gsSP2Triangles 2, 5, 6, 0x0, 2, 6, 7, 0x0
gsSPEndDisplayList
glabel poundable_pole_seg6_dl_06002358 # 0x06002358 - 0x06002410
gsDPSetTextureImage G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, poundable_pole_seg6_texture_06001850
gsDPLoadSync
gsDPLoadBlock 7, 0, 0, 0x3FF, 0x100
gsSPVertex poundable_pole_seg6_vertex_060020D0, 15, 0
gsSP2Triangles 0, 1, 2, 0x0, 3, 4, 5, 0x0
gsSP2Triangles 3, 5, 6, 0x0, 7, 8, 9, 0x0
gsSP2Triangles 7, 9, 10, 0x0, 11, 12, 13, 0x0
gsSP1Triangle 12, 11, 14, 0x0
gsSPVertex poundable_pole_seg6_vertex_060021C0, 15, 0
gsSP2Triangles 0, 1, 2, 0x0, 3, 4, 5, 0x0
gsSP2Triangles 6, 7, 8, 0x0, 6, 9, 7, 0x0
gsSP2Triangles 10, 11, 12, 0x0, 11, 10, 13, 0x0
gsSP1Triangle 1, 0, 14, 0x0
gsSPVertex poundable_pole_seg6_vertex_060022B0, 4, 0
gsSP2Triangles 0, 1, 2, 0x0, 3, 0, 2, 0x0
gsSPEndDisplayList
glabel poundable_pole_seg6_dl_06002410 # 0x06002410 - 0x06002490
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
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_CLAMP | G_TX_NOMIRROR, 5, G_TX_NOLOD, G_TX_CLAMP | G_TX_NOMIRROR, 5, G_TX_NOLOD
gsDPSetTileSize 0, 0, 0, 124, 124
gsSPDisplayList poundable_pole_seg6_dl_060022F0
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 poundable_pole_seg6_dl_06002358
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
gsSPEndDisplayList