Skip to content

Commit

Permalink
level changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@Reonu
Reonu committed Mar 28, 2021
1 parent af5e461 commit 098b09e
Show file tree
Hide file tree
Showing 4 changed files with 83 additions and 74 deletions.
116 changes: 58 additions & 58 deletions levels/ccm/area_7/collision.inc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,64 +83,64 @@ const Collision ccm_area_7_collision[] = {
COL_VERTEX(837, 3705, -3196),
COL_VERTEX(837, 3705, -2821),
COL_VERTEX(837, 2981, -2821),
COL_VERTEX(-1671, -392, -12548),
COL_VERTEX(-3698, -392, -12548),
COL_VERTEX(-3698, -21, -7452),
COL_VERTEX(-1672, -3, -7452),
COL_VERTEX(-1675, -1956, -12548),
COL_VERTEX(-3698, -1956, -12548),
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(-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(-5071, -392, -12548),
COL_VERTEX(-7098, -392, -12548),
COL_VERTEX(-7098, -21, -7452),
COL_VERTEX(-5072, -3, -7452),
COL_VERTEX(-5075, -1956, -12548),
COL_VERTEX(-7098, -1956, -12548),
COL_VERTEX(-7098, 874, -5062),
COL_VERTEX(-5072, 892, -5062),
COL_VERTEX(-7098, 2651, -3595),
COL_VERTEX(-5072, 2670, -3595),
COL_VERTEX(-7098, 3952, -2810),
COL_VERTEX(-5072, 3970, -2810),
COL_VERTEX(-7098, 3952, -1436),
COL_VERTEX(-5072, 3970, -1436),
COL_VERTEX(-5072, 4251, -3595),
COL_VERTEX(-5072, 2473, -5062),
COL_VERTEX(-5072, 5452, -2810),
COL_VERTEX(-5072, 1578, -7452),
COL_VERTEX(-5072, 5452, -1436),
COL_VERTEX(-5071, 1581, -12548),
COL_VERTEX(-7098, 1500, -12548),
COL_VERTEX(-7098, 1478, -7452),
COL_VERTEX(-7098, 4151, -3595),
COL_VERTEX(-7098, 5452, -2810),
COL_VERTEX(-7098, 2374, -5062),
COL_VERTEX(-7098, 5452, -1436),
COL_VERTEX(-6362, 546, -4597),
COL_VERTEX(-6362, 1270, -4597),
COL_VERTEX(-6362, 1270, -4971),
COL_VERTEX(-6362, 546, -4971),
COL_VERTEX(-5663, 546, -4971),
COL_VERTEX(-5663, 1270, -4971),
COL_VERTEX(-5663, 1270, -4597),
COL_VERTEX(-5663, 546, -4597),
COL_VERTEX(-6672, 1530, -3801),
COL_VERTEX(-6672, 2254, -3801),
COL_VERTEX(-6672, 2254, -4175),
COL_VERTEX(-6672, 1530, -4175),
COL_VERTEX(-5973, 1530, -4175),
COL_VERTEX(-5973, 2254, -4175),
COL_VERTEX(-5973, 2254, -3801),
COL_VERTEX(-5973, 1530, -3801),
COL_VERTEX(-5962, 2392, -3169),
COL_VERTEX(-5962, 3117, -3169),
COL_VERTEX(-5962, 3117, -3544),
COL_VERTEX(-5962, 2392, -3544),
COL_VERTEX(-5263, 2392, -3544),
COL_VERTEX(-5263, 3117, -3544),
COL_VERTEX(-5263, 3117, -3169),
COL_VERTEX(-5263, 2392, -3169),
COL_VERTEX(-7128, 3087, -2757),
COL_VERTEX(-7128, 3811, -2757),
COL_VERTEX(-7128, 3811, -3131),
COL_VERTEX(-7128, 3087, -3131),
COL_VERTEX(-6429, 3087, -3131),
COL_VERTEX(-6429, 3811, -3131),
COL_VERTEX(-6429, 3811, -2757),
COL_VERTEX(-6429, 3087, -2757),
COL_VERTEX(1014, 4251, -3595),
COL_VERTEX(1014, 2473, -5062),
COL_VERTEX(1014, 5452, -2810),
Expand Down
2 changes: 1 addition & 1 deletion levels/ccm/area_7/geo.inc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const GeoLayout ccm_area_7_geo[] = {
const GeoLayout ccm_dl_zzz_geo[] = {
GEO_NODE_START(),
GEO_OPEN_NODE(),
GEO_TRANSLATE_NODE_WITH_DL(1, -2686, 0, -10000, ccm_dl_zzz_mesh_layer_1),
GEO_TRANSLATE_NODE_WITH_DL(1, -6086, 0, -10000, ccm_dl_zzz_mesh_layer_1),
GEO_CLOSE_NODE(),
GEO_RETURN(),
};
Expand Down
26 changes: 13 additions & 13 deletions levels/ccm/area_7/room.inc.c
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
const u8 ccm_area_7_collision_rooms[] = {
1, 1, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 2, 2,
0, 0, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 2, 2,
1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2,
};
13 changes: 11 additions & 2 deletions levels/ccm/script.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ const LevelScript level_ccm_entry[] = {
MARIO_POS(0x01, 0, 0, 200, -10000),
OBJECT(MODEL_NONE, 8, -135, -10074, 0, 180, 0, 0x000A0000, bhvInstantActiveWarp),
OBJECT(MODEL_GOOMBA, 128, -135, -9025, 0, 0, 0, 0x00000000, bhvGoomba),
OBJECT(MODEL_YELLOW_COIN, -34, -169, -7868, 0, 0, 0, 0x00000000, bhvYellowCoin),
OBJECT(MODEL_NONE, -171, -364, -3628, 0, 0, 0, 0x00000000, bhvCoinFormation),
OBJECT(MODEL_NONE, -34, -169, -7868, 0, -1, 0, 0x00000000, bhvCoinFormation),
TERRAIN(ccm_area_1_collision),
MACRO_OBJECTS(ccm_area_1_macro_objs),
SET_BACKGROUND_MUSIC(0x00, SEQ_LEVEL_GRASS),
Expand All @@ -74,6 +75,8 @@ const LevelScript level_ccm_entry[] = {
OBJECT(MODEL_BULLY, -776, 1698, -4575, 0, 0, 0, 0x00000000, bhvSmallBully),
OBJECT(MODEL_BULLY, -449, 1698, -4233, 0, 0, 0, 0x00000000, bhvSmallBully),
OBJECT(MODEL_BULLY, 39, 1698, -7102, 0, 0, 0, 0x00000000, bhvSmallBully),
OBJECT(MODEL_NONE, -33, 1698, -7312, 0, 0, 0, 0x00000000, bhvCoinFormation),
OBJECT(MODEL_NONE, 132, 0, -9657, 0, 0, 0, 0x00000000, bhvCoinFormation),
OBJECT(MODEL_BREAKABLE_BOX, 69, 0, -7642, 0, 0, 0, 0x00050000, bhvHiddenObject),
OBJECT(MODEL_BREAKABLE_BOX, 285, 614, -7642, 0, 0, 0, 0x00000000, bhvHiddenObject),
OBJECT(MODEL_BREAKABLE_BOX, -105, 1263, -7642, 0, 0, 0, 0x00000000, bhvHiddenObject),
Expand Down Expand Up @@ -106,10 +109,13 @@ const LevelScript level_ccm_entry[] = {
OBJECT(MODEL_MR_BLIZZARD, -667, -171, -6217, 0, 0, 0, 0x00000000, bhvMrBlizzard),
OBJECT(MODEL_MR_BLIZZARD, 166, -171, -6217, 0, 0, 0, 0x00000000, bhvMrBlizzard),
OBJECT(MODEL_NONE, 180, -171, -11881, 0, 0, 0, 0x000A0000, bhvInstantActiveWarp),
OBJECT(MODEL_YELLOW_COIN, 882, 1234, -3021, 0, 90, 0, 0x00000000, bhvYellowCoin),
OBJECT(MODEL_YELLOW_COIN, -60, 1974, -2820, 0, 90, 0, 0x00000000, bhvYellowCoin),
OBJECT(MODEL_YELLOW_SPRING, -61, 1620, -2822, 0, 90, 0, 0x00000000, bhvGreenSpring),
OBJECT(MODEL_YELLOW_SPRING, 626, 1234, -3044, 0, 90, 0, 0x00000000, bhvGreenSpring),
OBJECT(MODEL_YELLOW_SPRING, 213, 698, -3166, 0, 90, 0, 0x00000000, bhvGreenSpring),
OBJECT(MODEL_YELLOW_SPRING, 43, -167, -4064, 0, 90, 0, 0x00000000, bhvGreenSpring),
OBJECT(MODEL_YELLOW_COIN, -50, 698, -3166, 0, 90, 0, 0x00000000, bhvYellowCoin),
TERRAIN(ccm_area_3_collision),
MACRO_OBJECTS(ccm_area_3_macro_objs),
SET_BACKGROUND_MUSIC(0x00, SEQ_LEVEL_GRASS),
Expand Down Expand Up @@ -193,6 +199,7 @@ const LevelScript level_ccm_entry[] = {
OBJECT(MODEL_MR_BLIZZARD, -712, 3255, 11776, 0, 0, 0, 0x00000000, bhvMrBlizzard),
OBJECT(MODEL_MR_BLIZZARD, -631, 4367, 12814, 0, 0, 0, 0x00000000, bhvMrBlizzard),
OBJECT(MODEL_MR_BLIZZARD, -480, 4612, 13506, 0, 0, 0, 0x00000000, bhvMrBlizzard),
OBJECT(MODEL_NONE, 0, 0, 10995, 0, 0, 0, 0x00000000, bhvCoinFormation),
OBJECT(MODEL_NONE, -178, 0, 12823, 0, 0, 0, 0x000A0000, bhvInstantActiveWarp),
TERRAIN(ccm_area_5_collision),
MACRO_OBJECTS(ccm_area_5_macro_objs),
Expand All @@ -217,6 +224,8 @@ const LevelScript level_ccm_entry[] = {
OBJECT(MODEL_GOOMBA, -32, 4162, 3977, 0, 0, 0, 0x00000000, bhvGoomba),
OBJECT(MODEL_GOOMBA, -30, 4162, 4579, 0, 0, 0, 0x00000000, bhvGoomba),
OBJECT(MODEL_NONE, -53, -70, 10979, 0, 0, 0, 0x000A0000, bhvInstantActiveWarp),
OBJECT(MODEL_YELLOW_COIN, -44, 1124, 3127, 0, 0, 0, 0x00000000, bhvYellowCoin),
OBJECT(MODEL_YELLOW_COIN, -34, 1624, 2594, 0, 0, 0, 0x00000000, bhvYellowCoin),
OBJECT(MODEL_YELLOW_SPRING, 0, -70, 8407, 0, 0, 0, 0x00000000, bhvGreenSpring),
OBJECT(MODEL_BULLY, 0, -70, 8828, 0, 0, 0, 0x00000000, bhvSmallBully),
OBJECT(MODEL_YELLOW_SPRING, 0, 754, 5854, 0, 0, 0, 0x00000000, bhvGreenSpring),
Expand All @@ -230,7 +239,7 @@ const LevelScript level_ccm_entry[] = {
AREA(7, ccm_area_7),
WARP_NODE(0x0A, LEVEL_BOB, 0x01, 0x0A, WARP_NO_CHECKPOINT),
WARP_NODE(0xF1, LEVEL_CCM, 0x07, 0x0A, WARP_NO_CHECKPOINT),
INSTANT_WARP(0x00, 0x07, -2600, 0, 0),
INSTANT_WARP(0x00, 0x07, -6000, 0, 0),
WARP_NODE(0xF0, LEVEL_BOB, 0x03, 0x0A, WARP_NO_CHECKPOINT),
OBJECT(MODEL_FLYGUY, 421, 3705, -3111, 0, 0, 0, 0x00000000, bhvFlyGuy),
OBJECT(MODEL_FLYGUY, -422, 2701, -3716, 0, 0, 0, 0x00000000, bhvFlyGuy),
Expand Down

0 comments on commit 098b09e

Please sign in to comment.