1 files changed, 4 insertions, 44 deletions
diff --git a/src/dolphin/gf/GFGeometry.cpp b/src/dolphin/gf/GFGeometry.cpp
index fee178217c..99b40dba1c 100644
--- a/src/dolphin/gf/GFGeometry.cpp
+++ b/src/dolphin/gf/GFGeometry.cpp
@@ -4,58 +4,18 @@
 //
 
 #include "dolphin/gf/GFGeometry.h"
-#include "dol2asm.h"
-
-//
-// Types:
-//
-
-//
-// Forward References:
-//
-
-extern "C" void GFSetGenMode2__FUcUcUcUc11_GXCullMode();
-extern "C" extern u8 data_804508B0[8];
-
-//
-// External References:
-//
-
-//
-// Declarations:
-//
-
-/* ############################################################################################## */
-/* 804508A8-804508B0 000328 0004+04 1/1 0/0 0/0 .sdata           cm2hw$539 */
-SECTION_SDATA static u8 cm2hw[4 + 4 /* padding */] = {
-    0x00,
-    0x02,
-    0x01,
-    0x03,
-    /* padding */
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-};
 
 /* 802CDDC8-802CDE54 2C8708 008C+00 0/0 0/0 1/1 .text GFSetGenMode2__FUcUcUcUc11_GXCullMode */
-// reg alloc
-#ifdef NONMATCHING
+// NONMATCHING regalloc
 void GFSetGenMode2(u8 param_0, u8 param_1, u8 param_2, u8 param_3, _GXCullMode param_4) {
+    static u8 cm2hw[4] = {0, 2, 1, 3};
     GFWriteBPCmd(0xFE07FC3F);
     GFWriteBPCmd((param_0) | (param_1 << 4) | ((param_2 - 1) << 10) | (cm2hw[param_4] << 14) | (param_3 << 16));
     GFFill(0x1009, param_1);
     GFFill(0x103f, param_0);
 }
-#else
-void GFSetGenMode2(u8 param_0, u8 param_1, u8 param_2, u8 param_3, _GXCullMode param_4) {
-    // NONMATCHING
-}
-#endif
 
-/* ############################################################################################## */
 /* 804508B0-804508B8 000330 0008+00 0/0 2/2 0/0 .sdata           None */
-SECTION_SDATA extern u8 data_804508B0[8] = {
+extern u8 data_804508B0[8] = {
     0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
-\ No newline at end of file
+};