Skip to content

Commit 630c9e8

Browse files
stalechilibeansstalechilibeans
authored
Merge pull request #19 from penguinlambz/test
Add sinking rectangular platform + minimap update
2 parents 4904215 + c1372c3 commit 630c9e8

6 files changed

Lines changed: 773 additions & 1019 deletions

File tree

‎levels/lll/areamap_fire_bubble_top.rgba16.png‎

55 Bytes
Loading

‎levels/lll/areas/1/1/model.inc.c‎

Lines changed: 77 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -101,16 +101,18 @@ static const Gfx fire_bubble_1_dl_mesh_tri_2[] = {
101101
};
102102

103103
static const Vtx fire_bubble_1_dl_mesh_vtx_3[12] = {
104-
{{ {512, 154, -6207}, 0, {-1618, 4099}, {0, 127, 0, 255} }},
105-
{{ {-511, 154, -7231}, 0, {2532, -55}, {0, 127, 0, 255} }},
106-
{{ {-511, 154, -6207}, 0, {2532, 4099}, {0, 127, 0, 255} }},
107-
{{ {512, 154, -7231}, 0, {-1618, -55}, {0, 127, 0, 255} }},
104+
{{ {-511, 207, -6581}, 0, {2656, -871}, {0, 127, 0, 255} }},
105+
{{ {512, 207, -5557}, 0, {-1470, 3256}, {0, 127, 0, 255} }},
106+
{{ {512, 207, -6581}, 0, {2661, 3256}, {0, 127, 0, 255} }},
107+
{{ {-511, 207, -6581}, 0, {2657, -870}, {0, 127, 0, 255} }},
108+
{{ {-511, 207, -5557}, 0, {-1465, -870}, {0, 127, 0, 255} }},
109+
{{ {512, 207, -5557}, 0, {-1465, 3255}, {0, 127, 0, 255} }},
108110
};
109111

110112
static const Gfx fire_bubble_1_dl_mesh_tri_3[] = {
111-
gsSPVertex(fire_bubble_1_dl_mesh_vtx_3 + 0, 4, 0),
113+
gsSPVertex(fire_bubble_1_dl_mesh_vtx_3 + 0, 6, 0),
112114
gsSP1Triangle(0, 1, 2, 0),
113-
gsSP1Triangle(1, 0, 3, 0),
115+
gsSP1Triangle(3, 4, 5, 0),
114116
gsSPEndDisplayList(),
115117
};
116118

@@ -473,15 +475,15 @@ static const Gfx fire_bubble_1_dl_mesh_tri_5[] = {
473475
gsSP1Triangle(8, 10, 11, 0),
474476
gsSP1Triangle(12, 13, 14, 0),
475477
gsSP1Triangle(12, 14, 15, 0),
476-
gsSPVertex(fire_bubble_1_dl_mesh_vtx_5 + 16, 16, 0),
477-
gsSP1Triangle(0, 1, 2, 0),
478-
gsSP1Triangle(0, 3, 1, 0),
479-
gsSP1Triangle(4, 5, 6, 0),
480-
gsSP1Triangle(4, 7, 5, 0),
481-
gsSP1Triangle(8, 9, 10, 0),
482-
gsSP1Triangle(8, 11, 9, 0),
483-
gsSP1Triangle(12, 13, 14, 0),
484-
gsSP1Triangle(12, 14, 15, 0),
478+
// gsSPVertex(fire_bubble_1_dl_mesh_vtx_5 + 16, 16, 0),
479+
// gsSP1Triangle(0, 1, 2, 0),
480+
// gsSP1Triangle(0, 3, 1, 0),
481+
// gsSP1Triangle(4, 5, 6, 0),
482+
// gsSP1Triangle(4, 7, 5, 0),
483+
// gsSP1Triangle(8, 9, 10, 0),
484+
// gsSP1Triangle(8, 11, 9, 0),
485+
// gsSP1Triangle(12, 13, 14, 0),
486+
// gsSP1Triangle(12, 14, 15, 0),
485487
gsSPVertex(fire_bubble_1_dl_mesh_vtx_5 + 32, 16, 0),
486488
gsSP1Triangle(0, 1, 2, 0),
487489
gsSP1Triangle(0, 3, 1, 0),
@@ -518,7 +520,7 @@ static const Gfx fire_bubble_1_dl_mesh_tri_5[] = {
518520
// gsSP1Triangle(8, 10, 11, 0),
519521
// gsSP1Triangle(12, 13, 14, 0),
520522
// gsSP1Triangle(12, 14, 15, 0),
521-
gsSPVertex(fire_bubble_1_dl_mesh_vtx_5 + 96, 16, 0),
523+
// gsSPVertex(fire_bubble_1_dl_mesh_vtx_5 + 96, 16, 0),
522524
// gsSP1Triangle(0, 1, 2, 0),
523525
// gsSP1Triangle(0, 2, 3, 0),
524526
// gsSP1Triangle(4, 5, 6, 0),
@@ -531,10 +533,10 @@ static const Gfx fire_bubble_1_dl_mesh_tri_5[] = {
531533
};
532534

533535
static const Vtx fire_bubble_1_dl_mesh_vtx_6[4] = {
534-
{{ {-767, 307, -3647}, 0, {-3310, 736}, {0, 127, 0, 255} }},
535-
{{ {768, 307, -5055}, 0, {1010, -3225}, {0, 127, 0, 255} }},
536-
{{ {-767, 307, -5055}, 0, {-3310, -3225}, {0, 127, 0, 255} }},
537-
{{ {768, 307, -3647}, 0, {1010, 736}, {0, 127, 0, 255} }},
536+
{{ {-767, 307, -2997}, 0, {-3310, 736}, {0, 127, 0, 255} }},
537+
{{ {768, 307, -4405}, 0, {1010, -3225}, {0, 127, 0, 255} }},
538+
{{ {-767, 307, -4405}, 0, {-3310, -3225}, {0, 127, 0, 255} }},
539+
{{ {768, 307, -2997}, 0, {1010, 736}, {0, 127, 0, 255} }},
538540
};
539541

540542
static const Gfx fire_bubble_1_dl_mesh_tri_6[] = {
@@ -557,41 +559,66 @@ const Gfx fire_bubble_lava_plane_mesh[] = {
557559
};
558560

559561
static const Vtx fire_bubble_1_dl_mesh_vtx_7[20] = {
560-
{{ {-511, 154, -7231}, 0, {4836, 36}, {0, 0, 129, 255} }},
561-
{{ {0, 0, -7231}, 0, {1552, 1000}, {0, 0, 129, 255} }},
562-
{{ {-511, 0, -7231}, 0, {4836, 1000}, {0, 0, 129, 255} }},
563-
{{ {512, 0, -7231}, 0, {-1740, 1000}, {0, 0, 129, 255} }},
564-
{{ {512, 154, -7231}, 0, {-1740, 36}, {0, 0, 129, 255} }},
565-
{{ {-511, 154, -7231}, 0, {-3353, 35}, {129, 0, 0, 255} }},
566-
{{ {-511, 0, -6207}, 0, {5724, 999}, {129, 0, 0, 255} }},
567-
{{ {-511, 154, -6207}, 0, {5724, 35}, {129, 0, 0, 255} }},
568-
{{ {-511, 0, -7231}, 0, {-3353, 999}, {129, 0, 0, 255} }},
569-
{{ {512, 0, -7231}, 0, {4015, 1000}, {127, 0, 0, 255} }},
570-
{{ {512, 154, -6207}, 0, {-5063, 36}, {127, 0, 0, 255} }},
571-
{{ {512, 0, -6207}, 0, {-5063, 1000}, {127, 0, 0, 255} }},
572-
{{ {512, 154, -7231}, 0, {4015, 36}, {127, 0, 0, 255} }},
573-
{{ {512, 154, -6207}, 0, {4115, 35}, {0, 0, 127, 255} }},
574-
{{ {0, 0, -6207}, 0, {823, 999}, {0, 0, 127, 255} }},
575-
{{ {512, 0, -6207}, 0, {4115, 999}, {0, 0, 127, 255} }},
576-
{{ {0, 0, -6207}, 0, {823, 999}, {0, 0, 127, 255} }},
577-
{{ {512, 154, -6207}, 0, {4115, 35}, {0, 0, 127, 255} }},
578-
{{ {-511, 0, -6207}, 0, {-2462, 999}, {0, 0, 127, 255} }},
579-
{{ {-511, 154, -6207}, 0, {-2462, 35}, {0, 0, 127, 255} }},
562+
{{ {-511, 0, -5557}, 0, {-1834, 870}, {0, 0, 127, 255} }},
563+
{{ {512, 0, -5557}, 0, {2826, 870}, {0, 0, 127, 255} }},
564+
{{ {512, 207, -5557}, 0, {2826, -11}, {0, 0, 127, 255} }},
565+
{{ {-511, 207, -5557}, 0, {-1834, -11}, {0, 0, 127, 255} }},
566+
{{ {512, 207, -6581}, 0, {2828, -11}, {127, 0, 0, 255} }},
567+
{{ {512, 207, -5557}, 0, {-1836, -11}, {127, 0, 0, 255} }},
568+
{{ {512, 0, -5557}, 0, {-1836, 870}, {127, 0, 0, 255} }},
569+
{{ {512, 0, -6581}, 0, {2828, 870}, {127, 0, 0, 255} }},
570+
{{ {-511, 207, -6581}, 0, {-1834, -11}, {0, 0, 129, 255} }},
571+
{{ {512, 207, -6581}, 0, {2826, -11}, {0, 0, 129, 255} }},
572+
{{ {512, 0, -6581}, 0, {2826, 870}, {0, 0, 129, 255} }},
573+
{{ {-511, 0, -6581}, 0, {-1834, 870}, {0, 0, 129, 255} }},
574+
{{ {-511, 207, -5557}, 0, {-1836, -11}, {129, 0, 0, 255} }},
575+
{{ {-511, 207, -6581}, 0, {2828, -11}, {129, 0, 0, 255} }},
576+
{{ {-511, 0, -6581}, 0, {2828, 870}, {129, 0, 0, 255} }},
577+
{{ {-511, 0, -5557}, 0, {-1836, 870}, {129, 0, 0, 255} }},
580578
};
581579

582580
static const Gfx fire_bubble_1_dl_mesh_tri_7[] = {
583581
gsSPVertex(fire_bubble_1_dl_mesh_vtx_7 + 0, 16, 0),
584582
gsSP1Triangle(0, 1, 2, 0),
585-
gsSP1Triangle(1, 0, 3, 0),
586-
gsSP1Triangle(3, 0, 4, 0),
587-
gsSP1Triangle(5, 6, 7, 0),
588-
gsSP1Triangle(6, 5, 8, 0),
589-
gsSP1Triangle(9, 10, 11, 0),
590-
gsSP1Triangle(10, 9, 12, 0),
591-
gsSP1Triangle(13, 14, 15, 0),
592-
gsSPVertex(fire_bubble_1_dl_mesh_vtx_7 + 16, 4, 0),
583+
gsSP1Triangle(2, 3, 0, 0),
584+
gsSP1Triangle(4, 5, 6, 0),
585+
gsSP1Triangle(4, 6, 7, 0),
586+
gsSP1Triangle(8, 9, 10, 0),
587+
gsSP1Triangle(8, 10, 11, 0),
588+
gsSP1Triangle(12, 13, 14, 0),
589+
gsSP1Triangle(12, 14, 15, 0),
590+
gsSPEndDisplayList(),
591+
};
592+
593+
Vtx fire_bubble_1_dl_mesh_vtx_8[16] = {
594+
{{ {768, 0, -4405}, 0, {4624, 976}, {127, 0, 0, 255} }},
595+
{{ {768, 307, -2997}, 0, {-16, -16}, {127, 0, 0, 255} }},
596+
{{ {768, 0, -2997}, 0, {-16, 976}, {127, 0, 0, 255} }},
597+
{{ {768, 307, -4405}, 0, {4624, -16}, {127, 0, 0, 255} }},
598+
{{ {-767, 0, -4405}, 0, {-16, 976}, {0, 0, 129, 255} }},
599+
{{ {768, 307, -4405}, 0, {5072, -16}, {0, 0, 129, 255} }},
600+
{{ {768, 0, -4405}, 0, {5072, 976}, {0, 0, 129, 255} }},
601+
{{ {-767, 307, -4405}, 0, {-16, -16}, {0, 0, 129, 255} }},
602+
{{ {768, 0, -2997}, 0, {5072, 976}, {0, 0, 127, 255} }},
603+
{{ {-767, 307, -2997}, 0, {-16, -16}, {0, 0, 127, 255} }},
604+
{{ {-767, 0, -2997}, 0, {-16, 976}, {0, 0, 127, 255} }},
605+
{{ {768, 307, -2997}, 0, {5072, -16}, {0, 0, 127, 255} }},
606+
{{ {-767, 0, -2997}, 0, {-16, 976}, {129, 0, 0, 255} }},
607+
{{ {-767, 307, -2997}, 0, {-16, -16}, {129, 0, 0, 255} }},
608+
{{ {-767, 307, -4405}, 0, {4624, -16}, {129, 0, 0, 255} }},
609+
{{ {-767, 0, -4405}, 0, {4624, 976}, {129, 0, 0, 255} }},
610+
};
611+
612+
Gfx fire_bubble_1_dl_mesh_tri_8[] = {
613+
gsSPVertex(fire_bubble_1_dl_mesh_vtx_8 + 0, 16, 0),
593614
gsSP1Triangle(0, 1, 2, 0),
594-
gsSP1Triangle(2, 1, 3, 0),
615+
gsSP1Triangle(0, 3, 1, 0),
616+
gsSP1Triangle(4, 5, 6, 0),
617+
gsSP1Triangle(4, 7, 5, 0),
618+
gsSP1Triangle(8, 9, 10, 0),
619+
gsSP1Triangle(8, 11, 9, 0),
620+
gsSP1Triangle(12, 13, 14, 0),
621+
gsSP1Triangle(12, 14, 15, 0),
595622
gsSPEndDisplayList(),
596623
};
597624

@@ -609,6 +636,7 @@ const Gfx fire_bubble_1_dl_mesh[] = {
609636
gsSPDisplayList(mat_fire_bubble_WallMaterial),
610637
gsSPDisplayList(fire_bubble_1_dl_mesh_tri_5),
611638
gsSPDisplayList(fire_bubble_1_dl_mesh_tri_7),
639+
gsSPDisplayList(fire_bubble_1_dl_mesh_tri_8),
612640
gsSPDisplayList(mat_fire_bubble_GrayGravelMaterial),
613641
gsSPDisplayList(fire_bubble_1_dl_mesh_tri_6),
614642
gsDPPipeSync(),

0 commit comments

Comments
 (0)