"export configuration for ast_allies" by Sonic fixed (#150)

* begin

* progress

* progress

* Matchpoint

* clean up unnecessary externs

* dec

---------

Co-authored-by: Alejandro Javier Asenjo Nitti <alejandro.asenjo88@gmail.com>

13 files changed, 131 insertions, 46 deletions

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 77f718f9..c41f98c8 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -79,7 +79,8 @@
     "valarray": "c",
     "util": "c",
     "variant": "c",
-    "chrono": "c"
+    "chrono": "c",
+    "ast_allies.h": "c"
   },
   "C_Cpp_Runner.msvcBatchPath": ""
 }
\ No newline at end of file
diff --git a/assets/yaml/us/ast_allies.yaml b/assets/yaml/us/ast_allies.yaml
new file mode 100644
index 00000000..671cf9f5
--- /dev/null
+++ b/assets/yaml/us/ast_allies.yaml
@@ -0,0 +1,111 @@
+:config:
+  segments:
+    seg13: 0x955270
+  header:
+    code:
+      - '#include "assets/ast_allies.h"'
+    header:
+      - '#include "gfx.h"'
+      - '#include "sf64object.h"'
+      - '#include "structs.h"'
+
+D_D000000:
+  { type: GFX, offset: 0xD000000, symbol: D_D000000 }
+
+ast_allies_seg13_vtx_00000098:
+  { type: VTX, count: 3, offset: 0x0D000098, symbol: ast_allies_seg13_vtx_00000098 }
+
+D_D0000C8:
+  { type: BLOB, size: 0x18, offset: 0x0D0000C8, symbol: D_D0000C8 }
+
+D_D0000E0:
+  { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x0D0000E0, symbol: D_D0000E0, tlut: 0x0D000160 }
+
+D_D000160:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0xD000160, symbol: D_D000160 }
+
+D_D000170:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0xD000170, symbol: D_D000170 }
+
+D_D001090:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0xD001090, symbol: D_D001090 }
+
+D_D001FB0:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0xD001FB0, symbol: D_D001FB0 }
+
+D_D002ED0:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0xD002ED0, symbol: D_D002ED0 }
+
+D_D003DF0:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0xD003DF0, symbol: D_D003DF0 }
+
+D_D004D10:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0xD004D10, symbol: D_D004D10 }
+
+D_D005C30:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0xD005C30, symbol: D_D005C30 }
+
+D_D006B50:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0xD006B50, symbol: D_D006B50 }
+
+D_D007A70:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0xD007A70, symbol: D_D007A70 }
+
+D_D008990:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0xD008990, symbol: D_D008990 }
+
+D_D0098B0:
+  { type: GFX, offset: 0xD0098B0, symbol: D_D0098B0 }
+
+D_D009938:
+  { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 16, offset: 0x0D009938, symbol: D_D009938, pad: 8 }
+
+D_D009A40:
+  { type: GFX, offset: 0xD009A40, symbol: D_D009A40 }
+
+D_D00A3B8:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0D00A3B8, symbol: D_D00A3B8 }
+
+D_D00ABB8:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0D00ABB8, symbol: D_D00ABB8 }
+
+D_D00ADB8:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0D00ADB8, symbol: D_D00ADB8 }
+
+D_D00AFB8:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 16, offset: 0x0D00AFB8, symbol: D_D00AFB8 }
+
+D_D00B3B8:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0D00B3B8, symbol: D_D00B3B8, pad: 8 }
+
+D_D00B5C0:
+  { type: GFX, offset: 0xD00B5C0, symbol: D_D00B5C0 }
+
+# Letter B
+D_D00B688:
+  { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x0D00B688, symbol: D_D00B688, tlut: 0xD00B708 }
+
+D_D00B708:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 12, offset: 0xD00B708, symbol: D_D00B708 }
+
+D_D00B720:
+  { type: GFX, offset: 0xD00B720, symbol: D_D00B720 }
+
+# Letter J ?
+D_D00B7F0:
+  { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x0D00B7F0, symbol: D_D00B7F0, tlut: 0xD00B870 }
+
+D_D00B870:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0xD00B870, symbol: D_D00B870 }
+
+D_D00B880:
+  { type: GFX, offset: 0xD00B880, symbol: D_D00B880 }
+
+D_D00C470:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0xD00C470, symbol: D_D00C470 }
+
+D_D00C670:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0D00C670, symbol: D_D00C670 }
+
+D_D00C870:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0D00C870, symbol: D_D00C870 }
diff --git a/include/assets.h b/include/assets.h
index 644c92a2..94f7301b 100644
--- a/include/assets.h
+++ b/include/assets.h
@@ -1026,24 +1026,6 @@ extern f32 D_C038DC0[];
 extern f32 D_C038F24[];
 extern Gfx D_C039208[];
 
-// ast_allies
-extern Gfx D_D000000[];
-extern u16 D_D000170[];
-extern u16 D_D001090[];
-extern u16 D_D001FB0[];
-extern u16 D_D002ED0[];
-extern u16 D_D003DF0[];
-extern u16 D_D004D10[];
-extern u16 D_D005C30[];
-extern u16 D_D006B50[];
-extern u16 D_D007A70[];
-extern u16 D_D008990[];
-extern Gfx D_D0098B0[];
-extern Gfx D_D009A40[];
-extern Gfx D_D00B5C0[];
-extern Gfx D_D00B720[];
-extern Gfx D_D00B880[];
-
 // ast_great_fox
 extern Gfx D_E000000[];
 extern Gfx D_E003AB0[];
diff --git a/include/assets/ast_allies.h b/include/assets/ast_allies.h
deleted file mode 100644
index 76bc7c30..00000000
--- a/include/assets/ast_allies.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef AST_ALLIES_H
-#define AST_ALLIES_H
-
-#include "gfx.h"
-#include "sf64object.h"
-#include "structs.h"
-
-extern Gfx D_D000000[];
-extern u16 D_D000170[];
-extern u16 D_D001090[];
-extern u16 D_D001FB0[];
-extern u16 D_D002ED0[];
-extern u16 D_D003DF0[];
-extern u16 D_D004D10[];
-extern u16 D_D005C30[];
-extern u16 D_D006B50[];
-extern u16 D_D007A70[];
-extern u16 D_D008990[];
-extern Gfx D_D0098B0[];
-extern Gfx D_D009A40[];
-extern Gfx D_D00B5C0[];
-extern Gfx D_D00B720[];
-extern Gfx D_D00B880[];
-
-#endif
diff --git a/src/main/fox_360.c b/src/main/fox_360.c
index ab1af016..e78d28a4 100644
--- a/src/main/fox_360.c
+++ b/src/main/fox_360.c
@@ -45,6 +45,8 @@ s32 D_8015F93C;
 s32 D_8015F940;
 f32 D_8015F944;
 
+#include "assets/ast_allies.h"
+
 void func_8002E3E0(Actor* actor) {
     s32 hits = 0;
 
diff --git a/src/main/fox_demo.c b/src/main/fox_demo.c
index 2fed5c65..719e2ece 100644
--- a/src/main/fox_demo.c
+++ b/src/main/fox_demo.c
@@ -39,6 +39,8 @@ extern Animation D_601F3B8;
 extern Limb* D_6020C6C[];
 extern Limb* D_602D140[];
 
+#include "assets/ast_allies.h"
+
 Vec3f D_800C9F60[] = {
     { 2000.0f, 2000.0f, 2000.0f },
     { -2000.0f, 2000.0f, 2000.0f },
diff --git a/src/main/fox_display.c b/src/main/fox_display.c
index ecb57b7d..ed391ebd 100644
--- a/src/main/fox_display.c
+++ b/src/main/fox_display.c
@@ -12,6 +12,8 @@ Vec3f D_80161578[4];
 f32 D_801615A8[4];
 f32 D_801615B8[4];
 
+#include "assets/ast_allies.h"
+
 s32 D_800CA220 = 0;
 u8 D_800CA224[] = { 0, 0, 0, 0 };
 s32 D_800CA228 = 0;
diff --git a/src/main/fox_enmy2.c b/src/main/fox_enmy2.c
index d706b385..3cc7b3ee 100644
--- a/src/main/fox_enmy2.c
+++ b/src/main/fox_enmy2.c
@@ -6,6 +6,7 @@ s32 D_80161690;
 
 #include "fox_enmy2_assets.h"
 #include "assets/ast_warp_zone.h"
+#include "assets/ast_allies.h"
 
 void func_8006A7B0(u16* msg, s32 character) {
     PRINTF("Enm->obj.pos.y + tmp_xyz.y=<%10.3f>\n");
diff --git a/src/main/fox_hud.c b/src/main/fox_hud.c
index ae33c427..cadc4bca 100644
--- a/src/main/fox_hud.c
+++ b/src/main/fox_hud.c
@@ -148,6 +148,7 @@ extern u8 D_C000A80[];
 
 #include "assets/ast_bg_space.h"
 #include "assets/ast_bg_planet.h"
+#include "assets/ast_allies.h"
 
 // DATA SECTION START
 
diff --git a/src/main/fox_radio.c b/src/main/fox_radio.c
index ee8b3fc1..61a0756a 100644
--- a/src/main/fox_radio.c
+++ b/src/main/fox_radio.c
@@ -12,6 +12,8 @@ f32 D_80178740;
 s32 D_80178744;
 s32 D_80178748;
 
+#include "assets/ast_allies.h"
+
 s32 gCurrentMsgPri = 0;
 
 void func_800BA760(void) {
@@ -455,7 +457,7 @@ void func_800BB388(void) {
         } else {
             gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 60, 60, 255, 170);
         }
-        TextureRect_8bCI(&gMasterDisp, sp38, sp34, 0x20, 0x20, D_80178730, D_80178734 + 16.0f + sp30, D_80178738,
+        TextureRect_8bCI(&gMasterDisp, sp38, sp34, 32, 32, D_80178730, D_80178734 + 16.0f + sp30, D_80178738,
                          D_80177D50);
     }
     if (D_80177D50 == 1.3f) {
diff --git a/src/overlays/ovl_ending/fox_end1.c b/src/overlays/ovl_ending/fox_end1.c
index e16e2b2a..7d9c2682 100644
--- a/src/overlays/ovl_ending/fox_end1.c
+++ b/src/overlays/ovl_ending/fox_end1.c
@@ -1,6 +1,7 @@
 #include "global.h"
 #include "assets/ast_ending_award_front.h"
 #include "assets/ast_ending_award_back.h"
+#include "assets/ast_allies.h"
 
 void func_ending_8018CE20(s32);
 void func_ending_801926D4(void);
diff --git a/src/overlays/ovl_ending/fox_end2.c b/src/overlays/ovl_ending/fox_end2.c
index b50fc552..8fcf14cf 100644
--- a/src/overlays/ovl_ending/fox_end2.c
+++ b/src/overlays/ovl_ending/fox_end2.c
@@ -1,6 +1,7 @@
 #include "global.h"
 #include "fox_end2_data.c"
 #include "assets/ast_ending_expert.h"
+#include "assets/ast_allies.h"
 
 void func_ending_8018CE20(u32 arg0) {
     u8 alpha;
diff --git a/yamls/us/assets.yaml b/yamls/us/assets.yaml
index cbcd7271..f80418a6 100644
--- a/yamls/us/assets.yaml
+++ b/yamls/us/assets.yaml
@@ -79,8 +79,12 @@
 
   - name: ast_allies
     exclusive_ram_id: segment_0D
-    type: bin
+    type: code
+    dir: assets
     start: 0x955270
+    vram: 0x0D000000
+    subsegments:
+      - [0x955270, .data, ast_allies/ast_allies]
 
   - name: ast_corneria
     exclusive_ram_id: segment_06