Skip to content

Commit 4453bbf

Browse files
stalechilibeansstalechilibeans
authored
Merge pull request #22 from penguinlambz/test
LLL collision fixes + placement and uv fixes
2 parents 8d15c80 + d03c052 commit 4453bbf

4 files changed

Lines changed: 704 additions & 705 deletions

File tree

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

Lines changed: 53 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
// Data
22
static const Vtx fire_bubble_lava_plane_mesh_vtx_0[9] = {
33
{{ {-8176, 0, 0}, 0, {320, -13416}, {0, 127, 0, 255} }},
4-
{{ {0, 0, -8175}, 0, {15300, -28395}, {0, 127, 0, 255} }},
5-
{{ {-8176, 0, -8175}, 0, {321, -28395}, {0, 127, 0, 255} }},
4+
{{ {0, 0, -8175}, 0, {15300, -29242}, {0, 127, 0, 255} }},
5+
{{ {-8176, 0, -8175}, 0, {321, -29242}, {0, 127, 0, 255} }},
66
{{ {0, 0, 0}, 0, {15300, -13415}, {0, 127, 0, 255} }},
77
{{ {-8176, 0, 8176}, 0, {320, 1564}, {0, 127, 0, 255} }},
88
{{ {0, 0, 8176}, 0, {15300, 1564}, {0, 127, 0, 255} }},
99
{{ {8175, 0, 1}, 0, {30280, -13415}, {0, 127, 0, 255} }},
1010
{{ {8175, 0, 8176}, 0, {30280, 1564}, {0, 127, 0, 255} }},
11-
{{ {8175, 0, -8175}, 0, {30280, -28395}, {0, 127, 0, 255} }},
11+
{{ {8175, 0, -8175}, 0, {30280, -29242}, {0, 127, 0, 255} }},
1212
};
1313

1414
static const Gfx fire_bubble_lava_plane_mesh_tri_0[] = {
@@ -101,12 +101,12 @@ 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-
{{ {-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} }},
104+
{{ {-511, 207, -6461}, 0, {2664, -1453}, {0, 127, 0, 255} }},
105+
{{ {512, 207, -5437}, 0, {-1462, 2673}, {0, 127, 0, 255} }},
106+
{{ {512, 207, -6461}, 0, {2669, 2673}, {0, 127, 0, 255} }},
107+
{{ {-511, 207, -6461}, 0, {2665, -1453}, {0, 127, 0, 255} }},
108+
{{ {-511, 207, -5437}, 0, {-1457, -1453}, {0, 127, 0, 255} }},
109+
{{ {512, 207, -5437}, 0, {-1457, 2672}, {0, 127, 0, 255} }},
110110
};
111111

112112
static const Gfx fire_bubble_1_dl_mesh_tri_3[] = {
@@ -533,10 +533,10 @@ static const Gfx fire_bubble_1_dl_mesh_tri_5[] = {
533533
};
534534

535535
static const Vtx fire_bubble_1_dl_mesh_vtx_6[4] = {
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} }},
536+
{{ {-767, 307, -2877}, 0, {-3310, 736}, {0, 127, 0, 255} }},
537+
{{ {768, 307, -4285}, 0, {1010, -3225}, {0, 127, 0, 255} }},
538+
{{ {-767, 307, -4285}, 0, {-3310, -3225}, {0, 127, 0, 255} }},
539+
{{ {768, 307, -2877}, 0, {1010, 736}, {0, 127, 0, 255} }},
540540
};
541541

542542
static const Gfx fire_bubble_1_dl_mesh_tri_6[] = {
@@ -558,65 +558,58 @@ const Gfx fire_bubble_lava_plane_mesh[] = {
558558
gsSPEndDisplayList(),
559559
};
560560

561-
static const Vtx fire_bubble_1_dl_mesh_vtx_7[20] = {
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} }},
561+
static const Vtx fire_bubble_1_dl_mesh_vtx_7[32] = {
562+
{{ {768, 0, -4285}, 0, {4624, 976}, {127, 0, 0, 255} }},
563+
{{ {768, 307, -2877}, 0, {-16, -16}, {127, 0, 0, 255} }},
564+
{{ {768, 0, -2877}, 0, {-16, 976}, {127, 0, 0, 255} }},
565+
{{ {768, 307, -4285}, 0, {4624, -16}, {127, 0, 0, 255} }},
566+
{{ {-767, 0, -4285}, 0, {-16, 976}, {0, 0, 129, 255} }},
567+
{{ {768, 307, -4285}, 0, {5072, -16}, {0, 0, 129, 255} }},
568+
{{ {768, 0, -4285}, 0, {5072, 976}, {0, 0, 129, 255} }},
569+
{{ {-767, 307, -4285}, 0, {-16, -16}, {0, 0, 129, 255} }},
570+
{{ {768, 0, -2877}, 0, {5072, 976}, {0, 0, 127, 255} }},
571+
{{ {-767, 307, -2877}, 0, {-16, -16}, {0, 0, 127, 255} }},
572+
{{ {-767, 0, -2877}, 0, {-16, 976}, {0, 0, 127, 255} }},
573+
{{ {768, 307, -2877}, 0, {5072, -16}, {0, 0, 127, 255} }},
574+
{{ {-767, 0, -2877}, 0, {-16, 976}, {129, 0, 0, 255} }},
575+
{{ {-767, 307, -2877}, 0, {-16, -16}, {129, 0, 0, 255} }},
576+
{{ {-767, 307, -4285}, 0, {4624, -16}, {129, 0, 0, 255} }},
577+
{{ {-767, 0, -4285}, 0, {4624, 976}, {129, 0, 0, 255} }},
578+
{{ {-511, 0, -5437}, 0, {-1544, 854}, {0, 0, 127, 255} }},
579+
{{ {512, 0, -5437}, 0, {3116, 854}, {0, 0, 127, 255} }},
580+
{{ {512, 207, -5437}, 0, {3116, -14}, {0, 0, 127, 255} }},
581+
{{ {-511, 207, -5437}, 0, {-1544, -14}, {0, 0, 127, 255} }},
582+
{{ {512, 207, -6461}, 0, {3118, -14}, {127, 0, 0, 255} }},
583+
{{ {512, 207, -5437}, 0, {-1546, -14}, {127, 0, 0, 255} }},
584+
{{ {512, 0, -5437}, 0, {-1546, 854}, {127, 0, 0, 255} }},
585+
{{ {512, 0, -6461}, 0, {3118, 854}, {127, 0, 0, 255} }},
586+
{{ {-511, 207, -6461}, 0, {-1544, -14}, {0, 0, 129, 255} }},
587+
{{ {512, 207, -6461}, 0, {3116, -14}, {0, 0, 129, 255} }},
588+
{{ {512, 0, -6461}, 0, {3116, 854}, {0, 0, 129, 255} }},
589+
{{ {-511, 0, -6461}, 0, {-1544, 854}, {0, 0, 129, 255} }},
590+
{{ {-511, 207, -5437}, 0, {-1546, -14}, {129, 0, 0, 255} }},
591+
{{ {-511, 207, -6461}, 0, {3118, -14}, {129, 0, 0, 255} }},
592+
{{ {-511, 0, -6461}, 0, {3118, 854}, {129, 0, 0, 255} }},
593+
{{ {-511, 0, -5437}, 0, {-1546, 854}, {129, 0, 0, 255} }},
578594
};
579595

580596
static const Gfx fire_bubble_1_dl_mesh_tri_7[] = {
581597
gsSPVertex(fire_bubble_1_dl_mesh_vtx_7 + 0, 16, 0),
582598
gsSP1Triangle(0, 1, 2, 0),
583-
gsSP1Triangle(2, 3, 0, 0),
599+
gsSP1Triangle(0, 3, 1, 0),
584600
gsSP1Triangle(4, 5, 6, 0),
585-
gsSP1Triangle(4, 6, 7, 0),
601+
gsSP1Triangle(4, 7, 5, 0),
586602
gsSP1Triangle(8, 9, 10, 0),
587-
gsSP1Triangle(8, 10, 11, 0),
603+
gsSP1Triangle(8, 11, 9, 0),
588604
gsSP1Triangle(12, 13, 14, 0),
589605
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),
606+
gsSPVertex(fire_bubble_1_dl_mesh_vtx_7 + 16, 16, 0),
614607
gsSP1Triangle(0, 1, 2, 0),
615-
gsSP1Triangle(0, 3, 1, 0),
608+
gsSP1Triangle(2, 3, 0, 0),
616609
gsSP1Triangle(4, 5, 6, 0),
617-
gsSP1Triangle(4, 7, 5, 0),
610+
gsSP1Triangle(4, 6, 7, 0),
618611
gsSP1Triangle(8, 9, 10, 0),
619-
gsSP1Triangle(8, 11, 9, 0),
612+
gsSP1Triangle(8, 10, 11, 0),
620613
gsSP1Triangle(12, 13, 14, 0),
621614
gsSP1Triangle(12, 14, 15, 0),
622615
gsSPEndDisplayList(),
@@ -636,7 +629,6 @@ const Gfx fire_bubble_1_dl_mesh[] = {
636629
gsSPDisplayList(mat_fire_bubble_WallMaterial),
637630
gsSPDisplayList(fire_bubble_1_dl_mesh_tri_5),
638631
gsSPDisplayList(fire_bubble_1_dl_mesh_tri_7),
639-
gsSPDisplayList(fire_bubble_1_dl_mesh_tri_8),
640632
gsSPDisplayList(mat_fire_bubble_GrayGravelMaterial),
641633
gsSPDisplayList(fire_bubble_1_dl_mesh_tri_6),
642634
gsDPPipeSync(),

0 commit comments

Comments
 (0)