Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified levels/lll/areamap_fire_bubble_top.rgba16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
126 changes: 77 additions & 49 deletions levels/lll/areas/1/1/model.inc.c
Original file line number Diff line number Diff line change
Expand Up @@ -101,16 +101,18 @@ static const Gfx fire_bubble_1_dl_mesh_tri_2[] = {
};

static const Vtx fire_bubble_1_dl_mesh_vtx_3[12] = {
{{ {512, 154, -6207}, 0, {-1618, 4099}, {0, 127, 0, 255} }},
{{ {-511, 154, -7231}, 0, {2532, -55}, {0, 127, 0, 255} }},
{{ {-511, 154, -6207}, 0, {2532, 4099}, {0, 127, 0, 255} }},
{{ {512, 154, -7231}, 0, {-1618, -55}, {0, 127, 0, 255} }},
{{ {-511, 207, -6581}, 0, {2656, -871}, {0, 127, 0, 255} }},
{{ {512, 207, -5557}, 0, {-1470, 3256}, {0, 127, 0, 255} }},
{{ {512, 207, -6581}, 0, {2661, 3256}, {0, 127, 0, 255} }},
{{ {-511, 207, -6581}, 0, {2657, -870}, {0, 127, 0, 255} }},
{{ {-511, 207, -5557}, 0, {-1465, -870}, {0, 127, 0, 255} }},
{{ {512, 207, -5557}, 0, {-1465, 3255}, {0, 127, 0, 255} }},
};

static const Gfx fire_bubble_1_dl_mesh_tri_3[] = {
gsSPVertex(fire_bubble_1_dl_mesh_vtx_3 + 0, 4, 0),
gsSPVertex(fire_bubble_1_dl_mesh_vtx_3 + 0, 6, 0),
gsSP1Triangle(0, 1, 2, 0),
gsSP1Triangle(1, 0, 3, 0),
gsSP1Triangle(3, 4, 5, 0),
gsSPEndDisplayList(),
};

Expand Down Expand Up @@ -473,15 +475,15 @@ static const Gfx fire_bubble_1_dl_mesh_tri_5[] = {
gsSP1Triangle(8, 10, 11, 0),
gsSP1Triangle(12, 13, 14, 0),
gsSP1Triangle(12, 14, 15, 0),
gsSPVertex(fire_bubble_1_dl_mesh_vtx_5 + 16, 16, 0),
gsSP1Triangle(0, 1, 2, 0),
gsSP1Triangle(0, 3, 1, 0),
gsSP1Triangle(4, 5, 6, 0),
gsSP1Triangle(4, 7, 5, 0),
gsSP1Triangle(8, 9, 10, 0),
gsSP1Triangle(8, 11, 9, 0),
gsSP1Triangle(12, 13, 14, 0),
gsSP1Triangle(12, 14, 15, 0),
// gsSPVertex(fire_bubble_1_dl_mesh_vtx_5 + 16, 16, 0),
// gsSP1Triangle(0, 1, 2, 0),
// gsSP1Triangle(0, 3, 1, 0),
// gsSP1Triangle(4, 5, 6, 0),
// gsSP1Triangle(4, 7, 5, 0),
// gsSP1Triangle(8, 9, 10, 0),
// gsSP1Triangle(8, 11, 9, 0),
// gsSP1Triangle(12, 13, 14, 0),
// gsSP1Triangle(12, 14, 15, 0),
gsSPVertex(fire_bubble_1_dl_mesh_vtx_5 + 32, 16, 0),
gsSP1Triangle(0, 1, 2, 0),
gsSP1Triangle(0, 3, 1, 0),
Expand Down Expand Up @@ -518,7 +520,7 @@ static const Gfx fire_bubble_1_dl_mesh_tri_5[] = {
// gsSP1Triangle(8, 10, 11, 0),
// gsSP1Triangle(12, 13, 14, 0),
// gsSP1Triangle(12, 14, 15, 0),
gsSPVertex(fire_bubble_1_dl_mesh_vtx_5 + 96, 16, 0),
// gsSPVertex(fire_bubble_1_dl_mesh_vtx_5 + 96, 16, 0),
// gsSP1Triangle(0, 1, 2, 0),
// gsSP1Triangle(0, 2, 3, 0),
// gsSP1Triangle(4, 5, 6, 0),
Expand All @@ -531,10 +533,10 @@ static const Gfx fire_bubble_1_dl_mesh_tri_5[] = {
};

static const Vtx fire_bubble_1_dl_mesh_vtx_6[4] = {
{{ {-767, 307, -3647}, 0, {-3310, 736}, {0, 127, 0, 255} }},
{{ {768, 307, -5055}, 0, {1010, -3225}, {0, 127, 0, 255} }},
{{ {-767, 307, -5055}, 0, {-3310, -3225}, {0, 127, 0, 255} }},
{{ {768, 307, -3647}, 0, {1010, 736}, {0, 127, 0, 255} }},
{{ {-767, 307, -2997}, 0, {-3310, 736}, {0, 127, 0, 255} }},
{{ {768, 307, -4405}, 0, {1010, -3225}, {0, 127, 0, 255} }},
{{ {-767, 307, -4405}, 0, {-3310, -3225}, {0, 127, 0, 255} }},
{{ {768, 307, -2997}, 0, {1010, 736}, {0, 127, 0, 255} }},
};

static const Gfx fire_bubble_1_dl_mesh_tri_6[] = {
Expand All @@ -557,41 +559,66 @@ const Gfx fire_bubble_lava_plane_mesh[] = {
};

static const Vtx fire_bubble_1_dl_mesh_vtx_7[20] = {
{{ {-511, 154, -7231}, 0, {4836, 36}, {0, 0, 129, 255} }},
{{ {0, 0, -7231}, 0, {1552, 1000}, {0, 0, 129, 255} }},
{{ {-511, 0, -7231}, 0, {4836, 1000}, {0, 0, 129, 255} }},
{{ {512, 0, -7231}, 0, {-1740, 1000}, {0, 0, 129, 255} }},
{{ {512, 154, -7231}, 0, {-1740, 36}, {0, 0, 129, 255} }},
{{ {-511, 154, -7231}, 0, {-3353, 35}, {129, 0, 0, 255} }},
{{ {-511, 0, -6207}, 0, {5724, 999}, {129, 0, 0, 255} }},
{{ {-511, 154, -6207}, 0, {5724, 35}, {129, 0, 0, 255} }},
{{ {-511, 0, -7231}, 0, {-3353, 999}, {129, 0, 0, 255} }},
{{ {512, 0, -7231}, 0, {4015, 1000}, {127, 0, 0, 255} }},
{{ {512, 154, -6207}, 0, {-5063, 36}, {127, 0, 0, 255} }},
{{ {512, 0, -6207}, 0, {-5063, 1000}, {127, 0, 0, 255} }},
{{ {512, 154, -7231}, 0, {4015, 36}, {127, 0, 0, 255} }},
{{ {512, 154, -6207}, 0, {4115, 35}, {0, 0, 127, 255} }},
{{ {0, 0, -6207}, 0, {823, 999}, {0, 0, 127, 255} }},
{{ {512, 0, -6207}, 0, {4115, 999}, {0, 0, 127, 255} }},
{{ {0, 0, -6207}, 0, {823, 999}, {0, 0, 127, 255} }},
{{ {512, 154, -6207}, 0, {4115, 35}, {0, 0, 127, 255} }},
{{ {-511, 0, -6207}, 0, {-2462, 999}, {0, 0, 127, 255} }},
{{ {-511, 154, -6207}, 0, {-2462, 35}, {0, 0, 127, 255} }},
{{ {-511, 0, -5557}, 0, {-1834, 870}, {0, 0, 127, 255} }},
{{ {512, 0, -5557}, 0, {2826, 870}, {0, 0, 127, 255} }},
{{ {512, 207, -5557}, 0, {2826, -11}, {0, 0, 127, 255} }},
{{ {-511, 207, -5557}, 0, {-1834, -11}, {0, 0, 127, 255} }},
{{ {512, 207, -6581}, 0, {2828, -11}, {127, 0, 0, 255} }},
{{ {512, 207, -5557}, 0, {-1836, -11}, {127, 0, 0, 255} }},
{{ {512, 0, -5557}, 0, {-1836, 870}, {127, 0, 0, 255} }},
{{ {512, 0, -6581}, 0, {2828, 870}, {127, 0, 0, 255} }},
{{ {-511, 207, -6581}, 0, {-1834, -11}, {0, 0, 129, 255} }},
{{ {512, 207, -6581}, 0, {2826, -11}, {0, 0, 129, 255} }},
{{ {512, 0, -6581}, 0, {2826, 870}, {0, 0, 129, 255} }},
{{ {-511, 0, -6581}, 0, {-1834, 870}, {0, 0, 129, 255} }},
{{ {-511, 207, -5557}, 0, {-1836, -11}, {129, 0, 0, 255} }},
{{ {-511, 207, -6581}, 0, {2828, -11}, {129, 0, 0, 255} }},
{{ {-511, 0, -6581}, 0, {2828, 870}, {129, 0, 0, 255} }},
{{ {-511, 0, -5557}, 0, {-1836, 870}, {129, 0, 0, 255} }},
};

static const Gfx fire_bubble_1_dl_mesh_tri_7[] = {
gsSPVertex(fire_bubble_1_dl_mesh_vtx_7 + 0, 16, 0),
gsSP1Triangle(0, 1, 2, 0),
gsSP1Triangle(1, 0, 3, 0),
gsSP1Triangle(3, 0, 4, 0),
gsSP1Triangle(5, 6, 7, 0),
gsSP1Triangle(6, 5, 8, 0),
gsSP1Triangle(9, 10, 11, 0),
gsSP1Triangle(10, 9, 12, 0),
gsSP1Triangle(13, 14, 15, 0),
gsSPVertex(fire_bubble_1_dl_mesh_vtx_7 + 16, 4, 0),
gsSP1Triangle(2, 3, 0, 0),
gsSP1Triangle(4, 5, 6, 0),
gsSP1Triangle(4, 6, 7, 0),
gsSP1Triangle(8, 9, 10, 0),
gsSP1Triangle(8, 10, 11, 0),
gsSP1Triangle(12, 13, 14, 0),
gsSP1Triangle(12, 14, 15, 0),
gsSPEndDisplayList(),
};

Vtx fire_bubble_1_dl_mesh_vtx_8[16] = {
{{ {768, 0, -4405}, 0, {4624, 976}, {127, 0, 0, 255} }},
{{ {768, 307, -2997}, 0, {-16, -16}, {127, 0, 0, 255} }},
{{ {768, 0, -2997}, 0, {-16, 976}, {127, 0, 0, 255} }},
{{ {768, 307, -4405}, 0, {4624, -16}, {127, 0, 0, 255} }},
{{ {-767, 0, -4405}, 0, {-16, 976}, {0, 0, 129, 255} }},
{{ {768, 307, -4405}, 0, {5072, -16}, {0, 0, 129, 255} }},
{{ {768, 0, -4405}, 0, {5072, 976}, {0, 0, 129, 255} }},
{{ {-767, 307, -4405}, 0, {-16, -16}, {0, 0, 129, 255} }},
{{ {768, 0, -2997}, 0, {5072, 976}, {0, 0, 127, 255} }},
{{ {-767, 307, -2997}, 0, {-16, -16}, {0, 0, 127, 255} }},
{{ {-767, 0, -2997}, 0, {-16, 976}, {0, 0, 127, 255} }},
{{ {768, 307, -2997}, 0, {5072, -16}, {0, 0, 127, 255} }},
{{ {-767, 0, -2997}, 0, {-16, 976}, {129, 0, 0, 255} }},
{{ {-767, 307, -2997}, 0, {-16, -16}, {129, 0, 0, 255} }},
{{ {-767, 307, -4405}, 0, {4624, -16}, {129, 0, 0, 255} }},
{{ {-767, 0, -4405}, 0, {4624, 976}, {129, 0, 0, 255} }},
};

Gfx fire_bubble_1_dl_mesh_tri_8[] = {
gsSPVertex(fire_bubble_1_dl_mesh_vtx_8 + 0, 16, 0),
gsSP1Triangle(0, 1, 2, 0),
gsSP1Triangle(2, 1, 3, 0),
gsSP1Triangle(0, 3, 1, 0),
gsSP1Triangle(4, 5, 6, 0),
gsSP1Triangle(4, 7, 5, 0),
gsSP1Triangle(8, 9, 10, 0),
gsSP1Triangle(8, 11, 9, 0),
gsSP1Triangle(12, 13, 14, 0),
gsSP1Triangle(12, 14, 15, 0),
gsSPEndDisplayList(),
};

Expand All @@ -609,6 +636,7 @@ const Gfx fire_bubble_1_dl_mesh[] = {
gsSPDisplayList(mat_fire_bubble_WallMaterial),
gsSPDisplayList(fire_bubble_1_dl_mesh_tri_5),
gsSPDisplayList(fire_bubble_1_dl_mesh_tri_7),
gsSPDisplayList(fire_bubble_1_dl_mesh_tri_8),
gsSPDisplayList(mat_fire_bubble_GrayGravelMaterial),
gsSPDisplayList(fire_bubble_1_dl_mesh_tri_6),
gsDPPipeSync(),
Expand Down
Loading