Asset names and headers (sonicdcer#131)

* assets and such * here goes * here goes again * once more * once more * type fixing * type fixing * type fixing * here goes * here goes * format
inspectredc · Feb 17, 2024 · 9346a22 · 9346a22
1 parent 3241151
commit 9346a22
Show file tree

Hide file tree

Showing 71 changed files with 1,406 additions and 649 deletions.
diff --git a/include/assets.h b/include/assets.h
@@ -7,7 +7,7 @@
 #include "sf64object.h"
 #include "sf64player.h"
 
-// ast_873CB0
+// ast_common
 extern u16 D_1002040[];
 extern u16 D_10032A0[];
 extern u16 D_10041C0[];
@@ -88,7 +88,7 @@ extern Gfx D_1031630[];
 extern Gfx D_1031EC0[];
 extern Gfx D_1032780[];
 
-// ast_8A68C0, ast_8AE0A0
+// ast_bg_space, ast_bg_planet
 extern Gfx D_2000000[];
 extern Gfx D_2000890[];
 extern Gfx D_2001090[];
@@ -121,7 +121,7 @@ extern Gfx D_200F910[];
 extern Gfx D_20101A0[];
 extern Gfx D_20112C0[];
 
-// ast_8BFC00, ast_8D99F0, ast_8E1F80, ast_8E92D0
+// ast_arwing, ast_landmaster, ast_blue_marine, ast_vs_player
 extern Gfx D_3006940[];
 extern Gfx D_301AD60[];
 extern Gfx D_301AEF0[];
@@ -149,7 +149,7 @@ extern u16 D_3007500[];
 extern u8 D_300A470[];
 extern u16 D_300B218[];
 
-extern u8 D_5007F60[];
+
 
 extern Gfx D_3001C90[];
 extern u16 D_3002E80[];
@@ -246,7 +246,7 @@ extern Vec3f D_302F008[];
 extern Triangle D_302F044[];
 extern Vec3f D_302F098[];
 
-// ast_918430, ast_922730
+// ast_enmy_planet, ast_enmy_space
 extern Animation D_4000080;
 extern Limb* D_400014C[];
 extern Animation D_40001A4;
@@ -262,7 +262,7 @@ extern Animation D_400A30C;
 extern Limb* D_400A398[];
 extern Gfx D_400B390[];
 
-// ast_CD2410
+// ast_font
 extern u8 D_5000000[];
 extern u8 D_5000080[];
 extern u8 D_5000100[];
@@ -273,6 +273,7 @@ extern u8 D_5000400[];
 extern u8 D_5000480[];
 extern u8 D_50021F0[];
 extern u16 D_50077B0[];
+extern u8 D_5007F60[];
 extern u8 D_5009F60[];
 extern u8 D_500A050[];
 extern u8 D_500A140[];
@@ -285,10 +286,10 @@ extern u8 D_500A6E0[];
 extern u8 D_500A7D0[];
 extern Gfx D_500B600[];
 
-/* ast_961CE0, ast_9A1460, ast_9D2FD0, ast_A1D0F0, ast_A4FBB0,
- * ast_A58F60, ast_A8B470, ast_AB4000, ast_ACF960, ast_AE60A0*,
- * ast_B0AA00, ast_B1CA50, ast_B2CA50, ast_B612E0, ast_B84560,
- * ast_BB11D0, ast_BC23D0, ast_BFC510, ast_C48F40, ast_DDC010
+/* ast_corneria, ast_meteo, ast_titania, ast_sector_x, ast_sector_z,
+ * ast_aquas, ast_area_6, ast_venom_1, ast_venom_2, ast_ve1_boss*,
+ * ast_bolse, ast_fortuna, ast_sector_y, ast_solar, ast_zoness,
+ * ast_katina, ast_macbeth, ast_title, ast_menu, ast_training
  */
 extern Gfx D_60005B0[];
 extern u16 D_6000900[];
@@ -944,7 +945,7 @@ extern Gfx D_6019670[];
 extern Gfx D_60185E0[];
 extern Gfx D_6017550[];
 
-// ast_9DD390, ast_A0E340, ast_BFA740, ast_CBFE70, ast_D27600
+// ast_7_ti_2, ast_7_ti_1, ast_warp_zone, ast_versus, ast_ending
 extern u8 D_7000F10[];
 extern u8 D_7001030[];
 extern u8 D_7001270[];
@@ -975,7 +976,8 @@ extern u8 D_70118E0[];
 extern u16 D_70123F8[];
 extern u16 D_70123F8[];
 
-// ast_9EB5E0, ast_CA9DE0, ast_D43400, ast_D68480, ast_D91F10
+// ast_8_ti, ast_option, ast_ending_award_front, ast_ending_award_back, ast_reward
+extern u8 D_8000000[];
 extern u16 D_8000680[];
 extern u8 D_80006A0[];
 extern u16 D_80017A0[];
@@ -1021,7 +1023,7 @@ extern u16 D_800E170[];
 extern Gfx D_8015550[];
 extern Gfx D_8015DF0[];
 
-// ast_9F4880, ast_AE60A0, ast_CDDCA0
+// ast_9_ti, ast_ve1_boss, ast_font_3d
 extern Gfx D_9002CF0[];
 extern u16 D_9003330[];
 extern u16 D_9003890[];
@@ -1039,12 +1041,12 @@ extern Gfx D_9023290[];
 extern Gfx D_90234D0[];
 extern Gfx D_9023AD0[];
 
-// ast_A049A0
+// ast_A_ti
 extern Gfx D_A000000[];
 
 // segment B is unused
 
-// ast_CE9E70
+// ast_andross
 extern Gfx D_C017440[];
 extern ObjectInit* D_C0356A4[];
 extern u16* D_C037E3C[];
@@ -1057,7 +1059,7 @@ extern f32 D_C038DC0[];
 extern f32 D_C038F24[];
 extern Gfx D_C039208[];
 
-// ast_955270
+// ast_allies
 extern Gfx D_D000000[];
 extern u16 D_D000170[];
 extern u16 D_D001090[];
@@ -1075,21 +1077,23 @@ extern Gfx D_D00B5C0[];
 extern Gfx D_D00B720[];
 extern Gfx D_D00B880[];
 
-// ast_92EC40
+// ast_great_fox
+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[];
 
-// ast_D25100
+// ast_logo
 extern u16 D_F000000[];
 extern u16 D_F000800[];
 extern u16 D_F001000[];
 extern u16 D_F001800[];
 extern u16 D_F002000[];
 
-// ast_940AD0
+// ast_star_wolf
 extern u16 D_F000000[];
 extern u16 D_F000F20[];
 extern u16 D_F001E40[];

diff --git a/include/assets/ast_7_ti_1.h b/include/assets/ast_7_ti_1.h
@@ -0,0 +1,8 @@
+#ifndef AST_7_TI_1_H
+#define AST_7_TI_1_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+#endif
diff --git a/include/assets/ast_7_ti_2.h b/include/assets/ast_7_ti_2.h
@@ -0,0 +1,8 @@
+#ifndef AST_7_TI_2_H
+#define AST_7_TI_2_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+#endif
diff --git a/include/assets/ast_8_ti.h b/include/assets/ast_8_ti.h
@@ -0,0 +1,8 @@
+#ifndef AST_8_TI_H
+#define AST_8_TI_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+#endif
diff --git a/include/assets/ast_9_ti.h b/include/assets/ast_9_ti.h
@@ -0,0 +1,8 @@
+#ifndef AST_9_TI_H
+#define AST_9_TI_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+#endif
diff --git a/include/assets/ast_A_ti.h b/include/assets/ast_A_ti.h
@@ -0,0 +1,8 @@
+#ifndef AST_A_TI_H
+#define AST_A_TI_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+#endif
diff --git a/include/assets/ast_allies.h b/include/assets/ast_allies.h
@@ -0,0 +1,25 @@
+#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/include/assets/ast_andross.h b/include/assets/ast_andross.h
@@ -0,0 +1,65 @@
+#ifndef AST_ANDROSS_H
+#define AST_ANDROSS_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+extern Gfx D_C001880[];
+extern Animation D_C00208C;
+extern Animation D_C002654;
+extern Animation D_C002B08;
+extern Gfx D_C002B20[];
+extern Gfx D_C002F00[];
+extern Gfx D_C0043D0[];
+extern Gfx D_C004860[];
+extern Animation D_C006F08;
+extern Animation D_C00DE48;
+extern Animation D_C00E598;
+extern Gfx D_C015740[];
+extern Animation D_C017050;
+extern Animation D_C017430;
+extern Gfx D_C017440[];
+extern Vtx D_C017598[];
+extern Animation D_C018BC4;
+extern Limb* D_C01CC3C[];
+extern Gfx D_C022520[];
+extern Animation D_C023B54;
+extern Animation D_C0240D0;
+extern Animation D_C025C00;
+extern Animation D_C029F74;
+extern Animation D_C02E494;
+extern Animation D_C02EDA0;
+extern Animation D_C030244;
+extern Animation D_C033780;
+extern Animation D_C033D98;
+extern ObjectInit D_C0356A4[];
+extern ObjectInit D_C036310[];
+extern ObjectInit D_C036B6C[];
+extern ObjectInit D_C03733C[];
+extern u16* D_C037E3C[];
+extern f32 D_C037FCC[];
+extern f32 D_C0380C0[];
+extern f32 D_C0381B4[];
+extern f32 D_C0382A8[];
+extern f32 D_C03839C[];
+extern f32 D_C038490[];
+extern f32 D_C038584[];
+extern f32 D_C038678[];
+extern f32 D_C03876C[];
+extern f32 D_C038860[];
+extern f32 D_C038954[];
+extern f32 D_C038A48[];
+extern Gfx D_C038AC4[];
+extern f32 D_C038B40[];
+extern f32 D_C038B40[];
+extern f32 D_C038BA4[];
+extern f32 D_C038BD8[];
+extern f32 D_C038DC0[];
+extern f32 D_C038F24[];
+extern Vtx D_C038FE8[];
+extern Gfx D_C039208[];
+extern u32 D_C039290[];
+extern u32 D_C03A290[];
+
+#endif
diff --git a/include/assets/ast_aquas.h b/include/assets/ast_aquas.h
@@ -0,0 +1,8 @@
+#ifndef AST_AQUAS_H
+#define AST_AQUAS_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+#endif
diff --git a/include/assets/ast_area_6.h b/include/assets/ast_area_6.h
@@ -0,0 +1,8 @@
+#ifndef AST_AREA_6_H
+#define AST_AREA_6_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+#endif
diff --git a/include/assets/ast_arwing.h b/include/assets/ast_arwing.h
@@ -0,0 +1,8 @@
+#ifndef AST_ARWING_H
+#define AST_ARWING_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+#endif
diff --git a/include/assets/ast_bg_planet.h b/include/assets/ast_bg_planet.h
@@ -0,0 +1,8 @@
+#ifndef AST_BG_PLANET_H
+#define AST_BG_PLANET_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+#endif
diff --git a/include/assets/ast_bg_space.h b/include/assets/ast_bg_space.h
@@ -0,0 +1,8 @@
+#ifndef AST_BG_SPACE_H
+#define AST_BG_SPACE_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+#endif
diff --git a/include/assets/ast_blue_marine.h b/include/assets/ast_blue_marine.h
@@ -0,0 +1,8 @@
+#ifndef AST_BLUE_MARINE_H
+#define AST_BLUE_MARINE_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+#endif
diff --git a/include/assets/ast_bolse.h b/include/assets/ast_bolse.h
@@ -0,0 +1,8 @@
+#ifndef AST_BOLSE_H
+#define AST_BOLSE_H
+
+#include "gfx.h"
+#include "sf64object.h"
+#include "structs.h"
+
+#endif