export ast_title, add missing assets to ast_map (#185)

* WIP ast_title assets

* Fixed format

* macbeth

* title

* title

* bss

* small fix

---------

Co-authored-by: KiritoDv <kiritodev01@gmail.com>

assets/yaml/us/ast_aquas.yaml

@@ -72,7 +72,7 @@ D_AQ_6007F68:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6007F68, symbol: D_AQ_6007F68 }
 
 D_AQ_6007F68:
-  { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 32, offset: 0x6003FF0, symbol: D_6003FF0 }
+  { type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 32, offset: 0x6003FF0, symbol: D_AQ_6003FF0 }
 
 D_AQ_6008168:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6008168, symbol: D_AQ_6008168 }

assets/yaml/us/ast_map.yaml

@@ -182,7 +182,19 @@ 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 }
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 144, offset: 0x0601DAF0, symbol: D_MAP_601DAF0 }
+
+D_MAP_601DC10:
+  { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x0601DC10, symbol: D_MAP_601DC10, tlut: 0x0601DC90 }
+
+D_MAP_601DC90:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0x0601DC90, symbol: D_MAP_601DC90 }
+
+D_MAP_601DCA0:
+  { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 7, offset: 0x0601DCA0, symbol: D_MAP_601DCA0, tlut: 0x0601DCD8 }
+
+D_MAP_601DCD8:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 5, offset: 0x0601DCD8, symbol: D_MAP_601DCD8 }
 
 D_MAP_601DCF0:
   { type: GFX, offset: 0x601DCF0, symbol: D_MAP_601DCF0 }

assets/yaml/us/ast_title.yaml

@@ -0,0 +1,264 @@
+:config:
+  segments:
+    - [0x06, 0xBFC510]
+  header:
+    code:
+      - '#include "assets/ast_title.h"'
+    header:
+      - '#include "gfx.h"'
+      - '#include "sf64object.h"'
+      - '#include "structs.h"'
+
+starfox_logo: { type: TEXTURE, ctype: u16, format: RGBA16, width: 236, height: 60, offset: 0x6000000, symbol: gTitleStarfoxLogo }
+
+nintendo64_logo: { type: TEXTURE, ctype: u16, format: RGBA16, width: 128, height: 88, offset: 0x6006EA0, symbol: gTitleNintendo64Logo }
+
+radio_static: { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x600C6A0, symbol: gTitleRadioStatic }
+
+sun_beam: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x600D5C0, symbol: gTitleSunBeam }
+
+nintendo_copyright: { type: TEXTURE, ctype: u8, format: IA8, width: 120, height: 12, offset: 0x600DDC0, symbol: gTitleNintendoCopyright }
+
+press_start: { type: TEXTURE, ctype: u8, format: IA8, width: 120, height: 13, offset: 0x600E360, symbol: gTitlePressStart }
+
+great_fox_card: { type: TEXTURE, ctype: u8, format: IA8, width: 144, height: 28, offset: 0x600E980, symbol: gTitleGreatFoxCard }
+
+slippy_card: { type: TEXTURE, ctype: u8, format: IA8, width: 144, height: 13, offset: 0x600F940, symbol: gTitleSlippyCard }
+
+peppy_card: { type: TEXTURE, ctype: u8, format: IA8, width: 120, height: 13, offset: 0x6010090, symbol: gTitlePeppyCard }
+
+falco_card: { type: TEXTURE, ctype: u8, format: IA8, width: 176, height: 13, offset: 0x60106B0, symbol: gTitleFalcoCard }
+
+fox_card: { type: TEXTURE, ctype: u8, format: IA8, width: 176, height: 13, offset: 0x6010FA0, symbol: gTitleFoxCard }
+
+arwing_card: { type: TEXTURE, ctype: u8, format: IA8, width: 112, height: 26, offset: 0x6011890, symbol: gTitleArwingCard }
+
+no_controller: { type: TEXTURE, ctype: u8, format: IA8, width: 176, height: 24, offset: 0x60123F0, symbol: gTitleNoController }
+
+copyright_symbol: { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 16, offset: 0x6013470, symbol: gTitleCopyrightSymbol }
+
+unused_nintendo_copyright: { type: TEXTURE, ctype: u8, format: IA8, width: 168, height: 18, offset: 0x6013570, symbol: gTitleUnusedNintendoCopyright }
+
+starfox_text_intro: { type: TEXTURE, ctype: u8, format: CI4, width: 256, height: 13, offset: 0x6014140, tlut: 0x60147C0, symbol: gTextIntroStarfox }
+
+starfox_text_intro_palette: { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x60147C0, symbol: gTextIntroStarfoxPalette }
+
+in_text_intro: { type: TEXTURE, ctype: u8, format: CI4, width: 32, height: 13, offset: 0x60147E0, tlut: 0x60147C0, symbol: gTextIntroIn }
+
+in_text_intro_palette: { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x60148B0, symbol: gTextIntroInPalette }
+
+D_TITLE_60148D0: { type: GFX, offset: 0x60148D0, symbol: D_TITLE_60148D0 }
+
+D_TITLE_6014DE8: { type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 64, offset: 0x6014DE8, tlut: 0x60155E8, symbol: D_TITLE_6014DE8 }
+
+D_TITLE_60155E8: { type: TEXTURE, ctype: u16, format: TLUT, colors: 152, offset: 0x60155E8, symbol: D_TITLE_60155E8 }
+
+D_TITLE_6015718: { type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 63, offset: 0x6015718, tlut: 0x6015EF8, symbol: D_TITLE_6015718 }
+
+D_TITLE_6015EF8: { type: TEXTURE, ctype: u16, format: TLUT, colors: 64, offset: 0x6015EF8, symbol: D_TITLE_6015EF8 }
+
+D_TITLE_6015F78: { type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 64, offset: 0x6015F78, tlut: 0x6016778, symbol: D_TITLE_6015F78 }
+
+D_TITLE_6016778: { type: TEXTURE, ctype: u16, format: TLUT, colors: 200, offset: 0x6016778, symbol: D_TITLE_6016778 }
+
+D_TITLE_6016908: { type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 63, offset: 0x6016908, tlut: 0x60170E8, symbol: D_TITLE_6016908 }
+
+D_TITLE_60170E8: { type: TEXTURE, ctype: u16, format: TLUT, colors: 144, offset: 0x60170E8, symbol: D_TITLE_60170E8 }
+
+D_TITLE_6017208: { type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 64, offset: 0x6017208, tlut: 0x6017A08, symbol: D_TITLE_6017208 }
+
+D_TITLE_6017A08: { type: TEXTURE, ctype: u16, format: TLUT, colors: 136, offset: 0x6017A08, symbol: D_TITLE_6017A08 }
+
+D_TITLE_6017B18: { type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 64, offset: 0x6017B18, tlut: 0x6018318, symbol: D_TITLE_6017B18 }
+
+D_TITLE_6018318: { type: TEXTURE, ctype: u16, format: TLUT, colors: 200, offset: 0x6018318, symbol: D_TITLE_6018318 }
+
+D_TITLE_60184A8: { type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 64, offset: 0x60184A8, tlut: 0x6018CA8, symbol: D_TITLE_60184A8 }
+
+D_TITLE_6018CA8: { type: TEXTURE, ctype: u16, format: TLUT, colors: 76, offset: 0x6018CA8, symbol: D_TITLE_6018CA8 }
+
+D_TITLE_6018D40: { type: GFX, offset: 0x6018D40, symbol: D_TITLE_6018D40 }
+
+D_TITLE_60195C0: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x60195C0, symbol: D_TITLE_60195C0 }
+
+D_TITLE_6019DC0: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6019DC0, symbol: D_TITLE_6019DC0 }
+
+D_TITLE_601A5C0: { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x601A5C0, symbol: D_TITLE_601A5C0 }
+
+D_TITLE_601B5C0: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x601B5C0, symbol: D_TITLE_601B5C0 }
+
+D_TITLE_601B7C0: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x601B7C0, symbol: D_TITLE_601B7C0 }
+
+D_TITLE_601BFC0: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x601BFC0, symbol: D_TITLE_601BFC0 }
+
+D_TITLE_601C7C0: { type: GFX, offset: 0x601C7C0, symbol: D_TITLE_601C7C0 }
+
+D_TITLE_601CCD0: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x601CCD0, symbol: D_TITLE_601CCD0 }
+
+D_TITLE_601CED0: { type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x601CED0, symbol: D_TITLE_601CED0 }
+
+D_TITLE_601CF50: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x601CF50, symbol: D_TITLE_601CF50 }
+  
+D_TITLE_601D750: { type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x601D750, tlut: 0x601DB50, symbol: D_TITLE_601D750 }
+  
+D_TITLE_601DB50: { type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0x601DB50, symbol: D_TITLE_601DB50 }
+  
+D_TITLE_601E424: { type: SF64:ANIM, offset: 0x601E424, symbol: D_TITLE_601E424 }
+  
+D_TITLE_601E430: { type: GFX, offset: 0x601E430, symbol: D_TITLE_601E430 }
+  
+D_TITLE_601E720: { type: GFX, offset: 0x601E720, symbol: D_TITLE_601E720 }
+  
+D_TITLE_601EA00: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x601EA00, symbol: D_TITLE_601EA00 }
+  
+D_TITLE_601F200: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x601F200, symbol: D_TITLE_601F200 }
+  
+D_TITLE_601F400: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x601F400, symbol: D_TITLE_601F400 }
+  
+D_TITLE_601F8E0: { type: SF64:ANIM, offset: 0x601F8E0, symbol: D_TITLE_601F8E0 }
+  
+D_TITLE_6020058: { type: SF64:ANIM, offset: 0x6020058, symbol: D_TITLE_6020058 }
+  
+D_TITLE_60214F8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x60214F8, symbol: D_TITLE_60214F8 }
+  
+D_TITLE_6021D10: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6021D10, symbol: D_TITLE_6021D10 }
+  
+D_TITLE_6021F10: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6021F10, symbol: D_TITLE_6021F10 }
+  
+D_TITLE_6022B40: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6022B40, symbol: D_TITLE_6022B40 }
+  
+D_TITLE_6023340: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6023340, symbol: D_TITLE_6023340 }
+  
+D_TITLE_6023B40: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6023B40, symbol: D_TITLE_6023B40 }
+  
+D_TITLE_6024340: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6024340, symbol: D_TITLE_6024340 }
+  
+D_TITLE_60246F8: { type: SF64:ANIM, offset: 0x60246F8, symbol: D_TITLE_60246F8 }
+  
+D_TITLE_60257A8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x60257A8, symbol: D_TITLE_60257A8 }
+  
+D_TITLE_60259A8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x60259A8, symbol: D_TITLE_60259A8 }
+  
+D_TITLE_6025BA8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6025BA8, symbol: D_TITLE_6025BA8 }
+  
+D_TITLE_6025DA8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6025DA8, symbol: D_TITLE_6025DA8 }
+  
+D_TITLE_6025FA8: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6025FA8, symbol: D_TITLE_6025FA8 }
+  
+D_TITLE_6026D28: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6026D28, symbol: D_TITLE_6026D28 }
+  
+D_TITLE_6026F28: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6026F28, symbol: D_TITLE_6026F28 }
+  
+D_TITLE_6028508: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6028508, symbol: D_TITLE_6028508 }
+  
+D_TITLE_6028708: { type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x6028708, symbol: D_TITLE_6028708 }
+  
+D_TITLE_6028788: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6028788, symbol: D_TITLE_6028788 }
+  
+D_TITLE_6028988: { type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x6028988, symbol: D_TITLE_6028988 }
+  
+D_TITLE_6028A08: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6028A08, symbol: D_TITLE_6028A08 }
+
+D_TITLE_6028C08: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6028C08, symbol: D_TITLE_6028C08 }
+
+D_TITLE_6029BE4: { type: SF64:ANIM, offset: 0x6029BE4, symbol: D_TITLE_6029BE4 }
+
+D_TITLE_602A710: { type: SF64:ANIM, offset: 0x602A710, symbol: D_TITLE_602A710 }
+
+D_TITLE_602A720: { type: GFX, offset: 0x602A720, symbol: D_TITLE_602A720 }
+
+D_TITLE_602A8C0: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x602A8C0, symbol: D_TITLE_602A8C0 }
+  
+D_TITLE_602B8C0: { type: GFX, offset: 0x602B8C0, symbol: D_TITLE_602B8C0 }
+  
+D_TITLE_602D930: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x602D930, symbol: D_TITLE_602D930 }
+  
+D_TITLE_602DB30: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x602DB30, symbol: D_TITLE_602DB30 }
+  
+D_TITLE_602DD30: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x602DD30, symbol: D_TITLE_602DD30 }
+  
+D_TITLE_602DF30: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x602DF30, symbol: D_TITLE_602DF30 }
+  
+D_TITLE_602E380: { type: GFX, offset: 0x602E380, symbol: D_TITLE_602E380 }
+  
+D_TITLE_602E550: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x602E550, symbol: D_TITLE_602E550 }
+  
+D_TITLE_602F8E0: { type: SF64:ANIM, offset: 0x602F8E0, symbol: D_TITLE_602F8E0 }
+  
+D_TITLE_602FBAC: {type: SF64:SKELETON, offset: 0x602FBAC, symbol: D_TITLE_602FBAC}
+  
+D_TITLE_60305C0: { type: SF64:ANIM, offset: 0x60305C0, symbol: D_TITLE_60305C0 }
+
+D_TITLE_603088C: {type: SF64:SKELETON, offset: 0x603088C, symbol: D_TITLE_603088C}
+
+D_TITLE_6031120: { type: SF64:ANIM, offset: 0x6031120, symbol: D_TITLE_6031120 }
+
+D_TITLE_60313AC: {type: SF64:SKELETON, offset: 0x60313AC, symbol: D_TITLE_60313AC}
+
+D_TITLE_6031DB8: { type: SF64:ANIM, offset: 0x6031DB8, symbol: D_TITLE_6031DB8 }
+
+D_TITLE_6032084: {type: SF64:SKELETON, offset: 0x6032084, symbol: D_TITLE_6032084}
+
+D_TITLE_60320E0: { type: GFX, offset: 0x60320E0, symbol: D_TITLE_60320E0 }
+
+D_TITLE_6032178: {type: TEXTURE, ctype: u8, format: IA8, width: 32, height: 32, offset: 0x6032178, symbol: D_TITLE_6032178}
+
+D_TITLE_6032580: { type: GFX, offset: 0x6032580, symbol: D_TITLE_6032580 }
+
+D_TITLE_6032608: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6032608, symbol: D_TITLE_6032608 }
+
+D_TITLE_60338DC: { type: SF64:ANIM, offset: 0x60338DC, symbol: D_TITLE_60338DC }
+
+D_TITLE_6035024: { type: SF64:ANIM, offset: 0x6035024, symbol: D_TITLE_6035024 }
+
+D_TITLE_603531C: { type: SF64:ANIM, offset: 0x603531C, symbol: D_TITLE_603531C }
+
+D_TITLE_6036278: { type: SF64:ANIM, offset: 0x6036278, symbol: D_TITLE_6036278 }
+
+D_TITLE_6036290: { type: GFX, offset: 0x6036290, symbol: D_TITLE_6036290 }
+
+D_TITLE_6036328: { type: TEXTURE, ctype: u16, format: IA16, width: 32, height: 32, offset: 0x6036328, symbol: D_TITLE_6036328 }
+
+D_TITLE_6036B30: { type: GFX, offset: 0x6036B30, symbol: D_TITLE_6036B30 }
+
+D_TITLE_6036BC8: { type: TEXTURE, ctype: u16, format: IA16, width: 32, height: 32, offset: 0x6036BC8, symbol: D_TITLE_6036BC8 }
+
+D_TITLE_6037CF0: { type: GFX, offset: 0x6037CF0, symbol: D_TITLE_6037CF0 }
+
+D_TITLE_60380D0: {type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x60380D0, symbol: D_TITLE_60380D0}
+
+D_TITLE_60390D0: {type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x60390D0, symbol: D_TITLE_60390D0}
+
+D_TITLE_603A0D0: {type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x603A0D0, symbol: D_TITLE_603A0D0}
+
+D_TITLE_603B0D0: {type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x603B0D0, symbol: D_TITLE_603B0D0}
+
+D_TITLE_603C0D0: {type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x603C0D0, symbol: D_TITLE_603C0D0}
+
+D_TITLE_603D0D0: {type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x603D0D0, symbol: D_TITLE_603D0D0}
+
+D_TITLE_603E0D0: {type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x603E0D0, symbol: D_TITLE_603E0D0}
+
+D_TITLE_603F0D0: {type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x603F0D0, symbol: D_TITLE_603F0D0}
+
+D_TITLE_60408C0: { type: GFX, offset: 0x60408C0, symbol: D_TITLE_60408C0 }
+
+D_TITLE_6041070: { type: GFX, offset: 0x6041070, symbol: D_TITLE_6041070 }
+
+D_TITLE_60410F8: {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x60410F8, symbol: D_TITLE_60410F8}
+
+D_TITLE_6041CF0: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6041CF0, symbol: D_TITLE_6041CF0 }
+
+D_TITLE_60426E0: { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x60426E0, symbol: D_TITLE_60426E0 }
+
+D_TITLE_6043F68: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6043F68, symbol: D_TITLE_6043F68 }
+
+D_TITLE_60456C0: { type: GFX, offset: 0x60456C0, symbol: D_TITLE_60456C0 }
+
+D_TITLE_6045A28: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 64, offset: 0x6045A28, symbol: D_TITLE_6045A28}
+D_TITLE_6046A28: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 64, offset: 0x6046A28, symbol: D_TITLE_6046A28}
+D_TITLE_6047A28: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 64, offset: 0x6047A28, symbol: D_TITLE_6047A28}
+D_TITLE_6048A28: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 64, offset: 0x6048A28, symbol: D_TITLE_6048A28}
+D_TITLE_6049A28: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 64, offset: 0x6049A28, symbol: D_TITLE_6049A28}
+D_TITLE_604AA28: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 64, offset: 0x604AA28, symbol: D_TITLE_604AA28}
+D_TITLE_604BA28: { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 64, offset: 0x604BA28, symbol: D_TITLE_604BA28}

include/assets.h

@@ -150,7 +150,6 @@ extern Animation D_6014658;
 extern u16 D_60147C0[];
 extern u8 D_60147E0[];
 extern u8 D_60148B0[];
-extern Gfx D_60148D0[];
 extern EnvSettings D_VE2_6014D50;
 extern CollisionPoly D_6014FEC[];
 extern u16 D_6015430[];
@@ -164,7 +163,6 @@ extern Gfx D_6017090[];
 extern Gfx D_6017370[];
 extern Gfx D_6018450[];
 extern Gfx D_6018C00[]; // possible collision
-extern Gfx D_6018D40[];
 extern Gfx D_601AE40[];
 extern u16* D_VE1_601B1E4[];
 extern f32 D_601B4C4[];
@@ -183,12 +181,9 @@ extern f32 D_601B830[];
 extern f32 D_601B868[];
 extern f32 D_601B8A0[];
 extern f32 D_601B8D8[];
-extern Gfx D_601C7C0[];
 extern Gfx D_601C820[];
 extern u16 D_601C8E0[];
-extern u8 D_601D750[];
 extern u16 D_601D800[];
-extern u16 D_601DB50[];
 extern Gfx D_601E150[];
 extern u16 D_601E1E8[];
 extern Animation D_601E8C4;
@@ -235,7 +230,6 @@ extern f32 D_602C2B0[];
 extern u16 D_602C2CC[];
 extern Triangle D_602CACC[];
 extern Vec3f D_602CB80[];
-extern Gfx D_602E380[];
 extern u16* D_ME_602F3AC[];
 extern f32 D_602F638[];
 extern f32 D_602F684[];
@@ -252,10 +246,7 @@ extern CollisionPoly D_6030208[];
 extern Vec3s D_6030550[];
 extern CollisionPoly D_60305DC[];
 extern Vec3s D_603184C[];
-extern Gfx D_60320E0[];
-extern Gfx D_6032580[];
 extern Vec3s D_6033E08[];
-extern Gfx D_6037CF0[];
 extern Gfx D_60084C0[];
 extern Gfx D_6008D40[];
 extern Gfx D_6007C40[];

include/assets/ast_title.h

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

linker_scripts/us/symbol_addrs_assets.txt

@@ -90,3 +90,8 @@ D_A6_601B2B0 = 0x601B2B0;
 D_A6_6018BA0 = 0x6018BA0;
 D_A6_6028578 = 0x6028578;
 D_A6_6028454 = 0x6028454;
+
+D_TITLE_60246F8 = 0x60246F8;
+D_TITLE_60338DC = 0x60338DC;
+D_TITLE_6036278 = 0x6036278;
+D_TITLE_603531C = 0x603531C;

linker_scripts/us/undefined_syms.ld

@@ -403,12 +403,13 @@ D_TI_60034E0 = 0x060034E0;
 D_TI_6003580 = 0x06003580;
 D_TI_6003620 = 0x06003620;
 D_TI_60036C0 = 0x060036C0;
-D_601E424 = 0x0601E424;
+D_CO_6037160 = 0x06037160;
+D_TITLE_601E424 = 0x0601E424;
 D_6026C80 = 0x06026C80;
-D_6029BE4 = 0x06029BE4;
+D_TITLE_6029BE4 = 0x06029BE4;
 D_SX_602A120 = 0x0602A120;
-D_602A710 = 0x0602A710;
+D_TITLE_602A710 = 0x0602A710;
-D_6020058 = 0x06020058;
+D_TITLE_6020058 = 0x06020058;
 D_A6_6023F20 = 0x06023F20;
 D_A6_6028760 = 0x06028760;
 D_VE1_6007E30 = 0x06007E30;
@@ -486,30 +487,30 @@ D_D00B5C0 = 0x0D00B5C0;
 D_D00B720 = 0x0D00B720;
 
 // fox_title, to be ordered later
-D_602F8E0 = 0x0602F8E0;
+D_TITLE_602F8E0 = 0x0602F8E0;
-D_60305C0 = 0x060305C0;
+D_TITLE_60305C0 = 0x060305C0;
-D_6031DB8 = 0x06031DB8;
+D_TITLE_6031DB8 = 0x06031DB8;
-D_6031120 = 0x06031120;
+D_TITLE_6031120 = 0x06031120;
-D_6035024 = 0x06035024;
+D_TITLE_6035024 = 0x06035024;
-D_60338DC = 0x060338DC;
+D_TITLE_60338DC = 0x060338DC;
-D_603531C = 0x0603531C;
+D_TITLE_603531C = 0x0603531C;
-D_6036278 = 0x06036278;
+D_TITLE_6036278 = 0x06036278;
-D_602FBAC = 0x0602FBAC;
+D_TITLE_602FBAC = 0x0602FBAC;
-D_603088C = 0x0603088C;
+D_TITLE_603088C = 0x0603088C;
-D_6032084 = 0x06032084;
+D_TITLE_6032084 = 0x06032084;
-D_60313AC = 0x060313AC;
+D_TITLE_60313AC = 0x060313AC;
 
-D_602F8E0 = 0x0602F8E0;
+D_TITLE_602F8E0 = 0x0602F8E0;
-D_60305C0 = 0x060305C0;
+D_TITLE_60305C0 = 0x060305C0;
-D_6031DB8 = 0x06031DB8;
+D_TITLE_6031DB8 = 0x06031DB8;
-D_6031120 = 0x06031120;
+D_TITLE_6031120 = 0x06031120;
-D_60338DC = 0x060338DC;
+D_TITLE_60338DC = 0x060338DC;
-D_6035024 = 0x06035024;
+D_TITLE_6035024 = 0x06035024;
-D_603531C = 0x0603531C;
+D_TITLE_603531C = 0x0603531C;
-D_6036278 = 0x06036278;
+D_TITLE_6036278 = 0x06036278;
 
-D_6036290 = 0x06036290;
+D_TITLE_6036290 = 0x06036290;
-D_6036B30 = 0x06036B30;
+D_TITLE_6036B30 = 0x06036B30;
 
 // fox_map, to be ordered later
 D_6002160 = 0x06002160;
@@ -1606,7 +1607,7 @@ D_60147E0 = 0x60147E0;
 D_6014844 = 0x6014844;
 D_AQ_60148B0 = 0x60148B0;
 D_60148B0 = 0x60148B0;
-D_60148D0 = 0x60148D0;
+D_TITLE_60148D0 = 0x60148D0;
 D_6014904 = 0x6014904;
 D_60149D0 = 0x60149D0;
 D_AQ_6014FD0 = 0x6014FD0;
@@ -1639,7 +1640,7 @@ D_A6_6018BA0 = 0x6018BA0;
 D_A6_6018BF0 = 0x6018BF0;
 D_6018C00 = 0x6018C00;
 D_AQ_6018C78 = 0x6018C78;
-D_6018D40 = 0x6018D40;
+D_TITLE_6018D40 = 0x6018D40;
 D_6019030 = 0x6019030;
 D_AQ_6019078 = 0x6019078;
 D_MA_6019220 = 0x6019220;
@@ -1679,15 +1680,15 @@ D_AQ_601C080 = 0x601C080;
 D_MA_601C170 = 0x601C170;
 D_601C590 = 0x601C590;
 D_SX_601C690 = 0x601C690;
-D_601C7C0 = 0x601C7C0;
+D_TITLE_601C7C0 = 0x601C7C0;
 D_601C820 = 0x601C820;
 D_601C8E0 = 0x601C8E0;
 D_MA_601D188 = 0x601D188;
 D_601D1F0 = 0x601D1F0;
 D_601D680 = 0x601D680;
-D_601D750 = 0x601D750;
+D_TITLE_601D750 = 0x601D750;
 D_601D800 = 0x601D800;
-D_601DB50 = 0x601DB50;
+D_TITLE_601DB50 = 0x601DB50;
 D_601DC10 = 0x601DC10;
 D_601DC90 = 0x601DC90;
 D_601DCA0 = 0x601DCA0;
@@ -1707,7 +1708,7 @@ D_AQ_601EC68 = 0x601EC68;
 D_AQ_601EDB4 = 0x601EDB4;
 D_MA_601F270 = 0x601F270;
 D_601F874 = 0x601F874;
-D_601F8E0 = 0x601F8E0;
+D_TITLE_601F8E0 = 0x601F8E0;
 D_601F920 = 0x601F920;
 D_601FBC4 = 0x601FBC4;
 D_601FC90 = 0x601FC90;
@@ -1739,7 +1740,8 @@ D_6023D50 = 0x6023D50;
 D_60240B0 = 0x60240B0;
 D_6024220 = 0x6024220;
 D_MA_6024670 = 0x6024670;
-D_60246F8 = 0x60246F8;
+D_TITLE_60246F8 = 0x60246F8;
+D_AQ_6024A50 = 0x6024A50;
 D_6024AD0 = 0x6024AD0;
 D_6024B60 = 0x6024B60;
 D_MA_60251A0 = 0x60251A0;
@@ -1778,7 +1780,7 @@ D_AQ_602C088 = 0x602C088;
 D_602C2CC = 0x602C2CC;
 D_MA_602D380 = 0x602D380;
 D_MA_602DCB8 = 0x602DCB8;
-D_602E380 = 0x602E380;
+D_TITLE_602E380 = 0x602E380;
 D_AQ_602E584 = 0x602E584;
 D_MA_602EA0C = 0x602EA0C;
 D_MA_602EBB8 = 0x602EBB8;
@@ -1806,16 +1808,20 @@ D_AQ_603151C = 0x603151C;
 D_AQ_603158C = 0x603158C;
 D_AQ_6031D90 = 0x6031D90;
 D_SX_60320D0 = 0x60320D0;
-D_60320E0 = 0x60320E0;
+D_TITLE_60320E0 = 0x60320E0;
 D_SX_6032328 = 0x6032328;
 D_SX_6032408 = 0x6032408;
 D_SX_6032550 = 0x6032550;
-D_6032580 = 0x6032580;
+D_TITLE_6032580 = 0x6032580;
 D_SX_603265C = 0x603265C;
 D_SX_6032768 = 0x6032768;
 D_SX_60328CC = 0x60328CC;
-D_60338DC = 0x60338DC;
+D_60329C0 = 0x60329C0;
-D_603531C = 0x603531C;
+D_6032BC0 = 0x6032BC0;
+D_6033000 = 0x6033000;
+D_TITLE_60338DC = 0x60338DC;
+D_6034B90 = 0x6034B90;
+D_TITLE_603531C = 0x603531C;
 D_MA_6035678 = 0x6035678;
 D_MA_60357CC = 0x60357CC;
 D_MA_6035920 = 0x6035920;
@@ -1828,14 +1834,24 @@ D_MA_6035F30 = 0x6035F30;
 D_MA_6035F94 = 0x6035F94;
 D_MA_6035FF8 = 0x6035FF8;
 D_MA_603605C = 0x603605C;
-D_6036278 = 0x6036278;
+D_60361F0 = 0x60361F0;
+D_TITLE_6036278 = 0x6036278;
+D_60363B0 = 0x60363B0;
 D_MA_603648C = 0x603648C;
 D_MA_6036520 = 0x6036520;
 D_MA_603677C = 0x603677C;
 D_MA_6036818 = 0x6036818;
-D_6037CF0 = 0x6037CF0;
+D_6036840 = 0x6036840;
+D_6036CD0 = 0x6036CD0;
+D_TITLE_6037CF0 = 0x6037CF0;
 D_MA_60381D8 = 0x60381D8;
-D_6041070 = 0x6041070;
+D_603B074 = 0x603B074;
+D_CO_603D9E8 = 0x603D9E8;
+D_603E748 = 0x603E748;
+D_603E7C4 = 0x603E7C4;
+D_603E924 = 0x603E924;
+D_603EB38 = 0x603EB38;
+D_TITLE_6041070 = 0x6041070;
 D_60447A0 = 0x60447A0;
 D_6044820 = 0x6044820;
 D_6046AA0 = 0x6046AA0;

src/main/fox_demo.c

@@ -14,8 +14,7 @@
 #include "assets/ast_sector_x.h"
 #include "assets/ast_sector_y.h"
 #include "assets/ast_sector_z.h"
-
+#include "assets/ast_title.h"
-extern Gfx D_60320E0[];
 
 extern s32 D_800C9E90[];
 
@@ -30,9 +29,6 @@ extern Gfx D_6000D80[];
 extern Gfx D_600BAA0[];
 extern Gfx D_6020810[];
 
-extern Animation D_AQ_6020A40;
-extern Limb* D_AQ_6020C6C[];
-
 #include "assets/ast_allies.h"
 
 Vec3f D_800C9F60[] = {
@@ -2921,7 +2917,7 @@ void func_800515C4(void) {
     (void) "d Enm->wrk0 %d\n";
 
     if (gGameState == GSTATE_TITLE) {
-        var_fp = D_60320E0;
+        var_fp = D_TITLE_60320E0;
     } else if (gGameState == GSTATE_CREDITS) {
         var_fp = D_END_7010970;
     } else {

src/main/fox_radio.c

@@ -22,6 +22,7 @@ s32 D_80178748;
 #include "assets/ast_star_wolf.h"
 #include "assets/ast_great_fox.h"
 #include "assets/ast_area_6.h"
+#include "assets/ast_title.h"
 
 s32 gCurrentMsgPri = 0;
 
@@ -455,8 +456,8 @@ void func_800BB388(void) {
         switch (gGameState) {
             case GSTATE_TITLE:
             case GSTATE_CREDITS:
-                sp38 = D_601D750;
+                sp38 = D_TITLE_601D750;
-                sp34 = D_601DB50;
+                sp34 = D_TITLE_601DB50;
                 break;
             case GSTATE_PLAY:
                 sp38 = D_1013170;

src/overlays/ovl_ending/fox_end1.c

@@ -10,22 +10,6 @@
 void func_ending_8018CE20(s32);
 void func_ending_801926D4(void);
 extern u32 D_ending_80192E70;
-extern Gfx D_6041070[];
-extern Animation D_601E424;
-extern Animation D_601F8E0;
-extern Animation D_6020058;
-extern Animation D_60246F8;
-extern Animation D_6029BE4;
-extern Animation D_602A710;
-
-extern Limb* D_602FBAC[];
-extern Limb* D_603088C[];
-extern Limb* D_60313AC[];
-extern Limb* D_6032084[];
-
-extern Animation D_60338DC;
-extern Animation D_603531C;
-extern Animation D_6036278;
 
 bool func_ending_80189C64(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* data);
 void func_ending_8018ABE8(void);
@@ -128,7 +112,7 @@ void func_ending_801876A4(void) {
         Matrix_RotateX(gGfxMatrix, (D_ending_80196D08[i].rot.x + 5.0f) * M_DTOR, 1);
         Matrix_RotateZ(gGfxMatrix, D_ending_80196D08[i].rot.z * M_DTOR, 1);
         Matrix_SetGfxMtx(&gMasterDisp);
-        gSPDisplayList(gMasterDisp++, D_6041070);
+        gSPDisplayList(gMasterDisp++, D_TITLE_6041070);
         Matrix_Pop(&gGfxMatrix);
     }
 }
@@ -139,7 +123,7 @@ void func_ending_80187860(s32 arg0, s32 arg1) {
     Vec3f sp88[50];
     s32 i;
     s32 sp80;
-    Animation* sp70[4] = { &D_60246F8, &D_60338DC, &D_6036278, &D_603531C };
+    Animation* sp70[4] = { &D_TITLE_60246F8, &D_TITLE_60338DC, &D_TITLE_6036278, &D_TITLE_603531C };
 
     for (i = arg0; i < D_ending_80196F88; i++) {
         Matrix_Push(&gGfxMatrix);
@@ -162,16 +146,16 @@ void func_ending_80187860(s32 arg0, s32 arg1) {
         if ((arg1 != 0) && (gCsFrameCount >= 394)) {
             switch (i) {
                 case 0:
-                    sp80 = Animation_GetFrameData(&D_60246F8, 0, sp88);
+                    sp80 = Animation_GetFrameData(&D_TITLE_60246F8, 0, sp88);
                     break;
                 case 1:
-                    sp80 = Animation_GetFrameData(&D_60338DC, 0, sp88);
+                    sp80 = Animation_GetFrameData(&D_TITLE_60338DC, 0, sp88);
                     break;
                 case 2:
-                    sp80 = Animation_GetFrameData(&D_6036278, 0, sp88);
+                    sp80 = Animation_GetFrameData(&D_TITLE_6036278, 0, sp88);
                     break;
                 case 3:
-                    sp80 = Animation_GetFrameData(&D_603531C, 0, sp88);
+                    sp80 = Animation_GetFrameData(&D_TITLE_603531C, 0, sp88);
                     break;
             }
             Math_SmoothStepToVec3fArray(sp88, D_ending_80197900[i], 1, sp80, 0.1f, 100.0f, 0.01f);
@@ -187,7 +171,7 @@ void func_ending_80187860(s32 arg0, s32 arg1) {
     }
 }
 #else
-Animation* D_ending_80192820[4] = { &D_60246F8, &D_60338DC, &D_6036278, &D_603531C };
+Animation* D_ending_80192820[4] = { &D_TITLE_60246F8, &D_TITLE_60338DC, &D_TITLE_6036278, &D_TITLE_603531C };
 void func_ending_80187860(s32, s32);
 #pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/fox_end1/func_ending_80187860.s")
 #endif
@@ -197,8 +181,8 @@ void func_ending_80187D3C(s32 arg0) {
     s32 j;
     Vec3f sp23C = { 0.0f, 0.0f, 0.0f };
     UnkStruct_196D08 sp13C[4] = {
-        { &D_602A710,
+        { &D_TITLE_602A710,
-          D_602FBAC,
+          D_TITLE_602FBAC,
           23,
           { 110.0f, -520.0f, -1390.0f },
           { -20.0f, 0.0f, 0.0f },
@@ -207,8 +191,8 @@ void func_ending_80187D3C(s32 arg0) {
           0,
           0,
           { 0, 0, 0, 0 } },
-        { &D_601E424,
+        { &D_TITLE_601E424,
-          D_603088C,
+          D_TITLE_603088C,
           23,
           { 380.0f, -670.0f, -1840.0f },
           { -20.0f, 0.0f, 0.0f },
@@ -217,8 +201,8 @@ void func_ending_80187D3C(s32 arg0) {
           30,
           0,
           { 0, 0, 0, 0 } },
-        { &D_6020058,
+        { &D_TITLE_6020058,
-          D_60313AC,
+          D_TITLE_60313AC,
           23,
           { -100.0f, -590.0f, -1630.0f },
           { -20.0f, 0.0f, 0.0f },
@@ -227,8 +211,8 @@ void func_ending_80187D3C(s32 arg0) {
           20,
           0,
           { 0, 0, 0, 0 } },
-        { &D_6029BE4,
+        { &D_TITLE_6029BE4,
-          D_6032084,
+          D_TITLE_6032084,
           23,
           { -330.0f, -660.0f, -1840.0f },
           { -20.0f, 0.0f, 0.0f },
@@ -239,8 +223,8 @@ void func_ending_80187D3C(s32 arg0) {
           { 0, 0, 0, 0 } },
     };
     UnkStruct_196D08 sp3C[4] = {
-        { &D_602A710,
+        { &D_TITLE_602A710,
-          D_602FBAC,
+          D_TITLE_602FBAC,
           23,
           { -80.0f, -400.0f, -50.0f },
           { 0.0f, 180.0f, 0.0f },
@@ -249,8 +233,8 @@ void func_ending_80187D3C(s32 arg0) {
           0,
           0,
           { 0, 0, 0, 0 } },
-        { &D_601E424,
+        { &D_TITLE_601E424,
-          D_603088C,
+          D_TITLE_603088C,
           23,
           { -160.0f, -400.0f, 350.0f },
           { 0.0f, 180.0f, 0.0f },
@@ -259,8 +243,8 @@ void func_ending_80187D3C(s32 arg0) {
           30,
           0,
           { 0, 0, 0, 0 } },
-        { &D_6020058,
+        { &D_TITLE_6020058,
-          D_60313AC,
+          D_TITLE_60313AC,
           23,
           { 60.0f, -400.0f, 150.0f },
           { 0.0f, 180.0f, 0.0f },
@@ -269,8 +253,8 @@ void func_ending_80187D3C(s32 arg0) {
           20,
           0,
           { 0, 0, 0, 0 } },
-        { &D_6029BE4,
+        { &D_TITLE_6029BE4,
-          D_6032084,
+          D_TITLE_6032084,
           23,
           { 160.0f, -400.0f, 350.0f },
           { 350.0f, 180.0f, 0.0f },
@@ -486,17 +470,17 @@ void func_ending_801888F4(void) {
 
         case 1:
             sp294 = D_ending_80196D08[sp29C].unk_34 * D_ending_80196D08[sp29C].unk_30;
-            if (sp294 >= Animation_GetFrameCount(&D_601F8E0)) {
+            if (sp294 >= Animation_GetFrameCount(&D_TITLE_601F8E0)) {
-                sp294 = Animation_GetFrameCount(&D_601F8E0) - 1;
+                sp294 = Animation_GetFrameCount(&D_TITLE_601F8E0) - 1;
             }
-            Math_SmoothStepToVec3fArray(sp3C, D_ending_80197900[0], 1, Animation_GetFrameData(&D_601F8E0, sp294, sp3C),
+            Math_SmoothStepToVec3fArray(sp3C, D_ending_80197900[0], 1,
-                                        0.2f, 100.0f, 0.01f);
+                                        Animation_GetFrameData(&D_TITLE_601F8E0, sp294, sp3C), 0.2f, 100.0f, 0.01f);
             break;
 
         case 2:
             sp294 = (u32) (D_ending_80196D08[sp29C].unk_34 * D_ending_80196D08[sp29C].unk_30) %
                     Animation_GetFrameCount(D_ending_80196D08[sp29C].anim);
-            temp_s0_5 = Animation_GetFrameData(&D_60246F8, sp294, sp3C);
+            temp_s0_5 = Animation_GetFrameData(&D_TITLE_60246F8, sp294, sp3C);
             Math_SmoothStepToF(&D_ending_80198580, 1.0f, 0.01f, 1.0f, 0.05f);
             Math_SmoothStepToVec3fArray(sp3C, D_ending_80197900[0], 1, temp_s0_5, D_ending_80198580, 100.0f, 0.01f);
             break;
@@ -522,8 +506,8 @@ void func_ending_80188DB4(void) {
           0,
           0,
           { 0, 0, 0, 0 } },
-        { &D_60338DC,
+        { &D_TITLE_60338DC,
-          D_603088C,
+          D_TITLE_603088C,
           23,
           { 230.0f, -370.0f, -620.0f },
           { 350.0f, 0.0f, 0.0f },
@@ -532,8 +516,8 @@ void func_ending_80188DB4(void) {
           0,
           0,
           { 0, 0, 0, 0 } },
-        { &D_6036278,
+        { &D_TITLE_6036278,
-          D_60313AC,
+          D_TITLE_60313AC,
           23,
           { -120.0f, -350.0f, -600.0f },
           { 350.0f, 10.0f, 0.0f },
@@ -542,8 +526,8 @@ void func_ending_80188DB4(void) {
           0,
           0,
           { 0, 0, 0, 0 } },
-        { &D_603531C,
+        { &D_TITLE_603531C,
-          D_6032084,
+          D_TITLE_6032084,
           23,
           { -260.0f, -350.0f, -710.0f },
           { 350.0f, 10.0f, 0.0f },
@@ -552,8 +536,8 @@ void func_ending_80188DB4(void) {
           0,
           0,
           { 0, 0, 0, 0 } },
-        { &D_60246F8,
+        { &D_TITLE_60246F8,
-          D_602FBAC,
+          D_TITLE_602FBAC,
           23,
           { 30.0f, -330.0f, -320.0f },
           { 350.0f, 0.0f, 0.0f },

src/overlays/ovl_ending/fox_end2_data.c

@@ -83,15 +83,6 @@ void func_ending_80190CF0(u32 arg0, AssetInfo* asset);
 void func_ending_80191234(s32 arg0, s32 arg1);
 void func_ending_80191294(u32 arg0, AssetInfo* asset);
 
-extern Animation D_602F8E0;
-extern Limb* D_602FBAC[];
-extern Animation D_60305C0;
-extern Limb* D_603088C[];
-extern Animation D_6031120;
-extern Limb* D_60313AC[];
-extern Animation D_6031DB8;
-extern Limb* D_6032084[];
-
 // clang-format off
 
 u32 D_ending_80192E70 = 0;
@@ -265,14 +256,14 @@ AssetInfo D_ending_801934B4[] = {
     { NULL, func_ending_8018E7B8, 67, 3800, 950, 1.0f, 15600.0f, -6710.0f, -9960.0f, 0.0f, 0.0f, -10.0f, 35.0f, 10.0f, 20.0f, -22.0f, 12.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 240, 176, 64, 996, 1000, 255, 255, 0, 0, 255, 255, 255, 164, 0, 0 },
     { NULL, func_ending_8018D4BC, 0, 3100, 1800, 0.0f, 0.0f, 32.0f, -32.0f, 200.0f, 70.0f, 10.0f, 10.0f, 6.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { NULL, func_ending_8018EDB8, 20, 3100, 1800, 1.0f, 0.0f, -470.0f, -3500.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 996, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-    { &D_602F8E0, D_602FBAC, 12, 3100, 1800, 5.0f, -300.0f, -300.0f, -1300.0f, 5.0f, -90.0f, -90.0f, 0.6f, 0.1f, 6.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 200, 10, 0 },
+    { &D_TITLE_602F8E0, D_TITLE_602FBAC, 12, 3100, 1800, 5.0f, -300.0f, -300.0f, -1300.0f, 5.0f, -90.0f, -90.0f, 0.6f, 0.1f, 6.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 200, 10, 0 },
-    { &D_602F8E0, D_602FBAC, 23, 3100, 1800, 5.0f, -300.0f, -300.0f, -1300.0f, 5.0f, -90.0f, 0.0f, 0.6f, 0.6f, 0.6f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0 },
+    { &D_TITLE_602F8E0, D_TITLE_602FBAC, 23, 3100, 1800, 5.0f, -300.0f, -300.0f, -1300.0f, 5.0f, -90.0f, 0.0f, 0.6f, 0.6f, 0.6f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0 },
-    { &D_60305C0, D_603088C, 12, 3100, 1800, 5.0f, -100.0f, -300.0f, -1300.0f, 10.0f, -90.0f, -90.0f, 0.6f, 0.1f, 6.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 200, 0, 0 },
+    { &D_TITLE_60305C0, D_TITLE_603088C, 12, 3100, 1800, 5.0f, -100.0f, -300.0f, -1300.0f, 10.0f, -90.0f, -90.0f, 0.6f, 0.1f, 6.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 200, 0, 0 },
-    { &D_60305C0, D_603088C, 23, 3100, 1800, 5.0f, -100.0f, -300.0f, -1300.0f, 10.0f, -90.0f, 0.0f, 0.6f, 0.6f, 0.6f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+    { &D_TITLE_60305C0, D_TITLE_603088C, 23, 3100, 1800, 5.0f, -100.0f, -300.0f, -1300.0f, 10.0f, -90.0f, 0.0f, 0.6f, 0.6f, 0.6f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-    { &D_6031DB8, D_6032084, 12, 3100, 1800, 6.0f, 100.0f, -300.0f, -1300.0f, -10.0f, -90.0f, -90.0f, 0.6f, 0.1f, 6.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 200, 0, 0 },
+    { &D_TITLE_6031DB8, D_TITLE_6032084, 12, 3100, 1800, 6.0f, 100.0f, -300.0f, -1300.0f, -10.0f, -90.0f, -90.0f, 0.6f, 0.1f, 6.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 200, 0, 0 },
-    { &D_6031DB8, D_6032084, 23, 3100, 1800, 6.0f, 100.0f, -300.0f, -1300.0f, -10.0f, -90.0f, 0.0f, 0.6f, 0.6f, 0.6f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+    { &D_TITLE_6031DB8, D_TITLE_6032084, 23, 3100, 1800, 6.0f, 100.0f, -300.0f, -1300.0f, -10.0f, -90.0f, 0.0f, 0.6f, 0.6f, 0.6f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-    { &D_6031120, D_60313AC, 12, 3100, 1800, 7.0f, 300.0f, -300.0f, -1300.0f, -15.0f, -90.0f, -90.0f, 0.6f, 0.1f, 6.0f, 0.1f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.1f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 200, 0, 0 },
+    { &D_TITLE_6031120, D_TITLE_60313AC, 12, 3100, 1800, 7.0f, 300.0f, -300.0f, -1300.0f, -15.0f, -90.0f, -90.0f, 0.6f, 0.1f, 6.0f, 0.1f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.1f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 200, 0, 0 },
-    { &D_6031120, D_60313AC, 23, 3100, 1800, 7.0f, 300.0f, -300.0f, -1300.0f, -15.0f, -90.0f, 0.0f, 0.6f, 0.6f, 0.6f, 0.1f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.1f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+    { &D_TITLE_6031120, D_TITLE_60313AC, 23, 3100, 1800, 7.0f, 300.0f, -300.0f, -1300.0f, -15.0f, -90.0f, 0.0f, 0.6f, 0.6f, 0.6f, 0.1f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.1f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { NULL, func_ending_8018D250, 5, 5000, 2000, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0 },
     { NULL, func_ending_8018D4BC, 0, 5100, 1800, 0.0f, 0.0f, 32.0f, -32.0f, 200.0f, 70.0f, 10.0f, 10.0f, 6.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { D_END_7016540, NULL, 17, 5100, 310, 1.0f, 0.0f, -2800.0f, -6900.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, -4.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },

src/overlays/ovl_i2/fox_sx.c

@@ -11,24 +11,6 @@ Vec3f D_i2_80195650 = { 90.0f, 0.0f, 0.0f };
 Vec3f D_i2_8019565C = { 73.0f, -102.0f, -80.0f };
 Vec3f D_i2_80195668 = { 90.0f, 0.0f, 0.0f };
 
-extern Gfx D_SX_60010C0[];
-extern Gfx D_SX_6006810[];
-extern Gfx D_SX_6009C30[];
-extern Animation D_SX_6009FF8;
-extern Animation D_SX_600A2D4;
-extern Animation D_SX_600F890;
-extern Animation D_SX_60123BC;
-extern Animation D_SX_6013798;
-extern Animation D_SX_60158C4;
-extern Animation D_SX_6016E28;
-extern Animation D_SX_601AA28;
-extern Animation D_SX_601C690;
-extern Animation D_SX_60206DC;
-extern Limb* D_SX_6020C68[];
-extern Gfx D_SX_6020D20[];
-extern f32 D_SX_603265C[];
-extern f32 D_SX_6032768[];
-extern f32 D_SX_60328CC[];
 extern s32 D_800C9E90[];
 
 extern void func_i2_8018F030(void);

src/overlays/ovl_menu/fox_map.c

@@ -1109,31 +1109,6 @@ Gfx* D_menu_801B68F8[] = {
     D_menu_801B5B10, D_menu_801B5440, D_menu_801B50D8, D_menu_801B57A8, D_MAP_604DB10,
 };
 
-extern u8 D_MAP_6000840[]; // ast_map
-extern u8 D_MAP_6001080[]; // ast_map
-extern u8 D_MAP_60018C0[];
-extern u8 D_MAP_600D590[];
-extern u8 D_MAP_6019030[];
-extern Gfx D_MAP_601D1F0[];
-extern u8 D_601DC10[];
-extern u16 D_601DC90[];
-extern Gfx D_MAP_601DCF0[];
-extern u8 D_601DCA0[];
-extern u16 D_601DCD8[];
-extern Gfx D_MAP_601E9A0[];
-extern u16 D_MAP_6044820[];
-extern u16 D_6046AA0[];
-extern u16 D_MAP_6046CD0[];
-extern Gfx D_MAP_60479D0[];
-extern Gfx D_MAP_6047E70[];
-extern u8 D_MAP_6047F80[];
-extern u8 D_MAP_6048F80[];
-extern Gfx D_MAP_604C350[];
-extern Gfx D_MAP_604C540[];
-extern Gfx D_MAP_604CDE0[];
-extern Gfx D_MAP_604D680[];
-extern Gfx D_MAP_605A120[];
-
 void func_menu_8019E800(void);
 void func_menu_8019E99C(void);
 void func_menu_8019F164(void);
@@ -6730,11 +6705,11 @@ void func_menu_801AD7EC(s32 xPos, s32 yPos, s32 number) {
 
     gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
 
-    TextureRect_4bCI(&gMasterDisp, D_601DC10, D_601DC90, 16, 16, xPos, yPos, 1.0f, 1.0f);
+    TextureRect_4bCI(&gMasterDisp, D_MAP_601DC10, D_MAP_601DC90, 16, 16, xPos, yPos, 1.0f, 1.0f);
 
     gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255);
 
-    TextureRect_4bCI(&gMasterDisp, D_601DCA0, D_601DCD8, 16, 7, xPos + 18.0f, yPos + 9.0f, 1.0f, 1.0f);
+    TextureRect_4bCI(&gMasterDisp, D_MAP_601DCA0, D_MAP_601DCD8, 16, 7, xPos + 18.0f, yPos + 9.0f, 1.0f, 1.0f);
 
     RCP_SetupDL(&gMasterDisp, 0x53);
 

src/overlays/ovl_menu/fox_title.c

@@ -4,29 +4,11 @@
  * Description: Starfox Title Handler
  */
 #include "prevent_bss_reordering.h"
-// #include "prevent_bss_reordering2.h"
+#include "prevent_bss_reordering2.h"
 #include "global.h"
-#include "assets.h"
 #include "fox_title.h"
 #include "assets/ast_title.h"
 
-extern Animation D_602F8E0;
-extern Animation D_60305C0;
-extern Animation D_6031DB8;
-extern Animation D_6031120;
-extern Animation D_6035024;
-extern Animation D_60338DC;
-extern Animation D_603531C;
-extern Animation D_6036278;
-
-extern Limb* D_602FBAC[];
-extern Limb* D_603088C[];
-extern Limb* D_6032084[];
-extern Limb* D_60313AC[];
-
-extern Gfx D_6036290[];
-extern Gfx D_6036B30[];
-
 f32 D_menu_801B7BB0;
 f32 D_menu_801B7BB4;
 f32 D_menu_801B7BB8;
@@ -161,8 +143,6 @@ f32 D_menu_801B907C;
 f32 D_menu_801B9080;
 f32 D_menu_801B9084;
 
-extern u16 D_6000000[];
-
 #include "assets/ast_font.h"
 
 typedef struct {
@@ -173,10 +153,10 @@ typedef struct {
 
 //! TODO: Symbols for segmented addresses
 TitleAnimation D_menu_801ADA00[4] = {
-    { &D_602F8E0, &D_6035024, D_602FBAC },
+    { &D_TITLE_602F8E0, &D_TITLE_6035024, D_TITLE_602FBAC },
-    { &D_60305C0, &D_60338DC, D_603088C },
+    { &D_TITLE_60305C0, &D_TITLE_60338DC, D_TITLE_603088C },
-    { &D_6031DB8, &D_603531C, D_6032084 },
+    { &D_TITLE_6031DB8, &D_TITLE_603531C, D_TITLE_6032084 },
-    { &D_6031120, &D_6036278, D_60313AC },
+    { &D_TITLE_6031120, &D_TITLE_6036278, D_TITLE_60313AC },
 };
 
 u16* D_menu_801ADA30[5] = {
@@ -2349,7 +2329,7 @@ void func_menu_8018D510(s32 arg0) {
     Matrix_SetGfxMtx(&gMasterDisp);
 
     gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
-    gSPDisplayList(gMasterDisp++, D_60320E0);
+    gSPDisplayList(gMasterDisp++, D_TITLE_60320E0);
     gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
 
     Matrix_Pop(&gGfxMatrix);
@@ -2424,7 +2404,7 @@ void func_menu_8018D80C(s32 arg0) {
 
         Matrix_SetGfxMtx(&gMasterDisp);
 
-        gSPDisplayList(gMasterDisp++, D_60320E0);
+        gSPDisplayList(gMasterDisp++, D_TITLE_60320E0);
 
         Matrix_Pop(&gGfxMatrix);
     }
@@ -2442,7 +2422,7 @@ void func_menu_8018DDB8(s32 arg0) {
     RCP_SetupDL_64();
 
     gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 240);
-    gSPDisplayList(gMasterDisp++, D_6032580);
+    gSPDisplayList(gMasterDisp++, D_TITLE_6032580);
 
     Matrix_Pop(&gGfxMatrix);
 }
@@ -2465,7 +2445,7 @@ void func_menu_8018DF0C(f32 arg0) {
     Matrix_Scale(gGfxMatrix, D_menu_801B8688.scale, D_menu_801B8688.scale, D_menu_801B8688.scale, 1);
     Matrix_SetGfxMtx(&gMasterDisp);
 
-    gSPDisplayList(gMasterDisp++, D_6037CF0);
+    gSPDisplayList(gMasterDisp++, D_TITLE_6037CF0);
     func_menu_8018E200();
     Matrix_Pop(&gGfxMatrix);
 }
@@ -2560,7 +2540,7 @@ void func_menu_8018E200(void) {
 
         Matrix_SetGfxMtx(&gMasterDisp);
 
-        gSPDisplayList(gMasterDisp++, D_60320E0);
+        gSPDisplayList(gMasterDisp++, D_TITLE_60320E0);
 
         Matrix_Pop(&gGfxMatrix);
     }
@@ -2614,7 +2594,7 @@ void func_menu_8018E67C(s32 arg0) {
     RCP_SetupDL_64();
 
     gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 128);
-    gSPDisplayList(gMasterDisp++, D_6041070);
+    gSPDisplayList(gMasterDisp++, D_TITLE_6041070);
 
     Matrix_Pop(&gGfxMatrix);
 
@@ -2819,17 +2799,17 @@ void func_menu_8018F438(void) {
     Matrix_Scale(gGfxMatrix, 0.6f, 0.6f, 0.6f, 1);
     Matrix_SetGfxMtx(&gMasterDisp);
 
-    gSPDisplayList(gMasterDisp++, D_602E380);
+    gSPDisplayList(gMasterDisp++, D_TITLE_602E380);
 
     Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -6836.0f, 1);
     Matrix_SetGfxMtx(&gMasterDisp);
 
-    gSPDisplayList(gMasterDisp++, D_602E380);
+    gSPDisplayList(gMasterDisp++, D_TITLE_602E380);
 
     Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -6836.0f, 1);
     Matrix_SetGfxMtx(&gMasterDisp);
 
-    gSPDisplayList(gMasterDisp++, D_602E380);
+    gSPDisplayList(gMasterDisp++, D_TITLE_602E380);
 
     Matrix_Pop(&gGfxMatrix);
 }
@@ -2841,8 +2821,8 @@ void func_menu_8018F680(void) {
     gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
 
     for (i = 0; i < 30; i++) {
-        TextureRect_16bRGBA(&gMasterDisp, D_6000000 + (i * 472), 236, 2, D_menu_801B9054, D_menu_801B9058 + (i * 2.0f),
+        TextureRect_16bRGBA(&gMasterDisp, gTitleStarfoxLogo + (i * 472), 236, 2, D_menu_801B9054,
-                            1.0f, 1.0f);
+                            D_menu_801B9058 + (i * 2.0f), 1.0f, 1.0f);
     }
 }
 
@@ -2853,14 +2833,14 @@ void func_menu_8018F77C(void) {
     Matrix_Scale(gGfxMatrix, D_menu_801B9068, D_menu_801B906C, 1.0f, 1);
     Matrix_RotateX(gGfxMatrix, M_DTOR * 90, 1);
     Matrix_SetGfxMtx(&gMasterDisp);
-    gSPDisplayList(gMasterDisp++, D_60148D0);
+    gSPDisplayList(gMasterDisp++, D_TITLE_60148D0);
     Matrix_Pop(&gGfxMatrix);
 }
 
 void func_menu_8018F85C(void) {
     RCP_SetupDL(&gMasterDisp, 0x53);
     gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
-    TextureRect_8bIA(&gMasterDisp, D_6013470, 16, 16, 234.0f, 20.0f, 1.0f, 1.0f);
+    TextureRect_8bIA(&gMasterDisp, gTitleCopyrightSymbol, 16, 16, 234.0f, 20.0f, 1.0f, 1.0f);
 }
 
 void func_menu_8018F8E4(void) {
@@ -2889,14 +2869,14 @@ void func_menu_8018F8E4(void) {
 
             gDPSetPrimColor(gMasterDisp++, 0, 0, 60, 60, 255, 200);
 
-            TextureRect_8bCI(&gMasterDisp, &D_601D750, &D_601DB50, 32, 32, D_menu_801AE464, D_menu_801AE468,
+            TextureRect_8bCI(&gMasterDisp, &D_TITLE_601D750, &D_TITLE_601DB50, 32, 32, D_menu_801AE464, D_menu_801AE468,
                              D_menu_801AE46C, D_menu_801AE470);
             RCP_SetupDL(&gMasterDisp, 0x53);
 
             gDPSetPrimColor(gMasterDisp++, 0, 0, 255, (s32) D_menu_801B7BC8, (s32) D_menu_801B7BC8, 255);
 
             for (i = 0; i < 6; i++) {
-                TextureRect_8bIA(&gMasterDisp, D_60123F0 + (704 * i), 176, 4, D_menu_801AE474,
+                TextureRect_8bIA(&gMasterDisp, gTitleNoController + (704 * i), 176, 4, D_menu_801AE474,
                                  D_menu_801AE478 + (i * 4.0f), 1.0f, 1.0f);
             }
         } else {
@@ -2904,9 +2884,10 @@ void func_menu_8018F8E4(void) {
             gDPSetPrimColor(gMasterDisp++, 0, 0, 255, (s32) D_menu_801B7BC8, (s32) D_menu_801B7BC8, 255);
 
             for (i = 0; i < 2; i++) {
-                TextureRect_8bIA(&gMasterDisp, D_600E360 + (i * 720), 120, 6, 101.0f, temp2 + (i * 6.0f), 1.0f, 1.0f);
+                TextureRect_8bIA(&gMasterDisp, gTitlePressStart + (i * 720), 120, 6, 101.0f, temp2 + (i * 6.0f), 1.0f,
+                                 1.0f);
             }
-            TextureRect_8bIA(&gMasterDisp, D_600E360 + 1440, 120, 1, 101.0f, temp2 + 12, 1.0f, 1.0f);
+            TextureRect_8bIA(&gMasterDisp, gTitlePressStart + 1440, 120, 1, 101.0f, temp2 + 12, 1.0f, 1.0f);
         }
     }
 }
@@ -2918,7 +2899,8 @@ void func_menu_8018FC14(void) {
     gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
 
     for (i = 0; i < 2; i++) {
-        TextureRect_8bIA(&gMasterDisp, D_600DDC0 + (i * 720), 120, 6, 102.0f, 209.0f + (i * 6.0f), 1.0f, 1.0f);
+        TextureRect_8bIA(&gMasterDisp, gTitleNintendoCopyright + (i * 720), 120, 6, 102.0f, 209.0f + (i * 6.0f), 1.0f,
+                         1.0f);
     }
 }
 
@@ -2940,32 +2922,33 @@ void func_menu_8018FD08(void) {
 
     switch (D_menu_801B8340) {
         case 0:
-            TextureRect_8bIA(&gMasterDisp, D_600F940, 144, 13, temp_fs2, temp, 1.0f, 1.0f);
+            TextureRect_8bIA(&gMasterDisp, gTitleSlippyCard, 144, 13, temp_fs2, temp, 1.0f, 1.0f);
             break;
 
         case 1:
-            TextureRect_8bIA(&gMasterDisp, D_6010090, 120, 13, temp_fs2, temp, 1.0f, 1.0f);
+            TextureRect_8bIA(&gMasterDisp, gTitlePeppyCard, 120, 13, temp_fs2, temp, 1.0f, 1.0f);
             break;
 
         case 2:
             for (i = 0; i < 3; i++) {
-                TextureRect_8bIA(&gMasterDisp, D_60106B0 + (704 * i), 176, 4, temp_fs2, temp + (i * 4), 1.0f, 1.0f);
+                TextureRect_8bIA(&gMasterDisp, gTitleFalcoCard + (704 * i), 176, 4, temp_fs2, temp + (i * 4), 1.0f,
+                                 1.0f);
             }
-            TextureRect_8bIA(&gMasterDisp, D_60106B0 + 2112, 176, 1, temp_fs2, temp + 12.0f, 1.0f, 1.0f);
+            TextureRect_8bIA(&gMasterDisp, gTitleFalcoCard + 2112, 176, 1, temp_fs2, temp + 12.0f, 1.0f, 1.0f);
             break;
 
         case 3:
             for (i = 0; i < 3; i++) {
-                TextureRect_8bIA(&gMasterDisp, D_6010FA0 + (i * 704), 176, 4, temp_fs2, temp + (i * 4), 1.0f, 1.0f);
+                TextureRect_8bIA(&gMasterDisp, gTitleFoxCard + (i * 704), 176, 4, temp_fs2, temp + (i * 4), 1.0f, 1.0f);
             }
-            TextureRect_8bIA(&gMasterDisp, D_6010FA0 + 2112, 176, 1, temp_fs2, temp + 12, 1.0f, 1.0f);
+            TextureRect_8bIA(&gMasterDisp, gTitleFoxCard + 2112, 176, 1, temp_fs2, temp + 12, 1.0f, 1.0f);
             break;
     }
 }
 
 static Gfx* D_menu_801AE48C[12] = {
-    D_6036290, D_6036290, D_6036290, D_6036290, D_6036B30, D_6036290,
+    D_TITLE_6036290, D_TITLE_6036290, D_TITLE_6036290, D_TITLE_6036290, D_TITLE_6036B30, D_TITLE_6036290,
-    D_6036290, D_6036290, D_6036290, D_6036290, D_6036B30, D_6036290,
+    D_TITLE_6036290, D_TITLE_6036290, D_TITLE_6036290, D_TITLE_6036290, D_TITLE_6036B30, D_TITLE_6036290,
 };
 
 static f32 D_menu_801AE4BC[12] = {
@@ -3000,7 +2983,7 @@ void func_menu_8018FF74(void) {
             gDPSetColorDither(gMasterDisp++, G_CD_NOISE);
             gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, D_menu_801B7BD0);
 
-            TextureRect_16bRGBA(&gMasterDisp, &D_600D5C0, 32, 32, D_menu_801B9080, D_menu_801B9084, D_menu_801B7BB0,
+            TextureRect_16bRGBA(&gMasterDisp, &gTitleSunBeam, 32, 32, D_menu_801B9080, D_menu_801B9084, D_menu_801B7BB0,
                                 D_menu_801B7BB4);
             D_menu_801B9080 += 1.66f;
         }
@@ -3115,9 +3098,10 @@ void func_menu_801906A0(void) {
         case 0:
             RCP_SetupDL(&gMasterDisp, 0x55);
             gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, (s32) D_menu_801B7BDC);
-            TextureRect_4bCI(&gMasterDisp, D_6014140, D_60147C0, 256, 13, 90.0f, 110.0f, 1.0f, 1.0f);
+            TextureRect_4bCI(&gMasterDisp, gTextIntroStarfox, gTextIntroStarfoxPalette, 256, 13, 90.0f, 110.0f, 1.0f,
+                             1.0f);
             gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, (s32) D_menu_801B7BE0);
-            TextureRect_4bCI(&gMasterDisp, D_60147E0, D_60148B0, 32, 13, 150.0f, 110.0f, 1.0f, 1.0f);
+            TextureRect_4bCI(&gMasterDisp, gTextIntroIn, gTextIntroInPalette, 32, 13, 150.0f, 110.0f, 1.0f, 1.0f);
             break;
 
         case 1:
@@ -3125,10 +3109,10 @@ void func_menu_801906A0(void) {
             gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, (s32) D_menu_801B7BDC);
 
             for (i = 0; i < 5; i++) {
-                TextureRect_16bRGBA(&gMasterDisp, D_6006EA0 + (2048 * i), 128, 16, D_menu_801B9070,
+                TextureRect_16bRGBA(&gMasterDisp, gTitleNintendo64Logo + (2048 * i), 128, 16, D_menu_801B9070,
                                     D_menu_801B9074 + (16 * i * D_menu_801B907C), D_menu_801B9078, D_menu_801B907C);
             }
-            TextureRect_16bRGBA(&gMasterDisp, D_600BEA0, 128, 8, D_menu_801B9070,
+            TextureRect_16bRGBA(&gMasterDisp, gTitleNintendo64Logo + (2048 * 5), 128, 8, D_menu_801B9070,
                                 (80.0f * D_menu_801B907C) + D_menu_801B9074, D_menu_801B9078, D_menu_801B907C);
 
         case -1:
@@ -3146,7 +3130,7 @@ void func_menu_80190950(void) {
     Matrix_Scale(gGfxMatrix, 0.4f, 0.4f, 0.4f, 1);
     Matrix_SetGfxMtx(&gMasterDisp);
 
-    gSPDisplayList(gMasterDisp++, D_6018D40);
+    gSPDisplayList(gMasterDisp++, D_TITLE_6018D40);
 
     if (D_menu_801B7BE4 != 0) {
         func_menu_80190A98();
@@ -3159,7 +3143,7 @@ void func_menu_80190A98(void) {
     Matrix_Translate(gGfxMatrix, 401.0f, -249.0f, -22.0f, 1);
     Matrix_Scale(gGfxMatrix, 1.0f, 1.0f, 1.0f, 1);
     Matrix_SetGfxMtx(&gMasterDisp);
-    gSPDisplayList(gMasterDisp++, D_602A720);
+    gSPDisplayList(gMasterDisp++, D_TITLE_602A720);
 }
 
 void func_menu_80190B30(s32 arg0) {
@@ -3172,7 +3156,7 @@ void func_menu_80190B30(s32 arg0) {
     Matrix_Scale(gGfxMatrix, 0.8f, 0.8f, 0.8f, 1);
     Matrix_SetGfxMtx(&gMasterDisp);
 
-    gSPDisplayList(gMasterDisp++, D_601C7C0);
+    gSPDisplayList(gMasterDisp++, D_TITLE_601C7C0);
 
     Matrix_Pop(&gGfxMatrix);
 }
@@ -3191,7 +3175,7 @@ void func_menu_80190C9C(void) {
         case 1:
             RCP_SetupDL(&gMasterDisp, 0x53);
             gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
-            TextureRect_8bIA(&gMasterDisp, D_600E980, 144, 28, D_menu_801AE55C, D_menu_801AE560, 1.0f, 1.0f);
+            TextureRect_8bIA(&gMasterDisp, gTitleGreatFoxCard, 144, 28, D_menu_801AE55C, D_menu_801AE560, 1.0f, 1.0f);
             break;
 
         case 2:
@@ -3199,11 +3183,11 @@ void func_menu_80190C9C(void) {
             gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
 
             for (i = 0; i < 4; i++) {
-                TextureRect_8bIA(&gMasterDisp, D_6011890 + (672 * i), 112, 6, D_menu_801AE564,
+                TextureRect_8bIA(&gMasterDisp, gTitleArwingCard + (672 * i), 112, 6, D_menu_801AE564,
                                  D_menu_801AE568 + (6.0f * i), 1.0f, 1.0f);
             }
-            TextureRect_8bIA(&gMasterDisp, D_6012310, 112, 2, D_menu_801AE564, D_menu_801AE568 + (6.0f * 4), 1.0f,
+            TextureRect_8bIA(&gMasterDisp, gTitleArwingCard + (112 * 24), 112, 2, D_menu_801AE564,
-                             1.0f);
+                             D_menu_801AE568 + (6.0f * 4), 1.0f, 1.0f);
     }
 }
 

yamls/us/assets.yaml

@@ -288,8 +288,12 @@
 
   - name: ast_title
     exclusive_ram_id: segment_06
-    type: bin
+    type: code
+    dir: assets
+    vram: 0x06000000
     start: 0xBFC510
+    subsegments:
+      - [0xBFC510, .data, ast_title/ast_title]
 
   - name: ast_map
     exclusive_ram_id: segment_06