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": ""
 }

assets/yaml/us/ast_map.yaml

@@ -0,0 +1,566 @@
+:config:
+  segments:
+    - [0x06, 0xC48F40]
+  header:
+    code:
+      - '#include "assets/ast_map.h"'
+    header:
+      - '#include "gfx.h"'
+      - '#include "sf64object.h"'
+      - '#include "structs.h"'
+
+# Restart Game (Game Over)
+D_MAP_6000000:
+  { type: TEXTURE, format: IA8, offset: 0x6000000, width: 96, height: 22, ctype: u8, symbol: D_MAP_6000000 }
+
+# Proceed to Next Course
+D_MAP_6000840:
+  { type: TEXTURE, format: IA8, offset: 0x6000840, width: 96, height: 22, ctype: u8, symbol: D_MAP_6000840 }
+
+# Retry Course (Lose 1 Arwing)
+D_MAP_6001080:
+  { type: TEXTURE, format: IA8, offset: 0x6001080, width: 96, height: 22, ctype: u8, symbol: D_MAP_6001080 }
+
+# Change Course
+D_MAP_60018C0:
+  { type: TEXTURE, format: IA8, offset: 0x60018C0, width: 96, height: 10, ctype: u8, symbol: D_MAP_60018C0 }
+
+# Aquas Ocean
+D_MAP_6001C80:
+  { type: TEXTURE, format: IA8, offset: 0x6001C80, width: 96, height: 13, ctype: u8, symbol: D_MAP_6001C80 }
+
+# Terror of the Deep
+D_MAP_6002160:
+  { type: TEXTURE, format: IA8, offset: 0x6002160, width: 208, height: 19, ctype: u8, symbol: D_MAP_6002160 }
+
+# Meteo
+# Asteroid Field
+D_MAP_60030D0:
+  { type: TEXTURE, format: IA8, offset: 0x60030D0, width: 96, height: 28, ctype: u8, symbol: D_MAP_60030D0 }
+
+# Into the Asteroid Field
+D_MAP_6003B50:
+  { type: TEXTURE, format: IA8, offset: 0x6003B50, width: 208, height: 19, ctype: u8, symbol: D_MAP_6003B50 }
+
+# Bolse Defense Outpost
+D_MAP_6004AC0:
+  { type: TEXTURE, format: IA8, offset: 0x6004AC0, width: 168, height: 19, ctype: u8, symbol: D_MAP_6004AC0 }
+
+# The Last Hurrah
+D_MAP_6005740:
+  { type: TEXTURE, format: IA8, offset: 0x6005740, width: 160, height: 19, ctype: u8, symbol: D_MAP_6005740 }
+
+# Area 6
+# Defense Station
+D_MAP_6006320:
+  { type: TEXTURE, format: IA8, offset: 0x6006320, width: 104, height: 28, ctype: u8, symbol: D_MAP_6006320 }
+
+# Through the Middle
+D_MAP_6006E80:
+  { type: TEXTURE, format: IA8, offset: 0x6006E80, width: 176, height: 19, ctype: u8, symbol: D_MAP_6006E80 }
+
+# Corneria
+# Former Army Base
+D_MAP_6007B90:
+  { type: TEXTURE, format: IA8, offset: 0x6007B90, width: 128, height: 28, ctype: u8, symbol: D_MAP_6007B90 }
+
+# Enter Star Fox
+D_MAP_6008990:
+  { type: TEXTURE, format: IA8, offset: 0x6008990, width: 232, height: 19, ctype: u8, symbol: D_MAP_6008990 }
+
+# Fortuna
+# Former Defense Post
+D_MAP_6009AD0:
+  { type: TEXTURE, format: IA8, offset: 0x6009AD0, width: 168, height: 28, ctype: u8, symbol: D_MAP_6009AD0 }
+
+# Enter Star Wolf
+D_MAP_600AD30:
+  { type: TEXTURE, format: IA8, offset: 0x600AD30, width: 168, height: 19, ctype: u8, symbol: D_MAP_600AD30 }
+
+# Katina
+# Frontline Base
+D_MAP_600B9B0:
+  { type: TEXTURE, format: IA8, offset: 0x600B9B0, width: 168, height: 28, ctype: u8, symbol: D_MAP_600B9B0 }
+
+# Reunion
+D_MAP_600CC10:
+  { type: TEXTURE, format: IA8, offset: 0x600CC10, width: 128, height: 19, ctype: u8, symbol: D_MAP_600CC10 }
+
+# The Lylat System
+D_MAP_600D590:
+  { type: TEXTURE, format: IA8, offset: 0x600D590, width: 168, height: 19, ctype: u8, symbol: D_MAP_600D590 }
+
+# Macbeth
+# Venom Army Supply Base
+D_MAP_600E210:
+  { type: TEXTURE, format: IA8, offset: 0x600E210, width: 160, height: 28, ctype: u8, symbol: D_MAP_600E210 }
+
+# The Forever Train
+D_MAP_600F390:
+  { type: TEXTURE, format: IA8, offset: 0x600F390, width: 168, height: 19, ctype: u8, symbol: D_MAP_600F390 }
+
+# Solar
+D_MAP_6010010:
+  { type: TEXTURE, format: IA8, offset: 0x6010010, width: 112, height: 13, ctype: u8, symbol: D_MAP_6010010 }
+
+# Out of the Frying Pan.
+D_MAP_60105C0:
+  { type: TEXTURE, format: IA8, offset: 0x60105C0, width: 224, height: 19, ctype: u8, symbol: D_MAP_60105C0 }
+
+# Sector X Combat Zone
+D_MAP_6011660:
+  { type: TEXTURE, format: IA8, offset: 0x6011660, width: 176, height: 12, ctype: u8, symbol: D_MAP_6011660 }
+
+# Mystery of the Space Base
+D_MAP_6011EA0:
+  { type: TEXTURE, format: IA8, offset: 0x6011EA0, width: 256, height: 19, ctype: u8, symbol: D_MAP_6011EA0 }
+
+# Sector Y Combat Zone
+D_MAP_60131A0:
+  { type: TEXTURE, format: IA8, offset: 0x60131A0, width: 176, height: 12, ctype: u8, symbol: D_MAP_60131A0 }
+
+# Fierce Melee
+D_MAP_60139E0:
+  { type: TEXTURE, format: IA8, offset: 0x60139E0, width: 128, height: 19, ctype: u8, symbol: D_MAP_60139E0 }
+
+# Sector Z Combat Zone
+D_MAP_6014360:
+  { type: TEXTURE, format: IA8, offset: 0x6014360, width: 176, height: 12, ctype: u8, symbol: D_MAP_6014360 }
+
+# The Ambush of Great Fox
+D_MAP_6014BA0:
+  { type: TEXTURE, format: IA8, offset: 0x6014BA0, width: 232, height: 19, ctype: u8, symbol: D_MAP_6014BA0 }
+
+# Titania
+# Arid Desert
+D_MAP_6015CE0:
+  { type: TEXTURE, format: IA8, offset: 0x6015CE0, width: 96, height: 28, ctype: u8, symbol: D_MAP_6015CE0 }
+
+# The Search for Slippy
+D_MAP_6016760:
+  { type: TEXTURE, format: IA8, offset: 0x6016760, width: 200, height: 19, ctype: u8, symbol: D_MAP_6016760 }
+
+# Zones
+# Toxic Waste Area
+D_MAP_6017640: 
+  { type: TEXTURE, format: IA8, offset: 0x6017640, width: 112, height: 28, ctype: u8, symbol: D_MAP_6017640 }
+
+# Invasion Aftermath
+D_MAP_6018280: 
+  { type: TEXTURE, format: IA8, offset: 0x6018280, width: 184, height: 19, ctype: u8, symbol: D_MAP_6018280 }
+
+D_MAP_6019030: 
+  { type: TEXTURE, format: IA8, offset: 0x6019030, width: 8, height: 16, ctype: u8, symbol: D_MAP_6019030 }
+
+# Clouds ?
+D_MAP_60190B0: 
+  { type: TEXTURE, format: IA8, offset: 0x60190B0, width: 96, height: 96, ctype: u8, symbol: D_MAP_60190B0 }
+
+D_MAP_601B4B0: 
+  { type: TEXTURE, format: IA8, offset: 0x601B4B0, width: 32, height: 32, ctype: u8, symbol: D_MAP_601B4B0 }
+
+# Some text in japanese
+D_MAP_601B8B0: 
+  { type: TEXTURE, format: IA8, offset: 0x601B8B0, width: 80, height: 26, ctype: u8, symbol: D_MAP_1B8B0 }
+
+D_MAP_601C0D0:
+  { type: GFX, offset: 0x601C0D0, symbol: D_MAP_601C0D0 }
+
+D_MAP_601C160:
+  { type: TEXTURE, format: RGBA16, offset: 0x0601C160, width: 32, height: 32, ctype: u16, symbol: D_MAP_601C160 }
+
+D_MAP_601C960:
+  { type: GFX, offset: 0x601C960, symbol: D_MAP_601C960 }
+
+D_MAP_601C9F0:
+  { type: TEXTURE, format: RGBA16, offset: 0x0601C9F0, width: 32, height: 32, ctype: u16, symbol: D_MAP_601C9F0 }
+
+D_MAP_601D1F0:
+  { type: GFX, offset: 0x601D1F0, symbol: D_MAP_601D1F0 }
+
+D_MAP_601D2F0:
+  { type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 64, offset: 0x0601D2F0, symbol: D_MAP_601D2F0, tlut: 0x0601DAF0 }
+
+D_MAP_601DAF0:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 256, offset: 0x0601DAF0, symbol: D_MAP_601DAF0 }
+
+D_MAP_601DCF0:
+  { type: GFX, offset: 0x601DCF0, symbol: D_MAP_601DCF0 }
+
+D_MAP_601DDE8:
+  { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x0601DDE8, symbol: D_MAP_601DDE8, tlut: 0x0601DE68 }
+
+D_MAP_601DE68:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 12, offset: 0x0601DE68, symbol: D_MAP_601DE68 }
+
+D_MAP_601DE80:
+  { type: GFX, offset: 0x601DE80, symbol: D_MAP_601DE80 }
+
+D_MAP_601F2B0:
+  { type: TEXTURE, ctype: u8, format: CI4, width: 32, height: 32, offset: 0x0601F2B0, symbol: D_MAP_601F2B0, tlut: 0x0601F4B0 }
+
+D_MAP_601F4B0:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x0601F4B0, symbol: D_MAP_601F4B0 }
+
+D_MAP_601E8F8:
+  { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x0601E8F8, symbol: D_MAP_601E8F8, tlut: 0x0601E978 }
+
+D_MAP_601E978:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x0601E978, symbol: D_MAP_601E978 }
+
+D_MAP_601E9A0:
+  { type: GFX, offset: 0x601E9A0, symbol: D_MAP_601E9A0 }
+
+D_MAP_601F4D0:
+  { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x0601F4D0, symbol: D_MAP_601F4D0, tlut: 0x0601F550 }
+
+D_MAP_601F550:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x0601F550, symbol: D_MAP_601F550 }
+
+D_MAP_601F570:
+  { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x0601F570, symbol: D_MAP_601F570, tlut: 0x0601F5F0 }
+
+D_MAP_601F5F0:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x0601F5F0, symbol: D_MAP_601F5F0 }
+
+D_MAP_601F610:
+  { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x0601F610, symbol: D_MAP_601F610, tlut: 0x0601F690 }
+
+D_MAP_601F690:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x0601F690, symbol: D_MAP_601F690 }
+
+D_MAP_601F6B0:
+  { type: GFX, offset: 0x601F6B0, symbol: D_MAP_601F6B0 }
+
+D_MAP_601F740:
+  { type: TEXTURE, format: RGBA16, offset: 0x0601F740, width: 32, height: 32, ctype: u16, symbol: D_MAP_601F740 }
+
+# Looks like Aquas
+D_MAP_601FF40:
+  { type: TEXTURE, format: CI8, offset: 0x601FF40, width: 96, height: 96, ctype: u8, symbol: D_MAP_601FF40, tlut: 0x06022340 }
+
+D_MAP_6022340:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 75, offset: 0x06022340, symbol: D_MAP_6022340 }
+
+# Looks like Venom
+D_MAP_60223E0:
+  { type: TEXTURE, format: CI8, offset: 0x60223E0, width: 96, height: 96, ctype: u8, symbol: D_MAP_60223E0, tlut: 0x060247E0 }
+
+D_MAP_60247E0:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 84, offset: 0x060247E0, symbol: D_MAP_60247E0 }
+
+# Looks like Corneria
+D_MAP_6024890:
+  { type: TEXTURE, format: CI8, offset: 0x6024890, width: 96, height: 96, ctype: u8, symbol: D_MAP_6024890, tlut: 0x06026C90 }
+
+D_MAP_6026C90:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 108, offset: 0x06026C90, symbol: D_MAP_6026C90 }
+
+# Looks like Zones
+D_MAP_6026D70:
+  { type: TEXTURE, format: CI8, offset: 0x6026D70, width: 96, height: 96, ctype: u8, symbol: D_MAP_6026D70, tlut: 0x06029170 }
+
+D_MAP_6029170:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 84, offset: 0x06029170, symbol: D_MAP_6029170 }
+
+# Looks like Solar
+D_MAP_6029220:
+  { type: TEXTURE, format: CI8, offset: 0x6029220, width: 96, height: 96, ctype: u8, symbol: D_MAP_6029220, tlut: 0x0602B620 }
+
+D_MAP_602B620:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 84, offset: 0x0602B620, symbol: D_MAP_602B620 }
+
+# Looks like Macbeth
+D_MAP_602B6D0:
+  { type: TEXTURE, format: CI8, offset: 0x602B6D0, width: 96, height: 96, ctype: u8, symbol: D_MAP_602B6D0, tlut: 0x0602DAD0 }
+
+D_MAP_602DAD0:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 68, offset: 0x0602DAD0, symbol: D_MAP_602DAD0 }
+
+# Looks like Sector Z
+D_MAP_602DB60:
+  { type: TEXTURE, format: CI8, offset: 0x602DB60, width: 96, height: 96, ctype: u8, symbol: D_MAP_602DB60, tlut: 0x0602FF60 }
+
+D_MAP_602FF60:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 56, offset: 0x0602FF60, symbol: D_MAP_602FF60 }
+
+D_MAP_602FFD0:
+  { type: TEXTURE, format: CI8, offset: 0x602FFD0, width: 96, height: 96, ctype: u8, symbol: D_MAP_602FFD0, tlut: 0x060323D0 }
+
+D_MAP_60323D0:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 52, offset: 0x060323D0, symbol: D_MAP_60323D0 }
+
+# Portrait of Falco
+D_MAP_6032440:
+  { type: TEXTURE, format: RGBA16, offset: 0x06032440, width: 28, height: 28, ctype: u16, symbol: D_MAP_6032440 }
+
+# Portrait of Peppy
+D_MAP_6032A60:
+  { type: TEXTURE, format: RGBA16, offset: 0x06032A60, width: 28, height: 28, ctype: u16, symbol: D_MAP_6032A60 }
+
+# Picture of Peppy, James and Pigma used in the narrated intro.
+D_MAP_6033080:
+  { type: TEXTURE, format: RGBA16, offset: 0x06033080, width: 96, height: 52, ctype: u16, symbol: D_MAP_6033080 }
+
+# Picture of Andross, General Pepper and Venom in the background, used in the narrated intro.
+D_MAP_6035780:
+  { type: TEXTURE, format: RGBA16, offset: 0x06035780, width: 96, height: 52, ctype: u16, symbol: D_MAP_6035780 }
+
+# Picture of Andross, hands open, Corneria in the middle, used in the narrated intro.
+D_MAP_6037E80:
+  { type: TEXTURE, format: RGBA16, offset: 0x06037E80, width: 96, height: 52, ctype: u16, symbol: D_MAP_6037E80 }
+
+# Picture of an Arwing dodging attacks from enemies, used in the narrated intro.
+D_MAP_603A580:
+  { type: TEXTURE, format: RGBA16, offset: 0x0603A580, width: 96, height: 52, ctype: u16, symbol: D_MAP_603A580 }
+
+# Picture of Slippy, Peppy, Fox and Falco, used in the narrated intro.
+D_MAP_603CC80:
+  { type: TEXTURE, format: RGBA16, offset: 0x0603CC80, width: 96, height: 52, ctype: u16, symbol: D_MAP_603CC80 }
+
+# Picture of Peppy returning from Vemon, used in the narrated intro.
+D_MAP_603F380:
+  { type: TEXTURE, format: RGBA16, offset: 0x0603F380, width: 96, height: 52, ctype: u16, symbol: D_MAP_603F380 }
+
+# Picture of Corneria, used in the narrated intro.
+D_MAP_6041A80:
+  { type: TEXTURE, format: RGBA16, offset: 0x06041A80, width: 96, height: 52, ctype: u16, symbol: D_MAP_6041A80 }
+
+# Portrait of Slippy
+D_MAP_6044180:
+  { type: TEXTURE, format: RGBA16, offset: 0x06044180, width: 28, height: 28, ctype: u16, symbol: D_MAP_6044180 }
+
+# White Square ?
+D_MAP_60447A0:
+  { type: TEXTURE, format: RGBA16, offset: 0x060447A0, width: 8, height: 8, ctype: u16, symbol: D_MAP_60447A0 }
+
+# Picture of Fox receiving orders from General Pepper, used in the map (briefing)
+D_MAP_6044820:
+  { type: TEXTURE, format: RGBA16, offset: 0x06044820, width: 92, height: 51, ctype: u16, symbol: D_MAP_6044820 }
+
+# Fox face talking during briefing.
+D_MAP_6046CD0:
+  { type: TEXTURE, format: RGBA16, offset: 0x06046CD0, width: 32, height: 34, ctype: u16, symbol: D_MAP_6046CD0 }
+
+# Black Square with borders.
+D_MAP_6047550:
+  { type: TEXTURE, format: RGBA16, offset: 0x06047550, width: 24, height: 24, ctype: u16, symbol: D_MAP_6047550 }
+
+D_MAP_60479D0:
+  { type: GFX, offset: 0x60479D0, symbol: D_MAP_60479D0 }
+
+D_MAP_6047A68:
+  { type: TEXTURE, format: IA8, offset: 0x06047A68, width: 32, height: 32, ctype: u8, symbol: D_MAP_6047A68 }
+
+D_MAP_6047E70:
+  { type: GFX, offset: 0x6047E70, symbol: D_MAP_6047E70 }
+
+D_MAP_6047F80:
+  { type: TEXTURE, format: IA8, offset: 0x06047F80, width: 64, height: 32, ctype: u8, symbol: D_MAP_6047F80 }
+
+D_MAP_6048780:
+  { type: TEXTURE, format: IA8, offset: 0x06048780, width: 64, height: 32, ctype: u8, symbol: D_MAP_6048780 }
+
+D_MAP_6048F80:
+  { type: TEXTURE, format: IA8, offset: 0x06048F80, width: 64, height: 64, ctype: u8, symbol: D_MAP_6048F80 }
+
+D_MAP_6049F80:
+  { type: GFX, offset: 0x6049F80, symbol: D_MAP_6049F80 }
+
+D_MAP_604A048:
+  { type: TEXTURE, format: CI8, offset: 0x0604A048, width: 16, height: 16, ctype: u8, symbol: D_MAP_604A048, tlut: 0x0602FF60 }
+
+D_MAP_604A148:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 32, offset: 0x0604A148, symbol: D_MAP_604A148 }
+
+D_MAP_604A190:
+  { type: GFX, offset: 0x604A190, symbol: D_MAP_604A190 }
+
+D_MAP_604A258:
+  { type: TEXTURE, format: CI8, offset: 0x0604A258, width: 16, height: 16, ctype: u8, symbol: D_MAP_604A258, tlut: 0x0604A358 }
+
+D_MAP_604A358:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 80, offset: 0x0604A358, symbol: D_MAP_604A358 }
+
+D_MAP_604A400:
+  { type: GFX, offset: 0x604A400, symbol: D_MAP_604A400 }
+
+D_MAP_604A4C8:
+  { type: TEXTURE, format: CI8, offset: 0x0604A4C8, width: 16, height: 16, ctype: u8, symbol: D_MAP_604A4C8, tlut: 0x0604A5C8 }
+
+D_MAP_604A5C8:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 160, offset: 0x0604A5C8, symbol: D_MAP_604A5C8 }
+
+D_MAP_604A710:
+  { type: GFX, offset: 0x604A710, symbol: D_MAP_604A710 }
+
+D_MAP_604A7D8:
+  { type: TEXTURE, format: CI8, offset: 0x0604A7D8, width: 16, height: 16, ctype: u8, symbol: D_MAP_604A7D8, tlut: 0x0604A8D8 }
+
+D_MAP_604A8D8:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 136, offset: 0x0604A8D8, symbol: D_MAP_604A8D8 }
+
+# Arwing Model, used in the map.
+D_MAP_604A9F0:
+  { type: GFX, offset: 0x604A9F0, symbol: D_MAP_604A9F0 }
+
+ast_map_seg6_vtx_4AD50:
+  { type: VTX, offset: 0x604AD50, count: 124, symbol: ast_map_seg6_vtx_4AD50 }
+
+D_MAP_604B510:
+  { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x0604B510, symbol: D_MAP_604B510, tlut: 0x0604B590 }
+
+D_MAP_604B590: 
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x0604B590, symbol: D_MAP_604B590 }
+
+D_MAP_604B5B0:
+  { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x0604B5B0, symbol: D_MAP_604B5B0, tlut: 0x0604B630 }
+
+D_MAP_604B630:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x0604B630, symbol: D_MAP_604B630 }
+
+D_MAP_604B650:
+  { type: TEXTURE, format: RGBA16, offset: 0x0604B650, width: 8, height: 16, ctype: u16, symbol: D_MAP_604B650 }
+
+# Model of Bolse
+D_MAP_604B750:
+  { type: GFX, offset: 0x604B750, symbol: D_MAP_604B750 }
+
+D_MAP_604BC48:
+  { type: TEXTURE, ctype: u8, format: CI4, width: 32, height: 32, offset: 0x0604BC48, symbol: D_MAP_604BC48, tlut: 0x0604BC48 }
+
+D_MAP_604BE48: 
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x0604BE48, symbol: D_MAP_604BE48 }
+
+D_MAP_604BE68:
+  { type: TEXTURE, ctype: u8, format: CI4, width: 32, height: 32, offset: 0x0604BE68, symbol: D_MAP_604BE68, tlut: 0x0604C068 }
+
+D_MAP_604C068: 
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x0604C068, symbol: D_MAP_604C068 }
+
+D_MAP_604C088:
+  { type: TEXTURE, ctype: u8, format: CI4, width: 32, height: 32, offset: 0x0604C088, symbol: D_MAP_604C088, tlut: 0x0604C288 }
+
+D_MAP_604C288: 
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x0604C288, symbol: D_MAP_604C288 }
+
+D_MAP_604C2A8:
+  { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x0604C2A8, symbol: D_MAP_604C2A8, tlut: 0x0604C328 }
+
+D_MAP_604C328: 
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x0604C328, symbol: D_MAP_604C328 }
+
+# Television outcoming light Model, used during briefing.
+D_MAP_604C350:
+  { type: GFX, offset: 0x604C350, symbol: D_MAP_604C350 }
+
+D_MAP_604C4C0:
+  { type: TEXTURE, format: IA8, offset: 0x0604C4C0, width: 8, height: 16, ctype: u8, symbol: D_MAP_604C4C0 }
+
+D_MAP_604C540:
+  { type: GFX, offset: 0x604C540, symbol: D_MAP_604C540 }
+
+D_MAP_604C5D8:
+  { type: TEXTURE, format: IA8, offset: 0x0604C5D8, width: 32, height: 64, ctype: u8, symbol: D_MAP_604C5D8 }
+
+D_MAP_604CDE0:
+  { type: GFX, offset: 0x604CDE0, symbol: D_MAP_604CDE0 }
+
+D_MAP_604CE78:
+  { type: TEXTURE, format: IA8, offset: 0x0604CE78, width: 32, height: 64, ctype: u8, symbol: D_MAP_604CE78 }
+
+D_MAP_604D680:
+  { type: GFX, offset: 0x604D680, symbol: D_MAP_604D680 }
+
+D_MAP_604D708:
+  { type: TEXTURE, format: IA8, offset: 0x0604D708, width: 32, height: 32, ctype: u8, symbol: D_MAP_604D708 }
+
+# Solar Rays
+D_MAP_604DB10:
+  { type: GFX, offset: 0x604DB10, symbol: D_MAP_604DB10 }
+
+D_MAP_604DD20:
+  { type: TEXTURE, format: IA8, offset: 0x0604DD20, width: 128, height: 32, ctype: u8, symbol: D_MAP_604DD20 }
+
+D_MAP_604ED20:
+  { type: TEXTURE, format: IA8, offset: 0x0604ED20, width: 128, height: 32, ctype: u8, symbol: D_MAP_604ED20 }
+
+D_MAP_604FD20:
+  { type: TEXTURE, format: IA8, offset: 0x0604FD20, width: 128, height: 32, ctype: u8, symbol: D_MAP_604FD20 }
+
+D_MAP_6050D20:
+  { type: TEXTURE, format: IA8, offset: 0x06050D20, width: 128, height: 32, ctype: u8, symbol: D_MAP_6050D20 }
+
+D_MAP_6051D20:
+  { type: GFX, offset: 0x6051D20, symbol: D_MAP_6051D20 }
+
+D_MAP_6051F20:
+  { type: TEXTURE, format: RGBA16, offset: 0x06051F20, width: 64, height: 32, ctype: u16, symbol: D_MAP_6051F20 }
+
+D_MAP_6052F20:
+  { type: TEXTURE, format: RGBA16, offset: 0x06052F20, width: 64, height: 32, ctype: u16, symbol: D_MAP_6052F20 }
+
+D_MAP_6053F20:
+  { type: TEXTURE, format: RGBA16, offset: 0x06053F20, width: 64, height: 32, ctype: u16, symbol: D_MAP_6053F20 }
+
+D_MAP_6054F20:
+  { type: TEXTURE, format: RGBA16, offset: 0x06054F20, width: 64, height: 32, ctype: u16, symbol: D_MAP_6054F20 }
+
+D_MAP_6055F20:
+  { type: GFX, offset: 0x6055F20, symbol: D_MAP_6055F20 }
+
+D_MAP_6056120:
+  { type: TEXTURE, format: RGBA16, offset: 0x06056120, width: 64, height: 32, ctype: u16, symbol: D_MAP_6056120 }
+
+D_MAP_6057120:
+  { type: TEXTURE, format: RGBA16, offset: 0x06057120, width: 64, height: 32, ctype: u16, symbol: D_MAP_6057120 }
+
+D_MAP_6058120:
+  { type: TEXTURE, format: RGBA16, offset: 0x06058120, width: 64, height: 32, ctype: u16, symbol: D_MAP_6058120 }
+
+D_MAP_6059120:
+  { type: TEXTURE, format: RGBA16, offset: 0x06059120, width: 64, height: 32, ctype: u16, symbol: D_MAP_6059120 }
+
+D_MAP_605A120:
+  { type: GFX, offset: 0x605A120, symbol: D_MAP_605A120 }
+
+D_MAP_605A230:
+  { type: TEXTURE, format: RGBA16, offset: 0x0605A230, width: 64, height: 32, ctype: u16, symbol: D_MAP_605A230 }
+
+D_MAP_605B230:
+  { type: TEXTURE, format: RGBA16, offset: 0x0605B230, width: 64, height: 32, ctype: u16, symbol: D_MAP_605B230 }
+
+D_MAP_605C230:
+  { type: GFX, offset: 0x605C230, symbol: D_MAP_605C230 }
+
+D_MAP_605C610:
+  { type: TEXTURE, format: IA8, offset: 0x0605C610, width: 64, height: 32, ctype: u8, symbol: D_MAP_605C610 }
+
+D_MAP_605CE10:
+  { type: TEXTURE, format: IA8, offset: 0x0605CE10, width: 64, height: 32, ctype: u8, symbol: D_MAP_605CE10 }
+
+D_MAP_605D610:
+  { type: TEXTURE, format: IA8, offset: 0x0605D610, width: 64, height: 32, ctype: u8, symbol: D_MAP_605D610 }
+
+D_MAP_605DE10:
+  { type: TEXTURE, format: IA8, offset: 0x0605DE10, width: 64, height: 32, ctype: u8, symbol: D_MAP_605DE10 }
+
+D_MAP_605E610:
+  { type: TEXTURE, format: IA8, offset: 0x0605E610, width: 64, height: 32, ctype: u8, symbol: D_MAP_605E610 }
+
+D_MAP_605EE10:
+  { type: TEXTURE, format: IA8, offset: 0x0605EE10, width: 64, height: 32, ctype: u8, symbol: D_MAP_605EE10 }
+
+D_MAP_605F610:
+  { type: TEXTURE, format: IA8, offset: 0x0605F610, width: 64, height: 32, ctype: u8, symbol: D_MAP_605F610 }
+
+D_MAP_605FE10:
+  { type: TEXTURE, format: IA8, offset: 0x0605FE10, width: 64, height: 32, ctype: u8, symbol: D_MAP_605FE10 }
+
+D_MAP_6060610:
+  { type: GFX, offset: 0x6060610, symbol: D_MAP_6060610 }
+
+D_MAP_6060698:
+  { type: TEXTURE, format: RGBA16, offset: 0x06060698, width: 32, height: 32, ctype: u16, symbol: D_MAP_6060698 }
+
+# size = 0x60EA0

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_6000840[]; // ast_map
-extern u8 D_6001080[];
+extern u8 D_6001080[]; // ast_map
 extern u8 D_60018C0[];
 extern u8 D_600D590[];
 extern u8 D_6019030[];

tools/Torch

@@ -1 +1 @@
-Subproject commit 8465919ab7aba6cfde7d25ad1731673e5da01642
+Subproject commit 6e9f82312178d1fbc002a04ce97cf8b5add1f402

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