z64 - m

2025-08-30 18:55:54 +00:00 · 2025-04-28 10:40:35 -04:00 · 2025-04-28 10:40:35 -04:00 · 450aff8542
commit 450aff8542
parent 6d9889d4a9
93 changed files with 98 additions and 96 deletions
--- 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
--- 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;
--- 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;
--- 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;

--- 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;
--- 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;
--- 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
--- 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;
--- 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;

--- 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;

--- 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;

--- 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;
--- 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;
--- 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"

--- 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"
--- 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;
--- 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;
--- a/include/z64map_mark.h
+++ b/include/z64map_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"

--- a/include/z64message.h
+++ b/include/z64message.h
@ -1,5 +1,5 @@
-#ifndef Z64MESSAGE_H
-#define Z64MESSAGE_H
+#ifndef MESSAGE_H
+#define MESSAGE_H

 #include "z64view.h"
 #include "versions.h"
--- 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;
--- 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;
--- 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
--- 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;

--- 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;
--- 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);
--- 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;
--- 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;
--- 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"
--- 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;
--- 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,
--- 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"
--- 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;

--- 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;

--- 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;
--- 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;

--- 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);
--- a/include/z64math.h
+++ b/include/z64math.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"