mirror/sm64
1
0
Fork 0
mirror of https://github.com/n64decomp/sm64 synced 2026-09-01 09:22:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Refresh 15

Browse Source
This commit is contained in:
n64
2021-10-14 15:25:30 -04:00
parent f9982e0ef5
commit 1372ae1bb7
383 changed files with 7001 additions and 5730 deletions
Download Patch File Download Diff File Expand all files Collapse all files
levels/bbh/areas/1/collision.inc.c
+1 -1
View File
@@ -3742,7 +3742,7 @@ const Collision bbh_seg7_collision_level[] = {
COL_TRI(12, 14, 15),
COL_TRI_STOP(),
COL_SPECIAL_INIT(26),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ 1434, -204, 4710, /*yaw*/ 128), // unused, probably an early way to set intial position
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ 1434, -204, 4710, /*yaw*/ 128), // unused, probably an early way to set initial position
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_haunted_door, /*pos*/ 0, -2457, 2099, /*yaw*/ 128),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_haunted_door, /*pos*/ -1996, -2457, 205, /*yaw*/ 192),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_haunted_door, /*pos*/ 1587, -2457, 205, /*yaw*/ 64),
levels/bitdw/areas/1/collision.inc.c
+1 -1
View File
@@ -1324,7 +1324,7 @@ const Collision bitdw_seg7_collision_level[] = {
COL_TRI(485, 486, 489),
COL_TRI_STOP(),
COL_SPECIAL_INIT(23),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ -7443, -3153, 3886, /*yaw*/ 64), // unused, probably an early way to set intial position
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ -7443, -3153, 3886, /*yaw*/ 64), // unused, probably an early way to set initial position
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_03, /*pos*/ -6368, -3972, 3883, /*yaw*/ 0),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_04, /*pos*/ -3245, -3358, 3893, /*yaw*/ 0),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_05, /*pos*/ -2405, -1228, 1740, /*yaw*/ 0),
levels/bitfs/areas/1/collision.inc.c
+1 -1
View File
@@ -2053,7 +2053,7 @@ const Collision bitfs_seg7_collision_level[] = {
COL_TRI(801, 802, 509),
COL_TRI_STOP(),
COL_SPECIAL_INIT(24),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ -7577, -2764, 0, /*yaw*/ 64), // unused, probably an early way to set intial position
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ -7577, -2764, 0, /*yaw*/ 64), // unused, probably an early way to set initial position
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_03, /*pos*/ -5938, -3071, 0, /*yaw*/ 0),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_04, /*pos*/ -5488, -1535, 41, /*yaw*/ 0),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_04, /*pos*/ 4342, 1741, 41, /*yaw*/ 0),
levels/bits/areas/1/collision.inc.c
+1 -1
View File
@@ -2400,7 +2400,7 @@ const Collision bits_seg7_collision_level[] = {
COL_TRI(135, 216, 214),
COL_TRI_STOP(),
COL_SPECIAL_INIT(22),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ -7039, -4812, 4, /*yaw*/ 64), // unused, probably an early way to set intial position
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ -7039, -4812, 4, /*yaw*/ 64), // unused, probably an early way to set initial position
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_03, /*pos*/ -4505, -5119, 0, /*yaw*/ 0),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_04, /*pos*/ -2291, -2073, -762, /*yaw*/ 0),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_05, /*pos*/ 3891, -3276, -705, /*yaw*/ 0),
levels/bowser_1/areas/1/collision.inc.c
+1 -1
View File
@@ -77,7 +77,7 @@ const Collision bowser_1_seg7_collision_level[] = {
COL_TRI(25, 27, 28),
COL_TRI_STOP(),
COL_SPECIAL_INIT(22),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ 0, 1843, 0, /*yaw*/ 1423), // unused, probably an early way to set intial position
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ 0, 1843, 0, /*yaw*/ 1423), // unused, probably an early way to set initial position
SPECIAL_OBJECT(/*preset*/ special_mine, /*pos*/ 2949, 589, 0),
SPECIAL_OBJECT(/*preset*/ special_mine, /*pos*/ 0, 589, -2949),
SPECIAL_OBJECT(/*preset*/ special_mine, /*pos*/ 0, 589, 2949),
levels/bowser_2/areas/1/collision.inc.c
+1 -1
View File
@@ -19,7 +19,7 @@ const Collision bowser_2_seg7_collision_lava[] = {
COL_TRI(0, 5, 7),
COL_TRI_STOP(),
COL_SPECIAL_INIT(2),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ 0, 1229, 0, /*yaw*/ 128), // unused, probably an early way to set intial position
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ 0, 1229, 0, /*yaw*/ 128), // unused, probably an early way to set initial position
SPECIAL_OBJECT(/*preset*/ special_bowser, /*pos*/ -8, 1229, -1418),
COL_END(),
};
levels/bowser_3/areas/1/collision.inc.c
+1 -1
View File
@@ -68,7 +68,7 @@ const Collision bowser_3_seg7_collision_level[] = {
COL_TRI(0, 2, 3),
COL_TRI_STOP(),
COL_SPECIAL_INIT(7),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ 0, 307, 0, /*yaw*/ 128), // unused, probably an early way to set intial position
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ 0, 307, 0, /*yaw*/ 128), // unused, probably an early way to set initial position
SPECIAL_OBJECT(/*preset*/ special_bowser, /*pos*/ 13, 307, -1024),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_03, /*pos*/ -3362, -204, 1121, /*yaw*/ 0),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_03, /*pos*/ 0, -204, 3584, /*yaw*/ 0),
levels/castle_courtyard/areas/1/collision.inc.c
+1 -1
View File
@@ -847,7 +847,7 @@ const Collision castle_courtyard_seg7_collision[] = {
COL_TRI(136, 45, 133),
COL_TRI_STOP(),
COL_SPECIAL_INIT(19),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ 15, 0, 202, /*yaw*/ 128), // unused, probably an early way to set intial position
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ 15, 0, 202, /*yaw*/ 128), // unused, probably an early way to set initial position
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_03, /*pos*/ 0, 2048, 2662, /*yaw*/ 0),
SPECIAL_OBJECT(/*preset*/ special_spiky_tree, /*pos*/ 2272, -214, -1432),
SPECIAL_OBJECT(/*preset*/ special_spiky_tree, /*pos*/ 818, 10, 203),
levels/castle_inside/areas/1/collision.inc.c
+1 -1
View File
@@ -3741,7 +3741,7 @@ const Collision inside_castle_seg7_area_1_collision[] = {
COL_TRI(77, 79, 80),
COL_TRI_STOP(),
COL_SPECIAL_INIT(11),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ -1023, 0, 1152, /*yaw*/ 128), // unused, probably an early way to set intial position
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ -1023, 0, 1152, /*yaw*/ 128), // unused, probably an early way to set initial position
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_wooden_door, /*pos*/ -271, 0, -824, /*yaw*/ 32),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_wooden_door, /*pos*/ -1775, 0, -824, /*yaw*/ 224),
SPECIAL_OBJECT_WITH_YAW_AND_PARAM(/*preset*/ special_castle_door_warp, /*pos*/ -1100, 0, 2202, /*yaw*/ 0, /*behParam2*/ 0),
levels/ccm/areas/1/collision.inc.c
+1 -1
View File
@@ -1747,7 +1747,7 @@ const Collision ccm_seg7_area_1_collision[] = {
COL_TRI(336, 609, 616),
COL_TRI_STOP(),
COL_SPECIAL_INIT(21),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ -1512, 2560, -2305, /*yaw*/ 100), // unused, probably an early way to set intial position
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ -1512, 2560, -2305, /*yaw*/ 100), // unused, probably an early way to set initial position
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_03, /*pos*/ -409, 2765, -1637, /*yaw*/ 0),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_04, /*pos*/ 2355, -4095, 4096, /*yaw*/ 0),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_05, /*pos*/ -4210, -1446, 1874, /*yaw*/ 0),
levels/ccm/areas/2/collision.inc.c
+1 -1
View File
@@ -1873,7 +1873,7 @@ const Collision ccm_seg7_area_2_collision[] = {
COL_TRI(19, 23, 24),
COL_TRI_STOP(),
COL_SPECIAL_INIT(2),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ -5836, 7465, -6143, /*yaw*/ 64), // unused, probably an early way to set intial position
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ -5836, 7465, -6143, /*yaw*/ 64), // unused, probably an early way to set initial position
SPECIAL_OBJECT_WITH_YAW_AND_PARAM(/*preset*/ special_wooden_door_warp, /*pos*/ -7628, -5836, -6988, /*yaw*/ 64, /*behParam2*/ 20),
COL_END(),
};
levels/cotmc/areas/1/collision.inc.c
+1 -1
View File
@@ -990,7 +990,7 @@ const Collision cotmc_seg7_collision_level[] = {
COL_TRI(208, 206, 207),
COL_TRI_STOP(),
COL_SPECIAL_INIT(1),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ -4185, 20, -47, /*yaw*/ 64), // unused, probably an early way to set intial position
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ -4185, 20, -47, /*yaw*/ 64), // unused, probably an early way to set initial position
COL_WATER_BOX_INIT(1),
COL_WATER_BOX(0, -1535, -7679, 1536, 3389, 0),
COL_END(),
levels/hmc/areas/1/collision.inc.c
+1 -1
View File
@@ -3599,7 +3599,7 @@ const Collision hmc_seg7_collision_level[] = {
COL_TRI(55, 58, 56),
COL_TRI_STOP(),
COL_SPECIAL_INIT(13),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ -7601, 2253, 7630, /*yaw*/ 96), // unused, probably an early way to set intial position
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ -7601, 2253, 7630, /*yaw*/ 96), // unused, probably an early way to set initial position
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_wooden_door, /*pos*/ 922, -4689, 2330, /*yaw*/ 192),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_wooden_door, /*pos*/ -3586, 1536, 647, /*yaw*/ 19),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_wooden_door, /*pos*/ 5911, -204, 870, /*yaw*/ 0),
levels/jrb/areas/1/collision.inc.c
+1 -1
View File
@@ -872,7 +872,7 @@ const Collision jrb_seg7_area_1_collision[] = {
COL_TRI(7, 5, 0),
COL_TRI_STOP(),
COL_SPECIAL_INIT(1),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ -6750, 1126, 1482, /*yaw*/ 64), // unused, probably an early way to set intial position
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ -6750, 1126, 1482, /*yaw*/ 64), // unused, probably an early way to set initial position
COL_WATER_BOX_INIT(3),
COL_WATER_BOX(0, -6304, -669, 7992, 7814, 1024),
COL_WATER_BOX(1, 4433, -4253, 5969, -669, -3016),
levels/jrb/areas/1/movtext.inc.c
+4 -4
View File
@@ -35,8 +35,8 @@ const struct MovtexQuadCollection jrb_movtex_water[] = {
{-1, NULL},
};
// 0x0700D2E4, appears if you enter the course the first time, then it disappears when you grab the first star
static Movtex jrb_movtex_intial_mist_data[] = {
// 0x0700D2E4, appears if you enter the course the first time, then it disappears when you collect the "Plunder in the Sunken Ship" star
static Movtex jrb_movtex_initial_mist_data[] = {
MOV_TEX_INIT_LOAD( 1),
MOV_TEX_ROT_SPEED( 20),
MOV_TEX_ROT_SCALE( 10),
@@ -51,7 +51,7 @@ static Movtex jrb_movtex_intial_mist_data[] = {
};
// 0x0700D304
const struct MovtexQuadCollection jrb_movtex_intial_mist[] = {
{51, jrb_movtex_intial_mist_data},
const struct MovtexQuadCollection jrb_movtex_initial_mist[] = {
{51, jrb_movtex_initial_mist_data},
{-1, NULL},
};
levels/jrb/areas/2/collision.inc.c
+1 -1
View File
@@ -584,7 +584,7 @@ const Collision jrb_seg7_area_2_collision[] = {
COL_TRI(29, 79, 80),
COL_TRI_STOP(),
COL_SPECIAL_INIT(1),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ 866, 798, -1248, /*yaw*/ 128), // unused, probably an early way to set intial position
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ 866, 798, -1248, /*yaw*/ 128), // unused, probably an early way to set initial position
COL_WATER_BOX_INIT(1),
COL_WATER_BOX(0, -4095, -4095, 4096, 4096, 2765),
COL_END(),
levels/jrb/areas/2/movtext.inc.c
+3 -3
View File
@@ -1,5 +1,5 @@
// 0x0701137C
static Movtex jrb_movtex_sinked_boat_water_data[] = {
static Movtex jrb_movtex_sunken_ship_water_data[] = {
MOV_TEX_INIT_LOAD( 1),
MOV_TEX_ROT_SPEED( 20),
MOV_TEX_ROT_SCALE( 6),
@@ -14,7 +14,7 @@ static Movtex jrb_movtex_sinked_boat_water_data[] = {
};
// 0x0701139C
const struct MovtexQuadCollection jrb_movtex_sinked_boat_water[] = {
{0, jrb_movtex_sinked_boat_water_data},
const struct MovtexQuadCollection jrb_movtex_sunken_ship_water[] = {
{0, jrb_movtex_sunken_ship_water_data},
{-1, NULL},
};
levels/jrb/header.h
+2 -2
View File
@@ -52,13 +52,13 @@ extern const Collision jrb_seg7_collision_0700D1DC[];
extern const Trajectory jrb_seg7_trajectory_unagi_1[];
extern const Trajectory jrb_seg7_trajectory_unagi_2[];
extern const struct MovtexQuadCollection jrb_movtex_water[];
extern const struct MovtexQuadCollection jrb_movtex_intial_mist[];
extern const struct MovtexQuadCollection jrb_movtex_initial_mist[];
extern const Gfx jrb_seg7_dl_0700EF00[];
extern const Gfx jrb_seg7_dl_0700FE48[];
extern const Gfx jrb_seg7_dl_07010548[];
extern const Collision jrb_seg7_area_2_collision[];
extern const MacroObject jrb_seg7_area_2_macro_objs[];
extern const struct MovtexQuadCollection jrb_movtex_sinked_boat_water[];
extern const struct MovtexQuadCollection jrb_movtex_sunken_ship_water[];
// script
extern const LevelScript level_jrb_entry[];
levels/lll/areas/1/collision.inc.c
+2 -2
View File
@@ -1376,7 +1376,7 @@ const Collision lll_seg7_area_1_collision[] = {
COL_TRI(10, 52, 3),
COL_TRI_STOP(),
COL_SPECIAL_INIT(1),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ -3839, 154, 6272, /*yaw*/ 64), // unused, probably an early way to set intial position
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ -3839, 154, 6272, /*yaw*/ 64), // unused, probably an early way to set initial position
COL_END(),
#else
COL_INIT(),
@@ -2730,7 +2730,7 @@ const Collision lll_seg7_area_1_collision[] = {
COL_TRI(3, 52, 71),
COL_TRI_STOP(),
COL_SPECIAL_INIT(1),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ -3839, 154, 6272, /*yaw*/ 64), // unused, probably an early way to set intial position
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ -3839, 154, 6272, /*yaw*/ 64), // unused, probably an early way to set initial position
COL_END(),
#endif
};
levels/lll/areas/2/collision.inc.c
+1 -1
View File
@@ -1549,7 +1549,7 @@ const Collision lll_seg7_area_2_collision[] = {
COL_TRI(324, 451, 450),
COL_TRI_STOP(),
COL_SPECIAL_INIT(1),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ -955, 103, -1029, /*yaw*/ 84), // unused, probably an early way to set intial position
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ -955, 103, -1029, /*yaw*/ 84), // unused, probably an early way to set initial position
COL_WATER_BOX_INIT(1),
COL_WATER_BOX(10, -3071, -3071, 3072, 3072, 20),
COL_END(),
levels/rr/areas/1/collision.inc.c
+2 -2
View File
@@ -2694,7 +2694,7 @@ const Collision rr_seg7_collision_level[] = {
COL_TRI_SPECIAL(31, 46, 45, 0x140),
COL_TRI_STOP(),
COL_SPECIAL_INIT(23),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ 2599, -1833, 2071, /*yaw*/ 64), // unused, probably an early way to set intial position
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ 2599, -1833, 2071, /*yaw*/ 64), // unused, probably an early way to set initial position
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_03, /*pos*/ 1902, -1833, 1063, /*yaw*/ 0),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_04, /*pos*/ 3803, -1833, 2036, /*yaw*/ 0),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_05, /*pos*/ -4888, -2550, 5847, /*yaw*/ 0),
@@ -5419,7 +5419,7 @@ const Collision rr_seg7_collision_level[] = {
COL_TRI_SPECIAL(35, 46, 47, 0x100),
COL_TRI_STOP(),
COL_SPECIAL_INIT(23),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ 2599, -1833, 2071, /*yaw*/ 64), // unused, probably an early way to set intial position
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ 2599, -1833, 2071, /*yaw*/ 64), // unused, probably an early way to set initial position
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_03, /*pos*/ 1902, -1833, 1063, /*yaw*/ 0),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_04, /*pos*/ 3803, -1833, 2036, /*yaw*/ 0),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_05, /*pos*/ -4888, -2550, 5847, /*yaw*/ 0),
levels/sa/areas/1/collision.inc.c
+1 -1
View File
@@ -105,7 +105,7 @@ const Collision sa_seg7_collision[] = {
COL_TRI(30, 47, 12),
COL_TRI_STOP(),
COL_SPECIAL_INIT(1),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ 0, -1535, 0, /*yaw*/ 64), // unused, probably an early way to set intial position
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ 0, -1535, 0, /*yaw*/ 64), // unused, probably an early way to set initial position
COL_WATER_BOX_INIT(1),
COL_WATER_BOX(0, -3173, -3173, 3174, 3174, 102),
COL_END(),
levels/sl/areas/1/collision.inc.c
+1 -1
View File
@@ -1423,7 +1423,7 @@ const Collision sl_seg7_area_1_collision[] = {
COL_TRI(510, 327, 321),
COL_TRI_STOP(),
COL_SPECIAL_INIT(10),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ 5541, 1024, 443, /*yaw*/ 192), // unused, probably an early way to set intial position
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ 5541, 1024, 443, /*yaw*/ 192), // unused, probably an early way to set initial position
SPECIAL_OBJECT(/*preset*/ special_snow_tree, /*pos*/ 5395, 1054, -5443),
SPECIAL_OBJECT(/*preset*/ special_snow_tree, /*pos*/ 0, 4864, 0),
SPECIAL_OBJECT(/*preset*/ special_snow_tree, /*pos*/ 5666, 1024, -3341),
levels/sl/areas/2/collision.inc.c
+1 -1
View File
@@ -407,7 +407,7 @@ const Collision sl_seg7_area_2_collision[] = {
COL_TRI(146, 187, 145),
COL_TRI_STOP(),
COL_SPECIAL_INIT(1),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ 0, 0, 2867, /*yaw*/ 128), // unused, probably an early way to set intial position
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ 0, 0, 2867, /*yaw*/ 128), // unused, probably an early way to set initial position
COL_END(),
};
levels/ssl/areas/1/collision.inc.c
+1 -1
View File
@@ -1554,7 +1554,7 @@ const Collision ssl_seg7_area_1_collision[] = {
COL_TRI(482, 483, 484),
COL_TRI_STOP(),
COL_SPECIAL_INIT(7),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ 653, 38, 6566, /*yaw*/ 64), // unused, probably an early way to set intial position
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ 653, 38, 6566, /*yaw*/ 64), // unused, probably an early way to set initial position
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_03, /*pos*/ 5760, 0, 5751, /*yaw*/ 0),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_03, /*pos*/ -3583, 0, 2935, /*yaw*/ 0),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_03, /*pos*/ -511, 0, 2935, /*yaw*/ 0),
levels/ssl/areas/2/collision.inc.c
+1 -1
View File
@@ -2655,7 +2655,7 @@ const Collision ssl_seg7_area_2_collision[] = {
COL_TRI(359, 420, 419),
COL_TRI_STOP(),
COL_SPECIAL_INIT(4),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ 0, 0, 6451, /*yaw*/ 128), // unused, probably an early way to set intial position
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ 0, 0, 6451, /*yaw*/ 128), // unused, probably an early way to set initial position
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_04, /*pos*/ 1741, -101, 1843, /*yaw*/ 0),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_04, /*pos*/ 0, -101, 528, /*yaw*/ 0),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_04, /*pos*/ -1740, -101, 1843, /*yaw*/ 0),
levels/thi/areas/1/collision.inc.c
+1 -1
View File
@@ -1256,7 +1256,7 @@ const Collision thi_seg7_area_1_collision[] = {
COL_TRI(412, 320, 319),
COL_TRI_STOP(),
COL_SPECIAL_INIT(2),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ -7372, -2969, 7373, /*yaw*/ 106), // unused, probably an early way to set intial position
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ -7372, -2969, 7373, /*yaw*/ 106), // unused, probably an early way to set initial position
SPECIAL_OBJECT(/*preset*/ special_bubble_tree, /*pos*/ 4813, -511, 2254),
COL_WATER_BOX_INIT(3),
COL_WATER_BOX(0, -8191, -8191, -5119, 6246, -3071),
levels/thi/areas/2/collision.inc.c
+1 -1
View File
@@ -970,7 +970,7 @@ const Collision thi_seg7_area_2_collision[] = {
COL_TRI(244, 25, 148),
COL_TRI_STOP(),
COL_SPECIAL_INIT(3),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ -2211, -890, 2212, /*yaw*/ 106), // unused, probably an early way to set intial position
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ -2211, -890, 2212, /*yaw*/ 106), // unused, probably an early way to set initial position
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_03, /*pos*/ -40, -767, -4494, /*yaw*/ 0),
SPECIAL_OBJECT(/*preset*/ special_bubble_tree, /*pos*/ 1444, -153, 676),
COL_WATER_BOX_INIT(3),
levels/totwc/areas/1/collision.inc.c
+1 -1
View File
@@ -587,7 +587,7 @@ const Collision totwc_seg7_collision[] = {
COL_TRI(81, 97, 67),
COL_TRI_STOP(),
COL_SPECIAL_INIT(23),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ -4095, 2935, 0, /*yaw*/ 64), // unused, probably an early way to set intial position
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ -4095, 2935, 0, /*yaw*/ 64), // unused, probably an early way to set initial position
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_03, /*pos*/ 4608, -357, -511, /*yaw*/ 0),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_03, /*pos*/ -4095, 666, 512, /*yaw*/ 0),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_03, /*pos*/ -5631, -1893, 6144, /*yaw*/ 0),
levels/ttc/areas/1/collision.inc.c
+1 -1
View File
@@ -1890,6 +1890,6 @@ const Collision ttc_seg7_collision_level[] = {
COL_TRI(526, 625, 624),
COL_TRI_STOP(),
COL_SPECIAL_INIT(1),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ 1046, -4822, -266, /*yaw*/ 192), // unused, probably an early way to set intial position
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ 1046, -4822, -266, /*yaw*/ 192), // unused, probably an early way to set initial position
COL_END(),
};
levels/ttm/areas/1/collision.inc.c
+1 -1
View File
@@ -2293,7 +2293,7 @@ const Collision ttm_seg7_area_1_collision[] = {
COL_TRI(516, 430, 819),
COL_TRI_STOP(),
COL_SPECIAL_INIT(29),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ 102, -4332, 5734, /*yaw*/ 32), // unused, probably an early way to set intial position
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ 102, -4332, 5734, /*yaw*/ 32), // unused, probably an early way to set initial position
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_03, /*pos*/ -3276, -4423, -3685, /*yaw*/ 0),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_03, /*pos*/ 7293, -5056, 1429, /*yaw*/ 0),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_03, /*pos*/ 4938, -5568, 5115, /*yaw*/ 0),
levels/vcutm/areas/1/collision.inc.c
+1 -1
View File
@@ -844,6 +844,6 @@ const Collision vcutm_seg7_collision[] = {
COL_TRI(40, 27, 30),
COL_TRI_STOP(),
COL_SPECIAL_INIT(1),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ -6143, 5734, -6143, /*yaw*/ 0), // unused, probably an early way to set intial position
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ -6143, 5734, -6143, /*yaw*/ 0), // unused, probably an early way to set initial position
COL_END(),
};
levels/wdw/areas/1/collision.inc.c
+1 -1
View File
@@ -1345,7 +1345,7 @@ const Collision wdw_seg7_area_1_collision[] = {
COL_TRI(85, 159, 157),
COL_TRI_STOP(),
COL_SPECIAL_INIT(1),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ 3395, 1280, 384, /*yaw*/ 128), // unused, probably an early way to set intial position
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ 3395, 1280, 384, /*yaw*/ 128), // unused, probably an early way to set initial position
COL_WATER_BOX_INIT(1),
COL_WATER_BOX(0, -3839, -3839, 4608, 4608, 31),
COL_END(),
levels/wf/areas/1/collision.inc.c
+1 -1
View File
@@ -1075,7 +1075,7 @@ const Collision wf_seg7_collision_070102D8[] = {
COL_TRI(4, 7, 5),
COL_TRI_STOP(),
COL_SPECIAL_INIT(6),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ 2560, 256, 5120, /*yaw*/ 64), // unused, probably an early way to set intial position
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ 2560, 256, 5120, /*yaw*/ 64), // unused, probably an early way to set initial position
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_0E, /*pos*/ 3584, 154, 4864, /*yaw*/ 0),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_0F, /*pos*/ 4608, 256, 1792, /*yaw*/ 0),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_11, /*pos*/ -2499, 1792, -261, /*yaw*/ 0),
levels/wmotr/areas/1/collision.inc.c
+1 -1
View File
@@ -2055,6 +2055,6 @@ const Collision wmotr_seg7_collision[] = {
COL_TRI(288, 286, 289),
COL_TRI_STOP(),
COL_SPECIAL_INIT(1),
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ -67, 1669, -16, /*yaw*/ 192), // unused, probably an early way to set intial position
SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ -67, 1669, -16, /*yaw*/ 192), // unused, probably an early way to set initial position
COL_END(),
};