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

@@ -1,2 +0,0 @@
# Tornado

8
actors/tornado/geo.inc.c Normal file
View File

@@ -0,0 +1,8 @@
// 0x05014630
const GeoLayout tornado_seg5_geo_05014630[] = {
GEO_CULLING_RADIUS(5000),
GEO_OPEN_NODE(),
GEO_DISPLAY_LIST(LAYER_TRANSPARENT, tornado_seg5_dl_050145C0),
GEO_CLOSE_NODE(),
GEO_END(),
};

View File

@@ -1,6 +0,0 @@
glabel tornado_seg5_geo_05014630 # 0x05014630
geo_culling_radius 5000
geo_open_node
geo_display_list LAYER_TRANSPARENT, tornado_seg5_dl_050145C0
geo_close_node
geo_end

132
actors/tornado/model.inc.c Normal file
View File

@@ -0,0 +1,132 @@
// Tornado
// 0x05013128
ALIGNED8 static const u8 tornado_seg5_texture_05013128[] = {
#include "actors/tornado/tornado.ia16.inc.c"
};
// 0x05014128
static const Ambient tornado_seg5_light_05014128 = {
{{0x3b, 0x34, 0x23}, 0, {0x3b, 0x34, 0x23}, 0}
};
// 0x05014130
static const Light tornado_seg5_light_05014130 = {
{{0xee, 0xd0, 0x8d}, 0, {0xee, 0xd0, 0x8d}, 0, {0x28, 0x28, 0x28}, 0}
};
// 0x05014140
static const Vtx tornado_seg5_vertex_05014140[] = {
{{{ 474, 661, 822}, 0, { 650, 1708}, {0x30, 0xbe, 0x60, 0x64}}},
{{{ 0, 661, 949}, 0, { 480, 1708}, {0x00, 0xb6, 0x67, 0x64}}},
{{{ 0, 0, 0}, 0, { 564, 2012}, {0x00, 0x82, 0x00, 0x64}}},
{{{ 822, 661, 474}, 0, { 820, 1708}, {0x60, 0xc3, 0x37, 0x64}}},
{{{ 0, 0, 0}, 0, { 734, 2012}, {0x00, 0x82, 0x00, 0x64}}},
{{{ 969, 4107, 1679}, 0, { 650, 128}, {0x46, 0xde, 0x63, 0x64}}},
{{{ 0, 4107, 1938}, 0, { 480, 128}, {0x00, 0xdd, 0x7a, 0x64}}},
{{{ 1679, 4107, 969}, 0, { 820, 128}, {0x69, 0xdd, 0x3d, 0x64}}},
{{{ -474, 661, 822}, 0, { 308, 1708}, {0xc9, 0xc3, 0x60, 0x64}}},
{{{ -969, 4107, 1679}, 0, { 308, 128}, {0xc3, 0xdd, 0x69, 0x64}}},
{{{ 0, 0, 0}, 0, { 394, 2012}, {0x00, 0x82, 0x00, 0x64}}},
{{{ 949, 661, 0}, 0, { 990, 1708}, {0x67, 0xb6, 0x00, 0x64}}},
{{{ 0, 0, 0}, 0, { 904, 2012}, {0x00, 0x82, 0x00, 0x64}}},
{{{ 1938, 4107, 0}, 0, { 990, 128}, {0x7a, 0xdd, 0x00, 0x64}}},
};
// 0x05014220
static const Vtx tornado_seg5_vertex_05014220[] = {
{{{ -474, 661, -822}, 0, { 1672, 1708}, {0xd0, 0xbe, 0xa0, 0x64}}},
{{{ -969, 4107, -1678}, 0, { 1672, 128}, {0xba, 0xde, 0x9d, 0x64}}},
{{{ 0, 4107, -1938}, 0, { 1502, 128}, {0x00, 0xdd, 0x86, 0x64}}},
{{{ 822, 661, -474}, 0, { 1160, 1708}, {0x60, 0xbe, 0xd0, 0x64}}},
{{{ 1938, 4107, 0}, 0, { 990, 128}, {0x7a, 0xdd, 0x00, 0x64}}},
{{{ 949, 661, 0}, 0, { 990, 1708}, {0x67, 0xb6, 0x00, 0x64}}},
{{{ 1679, 4107, -969}, 0, { 1160, 128}, {0x63, 0xde, 0xba, 0x64}}},
{{{ 0, 0, 0}, 0, { 1076, 2012}, {0x00, 0x82, 0x00, 0x64}}},
{{{ 474, 661, -822}, 0, { 1330, 1708}, {0x37, 0xc3, 0xa0, 0x64}}},
{{{ 0, 0, 0}, 0, { 1246, 2012}, {0x00, 0x82, 0x00, 0x64}}},
{{{ 969, 4107, -1678}, 0, { 1330, 128}, {0x3d, 0xdd, 0x97, 0x64}}},
{{{ 0, 661, -949}, 0, { 1502, 1708}, {0x00, 0xb6, 0x99, 0x64}}},
{{{ 0, 0, 0}, 0, { 1416, 2012}, {0x00, 0x82, 0x00, 0x64}}},
{{{ -474, 661, 822}, 0, { 308, 1708}, {0xc9, 0xc3, 0x60, 0x64}}},
{{{ -822, 661, 474}, 0, { 138, 1708}, {0xa0, 0xbe, 0x30, 0x64}}},
{{{ 0, 0, 0}, 0, { 224, 2012}, {0x00, 0x82, 0x00, 0x64}}},
};
// 0x05014320
static const Vtx tornado_seg5_vertex_05014320[] = {
{{{ -474, 661, -822}, 0, { 1672, 1708}, {0xd0, 0xbe, 0xa0, 0x64}}},
{{{ 0, 661, -949}, 0, { 1502, 1708}, {0x00, 0xb6, 0x99, 0x64}}},
{{{ 0, 0, 0}, 0, { 1586, 2012}, {0x00, 0x82, 0x00, 0x64}}},
{{{ -822, 661, -474}, 0, { 1842, 1708}, {0xa0, 0xc3, 0xc9, 0x64}}},
{{{ 0, 0, 0}, 0, { 1756, 2012}, {0x00, 0x82, 0x00, 0x64}}},
{{{ -969, 4107, -1678}, 0, { 1672, 128}, {0xba, 0xde, 0x9d, 0x64}}},
{{{ -1678, 4107, -969}, 0, { 1842, 128}, {0x97, 0xdd, 0xc3, 0x64}}},
{{{ -949, 661, 0}, 0, { 2012, 1708}, {0x99, 0xb6, 0x00, 0x64}}},
{{{ 0, 0, 0}, 0, { 1926, 2012}, {0x00, 0x82, 0x00, 0x64}}},
{{{ -1938, 4107, 0}, 0, { 2012, 128}, {0x86, 0xdd, 0x00, 0x64}}},
{{{ -822, 661, 474}, 0, { 138, 1708}, {0xa0, 0xbe, 0x30, 0x64}}},
{{{ -949, 661, 0}, 0, { 0, 1708}, {0x99, 0xb6, 0x00, 0x64}}},
{{{ 0, 0, 0}, 0, { 54, 2012}, {0x00, 0x82, 0x00, 0x64}}},
{{{ -1938, 4107, 0}, 0, { 0, 128}, {0x86, 0xdd, 0x00, 0x64}}},
};
// 0x05014400
static const Vtx tornado_seg5_vertex_05014400[] = {
{{{ -474, 661, 822}, 0, { 308, 1708}, {0xc9, 0xc3, 0x60, 0x64}}},
{{{ -969, 4107, 1679}, 0, { 308, 128}, {0xc3, 0xdd, 0x69, 0x64}}},
{{{ -1678, 4107, 969}, 0, { 138, 128}, {0x9d, 0xde, 0x46, 0x64}}},
{{{ -822, 661, 474}, 0, { 138, 1708}, {0xa0, 0xbe, 0x30, 0x64}}},
{{{ -1938, 4107, 0}, 0, { 0, 128}, {0x86, 0xdd, 0x00, 0x64}}},
};
// 0x05014450 - 0x050145C0
const Gfx tornado_seg5_dl_05014450[] = {
gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b, 1, tornado_seg5_texture_05013128),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&tornado_seg5_light_05014130, 1),
gsSPLight(&tornado_seg5_light_05014128, 2),
gsSPVertex(tornado_seg5_vertex_05014140, 14, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 4, 0x0),
gsSP2Triangles( 0, 5, 6, 0x0, 0, 6, 1, 0x0),
gsSP2Triangles( 3, 5, 0, 0x0, 3, 7, 5, 0x0),
gsSP2Triangles( 1, 6, 8, 0x0, 6, 9, 8, 0x0),
gsSP2Triangles( 1, 8, 10, 0x0, 11, 3, 12, 0x0),
gsSP2Triangles(11, 13, 3, 0x0, 13, 7, 3, 0x0),
gsSPVertex(tornado_seg5_vertex_05014220, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 3, 6, 4, 0x0, 3, 5, 7, 0x0),
gsSP2Triangles( 8, 3, 9, 0x0, 8, 6, 3, 0x0),
gsSP2Triangles( 8, 10, 6, 0x0, 11, 8, 12, 0x0),
gsSP2Triangles( 2, 10, 8, 0x0, 11, 2, 8, 0x0),
gsSP2Triangles( 0, 2, 11, 0x0, 13, 14, 15, 0x0),
gsSPVertex(tornado_seg5_vertex_05014320, 14, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 4, 0x0),
gsSP2Triangles( 3, 5, 0, 0x0, 3, 6, 5, 0x0),
gsSP2Triangles( 7, 3, 8, 0x0, 9, 6, 3, 0x0),
gsSP2Triangles( 7, 9, 3, 0x0, 10, 11, 12, 0x0),
gsSP1Triangle(10, 13, 11, 0x0),
gsSPVertex(tornado_seg5_vertex_05014400, 5, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP1Triangle( 3, 2, 4, 0x0),
gsSPEndDisplayList(),
};
// 0x050145C0 - 0x05014630
const Gfx tornado_seg5_dl_050145C0[] = {
gsDPPipeSync(),
gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
gsSPClearGeometryMode(G_CULL_BACK),
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),
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_IA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, 6, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, 5, G_TX_NOLOD),
gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (64 - 1) << G_TEXTURE_IMAGE_FRAC),
gsSPDisplayList(tornado_seg5_dl_05014450),
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF),
gsDPPipeSync(),
gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE),
gsSPSetGeometryMode(G_CULL_BACK),
gsSPEndDisplayList(),
};

View File

@@ -1,117 +0,0 @@
# Tornado
tornado_seg5_texture_05013128: # 0x05013128
.incbin "actors/tornado/tornado.ia16"
tornado_seg5_light_05014128: # 0x05014128
.byte 0x3B, 0x34, 0x23, 0x00, 0x3B, 0x34, 0x23, 0x00
tornado_seg5_light_05014130: # 0x05014130
.byte 0xEE, 0xD0, 0x8D, 0x00, 0xEE, 0xD0, 0x8D, 0x00
.byte 0x28, 0x28, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00
tornado_seg5_vertex_05014140: # 0x05014140
vertex 474, 661, 822, 650, 1708, 0x30, 0xBE, 0x60, 0x64
vertex 0, 661, 949, 480, 1708, 0x00, 0xB6, 0x67, 0x64
vertex 0, 0, 0, 564, 2012, 0x00, 0x82, 0x00, 0x64
vertex 822, 661, 474, 820, 1708, 0x60, 0xC3, 0x37, 0x64
vertex 0, 0, 0, 734, 2012, 0x00, 0x82, 0x00, 0x64
vertex 969, 4107, 1679, 650, 128, 0x46, 0xDE, 0x63, 0x64
vertex 0, 4107, 1938, 480, 128, 0x00, 0xDD, 0x7A, 0x64
vertex 1679, 4107, 969, 820, 128, 0x69, 0xDD, 0x3D, 0x64
vertex -474, 661, 822, 308, 1708, 0xC9, 0xC3, 0x60, 0x64
vertex -969, 4107, 1679, 308, 128, 0xC3, 0xDD, 0x69, 0x64
vertex 0, 0, 0, 394, 2012, 0x00, 0x82, 0x00, 0x64
vertex 949, 661, 0, 990, 1708, 0x67, 0xB6, 0x00, 0x64
vertex 0, 0, 0, 904, 2012, 0x00, 0x82, 0x00, 0x64
vertex 1938, 4107, 0, 990, 128, 0x7A, 0xDD, 0x00, 0x64
tornado_seg5_vertex_05014220: # 0x05014220
vertex -474, 661, -822, 1672, 1708, 0xD0, 0xBE, 0xA0, 0x64
vertex -969, 4107, -1678, 1672, 128, 0xBA, 0xDE, 0x9D, 0x64
vertex 0, 4107, -1938, 1502, 128, 0x00, 0xDD, 0x86, 0x64
vertex 822, 661, -474, 1160, 1708, 0x60, 0xBE, 0xD0, 0x64
vertex 1938, 4107, 0, 990, 128, 0x7A, 0xDD, 0x00, 0x64
vertex 949, 661, 0, 990, 1708, 0x67, 0xB6, 0x00, 0x64
vertex 1679, 4107, -969, 1160, 128, 0x63, 0xDE, 0xBA, 0x64
vertex 0, 0, 0, 1076, 2012, 0x00, 0x82, 0x00, 0x64
vertex 474, 661, -822, 1330, 1708, 0x37, 0xC3, 0xA0, 0x64
vertex 0, 0, 0, 1246, 2012, 0x00, 0x82, 0x00, 0x64
vertex 969, 4107, -1678, 1330, 128, 0x3D, 0xDD, 0x97, 0x64
vertex 0, 661, -949, 1502, 1708, 0x00, 0xB6, 0x99, 0x64
vertex 0, 0, 0, 1416, 2012, 0x00, 0x82, 0x00, 0x64
vertex -474, 661, 822, 308, 1708, 0xC9, 0xC3, 0x60, 0x64
vertex -822, 661, 474, 138, 1708, 0xA0, 0xBE, 0x30, 0x64
vertex 0, 0, 0, 224, 2012, 0x00, 0x82, 0x00, 0x64
tornado_seg5_vertex_05014320: # 0x05014320
vertex -474, 661, -822, 1672, 1708, 0xD0, 0xBE, 0xA0, 0x64
vertex 0, 661, -949, 1502, 1708, 0x00, 0xB6, 0x99, 0x64
vertex 0, 0, 0, 1586, 2012, 0x00, 0x82, 0x00, 0x64
vertex -822, 661, -474, 1842, 1708, 0xA0, 0xC3, 0xC9, 0x64
vertex 0, 0, 0, 1756, 2012, 0x00, 0x82, 0x00, 0x64
vertex -969, 4107, -1678, 1672, 128, 0xBA, 0xDE, 0x9D, 0x64
vertex -1678, 4107, -969, 1842, 128, 0x97, 0xDD, 0xC3, 0x64
vertex -949, 661, 0, 2012, 1708, 0x99, 0xB6, 0x00, 0x64
vertex 0, 0, 0, 1926, 2012, 0x00, 0x82, 0x00, 0x64
vertex -1938, 4107, 0, 2012, 128, 0x86, 0xDD, 0x00, 0x64
vertex -822, 661, 474, 138, 1708, 0xA0, 0xBE, 0x30, 0x64
vertex -949, 661, 0, 0, 1708, 0x99, 0xB6, 0x00, 0x64
vertex 0, 0, 0, 54, 2012, 0x00, 0x82, 0x00, 0x64
vertex -1938, 4107, 0, 0, 128, 0x86, 0xDD, 0x00, 0x64
tornado_seg5_vertex_05014400: # 0x05014400
vertex -474, 661, 822, 308, 1708, 0xC9, 0xC3, 0x60, 0x64
vertex -969, 4107, 1679, 308, 128, 0xC3, 0xDD, 0x69, 0x64
vertex -1678, 4107, 969, 138, 128, 0x9D, 0xDE, 0x46, 0x64
vertex -822, 661, 474, 138, 1708, 0xA0, 0xBE, 0x30, 0x64
vertex -1938, 4107, 0, 0, 128, 0x86, 0xDD, 0x00, 0x64
glabel tornado_seg5_dl_05014450 # 0x05014450 - 0x050145C0
gsDPSetTextureImage G_IM_FMT_IA, G_IM_SIZ_16b, 1, tornado_seg5_texture_05013128
gsDPLoadSync
gsDPLoadBlock 7, 0, 0, 0x7FF, 0x100
gsSPLight tornado_seg5_light_05014130, 1
gsSPLight tornado_seg5_light_05014128, 2
gsSPVertex tornado_seg5_vertex_05014140, 14, 0
gsSP2Triangles 0, 1, 2, 0x0, 3, 0, 4, 0x0
gsSP2Triangles 0, 5, 6, 0x0, 0, 6, 1, 0x0
gsSP2Triangles 3, 5, 0, 0x0, 3, 7, 5, 0x0
gsSP2Triangles 1, 6, 8, 0x0, 6, 9, 8, 0x0
gsSP2Triangles 1, 8, 10, 0x0, 11, 3, 12, 0x0
gsSP2Triangles 11, 13, 3, 0x0, 13, 7, 3, 0x0
gsSPVertex tornado_seg5_vertex_05014220, 16, 0
gsSP2Triangles 0, 1, 2, 0x0, 3, 4, 5, 0x0
gsSP2Triangles 3, 6, 4, 0x0, 3, 5, 7, 0x0
gsSP2Triangles 8, 3, 9, 0x0, 8, 6, 3, 0x0
gsSP2Triangles 8, 10, 6, 0x0, 11, 8, 12, 0x0
gsSP2Triangles 2, 10, 8, 0x0, 11, 2, 8, 0x0
gsSP2Triangles 0, 2, 11, 0x0, 13, 14, 15, 0x0
gsSPVertex tornado_seg5_vertex_05014320, 14, 0
gsSP2Triangles 0, 1, 2, 0x0, 3, 0, 4, 0x0
gsSP2Triangles 3, 5, 0, 0x0, 3, 6, 5, 0x0
gsSP2Triangles 7, 3, 8, 0x0, 9, 6, 3, 0x0
gsSP2Triangles 7, 9, 3, 0x0, 10, 11, 12, 0x0
gsSP1Triangle 10, 13, 11, 0x0
gsSPVertex tornado_seg5_vertex_05014400, 5, 0
gsSP2Triangles 0, 1, 2, 0x0, 0, 2, 3, 0x0
gsSP1Triangle 3, 2, 4, 0x0
gsSPEndDisplayList
glabel tornado_seg5_dl_050145C0 # 0x050145C0 - 0x05014630
gsDPPipeSync
gsDPSetCombineModeLERP1Cycle G_CCMUX_TEXEL0, G_CCMUX_0, G_CCMUX_SHADE, G_CCMUX_0, G_ACMUX_TEXEL0, G_ACMUX_0, G_ACMUX_SHADE, G_ACMUX_0
gsSPClearGeometryMode G_CULL_BACK
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
gsSPTexture -1, -1, 0, 0, 1
gsDPTileSync
gsDPSetTile G_IM_FMT_IA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, 6, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, 5, G_TX_NOLOD
gsDPSetTileSize 0, 0, 0, 124, 252
gsSPDisplayList tornado_seg5_dl_05014450
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_CULL_BACK
gsSPEndDisplayList
actorgeo tornado