add array_count.h (#2514)

include/array_count.h

@@ -0,0 +1,8 @@
+#ifndef ARRAY_COUNT_H
+#define ARRAY_COUNT_H
+
+#define ARRAY_COUNT(arr) (s32)(sizeof(arr) / sizeof(arr[0]))
+#define ARRAY_COUNTU(arr) (u32)(sizeof(arr) / sizeof(arr[0]))
+#define ARRAY_COUNT_2D(arr) (s32)(sizeof(arr) / sizeof(arr[0][0]))
+
+#endif

include/macros.h

@@ -1,10 +1,6 @@
 #ifndef MACROS_H
 #define MACROS_H
 
-#define ARRAY_COUNT(arr) (s32)(sizeof(arr) / sizeof(arr[0]))
-#define ARRAY_COUNTU(arr) (u32)(sizeof(arr) / sizeof(arr[0]))
-#define ARRAY_COUNT_2D(arr) (s32)(sizeof(arr) / sizeof(arr[0][0]))
-
 #define CHECK_FLAG_ALL(flags, mask) (((flags) & (mask)) == (mask))
 
 #endif

include/z64.h

@@ -4,6 +4,7 @@
 // TODO: This file still exists ONLY to provide neccesary headers to extracted assets.
 //       After assets are modified to include the headers they need directly, delete this file.
 
+#include "array_count.h"
 #include "gfx.h"
 #include "sequence.h"
 #include "sys_matrix.h"

src/audio/data.c

@@ -1,7 +1,7 @@
+#include "array_count.h"
+#include "sfx.h"
 #include "ultra64.h"
 #include "z64audio.h"
-#include "macros.h"
-#include "sfx.h"
 
 // sSfxRequests ring buffer endpoints. read index <= write index, wrapping around mod 256.
 u8 gSfxRequestWriteIndex = 0;

src/audio/general.c

@@ -1,5 +1,5 @@
 #include "libu64/gfxprint.h"
-#include "ultra64.h"
+#include "array_count.h"
 #include "attributes.h"
 #include "audiothread_cmd.h"
 #include "controller.h"
@@ -8,6 +8,7 @@
 #include "seqcmd.h"
 #include "sequence.h"
 #include "sfx.h"
+#include "ultra64.h"
 #include "versions.h"
 #include "z64audio.h"
 #include "z64ocarina.h"

src/audio/lib/load.c

@@ -1,3 +1,4 @@
+#include "array_count.h"
 #include "attributes.h"
 #include "buffers.h"
 #include "segment_symbols.h"

src/audio/lib/seqplayer.c

@@ -14,6 +14,7 @@
  *     Otherwise, each set of instructions has its own command interpreter
  */
 #include "audio/aseq.h"
+#include "array_count.h"
 #include "assert.h"
 #include "attributes.h"
 #include "macros.h"

src/audio/lib/thread.c

@@ -1,3 +1,4 @@
+#include "array_count.h"
 #include "audiothread_cmd.h"
 #include "macros.h"
 #include "ultra64.h"

src/audio/sequence.c

@@ -17,15 +17,14 @@
  * Nor are these commands to be confused with the internal audio commands used to transfer requests from
  * the graph thread to the audio thread.
  */
+#include "array_count.h"
 #include "audiothread_cmd.h"
-#include "ultra64.h"
-#include "ultra64/abi.h"
 #include "seqcmd.h"
 #include "sfx.h"
+#include "ultra64.h"
+#include "ultra64/abi.h"
 #include "z64audio.h"
 
-#include "macros.h"
-
 // Direct audio command (skips the queueing system)
 #define SEQCMD_SET_SEQPLAYER_VOLUME_NOW(seqPlayerIndex, duration, volume)                       \
     Audio_ProcessSeqCmd((SEQCMD_OP_SET_SEQPLAYER_VOLUME << 28) | ((u8)(seqPlayerIndex) << 24) | \

src/audio/session_init.c

@@ -1,3 +1,4 @@
+#include "array_count.h"
 #include "buffers.h"
 #include "z64audio.h"
 

src/audio/sfx.c

@@ -1,3 +1,4 @@
+#include "array_count.h"
 #include "audiothread_cmd.h"
 #include "macros.h"
 #include "printf.h"

src/boot/idle.c

@@ -1,3 +1,4 @@
+#include "array_count.h"
 #include "buffers.h"
 #include "build.h"
 #include "idle.h"

src/boot/z_std_dma.c

@@ -21,6 +21,7 @@
 #include "libc64/sleep.h"
 #include "libc64/sprintf.h"
 #include "libu64/debug.h"
+#include "array_count.h"
 #include "attributes.h"
 #include "carthandle.h"
 #include "fault.h"

src/code/audio_stop_all_sfx.c

@@ -1,6 +1,7 @@
+#include "array_count.h"
 #include "sfx.h"
-
 #include "ultra64.h"
+
 #include "macros.h"
 
 u8 sSfxBankIds[] = {

src/code/audio_thread_manager.c

@@ -5,6 +5,7 @@
  * and sending the audio rsp tasks generated by the driver to the task scheduler.
  */
 
+#include "array_count.h"
 #include "audiomgr.h"
 #include "printf.h"
 #include "regs.h"

src/code/db_camera.c

@@ -1,4 +1,5 @@
 #include "libu64/gfxprint.h"
+#include "array_count.h"
 #include "attributes.h"
 #include "controller.h"
 #include "db_camera.h"

src/code/fault_gc.c

@@ -47,6 +47,7 @@
 #include "libc64/sleep.h"
 #include "libc64/sprintf.h"
 #include "alloca.h"
+#include "array_count.h"
 #include "controller.h"
 #include "gfx.h"
 #include "padmgr.h"

src/code/fault_gc_drawer.c

@@ -5,6 +5,7 @@
  * the crash screen implemented by fault.c
  */
 
+#include "array_count.h"
 #include "fault.h"
 
 #include "gfx.h"

src/code/fault_n64.c

@@ -1,6 +1,7 @@
 #include "libc64/os_malloc.h"
 #include "libc64/sleep.h"
 #include "libc64/sprintf.h"
+#include "array_count.h"
 #include "controller.h"
 #include "fault.h"
 #include "gfx.h"

src/code/game.c

@@ -2,6 +2,7 @@
 #include "libc64/os_malloc.h"
 #include "libu64/debug.h"
 #include "libu64/gfxprint.h"
+#include "array_count.h"
 #include "audiomgr.h"
 #include "buffers.h"
 #include "controller.h"

src/code/graph.c

@@ -1,7 +1,7 @@
 #include "libc64/malloc.h"
 #include "libc64/sprintf.h"
 #include "libu64/debug.h"
-
+#include "array_count.h"
 #include "buffers.h"
 #include "console_logo_state.h"
 #include "controller.h"

src/code/irqmgr.c

@@ -33,6 +33,7 @@
  * @see sched.c
  */
 #include "libu64/debug.h"
+#include "array_count.h"
 #include "irqmgr.h"
 #include "printf.h"
 #include "stackcheck.h"

src/code/main.c

@@ -19,6 +19,7 @@ extern struct IrqMgr gIrqMgr;
 #include "libc64/malloc.h"
 #include "libu64/rcp_utils.h"
 #include "libu64/runtime.h"
+#include "array_count.h"
 #include "audiomgr.h"
 #include "debug_arena.h"
 #include "fault.h"

src/code/object_table.c

@@ -1,3 +1,4 @@
+#include "array_count.h"
 #include "segment_symbols.h"
 #include "romfile.h"
 #include "ultra64.h"

src/code/padmgr.c

@@ -30,7 +30,7 @@
  */
 #include "libu64/debug.h"
 #include "libu64/padsetup.h"
-#include "macros.h"
+#include "array_count.h"
 #include "padmgr.h"
 #include "printf.h"
 #include "fault.h"
@@ -38,6 +38,8 @@
 #include "translation.h"
 #include "line_numbers.h"
 
+#include "macros.h"
+
 #define PADMGR_LOG(controllerNum, msg)                                                                \
     if (DEBUG_FEATURES) {                                                                             \
         PRINTF_COLOR_YELLOW();                                                                        \

src/code/sched.c

@@ -41,6 +41,7 @@
  */
 #include "libu64/debug.h"
 #include "libu64/rcp_utils.h"
+#include "array_count.h"
 #include "fault.h"
 #include "irqmgr.h"
 #include "main.h"

src/code/speed_meter.c

@@ -2,6 +2,7 @@
                                "pal-1.0:0 pal-1.1:0"
 #include "libc64/malloc.h"
 #include "libu64/debug.h"
+#include "array_count.h"
 #include "gfx.h"
 #include "printf.h"
 #include "regs.h"

src/code/sys_math_atan.c

@@ -1,5 +1,7 @@
+#include "array_count.h"
 #include "sys_math.h"
 #include "z64math.h"
+
 #include "macros.h"
 
 static u16 sAtan2Tbl[] = {

src/code/ucode_disas.c

@@ -1,10 +1,11 @@
-#include "ucode_disas.h"
-#include "ultra64.h"
-#include "ultra64/gs2dex.h"
 #include "libu64/mtxuty-cvt.h"
+#include "ultra64/gs2dex.h"
+#include "array_count.h"
 #include "printf.h"
 #include "segmented_address.h"
 #include "translation.h"
+#include "ucode_disas.h"
+#include "ultra64.h"
 
 #include "macros.h"
 

src/code/z_actor.c

@@ -1,5 +1,6 @@
 #include "libc64/math64.h"
 #include "libu64/overlay.h"
+#include "array_count.h"
 #include "fault.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"

src/code/z_bgcheck.c

@@ -1,4 +1,5 @@
 #include "libu64/debug.h"
+#include "array_count.h"
 #include "attributes.h"
 #include "line_numbers.h"
 #include "printf.h"

src/code/z_camera.c

@@ -1,7 +1,6 @@
 #include "libc64/math64.h"
 #include "libc64/qrand.h"
-#include "ultra64.h"
-
+#include "array_count.h"
 #include "attributes.h"
 #include "controller.h"
 #include "db_camera.h"
@@ -15,6 +14,7 @@
 #include "sys_math3d.h"
 #include "terminal.h"
 #include "translation.h"
+#include "ultra64.h"
 #include "z_lib.h"
 #include "zelda_arena.h"
 #include "z64audio.h"

src/code/z_camera_data.inc.c

@@ -1,4 +1,6 @@
+#include "array_count.h"
 #include "ultra64.h"
+
 #include "global.h"
 
 typedef struct CameraModeValue {

src/code/z_collision_btltbls.c

@@ -1,3 +1,4 @@
+#include "array_count.h"
 #include "printf.h"
 #include "translation.h"
 #include "z64collision_check.h"

src/code/z_debug.c

@@ -1,6 +1,7 @@
 #include "libc64/malloc.h"
 #include "libu64/gfxprint.h"
 #include "libu64/pad.h"
+#include "array_count.h"
 #include "color.h"
 #include "controller.h"
 #include "gfx.h"

src/code/z_demo.c

@@ -1,7 +1,8 @@
 #pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
                                "ique-cn:128 ntsc-1.0:0 ntsc-1.1:0 ntsc-1.2:0 pal-1.0:0 pal-1.1:0"
-#include "global.h"
+
 #include "libu64/gfxprint.h"
+#include "array_count.h"
 #include "controller.h"
 #include "gfx.h"
 #include "gfxalloc.h"
@@ -29,6 +30,8 @@
 #include "z64player.h"
 #include "z64save.h"
 
+#include "global.h"
+
 #include "assets/scenes/indoors/tokinoma/tokinoma_scene.h"
 
 #include "assets/scenes/overworld/ganon_tou/ganon_tou_scene.h"

src/code/z_eff_shield_particle.c

@@ -1,4 +1,5 @@
 #include "libc64/qrand.h"
+#include "array_count.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "printf.h"

src/code/z_eff_spark.c

@@ -1,4 +1,5 @@
 #include "libc64/qrand.h"
+#include "array_count.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "printf.h"

src/code/z_effect_soft_sprite.c

@@ -1,4 +1,5 @@
 #include "libu64/overlay.h"
+#include "array_count.h"
 #include "printf.h"
 #include "sfx.h"
 #include "terminal.h"

src/code/z_effect_soft_sprite_old_init.c

@@ -1,4 +1,5 @@
 #include "libc64/qrand.h"
+#include "array_count.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "rand.h"

src/code/z_env_flags.c

@@ -1,3 +1,4 @@
+#include "array_count.h"
 #include "ultra64.h"
 #include "z64cutscene_flags.h"
 #include "z64play.h"

src/code/z_game_over.c

@@ -1,3 +1,4 @@
+#include "array_count.h"
 #include "letterbox.h"
 #include "regs.h"
 #include "rumble.h"

src/code/z_horse.c

@@ -1,3 +1,4 @@
+#include "array_count.h"
 #include "terminal.h"
 #include "z_lib.h"
 #include "printf.h"

src/code/z_jpeg.c

@@ -1,5 +1,6 @@
 #include "jpeg.h"
 
+#include "array_count.h"
 #include "attributes.h"
 #include "gfx.h"
 #include "printf.h"
@@ -8,6 +9,7 @@
 #include "translation.h"
 #include "ultra64.h"
 
+#include "global.h"
 #include "macros.h"
 
 #define MARKER_ESCAPE 0x00

src/code/z_kaleido_manager.c

@@ -1,5 +1,6 @@
 #include "libu64/debug.h"
 #include "libu64/overlay.h"
+#include "array_count.h"
 #include "kaleido_manager.h"
 #include "printf.h"
 #include "segment_symbols.h"

src/code/z_kankyo.c

@@ -3,6 +3,7 @@
 
 #include "libc64/qrand.h"
 #include "libu64/gfxprint.h"
+#include "array_count.h"
 #include "buffers.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"

src/code/z_message.c

@@ -1,4 +1,5 @@
 #include "libu64/gfxprint.h"
+#include "array_count.h"
 #include "attributes.h"
 #include "controller.h"
 #include "gfx.h"

src/code/z_onepointdemo.c

@@ -1,6 +1,8 @@
+#include "one_point_cutscene.h"
+
 #include "libc64/math64.h"
 #include "libc64/qrand.h"
-#include "one_point_cutscene.h"
+#include "array_count.h"
 #include "printf.h"
 #include "quake.h"
 #include "sfx.h"

src/code/z_parameter.c

@@ -1,3 +1,4 @@
+#include "array_count.h"
 #include "attributes.h"
 #include "controller.h"
 #include "flag_set.h"

src/code/z_play.c

@@ -1,6 +1,7 @@
 #include "libc64/malloc.h"
 #include "libc64/qrand.h"
 #include "libu64/debug.h"
+#include "array_count.h"
 #include "buffers.h"
 #include "color.h"
 #include "controller.h"

src/code/z_quake.c

@@ -1,4 +1,5 @@
 #include "libc64/qrand.h"
+#include "array_count.h"
 #include "macros.h"
 #include "printf.h"
 #include "quake.h"

src/code/z_room.c

@@ -1,5 +1,6 @@
 #include "libu64/debug.h"
 #include "ultra64/gs2dex.h"
+#include "array_count.h"
 #include "buffers.h"
 #include "fault.h"
 #include "gfx.h"

src/code/z_scene.c

@@ -1,3 +1,4 @@
+#include "array_count.h"
 #include "avoid_ub.h"
 #include "printf.h"
 #include "regs.h"

src/code/z_sfx_source.c

@@ -1,5 +1,6 @@
 #include "z64sfx_source.h"
 
+#include "array_count.h"
 #include "sfx.h"
 #include "z64play.h"
 #include "z64skin_matrix.h"

src/code/z_skin_awb.c

@@ -1,4 +1,4 @@
-#include "overlays/actors/ovl_En_fHG/z_en_fhg.h"
+#include "array_count.h"
 #include "segmented_address.h"
 #include "zelda_arena.h"
 #include "z64actor.h"
@@ -6,6 +6,8 @@
 #include "z64skin.h"
 #include "z64skin_matrix.h"
 
+#include "overlays/actors/ovl_En_fHG/z_en_fhg.h"
+
 /**
  * Initialises the Vtx buffers used for limb at index `limbIndex`
  */

src/code/z_sram.c

@@ -1,5 +1,6 @@
 #include "z64sram.h"
 
+#include "array_count.h"
 #include "file_select_state.h"
 #include "controller.h"
 #include "memory_utils.h"

src/code/z_vr_box.c

@@ -1,5 +1,6 @@
 #include "z64skybox.h"
 
+#include "array_count.h"
 #include "printf.h"
 #include "segment_symbols.h"
 #include "terminal.h"

src/libleo/leo/leofunc.c

@@ -1,7 +1,9 @@
-#include "ultra64.h"
 #include "ultra64/leo.h"
 #include "ultra64/leoappli.h"
 #include "ultra64/leodrive.h"
+#include "array_count.h"
+#include "ultra64.h"
+
 #include "macros.h"
 
 static s32 __leoResetCalled = false;

src/libleo/leo/leoutil.c

@@ -1,7 +1,8 @@
-#include "ultra64.h"
 #include "ultra64/leo.h"
 #include "ultra64/leoappli.h"
 #include "ultra64/leodrive.h"
+#include "array_count.h"
+#include "ultra64.h"
 
 #include "macros.h"
 

src/libultra/io/contpfs.c

@@ -1,4 +1,6 @@
+#include "array_count.h"
 #include "ultra64.h"
+
 #include "macros.h"
 
 s32 __osPfsInodeCacheChannel = -1;

src/libultra/io/contreaddata.c

@@ -1,4 +1,6 @@
+#include "array_count.h"
 #include "ultra64.h"
+
 #include "macros.h"
 
 s32 osContStartReadData(OSMesgQueue* mq) {

src/libultra/io/controller.c

@@ -1,4 +1,6 @@
+#include "array_count.h"
 #include "ultra64.h"
+
 #include "macros.h"
 
 OSPifRam __osContPifRam;

src/libultra/io/piacs.c

@@ -1,4 +1,6 @@
+#include "array_count.h"
 #include "ultra64.h"
+
 #include "macros.h"
 
 u32 __osPiAccessQueueEnabled = false;

src/libultra/io/siacs.c

@@ -1,4 +1,6 @@
+#include "array_count.h"
 #include "ultra64.h"
+
 #include "macros.h"
 
 static OSMesg siAccessBuf[1];

src/libultra/io/vimgr.c

@@ -1,6 +1,8 @@
-#include "ultra64.h"
-#include "stack.h"
 #include "ultra64/internal.h"
+#include "array_count.h"
+#include "stack.h"
+#include "ultra64.h"
+
 #include "macros.h"
 
 static OSThread viThread;

src/n64dd/n64dd_801C8000.c

@@ -1,5 +1,8 @@
 // Does some command processing
+
 #include "n64dd.h"
+
+#include "array_count.h"
 #include "versions.h"
 #include "z_locale.h"
 

src/n64dd/n64dd_801CA0B0.c

@@ -1,6 +1,8 @@
 #include "n64dd.h"
+
 #include "libc64/aprintf.h"
 #include "attributes.h"
+#include "array_count.h"
 
 #include "global.h"
 

src/n64dd/z_n64dd.c

@@ -1,11 +1,14 @@
 // Main interface for the 64DD from the rest of the game. Starts background
 // threads and provides functions to submit commands to them.
+
+#include "n64dd.h"
+
 #include "libc64/sleep.h"
+#include "array_count.h"
 #include "fault.h"
 #include "gfx.h"
 #include "irqmgr.h"
 #include "line_numbers.h"
-#include "n64dd.h"
 #include "stack.h"
 #include "stackcheck.h"
 #include "sys_freeze.h"

src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c

@@ -7,6 +7,7 @@
 #include "z_bg_dodoago.h"
 #include "overlays/actors/ovl_En_Bom/z_en_bom.h"
 
+#include "array_count.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "ichain.h"

src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c

@@ -7,6 +7,7 @@
 #include "z_bg_ganon_otyuka.h"
 #include "overlays/actors/ovl_Boss_Ganon/z_boss_ganon.h"
 
+#include "array_count.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "ichain.h"

src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c

@@ -7,6 +7,7 @@
 #include "z_bg_heavy_block.h"
 
 #include "libu64/debug.h"
+#include "array_count.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "ichain.h"

src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c

@@ -6,6 +6,7 @@
 
 #include "z_bg_hidan_hamstep.h"
 
+#include "array_count.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "ichain.h"

src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c

@@ -6,6 +6,7 @@
 
 #include "z_bg_hidan_rsekizou.h"
 
+#include "array_count.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "ichain.h"

src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c

@@ -6,6 +6,7 @@
 
 #include "z_bg_hidan_sekizou.h"
 
+#include "array_count.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "ichain.h"

src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c

@@ -6,6 +6,7 @@
 
 #include "z_bg_hidan_sima.h"
 
+#include "array_count.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "ichain.h"

src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.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 "sfx.h"
 #include "z_lib.h"

src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.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"

src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c

@@ -6,6 +6,7 @@
 
 #include "z_bg_jya_zurerukabe.h"
 
+#include "array_count.h"
 #include "ichain.h"
 #include "printf.h"
 #include "sfx.h"

src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c

@@ -8,6 +8,7 @@
 #include "overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.h"
 
 #include "libc64/qrand.h"
+#include "array_count.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "ichain.h"

src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c

@@ -6,6 +6,7 @@
 
 #include "z_bg_mori_hashigo.h"
 
+#include "array_count.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "ichain.h"

src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c

@@ -6,6 +6,7 @@
 
 #include "z_bg_mori_rakkatenjo.h"
 
+#include "array_count.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "ichain.h"

src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.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 "sfx.h"
 #include "z_lib.h"

src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c

@@ -6,6 +6,7 @@
 
 #include "z_bg_spot09_obj.h"
 
+#include "array_count.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "ichain.h"

src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.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"

src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c

@@ -6,6 +6,7 @@
 
 #include "z_bg_spot15_rrbox.h"
 
+#include "array_count.h"
 #include "ichain.h"
 #include "printf.h"
 #include "sfx.h"

src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c

@@ -3,6 +3,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"

src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c

@@ -1,6 +1,7 @@
 #include "z_bg_spot18_basket.h"
 
 #include "libc64/qrand.h"
+#include "array_count.h"
 #include "ichain.h"
 #include "one_point_cutscene.h"
 #include "printf.h"

src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c

@@ -7,6 +7,7 @@
 
 #include "z_bg_spot18_obj.h"
 
+#include "array_count.h"
 #include "ichain.h"
 #include "printf.h"
 #include "sfx.h"

src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c

@@ -12,6 +12,7 @@
 
 #include "libc64/math64.h"
 #include "libc64/qrand.h"
+#include "array_count.h"
 #include "attributes.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"

src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c

@@ -8,6 +8,7 @@
 #include "overlays/actors/ovl_Boss_Fd/z_boss_fd.h"
 #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h"
 
+#include "array_count.h"
 #include "attributes.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"

src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c

@@ -6,6 +6,7 @@
 
 #include "libc64/math64.h"
 #include "libc64/qrand.h"
+#include "array_count.h"
 #include "attributes.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"

src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c

@@ -4,6 +4,7 @@
 #include "overlays/actors/ovl_En_Zl3/z_en_zl3.h"
 
 #include "libc64/qrand.h"
+#include "array_count.h"
 #include "attributes.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"

src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c

@@ -13,6 +13,7 @@
 
 #include "libc64/math64.h"
 #include "libc64/qrand.h"
+#include "array_count.h"
 #include "attributes.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"

src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c

@@ -11,6 +11,7 @@
 
 #include "libc64/math64.h"
 #include "libc64/qrand.h"
+#include "array_count.h"
 #include "attributes.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"

src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c

@@ -9,6 +9,7 @@
 
 #include "libc64/math64.h"
 #include "libc64/qrand.h"
+#include "array_count.h"
 #include "attributes.h"
 #include "controller.h"
 #include "gfx.h"

src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c

@@ -3,6 +3,7 @@
 
 #include "libc64/math64.h"
 #include "libc64/qrand.h"
+#include "array_count.h"
 #include "attributes.h"
 #include "controller.h"
 #include "gfx.h"

src/overlays/actors/ovl_Boss_Va/z_boss_va.c

@@ -8,6 +8,7 @@
 #include "overlays/actors/ovl_En_Boom/z_en_boom.h"
 
 #include "libc64/qrand.h"
+#include "array_count.h"
 #include "attributes.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"

src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c

@@ -6,6 +6,7 @@
 
 #include "z_demo_ec.h"
 
+#include "array_count.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "printf.h"

src/overlays/actors/ovl_Demo_Gj/z_demo_gj.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 "ichain.h"

src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c

@@ -1,5 +1,6 @@
 #include "z_demo_ik.h"
 
+#include "array_count.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "printf.h"