From 450aff85425786a3792f30ab278c60c84b5b2a74 Mon Sep 17 00:00:00 2001 From: fig02 Date: Mon, 28 Apr 2025 10:40:35 -0400 Subject: [PATCH] z64 - m --- include/actor.h | 2 +- include/animation.h | 2 +- include/animation_legacy.h | 2 +- include/audio.h | 2 +- include/bgcheck.h | 2 +- include/camera.h | 2 +- include/collision_check.h | 2 +- include/curve.h | 2 +- include/cutscene.h | 2 +- include/cutscene_spline.h | 2 +- include/db_camera.h | 2 +- include/debug_display.h | 2 +- include/effect.h | 2 +- include/environment.h | 2 +- include/file_select_state.h | 2 +- include/horse.h | 2 +- include/light.h | 2 +- include/{z64map_mark.h => map_mark.h} | 4 ++-- include/{z64message.h => message.h} | 4 ++-- include/n64dd.h | 2 +- include/quake.h | 2 +- include/sfx.h | 2 +- include/sys_math3d.h | 2 +- include/sys_matrix.h | 2 +- include/z64olib.h | 2 +- include/z64path.h | 2 +- include/z64pause.h | 2 +- include/z64play.h | 2 +- include/z64room.h | 2 +- include/z64save.h | 2 +- include/z64scene.h | 2 +- include/z64sfx_source.h | 2 +- include/z64skin_matrix.h | 2 +- include/z64skybox.h | 2 +- include/z64view.h | 2 +- include/z_lib.h | 2 +- include/{z64math.h => z_math.h} | 6 ++++-- src/code/sys_math3d.c | 2 +- src/code/sys_math_atan.c | 2 +- src/code/z_cutscene_spline.c | 2 +- src/code/z_fbdemo.c | 2 +- src/code/z_kanfont.c | 2 +- src/code/z_map_exp.c | 2 +- src/code/z_map_mark.c | 2 +- src/code/z_olib.c | 2 +- src/code/z_rumble.c | 2 +- src/code/z_skin.c | 2 +- src/code/z_sram.c | 2 +- src/libc64/math64.c | 2 +- src/libc64/qrand.c | 2 +- src/libultra/gu/cosf.c | 2 +- src/libultra/gu/lookat.c | 2 +- src/libultra/gu/normalize.c | 2 +- src/libultra/gu/sinf.c | 2 +- src/overlays/actors/ovl_En_Mag/z_en_mag.h | 2 +- src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.h | 2 +- src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.h | 2 +- src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.h | 2 +- src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.h | 2 +- src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.h | 2 +- .../effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.h | 2 +- .../effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.h | 2 +- .../effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.h | 2 +- .../effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h | 2 +- .../effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.h | 2 +- src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.h | 2 +- .../effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.h | 2 +- src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.h | 2 +- src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.h | 2 +- .../effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.h | 2 +- .../effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h | 2 +- .../effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.h | 2 +- src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.h | 2 +- .../effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.h | 2 +- .../effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.h | 2 +- .../effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.h | 2 +- src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.h | 2 +- .../effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.h | 2 +- src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h | 2 +- .../effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h | 2 +- .../effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.h | 2 +- .../effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.h | 2 +- src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.h | 2 +- src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h | 2 +- .../effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.h | 2 +- .../effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.h | 2 +- src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.h | 2 +- .../effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.h | 2 +- .../z_eff_ss_solder_srch_ball.h | 2 +- src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.h | 2 +- src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.h | 2 +- src/overlays/misc/ovl_map_mark_data/z_map_mark_data.c | 2 +- src/overlays/misc/ovl_map_mark_data/z_map_mark_data_mq.c | 2 +- 93 files changed, 98 insertions(+), 96 deletions(-) rename include/{z64map_mark.h => map_mark.h} (95%) rename include/{z64message.h => message.h} (99%) rename include/{z64math.h => z_math.h} (97%) diff --git a/include/actor.h b/include/actor.h index cdca9814d9..944e1b622b 100644 --- a/include/actor.h +++ b/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 diff --git a/include/animation.h b/include/animation.h index 9e162ea9c5..fdf14843b9 100644 --- a/include/animation.h +++ b/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; diff --git a/include/animation_legacy.h b/include/animation_legacy.h index 4e59adbee3..5b5c0399ff 100644 --- a/include/animation_legacy.h +++ b/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; diff --git a/include/audio.h b/include/audio.h index 81aa95a3ee..2dbf107501 100644 --- a/include/audio.h +++ b/include/audio.h @@ -3,7 +3,7 @@ #include "ultra64.h" #include "sequence.h" -#include "z64math.h" +#include "z_math.h" struct GfxPrint; diff --git a/include/bgcheck.h b/include/bgcheck.h index 61431e6d59..8ccd34522f 100644 --- a/include/bgcheck.h +++ b/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; diff --git a/include/camera.h b/include/camera.h index 3a581406e6..9d4783de06 100644 --- a/include/camera.h +++ b/include/camera.h @@ -3,7 +3,7 @@ #include "ultra64.h" #include "cutscene.h" -#include "z64math.h" +#include "z_math.h" struct CollisionContext; struct View; diff --git a/include/collision_check.h b/include/collision_check.h index 54dc8c9479..e437e3633b 100644 --- a/include/collision_check.h +++ b/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 diff --git a/include/curve.h b/include/curve.h index 2ae1ff5c32..d94e6207ef 100644 --- a/include/curve.h +++ b/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; diff --git a/include/cutscene.h b/include/cutscene.h index ee8eadd9ac..e3bf4a1c84 100644 --- a/include/cutscene.h +++ b/include/cutscene.h @@ -2,7 +2,7 @@ #define CUTSCENE_H #include "ultra64.h" -#include "z64math.h" +#include "z_math.h" struct PlayState; diff --git a/include/cutscene_spline.h b/include/cutscene_spline.h index e08890a628..00a815a614 100644 --- a/include/cutscene_spline.h +++ b/include/cutscene_spline.h @@ -2,7 +2,7 @@ #define CUTSCENE_SPLINE_H #include "ultra64.h" -#include "z64math.h" +#include "z_math.h" union CutsceneCameraPoint; diff --git a/include/db_camera.h b/include/db_camera.h index bed8beec41..fd11f56fdb 100644 --- a/include/db_camera.h +++ b/include/db_camera.h @@ -3,7 +3,7 @@ #include "ultra64.h" #include "cutscene.h" -#include "z64math.h" +#include "z_math.h" struct Camera; diff --git a/include/debug_display.h b/include/debug_display.h index 8853238807..0623224fef 100644 --- a/include/debug_display.h +++ b/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; diff --git a/include/effect.h b/include/effect.h index fe84685db3..060b6cd090 100644 --- a/include/effect.h +++ b/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; diff --git a/include/environment.h b/include/environment.h index 0d361da42f..6c23dfb336 100644 --- a/include/environment.h +++ b/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" diff --git a/include/file_select_state.h b/include/file_select_state.h index 7054bed82a..ad9ada66ab 100644 --- a/include/file_select_state.h +++ b/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" diff --git a/include/horse.h b/include/horse.h index 0df858fbeb..e3e5502a81 100644 --- a/include/horse.h +++ b/include/horse.h @@ -2,7 +2,7 @@ #define HORSE_H #include "ultra64.h" -#include "z64math.h" +#include "z_math.h" struct PlayState; struct Actor; diff --git a/include/light.h b/include/light.h index 78848f83c2..a17ba7da86 100644 --- a/include/light.h +++ b/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; diff --git a/include/z64map_mark.h b/include/map_mark.h similarity index 95% rename from include/z64map_mark.h rename to include/map_mark.h index b566491118..2f22ee0f5b 100644 --- a/include/z64map_mark.h +++ b/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" diff --git a/include/z64message.h b/include/message.h similarity index 99% rename from include/z64message.h rename to include/message.h index 912e4e9a24..8cad48e2bd 100644 --- a/include/z64message.h +++ b/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" diff --git a/include/n64dd.h b/include/n64dd.h index 6a353c3172..acbe6ef38b 100644 --- a/include/n64dd.h +++ b/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; diff --git a/include/quake.h b/include/quake.h index 36f1d53075..c6259c7675 100644 --- a/include/quake.h +++ b/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; diff --git a/include/sfx.h b/include/sfx.h index 4dfb96f9b4..8e9e6f76a2 100644 --- a/include/sfx.h +++ b/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 diff --git a/include/sys_math3d.h b/include/sys_math3d.h index deeb093f4e..11f699c17f 100644 --- a/include/sys_math3d.h +++ b/include/sys_math3d.h @@ -2,7 +2,7 @@ #define SYS_MATH3D_H #include "ultra64.h" -#include "z64math.h" +#include "z_math.h" struct PlayState; diff --git a/include/sys_matrix.h b/include/sys_matrix.h index 2708af81ee..3af75a18de 100644 --- a/include/sys_matrix.h +++ b/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; diff --git a/include/z64olib.h b/include/z64olib.h index 1b704b0e69..bb9d2084f6 100644 --- a/include/z64olib.h +++ b/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); diff --git a/include/z64path.h b/include/z64path.h index 0f9243974a..5242317b8d 100644 --- a/include/z64path.h +++ 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; diff --git a/include/z64pause.h b/include/z64pause.h index 4b9cb53380..fa6033aac4 100644 --- a/include/z64pause.h +++ b/include/z64pause.h @@ -2,7 +2,7 @@ #define Z64PAUSE_H #include "animation.h" -#include "z64message.h" +#include "message.h" #include "z64view.h" struct OcarinaStaff; diff --git a/include/z64play.h b/include/z64play.h index 3d372c9ff6..8ef43a509e 100644 --- a/include/z64play.h +++ b/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" diff --git a/include/z64room.h b/include/z64room.h index 63cfb837fd..f026c17c73 100644 --- a/include/z64room.h +++ b/include/z64room.h @@ -3,7 +3,7 @@ #include "ultra64.h" #include "dma.h" -#include "z64math.h" +#include "z_math.h" struct Input; struct PlayState; diff --git a/include/z64save.h b/include/z64save.h index 9150787db6..19478ba549 100644 --- a/include/z64save.h +++ b/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, diff --git a/include/z64scene.h b/include/z64scene.h index de3d0eb494..cc70251ec3 100644 --- a/include/z64scene.h +++ b/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" diff --git a/include/z64sfx_source.h b/include/z64sfx_source.h index 0034bc90aa..be949d4cf4 100644 --- a/include/z64sfx_source.h +++ b/include/z64sfx_source.h @@ -2,7 +2,7 @@ #define Z64SFX_SOURCE_H #include "ultra64.h" -#include "z64math.h" +#include "z_math.h" struct PlayState; diff --git a/include/z64skin_matrix.h b/include/z64skin_matrix.h index 647790abff..e2c81398a6 100644 --- a/include/z64skin_matrix.h +++ b/include/z64skin_matrix.h @@ -2,7 +2,7 @@ #define Z64SKIN_MATRIX_H #include "ultra64.h" -#include "z64math.h" +#include "z_math.h" struct GraphicsContext; diff --git a/include/z64skybox.h b/include/z64skybox.h index fae5587614..266e18572e 100644 --- a/include/z64skybox.h +++ b/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; diff --git a/include/z64view.h b/include/z64view.h index 83bdf0fe84..f31c39f650 100644 --- a/include/z64view.h +++ b/include/z64view.h @@ -3,7 +3,7 @@ #include "avoid_ub.h" #include "ultra64.h" -#include "z64math.h" +#include "z_math.h" struct GraphicsContext; diff --git a/include/z_lib.h b/include/z_lib.h index 1e9052f93b..fd0b9084a2 100644 --- a/include/z_lib.h +++ b/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); diff --git a/include/z64math.h b/include/z_math.h similarity index 97% rename from include/z64math.h rename to include/z_math.h index 187d95b250..ebe364d886 100644 --- a/include/z64math.h +++ b/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" diff --git a/src/code/sys_math3d.c b/src/code/sys_math3d.c index 1ce651e9c9..1e8d8448d4 100644 --- a/src/code/sys_math3d.c +++ b/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" diff --git a/src/code/sys_math_atan.c b/src/code/sys_math_atan.c index 0c99eaced4..2e344d3910 100644 --- a/src/code/sys_math_atan.c +++ b/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, diff --git a/src/code/z_cutscene_spline.c b/src/code/z_cutscene_spline.c index fa261a0702..6ff03fdf91 100644 --- a/src/code/z_cutscene_spline.c +++ b/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" diff --git a/src/code/z_fbdemo.c b/src/code/z_fbdemo.c index 2621f1c129..08c800feab 100644 --- a/src/code/z_fbdemo.c +++ b/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 diff --git a/src/code/z_kanfont.c b/src/code/z_kanfont.c index 5eca249332..280bfa3df8 100644 --- a/src/code/z_kanfont.c +++ b/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 diff --git a/src/code/z_map_exp.c b/src/code/z_map_exp.c index e46c70bd10..c22a8bda65 100644 --- a/src/code/z_map_exp.c +++ b/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" diff --git a/src/code/z_map_mark.c b/src/code/z_map_mark.c index 402d942d66..1faf8f8748 100644 --- a/src/code/z_map_mark.c +++ b/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" diff --git a/src/code/z_olib.c b/src/code/z_olib.c index 66c767f68b..c4dc3b5393 100644 --- a/src/code/z_olib.c +++ b/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" diff --git a/src/code/z_rumble.c b/src/code/z_rumble.c index fc811cfccb..fcc39adee8 100644 --- a/src/code/z_rumble.c +++ b/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; diff --git a/src/code/z_skin.c b/src/code/z_skin.c index 7861acb897..7c3a5167ce 100644 --- a/src/code/z_skin.c +++ b/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" diff --git a/src/code/z_sram.c b/src/code/z_sram.c index 98988a6c76..af2f5e9b2c 100644 --- a/src/code/z_sram.c +++ b/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" diff --git a/src/libc64/math64.c b/src/libc64/math64.c index b51eb333ed..964dc3c8a4 100644 --- a/src/libc64/math64.c +++ b/src/libc64/math64.c @@ -1,5 +1,5 @@ #include "libc64/math64.h" -#include "z64math.h" +#include "z_math.h" #if !PLATFORM_N64 s32 gUseAtanContFrac; diff --git a/src/libc64/qrand.c b/src/libc64/qrand.c index 69bfa11d72..dafddc864f 100644 --- a/src/libc64/qrand.c +++ b/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 diff --git a/src/libultra/gu/cosf.c b/src/libultra/gu/cosf.c index f217eec13a..4d4f13fbe8 100644 --- a/src/libultra/gu/cosf.c +++ b/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 }, diff --git a/src/libultra/gu/lookat.c b/src/libultra/gu/lookat.c index 8d1df6bbe1..c30a259bf1 100644 --- a/src/libultra/gu/lookat.c +++ b/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; diff --git a/src/libultra/gu/normalize.c b/src/libultra/gu/normalize.c index 8b20110c8c..b954069f96 100644 --- a/src/libultra/gu/normalize.c +++ b/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)); diff --git a/src/libultra/gu/sinf.c b/src/libultra/gu/sinf.c index 23013731c4..64f850efbd 100644 --- a/src/libultra/gu/sinf.c +++ b/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 }, diff --git a/src/overlays/actors/ovl_En_Mag/z_en_mag.h b/src/overlays/actors/ovl_En_Mag/z_en_mag.h index 6e845cadde..07733d40ce 100644 --- a/src/overlays/actors/ovl_En_Mag/z_en_mag.h +++ b/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; diff --git a/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.h b/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.h index bfceec5856..22be855946 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.h +++ b/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; diff --git a/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.h b/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.h index 923739819b..6939246900 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.h +++ b/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; diff --git a/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.h b/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.h index 8aea4d3cc5..91dbf726f3 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.h +++ b/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; diff --git a/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.h b/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.h index 7701365bdc..52d7c40e26 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.h +++ b/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; diff --git a/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.h b/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.h index fbaa8aa28c..686d02b183 100644 --- a/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.h +++ b/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; diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.h b/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.h index fb7fc84af1..f4297d8fe4 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.h +++ b/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; diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.h b/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.h index c9c91ec609..0adb102caa 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.h +++ b/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; diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.h b/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.h index 7a7d57363a..a248e76229 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.h +++ b/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; diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h b/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h index 1f8ca9304c..7c9a67b3d2 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_eff_ss_dead_sound.h +++ b/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; diff --git a/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.h b/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.h index 6138c86046..2d51f1ed11 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.h +++ b/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; diff --git a/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.h b/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.h index 958bde91f8..4a4d9ec4bd 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.h +++ b/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; diff --git a/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.h b/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.h index 14acb95e40..e4ec69ea9a 100644 --- a/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.h +++ b/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; diff --git a/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.h b/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.h index 238b005bcc..a9b60960d0 100644 --- a/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.h +++ b/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; diff --git a/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.h b/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.h index 1bf5a5d30c..b4d77a21c1 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.h +++ b/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; diff --git a/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.h b/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.h index fc2a4ec2de..0a16be9333 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.h +++ b/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; diff --git a/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h b/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h index f3c1ea6168..8c57bad37d 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h +++ b/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; diff --git a/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.h b/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.h index ebe8a7203d..01e80d30d0 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.h +++ b/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; diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.h b/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.h index 52312527d9..d1673ab4f7 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.h +++ b/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; diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.h b/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.h index 55215239d2..e2361a3ed2 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.h +++ b/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; diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.h b/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.h index 2ddc9f4ce7..9ab63141a0 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.h +++ b/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; diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.h b/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.h index 86a7d8378e..196e688c88 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.h +++ b/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; diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.h b/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.h index 0d94bd7e0a..d88cdfcf86 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.h +++ b/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; diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.h b/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.h index fa1907f667..507117656e 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.h +++ b/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; diff --git a/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h b/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h index d598cebf5d..a6a5d7acf3 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h +++ b/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; diff --git a/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h b/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h index 591ba5a7d0..cbe297176d 100644 --- a/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h +++ b/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; diff --git a/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.h b/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.h index afb96c213c..6ed2557174 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.h +++ b/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; diff --git a/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.h b/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.h index 24c27f1cf6..649aff9adb 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.h +++ b/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; diff --git a/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.h b/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.h index eb8e8764d7..2afeb50935 100644 --- a/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.h +++ b/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; diff --git a/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h b/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h index 90f3a8cdab..09d38ed7e9 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h +++ b/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; diff --git a/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.h b/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.h index 0c128ff7ab..64612fcbb4 100644 --- a/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.h +++ b/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; diff --git a/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.h b/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.h index 39f5d51841..75af1b7e0c 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.h +++ b/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; diff --git a/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.h b/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.h index e45c2c6f2a..11eb6c9e8b 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.h +++ b/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; diff --git a/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.h b/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.h index 37a9425dc7..a01146d3e0 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.h +++ b/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; diff --git a/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.h b/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.h index b105f063d5..c68ae12bfa 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.h +++ b/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; diff --git a/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.h b/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.h index 4b5ccda965..1748ca5249 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.h +++ b/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; diff --git a/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.h b/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.h index efb8df225d..c84ab06f9c 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.h +++ b/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; diff --git a/src/overlays/misc/ovl_map_mark_data/z_map_mark_data.c b/src/overlays/misc/ovl_map_mark_data/z_map_mark_data.c index 48a18fff9d..bb78417dde 100644 --- a/src/overlays/misc/ovl_map_mark_data/z_map_mark_data.c +++ b/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 diff --git a/src/overlays/misc/ovl_map_mark_data/z_map_mark_data_mq.c b/src/overlays/misc/ovl_map_mark_data/z_map_mark_data_mq.c index ba7517034c..1587228a44 100644 --- a/src/overlays/misc/ovl_map_mark_data/z_map_mark_data_mq.c +++ b/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