z64 - m

include/actor.h

@@ -5,7 +5,7 @@
 #include "romfile.h"
 #include "actor_profile.h"
 #include "animation.h"
-#include "z64math.h"
+#include "z_math.h"
 #include "collision_check.h"
 
 #define ACTOR_NUMBER_MAX 200

include/animation.h

@@ -4,7 +4,7 @@
 #include "avoid_ub.h"
 #include "ultra64.h"
 #include "dma.h"
-#include "z64math.h"
+#include "z_math.h"
 
 struct PlayState;
 struct Actor;

include/animation_legacy.h

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

include/audio.h

@@ -3,7 +3,7 @@
 
 #include "ultra64.h"
 #include "sequence.h"
-#include "z64math.h"
+#include "z_math.h"
 
 struct GfxPrint;
 

include/bgcheck.h

@@ -2,7 +2,7 @@
 #define BGCHECK_H
 
 #include "ultra64/ultratypes.h"
-#include "z64math.h"
+#include "z_math.h"
 
 struct PlayState;
 struct Actor;

include/camera.h

@@ -3,7 +3,7 @@
 
 #include "ultra64.h"
 #include "cutscene.h"
-#include "z64math.h"
+#include "z_math.h"
 
 struct CollisionContext;
 struct View;

include/collision_check.h

@@ -2,7 +2,7 @@
 #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/curve.h

@@ -2,7 +2,7 @@
 #define CURVE_H
 
 #include "ultra64/ultratypes.h"
-#include "z64math.h"
+#include "z_math.h"
 
 struct PlayState;
 struct Actor;

include/cutscene.h

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

include/cutscene_spline.h

@@ -2,7 +2,7 @@
 #define CUTSCENE_SPLINE_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 union CutsceneCameraPoint;
 

include/db_camera.h

@@ -3,7 +3,7 @@
 
 #include "ultra64.h"
 #include "cutscene.h"
-#include "z64math.h"
+#include "z_math.h"
 
 struct Camera;
 

include/debug_display.h

@@ -2,7 +2,7 @@
 #define DEBUG_DISPLAY_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 #include "color.h"
 
 struct GraphicsContext;

include/effect.h

@@ -4,7 +4,7 @@
 #include "color.h"
 #include "romfile.h"
 #include "light.h"
-#include "z64math.h"
+#include "z_math.h"
 
 struct Actor;
 struct GraphicsContext;

include/environment.h

@@ -1,7 +1,7 @@
 #ifndef ENVIRONMENT_H_
 #define ENVIRONMENT_H_
 
-#include "z64math.h"
+#include "z_math.h"
 #include "light.h"
 #include "dma.h"
 

include/file_select_state.h

@@ -4,7 +4,7 @@
 #include "ultra64.h"
 #include "environment.h"
 #include "game.h"
-#include "z64message.h"
+#include "message.h"
 #include "z64skybox.h"
 #include "z64sram.h"
 #include "z64view.h"

include/horse.h

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

include/light.h

@@ -3,7 +3,7 @@
 
 #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/message.h

@@ -1,5 +1,5 @@
-#ifndef Z64MESSAGE_H
-#define Z64MESSAGE_H
+#ifndef MESSAGE_H
+#define MESSAGE_H
 
 #include "z64view.h"
 #include "versions.h"

include/n64dd.h

@@ -5,7 +5,7 @@
 #include "ultra64/leo.h"
 #include "z64pause.h"
 #include "z64scene.h"
-#include "z64map_mark.h"
+#include "map_mark.h"
 #include "versions.h"
 
 struct Font;

include/quake.h

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

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

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

include/z64path.h

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

include/z64pause.h

@@ -2,7 +2,7 @@
 #define Z64PAUSE_H
 
 #include "animation.h"
-#include "z64message.h"
+#include "message.h"
 #include "z64view.h"
 
 struct OcarinaStaff;

include/z64play.h

@@ -15,7 +15,7 @@
 #include "game_over.h"
 #include "interface.h"
 #include "light.h"
-#include "z64message.h"
+#include "message.h"
 #include "z64object.h"
 #include "z64pause.h"
 #include "z64room.h"

include/z64room.h

@@ -3,7 +3,7 @@
 
 #include "ultra64.h"
 #include "dma.h"
-#include "z64math.h"
+#include "z_math.h"
 
 struct Input;
 struct PlayState;

include/z64save.h

@@ -4,7 +4,7 @@
 #include "ultra64.h"
 #include "versions.h"
 #include "inventory.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef enum ZTargetSetting {
     /* 0 */ Z_TARGET_SETTING_SWITCH,

include/z64scene.h

@@ -6,7 +6,7 @@
 #include "bgcheck.h"
 #include "environment.h"
 #include "light.h"
-#include "z64math.h"
+#include "z_math.h"
 #include "z64path.h"
 
 #include "command_macros_base.h"

include/z64sfx_source.h

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

include/z64skin_matrix.h

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

include/z64skybox.h

@@ -4,7 +4,7 @@
 #include "ultra64/ultratypes.h"
 #include "ultra64/gbi.h"
 
-#include "z64math.h"
+#include "z_math.h"
 #include "dma.h" // for RomFile
 
 struct GameState;

include/z64view.h

@@ -3,7 +3,7 @@
 
 #include "avoid_ub.h"
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 struct GraphicsContext;
 

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/code/sys_math3d.c

@@ -5,7 +5,7 @@
 #include "translation.h"
 #include "ultra64.h"
 #include "z_lib.h"
-#include "z64math.h"
+#include "z_math.h"
 
 #pragma increment_block_number "gc-eu:77 gc-eu-mq:77 gc-jp:77 gc-jp-ce:77 gc-jp-mq:77 gc-us:77 gc-us-mq:77 ique-cn:67" \
                                "ntsc-1.0:64 ntsc-1.1:64 ntsc-1.2:64 pal-1.0:64 pal-1.1:64"

src/code/sys_math_atan.c

@@ -1,6 +1,6 @@
 #include "array_count.h"
 #include "sys_math.h"
-#include "z64math.h"
+#include "z_math.h"
 
 static u16 sAtan2Tbl[] = {
     0x0000, 0x000A, 0x0014, 0x001F, 0x0029, 0x0033, 0x003D, 0x0047, 0x0051, 0x005C, 0x0066, 0x0070, 0x007A, 0x0084,

src/code/z_cutscene_spline.c

@@ -1,5 +1,5 @@
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 #include "camera.h"
 #include "cutscene_spline.h"
 

src/code/z_fbdemo.c

@@ -16,7 +16,7 @@
 #include "libu64/debug.h"
 #include "gfx.h"
 #include "printf.h"
-#include "z64math.h"
+#include "z_math.h"
 #include "z64transition_instances.h"
 
 // color framebuffer

src/code/z_kanfont.c

@@ -6,7 +6,7 @@
 #include "versions.h"
 #include "dma.h"
 #include "font.h"
-#include "z64message.h"
+#include "message.h"
 
 /**
  * Loads a texture from kanji for the requested `character` into the character texture buffer

src/code/z_map_exp.c

@@ -12,7 +12,7 @@
 #include "sys_matrix.h"
 #include "terminal.h"
 #include "translation.h"
-#include "z64map_mark.h"
+#include "map_mark.h"
 #include "z64play.h"
 #include "z64player.h"
 #include "z64save.h"

src/code/z_map_mark.c

@@ -10,7 +10,7 @@
 #include "segment_symbols.h"
 #include "terminal.h"
 #include "translation.h"
-#include "z64map_mark.h"
+#include "map_mark.h"
 #include "z64play.h"
 #include "z64save.h"
 

src/code/z_olib.c

@@ -1,4 +1,4 @@
-#include "z64math.h"
+#include "z_math.h"
 #include "libc64/math64.h"
 #include "z64olib.h"
 #include "z_lib.h"

src/code/z_rumble.c

@@ -13,7 +13,7 @@
  */
 #include "rumble.h"
 #include "padmgr.h"
-#include "z64math.h"
+#include "z_math.h"
 
 static s32 sUnused[4];
 RumbleMgr sRumbleMgr;

src/code/z_skin.c

@@ -1,7 +1,7 @@
 #include "gfx.h"
 #include "segmented_address.h"
 #include "sys_matrix.h"
-#include "z64math.h"
+#include "z_math.h"
 #include "z64play.h"
 #include "z64skin.h"
 #include "z64skin_matrix.h"

src/code/z_sram.c

@@ -11,7 +11,7 @@
 #include "audio.h"
 #include "game.h"
 #include "interface.h"
-#include "z64message.h"
+#include "message.h"
 #include "z64ocarina.h"
 #include "z64save.h"
 #include "z64scene.h"

src/libc64/math64.c

@@ -1,5 +1,5 @@
 #include "libc64/math64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 #if !PLATFORM_N64
 s32 gUseAtanContFrac;

src/libc64/qrand.c

@@ -42,7 +42,7 @@
  * @note Original name: qrand.c
  */
 #include "libc64/qrand.h"
-#include "z64math.h"
+#include "z_math.h"
 
 #define RAND_MULTIPLIER 1664525
 #define RAND_INCREMENT 1013904223

src/libultra/gu/cosf.c

@@ -1,5 +1,5 @@
 #include "ultra64.h"
-#include "z64math.h" // TODO: libultra should not have access to game-side headers
+#include "z_math.h" // TODO: libultra should not have access to game-side headers
 
 static const du P[] = {
     { 0x3FF00000, 0x00000000 }, { 0xBFC55554, 0xBC83656D }, { 0x3F8110ED, 0x3804C2A0 },

src/libultra/gu/lookat.c

@@ -1,5 +1,5 @@
 #include "ultra64.h"
-#include "z64math.h" // TODO: libultra should not have access to game-side headers
+#include "z_math.h" // TODO: libultra should not have access to game-side headers
 
 void guLookAtF(f32 mf[4][4], f32 xEye, f32 yEye, f32 zEye, f32 xAt, f32 yAt, f32 zAt, f32 xUp, f32 yUp, f32 zUp) {
     f32 length;

src/libultra/gu/normalize.c

@@ -1,5 +1,5 @@
 #include "ultra64.h"
-#include "z64math.h" // TODO: libultra should not have access to game-side headers
+#include "z_math.h" // TODO: libultra should not have access to game-side headers
 
 void guNormalize(f32* x, f32* y, f32* z) {
     f32 m = 1 / sqrtf(SQ(*x) + SQ(*y) + SQ(*z));

src/libultra/gu/sinf.c

@@ -1,5 +1,5 @@
 #include "ultra64.h"
-#include "z64math.h" // TODO: libultra should not have access to game-side headers
+#include "z_math.h" // TODO: libultra should not have access to game-side headers
 
 static const du P[] = {
     { 0x3FF00000, 0x00000000 }, { 0xBFC55554, 0xBC83656D }, { 0x3F8110ED, 0x3804C2A0 },

src/overlays/actors/ovl_En_Mag/z_en_mag.h

@@ -3,7 +3,7 @@
 
 #include "ultra64.h"
 #include "actor.h"
-#include "z64message.h"
+#include "message.h"
 
 struct EnMag;
 

src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.h

@@ -3,7 +3,7 @@
 
 #include "ultra64.h"
 #include "color.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsBlastParams {
     /* 0x00 */ Vec3f pos;

src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.h

@@ -2,7 +2,7 @@
 #define Z_EFF_SS_BOMB_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsBombInitParams {
     /* 0x00 */ Vec3f pos;

src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.h

@@ -2,7 +2,7 @@
 #define Z_EFF_SS_BOMB2_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsBomb2InitParams {
     /* 0x00 */ Vec3f pos;

src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.h

@@ -2,7 +2,7 @@
 #define Z_EFF_SS_BUBBLE_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsBubbleInitParams {
     /* 0x00 */ Vec3f pos;

src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.h

@@ -2,7 +2,7 @@
 #define Z_EFF_SS_D_FIRE_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsDFireInitParams {
     /* 0x00 */ Vec3f pos;

src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.h

@@ -3,7 +3,7 @@
 
 #include "ultra64.h"
 #include "color.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsDeadDbInitParams {
     /* 0x00 */ Vec3f pos;

src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.h

@@ -3,7 +3,7 @@
 
 #include "ultra64.h"
 #include "color.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsDeadDdInitParams {
     /* 0x00 */ Vec3f pos;

src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.h

@@ -2,7 +2,7 @@
 #define Z_EFF_SS_DEAD_DS_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsDeadDsInitParams {
     /* 0x00 */ Vec3f pos;

src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h

@@ -2,7 +2,7 @@
 #define Z_EFF_SS_DEAD_SOUND_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsDeadSoundInitParams {
     /* 0x00 */ Vec3f pos;

src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.h

@@ -3,7 +3,7 @@
 
 #include "ultra64.h"
 #include "color.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsDtBubbleInitParams {
     /* 0x00 */ Vec3f pos;

src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.h

@@ -3,7 +3,7 @@
 
 #include "ultra64.h"
 #include "color.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsDustInitParams {
     /* 0x00 */ Vec3f pos;

src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.h

@@ -2,7 +2,7 @@
 #define Z_EFF_SS_EN_FIRE_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsEnFireInitParams {
     /* 0x00 */ struct Actor* actor;

src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.h

@@ -3,7 +3,7 @@
 
 #include "ultra64.h"
 #include "color.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsEnIceInitParams {
     /* 0x00 */ struct Actor* actor;

src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.h

@@ -2,7 +2,7 @@
 #define Z_EFF_SS_EXTRA_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsExtraInitParams {
     /* 0x00 */ Vec3f pos;

src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.h

@@ -2,7 +2,7 @@
 #define Z_EFF_SS_FCIRCLE_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsFcircleInitParams {
     /* 0x00 */ struct Actor* actor;

src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h

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

src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.h

@@ -3,7 +3,7 @@
 
 #include "ultra64.h"
 #include "color.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsFireTailInitParams {
     /* 0x00 */ struct Actor* actor;

src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.h

@@ -2,7 +2,7 @@
 #define Z_EFF_SS_G_FIRE_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsGFireInitParams {
     /* 0x00 */ Vec3f pos;

src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.h

@@ -2,7 +2,7 @@
 #define Z_EFF_SS_G_MAGMA_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsGMagmaInitParams {
     /* 0x00 */ Vec3f pos;

src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.h

@@ -3,7 +3,7 @@
 
 #include "ultra64.h"
 #include "color.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsGMagma2InitParams {
     /* 0x00 */ Vec3f pos;

src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.h

@@ -2,7 +2,7 @@
 #define Z_EFF_SS_G_RIPPLE_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsGRippleInitParams {
     /* 0x00 */ Vec3f pos;

src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.h

@@ -3,7 +3,7 @@
 
 #include "ultra64.h"
 #include "color.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsGSpkInitParams {
     /* 0x00 */ struct Actor* actor;

src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.h

@@ -3,7 +3,7 @@
 
 #include "ultra64.h"
 #include "color.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsGSplashInitParams {
     /* 0x00 */ Vec3f pos;

src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h

@@ -2,7 +2,7 @@
 #define Z_EFF_SS_HAHEN_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsHahenInitParams {
     /* 0x00 */ Vec3f pos;

src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h

@@ -2,7 +2,7 @@
 #define Z_EFF_SS_HITMARK_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsHitMarkInitParams {
     /* 0x00 */ s32 type;

src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.h

@@ -2,7 +2,7 @@
 #define Z_EFF_SS_ICE_PIECE_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsIcePieceInitParams {
     /* 0x00 */ Vec3f pos;

src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.h

@@ -2,7 +2,7 @@
 #define Z_EFF_SS_ICE_SMOKE_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsIceSmokeInitParams {
     /* 0x00 */ Vec3f pos;

src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.h

@@ -2,7 +2,7 @@
 #define Z_EFF_SS_K_FIRE_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsKFireInitParams {
     /* 0x00 */ Vec3f pos;

src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h

@@ -2,7 +2,7 @@
 #define Z_EFF_SS_KAKERA_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsKakeraInitParams {
     /* 0x00 */ Vec3f pos;

src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.h

@@ -3,7 +3,7 @@
 
 #include "ultra64.h"
 #include "color.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsKiraKiraInitParams {
     /* 0x00 */ Vec3f pos;

src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.h

@@ -3,7 +3,7 @@
 
 #include "ultra64.h"
 #include "color.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsLightningInitParams {
     /* 0x00 */ Vec3f pos;

src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.h

@@ -2,7 +2,7 @@
 #define Z_EFF_SS_SIBUKI_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsSibukiInitParams {
     /* 0x00 */ Vec3f pos;

src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.h

@@ -2,7 +2,7 @@
 #define Z_EFF_SS_SIBUKI2_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsSibuki2InitParams {
     /* 0x00 */ Vec3f pos;

src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.h

@@ -2,7 +2,7 @@
 #define Z_EFF_SS_SOLDERSRCHBALL_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsSolderSrchBallInitParams {
     /* 0x00 */ Vec3f pos;

src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.h

@@ -2,7 +2,7 @@
 #define Z_EFF_SS_STICK_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsStickInitParams {
     /* 0x00 */ Vec3f pos;

src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.h

@@ -2,7 +2,7 @@
 #define Z_EFF_SS_STONE1_H
 
 #include "ultra64.h"
-#include "z64math.h"
+#include "z_math.h"
 
 typedef struct EffectSsStone1InitParams {
     /* 0x00 */ Vec3f pos;

src/overlays/misc/ovl_map_mark_data/z_map_mark_data.c

@@ -1,4 +1,4 @@
-#include "z64map_mark.h"
+#include "map_mark.h"
 
 static MapMarkData sMapMarkDekuTree[] = {
     // Deku Tree minimap 0

src/overlays/misc/ovl_map_mark_data/z_map_mark_data_mq.c

@@ -1,4 +1,4 @@
-#include "z64map_mark.h"
+#include "map_mark.h"
 
 static MapMarkData sMapMarkDekuTree[] = {
     // Deku Tree minimap 0