From 652478c338b0a9aa04f3d8f908a2c44a429e94f3 Mon Sep 17 00:00:00 2001 From: mzxrules Date: Sun, 16 Feb 2025 15:33:55 -0500 Subject: [PATCH] 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 --- include/functions.h | 9 ----- include/gfx.h | 2 ++ include/regs.h | 1 + include/segment_symbols.h | 2 +- include/variables.h | 12 ------- include/z64.h | 36 ------------------- include/z64camera.h | 1 - include/z64cutscene.h | 8 +++++ include/z64cutscene_flags.h | 13 +++++++ include/z64cutscene_spline.h | 12 +++++++ include/z64play.h | 4 ++- include/z64quest_hint.h | 11 ++++++ include/z64quest_hint_commands.h | 7 ++++ src/audio/general.c | 2 ++ src/audio/sequence.c | 1 + src/boot/boot_main.c | 3 +- src/boot/cic6105.c | 2 +- src/boot/yaz0.c | 4 +-- src/boot/z_std_dma.c | 12 ++++--- src/code/code_n64dd_800AD4C0.c | 4 ++- src/code/db_camera.c | 13 +++++++ src/code/fault_gc.c | 10 ++++-- src/code/fault_n64.c | 16 ++++++--- src/code/flg_set.c | 8 ++++- src/code/graph.c | 16 ++++++--- src/code/jpegdecoder.c | 2 +- src/code/jpegutils.c | 2 +- src/code/main.c | 4 +-- src/code/speed_meter.c | 2 +- src/code/z_actor.c | 1 + src/code/z_bgcheck.c | 2 +- src/code/z_camera.c | 9 ++--- src/code/z_collision_check.c | 3 +- src/code/z_common_data.c | 11 ++++-- src/code/z_construct.c | 5 +++ src/code/z_cutscene_spline.c | 6 +++- src/code/z_debug.c | 15 ++++++-- src/code/z_demo.c | 30 ++++++++++++---- src/code/z_elf_message.c | 6 +++- src/code/z_en_item00.c | 1 + src/code/z_env_flags.c | 1 + src/code/z_fbdemo_fade.c | 9 ++++- src/code/z_fbdemo_wipe1.c | 4 ++- src/code/z_game_over.c | 13 +++++-- src/code/z_horse.c | 3 +- src/code/z_inventory.c | 6 +++- src/code/z_kaleido_scope_call.c | 12 +++++-- src/code/z_kaleido_setup.c | 7 +++- src/code/z_kankyo.c | 12 ++++--- src/code/z_lifemeter.c | 10 ++++++ src/code/z_map_data.c | 3 +- src/code/z_map_exp.c | 20 ++++++++--- src/code/z_map_mark.c | 9 ++++- src/code/z_message.c | 26 +++++++++++--- src/code/z_onepointdemo.c | 9 ++++- src/code/z_parameter.c | 21 ++++++++++- src/code/z_play.c | 35 ++++++++++++++---- src/code/z_player_call.c | 2 +- src/code/z_player_lib.c | 16 +++++++-- src/code/z_room.c | 23 +++++++++--- src/code/z_scene.c | 2 ++ src/code/z_scene_table.c | 20 ++++++++--- src/code/z_sram.c | 1 + src/code/z_vr_box.c | 1 + src/elf_message/elf_message_field.c | 2 +- src/elf_message/elf_message_ydan.c | 1 - src/n64dd/z_n64dd.c | 2 +- .../ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c | 1 + .../actors/ovl_Bg_Breakwall/z_bg_breakwall.c | 1 + .../actors/ovl_Bg_Dodoago/z_bg_dodoago.c | 1 + .../ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c | 1 + .../ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c | 1 + .../ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c | 1 + src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c | 1 + .../ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c | 1 + .../ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c | 1 + .../actors/ovl_Bg_Ingate/z_bg_ingate.c | 1 + .../ovl_Bg_Jya_1flift/z_bg_jya_1flift.c | 1 + .../actors/ovl_Bg_Jya_Block/z_bg_jya_block.c | 1 + .../actors/ovl_Bg_Po_Event/z_bg_po_event.c | 1 + .../ovl_Bg_Relay_Objects/z_bg_relay_objects.c | 4 +-- .../ovl_Bg_Spot00_Break/z_bg_spot00_break.c | 1 + .../z_bg_spot00_hanebasi.c | 4 +-- .../ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c | 1 + .../z_bg_spot01_idohashira.c | 1 + .../z_bg_spot01_idomizu.c | 1 + .../z_bg_spot01_idosoko.c | 1 + .../z_bg_spot01_objects2.c | 1 + .../z_bg_spot02_objects.c | 1 + .../ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c | 1 + .../z_bg_spot06_objects.c | 1 + .../ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c | 1 + .../z_bg_spot08_iceblock.c | 1 + .../ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c | 1 + .../ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c | 3 +- .../ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c | 1 + .../ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c | 1 + .../z_bg_spot16_bombstone.c | 1 + .../z_bg_spot16_doughnut.c | 1 + .../ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c | 1 + .../z_bg_spot18_shutter.c | 1 + .../ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c | 1 + .../actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c | 4 +-- .../actors/ovl_Bg_Treemouth/z_bg_treemouth.c | 3 +- .../actors/ovl_Bg_Umajump/z_bg_umajump.c | 1 + .../actors/ovl_Boss_Dodongo/z_boss_dodongo.c | 1 + src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c | 1 + .../actors/ovl_Boss_Ganon/z_boss_ganon.c | 1 + .../actors/ovl_Boss_Ganon2/z_boss_ganon2.c | 1 + .../actors/ovl_Boss_Goma/z_boss_goma.c | 1 + src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c | 1 + src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c | 5 +-- src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c | 1 + src/overlays/actors/ovl_Boss_Va/z_boss_va.c | 1 + src/overlays/actors/ovl_Demo_Du/z_demo_du.c | 1 + src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c | 1 + .../actors/ovl_Demo_Effect/z_demo_effect.c | 4 +-- src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c | 1 + src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c | 1 + src/overlays/actors/ovl_Demo_Im/z_demo_im.c | 1 + .../actors/ovl_Demo_Kankyo/z_demo_kankyo.c | 9 ++--- .../actors/ovl_Demo_Kekkai/z_demo_kekkai.c | 1 + src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c | 1 + .../actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c | 1 + src/overlays/actors/ovl_Door_Ana/z_door_ana.c | 4 +-- .../actors/ovl_Door_Gerudo/z_door_gerudo.c | 1 + .../actors/ovl_Door_Shutter/z_door_shutter.c | 1 + .../actors/ovl_Door_Toki/z_door_toki.c | 1 + .../actors/ovl_Door_Warp1/z_door_warp1.c | 1 + .../actors/ovl_Efc_Erupc/z_efc_erupc.c | 1 + src/overlays/actors/ovl_En_Ani/z_en_ani.c | 1 + .../ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c | 1 + .../ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c | 1 + src/overlays/actors/ovl_En_Box/z_en_box.c | 1 + .../actors/ovl_En_Changer/z_en_changer.c | 1 + src/overlays/actors/ovl_En_Cow/z_en_cow.c | 1 + src/overlays/actors/ovl_En_Cs/z_en_cs.c | 1 + src/overlays/actors/ovl_En_Daiku/z_en_daiku.c | 1 + .../z_en_daiku_kakariko.c | 1 + .../actors/ovl_En_Dekubaba/z_en_dekubaba.c | 1 + src/overlays/actors/ovl_En_Dh/z_en_dh.c | 1 + src/overlays/actors/ovl_En_Dha/z_en_dha.c | 1 + .../ovl_En_Diving_Game/z_en_diving_game.c | 1 + src/overlays/actors/ovl_En_Dns/z_en_dns.c | 1 + .../actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c | 1 + .../actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c | 1 + .../actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c | 1 + src/overlays/actors/ovl_En_Dog/z_en_dog.c | 1 + src/overlays/actors/ovl_En_Door/z_en_door.c | 1 + src/overlays/actors/ovl_En_Ds/z_en_ds.c | 1 + src/overlays/actors/ovl_En_Du/z_en_du.c | 1 + src/overlays/actors/ovl_En_Eg/z_en_eg.c | 1 + src/overlays/actors/ovl_En_Elf/z_en_elf.c | 4 +-- .../actors/ovl_En_Encount1/z_en_encount1.c | 1 + .../actors/ovl_En_Encount2/z_en_encount2.c | 1 + .../actors/ovl_En_Ex_Item/z_en_ex_item.c | 1 + .../actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c | 1 + src/overlays/actors/ovl_En_Fish/z_en_fish.c | 1 + .../actors/ovl_En_Floormas/z_en_floormas.c | 1 + src/overlays/actors/ovl_En_Fr/z_en_fr.c | 1 + src/overlays/actors/ovl_En_Fu/z_en_fu.c | 1 + .../actors/ovl_En_G_Switch/z_en_g_switch.c | 1 + src/overlays/actors/ovl_En_Gb/z_en_gb.c | 1 + src/overlays/actors/ovl_En_Ge1/z_en_ge1.c | 1 + src/overlays/actors/ovl_En_Ge2/z_en_ge2.c | 1 + src/overlays/actors/ovl_En_Ge3/z_en_ge3.c | 1 + src/overlays/actors/ovl_En_GeldB/z_en_geldb.c | 1 + src/overlays/actors/ovl_En_GirlA/z_en_girla.c | 1 + src/overlays/actors/ovl_En_Gm/z_en_gm.c | 1 + src/overlays/actors/ovl_En_Go/z_en_go.c | 1 + src/overlays/actors/ovl_En_Go2/z_en_go2.c | 1 + src/overlays/actors/ovl_En_Guest/z_en_guest.c | 1 + .../actors/ovl_En_Heishi1/z_en_heishi1.c | 1 + .../actors/ovl_En_Heishi2/z_en_heishi2.c | 1 + .../actors/ovl_En_Heishi3/z_en_heishi3.c | 1 + .../actors/ovl_En_Heishi4/z_en_heishi4.c | 1 + src/overlays/actors/ovl_En_Holl/z_en_holl.c | 1 + src/overlays/actors/ovl_En_Horse/z_en_horse.c | 1 + .../z_en_horse_game_check.c | 1 + .../z_en_horse_link_child.c | 1 + .../ovl_En_Horse_Normal/z_en_horse_normal.c | 1 + src/overlays/actors/ovl_En_Hs/z_en_hs.c | 1 + src/overlays/actors/ovl_En_Hy/z_en_hy.c | 1 + .../actors/ovl_En_Ice_Hono/z_en_ice_hono.c | 1 + src/overlays/actors/ovl_En_Ik/z_en_ik.c | 1 + src/overlays/actors/ovl_En_In/z_en_in.c | 1 + .../actors/ovl_En_Insect/z_en_insect.c | 1 + src/overlays/actors/ovl_En_Ishi/z_en_ishi.c | 1 + src/overlays/actors/ovl_En_Jj/z_en_jj.c | 1 + src/overlays/actors/ovl_En_Js/z_en_js.c | 1 + .../actors/ovl_En_Jsjutan/z_en_jsjutan.c | 1 + .../actors/ovl_En_Kakasi/z_en_kakasi.c | 1 + .../actors/ovl_En_Kakasi2/z_en_kakasi2.c | 1 + .../actors/ovl_En_Kakasi3/z_en_kakasi3.c | 1 + .../actors/ovl_En_Kanban/z_en_kanban.c | 1 + .../actors/ovl_En_Karebaba/z_en_karebaba.c | 1 + src/overlays/actors/ovl_En_Ko/z_en_ko.c | 1 + src/overlays/actors/ovl_En_Kz/z_en_kz.c | 1 + src/overlays/actors/ovl_En_Light/z_en_light.c | 1 + .../actors/ovl_En_M_Thunder/z_en_m_thunder.c | 1 + src/overlays/actors/ovl_En_Ma1/z_en_ma1.c | 1 + src/overlays/actors/ovl_En_Ma2/z_en_ma2.c | 1 + src/overlays/actors/ovl_En_Ma3/z_en_ma3.c | 1 + src/overlays/actors/ovl_En_Mag/z_en_mag.c | 2 ++ src/overlays/actors/ovl_En_Md/z_en_md.c | 1 + src/overlays/actors/ovl_En_Mk/z_en_mk.c | 1 + src/overlays/actors/ovl_En_Mm/z_en_mm.c | 1 + src/overlays/actors/ovl_En_Mm2/z_en_mm2.c | 1 + src/overlays/actors/ovl_En_Ms/z_en_ms.c | 1 + src/overlays/actors/ovl_En_Mu/z_en_mu.c | 1 + src/overlays/actors/ovl_En_Nb/z_en_nb.c | 1 + src/overlays/actors/ovl_En_Niw/z_en_niw.c | 1 + .../actors/ovl_En_Niw_Girl/z_en_niw_girl.c | 1 + .../actors/ovl_En_Niw_Lady/z_en_niw_lady.c | 1 + .../actors/ovl_En_Nutsball/z_en_nutsball.c | 1 + .../z_en_okarina_effect.c | 4 +-- .../ovl_En_Okarina_Tag/z_en_okarina_tag.c | 1 + src/overlays/actors/ovl_En_Okuta/z_en_okuta.c | 1 + src/overlays/actors/ovl_En_Ossan/z_en_ossan.c | 1 + src/overlays/actors/ovl_En_Owl/z_en_owl.c | 1 + .../actors/ovl_En_Peehat/z_en_peehat.c | 1 + .../actors/ovl_En_Po_Field/z_en_po_field.c | 1 + .../actors/ovl_En_Po_Relay/z_en_po_relay.c | 1 + src/overlays/actors/ovl_En_Poh/z_en_poh.c | 1 + src/overlays/actors/ovl_En_Rd/z_en_rd.c | 1 + .../ovl_En_River_Sound/z_en_river_sound.c | 1 + src/overlays/actors/ovl_En_Rl/z_en_rl.c | 1 + src/overlays/actors/ovl_En_Rr/z_en_rr.c | 1 + src/overlays/actors/ovl_En_Ru1/z_en_ru1.c | 1 + src/overlays/actors/ovl_En_Ru2/z_en_ru2.c | 1 + src/overlays/actors/ovl_En_Sa/z_en_sa.c | 1 + .../actors/ovl_En_Shopnuts/z_en_shopnuts.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_Skj/z_en_skj.c | 1 + src/overlays/actors/ovl_En_Ssh/z_en_ssh.c | 1 + src/overlays/actors/ovl_En_Sth/z_en_sth.c | 1 + src/overlays/actors/ovl_En_Sw/z_en_sw.c | 1 + .../ovl_En_Syateki_Itm/z_en_syateki_itm.c | 1 + .../ovl_En_Syateki_Man/z_en_syateki_man.c | 1 + .../ovl_En_Syateki_Niw/z_en_syateki_niw.c | 1 + src/overlays/actors/ovl_En_Ta/z_en_ta.c | 1 + .../ovl_En_Takara_Man/z_en_takara_man.c | 1 + src/overlays/actors/ovl_En_Tk/z_en_tk.c | 1 + src/overlays/actors/ovl_En_Torch/z_en_torch.c | 1 + .../actors/ovl_En_Torch2/z_en_torch2.c | 1 + src/overlays/actors/ovl_En_Toryo/z_en_toryo.c | 1 + src/overlays/actors/ovl_En_Tr/z_en_tr.c | 1 + .../actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c | 1 + .../actors/ovl_En_Viewer/z_en_viewer.c | 1 + .../actors/ovl_En_Wallmas/z_en_wallmas.c | 1 + .../ovl_En_Weather_Tag/z_en_weather_tag.c | 1 + .../ovl_En_Wonder_Talk/z_en_wonder_talk.c | 1 + .../ovl_En_Wonder_Talk2/z_en_wonder_talk2.c | 1 + src/overlays/actors/ovl_En_Xc/z_en_xc.c | 1 + .../ovl_En_Yabusame_Mark/z_en_yabusame_mark.c | 1 + src/overlays/actors/ovl_En_Zl1/z_en_zl1.c | 1 + src/overlays/actors/ovl_En_Zl2/z_en_zl2.c | 1 + src/overlays/actors/ovl_En_Zl3/z_en_zl3.c | 1 + src/overlays/actors/ovl_En_Zl4/z_en_zl4.c | 1 + src/overlays/actors/ovl_En_Zo/z_en_zo.c | 1 + src/overlays/actors/ovl_En_fHG/z_en_fhg.c | 1 + src/overlays/actors/ovl_Fishing/z_fishing.c | 5 +-- .../actors/ovl_Item_B_Heart/z_item_b_heart.c | 1 + .../ovl_Item_Etcetera/z_item_etcetera.c | 1 + .../actors/ovl_Item_Ocarina/z_item_ocarina.c | 1 + .../actors/ovl_Item_Shield/z_item_shield.c | 1 + .../actors/ovl_Magic_Dark/z_magic_dark.c | 1 + src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c | 4 +-- .../actors/ovl_Obj_Dekujr/z_obj_dekujr.c | 1 + src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c | 1 + .../ovl_Obj_Roomtimer/z_obj_roomtimer.c | 1 + .../ovl_Obj_Timeblock/z_obj_timeblock.c | 1 + .../actors/ovl_Obj_Tsubo/z_obj_tsubo.c | 1 + .../ovl_Object_Kankyo/z_object_kankyo.c | 1 + .../actors/ovl_Oceff_Spot/z_oceff_spot.c | 1 + .../actors/ovl_Oceff_Storm/z_oceff_storm.c | 1 + .../actors/ovl_Oceff_Wipe/z_oceff_wipe.c | 1 + .../actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c | 1 + .../actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c | 1 + src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c | 1 + .../actors/ovl_player_actor/z_player.c | 9 ++--- .../ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c | 3 +- .../ovl_Effect_Ss_Stick/z_eff_ss_stick.c | 1 + .../gamestates/ovl_opening/z_opening.c | 1 + src/overlays/gamestates/ovl_select/z_select.c | 10 +++--- src/overlays/gamestates/ovl_title/z_title.c | 1 + .../ovl_kaleido_scope/z_kaleido_collect.c | 3 ++ .../misc/ovl_kaleido_scope/z_kaleido_debug.c | 3 ++ .../ovl_kaleido_scope/z_kaleido_equipment.c | 3 ++ .../misc/ovl_kaleido_scope/z_kaleido_item.c | 3 ++ .../misc/ovl_kaleido_scope/z_kaleido_map.c | 1 + .../misc/ovl_kaleido_scope/z_kaleido_scope.c | 9 +++-- .../misc/ovl_kaleido_scope/z_kaleido_scope.h | 1 + 294 files changed, 688 insertions(+), 197 deletions(-) create mode 100644 include/z64cutscene_flags.h create mode 100644 include/z64cutscene_spline.h create mode 100644 include/z64quest_hint.h diff --git a/include/functions.h b/include/functions.h index 445e7783ff..ba850129d5 100644 --- a/include/functions.h +++ b/include/functions.h @@ -47,13 +47,6 @@ void Debug_DrawText(GraphicsContext* gfxCtx); void* MemCpy(void* dest, const void* src, s32 len); -u16 QuestHint_GetSariaTextId(PlayState* play); -u16 QuestHint_GetNaviTextId(PlayState* play); -void CutsceneFlags_UnsetAll(PlayState* play); -void CutsceneFlags_Set(PlayState* play, s16 flag); -void CutsceneFlags_Unset(PlayState* play, s16 flag); -s32 CutsceneFlags_Get(PlayState* play, s16 flag); - s32 Kanji_OffsetFromShiftJIS(s32 character); #if PLATFORM_IQUE void Font_LoadCharCHN(Font* font, u16 character, u16 codePointIndex); @@ -160,8 +153,6 @@ void DebugCamera_Init(DebugCam* debugCam, Camera* cameraPtr); void DebugCamera_Enable(DebugCam* debugCam, Camera* cam); void DebugCamera_Update(DebugCam* debugCam, Camera* cam); void DebugCamera_Reset(Camera* cam, DebugCam* debugCam); -void func_800BB0A0(f32 u, Vec3f* pos, f32* roll, f32* viewAngle, f32* point0, f32* point1, f32* point2, f32* point3); -s32 func_800BB2B4(Vec3f* pos, f32* roll, f32* fov, CutsceneCameraPoint* point, s16* keyFrame, f32* curFrame); void PreRender_SetValuesSave(PreRender* this, u32 width, u32 height, void* fbuf, void* zbuf, void* cvg); void PreRender_Init(PreRender* this); diff --git a/include/gfx.h b/include/gfx.h index 46a06649b9..a4c17281ca 100644 --- a/include/gfx.h +++ b/include/gfx.h @@ -54,6 +54,8 @@ typedef struct GraphicsContext { /* 0x02FC */ char unk_2FC[0x04]; } GraphicsContext; // size = 0x300 +extern Gfx gEmptyDL[]; + Gfx* Gfx_SetFog(Gfx* gfx, s32 r, s32 g, s32 b, s32 a, s32 near, s32 far); Gfx* Gfx_SetFogWithSync(Gfx* gfx, s32 r, s32 g, s32 b, s32 a, s32 near, s32 far); Gfx* Gfx_SetFog2(Gfx* gfx, s32 r, s32 g, s32 b, s32 a, s32 near, s32 far); diff --git a/include/regs.h b/include/regs.h index 50e43769ce..6eccca7701 100644 --- a/include/regs.h +++ b/include/regs.h @@ -1,6 +1,7 @@ #ifndef REGS_H #define REGS_H +#include "ultra64.h" #include "versions.h" #define REG_GROUPS 29 // number of REG groups, i.e. REG, SREG, OREG, etc. diff --git a/include/segment_symbols.h b/include/segment_symbols.h index 1aacb246d0..d036e7cec0 100644 --- a/include/segment_symbols.h +++ b/include/segment_symbols.h @@ -1,8 +1,8 @@ #ifndef SEGMENT_SYMBOLS_H #define SEGMENT_SYMBOLS_H +#include "ultra64/ultratypes.h" #include "versions.h" -#include "z64.h" #define DECLARE_SEGMENT(name) \ extern u8 _##name##SegmentStart[]; \ diff --git a/include/variables.h b/include/variables.h index 39c73df77b..4512c2f2c8 100644 --- a/include/variables.h +++ b/include/variables.h @@ -5,8 +5,6 @@ #include "libc64/os_malloc.h" #include "segment_symbols.h" -extern Mtx D_01000000; - extern void* osRomBase; extern s32 osTvType; extern u32 osRomType; @@ -77,8 +75,6 @@ extern MapData gMapDataTable; extern s16 gSpoilingItems[3]; extern s16 gSpoilingItemReverts[3]; -extern Gfx gEmptyDL[]; - extern u16 gSramSlotOffsets[]; // 4 16-colors palettes extern u64 gMojiFontTLUTs[4][4]; // original name: "moji_tlut" @@ -153,14 +149,6 @@ extern u8 gSequenceFontTable[]; extern u8 gSequenceTable[]; extern AudioTable gSampleBankTable; -extern u8 gUseCutsceneCam; -extern u16 D_8015FCCC; -extern char D_8015FCD0[20]; -extern u8 D_8015FCE4; -extern u16 gCamAtSplinePointsAppliedFrame; -extern u16 gCamEyePointAppliedFrame; -extern u16 gCamAtPointAppliedFrame; - extern LightningStrike gLightningStrike; // TODO: These variables are here for BSS ordering but ideally they should not // be extern. This could be fixed by putting more stuff (e.g. struct definitions) diff --git a/include/z64.h b/include/z64.h index e59a8caa0c..3e0f1e7e0b 100644 --- a/include/z64.h +++ b/include/z64.h @@ -7,55 +7,28 @@ #include "audiomgr.h" #include "controller.h" #include "versions.h" -#include "z64save.h" -#include "z64light.h" -#include "z64bgcheck.h" -#include "z64actor.h" #include "z64player.h" #include "z64audio.h" -#include "z64object.h" #include "z64ocarina.h" -#include "z64camera.h" -#include "z64environment.h" -#include "z64cutscene.h" -#include "z64collision_check.h" #include "z64curve.h" -#include "z64scene.h" #include "z64effect.h" -#include "z64game_over.h" -#include "z64inventory.h" -#include "z64item.h" #include "z64animation.h" #include "z64animation_legacy.h" -#include "z64dma.h" #include "letterbox.h" #include "z64math.h" #include "z64map_mark.h" -#include "z64message.h" #include "one_point_cutscene.h" -#include "z64pause.h" #include "z64play.h" #include "z64skin.h" #include "z64skin_matrix.h" -#include "z64game.h" -#include "z64transition.h" -#include "z64transition_instances.h" -#include "z64interface.h" -#include "z64sfx_source.h" -#include "z64skybox.h" -#include "z64sram.h" -#include "z64view.h" #include "z64vis.h" #include "zelda_arena.h" #include "alignment.h" #include "audiothread_cmd.h" -#include "seqcmd.h" -#include "sequence.h" #include "sfx.h" #include "color.h" #include "libu64/gfxprint.h" #include "z_lib.h" -#include "ichain.h" #include "regs.h" #include "irqmgr.h" #include "padmgr.h" @@ -69,10 +42,8 @@ #include "gfx.h" #include "gfx_setupdl.h" #include "gfxalloc.h" -#include "jpeg.h" #include "prerender.h" #include "rand.h" -#include "libc64/qrand.h" #include "sys_math.h" #include "sys_math3d.h" #include "libc64/math64.h" @@ -148,13 +119,6 @@ typedef struct SampleState { /* 0x00A8 */ View view; } SampleState; // size = 0x1D0 -typedef struct QuestHintCmd { - /* 0x00 */ u8 byte0; - /* 0x01 */ u8 byte1; - /* 0x02 */ u8 byte2; - /* 0x03 */ u8 byte3; -} QuestHintCmd; // size = 0x4 - typedef enum PauseBgPreRenderState { /* 0 */ PAUSE_BG_PRERENDER_OFF, // Inactive, do nothing. /* 1 */ PAUSE_BG_PRERENDER_SETUP, // The current frame is only drawn for the purpose of serving as the pause background. diff --git a/include/z64camera.h b/include/z64camera.h index 1e831a909e..a8b9ebc4a5 100644 --- a/include/z64camera.h +++ b/include/z64camera.h @@ -4,7 +4,6 @@ #include "ultra64.h" #include "z64cutscene.h" #include "z64math.h" -#include "z64save.h" struct CollisionContext; struct View; diff --git a/include/z64cutscene.h b/include/z64cutscene.h index c9200c24f9..f8aed368d4 100644 --- a/include/z64cutscene.h +++ b/include/z64cutscene.h @@ -515,6 +515,14 @@ typedef struct CutsceneContext { /* 0x28 */ CsCmdActorCue* actorCues[10]; // "npcdemopnt" } CutsceneContext; // size = 0x50 +extern u8 gUseCutsceneCam; +extern u16 D_8015FCCC; +extern char D_8015FCD0[20]; +extern u8 D_8015FCE4; +extern u16 gCamAtSplinePointsAppliedFrame; +extern u16 gCamEyePointAppliedFrame; +extern u16 gCamAtPointAppliedFrame; + void Cutscene_InitContext(struct PlayState* play, CutsceneContext* csCtx); void Cutscene_StartManual(struct PlayState* play, CutsceneContext* csCtx); void Cutscene_StopManual(struct PlayState* play, CutsceneContext* csCtx); diff --git a/include/z64cutscene_flags.h b/include/z64cutscene_flags.h new file mode 100644 index 0000000000..5a3c7c2a7a --- /dev/null +++ b/include/z64cutscene_flags.h @@ -0,0 +1,13 @@ +#ifndef Z64CUTSCENE_FLAGS_H +#define Z64CUTSCENE_FLAGS_H + +#include "ultra64.h" + +struct PlayState; + +void CutsceneFlags_UnsetAll(struct PlayState* play); +void CutsceneFlags_Set(struct PlayState* play, s16 flag); +void CutsceneFlags_Unset(struct PlayState* play, s16 flag); +s32 CutsceneFlags_Get(struct PlayState* play, s16 flag); + +#endif diff --git a/include/z64cutscene_spline.h b/include/z64cutscene_spline.h new file mode 100644 index 0000000000..3a73949453 --- /dev/null +++ b/include/z64cutscene_spline.h @@ -0,0 +1,12 @@ +#ifndef Z64CUTSCENE_SPLINE_H +#define Z64CUTSCENE_SPLINE_H + +#include "ultra64.h" +#include "z64math.h" + +union CutsceneCameraPoint; + +void func_800BB0A0(f32 u, Vec3f* pos, f32* roll, f32* viewAngle, f32* point0, f32* point1, f32* point2, f32* point3); +s32 func_800BB2B4(Vec3f* pos, f32* roll, f32* fov, union CutsceneCameraPoint* point, s16* keyFrame, f32* curFrame); + +#endif diff --git a/include/z64play.h b/include/z64play.h index 106c4fed00..75360543d9 100644 --- a/include/z64play.h +++ b/include/z64play.h @@ -4,7 +4,6 @@ #include "ultra64.h" #include "prerender.h" - #include "z64actor.h" #include "z64bgcheck.h" #include "z64camera.h" @@ -26,6 +25,7 @@ #include "z64view.h" union Color_RGBA8_u32; +struct Path; struct Player; struct QuestHintCmd; struct VisMono; @@ -115,6 +115,8 @@ typedef struct PlayState { /* 0x12430 */ char unk_12430[0xE8]; } PlayState; // size = 0x12518 +extern Mtx D_01000000; // billboardMtx + #define GET_ACTIVE_CAM(play) ((play)->cameraPtrs[(play)->activeCamId]) #define GET_PLAYER(play) ((Player*)(play)->actorCtx.actorLists[ACTORCAT_PLAYER].head) diff --git a/include/z64quest_hint.h b/include/z64quest_hint.h new file mode 100644 index 0000000000..b592a07c34 --- /dev/null +++ b/include/z64quest_hint.h @@ -0,0 +1,11 @@ +#ifndef Z64QUEST_HINT_H +#define Z64QUEST_HINT_H + +#include "ultra64.h" + +struct PlayState; + +u16 QuestHint_GetSariaTextId(struct PlayState* play); +u16 QuestHint_GetNaviTextId(struct PlayState* play); + +#endif diff --git a/include/z64quest_hint_commands.h b/include/z64quest_hint_commands.h index 62f262f39b..8b99510160 100644 --- a/include/z64quest_hint_commands.h +++ b/include/z64quest_hint_commands.h @@ -3,6 +3,13 @@ #include "ultra64.h" +typedef struct QuestHintCmd { + /* 0x00 */ u8 byte0; + /* 0x01 */ u8 byte1; + /* 0x02 */ u8 byte2; + /* 0x03 */ u8 byte3; +} QuestHintCmd; // size = 0x4 + /* * Hint Command Types */ diff --git a/src/audio/general.c b/src/audio/general.c index 8fc6a451f1..228fb879f1 100644 --- a/src/audio/general.c +++ b/src/audio/general.c @@ -1,5 +1,7 @@ #include "ultra64.h" #include "global.h" +#include "seqcmd.h" +#include "sequence.h" #include "versions.h" #define ABS_ALT(x) ((x) < 0 ? -(x) : (x)) diff --git a/src/audio/sequence.c b/src/audio/sequence.c index c1530377a2..a6d5003cc4 100644 --- a/src/audio/sequence.c +++ b/src/audio/sequence.c @@ -20,6 +20,7 @@ #include "ultra64.h" #include "global.h" #include "ultra64/abi.h" +#include "seqcmd.h" // Direct audio command (skips the queueing system) #define SEQCMD_SET_SEQPLAYER_VOLUME_NOW(seqPlayerIndex, duration, volume) \ diff --git a/src/boot/boot_main.c b/src/boot/boot_main.c index 409f97e530..4bd5b5bd02 100644 --- a/src/boot/boot_main.c +++ b/src/boot/boot_main.c @@ -6,8 +6,7 @@ #endif #include "z64thread.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" \ - "ntsc-1.2: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 ntsc-1.2:128" StackEntry sBootThreadInfo; OSThread sIdleThread; diff --git a/src/boot/cic6105.c b/src/boot/cic6105.c index 5ef47053fc..7f76e99c3b 100644 --- a/src/boot/cic6105.c +++ b/src/boot/cic6105.c @@ -1,4 +1,4 @@ -#pragma increment_block_number "ntsc-1.2:128" +#pragma increment_block_number "ntsc-1.2:0" #include "global.h" #include "cic6105.h" diff --git a/src/boot/yaz0.c b/src/boot/yaz0.c index 5e5ed26eb1..bb82d81734 100644 --- a/src/boot/yaz0.c +++ b/src/boot/yaz0.c @@ -1,7 +1,7 @@ #include "global.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" \ - "ntsc-1.2: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 ntsc-1.2:128" \ + "pal-1.1:128" ALIGNED(16) u8 sYaz0DataBuffer[0x400]; u8* sYaz0DataBufferEnd; diff --git a/src/boot/z_std_dma.c b/src/boot/z_std_dma.c index 2b9fc12d7e..2d611fb0a7 100644 --- a/src/boot/z_std_dma.c +++ b/src/boot/z_std_dma.c @@ -18,18 +18,22 @@ * There are some additional provisions to ensure that audio DMA is particularly high-speed, the audio data is assumed * to be uncompressed and the request queue and address translation is skipped. */ -#include "global.h" +#include "libc64/sleep.h" #include "fault.h" -#include "stack.h" -#include "terminal.h" #include "line_numbers.h" #if PLATFORM_N64 #include "n64dd.h" #endif +#include "segment_symbols.h" +#include "stack.h" +#include "stackcheck.h" +#include "terminal.h" #include "z64thread.h" +#include "global.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" \ - "ntsc-1.2:72 pal-1.0:70 pal-1.1:70" + "ntsc-1.2:20 pal-1.0:18 pal-1.1:18" StackEntry sDmaMgrStackInfo; OSMesgQueue sDmaMgrMsgQueue; diff --git a/src/code/code_n64dd_800AD4C0.c b/src/code/code_n64dd_800AD4C0.c index 3f1488c66e..34dcdb3bb3 100644 --- a/src/code/code_n64dd_800AD4C0.c +++ b/src/code/code_n64dd_800AD4C0.c @@ -1,6 +1,8 @@ -#include "global.h" #include "fault.h" #include "n64dd.h" +#include "z64save.h" + +#include "global.h" n64ddStruct_800FEE70_pointers D_800FEE70 = { func_801C7C1C, diff --git a/src/code/db_camera.c b/src/code/db_camera.c index 5da144096a..bc9fa468c1 100644 --- a/src/code/db_camera.c +++ b/src/code/db_camera.c @@ -1,6 +1,19 @@ #include "global.h" +#include "libu64/gfxprint.h" +#include "attributes.h" +#include "controller.h" +#include "letterbox.h" +#include "mempak.h" +#include "regs.h" +#include "sfx.h" +#include "z_lib.h" +#include "z64camera.h" +#include "z64cutscene.h" +#include "z64cutscene_spline.h" #include "z64debug_display.h" #include "z64olib.h" +#include "z64play.h" +#include "z64save.h" #define DEBUG_CAM_CONTROLLER_PORT 2 diff --git a/src/code/fault_gc.c b/src/code/fault_gc.c index 3bd75ed5c8..a8597a60be 100644 --- a/src/code/fault_gc.c +++ b/src/code/fault_gc.c @@ -40,16 +40,22 @@ * DPad-Up may be pressed to enable sending fault pages over osSyncPrintf as well as displaying them on-screen. * DPad-Down disables sending fault pages over osSyncPrintf. */ -#pragma increment_block_number "gc-eu:160 gc-eu-mq:160 gc-eu-mq-dbg:160 gc-jp:160 gc-jp-ce:160 gc-jp-mq:160 gc-us:160" \ - "gc-us-mq:160 ique-cn:160" +#pragma increment_block_number "gc-eu:96 gc-eu-mq:96 gc-eu-mq-dbg:96 gc-jp:112 gc-jp-ce:112 gc-jp-mq:112 gc-us:112" \ + "gc-us-mq:112 ique-cn:112" #include "global.h" +#include "libc64/sleep.h" +#include "libc64/sprintf.h" #include "alloca.h" +#include "controller.h" #include "fault.h" #include "stack.h" +#include "stackcheck.h" #include "terminal.h" #include "z64thread.h" +#include "macros.h" + void Fault_Init(void); void Fault_SetOsSyncPrintfEnabled(u32 enabled); void Fault_DrawRecImpl(s32 xStart, s32 yStart, s32 xEnd, s32 yEnd, u16 color); diff --git a/src/code/fault_n64.c b/src/code/fault_n64.c index 373c20ef97..ecfc87f10f 100644 --- a/src/code/fault_n64.c +++ b/src/code/fault_n64.c @@ -1,13 +1,19 @@ -#pragma increment_block_number "ntsc-1.0:0 ntsc-1.1:0 ntsc-1.2:0 pal-1.0:0 pal-1.1:0" - -#include "global.h" -#include "fault.h" #include "libc64/os_malloc.h" +#include "libc64/sleep.h" +#include "libc64/sprintf.h" +#include "controller.h" +#include "fault.h" +#include "padmgr.h" +#include "segmented_address.h" #include "stack.h" +#include "stackcheck.h" #include "terminal.h" #include "z64thread.h" -#pragma increment_block_number "ntsc-1.0:192 ntsc-1.1:192 ntsc-1.2:192 pal-1.0:192 pal-1.1:192" +#include "macros.h" +#include "global.h" + +#pragma increment_block_number "ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128" typedef struct FaultMgr { OSThread thread; diff --git a/src/code/flg_set.c b/src/code/flg_set.c index de5b2a3d3f..5f4316d7f0 100644 --- a/src/code/flg_set.c +++ b/src/code/flg_set.c @@ -1,4 +1,10 @@ -#include "global.h" +#include "libu64/gfxprint.h" +#include "libu64/pad.h" +#include "gfx.h" +#include "gfxalloc.h" +#include "controller.h" +#include "z64play.h" +#include "z64save.h" typedef struct FlagSetEntry { /* 0x00 */ u16* value; diff --git a/src/code/graph.c b/src/code/graph.c index c77ef71087..dfa1dc2f2a 100644 --- a/src/code/graph.c +++ b/src/code/graph.c @@ -1,16 +1,24 @@ -#include "global.h" +#include "libc64/malloc.h" +#include "libc64/sprintf.h" +#include "libu64/debug.h" +#include "gfx.h" #include "fault.h" +#include "line_numbers.h" +#include "regs.h" #include "sys_ucode.h" #include "terminal.h" #include "ucode_disas.h" #include "versions.h" -#include "line_numbers.h" +#include "z64save.h" + +#include "macros.h" +#include "global.h" #define GFXPOOL_HEAD_MAGIC 0x1234 #define GFXPOOL_TAIL_MAGIC 0x5678 -#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 ntsc-1.0:160" \ - "ntsc-1.1:160 ntsc-1.2:160 pal-1.0:160 pal-1.1:160" +#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 ntsc-1.0:192" \ + "ntsc-1.1:192 ntsc-1.2:192 pal-1.0:192 pal-1.1:192" /** * The time at which the previous `Graph_Update` ended. diff --git a/src/code/jpegdecoder.c b/src/code/jpegdecoder.c index a29752511c..338c6b15d9 100644 --- a/src/code/jpegdecoder.c +++ b/src/code/jpegdecoder.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "jpeg.h" s32 JpegDecoder_ProcessMcu(JpegHuffmanTable* hTable0, JpegHuffmanTable* hTable1, u16* mcu, s16* unk); s32 JpegDecoder_ParseNextSymbol(JpegHuffmanTable* hTable, s16* outCoeff, s8* outZeroCount); diff --git a/src/code/jpegutils.c b/src/code/jpegutils.c index 00c0406096..7f5442fd9b 100644 --- a/src/code/jpegutils.c +++ b/src/code/jpegutils.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "jpeg.h" void JpegUtils_ProcessQuantizationTable(u8* dqt, JpegQuantizationTable* qt, u8 count) { u8 i; diff --git a/src/code/main.c b/src/code/main.c index 1699a3c07f..4a55baf439 100644 --- a/src/code/main.c +++ b/src/code/main.c @@ -24,8 +24,8 @@ extern struct IrqMgr gIrqMgr; #endif #include "z64thread.h" -#pragma increment_block_number "gc-eu:144 gc-eu-mq:144 gc-jp:144 gc-jp-ce:144 gc-jp-mq:144 gc-us:144 gc-us-mq:144" \ - "ique-cn:160 ntsc-1.0:133 ntsc-1.1:133 ntsc-1.2:133 pal-1.0:131 pal-1.1:131" +#pragma increment_block_number "gc-eu:96 gc-eu-mq:96 gc-jp:96 gc-jp-ce:96 gc-jp-mq:96 gc-us:96 gc-us-mq:96 ique-cn:96" \ + "ntsc-1.0:78 ntsc-1.1:78 ntsc-1.2:78 pal-1.0:76 pal-1.1:76" extern u8 _buffersSegmentEnd[]; diff --git a/src/code/speed_meter.c b/src/code/speed_meter.c index d282e34953..c8a6fee43c 100644 --- a/src/code/speed_meter.c +++ b/src/code/speed_meter.c @@ -1,4 +1,4 @@ -#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" \ +#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" \ "ntsc-1.2:128 pal-1.0:128 pal-1.1:128" #include "global.h" diff --git a/src/code/z_actor.c b/src/code/z_actor.c index b6a5c49564..155389b53f 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -18,6 +18,7 @@ #include "z64light.h" #include "z64horse.h" #include "z64play.h" +#include "z64save.h" #include "z64skin_matrix.h" #include "global.h" diff --git a/src/code/z_bgcheck.c b/src/code/z_bgcheck.c index 8caacb9405..f89840fb67 100644 --- a/src/code/z_bgcheck.c +++ b/src/code/z_bgcheck.c @@ -2,7 +2,7 @@ #include "terminal.h" #include "line_numbers.h" -#pragma increment_block_number "ntsc-1.0:120 ntsc-1.1:120 ntsc-1.2:120" +#pragma increment_block_number "ntsc-1.0:64 ntsc-1.1:64 ntsc-1.2:64" u16 DynaSSNodeList_GetNextNodeIdx(DynaSSNodeList* nodeList); void BgCheck_GetStaticLookupIndicesFromPos(CollisionContext* colCtx, Vec3f* pos, Vec3i* sector); diff --git a/src/code/z_camera.c b/src/code/z_camera.c index 6b0f502ae0..21ba635c85 100644 --- a/src/code/z_camera.c +++ b/src/code/z_camera.c @@ -1,12 +1,13 @@ #include "ultra64.h" -#include "global.h" #include "quake.h" #include "terminal.h" +#include "z64cutscene_spline.h" #include "z64olib.h" +#include "z64save.h" #include "overlays/actors/ovl_En_Horse/z_en_horse.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:192 gc-eu-mq:192 gc-jp:192 gc-jp-ce:192 gc-jp-mq:192 gc-us:192 gc-us-mq:192" \ + "ique-cn:192 ntsc-1.0:192 ntsc-1.1:192 ntsc-1.2:192 pal-1.0:192 pal-1.1:192" s16 Camera_RequestSettingImpl(Camera* camera, s16 requestedSetting, s16 flags); s32 Camera_RequestModeImpl(Camera* camera, s16 requestedMode, u8 forceModeChange); @@ -3640,7 +3641,7 @@ s32 Camera_KeepOn3(Camera* camera) { } #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:134 ntsc-1.1:134 ntsc-1.2:134 pal-1.0:132 pal-1.1:132" + "ique-cn:128 ntsc-1.0:117 ntsc-1.1:117 ntsc-1.2:117 pal-1.0:115 pal-1.1:115" s32 Camera_KeepOn4(Camera* camera) { static Vec3f D_8015BD50; diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c index 6096966e29..e05bb44d17 100644 --- a/src/code/z_collision_check.c +++ b/src/code/z_collision_check.c @@ -15,8 +15,7 @@ #include "overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h" #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:104 ntsc-1.1:104 ntsc-1.2:104 pal-1.0:104 pal-1.1:104" +#pragma increment_block_number "ique-cn:0 ntsc-1.0:248 ntsc-1.1:248 ntsc-1.2:248 pal-1.0:248 pal-1.1:248" typedef s32 (*ColChkResetFunc)(PlayState*, Collider*); typedef void (*ColChkApplyFunc)(PlayState*, CollisionCheckContext*, Collider*); diff --git a/src/code/z_common_data.c b/src/code/z_common_data.c index 7671ba1c0c..a8193c3af6 100644 --- a/src/code/z_common_data.c +++ b/src/code/z_common_data.c @@ -1,9 +1,14 @@ -#include "global.h" #include "region.h" +#include "sequence.h" #include "versions.h" +#include "z64environment.h" +#include "z64save.h" +#include "z64transition.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" \ - "ntsc-1.0:176 ntsc-1.1:176 ntsc-1.2:176 pal-1.0:176 pal-1.1:176" +#include "global.h" + +#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 ntsc-1.0:176" \ + "ntsc-1.1:176 ntsc-1.2:176 pal-1.0:192 pal-1.1:192" ALIGNED(16) SaveContext gSaveContext; #if PLATFORM_IQUE diff --git a/src/code/z_construct.c b/src/code/z_construct.c index fa0f4a38d2..dacec26d9b 100644 --- a/src/code/z_construct.c +++ b/src/code/z_construct.c @@ -1,5 +1,10 @@ #include "global.h" +#include "map.h" +#include "regs.h" #include "versions.h" +#include "z64ocarina.h" +#include "z64play.h" +#include "z64save.h" void Interface_Destroy(PlayState* play) { Map_Destroy(play); diff --git a/src/code/z_cutscene_spline.c b/src/code/z_cutscene_spline.c index 421f9a2809..d95b2ca7fd 100644 --- a/src/code/z_cutscene_spline.c +++ b/src/code/z_cutscene_spline.c @@ -1,4 +1,8 @@ -#include "global.h" +#include "ultra64.h" +#include "z64math.h" +#include "z64camera.h" +#include "z64cutscene_spline.h" +#include "macros.h" // The code in this file is very similar to a spline system used in Super Mario 64 for cutscene camera movement diff --git a/src/code/z_debug.c b/src/code/z_debug.c index c4333f787e..70d108e167 100644 --- a/src/code/z_debug.c +++ b/src/code/z_debug.c @@ -1,4 +1,15 @@ -#include "global.h" +#include "libc64/malloc.h" +#include "libu64/gfxprint.h" +#include "libu64/pad.h" +#include "color.h" +#include "controller.h" +#include "gfx.h" +#include "gfxalloc.h" +#include "regs.h" +#include "rumble.h" +#include "ultra64.h" + +#include "macros.h" typedef struct DebugCamTextBufferEntry { /* 0x0 */ u8 x; @@ -13,7 +24,7 @@ typedef struct InputCombo { } InputCombo; // size = 0x4 #pragma increment_block_number "gc-eu:160 gc-eu-mq:160 gc-jp:160 gc-jp-ce:160 gc-jp-mq:160 gc-us:160 gc-us-mq:160" \ - "ique-cn:128 ntsc-1.0:160 ntsc-1.1:160 ntsc-1.2:160 pal-1.0:160 pal-1.1:160" + "ique-cn:160 ntsc-1.0:160 ntsc-1.1:160 ntsc-1.2:160 pal-1.0:160 pal-1.1:160" RegEditor* gRegEditor; diff --git a/src/code/z_demo.c b/src/code/z_demo.c index 6e35b82554..9db96e052d 100644 --- a/src/code/z_demo.c +++ b/src/code/z_demo.c @@ -1,11 +1,29 @@ -#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" \ - "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" #include "global.h" -#include "quake.h" -#include "z64camera.h" +#include "libu64/gfxprint.h" +#include "controller.h" +#include "gfx.h" +#include "gfxalloc.h" +#include "letterbox.h" #if PLATFORM_N64 #include "n64dd.h" #endif +#include "regs.h" +#include "rumble.h" +#include "quake.h" +#include "segmented_address.h" +#include "seqcmd.h" +#include "sequence.h" +#include "sfx.h" +#include "z_lib.h" +#include "z64audio.h" +#include "z64camera.h" +#include "z64cutscene.h" +#include "z64cutscene_flags.h" +#include "z64play.h" +#include "z64player.h" +#include "z64save.h" #include "assets/scenes/indoors/tokinoma/tokinoma_scene.h" @@ -126,8 +144,8 @@ u16 gCamAtSplinePointsAppliedFrame; u16 gCamEyePointAppliedFrame; u16 gCamAtPointAppliedFrame; -#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:188 gc-jp-ce:188 gc-jp-mq:0 gc-us:188 gc-us-mq:0" \ - "ntsc-1.0:128 ntsc-1.1:80 ntsc-1.2:80 pal-1.0:80 pal-1.1:80" +#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \ + "ique-cn:128 ntsc-1.0:0 ntsc-1.1:0 ntsc-1.2:0 pal-1.0:0 pal-1.1:0" // Cam ID to return to when a scripted cutscene is finished s16 sReturnToCamId; diff --git a/src/code/z_elf_message.c b/src/code/z_elf_message.c index c90b4ee6f4..7b3cf1c556 100644 --- a/src/code/z_elf_message.c +++ b/src/code/z_elf_message.c @@ -1,5 +1,9 @@ -#include "global.h" +#include "libu64/debug.h" +#include "rand.h" +#include "z64play.h" +#include "z64player.h" #include "z64quest_hint_commands.h" +#include "z64save.h" QuestHintCmd sChildSariaQuestHints[] = { QUEST_HINT_STRENGTH_UPG(SKIP, 0, false, 3), diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c index e91f09ac0e..afd6a41f46 100644 --- a/src/code/z_en_item00.c +++ b/src/code/z_en_item00.c @@ -17,6 +17,7 @@ #include "z64item.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/code/z_env_flags.c b/src/code/z_env_flags.c index d277a5f752..9ad7e7a024 100644 --- a/src/code/z_env_flags.c +++ b/src/code/z_env_flags.c @@ -1,4 +1,5 @@ #include "ultra64.h" +#include "z64cutscene_flags.h" #include "z64play.h" void CutsceneFlags_UnsetAll(PlayState* play) { diff --git a/src/code/z_fbdemo_fade.c b/src/code/z_fbdemo_fade.c index d2cb382f05..3375628cb0 100644 --- a/src/code/z_fbdemo_fade.c +++ b/src/code/z_fbdemo_fade.c @@ -1,5 +1,12 @@ -#include "global.h" +#include "ultra64.h" +#include "main.h" +#include "regs.h" #include "terminal.h" +#include "z_lib.h" +#include "z64save.h" +#include "z64transition_instances.h" + +#include "macros.h" typedef enum TransitionFadeDirection { /* 0 */ TRANS_FADE_DIR_IN, diff --git a/src/code/z_fbdemo_wipe1.c b/src/code/z_fbdemo_wipe1.c index e008f68613..a3418e91a3 100644 --- a/src/code/z_fbdemo_wipe1.c +++ b/src/code/z_fbdemo_wipe1.c @@ -1,4 +1,6 @@ -#include "global.h" +#include "gfx.h" +#include "z64save.h" +#include "z64transition_instances.h" typedef enum TransitionWipeDirection { /* 0 */ TRANS_WIPE_DIR_IN, diff --git a/src/code/z_game_over.c b/src/code/z_game_over.c index f0390a9611..20814a4c74 100644 --- a/src/code/z_game_over.c +++ b/src/code/z_game_over.c @@ -1,7 +1,14 @@ -#include "z64game_over.h" - -#include "global.h" +#include "letterbox.h" +#include "regs.h" +#include "rumble.h" +#include "sequence.h" #include "versions.h" +#include "z64game_over.h" +#include "z64play.h" +#include "z64save.h" + +#include "macros.h" +#include "global.h" void GameOver_Init(PlayState* play) { play->gameOverCtx.state = GAMEOVER_INACTIVE; diff --git a/src/code/z_horse.c b/src/code/z_horse.c index f6f55c9d06..800f72c738 100644 --- a/src/code/z_horse.c +++ b/src/code/z_horse.c @@ -4,7 +4,8 @@ #include "z64horse.h" #include "z64play.h" #include "z64player.h" -#include "src/overlays/actors/ovl_En_Horse/z_en_horse.h" +#include "z64save.h" +#include "overlays/actors/ovl_En_Horse/z_en_horse.h" /** * Tests if the player horse can be spawned diff --git a/src/code/z_inventory.c b/src/code/z_inventory.c index 2f89c0565b..bb4bb5f850 100644 --- a/src/code/z_inventory.c +++ b/src/code/z_inventory.c @@ -1,4 +1,8 @@ -#include "global.h" +#include "ultra64.h" +#include "z64play.h" +#include "z64player.h" +#include "z64save.h" + #include "assets/textures/icon_item_static/icon_item_static.h" #include "assets/textures/icon_item_24_static/icon_item_24_static.h" #include "assets/textures/parameter_static/parameter_static.h" diff --git a/src/code/z_kaleido_scope_call.c b/src/code/z_kaleido_scope_call.c index 9983b9b320..f1017342a8 100644 --- a/src/code/z_kaleido_scope_call.c +++ b/src/code/z_kaleido_scope_call.c @@ -1,8 +1,14 @@ -#pragma increment_block_number "gc-eu:192 gc-eu-mq:192 gc-jp:192 gc-jp-ce:192 gc-jp-mq:192 gc-us:192 gc-us-mq:192" \ - "ique-cn:192 ntsc-1.0:224 ntsc-1.1:224 ntsc-1.2:224 pal-1.0:224 pal-1.1:224" +#pragma increment_block_number "gc-eu:160 gc-eu-mq:160 gc-jp:160 gc-jp-ce:160 gc-jp-mq:160 gc-us:160 gc-us-mq:160" \ + "ique-cn:160 ntsc-1.0:160 ntsc-1.1:160 ntsc-1.2:160 pal-1.0:160 pal-1.1:160" + +#include "libu64/debug.h" +#include "kaleido_manager.h" +#include "letterbox.h" +#include "regs.h" +#include "terminal.h" +#include "z64play.h" #include "global.h" -#include "terminal.h" void (*sKaleidoScopeUpdateFunc)(PlayState* play); void (*sKaleidoScopeDrawFunc)(PlayState* play); diff --git a/src/code/z_kaleido_setup.c b/src/code/z_kaleido_setup.c index 075a13dcdb..cc1621947d 100644 --- a/src/code/z_kaleido_setup.c +++ b/src/code/z_kaleido_setup.c @@ -1,7 +1,12 @@ -#include "global.h" +#include "controller.h" +#include "letterbox.h" #if PLATFORM_N64 #include "n64dd.h" #endif +#include "regs.h" +#include "z64audio.h" +#include "z64play.h" +#include "z64save.h" /* * The following three arrays are effectively unused. diff --git a/src/code/z_kankyo.c b/src/code/z_kankyo.c index 012ecdb742..8e835bdd46 100644 --- a/src/code/z_kankyo.c +++ b/src/code/z_kankyo.c @@ -1,12 +1,16 @@ -#pragma increment_block_number "gc-eu:224 gc-eu-mq:224 gc-jp:208 gc-jp-ce:208 gc-jp-mq:208 gc-us:208 gc-us-mq:208" \ - "ique-cn:208 ntsc-1.0:224 ntsc-1.1:224 ntsc-1.2:224 pal-1.0:232 pal-1.1:232" +#pragma increment_block_number "gc-eu:64 gc-eu-mq:64 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:64 pal-1.1:64" #include "global.h" #include "ultra64.h" +#include "seqcmd.h" +#include "sequence.h" #include "terminal.h" #include "versions.h" +#include "z64cutscene.h" #include "z64frame_advance.h" +#include "z64save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" @@ -214,8 +218,8 @@ s16 sLightningFlashAlpha; s16 sSunDepthTestX; s16 sSunDepthTestY; -#pragma increment_block_number "gc-eu:240 gc-eu-mq:240 gc-jp:224 gc-jp-ce:224 gc-jp-mq:224 gc-us:224 gc-us-mq:224" \ - "ique-cn:224 ntsc-1.0:224 ntsc-1.1:224 ntsc-1.2:224 pal-1.0:240 pal-1.1:240" +#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" LightNode* sNGameOverLightNode; LightInfo sNGameOverLightInfo; diff --git a/src/code/z_lifemeter.c b/src/code/z_lifemeter.c index efe7b92b83..1395580d0e 100644 --- a/src/code/z_lifemeter.c +++ b/src/code/z_lifemeter.c @@ -1,4 +1,14 @@ +#include "gfx.h" +#include "gfx_setupdl.h" +#include "sfx.h" +#include "sys_matrix.h" +#include "z_lib.h" +#include "z64play.h" +#include "z64player.h" +#include "z64save.h" + #include "global.h" + #include "assets/textures/parameter_static/parameter_static.h" static s16 sHeartsPrimColors[3][3] = { diff --git a/src/code/z_map_data.c b/src/code/z_map_data.c index 24721c6234..502eb43c3c 100644 --- a/src/code/z_map_data.c +++ b/src/code/z_map_data.c @@ -1,4 +1,5 @@ -#include "global.h" +#include "map.h" +#include "z64save.h" static s16 sFloorTexIndexOffset[10][8] = { { 0, 0, 0, 0, 2, 4, 6, 8 }, { 0, 0, 0, 0, 0, 0, 0, 2 }, diff --git a/src/code/z_map_exp.c b/src/code/z_map_exp.c index 8c19635d62..78371084b5 100644 --- a/src/code/z_map_exp.c +++ b/src/code/z_map_exp.c @@ -1,10 +1,22 @@ -#include "global.h" -#include "terminal.h" -#include "assets/objects/gameplay_keep/gameplay_keep.h" -#include "assets/textures/parameter_static/parameter_static.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "controller.h" +#include "map.h" #if PLATFORM_N64 #include "n64dd.h" #endif +#include "regs.h" +#include "sfx.h" +#include "sys_matrix.h" +#include "terminal.h" +#include "z64play.h" +#include "z64player.h" +#include "z64save.h" + +#include "global.h" + +#include "assets/objects/gameplay_keep/gameplay_keep.h" +#include "assets/textures/parameter_static/parameter_static.h" MapData* gMapData; diff --git a/src/code/z_map_mark.c b/src/code/z_map_mark.c index 4d0ab0411b..72d245ce8a 100644 --- a/src/code/z_map_mark.c +++ b/src/code/z_map_mark.c @@ -1,9 +1,16 @@ -#include "global.h" +#include "libu64/debug.h" +#include "romfile.h" +#include "segment_symbols.h" #include "terminal.h" #include "assets/textures/parameter_static/parameter_static.h" #if PLATFORM_N64 #include "n64dd.h" #endif +#include "z64map_mark.h" +#include "z64play.h" +#include "z64save.h" + +#include "global.h" typedef struct MapMarkInfo { /* 0x00 */ void* texture; diff --git a/src/code/z_message.c b/src/code/z_message.c index a2c275b8ea..01ecf6f0c2 100644 --- a/src/code/z_message.c +++ b/src/code/z_message.c @@ -1,14 +1,30 @@ -#include "global.h" +#include "libu64/gfxprint.h" +#include "attributes.h" +#include "controller.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "gfxalloc.h" #include "message_data_static.h" -#include "terminal.h" -#include "versions.h" -#include "assets/textures/parameter_static/parameter_static.h" #if PLATFORM_N64 #include "n64dd.h" #endif +#include "segment_symbols.h" +#include "sequence.h" +#include "regs.h" +#include "terminal.h" +#include "versions.h" +#include "z64audio.h" +#include "z64ocarina.h" +#include "z64play.h" +#include "z64player.h" +#include "z64save.h" + +#include "global.h" + +#include "assets/textures/parameter_static/parameter_static.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" \ - "ntsc-1.0:80 ntsc-1.1:80 ntsc-1.2:80 pal-1.0:128 pal-1.1:128" + "ntsc-1.0:144 ntsc-1.1:144 ntsc-1.2:144 pal-1.0:128 pal-1.1:128" #if !PLATFORM_IQUE #define MSG_BUF_DECODED (msgCtx->msgBufDecoded) diff --git a/src/code/z_onepointdemo.c b/src/code/z_onepointdemo.c index 344d3aee29..6a4c896ac7 100644 --- a/src/code/z_onepointdemo.c +++ b/src/code/z_onepointdemo.c @@ -1,8 +1,15 @@ -#include "global.h" +#include "libc64/math64.h" +#include "libc64/qrand.h" +#include "one_point_cutscene.h" #include "quake.h" +#include "sfx.h" #include "terminal.h" #include "versions.h" +#include "z_lib.h" #include "z64olib.h" +#include "z64play.h" +#include "z64player.h" +#include "z64save.h" #include "overlays/actors/ovl_En_Sw/z_en_sw.h" static s16 sDisableAttention = false; diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index 91225aae25..1a25f67518 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -1,7 +1,26 @@ -#include "global.h" +#include "attributes.h" +#include "controller.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "main.h" +#include "map.h" +#include "regs.h" +#include "segment_symbols.h" +#include "segmented_address.h" +#include "sequence.h" +#include "sfx.h" +#include "sys_matrix.h" #include "terminal.h" #include "versions.h" +#include "z64audio.h" #include "z64horse.h" +#include "z64ocarina.h" +#include "z64play.h" +#include "z64player.h" +#include "z64save.h" + +#include "global.h" + #include "assets/textures/parameter_static/parameter_static.h" #include "assets/textures/do_action_static/do_action_static.h" #include "assets/textures/icon_item_static/icon_item_static.h" diff --git a/src/code/z_play.c b/src/code/z_play.c index ac271a93e8..4e724601f0 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -1,18 +1,39 @@ - -#include "global.h" +#include "libu64/debug.h" +#include "controller.h" #include "fault.h" -#include "quake.h" -#include "terminal.h" -#include "versions.h" +#include "gfx.h" +#include "gfxalloc.h" +#include "kaleido_manager.h" +#include "letterbox.h" #include "line_numbers.h" #if PLATFORM_N64 #include "n64dd.h" #endif - +#include "one_point_cutscene.h" +#include "quake.h" +#include "regs.h" +#include "rumble.h" +#include "segmented_address.h" +#include "sequence.h" +#include "sfx.h" +#include "sys_math3d.h" +#include "sys_matrix.h" +#include "terminal.h" +#include "versions.h" +#include "zelda_arena.h" +#include "z64cutscene_flags.h" #include "z64debug_display.h" +#include "z64effect.h" #include "z64frame_advance.h" +#include "z64light.h" +#include "z64play.h" +#include "z64player.h" +#include "z64save.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" +#include "global.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:192 ntsc-1.0:64 ntsc-1.1:64 ntsc-1.2:64 pal-1.0:64 pal-1.1:64" TransitionTile gTransitionTile; s32 gTransitionTileState; diff --git a/src/code/z_player_call.c b/src/code/z_player_call.c index b922f56638..2874522dfb 100644 --- a/src/code/z_player_call.c +++ b/src/code/z_player_call.c @@ -4,7 +4,7 @@ (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \ ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA | ACTOR_FLAG_CAN_PRESS_SWITCHES) -#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" \ +#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" \ "ntsc-1.2:128 pal-1.1:128" void (*sPlayerCallInitFunc)(Actor* thisx, PlayState* play); diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c index 0e34ff571a..adefea26a7 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -1,12 +1,24 @@ -#include "global.h" +#include "libc64/math64.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "regs.h" +#include "segmented_address.h" +#include "sys_matrix.h" #include "versions.h" +#include "z_lib.h" #include "z64draw.h" +#include "z64effect.h" +#include "z64play.h" +#include "z64player.h" +#include "z64save.h" +#include "z64skin_matrix.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_link_boy/object_link_boy.h" #include "assets/objects/object_link_child/object_link_child.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" +#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:0 pal-1.1:0" typedef struct BowSlingshotStringData { /* 0x00 */ Gfx* dList; diff --git a/src/code/z_room.c b/src/code/z_room.c index 4050248b3b..ce8f452f9e 100644 --- a/src/code/z_room.c +++ b/src/code/z_room.c @@ -1,12 +1,27 @@ -#include "global.h" +#include "libu64/debug.h" +#include "ultra64/gs2dex.h" #include "fault.h" -#include "sys_ucode.h" -#include "terminal.h" -#include "versions.h" +#include "gfx.h" +#include "gfx_setupdl.h" +#include "jpeg.h" #include "line_numbers.h" +#include "map.h" #if PLATFORM_N64 #include "n64dd.h" #endif +#include "regs.h" +#include "segmented_address.h" +#include "sys_matrix.h" +#include "sys_ucode.h" +#include "terminal.h" +#include "versions.h" +#include "z64audio.h" +#include "z64play.h" +#include "z64player.h" +#include "z64save.h" +#include "z64skin_matrix.h" + +#include "global.h" Vec3f D_801270A0 = { 0.0f, 0.0f, 0.0f }; diff --git a/src/code/z_scene.c b/src/code/z_scene.c index e285587d90..4b40a3b0ca 100644 --- a/src/code/z_scene.c +++ b/src/code/z_scene.c @@ -1,6 +1,8 @@ #include "global.h" +#include "seqcmd.h" #include "terminal.h" #include "versions.h" +#include "z64save.h" SceneCmdHandlerFunc sSceneCmdHandlers[SCENE_CMD_ID_MAX]; RomFile sNaviQuestHintFiles[]; diff --git a/src/code/z_scene_table.c b/src/code/z_scene_table.c index a6a08ccd16..8b4a57e893 100644 --- a/src/code/z_scene_table.c +++ b/src/code/z_scene_table.c @@ -1,10 +1,22 @@ -#include "global.h" -#include "quake.h" -#include "versions.h" -#include "z64frame_advance.h" +#include "libc64/qrand.h" +#include "gfx.h" #if PLATFORM_N64 #include "n64dd.h" #endif +#include "quake.h" +#include "regs.h" +#include "segment_symbols.h" +#include "segmented_address.h" +#include "sfx.h" +#include "sys_matrix.h" +#include "versions.h" +#include "z_lib.h" +#include "z64frame_advance.h" +#include "z64play.h" +#include "z64player.h" +#include "z64save.h" + +#include "global.h" #include "assets/scenes/indoors/miharigoya/miharigoya_scene.h" #include "assets/scenes/indoors/souko/souko_scene.h" diff --git a/src/code/z_sram.c b/src/code/z_sram.c index da453d46cf..ab25ffeb2e 100644 --- a/src/code/z_sram.c +++ b/src/code/z_sram.c @@ -1,6 +1,7 @@ #include "global.h" #include "terminal.h" #include "versions.h" +#include "z64save.h" #define SLOT_SIZE (sizeof(SaveContext) + 0x28) #define CHECKSUM_SIZE (sizeof(Save) / 2) diff --git a/src/code/z_vr_box.c b/src/code/z_vr_box.c index 2e7953362b..cd8c1b2b8f 100644 --- a/src/code/z_vr_box.c +++ b/src/code/z_vr_box.c @@ -1,6 +1,7 @@ #include "global.h" #include "terminal.h" #include "z64environment.h" +#include "z64save.h" typedef struct SkyboxFaceParams { /* 0x000 */ s32 xStart; diff --git a/src/elf_message/elf_message_field.c b/src/elf_message/elf_message_field.c index 505649afda..8c672ad50b 100644 --- a/src/elf_message/elf_message_field.c +++ b/src/elf_message/elf_message_field.c @@ -1,5 +1,5 @@ -#include "global.h" #include "z64quest_hint_commands.h" +#include "z64save.h" QuestHintCmd gOverworldNaviQuestHints[] = { QUEST_HINT_FLAG(CHECK, EVENTCHKINF_05, false, 0x40), diff --git a/src/elf_message/elf_message_ydan.c b/src/elf_message/elf_message_ydan.c index 21b5fe89fa..cde6410b22 100644 --- a/src/elf_message/elf_message_ydan.c +++ b/src/elf_message/elf_message_ydan.c @@ -1,4 +1,3 @@ -#include "global.h" #include "z64quest_hint_commands.h" QuestHintCmd gDungeonNaviQuestHints[] = { diff --git a/src/n64dd/z_n64dd.c b/src/n64dd/z_n64dd.c index 1b6934f502..864b67d822 100644 --- a/src/n64dd/z_n64dd.c +++ b/src/n64dd/z_n64dd.c @@ -8,7 +8,7 @@ #include "line_numbers.h" #include "z64thread.h" -#pragma increment_block_number "ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128" +#pragma increment_block_number "ntsc-1.0:64 ntsc-1.1:64 ntsc-1.2:64 pal-1.0:64 pal-1.1:64" typedef struct struct_801D9C30 { /* 0x000 */ s32 unk_000; // disk start diff --git a/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c b/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c index 2548f33e10..c927465569 100644 --- a/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c +++ b/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" diff --git a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c index e03e1f6299..f36d251f45 100644 --- a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c +++ b/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" diff --git a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c b/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c index 7153161f34..bf421ecd98 100644 --- a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c +++ b/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" diff --git a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c index b20e6fc16e..eb35f52494 100644 --- a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c +++ b/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" diff --git a/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c b/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c index c4811a1d5a..9385ed95bf 100644 --- a/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c +++ b/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" diff --git a/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c b/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c index a4a64c2014..6c0f01b322 100644 --- a/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c +++ b/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" diff --git a/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c b/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c index 6e0b045a8b..f20af0b9f8 100644 --- a/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c +++ b/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" diff --git a/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c b/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c index dfaca6232e..a20a0a0421 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c +++ b/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" diff --git a/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c b/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c index 26201b24c2..47849aa850 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c +++ b/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" 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 40eaf99d1d..e46139117c 100644 --- a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c +++ b/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" 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 8dbf588a19..94fd0883d4 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 @@ -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" 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 bcd06ce59a..946db1b05c 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 @@ -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" 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 1c5ce99ec1..eda5a530eb 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 @@ -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" diff --git a/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c b/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c index 953a6c372b..37591ae020 100644 --- a/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c +++ b/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" diff --git a/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c b/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c index e493207d0f..4a3a760d92 100644 --- a/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c +++ b/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" diff --git a/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c b/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c index fb801f1704..c305635b83 100644 --- a/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c +++ b/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" diff --git a/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c b/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c index ada2d26420..33f96d5476 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c +++ b/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" diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c b/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c index 0aefb899f9..d5a21a8b6b 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c +++ b/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" diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c b/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c index 3b81adc378..5329d2e0f6 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c +++ b/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" diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c b/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c index 2dc1d7b30d..6dbdd910d5 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c +++ b/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" diff --git a/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c b/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c index 08b0c14f70..4b7e9eed8a 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c +++ b/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" diff --git a/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c b/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c index 9c66c77648..795df90151 100644 --- a/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c +++ b/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" diff --git a/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c b/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c index 8df3a7830e..edb253568d 100644 --- a/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c +++ b/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" diff --git a/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c b/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c index a713bb557c..45b2b1e9f2 100644 --- a/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c +++ b/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" diff --git a/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c b/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c index e131bf40f8..afb9d02972 100644 --- a/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c +++ b/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" diff --git a/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c b/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c index 6ac2bd0fd7..4f0bb37567 100644 --- a/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c +++ b/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" diff --git a/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c b/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c index a157fc5d61..449091faa0 100644 --- a/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c +++ b/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" diff --git a/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c b/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c index 5042c86d35..1af76df476 100644 --- a/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c +++ b/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 diff --git a/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c b/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c index 5770d45f9c..02dbe68e3a 100644 --- a/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c +++ b/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" diff --git a/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c b/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c index 1fe57be526..c053a6c2d1 100644 --- a/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c +++ b/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" diff --git a/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c b/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c index 6bbf058f79..b014d7faff 100644 --- a/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c +++ b/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" diff --git a/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c b/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c index d99e751628..c6cf246bca 100644 --- a/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c +++ b/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" diff --git a/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c b/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c index eb60ebe2ff..7012e9023c 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c +++ b/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" diff --git a/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c b/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c index 4a8c72d6ee..a92e53a4f2 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c +++ b/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" diff --git a/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c b/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c index fd12de168b..47550f22bd 100644 --- a/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c +++ b/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" diff --git a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c index 8c79e8fdbe..a3a3856969 100644 --- a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c +++ b/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" diff --git a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c index f5fb1eabca..5a544c3015 100644 --- a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c +++ b/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" diff --git a/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c b/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c index 9d5e94d044..63a73aaf4e 100644 --- a/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c +++ b/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" diff --git a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c index 4adab87599..bfc700c6dc 100644 --- a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c +++ b/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" diff --git a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c index 4b0f869e02..aad89ee93f 100644 --- a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c +++ b/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" diff --git a/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c b/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c index 5b695935df..a32ba565ce 100644 --- a/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c +++ b/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" diff --git a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c index 368c3fdb21..daad206320 100644 --- a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c +++ b/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" diff --git a/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c b/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c index 2b14470128..c1719b8e6d 100644 --- a/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c +++ b/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" diff --git a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c index 9d28223bdc..cbb82fd9a6 100644 --- a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c +++ b/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" diff --git a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c index ce3be2b754..3cb53006cc 100644 --- a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c +++ b/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 | \ diff --git a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c index baff7c26c0..50bb35218a 100644 --- a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c +++ b/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" diff --git a/src/overlays/actors/ovl_Boss_Va/z_boss_va.c b/src/overlays/actors/ovl_Boss_Va/z_boss_va.c index 076a1d68c6..d5454d30e8 100644 --- a/src/overlays/actors/ovl_Boss_Va/z_boss_va.c +++ b/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" diff --git a/src/overlays/actors/ovl_Demo_Du/z_demo_du.c b/src/overlays/actors/ovl_Demo_Du/z_demo_du.c index b66d9edede..9a1993da17 100644 --- a/src/overlays/actors/ovl_Demo_Du/z_demo_du.c +++ b/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" diff --git a/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c b/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c index f7e652fa2f..303c4f7240 100644 --- a/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c +++ b/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" diff --git a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c index 69db3f243b..78517cad0f 100644 --- a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c +++ b/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" diff --git a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c index 4af78a9b65..1cfb0ef82b 100644 --- a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c +++ b/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" diff --git a/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c b/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c index 3e62e46bf0..7b86c2bc25 100644 --- a/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c +++ b/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" diff --git a/src/overlays/actors/ovl_Demo_Im/z_demo_im.c b/src/overlays/actors/ovl_Demo_Im/z_demo_im.c index eed9b32d36..95d68dd2b5 100644 --- a/src/overlays/actors/ovl_Demo_Im/z_demo_im.c +++ b/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" diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c index ab25e8756e..e3ac3e78fe 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c +++ b/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) diff --git a/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c b/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c index f1941c2616..2a79aef458 100644 --- a/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c +++ b/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" diff --git a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c index 74260383d0..3b6ed448d8 100644 --- a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c +++ b/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" diff --git a/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c b/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c index 2da168e120..dcafdfed20 100644 --- a/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c +++ b/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" diff --git a/src/overlays/actors/ovl_Door_Ana/z_door_ana.c b/src/overlays/actors/ovl_Door_Ana/z_door_ana.c index 323bad3d2b..4034dafc91 100644 --- a/src/overlays/actors/ovl_Door_Ana/z_door_ana.c +++ b/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" diff --git a/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c b/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c index ae4aa71911..2f9f4e1183 100644 --- a/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c +++ b/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" diff --git a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c index f25d82df23..aff4f840d2 100644 --- a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c +++ b/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" diff --git a/src/overlays/actors/ovl_Door_Toki/z_door_toki.c b/src/overlays/actors/ovl_Door_Toki/z_door_toki.c index 9bd37b6813..ceef1f93f6 100644 --- a/src/overlays/actors/ovl_Door_Toki/z_door_toki.c +++ b/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" diff --git a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c index 6927a0f16e..7c5709434f 100644 --- a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c +++ b/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" diff --git a/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c b/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c index 46d5fa68d7..677458f186 100644 --- a/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c +++ b/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" diff --git a/src/overlays/actors/ovl_En_Ani/z_en_ani.c b/src/overlays/actors/ovl_En_Ani/z_en_ani.c index 752fe96004..8bfcc38fac 100644 --- a/src/overlays/actors/ovl_En_Ani/z_en_ani.c +++ b/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" diff --git a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c index 2935faa451..8edeca7cf5 100644 --- a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c +++ b/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" diff --git a/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c b/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c index 81442e856a..20ea5fb0db 100644 --- a/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c +++ b/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 diff --git a/src/overlays/actors/ovl_En_Box/z_en_box.c b/src/overlays/actors/ovl_En_Box/z_en_box.c index 1ecc771939..ac30a23d5f 100644 --- a/src/overlays/actors/ovl_En_Box/z_en_box.c +++ b/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" diff --git a/src/overlays/actors/ovl_En_Changer/z_en_changer.c b/src/overlays/actors/ovl_En_Changer/z_en_changer.c index 78d2cc3336..d6f0ab74e0 100644 --- a/src/overlays/actors/ovl_En_Changer/z_en_changer.c +++ b/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 diff --git a/src/overlays/actors/ovl_En_Cow/z_en_cow.c b/src/overlays/actors/ovl_En_Cow/z_en_cow.c index be0438ce77..d459c93f6f 100644 --- a/src/overlays/actors/ovl_En_Cow/z_en_cow.c +++ b/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) diff --git a/src/overlays/actors/ovl_En_Cs/z_en_cs.c b/src/overlays/actors/ovl_En_Cs/z_en_cs.c index 877db78157..8b74a6063e 100644 --- a/src/overlays/actors/ovl_En_Cs/z_en_cs.c +++ b/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" diff --git a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c index d2897a0098..98a09bb25e 100644 --- a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c +++ b/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" diff --git a/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c b/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c index 2a77645647..c5eb8ff56b 100644 --- a/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c +++ b/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" 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 46a15d4d29..ab7b8e4285 100644 --- a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c +++ b/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" diff --git a/src/overlays/actors/ovl_En_Dh/z_en_dh.c b/src/overlays/actors/ovl_En_Dh/z_en_dh.c index 71792bab7f..34acb2d982 100644 --- a/src/overlays/actors/ovl_En_Dh/z_en_dh.c +++ b/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" diff --git a/src/overlays/actors/ovl_En_Dha/z_en_dha.c b/src/overlays/actors/ovl_En_Dha/z_en_dha.c index 599c175696..5754d8ae1e 100644 --- a/src/overlays/actors/ovl_En_Dha/z_en_dha.c +++ b/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" diff --git a/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c b/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c index e1016ad67e..6de6666028 100644 --- a/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c +++ b/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" diff --git a/src/overlays/actors/ovl_En_Dns/z_en_dns.c b/src/overlays/actors/ovl_En_Dns/z_en_dns.c index f6c459897e..cc823ecdcb 100644 --- a/src/overlays/actors/ovl_En_Dns/z_en_dns.c +++ b/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" diff --git a/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c b/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c index dcc9f85449..e23c50b448 100644 --- a/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c +++ b/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 diff --git a/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c b/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c index 65070ac2c9..b0be17234b 100644 --- a/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c +++ b/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" diff --git a/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c b/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c index 95665267e2..bcf0978433 100644 --- a/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c +++ b/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" diff --git a/src/overlays/actors/ovl_En_Dog/z_en_dog.c b/src/overlays/actors/ovl_En_Dog/z_en_dog.c index 8b69ed6278..0255b01626 100644 --- a/src/overlays/actors/ovl_En_Dog/z_en_dog.c +++ b/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" diff --git a/src/overlays/actors/ovl_En_Door/z_en_door.c b/src/overlays/actors/ovl_En_Door/z_en_door.c index 9b25aebe06..b3f71481d9 100644 --- a/src/overlays/actors/ovl_En_Door/z_en_door.c +++ b/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" diff --git a/src/overlays/actors/ovl_En_Ds/z_en_ds.c b/src/overlays/actors/ovl_En_Ds/z_en_ds.c index 662f7b3858..3c879ee1ac 100644 --- a/src/overlays/actors/ovl_En_Ds/z_en_ds.c +++ b/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" diff --git a/src/overlays/actors/ovl_En_Du/z_en_du.c b/src/overlays/actors/ovl_En_Du/z_en_du.c index 5aad8c5b5e..1f716b977d 100644 --- a/src/overlays/actors/ovl_En_Du/z_en_du.c +++ b/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" diff --git a/src/overlays/actors/ovl_En_Eg/z_en_eg.c b/src/overlays/actors/ovl_En_Eg/z_en_eg.c index cebab64506..9023f99eac 100644 --- a/src/overlays/actors/ovl_En_Eg/z_en_eg.c +++ b/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 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 a5fd62af6d..58cd30f3ff 100644 --- a/src/overlays/actors/ovl_En_Elf/z_en_elf.c +++ b/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" diff --git a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c index f087917032..b60eb08a6d 100644 --- a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c +++ b/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) diff --git a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c index 6ff21c428c..0fd64079e6 100644 --- a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c +++ b/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" diff --git a/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c b/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c index 40f0b99eb8..b7232a5c45 100644 --- a/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c +++ b/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" diff --git a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c index c61b3d7103..88e2d884c2 100644 --- a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c +++ b/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" diff --git a/src/overlays/actors/ovl_En_Fish/z_en_fish.c b/src/overlays/actors/ovl_En_Fish/z_en_fish.c index 2ca4187542..6634d2cf2c 100644 --- a/src/overlays/actors/ovl_En_Fish/z_en_fish.c +++ b/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" 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 4e31c7b77f..d365822f59 100644 --- a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c +++ b/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" diff --git a/src/overlays/actors/ovl_En_Fr/z_en_fr.c b/src/overlays/actors/ovl_En_Fr/z_en_fr.c index a144c4b3c6..9bfa0c0ff2 100644 --- a/src/overlays/actors/ovl_En_Fr/z_en_fr.c +++ b/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" diff --git a/src/overlays/actors/ovl_En_Fu/z_en_fu.c b/src/overlays/actors/ovl_En_Fu/z_en_fu.c index 0f8969734c..24818477d7 100644 --- a/src/overlays/actors/ovl_En_Fu/z_en_fu.c +++ b/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" diff --git a/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c b/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c index b02686145d..cbc6fff801 100644 --- a/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c +++ b/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" diff --git a/src/overlays/actors/ovl_En_Gb/z_en_gb.c b/src/overlays/actors/ovl_En_Gb/z_en_gb.c index 3a2f8d2711..0bc9d51d95 100644 --- a/src/overlays/actors/ovl_En_Gb/z_en_gb.c +++ b/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" diff --git a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c index c96f1fa5f8..745fa4a493 100644 --- a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c +++ b/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" diff --git a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c index b460fe5753..2ff3ec7b51 100644 --- a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c +++ b/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" diff --git a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c index c07dbc101f..5e0783bc30 100644 --- a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c +++ b/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" diff --git a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c index c36cbeb5d4..33b53f4dcd 100644 --- a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c +++ b/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" 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 22b37cbab5..08c47da269 100644 --- a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c +++ b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c @@ -12,6 +12,7 @@ #include "z_lib.h" #include "z64draw.h" #include "z64play.h" +#include "z64save.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED) diff --git a/src/overlays/actors/ovl_En_Gm/z_en_gm.c b/src/overlays/actors/ovl_En_Gm/z_en_gm.c index 0a85fc37c2..75bf9b4357 100644 --- a/src/overlays/actors/ovl_En_Gm/z_en_gm.c +++ b/src/overlays/actors/ovl_En_Gm/z_en_gm.c @@ -16,6 +16,7 @@ #include "terminal.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "assets/objects/object_oF1d_map/object_oF1d_map.h" #include "assets/objects/object_gm/object_gm.h" diff --git a/src/overlays/actors/ovl_En_Go/z_en_go.c b/src/overlays/actors/ovl_En_Go/z_en_go.c index 20c3cb0782..4f7f47630f 100644 --- a/src/overlays/actors/ovl_En_Go/z_en_go.c +++ b/src/overlays/actors/ovl_En_Go/z_en_go.c @@ -13,6 +13,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_oF1d_map/object_oF1d_map.h" diff --git a/src/overlays/actors/ovl_En_Go2/z_en_go2.c b/src/overlays/actors/ovl_En_Go2/z_en_go2.c index e99a3d1498..9c15e9e7a3 100644 --- a/src/overlays/actors/ovl_En_Go2/z_en_go2.c +++ b/src/overlays/actors/ovl_En_Go2/z_en_go2.c @@ -17,6 +17,7 @@ #include "z64face_reaction.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_oF1d_map/object_oF1d_map.h" diff --git a/src/overlays/actors/ovl_En_Guest/z_en_guest.c b/src/overlays/actors/ovl_En_Guest/z_en_guest.c index 09fec8ccfc..117f891c10 100644 --- a/src/overlays/actors/ovl_En_Guest/z_en_guest.c +++ b/src/overlays/actors/ovl_En_Guest/z_en_guest.c @@ -16,6 +16,7 @@ #include "z_lib.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "assets/objects/object_os_anime/object_os_anime.h" #include "assets/objects/object_boj/object_boj.h" diff --git a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c index af76fe441f..7f5af16a74 100644 --- a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c +++ b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c @@ -20,6 +20,7 @@ #include "z64effect.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "assets/objects/object_sd/object_sd.h" diff --git a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c index 034e211d0a..d9428562fe 100644 --- a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c +++ b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c @@ -19,6 +19,7 @@ #include "z64face_reaction.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "assets/objects/object_sd/object_sd.h" #include "assets/objects/object_link_child/object_link_child.h" diff --git a/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c b/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c index 76031fb746..91ccd4d516 100644 --- a/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c +++ b/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c @@ -14,6 +14,7 @@ #include "z_lib.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "assets/objects/object_sd/object_sd.h" diff --git a/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c b/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c index 7a88e66ebe..b139288ba1 100644 --- a/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c +++ b/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c @@ -6,6 +6,7 @@ #include "z64face_reaction.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "assets/objects/object_sd/object_sd.h" diff --git a/src/overlays/actors/ovl_En_Holl/z_en_holl.c b/src/overlays/actors/ovl_En_Holl/z_en_holl.c index d75585e91d..ac7687eb14 100644 --- a/src/overlays/actors/ovl_En_Holl/z_en_holl.c +++ b/src/overlays/actors/ovl_En_Holl/z_en_holl.c @@ -7,6 +7,7 @@ #include "z_lib.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "global.h" 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 2919bb2527..08f58dbce2 100644 --- a/src/overlays/actors/ovl_En_Horse/z_en_horse.c +++ b/src/overlays/actors/ovl_En_Horse/z_en_horse.c @@ -27,6 +27,7 @@ #include "z64horse.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "z64skin_matrix.h" #include "assets/objects/object_horse/object_horse.h" diff --git a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c index 5d23213a52..ac1ae2f420 100644 --- a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c +++ b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c @@ -17,6 +17,7 @@ #include "z_lib.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c index b8df4e79cd..7a3307bc05 100644 --- a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c +++ b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c @@ -19,6 +19,7 @@ #include "z64horse.h" #include "z64player.h" #include "z64play.h" +#include "z64save.h" #include "z64skin.h" #include "assets/objects/object_horse_link_child/object_horse_link_child.h" diff --git a/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c b/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c index bd4e01cf89..1ddc46944b 100644 --- a/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c +++ b/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.c @@ -17,6 +17,7 @@ #include "sys_matrix.h" #include "z_lib.h" #include "z64play.h" +#include "z64save.h" #include "z64skin.h" #include "z64skin_matrix.h" diff --git a/src/overlays/actors/ovl_En_Hs/z_en_hs.c b/src/overlays/actors/ovl_En_Hs/z_en_hs.c index 21d5113235..88a548a41a 100644 --- a/src/overlays/actors/ovl_En_Hs/z_en_hs.c +++ b/src/overlays/actors/ovl_En_Hs/z_en_hs.c @@ -14,6 +14,7 @@ #include "z_lib.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "assets/objects/object_hs/object_hs.h" diff --git a/src/overlays/actors/ovl_En_Hy/z_en_hy.c b/src/overlays/actors/ovl_En_Hy/z_en_hy.c index ca004db5f0..3af23db48b 100644 --- a/src/overlays/actors/ovl_En_Hy/z_en_hy.c +++ b/src/overlays/actors/ovl_En_Hy/z_en_hy.c @@ -19,6 +19,7 @@ #include "z64face_reaction.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "assets/objects/object_aob/object_aob.h" #include "assets/objects/object_ahg/object_ahg.h" diff --git a/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c b/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c index 1e0bbf5362..4c230f210b 100644 --- a/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c +++ b/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c @@ -13,6 +13,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "z_lib.h" +#include "z64item.h" #include "z64light.h" #include "z64play.h" #include "z64player.h" 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 e6e2d09247..61573e535f 100644 --- a/src/overlays/actors/ovl_En_Ik/z_en_ik.c +++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.c @@ -22,6 +22,7 @@ #include "z64effect.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "z64skin_matrix.h" #include "assets/scenes/dungeons/jyasinboss/jyasinboss_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 1910466d10..fec8487235 100644 --- a/src/overlays/actors/ovl_En_In/z_en_in.c +++ b/src/overlays/actors/ovl_En_In/z_en_in.c @@ -16,6 +16,7 @@ #include "z64face_reaction.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "assets/objects/object_in/object_in.h" diff --git a/src/overlays/actors/ovl_En_Insect/z_en_insect.c b/src/overlays/actors/ovl_En_Insect/z_en_insect.c index 09e4c8d401..9135ccd110 100644 --- a/src/overlays/actors/ovl_En_Insect/z_en_insect.c +++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.c @@ -18,6 +18,7 @@ #include "z64effect.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" 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 38f818d01a..41058b811a 100644 --- a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c +++ b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c @@ -21,6 +21,7 @@ #include "z_en_item00.h" #include "z_lib.h" #include "z64effect.h" +#include "z64item.h" #include "z64play.h" #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" diff --git a/src/overlays/actors/ovl_En_Jj/z_en_jj.c b/src/overlays/actors/ovl_En_Jj/z_en_jj.c index e6be5deb13..3f6b3c587c 100644 --- a/src/overlays/actors/ovl_En_Jj/z_en_jj.c +++ b/src/overlays/actors/ovl_En_Jj/z_en_jj.c @@ -16,6 +16,7 @@ #include "z_lib.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "assets/objects/object_jj/object_jj.h" diff --git a/src/overlays/actors/ovl_En_Js/z_en_js.c b/src/overlays/actors/ovl_En_Js/z_en_js.c index 73ccde6e95..f5aee34c6a 100644 --- a/src/overlays/actors/ovl_En_Js/z_en_js.c +++ b/src/overlays/actors/ovl_En_Js/z_en_js.c @@ -12,6 +12,7 @@ #include "sys_matrix.h" #include "z_lib.h" #include "z64play.h" +#include "z64save.h" #include "assets/objects/object_js/object_js.h" diff --git a/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c b/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c index 9147125c12..2d0ed48af9 100644 --- a/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c +++ b/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c @@ -15,6 +15,7 @@ #include "z_lib.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY) diff --git a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c index 177a648b54..7a38ebc937 100644 --- a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c +++ b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c @@ -17,6 +17,7 @@ #include "z64ocarina.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "assets/objects/object_ka/object_ka.h" diff --git a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c index 7bd9d248f7..d2b70ada73 100644 --- a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c +++ b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c @@ -16,6 +16,7 @@ #include "z64ocarina.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "assets/objects/object_ka/object_ka.h" diff --git a/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c b/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c index 0bf909a234..6ae299d966 100644 --- a/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c +++ b/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c @@ -17,6 +17,7 @@ #include "z64ocarina.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "assets/objects/object_ka/object_ka.h" 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 f1099edf2b..5c2b652437 100644 --- a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c +++ b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c @@ -21,6 +21,7 @@ #include "z64ocarina.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_kanban/object_kanban.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 b8f5309620..be3b0eacb5 100644 --- a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c +++ b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c @@ -16,6 +16,7 @@ #include "z64effect.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "assets/objects/object_dekubaba/object_dekubaba.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_En_Ko/z_en_ko.c b/src/overlays/actors/ovl_En_Ko/z_en_ko.c index 1f0d1f30fe..47ac6f1d54 100644 --- a/src/overlays/actors/ovl_En_Ko/z_en_ko.c +++ b/src/overlays/actors/ovl_En_Ko/z_en_ko.c @@ -17,6 +17,7 @@ #include "z64face_reaction.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "global.h" diff --git a/src/overlays/actors/ovl_En_Kz/z_en_kz.c b/src/overlays/actors/ovl_En_Kz/z_en_kz.c index 7e4c7543e4..7caa735739 100644 --- a/src/overlays/actors/ovl_En_Kz/z_en_kz.c +++ b/src/overlays/actors/ovl_En_Kz/z_en_kz.c @@ -18,6 +18,7 @@ #include "z64face_reaction.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "assets/objects/object_kz/object_kz.h" diff --git a/src/overlays/actors/ovl_En_Light/z_en_light.c b/src/overlays/actors/ovl_En_Light/z_en_light.c index da45fa132a..f0cc5dddc6 100644 --- a/src/overlays/actors/ovl_En_Light/z_en_light.c +++ b/src/overlays/actors/ovl_En_Light/z_en_light.c @@ -14,6 +14,7 @@ #include "z_lib.h" #include "z64light.h" #include "z64play.h" +#include "z64save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" diff --git a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c index bd02c66244..ba34f9adcc 100644 --- a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c +++ b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c @@ -10,6 +10,7 @@ #include "z64light.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c b/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c index 22ae984333..9c1689a524 100644 --- a/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c +++ b/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c @@ -17,6 +17,7 @@ #include "z64ocarina.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "assets/objects/object_ma1/object_ma1.h" diff --git a/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c b/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c index 5e2482df77..aed88bb92c 100644 --- a/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c +++ b/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c @@ -12,6 +12,7 @@ #include "z64ocarina.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "assets/objects/object_ma2/object_ma2.h" diff --git a/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c b/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c index ddf065f837..cdac009221 100644 --- a/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c +++ b/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c @@ -17,6 +17,7 @@ #include "z64audio.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "assets/objects/object_ma2/object_ma2.h" diff --git a/src/overlays/actors/ovl_En_Mag/z_en_mag.c b/src/overlays/actors/ovl_En_Mag/z_en_mag.c index 0dd03dff1f..72ae7f7058 100644 --- a/src/overlays/actors/ovl_En_Mag/z_en_mag.c +++ b/src/overlays/actors/ovl_En_Mag/z_en_mag.c @@ -17,7 +17,9 @@ #include "sfx.h" #include "versions.h" #include "z64audio.h" +#include "z64cutscene_flags.h" #include "z64play.h" +#include "z64save.h" #include "global.h" diff --git a/src/overlays/actors/ovl_En_Md/z_en_md.c b/src/overlays/actors/ovl_En_Md/z_en_md.c index 9bf24e4acb..0f354ade29 100644 --- a/src/overlays/actors/ovl_En_Md/z_en_md.c +++ b/src/overlays/actors/ovl_En_Md/z_en_md.c @@ -18,6 +18,7 @@ #include "z64ocarina.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "global.h" diff --git a/src/overlays/actors/ovl_En_Mk/z_en_mk.c b/src/overlays/actors/ovl_En_Mk/z_en_mk.c index 42b68d1fb7..f035f2d331 100644 --- a/src/overlays/actors/ovl_En_Mk/z_en_mk.c +++ b/src/overlays/actors/ovl_En_Mk/z_en_mk.c @@ -14,6 +14,7 @@ #include "z64face_reaction.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "assets/objects/object_mk/object_mk.h" diff --git a/src/overlays/actors/ovl_En_Mm/z_en_mm.c b/src/overlays/actors/ovl_En_Mm/z_en_mm.c index c640ef74a6..75969dd224 100644 --- a/src/overlays/actors/ovl_En_Mm/z_en_mm.c +++ b/src/overlays/actors/ovl_En_Mm/z_en_mm.c @@ -17,6 +17,7 @@ #include "z64face_reaction.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "assets/objects/object_mm/object_mm.h" #include "assets/objects/object_link_child/object_link_child.h" diff --git a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c index 3a590285a5..3958fce494 100644 --- a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c +++ b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c @@ -15,6 +15,7 @@ #include "terminal.h" #include "z_lib.h" #include "z64play.h" +#include "z64save.h" #include "assets/objects/object_mm/object_mm.h" diff --git a/src/overlays/actors/ovl_En_Ms/z_en_ms.c b/src/overlays/actors/ovl_En_Ms/z_en_ms.c index 2debeaf16a..32ac753571 100644 --- a/src/overlays/actors/ovl_En_Ms/z_en_ms.c +++ b/src/overlays/actors/ovl_En_Ms/z_en_ms.c @@ -11,6 +11,7 @@ #include "ichain.h" #include "z64face_reaction.h" #include "z64play.h" +#include "z64save.h" #include "assets/objects/object_ms/object_ms.h" diff --git a/src/overlays/actors/ovl_En_Mu/z_en_mu.c b/src/overlays/actors/ovl_En_Mu/z_en_mu.c index 24f9bf22f9..7360dd7f18 100644 --- a/src/overlays/actors/ovl_En_Mu/z_en_mu.c +++ b/src/overlays/actors/ovl_En_Mu/z_en_mu.c @@ -12,6 +12,7 @@ #include "z_lib.h" #include "z64face_reaction.h" #include "z64play.h" +#include "z64save.h" #include "assets/objects/object_mu/object_mu.h" diff --git a/src/overlays/actors/ovl_En_Nb/z_en_nb.c b/src/overlays/actors/ovl_En_Nb/z_en_nb.c index d765c7caae..4b615342c0 100644 --- a/src/overlays/actors/ovl_En_Nb/z_en_nb.c +++ b/src/overlays/actors/ovl_En_Nb/z_en_nb.c @@ -21,6 +21,7 @@ #include "z64face_reaction.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "assets/objects/object_nb/object_nb.h" diff --git a/src/overlays/actors/ovl_En_Niw/z_en_niw.c b/src/overlays/actors/ovl_En_Niw/z_en_niw.c index 284e725a6c..00fde6a469 100644 --- a/src/overlays/actors/ovl_En_Niw/z_en_niw.c +++ b/src/overlays/actors/ovl_En_Niw/z_en_niw.c @@ -24,6 +24,7 @@ #include "z64effect.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "assets/objects/object_niw/object_niw.h" diff --git a/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c b/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c index 8521831bcb..2250042f84 100644 --- a/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c +++ b/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.c @@ -17,6 +17,7 @@ #include "z_lib.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "assets/objects/object_gr/object_gr.h" diff --git a/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c b/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c index 892b1e8396..33881ed73f 100644 --- a/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c +++ b/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c @@ -14,6 +14,7 @@ #include "z64face_reaction.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "assets/objects/object_ane/object_ane.h" #include "assets/objects/object_os_anime/object_os_anime.h" diff --git a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c index d76c28b720..3511a3c45d 100644 --- a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c +++ b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c @@ -14,6 +14,7 @@ #include "z64effect.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "assets/objects/object_dekunuts/object_dekunuts.h" #include "assets/objects/object_hintnuts/object_hintnuts.h" diff --git a/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c b/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c index 0e02db3bab..49c4756c29 100644 --- a/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c +++ b/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c @@ -11,11 +11,11 @@ #include "terminal.h" #include "versions.h" #include "z64audio.h" +#include "z64cutscene_flags.h" #include "z64debug_display.h" #include "z64frame_advance.h" #include "z64play.h" - -#include "global.h" +#include "z64save.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) diff --git a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c index 6f6d65ca54..c6ac85502c 100644 --- a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c +++ b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c @@ -18,6 +18,7 @@ #include "z64ocarina.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "assets/scenes/misc/hakaana_ouke/hakaana_ouke_scene.h" #include "assets/scenes/overworld/spot02/spot02_scene.h" 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 1e89d5fcd7..b7063e0f00 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 "z64effect.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "assets/objects/object_okuta/object_okuta.h" 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 fa8b531406..620d70e215 100644 --- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c +++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c @@ -15,6 +15,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_ossan/object_ossan.h" diff --git a/src/overlays/actors/ovl_En_Owl/z_en_owl.c b/src/overlays/actors/ovl_En_Owl/z_en_owl.c index bec1168274..827bf75c03 100644 --- a/src/overlays/actors/ovl_En_Owl/z_en_owl.c +++ b/src/overlays/actors/ovl_En_Owl/z_en_owl.c @@ -23,6 +23,7 @@ #include "z64audio.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "assets/objects/object_owl/object_owl.h" #include "assets/scenes/overworld/spot06/spot06_scene.h" 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 9572cf393b..2246b3df16 100644 --- a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c +++ b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c @@ -15,6 +15,7 @@ #include "z64effect.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "assets/objects/object_peehat/object_peehat.h" diff --git a/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c b/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c index 451c825ecf..f601c64a72 100644 --- a/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c +++ b/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c @@ -18,6 +18,7 @@ #include "z64light.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_po_field/object_po_field.h" diff --git a/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c b/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c index a0f605204c..983dbf0d71 100644 --- a/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c +++ b/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c @@ -21,6 +21,7 @@ #include "z64light.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "assets/objects/object_tk/object_tk.h" diff --git a/src/overlays/actors/ovl_En_Poh/z_en_poh.c b/src/overlays/actors/ovl_En_Poh/z_en_poh.c index 7b4ebbeb9e..fceb18ef7c 100644 --- a/src/overlays/actors/ovl_En_Poh/z_en_poh.c +++ b/src/overlays/actors/ovl_En_Poh/z_en_poh.c @@ -18,6 +18,7 @@ #include "z64light.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "assets/objects/object_poh/object_poh.h" #include "assets/objects/object_po_composer/object_po_composer.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 3026636de5..af9ed8f112 100644 --- a/src/overlays/actors/ovl_En_Rd/z_en_rd.c +++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.c @@ -19,6 +19,7 @@ #include "z64effect.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "assets/objects/object_rd/object_rd.h" diff --git a/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c b/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c index ba7f8fe2f1..871cf6668f 100644 --- a/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c +++ b/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c @@ -13,6 +13,7 @@ #include "z64audio.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED) diff --git a/src/overlays/actors/ovl_En_Rl/z_en_rl.c b/src/overlays/actors/ovl_En_Rl/z_en_rl.c index 96a03298f3..56e27591fc 100644 --- a/src/overlays/actors/ovl_En_Rl/z_en_rl.c +++ b/src/overlays/actors/ovl_En_Rl/z_en_rl.c @@ -14,6 +14,7 @@ #include "z_lib.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "assets/objects/object_rl/object_rl.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 f252b8d08e..07bb916640 100644 --- a/src/overlays/actors/ovl_En_Rr/z_en_rr.c +++ b/src/overlays/actors/ovl_En_Rr/z_en_rr.c @@ -21,6 +21,7 @@ #include "z64effect.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "assets/objects/object_rr/object_rr.h" diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c index 9f5db67aa6..16bc86f02a 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c @@ -23,6 +23,7 @@ #include "z64face_reaction.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "assets/objects/object_ru1/object_ru1.h" diff --git a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c index b6633a6858..402bb2329a 100644 --- a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c +++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c @@ -19,6 +19,7 @@ #include "z64audio.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "assets/objects/object_ru2/object_ru2.h" diff --git a/src/overlays/actors/ovl_En_Sa/z_en_sa.c b/src/overlays/actors/ovl_En_Sa/z_en_sa.c index c7a42e059d..fb834576fb 100644 --- a/src/overlays/actors/ovl_En_Sa/z_en_sa.c +++ b/src/overlays/actors/ovl_En_Sa/z_en_sa.c @@ -10,6 +10,7 @@ #include "z64face_reaction.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "assets/objects/object_sa/object_sa.h" #include "assets/scenes/overworld/spot04/spot04_scene.h" diff --git a/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c b/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c index eee717b358..4e082fcd47 100644 --- a/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c +++ b/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c @@ -14,6 +14,7 @@ #include "sys_matrix.h" #include "z_lib.h" #include "z64play.h" +#include "z64save.h" #include "assets/objects/object_shopnuts/object_shopnuts.h" 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 d630596d8f..d1597d0827 100644 --- a/src/overlays/actors/ovl_En_Si/z_en_si.c +++ b/src/overlays/actors/ovl_En_Si/z_en_si.c @@ -12,6 +12,7 @@ #include "z64draw.h" #include "z64play.h" #include "z64player.h" +#include "z64save.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 f7b41eb316..52e521df9c 100644 --- a/src/overlays/actors/ovl_En_Skb/z_en_skb.c +++ b/src/overlays/actors/ovl_En_Skb/z_en_skb.c @@ -19,6 +19,7 @@ #include "z64effect.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "assets/objects/object_skb/object_skb.h" diff --git a/src/overlays/actors/ovl_En_Skj/z_en_skj.c b/src/overlays/actors/ovl_En_Skj/z_en_skj.c index 3b976750e3..c5024ec78f 100644 --- a/src/overlays/actors/ovl_En_Skj/z_en_skj.c +++ b/src/overlays/actors/ovl_En_Skj/z_en_skj.c @@ -18,6 +18,7 @@ #include "z64effect.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "assets/objects/object_skj/object_skj.h" diff --git a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c index b006acf538..46c4d7559a 100644 --- a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c +++ b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c @@ -9,6 +9,7 @@ #include "z64face_reaction.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "assets/objects/object_ssh/object_ssh.h" diff --git a/src/overlays/actors/ovl_En_Sth/z_en_sth.c b/src/overlays/actors/ovl_En_Sth/z_en_sth.c index 4cd282026b..2535b03254 100644 --- a/src/overlays/actors/ovl_En_Sth/z_en_sth.c +++ b/src/overlays/actors/ovl_En_Sth/z_en_sth.c @@ -13,6 +13,7 @@ #include "terminal.h" #include "z_lib.h" #include "z64play.h" +#include "z64save.h" #include "assets/objects/object_ahg/object_ahg.h" #include "assets/objects/object_boj/object_boj.h" diff --git a/src/overlays/actors/ovl_En_Sw/z_en_sw.c b/src/overlays/actors/ovl_En_Sw/z_en_sw.c index 3a6da425ca..8e10154c10 100644 --- a/src/overlays/actors/ovl_En_Sw/z_en_sw.c +++ b/src/overlays/actors/ovl_En_Sw/z_en_sw.c @@ -13,6 +13,7 @@ #include "z64effect.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "assets/objects/object_st/object_st.h" diff --git a/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c b/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c index 6c2ae0f09f..993e6bdbf0 100644 --- a/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c +++ b/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c @@ -11,6 +11,7 @@ #include "z64debug_display.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c index b4dfce2165..3ddfb5d78f 100644 --- a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c +++ b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c @@ -11,6 +11,7 @@ #include "terminal.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "assets/objects/object_ossan/object_ossan.h" diff --git a/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c b/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c index 7e4de74153..01b9c77979 100644 --- a/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c +++ b/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.c @@ -18,6 +18,7 @@ #include "z64effect.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "assets/objects/object_niw/object_niw.h" diff --git a/src/overlays/actors/ovl_En_Ta/z_en_ta.c b/src/overlays/actors/ovl_En_Ta/z_en_ta.c index 146ab6a0a9..7e13bf3679 100644 --- a/src/overlays/actors/ovl_En_Ta/z_en_ta.c +++ b/src/overlays/actors/ovl_En_Ta/z_en_ta.c @@ -23,6 +23,7 @@ #include "z64face_reaction.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "assets/objects/object_ta/object_ta.h" diff --git a/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c b/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c index 427eae8494..6370bef893 100644 --- a/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c +++ b/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.c @@ -13,6 +13,7 @@ #include "terminal.h" #include "versions.h" #include "z64play.h" +#include "z64save.h" #include "assets/objects/object_ts/object_ts.h" diff --git a/src/overlays/actors/ovl_En_Tk/z_en_tk.c b/src/overlays/actors/ovl_En_Tk/z_en_tk.c index 4187b915dd..c6b1b0906e 100644 --- a/src/overlays/actors/ovl_En_Tk/z_en_tk.c +++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.c @@ -18,6 +18,7 @@ #include "z_lib.h" #include "z64face_reaction.h" #include "z64play.h" +#include "z64save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" #include "assets/objects/object_tk/object_tk.h" diff --git a/src/overlays/actors/ovl_En_Torch/z_en_torch.c b/src/overlays/actors/ovl_En_Torch/z_en_torch.c index dd8f18ed10..6e406c6bab 100644 --- a/src/overlays/actors/ovl_En_Torch/z_en_torch.c +++ b/src/overlays/actors/ovl_En_Torch/z_en_torch.c @@ -8,6 +8,7 @@ #include "overlays/actors/ovl_En_Box/z_en_box.h" #include "z64play.h" +#include "z64save.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c index 3fe0ef7df4..a02e9bc3bb 100644 --- a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c +++ b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c @@ -21,6 +21,7 @@ #include "z64effect.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "assets/objects/object_torch2/object_torch2.h" diff --git a/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c b/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c index dd2e469def..2ac84162c6 100644 --- a/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c +++ b/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c @@ -14,6 +14,7 @@ #include "z64face_reaction.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "assets/objects/object_toryo/object_toryo.h" diff --git a/src/overlays/actors/ovl_En_Tr/z_en_tr.c b/src/overlays/actors/ovl_En_Tr/z_en_tr.c index 1ccdb8e409..3f2672cde4 100644 --- a/src/overlays/actors/ovl_En_Tr/z_en_tr.c +++ b/src/overlays/actors/ovl_En_Tr/z_en_tr.c @@ -15,6 +15,7 @@ #include "z_lib.h" #include "z64effect.h" #include "z64play.h" +#include "z64save.h" #include "assets/objects/object_tr/object_tr.h" 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 57ece9581d..d9965bfe1f 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 @@ -16,6 +16,7 @@ #include "z64effect.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" diff --git a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c index 8d5de64124..93e21aa767 100644 --- a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c +++ b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c @@ -21,6 +21,7 @@ #include "z_lib.h" #include "z64audio.h" #include "z64play.h" +#include "z64save.h" #include "z64skin.h" #include "global.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 ddd3744d5b..abb91c80b9 100644 --- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c +++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c @@ -17,6 +17,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_wallmaster/object_wallmaster.h" diff --git a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c index 86f9fabc11..85de2cd564 100644 --- a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c +++ b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c @@ -13,6 +13,7 @@ #include "z64debug_display.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c b/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c index 0f235f1224..71a1e5d8fd 100644 --- a/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c +++ b/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c @@ -10,6 +10,7 @@ #include "terminal.h" #include "z64debug_display.h" #include "z64play.h" +#include "z64save.h" #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_LOCK_ON_DISABLED) diff --git a/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c b/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c index a8b118d25b..b843b64a8b 100644 --- a/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c +++ b/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c @@ -9,6 +9,7 @@ #include "regs.h" #include "terminal.h" #include "z64debug_display.h" +#include "z64item.h" #include "z64play.h" #include "z64player.h" diff --git a/src/overlays/actors/ovl_En_Xc/z_en_xc.c b/src/overlays/actors/ovl_En_Xc/z_en_xc.c index 1df5897bda..833973d4e4 100644 --- a/src/overlays/actors/ovl_En_Xc/z_en_xc.c +++ b/src/overlays/actors/ovl_En_Xc/z_en_xc.c @@ -21,6 +21,7 @@ #include "z64audio.h" #include "z64effect.h" #include "z64play.h" +#include "z64save.h" #include "z64skin_matrix.h" #include "assets/objects/object_xc/object_xc.h" diff --git a/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c b/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c index c9842c6d9f..4be5360be4 100644 --- a/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c +++ b/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c @@ -15,6 +15,7 @@ #include "z64debug_display.h" #include "z64effect.h" #include "z64play.h" +#include "z64save.h" #define FLAGS 0 diff --git a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c index 9b6cdbe105..5c60653b4e 100644 --- a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c +++ b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c @@ -17,6 +17,7 @@ #include "z64audio.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "assets/objects/object_zl1/object_zl1.h" diff --git a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c index eb72b09639..3665e8c6e5 100644 --- a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c +++ b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c @@ -19,6 +19,7 @@ #include "z64frame_advance.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #if PLATFORM_N64 #include "global.h" diff --git a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c index b4acd1077c..a07a2576d1 100644 --- a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c +++ b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c @@ -25,6 +25,7 @@ #include "z64frame_advance.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "overlays/actors/ovl_En_Encount2/z_en_encount2.h" #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h" diff --git a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c index 91ec0e5810..a18efd4ba9 100644 --- a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c +++ b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c @@ -20,6 +20,7 @@ #include "z64face_reaction.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "assets/objects/object_zl4/object_zl4.h" #include "assets/scenes/indoors/nakaniwa/nakaniwa_scene.h" diff --git a/src/overlays/actors/ovl_En_Zo/z_en_zo.c b/src/overlays/actors/ovl_En_Zo/z_en_zo.c index 7023c96136..5332ab6788 100644 --- a/src/overlays/actors/ovl_En_Zo/z_en_zo.c +++ b/src/overlays/actors/ovl_En_Zo/z_en_zo.c @@ -16,6 +16,7 @@ #include "z64face_reaction.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "assets/objects/object_zo/object_zo.h" diff --git a/src/overlays/actors/ovl_En_fHG/z_en_fhg.c b/src/overlays/actors/ovl_En_fHG/z_en_fhg.c index 7f34e8e7fd..1818bea858 100644 --- a/src/overlays/actors/ovl_En_fHG/z_en_fhg.c +++ b/src/overlays/actors/ovl_En_fHG/z_en_fhg.c @@ -21,6 +21,7 @@ #include "z_lib.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "z64skin.h" #include "assets/objects/object_fhg/object_fhg.h" diff --git a/src/overlays/actors/ovl_Fishing/z_fishing.c b/src/overlays/actors/ovl_Fishing/z_fishing.c index 2034187934..95ea420aec 100644 --- a/src/overlays/actors/ovl_Fishing/z_fishing.c +++ b/src/overlays/actors/ovl_Fishing/z_fishing.c @@ -26,16 +26,17 @@ #include "sys_matrix.h" #include "terminal.h" #include "versions.h" +#include "z_lib.h" #include "z64audio.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "z64skin_matrix.h" -#include "z_lib.h" #if PLATFORM_N64 #include "cic6105.h" #endif -#pragma increment_block_number "gc-eu:170 gc-eu-mq:170 gc-jp:170 gc-jp-ce:170 gc-jp-mq:170 gc-us:170 gc-us-mq:170" \ +#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" \ "ntsc-1.0:121 ntsc-1.1:121 ntsc-1.2:121 pal-1.0:121 pal-1.1:121" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c b/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c index 3912841eb4..a690bfa73f 100644 --- a/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c +++ b/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.c @@ -11,6 +11,7 @@ #include "ichain.h" #include "sys_matrix.h" #include "z_lib.h" +#include "z64item.h" #include "z64play.h" #include "assets/objects/object_gi_hearts/object_gi_hearts.h" 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 04028bff74..e0e0e88d83 100644 --- a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c +++ b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c @@ -12,6 +12,7 @@ #include "z64draw.h" #include "z64effect.h" #include "z64play.h" +#include "z64save.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED 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 61d19aee51..fa4f500c87 100644 --- a/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c +++ b/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c @@ -12,6 +12,7 @@ #include "z64draw.h" #include "z64effect.h" #include "z64play.h" +#include "z64save.h" #include "assets/scenes/overworld/spot00/spot00_scene.h" diff --git a/src/overlays/actors/ovl_Item_Shield/z_item_shield.c b/src/overlays/actors/ovl_Item_Shield/z_item_shield.c index da65558db1..357e1e8f71 100644 --- a/src/overlays/actors/ovl_Item_Shield/z_item_shield.c +++ b/src/overlays/actors/ovl_Item_Shield/z_item_shield.c @@ -15,6 +15,7 @@ #include "terminal.h" #include "z_lib.h" #include "z64effect.h" +#include "z64item.h" #include "z64play.h" #include "z64player.h" diff --git a/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c b/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c index 8b5ef7c199..0dfabfee4c 100644 --- a/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c +++ b/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c @@ -13,6 +13,7 @@ #include "z_lib.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "assets/objects/gameplay_keep/gameplay_keep.h" diff --git a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c index 0ce75f8cfd..f2837d8481 100644 --- a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c +++ b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c @@ -17,10 +17,10 @@ #include "terminal.h" #include "z_en_item00.h" #include "z_lib.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_mamenoki/object_mamenoki.h" diff --git a/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c b/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c index 46024753d9..2c77570a41 100644 --- a/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c +++ b/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c @@ -11,6 +11,7 @@ #include "sfx.h" #include "sys_matrix.h" #include "z64play.h" +#include "z64save.h" #include "assets/objects/object_dekujr/object_dekujr.h" diff --git a/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c b/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c index a70b4a4a43..f1f8000063 100644 --- a/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c +++ b/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c @@ -8,6 +8,7 @@ #include "ichain.h" #include "z64play.h" +#include "z64save.h" #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h" diff --git a/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c b/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c index 8ea4ba33f7..6eca379686 100644 --- a/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c +++ b/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c @@ -9,6 +9,7 @@ #include "sfx.h" #include "z_lib.h" #include "z64play.h" +#include "z64save.h" #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED diff --git a/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c b/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c index 0beebfd17d..fdd18ef60a 100644 --- a/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c +++ b/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c @@ -16,6 +16,7 @@ #include "z64ocarina.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "assets/objects/object_timeblock/object_timeblock.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 057d660ab4..2f4cc15c76 100644 --- a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c +++ b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c @@ -13,6 +13,7 @@ #include "z_en_item00.h" #include "z_lib.h" #include "z64effect.h" +#include "z64item.h" #include "z64play.h" #include "z64player.h" diff --git a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c index d76ccb548d..b285bc8767 100644 --- a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c +++ b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c @@ -18,6 +18,7 @@ #include "z64audio.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "global.h" diff --git a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c index 2276e833ff..c9d6470d63 100644 --- a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c +++ b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c @@ -17,6 +17,7 @@ #include "z64ocarina.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) 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 a78c2e1306..5e236c86f4 100644 --- a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c +++ b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c @@ -11,6 +11,7 @@ #include "sys_matrix.h" #include "z64play.h" #include "z64player.h" +#include "z64save.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_Oceff_Wipe/z_oceff_wipe.c b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c index e44f6d145f..011b112061 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c +++ b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c @@ -13,6 +13,7 @@ #include "z_lib.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) diff --git a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c index e01d79aa70..5885dd0ac9 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c +++ b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c @@ -13,6 +13,7 @@ #include "z_lib.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) diff --git a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c index 881d2fbe70..580d2cfece 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c +++ b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c @@ -13,6 +13,7 @@ #include "z_lib.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA) 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 20d506b593..de537e434b 100644 --- a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c +++ b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c @@ -19,6 +19,7 @@ #include "z64ocarina.h" #include "z64play.h" #include "z64player.h" +#include "z64save.h" #include "assets/scenes/overworld/spot06/spot06_scene.h" diff --git a/src/overlays/actors/ovl_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c index cffcfe1e44..601cfabc5d 100644 --- a/src/overlays/actors/ovl_player_actor/z_player.c +++ b/src/overlays/actors/ovl_player_actor/z_player.c @@ -43,6 +43,7 @@ #include "z64effect.h" #include "z64ocarina.h" #include "z64play.h" +#include "z64save.h" #include "z64skin_matrix.h" #include "global.h" @@ -359,20 +360,20 @@ void Player_Action_CsAction(Player* this, PlayState* play); // .bss part 1 #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:64 ntsc-1.1:64 ntsc-1.2:64 pal-1.0:64 pal-1.1:64" + "ique-cn:128 ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128" static s32 D_80858AA0; // TODO: There's probably a way to match BSS ordering with less padding by spreading the variables out and moving // data around. It would be easier if we had more options for controlling BSS ordering in debug. -#pragma increment_block_number "gc-eu:192 gc-eu-mq:192 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \ - "ique-cn:128 ntsc-1.0:192 ntsc-1.1:192 ntsc-1.2:192 pal-1.0:192 pal-1.1:192" +#pragma increment_block_number "gc-eu:192 gc-eu-mq:192 gc-jp:192 gc-jp-ce:192 gc-jp-mq:192 gc-us:192 gc-us-mq:192" \ + "ique-cn:192 ntsc-1.0:192 ntsc-1.1:192 ntsc-1.2:192 pal-1.0:192 pal-1.1:192" static s32 sSavedCurrentMask; static Vec3f sInteractWallCheckResult; static Input* sControlInput; -#pragma increment_block_number "gc-eu:160 gc-eu-mq:160 gc-jp:192 gc-jp-ce:192 gc-jp-mq:192 gc-us:192 gc-us-mq:192" \ +#pragma increment_block_number "gc-eu:192 gc-eu-mq:192 gc-jp:192 gc-jp-ce:192 gc-jp-mq:192 gc-us:192 gc-us-mq:192" \ "ique-cn:192 ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128" // .data 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 c6e2803bb9..0b3ef078e9 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 @@ -6,14 +6,13 @@ #include "z_eff_ss_dead_dd.h" +#include "libc64/qrand.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_Stick/z_eff_ss_stick.c b/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c index f78855692d..520f8af02a 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 @@ -13,6 +13,7 @@ #include "z64effect.h" #include "z64play.h" #include "z64player.h" +#include "z64save.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/gamestates/ovl_opening/z_opening.c b/src/overlays/gamestates/ovl_opening/z_opening.c index 7b24564cfc..636323b583 100644 --- a/src/overlays/gamestates/ovl_opening/z_opening.c +++ b/src/overlays/gamestates/ovl_opening/z_opening.c @@ -5,6 +5,7 @@ */ #include "global.h" +#include "z64save.h" void TitleSetup_SetupTitleScreen(TitleSetupState* this) { gSaveContext.gameMode = GAMEMODE_TITLE_SCREEN; diff --git a/src/overlays/gamestates/ovl_select/z_select.c b/src/overlays/gamestates/ovl_select/z_select.c index 6a9b1e1b3d..4bdccd5ae9 100644 --- a/src/overlays/gamestates/ovl_select/z_select.c +++ b/src/overlays/gamestates/ovl_select/z_select.c @@ -5,14 +5,16 @@ */ #include "ultra64.h" -#include "global.h" -#include "terminal.h" #include "alloca.h" -#include "z64.h" - #if PLATFORM_N64 #include "n64dd.h" #endif +#include "seqcmd.h" +#include "sequence.h" +#include "terminal.h" +#include "z64save.h" + +#include "global.h" void MapSelect_LoadTitle(MapSelectState* this) { this->state.running = false; diff --git a/src/overlays/gamestates/ovl_title/z_title.c b/src/overlays/gamestates/ovl_title/z_title.c index 8613d7bd37..fde3d01806 100644 --- a/src/overlays/gamestates/ovl_title/z_title.c +++ b/src/overlays/gamestates/ovl_title/z_title.c @@ -12,6 +12,7 @@ #include "cic6105.h" #include "n64dd.h" #endif +#include "z64save.h" #include "assets/textures/nintendo_rogo_static/nintendo_rogo_static.h" diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c index 4828f726eb..c35e3f8cf8 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_collect.c @@ -1,4 +1,7 @@ #include "z_kaleido_scope.h" + +#include "z64save.h" + #include "assets/textures/parameter_static/parameter_static.h" #include "assets/textures/icon_item_static/icon_item_static.h" diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c index 6cf75817a5..0cecf2ed2b 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_debug.c @@ -1,4 +1,7 @@ #include "z_kaleido_scope.h" + +#include "z64save.h" + #include "assets/textures/parameter_static/parameter_static.h" // Positions of each input section in the editor diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c index e633b06e2e..0ac596023c 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_equipment.c @@ -1,4 +1,7 @@ #include "z_kaleido_scope.h" + +#include "z64save.h" + #include "assets/textures/icon_item_static/icon_item_static.h" #include "assets/textures/parameter_static/parameter_static.h" diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c index 3dc94e9c42..3b9ee9a5de 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c @@ -1,4 +1,7 @@ #include "z_kaleido_scope.h" + +#include "z64save.h" + #include "assets/textures/parameter_static/parameter_static.h" u8 gAmmoItems[] = { diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map.c index 63b08448b3..a6e71fb408 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_map.c @@ -1,6 +1,7 @@ #include "z_kaleido_scope.h" #include "sys_ucode.h" #include "versions.h" +#include "z64save.h" #include "assets/textures/icon_item_24_static/icon_item_24_static.h" #if OOT_NTSC diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c index ec5af27f7d..eac990ce51 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c @@ -1,7 +1,12 @@ +#include "z_kaleido_scope.h" #if PLATFORM_N64 #include "n64dd.h" #endif -#include "z_kaleido_scope.h" +#include "seqcmd.h" +#include "terminal.h" +#include "versions.h" +#include "z64save.h" + #include "assets/textures/icon_item_static/icon_item_static.h" #include "assets/textures/icon_item_24_static/icon_item_24_static.h" #if OOT_NTSC @@ -13,8 +18,6 @@ #include "assets/textures/icon_item_fra_static/icon_item_fra_static.h" #endif #include "assets/textures/icon_item_gameover_static/icon_item_gameover_static.h" -#include "terminal.h" -#include "versions.h" #pragma increment_block_number "gc-eu:128 gc-eu-mq:128 ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128" diff --git a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h index ce0044ad44..c1e965c650 100644 --- a/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h +++ b/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h @@ -3,6 +3,7 @@ #include "ultra64.h" #include "global.h" +#include "z64inventory.h" extern u8 gAmmoItems[]; extern s16 gVtxPageMapWorldQuadsWidth[];