From d40f64ac0638b62796bf5a6d3b8d4402ace3138f Mon Sep 17 00:00:00 2001
From: Max <mparisi@stevens.edu>
Date: Wed, 11 Nov 2020 23:29:59 -0500
Subject: remove GScamera_asm.s

---
 asm/GScamera_asm.s      |  3 ---
 asm/code_801DDF78_asm.s |  3 ---
 obj_files.mk            |  1 -
 src/GScamera.cpp        | 11 +++++------
 4 files changed, 5 insertions(+), 13 deletions(-)
 delete mode 100644 asm/GScamera_asm.s
 delete mode 100644 asm/code_801DDF78_asm.s

diff --git a/asm/GScamera_asm.s b/asm/GScamera_asm.s
deleted file mode 100644
index 4ea72fe..0000000
--- a/asm/GScamera_asm.s
+++ /dev/null
@@ -1,3 +0,0 @@
-.include "macros.inc"
-
-.section .text, "ax"  # 0x80006980 - 0x803E1E60
diff --git a/asm/code_801DDF78_asm.s b/asm/code_801DDF78_asm.s
deleted file mode 100644
index 4ea72fe..0000000
--- a/asm/code_801DDF78_asm.s
+++ /dev/null
@@ -1,3 +0,0 @@
-.include "macros.inc"
-
-.section .text, "ax"  # 0x80006980 - 0x803E1E60
diff --git a/obj_files.mk b/obj_files.mk
index 87b465e..bffb85d 100644
--- a/obj_files.mk
+++ b/obj_files.mk
@@ -230,7 +230,6 @@ SPLIT_O_FILES := 						                          \
 	$(BUILD_DIR)/src/code_801DD5C8.o                                   \
 	$(BUILD_DIR)/src/code_801DD8C0.o                                   \
 	$(BUILD_DIR)/src/GScamera.o                                   \
-	$(BUILD_DIR)/asm/GScamera_asm.o                               \
 	$(BUILD_DIR)/asm/code_801DF040.o                                   \
 	$(BUILD_DIR)/asm/code_801E07E8.o                                   \
 	$(BUILD_DIR)/asm/code_801E0810.o                                   \
diff --git a/src/GScamera.cpp b/src/GScamera.cpp
index 6de1146..b28b1cc 100644
--- a/src/GScamera.cpp
+++ b/src/GScamera.cpp
@@ -130,8 +130,6 @@ public:
 // 801DDF78
 GScamera::GScamera() : GSnull(4)
 {
-    //float f0 = -1.0f;
-    //float f1 = 0.0f;
     float f2;
     float f3;
     float f4;
@@ -196,15 +194,16 @@ GScamera::GScamera(void* p1, gUnkClass10* p2) : GSnull(p1, p2)
     float f2;
     float f3;
     float f4;
-    float f5 = 1.0f;
+    float f5;
     float f6;
     float f7;
     
-    f6 = 1.28f;
-    f2 = 10.0f;
     f7 = 60.0f;
+    f6 = 1.28f;
+    f5 = 1.0f;
     f4 = 0.1f;
     f3 = 100000.0f;
+    f2 = 10.0f;
     
     unk16C = f6;
     unk17C.z = f2;
@@ -569,7 +568,7 @@ static inline float InlineFunc1(const Mtx m, u32 col)
     return static_cast<float>(sqrt(f1));
 }
 
-#ifdef NONMATCHING_801DEA3C
+#ifdef NONMATCHING
 void func_801DEA3C(Mtx p1, GScamera* p2, Mtx p3, BOOL p4)
 {
     Mtx sp70;
-- 
cgit v1.2.3