diff options
Diffstat (limited to 'src/code')
44 files changed, 61 insertions, 11 deletions
diff --git a/src/code/audio_stop_all_sfx.c b/src/code/audio_stop_all_sfx.c index 5ae65705c..2702f8a57 100644 --- a/src/code/audio_stop_all_sfx.c +++ b/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[] = { diff --git a/src/code/audio_thread_manager.c b/src/code/audio_thread_manager.c index 5c7ff901e..5e0cbfc28 100644 --- a/src/code/audio_thread_manager.c +++ b/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" diff --git a/src/code/db_camera.c b/src/code/db_camera.c index 727600849..a275cae52 100644 --- a/src/code/db_camera.c +++ b/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" diff --git a/src/code/fault_gc.c b/src/code/fault_gc.c index 9965a6ec0..75104362d 100644 --- a/src/code/fault_gc.c +++ b/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" diff --git a/src/code/fault_gc_drawer.c b/src/code/fault_gc_drawer.c index a0e409df7..044b9561b 100644 --- a/src/code/fault_gc_drawer.c +++ b/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" diff --git a/src/code/fault_n64.c b/src/code/fault_n64.c index c6c579676..5e071d87b 100644 --- a/src/code/fault_n64.c +++ b/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" diff --git a/src/code/game.c b/src/code/game.c index e3ffb5381..536013aa9 100644 --- a/src/code/game.c +++ b/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" diff --git a/src/code/graph.c b/src/code/graph.c index 62453359a..8fbb1b02f 100644 --- a/src/code/graph.c +++ b/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" diff --git a/src/code/irqmgr.c b/src/code/irqmgr.c index 2915e1c83..fe6b3a12f 100644 --- a/src/code/irqmgr.c +++ b/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" diff --git a/src/code/main.c b/src/code/main.c index 6a5dae80e..584e098e6 100644 --- a/src/code/main.c +++ b/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" diff --git a/src/code/object_table.c b/src/code/object_table.c index 904683596..0de131824 100644 --- a/src/code/object_table.c +++ b/src/code/object_table.c @@ -1,3 +1,4 @@ +#include "array_count.h" #include "segment_symbols.h" #include "romfile.h" #include "ultra64.h" diff --git a/src/code/padmgr.c b/src/code/padmgr.c index 6d88b34c1..ddea9b254 100644 --- a/src/code/padmgr.c +++ b/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(); \ diff --git a/src/code/sched.c b/src/code/sched.c index d8fea59fa..b009dff35 100644 --- a/src/code/sched.c +++ b/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" diff --git a/src/code/speed_meter.c b/src/code/speed_meter.c index bf8a247ac..bb3624fa8 100644 --- a/src/code/speed_meter.c +++ b/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" diff --git a/src/code/sys_math_atan.c b/src/code/sys_math_atan.c index 8dabed7d7..e2b70a361 100644 --- a/src/code/sys_math_atan.c +++ b/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[] = { diff --git a/src/code/ucode_disas.c b/src/code/ucode_disas.c index eadb32188..7626ed620 100644 --- a/src/code/ucode_disas.c +++ b/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" diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 7ea5bb355..8ea0eb113 100644 --- a/src/code/z_actor.c +++ b/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" diff --git a/src/code/z_bgcheck.c b/src/code/z_bgcheck.c index 51d7e8ad1..945051552 100644 --- a/src/code/z_bgcheck.c +++ b/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" diff --git a/src/code/z_camera.c b/src/code/z_camera.c index 388093116..cf18c3634 100644 --- a/src/code/z_camera.c +++ b/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" diff --git a/src/code/z_camera_data.inc.c b/src/code/z_camera_data.inc.c index 07a527afe..18b071b1d 100644 --- a/src/code/z_camera_data.inc.c +++ b/src/code/z_camera_data.inc.c @@ -1,4 +1,6 @@ +#include "array_count.h" #include "ultra64.h" + #include "global.h" typedef struct CameraModeValue { diff --git a/src/code/z_collision_btltbls.c b/src/code/z_collision_btltbls.c index 34e25b2ff..a49a71d05 100644 --- a/src/code/z_collision_btltbls.c +++ b/src/code/z_collision_btltbls.c @@ -1,3 +1,4 @@ +#include "array_count.h" #include "printf.h" #include "translation.h" #include "z64collision_check.h" diff --git a/src/code/z_debug.c b/src/code/z_debug.c index a43c76cfb..65f8eb60a 100644 --- a/src/code/z_debug.c +++ b/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" diff --git a/src/code/z_demo.c b/src/code/z_demo.c index 68f2fbc2f..f45fd1933 100644 --- a/src/code/z_demo.c +++ b/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" diff --git a/src/code/z_eff_shield_particle.c b/src/code/z_eff_shield_particle.c index 351676791..bc71d8c4f 100644 --- a/src/code/z_eff_shield_particle.c +++ b/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" diff --git a/src/code/z_eff_spark.c b/src/code/z_eff_spark.c index 429635956..dc3ebf9d1 100644 --- a/src/code/z_eff_spark.c +++ b/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" diff --git a/src/code/z_effect_soft_sprite.c b/src/code/z_effect_soft_sprite.c index 696a18504..061b6d70d 100644 --- a/src/code/z_effect_soft_sprite.c +++ b/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" diff --git a/src/code/z_effect_soft_sprite_old_init.c b/src/code/z_effect_soft_sprite_old_init.c index 967640f28..1654ab3d0 100644 --- a/src/code/z_effect_soft_sprite_old_init.c +++ b/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" diff --git a/src/code/z_env_flags.c b/src/code/z_env_flags.c index 9ad7e7a02..164ff1dde 100644 --- a/src/code/z_env_flags.c +++ b/src/code/z_env_flags.c @@ -1,3 +1,4 @@ +#include "array_count.h" #include "ultra64.h" #include "z64cutscene_flags.h" #include "z64play.h" diff --git a/src/code/z_game_over.c b/src/code/z_game_over.c index 20814a4c7..e05bcff26 100644 --- a/src/code/z_game_over.c +++ b/src/code/z_game_over.c @@ -1,3 +1,4 @@ +#include "array_count.h" #include "letterbox.h" #include "regs.h" #include "rumble.h" diff --git a/src/code/z_horse.c b/src/code/z_horse.c index 9d185d1e3..d61af32e7 100644 --- a/src/code/z_horse.c +++ b/src/code/z_horse.c @@ -1,3 +1,4 @@ +#include "array_count.h" #include "terminal.h" #include "z_lib.h" #include "printf.h" diff --git a/src/code/z_jpeg.c b/src/code/z_jpeg.c index 29a5404ed..86c896e62 100644 --- a/src/code/z_jpeg.c +++ b/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 diff --git a/src/code/z_kaleido_manager.c b/src/code/z_kaleido_manager.c index 87a7c0fa1..efecef646 100644 --- a/src/code/z_kaleido_manager.c +++ b/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" diff --git a/src/code/z_kankyo.c b/src/code/z_kankyo.c index d87f908be..88dcd5e59 100644 --- a/src/code/z_kankyo.c +++ b/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" diff --git a/src/code/z_message.c b/src/code/z_message.c index d4de077ed..38153dff0 100644 --- a/src/code/z_message.c +++ b/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" diff --git a/src/code/z_onepointdemo.c b/src/code/z_onepointdemo.c index 700353cb8..94c3bc9e1 100644 --- a/src/code/z_onepointdemo.c +++ b/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" diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index 944612348..078567510 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -1,3 +1,4 @@ +#include "array_count.h" #include "attributes.h" #include "controller.h" #include "flag_set.h" diff --git a/src/code/z_play.c b/src/code/z_play.c index 60a20e0ed..31dbc765c 100644 --- a/src/code/z_play.c +++ b/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" diff --git a/src/code/z_quake.c b/src/code/z_quake.c index 690dbc81d..cacb5a213 100644 --- a/src/code/z_quake.c +++ b/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" diff --git a/src/code/z_room.c b/src/code/z_room.c index a8e9c5b23..7bc9e4801 100644 --- a/src/code/z_room.c +++ b/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" diff --git a/src/code/z_scene.c b/src/code/z_scene.c index da2ddf648..feef5ffc6 100644 --- a/src/code/z_scene.c +++ b/src/code/z_scene.c @@ -1,3 +1,4 @@ +#include "array_count.h" #include "avoid_ub.h" #include "printf.h" #include "regs.h" diff --git a/src/code/z_sfx_source.c b/src/code/z_sfx_source.c index 3d793c617..9dda34ce3 100644 --- a/src/code/z_sfx_source.c +++ b/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" diff --git a/src/code/z_skin_awb.c b/src/code/z_skin_awb.c index 8a175ed15..196ce9aae 100644 --- a/src/code/z_skin_awb.c +++ b/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` */ diff --git a/src/code/z_sram.c b/src/code/z_sram.c index d25362704..456e7a822 100644 --- a/src/code/z_sram.c +++ b/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" diff --git a/src/code/z_vr_box.c b/src/code/z_vr_box.c index ab39d3ca6..f0ef9b008 100644 --- a/src/code/z_vr_box.c +++ b/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" |