Cleanup extracted colliders 2: ARRAY_COUNT (#2643)

2025-07-03 22:44:30 +00:00 · 2025-06-25 13:20:55 +01:00 · 2025-06-25 13:20:55 +01:00 · b7935dad12
commit b7935dad12
parent 6234d7f2aa
69 changed files with 123 additions and 74 deletions
--- a/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c
+++ b/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c
@ -6,6 +6,7 @@

 #include "z_bg_bdan_switch.h"

+#include "array_count.h"
 #include "ichain.h"
 #include "one_point_cutscene.h"
 #include "printf.h"
@ -89,7 +90,7 @@ static ColliderJntSphInit sJntSphInit = {
        OC2_TYPE_2,
        COLSHAPE_JNTSPH,
    },
-    1,
+    ARRAY_COUNT(sJntSphElementsInit),
    sJntSphElementsInit,
 };

--- a/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c
+++ b/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c
@ -6,6 +6,7 @@

 #include "z_bg_bombwall.h"
 #include "libc64/qrand.h"
+#include "array_count.h"
 #include "ichain.h"
 #include "printf.h"
 #include "sfx.h"
@ -73,7 +74,7 @@ static ColliderTrisInit sTrisInit = {
        OC2_NONE,
        COLSHAPE_TRIS,
    },
-    3,
+    ARRAY_COUNT(sTrisElementsInit),
    sTrisElementsInit,
 };

--- a/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c
+++ b/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c
@ -6,6 +6,7 @@

 #include "z_bg_haka_sgami.h"

+#include "array_count.h"
 #include "ichain.h"
 #include "sfx.h"
 #include "z_lib.h"
@ -102,7 +103,7 @@ static ColliderTrisInit sTrisInit = {
        OC2_TYPE_2,
        COLSHAPE_TRIS,
    },
-    4,
+    ARRAY_COUNT(sTrisElementsInit),
    sTrisElementsInit,
 };

--- a/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c
+++ b/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c
@ -6,6 +6,7 @@

 #include "z_bg_haka_trap.h"

+#include "array_count.h"
 #include "ichain.h"
 #include "rand.h"
 #include "sfx.h"
@ -106,7 +107,7 @@ static ColliderTrisInit sTrisInit = {
        OC2_TYPE_2,
        COLSHAPE_TRIS,
    },
-    2,
+    ARRAY_COUNT(sTrisElementsInit),
    sTrisElementsInit,
 };

--- a/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c
+++ b/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c
@ -7,6 +7,7 @@
 #include "z_bg_hidan_dalm.h"

 #include "libc64/qrand.h"
+#include "array_count.h"
 #include "ichain.h"
 #include "sfx.h"
 #include "sys_matrix.h"
@ -95,7 +96,7 @@ static ColliderTrisInit sTrisInit = {
        OC2_TYPE_2,
        COLSHAPE_TRIS,
    },
-    4,
+    ARRAY_COUNT(sTrisElementInit),
    sTrisElementInit,
 };

--- a/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c
+++ b/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c
@ -75,7 +75,7 @@ static ColliderTrisInit sTrisInit = {
        OC2_NONE,
        COLSHAPE_TRIS,
    },
-    2,
+    ARRAY_COUNT(sTrisElementsInit),
    sTrisElementsInit,
 };

--- a/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c
+++ b/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c
@ -6,6 +6,7 @@

 #include "z_bg_hidan_hrock.h"

+#include "array_count.h"
 #include "ichain.h"
 #include "rumble.h"
 #include "sfx.h"
@ -71,7 +72,7 @@ static ColliderTrisInit sTrisInit = {
        OC2_TYPE_2,
        COLSHAPE_TRIS,
    },
-    2,
+    ARRAY_COUNT(sTrisElementsInit),
    sTrisElementsInit,
 };

--- a/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c
+++ b/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c
@ -8,6 +8,7 @@
 #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h"

 #include "libc64/qrand.h"
+#include "array_count.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "ichain.h"
@ -76,7 +77,7 @@ static ColliderJntSphInit sJntSphInit = {
        OC2_NONE,
        COLSHAPE_JNTSPH,
    },
-    1,
+    ARRAY_COUNT(sJntSphElementsInit),
    sJntSphElementsInit,
 };

--- a/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c
+++ b/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c
@ -115,7 +115,7 @@ static ColliderJntSphInit sJntSphInit = {
        OC2_TYPE_2,
        COLSHAPE_JNTSPH,
    },
-    6,
+    ARRAY_COUNT(sJntSphElementsInit),
    sJntSphElementsInit,
 };

--- a/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c
+++ b/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c
@ -119,7 +119,7 @@ static ColliderJntSphInit sJntSphInit = {
        OC2_TYPE_2,
        COLSHAPE_JNTSPH,
    },
-    6,
+    ARRAY_COUNT(sJntSphElementsInit),
    sJntSphElementsInit,
 };

--- a/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c
+++ b/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c
@ -2,6 +2,7 @@
 #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h"

 #include "libc64/qrand.h"
+#include "array_count.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "ichain.h"
@ -63,7 +64,7 @@ static ColliderJntSphInit sJntSphInit = {
        OC2_TYPE_2,
        COLSHAPE_JNTSPH,
    },
-    1,
+    ARRAY_COUNT(sJntSphElementsInit),
    sJntSphElementsInit,
 };

--- a/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c
+++ b/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c
@ -8,6 +8,7 @@
 #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h"

 #include "libc64/qrand.h"
+#include "array_count.h"
 #include "ichain.h"
 #include "printf.h"
 #include "sfx.h"
@ -60,7 +61,7 @@ static ColliderJntSphInit sJntSphInit = {
        OC2_NONE,
        COLSHAPE_JNTSPH,
    },
-    1,
+    ARRAY_COUNT(sJntSphElementsInit),
    sJntSphElementsInit,
 };

--- a/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c
+++ b/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c
@ -7,6 +7,7 @@

 #include "z_bg_jya_goroiwa.h"

+#include "array_count.h"
 #include "ichain.h"
 #include "sfx.h"
 #include "z_lib.h"
@ -65,7 +66,7 @@ static ColliderJntSphInit sJntSphInit = {
        OC2_TYPE_2,
        COLSHAPE_JNTSPH,
    },
-    1,
+    ARRAY_COUNT(sJntSphElementsInit),
    sJntSphElementsInit,
 };

--- a/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c
+++ b/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c
@ -66,7 +66,7 @@ static ColliderJntSphInit sJntSphInit = {
        OC2_NONE,
        COLSHAPE_JNTSPH,
    },
-    1,
+    ARRAY_COUNT(sJntSphElementsInit),
    sJntSphElementsInit,
 };

--- a/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c
+++ b/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c
@ -69,7 +69,7 @@ static ColliderJntSphInit sJntSphInit = {
        OC2_NONE,
        COLSHAPE_JNTSPH,
    },
-    1,
+    ARRAY_COUNT(sJntSphElementsInit),
    sJntSphElementsInit,
 };

--- a/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c
+++ b/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c
@ -6,6 +6,7 @@

 #include "z_bg_menkuri_eye.h"

+#include "array_count.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "ichain.h"
@ -60,7 +61,7 @@ static ColliderJntSphInit sJntSphInit = {
        OC2_TYPE_2,
        COLSHAPE_JNTSPH,
    },
-    1,
+    ARRAY_COUNT(sJntSphElementsInit),
    sJntSphElementsInit,
 };

--- a/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c
+++ b/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c
@ -78,7 +78,7 @@ static ColliderTrisInit sTrisInitFloor = {
        OC2_NONE,
        COLSHAPE_TRIS,
    },
-    2,
+    ARRAY_COUNT(sTrisElementsInitFloor),
    sTrisElementsInitFloor,
 };

@ -105,7 +105,7 @@ static ColliderTrisInit sTrisInitRutoWall = {
        OC2_NONE,
        COLSHAPE_TRIS,
    },
-    1,
+    ARRAY_COUNT(sTrisElementsInitRutoWall),
    sTrisElementsInitRutoWall,
 };

@ -143,7 +143,7 @@ static ColliderTrisInit sTrisInitUnusedWall = {
        OC2_NONE,
        COLSHAPE_TRIS,
    },
-    2,
+    ARRAY_COUNT(sTrisElementsInitWall),
    sTrisElementsInitWall,
 };

@ -156,7 +156,7 @@ static ColliderTrisInit sTrisInitStingerWall = {
        OC2_NONE,
        COLSHAPE_TRIS,
    },
-    2,
+    ARRAY_COUNT(sTrisElementsInitWall),
    sTrisElementsInitWall,
 };

--- a/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c
+++ b/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c
@ -70,7 +70,7 @@ static ColliderJntSphInit sJntSphInit = {
        OC2_NONE,
        COLSHAPE_JNTSPH,
    },
-    1,
+    ARRAY_COUNT(sJntSphElementsInit),
    sJntSphElementsInit,
 };

--- a/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c
+++ b/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c
@ -7,6 +7,7 @@
 #include "z_bg_po_event.h"

 #include "libc64/qrand.h"
+#include "array_count.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "ichain.h"
@ -89,7 +90,7 @@ static ColliderTrisInit sTrisInit = {
        OC2_TYPE_2,
        COLSHAPE_TRIS,
    },
-    2,
+    ARRAY_COUNT(sTrisElementsInit),
    sTrisElementsInit,
 };

--- a/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c
+++ b/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c
@ -6,6 +6,7 @@

 #include "z_bg_spot06_objects.h"

+#include "array_count.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "ichain.h"
@ -93,7 +94,7 @@ static ColliderJntSphInit sJntSphInit = {
        OC2_TYPE_2,
        COLSHAPE_JNTSPH,
    },
-    1,
+    ARRAY_COUNT(sJntSphElementsInit),
    sJntSphElementsInit,
 };

--- a/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c
+++ b/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c
@ -85,7 +85,7 @@ static ColliderJntSphInit sJntSphInit = {
        OC2_TYPE_2,
        COLSHAPE_JNTSPH,
    },
-    3,
+    ARRAY_COUNT(sJntSphElementsInit),
    sJntSphElementsInit,
 };

--- a/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c
+++ b/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c
@ -75,7 +75,7 @@ static ColliderJntSphInit sJntSphInit = {
        OC2_TYPE_2,
        COLSHAPE_JNTSPH,
    },
-    1,
+    ARRAY_COUNT(sJntSphElementsInit),
    sJntSphElementsInit,
 };

--- a/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c
+++ b/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c
@ -83,7 +83,7 @@ static ColliderJntSphInit sJntSphInit = {
        OC2_TYPE_2,
        COLSHAPE_JNTSPH,
    },
-    2,
+    ARRAY_COUNT(sJntSphElementsInit),
    sJntSphElementsInit,
 };

--- a/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c
+++ b/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c
@ -6,6 +6,7 @@

 #include "z_bg_ydan_maruta.h"

+#include "array_count.h"
 #include "ichain.h"
 #include "one_point_cutscene.h"
 #include "sfx.h"
@ -73,7 +74,7 @@ static ColliderTrisInit sTrisInit = {
        OC2_TYPE_2,
        COLSHAPE_TRIS,
    },
-    2,
+    ARRAY_COUNT(sTrisElementsInit),
    sTrisElementsInit,
 };

--- a/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c
+++ b/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c
@ -7,6 +7,7 @@
 #include "z_bg_ydan_sp.h"

 #include "libc64/qrand.h"
+#include "array_count.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "ichain.h"
@ -85,7 +86,7 @@ static ColliderTrisInit sTrisInit = {
        OC2_TYPE_2,
        COLSHAPE_TRIS,
    },
-    2,
+    ARRAY_COUNT(sTrisElementsInit),
    sTrisElementsInit,
 };

--- a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo_data.inc.c
+++ b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo_data.inc.c
@ -1,3 +1,4 @@
+#include "array_count.h"
 #include "collision_check.h"

 static u8 D_808C7000[] = {
@ -231,7 +232,7 @@ static ColliderJntSphInit sJntSphInit = {
        OC2_TYPE_1,
        COLSHAPE_JNTSPH,
    },
-    19,
+    ARRAY_COUNT(sJntSphElementsInit),
    sJntSphElementsInit,
 };

--- a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd_colchk.inc.c
+++ b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd_colchk.inc.c
@ -221,6 +221,6 @@ static ColliderJntSphInit sJntSphInit = {
        OC2_TYPE_1,
        COLSHAPE_JNTSPH,
    },
-    19,
+    ARRAY_COUNT(sJntSphElementsInit),
    sJntSphElementsInit,
 };
--- a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2_colchk.inc.c
+++ b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2_colchk.inc.c
@ -111,6 +111,6 @@ static ColliderJntSphInit sJntSphInit = {
        OC2_TYPE_1,
        COLSHAPE_JNTSPH,
    },
-    9,
+    ARRAY_COUNT(sJntSphElementsInit),
    sJntSphElementsInit,
 };
--- a/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c
+++ b/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c
@ -247,7 +247,7 @@ static ColliderJntSphInit sColliderJntSphInit = {
        OC2_TYPE_1,
        COLSHAPE_JNTSPH,
    },
-    13,
+    ARRAY_COUNT(sColliderJntSphElementsInit),
    sColliderJntSphElementsInit,
 };

--- a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo_colchk.inc.c
+++ b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo_colchk.inc.c
@ -221,7 +221,7 @@ static ColliderJntSphInit sJntSphInit = {
        OC2_TYPE_1,
        COLSHAPE_JNTSPH,
    },
-    19,
+    ARRAY_COUNT(sJntSphElementsInit),
    sJntSphElementsInit,
 };

--- a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst_colchk.inc.c
+++ b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst_colchk.inc.c
@ -1,3 +1,4 @@
+#include "array_count.h"
 #include "collision_check.h"

 static ColliderJntSphElementInit sJntSphElementsInitHand[] = {
@ -133,7 +134,7 @@ static ColliderJntSphInit sJntSphInitHand = {
        OC2_TYPE_1,
        COLSHAPE_JNTSPH,
    },
-    11,
+    ARRAY_COUNT(sJntSphElementsInitHand),
    sJntSphElementsInitHand,
 };

@ -270,7 +271,7 @@ static ColliderJntSphInit sJntSphInitHead = {
        OC2_TYPE_1,
        COLSHAPE_JNTSPH,
    },
-    11,
+    ARRAY_COUNT(sJntSphElementsInitHead),
    sJntSphElementsInitHead,
 };

--- a/src/overlays/actors/ovl_Door_Killer/z_door_killer.c
+++ b/src/overlays/actors/ovl_Door_Killer/z_door_killer.c
@ -6,6 +6,7 @@

 #include "z_door_killer.h"

+#include "array_count.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "printf.h"
@ -96,7 +97,7 @@ static ColliderJntSphInit sJntSphInit = {
        OC2_NONE,
        COLSHAPE_JNTSPH,
    },
-    1,
+    ARRAY_COUNT(sJntSphElementsInit),
    sJntSphElementsInit,
 };

--- a/src/overlays/actors/ovl_En_Ba/z_en_ba.c
+++ b/src/overlays/actors/ovl_En_Ba/z_en_ba.c
@ -6,6 +6,7 @@

 #include "z_en_ba.h"

+#include "array_count.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "ichain.h"
@ -85,7 +86,7 @@ static ColliderJntSphInit sJntSphInit = {
        OC2_NONE,
        COLSHAPE_JNTSPH,
    },
-    2,
+    ARRAY_COUNT(sJntSphElementsInit),
    sJntSphElementsInit,
 };

--- a/src/overlays/actors/ovl_En_Bb/z_en_bb.c
+++ b/src/overlays/actors/ovl_En_Bb/z_en_bb.c
@ -7,6 +7,7 @@
 #include "z_en_bb.h"

 #include "libc64/qrand.h"
+#include "array_count.h"
 #include "attributes.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
@ -248,7 +249,7 @@ static ColliderJntSphInit sJntSphInit = {
        OC2_TYPE_1,
        COLSHAPE_JNTSPH,
    },
-    1,
+    ARRAY_COUNT(sJntSphElementsInit),
    sJntSphElementsInit,
 };

--- a/src/overlays/actors/ovl_En_Bom/z_en_bom.c
+++ b/src/overlays/actors/ovl_En_Bom/z_en_bom.c
@ -7,6 +7,7 @@
 #include "z_en_bom.h"
 #include "overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h"

+#include "array_count.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "ichain.h"
@ -85,7 +86,7 @@ static ColliderJntSphInit sJntSphInit = {
        OC2_NONE,
        COLSHAPE_JNTSPH,
    },
-    1,
+    ARRAY_COUNT(sJntSphElementsInit),
    sJntSphElementsInit,
 };

--- a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c
+++ b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c
@ -7,6 +7,7 @@
 #include "z_en_bombf.h"
 #include "overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h"

+#include "array_count.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "regs.h"
@ -89,7 +90,7 @@ static ColliderJntSphInit sJntSphInit = {
        OC2_NONE,
        COLSHAPE_JNTSPH,
    },
-    1,
+    ARRAY_COUNT(sJntSphElementsInit),
    sJntSphElementsInit,
 };

--- a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c
+++ b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c
@ -1,6 +1,7 @@
 #include "z_en_bubble.h"

 #include "libc64/qrand.h"
+#include "array_count.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "sfx.h"
@ -70,7 +71,7 @@ static ColliderJntSphInit sJntSphInit = {
        OC2_TYPE_1,
        COLSHAPE_JNTSPH,
    },
-    2,
+    ARRAY_COUNT(sJntSphElementsInit),
    sJntSphElementsInit,
 };

--- a/src/overlays/actors/ovl_En_Butte/z_en_butte.c
+++ b/src/overlays/actors/ovl_En_Butte/z_en_butte.c
@ -8,6 +8,7 @@
 #include "overlays/actors/ovl_En_Elf/z_en_elf.h"

 #include "libc64/qrand.h"
+#include "array_count.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "ichain.h"
@ -62,7 +63,7 @@ static ColliderJntSphInit sColliderJntSphInit = {
        OC2_TYPE_1,
        COLSHAPE_JNTSPH,
    },
-    1,
+    ARRAY_COUNT(sJntSphElementsInit),
    sJntSphElementsInit,
 };

--- a/src/overlays/actors/ovl_En_Crow/z_en_crow.c
+++ b/src/overlays/actors/ovl_En_Crow/z_en_crow.c
@ -1,5 +1,6 @@
 #include "z_en_crow.h"

+#include "array_count.h"
 #include "gfx_setupdl.h"
 #include "ichain.h"
 #include "rand.h"
@ -66,7 +67,7 @@ static ColliderJntSphInit sJntSphInit = {
        OC2_TYPE_1,
        COLSHAPE_JNTSPH,
    },
-    1,
+    ARRAY_COUNT(sJntSphElementsInit),
    sJntSphElementsInit,
 };

--- a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c
+++ b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c
@ -144,7 +144,7 @@ static ColliderJntSphInit sJntSphInit = {
        OC2_TYPE_1,
        COLSHAPE_JNTSPH,
    },
-    7,
+    ARRAY_COUNT(sJntSphElementsInit),
    sJntSphElementsInit,
 };

--- a/src/overlays/actors/ovl_En_Dh/z_en_dh.c
+++ b/src/overlays/actors/ovl_En_Dh/z_en_dh.c
@ -7,6 +7,7 @@
 #include "z_en_dh.h"

 #include "libc64/qrand.h"
+#include "array_count.h"
 #include "attributes.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
@ -113,7 +114,7 @@ static ColliderJntSphInit sJntSphInit = {
        OC2_TYPE_1,
        COLSHAPE_JNTSPH,
    },
-    1,
+    ARRAY_COUNT(sJntSphElementsInit),
    sJntSphElementsInit,
 };

--- a/src/overlays/actors/ovl_En_Dha/z_en_dha.c
+++ b/src/overlays/actors/ovl_En_Dha/z_en_dha.c
@ -8,6 +8,7 @@
 #include "overlays/actors/ovl_En_Dh/z_en_dh.h"

 #include "libc64/qrand.h"
+#include "array_count.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "ichain.h"
@ -151,7 +152,7 @@ static ColliderJntSphInit sJntSphInit = {
        OC2_TYPE_1,
        COLSHAPE_JNTSPH,
    },
-    5,
+    ARRAY_COUNT(sJntSphElementsInit),
    sJntSphElementsInit,
 };

--- a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c
+++ b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c
@ -3,6 +3,7 @@
 #include "overlays/actors/ovl_En_Bombf/z_en_bombf.h"

 #include "libc64/qrand.h"
+#include "array_count.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "ichain.h"
@ -141,7 +142,7 @@ static ColliderJntSphInit sBodyJntSphInit = {
        OC2_TYPE_1,
        COLSHAPE_JNTSPH,
    },
-    6,
+    ARRAY_COUNT(sBodyElementsInit),
    sBodyElementsInit,
 };

@ -190,7 +191,7 @@ static ColliderTrisInit sHardTrisInit = {
        OC2_NONE,
        COLSHAPE_TRIS,
    },
-    3,
+    ARRAY_COUNT(sHardElementsInit),
    sHardElementsInit,
 };

--- a/src/overlays/actors/ovl_En_Fd/z_en_fd.c
+++ b/src/overlays/actors/ovl_En_Fd/z_en_fd.c
@ -8,6 +8,7 @@

 #include "libc64/math64.h"
 #include "libc64/qrand.h"
+#include "array_count.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "segmented_address.h"
@ -206,7 +207,7 @@ static ColliderJntSphInit sJntSphInit = {
        OC2_TYPE_1,
        COLSHAPE_JNTSPH,
    },
-    12,
+    ARRAY_COUNT(sJntSphElementsInit),
    sJntSphElementsInit,
 };

--- a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c
+++ b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c
@ -8,6 +8,7 @@
 #include "overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.h"

 #include "libc64/qrand.h"
+#include "array_count.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "ichain.h"
@ -85,7 +86,7 @@ static ColliderJntSphInit sJntSphInit = {
        OC2_TYPE_1,
        COLSHAPE_JNTSPH,
    },
-    1,
+    ARRAY_COUNT(sJntSphElementsInit),
    sJntSphElementsInit,
 };

--- a/src/overlays/actors/ovl_En_Fish/z_en_fish.c
+++ b/src/overlays/actors/ovl_En_Fish/z_en_fish.c
@ -7,6 +7,7 @@
 #include "z_en_fish.h"

 #include "libc64/qrand.h"
+#include "array_count.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "ichain.h"
@ -73,7 +74,7 @@ static ColliderJntSphInit sJntSphInit = {
        OC2_TYPE_1,
        COLSHAPE_JNTSPH,
    },
-    1,
+    ARRAY_COUNT(sJntSphElementsInit),
    sJntSphElementsInit,
 };

--- a/src/overlays/actors/ovl_En_Fw/z_en_fw.c
+++ b/src/overlays/actors/ovl_En_Fw/z_en_fw.c
@ -9,6 +9,7 @@

 #include "libc64/math64.h"
 #include "libc64/qrand.h"
+#include "array_count.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "segmented_address.h"
@ -74,7 +75,7 @@ static ColliderJntSphInit sJntSphInit = {
        OC2_TYPE_1,
        COLSHAPE_JNTSPH,
    },
-    1,
+    ARRAY_COUNT(sJntSphElementsInit),
    sJntSphElementsInit,
 };

--- a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c
+++ b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c
@ -7,6 +7,7 @@
 #include "z_en_geldb.h"

 #include "libc64/qrand.h"
+#include "array_count.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "ichain.h"
@ -153,7 +154,7 @@ static ColliderTrisInit sBlockTrisInit = {
        OC2_NONE,
        COLSHAPE_TRIS,
    },
-    2,
+    ARRAY_COUNT(sBlockTrisElementsInit),
    sBlockTrisElementsInit,
 };

--- a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c
+++ b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c
@ -8,6 +8,7 @@
 #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h"

 #include "libc64/qrand.h"
+#include "array_count.h"
 #include "ichain.h"
 #include "printf.h"
 #include "quake.h"
@ -93,7 +94,7 @@ static ColliderJntSphInit sJntSphInit = {
        OC2_TYPE_2,
        COLSHAPE_JNTSPH,
    },
-    1,
+    ARRAY_COUNT(sJntSphElementsInit),
    sJntSphElementsInit,
 };

--- a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c
+++ b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c
@ -7,6 +7,7 @@
 #include "z_en_honotrap.h"

 #include "libc64/qrand.h"
+#include "array_count.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "ichain.h"
@ -110,7 +111,7 @@ static ColliderTrisInit sTrisInit = {
        OC2_NONE,
        COLSHAPE_TRIS,
    },
-    2,
+    ARRAY_COUNT(sTrisElementsInit),
    sTrisElementsInit,
 };

--- a/src/overlays/actors/ovl_En_Horse/z_en_horse.c
+++ b/src/overlays/actors/ovl_En_Horse/z_en_horse.c
@ -166,7 +166,7 @@ static ColliderJntSphInit sJntSphInit = {
        OC2_TYPE_1 | OC2_UNK1,
        COLSHAPE_JNTSPH,
    },
-    1,
+    ARRAY_COUNT(sJntSphElementsInit),
    sJntSphElementsInit,
 };

--- a/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c
+++ b/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c
@ -7,6 +7,7 @@
 #include "z_en_horse_ganon.h"

 #include "libc64/math64.h"
+#include "array_count.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "ichain.h"
@ -97,7 +98,7 @@ static ColliderJntSphInit sJntSphInit = {
        OC2_TYPE_1 | OC2_UNK1,
        COLSHAPE_JNTSPH,
    },
-    1,
+    ARRAY_COUNT(sJntSphElementsInit),
    sJntSphElementsInit,
 };

--- a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c
+++ b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c
@ -96,7 +96,7 @@ static ColliderJntSphInit sJntSphInit = {
        OC2_TYPE_1 | OC2_UNK1,
        COLSHAPE_JNTSPH,
    },
-    1,
+    ARRAY_COUNT(sJntSphElementsInit),
    sJntSphElementsInit,
 };

--- a/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c
+++ b/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c
@ -88,7 +88,7 @@ static ColliderJntSphInit sJntSphInit = {
        OC2_TYPE_1 | OC2_UNK1,
        COLSHAPE_JNTSPH,
    },
-    1,
+    ARRAY_COUNT(sJntSphElementsInit),
    sJntSphElementsInit,
 };

--- a/src/overlays/actors/ovl_En_Ik/z_en_ik.c
+++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.c
@ -141,7 +141,7 @@ static ColliderTrisInit sTrisInit = {
        OC2_NONE,
        COLSHAPE_TRIS,
    },
-    2,
+    ARRAY_COUNT(sTrisElementsInit),
    sTrisElementsInit,
 };

--- a/src/overlays/actors/ovl_En_Insect/z_en_insect.c
+++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.c
@ -8,6 +8,7 @@
 #include "overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.h"

 #include "libc64/qrand.h"
+#include "array_count.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "ichain.h"
@ -93,7 +94,7 @@ static ColliderJntSphInit sColliderJntSphInit = {
        OC2_TYPE_1,
        COLSHAPE_JNTSPH,
    },
-    1,
+    ARRAY_COUNT(sColliderElementsInit),
    sColliderElementsInit,
 };

--- a/src/overlays/actors/ovl_En_Mb/z_en_mb.c
+++ b/src/overlays/actors/ovl_En_Mb/z_en_mb.c
@ -7,6 +7,7 @@
 #include "z_en_mb.h"

 #include "libc64/qrand.h"
+#include "array_count.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "ichain.h"
@ -160,7 +161,7 @@ static ColliderTrisInit sFrontShieldingTrisInit = {
        OC2_NONE,
        COLSHAPE_TRIS,
    },
-    2,
+    ARRAY_COUNT(sFrontShieldingTrisElementsInit),
    sFrontShieldingTrisElementsInit,
 };

--- a/src/overlays/actors/ovl_En_Ny/z_en_ny.c
+++ b/src/overlays/actors/ovl_En_Ny/z_en_ny.c
@ -1,6 +1,7 @@
 #include "z_en_ny.h"

 #include "libc64/math64.h"
+#include "array_count.h"
 #include "attributes.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
@ -74,7 +75,7 @@ static ColliderJntSphInit sColliderJntSphInit = {
        OC2_TYPE_1,
        COLSHAPE_JNTSPH,
    },
-    1,
+    ARRAY_COUNT(sJntSphElementsInit),
    sJntSphElementsInit,
 };

--- a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c
+++ b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c
@ -3,6 +3,7 @@
 #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h"

 #include "libc64/qrand.h"
+#include "array_count.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "ichain.h"
@ -113,7 +114,7 @@ static ColliderJntSphInit sJntSphInit = {
        OC2_TYPE_1,
        COLSHAPE_JNTSPH,
    },
-    1,
+    ARRAY_COUNT(sJntSphElementsInit),
    sJntSphElementsInit,
 };

--- a/src/overlays/actors/ovl_En_Poh/z_en_poh.c
+++ b/src/overlays/actors/ovl_En_Poh/z_en_poh.c
@ -7,6 +7,7 @@
 #include "z_en_poh.h"

 #include "libc64/qrand.h"
+#include "array_count.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "ichain.h"
@ -113,7 +114,7 @@ static ColliderJntSphInit sJntSphInit = {
        OC2_TYPE_1,
        COLSHAPE_JNTSPH,
    },
-    1,
+    ARRAY_COUNT(sJntSphElementsInit),
    sJntSphElementsInit,
 };

--- a/src/overlays/actors/ovl_En_Skb/z_en_skb.c
+++ b/src/overlays/actors/ovl_En_Skb/z_en_skb.c
@ -8,6 +8,7 @@
 #include "overlays/actors/ovl_En_Encount1/z_en_encount1.h"

 #include "libc64/qrand.h"
+#include "array_count.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "ichain.h"
@ -89,7 +90,7 @@ static ColliderJntSphInit sJntSphInit = {
        OC2_TYPE_1,
        COLSHAPE_JNTSPH,
    },
-    2,
+    ARRAY_COUNT(sJntSphElementsInit),
    sJntSphElementsInit,
 };

--- a/src/overlays/actors/ovl_En_St/z_en_st.c
+++ b/src/overlays/actors/ovl_En_St/z_en_st.c
@ -121,7 +121,7 @@ static ColliderJntSphInit sJntSphInit = {
        OC2_TYPE_1,
        COLSHAPE_JNTSPH,
    },
-    1,
+    ARRAY_COUNT(sJntSphElementsInit),
    sJntSphElementsInit,
 };

--- a/src/overlays/actors/ovl_En_Sw/z_en_sw.c
+++ b/src/overlays/actors/ovl_En_Sw/z_en_sw.c
@ -2,6 +2,7 @@

 #include "libc64/math64.h"
 #include "libc64/qrand.h"
+#include "array_count.h"
 #include "attributes.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
@ -71,7 +72,7 @@ static ColliderJntSphInit sJntSphInit = {
        OC2_TYPE_1,
        COLSHAPE_JNTSPH,
    },
-    1,
+    ARRAY_COUNT(sJntSphElementsInit),
    sJntSphElementsInit,
 };

--- a/src/overlays/actors/ovl_En_Tite/z_en_tite.c
+++ b/src/overlays/actors/ovl_En_Tite/z_en_tite.c
@ -9,6 +9,7 @@
 #include "overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h"

 #include "libc64/qrand.h"
+#include "array_count.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "ichain.h"
@ -125,7 +126,7 @@ static ColliderJntSphInit sJntSphInit = {
        OC2_TYPE_1,
        COLSHAPE_JNTSPH,
    },
-    1,
+    ARRAY_COUNT(sJntSphElementsInit),
    sJntSphElementsInit,
 };

--- a/src/overlays/actors/ovl_En_Tp/z_en_tp.c
+++ b/src/overlays/actors/ovl_En_Tp/z_en_tp.c
@ -7,6 +7,7 @@
 #include "z_en_tp.h"

 #include "libc64/qrand.h"
+#include "array_count.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "ichain.h"
@ -91,7 +92,7 @@ static ColliderJntSphInit sJntSphInit = {
        OC2_TYPE_1,
        COLSHAPE_JNTSPH,
    },
-    1,
+    ARRAY_COUNT(sJntSphElementsInit),
    sJntSphElementsInit,
 };

--- a/src/overlays/actors/ovl_Fishing/z_fishing.c
+++ b/src/overlays/actors/ovl_Fishing/z_fishing.c
@ -9,6 +9,7 @@
 #include "overlays/actors/ovl_En_Kanban/z_en_kanban.h"
 #include "assets/objects/object_fish/object_fish.h"
 #include "libc64/math64.h"
+#include "array_count.h"
 #include "attributes.h"
 #include "controller.h"
 #include "gfx.h"
@ -368,7 +369,7 @@ static ColliderJntSphInit sJntSphInit = {
        OC2_TYPE_1,
        COLSHAPE_JNTSPH,
    },
-    12,
+    ARRAY_COUNT(sJntSphElementsInit),
    sJntSphElementsInit,
 };

--- a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c
+++ b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c
@ -7,6 +7,7 @@
 #include "z_mir_ray.h"

 #include "libu64/debug.h"
+#include "array_count.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "ichain.h"
@ -102,7 +103,7 @@ static ColliderJntSphInit sJntSphInit = {
        OC2_NONE,
        COLSHAPE_JNTSPH,
    },
-    1,
+    ARRAY_COUNT(sJntSphElementsInit),
    sJntSphElementsInit,
 };

--- a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c
+++ b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c
@ -8,6 +8,7 @@
 #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h"

 #include "libc64/qrand.h"
+#include "array_count.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "ichain.h"
@ -66,7 +67,7 @@ static ColliderJntSphInit sJntSphInit = {
        OC2_TYPE_2,
        COLSHAPE_JNTSPH,
    },
-    1,
+    ARRAY_COUNT(sJntSphElementsInit),
    sJntSphElementsInit,
 };

--- a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c
+++ b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c
@ -8,6 +8,7 @@
 #include "overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h"

 #include "libc64/qrand.h"
+#include "array_count.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "ichain.h"
@ -84,7 +85,7 @@ static ColliderJntSphInit sColliderJntSphInit = {
        OC2_TYPE_2,
        COLSHAPE_JNTSPH,
    },
-    1,
+    ARRAY_COUNT(sColliderJntSphElementsInit),
    sColliderJntSphElementsInit,
 };