Skip to content

Commit

Permalink
added convenience cloud in DR, fixed purple goop OOB
Browse files Browse the repository at this point in the history
  • Loading branch information
@thecozies
thecozies committed Mar 27, 2023
1 parent 218f78a commit 4b93e8c
Show file tree
Hide file tree
Showing 10 changed files with 313 additions and 234 deletions.
1 change: 1 addition & 0 deletions include/types.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -513,6 +513,7 @@ struct MarioState
#ifdef NUM_COYOTE_FRAMES
u8 coyoteFrames;
#endif
u8 overrideWhirlpool; // sorry for dirty solution - with love, thecozies
};

typedef union _RGBA {
Expand Down
297 changes: 173 additions & 124 deletions levels/ddd/area_2/collision.inc.c
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const Collision ddd_area_2_collision[] = {
COL_INIT(),
COL_VERTEX_INIT(2748),
COL_VERTEX_INIT(2766),
COL_VERTEX(4438, -8007, -3091),
COL_VERTEX(4438, -8007, -2307),
COL_VERTEX(4485, -8007, -2308),
Expand Down Expand Up @@ -2698,7 +2698,6 @@ const Collision ddd_area_2_collision[] = {
COL_VERTEX(-4557, 1046, 2555),
COL_VERTEX(-4670, 1806, 2613),
COL_VERTEX(-4527, 1974, 2626),
COL_VERTEX(-4973, 2389, 2628),
COL_VERTEX(-4963, 2063, 2636),
COL_VERTEX(-5353, 1090, 2523),
COL_VERTEX(-4960, 2068, 2700),
Expand All @@ -2714,13 +2713,13 @@ const Collision ddd_area_2_collision[] = {
COL_VERTEX(-5009, 1144, 2783),
COL_VERTEX(-4529, 2624, 2721),
COL_VERTEX(-4428, 2362, 2753),
COL_VERTEX(-4424, 2363, 2578),
COL_VERTEX(-4865, 619, 4654),
COL_VERTEX(-5058, 654, 4163),
COL_VERTEX(-5058, 687, 3346),
COL_VERTEX(-4530, 2624, 2616),
COL_VERTEX(-4636, 2678, 2619),
COL_VERTEX(-4869, 2618, 2643),
COL_VERTEX(-4973, 2389, 2628),
COL_VERTEX(-4894, 2641, 2710),
COL_VERTEX(-4701, 2725, 2740),
COL_VERTEX(-4403, 43, 2020),
Expand All @@ -2739,6 +2738,7 @@ const Collision ddd_area_2_collision[] = {
COL_VERTEX(-4950, 2390, 2668),
COL_VERTEX(-4565, 2586, 2669),
COL_VERTEX(-4472, 2356, 2668),
COL_VERTEX(-4424, 2363, 2578),
COL_VERTEX(-4555, 2042, 2669),
COL_VERTEX(-4690, 1883, 2668),
COL_VERTEX(-4872, 1937, 2669),
Expand All @@ -2749,6 +2749,24 @@ const Collision ddd_area_2_collision[] = {
COL_VERTEX(-4858, 526, 5373),
COL_VERTEX(-4403, 605, 4654),
COL_VERTEX(-4258, 584, 4927),
COL_VERTEX(-5476, 732, 2490),
COL_VERTEX(-5010, 667, 2659),
COL_VERTEX(-4730, 664, 2660),
COL_VERTEX(-4000, 728, 2480),
COL_VERTEX(-4451, 661, 2661),
COL_VERTEX(-5476, 2800, 2490),
COL_VERTEX(-5010, 2190, 2659),
COL_VERTEX(-4730, 1810, 2660),
COL_VERTEX(-4870, 1915, 2659),
COL_VERTEX(-4451, 2120, 2661),
COL_VERTEX(-4000, 2900, 2480),
COL_VERTEX(-5010, 2503, 2659),
COL_VERTEX(-5476, 3250, 2490),
COL_VERTEX(-5010, 3403, 2659),
COL_VERTEX(-4000, 3350, 2480),
COL_VERTEX(-4451, 3397, 2661),
COL_VERTEX(-4730, 2785, 2660),
COL_VERTEX(-4451, 2497, 2661),
COL_TRI_INIT(SURFACE_DEFAULT, 4768),
COL_TRI(0, 1, 2),
COL_TRI(0, 2, 3),
Expand Down Expand Up @@ -7681,7 +7699,7 @@ const Collision ddd_area_2_collision[] = {
COL_TRI(2629, 2631, 2632),
COL_TRI(2330, 2329, 2334),
COL_TRI(2330, 2334, 2335),
COL_TRI_INIT(SURFACE_HURT_FLOOR_WITH_HEIGHT, 335),
COL_TRI_INIT(SURFACE_HURT_FLOOR_WITH_HEIGHT, 366),
COL_TRI_SPECIAL(2633, 1057, 1056, 80),
COL_TRI_SPECIAL(2634, 2635, 1096, 80),
COL_TRI_SPECIAL(1065, 2636, 2637, 80),
Expand Down Expand Up @@ -7875,134 +7893,128 @@ const Collision ddd_area_2_collision[] = {
COL_TRI_SPECIAL(1698, 1696, 1692, 600),
COL_TRI_SPECIAL(2693, 2694, 2695, 30),
COL_TRI_SPECIAL(2693, 2695, 2696, 30),
COL_TRI_SPECIAL(2407, 2405, 2697, 30),
COL_TRI_SPECIAL(2697, 2698, 2699, 30),
COL_TRI_SPECIAL(2697, 2699, 2407, 30),
COL_TRI_SPECIAL(2700, 2701, 2448, 30),
COL_TRI_SPECIAL(2448, 2379, 2702, 30),
COL_TRI_SPECIAL(2448, 2702, 2700, 30),
COL_TRI_SPECIAL(2703, 2704, 2705, 30),
COL_TRI_SPECIAL(2703, 2705, 2706, 30),
COL_TRI_SPECIAL(2694, 2707, 2708, 30),
COL_TRI_SPECIAL(2694, 2708, 2695, 30),
COL_TRI_SPECIAL(2704, 2709, 2710, 30),
COL_TRI_SPECIAL(2704, 2710, 2705, 30),
COL_TRI_SPECIAL(2709, 2700, 2702, 30),
COL_TRI_SPECIAL(2709, 2702, 2710, 30),
COL_TRI_SPECIAL(2711, 2712, 2380, 30),
COL_TRI_SPECIAL(2711, 2380, 2382, 30),
COL_TRI_SPECIAL(2696, 2713, 2395, 30),
COL_TRI_SPECIAL(2395, 2394, 2693, 30),
COL_TRI_SPECIAL(2395, 2693, 2696, 30),
COL_TRI_SPECIAL(2378, 2463, 2714, 30),
COL_TRI_SPECIAL(2378, 2714, 2715, 30),
COL_TRI_SPECIAL(2716, 2378, 2715, 30),
COL_TRI_SPECIAL(2399, 2402, 2717, 30),
COL_TRI_SPECIAL(2399, 2717, 2718, 30),
COL_TRI_SPECIAL(2405, 2404, 2719, 30),
COL_TRI_SPECIAL(2405, 2719, 2697, 30),
COL_TRI_SPECIAL(2707, 2699, 2698, 30),
COL_TRI_SPECIAL(2707, 2698, 2708, 30),
COL_TRI_SPECIAL(2720, 2721, 2389, 30),
COL_TRI_SPECIAL(2720, 2389, 2406, 30),
COL_TRI_SPECIAL(2400, 2399, 2718, 30),
COL_TRI_SPECIAL(2701, 2720, 2406, 30),
COL_TRI_SPECIAL(2701, 2406, 2448, 30),
COL_TRI_SPECIAL(2404, 2400, 2718, 30),
COL_TRI_SPECIAL(2404, 2718, 2719, 30),
COL_TRI_SPECIAL(2721, 2711, 2382, 30),
COL_TRI_SPECIAL(2721, 2382, 2384, 30),
COL_TRI_SPECIAL(2438, 2380, 2712, 30),
COL_TRI_SPECIAL(2712, 2703, 2706, 30),
COL_TRI_SPECIAL(2712, 2706, 2438, 30),
COL_TRI_SPECIAL(2721, 2384, 2389, 30),
COL_TRI_SPECIAL(2393, 2392, 2722, 30),
COL_TRI_SPECIAL(2393, 2722, 2396, 30),
COL_TRI_SPECIAL(2392, 2359, 2723, 30),
COL_TRI_SPECIAL(2392, 2723, 2722, 30),
COL_TRI_SPECIAL(2378, 2724, 2379, 30),
COL_TRI_SPECIAL(2724, 2702, 2379, 30),
COL_TRI_SPECIAL(2706, 2725, 2438, 30),
COL_TRI_SPECIAL(2725, 2439, 2438, 30),
COL_TRI_SPECIAL(2716, 2726, 2727, 30),
COL_TRI_SPECIAL(2716, 2727, 2728, 30),
COL_TRI_SPECIAL(2728, 2727, 2705, 30),
COL_TRI_SPECIAL(2728, 2705, 2710, 30),
COL_TRI_SPECIAL(2378, 2716, 2728, 30),
COL_TRI_SPECIAL(2378, 2728, 2724, 30),
COL_TRI_SPECIAL(2724, 2728, 2710, 30),
COL_TRI_SPECIAL(2724, 2710, 2702, 30),
COL_TRI_SPECIAL(2726, 2439, 2725, 30),
COL_TRI_SPECIAL(2726, 2725, 2727, 30),
COL_TRI_SPECIAL(2727, 2725, 2706, 30),
COL_TRI_SPECIAL(2727, 2706, 2705, 30),
COL_TRI_SPECIAL(2699, 2729, 2407, 30),
COL_TRI_SPECIAL(2729, 2408, 2407, 30),
COL_TRI_SPECIAL(2396, 2730, 2394, 30),
COL_TRI_SPECIAL(2730, 2693, 2394, 30),
COL_TRI_SPECIAL(2707, 2694, 2731, 30),
COL_TRI_SPECIAL(2707, 2731, 2732, 30),
COL_TRI_SPECIAL(2732, 2731, 2722, 30),
COL_TRI_SPECIAL(2732, 2722, 2723, 30),
COL_TRI_SPECIAL(2699, 2707, 2732, 30),
COL_TRI_SPECIAL(2699, 2732, 2729, 30),
COL_TRI_SPECIAL(2729, 2732, 2723, 30),
COL_TRI_SPECIAL(2729, 2723, 2408, 30),
COL_TRI_SPECIAL(2694, 2693, 2730, 30),
COL_TRI_SPECIAL(2694, 2730, 2731, 30),
COL_TRI_SPECIAL(2731, 2730, 2396, 30),
COL_TRI_SPECIAL(2731, 2396, 2722, 30),
COL_TRI_SPECIAL(2697, 2698, 2407, 30),
COL_TRI_SPECIAL(2699, 2700, 2448, 30),
COL_TRI_SPECIAL(2448, 2379, 2701, 30),
COL_TRI_SPECIAL(2448, 2701, 2699, 30),
COL_TRI_SPECIAL(2702, 2703, 2704, 30),
COL_TRI_SPECIAL(2702, 2704, 2705, 30),
COL_TRI_SPECIAL(2694, 2706, 2707, 30),
COL_TRI_SPECIAL(2694, 2707, 2695, 30),
COL_TRI_SPECIAL(2703, 2708, 2709, 30),
COL_TRI_SPECIAL(2703, 2709, 2704, 30),
COL_TRI_SPECIAL(2708, 2699, 2701, 30),
COL_TRI_SPECIAL(2708, 2701, 2709, 30),
COL_TRI_SPECIAL(2710, 2711, 2380, 30),
COL_TRI_SPECIAL(2710, 2380, 2382, 30),
COL_TRI_SPECIAL(2394, 2693, 2696, 30),
COL_TRI_SPECIAL(2378, 2463, 2712, 30),
COL_TRI_SPECIAL(2378, 2712, 2713, 30),
COL_TRI_SPECIAL(2714, 2378, 2713, 30),
COL_TRI_SPECIAL(2399, 2402, 2715, 30),
COL_TRI_SPECIAL(2399, 2715, 2716, 30),
COL_TRI_SPECIAL(2405, 2717, 2718, 30),
COL_TRI_SPECIAL(2706, 2698, 2697, 30),
COL_TRI_SPECIAL(2706, 2697, 2707, 30),
COL_TRI_SPECIAL(2719, 2720, 2389, 30),
COL_TRI_SPECIAL(2719, 2389, 2406, 30),
COL_TRI_SPECIAL(2400, 2399, 2716, 30),
COL_TRI_SPECIAL(2700, 2719, 2406, 30),
COL_TRI_SPECIAL(2700, 2406, 2448, 30),
COL_TRI_SPECIAL(2404, 2400, 2716, 30),
COL_TRI_SPECIAL(2404, 2716, 2717, 30),
COL_TRI_SPECIAL(2720, 2710, 2382, 30),
COL_TRI_SPECIAL(2720, 2382, 2384, 30),
COL_TRI_SPECIAL(2438, 2380, 2711, 30),
COL_TRI_SPECIAL(2711, 2702, 2705, 30),
COL_TRI_SPECIAL(2711, 2705, 2438, 30),
COL_TRI_SPECIAL(2720, 2384, 2389, 30),
COL_TRI_SPECIAL(2393, 2392, 2721, 30),
COL_TRI_SPECIAL(2393, 2721, 2396, 30),
COL_TRI_SPECIAL(2392, 2359, 2722, 30),
COL_TRI_SPECIAL(2392, 2722, 2721, 30),
COL_TRI_SPECIAL(2378, 2723, 2379, 30),
COL_TRI_SPECIAL(2723, 2701, 2379, 30),
COL_TRI_SPECIAL(2705, 2724, 2438, 30),
COL_TRI_SPECIAL(2724, 2439, 2438, 30),
COL_TRI_SPECIAL(2714, 2725, 2726, 30),
COL_TRI_SPECIAL(2714, 2726, 2727, 30),
COL_TRI_SPECIAL(2727, 2726, 2704, 30),
COL_TRI_SPECIAL(2727, 2704, 2709, 30),
COL_TRI_SPECIAL(2378, 2714, 2727, 30),
COL_TRI_SPECIAL(2378, 2727, 2723, 30),
COL_TRI_SPECIAL(2723, 2727, 2709, 30),
COL_TRI_SPECIAL(2723, 2709, 2701, 30),
COL_TRI_SPECIAL(2725, 2439, 2724, 30),
COL_TRI_SPECIAL(2725, 2724, 2726, 30),
COL_TRI_SPECIAL(2726, 2724, 2705, 30),
COL_TRI_SPECIAL(2726, 2705, 2704, 30),
COL_TRI_SPECIAL(2698, 2728, 2407, 30),
COL_TRI_SPECIAL(2728, 2408, 2407, 30),
COL_TRI_SPECIAL(2396, 2729, 2394, 30),
COL_TRI_SPECIAL(2729, 2693, 2394, 30),
COL_TRI_SPECIAL(2706, 2694, 2730, 30),
COL_TRI_SPECIAL(2706, 2730, 2731, 30),
COL_TRI_SPECIAL(2731, 2730, 2721, 30),
COL_TRI_SPECIAL(2731, 2721, 2722, 30),
COL_TRI_SPECIAL(2698, 2706, 2731, 30),
COL_TRI_SPECIAL(2698, 2731, 2728, 30),
COL_TRI_SPECIAL(2728, 2731, 2722, 30),
COL_TRI_SPECIAL(2728, 2722, 2408, 30),
COL_TRI_SPECIAL(2694, 2693, 2729, 30),
COL_TRI_SPECIAL(2694, 2729, 2730, 30),
COL_TRI_SPECIAL(2730, 2729, 2396, 30),
COL_TRI_SPECIAL(2730, 2396, 2721, 30),
COL_TRI_SPECIAL(2359, 2358, 2408, 30),
COL_TRI_SPECIAL(2359, 2408, 2723, 30),
COL_TRI_SPECIAL(2721, 2720, 2733, 30),
COL_TRI_SPECIAL(2721, 2733, 2734, 30),
COL_TRI_SPECIAL(2734, 2733, 2719, 30),
COL_TRI_SPECIAL(2734, 2719, 2718, 30),
COL_TRI_SPECIAL(2720, 2701, 2735, 30),
COL_TRI_SPECIAL(2720, 2735, 2733, 30),
COL_TRI_SPECIAL(2733, 2735, 2697, 30),
COL_TRI_SPECIAL(2733, 2697, 2719, 30),
COL_TRI_SPECIAL(2712, 2711, 2736, 30),
COL_TRI_SPECIAL(2712, 2736, 2737, 30),
COL_TRI_SPECIAL(2737, 2736, 2717, 30),
COL_TRI_SPECIAL(2737, 2717, 2713, 30),
COL_TRI_SPECIAL(2704, 2703, 2738, 30),
COL_TRI_SPECIAL(2704, 2738, 2739, 30),
COL_TRI_SPECIAL(2359, 2408, 2722, 30),
COL_TRI_SPECIAL(2720, 2719, 2732, 30),
COL_TRI_SPECIAL(2720, 2732, 2733, 30),
COL_TRI_SPECIAL(2733, 2732, 2717, 30),
COL_TRI_SPECIAL(2733, 2717, 2716, 30),
COL_TRI_SPECIAL(2719, 2700, 2734, 30),
COL_TRI_SPECIAL(2719, 2734, 2732, 30),
COL_TRI_SPECIAL(2732, 2734, 2718, 30),
COL_TRI_SPECIAL(2732, 2718, 2717, 30),
COL_TRI_SPECIAL(2711, 2710, 2735, 30),
COL_TRI_SPECIAL(2711, 2735, 2736, 30),
COL_TRI_SPECIAL(2736, 2735, 2715, 30),
COL_TRI_SPECIAL(2736, 2715, 2737, 30),
COL_TRI_SPECIAL(2703, 2702, 2738, 30),
COL_TRI_SPECIAL(2703, 2738, 2739, 30),
COL_TRI_SPECIAL(2739, 2738, 2696, 30),
COL_TRI_SPECIAL(2739, 2696, 2695, 30),
COL_TRI_SPECIAL(2700, 2709, 2740, 30),
COL_TRI_SPECIAL(2700, 2740, 2741, 30),
COL_TRI_SPECIAL(2741, 2740, 2708, 30),
COL_TRI_SPECIAL(2741, 2708, 2698, 30),
COL_TRI_SPECIAL(2709, 2704, 2739, 30),
COL_TRI_SPECIAL(2709, 2739, 2740, 30),
COL_TRI_SPECIAL(2699, 2708, 2740, 30),
COL_TRI_SPECIAL(2699, 2740, 2741, 30),
COL_TRI_SPECIAL(2741, 2740, 2707, 30),
COL_TRI_SPECIAL(2741, 2707, 2697, 30),
COL_TRI_SPECIAL(2708, 2703, 2739, 30),
COL_TRI_SPECIAL(2708, 2739, 2740, 30),
COL_TRI_SPECIAL(2740, 2739, 2695, 30),
COL_TRI_SPECIAL(2740, 2695, 2708, 30),
COL_TRI_SPECIAL(2701, 2700, 2741, 30),
COL_TRI_SPECIAL(2701, 2741, 2735, 30),
COL_TRI_SPECIAL(2735, 2741, 2698, 30),
COL_TRI_SPECIAL(2735, 2698, 2697, 30),
COL_TRI_SPECIAL(2713, 2696, 2738, 30),
COL_TRI_SPECIAL(2713, 2738, 2737, 30),
COL_TRI_SPECIAL(2737, 2738, 2703, 30),
COL_TRI_SPECIAL(2737, 2703, 2712, 30),
COL_TRI_SPECIAL(2711, 2721, 2734, 30),
COL_TRI_SPECIAL(2711, 2734, 2736, 30),
COL_TRI_SPECIAL(2736, 2734, 2718, 30),
COL_TRI_SPECIAL(2736, 2718, 2717, 30),
COL_TRI_SPECIAL(2402, 2395, 2713, 30),
COL_TRI_SPECIAL(2402, 2713, 2717, 30),
COL_TRI_SPECIAL(2439, 2726, 2742, 30),
COL_TRI_SPECIAL(2740, 2695, 2707, 30),
COL_TRI_SPECIAL(2700, 2699, 2741, 30),
COL_TRI_SPECIAL(2700, 2741, 2734, 30),
COL_TRI_SPECIAL(2734, 2741, 2697, 30),
COL_TRI_SPECIAL(2734, 2697, 2718, 30),
COL_TRI_SPECIAL(2737, 2696, 2738, 30),
COL_TRI_SPECIAL(2737, 2738, 2736, 30),
COL_TRI_SPECIAL(2736, 2738, 2702, 30),
COL_TRI_SPECIAL(2736, 2702, 2711, 30),
COL_TRI_SPECIAL(2710, 2720, 2733, 30),
COL_TRI_SPECIAL(2710, 2733, 2735, 30),
COL_TRI_SPECIAL(2735, 2733, 2716, 30),
COL_TRI_SPECIAL(2735, 2716, 2715, 30),
COL_TRI_SPECIAL(2395, 2715, 2402, 30),
COL_TRI_SPECIAL(2439, 2725, 2742, 30),
COL_TRI_SPECIAL(2355, 2354, 2743, 30),
COL_TRI_SPECIAL(2355, 2743, 2744, 30),
COL_TRI_SPECIAL(2744, 2745, 2373, 30),
COL_TRI_SPECIAL(2744, 2373, 2355, 30),
COL_TRI_SPECIAL(2745, 2441, 2374, 30),
COL_TRI_SPECIAL(2726, 2716, 2715, 30),
COL_TRI_SPECIAL(2726, 2715, 2742, 30),
COL_TRI_SPECIAL(2725, 2714, 2713, 30),
COL_TRI_SPECIAL(2725, 2713, 2742, 30),
COL_TRI_SPECIAL(2354, 2465, 2743, 30),
COL_TRI_SPECIAL(2742, 2715, 2714, 30),
COL_TRI_SPECIAL(2742, 2714, 2746, 30),
COL_TRI_SPECIAL(2742, 2713, 2712, 30),
COL_TRI_SPECIAL(2742, 2712, 2746, 30),
COL_TRI_SPECIAL(2746, 2464, 2439, 30),
COL_TRI_SPECIAL(2746, 2439, 2742, 30),
COL_TRI_SPECIAL(2745, 2374, 2373, 30),
Expand All @@ -8011,12 +8023,49 @@ const Collision ddd_area_2_collision[] = {
COL_TRI_SPECIAL(2549, 2747, 2743, 30),
COL_TRI_SPECIAL(2549, 2743, 2465, 30),
COL_TRI_SPECIAL(2747, 2744, 2743, 30),
COL_TRI_SPECIAL(2714, 2463, 2548, 30),
COL_TRI_SPECIAL(2712, 2463, 2548, 30),
COL_TRI_SPECIAL(2548, 2441, 2745, 30),
COL_TRI_SPECIAL(2746, 2714, 2548, 30),
COL_TRI_SPECIAL(2746, 2712, 2548, 30),
COL_TRI_SPECIAL(2746, 2548, 2747, 30),
COL_TRI_SPECIAL(2747, 2548, 2745, 30),
COL_TRI_SPECIAL(2747, 2745, 2744, 30),
COL_TRI_SPECIAL(2407, 2405, 2697, 30),
COL_TRI_SPECIAL(2405, 2718, 2697, 30),
COL_TRI_SPECIAL(2696, 2737, 2395, 30),
COL_TRI_SPECIAL(2395, 2394, 2696, 30),
COL_TRI_SPECIAL(2405, 2404, 2717, 30),
COL_TRI_SPECIAL(2395, 2737, 2715, 30),
COL_TRI_SPECIAL(2748, 2723, 2727, 30),
COL_TRI_SPECIAL(2748, 2727, 2749, 30),
COL_TRI_SPECIAL(2750, 2749, 2727, 30),
COL_TRI_SPECIAL(2751, 2752, 2726, 30),
COL_TRI_SPECIAL(2751, 2726, 2724, 30),
COL_TRI_SPECIAL(2729, 2730, 2752, 30),
COL_TRI_SPECIAL(2729, 2752, 2751, 30),
COL_TRI_SPECIAL(2752, 2730, 2750, 30),
COL_TRI_SPECIAL(2728, 2748, 2749, 30),
COL_TRI_SPECIAL(2728, 2749, 2731, 30),
COL_TRI_SPECIAL(2749, 2748, 2753, 30),
COL_TRI_SPECIAL(2749, 2753, 2754, 30),
COL_TRI_SPECIAL(2755, 2750, 2756, 30),
COL_TRI_SPECIAL(2751, 2752, 2757, 30),
COL_TRI_SPECIAL(2751, 2757, 2758, 30),
COL_TRI_SPECIAL(2759, 2754, 2753, 30),
COL_TRI_SPECIAL(2753, 2760, 2761, 30),
COL_TRI_SPECIAL(2753, 2761, 2759, 30),
COL_TRI_SPECIAL(2762, 2758, 2757, 30),
COL_TRI_SPECIAL(2757, 2763, 2762, 30),
COL_TRI_SPECIAL(2764, 2759, 2761, 30),
COL_TRI_SPECIAL(2752, 2750, 2755, 30),
COL_TRI_SPECIAL(2752, 2755, 2757, 30),
COL_TRI_SPECIAL(2731, 2749, 2750, 30),
COL_TRI_SPECIAL(2730, 2731, 2750, 30),
COL_TRI_SPECIAL(2752, 2750, 2726, 30),
COL_TRI_SPECIAL(2726, 2750, 2727, 30),
COL_TRI_SPECIAL(2765, 2764, 2763, 30),
COL_TRI_SPECIAL(2763, 2764, 2761, 30),
COL_TRI_SPECIAL(2749, 2754, 2756, 30),
COL_TRI_SPECIAL(2750, 2749, 2756, 30),
COL_TRI_STOP(),
COL_END()
};
6 changes: 5 additions & 1 deletion levels/ddd/area_2/room.inc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -656,5 +656,9 @@ const u8 ddd_area_2_collision_rooms[] = {
11, 11, 11, 11, 11, 11, 11, 11,
11, 11, 11, 11, 11, 11, 11, 11,
11, 11, 11, 11, 11, 11, 11, 11,
11, 11, 11, 11,
11, 11, 11, 11, 11, 11, 11, 11,
11, 11, 11, 11, 11, 11, 11, 11,
11, 11, 11, 11, 11, 11, 11, 11,
11, 11, 11, 11, 11, 11, 11, 11,
11, 11, 11,
};
Loading

0 comments on commit 4b93e8c

Please sign in to comment.