export configuration for ast_map (#172)

* progress

* progress

* progress

* progress

* progress

* progress

* progress

* finished?

* remove unnecessary header

* rename to map

* remove header

* rename to ast_map

* problem with torch

* Matchpoint

* take out pads and update Torch

.vscode/settings.json

@@ -100,7 +100,8 @@
     "ast_sector_x.h": "c",
     "ast_aquas.h": "c",
     "ast_enmy_space.h": "c",
-    "prevent_context_reordering.h": "c"
+    "prevent_context_reordering.h": "c",
+    "ast_option.h": "c"
   },
   "C_Cpp_Runner.msvcBatchPath": ""
 }

include/assets.h

@@ -19,7 +19,7 @@ extern Gfx D_4007AF0[];
 /* 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
+ * ast_katina, ast_macbeth, ast_title, ast_map, ast_training
  */
 extern Gfx D_60005B0[]; // fox_bg
 extern Gfx D_6000A80[]; // fox_bg, fox_effect

include/assets/ast_map.h

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

include/assets/ast_menu.h

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

include/sf64dma.h

@@ -163,7 +163,7 @@ DECLARE_SEGMENT(ast_katina);
 DECLARE_SEGMENT(ast_macbeth);
 DECLARE_SEGMENT(ast_warp_zone);
 DECLARE_SEGMENT(ast_title);
-DECLARE_SEGMENT(ast_menu);
+DECLARE_SEGMENT(ast_map);
 DECLARE_SEGMENT(ast_option);
 DECLARE_SEGMENT(ast_versus);
 DECLARE_SEGMENT(ast_font);

src/main/dmatable.c

@@ -56,7 +56,7 @@ DmaEntry gDmaTable[90] = {
     { SEGMENT_ROM_START(ast_macbeth), { SEGMENT_ROM_START(ast_macbeth), SEGMENT_ROM_END(ast_macbeth) }, false },
     { SEGMENT_ROM_START(ast_warp_zone), { SEGMENT_ROM_START(ast_warp_zone), SEGMENT_ROM_END(ast_warp_zone) }, false },
     { SEGMENT_ROM_START(ast_title), { SEGMENT_ROM_START(ast_title), SEGMENT_ROM_END(ast_title) }, false },
-    { SEGMENT_ROM_START(ast_menu), { SEGMENT_ROM_START(ast_menu), SEGMENT_ROM_END(ast_menu) }, false },
+    { SEGMENT_ROM_START(ast_map), { SEGMENT_ROM_START(ast_map), SEGMENT_ROM_END(ast_map) }, false },
     { SEGMENT_ROM_START(ast_option), { SEGMENT_ROM_START(ast_option), SEGMENT_ROM_END(ast_option) }, false },
     { SEGMENT_ROM_START(ast_versus), { SEGMENT_ROM_START(ast_versus), SEGMENT_ROM_END(ast_versus) }, false },
     { SEGMENT_ROM_START(ast_font), { SEGMENT_ROM_START(ast_font), SEGMENT_ROM_END(ast_font) }, false },

src/main/fox_load_inits.c

@@ -165,7 +165,7 @@ OverlayInit sOvlmenu_Option[1] = {
         /* 0x3 */ NO_SEGMENT,
         /* 0x4 */ NO_SEGMENT,
         /* 0x5 */ ROM_SEGMENT(ast_font),
-        /* 0x6 */ ROM_SEGMENT(ast_menu),
+        /* 0x6 */ ROM_SEGMENT(ast_map),
         /* 0x7 */ ROM_SEGMENT(ast_versus),
         /* 0x8 */ ROM_SEGMENT(ast_option),
         /* 0x9 */ ROM_SEGMENT(ast_font_3d),
@@ -184,7 +184,7 @@ OverlayInit sOvlmenu_Map[1] = {
         /* 0x3 */ ROM_SEGMENT(ast_arwing),
         /* 0x4 */ NO_SEGMENT,
         /* 0x5 */ ROM_SEGMENT(ast_font),
-        /* 0x6 */ ROM_SEGMENT(ast_menu),
+        /* 0x6 */ ROM_SEGMENT(ast_map),
         /* 0x7 */ NO_SEGMENT,
         /* 0x8 */ NO_SEGMENT,
         /* 0x9 */ ROM_SEGMENT(ast_font_3d),

src/overlays/ovl_menu/fox_map.c

@@ -1109,8 +1109,8 @@ Gfx* D_menu_801B68F8[] = {
     D_menu_801B5B10, D_menu_801B5440, D_menu_801B50D8, D_menu_801B57A8, D_604DB10,
 };
 
-extern u8 D_6000840[];
-extern u8 D_6001080[];
+extern u8 D_6000840[]; // ast_map
+extern u8 D_6001080[]; // ast_map
 extern u8 D_60018C0[];
 extern u8 D_600D590[];
 extern u8 D_6019030[];

yamls/us/assets.yaml

@@ -243,10 +243,14 @@
     type: bin
     start: 0xBFC510
 
-  - name: ast_menu
+  - name: ast_map
     exclusive_ram_id: segment_06
-    type: bin
+    type: code
+    dir: assets
     start: 0xC48F40
+    vram: 0x06000000
+    subsegments:
+      - [0xC48F40, .data, ast_map/ast_map]
 
   - name: ast_option
     exclusive_ram_id: segment_08