From 130ac114580747632d0a7fe21f711771616c40ee Mon Sep 17 00:00:00 2001 From: mzxrules Date: Sat, 8 Feb 2025 19:30:24 -0500 Subject: [PATCH] Reduce overlay dependencies on global.h (4) (#2456) * remove more global.h references * .bss --- include/z64game.h | 2 +- include/z64view.h | 1 + include/z_lib.h | 2 +- src/code/sys_math3d.c | 4 +- src/code/z_collision_check.c | 2 +- .../ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c | 12 ++++++ .../ovl_Bg_Hidan_Sima/z_bg_hidan_sima.h | 4 +- .../ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c | 5 +++ .../ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.h | 4 +- .../ovl_Bg_Ice_Objects/z_bg_ice_objects.c | 10 +++++ .../ovl_Bg_Ice_Objects/z_bg_ice_objects.h | 4 +- .../ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c | 11 ++++++ .../ovl_Bg_Ice_Shelter/z_bg_ice_shelter.h | 4 +- .../ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c | 7 ++++ .../ovl_Bg_Ice_Shutter/z_bg_ice_shutter.h | 4 +- .../ovl_Bg_Ice_Turara/z_bg_ice_turara.c | 9 +++++ .../ovl_Bg_Ice_Turara/z_bg_ice_turara.h | 4 +- .../actors/ovl_Bg_Ingate/z_bg_ingate.c | 7 ++++ .../actors/ovl_Bg_Ingate/z_bg_ingate.h | 4 +- .../ovl_Bg_Jya_1flift/z_bg_jya_1flift.c | 6 +++ .../ovl_Bg_Jya_1flift/z_bg_jya_1flift.h | 4 +- .../z_bg_jya_amishutter.c | 6 +++ .../z_bg_jya_amishutter.h | 2 +- .../ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c | 7 ++++ .../ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.h | 5 +-- .../actors/ovl_Bg_Jya_Block/z_bg_jya_block.c | 9 +++++ .../actors/ovl_Bg_Jya_Block/z_bg_jya_block.h | 2 +- .../z_bg_jya_bombchuiwa.c | 12 ++++++ .../z_bg_jya_bombchuiwa.h | 4 +- .../ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c | 9 ++++- .../ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.h | 2 +- .../actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c | 12 +++++- .../actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.h | 4 +- .../ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c | 7 ++++ .../ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.h | 4 +- .../ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c | 8 ++++ .../ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.h | 4 +- .../ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c | 9 ++++- .../ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.h | 4 +- .../actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c | 7 ++++ .../actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.h | 4 +- .../ovl_Bg_Jya_Megami/z_bg_jya_megami.c | 13 +++++++ .../ovl_Bg_Jya_Megami/z_bg_jya_megami.h | 4 +- .../z_bg_jya_zurerukabe.c | 9 ++++- .../z_bg_jya_zurerukabe.h | 4 +- .../ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c | 9 +++++ .../ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.h | 2 +- .../z_bg_menkuri_kaiten.c | 5 +++ .../z_bg_menkuri_kaiten.h | 2 +- .../z_bg_menkuri_nisekabe.c | 3 ++ .../z_bg_menkuri_nisekabe.h | 2 +- .../ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c | 10 +++++ .../ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.h | 4 +- .../ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c | 10 +++++ .../ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.h | 4 +- .../ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c | 11 ++++++ .../ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.h | 4 +- .../actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c | 6 +++ .../actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.h | 4 +- .../ovl_Bg_Mizu_Water/z_bg_mizu_water.c | 12 ++++++ .../ovl_Bg_Mizu_Water/z_bg_mizu_water.h | 4 +- src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c | 8 ++++ src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.h | 4 +- .../ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c | 12 +++++- .../ovl_Bg_Mori_Bigst/z_bg_mori_bigst.h | 4 +- .../ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c | 11 ++++++ .../ovl_Bg_Mori_Elevator/z_bg_mori_elevator.h | 4 +- .../actors/ovl_Bg_Po_Event/z_bg_po_event.c | 14 +++++++ .../actors/ovl_Bg_Po_Event/z_bg_po_event.h | 4 +- .../actors/ovl_Boss_Fd/z_boss_fd_colchk.inc.c | 2 +- .../ovl_Boss_Fd2/z_boss_fd2_colchk.inc.c | 2 +- .../actors/ovl_Boss_Mo/z_boss_mo_colchk.inc.c | 3 +- .../ovl_Boss_Sst/z_boss_sst_colchk.inc.c | 2 +- src/overlays/actors/ovl_En_Elf/z_en_elf.c | 21 ++++++++++ src/overlays/actors/ovl_En_Elf/z_en_elf.h | 3 +- src/overlays/actors/ovl_En_GirlA/z_en_girla.c | 5 +++ src/overlays/actors/ovl_En_GirlA/z_en_girla.h | 10 ++--- src/overlays/actors/ovl_En_Horse/z_en_horse.c | 28 ++++++++++++-- src/overlays/actors/ovl_En_In/z_en_in.c | 19 +++++++++- src/overlays/actors/ovl_En_In/z_en_in.h | 4 +- src/overlays/actors/ovl_En_Ossan/z_en_ossan.c | 17 ++++++++- src/overlays/actors/ovl_En_Ossan/z_en_ossan.h | 18 ++++----- src/overlays/actors/ovl_En_Part/z_en_part.c | 14 +++++++ src/overlays/actors/ovl_En_Part/z_en_part.h | 4 +- src/overlays/actors/ovl_En_Tana/z_en_tana.c | 7 ++++ src/overlays/actors/ovl_En_Tana/z_en_tana.h | 2 +- .../actors/ovl_Item_Inbox/z_item_inbox.c | 1 + .../actors/ovl_Item_Inbox/z_item_inbox.h | 4 +- .../actors/ovl_Item_Ocarina/z_item_ocarina.c | 7 ++++ .../actors/ovl_Item_Ocarina/z_item_ocarina.h | 4 +- src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c | 13 +++++++ src/overlays/actors/ovl_Mir_Ray/z_mir_ray.h | 5 ++- src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c | 4 ++ src/overlays/actors/ovl_Obj_Mure/z_obj_mure.h | 4 +- .../actors/ovl_Oceff_Storm/z_oceff_storm.c | 8 ++++ .../actors/ovl_Oceff_Storm/z_oceff_storm.h | 4 +- .../actors/ovl_player_actor/z_player.c | 38 ++++++++++++++++--- .../ovl_Effect_Ss_Blast/z_eff_ss_blast.c | 9 +++++ .../ovl_Effect_Ss_Blast/z_eff_ss_blast.h | 3 +- .../ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c | 11 ++++++ .../ovl_Effect_Ss_Bomb/z_eff_ss_bomb.h | 2 +- .../ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c | 10 +++++ .../ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.h | 2 +- .../ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c | 10 +++++ .../ovl_Effect_Ss_Bubble/z_eff_ss_bubble.h | 2 +- .../ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c | 8 ++++ .../ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.h | 2 +- .../ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c | 9 +++++ .../ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.h | 3 +- .../ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c | 9 +++++ .../ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.h | 3 +- .../ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c | 7 ++++ .../ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.h | 2 +- .../z_eff_ss_dt_bubble.c | 10 +++++ .../z_eff_ss_dt_bubble.h | 3 +- .../ovl_Effect_Ss_Dust/z_eff_ss_dust.c | 11 ++++++ .../ovl_Effect_Ss_Dust/z_eff_ss_dust.h | 3 +- .../ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c | 9 +++++ .../ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.h | 4 +- .../ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c | 10 +++++ .../ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.h | 5 ++- .../ovl_Effect_Ss_Extra/z_eff_ss_extra.c | 8 ++++ .../ovl_Effect_Ss_Extra/z_eff_ss_extra.h | 2 +- .../ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c | 8 ++++ .../ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.h | 4 +- .../z_eff_ss_fire_tail.c | 9 +++++ .../z_eff_ss_fire_tail.h | 5 ++- .../ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.c | 5 +++ .../ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.h | 2 +- .../ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.c | 6 +++ .../ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.h | 2 +- .../z_eff_ss_g_magma2.c | 8 ++++ .../z_eff_ss_g_magma2.h | 3 +- .../z_eff_ss_g_ripple.c | 9 +++++ .../z_eff_ss_g_ripple.h | 2 +- .../ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c | 10 +++++ .../ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.h | 5 ++- .../z_eff_ss_g_splash.c | 5 +++ .../z_eff_ss_g_splash.h | 3 +- .../z_eff_ss_ice_piece.c | 9 +++++ .../z_eff_ss_ice_piece.h | 2 +- .../z_eff_ss_ice_smoke.c | 9 +++++ .../z_eff_ss_ice_smoke.h | 2 +- .../ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c | 8 ++++ .../ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.h | 2 +- .../z_eff_ss_kirakira.c | 12 ++++++ .../z_eff_ss_kirakira.h | 3 +- .../z_eff_ss_lightning.c | 11 ++++++ .../z_eff_ss_lightning.h | 3 +- .../ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c | 12 ++++++ .../ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.h | 2 +- .../ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c | 8 ++++ .../ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.h | 2 +- .../z_eff_ss_solder_srch_ball.c | 5 +++ .../z_eff_ss_solder_srch_ball.h | 2 +- .../ovl_Effect_Ss_Stick/z_eff_ss_stick.c | 9 +++++ .../ovl_Effect_Ss_Stick/z_eff_ss_stick.h | 2 +- .../ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c | 11 ++++++ .../ovl_Effect_Ss_Stone1/z_eff_ss_stone1.h | 2 +- .../gamestates/ovl_file_choose/file_select.h | 3 +- .../ovl_file_choose/z_file_choose.c | 26 +++++++++++-- .../ovl_file_choose/z_file_copy_erase.c | 9 +++++ .../ovl_file_choose/z_file_nameset.c | 13 +++++++ 163 files changed, 920 insertions(+), 157 deletions(-) diff --git a/include/z64game.h b/include/z64game.h index 3b50cfd362..e41c0dd8d3 100644 --- a/include/z64game.h +++ b/include/z64game.h @@ -3,7 +3,7 @@ // This file is named "game" after game.c for now, this may change later with the system name #include "ultra64/ultratypes.h" -#include "padmgr.h" +#include "libu64/pad.h" #include "tha.h" struct GraphicsContext; diff --git a/include/z64view.h b/include/z64view.h index 82f4ee48ff..3832eb5f6f 100644 --- a/include/z64view.h +++ b/include/z64view.h @@ -1,6 +1,7 @@ #ifndef Z64VIEW_H #define Z64VIEW_H +#include "macros.h" #include "ultra64.h" #include "z64math.h" diff --git a/include/z_lib.h b/include/z_lib.h index 34581da982..1e9052f93b 100644 --- a/include/z_lib.h +++ b/include/z_lib.h @@ -2,7 +2,7 @@ #define Z_LIB_H #include "libc/stddef.h" -#include "padmgr.h" +#include "libu64/pad.h" #include "z64math.h" #include "color.h" diff --git a/src/code/sys_math3d.c b/src/code/sys_math3d.c index 54ae8741e4..4a1ddaf0bb 100644 --- a/src/code/sys_math3d.c +++ b/src/code/sys_math3d.c @@ -5,8 +5,8 @@ #include "macros.h" #include "sys_math3d.h" -#pragma increment_block_number "gc-eu:97 gc-eu-mq:97 gc-jp:97 gc-jp-ce:97 gc-jp-mq:97 gc-us:97 gc-us-mq:97 ique-cn:97" \ - "ntsc-1.0:80 ntsc-1.1:80 ntsc-1.2:79 pal-1.0:80 pal-1.1:80" +#pragma increment_block_number "gc-eu:120 gc-eu-mq:120 gc-jp:120 gc-jp-ce:120 gc-jp-mq:120 gc-us:120 gc-us-mq:120" \ + "ique-cn:120 ntsc-1.0:96 ntsc-1.1:96 ntsc-1.2:96 pal-1.0:96 pal-1.1:96" s32 Math3D_LineVsLineClosestTwoPoints(Vec3f* lineAPointA, Vec3f* lineAPointB, Vec3f* lineBPointA, Vec3f* lineBPointB, Vec3f* lineAClosestToB, Vec3f* lineBClosestToA); diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c index 7a644a1c6f..6096966e29 100644 --- a/src/code/z_collision_check.c +++ b/src/code/z_collision_check.c @@ -16,7 +16,7 @@ #include "z_lib.h" #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:96 ntsc-1.1:96 ntsc-1.2:96 pal-1.0:96 pal-1.1:96" + "ique-cn:128 ntsc-1.0:104 ntsc-1.1:104 ntsc-1.2:104 pal-1.0:104 pal-1.1:104" typedef s32 (*ColChkResetFunc)(PlayState*, Collider*); typedef void (*ColChkApplyFunc)(PlayState*, CollisionCheckContext*, Collider*); diff --git a/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c b/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c index 2001c91659..66f15cd166 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c @@ -5,6 +5,18 @@ */ #include "z_bg_hidan_sima.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "ichain.h" +#include "rumble.h" +#include "segmented_address.h" +#include "sfx.h" +#include "sys_matrix.h" +#include "z_lib.h" +#include "z64play.h" +#include "z64player.h" + #include "assets/objects/object_hidan_objects/object_hidan_objects.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.h b/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.h index 927391110b..a4f5175c8d 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.h +++ b/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.h @@ -2,11 +2,11 @@ #define Z_BG_HIDAN_SIMA_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct BgHidanSima; -typedef void (*BgHidanSimaActionFunc)(struct BgHidanSima*, PlayState*); +typedef void (*BgHidanSimaActionFunc)(struct BgHidanSima*, struct PlayState*); typedef struct BgHidanSima { /* 0x0000 */ DynaPolyActor dyna; diff --git a/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c b/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c index e1a7007068..d21b1e8212 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c @@ -5,6 +5,11 @@ */ #include "z_bg_hidan_syoku.h" + +#include "ichain.h" +#include "sfx.h" +#include "z64play.h" + #include "assets/objects/object_hidan_objects/object_hidan_objects.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.h b/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.h index 61e3520b76..2ce3fbfd4e 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.h +++ b/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.h @@ -2,11 +2,11 @@ #define Z_BG_HIDAN_SYOKU_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct BgHidanSyoku; -typedef void (*BgHidanSyokuActionFunc)(struct BgHidanSyoku*, PlayState*); +typedef void (*BgHidanSyokuActionFunc)(struct BgHidanSyoku*, struct PlayState*); typedef struct BgHidanSyoku { /* 0x0000 */ DynaPolyActor dyna; diff --git a/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c b/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c index 15163c9842..6bfd39e4e5 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c +++ b/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c @@ -5,6 +5,16 @@ */ #include "z_bg_ice_objects.h" + +#include "libc64/qrand.h" +#include "ichain.h" +#include "rand.h" +#include "sfx.h" +#include "z_lib.h" +#include "z64effect.h" +#include "z64play.h" +#include "z64player.h" + #include "assets/objects/object_ice_objects/object_ice_objects.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.h b/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.h index 13a2334c39..364b087852 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.h +++ b/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.h @@ -2,11 +2,11 @@ #define Z_BG_ICE_OBJECTS_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct BgIceObjects; -typedef void (*BgIceObjectsActionFunc) (struct BgIceObjects*, PlayState*); +typedef void (*BgIceObjectsActionFunc) (struct BgIceObjects*, struct PlayState*); typedef struct BgIceObjects { /* 0x0000 */ DynaPolyActor dyna; diff --git a/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c b/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c index 39c891ab4f..0b19f74e6a 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c +++ b/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c @@ -5,6 +5,17 @@ */ #include "z_bg_ice_shelter.h" + +#include "libc64/qrand.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "ichain.h" +#include "sfx.h" +#include "sys_matrix.h" +#include "z_lib.h" +#include "z64effect.h" +#include "z64play.h" + #include "assets/objects/object_ice_objects/object_ice_objects.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.h b/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.h index 765b017b32..30286a64d1 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.h +++ b/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.h @@ -2,11 +2,11 @@ #define Z_BG_ICE_SHELTER_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct BgIceShelter; -typedef void (*BgIceShelterActionFunc)(struct BgIceShelter*, PlayState*); +typedef void (*BgIceShelterActionFunc)(struct BgIceShelter*, struct PlayState*); typedef enum RedIceType { /* 0 */ RED_ICE_LARGE, // Large red ice block diff --git a/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c b/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c index d00358e230..20176f2758 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c +++ b/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c @@ -5,6 +5,13 @@ */ #include "z_bg_ice_shutter.h" + +#include "ichain.h" +#include "one_point_cutscene.h" +#include "sfx.h" +#include "z_lib.h" +#include "z64play.h" + #include "assets/objects/object_ice_objects/object_ice_objects.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.h b/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.h index db8a7ff61c..aad63d435b 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.h +++ b/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.h @@ -2,11 +2,11 @@ #define Z_BG_ICE_SHUTTER_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct BgIceShutter; -typedef void (*BgIceShutterActionFunc)(struct BgIceShutter*, PlayState*); +typedef void (*BgIceShutterActionFunc)(struct BgIceShutter*, struct PlayState*); typedef struct BgIceShutter { /* 0x0000 */ DynaPolyActor dyna; diff --git a/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c b/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c index 094f585645..8fb200aca5 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c +++ b/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c @@ -5,6 +5,15 @@ */ #include "z_bg_ice_turara.h" + +#include "libc64/qrand.h" +#include "ichain.h" +#include "rand.h" +#include "sfx.h" +#include "z_lib.h" +#include "z64effect.h" +#include "z64play.h" + #include "assets/objects/object_ice_objects/object_ice_objects.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.h b/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.h index eaa6cc843f..46a78eb738 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.h +++ b/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.h @@ -2,11 +2,11 @@ #define Z_BG_ICE_TURARA_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct BgIceTurara; -typedef void (*BgIceTuraraActionFunc)(struct BgIceTurara*, PlayState*); +typedef void (*BgIceTuraraActionFunc)(struct BgIceTurara*, struct PlayState*); typedef enum BgIceTuraraType { /* 0 */ TURARA_STALAGMITE, diff --git a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c index dc5b9323e3..40eaf99d1d 100644 --- a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c +++ b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c @@ -5,6 +5,13 @@ */ #include "z_bg_ingate.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "sys_matrix.h" +#include "z_lib.h" +#include "z64play.h" + #include "assets/objects/object_ingate/object_ingate.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.h b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.h index 2137cc6464..c9f46446ab 100644 --- a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.h +++ b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.h @@ -2,11 +2,11 @@ #define Z_BG_INGATE_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct BgInGate; -typedef void (*BgInGateActionFunc)(struct BgInGate*, PlayState*); +typedef void (*BgInGateActionFunc)(struct BgInGate*, struct PlayState*); typedef struct BgInGate { /* 0x0000 */ DynaPolyActor dyna; diff --git a/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c b/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c index 7963199d74..8dbf588a19 100644 --- a/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c +++ b/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c @@ -5,6 +5,12 @@ */ #include "z_bg_jya_1flift.h" + +#include "ichain.h" +#include "sfx.h" +#include "z_lib.h" +#include "z64play.h" + #include "assets/objects/object_jya_obj/object_jya_obj.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.h b/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.h index 31ce5a7f4d..8d772757bf 100644 --- a/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.h +++ b/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.h @@ -2,11 +2,11 @@ #define Z_BG_JYA_1FLIFT_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct BgJya1flift; -typedef void (*BgJya1fliftActionFunc)(struct BgJya1flift*, PlayState*); +typedef void (*BgJya1fliftActionFunc)(struct BgJya1flift*, struct PlayState*); typedef struct BgJya1flift { /* 0x0000 */ DynaPolyActor dyna; diff --git a/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c b/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c index 23f5658ce8..e97451e861 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c +++ b/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c @@ -5,6 +5,12 @@ */ #include "z_bg_jya_amishutter.h" + +#include "ichain.h" +#include "sfx.h" +#include "z_lib.h" +#include "z64play.h" + #include "assets/objects/object_jya_obj/object_jya_obj.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.h b/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.h index e15a42fe88..1dad4c1543 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.h +++ b/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.h @@ -2,7 +2,7 @@ #define Z_BG_JYA_AMISHUTTER_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct BgJyaAmishutter; diff --git a/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c b/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c index ecdf4aa4de..7a3606213a 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c +++ b/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c @@ -5,6 +5,13 @@ */ #include "z_bg_jya_bigmirror.h" +#include "overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "sys_matrix.h" +#include "z64play.h" + #include "assets/objects/object_jya_obj/object_jya_obj.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) diff --git a/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.h b/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.h index 52f2b95930..56b6d8db07 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.h +++ b/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.h @@ -2,8 +2,7 @@ #define Z_BG_JYA_BIGMIRROR_H #include "ultra64.h" -#include "global.h" -#include "overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.h" +#include "z64actor.h" #define BIGMIR_PUZZLE_COBRA1_SOLVED (1 << 0) #define BIGMIR_PUZZLE_COBRA2_SOLVED (1 << 1) @@ -15,7 +14,7 @@ struct BgJyaBigmirror; typedef struct BigmirrorCobra { - /* 0x00 */ BgJyaCobra* cobra; + /* 0x00 */ struct BgJyaCobra* cobra; /* 0x04 */ s16 rotY; } BigmirrorCobra; // size = 0x08 diff --git a/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c b/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c index eea63927ed..bcd06ce59a 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c +++ b/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c @@ -5,6 +5,15 @@ */ #include "z_bg_jya_block.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "ichain.h" +#include "segmented_address.h" +#include "sys_matrix.h" +#include "z64play.h" +#include "z64player.h" + #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.h b/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.h index 2d58de5c12..641141945a 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.h +++ b/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.h @@ -2,7 +2,7 @@ #define Z_BG_JYA_BLOCK_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct BgJyaBlock; diff --git 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 index cd177d8044..cd7d83e0f1 100644 --- 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 @@ -1,5 +1,17 @@ #include "z_bg_jya_bombchuiwa.h" #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" + +#include "libc64/qrand.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "ichain.h" +#include "one_point_cutscene.h" +#include "sfx.h" +#include "sys_matrix.h" +#include "z_lib.h" +#include "z64effect.h" +#include "z64play.h" + #include "assets/objects/object_jya_obj/object_jya_obj.h" #define FLAGS ACTOR_FLAG_ATTENTION_ENABLED diff --git a/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.h b/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.h index e936167100..650a95ce74 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.h +++ b/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.h @@ -2,11 +2,11 @@ #define Z_BG_JYA_BOMBCHUIWA_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct BgJyaBombchuiwa; -typedef void (*BgJyaBombchuiwaActionFunc)(struct BgJyaBombchuiwa*, PlayState*); +typedef void (*BgJyaBombchuiwaActionFunc)(struct BgJyaBombchuiwa*, struct PlayState*); typedef struct BgJyaBombchuiwa { /* 0x0000 */ Actor actor; diff --git 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 index c94ee924b1..c7d6fb3d9b 100644 --- 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 @@ -6,8 +6,15 @@ #include "z_bg_jya_bombiwa.h" #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" -#include "assets/objects/object_jya_obj/object_jya_obj.h" + +#include "libc64/qrand.h" +#include "ichain.h" +#include "sfx.h" #include "terminal.h" +#include "z64effect.h" +#include "z64play.h" + +#include "assets/objects/object_jya_obj/object_jya_obj.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.h b/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.h index 879291f87c..ed0e29f1e9 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.h +++ b/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.h @@ -2,7 +2,7 @@ #define Z_BG_JYA_BOMBIWA_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct BgJyaBombiwa; diff --git a/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c b/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c index c32bd92896..6380e0cf6a 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c +++ b/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c @@ -1,8 +1,18 @@ #include "z_bg_jya_cobra.h" #include "overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.h" #include "overlays/actors/ovl_Mir_Ray/z_mir_ray.h" -#include "assets/objects/object_jya_obj/object_jya_obj.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "ichain.h" +#include "sfx.h" +#include "sys_matrix.h" #include "terminal.h" +#include "z_lib.h" +#include "z64play.h" +#include "z64player.h" + +#include "assets/objects/object_jya_obj/object_jya_obj.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.h b/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.h index 8722bcc2ce..32266e2ac4 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.h +++ b/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.h @@ -2,11 +2,11 @@ #define Z_BG_JYA_COBRA_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct BgJyaCobra; -typedef void (*BgJyaCobraActionFunc)(struct BgJyaCobra*, PlayState*); +typedef void (*BgJyaCobraActionFunc)(struct BgJyaCobra*, struct PlayState*); #define COBRA_SHADOW_TEX_WIDTH 64 #define COBRA_SHADOW_TEX_HEIGHT 64 diff --git 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 index 9122ebfcf9..e46dbfa345 100644 --- 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 @@ -6,6 +6,13 @@ */ #include "z_bg_jya_goroiwa.h" + +#include "ichain.h" +#include "sfx.h" +#include "z_lib.h" +#include "z64play.h" +#include "z64player.h" + #include "assets/objects/object_goroiwa/object_goroiwa.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.h b/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.h index 2722475480..299f9a65f9 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.h +++ b/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.h @@ -2,11 +2,11 @@ #define Z_BG_JYA_GOROIWA_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct BgJyaGoroiwa; -typedef void (*BgJyaGoroiwaFunc)(struct BgJyaGoroiwa*, PlayState*); +typedef void (*BgJyaGoroiwaFunc)(struct BgJyaGoroiwa*, struct PlayState*); typedef struct BgJyaGoroiwa { /* 0x0000 */ Actor actor; diff --git 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 index f327e15f8c..7226d1a821 100644 --- 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 @@ -6,6 +6,14 @@ #include "z_bg_jya_haheniron.h" #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" + +#include "libc64/qrand.h" +#include "ichain.h" +#include "sfx.h" +#include "z_lib.h" +#include "z64effect.h" +#include "z64play.h" + #include "assets/objects/object_jya_iron/object_jya_iron.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.h b/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.h index 60f9c6ef9e..e8ef33d5d0 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.h +++ b/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.h @@ -2,11 +2,11 @@ #define Z_BG_JYA_HAHENIRON_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct BgJyaHaheniron; -typedef void (*BgJyaHahenironActionFunc)(struct BgJyaHaheniron*, PlayState*); +typedef void (*BgJyaHahenironActionFunc)(struct BgJyaHaheniron*, struct PlayState*); typedef struct BgJyaHaheniron { /* 0x0000 */ Actor actor; diff --git a/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c b/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c index 459e3f11af..7aead74061 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c +++ b/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c @@ -5,8 +5,15 @@ */ #include "z_bg_jya_kanaami.h" -#include "assets/objects/object_jya_obj/object_jya_obj.h" + +#include "ichain.h" +#include "one_point_cutscene.h" #include "quake.h" +#include "sfx.h" +#include "z_lib.h" +#include "z64play.h" + +#include "assets/objects/object_jya_obj/object_jya_obj.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.h b/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.h index 6e5d670fde..a125e8ef53 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.h +++ b/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.h @@ -2,11 +2,11 @@ #define Z_BG_JYA_KANAAMI_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct BgJyaKanaami; -typedef void (*BgJyaKanaamiActionFunc)(struct BgJyaKanaami*, PlayState*); +typedef void (*BgJyaKanaamiActionFunc)(struct BgJyaKanaami*, struct PlayState*); typedef struct BgJyaKanaami { /* 0x0000 */ DynaPolyActor dyna; diff --git a/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c b/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c index 2d1092c8e5..50571f8ac5 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c +++ b/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c @@ -5,6 +5,13 @@ */ #include "z_bg_jya_lift.h" + +#include "ichain.h" +#include "one_point_cutscene.h" +#include "sfx.h" +#include "z_lib.h" +#include "z64play.h" + #include "assets/objects/object_jya_obj/object_jya_obj.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.h b/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.h index b6c951dc18..ea9abac2bf 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.h +++ b/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.h @@ -2,10 +2,10 @@ #define Z_BG_JYA_LIFT_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct BgJyaLift; -typedef void (*BgJyaLiftActionFunc)(struct BgJyaLift*, PlayState*); +typedef void (*BgJyaLiftActionFunc)(struct BgJyaLift*, struct PlayState*); typedef struct BgJyaLift { /* 0x000 */ DynaPolyActor dyna; diff --git 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 index 546f8c8d64..364e095969 100644 --- 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 @@ -6,6 +6,19 @@ #include "z_bg_jya_megami.h" #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" + +#include "libc64/qrand.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "ichain.h" +#include "one_point_cutscene.h" +#include "segmented_address.h" +#include "sfx.h" +#include "sys_matrix.h" +#include "z_lib.h" +#include "z64effect.h" +#include "z64play.h" + #include "assets/objects/object_jya_obj/object_jya_obj.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.h b/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.h index b24f236013..df3451f9d8 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.h +++ b/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.h @@ -2,11 +2,11 @@ #define Z_BG_JYA_MEGAMI_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct BgJyaMegami; -typedef void (*BgJyaMegamiActionFunc)(struct BgJyaMegami*, PlayState*); +typedef void (*BgJyaMegamiActionFunc)(struct BgJyaMegami*, struct PlayState*); typedef struct BgJyaMegamiPiece { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c b/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c index bbdc93c2f8..4dea268824 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c +++ b/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c @@ -5,8 +5,15 @@ */ #include "z_bg_jya_zurerukabe.h" -#include "assets/objects/object_jya_obj/object_jya_obj.h" + +#include "ichain.h" +#include "sfx.h" #include "terminal.h" +#include "z_lib.h" +#include "z64play.h" +#include "z64player.h" + +#include "assets/objects/object_jya_obj/object_jya_obj.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.h b/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.h index 683f681999..d9d920f57b 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.h +++ b/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.h @@ -2,11 +2,11 @@ #define Z_BG_JYA_ZURERUKABE_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct BgJyaZurerukabe; -typedef void (*BgJyaZurerukabeActionFunc)(struct BgJyaZurerukabe*, PlayState*); +typedef void (*BgJyaZurerukabeActionFunc)(struct BgJyaZurerukabe*, struct PlayState*); typedef struct BgJyaZurerukabe { /* 0x0000 */ DynaPolyActor dyna; diff --git 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 index e44f561d83..2a2740349e 100644 --- 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 @@ -5,6 +5,15 @@ */ #include "z_bg_menkuri_eye.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "ichain.h" +#include "sfx.h" +#include "sys_matrix.h" +#include "z_lib.h" +#include "z64play.h" + #include "assets/objects/object_menkuri_objects/object_menkuri_objects.h" #define FLAGS ACTOR_FLAG_DRAW_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.h b/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.h index cf27ca1827..7ed3004edd 100644 --- a/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.h +++ b/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.h @@ -2,7 +2,7 @@ #define Z_BG_MENKURI_EYE_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct BgMenkuriEye; diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c b/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c index cb3c724cf5..ee3f35a1db 100644 --- a/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c +++ b/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c @@ -5,6 +5,11 @@ */ #include "z_bg_menkuri_kaiten.h" + +#include "ichain.h" +#include "sfx.h" +#include "z64play.h" + #include "assets/objects/object_menkuri_objects/object_menkuri_objects.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.h b/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.h index c65b08d6e9..5bcdbf8ec4 100644 --- a/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.h +++ b/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.h @@ -2,7 +2,7 @@ #define Z_BG_MENKURI_KAITEN_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct BgMenkuriKaiten; diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.c b/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.c index 589ecd6d7a..0bc0649065 100644 --- a/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.c +++ b/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.c @@ -5,6 +5,9 @@ */ #include "z_bg_menkuri_nisekabe.h" + +#include "z64play.h" + #include "assets/objects/object_menkuri_objects/object_menkuri_objects.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.h b/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.h index f7cb56a5bf..54cce56eff 100644 --- a/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.h +++ b/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.h @@ -2,7 +2,7 @@ #define Z_BG_MENKURI_NISEKABE_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct BgMenkuriNisekabe; diff --git 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 index 2bcc1974b2..156a44aa20 100644 --- 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 @@ -6,6 +6,16 @@ #include "z_bg_mizu_bwall.h" #include "overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.h" + +#include "libc64/qrand.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "ichain.h" +#include "sfx.h" +#include "sys_matrix.h" +#include "z_lib.h" +#include "z64play.h" + #include "assets/objects/object_mizu_objects/object_mizu_objects.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.h b/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.h index d5eeaad344..4a23306a39 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.h +++ b/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.h @@ -2,11 +2,11 @@ #define Z_BG_MIZU_BWALL_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct BgMizuBwall; -typedef void (*BgMizuBwallActionFunc)(struct BgMizuBwall*, PlayState*); +typedef void (*BgMizuBwallActionFunc)(struct BgMizuBwall*, struct PlayState*); typedef struct BgMizuBwall { /* 0x0000 */ DynaPolyActor dyna; diff --git a/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c b/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c index 095ab67e43..ae1dd32bc6 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c @@ -6,6 +6,16 @@ #include "z_bg_mizu_movebg.h" #include "overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "ichain.h" +#include "segmented_address.h" +#include "sfx.h" +#include "sys_matrix.h" +#include "z_lib.h" +#include "z64play.h" + #include "assets/objects/object_mizu_objects/object_mizu_objects.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.h b/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.h index 1a378f13a5..75a50e864e 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.h +++ b/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.h @@ -2,7 +2,7 @@ #define Z_BG_MIZU_MOVEBG_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" typedef enum BgMizuMovebgType { /* 0 */ MIZUMOVEBG_TYPE_FLOATING_PLATFORM_OUTSIDE_CENTER_PILLAR, @@ -18,7 +18,7 @@ typedef enum BgMizuMovebgType { struct BgMizuMovebg; -typedef void (*BgMizuMovebgActionFunc)(struct BgMizuMovebg*, PlayState*); +typedef void (*BgMizuMovebgActionFunc)(struct BgMizuMovebg*, struct PlayState*); typedef struct BgMizuMovebg { /* 0x0000 */ DynaPolyActor dyna; diff --git a/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c b/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c index 585f85f6f5..ed8fae2784 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c @@ -1,4 +1,15 @@ #include "z_bg_mizu_shutter.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "ichain.h" +#include "one_point_cutscene.h" +#include "rumble.h" +#include "sfx.h" +#include "sys_matrix.h" +#include "z_lib.h" +#include "z64play.h" + #include "assets/objects/object_mizu_objects/object_mizu_objects.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.h b/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.h index cc42e4ddf3..bcba73f531 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.h +++ b/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.h @@ -2,7 +2,7 @@ #define Z_BG_MIZU_SHUTTER_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" #define BGMIZUSHUTTER_GET_SIZE(thisx) PARAMS_GET_U((u16)(thisx)->params, 12, 4) #define BGMIZUSHUTTER_GET_TIMER(thisx) PARAMS_GET_U((u16)(thisx)->params, 6, 6) @@ -12,7 +12,7 @@ struct BgMizuShutter; -typedef void (*BgMizuShutterActionFunc)(struct BgMizuShutter*, PlayState*); +typedef void (*BgMizuShutterActionFunc)(struct BgMizuShutter*, struct PlayState*); typedef struct BgMizuShutter { /* 0x0000 */ DynaPolyActor dyna; diff --git a/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c b/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c index 9f1884ea49..3072207ece 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c @@ -5,6 +5,12 @@ */ #include "z_bg_mizu_uzu.h" + +#include "ichain.h" +#include "sfx.h" +#include "z64play.h" +#include "z64player.h" + #include "assets/objects/object_mizu_objects/object_mizu_objects.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.h b/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.h index 94e6b3c9d1..f8fe16ccd7 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.h +++ b/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.h @@ -2,11 +2,11 @@ #define Z_BG_MIZU_UZU_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct BgMizuUzu; -typedef void (*BgMizuUzuActionFunc)(struct BgMizuUzu*, PlayState*); +typedef void (*BgMizuUzuActionFunc)(struct BgMizuUzu*, struct PlayState*); typedef struct BgMizuUzu { /* 0x0000 */ DynaPolyActor dyna; diff --git a/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c b/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c index 68f551be8b..5a59ddd683 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c @@ -5,6 +5,18 @@ */ #include "z_bg_mizu_water.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "ichain.h" +#include "one_point_cutscene.h" +#include "regs.h" +#include "rumble.h" +#include "sfx.h" +#include "sys_matrix.h" +#include "z_lib.h" +#include "z64play.h" + #include "assets/objects/object_mizu_objects/object_mizu_objects.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) diff --git a/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.h b/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.h index 21196022f8..26eb33d0d8 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.h +++ b/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.h @@ -2,11 +2,11 @@ #define Z_BG_MIZU_WATER_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct BgMizuWater; -typedef void (*BgMizuWaterActionFunc)(struct BgMizuWater*, PlayState*); +typedef void (*BgMizuWaterActionFunc)(struct BgMizuWater*, struct PlayState*); typedef struct BgMizuWater { /* 0x0000 */ Actor actor; diff --git a/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c b/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c index 69bbc3506c..6fa9814a1b 100644 --- a/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c +++ b/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c @@ -5,6 +5,14 @@ */ #include "z_bg_mjin.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "ichain.h" +#include "segmented_address.h" +#include "sys_matrix.h" +#include "z64play.h" + #include "assets/objects/object_mjin/object_mjin.h" #include "assets/objects/object_mjin_wind/object_mjin_wind.h" #include "assets/objects/object_mjin_soul/object_mjin_soul.h" diff --git a/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.h b/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.h index 03e18fbb76..1ed19aa2a4 100644 --- a/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.h +++ b/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.h @@ -2,11 +2,11 @@ #define Z_BG_MJIN_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct BgMjin; -typedef void (*BgMjinActionFunc)(struct BgMjin*, PlayState*); +typedef void (*BgMjinActionFunc)(struct BgMjin*, struct PlayState*); typedef struct BgMjin { /* 0x0000 */ DynaPolyActor dyna; diff --git a/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c b/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c index 7b02395228..9bc16b1fe4 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c +++ b/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c @@ -5,8 +5,18 @@ */ #include "z_bg_mori_bigst.h" -#include "assets/objects/object_mori_objects/object_mori_objects.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "ichain.h" +#include "one_point_cutscene.h" #include "quake.h" +#include "sfx.h" +#include "sys_matrix.h" +#include "z64play.h" +#include "z64player.h" + +#include "assets/objects/object_mori_objects/object_mori_objects.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.h b/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.h index c71eac7ab1..f37499b2f7 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.h +++ b/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.h @@ -2,11 +2,11 @@ #define Z_BG_MORI_BIGST_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct BgMoriBigst; -typedef void (*BgMoriBigstActionFunc)(struct BgMoriBigst*, PlayState*); +typedef void (*BgMoriBigstActionFunc)(struct BgMoriBigst*, struct PlayState*); typedef struct BgMoriBigst { /* 0x0000 */ DynaPolyActor dyna; diff --git a/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c b/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c index b441ed008c..53206ecf72 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c +++ b/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c @@ -1,4 +1,15 @@ #include "z_bg_mori_elevator.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "ichain.h" +#include "one_point_cutscene.h" +#include "sfx.h" +#include "sys_matrix.h" +#include "z64audio.h" +#include "z64play.h" +#include "z64player.h" + #include "assets/objects/object_mori_objects/object_mori_objects.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.h b/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.h index e7bcc5018e..42e45d56fc 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.h +++ b/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.h @@ -2,11 +2,11 @@ #define Z_BG_MORI_ELEVATOR_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct BgMoriElevator; -typedef void (*BgMoriElevatorActionFunc)(struct BgMoriElevator*, PlayState*); +typedef void (*BgMoriElevatorActionFunc)(struct BgMoriElevator*, struct PlayState*); typedef struct BgMoriElevator { /* 0x0000 */ DynaPolyActor dyna; diff --git 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 index 7199ec25b5..64d7bb9f46 100644 --- 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 @@ -5,6 +5,20 @@ */ #include "z_bg_po_event.h" + +#include "libc64/qrand.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "ichain.h" +#include "one_point_cutscene.h" +#include "rand.h" +#include "sfx.h" +#include "sys_matrix.h" +#include "z_lib.h" +#include "z64effect.h" +#include "z64play.h" +#include "z64player.h" + #include "assets/objects/object_po_sisters/object_po_sisters.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.h b/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.h index 412c187227..e279513666 100644 --- a/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.h +++ b/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.h @@ -2,11 +2,11 @@ #define Z_BG_PO_EVENT_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct BgPoEvent; -typedef void (*BgPoEventActionFunc)(struct BgPoEvent*, PlayState*); +typedef void (*BgPoEventActionFunc)(struct BgPoEvent*, struct PlayState*); typedef struct BgPoEvent { /* 0x0000 */ DynaPolyActor dyna; diff --git 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 index 83aa550fde..78dda01d3e 100644 --- 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 @@ -1,4 +1,4 @@ -#include "global.h" +#include "z64collision_check.h" static ColliderJntSphElementInit sJntSphItemsInit[19] = { { diff --git 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 index 1098d44c3f..3a432692fe 100644 --- 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 @@ -1,4 +1,4 @@ -#include "global.h" +#include "z64collision_check.h" static ColliderJntSphElementInit sJntSphElementsInit[9] = { { diff --git 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 index 58d807607c..1148cf1a99 100644 --- 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 @@ -1,5 +1,4 @@ -#include "global.h" -#include "z_boss_mo.h" +#include "z64collision_check.h" static ColliderJntSphElementInit sJntSphElementsInit[19] = { { diff --git 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 index cc06356aa8..4cbb650d7e 100644 --- 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,4 +1,4 @@ -#include "z_boss_sst.h" +#include "z64collision_check.h" static ColliderJntSphElementInit sJntSphItemsInitHand[11] = { { diff --git a/src/overlays/actors/ovl_En_Elf/z_en_elf.c b/src/overlays/actors/ovl_En_Elf/z_en_elf.c index cd3658756e..a5fd62af6d 100644 --- a/src/overlays/actors/ovl_En_Elf/z_en_elf.c +++ b/src/overlays/actors/ovl_En_Elf/z_en_elf.c @@ -5,7 +5,28 @@ */ #include "z_en_elf.h" +#include "overlays/actors/ovl_Elf_Msg/z_elf_msg.h" + +#include "libc64/qrand.h" +#include "libu64/debug.h" +#include "attributes.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "ichain.h" +#include "rand.h" +#include "regs.h" +#include "sfx.h" +#include "sys_math.h" +#include "sys_matrix.h" +#include "z_lib.h" +#include "z64audio.h" +#include "z64effect.h" +#include "z64light.h" +#include "z64play.h" +#include "z64player.h" + #include "global.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) diff --git a/src/overlays/actors/ovl_En_Elf/z_en_elf.h b/src/overlays/actors/ovl_En_Elf/z_en_elf.h index 2190065f71..60e9940d75 100644 --- a/src/overlays/actors/ovl_En_Elf/z_en_elf.h +++ b/src/overlays/actors/ovl_En_Elf/z_en_elf.h @@ -4,7 +4,6 @@ #include "ultra64.h" #include "z64actor.h" #include "z64light.h" -#include "overlays/actors/ovl_Elf_Msg/z_elf_msg.h" struct EnElf; @@ -23,7 +22,7 @@ typedef struct EnElf { /* 0x0278 */ LightInfo lightInfoNoGlow; /* 0x0288 */ LightNode* lightNodeNoGlow; /* 0x028C */ Vec3f unk_28C; - /* 0x0298 */ ElfMsg* elfMsg; + /* 0x0298 */ struct ElfMsg* elfMsg; /* 0x029C */ f32 unk_29C; /* 0x02A0 */ f32 unk_2A0; /* 0x02A4 */ f32 unk_2A4; diff --git a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c index 47e40b5af1..22b37cbab5 100644 --- a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c +++ b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c @@ -5,8 +5,13 @@ */ #include "z_en_girla.h" + +#include "rand.h" +#include "sys_matrix.h" #include "terminal.h" +#include "z_lib.h" #include "z64draw.h" +#include "z64play.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) diff --git a/src/overlays/actors/ovl_En_GirlA/z_en_girla.h b/src/overlays/actors/ovl_En_GirlA/z_en_girla.h index 971d0109c4..504837044e 100644 --- a/src/overlays/actors/ovl_En_GirlA/z_en_girla.h +++ b/src/overlays/actors/ovl_En_GirlA/z_en_girla.h @@ -2,14 +2,14 @@ #define Z_EN_GIRLA_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct EnGirlA; -typedef void (*EnGirlAActionFunc)(struct EnGirlA*, PlayState*); -typedef void (*EnGirlA2Func)(PlayState*, struct EnGirlA*); -typedef void (*EnGirlA3Func)(Actor*, PlayState*, s32); -typedef s32 (*EnGirlA4Func)(PlayState*, struct EnGirlA*); +typedef void (*EnGirlAActionFunc)(struct EnGirlA*, struct PlayState*); +typedef void (*EnGirlA2Func)(struct PlayState*, struct EnGirlA*); +typedef void (*EnGirlA3Func)(Actor*, struct PlayState*, s32); +typedef s32 (*EnGirlA4Func)(struct PlayState*, struct EnGirlA*); typedef struct EnGirlA { /* 0x0000 */ Actor actor; diff --git a/src/overlays/actors/ovl_En_Horse/z_en_horse.c b/src/overlays/actors/ovl_En_Horse/z_en_horse.c index 075facff4d..5429024c74 100644 --- a/src/overlays/actors/ovl_En_Horse/z_en_horse.c +++ b/src/overlays/actors/ovl_En_Horse/z_en_horse.c @@ -5,10 +5,32 @@ */ #include "z_en_horse.h" -#include "z64horse.h" -#include "global.h" -#include "versions.h" #include "overlays/actors/ovl_En_In/z_en_in.h" + +#include "libc64/math64.h" +#include "libc64/qrand.h" +#include "controller.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "ichain.h" +#include "regs.h" +#include "rumble.h" +#include "segmented_address.h" +#include "seqcmd.h" +#include "sequence.h" +#include "sfx.h" +#include "sys_math3d.h" +#include "versions.h" +#include "z_lib.h" +#include "z64audio.h" +#include "z64effect.h" +#include "z64horse.h" +#include "z64play.h" +#include "z64player.h" +#include "z64skin_matrix.h" + +#include "global.h" + #include "assets/objects/object_horse/object_horse.h" #include "assets/objects/object_hni/object_hni.h" #include "assets/scenes/overworld/spot09/spot09_scene.h" diff --git a/src/overlays/actors/ovl_En_In/z_en_in.c b/src/overlays/actors/ovl_En_In/z_en_in.c index 7ce346f633..333550942f 100644 --- a/src/overlays/actors/ovl_En_In/z_en_in.c +++ b/src/overlays/actors/ovl_En_In/z_en_in.c @@ -1,6 +1,23 @@ #include "z_en_in.h" -#include "versions.h" #include "overlays/actors/ovl_En_Horse/z_en_horse.h" + +#include "libc64/qrand.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "letterbox.h" +#include "regs.h" +#include "segmented_address.h" +#include "sequence.h" +#include "sfx.h" +#include "sys_matrix.h" +#include "versions.h" +#include "z_lib.h" +#include "z64audio.h" +#include "z64play.h" +#include "z64player.h" + +#include "global.h" + #include "assets/objects/object_in/object_in.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) diff --git a/src/overlays/actors/ovl_En_In/z_en_in.h b/src/overlays/actors/ovl_En_In/z_en_in.h index 84b5db8bac..00774d0ddb 100644 --- a/src/overlays/actors/ovl_En_In/z_en_in.h +++ b/src/overlays/actors/ovl_En_In/z_en_in.h @@ -2,11 +2,11 @@ #define Z_EN_IN_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct EnIn; -typedef void (*EnInActionFunc)(struct EnIn*, PlayState*); +typedef void (*EnInActionFunc)(struct EnIn*, struct PlayState*); typedef enum IngoLimb { /* 0x00 */ INGO_LIMB_NONE, diff --git a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c index a083ef85d7..fa8b531406 100644 --- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c +++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c @@ -1,5 +1,21 @@ #include "z_en_ossan.h" +#include "overlays/actors/ovl_En_Elf/z_en_elf.h" +#include "overlays/actors/ovl_En_GirlA/z_en_girla.h" +#include "overlays/actors/ovl_En_Tana/z_en_tana.h" + +#include "libc64/qrand.h" +#include "controller.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "ichain.h" +#include "regs.h" +#include "segmented_address.h" +#include "sfx.h" #include "terminal.h" +#include "z_lib.h" +#include "z64play.h" +#include "z64player.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_ossan/object_ossan.h" #include "assets/objects/object_oF1d_map/object_oF1d_map.h" @@ -7,7 +23,6 @@ #include "assets/objects/object_zo/object_zo.h" #include "assets/objects/object_rs/object_rs.h" #include "assets/objects/object_ds2/object_ds2.h" -#include "overlays/actors/ovl_En_Elf/z_en_elf.h" #include "assets/objects/object_masterkokiri/object_masterkokiri.h" #include "assets/objects/object_km1/object_km1.h" #include "assets/objects/object_mastergolon/object_mastergolon.h" diff --git a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.h b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.h index c2101e9d9e..7df4be57b8 100644 --- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.h +++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.h @@ -2,17 +2,15 @@ #define Z_EN_OSSAN_H #include "ultra64.h" -#include "global.h" -#include "overlays/actors/ovl_En_Tana/z_en_tana.h" -#include "overlays/actors/ovl_En_GirlA/z_en_girla.h" +#include "z64actor.h" struct EnOssan; -typedef void (*EnOssanActionFunc)(struct EnOssan*, PlayState*); -typedef void (*EnOssanTalkOwnerFunc)(PlayState*); -typedef void (*EnOssanInitFunc)(struct EnOssan*, PlayState*); +typedef void (*EnOssanActionFunc)(struct EnOssan*, struct PlayState*); +typedef void (*EnOssanTalkOwnerFunc)(struct PlayState*); +typedef void (*EnOssanInitFunc)(struct EnOssan*, struct PlayState*); typedef s16 (*EnOssanGetGirlAParamsFunc)(s16); -typedef void (*EnOssanStateFunc)(struct EnOssan*, PlayState*, Player*); +typedef void (*EnOssanStateFunc)(struct EnOssan*, struct PlayState*, struct Player*); typedef struct StickDirectionPrompt { /* 0x00 */ u32 stickColorR; @@ -37,7 +35,7 @@ typedef struct EnOssan { /* 0x0000 */ Actor actor; /* 0x014C */ SkelAnime skelAnime; /* 0x0190 */ EnOssanActionFunc actionFunc; - /* 0x0194 */ void (*obj3ToSeg6Func)(struct EnOssan*, PlayState*); + /* 0x0194 */ void (*obj3ToSeg6Func)(struct EnOssan*, struct PlayState*); /* 0x0198 */ ColliderCylinder collider; // unused /* 0x01E4 */ s16 timer; /* 0x01E6 */ s16 delayTimer; @@ -53,11 +51,11 @@ typedef struct EnOssan { /* 0x01F8 */ void (*blinkFunc)(struct EnOssan*); /* 0x01FC */ s16 stateFlag; /* 0x01FE */ s16 tempStateFlag; - /* 0x0200 */ EnGirlA* shelfSlots[8]; + /* 0x0200 */ struct EnGirlA* shelfSlots[8]; // Shelves are indexed as such: /* 7 5 3 1 */ /* 6 4 2 0 */ - /* 0x0220 */ EnTana* shelves; + /* 0x0220 */ struct EnTana* shelves; /* 0x0224 */ s32 stickAccumX; /* 0x0228 */ s32 stickAccumY; /* 0x022C */ u8 moveHorizontal; diff --git a/src/overlays/actors/ovl_En_Part/z_en_part.c b/src/overlays/actors/ovl_En_Part/z_en_part.c index 215442f52e..c10a8edcb4 100644 --- a/src/overlays/actors/ovl_En_Part/z_en_part.c +++ b/src/overlays/actors/ovl_En_Part/z_en_part.c @@ -5,6 +5,20 @@ */ #include "z_en_part.h" + +#include "libc64/qrand.h" +#include "attributes.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "rand.h" +#include "segmented_address.h" +#include "sfx.h" +#include "sys_matrix.h" +#include "z_lib.h" +#include "z64effect.h" +#include "z64play.h" +#include "z64player.h" + #include "assets/objects/object_tite/object_tite.h" #include "assets/objects/object_ik/object_ik.h" diff --git a/src/overlays/actors/ovl_En_Part/z_en_part.h b/src/overlays/actors/ovl_En_Part/z_en_part.h index 3502d80a80..405e795e75 100644 --- a/src/overlays/actors/ovl_En_Part/z_en_part.h +++ b/src/overlays/actors/ovl_En_Part/z_en_part.h @@ -2,11 +2,11 @@ #define Z_EN_PART_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct EnPart; -typedef void (*EnPartActionFunc)(struct EnPart*, PlayState*); +typedef void (*EnPartActionFunc)(struct EnPart*, struct PlayState*); typedef struct EnPart { /* 0x000 */ Actor actor; diff --git a/src/overlays/actors/ovl_En_Tana/z_en_tana.c b/src/overlays/actors/ovl_En_Tana/z_en_tana.c index 866329c2ab..28397c9c53 100644 --- a/src/overlays/actors/ovl_En_Tana/z_en_tana.c +++ b/src/overlays/actors/ovl_En_Tana/z_en_tana.c @@ -5,6 +5,13 @@ */ #include "z_en_tana.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "segmented_address.h" +#include "sys_matrix.h" +#include "z64play.h" + #include "assets/objects/object_shop_dungen/object_shop_dungen.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY) diff --git a/src/overlays/actors/ovl_En_Tana/z_en_tana.h b/src/overlays/actors/ovl_En_Tana/z_en_tana.h index 763d1303c6..1804bcd798 100644 --- a/src/overlays/actors/ovl_En_Tana/z_en_tana.h +++ b/src/overlays/actors/ovl_En_Tana/z_en_tana.h @@ -2,7 +2,7 @@ #define Z_EN_TANA_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct EnTana; diff --git a/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c b/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c index 3f36c3da17..40594c86f6 100644 --- a/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c +++ b/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c @@ -6,6 +6,7 @@ #include "z_item_inbox.h" #include "z64draw.h" +#include "z64play.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY) diff --git a/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.h b/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.h index 3bf3cf1570..d13bad0053 100644 --- a/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.h +++ b/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.h @@ -2,11 +2,11 @@ #define Z_ITEM_INBOX_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct ItemInbox; -typedef void (*ItemInboxActionFunc)(struct ItemInbox*, PlayState*); +typedef void (*ItemInboxActionFunc)(struct ItemInbox*, struct PlayState*); typedef struct ItemInbox { /* 0x0000 */ Actor actor; diff --git a/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c b/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c index 434322abc5..61d19aee51 100644 --- a/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c +++ b/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c @@ -5,7 +5,14 @@ */ #include "z_item_ocarina.h" + +#include "libu64/debug.h" +#include "segmented_address.h" +#include "sfx.h" #include "z64draw.h" +#include "z64effect.h" +#include "z64play.h" + #include "assets/scenes/overworld/spot00/spot00_scene.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.h b/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.h index 9a02b99ed0..3ae598e7d1 100644 --- a/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.h +++ b/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.h @@ -2,11 +2,11 @@ #define Z_ITEM_OCARINA_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct ItemOcarina; -typedef void (*ItemOcarinaActionFunc)(struct ItemOcarina*, PlayState*); +typedef void (*ItemOcarinaActionFunc)(struct ItemOcarina*, struct PlayState*); typedef struct ItemOcarina { /* 0x0000 */ Actor actor; diff --git a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c index 1915999df6..8fd7f63d0b 100644 --- a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c +++ b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c @@ -5,6 +5,19 @@ */ #include "z_mir_ray.h" + +#include "libu64/debug.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "ichain.h" +#include "sfx.h" +#include "sys_math3d.h" +#include "sys_matrix.h" +#include "z_lib.h" +#include "z64light.h" +#include "z64play.h" +#include "z64player.h" + #include "assets/objects/object_mir_ray/object_mir_ray.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) diff --git a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.h b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.h index 4e93149075..652516ec11 100644 --- a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.h +++ b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.h @@ -2,7 +2,8 @@ #define Z_MIR_RAY_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" +#include "z64light.h" struct MirRay; @@ -22,7 +23,7 @@ typedef struct MirRayDataEntry { typedef struct MirRayShieldReflection { /* 0x00 */ Vec3f pos; /* 0x0C */ MtxF mtx; - /* 0x4C */ CollisionPoly* reflectionPoly; + /* 0x4C */ struct CollisionPoly* reflectionPoly; /* 0x50 */ u8 opacity; } MirRayShieldReflection; // size = 0x54 diff --git a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c index 90e1b5dda7..5d1f63d6b6 100644 --- a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c +++ b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c @@ -7,6 +7,10 @@ #include "z_obj_mure.h" #include "overlays/actors/ovl_En_Insect/z_en_insect.h" +#include "libc64/qrand.h" +#include "ichain.h" +#include "z64play.h" + #define FLAGS 0 void ObjMure_Init(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.h b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.h index 386c6ed0d8..20cf667daa 100644 --- a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.h +++ b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.h @@ -2,11 +2,11 @@ #define Z_OBJ_MURE_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct ObjMure; -typedef void (*ObjMureActionFunc)(struct ObjMure*, PlayState*); +typedef void (*ObjMureActionFunc)(struct ObjMure*, struct PlayState*); #define OBJMURE_MAX_SPAWNS 15 diff --git a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c index c7c63690b7..18ea2231d5 100644 --- a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c +++ b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c @@ -6,6 +6,14 @@ #include "z_oceff_storm.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "sys_matrix.h" +#include "z64play.h" +#include "z64player.h" + +#include "global.h" + #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) void OceffStorm_Init(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.h b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.h index e4b831a208..aebc002780 100644 --- a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.h +++ b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.h @@ -2,11 +2,11 @@ #define Z_OCEFF_STORM_H #include "ultra64.h" -#include "global.h" +#include "z64actor.h" struct OceffStorm; -typedef void (*OceffStormActionFunc)(struct OceffStorm*, PlayState*); +typedef void (*OceffStormActionFunc)(struct OceffStorm*, struct PlayState*); typedef struct OceffStorm { /* 0x0000 */ Actor actor; diff --git a/src/overlays/actors/ovl_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c index b318b56905..cffcfe1e44 100644 --- a/src/overlays/actors/ovl_player_actor/z_player.c +++ b/src/overlays/actors/ovl_player_actor/z_player.c @@ -4,12 +4,6 @@ * Description: Link */ -#include "ultra64.h" -#include "global.h" -#include "quake.h" -#include "versions.h" -#include "z_en_item00.h" - #include "overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.h" #include "overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h" #include "overlays/actors/ovl_En_Boom/z_en_boom.h" @@ -21,6 +15,38 @@ #include "overlays/actors/ovl_En_Horse/z_en_horse.h" #include "overlays/actors/ovl_En_Insect/z_en_insect.h" #include "overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h" + +#include "libc64/qrand.h" +#include "libu64/debug.h" +#include "controller.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "ichain.h" +#include "letterbox.h" +#include "map.h" +#include "one_point_cutscene.h" +#include "quake.h" +#include "rand.h" +#include "regs.h" +#include "rumble.h" +#include "sequence.h" +#include "sfx.h" +#include "sys_math.h" +#include "sys_math3d.h" +#include "sys_matrix.h" +#include "ultra64.h" +#include "versions.h" +#include "z_en_item00.h" +#include "z_lib.h" +#include "zelda_arena.h" +#include "z64audio.h" +#include "z64effect.h" +#include "z64ocarina.h" +#include "z64play.h" +#include "z64skin_matrix.h" + +#include "global.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_link_child/object_link_child.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c b/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c index f107473306..9ff1bd5a96 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c +++ b/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c @@ -5,6 +5,15 @@ */ #include "z_eff_ss_blast.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "segmented_address.h" +#include "sys_matrix.h" +#include "z_lib.h" +#include "z64effect.h" +#include "z64play.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #define rInnerColorR regs[0] diff --git a/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.h b/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.h index b38f343e8e..bfceec5856 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.h +++ b/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.h @@ -2,7 +2,8 @@ #define Z_EFF_SS_BLAST_H #include "ultra64.h" -#include "global.h" +#include "color.h" +#include "z64math.h" typedef struct EffectSsBlastParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c b/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c index 4f02a83044..a6f909b56a 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c +++ b/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c @@ -5,6 +5,17 @@ */ #include "z_eff_ss_bomb.h" + +#include "libc64/qrand.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "segmented_address.h" +#include "sys_matrix.h" +#include "z_lib.h" +#include "z64effect.h" +#include "z64play.h" +#include "z64skin_matrix.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #define EFFSSBOMB_LIFESPAN 20 diff --git a/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.h b/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.h index 5d42b118c8..923739819b 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.h +++ b/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.h @@ -2,7 +2,7 @@ #define Z_EFF_SS_BOMB_H #include "ultra64.h" -#include "global.h" +#include "z64math.h" typedef struct EffectSsBombInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c b/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c index e848dd47b8..4ec61bc8ea 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c +++ b/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c @@ -5,6 +5,16 @@ */ #include "z_eff_ss_bomb2.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "segmented_address.h" +#include "sys_matrix.h" +#include "z_lib.h" +#include "z64effect.h" +#include "z64play.h" +#include "z64skin_matrix.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #define rScale regs[0] diff --git a/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.h b/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.h index 249a2a6507..8aea4d3cc5 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.h +++ b/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.h @@ -2,7 +2,7 @@ #define Z_EFF_SS_BOMB2_H #include "ultra64.h" -#include "global.h" +#include "z64math.h" typedef struct EffectSsBomb2InitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c b/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c index be7d160712..f23d0a9aab 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c +++ b/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c @@ -5,6 +5,16 @@ */ #include "z_eff_ss_bubble.h" + +#include "libc64/qrand.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "segmented_address.h" +#include "sys_matrix.h" +#include "z_lib.h" +#include "z64effect.h" +#include "z64play.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #define rScale regs[0] diff --git a/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.h b/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.h index 3c3c8f80df..7701365bdc 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.h +++ b/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.h @@ -2,7 +2,7 @@ #define Z_EFF_SS_BUBBLE_H #include "ultra64.h" -#include "global.h" +#include "z64math.h" typedef struct EffectSsBubbleInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c b/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c index 5b178002d1..b66766dd19 100644 --- a/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c +++ b/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c @@ -5,6 +5,14 @@ */ #include "z_eff_ss_d_fire.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "segmented_address.h" +#include "z64effect.h" +#include "z64play.h" +#include "z64skin_matrix.h" + #include "assets/objects/object_dodongo/object_dodongo.h" #define rScale regs[0] diff --git a/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.h b/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.h index c59c9add92..fbaa8aa28c 100644 --- a/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.h +++ b/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.h @@ -2,7 +2,7 @@ #define Z_EFF_SS_D_FIRE_H #include "ultra64.h" -#include "global.h" +#include "z64math.h" typedef struct EffectSsDFireInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c b/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c index 56b7b4db36..e8b904a4b6 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c @@ -5,6 +5,15 @@ */ #include "z_eff_ss_dead_db.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "segmented_address.h" +#include "sfx.h" +#include "z64effect.h" +#include "z64play.h" +#include "z64skin_matrix.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #define rScale regs[0] diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.h b/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.h index 0ea6bd0fda..fb7fc84af1 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.h +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.h @@ -2,7 +2,8 @@ #define Z_EFF_SS_DEAD_DB_H #include "ultra64.h" -#include "global.h" +#include "color.h" +#include "z64math.h" typedef struct EffectSsDeadDbInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c b/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c index ac0df1b437..c6e2803bb9 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c @@ -5,6 +5,15 @@ */ #include "z_eff_ss_dead_dd.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "z64effect.h" +#include "z64play.h" +#include "z64skin_matrix.h" + +#include "global.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #define rScale regs[0] diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.h b/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.h index 80d46899e7..c9c91ec609 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.h +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.h @@ -2,7 +2,8 @@ #define Z_EFF_SS_DEAD_DD_H #include "ultra64.h" -#include "global.h" +#include "color.h" +#include "z64math.h" typedef struct EffectSsDeadDdInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c b/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c index 9d9c695d88..4d649d4be4 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c @@ -5,6 +5,13 @@ */ #include "z_eff_ss_dead_ds.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "sys_matrix.h" +#include "z64effect.h" +#include "z64play.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #define rScale regs[0] diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.h b/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.h index 3714bf41ba..7a7d57363a 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.h +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.h @@ -2,7 +2,7 @@ #define Z_EFF_SS_DEAD_DS_H #include "ultra64.h" -#include "global.h" +#include "z64math.h" typedef struct EffectSsDeadDsInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c b/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c index 07335e2488..2f5901ca2e 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c @@ -5,6 +5,16 @@ */ #include "z_eff_ss_dt_bubble.h" + +#include "libc64/qrand.h" +#include "color.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "segmented_address.h" +#include "sys_matrix.h" +#include "z64effect.h" +#include "z64play.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #define rPrimColorR regs[0] diff --git a/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.h b/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.h index cac4c1a08c..6138c86046 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.h +++ b/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.h @@ -2,7 +2,8 @@ #define Z_EFF_SS_DT_BUBBLE_H #include "ultra64.h" -#include "global.h" +#include "color.h" +#include "z64math.h" typedef struct EffectSsDtBubbleInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c b/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c index d7f6c2dba1..899e9f2a2d 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c @@ -5,6 +5,17 @@ */ #include "z_eff_ss_dust.h" + +#include "libc64/qrand.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "segmented_address.h" +#include "sys_matrix.h" +#include "z_lib.h" +#include "z64effect.h" +#include "z64play.h" +#include "z64skin_matrix.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #define rPrimColorR regs[0] diff --git a/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.h b/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.h index 5cb686ae94..958bde91f8 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.h +++ b/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.h @@ -2,7 +2,8 @@ #define Z_EFF_SS_DUST_H #include "ultra64.h" -#include "global.h" +#include "color.h" +#include "z64math.h" typedef struct EffectSsDustInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c b/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c index 73795ab2d4..56dc375337 100644 --- a/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c +++ b/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c @@ -5,6 +5,15 @@ */ #include "z_eff_ss_en_fire.h" + +#include "libc64/qrand.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "sys_matrix.h" +#include "z_lib.h" +#include "z64effect.h" +#include "z64play.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #define rScaleMax regs[0] diff --git a/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.h b/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.h index c511827ecf..14acb95e40 100644 --- a/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.h +++ b/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.h @@ -2,10 +2,10 @@ #define Z_EFF_SS_EN_FIRE_H #include "ultra64.h" -#include "global.h" +#include "z64math.h" typedef struct EffectSsEnFireInitParams { - /* 0x00 */ Actor* actor; + /* 0x00 */ struct Actor* actor; /* 0x04 */ Vec3f pos; /* 0x10 */ s16 scale; /* 0x12 */ s16 unk_12; diff --git a/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c b/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c index 4a2d5a584c..f4f8e01d1c 100644 --- a/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c +++ b/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c @@ -5,7 +5,17 @@ */ #include "z_eff_ss_en_ice.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "rand.h" +#include "sys_math.h" +#include "sys_matrix.h" #include "versions.h" +#include "z_lib.h" +#include "z64effect.h" +#include "z64play.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #define rLifespan regs[0] diff --git a/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.h b/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.h index 22929d39dd..238b005bcc 100644 --- a/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.h +++ b/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.h @@ -2,10 +2,11 @@ #define Z_EFF_SS_EN_ICE_H #include "ultra64.h" -#include "global.h" +#include "color.h" +#include "z64math.h" typedef struct EffectSsEnIceInitParams { - /* 0x00 */ Actor* actor; + /* 0x00 */ struct Actor* actor; /* 0x04 */ Vec3f pos; /* 0x10 */ f32 scale; /* 0x14 */ Vec3f velocity; diff --git a/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c b/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c index e3506295da..3af854c502 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c +++ b/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c @@ -5,6 +5,14 @@ */ #include "z_eff_ss_extra.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "segmented_address.h" +#include "sys_matrix.h" +#include "z64effect.h" +#include "z64play.h" + #include "assets/objects/object_yabusame_point/object_yabusame_point.h" #define rObjectSlot regs[0] diff --git a/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.h b/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.h index c8047d21fa..1bf5a5d30c 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.h +++ b/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.h @@ -2,7 +2,7 @@ #define Z_EFF_SS_EXTRA_H #include "ultra64.h" -#include "global.h" +#include "z64math.h" typedef struct EffectSsExtraInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c b/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c index 6b07df0582..9f00f52e30 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c +++ b/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c @@ -5,6 +5,14 @@ */ #include "z_eff_ss_fcircle.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "sys_matrix.h" +#include "z_lib.h" +#include "z64effect.h" +#include "z64play.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #define rUnused regs[3] // probably supposed to be an alpha diff --git a/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.h b/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.h index 2e3eb74184..fc2a4ec2de 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.h +++ b/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.h @@ -2,10 +2,10 @@ #define Z_EFF_SS_FCIRCLE_H #include "ultra64.h" -#include "global.h" +#include "z64math.h" typedef struct EffectSsFcircleInitParams { - /* 0x00 */ Actor* actor; + /* 0x00 */ struct Actor* actor; /* 0x04 */ Vec3f pos; /* 0x10 */ s16 radius; /* 0x12 */ s16 height; diff --git a/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c b/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c index 089c7f73eb..de4ae887bb 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c +++ b/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c @@ -5,6 +5,15 @@ */ #include "z_eff_ss_fire_tail.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "sys_matrix.h" +#include "z_lib.h" +#include "z64effect.h" +#include "z64play.h" +#include "z64player.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #define rScale regs[0] diff --git a/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.h b/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.h index 70f5df7e19..ebe8a7203d 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.h +++ b/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.h @@ -2,10 +2,11 @@ #define Z_EFF_SS_FIRE_TAIL_H #include "ultra64.h" -#include "global.h" +#include "color.h" +#include "z64math.h" typedef struct EffectSsFireTailInitParams { - /* 0x00 */ Actor* actor; + /* 0x00 */ struct Actor* actor; /* 0x04 */ Vec3f pos; /* 0x10 */ f32 scale; /* 0x14 */ Vec3f unk_14; diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.c b/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.c index 351fadab7c..05e4a3d8bf 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.c @@ -5,6 +5,11 @@ */ #include "z_eff_ss_g_fire.h" + +#include "segmented_address.h" +#include "z64effect.h" +#include "z64play.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" u32 EffectSsGFire_Init(PlayState* play, u32 index, EffectSs* this, void* initParamsx); diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.h b/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.h index cfb5dcfafb..52312527d9 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.h +++ b/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.h @@ -2,7 +2,7 @@ #define Z_EFF_SS_G_FIRE_H #include "ultra64.h" -#include "global.h" +#include "z64math.h" typedef struct EffectSsGFireInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.c b/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.c index f93bb0e7d6..9610917043 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.c @@ -5,6 +5,12 @@ */ #include "z_eff_ss_g_magma.h" + +#include "libc64/qrand.h" +#include "segmented_address.h" +#include "z64effect.h" +#include "z64play.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" u32 EffectSsGMagma_Init(PlayState* play, u32 index, EffectSs* this, void* initParamsx); diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.h b/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.h index ab1b97a1de..55215239d2 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.h +++ b/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.h @@ -2,7 +2,7 @@ #define Z_EFF_SS_G_MAGMA_H #include "ultra64.h" -#include "global.h" +#include "z64math.h" typedef struct EffectSsGMagmaInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c b/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c index 11fc08606b..9ee5cbe831 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c @@ -5,6 +5,14 @@ */ #include "z_eff_ss_g_magma2.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "segmented_address.h" +#include "sys_matrix.h" +#include "z64effect.h" +#include "z64play.h" + #include "assets/objects/object_kingdodongo/object_kingdodongo.h" #define rPrimColorR regs[0] diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.h b/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.h index 715e01e7db..2ddc9f4ce7 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.h +++ b/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.h @@ -2,7 +2,8 @@ #define Z_EFF_SS_G_MAGMA2_H #include "ultra64.h" -#include "global.h" +#include "color.h" +#include "z64math.h" typedef struct EffectSsGMagma2InitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c b/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c index 48a2eec4f0..2c83108d35 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c @@ -5,6 +5,15 @@ */ #include "z_eff_ss_g_ripple.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "segmented_address.h" +#include "z_lib.h" +#include "z64effect.h" +#include "z64play.h" +#include "z64skin_matrix.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #define rWaterBoxNum regs[0] diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.h b/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.h index 63487ee0ca..86a7d8378e 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.h +++ b/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.h @@ -2,7 +2,7 @@ #define Z_EFF_SS_G_RIPPLE_H #include "ultra64.h" -#include "global.h" +#include "z64math.h" typedef struct EffectSsGRippleInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c b/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c index f43f4f3a52..a5472c29fa 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c @@ -5,6 +5,16 @@ */ #include "z_eff_ss_g_spk.h" + +#include "libc64/qrand.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "segmented_address.h" +#include "z_lib.h" +#include "z64effect.h" +#include "z64play.h" +#include "z64skin_matrix.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #define rPrimColorR regs[0] diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.h b/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.h index 8627bc0528..0d94bd7e0a 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.h +++ b/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.h @@ -2,10 +2,11 @@ #define Z_EFF_SS_G_SPK_H #include "ultra64.h" -#include "global.h" +#include "color.h" +#include "z64math.h" typedef struct EffectSsGSpkInitParams { - /* 0x00 */ Actor* actor; + /* 0x00 */ struct Actor* actor; /* 0x04 */ Vec3f pos; /* 0x10 */ Vec3f velocity; /* 0x1C */ Vec3f accel; diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.c b/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.c index 4e7c26308c..3baab32db9 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.c @@ -5,6 +5,11 @@ */ #include "z_eff_ss_g_splash.h" + +#include "segmented_address.h" +#include "z64effect.h" +#include "z64play.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" //! @bug the reuse of regs[11] means that EffectSs_DrawGEffect will treat the type as an object slot (`rgObjectSlot`) diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.h b/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.h index c13e19cd1c..fa1907f667 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.h +++ b/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.h @@ -2,7 +2,8 @@ #define Z_EFF_SS_G_SPLASH_H #include "ultra64.h" -#include "global.h" +#include "color.h" +#include "z64math.h" typedef struct EffectSsGSplashInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c b/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c index 7f0fc02fa1..9ce9885de3 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c +++ b/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c @@ -5,6 +5,15 @@ */ #include "z_eff_ss_ice_piece.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "rand.h" +#include "sys_math.h" +#include "sys_matrix.h" +#include "z64effect.h" +#include "z64play.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #define rLifespan regs[0] diff --git a/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.h b/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.h index f7b376a7ad..afb96c213c 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.h +++ b/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.h @@ -2,7 +2,7 @@ #define Z_EFF_SS_ICE_PIECE_H #include "ultra64.h" -#include "global.h" +#include "z64math.h" typedef struct EffectSsIcePieceInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c b/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c index 9997240be7..5c1b5fc164 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c +++ b/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c @@ -5,6 +5,15 @@ */ #include "z_eff_ss_ice_smoke.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "segmented_address.h" +#include "sys_matrix.h" +#include "z_lib.h" +#include "z64effect.h" +#include "z64play.h" + #include "assets/objects/object_fz/object_fz.h" #define rObjectSlot regs[0] diff --git a/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.h b/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.h index 64833be518..24c27f1cf6 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.h +++ b/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.h @@ -2,7 +2,7 @@ #define Z_EFF_SS_ICE_SMOKE_H #include "ultra64.h" -#include "global.h" +#include "z64math.h" typedef struct EffectSsIceSmokeInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c b/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c index 10a3b668ab..12d9c5a5eb 100644 --- a/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c +++ b/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c @@ -5,6 +5,14 @@ */ #include "z_eff_ss_k_fire.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "rand.h" +#include "sys_matrix.h" +#include "z64effect.h" +#include "z64play.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #define rAlpha regs[0] diff --git a/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.h b/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.h index 1896b47a73..eb8e8764d7 100644 --- a/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.h +++ b/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.h @@ -2,7 +2,7 @@ #define Z_EFF_SS_K_FIRE_H #include "ultra64.h" -#include "global.h" +#include "z64math.h" typedef struct EffectSsKFireInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c b/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c index edbd946ad3..f7c22aaa19 100644 --- a/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c +++ b/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c @@ -5,6 +5,18 @@ */ #include "z_eff_ss_kirakira.h" + +#include "libc64/qrand.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "rand.h" +#include "segmented_address.h" +#include "sys_matrix.h" +#include "z_lib.h" +#include "z64effect.h" +#include "z64play.h" +#include "z64skin_matrix.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #define rRotSpeed regs[0] diff --git a/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.h b/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.h index 7f8c18da3e..0c128ff7ab 100644 --- a/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.h +++ b/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.h @@ -2,7 +2,8 @@ #define Z_EFF_SS_KIRAKIRA_H #include "ultra64.h" -#include "global.h" +#include "color.h" +#include "z64math.h" typedef struct EffectSsKiraKiraInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c b/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c index eee8041d53..f44ac38496 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c +++ b/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c @@ -5,6 +5,17 @@ */ #include "z_eff_ss_lightning.h" + +#include "libc64/qrand.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "segmented_address.h" +#include "sys_matrix.h" +#include "z_lib.h" +#include "z64effect.h" +#include "z64play.h" +#include "z64skin_matrix.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #define rPrimColorR regs[0] diff --git a/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.h b/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.h index ad352e9013..39f5d51841 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.h +++ b/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.h @@ -2,7 +2,8 @@ #define Z_EFF_SS_LIGHTNING_H #include "ultra64.h" -#include "global.h" +#include "color.h" +#include "z64math.h" typedef struct EffectSsLightningInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c b/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c index f707251cba..1dadd7f069 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c +++ b/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c @@ -5,6 +5,18 @@ */ #include "z_eff_ss_sibuki.h" + +#include "libc64/qrand.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "regs.h" +#include "segmented_address.h" +#include "sys_matrix.h" +#include "z_lib.h" +#include "z64effect.h" +#include "z64play.h" +#include "z64player.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #define rPrimColorR regs[0] diff --git a/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.h b/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.h index 18aaf0d200..e45c2c6f2a 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.h +++ b/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.h @@ -2,7 +2,7 @@ #define Z_EFF_SS_SIBUKI_H #include "ultra64.h" -#include "global.h" +#include "z64math.h" typedef struct EffectSsSibukiInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c b/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c index e85a53e890..8566be1623 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c +++ b/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c @@ -5,6 +5,14 @@ */ #include "z_eff_ss_sibuki2.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "segmented_address.h" +#include "sys_matrix.h" +#include "z64effect.h" +#include "z64play.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #define rPrimColorR regs[0] diff --git a/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.h b/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.h index 7fb20d8b33..37a9425dc7 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.h +++ b/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.h @@ -2,7 +2,7 @@ #define Z_EFF_SS_SIBUKI2_H #include "ultra64.h" -#include "global.h" +#include "z64math.h" typedef struct EffectSsSibuki2InitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c b/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c index ed1d5edccf..2277a71d85 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c +++ b/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c @@ -6,6 +6,11 @@ #include "z_eff_ss_solder_srch_ball.h" +#include "z64bgcheck.h" +#include "z64effect.h" +#include "z64play.h" +#include "z64player.h" + #define rUnused regs[1] u32 EffectSsSolderSrchBall_Init(PlayState* play, u32 index, EffectSs* this, void* initParamsx); diff --git a/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.h b/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.h index 70aa558b65..b105f063d5 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.h +++ b/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.h @@ -2,7 +2,7 @@ #define Z_EFF_SS_SOLDERSRCHBALL_H #include "ultra64.h" -#include "global.h" +#include "z64math.h" typedef struct EffectSsSolderSrchBallInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c b/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c index ba327e465a..f78855692d 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c +++ b/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c @@ -5,6 +5,15 @@ */ #include "z_eff_ss_stick.h" + +#include "gfx.h" +#include "gfx_setupdl.h" +#include "sys_matrix.h" +#include "z_lib.h" +#include "z64effect.h" +#include "z64play.h" +#include "z64player.h" + #include "assets/objects/object_link_boy/object_link_boy.h" #include "assets/objects/object_link_child/object_link_child.h" diff --git a/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.h b/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.h index 8e01aeb003..4b5ccda965 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.h +++ b/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.h @@ -2,7 +2,7 @@ #define Z_EFF_SS_STICK_H #include "ultra64.h" -#include "global.h" +#include "z64math.h" typedef struct EffectSsStickInitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c b/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c index e1083373b8..5ecd83add1 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c +++ b/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c @@ -5,6 +5,17 @@ */ #include "z_eff_ss_stone1.h" + +#include "color.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "regs.h" +#include "segmented_address.h" +#include "sys_matrix.h" +#include "z64effect.h" +#include "z64play.h" +#include "z64skin_matrix.h" + #include "assets/objects/gameplay_keep/gameplay_keep.h" #define rReg0 regs[0] diff --git a/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.h b/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.h index d329161277..efb8df225d 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.h +++ b/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.h @@ -2,7 +2,7 @@ #define Z_EFF_SS_STONE1_H #include "ultra64.h" -#include "global.h" +#include "z64math.h" typedef struct EffectSsStone1InitParams { /* 0x00 */ Vec3f pos; diff --git a/src/overlays/gamestates/ovl_file_choose/file_select.h b/src/overlays/gamestates/ovl_file_choose/file_select.h index 122ba09af0..2946a39357 100644 --- a/src/overlays/gamestates/ovl_file_choose/file_select.h +++ b/src/overlays/gamestates/ovl_file_choose/file_select.h @@ -3,8 +3,9 @@ #include "libc/stddef.h" #include "ultra64.h" -#include "global.h" +#include "gfx.h" #include "versions.h" +#include "z64game.h" #define GET_NEWF(sramCtx, slotNum, index) (sramCtx->readBuff[gSramSlotOffsets[slotNum] + offsetof(SaveContext, save.info.playerData.newf[index])]) diff --git a/src/overlays/gamestates/ovl_file_choose/z_file_choose.c b/src/overlays/gamestates/ovl_file_choose/z_file_choose.c index 6c641e1da5..306d2e1923 100644 --- a/src/overlays/gamestates/ovl_file_choose/z_file_choose.c +++ b/src/overlays/gamestates/ovl_file_choose/z_file_choose.c @@ -1,14 +1,34 @@ #include "file_select.h" + +#include "attributes.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "letterbox.h" +#include "macros.h" +#if PLATFORM_N64 +#include "n64dd.h" +#endif +#include "regs.h" +#include "seqcmd.h" +#include "sequence.h" +#include "sfx.h" +#include "sys_matrix.h" #include "terminal.h" #include "versions.h" +#include "z64audio.h" +#include "z64environment.h" +#include "z64save.h" +#include "z64skybox.h" +#include "z64sram.h" +#include "z64view.h" + +#include "global.h" + #if OOT_PAL_N64 #include "assets/objects/object_mag/object_mag.h" #endif #include "assets/textures/title_static/title_static.h" #include "assets/textures/parameter_static/parameter_static.h" -#if PLATFORM_N64 -#include "n64dd.h" -#endif #if OOT_PAL_N64 static s32 sInitialLanguageAlphaAsInt = 100; diff --git a/src/overlays/gamestates/ovl_file_choose/z_file_copy_erase.c b/src/overlays/gamestates/ovl_file_choose/z_file_copy_erase.c index 9c6e8ff2db..4479689ede 100644 --- a/src/overlays/gamestates/ovl_file_choose/z_file_copy_erase.c +++ b/src/overlays/gamestates/ovl_file_choose/z_file_copy_erase.c @@ -1,5 +1,14 @@ #include "file_select.h" +#include "controller.h" +#include "regs.h" +#include "sfx.h" +#include "z64save.h" +#include "z64sram.h" + +#include "macros.h" +#include "global.h" + // In iQue versions, this file contains many workarounds for EGCS internal // compiler errors (see docs/compilers.md) diff --git a/src/overlays/gamestates/ovl_file_choose/z_file_nameset.c b/src/overlays/gamestates/ovl_file_choose/z_file_nameset.c index 9bafd123bd..c22f822cd5 100644 --- a/src/overlays/gamestates/ovl_file_choose/z_file_nameset.c +++ b/src/overlays/gamestates/ovl_file_choose/z_file_nameset.c @@ -1,6 +1,19 @@ #include "file_select.h" + +#include "controller.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "rumble.h" +#include "sfx.h" +#include "sys_matrix.h" #include "terminal.h" #include "versions.h" +#include "z64audio.h" +#include "z64save.h" + +#include "macros.h" +#include "global.h" + #include "assets/textures/title_static/title_static.h" #include "assets/overlays/ovl_file_choose/ovl_file_choose.h"