Merge 4100858bde into 3152557b49

include/actor.h

@@ -1,12 +1,12 @@
-#ifndef Z64ACTOR_H
-#define Z64ACTOR_H
+#ifndef ACTOR_H
+#define ACTOR_H
 
 #include "color.h"
 #include "romfile.h"
-#include "z64actor_profile.h"
-#include "z64animation.h"
-#include "z64math.h"
-#include "z64collision_check.h"
+#include "actor_profile.h"
+#include "animation.h"
+#include "z_math.h"
+#include "collision_check.h"
 
 #define ACTOR_NUMBER_MAX 200
 

include/actor_profile.h

@@ -1,5 +1,5 @@
-#ifndef Z64ACTOR_PROFILE_H
-#define Z64ACTOR_PROFILE_H
+#ifndef ACTOR_PROFILE_H
+#define ACTOR_PROFILE_H
 
 #include "ultra64.h"
 

include/animation.h

@@ -1,10 +1,10 @@
-#ifndef Z64_ANIMATION_H
-#define Z64_ANIMATION_H
+#ifndef ANIMATION_H
+#define ANIMATION_H
 
 #include "avoid_ub.h"
 #include "ultra64.h"
-#include "z64dma.h"
-#include "z64math.h"
+#include "dma.h"
+#include "z_math.h"
 
 struct PlayState;
 struct Actor;

include/animation_legacy.h

@@ -1,8 +1,8 @@
-#ifndef Z64_ANIMATION_LEGACY_H
-#define Z64_ANIMATION_LEGACY_H
+#ifndef ANIMATION_LEGACY_H
+#define ANIMATION_LEGACY_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct LegacyLimb {
     /* 0x000 */ Gfx* dList;

include/audio.h

@@ -1,9 +1,9 @@
-#ifndef Z64_AUDIO_H
-#define Z64_AUDIO_H
+#ifndef AUDIO_H
+#define AUDIO_H
 
 #include "ultra64.h"
 #include "sequence.h"
-#include "z64math.h"
+#include "z_math.h"
 
 struct GfxPrint;
 

include/audio/soundfont_file.h

@@ -4,7 +4,7 @@
 #include "libc/stdbool.h"
 #include "alignment.h"
 #include "attributes.h"
-#include "z64audio.h"
+#include "audio.h"
 
 // Envelope definitions
 

include/audiomgr.h

@@ -2,7 +2,7 @@
 #define AUDIOMGR_H
 
 #include "sched.h"
-#include "z64audio.h"
+#include "audio.h"
 
 typedef enum AudioMgrDebugLevel {
     /* 0 */ AUDIOMGR_DEBUG_LEVEL_NONE,

include/bgcheck.h

@@ -1,8 +1,8 @@
-#ifndef Z64BGCHECK_H
-#define Z64BGCHECK_H
+#ifndef BGCHECK_H
+#define BGCHECK_H
 
 #include "ultra64/ultratypes.h"
-#include "z64math.h"
+#include "z_math.h"
 
 struct PlayState;
 struct Actor;

include/camera.h

@@ -1,9 +1,9 @@
-#ifndef Z64CAMERA_H
-#define Z64CAMERA_H
+#ifndef CAMERA_H
+#define CAMERA_H
 
 #include "ultra64.h"
-#include "z64cutscene.h"
-#include "z64math.h"
+#include "cutscene.h"
+#include "z_math.h"
 
 struct CollisionContext;
 struct View;

include/collision_check.h

@@ -1,8 +1,8 @@
-#ifndef Z64COLLISION_CHECK_H
-#define Z64COLLISION_CHECK_H
+#ifndef COLLISION_CHECK_H
+#define COLLISION_CHECK_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 #define COLLISION_CHECK_AT_MAX 50
 #define COLLISION_CHECK_AC_MAX 60

include/console_logo_state.h

@@ -2,9 +2,9 @@
 #define CONSOLE_LOGO_STATE_H
 
 #include "ultra64.h"
-#include "z64game.h"
-#include "z64sram.h"
-#include "z64view.h"
+#include "game.h"
+#include "sram.h"
+#include "view.h"
 
 typedef struct ConsoleLogoState {
     /* 0x0000 */ GameState state;

include/curve.h

@@ -1,8 +1,8 @@
-#ifndef Z64_CURVE_H
-#define Z64_CURVE_H
+#ifndef CURVE_H
+#define CURVE_H
 
 #include "ultra64/ultratypes.h"
-#include "z64math.h"
+#include "z_math.h"
 
 struct PlayState;
 struct Actor;

include/cutscene.h

@@ -1,8 +1,8 @@
-#ifndef Z64CUTSCENE_H
-#define Z64CUTSCENE_H
+#ifndef CUTSCENE_H
+#define CUTSCENE_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 struct PlayState;
 

include/cutscene_commands.h

@@ -1,8 +1,8 @@
-#ifndef Z64CUTSCENE_COMMANDS_H
-#define Z64CUTSCENE_COMMANDS_H
+#ifndef CUTSCENE_COMMANDS_H
+#define CUTSCENE_COMMANDS_H
 
 #include "command_macros_base.h"
-#include "z64cutscene.h"
+#include "cutscene.h"
 
 /**
  * Cutscene scripts are arrays of `CutsceneData` words, including bit-packed integers and floats.

include/cutscene_flags.h

@@ -1,5 +1,5 @@
-#ifndef Z64CUTSCENE_FLAGS_H
-#define Z64CUTSCENE_FLAGS_H
+#ifndef CUTSCENE_FLAGS_H
+#define CUTSCENE_FLAGS_H
 
 #include "ultra64.h"
 

include/cutscene_spline.h

@@ -1,8 +1,8 @@
-#ifndef Z64CUTSCENE_SPLINE_H
-#define Z64CUTSCENE_SPLINE_H
+#ifndef CUTSCENE_SPLINE_H
+#define CUTSCENE_SPLINE_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 union CutsceneCameraPoint;
 

include/db_camera.h

@@ -2,8 +2,8 @@
 #define DB_CAMERA_H
 
 #include "ultra64.h"
-#include "z64cutscene.h"
-#include "z64math.h"
+#include "cutscene.h"
+#include "z_math.h"
 
 struct Camera;
 

include/debug.h

@@ -1,5 +1,5 @@
-#ifndef Z64DEBUG_H
-#define Z64DEBUG_H
+#ifndef DEBUG_H
+#define DEBUG_H
 
 #include "ultra64.h"
 

include/debug_display.h

@@ -1,8 +1,8 @@
-#ifndef Z64_DEBUG_DISPLAY_H
-#define Z64_DEBUG_DISPLAY_H
+#ifndef DEBUG_DISPLAY_H
+#define DEBUG_DISPLAY_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 #include "color.h"
 
 struct GraphicsContext;

include/dma.h

@@ -1,5 +1,5 @@
-#ifndef Z64_DMA_H
-#define Z64_DMA_H
+#ifndef DMA_H
+#define DMA_H
 
 #include "ultra64.h"
 #include "alignment.h"

include/draw.h

@@ -1,5 +1,5 @@
-#ifndef Z64_DRAW_H
-#define Z64_DRAW_H
+#ifndef DRAW_H
+#define DRAW_H
 
 #include "ultra64.h"
 

include/effect.h

@@ -1,10 +1,10 @@
-#ifndef Z64EFFECT_H
-#define Z64EFFECT_H
+#ifndef EFFECT_H
+#define EFFECT_H
 
 #include "color.h"
 #include "romfile.h"
-#include "z64light.h"
-#include "z64math.h"
+#include "light.h"
+#include "z_math.h"
 
 struct Actor;
 struct GraphicsContext;

include/environment.h

@@ -1,9 +1,9 @@
-#ifndef _Z64ENVIRONMENT_H_
-#define _Z64ENVIRONMENT_H_
+#ifndef ENVIRONMENT_H_
+#define ENVIRONMENT_H_
 
-#include "z64math.h"
-#include "z64light.h"
-#include "z64dma.h"
+#include "z_math.h"
+#include "light.h"
+#include "dma.h"
 
 struct GameOverContext;
 struct MessageContext;

include/face_reaction.h

@@ -1,5 +1,5 @@
-#ifndef Z64FACE_REACTION_H
-#define Z64FACE_REACTION_H
+#ifndef FACE_REACTION_H
+#define FACE_REACTION_H
 
 #include "ultra64.h"
 

include/file_select_state.h

@@ -2,12 +2,12 @@
 #define FILE_SELECT_STATE_H
 
 #include "ultra64.h"
-#include "z64environment.h"
-#include "z64game.h"
-#include "z64message.h"
-#include "z64skybox.h"
-#include "z64sram.h"
-#include "z64view.h"
+#include "environment.h"
+#include "game.h"
+#include "message.h"
+#include "skybox.h"
+#include "sram.h"
+#include "view.h"
 
 typedef struct FileSelectState {
     /* 0x00000 */ GameState state;

include/font.h

@@ -1,5 +1,5 @@
-#ifndef Z64FONT_H
-#define Z64FONT_H
+#ifndef FONT_H
+#define FONT_H
 
 #include "ultra64.h"
 

include/frame_advance.h

@@ -1,5 +1,5 @@
-#ifndef Z64FRAME_ADVANCE_H
-#define Z64FRAME_ADVANCE_H
+#ifndef FRAME_ADVANCE_H
+#define FRAME_ADVANCE_H
 
 #include "ultra64.h"
 

include/game.h

@@ -1,5 +1,5 @@
-#ifndef Z64GAME_H
-#define Z64GAME_H
+#ifndef GAME_H
+#define GAME_H
 // This file is named "game" after game.c for now, this may change later with the system name
 
 #include "ultra64/ultratypes.h"

include/game_over.h

@@ -1,5 +1,5 @@
-#ifndef Z64GAME_OVER_H
-#define Z64GAME_OVER_H
+#ifndef GAME_OVER_H
+#define GAME_OVER_H
 
 #include "ultra64.h"
 

include/horse.h

@@ -1,8 +1,8 @@
-#ifndef Z64HORSE_H
-#define Z64HORSE_H
+#ifndef HORSE_H
+#define HORSE_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 struct PlayState;
 struct Actor;

include/interface.h

@@ -1,9 +1,9 @@
-#ifndef Z64INTERFACE_H
-#define Z64INTERFACE_H
+#ifndef INTERFACE_H
+#define INTERFACE_H
 
 #include "ultra64.h"
-#include "z64dma.h"
-#include "z64view.h"
+#include "dma.h"
+#include "view.h"
 
 struct PlayState;
 

include/inventory.h

@@ -1,8 +1,8 @@
-#ifndef Z64INVENTORY_H
-#define Z64INVENTORY_H
+#ifndef INVENTORY_H
+#define INVENTORY_H
 
 #include "ultra64.h"
-#include "z64item.h"
+#include "item.h"
 
 struct PlayState;
 

include/item.h

@@ -1,5 +1,5 @@
-#ifndef Z64ITEM_H
-#define Z64ITEM_H
+#ifndef ITEM_H
+#define ITEM_H
 
 // Note that z_kaleido_scope.c assumes that the dimensions and texture format here also matches the dimensions and
 // texture format for MAP_NAME_TEX1_*

include/lifemeter.h

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

include/light.h

@@ -1,9 +1,9 @@
-#ifndef Z64LIGHT_H
-#define Z64LIGHT_H
+#ifndef LIGHT_H
+#define LIGHT_H
 
 #include "ultra64.h"
 #include "ultra64/gbi.h"
-#include "z64math.h"
+#include "z_math.h"
 #include "color.h"
 
 struct GraphicsContext;

include/map_mark.h

@@ -1,5 +1,5 @@
-#ifndef Z64MAP_MARK_H
-#define Z64MAP_MARK_H
+#ifndef MAP_MARK_H
+#define MAP_MARK_H
 
 #include "ultra64.h"
 

include/map_select_state.h

@@ -2,8 +2,8 @@
 #define MAP_SELECT_STATE_H
 
 #include "ultra64.h"
-#include "z64game.h"
-#include "z64view.h"
+#include "game.h"
+#include "view.h"
 
 struct MapSelectState;
 

include/message.h

@@ -1,9 +1,9 @@
-#ifndef Z64MESSAGE_H
-#define Z64MESSAGE_H
+#ifndef MESSAGE_H
+#define MESSAGE_H
 
-#include "z64view.h"
+#include "view.h"
 #include "versions.h"
-#include "z64font.h"
+#include "font.h"
 
 struct OcarinaStaff;
 struct Actor;

include/message_data_fmt.h

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

include/n64dd.h

@@ -3,9 +3,9 @@
 
 #include "ultra64.h"
 #include "ultra64/leo.h"
-#include "z64pause.h"
-#include "z64scene.h"
-#include "z64map_mark.h"
+#include "pause.h"
+#include "scene.h"
+#include "map_mark.h"
 #include "versions.h"
 
 struct Font;

include/object.h

@@ -1,8 +1,8 @@
-#ifndef Z64OBJECT_H
-#define Z64OBJECT_H
+#ifndef OBJECT_H
+#define OBJECT_H
 
 #include "ultra64.h"
-#include "z64dma.h"
+#include "dma.h"
 
 struct PlayState;
 

include/ocarina.h

@@ -1,5 +1,5 @@
-#ifndef Z64OCARINA_H
-#define Z64OCARINA_H
+#ifndef OCARINA_H
+#define OCARINA_H
 
 #include "ultra64.h"
 

include/olib.h

@@ -1,7 +1,7 @@
-#ifndef Z64OLIB_H
-#define Z64OLIB_H
+#ifndef OLIB_H
+#define OLIB_H
 
-#include "z64math.h"
+#include "z_math.h"
 
 f32 OLib_Vec3fDist(Vec3f* a, Vec3f* b);
 f32 OLib_Vec3fDistXZ(Vec3f* a, Vec3f* b);

include/path.h

@@ -1,8 +1,8 @@
-#ifndef Z64PATH_H
-#define Z64PATH_H
+#ifndef PATH_H
+#define PATH_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 struct PlayState;
 struct Actor;

include/pause.h

@@ -1,9 +1,9 @@
-#ifndef Z64PAUSE_H
-#define Z64PAUSE_H
+#ifndef PAUSE_H
+#define PAUSE_H
 
-#include "z64animation.h"
-#include "z64message.h"
-#include "z64view.h"
+#include "animation.h"
+#include "message.h"
+#include "view.h"
 
 struct OcarinaStaff;
 struct PlayState;

include/play_state.h

@@ -1,30 +1,30 @@
-#ifndef Z64PLAY_H
-#define Z64PLAY_H
+#ifndef PLAY_STATE_H
+#define PLAY_STATE_H
 
 #include "ultra64.h"
 
 #include "prerender.h"
 #include "transition_tile.h"
-#include "z64actor.h"
-#include "z64bgcheck.h"
-#include "z64camera.h"
-#include "z64cutscene.h"
-#include "z64environment.h"
-#include "z64frame_advance.h"
-#include "z64game.h"
-#include "z64game_over.h"
-#include "z64interface.h"
-#include "z64light.h"
-#include "z64message.h"
-#include "z64object.h"
-#include "z64pause.h"
-#include "z64room.h"
-#include "z64scene.h"
-#include "z64sfx_source.h"
-#include "z64skybox.h"
-#include "z64sram.h"
-#include "z64transition.h"
-#include "z64view.h"
+#include "actor.h"
+#include "bgcheck.h"
+#include "camera.h"
+#include "cutscene.h"
+#include "environment.h"
+#include "frame_advance.h"
+#include "game.h"
+#include "game_over.h"
+#include "interface.h"
+#include "light.h"
+#include "message.h"
+#include "object.h"
+#include "pause.h"
+#include "room.h"
+#include "scene.h"
+#include "sfx_source.h"
+#include "skybox.h"
+#include "sram.h"
+#include "transition.h"
+#include "view.h"
 
 union Color_RGBA8_u32;
 struct Path;

include/player.h

@@ -1,7 +1,7 @@
-#ifndef Z64PLAYER_H
-#define Z64PLAYER_H
+#ifndef PLAYER_H
+#define PLAYER_H
 
-#include "z64actor.h"
+#include "actor.h"
 #include "alignment.h"
 #include "face_change.h"
 

include/prenmi_state.h

@@ -2,7 +2,7 @@
 #define PRENMI_STATE_H
 
 #include "ultra64.h"
-#include "z64game.h"
+#include "game.h"
 
 typedef struct PreNMIState {
     /* 0x00 */ GameState state;

include/quake.h

@@ -1,8 +1,8 @@
 #ifndef QUAKE_H
 #define QUAKE_H
 
-#include "z64camera.h"
-#include "z64math.h"
+#include "camera.h"
+#include "z_math.h"
 
 typedef struct ShakeInfo {
     /* 0x00 */ Vec3f atOffset;

include/quest_hint.h

@@ -1,5 +1,5 @@
-#ifndef Z64QUEST_HINT_H
-#define Z64QUEST_HINT_H
+#ifndef QUEST_HINT_H
+#define QUEST_HINT_H
 
 #include "ultra64.h"
 

include/quest_hint_commands.h

@@ -1,5 +1,5 @@
-#ifndef Z64QUEST_HINT_COMMANDS_H
-#define Z64QUEST_HINT_COMMANDS_H
+#ifndef QUEST_HINT_COMMANDS_H
+#define QUEST_HINT_COMMANDS_H
 
 #include "ultra64.h"
 

include/room.h

@@ -1,9 +1,9 @@
-#ifndef Z64ROOM_H
-#define Z64ROOM_H
+#ifndef ROOM_H
+#define ROOM_H
 
 #include "ultra64.h"
-#include "z64dma.h"
-#include "z64math.h"
+#include "dma.h"
+#include "z_math.h"
 
 struct Input;
 struct PlayState;

include/sample_state.h

@@ -2,8 +2,8 @@
 #define SAMPLE_STATE_H
 
 #include "ultra64.h"
-#include "z64game.h"
-#include "z64view.h"
+#include "game.h"
+#include "view.h"
 
 typedef struct SampleState {
     /* 0x0000 */ GameState state;

include/save.h

@@ -1,10 +1,10 @@
-#ifndef Z64SAVE_H
-#define Z64SAVE_H
+#ifndef SAVE_H
+#define SAVE_H
 
 #include "ultra64.h"
 #include "versions.h"
-#include "z64inventory.h"
-#include "z64math.h"
+#include "inventory.h"
+#include "z_math.h"
 
 typedef enum ZTargetSetting {
     /* 0 */ Z_TARGET_SETTING_SWITCH,

include/scene.h

@@ -1,13 +1,13 @@
-#ifndef Z64SCENE_H
-#define Z64SCENE_H
+#ifndef SCENE_H
+#define SCENE_H
 
 #include "avoid_ub.h"
 #include "ultra64.h"
-#include "z64bgcheck.h"
-#include "z64environment.h"
-#include "z64light.h"
-#include "z64math.h"
-#include "z64path.h"
+#include "bgcheck.h"
+#include "environment.h"
+#include "light.h"
+#include "z_math.h"
+#include "path.h"
 
 #include "command_macros_base.h"
 

include/setup_state.h

@@ -1,7 +1,7 @@
 #ifndef SETUP_STATE_H
 #define SETUP_STATE_H
 
-#include "z64game.h"
+#include "game.h"
 
 typedef struct SetupState {
     /* 0x00 */ GameState state;

include/sfx.h

@@ -3,7 +3,7 @@
 
 #include "ultra64.h"
 #include "versions.h"
-#include "z64math.h"
+#include "z_math.h"
 #include "libc/assert.h"
 
 #define MAX_CHANNELS_PER_BANK 3

include/sfx_source.h

@@ -1,8 +1,8 @@
-#ifndef Z64SFX_SOURCE_H
-#define Z64SFX_SOURCE_H
+#ifndef SFX_SOURCE_H
+#define SFX_SOURCE_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 struct PlayState;
 

include/skin.h

@@ -1,7 +1,7 @@
-#ifndef Z64_SKIN_H
-#define Z64_SKIN_H
+#ifndef SKIN_H
+#define SKIN_H
 
-#include "z64animation.h"
+#include "animation.h"
 
 struct Actor;
 struct GraphicsContext;

include/skin_matrix.h

@@ -1,8 +1,8 @@
-#ifndef Z64SKIN_MATRIX_H
-#define Z64SKIN_MATRIX_H
+#ifndef SKIN_MATRIX_H
+#define SKIN_MATRIX_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 struct GraphicsContext;
 

include/skybox.h

@@ -1,11 +1,11 @@
-#ifndef Z64_SKYBOX_H
-#define Z64_SKYBOX_H
+#ifndef SKYBOX_H
+#define SKYBOX_H
 
 #include "ultra64/ultratypes.h"
 #include "ultra64/gbi.h"
 
-#include "z64math.h"
-#include "z64dma.h" // for RomFile
+#include "z_math.h"
+#include "dma.h" // for RomFile
 
 struct GameState;
 struct GraphicsContext;

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/sys_math3d.h

@@ -2,7 +2,7 @@
 #define SYS_MATH3D_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 struct PlayState;
 

include/sys_matrix.h

@@ -1,7 +1,7 @@
 #ifndef SYS_MATRIX_H
 #define SYS_MATRIX_H
 
-#include "z64math.h"
+#include "z_math.h"
 
 struct GraphicsContext;
 struct GameState;

include/thread.h

@@ -1,5 +1,5 @@
-#ifndef Z64THREAD_H
-#define Z64THREAD_H
+#ifndef THREAD_H
+#define THREAD_H
 
 #include "ultra64.h"
 

include/title_setup_state.h

@@ -1,8 +1,8 @@
 #ifndef TITLE_SETUP_STATE_H
 #define TITLE_SETUP_STATE_H
 
-#include "z64game.h"
-#include "z64view.h"
+#include "game.h"
+#include "view.h"
 
 typedef struct TitleSetupState {
     /* 0x0000 */ GameState state;

include/transition.h

@@ -1,5 +1,5 @@
-#ifndef Z64TRANSITION_H
-#define Z64TRANSITION_H
+#ifndef TRANSITION_H
+#define TRANSITION_H
 
 #include "ultra64/ultratypes.h"
 #include "ultra64/gbi.h" // for Gfx
@@ -7,7 +7,7 @@
 #include "transition_fade.h"
 #include "transition_triforce.h"
 #include "transition_wipe.h"
-#include "z64transition_instances.h"
+#include "transition_instances.h"
 
 #define TRANS_TRIGGER_OFF 0 // transition is not active
 #define TRANS_TRIGGER_START 20 // start transition (exiting an area)

include/transition_instances.h

@@ -1,5 +1,5 @@
-#ifndef Z64TRANSITION_INSTANCES_H
-#define Z64TRANSITION_INSTANCES_H
+#ifndef TRANSITION_INSTANCES_H
+#define TRANSITION_INSTANCES_H
 
 typedef enum TransitionInstanceType {
     /* 1 */ TRANS_INSTANCE_TYPE_FILL_OUT = 1,

include/view.h

@@ -1,9 +1,9 @@
-#ifndef Z64VIEW_H
-#define Z64VIEW_H
+#ifndef VIEW_H
+#define VIEW_H
 
 #include "avoid_ub.h"
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 struct GraphicsContext;
 

include/vis.h

@@ -1,5 +1,5 @@
-#ifndef Z64_VIS_H
-#define Z64_VIS_H
+#ifndef VIS_H
+#define VIS_H
 
 #include "ultra64.h"
 #include "color.h"

include/z64.h

@@ -9,12 +9,12 @@
 #include "sequence.h"
 #include "sys_matrix.h"
 #include "ultra64.h"
-#include "z64play.h"
-#include "z64animation.h"
-#include "z64animation_legacy.h"
-#include "z64curve.h"
-#include "z64skin.h"
-#include "z64player.h"
-#include "z64ocarina.h"
+#include "play_state.h"
+#include "animation.h"
+#include "animation_legacy.h"
+#include "curve.h"
+#include "skin.h"
+#include "player.h"
+#include "ocarina.h"
 
 #endif

include/z_actor_dlftbls.h

@@ -2,7 +2,7 @@
 #define Z_ACTOR_DLFTBLS_H
 
 #include "romfile.h"
-#include "z64actor_profile.h"
+#include "actor_profile.h"
 
 /**
  * @see ACTOROVL_ALLOC_ABSOLUTE

include/z_en_a_obj.h

@@ -2,7 +2,7 @@
 #define Z_EN_A_OBJ_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 // Only A_OBJ_SIGNPOST_OBLONG and A_OBJ_SIGNPOST_ARROW are used in room files.
 typedef enum AObjType {

include/z_en_item00.h

@@ -2,7 +2,7 @@
 #define Z_EN_ITEM00_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 typedef enum Item00Type {
     /* 0x00 */ ITEM00_RUPEE_GREEN,

include/z_lib.h

@@ -3,7 +3,7 @@
 
 #include "libc/stddef.h"
 #include "libu64/pad.h"
-#include "z64math.h"
+#include "z_math.h"
 #include "color.h"
 
 void Lib_MemSet(u8* dest, size_t len, u8 val);

include/z_math.h

@@ -1,5 +1,7 @@
-#ifndef Z64MATH_H
-#define Z64MATH_H
+#ifndef Z_MATH_H
+#define Z_MATH_H
+
+// This file has a z_ prefix to indicate that it is the game-side math header, not libc
 
 #include "math.h"
 #include "ultra64.h"

src/audio/data.c

@@ -1,7 +1,7 @@
 #include "array_count.h"
 #include "sfx.h"
 #include "ultra64.h"
-#include "z64audio.h"
+#include "audio.h"
 
 // sSfxRequests ring buffer endpoints. read index <= write index, wrapping around mod 256.
 u8 gSfxRequestWriteIndex = 0;

src/audio/general.c

@@ -10,8 +10,8 @@
 #include "sfx.h"
 #include "ultra64.h"
 #include "versions.h"
-#include "z64audio.h"
-#include "z64ocarina.h"
+#include "audio.h"
+#include "ocarina.h"
 
 #define ABS_ALT(x) ((x) < 0 ? -(x) : (x))
 

src/audio/lib/data.c

@@ -1,6 +1,6 @@
 #include "alignment.h"
 #include "ultra64.h"
-#include "z64audio.h"
+#include "audio.h"
 
 // clang-format off
 ALIGNED(16) s16 gSawtoothWaveSample[] = {

src/audio/lib/dcache.c

@@ -1,5 +1,5 @@
 #include "ultra64.h"
-#include "z64audio.h"
+#include "audio.h"
 
 void Audio_InvalDCache(void* buf, s32 size) {
     OSIntMask prevMask = osSetIntMask(OS_IM_NONE);

src/audio/lib/effects.c

@@ -1,6 +1,6 @@
 #include "ultra64.h"
 #include "attributes.h"
-#include "z64audio.h"
+#include "audio.h"
 
 void Audio_SequenceChannelProcessSound(SequenceChannel* channel, s32 recalculateVolume, s32 applyBend) {
     f32 channelVolume;

src/audio/lib/heap.c

@@ -1,7 +1,7 @@
 #include "alignment.h"
 #include "ultra64.h"
 #include "versions.h"
-#include "z64audio.h"
+#include "audio.h"
 
 void AudioHeap_InitSampleCaches(u32 persistentSampleCacheSize, u32 temporarySampleCacheSize);
 SampleCacheEntry* AudioHeap_AllocTemporarySampleCacheEntry(u32 size);

src/audio/lib/load.c

@@ -8,7 +8,7 @@
 #include "segment_symbols.h"
 #include "ultra64.h"
 #include "versions.h"
-#include "z64audio.h"
+#include "audio.h"
 
 #define MK_ASYNC_MSG(retData, tableType, id, loadStatus) \
     (((retData) << 24) | ((tableType) << 16) | ((id) << 8) | (loadStatus))

src/audio/lib/playback.c

@@ -1,5 +1,5 @@
 #include "ultra64.h"
-#include "z64audio.h"
+#include "audio.h"
 
 void Audio_InitNoteSub(Note* note, NoteSubEu* sub, NoteSubAttributes* attrs) {
     f32 volLeft;

src/audio/lib/seqplayer.c

@@ -19,7 +19,7 @@
 #include "assert.h"
 #include "attributes.h"
 #include "ultra64.h"
-#include "z64audio.h"
+#include "audio.h"
 
 static_assert(MML_VERSION == MML_VERSION_OOT, "This file implements the OoT version of the MML");
 

src/audio/lib/synthesis.c

@@ -1,6 +1,6 @@
 #include "alignment.h"
 #include "ultra64.h"
-#include "z64audio.h"
+#include "audio.h"
 
 // DMEM Addresses for the RSP
 #define DMEM_TEMP 0x3C0

src/audio/lib/thread.c

@@ -6,7 +6,7 @@
 #include "audiothread_cmd.h"
 #include "ultra64.h"
 #include "versions.h"
-#include "z64audio.h"
+#include "audio.h"
 
 #define SAMPLES_TO_OVERPRODUCE 0x10
 #define EXTRA_BUFFERED_AI_SAMPLES_TARGET 0x80

src/audio/sequence.c

@@ -23,7 +23,7 @@
 #include "sfx.h"
 #include "ultra64.h"
 #include "ultra64/abi.h"
-#include "z64audio.h"
+#include "audio.h"
 
 // Direct audio command (skips the queueing system)
 #define SEQCMD_SET_SEQPLAYER_VOLUME_NOW(seqPlayerIndex, duration, volume)                       \

src/audio/session_config.c

@@ -1,4 +1,4 @@
-#include "z64audio.h"
+#include "audio.h"
 
 AudioContext gAudioCtx;
 AudioCustomUpdateFunction gAudioCustomUpdateFunction;

src/audio/session_init.c

@@ -1,6 +1,6 @@
 #include "array_count.h"
 #include "buffers.h"
-#include "z64audio.h"
+#include "audio.h"
 
 #include "assets/audio/sequence_sizes.h"
 #include "assets/audio/soundfont_sizes.h"

src/audio/sfx.c

@@ -4,7 +4,7 @@
 #include "sfx.h"
 #include "terminal.h"
 #include "ultra64.h"
-#include "z64audio.h"
+#include "audio.h"
 
 typedef struct SfxRequest {
     /* 0x00 */ u16 sfxId;

src/audio/tables/samplebank_table.c

@@ -1,5 +1,5 @@
 #include "attributes.h"
-#include "z64audio.h"
+#include "audio.h"
 
 // Symbol definition
 

src/audio/tables/sequence_table.c

@@ -1,5 +1,5 @@
 #include "attributes.h"
-#include "z64audio.h"
+#include "audio.h"
 #include "versions.h"
 
 // Symbol definition

src/audio/tables/soundfont_table.c

@@ -1,5 +1,5 @@
 #include "attributes.h"
-#include "z64audio.h"
+#include "audio.h"
 
 // Symbol definition
 

src/boot/boot_main.c

@@ -10,7 +10,7 @@
 #include "cic6105.h"
 #endif
 #include "z_locale.h"
-#include "z64thread.h"
+#include "thread.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.2:128"
 

src/boot/idle.c

@@ -11,8 +11,8 @@
 #include "translation.h"
 #include "versions.h"
 #include "vi_mode.h"
-#include "z64thread.h"
-#include "z64dma.h"
+#include "thread.h"
+#include "dma.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" \
                                "ntsc-1.0:192 ntsc-1.1:192 ntsc-1.2:192 pal-1.0:192 pal-1.1:192"

src/boot/inflate.c

@@ -102,7 +102,7 @@
 #include "libc/stdint.h"
 #include "alignment.h"
 #include "attributes.h"
-#include "z64dma.h"
+#include "dma.h"
 
 typedef u8 uch;
 typedef u16 ush;

src/boot/yaz0.c

@@ -2,7 +2,7 @@
 
 #include "alignment.h"
 #include "ultra64.h"
-#include "z64dma.h"
+#include "dma.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.2:128" \
                                "pal-1.1:128"

src/boot/z_std_dma.c

@@ -42,8 +42,8 @@
 #if !PLATFORM_IQUE
 #include "yaz0.h"
 #endif
-#include "z64dma.h"
-#include "z64thread.h"
+#include "dma.h"
+#include "thread.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.2:66" \
                                "pal-1.0:64 pal-1.1:64"