export configuration for ast_landmaster & ast_training (#165)

* remove header

* Matchpoint

* remove unnecessary externs

* Matchpoint (2 blobs)

* Asset analysis complete, here it comes!

* bye bye header

* MISSION ACCOMPLISHED

.vscode/settings.json

@@ -93,7 +93,10 @@
     "fox_std_lib_assets.h": "c",
     "fox_versus_assets.h": "c",
     "guint.h": "c",
-    "ast_test.h": "c"
+    "ast_test.h": "c",
+    "ast_landmaster.h": "c",
+    "ast_blue_marine.h": "c",
+    "ast_training.h": "c"
   },
   "C_Cpp_Runner.msvcBatchPath": ""
 }

assets/yaml/us/ast_blue_marine.yaml

@@ -15,8 +15,8 @@ D_blue_marine_3000000:
 D_blue_marine_3000080:
   { type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0x3000080, symbol: D_blue_marine_3000080 }
 
-D_3000090:
+D_blue_marine_3000090:
-  { type: TEXTURE, ctype: u8, format: CI4, width: 32, height: 9, offset: 0x3000090, symbol: D_3000090, tlut: 0x3000120 }
+  { type: TEXTURE, ctype: u8, format: CI4, width: 32, height: 9, offset: 0x3000090, symbol: D_blue_marine_3000090, tlut: 0x3000120 }
 
 D_3000120:
   { type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0x3000120, symbol: D_3000120 }
@@ -87,5 +87,5 @@ D_3006AF0:
 D_3006C70:
   { type: GFX, offset: 0x3006C70, symbol: D_3006C70 }
 
-D_3006DE0:
+D_blue_marine_3006DE0:
-  { type: GFX, offset: 0x3006DE0, symbol: D_3006DE0 }
+  { type: GFX, offset: 0x3006DE0, symbol: D_blue_marine_3006DE0 }

assets/yaml/us/ast_landmaster.yaml

@@ -0,0 +1,95 @@
+:config:
+  segments:
+    - [0x3, 0x8D99F0]
+  header:
+    code:
+      - '#include "assets/ast_landmaster.h"'
+    header:
+      - '#include "gfx.h"'
+      - '#include "sf64object.h"'
+      - '#include "structs.h"'
+
+
+D_landmaster_3000000:
+  { type: TEXTURE, format: CI4, offset: 0x3000000, width: 16, height: 16, ctype: u8, tlut: 0x3000080, symbol: D_landmaster_3000000 }
+
+D_landmaster_3000080:
+  { type: TEXTURE, format: TLUT, offset: 0x3000080, colors: 8, ctype: u16, symbol: D_landmaster_3000080 }
+
+D_landmaster_3000090:
+  { type: GFX, offset: 0x3000090, symbol: D_landmaster_3000090 }
+
+D_3004CA8:
+  { type: TEXTURE, format: RGBA16, offset: 0x3004CA8, width: 32, height: 32, ctype: u16, symbol: D_3004CA8 }
+
+D_30054A8:
+  { type: TEXTURE, format: RGBA16, offset: 0x30054A8, width: 32, height: 32, ctype: u16, symbol: D_30054A8 }
+
+D_3005CA8:
+  { type: TEXTURE, format: RGBA16, offset: 0x3005CA8, width: 16, height: 16, ctype: u16, symbol: D_3005CA8 }
+
+D_3005EA8:
+  { type: TEXTURE, format: RGBA16, offset: 0x3005EA8, width: 32, height: 32, ctype: u16, symbol: D_3005EA8 }
+
+D_3002680:
+  { type: TEXTURE, format: RGBA16, offset: 0x3002680, width: 32, height: 32, ctype: u16, symbol: D_3002680 }
+
+D_3002E80:
+  { type: TEXTURE, format: RGBA16, offset: 0x3002E80, width: 32, height: 32, ctype: u16, symbol: D_3002E80 }
+
+D_3003680:
+  { type: TEXTURE, format: RGBA16, offset: 0x3003680, width: 64, height: 32, ctype: u16, symbol: D_3003680 }
+
+D_3001680:
+  { type: TEXTURE, format: RGBA16, offset: 0x3001680, width: 32, height: 32, ctype: u16, symbol: D_3001680 }
+
+D_3001E80:
+  { type: TEXTURE, format: RGBA16, offset: 0x3001E80, width: 32, height: 32, ctype: u16, symbol: D_3001E80 }
+
+D_3004680:
+  { type: GFX, offset: 0x3004680, symbol: D_3004680 }
+
+PAD_30066A8:
+  { type: BLOB, offset: 0x30066A8, size: 0x8, symbol: PAD_30066A8 }
+
+D_30066B0:
+  { type: GFX, offset: 0x30066B0, symbol: D_30066B0 }
+
+D_3006738:
+  { type: TEXTURE, format: IA8, offset: 0x3006738, width: 16, height: 32, ctype: u8, symbol: D_3006738 }
+
+PAD_3006938:
+  { type: BLOB, offset: 0x3006938, size: 0x8, symbol: PAD_3006938 }
+
+D_3006940:
+  { type: GFX, offset: 0x3006940, symbol: D_3006940 }
+
+D_30069D8:
+  { type: TEXTURE, format: IA8, offset: 0x030069D8, width: 32, height: 32, ctype: u8, symbol: D_30069D8 }
+
+PAD_3006DD8:
+  { type: BLOB, offset: 0x3006DD8, size: 0x8, symbol: PAD_3006DD8 }
+
+D_landmaster_3006DE0:
+  { type: GFX, offset: 0x3006DE0, symbol: D_landmaster_3006DE0 }
+
+D_3006E68:
+  { type: TEXTURE, format: RGBA32, offset: 0x3006E68, width: 32, height: 32, ctype: u32, symbol: D_3006E68 }
+
+PAD_3007E68:
+  { type: BLOB, offset: 0x3007E68, size: 0x8, symbol: PAD_3007E68 }
+
+D_3007E70:
+  { type: GFX, offset: 0x3007E70, symbol: D_3007E70 }
+
+D_3007EF8:
+  { type: TEXTURE, format: RGBA16, offset: 0x3007EF8, width: 16, height: 16, ctype: u16, symbol: D_3007EF8 }
+
+PAD_30080F8:
+  { type: BLOB, offset: 0x30080F8, size: 0x8, symbol: PAD_30080F8 }
+
+D_3008100:
+  { type: GFX, offset: 0x3008100, symbol: D_3008100 }
+
+D_3008188:
+  { type: TEXTURE, format: IA8, offset: 0x03008188, width: 32, height: 32, ctype: u8, symbol: D_3008188 }

assets/yaml/us/ast_training.yaml

@@ -0,0 +1,94 @@
+:config:
+  segments:
+    - [0x6, 0xDDC010]
+  header:
+    code:
+      - '#include "assets/ast_training.h"'
+    header:
+      - '#include "gfx.h"'
+      - '#include "sf64object.h"'
+      - '#include "structs.h"'
+      - '#include "sf64level.h"'
+
+D_training_6000000:
+  { type: TEXTURE, format: IA8, offset: 0x6000000, width: 96, height: 12, ctype: u8, symbol: D_training_6000000 }
+
+D_training_6000480:
+  { type: TEXTURE, format: IA8, offset: 0x6000480, width: 96, height: 12, ctype: u8, symbol: D_training_6000480 }
+
+D_training_6000900:
+  { type: TEXTURE, format: RGBA16, offset: 0x6000900, width: 44, height: 44, ctype: u16, symbol: D_training_6000900 }
+
+D_training_6001820:
+  { type: TEXTURE, format: RGBA16, offset: 0x6001820, width: 44, height: 44, ctype: u16, symbol: D_training_6001820 }
+
+D_training_6002740:
+  { type: GFX, offset: 0x6002740, symbol: D_training_6002740 }
+
+D_60028F0:
+  { type: TEXTURE, format: RGBA16, offset: 0x060028F0, width: 32, height: 32, ctype: u16, symbol: D_60028F0 }
+
+D_training_60030F0:
+  { type: GFX, offset: 0x60030F0, symbol: D_training_60030F0 }
+
+D_6003360:
+  { type: TEXTURE, format: RGBA16, offset: 0x06003360, width: 16, height: 16, ctype: u16, symbol: D_6003360 }
+
+D_6003560:
+  { type: TEXTURE, format: RGBA16, offset: 0x06003560, width: 16, height: 16, ctype: u16, symbol: D_6003560 }
+
+D_training_6003760:
+  { type: GFX, offset: 0x6003760, symbol: D_training_6003760 }
+
+D_6003878:
+  { type: TEXTURE, format: RGBA16, offset: 0x06003878, width: 64, height: 32, ctype: u16, symbol: D_6003878 }
+
+D_6004878:
+  { type: TEXTURE, format: RGBA16, offset: 0x06004878, width: 64, height: 32, ctype: u16, symbol: D_6004878 }
+
+PAD_6005878:
+  { type: BLOB, offset: 0x6005878, size: 0x8, symbol: PAD_6005878 }
+
+D_training_6005880:
+  { type: GFX, offset: 0x6005880, symbol: D_training_6005880 }
+
+D_6005938:
+  { type: TEXTURE, format: RGBA16, offset: 0x06005938, width: 32, height: 32, ctype: u16, symbol: D_6005938 }
+
+PAD_6006138:
+  { type: BLOB, offset: 0x6006138, size: 0x8, symbol: PAD_6006138 }
+
+gItemTrainingRingDL:
+  { type: GFX, offset: 0x6006140, symbol: gItemTrainingRingDL }
+
+D_6006958:
+  { type: TEXTURE, format: RGBA16, offset: 0x06006958, width: 8, height: 8, ctype: u16, symbol: D_6006958 }
+
+D_60069D8:
+  { type: TEXTURE, format: RGBA16, offset: 0x060069D8, width: 8, height: 8, ctype: u16, symbol: D_60069D8 }
+
+PAD_6006A58:
+  { type: BLOB, offset: 0x6006A58, size: 0x8, symbol: PAD_6006A58 }
+
+D_training_6006A60:
+  { type: SF64:ENV_SETTINGS, offset: 0x6006A60, symbol: D_training_6006A60 }
+
+D_6006AA4:
+  { type: SF64:OBJECT_INIT, offset: 0x6006AA4, symbol: D_6006AA4 }
+
+D_6008EF8:
+  { type: SF64:OBJECT_INIT, offset: 0x6008EF8, symbol: D_6008EF8 }
+
+D_training_6009B34:
+  { type: SF64:SCRIPT, offset: 0x6009B34, symbol: D_training_6009B34 }
+
+D_training_6009CC4:
+  { type: SF64:HITBOX, offset: 0x6009CC4, symbol: D_training_6009CC4 }
+
+D_training_6009CFC:
+  { type: SF64:HITBOX, offset: 0x6009CFC, symbol: D_training_6009CFC }
+
+D_training_6009D18:
+  { type: SF64:HITBOX, offset: 0x6009D18, symbol: D_training_6009D18 }
+
+# size = 0x9D40

include/assets.h

@@ -103,7 +103,6 @@ extern u16 D_3000810[];
 extern u8  D_30013E0[];
 extern u8  D_3001420[];
 extern u16 D_3000BC0[];
-extern Gfx D_3006940[];
 extern u8  D_3004010[];
 extern u16 D_3003E20[];
 extern u16 D_3004D58[];
@@ -118,15 +117,10 @@ extern u8  D_300A470[];
 
 
 extern Gfx D_3001C90[];
-extern u16 D_3002E80[];
 extern Gfx D_3003CE0[];
-extern Gfx D_3004680[];
 extern Gfx D_3005980[];
 extern Gfx D_3005AB0[];
-extern u16 D_3005EA8[];
-extern Gfx D_30066B0[];
 extern Gfx D_3007650[];
-extern Gfx D_3008100[];
 extern u8 D_300D350[];
 extern u16 D_300D398[];
 extern u8 D_300D3C0[];
@@ -252,14 +246,12 @@ extern u8 D_500A7D0[]; // fox_std_lib, fox_versus, fox_option, fox_hud
  * ast_katina, ast_macbeth, ast_title, ast_menu, ast_training
  */
 extern Gfx D_60005B0[]; // fox_bg
-extern u16 D_6000900[]; // fox_radio
 extern Gfx D_6000A80[]; // fox_bg, fox_effect
 extern u16 D_6000B60[]; // fox_radio
 extern Gfx D_6000E00[]; // fox_edata_1C
 extern Gfx D_6000E10[]; // fox_enmy2
 extern Gfx D_6001360[]; // fox_bg, fox_demo, fox_edata_1C
 extern Gfx D_6001530[]; // fox_360, fox_demo, fox_ka
-extern u16 D_6001820[]; // fox_radio
 extern Gfx D_6001840[]; // fox_bg
 extern Gfx D_6001950[]; // fox_enmy2
 extern Gfx D_6001A60[]; // fox_effect

include/assets/ast_landmaster.h

@@ -1,8 +0,0 @@
-#ifndef AST_LANDMASTER_H
-#define AST_LANDMASTER_H
-
-#include "gfx.h"
-#include "sf64object.h"
-#include "structs.h"
-
-#endif

include/assets/ast_training.h

@@ -1,8 +0,0 @@
-#ifndef AST_TRAINING_H
-#define AST_TRAINING_H
-
-#include "gfx.h"
-#include "sf64object.h"
-#include "structs.h"
-
-#endif

include/fox_enmy2_assets.h

@@ -70,7 +70,6 @@ extern Gfx D_601A2B0[];
 extern Gfx D_6002500[];
 extern Gfx D_60043F0[];
 extern Gfx D_6004310[];
-extern Gfx D_6002740[];
 extern Gfx D_6002890[];
 
 extern f32 D_60282A0[];

linker_scripts/us/undefined_syms.ld

@@ -87,8 +87,6 @@ D_200F080 = 0x0200F080;
 D_200F910 = 0x0200F910;
 D_20101A0 = 0x020101A0;
 
-D_3000000 = 0x03000000;
-D_3000080 = 0x03000080;
 D_3001C90 = 0x03001C90;
 D_3003CE0 = 0x03003CE0;
 D_3007650 = 0x03007650;
@@ -138,7 +136,6 @@ D_60012A0 = 0x060012A0;
 D_60023B0 = 0x060023B0;
 D_6002990 = 0x06002990;
 D_6003000 = 0x06003000;
-D_60030F0 = 0x060030F0;
 D_60034D0 = 0x060034D0;
 D_6003610 = 0x06003610;
 D_60036A0 = 0x060036A0;
@@ -146,7 +143,6 @@ D_6004170 = 0x06004170;
 D_6004AC0 = 0x06004AC0;
 D_6005360 = 0x06005360;
 D_6005780 = 0x06005780;
-D_6006140 = 0x06006140;
 D_6006310 = 0x06006310;
 D_60064AC = 0x060064AC;
 D_60064C8 = 0x060064C8;
@@ -187,8 +183,6 @@ D_60092E8 = 0x060092E8;
 D_6009388 = 0x06009388;
 D_60097E0 = 0x060097E0;
 D_6009AD0 = 0x06009AD0;
-D_6009CC4 = 0x06009CC4;
-D_6009CFC = 0x06009CFC;
 D_600A420 = 0x0600A420;
 D_600AF40 = 0x0600AF40;
 D_600B8B0 = 0x0600B8B0;
@@ -523,7 +517,6 @@ D_6007E30 = 0x06007E30;
 D_601F1F0 = 0x0601F1F0;
 D_60266D0 = 0x060266D0;
 D_C035110 = 0x0C035110;
-D_6006A60 = 0x06006A60;
 D_6030E30_Env = 0x06030E30;
 D_6005000 = 0x06005000;
 D_602E540 = 0x0602E540;
@@ -1080,7 +1073,6 @@ D_600AC70 = 0x0600AC70;
 D_6002500 = 0x06002500;
 D_60043F0 = 0x060043F0;
 D_6004310 = 0x06004310;
-D_6002740 = 0x06002740;
 D_4006E90 = 0x04006E90;
 D_4009800 = 0x04009800;
 D_40073C0 = 0x040073C0;
@@ -1124,7 +1116,6 @@ D_60368FC = 0x060368FC;
 D_60368E0 = 0x060368E0;
 D_60364C0 = 0x060364C0;
 D_601B944 = 0x0601B944;
-D_6009D18 = 0x06009D18;
 D_60368E0 = 0x060368E0;
 
 // fox_option
@@ -1276,7 +1267,6 @@ D_A001EC0 = 0x0A001EC0;
 D_A001BE0 = 0x0A001BE0;
 D_7004270 = 0x07004270;
 
-D_3002E80 = 0x3002E80;
 D_3005AB0 = 0x3005AB0;
 D_1000000 = 0x1000000;
 D_1000280 = 0x1000280;
@@ -1398,23 +1388,15 @@ D_3000BC0 = 0x3000BC0;
 D_3000C70 = 0x3000C70;
 D_30013E0 = 0x30013E0;
 D_3001420 = 0x3001420;
-D_3002E80 = 0x3002E80;
 D_3003E20 = 0x3003E20;
 D_3004010 = 0x3004010;
-D_3004680 = 0x3004680;
 D_3004D58 = 0x3004D58;
 D_3005980 = 0x3005980;
 D_3005AB0 = 0x3005AB0;
-D_3005EA8 = 0x3005EA8;
-D_30066B0 = 0x30066B0;
-D_3006940 = 0x3006940;
 D_3006AF0 = 0x3006AF0;
 D_3006C60 = 0x3006C60;
 D_3006C70 = 0x3006C70;
-D_3006DE0 = 0x3006DE0;
 D_3007500 = 0x3007500;
-D_3007E70 = 0x3007E70;
-D_3008100 = 0x3008100;
 D_300A470 = 0x300A470;
 D_300B218 = 0x300B218;
 D_300D350 = 0x300D350;
@@ -1527,7 +1509,6 @@ D_500B600 = 0x500B600;
 D_6000000 = 0x6000000;
 D_60005B0 = 0x60005B0;
 D_6000840 = 0x6000840;
-D_6000900 = 0x6000900;
 D_6000A80 = 0x6000A80;
 D_6000AE4 = 0x6000AE4;
 D_6000B60 = 0x6000B60;
@@ -1545,7 +1526,6 @@ D_6001310 = 0x6001310;
 D_6001360 = 0x6001360;
 D_60014A0 = 0x60014A0;
 D_6001530 = 0x6001530;
-D_6001820 = 0x6001820;
 D_6001840 = 0x6001840;
 D_60018C0 = 0x60018C0;
 D_6001950 = 0x6001950;
@@ -1571,7 +1551,6 @@ D_6003090 = 0x6003090;
 D_6003348 = 0x6003348;
 D_6003370 = 0x6003370;
 D_60034C4 = 0x60034C4;
-D_6003760 = 0x6003760;
 D_60038C0 = 0x60038C0;
 D_60038E0 = 0x60038E0;
 D_60038F8 = 0x60038F8;
@@ -1587,7 +1566,6 @@ D_6004900 = 0x6004900;
 D_6004FE0 = 0x6004FE0;
 D_6005700 = 0x6005700;
 D_6005710 = 0x6005710;
-D_6005880 = 0x6005880;
 D_6005954 = 0x6005954;
 D_60059F0 = 0x60059F0;
 D_6005A80 = 0x6005A80;
@@ -1643,7 +1621,6 @@ D_6009230 = 0x6009230;
 D_6009250 = 0x6009250;
 D_6009300 = 0x6009300;
 D_60097E0 = 0x60097E0;
-D_6009B34 = 0x6009B34;
 D_6009BB8 = 0x6009BB8;
 D_6009BC0 = 0x6009BC0;
 D_6009C30 = 0x6009C30;

src/main/fox_beam.c

@@ -1,4 +1,5 @@
 #include "global.h"
+#include "assets/ast_landmaster.h"
 
 static Vec3f D_8015F950;
 

src/main/fox_bg.c

@@ -17,6 +17,7 @@ UNK_TYPE D_8015F988[0x683]; // Unused? Close to being [13][0x80]
 f32 D_80161394;             // can be static
 
 #include "assets/ast_bg_planet.h"
+#include "assets/ast_training.h"
 
 f32 D_800C9C30 = 0.0f;
 u16 D_800C9C34 = 1;
@@ -565,7 +566,7 @@ void func_8003E1E8(void) {
                             Matrix_SetGfxMtx(&gMasterDisp);
                             RCP_SetupDL_62();
                             gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255);
-                            gSPDisplayList(gMasterDisp++, D_6003760);
+                            gSPDisplayList(gMasterDisp++, D_training_6003760);
                             break;
                         case LEVEL_AREA_6:
                         case LEVEL_UNK_4:
@@ -975,14 +976,14 @@ void func_80040CE4(void) {
                 Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -3000.0f + D_80177CE8, 1);
                 Matrix_Scale(gGfxMatrix, 1.0f, 1.0f, 0.5f, 1);
                 Matrix_SetGfxMtx(&gMasterDisp);
-                gSPDisplayList(gMasterDisp++, D_6005880);
+                gSPDisplayList(gMasterDisp++, D_training_6005880);
                 Matrix_Pop(&gGfxMatrix);
                 if (1) {}
                 Matrix_Push(&gGfxMatrix);
                 Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, 3000.0f + D_80177CE8, 1);
                 Matrix_Scale(gGfxMatrix, 1.0f, 1.0f, 0.5f, 1);
                 Matrix_SetGfxMtx(&gMasterDisp);
-                gSPDisplayList(gMasterDisp++, D_6005880);
+                gSPDisplayList(gMasterDisp++, D_training_6005880);
                 Matrix_Pop(&gGfxMatrix);
             } else {
                 for (i = 0; i < 4; i++) {
@@ -990,7 +991,7 @@ void func_80040CE4(void) {
                     Matrix_Translate(gGfxMatrix, D_800C9E64[i], 0.0f, D_800C9E74[i], 1);
                     Matrix_Scale(gGfxMatrix, 1.5f, 1.0f, 1.0f, 1);
                     Matrix_SetGfxMtx(&gMasterDisp);
-                    gSPDisplayList(gMasterDisp++, D_6005880);
+                    gSPDisplayList(gMasterDisp++, D_training_6005880);
                     Matrix_Pop(&gGfxMatrix);
                 }
             }

src/main/fox_display.c

@@ -14,6 +14,7 @@ f32 D_801615B8[4];
 
 #include "assets/ast_arwing.h"
 #include "assets/ast_allies.h"
+#include "assets/ast_landmaster.h"
 
 s32 D_800CA220 = 0;
 u8 D_800CA224[] = { 0, 0, 0, 0 };

src/main/fox_edata_1C.c

@@ -3,6 +3,8 @@
 extern f32 D_6031398[];
 extern f32 D_60313CC[];
 
+#include "assets/ast_training.h"
+
 f32 D_800CBE70[] = {
     1.0f, 0.0f, 50.0f, 0.0f, 25.0f, 0.0f, 25.0f,
 };
@@ -206,7 +208,7 @@ ObjectInfo D_800CC124[0x190] = {
   /* OBJ_80_130  */  {(void*)     D_900F1D0, 0, (ObjectFunc)          NULL,        D_601B75C,  3200.0f,  0, 0, 42, 0,   0.0f,  0 },
   /* OBJ_80_131  */  {(void*) func_i6_801935D4, 1, (ObjectFunc) func_i6_8019356C,        D_C038BD8,   500.0f,  0, 0, 41, 0,   0.0f,  0 },
   /* OBJ_80_132  */  {(void*) func_i6_8019350C, 1, (ObjectFunc) func_i6_80193380,        D_C038A48,   500.0f,  0, 0, 41, 0,   0.0f,  0 },
-  /* OBJ_80_133  */  {(void*)     D_60030F0, 0, (ObjectFunc)          NULL,        D_6009CC4,  1000.0f,  0, 0, 20, 0,   0.0f,  0 },
+  /* OBJ_80_133  */  {(void*)     D_training_60030F0, 0, (ObjectFunc)          NULL,        D_training_6009CC4,  1000.0f,  0, 0, 20, 0,   0.0f,  0 },
   /* OBJ_80_134  */  {(void*)     D_6003000, 0, (ObjectFunc)          NULL,        D_C038BA4,     0.0f,  0, 0, 41, 1,   0.0f,  0 },
   /* OBJ_80_135  */  {(void*) D_6006890_Gfx, 0, (ObjectFunc)          NULL,        D_C038B40,     0.0f,  0, 0, 41, 1,   0.0f,  0 },
   /* OBJ_80_136  */  {(void*)     D_6002990, 0, (ObjectFunc)          NULL,        D_C038B40,     0.0f,  0, 0, 41, 1,   0.0f,  0 },
@@ -411,7 +413,7 @@ ObjectInfo D_800CC124[0x190] = {
   /* OBJ_ITEM_1UP  */  {(void*)     D_1022120, 0, (ObjectFunc) func_80067B1C,       D_800CBE8C,   700.0f,  0, 0,  0, 0,   0.0f,  0 },
   /* OBJ_ITEM_GOLD_RING  */  {(void*) func_8005CA80, 1, (ObjectFunc) func_800685F8,       D_800CBF54,   700.0f,  0, 0,  0, 0,   0.0f,  0 },
   /* OBJ_ITEM_WING_REPAIR  */  {(void*)     D_3007650, 0, (ObjectFunc) func_80068618,       D_800CBFA8,   700.0f,  0, 0,  0, 0,   0.0f,  0 },
-  /* OBJ_ITEM_TRAINING_RING  */  {(void*)     D_6006140, 0, (ObjectFunc) func_i1_80198968,        D_6009CFC,   700.0f,  0, 0,  0, 0,   0.0f,  0 },
+  /* OBJ_ITEM_TRAINING_RING  */  {(void*)     gItemTrainingRingDL, 0, (ObjectFunc) func_i1_80198968,        D_training_6009CFC,   700.0f,  0, 0,  0, 0,   0.0f,  0 },
   /* OBJ_EFFECT_339  */  {(void*) func_8007D55C, 1, (ObjectFunc) func_8007D2F4,             NULL,  -200.0f,  1, 2,  0, 0,   0.0f,  0 },
   /* OBJ_EFFECT_340  */  {(void*) func_8007D55C, 1, (ObjectFunc) func_8007D748,             NULL,  -200.0f,  1, 2,  0, 0,   0.0f,  0 },
   /* OBJ_EFFECT_341  */  {(void*) func_8007D55C, 1, (ObjectFunc) func_8007D8A8,             NULL,  -200.0f,  1, 2,  0, 0,   0.0f,  0 },

src/main/fox_effect.c

@@ -37,6 +37,7 @@ extern Gfx D_9013C20[];
 
 #include "assets/ast_bg_space.h"
 #include "assets/ast_bg_planet.h"
+#include "assets/ast_training.h"
 
 void BonusText_Display(f32 xPos, f32 yPos, f32 zPos, s32 hits) {
     s32 i;
@@ -1056,7 +1057,7 @@ void func_8007A994(Effect* effect) {
     effect->unk_4A++;
 }
 
-Gfx* D_800D178C[] = { D_6003440, D_60034E0, D_6003580, D_6003620, D_60036C0, D_6003760 };
+Gfx* D_800D178C[] = { D_6003440, D_60034E0, D_6003580, D_6003620, D_60036C0, D_training_6003760 };
 
 void func_8007AA60(Effect* effect) {
     RCP_SetupDL(&gMasterDisp, 0x44);

src/main/fox_enmy2.c

@@ -5,6 +5,7 @@ s32 D_800CFF90 = 0;
 s32 D_80161690;
 
 #include "fox_enmy2_assets.h"
+#include "assets/ast_training.h"
 #include "assets/ast_warp_zone.h"
 #include "assets/ast_allies.h"
 
@@ -955,7 +956,7 @@ UnkStruct_D003C D_800D003C[108] = {
     { D_6002500, D_601B944, -1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 1 },
     { D_60043F0, D_800CBF34, -1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 1 },
     { D_6004310, D_800CBF34, -1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 1 },
-    { D_6002740, D_6009D18, -1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 1 },
+    { D_training_6002740, D_training_6009D18, -1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 1 },
     { NULL, D_800CBF34, -1.0f, 500.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 0 },
     { NULL, D_800CBF34, -1.0f, 500.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 0 },
     { NULL, D_800CBEC4, 1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 1.0f, 1 },
@@ -1017,7 +1018,7 @@ void func_8006D36C(Actor* actor) {
             var_v1 = SEGMENTED_TO_VIRTUAL(D_60381D8);
             break;
         case LEVEL_TRAINING:
-            var_v1 = SEGMENTED_TO_VIRTUAL(D_6009B34);
+            var_v1 = SEGMENTED_TO_VIRTUAL(D_training_6009B34);
             break;
         default:
             var_v1 = SEGMENTED_TO_VIRTUAL(D_603D9E8);

src/main/fox_hud.c

@@ -1,7 +1,9 @@
 #include "prevent_bss_reordering.h"
 #include "sf64math.h"
-
 #include "assets/ast_blue_marine.h"
+#include "assets/ast_landmaster.h"
+#include "assets/ast_training.h"
+
 // BSS section range:
 // D_801616A0 <==> D_80161910
 
@@ -165,12 +167,12 @@ void func_80084930(f32 arg0, f32 arg1, s32 arg2) {
     u8* D_800D1A58[] = {
         D_arwing_3000000,
         D_blue_marine_3000000,
-        D_3000000,
+        D_landmaster_3000000,
     };
     u16* D_800D1A64[] = {
         D_arwing_3000080,
         D_blue_marine_3000080,
-        D_3000080,
+        D_landmaster_3000080,
     };
     Player* player;
     s32 var_t0;
@@ -948,8 +950,8 @@ void func_80086DCC(void) {
 }
 
 void func_80087530(f32 x, f32 y, s32 number) {
-    u8* D_800D1D00[] = { D_arwing_3000000, D_blue_marine_3000000, D_3000000 };
+    u8* D_800D1D00[] = { D_arwing_3000000, D_blue_marine_3000000, D_landmaster_3000000 };
-    u16* D_800D1D0C[] = { D_arwing_3000080, D_blue_marine_3000080, D_3000080 };
+    u16* D_800D1D0C[] = { D_arwing_3000080, D_blue_marine_3000080, D_landmaster_3000080 };
     Player* player = &gPlayer[0];
     f32 x0;
     f32 x1;
@@ -1709,7 +1711,7 @@ void func_80088970(void) {
                 }
 
                 if (gCurrentLevel == LEVEL_TRAINING) {
-                    TextureRect_8bIA(&gMasterDisp, D_6000000, 96, 12, x1, y1, 1.0f, 1.0f);
+                    TextureRect_8bIA(&gMasterDisp, D_training_6000000, 96, 12, x1, y1, 1.0f, 1.0f);
                 } else {
                     if (gLifeCount[gPlayerNum]) {
                         TextureRect_8bIA(&gMasterDisp, D_1000280, 96, 10, x1, y1, 1.0f, 1.0f);
@@ -3528,7 +3530,7 @@ void func_8008EA14(f32 x, f32 y) {
         case 6:
             RCP_SetupDL(&gMasterDisp, 0x4E);
             gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
-            TextureRect_4bCI(&gMasterDisp, D_3000090, D_3000120, 32, 9, x + 1.0f, y, 1.0f, 1.0f);
+            TextureRect_4bCI(&gMasterDisp, D_blue_marine_3000090, D_3000120, 32, 9, x + 1.0f, y, 1.0f, 1.0f);
             break;
     }
 }

src/main/fox_play.c

@@ -1,6 +1,7 @@
 #include "prevent_bss_reordering2.h"
 #include "global.h"
 #include "fox_map.h"
+#include "assets/ast_training.h"
 
 UNK_TYPE D_800D2F50 = 0;
 s32 D_800D2F54 = 0;
@@ -33,8 +34,9 @@ extern s32 D_i4_801A03DC;
 bool Play_CheckMedalStatus(u16 hitCount) {
     if ((gTeamShields[2] > 0) && (gTeamShields[3] > 0) && (gTeamShields[1] > 0) && (gHitCount >= hitCount)) {
         return true;
+    } else {
+        return false;
     }
-    return false;
 }
 
 void func_800A3FB0(void) {
@@ -452,9 +454,9 @@ void func_800A5844(void) {
 }
 
 EnvSettings* D_800D2F98[21] = {
-    &D_6037160, &D_ENV_6026C80, &D_602A120, &D_6023F20,     &D_6028760,     &D_602E4B0, &D_6007E30,
+    &D_6037160, &D_ENV_6026C80, &D_602A120, &D_6023F20,          &D_6028760,     &D_602E4B0, &D_6007E30,
-    &D_601F1F0, &D_60266D0,     &D_C035110, &D_6006A60,     &D_6030E30_Env, &D_6005000, &D_602E540,
+    &D_601F1F0, &D_60266D0,     &D_C035110, &D_training_6006A60, &D_6030E30_Env, &D_6005000, &D_602E540,
-    &D_600EA90, NULL,           &D_6011000, &D_600FF30_Env, &D_6006E70,     &D_6014D50, &D_302DD70,
+    &D_600EA90, NULL,           &D_6011000, &D_600FF30_Env,      &D_6006E70,     &D_6014D50, &D_302DD70,
 };
 
 void func_800A594C(void) {

src/main/fox_radio.c

@@ -13,6 +13,7 @@ s32 D_80178744;
 s32 D_80178748;
 
 #include "assets/ast_allies.h"
+#include "assets/ast_training.h"
 
 s32 gCurrentMsgPri = 0;
 
@@ -370,10 +371,10 @@ void func_800BAAE8(void) {
             sp44 = D_E010E60;
             break;
         case RCID_TRAINING:
-            sp44 = D_6000900;
+            sp44 = D_training_6000900;
             break;
         case RCID_TRAINING_OPEN:
-            sp44 = D_6001820;
+            sp44 = D_training_6001820;
             break;
         case RCID_STATIC_FLIP:
             mirror = true;

src/main/fox_tank.c

@@ -1,4 +1,5 @@
 #include "global.h"
+#include "assets/ast_landmaster.h"
 
 void func_80047754(Player* player);
 void func_80047D38(Player* player, f32);

src/overlays/ovl_i3/fox_aq.c

@@ -1,18 +1,10 @@
 // #include "prevent_bss_reordering.h"
 #include "global.h"
+#include "assets/ast_blue_marine.h"
 
 const char D_i3_801C1A30[] = "プレイヤーのすべてをクリア \n";
 const char D_i3_801C1A50[] = "i %d\n";
 
-// /* 0x3 */ ROM_SEGMENT(ast_8E1F80),
-extern Gfx D_3000130[];
-extern Gfx D_3000470[];
-extern Gfx D_3000AF0[];
-extern Gfx D_3000C70[];
-extern Gfx D_3006AF0[];
-extern Gfx D_3006C70[];
-extern Gfx D_3006DE0[];
-
 // /* 0x6 */ ROM_SEGMENT(ast_A58F60),
 extern Animation D_6000AE4;
 extern Limb* D_6000DB0[];
@@ -1361,7 +1353,7 @@ void func_i3_801ACBB4(Player* player) {
     Matrix_Translate(gGfxMatrix, 0.0f, -4.5f, 1.2f, 1);
     Matrix_RotateZ(gGfxMatrix, player->unk_178 * M_DTOR, 1);
     Matrix_SetGfxMtx(&gMasterDisp);
-    gSPDisplayList(gMasterDisp++, D_3006DE0);
+    gSPDisplayList(gMasterDisp++, D_blue_marine_3006DE0);
     Matrix_Pop(&gGfxMatrix);
     Matrix_Push(&gGfxMatrix);
     Matrix_Translate(gGfxMatrix, 0.0f, 2.0f, 40.0f, 1);

src/overlays/ovl_i5/fox_ma.c

@@ -1,4 +1,5 @@
 #include "global.h"
+#include "assets/ast_landmaster.h"
 
 extern u8 D_6023228[];
 extern u8 D_6023388[];

src/overlays/ovl_i5/fox_ti.c

@@ -1,6 +1,7 @@
 #include "global.h"
 #include "assets/ast_bg_planet.h"
 #include "assets/ast_7_ti_1.h"
+#include "assets/ast_landmaster.h"
 
 extern Animation D_7003EE8;
 extern Gfx D_7005300[];
@@ -10,7 +11,6 @@ extern Animation D_70096EC;
 extern Limb* D_700C964[];
 extern Limb* D_700D700[];
 extern Animation D_700E244;
-extern Gfx D_3007E70[];
 extern f32 D_6006924[];
 extern f32 D_6006C0C[];
 extern f32 D_6006C28[];

yamls/us/assets.yaml

@@ -44,8 +44,12 @@
 
   - name: ast_landmaster
     exclusive_ram_id: segment_03
-    type: bin
+    type: code
+    dir: assets
     start: 0x8D99F0
+    vram: 0x03000000
+    subsegments:
+      - [0x8D99F0, .data, ast_landmaster/ast_landmaster]
 
   - name: ast_blue_marine
     exclusive_ram_id: segment_03
@@ -308,8 +312,12 @@
 
   - name: ast_training
     exclusive_ram_id: segment_06
-    type: bin
+    type: code
+    dir: assets
     start: 0xDDC010
+    vram: 0x06000000
+    subsegments:
+      - [0xDDC010, .data, ast_training/ast_training]
 
   - name: ast_radio
     type: code