From 0d2358d4c69a5d8c231997ec9b440cac0d39777d Mon Sep 17 00:00:00 2001
From: MysterD <myster@d>
Date: Sat, 15 Jan 2022 20:43:49 -0800
Subject: [PATCH] Adjust waluigi_cap's compilation order

---
 actors/custom0.c      |  3 ---
 actors/custom0.h      | 12 ------------
 actors/custom0_geo.c  |  1 -
 actors/zcustom0.c     |  3 +++
 actors/zcustom0.h     | 12 ++++++++++++
 actors/zcustom0_geo.c |  1 +
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/actors/custom0.c b/actors/custom0.c
index f78d1d14..0ead73b7 100644
--- a/actors/custom0.c
+++ b/actors/custom0.c
@@ -6,6 +6,3 @@
 
 // luigi_cap
 #include "luigi_cap/model.inc.c"
-
-// waluigi_cap
-#include "waluigi_cap/model.inc.c"
diff --git a/actors/custom0.h b/actors/custom0.h
index 0523c1ce..8c5fb2d9 100644
--- a/actors/custom0.h
+++ b/actors/custom0.h
@@ -28,16 +28,4 @@ extern const GeoLayout toads_cap_geo[];
 extern const GeoLayout toads_metal_cap_geo[];
 extern const GeoLayout toads_wing_cap_geo[];
 
-// waluigi_cap
-extern const GeoLayout waluigis_cap_geo[];
-extern const GeoLayout waluigis_metal_cap_geo[];
-extern const GeoLayout waluigis_wing_cap_geo[];
-extern const GeoLayout waluigis_winged_metal_cap_geo[];
-extern const Gfx waluigi_cap_seg3_dl_03022F48[];
-extern const Gfx waluigi_cap_seg3_dl_03022FF8[];
-extern const Gfx waluigi_cap_seg3_dl_030230B0[];
-extern const Gfx waluigi_cap_seg3_dl_03023160[];
-extern const Gfx waluigi_cap_seg3_dl_03023108[];
-extern const Gfx waluigi_cap_seg3_dl_03023298[];
-
 #endif
diff --git a/actors/custom0_geo.c b/actors/custom0_geo.c
index 20ddf17b..429e1d40 100644
--- a/actors/custom0_geo.c
+++ b/actors/custom0_geo.c
@@ -6,4 +6,3 @@
 
 #include "luigi_cap/geo.inc.c" // custom luigi_cap
 #include "toad_cap/geo.inc.c" // custom toad_cap
-#include "waluigi_cap/geo.inc.c" // custom waluigi_cap
diff --git a/actors/zcustom0.c b/actors/zcustom0.c
index c45f4f0b..3919ba65 100644
--- a/actors/zcustom0.c
+++ b/actors/zcustom0.c
@@ -10,5 +10,8 @@
 // toad model
 #include "toad_player/model.inc.c"
 
+// waluigi_cap
+#include "waluigi_cap/model.inc.c"
+
 // waluigi model
 #include "waluigi/model.inc.c"
diff --git a/actors/zcustom0.h b/actors/zcustom0.h
index dc23dcd3..e9a08e97 100644
--- a/actors/zcustom0.h
+++ b/actors/zcustom0.h
@@ -9,6 +9,18 @@
 // toad_player
 #include "actors/toad_player/geo_header.h"
 
+// waluigi_cap
+extern const GeoLayout waluigis_cap_geo[];
+extern const GeoLayout waluigis_metal_cap_geo[];
+extern const GeoLayout waluigis_wing_cap_geo[];
+extern const GeoLayout waluigis_winged_metal_cap_geo[];
+extern const Gfx waluigi_cap_seg3_dl_03022F48[];
+extern const Gfx waluigi_cap_seg3_dl_03022FF8[];
+extern const Gfx waluigi_cap_seg3_dl_030230B0[];
+extern const Gfx waluigi_cap_seg3_dl_03023160[];
+extern const Gfx waluigi_cap_seg3_dl_03023108[];
+extern const Gfx waluigi_cap_seg3_dl_03023298[];
+
 // waluigi
 #include "actors/waluigi/geo_header.h"
 
diff --git a/actors/zcustom0_geo.c b/actors/zcustom0_geo.c
index 25e2c7db..9e2d194f 100644
--- a/actors/zcustom0_geo.c
+++ b/actors/zcustom0_geo.c
@@ -8,4 +8,5 @@
 
 #include "toad_player/geo.inc.c"
 
+#include "waluigi_cap/geo.inc.c" // custom waluigi_cap
 #include "waluigi/geo.inc.c"