z64 - a

include/actor.h

@@ -1,10 +1,10 @@
-#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 "actor_profile.h"
+#include "animation.h"
 #include "z64math.h"
 #include "z64collision_check.h"
 

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,5 +1,5 @@
-#ifndef Z64_ANIMATION_H
-#define Z64_ANIMATION_H
+#ifndef ANIMATION_H
+#define ANIMATION_H
 
 #include "avoid_ub.h"
 #include "ultra64.h"

include/animation_legacy.h

@@ -1,5 +1,5 @@
-#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/audio.h

@@ -1,5 +1,5 @@
-#ifndef Z64_AUDIO_H
-#define Z64_AUDIO_H
+#ifndef AUDIO_H
+#define AUDIO_H
 
 #include "ultra64.h"
 #include "sequence.h"

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

@@ -10,8 +10,8 @@
 #include "sys_matrix.h"
 #include "ultra64.h"
 #include "z64play.h"
-#include "z64animation.h"
-#include "z64animation_legacy.h"
+#include "animation.h"
+#include "animation_legacy.h"
 #include "z64curve.h"
 #include "z64skin.h"
 #include "z64player.h"

include/z64pause.h

@@ -1,7 +1,7 @@
 #ifndef Z64PAUSE_H
 #define Z64PAUSE_H
 
-#include "z64animation.h"
+#include "animation.h"
 #include "z64message.h"
 #include "z64view.h"
 

include/z64play.h

@@ -5,7 +5,7 @@
 
 #include "prerender.h"
 #include "transition_tile.h"
-#include "z64actor.h"
+#include "actor.h"
 #include "z64bgcheck.h"
 #include "z64camera.h"
 #include "z64cutscene.h"

include/z64player.h

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

include/z64skin.h

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

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,

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,7 +10,7 @@
 #include "sfx.h"
 #include "ultra64.h"
 #include "versions.h"
-#include "z64audio.h"
+#include "audio.h"
 #include "z64ocarina.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

@@ -4,7 +4,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

@@ -18,7 +18,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

@@ -2,7 +2,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/code/code_n64dd_800AD4C0.c

@@ -2,7 +2,7 @@
 #include "n64dd.h"
 #include "regs.h"
 #include "segmented_address.h"
-#include "z64actor.h"
+#include "actor.h"
 #include "z64cutscene.h"
 #include "z64save.h"
 

src/code/graph.c

@@ -26,7 +26,7 @@
 #include "versions.h"
 #include "vi_mode.h"
 #include "z_game_dlftbls.h"
-#include "z64audio.h"
+#include "audio.h"
 #include "z64save.h"
 #include "z64play.h"
 

src/code/z_actor.c

@@ -19,8 +19,8 @@
 #include "z_actor_dlftbls.h"
 #include "z_lib.h"
 #include "zelda_arena.h"
-#include "z64actor.h"
-#include "z64audio.h"
+#include "actor.h"
+#include "audio.h"
 #include "z64effect.h"
 #include "z64light.h"
 #include "z64horse.h"

src/code/z_bg_collect.c

@@ -2,7 +2,7 @@
 #include "terminal.h"
 #include "translation.h"
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 #include "z64bgcheck.h"
 #include "z64player.h"
 #include "z64skin_matrix.h"

src/code/z_bg_item.c

@@ -1,5 +1,5 @@
 #include "z_lib.h"
-#include "z64actor.h"
+#include "actor.h"
 #include "z64bgcheck.h"
 #include "z64play.h"
 

src/code/z_camera.c

@@ -17,7 +17,7 @@
 #include "ultra64.h"
 #include "z_lib.h"
 #include "zelda_arena.h"
-#include "z64audio.h"
+#include "audio.h"
 #include "z64cutscene_spline.h"
 #include "z64debug.h"
 #include "z64olib.h"

src/code/z_demo.c

@@ -21,7 +21,7 @@
 #include "sfx.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64audio.h"
+#include "audio.h"
 #include "z64camera.h"
 #include "z64cutscene.h"
 #include "z64cutscene_flags.h"

src/code/z_fcurve_data_skelanime.c

@@ -32,7 +32,7 @@
 #include "sys_matrix.h"
 #include "translation.h"
 #include "zelda_arena.h"
-#include "z64actor.h"
+#include "actor.h"
 #include "z64curve.h"
 #include "z64play.h"
 

src/code/z_kaleido_setup.c

@@ -5,7 +5,7 @@
 #endif
 #include "printf.h"
 #include "regs.h"
-#include "z64audio.h"
+#include "audio.h"
 #include "z64play.h"
 #include "z64save.h"
 

src/code/z_kankyo.c

@@ -24,7 +24,7 @@
 #include "translation.h"
 #include "versions.h"
 #include "z_lib.h"
-#include "z64audio.h"
+#include "audio.h"
 #include "z64cutscene.h"
 #include "z64frame_advance.h"
 #include "z64environment.h"

src/code/z_message.c

@@ -18,7 +18,7 @@
 #include "terminal.h"
 #include "translation.h"
 #include "versions.h"
-#include "z64audio.h"
+#include "audio.h"
 #include "z64ocarina.h"
 #include "z64play.h"
 #include "z64player.h"

src/code/z_parameter.c

@@ -17,7 +17,7 @@
 #include "terminal.h"
 #include "translation.h"
 #include "versions.h"
-#include "z64audio.h"
+#include "audio.h"
 #include "z64lifemeter.h"
 #include "z64horse.h"
 #include "z64ocarina.h"

src/code/z_path.c

@@ -1,7 +1,7 @@
 #include "ultra64.h"
 #include "libc64/math64.h"
 #include "segmented_address.h"
-#include "z64actor.h"
+#include "actor.h"
 #include "z64path.h"
 #include "z64play.h"
 

src/code/z_play.c

@@ -36,7 +36,7 @@
 #include "versions.h"
 #include "z_actor_dlftbls.h"
 #include "zelda_arena.h"
-#include "z64audio.h"
+#include "audio.h"
 #include "z64cutscene_flags.h"
 #include "z64debug_display.h"
 #include "z64effect.h"

src/code/z_player_call.c

@@ -1,6 +1,6 @@
 #include "kaleido_manager.h"
-#include "z64actor.h"
-#include "z64actor_profile.h"
+#include "actor.h"
+#include "actor_profile.h"
 #include "z64play.h"
 #include "z64player.h"
 

src/code/z_room.c

@@ -19,7 +19,7 @@
 #include "terminal.h"
 #include "translation.h"
 #include "versions.h"
-#include "z64audio.h"
+#include "audio.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64room.h"

src/code/z_skelanime.c

@@ -10,8 +10,8 @@
 #include "translation.h"
 #include "z_lib.h"
 #include "zelda_arena.h"
-#include "z64animation.h"
-#include "z64animation_legacy.h"
+#include "animation.h"
+#include "animation_legacy.h"
 #include "z64play.h"
 
 #define ANIM_INTERP 1

src/code/z_skin_awb.c

@@ -1,7 +1,7 @@
 #include "array_count.h"
 #include "segmented_address.h"
 #include "zelda_arena.h"
-#include "z64actor.h"
+#include "actor.h"
 #include "z64play.h"
 #include "z64skin.h"
 #include "z64skin_matrix.h"

src/code/z_sram.c

@@ -8,7 +8,7 @@
 #include "terminal.h"
 #include "translation.h"
 #include "versions.h"
-#include "z64audio.h"
+#include "audio.h"
 #include "z64game.h"
 #include "z64interface.h"
 #include "z64message.h"

src/n64dd/z_n64dd.c

@@ -13,7 +13,7 @@
 #include "stackcheck.h"
 #include "sys_freeze.h"
 #include "versions.h"
-#include "z64audio.h"
+#include "audio.h"
 #include "z64thread.h"
 
 #pragma increment_block_number "ntsc-1.0:0 ntsc-1.1:0 ntsc-1.2:0 pal-1.0:0 pal-1.1:0"

src/overlays/actors/ovl_Arms_Hook/z_arms_hook.h

@@ -2,7 +2,7 @@
 #define Z_ARMS_HOOK_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 #include "z64player.h"
 
 struct ArmsHook;

src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.h

@@ -2,7 +2,7 @@
 #define Z_ARROW_FIRE_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct ArrowFire;
 

src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.h

@@ -2,7 +2,7 @@
 #define Z_ARROW_ICE_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct ArrowIce;
 

src/overlays/actors/ovl_Arrow_Light/z_arrow_light.h

@@ -2,7 +2,7 @@
 #define Z_ARROW_LIGHT_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct ArrowLight;
 

src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c

@@ -15,7 +15,7 @@
 #include "sys_matrix.h"
 #include "translation.h"
 #include "z_lib.h"
-#include "z64audio.h"
+#include "audio.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"

src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.h

@@ -2,7 +2,7 @@
 #define Z_BG_BDAN_OBJECTS_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgBdanObjects;
 

src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.h

@@ -2,7 +2,7 @@
 #define Z_BG_BDAN_SWITCH_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 typedef enum BgBdanSwitchType {
     /* 0x00 */ BLUE,

src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.h

@@ -2,7 +2,7 @@
 #define Z_BG_BOM_GUARD_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgBomGuard;
 

src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.h

@@ -2,7 +2,7 @@
 #define Z_BG_BOMBWALL_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgBombwall;
 

src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.h

@@ -2,7 +2,7 @@
 #define Z_BG_BOWL_WALL_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 #include "overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.h"
 
 struct BgBowlWall;

src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h

@@ -2,7 +2,7 @@
 #define Z_BG_BREAKWALL_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgBreakwall;
 

src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.h

@@ -2,7 +2,7 @@
 #define Z_BG_DDAN_JD_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgDdanJd;
 

src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.h

@@ -2,7 +2,7 @@
 #define Z_BG_DDAN_KD_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgDdanKd;
 

src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.h

@@ -2,7 +2,7 @@
 #define Z_BG_DODOAGO_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 typedef enum BgDodoagoEye {
     /* 0 */ BGDODOAGO_EYE_LEFT,

src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h

@@ -2,7 +2,7 @@
 #define Z_BG_DY_YOSEIZO_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 #include "overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.h"
 #include "overlays/actors/ovl_En_Ex_Item/z_en_ex_item.h"
 

src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.h

@@ -2,7 +2,7 @@
 #define Z_BG_GANON_OTYUKA_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 #define OTYUKA_SIDE_EAST (1 << 0)
 #define OTYUKA_SIDE_WEST (1 << 1)

src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.h

@@ -2,7 +2,7 @@
 #define Z_BG_GATE_SHUTTER_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgGateShutter;
 

src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.h

@@ -2,7 +2,7 @@
 #define Z_BG_GJYO_BRIDGE_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgGjyoBridge;
 

src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.h

@@ -2,7 +2,7 @@
 #define Z_BG_GND_DARKMEIRO_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgGndDarkmeiro;
 

src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.h

@@ -2,7 +2,7 @@
 #define Z_BG_GND_FIREMEIRO_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgGndFiremeiro;
 

src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.h

@@ -2,7 +2,7 @@
 #define Z_BG_GND_ICEBLOCK_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgGndIceblock;
 

src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.h

@@ -2,7 +2,7 @@
 #define Z_BG_GND_NISEKABE_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgGndNisekabe;
 

src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.h

@@ -2,7 +2,7 @@
 #define Z_BG_GND_SOULMEIRO_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgGndSoulmeiro;
 

src/overlays/actors/ovl_Bg_Haka/z_bg_haka.h

@@ -2,7 +2,7 @@
 #define Z_BG_HAKA_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgHaka;
 

src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.h

@@ -2,7 +2,7 @@
 #define Z_BG_HAKA_GATE_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgHakaGate;
 

src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.h

@@ -2,7 +2,7 @@
 #define Z_BG_HAKA_HUTA_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgHakaHuta;
 

src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.h

@@ -2,7 +2,7 @@
 #define Z_BG_HAKA_MEGANE_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgHakaMegane;
 

src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.h

@@ -2,7 +2,7 @@
 #define Z_BG_HAKA_MEGANEBG_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgHakaMeganeBG;
 

src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.h

@@ -2,7 +2,7 @@
 #define Z_BG_HAKA_SGAMI_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgHakaSgami;
 

src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.h

@@ -2,7 +2,7 @@
 #define Z_BG_HAKA_SHIP_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgHakaShip;
 

src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.h

@@ -2,7 +2,7 @@
 #define Z_BG_HAKA_TRAP_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 typedef enum HakaTrapType {
     /* 0x00 */ HAKA_TRAP_GUILLOTINE_SLOW,

src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.h

@@ -2,7 +2,7 @@
 #define Z_BG_HAKA_TUBO_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgHakaTubo;
 

src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.h

@@ -2,7 +2,7 @@
 #define Z_BG_HAKA_WATER_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgHakaWater;
 

src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.h

@@ -2,7 +2,7 @@
 #define Z_BG_HAKA_ZOU_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgHakaZou;
 

src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.h

@@ -2,7 +2,7 @@
 #define Z_BG_HEAVY_BLOCK_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgHeavyBlock;
 

src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.h

@@ -2,7 +2,7 @@
 #define Z_BG_HIDAN_CURTAIN_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgHidanCurtain;
 

src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.h

@@ -2,7 +2,7 @@
 #define Z_BG_HIDAN_DALM_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgHidanDalm;
 

src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.h

@@ -2,7 +2,7 @@
 #define Z_BG_HIDAN_FIREWALL_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgHidanFirewall;
 

src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.h

@@ -2,7 +2,7 @@
 #define Z_BG_HIDAN_FSLIFT_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgHidanFslift;
 

src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.h

@@ -2,7 +2,7 @@
 #define Z_BG_HIDAN_FWBIG_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgHidanFwbig;
 

src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.h

@@ -2,7 +2,7 @@
 #define Z_BG_HIDAN_HAMSTEP_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgHidanHamstep;
 

src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.h

@@ -2,7 +2,7 @@
 #define Z_BG_HIDAN_HROCK_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgHidanHrock;
 

src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.h

@@ -2,7 +2,7 @@
 #define Z_BG_HIDAN_KOUSI_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgHidanKousi;
 

src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.h

@@ -2,7 +2,7 @@
 #define Z_BG_HIDAN_KOWARERUKABE_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgHidanKowarerukabe;
 

src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.h

@@ -2,7 +2,7 @@
 #define Z_BG_HIDAN_ROCK_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgHidanRock;
 

src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.h

@@ -2,7 +2,7 @@
 #define Z_BG_HIDAN_RSEKIZOU_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgHidanRsekizou;
 

src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.h

@@ -2,7 +2,7 @@
 #define Z_BG_HIDAN_SEKIZOU_H
 
 #include "ultra64.h"
-#include "z64actor.h"
+#include "actor.h"
 
 struct BgHidanSekizou;