Reduce overlay dependencies on global.h (7) (#2472)

* z64env_flags, z64quest_hint_commands

* z64cutscene_spline, z64save.h moved from z64.h

* bss

* pr suggestion

* bss

* suggestions

src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c

@@ -16,6 +16,7 @@
 #include "z64audio.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/objects/object_bdan_objects/object_bdan_objects.h"
 

src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c

@@ -17,6 +17,7 @@
 #include "z_lib.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/scenes/dungeons/ddan/ddan_scene.h"
 #include "assets/objects/object_bwall/object_bwall.h"

src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c

@@ -20,6 +20,7 @@
 #include "z_lib.h"
 #include "z64effect.h"
 #include "z64play.h"
+#include "z64save.h"
 
 #include "assets/objects/object_ddan_objects/object_ddan_objects.h"
 

src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c

@@ -22,6 +22,7 @@
 #include "z64ocarina.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/objects/object_dy_obj/object_dy_obj.h"
 #include "assets/scenes/indoors/yousei_izumi_yoko/yousei_izumi_yoko_scene.h"

src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c

@@ -13,6 +13,7 @@
 #include "terminal.h"
 #include "z_lib.h"
 #include "z64play.h"
+#include "z64save.h"
 
 #include "assets/objects/object_spot01_matoyab/object_spot01_matoyab.h"
 

src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c

@@ -13,6 +13,7 @@
 #include "sys_matrix.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/objects/object_gjyo_objects/object_gjyo_objects.h"
 #include "assets/scenes/overworld/ganon_tou/ganon_tou_scene.h"

src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c

@@ -14,6 +14,7 @@
 #include "z_lib.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/objects/object_haka/object_haka.h"
 

src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c

@@ -14,6 +14,7 @@
 #include "sys_matrix.h"
 #include "z_lib.h"
 #include "z64play.h"
+#include "z64save.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 

src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c

@@ -17,6 +17,7 @@
 #include "z_lib.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_hidan_objects/object_hidan_objects.h"

src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c

@@ -11,6 +11,7 @@
 #include "sys_matrix.h"
 #include "z_lib.h"
 #include "z64play.h"
+#include "z64save.h"
 
 #include "assets/objects/object_ingate/object_ingate.h"
 

src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c

@@ -10,6 +10,7 @@
 #include "sfx.h"
 #include "z_lib.h"
 #include "z64play.h"
+#include "z64save.h"
 
 #include "assets/objects/object_jya_obj/object_jya_obj.h"
 

src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c

@@ -13,6 +13,7 @@
 #include "sys_matrix.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h"
 

src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c

@@ -18,6 +18,7 @@
 #include "z64effect.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/objects/object_po_sisters/object_po_sisters.h"
 

src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c

@@ -11,10 +11,10 @@
 #include "sfx.h"
 #include "z_lib.h"
 #include "z64audio.h"
+#include "z64cutscene_flags.h"
 #include "z64play.h"
 #include "z64player.h"
-
-#include "global.h"
+#include "z64save.h"
 
 #include "assets/objects/object_relay_objects/object_relay_objects.h"
 

src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c

@@ -8,6 +8,7 @@
 
 #include "ichain.h"
 #include "z64play.h"
+#include "z64save.h"
 
 #include "assets/objects/object_spot00_break/object_spot00_break.h"
 

src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c

@@ -13,11 +13,11 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
+#include "z64cutscene_flags.h"
 #include "z64light.h"
 #include "z64play.h"
 #include "z64player.h"
-
-#include "global.h"
+#include "z64save.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_spot00_objects/object_spot00_objects.h"

src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c

@@ -13,6 +13,7 @@
 #include "z_lib.h"
 #include "z64audio.h"
 #include "z64play.h"
+#include "z64save.h"
 
 #include "assets/objects/object_spot01_objects/object_spot01_objects.h"
 

src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c

@@ -16,6 +16,7 @@
 #include "z_lib.h"
 #include "z64effect.h"
 #include "z64play.h"
+#include "z64save.h"
 
 #include "assets/objects/object_spot01_objects/object_spot01_objects.h"
 

src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c

@@ -13,6 +13,7 @@
 #include "sys_matrix.h"
 #include "z_lib.h"
 #include "z64play.h"
+#include "z64save.h"
 
 #include "assets/objects/object_spot01_objects/object_spot01_objects.h"
 

src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c

@@ -11,6 +11,7 @@
 #include "ichain.h"
 #include "sys_matrix.h"
 #include "z64play.h"
+#include "z64save.h"
 
 #include "assets/objects/object_spot01_matoya/object_spot01_matoya.h"
 

src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c

@@ -9,6 +9,7 @@
 #include "ichain.h"
 #include "segmented_address.h"
 #include "z64play.h"
+#include "z64save.h"
 
 #include "assets/objects/object_spot01_matoya/object_spot01_matoya.h"
 #include "assets/objects/object_spot01_matoyab/object_spot01_matoyab.h"

src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c

@@ -17,6 +17,7 @@
 #include "z64effect.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/objects/object_spot02_objects/object_spot02_objects.h"
 

src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c

@@ -11,6 +11,7 @@
 #include "sfx.h"
 #include "z_lib.h"
 #include "z64play.h"
+#include "z64save.h"
 
 #include "assets/objects/object_spot05_objects/object_spot05_objects.h"
 

src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c

@@ -16,6 +16,7 @@
 #include "z_lib.h"
 #include "z64effect.h"
 #include "z64play.h"
+#include "z64save.h"
 
 #include "assets/objects/object_spot06_objects/object_spot06_objects.h"
 

src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c

@@ -12,6 +12,7 @@
 #include "sys_matrix.h"
 #include "versions.h"
 #include "z64play.h"
+#include "z64save.h"
 
 #include "assets/objects/object_spot07_object/object_spot07_object.h"
 

src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c

@@ -14,6 +14,7 @@
 #include "z_lib.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/objects/object_spot08_obj/object_spot08_obj.h"
 

src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c

@@ -11,6 +11,7 @@
 #include "ichain.h"
 #include "sys_matrix.h"
 #include "z64play.h"
+#include "z64save.h"
 
 #include "assets/objects/object_spot09_obj/object_spot09_obj.h"
 

src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c

@@ -16,12 +16,11 @@
 #include "sys_math3d.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
+#include "z64cutscene_flags.h"
 #include "z64effect.h"
 #include "z64play.h"
 #include "z64player.h"
 
-#include "global.h"
-
 #include "assets/objects/object_spot11_obj/object_spot11_obj.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED

src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c

@@ -12,6 +12,7 @@
 #include "z_lib.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/objects/object_spot15_obj/object_spot15_obj.h"
 

src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c

@@ -11,6 +11,7 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z64play.h"
+#include "z64save.h"
 
 #include "assets/objects/object_spot15_obj/object_spot15_obj.h"
 

src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c

@@ -15,6 +15,7 @@
 #include "z64effect.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/objects/object_spot16_obj/object_spot16_obj.h"
 #include "assets/objects/object_bombiwa/object_bombiwa.h"

src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c

@@ -12,6 +12,7 @@
 #include "sys_matrix.h"
 #include "terminal.h"
 #include "z64play.h"
+#include "z64save.h"
 
 #include "assets/objects/object_efc_doughnut/object_efc_doughnut.h"
 

src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c

@@ -13,6 +13,7 @@
 #include "z_lib.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/objects/object_spot18_obj/object_spot18_obj.h"
 

src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c

@@ -11,6 +11,7 @@
 #include "sfx.h"
 #include "z_lib.h"
 #include "z64play.h"
+#include "z64save.h"
 
 #include "assets/objects/object_spot18_obj/object_spot18_obj.h"
 

src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c

@@ -11,6 +11,7 @@
 #include "ichain.h"
 #include "sys_matrix.h"
 #include "z64play.h"
+#include "z64save.h"
 
 #include "assets/objects/object_toki_objects/object_toki_objects.h"
 

src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c

@@ -13,10 +13,10 @@
 #include "sequence.h"
 #include "sfx.h"
 #include "sys_matrix.h"
+#include "z64cutscene_flags.h"
 #include "z64play.h"
 #include "z64player.h"
-
-#include "global.h"
+#include "z64save.h"
 
 #include "assets/objects/object_toki_objects/object_toki_objects.h"
 

src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c

@@ -17,8 +17,7 @@
 #include "z64effect.h"
 #include "z64play.h"
 #include "z64player.h"
-
-#include "global.h"
+#include "z64save.h"
 
 #include "assets/objects/object_spot04_objects/object_spot04_objects.h"
 

src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c

@@ -9,6 +9,7 @@
 #include "ichain.h"
 #include "regs.h"
 #include "z64play.h"
+#include "z64save.h"
 
 #include "assets/objects/object_umajump/object_umajump.h"
 

src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c

@@ -19,6 +19,7 @@
 #include "z64effect.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/objects/object_kingdodongo/object_kingdodongo.h"
 #include "assets/scenes/dungeons/ddan_boss/ddan_boss_room_1.h"

src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c

@@ -26,6 +26,7 @@
 #include "z64effect.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_fd/object_fd.h"

src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c

@@ -23,6 +23,7 @@
 #include "z64effect.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "global.h"
 

src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c

@@ -20,6 +20,7 @@
 #include "z64effect.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/objects/object_ganon/object_ganon.h"
 #include "assets/objects/object_ganon2/object_ganon2.h"

src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c

@@ -27,6 +27,7 @@
 #include "z64environment.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/objects/object_goma/object_goma.h"
 

src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c

@@ -29,6 +29,7 @@
 #include "z64effect.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 #include "z64skin_matrix.h"
 
 #include "global.h"

src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c

@@ -26,13 +26,14 @@
 #include "z64effect.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 #include "z64skin_matrix.h"
 
 #include "assets/objects/object_sst/object_sst.h"
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
-#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
-                               "pal-1.0:128 pal-1.1:128"
+#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0 pal-1.0:128" \
+                               "pal-1.1:128"
 
 #define FLAGS                                                                                 \
     (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \

src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c

@@ -18,6 +18,7 @@
 #include "z_lib.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 #include "z64skin_matrix.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"

src/overlays/actors/ovl_Boss_Va/z_boss_va.c

@@ -23,6 +23,7 @@
 #include "z64audio.h"
 #include "z64effect.h"
 #include "z64play.h"
+#include "z64save.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_bv/object_bv.h"

src/overlays/actors/ovl_Demo_Du/z_demo_du.c

@@ -13,6 +13,7 @@
 #include "z64effect.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/objects/object_du/object_du.h"
 

src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c

@@ -12,6 +12,7 @@
 #include "terminal.h"
 #include "z_lib.h"
 #include "z64play.h"
+#include "z64save.h"
 
 #include "assets/objects/object_zo/object_zo.h"
 #include "assets/objects/object_ec/object_ec.h"

src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c

@@ -17,10 +17,10 @@
 #include "z64audio.h"
 #include "z64curve.h"
 #include "z64draw.h"
+#include "z64cutscene_flags.h"
 #include "z64effect.h"
 #include "z64play.h"
-
-#include "global.h"
+#include "z64save.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_efc_crystal_light/object_efc_crystal_light.h"

src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c

@@ -21,6 +21,7 @@
 #include "z64effect.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/objects/object_gj/object_gj.h"
 

src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c

@@ -16,6 +16,7 @@
 #include "z64effect.h"
 #include "z64frame_advance.h"
 #include "z64play.h"
+#include "z64save.h"
 
 #include "assets/objects/object_gt/object_gt.h"
 #include "assets/objects/object_geff/object_geff.h"

src/overlays/actors/ovl_Demo_Im/z_demo_im.c

@@ -18,6 +18,7 @@
 #include "z_lib.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/scenes/indoors/nakaniwa/nakaniwa_scene.h"
 #include "assets/objects/object_im/object_im.h"

src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c

@@ -10,18 +10,19 @@
 #include "versions.h"
 #include "z_lib.h"
 #include "z64cutscene_commands.h"
+#include "z64cutscene_flags.h"
+#include "z64cutscene_spline.h"
 #include "z64olib.h"
 #include "z64play.h"
 #include "z64player.h"
-
-#include "global.h"
+#include "z64save.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_efc_star_field/object_efc_star_field.h"
 #include "assets/objects/object_toki_objects/object_toki_objects.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:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128"
+#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0 ique-cn:0" \
+                               "ntsc-1.0:0 ntsc-1.1:0 ntsc-1.2:0 pal-1.0:0 pal-1.1:0"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)
 

src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c

@@ -18,6 +18,7 @@
 #include "z64audio.h"
 #include "z64effect.h"
 #include "z64play.h"
+#include "z64save.h"
 
 #include "assets/objects/object_demo_kekkai/object_demo_kekkai.h"
 #include "assets/scenes/dungeons/ganontika/ganontika_scene.h"

src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c

@@ -18,6 +18,7 @@
 #include "z_lib.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/objects/object_sa/object_sa.h"
 

src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c

@@ -6,6 +6,7 @@
 #include "sfx.h"
 #include "z64curve.h"
 #include "z64play.h"
+#include "z64save.h"
 
 #include "assets/objects/object_box/object_box.h"
 

src/overlays/actors/ovl_Door_Ana/z_door_ana.c

@@ -11,10 +11,10 @@
 #include "sfx.h"
 #include "sys_matrix.h"
 #include "z_lib.h"
+#include "z64cutscene_flags.h"
 #include "z64play.h"
 #include "z64player.h"
-
-#include "global.h"
+#include "z64save.h"
 
 #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h"
 

src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c

@@ -14,6 +14,7 @@
 #include "z_lib.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/objects/object_door_gerudo/object_door_gerudo.h"
 

src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c

@@ -21,6 +21,7 @@
 #include "z64audio.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "global.h"
 

src/overlays/actors/ovl_Door_Toki/z_door_toki.c

@@ -8,6 +8,7 @@
 
 #include "ichain.h"
 #include "z64play.h"
+#include "z64save.h"
 
 #include "assets/objects/object_toki_objects/object_toki_objects.h"
 

src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c

@@ -12,6 +12,7 @@
 #include "z64light.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/objects/object_warp1/object_warp1.h"
 

src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c

@@ -9,6 +9,7 @@
 #include "z_lib.h"
 #include "z64audio.h"
 #include "z64play.h"
+#include "z64save.h"
 
 #include "assets/objects/object_efc_erupc/object_efc_erupc.h"
 

src/overlays/actors/ovl_En_Ani/z_en_ani.c

@@ -15,6 +15,7 @@
 #include "z_lib.h"
 #include "z64face_reaction.h"
 #include "z64play.h"
+#include "z64save.h"
 
 #include "assets/objects/object_ani/object_ani.h"
 

src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c

@@ -12,6 +12,7 @@
 #include "z64effect.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/objects/object_bg/object_bg.h"
 

src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c

@@ -7,6 +7,7 @@
 #include "z_lib.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED
 

src/overlays/actors/ovl_En_Box/z_en_box.c

@@ -17,6 +17,7 @@
 #include "z64ocarina.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/objects/object_box/object_box.h"
 

src/overlays/actors/ovl_En_Changer/z_en_changer.c

@@ -14,6 +14,7 @@
 #include "terminal.h"
 #include "z64debug_display.h"
 #include "z64play.h"
+#include "z64save.h"
 
 #define FLAGS 0
 

src/overlays/actors/ovl_En_Cow/z_en_cow.c

@@ -16,6 +16,7 @@
 #include "z64ocarina.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY)
 

src/overlays/actors/ovl_En_Cs/z_en_cs.c

@@ -11,6 +11,7 @@
 #include "z64face_reaction.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/objects/object_cs/object_cs.h"
 #include "assets/objects/object_link_child/object_link_child.h"

src/overlays/actors/ovl_En_Daiku/z_en_daiku.c

@@ -13,6 +13,7 @@
 #include "z64audio.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/objects/object_daiku/object_daiku.h"
 

src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c

@@ -17,6 +17,7 @@
 #include "z64face_reaction.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/objects/object_daiku/object_daiku.h"
 

src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c

@@ -11,6 +11,7 @@
 #include "z64effect.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_dekubaba/object_dekubaba.h"

src/overlays/actors/ovl_En_Dh/z_en_dh.c

@@ -22,6 +22,7 @@
 #include "z64effect.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/objects/object_dh/object_dh.h"
 

src/overlays/actors/ovl_En_Dha/z_en_dha.c

@@ -18,6 +18,7 @@
 #include "z_lib.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/objects/object_dh/object_dh.h"
 

src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c

@@ -22,6 +22,7 @@
 #include "z64face_reaction.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/objects/object_zo/object_zo.h"
 

src/overlays/actors/ovl_En_Dns/z_en_dns.c

@@ -16,6 +16,7 @@
 #include "z64effect.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/objects/object_shopnuts/object_shopnuts.h"
 

src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c

@@ -21,6 +21,7 @@
 #include "z64debug_display.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #define FLAGS 0
 

src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c

@@ -24,6 +24,7 @@
 #include "z64effect.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/objects/object_dns/object_dns.h"
 

src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c

@@ -25,6 +25,7 @@
 #include "z64effect.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/objects/object_dnk/object_dnk.h"
 #include "assets/objects/object_hintnuts/object_hintnuts.h"

src/overlays/actors/ovl_En_Dog/z_en_dog.c

@@ -11,6 +11,7 @@
 #include "sfx.h"
 #include "z_lib.h"
 #include "z64play.h"
+#include "z64save.h"
 
 #include "assets/objects/object_dog/object_dog.h"
 

src/overlays/actors/ovl_En_Door/z_en_door.c

@@ -15,6 +15,7 @@
 #include "z64effect.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h"

src/overlays/actors/ovl_En_Ds/z_en_ds.c

@@ -13,6 +13,7 @@
 #include "z_lib.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/objects/object_ds/object_ds.h"
 

src/overlays/actors/ovl_En_Du/z_en_du.c

@@ -12,6 +12,7 @@
 #include "z64ocarina.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/objects/object_du/object_du.h"
 #include "assets/scenes/overworld/spot18/spot18_scene.h"

src/overlays/actors/ovl_En_Eg/z_en_eg.c

@@ -13,6 +13,7 @@
 #include "terminal.h"
 #include "z_lib.h"
 #include "z64play.h"
+#include "z64save.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED
 

src/overlays/actors/ovl_En_Elf/z_en_elf.c

@@ -24,8 +24,8 @@
 #include "z64light.h"
 #include "z64play.h"
 #include "z64player.h"
-
-#include "global.h"
+#include "z64quest_hint.h"
+#include "z64save.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 

src/overlays/actors/ovl_En_Encount1/z_en_encount1.c

@@ -9,6 +9,7 @@
 #include "z64debug_display.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_LOCK_ON_DISABLED)
 

src/overlays/actors/ovl_En_Encount2/z_en_encount2.c

@@ -12,6 +12,7 @@
 #include "z_lib.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/objects/object_efc_star_field/object_efc_star_field.h"
 

src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c

@@ -18,6 +18,7 @@
 #include "z64draw.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 

src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c

@@ -13,6 +13,7 @@
 #include "z_lib.h"
 #include "z64effect.h"
 #include "z64play.h"
+#include "z64save.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 

src/overlays/actors/ovl_En_Fish/z_en_fish.c

@@ -13,6 +13,7 @@
 #include "sfx.h"
 #include "terminal.h"
 #include "z_lib.h"
+#include "z64item.h"
 #include "z64play.h"
 #include "z64player.h"
 

src/overlays/actors/ovl_En_Floormas/z_en_floormas.c

@@ -16,6 +16,7 @@
 #include "z64effect.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/objects/object_wallmaster/object_wallmaster.h"
 

src/overlays/actors/ovl_En_Fr/z_en_fr.c

@@ -19,6 +19,7 @@
 #include "z64ocarina.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "global.h"
 

src/overlays/actors/ovl_En_Fu/z_en_fu.c

@@ -16,6 +16,7 @@
 #include "z64ocarina.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/objects/object_fu/object_fu.h"
 #include "assets/scenes/indoors/hakasitarelay/hakasitarelay_scene.h"

src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c

@@ -25,6 +25,7 @@
 #include "z64effect.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_tsubo/object_tsubo.h"

src/overlays/actors/ovl_En_Gb/z_en_gb.c

@@ -18,6 +18,7 @@
 #include "z64light.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/objects/object_ps/object_ps.h"
 

src/overlays/actors/ovl_En_Ge1/z_en_ge1.c

@@ -18,6 +18,7 @@
 #include "z64horse.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/objects/object_ge1/object_ge1.h"
 

src/overlays/actors/ovl_En_Ge2/z_en_ge2.c

@@ -17,6 +17,7 @@
 #include "z64horse.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/objects/object_gla/object_gla.h"
 

src/overlays/actors/ovl_En_Ge3/z_en_ge3.c

@@ -13,6 +13,7 @@
 #include "sys_matrix.h"
 #include "versions.h"
 #include "z_lib.h"
+#include "z64item.h"
 #include "z64play.h"
 #include "z64player.h"
 

src/overlays/actors/ovl_En_GeldB/z_en_geldb.c

@@ -21,6 +21,7 @@
 #include "z64effect.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/objects/object_geldb/object_geldb.h"