Skip to content

Commit

Permalink
release version
Browse files Browse the repository at this point in the history
  • Loading branch information
@Reonu
Reonu committed Mar 13, 2021
1 parent e266cb8 commit 3f9a249
Show file tree
Hide file tree
Showing 11 changed files with 547 additions and 121 deletions.
2 changes: 1 addition & 1 deletion levels/bob/script.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ const LevelScript level_bob_entry[] = {
WARP_NODE(0x0A, LEVEL_BOB, 0x01, 0x0A, WARP_NO_CHECKPOINT),
WARP_NODE(0xF0, LEVEL_ENDING, 0x01, 0x00, WARP_NO_CHECKPOINT),
WARP_NODE(0xFB, LEVEL_BOB, 0x02, 0x0A, WARP_NO_CHECKPOINT),
OBJECT(MODEL_LUIGINPCBYE, 172, 0, 238, 0, 0, 0, 0x00100000, bhvLuigiNpcBye),
OBJECT(MODEL_LUIGINPCBYE, 172, 0, 238, 0, 180, 0, 0x00100000, bhvLuigiNpcBye),
OBJECT(MODEL_NONE, -5, 0, -68, 0, 0, 0, 0x000A0000, bhvInstantActiveWarp),
OBJECT(MODEL_WOODEN_SIGNPOST, 15, 0, 99, 0, 180, 0, 0x00040000, bhvMessagePanel),
TERRAIN(bob_area_3_collision),
Expand Down
44 changes: 24 additions & 20 deletions levels/ccm/area_5/collision.inc.c
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const Collision ccm_area_5_collision[] = {
COL_INIT(),
COL_VERTEX_INIT(271),
COL_VERTEX_INIT(273),
COL_VERTEX(394, 0, 9538),
COL_VERTEX(1084, 0, 9538),
COL_VERTEX(1084, 345, 8612),
Expand Down Expand Up @@ -40,7 +40,7 @@ const Collision ccm_area_5_collision[] = {
COL_VERTEX(-559, 2312, 7448),
COL_VERTEX(-296, 2455, 7448),
COL_VERTEX(-296, 2943, 7448),
COL_VERTEX(-559, 2943, 7448),
COL_VERTEX(-559, 5606, 7448),
COL_VERTEX(-987, 345, 8612),
COL_VERTEX(-296, 345, 8612),
COL_VERTEX(-296, 345, 7448),
Expand Down Expand Up @@ -94,7 +94,7 @@ const Collision ccm_area_5_collision[] = {
COL_VERTEX(-400, 2943, 10126),
COL_VERTEX(440, 2943, 10126),
COL_VERTEX(1049, 2943, 10126),
COL_VERTEX(-559, 2943, 8139),
COL_VERTEX(-559, 5606, 8139),
COL_VERTEX(-559, 2312, 8139),
COL_VERTEX(-559, 1056, 7448),
COL_VERTEX(-559, 1056, 8139),
Expand Down Expand Up @@ -248,8 +248,8 @@ const Collision ccm_area_5_collision[] = {
COL_VERTEX(1049, 7880, 15226),
COL_VERTEX(-400, 7880, 15071),
COL_VERTEX(-1014, 7880, 15071),
COL_VERTEX(-1092, 2943, 7448),
COL_VERTEX(-1092, 2943, 8139),
COL_VERTEX(-1092, 5606, 7448),
COL_VERTEX(-1092, 5606, 8139),
COL_VERTEX(-1096, 6233, 13978),
COL_VERTEX(-1096, 6433, 13978),
COL_VERTEX(-1096, 6433, 11688),
Expand All @@ -258,6 +258,8 @@ const Collision ccm_area_5_collision[] = {
COL_VERTEX(1005, 6233, 11688),
COL_VERTEX(1005, 6433, 13978),
COL_VERTEX(1005, 6233, 13978),
COL_VERTEX(-1092, 2914, 8139),
COL_VERTEX(-559, 2914, 8139),
COL_VERTEX(-396, 3430, 10098),
COL_VERTEX(444, 3430, 10098),
COL_VERTEX(-400, 3480, 10951),
Expand All @@ -272,7 +274,7 @@ const Collision ccm_area_5_collision[] = {
COL_VERTEX(440, 5529, 13985),
COL_VERTEX(440, 5479, 13985),
COL_VERTEX(-400, 5479, 13985),
COL_TRI_INIT(SURFACE_DEFAULT, 435),
COL_TRI_INIT(SURFACE_DEFAULT, 437),
COL_TRI(0, 1, 2),
COL_TRI(0, 2, 3),
COL_TRI(3, 2, 4),
Expand Down Expand Up @@ -453,14 +455,14 @@ const Collision ccm_area_5_collision[] = {
COL_TRI(120, 78, 77),
COL_TRI(70, 121, 119),
COL_TRI(70, 119, 71),
COL_TRI(76, 39, 120),
COL_TRI(76, 120, 77),
COL_TRI(76, 39, 77),
COL_TRI(39, 120, 77),
COL_TRI(9, 8, 72),
COL_TRI(9, 72, 73),
COL_TRI(121, 75, 78),
COL_TRI(121, 78, 119),
COL_TRI(39, 38, 74),
COL_TRI(39, 74, 120),
COL_TRI(39, 38, 120),
COL_TRI(38, 74, 120),
COL_TRI(88, 87, 122),
COL_TRI(88, 122, 123),
COL_TRI(87, 89, 124),
Expand Down Expand Up @@ -708,22 +710,24 @@ const Collision ccm_area_5_collision[] = {
COL_TRI(256, 250, 249),
COL_TRI(252, 254, 256),
COL_TRI(252, 256, 249),
COL_TRI(93, 248, 257),
COL_TRI(93, 257, 258),
COL_TRI_INIT(SURFACE_INSTANT_WARP_1B, 2),
COL_TRI(253, 251, 250),
COL_TRI(253, 250, 255),
COL_TRI_INIT(SURFACE_HANGABLE, 12),
COL_TRI(158, 257, 258),
COL_TRI(158, 258, 165),
COL_TRI(259, 260, 261),
COL_TRI(259, 261, 262),
COL_TRI(260, 259, 263),
COL_TRI(260, 263, 264),
COL_TRI(158, 165, 265),
COL_TRI(158, 265, 266),
COL_TRI(264, 263, 267),
COL_TRI(264, 267, 268),
COL_TRI(158, 259, 260),
COL_TRI(158, 260, 165),
COL_TRI(261, 262, 263),
COL_TRI(261, 263, 264),
COL_TRI(262, 261, 265),
COL_TRI(262, 265, 266),
COL_TRI(158, 165, 267),
COL_TRI(158, 267, 268),
COL_TRI(266, 265, 269),
COL_TRI(266, 269, 270),
COL_TRI(268, 267, 271),
COL_TRI(268, 271, 272),
COL_TRI_STOP(),
COL_END()
};
178 changes: 151 additions & 27 deletions levels/ccm/area_7/collision.inc.c
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const Collision ccm_area_7_collision[] = {
COL_INIT(),
COL_VERTEX_INIT(62),
COL_VERTEX_INIT(120),
COL_VERTEX(1016, -392, -12548),
COL_VERTEX(-1011, -392, -12548),
COL_VERTEX(-1011, -21, -7452),
Expand Down Expand Up @@ -47,6 +47,42 @@ const Collision ccm_area_7_collision[] = {
COL_VERTEX(-343, 3811, -3131),
COL_VERTEX(-343, 3811, -2757),
COL_VERTEX(-343, 3087, -2757),
COL_VERTEX(-3698, -392, -12548),
COL_VERTEX(-1671, -392, -12548),
COL_VERTEX(-1675, -1956, -12548),
COL_VERTEX(-3698, -1956, -12548),
COL_VERTEX(-2962, 546, -4597),
COL_VERTEX(-2962, 1270, -4597),
COL_VERTEX(-2962, 1270, -4971),
COL_VERTEX(-2962, 546, -4971),
COL_VERTEX(-2263, 546, -4971),
COL_VERTEX(-2263, 1270, -4971),
COL_VERTEX(-2263, 1270, -4597),
COL_VERTEX(-2263, 546, -4597),
COL_VERTEX(-3272, 1530, -3801),
COL_VERTEX(-3272, 2254, -3801),
COL_VERTEX(-3272, 2254, -4175),
COL_VERTEX(-3272, 1530, -4175),
COL_VERTEX(-2573, 1530, -4175),
COL_VERTEX(-2573, 2254, -4175),
COL_VERTEX(-2573, 2254, -3801),
COL_VERTEX(-2573, 1530, -3801),
COL_VERTEX(-2562, 2392, -3169),
COL_VERTEX(-2562, 3117, -3169),
COL_VERTEX(-2562, 3117, -3544),
COL_VERTEX(-2562, 2392, -3544),
COL_VERTEX(-1863, 2392, -3544),
COL_VERTEX(-1863, 3117, -3544),
COL_VERTEX(-1863, 3117, -3169),
COL_VERTEX(-1863, 2392, -3169),
COL_VERTEX(-3728, 3087, -2757),
COL_VERTEX(-3728, 3811, -2757),
COL_VERTEX(-3728, 3811, -3131),
COL_VERTEX(-3728, 3087, -3131),
COL_VERTEX(-3029, 3087, -3131),
COL_VERTEX(-3029, 3811, -3131),
COL_VERTEX(-3029, 3811, -2757),
COL_VERTEX(-3029, 3087, -2757),
COL_VERTEX(1014, 4251, -3595),
COL_VERTEX(1014, 2473, -5062),
COL_VERTEX(1014, 5452, -2810),
Expand All @@ -59,11 +95,33 @@ const Collision ccm_area_7_collision[] = {
COL_VERTEX(-1011, 5452, -2810),
COL_VERTEX(-1011, 2374, -5062),
COL_VERTEX(-1011, 5452, -1436),
COL_VERTEX(-3698, -21, -7452),
COL_VERTEX(-1672, -3, -7452),
COL_VERTEX(-3698, 874, -5062),
COL_VERTEX(-1672, 892, -5062),
COL_VERTEX(-3698, 2651, -3595),
COL_VERTEX(-1672, 2670, -3595),
COL_VERTEX(-3698, 3952, -2810),
COL_VERTEX(-1672, 3970, -2810),
COL_VERTEX(-3698, 3952, -1436),
COL_VERTEX(-1672, 3970, -1436),
COL_VERTEX(-1672, 4251, -3595),
COL_VERTEX(-1672, 2473, -5062),
COL_VERTEX(-1672, 5452, -2810),
COL_VERTEX(-1672, 1578, -7452),
COL_VERTEX(-1672, 5452, -1436),
COL_VERTEX(-1671, 1581, -12548),
COL_VERTEX(-3698, 1500, -12548),
COL_VERTEX(-3698, 1478, -7452),
COL_VERTEX(-3698, 4151, -3595),
COL_VERTEX(-3698, 5452, -2810),
COL_VERTEX(-3698, 2374, -5062),
COL_VERTEX(-3698, 5452, -1436),
COL_VERTEX(-1205, -1956, -12548),
COL_VERTEX(1205, -1956, -12548),
COL_VERTEX(1205, -1956, -13946),
COL_VERTEX(-1205, -1956, -13946),
COL_TRI_INIT(SURFACE_NOT_SLIPPERY, 28),
COL_TRI_INIT(SURFACE_NOT_SLIPPERY, 46),
COL_TRI(0, 1, 2),
COL_TRI(0, 2, 3),
COL_TRI(1, 0, 4),
Expand Down Expand Up @@ -92,27 +150,45 @@ const Collision ccm_area_7_collision[] = {
COL_TRI(38, 40, 41),
COL_TRI(42, 43, 44),
COL_TRI(42, 44, 45),
COL_TRI_INIT(SURFACE_DEFAULT, 38),
COL_TRI(7, 9, 46),
COL_TRI(7, 46, 47),
COL_TRI(9, 11, 48),
COL_TRI(9, 48, 46),
COL_TRI(3, 7, 47),
COL_TRI(3, 47, 49),
COL_TRI(11, 13, 50),
COL_TRI(11, 50, 48),
COL_TRI(0, 3, 49),
COL_TRI(0, 49, 51),
COL_TRI(2, 1, 52),
COL_TRI(2, 52, 53),
COL_TRI(10, 8, 54),
COL_TRI(10, 54, 55),
COL_TRI(6, 2, 53),
COL_TRI(6, 53, 56),
COL_TRI(12, 10, 55),
COL_TRI(12, 55, 57),
COL_TRI(8, 6, 56),
COL_TRI(8, 56, 54),
COL_TRI(46, 47, 48),
COL_TRI(46, 48, 49),
COL_TRI(50, 51, 52),
COL_TRI(50, 52, 53),
COL_TRI(54, 55, 56),
COL_TRI(54, 56, 57),
COL_TRI(58, 59, 60),
COL_TRI(58, 60, 61),
COL_TRI(62, 63, 64),
COL_TRI(62, 64, 65),
COL_TRI(66, 67, 68),
COL_TRI(66, 68, 69),
COL_TRI(70, 71, 72),
COL_TRI(70, 72, 73),
COL_TRI(74, 75, 76),
COL_TRI(74, 76, 77),
COL_TRI(78, 79, 80),
COL_TRI(78, 80, 81),
COL_TRI_INIT(SURFACE_DEFAULT, 86),
COL_TRI(7, 9, 82),
COL_TRI(7, 82, 83),
COL_TRI(9, 11, 84),
COL_TRI(9, 84, 82),
COL_TRI(3, 7, 83),
COL_TRI(3, 83, 85),
COL_TRI(11, 13, 86),
COL_TRI(11, 86, 84),
COL_TRI(0, 3, 85),
COL_TRI(0, 85, 87),
COL_TRI(2, 1, 88),
COL_TRI(2, 88, 89),
COL_TRI(10, 8, 90),
COL_TRI(10, 90, 91),
COL_TRI(6, 2, 89),
COL_TRI(6, 89, 92),
COL_TRI(12, 10, 91),
COL_TRI(12, 91, 93),
COL_TRI(8, 6, 92),
COL_TRI(8, 92, 90),
COL_TRI(17, 16, 19),
COL_TRI(17, 19, 18),
COL_TRI(25, 24, 27),
Expand All @@ -129,11 +205,59 @@ const Collision ccm_area_7_collision[] = {
COL_TRI(41, 43, 42),
COL_TRI(43, 40, 39),
COL_TRI(43, 39, 44),
COL_TRI(12, 57, 50),
COL_TRI(12, 50, 13),
COL_TRI(12, 93, 86),
COL_TRI(12, 86, 13),
COL_TRI(47, 46, 94),
COL_TRI(47, 94, 95),
COL_TRI(95, 94, 96),
COL_TRI(95, 96, 97),
COL_TRI(97, 96, 98),
COL_TRI(97, 98, 99),
COL_TRI(99, 98, 100),
COL_TRI(99, 100, 101),
COL_TRI(101, 100, 102),
COL_TRI(101, 102, 103),
COL_TRI(97, 99, 104),
COL_TRI(97, 104, 105),
COL_TRI(99, 101, 106),
COL_TRI(99, 106, 104),
COL_TRI(95, 97, 105),
COL_TRI(95, 105, 107),
COL_TRI(101, 103, 108),
COL_TRI(101, 108, 106),
COL_TRI(47, 95, 107),
COL_TRI(47, 107, 109),
COL_TRI(94, 46, 110),
COL_TRI(94, 110, 111),
COL_TRI(100, 98, 112),
COL_TRI(100, 112, 113),
COL_TRI(96, 94, 111),
COL_TRI(96, 111, 114),
COL_TRI(102, 100, 113),
COL_TRI(102, 113, 115),
COL_TRI(98, 96, 114),
COL_TRI(98, 114, 112),
COL_TRI(53, 52, 55),
COL_TRI(53, 55, 54),
COL_TRI(61, 60, 63),
COL_TRI(61, 63, 62),
COL_TRI(55, 52, 51),
COL_TRI(55, 51, 56),
COL_TRI(63, 60, 59),
COL_TRI(63, 59, 64),
COL_TRI(69, 68, 71),
COL_TRI(69, 71, 70),
COL_TRI(71, 68, 67),
COL_TRI(71, 67, 72),
COL_TRI(77, 76, 79),
COL_TRI(77, 79, 78),
COL_TRI(79, 76, 75),
COL_TRI(79, 75, 80),
COL_TRI(102, 115, 108),
COL_TRI(102, 108, 103),
COL_TRI_INIT(SURFACE_DEATH_PLANE, 2),
COL_TRI(58, 59, 60),
COL_TRI(58, 60, 61),
COL_TRI(116, 117, 118),
COL_TRI(116, 118, 119),
COL_TRI_STOP(),
COL_END()
};
1 change: 1 addition & 0 deletions levels/ccm/area_7/geo.inc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ const GeoLayout ccm_area_7_geo[] = {
GEO_NODE_START(),
GEO_OPEN_NODE(),
GEO_TRANSLATE_NODE_WITH_DL(1, 0, 0, -10000, ccm_dl_Plane_008_mesh_layer_1),
GEO_TRANSLATE_NODE_WITH_DL(1, -2686, 0, -10000, ccm_dl_Plane_012_mesh_layer_1),
GEO_CLOSE_NODE(),
GEO_RETURN(),
};
Expand Down
15 changes: 13 additions & 2 deletions levels/ccm/header.inc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ extern Lights1 ccm_dl_RockVertex_layer1_area6_lights;
extern Lights1 ccm_dl_Slide_layer1_area6_lights;
extern Lights1 ccm_dl_RockWarp_layer1_area6_lights;
extern Lights1 ccm_dl_Snow_002_layer1_area7_lights;
extern Lights1 ccm_dl_RockVertex_layer1_area7_lights;
extern u8 ccm_dl_SUPER_MARIO_64_E8E37186_0_2_all_ci8[];
extern u8 ccm_dl_SUPER_MARIO_64_E8E37186_0_2_all_ci8_pal_rgba16[];
extern u8 ccm_dl_SUPER_MARIO_64_E8E37186_0_2_all_ci8_copy[];
Expand Down Expand Up @@ -136,9 +137,9 @@ extern Vtx ccm_dl_Mountains_003_mesh_layer_1_vtx_cull[8];
extern Vtx ccm_dl_Mountains_003_mesh_layer_1_vtx_0[20];
extern Gfx ccm_dl_Mountains_003_mesh_layer_1_tri_0[];
extern Vtx ccm_dl_Plane_004_mesh_layer_1_vtx_cull[8];
extern Vtx ccm_dl_Plane_004_mesh_layer_1_vtx_0[318];
extern Vtx ccm_dl_Plane_004_mesh_layer_1_vtx_0[306];
extern Gfx ccm_dl_Plane_004_mesh_layer_1_tri_0[];
extern Vtx ccm_dl_Plane_004_mesh_layer_1_vtx_1[115];
extern Vtx ccm_dl_Plane_004_mesh_layer_1_vtx_1[151];
extern Gfx ccm_dl_Plane_004_mesh_layer_1_tri_1[];
extern Vtx ccm_dl_Plane_004_mesh_layer_1_vtx_2[4];
extern Gfx ccm_dl_Plane_004_mesh_layer_1_tri_2[];
Expand Down Expand Up @@ -184,6 +185,13 @@ extern Vtx ccm_dl_Plane_008_mesh_layer_1_vtx_0[48];
extern Gfx ccm_dl_Plane_008_mesh_layer_1_tri_0[];
extern Vtx ccm_dl_Plane_008_mesh_layer_1_vtx_1[52];
extern Gfx ccm_dl_Plane_008_mesh_layer_1_tri_1[];
extern Vtx ccm_dl_Plane_012_mesh_layer_1_vtx_cull[8];
extern Vtx ccm_dl_Plane_012_mesh_layer_1_vtx_0[42];
extern Gfx ccm_dl_Plane_012_mesh_layer_1_tri_0[];
extern Vtx ccm_dl_Plane_012_mesh_layer_1_vtx_1[36];
extern Gfx ccm_dl_Plane_012_mesh_layer_1_tri_1[];
extern Vtx ccm_dl_Plane_012_mesh_layer_1_vtx_2[24];
extern Gfx ccm_dl_Plane_012_mesh_layer_1_tri_2[];
extern Gfx mat_ccm_dl_Snow_layer1_area1[];
extern Gfx mat_revert_ccm_dl_Snow_layer1_area1[];
extern Gfx mat_ccm_dl_snowVertexColor[];
Expand Down Expand Up @@ -227,6 +235,8 @@ extern Gfx mat_ccm_dl_RockWarp_layer1_area6[];
extern Gfx mat_revert_ccm_dl_RockWarp_layer1_area6[];
extern Gfx mat_ccm_dl_Snow_002_layer1_area7[];
extern Gfx mat_revert_ccm_dl_Snow_002_layer1_area7[];
extern Gfx mat_ccm_dl_RockVertex_layer1_area7[];
extern Gfx mat_revert_ccm_dl_RockVertex_layer1_area7[];
extern Gfx ccm_dl_Mountains_mesh_layer_1[];
extern Gfx ccm_dl_Mountains_001_mesh_layer_1[];
extern Gfx ccm_dl_Mountains_002_mesh_layer_1[];
Expand Down Expand Up @@ -257,4 +267,5 @@ extern Gfx ccm_dl_Mountain_007_mesh_layer_1[];
extern Gfx ccm_dl_Mountain_008_mesh_layer_1[];
extern Gfx ccm_dl_Plane_007_mesh_layer_1[];
extern Gfx ccm_dl_Plane_008_mesh_layer_1[];
extern Gfx ccm_dl_Plane_012_mesh_layer_1[];
extern Gfx ccm_dl_material_revert_render_settings[];
Loading

0 comments on commit 3f9a249

Please sign in to comment.