[WIP] Export configuration for ast_common (#176)

* Close to fully implement the whole file

* Filled gaps with blobs

* Added config into assets.yaml

* Removed a more blobs

* Fully extracted ast_common

* Bump torch

include/assets/ast_common.h

@@ -1,152 +0,0 @@
-#ifndef AST_COMMON_H
-#define AST_COMMON_H
-
-#include "gfx.h"
-#include "sf64object.h"
-#include "structs.h"
-
-extern  u8 D_1000000[];
-extern  u8 D_1000280[];
-extern  u8 D_1000640[];
-extern u16 D_1000E80[];
-extern u16 D_1002040[];
-extern u16 D_1002280[];
-extern u16 D_10030D0[];
-extern Gfx D_1003130[];
-extern u16 D_10032A0[];
-extern u16 D_10041C0[];
-extern u16 D_10050E0[];
-extern u16 D_1006000[];
-extern u16 D_1006F20[];
-extern u16 D_1007E40[];
-extern u16 D_1008D60[];
-extern u16 D_1009C80[];
-extern u16 D_100ABA0[];
-extern u16 D_100BAC0[];
-extern u16 D_100C9E0[];
-extern u16 D_100D900[];
-extern u16 D_100E820[];
-extern s32 D_1011280[];
-extern s32 D_10116A0[];
-extern s32 D_10116B0[];
-extern s32 D_1011730[];
-extern u8  D_1011A40[];
-extern u16 D_1011AB0[];
-extern s32 D_1011AC0[];
-extern s32 D_1011B90[];
-extern s32 D_1011BB0[];
-extern s32 D_1011C80[];
-extern s32 D_1011CA0[];
-extern s32 D_1011D70[];
-extern s32 D_1011D90[];
-extern s32 D_1011E60[];
-extern u8  D_1011E80[];
-extern u16 D_1011EC0[];
-extern u8  D_1011ED0[];
-extern u16 D_1011F08[];
-extern Gfx D_1011F20[];
-extern Gfx D_1012110[];
-extern u8  D_10127D0[];
-extern u16 D_1012898[];
-extern u8  D_10128C0[];
-extern u16 D_1012988[];
-extern u8  D_10129C0[];
-extern u16 D_1013090[];
-extern u8  D_1013170[];
-extern u16 D_1013570[];
-extern s32 D_1013580[];
-extern s32 D_1013700[];
-extern Gfx D_1015320[];
-extern Gfx D_1015510[];
-extern Gfx D_10156A0[];
-extern Gfx D_1015810[];
-extern Gfx D_1015980[];
-extern Gfx D_1015B70[];
-extern Gfx D_1015CE0[];
-extern Gfx D_1015E50[];
-extern Gfx D_1015FC0[];
-extern Gfx D_1016130[];
-extern Gfx D_10162A0[];
-extern Gfx D_1016410[];
-extern Gfx D_1016580[];
-extern Gfx D_1016870[];
-extern Gfx D_10177C0[];
-extern Gfx D_10182C0[];
-extern u16 D_10190C0[]; // A texture of some sort.
-extern Gfx D_10194C0[];
-extern Gfx D_1019820[];
-extern Gfx D_1019CA0[];
-extern Gfx D_101A570[];
-extern Gfx D_101A8E0[];
-extern Gfx D_101ABD0[];
-extern Gfx D_101AD20[];
-extern Gfx D_101AED0[];
-extern Gfx D_101B1A0[];
-extern Gfx D_101B310[];
-extern Gfx D_101B480[];
-extern Gfx D_101B5F0[];
-extern Gfx D_101B760[];
-extern Gfx D_101B8D0[];
-extern Gfx D_101BA40[];
-extern Gfx D_101BBB0[];
-extern Gfx D_101BD20[];
-extern Gfx D_101BE90[];
-extern Gfx D_101C000[];
-extern Gfx D_101C170[];
-extern Gfx D_101C2E0[];
-extern Gfx D_101CAE0[];
-extern Gfx D_101CD70[];
-extern u16 D_101D070[];
-extern Gfx D_101DC10[];
-extern Gfx D_1021E20[];
-extern Gfx D_1022120[];
-extern Gfx D_1022E80[];
-extern Gfx D_10231A0[];
-extern Gfx D_1023700[];
-extern Gfx D_1023750[];
-extern Gfx D_1023C80[];
-extern Gfx D_1024230[];
-extern Gfx D_1024290[];
-extern Gfx D_1024410[];
-extern Gfx D_1024570[];
-extern Gfx D_10246D0[];
-extern Gfx D_1024830[];
-extern Gfx D_1024990[];
-extern u8  D_1024A58[];
-extern Gfx D_1024AC0[];
-extern Gfx D_1024F60[];
-extern Gfx D_1025800[];
-extern Gfx D_1026090[];
-extern Gfx D_1028230[];
-extern Gfx D_1029780[];
-extern Gfx D_102A010[];
-extern Gfx D_102A8A0[];
-extern Gfx D_102ED50[];
-extern Gfx D_102F5E0[];
-extern Gfx D_102FE80[];
-extern u16 D_102FF08[];
-extern Gfx D_1031630[];
-extern Gfx D_1031EC0[];
-extern Gfx D_1032780[];
-extern u8 D_1010660[];
-extern u8 D_10106B0[];
-extern u8 D_1010700[];
-extern u8 D_1010750[];
-extern u8 D_10107A0[];
-extern u8 D_10107F0[];
-extern u8 D_1010840[];
-extern u8 D_1010890[];
-extern u8 D_10108E0[];
-extern u8 D_1010930[];
-extern u16 D_10106A0[];
-extern u16 D_10106F0[];
-extern u16 D_1010740[];
-extern u16 D_1010790[];
-extern u16 D_10107E0[];
-extern u16 D_1010830[];
-extern u16 D_1010880[];
-extern u16 D_10108D0[];
-extern u16 D_1010920[];
-extern u16 D_1010970[];
-
-#endif

src/main/fox_bg.c

@@ -1,6 +1,6 @@
 #include "global.h"
 #include "assets.h"
-//#include "prevent_bss_reordering.h"
+// #include "prevent_bss_reordering.h"
 
 extern f32 D_i3_801C4188;
 

src/main/fox_edisplay.c

@@ -1,7 +1,7 @@
 
 #include "global.h"
 #include "assets.h"
-//#include "prevent_bss_reordering.h"
+// #include "prevent_bss_reordering.h"
 Vec3f D_801615D0;
 Vec3f D_801615E0;
 s32 D_801615EC;

src/overlays/ovl_i3/fox_so.c

@@ -1,3 +1,4 @@
+#include "prevent_bss_reordering.h"
 #include "global.h"
 #include "assets.h"
 #include "assets/ast_bg_planet.h"

src/overlays/ovl_menu/fox_map.c

@@ -5,14 +5,16 @@
  */
 
 #include "mods.h"
+#include "prevent_bss_reordering.h"
 #include "global.h"
 #include "fox_map.h"
 #include "fox_option.h"
-#include "prevent_bss_reordering.h"
 // #include "prevent_bss_reordering2.h"
 #include "assets/ast_map.h"
-// BSS STARTS HERE
+#include "assets/ast_font.h"
+#include "assets/ast_font_3d.h"
 
+// BSS STARTS HERE
 u8 D_menu_801B9410[96 * 96];
 u8 D_menu_801BB810[96 * 96];
 u8 D_menu_801BDC10[96 * 96];
@@ -189,9 +191,6 @@ s32 D_menu_801CF11C;
 s32 D_menu_801CF120;
 f32 D_menu_801CF124;
 
-#include "assets/ast_font.h"
-#include "assets/ast_font_3d.h"
-
 s32 D_menu_801AF420[2] = { 10, 20 };
 
 u16* D_menu_801AF428[15][2] = {

src/overlays/ovl_menu/fox_title.c

@@ -4,7 +4,6 @@
  * Description: Starfox Title Handler
  */
 #include "prevent_bss_reordering.h"
-#include "prevent_bss_reordering2.h"
 #include "global.h"
 #include "fox_title.h"
 #include "assets/ast_title.h"

yamls/us/assets.yaml

@@ -12,8 +12,12 @@
 
   - name: ast_common
     exclusive_ram_id: segment_01
-    type: bin
+    type: code
+    dir: assets
     start: 0x873CB0
+    vram: 0x01000000
+    subsegments:
+      - [0x873CB0, .data, ast_common/ast_common]
 
   - name: ast_bg_space
     exclusive_ram_id: segment_02
@@ -217,7 +221,7 @@
     vram: 0x06000000
     subsegments:
      - [0xA8B470, .data, ast_area_6/ast_area_6]
-     
+
   - name: ast_venom_1
     exclusive_ram_id: segment_06
     type: bin