From 71e918a01e8bd7f873a9484d0b547566bdfc4c92 Mon Sep 17 00:00:00 2001
From: jaburns <j@jaburns.net>
Date: Tue, 27 Oct 2020 11:47:49 -0600
Subject: [PATCH] Move matrix utils in to decomp dir

---
 src/{ => decomp/engine}/guMtxF2L.c | 0
 src/decomp/engine/guMtxF2L.h       | 9 +++++++++
 src/decomp/engine/math_util.c      | 2 +-
 src/gfx_adapter.c                  | 2 +-
 src/guMtxF2L.h                     | 6 ------
 src/libsm64.h                      | 6 +++---
 6 files changed, 14 insertions(+), 11 deletions(-)
 rename src/{ => decomp/engine}/guMtxF2L.c (100%)
 create mode 100644 src/decomp/engine/guMtxF2L.h
 delete mode 100644 src/guMtxF2L.h

diff --git a/src/guMtxF2L.c b/src/decomp/engine/guMtxF2L.c
similarity index 100%
rename from src/guMtxF2L.c
rename to src/decomp/engine/guMtxF2L.c
diff --git a/src/decomp/engine/guMtxF2L.h b/src/decomp/engine/guMtxF2L.h
new file mode 100644
index 0000000..ccfa212
--- /dev/null
+++ b/src/decomp/engine/guMtxF2L.h
@@ -0,0 +1,9 @@
+#ifndef GUMTXF2L_H
+#define GUMTXF2L_H
+
+#include "../include/PR/gbi.h"
+
+extern void guMtxF2L(float mf[4][4], Mtx *m);
+extern void guMtxL2F(float mf[4][4], Mtx *m);
+
+#endif//GUMTXF2L_H
\ No newline at end of file
diff --git a/src/decomp/engine/math_util.c b/src/decomp/engine/math_util.c
index 05dc3f7..eaa7eaf 100644
--- a/src/decomp/engine/math_util.c
+++ b/src/decomp/engine/math_util.c
@@ -3,7 +3,7 @@
 #include <math.h>
 #include "../shim.h"
 
-#include "../../guMtxF2L.h"
+#include "guMtxF2L.h"
 #include "../include/sm64.h"
 #include "graph_node.h"
 #include "surface_collision.h"
diff --git a/src/gfx_adapter.c b/src/gfx_adapter.c
index c28c65b..54d562a 100644
--- a/src/gfx_adapter.c
+++ b/src/gfx_adapter.c
@@ -3,7 +3,7 @@
 
 #include "libsm64.h"
 #include "decomp/engine/math_util.h"
-#include "guMtxF2L.h"
+#include "decomp/engine/guMtxF2L.h"
 #include "gfx_adapter.h"
 #include "gfx_adapter_commands.h"
 #include "load_tex_data.h"
diff --git a/src/guMtxF2L.h b/src/guMtxF2L.h
deleted file mode 100644
index 107f505..0000000
--- a/src/guMtxF2L.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma once
-
-#include "decomp/include/PR/gbi.h"
-
-extern void guMtxF2L(float mf[4][4], Mtx *m);
-extern void guMtxL2F(float mf[4][4], Mtx *m);
\ No newline at end of file
diff --git a/src/libsm64.h b/src/libsm64.h
index 026410c..54d3039 100644
--- a/src/libsm64.h
+++ b/src/libsm64.h
@@ -1,5 +1,5 @@
-#ifndef __LIB_SM64_H
-#define __LIB_SM64_H
+#ifndef LIB_SM64_H
+#define LIB_SM64_H
 
 #include <stddef.h>
 #include <stdint.h>
@@ -98,4 +98,4 @@ extern void sm64_delete_mario( uint32_t marioId );
 
 */
 
-#endif//__LIB_SM64_H
+#endif//LIB_SM64_H