From 84842bf284105d69c8659f2fce2531d16492b478 Mon Sep 17 00:00:00 2001
From: angie <angheloalf95@gmail.com>
Date: Thu, 6 Oct 2022 12:46:56 -0300
Subject: [PATCH] fix circular dependency problem

---
 include/z64transition.h                                     | 6 ------
 src/code/z_collision_check.c                                | 1 +
 src/code/z_demo.c                                           | 1 +
 src/overlays/actors/ovl_Boss_02/z_boss_02.c                 | 1 +
 .../fbdemos/ovl_fbdemo_triforce/z_fbdemo_triforce.c         | 1 +
 .../fbdemos/ovl_fbdemo_triforce/z_fbdemo_triforce.h         | 3 ++-
 src/overlays/fbdemos/ovl_fbdemo_wipe1/z_fbdemo_wipe1.c      | 1 +
 src/overlays/fbdemos/ovl_fbdemo_wipe1/z_fbdemo_wipe1.h      | 3 ++-
 src/overlays/fbdemos/ovl_fbdemo_wipe3/z_fbdemo_wipe3.c      | 1 +
 src/overlays/fbdemos/ovl_fbdemo_wipe3/z_fbdemo_wipe3.h      | 3 ++-
 src/overlays/fbdemos/ovl_fbdemo_wipe4/z_fbdemo_wipe4.c      | 1 +
 src/overlays/fbdemos/ovl_fbdemo_wipe4/z_fbdemo_wipe4.h      | 3 ++-
 src/overlays/fbdemos/ovl_fbdemo_wipe5/z_fbdemo_wipe5.c      | 1 +
 src/overlays/fbdemos/ovl_fbdemo_wipe5/z_fbdemo_wipe5.h      | 3 ++-
 14 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/include/z64transition.h b/include/z64transition.h
index 06907d1ed1..3660627c1c 100644
--- a/include/z64transition.h
+++ b/include/z64transition.h
@@ -3,14 +3,11 @@
 
 #include "ultra64.h"
 
-// TODO: Figure out circular dependencies
-#if 0
 #include "overlays/fbdemos/ovl_fbdemo_triforce/z_fbdemo_triforce.h"
 #include "overlays/fbdemos/ovl_fbdemo_wipe1/z_fbdemo_wipe1.h"
 #include "overlays/fbdemos/ovl_fbdemo_wipe3/z_fbdemo_wipe3.h"
 #include "overlays/fbdemos/ovl_fbdemo_wipe4/z_fbdemo_wipe4.h"
 #include "overlays/fbdemos/ovl_fbdemo_wipe5/z_fbdemo_wipe5.h"
-#endif
 
 #define TC_SET_PARAMS (1 << 7)
 
@@ -76,14 +73,11 @@ typedef struct {
     /* 0x008 */ union {
         TransitionFade fade;
         TransitionCircle circle;
-#if 0
         TransitionTriforce triforce;
         TransitionWipe1 wipe1;
         TransitionWipe3 wipe3;
         TransitionWipe4 wipe4;
         TransitionWipe5 wipe5;
-#endif
-        u8 forceSize[0x218];
     } instanceData;
     /* 0x220 */ char unk_220[0x10];
     /* 0x230 */ void* (*init)(void* transition);
diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c
index edaa159c68..0e36f1c54e 100644
--- a/src/code/z_collision_check.c
+++ b/src/code/z_collision_check.c
@@ -1,3 +1,4 @@
+#include "prevent_bss_reordering.h"
 #include "global.h"
 
 Vec3f D_801EDE00;
diff --git a/src/code/z_demo.c b/src/code/z_demo.c
index 9fc1067d15..1dd2dc6ca1 100644
--- a/src/code/z_demo.c
+++ b/src/code/z_demo.c
@@ -1,3 +1,4 @@
+#include "prevent_bss_reordering.h"
 #include "global.h"
 #include "z64quake.h"
 #include "z64rumble.h"
diff --git a/src/overlays/actors/ovl_Boss_02/z_boss_02.c b/src/overlays/actors/ovl_Boss_02/z_boss_02.c
index 61c2445bf5..e8060f38f7 100644
--- a/src/overlays/actors/ovl_Boss_02/z_boss_02.c
+++ b/src/overlays/actors/ovl_Boss_02/z_boss_02.c
@@ -4,6 +4,7 @@
  * Description: Twinmold
  */
 
+#include "prevent_bss_reordering.h"
 #include "z_boss_02.h"
 #include "z64rumble.h"
 #include "z64shrink_window.h"
diff --git a/src/overlays/fbdemos/ovl_fbdemo_triforce/z_fbdemo_triforce.c b/src/overlays/fbdemos/ovl_fbdemo_triforce/z_fbdemo_triforce.c
index 00e7cfabda..f4f68d2302 100644
--- a/src/overlays/fbdemos/ovl_fbdemo_triforce/z_fbdemo_triforce.c
+++ b/src/overlays/fbdemos/ovl_fbdemo_triforce/z_fbdemo_triforce.c
@@ -4,6 +4,7 @@
  * Description:
  */
 
+#include "global.h"
 #include "z_fbdemo_triforce.h"
 #include "assets/objects/object_fbdemo_triforce/ovl_fbdemo_triforce.c"
 
diff --git a/src/overlays/fbdemos/ovl_fbdemo_triforce/z_fbdemo_triforce.h b/src/overlays/fbdemos/ovl_fbdemo_triforce/z_fbdemo_triforce.h
index 06d807a08e..cd7f4563e1 100644
--- a/src/overlays/fbdemos/ovl_fbdemo_triforce/z_fbdemo_triforce.h
+++ b/src/overlays/fbdemos/ovl_fbdemo_triforce/z_fbdemo_triforce.h
@@ -1,7 +1,8 @@
 #ifndef Z_FBDEMO_TRIFORCE_H
 #define Z_FBDEMO_TRIFORCE_H
 
-#include "global.h"
+#include "ultra64.h"
+#include "color.h"
 
 typedef enum {
     /* 0 */ STATE_NONE,
diff --git a/src/overlays/fbdemos/ovl_fbdemo_wipe1/z_fbdemo_wipe1.c b/src/overlays/fbdemos/ovl_fbdemo_wipe1/z_fbdemo_wipe1.c
index ed12d400ed..1ce5f0d598 100644
--- a/src/overlays/fbdemos/ovl_fbdemo_wipe1/z_fbdemo_wipe1.c
+++ b/src/overlays/fbdemos/ovl_fbdemo_wipe1/z_fbdemo_wipe1.c
@@ -4,6 +4,7 @@
  * Description:
  */
 
+#include "global.h"
 #include "z_fbdemo_wipe1.h"
 
 void* TransitionWipe1_Init(void* thisx);
diff --git a/src/overlays/fbdemos/ovl_fbdemo_wipe1/z_fbdemo_wipe1.h b/src/overlays/fbdemos/ovl_fbdemo_wipe1/z_fbdemo_wipe1.h
index b473a08435..39f881b390 100644
--- a/src/overlays/fbdemos/ovl_fbdemo_wipe1/z_fbdemo_wipe1.h
+++ b/src/overlays/fbdemos/ovl_fbdemo_wipe1/z_fbdemo_wipe1.h
@@ -1,7 +1,8 @@
 #ifndef Z_FBDEMO_WIPE1_H
 #define Z_FBDEMO_WIPE1_H
 
-#include "global.h"
+#include "ultra64.h"
+#include "color.h"
 
 typedef struct {
     /* 0x000 */ char unk_0[0x218];
diff --git a/src/overlays/fbdemos/ovl_fbdemo_wipe3/z_fbdemo_wipe3.c b/src/overlays/fbdemos/ovl_fbdemo_wipe3/z_fbdemo_wipe3.c
index c33f3c8c78..759e1511c4 100644
--- a/src/overlays/fbdemos/ovl_fbdemo_wipe3/z_fbdemo_wipe3.c
+++ b/src/overlays/fbdemos/ovl_fbdemo_wipe3/z_fbdemo_wipe3.c
@@ -4,6 +4,7 @@
  * Description:
  */
 
+#include "global.h"
 #include "z_fbdemo_wipe3.h"
 
 void* TransitionWipe3_Init(void* thisx);
diff --git a/src/overlays/fbdemos/ovl_fbdemo_wipe3/z_fbdemo_wipe3.h b/src/overlays/fbdemos/ovl_fbdemo_wipe3/z_fbdemo_wipe3.h
index 7a33ffe9a2..b023ecb8bb 100644
--- a/src/overlays/fbdemos/ovl_fbdemo_wipe3/z_fbdemo_wipe3.h
+++ b/src/overlays/fbdemos/ovl_fbdemo_wipe3/z_fbdemo_wipe3.h
@@ -1,7 +1,8 @@
 #ifndef Z_FBDEMO_WIPE3_H
 #define Z_FBDEMO_WIPE3_H
 
-#include "global.h"
+#include "ultra64.h"
+#include "color.h"
 
 typedef struct {
     /* 0x000 */ char unk_0[0x120];
diff --git a/src/overlays/fbdemos/ovl_fbdemo_wipe4/z_fbdemo_wipe4.c b/src/overlays/fbdemos/ovl_fbdemo_wipe4/z_fbdemo_wipe4.c
index e91d8ab5e0..1acb8c07a3 100644
--- a/src/overlays/fbdemos/ovl_fbdemo_wipe4/z_fbdemo_wipe4.c
+++ b/src/overlays/fbdemos/ovl_fbdemo_wipe4/z_fbdemo_wipe4.c
@@ -4,6 +4,7 @@
  * Description:
  */
 
+#include "global.h"
 #include "z_fbdemo_wipe4.h"
 
 void* TransitionWipe4_Init(void* thisx);
diff --git a/src/overlays/fbdemos/ovl_fbdemo_wipe4/z_fbdemo_wipe4.h b/src/overlays/fbdemos/ovl_fbdemo_wipe4/z_fbdemo_wipe4.h
index 60d501ae51..b0aec44be4 100644
--- a/src/overlays/fbdemos/ovl_fbdemo_wipe4/z_fbdemo_wipe4.h
+++ b/src/overlays/fbdemos/ovl_fbdemo_wipe4/z_fbdemo_wipe4.h
@@ -1,7 +1,8 @@
 #ifndef Z_FBDEMO_WIPE4_H
 #define Z_FBDEMO_WIPE4_H
 
-#include "global.h"
+#include "ultra64.h"
+#include "color.h"
 
 typedef struct {
     /* 0x00 */ char unk_0[0x28];
diff --git a/src/overlays/fbdemos/ovl_fbdemo_wipe5/z_fbdemo_wipe5.c b/src/overlays/fbdemos/ovl_fbdemo_wipe5/z_fbdemo_wipe5.c
index 0ed80c066d..115936fb86 100644
--- a/src/overlays/fbdemos/ovl_fbdemo_wipe5/z_fbdemo_wipe5.c
+++ b/src/overlays/fbdemos/ovl_fbdemo_wipe5/z_fbdemo_wipe5.c
@@ -4,6 +4,7 @@
  * Description:
  */
 
+#include "global.h"
 #include "z_fbdemo_wipe5.h"
 
 void* TransitionWipe5_Init(void* thisx);
diff --git a/src/overlays/fbdemos/ovl_fbdemo_wipe5/z_fbdemo_wipe5.h b/src/overlays/fbdemos/ovl_fbdemo_wipe5/z_fbdemo_wipe5.h
index c93bfdd11c..e419d65b74 100644
--- a/src/overlays/fbdemos/ovl_fbdemo_wipe5/z_fbdemo_wipe5.h
+++ b/src/overlays/fbdemos/ovl_fbdemo_wipe5/z_fbdemo_wipe5.h
@@ -1,7 +1,8 @@
 #ifndef Z_FBDEMO_WIPE5_H
 #define Z_FBDEMO_WIPE5_H
 
-#include "global.h"
+#include "ultra64.h"
+#include "color.h"
 
 typedef struct {
     /* 0x00 */ char unk_0[0x14];