diff --git a/src/world/area_dgb/dgb_12/dgb_12_3_spikes.c b/src/world/area_dgb/dgb_12/dgb_12_3_spikes.c
index e7e34e34e..1d3455912 100644
--- a/src/world/area_dgb/dgb_12/dgb_12_3_spikes.c
+++ b/src/world/area_dgb/dgb_12/dgb_12_3_spikes.c
@@ -2,7 +2,7 @@
 
 LavaReset N(SafeFloorColliders)[] = {
     { .colliderID = COLLIDER_o200, .pos = { -503.0,    0.0,  -63.0 }},
-    { .colliderID = -1 }
+    { .colliderID = NO_COLLIDER }
 };
 
 EvtScript N(EVS_SetupSpikes) = {
diff --git a/src/world/area_flo/flo_08/flo_08_3_main.c b/src/world/area_flo/flo_08/flo_08_3_main.c
index 3040418af..211894f7e 100644
--- a/src/world/area_flo/flo_08/flo_08_3_main.c
+++ b/src/world/area_flo/flo_08/flo_08_3_main.c
@@ -22,7 +22,7 @@ LavaReset N(SafeFloorColliders)[] = {
     { .colliderID = COLLIDER_o158, .pos = { -540.0,    0.0,   50.0 }},
     { .colliderID = COLLIDER_o132, .pos = {   60.0,    0.0,   50.0 }},
     { .colliderID = COLLIDER_o223, .pos = {   60.0,    0.0,   50.0 }},
-    { .colliderID = -1 }
+    { .colliderID = NO_COLLIDER }
 };
 
 EvtScript N(EVS_Main) = {
diff --git a/src/world/area_flo/flo_14/flo_14_2_main.c b/src/world/area_flo/flo_14/flo_14_2_main.c
index 3711b4dd9..77890d90c 100644
--- a/src/world/area_flo/flo_14/flo_14_2_main.c
+++ b/src/world/area_flo/flo_14/flo_14_2_main.c
@@ -30,7 +30,7 @@ LavaReset N(SafeFloorColliders)[] = {
     { .colliderID = COLLIDER_o153, .pos = {  410.0,   60.0,  -95.0 }},
     { .colliderID = COLLIDER_o154, .pos = {  550.0,    0.0,   50.0 }},
     { .colliderID = COLLIDER_o158, .pos = {  -50.0,    0.0,  110.0 }},
-    { .colliderID = -1 }
+    { .colliderID = NO_COLLIDER }
 };
 
 EvtScript N(EVS_Main) = {
diff --git a/src/world/area_flo/flo_16/flo_16_2_main.c b/src/world/area_flo/flo_16/flo_16_2_main.c
index 66d5a631d..2657ec910 100644
--- a/src/world/area_flo/flo_16/flo_16_2_main.c
+++ b/src/world/area_flo/flo_16/flo_16_2_main.c
@@ -19,7 +19,7 @@ EvtScript N(EVS_BindExitTriggers) = {
 LavaReset N(SafeFloorColliders)[] = {
     { .colliderID = COLLIDER_o190, .pos = { -310.0,    0.0,    0.0 }},
     { .colliderID = COLLIDER_o191, .pos = {  305.0,  100.0,    0.0 }},
-    { .colliderID = -1 }
+    { .colliderID = NO_COLLIDER }
 };
 
 EvtScript N(EVS_Main) = {
diff --git a/src/world/area_flo/flo_17/flo_17_2_main.c b/src/world/area_flo/flo_17/flo_17_2_main.c
index 675b603b6..77501a26f 100644
--- a/src/world/area_flo/flo_17/flo_17_2_main.c
+++ b/src/world/area_flo/flo_17/flo_17_2_main.c
@@ -38,7 +38,7 @@ LavaReset N(SafeFloorColliders)[] = {
     { .colliderID = COLLIDER_o129, .pos = {  280.0,    0.0,   50.0 }},
     { .colliderID = COLLIDER_o134, .pos = {  525.0,    0.0,  -70.0 }},
     { .colliderID = COLLIDER_o133, .pos = {  525.0,    0.0,   50.0 }},
-    { .colliderID = -1 }
+    { .colliderID = NO_COLLIDER }
 };
 
 EvtScript N(EVS_Main) = {
diff --git a/src/world/area_flo/flo_18/flo_18_2_main.c b/src/world/area_flo/flo_18/flo_18_2_main.c
index 3087a7f0e..48e45b24b 100644
--- a/src/world/area_flo/flo_18/flo_18_2_main.c
+++ b/src/world/area_flo/flo_18/flo_18_2_main.c
@@ -20,7 +20,7 @@ LavaReset N(SafeFloorColliders)[] = {
     { .colliderID = COLLIDER_o138, .pos = { -200.0,    0.0,  120.0 }},
     { .colliderID = COLLIDER_o140, .pos = {    0.0,    0.0,  120.0 }},
     { .colliderID = COLLIDER_o142, .pos = {  170.0,    0.0,  120.0 }},
-    { .colliderID = -1 }
+    { .colliderID = NO_COLLIDER }
 };
 
 EvtScript N(EVS_Main) = {
diff --git a/src/world/area_jan/jan_22/jan_22_2_main.c b/src/world/area_jan/jan_22/jan_22_2_main.c
index efb94e593..77e0c9bd6 100644
--- a/src/world/area_jan/jan_22/jan_22_2_main.c
+++ b/src/world/area_jan/jan_22/jan_22_2_main.c
@@ -74,7 +74,7 @@ LavaReset N(SafeFloorColliders)[] = {
     { .colliderID = COLLIDER_o70,  .pos = {  750.0,    0.0,   50.0 }},
     { .colliderID = COLLIDER_o119, .pos = {  960.0,    0.0,   50.0 }},
     { .colliderID = COLLIDER_o276, .pos = {  960.0,    0.0,   50.0 }},
-    { .colliderID = -1 }
+    { .colliderID = NO_COLLIDER }
 };
 
 EvtScript N(D_8024202C_B861AC) = {
diff --git a/src/world/area_kpa/kpa_11/kpa_11_2_main.c b/src/world/area_kpa/kpa_11/kpa_11_2_main.c
index 4f0105829..84979565e 100644
--- a/src/world/area_kpa/kpa_11/kpa_11_2_main.c
+++ b/src/world/area_kpa/kpa_11/kpa_11_2_main.c
@@ -62,7 +62,7 @@ EvtScript N(D_80240F84_A53844) = {
 
 LavaReset N(SafeFloorColliders)[] = {
     { .colliderID = COLLIDER_o1234, .pos = { 1400.0,   30.0, -325.0 }},
-    { .colliderID = -1 }
+    { .colliderID = NO_COLLIDER }
 };
 
 EvtScript N(EVS_Main) = {
diff --git a/src/world/area_kpa/kpa_12/kpa_12_2_main.c b/src/world/area_kpa/kpa_12/kpa_12_2_main.c
index 51bb8aa60..a36a94c75 100644
--- a/src/world/area_kpa/kpa_12/kpa_12_2_main.c
+++ b/src/world/area_kpa/kpa_12/kpa_12_2_main.c
@@ -67,7 +67,7 @@ LavaReset N(SafeFloorColliders)[] = {
     { .colliderID = COLLIDER_o175, .pos = {  700.0,   30.0, -150.0 }},
     { .colliderID = COLLIDER_o144, .pos = {  855.0,   30.0, -100.0 }},
     { .colliderID = COLLIDER_o305, .pos = { 1445.0,   30.0, -135.0 }},
-    { .colliderID = -1 }
+    { .colliderID = NO_COLLIDER }
 };
 
 EvtScript N(EVS_Main) = {
diff --git a/src/world/area_kpa/kpa_13/kpa_13_2_main.c b/src/world/area_kpa/kpa_13/kpa_13_2_main.c
index fdc62f521..753661caf 100644
--- a/src/world/area_kpa/kpa_13/kpa_13_2_main.c
+++ b/src/world/area_kpa/kpa_13/kpa_13_2_main.c
@@ -43,7 +43,7 @@ LavaReset N(SafeFloorColliders)[] = {
     { .colliderID = COLLIDER_o1066, .pos = { 1655.0,   30.0, -175.0 }},
     { .colliderID = COLLIDER_o1068, .pos = { 1755.0,   30.0, -175.0 }},
     { .colliderID = COLLIDER_o1042, .pos = { 1860.0,   30.0, -120.0 }},
-    { .colliderID = -1 }
+    { .colliderID = NO_COLLIDER }
 };
 
 EvtScript N(EVS_Main) = {
diff --git a/src/world/area_kpa/kpa_14/kpa_14_2_main.c b/src/world/area_kpa/kpa_14/kpa_14_2_main.c
index afc78512c..e300272e5 100644
--- a/src/world/area_kpa/kpa_14/kpa_14_2_main.c
+++ b/src/world/area_kpa/kpa_14/kpa_14_2_main.c
@@ -100,7 +100,7 @@ LavaReset N(SafeFloorColliders)[] = {
     { .colliderID = COLLIDER_o198, .pos = { 1400.0,   30.0, -135.0 }},
     { .colliderID = COLLIDER_o200, .pos = { 1590.0,   30.0,  -90.0 }},
     { .colliderID = COLLIDER_o199, .pos = { 1940.0,   30.0, -135.0 }},
-    { .colliderID = -1 }
+    { .colliderID = NO_COLLIDER }
 };
 
 EvtScript N(EVS_Touch_LeftOfLavaFall) = {
diff --git a/src/world/area_kpa/kpa_16/kpa_16_2_main.c b/src/world/area_kpa/kpa_16/kpa_16_2_main.c
index f2db3f254..5ac35e4dc 100644
--- a/src/world/area_kpa/kpa_16/kpa_16_2_main.c
+++ b/src/world/area_kpa/kpa_16/kpa_16_2_main.c
@@ -102,7 +102,7 @@ LavaReset N(SafeFloorColliders)[] = {
     { .colliderID = COLLIDER_o197, .pos = {  470.0,   30.0,  -30.0 }},
     { .colliderID = COLLIDER_o202, .pos = {  470.0,   30.0,  -30.0 }},
     { .colliderID = COLLIDER_o785, .pos = {  500.0,  230.0, -140.0 }},
-    { .colliderID = -1 }
+    { .colliderID = NO_COLLIDER }
 };
 
 EvtScript N(EVS_Main) = {
diff --git a/src/world/area_kpa/kpa_60/kpa_60_3_main.c b/src/world/area_kpa/kpa_60/kpa_60_3_main.c
index 8b20fbf60..8c821f0e0 100644
--- a/src/world/area_kpa/kpa_60/kpa_60_3_main.c
+++ b/src/world/area_kpa/kpa_60/kpa_60_3_main.c
@@ -182,7 +182,7 @@ EvtScript N(EVS_TexPan_Lava) = {
 LavaReset N(SafeFloorColliders)[] = {
     { .colliderID = COLLIDER_o1559, .pos = { -455.0,  -15.0,   35.0 }},
     { .colliderID = COLLIDER_o1560, .pos = { -545.0,   10.0,   15.0 }},
-    { .colliderID = -1 }
+    { .colliderID = NO_COLLIDER }
 };
 
 EvtScript N(EVS_Main) = {
diff --git a/src/world/area_kpa/kpa_62/kpa_62_3_main.c b/src/world/area_kpa/kpa_62/kpa_62_3_main.c
index 6c73427e0..4b78c59d5 100644
--- a/src/world/area_kpa/kpa_62/kpa_62_3_main.c
+++ b/src/world/area_kpa/kpa_62/kpa_62_3_main.c
@@ -185,7 +185,7 @@ LavaReset N(SafeFloorColliders)[] = {
     { .colliderID = COLLIDER_o1559, .pos = { -455.0,  -15.0,   35.0 }},
     { .colliderID = COLLIDER_o1560, .pos = { -545.0,   10.0,   15.0 }},
     { .colliderID = COLLIDER_o1692, .pos = { -426.0,  -35.0,   70.0 }},
-    { .colliderID = -1 }
+    { .colliderID = NO_COLLIDER }
 };
 
 EvtScript N(EVS_Main) = {
diff --git a/src/world/area_kzn/kzn_02/kzn_02_1_main.c b/src/world/area_kzn/kzn_02/kzn_02_1_main.c
index 76117c788..58f598e82 100644
--- a/src/world/area_kzn/kzn_02/kzn_02_1_main.c
+++ b/src/world/area_kzn/kzn_02/kzn_02_1_main.c
@@ -93,7 +93,7 @@ LavaReset N(SafeFloorColliders)[] = {
     { .colliderID = COLLIDER_o78, .pos = {  250.0, 20.0, 15.0 }},
     { .colliderID = COLLIDER_o83, .pos = {  790.0, 20.0,  0.0 }},
     { .colliderID = COLLIDER_o84, .pos = {  790.0, 20.0,  0.0 }},
-    { .colliderID = -1 }
+    { .colliderID = NO_COLLIDER }
 };
 
 EvtScript N(EVS_Main) = {
diff --git a/src/world/area_kzn/kzn_06/kzn_06_1_main.c b/src/world/area_kzn/kzn_06/kzn_06_1_main.c
index c5434c18b..04e6d58ff 100644
--- a/src/world/area_kzn/kzn_06/kzn_06_1_main.c
+++ b/src/world/area_kzn/kzn_06/kzn_06_1_main.c
@@ -44,7 +44,7 @@ LavaReset N(SafeFloorColliders)[] = {
     { .colliderID = COLLIDER_o394, .pos = { -210.0,  75.0, 100.0 }},
     { .colliderID = COLLIDER_o440, .pos = {   60.0,  75.0, 100.0 }},
     { .colliderID = COLLIDER_o437, .pos = {   60.0,  75.0, 100.0 }},
-    { .colliderID = -1 }
+    { .colliderID = NO_COLLIDER }
 };
 
 EvtScript N(EVS_Main) = {
diff --git a/src/world/area_kzn/kzn_07/kzn_07_2_main.c b/src/world/area_kzn/kzn_07/kzn_07_2_main.c
index a68192ab0..2ea8ea967 100644
--- a/src/world/area_kzn/kzn_07/kzn_07_2_main.c
+++ b/src/world/area_kzn/kzn_07/kzn_07_2_main.c
@@ -47,7 +47,7 @@ EvtScript N(EVS_SetupTexPanners) = {
 LavaReset N(SafeFloorColliders)[] = {
     { .colliderID = COLLIDER_o365, .pos = {  120.0, 0.0, 100.0 }},
     { .colliderID = COLLIDER_o411, .pos = { -120.0, 0.0, 100.0 }},
-    { .colliderID = -1 }
+    { .colliderID = NO_COLLIDER }
 };
 
 EvtScript N(EVS_Main) = {
diff --git a/src/world/area_kzn/kzn_08/kzn_08_1_main.c b/src/world/area_kzn/kzn_08/kzn_08_1_main.c
index 14bce4e8d..c68a9adce 100644
--- a/src/world/area_kzn/kzn_08/kzn_08_1_main.c
+++ b/src/world/area_kzn/kzn_08/kzn_08_1_main.c
@@ -98,7 +98,7 @@ LavaReset N(SafeFloorColliders)[] = {
     { .colliderID = COLLIDER_o322, .pos = {  -10.0, 0.0, 100.0 }},
     { .colliderID = COLLIDER_o446, .pos = {  -10.0, 0.0, 100.0 }},
     { .colliderID = COLLIDER_o454, .pos = {  -90.0, 0.0, -45.0 }},
-    { .colliderID = -1 }
+    { .colliderID = NO_COLLIDER }
 };
 
 // unused
diff --git a/src/world/area_kzn/kzn_11/kzn_11_1_main.c b/src/world/area_kzn/kzn_11/kzn_11_1_main.c
index f4119cab7..5e1e18882 100644
--- a/src/world/area_kzn/kzn_11/kzn_11_1_main.c
+++ b/src/world/area_kzn/kzn_11/kzn_11_1_main.c
@@ -49,7 +49,7 @@ LavaReset N(SafeFloorColliders)[] = {
     { .colliderID = COLLIDER_o211, .pos = { -400.0,   20.0,    0.0 }},
     { .colliderID = COLLIDER_o212, .pos = {  230.0,   20.0,    0.0 }},
     { .colliderID = COLLIDER_o83,  .pos = {  790.0,   20.0,    0.0 }},
-    { .colliderID = -1 }
+    { .colliderID = NO_COLLIDER }
 };
 
 EvtScript N(EVS_Main) = {
diff --git a/src/world/area_kzn/kzn_18/kzn_18_1_main.c b/src/world/area_kzn/kzn_18/kzn_18_1_main.c
index bf15e5f8d..7a662b47c 100644
--- a/src/world/area_kzn/kzn_18/kzn_18_1_main.c
+++ b/src/world/area_kzn/kzn_18/kzn_18_1_main.c
@@ -52,7 +52,7 @@ EvtScript N(EVS_StartTexPanners_Lava) = {
 
 LavaReset N(SafeFloorColliders)[] = {
     { .colliderID = COLLIDER_o382, .pos = { 50.0, 200.0, -185.0 }},
-    { .colliderID = -1 }
+    { .colliderID = NO_COLLIDER }
 };
 
 EvtScript N(EVS_EnterMap) = {
diff --git a/src/world/area_kzn/kzn_20/kzn_20_2_main.c b/src/world/area_kzn/kzn_20/kzn_20_2_main.c
index 0d99032a4..52e532df3 100644
--- a/src/world/area_kzn/kzn_20/kzn_20_2_main.c
+++ b/src/world/area_kzn/kzn_20/kzn_20_2_main.c
@@ -30,7 +30,7 @@ EvtScript N(EVS_UpdateTexPan_Lava) = {
 LavaReset N(SafeFloorColliders)[] = {
     { .colliderID = COLLIDER_o919, .pos = { -30.0, 125.0, -15.0 }},
     { .colliderID = COLLIDER_o870, .pos = {  30.0, 150.0,   0.0 }},
-    { .colliderID = -1 }
+    { .colliderID = NO_COLLIDER }
 };
 
 EvtScript N(EVS_DetermineLavaLevel) = {
diff --git a/src/world/area_kzn/kzn_22/kzn_22_2_main.c b/src/world/area_kzn/kzn_22/kzn_22_2_main.c
index f840efd07..d81043417 100644
--- a/src/world/area_kzn/kzn_22/kzn_22_2_main.c
+++ b/src/world/area_kzn/kzn_22/kzn_22_2_main.c
@@ -133,7 +133,7 @@ EvtScript N(EVS_UpdateLavaLevel) = {
 LavaReset N(SafeFloorColliders)[] = {
     { .colliderID = COLLIDER_o582, .pos = { 200.0, 150.0, 180.0 }},
     { .colliderID = COLLIDER_o357, .pos = { 200.0, 150.0, 180.0 }},
-    { .colliderID = -1 }
+    { .colliderID = NO_COLLIDER }
 };
 
 EvtScript N(EVS_Main) = {
diff --git a/src/world/area_tik/tik_20/tik_20_2_main.c b/src/world/area_tik/tik_20/tik_20_2_main.c
index bf75be9da..7a93fa647 100644
--- a/src/world/area_tik/tik_20/tik_20_2_main.c
+++ b/src/world/area_tik/tik_20/tik_20_2_main.c
@@ -27,7 +27,7 @@ EvtScript N(EVS_BindExitTriggers) = {
 LavaReset N(SafeFloorColliders)[] = {
     { .colliderID = COLLIDER_yuka, .pos = { -190.0,   30.0,  -85.0 }},
     { .colliderID = COLLIDER_yuka2, .pos = {  200.0,   30.0,  -70.0 }},
-    { .colliderID = -1 }
+    { .colliderID = NO_COLLIDER }
 };
 
 #define DROPLET_MODEL MODEL_sizuku