fix circular dependency problem

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);

src/code/z_collision_check.c

@@ -1,3 +1,4 @@
+#include "prevent_bss_reordering.h"
 #include "global.h"
 
 Vec3f D_801EDE00;

src/code/z_demo.c

@@ -1,3 +1,4 @@
+#include "prevent_bss_reordering.h"
 #include "global.h"
 #include "z64quake.h"
 #include "z64rumble.h"

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"

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"
 

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,

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);

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];

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);

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];

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);

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];

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);

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];