diff --git a/src/42C30.c b/src/42C30.c
deleted file mode 100644
index 147701d..0000000
--- a/src/42C30.c
+++ /dev/null
@@ -1,33 +0,0 @@
-#include "common.h"
-
-u8 D_80187020;
-u8 __compared_osTvType;
-
-/* 42C30 8016CD30 */
-u8 __get_compared_osTvType(void) {
-    return D_80187020;
-}
-
-/* 42C3C 8016CD3C */
-u8 __reset_compared_osTvType(void) {
-    u8 temp_v0;
-
-    temp_v0 = __compared_osTvType;
-    __compared_osTvType = 0;
-    return temp_v0;
-}
-
-/* 42C50 8016CD50 */
-void func_8016CD50(u8 arg0) {
-    D_80187020 = arg0;
-}
-
-/* 42C5C 8016CD5C */
-void __inc_compared_osTvType(u8 arg0) {
-    if (D_80187020 != arg0) {
-        __compared_osTvType = arg0 + 1;
-    }
-    D_80187020 = arg0;
-}
-
-
diff --git a/src/45AE0.c b/src/45AE0.c
deleted file mode 100644
index 58a4b30..0000000
--- a/src/45AE0.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "common.h"
-
-INCLUDE_ASM(const s32, "45AE0", func_8016FBE0);
-
-INCLUDE_ASM(const s32, "45AE0", func_8016FCEC);
diff --git a/src/49A30.c b/src/49A30.c
deleted file mode 100644
index 261f2c5..0000000
--- a/src/49A30.c
+++ /dev/null
@@ -1,41 +0,0 @@
-#include <PR/gbi.h>
-
-#include "common.h"
-
-INCLUDE_ASM(const s32, "49A30", func_80173B30);
-
-INCLUDE_ASM(const s32, "49A30", func_80173B40);
-
-INCLUDE_ASM(const s32, "49A30", func_80173B50);
-
-INCLUDE_ASM(const s32, "49A30", func_80173B60);
-
-INCLUDE_ASM(const s32, "49A30", func_80173BA0);
-
-INCLUDE_ASM(const s32, "49A30", func_80173BE0);
-
-INCLUDE_ASM(const s32, "49A30", func_80173C54);
-
-INCLUDE_ASM(const s32, "49A30", func_80173D14);
-
-INCLUDE_ASM(const s32, "49A30", func_80173D4C);
-
-INCLUDE_ASM(const s32, "49A30", func_80173D84);
-
-INCLUDE_ASM(const s32, "49A30", func_80173DBC);
-
-INCLUDE_ASM(const s32, "49A30", func_80174138);
-
-INCLUDE_ASM(const s32, "49A30", func_80174250);
-
-INCLUDE_ASM(const s32, "49A30", func_801758C0);
-
-INCLUDE_ASM(const s32, "49A30", func_801768D4);
-
-INCLUDE_ASM(const s32, "49A30", func_80176948);
-
-INCLUDE_ASM(const s32, "49A30", func_80176C6C);
-
-INCLUDE_ASM(const s32, "49A30", func_80176F90);
-
-INCLUDE_ASM(const s32, "49A30", func_801772C0);
diff --git a/src/segment_obdata/_ob_ugliest_snow.c b/src/segment_obdata/_ob_ugliest_snow.c
index 90e7864..1b72a72 100644
--- a/src/segment_obdata/_ob_ugliest_snow.c
+++ b/src/segment_obdata/_ob_ugliest_snow.c
@@ -1,9 +1,33 @@
 #include "common.h"
 
-INCLUDE_ASM(const s32, "segment_obdata/_ob_ugliest_snow", __get_compared_osTvType);
+extern u8 D_80187020;
+extern u8 __compared_osTvType;
 
-INCLUDE_ASM(const s32, "segment_obdata/_ob_ugliest_snow", __reset_compared_osTvType);
+/* 42C30 8016CD30 */
+u8 __get_compared_osTvType(void) {
+    return D_80187020;
+}
+
+/* 42C3C 8016CD3C */
+u8 __reset_compared_osTvType(void) {
+    u8 temp_v0;
+
+    temp_v0 = __compared_osTvType;
+    __compared_osTvType = 0;
+    return temp_v0;
+}
+
+/* 42C50 8016CD50 */
+void func_8016CD50(u8 arg0) {
+    D_80187020 = arg0;
+}
+
+/* 42C5C 8016CD5C */
+void __inc_compared_osTvType(u8 arg0) {
+    if (D_80187020 != arg0) {
+        __compared_osTvType = arg0 + 1;
+    }
+    D_80187020 = arg0;
+}
 
-INCLUDE_ASM(const s32, "segment_obdata/_ob_ugliest_snow", func_8016CD50);
 
-INCLUDE_ASM(const s32, "segment_obdata/_ob_ugliest_snow", __inc_compared_osTvType);