export configuration for ast_great_fox & ast_sector_z & ast_sector_y (#175)

* Matchpoint

* remove symbols from undef

* remove header

* comments

* var rename

* remove header

* first asset

* progress

* progress

* progress, should be matching. Torch bug?

* comments

* update torch with Peter's fix

* PRINTF

* replace symbol usage

* todo comment

* D_SX_6000000 usage

* progress

* Matchpoint

* progress replacing symbol usage (apo apo ahora)

* remove headers

* va bene

* format

* remove header

7 files changed, 2 insertions, 99 deletions

diff --git a/include/assets.h b/include/assets.h
index aea7bbdc..369a8d0e 100644
--- a/include/assets.h
+++ b/include/assets.h
@@ -18,34 +18,25 @@
 extern Gfx D_60005B0[]; // fox_bg
 extern Gfx D_6000A80[]; // fox_bg, fox_effect
 extern Gfx D_6000E00[]; // fox_edata_1C
-extern Gfx D_6001360[]; // fox_bg, fox_demo, fox_edata_1C
+extern Gfx D_6001360[]; // fox_bg, fox_demo, fox_edata_1C. Possible symbol collision
 extern Gfx D_6001530[]; // fox_360, fox_demo, fox_ka
-extern Gfx D_6001840[]; // fox_bg
 extern Gfx D_6001A60[]; // fox_effect
 extern u8 D_6001B80[]; // fox_hud
 extern Vtx D_6001C50[]; // fox_play
-extern Gfx D_6001DA0[]; // fox_demo, fox_edata_1C
 extern u8 D_60020D0[]; // fox_hud
 extern Gfx D_60023B0[]; // fox_edata_1C
 extern Gfx D_6002990[]; // fox_edata_1C
 extern Gfx D_6002E60[]; // fox_bg
-extern Gfx D_6002F80[]; // fox_bg
 extern Gfx D_6003000[]; // fox_edata_1C
 extern Gfx D_60030F0[]; // fox_edata_1C
-extern Gfx D_60034D0[]; // fox_edata_1C, fox_enmy2
-extern Gfx D_60036A0[]; // fox_edata_1C, fox_enmy2
 extern Gfx D_6003760[];
 extern Gfx D_60038E0[];
 extern u16 D_60038F8[];
 extern Gfx D_6004170[];
-extern Gfx D_6004330[];
 extern Vtx D_6004500[];
-extern Gfx D_6004570[];
 extern Gfx D_60046F0[];
 extern Gfx D_6004900[];
-extern Gfx D_6004FE0[];
 extern EnvSettings D_6005000;
-extern Gfx D_6005360[];
 extern u16 D_6005710[];
 extern Gfx D_6005780[];
 extern Gfx D_6005880[];
@@ -93,13 +84,9 @@ extern Gfx D_6006A80[];
 extern Gfx D_6006BE0[];
 extern f32 D_6006BF0[];
 extern f32 D_6006C44[];
-extern Animation D_6006D64;
-extern Limb* D_6006E50[];
-extern EnvSettings D_6006E70;
 extern u16 D_6006EA0[];
 extern Gfx D_6006F50[];
 extern Gfx D_6007410[];
-extern CollisionPoly D_6007558[];
 extern Gfx D_60075D0[];
 extern Gfx D_6007650[];
 extern Gfx D_60079B0[];
@@ -112,11 +99,7 @@ extern Gfx D_6008770[];
 extern Gfx D_6008830[];
 extern Gfx D_6008AA0[];
 extern Vec3s D_6008E08[];
-extern f32 D_600924C[];
 extern Gfx D_6009250[];
-extern f32 D_60092E8[];
-extern f32 D_6009388[];
-extern Gfx D_60097E0[];
 extern u16* D_6009B34[];
 extern u16 D_6009BB8[];
 extern f32 D_6009CC4[];
@@ -175,8 +158,6 @@ extern Gfx D_600F560[];
 extern Vec3s D_600F5AC[];
 extern CollisionPoly D_600F60C[];
 extern Gfx D_600F670[];
-extern Gfx D_600F6C0[];
-extern Gfx D_600F6C0[];
 extern Animation D_600F744;
 extern u8 D_600F940[];
 extern Gfx D_600F9B0[];
@@ -193,7 +174,6 @@ extern ObjectInit* D_6010088[];
 extern u8 D_6010090[];
 extern u16 D_6010198[];
 extern CollisionPoly D_6010294[];
-extern Gfx D_60102C0[];
 extern u8 D_60106B0[];
 extern Gfx D_6010700[];
 extern Gfx D_6010960[];
@@ -251,16 +231,12 @@ extern Gfx D_6016CF0[];
 extern Gfx D_6017090[];
 extern Gfx D_6017370[];
 extern Gfx D_6018450[];
-extern Gfx D_60188D0[];
 extern Gfx D_6018C00[]; // possible collision
 extern Gfx D_6018D40[];
 extern Gfx D_6018E80[];
-extern u16 D_6018F30[];
 extern Gfx D_6019220[];
-extern u16 D_6019E50[];
 extern Gfx D_601A7A0[];
 extern Gfx D_601A7D0[];
-extern Gfx D_601AD70[];
 extern Gfx D_601AE40[];
 extern Gfx D_601B0D0[];
 extern u16* D_601B1E4[];
@@ -271,7 +247,6 @@ extern f32 D_601B518[];
 extern Gfx D_601B560[];
 extern f32 D_601B584[];
 extern f32 D_601B5F4[];
-extern Gfx D_601B610[];
 extern Gfx D_601B640[];
 extern f32 D_601B644[];
 extern f32 D_601B678[];
@@ -286,12 +261,10 @@ extern f32 D_601B868[];
 extern f32 D_601B8A0[];
 extern f32 D_601B8D8[];
 extern Gfx D_601BEC0[];
-extern Gfx D_601C6A0[];
 extern Gfx D_601C7C0[];
 extern Gfx D_601C820[];
 extern u16 D_601C8E0[];
 extern Gfx D_601C9B0[];
-extern Gfx D_601D730[];
 extern u8 D_601D750[];
 extern u16 D_601D800[];
 extern u16 D_601DB50[];
@@ -378,7 +351,6 @@ extern Gfx D_602DCA0[];
 extern u16 D_602DCB8[];
 extern Gfx D_602E080[];
 extern Gfx D_602E380[];
-extern EnvSettings D_602E4B0;
 extern Gfx D_602E570[];
 extern Gfx D_602E7A0[];
 extern Gfx D_602E9E0[];
@@ -401,7 +373,6 @@ extern Vec3s D_6030550[];
 extern CollisionPoly D_60305DC[];
 extern Gfx D_6030630[];
 extern Gfx D_60306D0[];
-extern ObjectInit D_6030B14[];
 extern EnvSettings D_6030E30_Env;
 extern Triangle D_6030E74[];
 extern Vec3f D_6030E80[];
@@ -418,19 +389,8 @@ extern Vec3s D_603184C[];
 extern Gfx D_60320E0[];
 extern Gfx D_6032580[];
 extern Gfx D_6032BC0[];
-extern u16* D_6032E18[];
 extern Gfx D_6033000[];
-extern CollisionPoly D_6033070[];
 extern Vec3s D_6033E08[];
-extern f32 D_603405C[];
-extern f32 D_6034368[];
-extern f32 D_6034478[];
-extern f32 D_603450C[];
-extern f32 D_6034588[];
-extern f32 D_6034664[];
-extern f32 D_6034770[];
-extern f32 D_60347D4[];
-extern f32 D_60347F0[];
 extern f32 D_603486C[];
 extern Gfx D_6034B90[];
 extern f32 D_60359C8[];
diff --git a/include/assets/ast_great_fox.h b/include/assets/ast_great_fox.h
deleted file mode 100644
index 460306bb..00000000
--- a/include/assets/ast_great_fox.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef AST_GREAT_FOX_H
-#define AST_GREAT_FOX_H
-
-#include "gfx.h"
-#include "sf64object.h"
-#include "structs.h"
-
-extern Gfx D_E000000[];
-extern Gfx D_E003AB0[];
-extern Gfx D_E00DFB0[];
-extern u16 D_E00E100[];
-extern u16 D_E00F020[];
-extern u16 D_E00FF40[];
-extern u16 D_E010E60[];
-
-#endif
diff --git a/include/assets/ast_sector_y.h b/include/assets/ast_sector_y.h
deleted file mode 100644
index 5e3a43b5..00000000
--- a/include/assets/ast_sector_y.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef AST_SECTOR_Y_H
-#define AST_SECTOR_Y_H
-
-#include "gfx.h"
-#include "sf64object.h"
-#include "structs.h"
-
-#endif
diff --git a/include/assets/ast_sector_z.h b/include/assets/ast_sector_z.h
deleted file mode 100644
index 0e1a98f4..00000000
--- a/include/assets/ast_sector_z.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef AST_SECTOR_Z_H
-#define AST_SECTOR_Z_H
-
-#include "gfx.h"
-#include "sf64object.h"
-#include "structs.h"
-
-#endif
diff --git a/include/context.h b/include/context.h
index 479ee24c..66822575 100644
--- a/include/context.h
+++ b/include/context.h
@@ -287,7 +287,7 @@ extern s32 D_80177B00[4][4];
 extern u8 D_Timer_80177B44;
 extern u8 D_80177B4C;
 extern u8 D_80177B6C;
-extern u8  D_80177B8C;
+extern u8  gGreatFoxIntact;
 extern u8 D_80177BAC;
 extern u16 D_Timer_80177BD0[4];
 extern u16 D_80177C30[4];
diff --git a/include/fox_enmy2_assets.h b/include/fox_enmy2_assets.h
index 15d13d4f..65ab2796 100644
--- a/include/fox_enmy2_assets.h
+++ b/include/fox_enmy2_assets.h
@@ -7,27 +7,14 @@
 
 extern Gfx D_6011F90[];
 extern Gfx D_601F2A0[];
-extern Gfx D_60102C0[];
 extern Gfx D_6017B60[];
 extern Gfx D_6004D00[];
 extern Gfx D_601A880[];
-extern Gfx D_6015D60[];
-extern Gfx D_60102C0[];
-extern Gfx D_601F3D0[];
-extern Gfx D_6022B10[];
-extern Gfx D_60209F0[];
 extern Gfx D_6019430[];
 extern Gfx D_6018960[];
 extern Gfx D_6009F50[];
 extern Gfx D_600C2A0[];
 extern Gfx D_600BD40[];
-extern Gfx D_60205D0[];
-extern Gfx D_60036A0[];
-extern Gfx D_60034D0[];
-extern Gfx D_6005360[];
-extern Gfx D_601B610[];
-extern Gfx D_601C6A0[];
-extern Gfx D_60188D0[];
 extern Gfx D_601C520[];
 extern Gfx D_600AF40[];
 extern Gfx D_600AC70[];
@@ -37,18 +24,8 @@ extern Gfx D_60043F0[];
 extern Gfx D_6004310[];
 extern Gfx D_6002890[];
 
-extern f32 D_6034478[];
-extern f32 D_603450C[];
-extern f32 D_6034588[];
-extern f32 D_6034124[];
 extern f32 D_602C1A0[];
 extern f32 D_602F604[];
-extern f32 D_603445C[];
-extern f32 D_6034664[];
-extern f32 D_60347D4[];
-extern f32 D_6034770[];
-extern f32 D_60347F0[];
-extern f32 D_603486C[];
 extern f32 D_602C294[];
 extern f32 D_601B474[];
 extern f32 D_601B43C[];
diff --git a/include/fox_enmy_assets.h b/include/fox_enmy_assets.h
index 5972e9e9..854bbc3a 100644
--- a/include/fox_enmy_assets.h
+++ b/include/fox_enmy_assets.h
@@ -5,7 +5,6 @@
 
 extern ObjectInit D_60371A4[];
 extern ObjectInit D_6026CC4[];
-extern ObjectInit D_602E4F4[];
 extern ObjectInit D_6007E74[];
 extern ObjectInit D_601F234[];
 extern ObjectInit D_6026714[];
@@ -15,7 +14,6 @@ extern ObjectInit D_602E5C8[];
 extern ObjectInit D_600EAD4[];
 extern ObjectInit D_6011044[];
 extern ObjectInit D_600FF74[];
-extern ObjectInit D_6006EB4[];
 extern ObjectInit D_6014D94[];
 
 #endif