From 49afa18da04e797217536bb473edbf054bd9e36e Mon Sep 17 00:00:00 2001 From: mzxrules Date: Sun, 30 Aug 2026 09:56:09 -0400 Subject: split headers z_en_item00.h, z_en_a_keep.h, z64draw.h (#1897) --- src/code/z_en_a_keep.c | 1 + src/code/z_en_item00.c | 4 +++- src/code/z_player_lib.c | 1 + src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c | 1 + src/overlays/actors/ovl_Boss_01/z_boss_01.c | 1 + src/overlays/actors/ovl_Boss_05/z_boss_05.c | 1 + src/overlays/actors/ovl_Demo_Getitem/z_demo_getitem.c | 1 + src/overlays/actors/ovl_Dm_Char03/z_dm_char03.c | 1 + src/overlays/actors/ovl_Dm_Char05/z_dm_char05.c | 2 ++ src/overlays/actors/ovl_Dm_Hina/z_dm_hina.c | 1 + src/overlays/actors/ovl_En_Am/z_en_am.c | 1 + src/overlays/actors/ovl_En_Baguo/z_en_baguo.c | 1 + src/overlays/actors/ovl_En_Bb/z_en_bb.c | 1 + src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c | 1 + src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.c | 1 + src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c | 1 + src/overlays/actors/ovl_En_Boom/z_en_boom.c | 1 + src/overlays/actors/ovl_En_Bubble/z_en_bubble.c | 1 + src/overlays/actors/ovl_En_Crow/z_en_crow.c | 1 + src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c | 1 + src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c | 1 + src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c | 1 + src/overlays/actors/ovl_En_Dragon/z_en_dragon.c | 1 + src/overlays/actors/ovl_En_Famos/z_en_famos.c | 1 + src/overlays/actors/ovl_En_Firefly/z_en_firefly.c | 1 + src/overlays/actors/ovl_En_Floormas/z_en_floormas.c | 1 + src/overlays/actors/ovl_En_Fz/z_en_fz.c | 1 + src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.c | 1 + src/overlays/actors/ovl_En_GirlA/z_en_girla.c | 2 ++ src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c | 1 + src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.c | 1 + src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.c | 1 + src/overlays/actors/ovl_En_Hit_Tag/z_en_hit_tag.c | 1 + src/overlays/actors/ovl_En_Ik/z_en_ik.c | 1 + src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c | 1 + src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.c | 1 + src/overlays/actors/ovl_En_Ishi/z_en_ishi.c | 1 + src/overlays/actors/ovl_En_Kame/z_en_kame.c | 1 + src/overlays/actors/ovl_En_Kanban/z_en_kanban.c | 1 + src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c | 1 + src/overlays/actors/ovl_En_Kusa/z_en_kusa.c | 1 + src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c | 1 + src/overlays/actors/ovl_En_Minideath/z_en_minideath.c | 1 + src/overlays/actors/ovl_En_Mkk/z_en_mkk.c | 1 + src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c | 1 + src/overlays/actors/ovl_En_Okuta/z_en_okuta.c | 1 + src/overlays/actors/ovl_En_Peehat/z_en_peehat.c | 1 + src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c | 1 + src/overlays/actors/ovl_En_Pp/z_en_pp.c | 1 + src/overlays/actors/ovl_En_Pr2/z_en_pr2.c | 1 + src/overlays/actors/ovl_En_Rat/z_en_rat.c | 1 + src/overlays/actors/ovl_En_Rd/z_en_rd.c | 1 + src/overlays/actors/ovl_En_Rr/z_en_rr.c | 1 + src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.c | 1 + src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.h | 3 ++- src/overlays/actors/ovl_En_Sb/z_en_sb.c | 1 + src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.c | 1 + src/overlays/actors/ovl_En_Si/z_en_si.c | 1 + src/overlays/actors/ovl_En_Skb/z_en_skb.c | 1 + src/overlays/actors/ovl_En_Slime/z_en_slime.c | 1 + src/overlays/actors/ovl_En_Snowman/z_en_snowman.c | 1 + src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.c | 1 + src/overlays/actors/ovl_En_St/z_en_st.c | 1 + src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.c | 1 + src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c | 1 + src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.h | 1 + src/overlays/actors/ovl_En_Tite/z_en_tite.c | 1 + src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c | 1 + src/overlays/actors/ovl_En_Vm/z_en_vm.c | 1 + src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c | 1 + src/overlays/actors/ovl_En_Wf/z_en_wf.c | 1 + src/overlays/actors/ovl_En_Wood02/z_en_wood02.c | 1 + src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c | 1 + src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c | 1 + src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c | 1 + src/overlays/actors/ovl_Obj_Dora/z_obj_dora.c | 1 + src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c | 1 + src/overlays/actors/ovl_Obj_Grass/z_obj_grass.c | 1 + src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.c | 1 + src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c | 1 + src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c | 1 + src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c | 1 + src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.h | 1 + src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c | 1 + src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.c | 1 + src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.c | 1 + src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.c | 1 + src/overlays/actors/ovl_Obj_Taru/z_obj_taru.c | 1 + src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c | 1 + src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.c | 1 + src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c | 1 + src/overlays/actors/ovl_player_actor/z_player.c | 1 + 92 files changed, 97 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/code/z_en_a_keep.c b/src/code/z_en_a_keep.c index 92b1d4b67..144830df3 100644 --- a/src/code/z_en_a_keep.c +++ b/src/code/z_en_a_keep.c @@ -1,4 +1,5 @@ #include "global.h" +#include "z_en_a_keep.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY) diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c index 64a17eadd..c9f165f4e 100644 --- a/src/code/z_en_item00.c +++ b/src/code/z_en_item00.c @@ -1,5 +1,7 @@ -#include "global.h" +#include "z_en_item00.h" #include "attributes.h" +#include "z64draw.h" +#include "z64play.h" #include "overlays/actors/ovl_En_Elforg/z_en_elforg.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_gi_hearts/object_gi_hearts.h" diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c index 4a2889831..a90113c0c 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -4,6 +4,7 @@ */ #include "global.h" +#include "z64draw.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c b/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c index 1e94ffc89..4e5977ebd 100644 --- a/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c +++ b/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c @@ -5,6 +5,7 @@ */ #include "z_bg_icicle.h" +#include "z_en_item00.h" #include "assets/objects/object_icicle/object_icicle.h" #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_Boss_01/z_boss_01.c b/src/overlays/actors/ovl_Boss_01/z_boss_01.c index 2b5f44389..e7ac0d6a6 100644 --- a/src/overlays/actors/ovl_Boss_01/z_boss_01.c +++ b/src/overlays/actors/ovl_Boss_01/z_boss_01.c @@ -26,6 +26,7 @@ */ #include "z_boss_01.h" +#include "z_en_item00.h" #include "z64rumble.h" #include "z64shrink_window.h" #include "attributes.h" diff --git a/src/overlays/actors/ovl_Boss_05/z_boss_05.c b/src/overlays/actors/ovl_Boss_05/z_boss_05.c index 0cfd6fc17..e71b98247 100644 --- a/src/overlays/actors/ovl_Boss_05/z_boss_05.c +++ b/src/overlays/actors/ovl_Boss_05/z_boss_05.c @@ -29,6 +29,7 @@ #include "z_boss_05.h" #include "attributes.h" +#include "z_en_item00.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE) diff --git a/src/overlays/actors/ovl_Demo_Getitem/z_demo_getitem.c b/src/overlays/actors/ovl_Demo_Getitem/z_demo_getitem.c index 71c60bddc..ee0beb5b7 100644 --- a/src/overlays/actors/ovl_Demo_Getitem/z_demo_getitem.c +++ b/src/overlays/actors/ovl_Demo_Getitem/z_demo_getitem.c @@ -5,6 +5,7 @@ */ #include "z_demo_getitem.h" +#include "z64draw.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) diff --git a/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.c b/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.c index 80325a2f2..f28b3a973 100644 --- a/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.c +++ b/src/overlays/actors/ovl_Dm_Char03/z_dm_char03.c @@ -5,6 +5,7 @@ */ #include "z_dm_char03.h" +#include "z64draw.h" #include "assets/objects/object_osn/object_osn.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) diff --git a/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.c b/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.c index 4890756d5..00ce5ffee 100644 --- a/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.c +++ b/src/overlays/actors/ovl_Dm_Char05/z_dm_char05.c @@ -5,6 +5,8 @@ */ #include "z_dm_char05.h" + +#include "z64draw.h" #include "assets/objects/object_dmask/object_dmask.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) diff --git a/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.c b/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.c index 655b6be7f..8f2d45625 100644 --- a/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.c +++ b/src/overlays/actors/ovl_Dm_Hina/z_dm_hina.c @@ -5,6 +5,7 @@ */ #include "z_dm_hina.h" +#include "z64draw.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) diff --git a/src/overlays/actors/ovl_En_Am/z_en_am.c b/src/overlays/actors/ovl_En_Am/z_en_am.c index 84ed4b493..9b0b31f29 100644 --- a/src/overlays/actors/ovl_En_Am/z_en_am.c +++ b/src/overlays/actors/ovl_En_Am/z_en_am.c @@ -5,6 +5,7 @@ */ #include "z_en_am.h" +#include "z_en_item00.h" #include "overlays/actors/ovl_En_Bom/z_en_bom.h" #include "overlays/actors/ovl_En_Bombf/z_en_bombf.h" #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" diff --git a/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c b/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c index a844dca68..2c84ca82b 100644 --- a/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c +++ b/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c @@ -5,6 +5,7 @@ */ #include "z_en_baguo.h" +#include "z_en_item00.h" #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_En_Bb/z_en_bb.c b/src/overlays/actors/ovl_En_Bb/z_en_bb.c index 0fd92ac0f..d5454f208 100644 --- a/src/overlays/actors/ovl_En_Bb/z_en_bb.c +++ b/src/overlays/actors/ovl_En_Bb/z_en_bb.c @@ -5,6 +5,7 @@ */ #include "z_en_bb.h" +#include "z_en_item00.h" #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c b/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c index 8222d8358..24120b6ac 100644 --- a/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c +++ b/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c @@ -5,6 +5,7 @@ */ #include "z_en_bbfall.h" +#include "z_en_item00.h" #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.c b/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.c index bfab700db..e56f84b0c 100644 --- a/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.c +++ b/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.c @@ -5,6 +5,7 @@ */ #include "z_en_bigpamet.h" +#include "z_en_item00.h" #include "z64quake.h" #include "z64rumble.h" #include "overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.h" diff --git a/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c b/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c index 1a78c2668..7b65ad85d 100644 --- a/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c +++ b/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c @@ -5,6 +5,7 @@ */ #include "z_en_bigslime.h" +#include "z_en_item00.h" #include "z64quake.h" #include "z64rumble.h" #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" diff --git a/src/overlays/actors/ovl_En_Boom/z_en_boom.c b/src/overlays/actors/ovl_En_Boom/z_en_boom.c index e3803f748..8668e1885 100644 --- a/src/overlays/actors/ovl_En_Boom/z_en_boom.c +++ b/src/overlays/actors/ovl_En_Boom/z_en_boom.c @@ -5,6 +5,7 @@ */ #include "z_en_boom.h" +#include "z_en_item00.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) diff --git a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c index b9de4b872..d4f766e0f 100644 --- a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c +++ b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c @@ -5,6 +5,7 @@ */ #include "z_en_bubble.h" +#include "z_en_item00.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED) diff --git a/src/overlays/actors/ovl_En_Crow/z_en_crow.c b/src/overlays/actors/ovl_En_Crow/z_en_crow.c index 1a69cd77c..70dc0d6c6 100644 --- a/src/overlays/actors/ovl_En_Crow/z_en_crow.c +++ b/src/overlays/actors/ovl_En_Crow/z_en_crow.c @@ -5,6 +5,7 @@ */ #include "z_en_crow.h" +#include "z_en_item00.h" #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" #define FLAGS \ diff --git a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c index 217281c1c..d4e7a05a5 100644 --- a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c +++ b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c @@ -5,6 +5,7 @@ */ #include "z_en_dekubaba.h" +#include "z_en_item00.h" #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c index b606c63bd..fc72a419f 100644 --- a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c +++ b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c @@ -5,6 +5,7 @@ */ #include "z_en_dekunuts.h" +#include "z_en_item00.h" #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" #include "overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.h" #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" diff --git a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c index 398ba3fc0..113668223 100644 --- a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c +++ b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c @@ -5,6 +5,7 @@ */ #include "z_en_dodongo.h" +#include "z_en_item00.h" #include "overlays/actors/ovl_En_Bom/z_en_bom.h" #include "overlays/actors/ovl_En_Bombf/z_en_bombf.h" #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" diff --git a/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c b/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c index d4441493b..4a8c4bc5d 100644 --- a/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c +++ b/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c @@ -5,6 +5,7 @@ */ #include "z_en_dragon.h" +#include "z_en_item00.h" #include "overlays/actors/ovl_En_Ot/z_en_ot.h" #define FLAGS \ diff --git a/src/overlays/actors/ovl_En_Famos/z_en_famos.c b/src/overlays/actors/ovl_En_Famos/z_en_famos.c index 48313a7c8..ff720de8e 100644 --- a/src/overlays/actors/ovl_En_Famos/z_en_famos.c +++ b/src/overlays/actors/ovl_En_Famos/z_en_famos.c @@ -5,6 +5,7 @@ */ #include "z_en_famos.h" +#include "z_en_item00.h" #include "z64rumble.h" #include "overlays/actors/ovl_En_Bom/z_en_bom.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c index 8bf4c520e..4e480dd53 100644 --- a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c +++ b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c @@ -5,6 +5,7 @@ */ #include "z_en_firefly.h" +#include "z_en_item00.h" #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" #include "overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.h" diff --git a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c index 534e58cce..4259a5e93 100644 --- a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c +++ b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c @@ -5,6 +5,7 @@ */ #include "z_en_floormas.h" +#include "z_en_item00.h" #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER) diff --git a/src/overlays/actors/ovl_En_Fz/z_en_fz.c b/src/overlays/actors/ovl_En_Fz/z_en_fz.c index 9f11aa8c8..b0ecf5075 100644 --- a/src/overlays/actors/ovl_En_Fz/z_en_fz.c +++ b/src/overlays/actors/ovl_En_Fz/z_en_fz.c @@ -6,6 +6,7 @@ #include "z_en_fz.h" #include "attributes.h" +#include "z_en_item00.h" #include "overlays/actors/ovl_En_Wiz/z_en_wiz.h" #include "assets/objects/object_fz/object_fz.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.c b/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.c index 1968fd504..1f1187339 100644 --- a/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.c +++ b/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.c @@ -5,6 +5,7 @@ */ #include "z_en_gakufu.h" +#include "z_en_item00.h" #include "assets/interface/parameter_static/parameter_static.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) 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 87de45eff..92f9127ab 100644 --- a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c +++ b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c @@ -6,6 +6,8 @@ #include "z_en_girla.h" +#include "z64draw.h" + #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) void EnGirlA_Init(Actor* thisx, PlayState* play); diff --git a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c index b208fcc35..3d284aac7 100644 --- a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c +++ b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c @@ -5,6 +5,7 @@ */ #include "z_en_goroiwa.h" +#include "z_en_item00.h" #include "z64quake.h" #include "assets/objects/object_goroiwa/object_goroiwa.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.c b/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.c index b105b283f..98799f55b 100644 --- a/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.c +++ b/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.c @@ -5,6 +5,7 @@ */ #include "z_en_grasshopper.h" +#include "z_en_item00.h" #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.c b/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.c index 64f8da1ac..4bdd1bb84 100644 --- a/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.c +++ b/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.c @@ -6,6 +6,7 @@ #include "z_en_hint_skb.h" #include "attributes.h" +#include "z_en_item00.h" #include "overlays/actors/ovl_En_Part/z_en_part.h" #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" diff --git a/src/overlays/actors/ovl_En_Hit_Tag/z_en_hit_tag.c b/src/overlays/actors/ovl_En_Hit_Tag/z_en_hit_tag.c index d0ed117f0..8552d7f96 100644 --- a/src/overlays/actors/ovl_En_Hit_Tag/z_en_hit_tag.c +++ b/src/overlays/actors/ovl_En_Hit_Tag/z_en_hit_tag.c @@ -5,6 +5,7 @@ */ #include "z_en_hit_tag.h" +#include "z_en_item00.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) diff --git a/src/overlays/actors/ovl_En_Ik/z_en_ik.c b/src/overlays/actors/ovl_En_Ik/z_en_ik.c index 0f9164d65..66454553b 100644 --- a/src/overlays/actors/ovl_En_Ik/z_en_ik.c +++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.c @@ -5,6 +5,7 @@ */ #include "z_en_ik.h" +#include "z_en_item00.h" #include "z64rumble.h" #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" diff --git a/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c b/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c index 7a92ad891..fc4078e15 100644 --- a/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c +++ b/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c @@ -32,6 +32,7 @@ #include "z_en_invadepoh.h" #include "sys_cfb.h" +#include "z_en_item00.h" #include "z64horse.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" diff --git a/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.c b/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.c index e0110493d..3250ab86c 100644 --- a/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.c +++ b/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.c @@ -5,6 +5,7 @@ */ #include "z_en_invisible_ruppe.h" +#include "z_en_item00.h" #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c index 3735a10a7..5ac3cbf14 100644 --- a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c +++ b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c @@ -5,6 +5,7 @@ */ #include "z_en_ishi.h" +#include "z_en_item00.h" #include "z64quake.h" #include "z64rumble.h" #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" diff --git a/src/overlays/actors/ovl_En_Kame/z_en_kame.c b/src/overlays/actors/ovl_En_Kame/z_en_kame.c index cd043ffd9..8c0c9b2f1 100644 --- a/src/overlays/actors/ovl_En_Kame/z_en_kame.c +++ b/src/overlays/actors/ovl_En_Kame/z_en_kame.c @@ -5,6 +5,7 @@ */ #include "z_en_kame.h" +#include "z_en_item00.h" #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER) diff --git a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c index f1c7a36bf..6ee99214f 100644 --- a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c +++ b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c @@ -6,6 +6,7 @@ #include "z_en_kanban.h" #include "attributes.h" +#include "z_en_item00.h" #include "assets/objects/object_kanban/object_kanban.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c index 0a4d36905..237ed031b 100644 --- a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c +++ b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c @@ -5,6 +5,7 @@ */ #include "z_en_karebaba.h" +#include "z_en_item00.h" #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c index 00a7a8334..b909f4d67 100644 --- a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c +++ b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c @@ -5,6 +5,7 @@ */ #include "z_en_kusa.h" +#include "z_en_item00.h" #include "assets/objects/object_kusa/object_kusa.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" diff --git a/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c b/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c index 13f71541c..b831c7939 100644 --- a/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c +++ b/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c @@ -5,6 +5,7 @@ */ #include "z_en_kusa2.h" +#include "z_en_item00.h" #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_En_Minideath/z_en_minideath.c b/src/overlays/actors/ovl_En_Minideath/z_en_minideath.c index 237655691..cd13adc7f 100644 --- a/src/overlays/actors/ovl_En_Minideath/z_en_minideath.c +++ b/src/overlays/actors/ovl_En_Minideath/z_en_minideath.c @@ -5,6 +5,7 @@ */ #include "z_en_minideath.h" +#include "z_en_item00.h" #include "overlays/actors/ovl_En_Death/z_en_death.h" #include "assets/objects/object_death/object_death.h" diff --git a/src/overlays/actors/ovl_En_Mkk/z_en_mkk.c b/src/overlays/actors/ovl_En_Mkk/z_en_mkk.c index 897a3786f..21c1e62f0 100644 --- a/src/overlays/actors/ovl_En_Mkk/z_en_mkk.c +++ b/src/overlays/actors/ovl_En_Mkk/z_en_mkk.c @@ -5,6 +5,7 @@ */ #include "z_en_mkk.h" +#include "z_en_item00.h" #include "assets/objects/object_mkk/object_mkk.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE) diff --git a/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c b/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c index bd0abea0e..abd18e1d3 100644 --- a/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c +++ b/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c @@ -6,6 +6,7 @@ #include "z_en_neo_reeba.h" #include "attributes.h" +#include "z_en_item00.h" #include "assets/objects/object_rb/object_rb.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_HOOKSHOT_PULLS_ACTOR) diff --git a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c index b0fe9cf41..5f936fdec 100644 --- a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c +++ b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c @@ -11,6 +11,7 @@ */ #include "z_en_okuta.h" +#include "z_en_item00.h" #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE) diff --git a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c index 001dd514f..0a92405df 100644 --- a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c +++ b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c @@ -5,6 +5,7 @@ */ #include "z_en_peehat.h" +#include "z_en_item00.h" #include "overlays/actors/ovl_En_Bom/z_en_bom.h" #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" diff --git a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c index dc2b46414..841cd8900 100644 --- a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c +++ b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c @@ -5,6 +5,7 @@ */ #include "z_en_po_sisters.h" +#include "z_en_item00.h" #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_En_Pp/z_en_pp.c b/src/overlays/actors/ovl_En_Pp/z_en_pp.c index aa40aba7e..e291be73b 100644 --- a/src/overlays/actors/ovl_En_Pp/z_en_pp.c +++ b/src/overlays/actors/ovl_En_Pp/z_en_pp.c @@ -5,6 +5,7 @@ */ #include "z_en_pp.h" +#include "z_en_item00.h" #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_En_Pr2/z_en_pr2.c b/src/overlays/actors/ovl_En_Pr2/z_en_pr2.c index d71646bba..6d36391d8 100644 --- a/src/overlays/actors/ovl_En_Pr2/z_en_pr2.c +++ b/src/overlays/actors/ovl_En_Pr2/z_en_pr2.c @@ -5,6 +5,7 @@ */ #include "z_en_pr2.h" +#include "z_en_item00.h" #include "overlays/actors/ovl_En_Encount1/z_en_encount1.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED) diff --git a/src/overlays/actors/ovl_En_Rat/z_en_rat.c b/src/overlays/actors/ovl_En_Rat/z_en_rat.c index 4c6bbd842..67e05c0cf 100644 --- a/src/overlays/actors/ovl_En_Rat/z_en_rat.c +++ b/src/overlays/actors/ovl_En_Rat/z_en_rat.c @@ -5,6 +5,7 @@ */ #include "z_en_rat.h" +#include "z_en_item00.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "overlays/actors/ovl_En_Bom/z_en_bom.h" diff --git a/src/overlays/actors/ovl_En_Rd/z_en_rd.c b/src/overlays/actors/ovl_En_Rd/z_en_rd.c index 1630ed9f8..150cf74a8 100644 --- a/src/overlays/actors/ovl_En_Rd/z_en_rd.c +++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.c @@ -23,6 +23,7 @@ */ #include "z_en_rd.h" +#include "z_en_item00.h" #include "z64rumble.h" #include "attributes.h" #include "assets/objects/object_rd/object_rd.h" diff --git a/src/overlays/actors/ovl_En_Rr/z_en_rr.c b/src/overlays/actors/ovl_En_Rr/z_en_rr.c index 3e8e56bb9..f120ec580 100644 --- a/src/overlays/actors/ovl_En_Rr/z_en_rr.c +++ b/src/overlays/actors/ovl_En_Rr/z_en_rr.c @@ -5,6 +5,7 @@ */ #include "z_en_rr.h" +#include "z_en_item00.h" #include "z64rumble.h" #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" #include "assets/objects/object_rr/object_rr.h" diff --git a/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.c b/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.c index 31f505b27..26747d60d 100644 --- a/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.c +++ b/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.c @@ -5,6 +5,7 @@ */ #include "z_en_ruppecrow.h" +#include "z_en_item00.h" #include "assets/objects/object_crow/object_crow.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_CAN_ATTACH_TO_ARROW) diff --git a/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.h b/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.h index e6132cb51..d646e3d0c 100644 --- a/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.h +++ b/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.h @@ -2,6 +2,7 @@ #define Z_EN_RUPPECROW_H #include "global.h" +#include "z_en_item00.h" #include "assets/objects/object_crow/object_crow.h" #define ENRUPPECROW_GET_PATH_INDEX(thisx) (((thisx)->params & 0xFC00) >> 0xA) @@ -39,7 +40,7 @@ typedef struct EnRuppecrow { /* 0x2BC */ s16 rupeeIndex; /* 0x2BE */ s16 yOffset; /* 0x2C0 */ UNK_TYPE1 unk_2C0[0x4]; - /* 0x2C4 */ u8 currentEffect; + /* 0x2C4 */ u8 currentEffect; /* 0x2C8 */ f32 unk_2C8; // set but not used /* 0x2CC */ f32 unk_2CC; // set but not used /* 0x2D0 */ f32 iceSfxTimer; diff --git a/src/overlays/actors/ovl_En_Sb/z_en_sb.c b/src/overlays/actors/ovl_En_Sb/z_en_sb.c index 4f10b78a4..ac3383996 100644 --- a/src/overlays/actors/ovl_En_Sb/z_en_sb.c +++ b/src/overlays/actors/ovl_En_Sb/z_en_sb.c @@ -5,6 +5,7 @@ */ #include "z_en_sb.h" +#include "z_en_item00.h" #include "overlays/actors/ovl_En_Part/z_en_part.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE) diff --git a/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.c b/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.c index 1d87637b8..481ca737c 100644 --- a/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.c +++ b/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.c @@ -5,6 +5,7 @@ */ #include "z_en_scopecoin.h" +#include "z_en_item00.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) diff --git a/src/overlays/actors/ovl_En_Si/z_en_si.c b/src/overlays/actors/ovl_En_Si/z_en_si.c index 56c57239b..dc94be207 100644 --- a/src/overlays/actors/ovl_En_Si/z_en_si.c +++ b/src/overlays/actors/ovl_En_Si/z_en_si.c @@ -5,6 +5,7 @@ */ #include "z_en_si.h" +#include "z64draw.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOOKSHOT_PULLS_ACTOR) diff --git a/src/overlays/actors/ovl_En_Skb/z_en_skb.c b/src/overlays/actors/ovl_En_Skb/z_en_skb.c index 9420c467d..e72ab7c58 100644 --- a/src/overlays/actors/ovl_En_Skb/z_en_skb.c +++ b/src/overlays/actors/ovl_En_Skb/z_en_skb.c @@ -6,6 +6,7 @@ #include "z_en_skb.h" #include "attributes.h" +#include "z_en_item00.h" #include "overlays/actors/ovl_En_Encount4/z_en_encount4.h" #include "overlays/actors/ovl_En_Part/z_en_part.h" #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h" diff --git a/src/overlays/actors/ovl_En_Slime/z_en_slime.c b/src/overlays/actors/ovl_En_Slime/z_en_slime.c index 0846c2194..6eb4191ad 100644 --- a/src/overlays/actors/ovl_En_Slime/z_en_slime.c +++ b/src/overlays/actors/ovl_En_Slime/z_en_slime.c @@ -5,6 +5,7 @@ */ #include "z_en_slime.h" +#include "z_en_item00.h" #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" #define FLAGS \ diff --git a/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c b/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c index 49ca062fe..bea2c9f45 100644 --- a/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c +++ b/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c @@ -5,6 +5,7 @@ */ #include "z_en_snowman.h" +#include "z_en_item00.h" #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE) diff --git a/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.c b/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.c index 9dd323134..95d55eb0b 100644 --- a/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.c +++ b/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.c @@ -5,6 +5,7 @@ */ #include "z_en_snowwd.h" +#include "z_en_item00.h" #include "assets/objects/object_snowwd/object_snowwd.h" #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_En_St/z_en_st.c b/src/overlays/actors/ovl_En_St/z_en_st.c index ef352e956..652e12c08 100644 --- a/src/overlays/actors/ovl_En_St/z_en_st.c +++ b/src/overlays/actors/ovl_En_St/z_en_st.c @@ -5,6 +5,7 @@ */ #include "z_en_st.h" +#include "z_en_item00.h" #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.c b/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.c index 152a7d119..1868942d0 100644 --- a/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.c +++ b/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.c @@ -5,6 +5,7 @@ */ #include "z_en_tanron3.h" +#include "z_en_item00.h" #include "overlays/actors/ovl_Boss_03/z_boss_03.h" #include "assets/objects/object_boss03/object_boss03.h" diff --git a/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c b/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c index d214f5ebc..afd43b6bd 100644 --- a/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c +++ b/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c @@ -4,6 +4,7 @@ * Description: Takkuri */ #include "z_en_thiefbird.h" +#include "z_en_item00.h" #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" #define FLAGS \ diff --git a/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.h b/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.h index fb79f8037..4db8a979e 100644 --- a/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.h +++ b/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.h @@ -2,6 +2,7 @@ #define Z_EN_THIEFBIRD_H #include "global.h" +#include "z_en_item00.h" #include "assets/objects/object_thiefbird/object_thiefbird.h" struct EnThiefbird; diff --git a/src/overlays/actors/ovl_En_Tite/z_en_tite.c b/src/overlays/actors/ovl_En_Tite/z_en_tite.c index 4366a6ccf..f4a6ad5c7 100644 --- a/src/overlays/actors/ovl_En_Tite/z_en_tite.c +++ b/src/overlays/actors/ovl_En_Tite/z_en_tite.c @@ -5,6 +5,7 @@ */ #include "z_en_tite.h" +#include "z_en_item00.h" #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_HOOKSHOT_PULLS_ACTOR) diff --git a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c index 757b3b2f4..3952daa06 100644 --- a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c +++ b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c @@ -5,6 +5,7 @@ */ #include "z_en_tubo_trap.h" +#include "z_en_item00.h" #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_En_Vm/z_en_vm.c b/src/overlays/actors/ovl_En_Vm/z_en_vm.c index fd92e6943..3ba9a8de7 100644 --- a/src/overlays/actors/ovl_En_Vm/z_en_vm.c +++ b/src/overlays/actors/ovl_En_Vm/z_en_vm.c @@ -5,6 +5,7 @@ */ #include "z_en_vm.h" +#include "z_en_item00.h" #include "overlays/actors/ovl_En_Bom/z_en_bom.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c index e5cc827d9..3684ca8c5 100644 --- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c +++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c @@ -5,6 +5,7 @@ */ #include "z_en_wallmas.h" +#include "z_en_item00.h" #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" #include "overlays/actors/ovl_En_Encount1/z_en_encount1.h" #include "overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.h" diff --git a/src/overlays/actors/ovl_En_Wf/z_en_wf.c b/src/overlays/actors/ovl_En_Wf/z_en_wf.c index 2f8cd7770..96cfc5748 100644 --- a/src/overlays/actors/ovl_En_Wf/z_en_wf.c +++ b/src/overlays/actors/ovl_En_Wf/z_en_wf.c @@ -5,6 +5,7 @@ */ #include "z_en_wf.h" +#include "z_en_item00.h" #include "overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.h" #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h" #include "overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.h" diff --git a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c index cd113cfe5..5cd988c4a 100644 --- a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c +++ b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c @@ -6,6 +6,7 @@ #include "z_en_wood02.h" #include "attributes.h" +#include "z_en_item00.h" #include "assets/objects/object_wood02/object_wood02.h" #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c index 4c13ea6a8..62049d3dd 100644 --- a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c +++ b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c @@ -5,6 +5,7 @@ */ #include "z_item_etcetera.h" +#include "z64draw.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) 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 4f412a814..c5afd7cdb 100644 --- a/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c +++ b/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c @@ -5,6 +5,7 @@ */ #include "z_item_inbox.h" +#include "z64draw.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY) diff --git a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c index 5025bf25b..7c943e4b3 100644 --- a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c +++ b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c @@ -5,6 +5,7 @@ */ #include "z_obj_comb.h" +#include "z_en_item00.h" #include "assets/objects/object_comb/object_comb.h" #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.c b/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.c index ef051de4f..7e715553b 100644 --- a/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.c +++ b/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.c @@ -5,6 +5,7 @@ */ #include "z_obj_dora.h" +#include "z_en_item00.h" #include "assets/objects/object_dora/object_dora.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) diff --git a/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c b/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c index e04f3f9c1..7fbf47c41 100644 --- a/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c +++ b/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c @@ -4,6 +4,7 @@ * Description: Breakable Pot With Grass */ #include "z_obj_flowerpot.h" +#include "z_en_item00.h" #include "assets/objects/object_flowerpot/object_flowerpot.h" #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.c b/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.c index 069cafaa8..4a8a00553 100644 --- a/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.c +++ b/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.c @@ -7,6 +7,7 @@ */ #include "z_obj_grass.h" +#include "z_en_item00.h" #include "overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.c b/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.c index 903220409..166b819e0 100644 --- a/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.c +++ b/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.c @@ -5,6 +5,7 @@ */ #include "z_obj_grass_carry.h" +#include "z_en_item00.h" #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "overlays/actors/ovl_Obj_Grass/z_obj_grass.h" diff --git a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c index a5cbc61d7..3b1730407 100644 --- a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c +++ b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c @@ -5,6 +5,7 @@ */ #include "z_obj_kibako.h" +#include "z_en_item00.h" #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" #include "assets/objects/object_kibako/object_kibako.h" diff --git a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c index 5f0ead6fb..f93772a60 100644 --- a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c +++ b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c @@ -5,6 +5,7 @@ */ #include "z_obj_kibako2.h" +#include "z_en_item00.h" #include "assets/objects/object_kibako2/object_kibako2.h" #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" diff --git a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c index 6a974685c..0defd4d09 100644 --- a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c +++ b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c @@ -5,6 +5,7 @@ */ #include "z_obj_mure3.h" +#include "z_en_item00.h" #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.h b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.h index fb79e3440..d91d4d5ba 100644 --- a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.h +++ b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.h @@ -2,6 +2,7 @@ #define Z_OBJ_MURE3_H #include "global.h" +#include "z_en_item00.h" #define OBJMURE3_GET_SWITCH_FLAG(thisx) ((thisx)->params & 0x7F) #define OBJMURE3_PARAM_RUPEEINDEX(thisx) (((thisx)->params >> 13) & 7) diff --git a/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c b/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c index 86f1b6b5f..c7bedad37 100644 --- a/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c +++ b/src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c @@ -5,6 +5,7 @@ */ #include "z_obj_nozoki.h" +#include "z64draw.h" #include "assets/objects/object_secom_obj/object_secom_obj.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) diff --git a/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.c b/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.c index 9bc67cd21..8f6dec94e 100644 --- a/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.c +++ b/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.c @@ -5,6 +5,7 @@ */ #include "z_obj_snowball.h" +#include "z_en_item00.h" #include "assets/objects/object_goroiwa/object_goroiwa.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.c b/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.c index 1608ec88c..588d99920 100644 --- a/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.c +++ b/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.c @@ -5,6 +5,7 @@ */ #include "z_obj_snowball2.h" +#include "z_en_item00.h" #include "assets/objects/object_goroiwa/object_goroiwa.h" #define FLAGS (ACTOR_FLAG_THROW_ONLY) diff --git a/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.c b/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.c index 586698e52..8a3c0afaa 100644 --- a/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.c +++ b/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.c @@ -5,6 +5,7 @@ */ #include "z_obj_swprize.h" +#include "z_en_item00.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED) diff --git a/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.c b/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.c index 6077ba7f8..de028fd02 100644 --- a/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.c +++ b/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.c @@ -5,6 +5,7 @@ */ #include "z_obj_taru.h" +#include "z_en_item00.h" #include "overlays/actors/ovl_En_Sw/z_en_sw.h" #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h" #include "overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.h" diff --git a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c index c5c75ca23..03a296160 100644 --- a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c +++ b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c @@ -5,6 +5,7 @@ */ #include "z_obj_tsubo.h" +#include "z_en_item00.h" #include "overlays/actors/ovl_En_Sw/z_en_sw.h" #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" #include "assets/objects/object_tsubo/object_tsubo.h" diff --git a/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.c b/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.c index 7c47607d5..c407723a6 100644 --- a/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.c +++ b/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.c @@ -5,6 +5,7 @@ */ #include "z_obj_yasi.h" +#include "z_en_item00.h" #include "assets/objects/object_obj_yasi/object_obj_yasi.h" #define FLAGS 0x00000000 diff --git a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c index 3d87fa1f3..fbd0a80c7 100644 --- a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c +++ b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c @@ -5,6 +5,7 @@ */ #include "z_shot_sun.h" +#include "z_en_item00.h" #include "overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h" #include "overlays/actors/ovl_En_Elf/z_en_elf.h" diff --git a/src/overlays/actors/ovl_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c index 34d30a937..8e9182a73 100644 --- a/src/overlays/actors/ovl_player_actor/z_player.c +++ b/src/overlays/actors/ovl_player_actor/z_player.c @@ -6,6 +6,7 @@ #include "z64player.h" #include "global.h" +#include "z_en_item00.h" #include "z64horse.h" #include "z64lifemeter.h" #include "zelda_arena.h" -- cgit v1.2.3