fix circular dependency problem

This commit is contained in:
angie
2022-10-06 12:46:56 -03:00
parent 76334def1e
commit 84842bf284
14 changed files with 18 additions and 11 deletions
+1
View File
@@ -1,3 +1,4 @@
#include "prevent_bss_reordering.h"
#include "global.h"
Vec3f D_801EDE00;
+1
View File
@@ -1,3 +1,4 @@
#include "prevent_bss_reordering.h"
#include "global.h"
#include "z64quake.h"
#include "z64rumble.h"
@@ -4,6 +4,7 @@
* Description: Twinmold
*/
#include "prevent_bss_reordering.h"
#include "z_boss_02.h"
#include "z64rumble.h"
#include "z64shrink_window.h"
@@ -4,6 +4,7 @@
* Description:
*/
#include "global.h"
#include "z_fbdemo_triforce.h"
#include "assets/objects/object_fbdemo_triforce/ovl_fbdemo_triforce.c"
@@ -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,
@@ -4,6 +4,7 @@
* Description:
*/
#include "global.h"
#include "z_fbdemo_wipe1.h"
void* TransitionWipe1_Init(void* thisx);
@@ -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];
@@ -4,6 +4,7 @@
* Description:
*/
#include "global.h"
#include "z_fbdemo_wipe3.h"
void* TransitionWipe3_Init(void* thisx);
@@ -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];
@@ -4,6 +4,7 @@
* Description:
*/
#include "global.h"
#include "z_fbdemo_wipe4.h"
void* TransitionWipe4_Init(void* thisx);
@@ -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];
@@ -4,6 +4,7 @@
* Description:
*/
#include "global.h"
#include "z_fbdemo_wipe5.h"
void* TransitionWipe5_Init(void* thisx);
@@ -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];