z64 - s

include/console_logo_state.h

@@ -3,7 +3,7 @@
 
 #include "ultra64.h"
 #include "game.h"
-#include "z64sram.h"
+#include "sram.h"
 #include "z64view.h"
 
 typedef struct ConsoleLogoState {

include/file_select_state.h

@@ -5,8 +5,8 @@
 #include "environment.h"
 #include "game.h"
 #include "message.h"
-#include "z64skybox.h"
-#include "z64sram.h"
+#include "skybox.h"
+#include "sram.h"
 #include "z64view.h"
 
 typedef struct FileSelectState {

include/message_data_fmt.h

@@ -1,7 +1,7 @@
 #ifndef MESSAGE_DATA_FMT_H
 #define MESSAGE_DATA_FMT_H
 
-#include "z64save.h" // For highscores
+#include "save.h" // For highscores
 #include "item.h" // For item ids
 #include "sfx.h" // For sfx ids
 

include/n64dd.h

@@ -4,7 +4,7 @@
 #include "ultra64.h"
 #include "ultra64/leo.h"
 #include "pause.h"
-#include "z64scene.h"
+#include "scene.h"
 #include "map_mark.h"
 #include "versions.h"
 

include/play_state.h

@@ -19,10 +19,10 @@
 #include "object.h"
 #include "pause.h"
 #include "room.h"
-#include "z64scene.h"
-#include "z64sfx_source.h"
-#include "z64skybox.h"
-#include "z64sram.h"
+#include "scene.h"
+#include "sfx_source.h"
+#include "skybox.h"
+#include "sram.h"
 #include "z64transition.h"
 #include "z64view.h"
 

include/save.h

@@ -1,5 +1,5 @@
-#ifndef Z64SAVE_H
-#define Z64SAVE_H
+#ifndef SAVE_H
+#define SAVE_H
 
 #include "ultra64.h"
 #include "versions.h"

include/scene.h

@@ -1,5 +1,5 @@
-#ifndef Z64SCENE_H
-#define Z64SCENE_H
+#ifndef SCENE_H
+#define SCENE_H
 
 #include "avoid_ub.h"
 #include "ultra64.h"

include/sfx_source.h

@@ -1,5 +1,5 @@
-#ifndef Z64SFX_SOURCE_H
-#define Z64SFX_SOURCE_H
+#ifndef SFX_SOURCE_H
+#define SFX_SOURCE_H
 
 #include "ultra64.h"
 #include "z_math.h"

include/skin.h

@@ -1,5 +1,5 @@
-#ifndef Z64_SKIN_H
-#define Z64_SKIN_H
+#ifndef SKIN_H
+#define SKIN_H
 
 #include "animation.h"
 

include/skin_matrix.h

@@ -1,5 +1,5 @@
-#ifndef Z64SKIN_MATRIX_H
-#define Z64SKIN_MATRIX_H
+#ifndef SKIN_MATRIX_H
+#define SKIN_MATRIX_H
 
 #include "ultra64.h"
 #include "z_math.h"

include/skybox.h

@@ -1,5 +1,5 @@
-#ifndef Z64_SKYBOX_H
-#define Z64_SKYBOX_H
+#ifndef SKYBOX_H
+#define SKYBOX_H
 
 #include "ultra64/ultratypes.h"
 #include "ultra64/gbi.h"

include/sram.h

@@ -1,5 +1,5 @@
-#ifndef Z64SRAM_H
-#define Z64SRAM_H
+#ifndef SRAM_H
+#define SRAM_H
 
 #include "ultra64/ultratypes.h"
 

include/ss_sram.h

@@ -1,5 +1,5 @@
-#ifndef Z64SS_SRAM_H
-#define Z64SS_SRAM_H
+#ifndef SS_SRAM_H
+#define SS_SRAM_H
 
 #include "libc/stddef.h"
 #include "ultra64/ultratypes.h"

include/z64.h

@@ -13,7 +13,7 @@
 #include "animation.h"
 #include "animation_legacy.h"
 #include "curve.h"
-#include "z64skin.h"
+#include "skin.h"
 #include "player.h"
 #include "ocarina.h"
 

src/code/code_n64dd_800AD4C0.c

@@ -4,7 +4,7 @@
 #include "segmented_address.h"
 #include "actor.h"
 #include "cutscene.h"
-#include "z64save.h"
+#include "save.h"
 
 n64ddStruct_800FEE70_pointers D_800FEE70 = {
     func_801C7C1C,

src/code/db_camera.c

@@ -17,7 +17,7 @@
 #include "debug_display.h"
 #include "olib.h"
 #include "play_state.h"
-#include "z64save.h"
+#include "save.h"
 
 #define DEBUG_CAM_CONTROLLER_PORT 2
 

src/code/flg_set.c

@@ -6,7 +6,7 @@
 #include "gfxalloc.h"
 #include "controller.h"
 #include "play_state.h"
-#include "z64save.h"
+#include "save.h"
 
 typedef struct FlagSetEntry {
     /* 0x00 */ u16* value;

src/code/graph.c

@@ -27,7 +27,7 @@
 #include "vi_mode.h"
 #include "z_game_dlftbls.h"
 #include "audio.h"
-#include "z64save.h"
+#include "save.h"
 #include "play_state.h"
 
 #define GFXPOOL_HEAD_MAGIC 0x1234

src/code/sys_matrix.c

@@ -8,7 +8,7 @@
 #include "ultra64.h"
 #include "z_lib.h"
 #include "game.h"
-#include "z64skin_matrix.h"
+#include "skin_matrix.h"
 
 // clang-format off
 Mtx gIdentityMtx = gdSPDefMtx(

src/code/title_setup.c

@@ -2,7 +2,7 @@
 #include "setup_state.h"
 #include "printf.h"
 #include "translation.h"
-#include "z64save.h"
+#include "save.h"
 
 void Setup_InitImpl(SetupState* this) {
     PRINTF(T("ゼルダ共通データ初期化\n", "Zelda common data initialization\n"));

src/code/z_actor.c

@@ -25,8 +25,8 @@
 #include "light.h"
 #include "horse.h"
 #include "play_state.h"
-#include "z64save.h"
-#include "z64skin_matrix.h"
+#include "save.h"
+#include "skin_matrix.h"
 
 #include "overlays/actors/ovl_Arms_Hook/z_arms_hook.h"
 #include "overlays/actors/ovl_En_Part/z_en_part.h"

src/code/z_bg_collect.c

@@ -5,7 +5,7 @@
 #include "actor.h"
 #include "bgcheck.h"
 #include "player.h"
-#include "z64skin_matrix.h"
+#include "skin_matrix.h"
 
 /**
  * Update the `carriedActor`'s position based on the dynapoly actor identified by `bgId`.

src/code/z_bgcheck.c

@@ -12,7 +12,7 @@
 #include "bgcheck.h"
 #include "play_state.h"
 #include "player.h"
-#include "z64skin_matrix.h"
+#include "skin_matrix.h"
 
 #pragma increment_block_number "ntsc-1.0:152 ntsc-1.1:152 ntsc-1.2:152"
 

src/code/z_camera.c

@@ -23,7 +23,7 @@
 #include "olib.h"
 #include "play_state.h"
 #include "player.h"
-#include "z64save.h"
+#include "save.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" \

src/code/z_common_data.c

@@ -4,7 +4,7 @@
 #include "versions.h"
 #include "z_locale.h"
 #include "environment.h"
-#include "z64save.h"
+#include "save.h"
 #include "z64transition.h"
 
 #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" \

src/code/z_construct.c

@@ -8,7 +8,7 @@
 #include "interface.h"
 #include "ocarina.h"
 #include "play_state.h"
-#include "z64save.h"
+#include "save.h"
 
 void Interface_Destroy(PlayState* play) {
     Map_Destroy(play);

src/code/z_demo.c

@@ -28,7 +28,7 @@
 #include "ocarina.h"
 #include "play_state.h"
 #include "player.h"
-#include "z64save.h"
+#include "save.h"
 
 #include "assets/scenes/indoors/tokinoma/tokinoma_scene.h"
 

src/code/z_eff_blure.c

@@ -7,7 +7,7 @@
 #include "translation.h"
 #include "z_lib.h"
 #include "effect.h"
-#include "z64skin_matrix.h"
+#include "skin_matrix.h"
 
 #include "z64.h" // required for gameplay keep, the header doesnt include any external dependencies
 #include "assets/objects/gameplay_keep/gameplay_keep.h"

src/code/z_eff_shield_particle.c

@@ -8,7 +8,7 @@
 #include "effect.h"
 #include "light.h"
 #include "play_state.h"
-#include "z64skin_matrix.h"
+#include "skin_matrix.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 

src/code/z_eff_spark.c

@@ -7,7 +7,7 @@
 #include "translation.h"
 #include "effect.h"
 #include "play_state.h"
-#include "z64skin_matrix.h"
+#include "skin_matrix.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 

src/code/z_effect_soft_sprite_old_init.c

@@ -10,7 +10,7 @@
 #include "effect.h"
 #include "play_state.h"
 #include "player.h"
-#include "z64skin_matrix.h"
+#include "skin_matrix.h"
 
 #include "overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.h"
 #include "overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.h"

src/code/z_elf_message.c

@@ -4,7 +4,7 @@
 #include "player.h"
 #include "quest_hint.h"
 #include "quest_hint_commands.h"
-#include "z64save.h"
+#include "save.h"
 
 QuestHintCmd sChildSariaQuestHints[] = {
     QUEST_HINT_STRENGTH_UPG(SKIP, 0, false, 3),

src/code/z_en_item00.c

@@ -17,7 +17,7 @@
 #include "item.h"
 #include "play_state.h"
 #include "player.h"
-#include "z64save.h"
+#include "save.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 

src/code/z_fbdemo_fade.c

@@ -6,7 +6,7 @@
 #include "terminal.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64save.h"
+#include "save.h"
 #include "z64transition_instances.h"
 
 typedef enum TransitionFadeDirection {

src/code/z_fbdemo_wipe1.c

@@ -1,7 +1,7 @@
 #include "transition_wipe.h"
 
 #include "gfx.h"
-#include "z64save.h"
+#include "save.h"
 #include "z64transition_instances.h"
 
 typedef enum TransitionWipeDirection {

src/code/z_game_over.c

@@ -6,7 +6,7 @@
 #include "versions.h"
 #include "game_over.h"
 #include "play_state.h"
-#include "z64save.h"
+#include "save.h"
 
 void GameOver_Init(PlayState* play) {
     play->gameOverCtx.state = GAMEOVER_INACTIVE;

src/code/z_horse.c

@@ -7,7 +7,7 @@
 #include "horse.h"
 #include "play_state.h"
 #include "player.h"
-#include "z64save.h"
+#include "save.h"
 #include "overlays/actors/ovl_En_Horse/z_en_horse.h"
 
 /**

src/code/z_inventory.c

@@ -3,7 +3,7 @@
 #include "translation.h"
 #include "play_state.h"
 #include "player.h"
-#include "z64save.h"
+#include "save.h"
 
 #include "assets/textures/icon_item_static/icon_item_static.h"
 #include "assets/textures/icon_item_24_static/icon_item_24_static.h"

src/code/z_kaleido_setup.c

@@ -7,7 +7,7 @@
 #include "regs.h"
 #include "audio.h"
 #include "play_state.h"
-#include "z64save.h"
+#include "save.h"
 
 /*
  * The following three arrays are effectively unused.

src/code/z_kankyo.c

@@ -30,7 +30,7 @@
 #include "environment.h"
 #include "play_state.h"
 #include "player.h"
-#include "z64save.h"
+#include "save.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h"

src/code/z_lifemeter.c

@@ -6,7 +6,7 @@
 #include "lifemeter.h"
 #include "play_state.h"
 #include "player.h"
-#include "z64save.h"
+#include "save.h"
 
 #include "assets/textures/parameter_static/parameter_static.h"
 

src/code/z_map_data.c

@@ -1,5 +1,5 @@
 #include "map.h"
-#include "z64save.h"
+#include "save.h"
 
 static s16 sFloorTexIndexOffset[10][8] = {
     { 0, 0, 0, 0, 2, 4, 6, 8 }, { 0, 0, 0, 0, 0, 0, 0, 2 },

src/code/z_map_exp.c

@@ -15,7 +15,7 @@
 #include "map_mark.h"
 #include "play_state.h"
 #include "player.h"
-#include "z64save.h"
+#include "save.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/textures/parameter_static/parameter_static.h"

src/code/z_map_mark.c

@@ -12,7 +12,7 @@
 #include "translation.h"
 #include "map_mark.h"
 #include "play_state.h"
-#include "z64save.h"
+#include "save.h"
 
 #include "assets/textures/parameter_static/parameter_static.h"
 

src/code/z_message.c

@@ -22,7 +22,7 @@
 #include "ocarina.h"
 #include "play_state.h"
 #include "player.h"
-#include "z64save.h"
+#include "save.h"
 
 #include "assets/textures/parameter_static/parameter_static.h"
 

src/code/z_onepointdemo.c

@@ -12,7 +12,7 @@
 #include "olib.h"
 #include "play_state.h"
 #include "player.h"
-#include "z64save.h"
+#include "save.h"
 #include "overlays/actors/ovl_En_Sw/z_en_sw.h"
 
 static s16 sDisableAttention = false;

src/code/z_parameter.c

@@ -23,7 +23,7 @@
 #include "ocarina.h"
 #include "play_state.h"
 #include "player.h"
-#include "z64save.h"
+#include "save.h"
 
 #include "assets/textures/parameter_static/parameter_static.h"
 #include "assets/textures/do_action_static/do_action_static.h"

src/code/z_play.c

@@ -44,7 +44,7 @@
 #include "light.h"
 #include "play_state.h"
 #include "player.h"
-#include "z64save.h"
+#include "save.h"
 #include "z64vis.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 ique-cn:224" \

src/code/z_player_lib.c

@@ -10,8 +10,8 @@
 #include "effect.h"
 #include "play_state.h"
 #include "player.h"
-#include "z64save.h"
-#include "z64skin_matrix.h"
+#include "save.h"
+#include "skin_matrix.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_link_boy/object_link_boy.h"

src/code/z_room.c

@@ -23,8 +23,8 @@
 #include "play_state.h"
 #include "player.h"
 #include "room.h"
-#include "z64save.h"
-#include "z64skin_matrix.h"
+#include "save.h"
+#include "skin_matrix.h"
 
 Vec3f D_801270A0 = { 0.0f, 0.0f, 0.0f };
 

src/code/z_scene.c

@@ -13,8 +13,8 @@
 #include "z_lib.h"
 #include "play_state.h"
 #include "player.h"
-#include "z64save.h"
-#include "z64scene.h"
+#include "save.h"
+#include "scene.h"
 
 SceneCmdHandlerFunc sSceneCmdHandlers[SCENE_CMD_ID_MAX];
 RomFile sNaviQuestHintFiles[];

src/code/z_scene_table.c

@@ -14,7 +14,7 @@
 #include "frame_advance.h"
 #include "play_state.h"
 #include "player.h"
-#include "z64save.h"
+#include "save.h"
 
 #include "assets/scenes/indoors/miharigoya/miharigoya_scene.h"
 #include "assets/scenes/indoors/souko/souko_scene.h"

src/code/z_sfx_source.c

@@ -1,9 +1,9 @@
-#include "z64sfx_source.h"
+#include "sfx_source.h"
 
 #include "array_count.h"
 #include "sfx.h"
 #include "play_state.h"
-#include "z64skin_matrix.h"
+#include "skin_matrix.h"
 
 void SfxSource_InitAll(PlayState* play) {
     SfxSource* sources = &play->sfxSources[0];

src/code/z_skin.c

@@ -3,8 +3,8 @@
 #include "sys_matrix.h"
 #include "z_math.h"
 #include "play_state.h"
-#include "z64skin.h"
-#include "z64skin_matrix.h"
+#include "skin.h"
+#include "skin_matrix.h"
 
 MtxF gSkinLimbMatrices[60]; // holds matrices for each limb of the skeleton currently being drawn
 

src/code/z_skin_awb.c

@@ -3,8 +3,8 @@
 #include "zelda_arena.h"
 #include "actor.h"
 #include "play_state.h"
-#include "z64skin.h"
-#include "z64skin_matrix.h"
+#include "skin.h"
+#include "skin_matrix.h"
 
 #include "overlays/actors/ovl_En_fHG/z_en_fhg.h"
 

src/code/z_skin_matrix.c

@@ -1,4 +1,4 @@
-#include "z64skin_matrix.h"
+#include "skin_matrix.h"
 
 #include "gfx.h"
 #include "printf.h"

src/code/z_sram.c

@@ -1,4 +1,4 @@
-#include "z64sram.h"
+#include "sram.h"
 
 #include "array_count.h"
 #include "file_select_state.h"
@@ -13,9 +13,9 @@
 #include "interface.h"
 #include "message.h"
 #include "ocarina.h"
-#include "z64save.h"
-#include "z64scene.h"
-#include "z64ss_sram.h"
+#include "save.h"
+#include "scene.h"
+#include "ss_sram.h"
 
 #define SLOT_SIZE (sizeof(SaveContext) + 0x28)
 #define CHECKSUM_SIZE (sizeof(Save) / 2)

src/code/z_ss_sram.c

@@ -1,6 +1,6 @@
 #include "ultra64.h"
 #include "printf.h"
-#include "z64ss_sram.h"
+#include "ss_sram.h"
 
 typedef struct SsSramContext {
     /* 0x00 */ OSPiHandle piHandle;

src/code/z_vr_box.c

@@ -1,4 +1,4 @@
-#include "z64skybox.h"
+#include "skybox.h"
 
 #include "array_count.h"
 #include "printf.h"
@@ -8,7 +8,7 @@
 #include "environment.h"
 #include "game.h"
 #include "play_state.h"
-#include "z64save.h"
+#include "save.h"
 
 typedef struct SkyboxFaceParams {
     /* 0x000 */ s32 xStart;

src/code/z_vr_box_draw.c

@@ -1,7 +1,7 @@
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "sys_matrix.h"
-#include "z64skybox.h"
+#include "skybox.h"
 
 Mtx* sSkyboxDrawMatrix;
 

src/elf_message/elf_message_field.c

@@ -1,5 +1,5 @@
 #include "quest_hint_commands.h"
-#include "z64save.h"
+#include "save.h"
 
 QuestHintCmd gOverworldNaviQuestHints[] = {
     QUEST_HINT_FLAG(CHECK, EVENTCHKINF_05, false, 0x40),

src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c

@@ -18,7 +18,7 @@
 #include "audio.h"
 #include "play_state.h"
 #include "player.h"
-#include "z64save.h"
+#include "save.h"
 
 #include "assets/objects/object_bdan_objects/object_bdan_objects.h"
 

src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c

@@ -17,7 +17,7 @@
 #include "z_lib.h"
 #include "play_state.h"
 #include "player.h"
-#include "z64save.h"
+#include "save.h"
 
 #include "assets/scenes/dungeons/ddan/ddan_scene.h"
 #include "assets/objects/object_bwall/object_bwall.h"

src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c

@@ -20,7 +20,7 @@
 #include "z_lib.h"
 #include "effect.h"
 #include "play_state.h"
-#include "z64save.h"
+#include "save.h"
 
 #include "assets/objects/object_ddan_objects/object_ddan_objects.h"
 

src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c

@@ -24,7 +24,7 @@
 #include "ocarina.h"
 #include "play_state.h"
 #include "player.h"
-#include "z64save.h"
+#include "save.h"
 
 #include "assets/objects/object_dy_obj/object_dy_obj.h"
 #include "assets/scenes/indoors/yousei_izumi_yoko/yousei_izumi_yoko_scene.h"

src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c

@@ -15,7 +15,7 @@
 #include "translation.h"
 #include "z_lib.h"
 #include "play_state.h"
-#include "z64save.h"
+#include "save.h"
 
 #include "assets/objects/object_spot01_matoyab/object_spot01_matoyab.h"
 

src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c

@@ -13,7 +13,7 @@
 #include "sys_matrix.h"
 #include "play_state.h"
 #include "player.h"
-#include "z64save.h"
+#include "save.h"
 
 #include "assets/objects/object_gjyo_objects/object_gjyo_objects.h"
 #include "assets/scenes/overworld/ganon_tou/ganon_tou_scene.h"

src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c

@@ -14,7 +14,7 @@
 #include "z_lib.h"
 #include "play_state.h"
 #include "player.h"
-#include "z64save.h"
+#include "save.h"
 
 #include "assets/objects/object_haka/object_haka.h"
 

src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c

@@ -16,7 +16,7 @@
 #include "translation.h"
 #include "z_lib.h"
 #include "play_state.h"
-#include "z64skin_matrix.h"
+#include "skin_matrix.h"
 
 #include "assets/objects/object_haka_objects/object_haka_objects.h"
 

src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c

@@ -14,7 +14,7 @@
 #include "effect.h"
 #include "play_state.h"
 #include "player.h"
-#include "z64skin_matrix.h"
+#include "skin_matrix.h"
 
 #include "assets/objects/object_haka_objects/object_haka_objects.h"
 

src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c

@@ -16,7 +16,7 @@
 #include "translation.h"
 #include "z_lib.h"
 #include "play_state.h"
-#include "z64save.h"
+#include "save.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 

src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c

@@ -17,7 +17,7 @@
 #include "z_lib.h"
 #include "play_state.h"
 #include "player.h"
-#include "z64save.h"
+#include "save.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_hidan_objects/object_hidan_objects.h"

src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c

@@ -16,7 +16,7 @@
 #include "z_lib.h"
 #include "play_state.h"
 #include "player.h"
-#include "z64skin_matrix.h"
+#include "skin_matrix.h"
 
 #include "assets/objects/object_hidan_objects/object_hidan_objects.h"
 

src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c

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

src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c

@@ -12,7 +12,7 @@
 #include "translation.h"
 #include "z_lib.h"
 #include "play_state.h"
-#include "z64save.h"
+#include "save.h"
 
 #include "assets/objects/object_jya_obj/object_jya_obj.h"
 

src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c

@@ -13,7 +13,7 @@
 #include "sys_matrix.h"
 #include "play_state.h"
 #include "player.h"
-#include "z64save.h"
+#include "save.h"
 
 #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h"
 

src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c

@@ -18,7 +18,7 @@
 #include "effect.h"
 #include "play_state.h"
 #include "player.h"
-#include "z64save.h"
+#include "save.h"
 
 #include "assets/objects/object_po_sisters/object_po_sisters.h"
 

src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c

@@ -14,7 +14,7 @@
 #include "cutscene_flags.h"
 #include "play_state.h"
 #include "player.h"
-#include "z64save.h"
+#include "save.h"
 
 #include "assets/objects/object_relay_objects/object_relay_objects.h"
 

src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c

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

src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c

@@ -17,7 +17,7 @@
 #include "light.h"
 #include "play_state.h"
 #include "player.h"
-#include "z64save.h"
+#include "save.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_spot00_objects/object_spot00_objects.h"

src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c

@@ -14,7 +14,7 @@
 #include "z_lib.h"
 #include "audio.h"
 #include "play_state.h"
-#include "z64save.h"
+#include "save.h"
 
 #include "assets/objects/object_spot01_objects/object_spot01_objects.h"
 

src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c

@@ -18,7 +18,7 @@
 #include "z_lib.h"
 #include "effect.h"
 #include "play_state.h"
-#include "z64save.h"
+#include "save.h"
 
 #include "assets/objects/object_spot01_objects/object_spot01_objects.h"
 

src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c

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

src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c

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

src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c

@@ -11,7 +11,7 @@
 #include "segmented_address.h"
 #include "translation.h"
 #include "play_state.h"
-#include "z64save.h"
+#include "save.h"
 
 #include "assets/objects/object_spot01_matoya/object_spot01_matoya.h"
 #include "assets/objects/object_spot01_matoyab/object_spot01_matoyab.h"

src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c

@@ -17,7 +17,7 @@
 #include "effect.h"
 #include "play_state.h"
 #include "player.h"
-#include "z64save.h"
+#include "save.h"
 
 #include "assets/objects/object_spot02_objects/object_spot02_objects.h"
 

src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c

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

src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c

@@ -17,7 +17,7 @@
 #include "z_lib.h"
 #include "effect.h"
 #include "play_state.h"
-#include "z64save.h"
+#include "save.h"
 
 #include "assets/objects/object_spot06_objects/object_spot06_objects.h"
 

src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c

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

src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c

@@ -16,7 +16,7 @@
 #include "z_lib.h"
 #include "play_state.h"
 #include "player.h"
-#include "z64save.h"
+#include "save.h"
 
 #include "assets/objects/object_spot08_obj/object_spot08_obj.h"
 

src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c

@@ -14,7 +14,7 @@
 #include "sys_matrix.h"
 #include "translation.h"
 #include "play_state.h"
-#include "z64save.h"
+#include "save.h"
 
 #include "assets/objects/object_spot09_obj/object_spot09_obj.h"
 

src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c

@@ -15,7 +15,7 @@
 #include "z_lib.h"
 #include "play_state.h"
 #include "player.h"
-#include "z64save.h"
+#include "save.h"
 
 #include "assets/objects/object_spot15_obj/object_spot15_obj.h"
 

src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c

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

src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c

@@ -18,7 +18,7 @@
 #include "effect.h"
 #include "play_state.h"
 #include "player.h"
-#include "z64save.h"
+#include "save.h"
 
 #include "assets/objects/object_spot16_obj/object_spot16_obj.h"
 #include "assets/objects/object_bombiwa/object_bombiwa.h"

src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c

@@ -14,7 +14,7 @@
 #include "terminal.h"
 #include "translation.h"
 #include "play_state.h"
-#include "z64save.h"
+#include "save.h"
 
 #include "assets/objects/object_efc_doughnut/object_efc_doughnut.h"
 

src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c

@@ -16,7 +16,7 @@
 #include "z_lib.h"
 #include "play_state.h"
 #include "player.h"
-#include "z64save.h"
+#include "save.h"
 
 #include "assets/objects/object_spot18_obj/object_spot18_obj.h"
 

src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c

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

src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c

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

src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c

@@ -16,7 +16,7 @@
 #include "cutscene_flags.h"
 #include "play_state.h"
 #include "player.h"
-#include "z64save.h"
+#include "save.h"
 
 #include "assets/objects/object_toki_objects/object_toki_objects.h"
 

src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c

@@ -17,7 +17,7 @@
 #include "effect.h"
 #include "play_state.h"
 #include "player.h"
-#include "z64save.h"
+#include "save.h"
 
 #include "assets/objects/object_spot04_objects/object_spot04_objects.h"