export configuration ast_zoness and bump torch for generic array factory (#192)

* ast_zoness

* format

* remove ast_zoness.h

* change name to D_ZO_601996C

* rename to yaml and use vec3f array

* prevent_bss_reordering in fox_edisplay

* format

---------

Co-authored-by: Alejandro Javier Asenjo Nitti <alejandro.asenjo88@gmail.com>

assets/yaml/us/ast_zoness.yaml

@@ -0,0 +1,477 @@
+:config:
+  segments:
+    - [0x06, 0xB84560]
+  header:
+    code:
+      - '#include "assets/ast_zoness.h"'
+    header:
+      - '#include "gfx.h"'
+      - '#include "sf64object.h"'
+      - '#include "structs.h"'
+      - '#include "sf64level.h"'
+
+D_ZO_6000000:
+  { type: TEXTURE, ctype: u8, format: IA8, width: 112, height: 28, offset: 0x6000000, symbol: D_ZO_6000000}
+
+D_ZO_6000C40:
+  { type: GFX, offset: 0x6000C40, symbol: D_ZO_6000C40}
+
+D_ZO_6000E98:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6000E98, symbol: D_ZO_6000E98}
+
+D_ZO_6001098:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6001098, symbol: D_ZO_6001098}
+
+D_ZO_60012A0:
+  { type: GFX, offset: 0x60012A0, symbol: D_ZO_60012A0}
+
+D_ZO_6001810:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6001810, symbol: D_ZO_6001810}
+
+D_ZO_6002010:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6002010, symbol: D_ZO_6002010}
+
+D_ZO_6002210:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6002210, symbol: D_ZO_6002210}
+
+D_ZO_6002410:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6002410, symbol: D_ZO_6002410}
+
+D_ZO_6002610:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6002610, symbol: D_ZO_6002610}
+
+D_ZO_6002810:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6002810, symbol: D_ZO_6002810}
+
+D_ZO_6002A10:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 16, offset: 0x6002A10, symbol: D_ZO_6002A10}
+
+D_ZO_6002E10:
+  { type: GFX, offset: 0x6002E10, symbol: D_ZO_6002E10}
+
+D_ZO_6003288:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6003288, symbol: D_ZO_6003288}
+
+D_ZO_6003488:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6003488, symbol: D_ZO_6003488}
+
+D_ZO_6003690:
+  { type: GFX, offset: 0x6003690, symbol: D_ZO_6003690}
+
+D_ZO_6003930:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6003930, symbol: D_ZO_6003930}
+
+D_ZO_6003B30:
+  { type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 64, offset: 0x6003B30, symbol: D_ZO_6003B30}
+
+D_ZO_6004330:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 40, offset: 0x6004330, symbol: D_ZO_6004330}
+
+D_ZO_6004380:
+  { type: GFX, offset: 0x6004380, symbol: D_ZO_6004380}
+
+D_ZO_6004450:
+  { type: GFX, offset: 0x6004450, symbol: D_ZO_6004450}
+
+D_ZO_6004970:
+  { type: TEXTURE, ctype: u8, format: CI8, width: 16, height: 16, offset: 0x6004970, symbol: D_ZO_6004970}
+
+D_ZO_6004A70:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 72, offset: 0x6004A70, symbol: D_ZO_6004A70}
+
+D_ZO_6004B00:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6004B00, symbol: D_ZO_6004B00}
+
+D_ZO_6004D00:
+  { type: GFX, offset: 0x6004D00, symbol: D_ZO_6004D00}
+
+D_ZO_6005958:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6005958, symbol: D_ZO_6005958}
+
+D_ZO_6005B58:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6005B58, symbol: D_ZO_6005B58}
+
+D_ZO_6006360:
+  { type: GFX, offset: 0x6006360, symbol: D_ZO_6006360}
+
+D_ZO_6007230:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6007230, symbol: D_ZO_6007230}
+
+D_ZO_6007430:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6007430, symbol: D_ZO_6007430}
+
+D_ZO_6007C30:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6007C30, symbol: D_ZO_6007C30}
+
+D_ZO_6007E30:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6007E30, symbol: D_ZO_6007E30}
+
+D_ZO_6008030:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6008030, symbol: D_ZO_6008030}
+
+D_ZO_6008230:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6008230, symbol: D_ZO_6008230}
+
+D_ZO_6008430:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6008430, symbol: D_ZO_6008430}
+
+D_ZO_6008630:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6008630, symbol: D_ZO_6008630}
+
+D_ZO_6008830:
+  { type: GFX, offset: 0x6008830, symbol: D_ZO_6008830}
+
+D_ZO_6009ED0:
+  { type: VTX, count: 289, offset: 0x6009ED0, symbol: D_ZO_6009ED0}
+
+D_ZO_600B0E0:
+  { type: GFX, offset: 0x600B0E0, symbol: D_ZO_600B0E0}
+
+D_ZO_600C780:
+  { type: VTX, count: 289, offset: 0x600C780, symbol: D_ZO_600C780}
+
+D_ZO_600D990:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x600D990, symbol: D_ZO_600D990}
+
+D_ZO_600E5EC:
+  { type: SF64:ANIM, offset: 0x600E5EC, symbol: D_ZO_600E5EC}
+
+D_ZO_600E7D8:
+  { type: SF64:SKELETON, offset: 0x600E7D8, symbol: D_ZO_600E7D8}
+
+D_ZO_600E820:
+  { type: GFX, offset: 0x600E820, symbol: D_ZO_600E820}
+
+D_ZO_600EC90:
+  { type: GFX, offset: 0x600EC90, symbol: D_ZO_600EC90}
+
+D_ZO_600F560:
+  { type: GFX, offset: 0x600F560, symbol: D_ZO_600F560}
+
+D_ZO_600FE58:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x600FE58, symbol: D_ZO_600FE58}
+
+D_ZO_6010658:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6010658, symbol: D_ZO_6010658}
+
+D_ZO_6010E58:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6010E58, symbol: D_ZO_6010E58}
+
+D_ZO_6011660:
+  { type: GFX, offset: 0x6011660, symbol: D_ZO_6011660}
+
+D_ZO_6011928:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6011928, symbol: D_ZO_6011928}
+
+D_ZO_6012128:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6012128, symbol: D_ZO_6012128}
+
+D_ZO_6012930:
+  { type: GFX, offset: 0x6012930, symbol: D_ZO_6012930}
+
+D_ZO_6013010:
+  { type: GFX, offset: 0x6013010, symbol: D_ZO_6013010}
+
+D_ZO_6013330:
+  { type: GFX, offset: 0x6013330, symbol: D_ZO_6013330}
+
+D_ZO_6013480:
+  { type: GFX, offset: 0x6013480, symbol: D_ZO_6013480}
+
+D_ZO_6013510:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x6013510, symbol: D_ZO_6013510}
+
+D_ZO_6014510:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x6014510, symbol: D_ZO_6014510}
+
+D_ZO_6015430:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x6015430, symbol: D_ZO_6015430}
+
+D_ZO_6016350:
+  { type: GFX, offset: 0x6016350, symbol: D_ZO_6016350}
+
+D_ZO_60163E0:
+  { type: GFX, offset: 0x60163E0, symbol: D_ZO_60163E0}
+
+D_ZO_60165D0:
+  { type: GFX, offset: 0x60165D0, symbol: D_ZO_60165D0}
+
+D_ZO_6016880:
+  { type: GFX, offset: 0x6016880, symbol: D_ZO_6016880}
+
+D_ZO_6016B50:
+  { type: GFX, offset: 0x6016B50, symbol: D_ZO_6016B50}
+
+D_ZO_6016D90:
+  { type: GFX, offset: 0x6016D90, symbol: D_ZO_6016D90}
+
+D_ZO_6016E30:
+  { type: GFX, offset: 0x6016E30, symbol: D_ZO_6016E30}
+
+D_ZO_6016EC8:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6016EC8, symbol: D_ZO_6016EC8}
+
+D_ZO_6017950:
+  { type: GFX, offset: 0x6017950, symbol: D_ZO_6017950}
+
+D_ZO_60179D8:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x60179D8, symbol: D_ZO_60179D8}
+
+D_ZO_60181E0:
+  { type: GFX, offset: 0x60181E0, symbol: D_ZO_60181E0}
+
+D_ZO_60182E0:
+  { type: TEXTURE, ctype: u16, format: IA16, width: 16, height: 16, offset: 0x60182E0, symbol: D_ZO_60182E0}
+
+D_ZO_6018550:
+  { type: SF64:ANIM, offset: 0x6018550, symbol: D_ZO_6018550}
+
+D_ZO_601863C:
+  { type: SF64:SKELETON, offset: 0x601863C, symbol: D_ZO_601863C}
+
+D_ZO_6018660:
+  { type: GFX, offset: 0x6018660, symbol: D_ZO_6018660}
+
+D_ZO_60186E8:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 32, offset: 0x60186E8, symbol: D_ZO_60186E8}
+
+D_ZO_6018AE8:
+  { type: GFX, offset: 0x6018AE8, symbol: D_ZO_6018AE8}
+
+D_ZO_6018B78:
+  { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 16, offset: 0x6018B78, symbol: D_ZO_6018B78}
+
+D_ZO_6018C80:
+  { type: GFX, offset: 0x6018C80, symbol: D_ZO_6018C80}
+
+D_ZO_6018E80:
+  { type: GFX, offset: 0x6018E80, symbol: D_ZO_6018E80}
+
+D_ZO_6019040:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6019040, symbol: D_ZO_6019040}
+
+D_ZO_60195EC:
+  { type: SF64:ANIM, offset: 0x60195EC, symbol: D_ZO_60195EC}
+
+D_ZO_6019738:
+  { type: SF64:SKELETON, offset: 0x6019738, symbol: D_ZO_6019738}
+
+D_ZO_601996C:
+  { type: SF64:ANIM, offset: 0x601996C, symbol: D_ZO_601996C}
+
+D_ZO_6019E18:
+  { type: SF64:SKELETON, offset: 0x6019E18, symbol: D_ZO_6019E18}
+
+D_ZO_6019EB0:
+  { type: GFX, offset: 0x6019EB0, symbol: D_ZO_6019EB0}
+
+D_ZO_601A340:
+  { type: GFX, offset: 0x601A340, symbol: D_ZO_601A340}
+
+D_ZO_601AA48:
+  { type: SF64:ANIM, offset: 0x601AA48, symbol: D_ZO_601AA48}
+
+D_ZO_601AB14:
+  { type: SF64:SKELETON, offset: 0x601AB14, symbol: D_ZO_601AB14}
+
+D_ZO_601AFB8:
+  { type: SF64:ANIM, offset: 0x601AFB8, symbol: D_ZO_601AFB8}
+
+D_ZO_601B184:
+  { type: SF64:SKELETON, offset: 0x601B184, symbol: D_ZO_601B184}
+
+D_ZO_601BAD0:
+  { type: GFX, offset: 0x601BAD0, symbol: D_ZO_601BAD0}
+
+D_ZO_601BBB8:
+  { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 16, offset: 0x601BBB8, symbol: D_ZO_601BBB8}
+
+D_ZO_601BCC0:
+  { type: GFX, offset: 0x601BCC0, symbol: D_ZO_601BCC0}
+
+D_ZO_601C390:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x601C390, symbol: D_ZO_601C390}
+
+D_ZO_601C590:
+  { type: GFX, offset: 0x601C590, symbol: D_ZO_601C590}
+
+D_ZO_601C8E0:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x601C8E0, symbol: D_ZO_601C8E0}
+
+D_ZO_601D0E0:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x601D0E0, symbol: D_ZO_601D0E0}
+
+D_ZO_601D2E0:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x601D2E0, symbol: D_ZO_601D2E0}
+
+D_ZO_601D5B0:
+  { type: GFX, offset: 0x601D5B0, symbol: D_ZO_601D5B0}
+
+D_ZO_601D680:
+  { type: GFX, offset: 0x601D680, symbol: D_ZO_601D680}
+
+D_ZO_601E618:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x601E618, symbol: D_ZO_601E618}
+
+D_ZO_601F874:
+  { type: SF64:ANIM, offset: 0x601F874, symbol: D_ZO_601F874}
+
+D_ZO_601F920:
+  { type: SF64:SKELETON, offset: 0x601F920, symbol: D_ZO_601F920}
+
+D_ZO_601FBC4:
+  { type: SF64:ANIM, offset: 0x601FBC4, symbol: D_ZO_601FBC4}
+
+D_ZO_601FC90:
+  { type: SF64:SKELETON, offset: 0x601FC90, symbol: D_ZO_601FC90}
+
+D_ZO_601FCB0:
+  { type: GFX, offset: 0x601FCB0, symbol: D_ZO_601FCB0}
+
+D_ZO_60201B0:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x60201B0, symbol: D_ZO_60201B0}
+
+D_ZO_60212B0:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x60212B0, symbol: D_ZO_60212B0}
+
+D_ZO_60216A8:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x60216A8, symbol: D_ZO_60216A8}
+
+D_ZO_6021ABC:
+  { type: SF64:ANIM, offset: 0x6021ABC, symbol: D_ZO_6021ABC}
+
+D_ZO_6021B88:
+  { type: SF64:SKELETON, offset: 0x6021B88, symbol: D_ZO_6021B88}
+
+D_ZO_60220A0:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x60220A0, symbol: D_ZO_60220A0}
+
+D_ZO_60227D8:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x60227D8, symbol: D_ZO_60227D8}
+
+D_ZO_60229D8:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x60229D8, symbol: D_ZO_60229D8}
+
+D_ZO_6023088:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6023088, symbol: D_ZO_6023088}
+
+D_ZO_6023288:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6023288, symbol: D_ZO_6023288}
+
+D_ZO_6023488:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6023488, symbol: D_ZO_6023488}
+
+D_ZO_6023730:
+  { type: GFX, offset: 0x6023730, symbol: D_ZO_6023730}
+
+D_ZO_60237E0:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x60237E0, symbol: D_ZO_60237E0}
+
+D_ZO_60239E0:
+  { type: GFX, offset: 0x60239E0, symbol: D_ZO_60239E0}
+
+D_ZO_6023D50:
+  { type: GFX, offset: 0x6023D50, symbol: D_ZO_6023D50}
+
+D_ZO_6024018:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6024018, symbol: D_ZO_6024018}
+
+D_ZO_6024220:
+  { type: GFX, offset: 0x6024220, symbol: D_ZO_6024220}
+
+D_ZO_60242B8:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x60242B8, symbol: D_ZO_60242B8}
+
+D_ZO_6024AC0:
+  { type: GFX, offset: 0x6024AC0, symbol: D_ZO_6024AC0}
+
+D_ZO_6024D60:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6024D60, symbol: D_ZO_6024D60}
+
+D_ZO_6025658:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6025658, symbol: D_ZO_6025658}
+
+D_ZO_6025E60:
+  { type: GFX, offset: 0x6025E60, symbol: D_ZO_6025E60}
+
+D_ZO_6025F98:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6025F98, symbol: D_ZO_6025F98}
+
+D_ZO_60266D0:
+  { type: SF64:ENV_SETTINGS, offset: 0x60266D0, symbol: D_ZO_60266D0}
+
+D_ZO_6026714:
+  { type: SF64:OBJECT_INIT, offset: 0x6026714, symbol: D_ZO_6026714}
+
+D_ZO_602AAC0:
+  { type: SF64:SCRIPT, offset: 0x602AAC0, symbol: D_ZO_602AAC0}
+
+D_ZO_602AC50:
+  { type: ARRAY, count: 289, array_type: u16, offset: 0x602AC50, symbol: D_ZO_602AC50}
+
+# Unused
+D_ZO_602AE94:
+  { type: ARRAY, count: 242, array_type: Vec3f, offset: 0x602AE94, symbol: D_ZO_602AE94}
+
+D_ZO_602B9EC:
+  { type: SF64:HITBOX, offset: 0x602B9EC, symbol: D_ZO_602B9EC}
+
+D_ZO_602BA20:
+  { type: SF64:HITBOX, offset: 0x602BA20, symbol: D_ZO_602BA20}
+
+D_ZO_602BAE4:
+  { type: SF64:HITBOX, offset: 0x602BAE4, symbol: D_ZO_602BAE4}
+
+D_ZO_602BBD8:
+  { type: SF64:HITBOX, offset: 0x602BBD8, symbol: D_ZO_602BBD8}
+
+D_ZO_602BC54:
+  { type: SF64:HITBOX, offset: 0x602BC54, symbol: D_ZO_602BC54}
+
+D_ZO_602BC58:
+  { type: SF64:HITBOX, offset: 0x602BC58, symbol: D_ZO_602BC58}
+
+D_ZO_602BE3C:
+  { type: SF64:HITBOX, offset: 0x602BE3C, symbol: D_ZO_602BE3C}
+
+D_ZO_602BE58:
+  { type: SF64:HITBOX, offset: 0x602BE58, symbol: D_ZO_602BE58}
+
+D_ZO_602BFC4:
+  { type: SF64:HITBOX, offset: 0x602BFC4, symbol: D_ZO_602BFC4}
+
+D_ZO_602C028:
+  { type: SF64:HITBOX, offset: 0x602C028, symbol: D_ZO_602C028}
+
+D_ZO_602C044:
+  { type: SF64:HITBOX, offset: 0x602C044, symbol: D_ZO_602C044}
+
+D_ZO_602C1A0:
+  { type: SF64:HITBOX, offset: 0x602C1A0, symbol: D_ZO_602C1A0}
+
+D_ZO_602C1D4:
+  { type: SF64:HITBOX, offset: 0x602C1D4, symbol: D_ZO_602C1D4}
+
+D_ZO_602C218:
+  { type: SF64:HITBOX, offset: 0x602C218, symbol: D_ZO_602C218}
+
+D_ZO_602C234:
+  { type: SF64:HITBOX, offset: 0x602C234, symbol: D_ZO_602C234}
+
+D_ZO_602C250:
+  { type: SF64:HITBOX, offset: 0x602C250, symbol: D_ZO_602C250}
+
+D_ZO_602C294:
+  { type: SF64:HITBOX, offset: 0x602C294, symbol: D_ZO_602C294}
+  
+D_ZO_602C2B0:
+  { type: SF64:HITBOX, offset: 0x602C2B0, symbol: D_ZO_602C2B0}
+
+D_ZO_602C2CC:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x602C2CC, symbol: D_ZO_602C2CC}
+
+D_ZO_602CACC:
+  {type: SF64:TRIANGLE, count: 30, offset: 0x602CACC, symbol: D_ZO_602CACC, mesh_symbol: D_ZO_OFFSET}
+
+
+

include/assets.h

@@ -33,40 +33,31 @@ extern u16 D_6006EA0[];
 extern Gfx D_6007C40[];
 extern Gfx D_60084C0[];
 extern Gfx D_6008770[];
-extern Gfx D_6008830[];
 extern Gfx D_6009250[];
 extern u16* D_6009B34[];
 extern f32 D_6009CC4[];
 extern f32 D_6009CFC[];
 extern Animation D_6009D30;
-extern Vtx D_6009ED0[];
 extern Gfx D_6009F90[];
 extern Gfx D_600A420[];
-extern Gfx D_600B0E0[];
 extern Animation D_600B1B4;
 extern Gfx D_600B8B0[];
 extern u16 D_600BEA0[];
 extern Animation D_600C15C;
 extern u16 D_600C6A0[];
-extern Vtx D_600C780[];
 extern Animation D_600D3DC;
-extern u16 D_600D990[];
 extern Gfx D_600D9F0[];
 extern u8 D_600DDC0[];
 extern Gfx D_600DDF0[];
 extern Animation D_600E2C4;
 extern u8 D_600E360[];
 extern Limb* D_600E470[];
-extern Animation D_600E5EC;
-extern Gfx D_600E820[];
 extern u8 D_600E980[];
-extern Gfx D_600EC90[];
 extern Gfx D_600F160[];
 extern Gfx D_600F2F0[];
 extern Vec3s D_600F394[];
 extern Gfx D_600F3D0[];
 extern CollisionPoly D_600F3F4[];
-extern Gfx D_600F560[];
 extern Vec3s D_600F5AC[];
 extern Animation D_600F744;
 extern u8 D_600F940[];
@@ -82,14 +73,11 @@ extern u8 D_6012310[];
 extern u8 D_60123F0[];
 extern Animation D_6012C00_Anim;
 extern u8 D_6013470[];
-extern Gfx D_6013480[];
 extern Animation D_601388C;
 extern u8 D_6014140[];
-extern u16 D_6014510[];
 extern u16 D_60147C0[];
 extern u8 D_60147E0[];
 extern u8 D_60148B0[];
-extern u16 D_6015430[];
 extern Gfx D_6016270[];
 extern Vec3s D_6016374[];
 extern Gfx D_6016CF0[];
@@ -111,9 +99,6 @@ extern Gfx D_601C820[];
 extern Gfx D_601E150[];
 extern u16 D_601E1E8[];
 extern EnvSettings D_SO_601F1F0;
-extern Animation D_601F874;
-extern Limb* D_601F920[];
-extern Gfx D_601FCB0[];
 extern Gfx D_60200E0[];
 extern Gfx D_6020A30[];
 extern Gfx D_6020E60[];
@@ -121,31 +106,6 @@ extern u16 D_6020F60[];
 extern u16 D_6022760[];
 extern u16 D_60229A4[];
 extern f32 D_60231A4[];
-extern u16* D_ZO_602AAC0[];
-extern Gfx D_6024220[];
-extern Gfx D_6024AC0[];
-extern EnvSettings D_ZO_60266D0;
-extern Gfx D_602A720[];
-extern u16 D_602AC50[];
-extern f32 D_602B9EC[];
-extern f32 D_602BA20[];
-extern f32 D_602BAE4[];
-extern f32 D_602BBD8[];
-extern f32 D_602BC54[];
-extern f32 D_602BC58[];
-extern f32 D_602BE3C[];
-extern f32 D_602BE58[];
-extern f32 D_602BFC4[];
-extern f32 D_602C044[];
-extern f32 D_602C1D4[];
-extern f32 D_602C218[];
-extern f32 D_602C234[];
-extern f32 D_602C250[];
-extern f32 D_602C294[];
-extern u16* D_ME_602F3AC[];
-extern f32 D_602C2B0[];
-extern u16 D_602C2CC[];
-extern Triangle D_602CACC[];
 extern Vec3f D_602CB80[];
 extern CollisionPoly D_602FA9C[];
 extern Vec3s D_6033E08[];

include/assets/ast_zoness.h

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

include/fox_edisplay_assets.h

@@ -33,15 +33,12 @@ extern Gfx D_6005CC0[];
 extern Gfx D_60176D0[];
 extern Gfx D_6017810[];
 extern Gfx D_6017770[];
-extern Gfx D_6016D90[];
-extern Gfx D_6016E30[];
 extern Gfx D_60178B0[];
 extern Gfx D_6023690[];
 extern Gfx D_6021BB0[];
 extern Gfx D_6021C50[];
 extern Gfx D_6021CE0[];
 extern Gfx D_6021D80[];
-extern Gfx D_6016350[];
 extern Gfx D_6021E20[];
 extern Gfx D_60222A0[];
 extern Gfx D_6022BE0[];
@@ -50,14 +47,8 @@ extern Gfx D_6022F00[];
 extern Gfx D_6020F10[];
 extern Gfx D_6021100[];
 extern Gfx D_60214B0[];
-extern Gfx D_60163E0[];
-extern Gfx D_60165D0[];
-extern Gfx D_6016880[];
-extern Gfx D_6016B50[];
-extern Gfx D_6000C40[];
 extern Gfx D_601F620[];
 extern Gfx D_601F420[];
-extern Gfx D_6018C80[];
 extern Gfx D_601F940[];
 extern Gfx D_601F260[];
 extern Gfx D_6014DB0[];
@@ -143,6 +134,5 @@ extern Gfx D_6020D50[];
 extern Gfx D_601B8F0[];
 extern Gfx D_601B3B0[];
 extern Gfx D_601B1C0[];
-extern Gfx D_6011660[];
 
 #endif

include/fox_enmy2_assets.h

@@ -5,12 +5,9 @@
 
 // Displaylists
 
-extern Gfx D_6004D00[];
 extern Gfx D_6002500[];
-extern Gfx D_60043F0[];
 extern Gfx D_6004310[];
-extern f32 D_602C1A0[];
+extern Gfx D_60043F0[];
-extern f32 D_602C294[];
 extern f32 D_VE1_601B474[];
 extern f32 D_VE1_601B43C[];
 extern f32 D_VE1_601B944[];

include/fox_enmy_assets.h

@@ -5,7 +5,6 @@
 
 extern ObjectInit D_VE1_6007E74[];
 extern ObjectInit D_SO_601F234[];
-extern ObjectInit D_ZO_6026714[];
 extern ObjectInit D_FO_600EAD4[];
 extern ObjectInit D_KA_6011044[];
 extern ObjectInit D_VE2_600FF74[];

linker_scripts/us/symbol_addrs_overlays.txt

@@ -185,3 +185,5 @@ D_ending_80198260 = 0x80198260;//size:0x320 segment:ovl_ending
 D_ending_80192DF0 = 0x80192DF0;//size:0x20 type:f32 segment:ovl_ending
 
 D_unused_801875C0 = 0x801875C0;
+
+D_ZO_601996C = 0x601996C;

linker_scripts/us/undefined_syms.ld

@@ -131,7 +131,6 @@ D_500A7D0 = 0x0500A7D0;
 
 D_6001360 = 0x06001360;
 D_KA_60012A0 = 0x060012A0;
-D_ZO_60012A0 = 0x060012A0;
 D_MA_60012A0 = 0x060012A0;
 D_60012A0 = 0x060012A0;
 D_TI_60023B0 = 0x060023B0;
@@ -179,14 +178,11 @@ D_600A420 = 0x0600A420;
 D_MA_600AF40 = 0x0600AF40;
 D_600BAF0 = 0x0600BAF0;
 D_AQ_600BF80 = 0x0600BF80;
-D_600E820 = 0x0600E820;
-D_600EC90 = 0x0600EC90;
 D_AQ_600EE10 = 0x0600EE10;
 D_AQ_600EEF0 = 0x0600EEF0;
 D_600F1DC = 0x0600F1DC;
 D_600F394 = 0x0600F394;
 D_600F3F4 = 0x0600F3F4;
-D_600F560 = 0x0600F560;
 D_600F5AC = 0x0600F5AC;
 D_600F60C = 0x0600F60C;
 D_600FD50 = 0x0600FD50;
@@ -201,7 +197,6 @@ D_6010960 = 0x06010960;
 D_6011058 = 0x06011058;
 D_601115C = 0x0601115C;
 D_601115C = 0x0601115C;
-D_6011660 = 0x06011660;
 D_AQ_6011EE0 = 0x06011EE0;
 D_AQ_60120F0 = 0x060120F0;
 D_MA_6012C00 = 0x06012C00;
@@ -236,15 +231,11 @@ D_601B8A0 = 0x0601B8A0;
 D_601B8D8 = 0x0601B8D8;
 D_AQ_601DE60 = 0x0601DE60;
 D_MA_601F1D0 = 0x0601F1D0;
-D_601FCB0 = 0x0601FCB0;
 D_6022340 = 0x06022340;
 D_AQ_6022110 = 0x06022110;
 D_MA_60238F0 = 0x060238F0;
-D_60239E0 = 0x060239E0;
-D_6023730 = 0x06023730;
 D_MA_6024010 = 0x06024010;
 D_60247E0 = 0x060247E0;
-D_6024AC0 = 0x06024AC0;
 D_6026C90 = 0x06026C90;
 D_MA_60270E0 = 0x060270E0;
 D_MA_6027180 = 0x06027180;
@@ -254,23 +245,6 @@ D_6029170 = 0x06029170;
 D_6029220 = 0x06029220;
 D_AQ_602B4C0 = 0x0602B4C0;
 D_602B620 = 0x0602B620;
-D_602B9EC = 0x0602B9EC;
-D_602BA20 = 0x0602BA20;
-D_602BAE4 = 0x0602BAE4;
-D_602BBD8 = 0x0602BBD8;
-D_602BC54 = 0x0602BC54;
-D_602BC58 = 0x0602BC58;
-D_602BE3C = 0x0602BE3C;
-D_602BE58 = 0x0602BE58;
-D_602BFC4 = 0x0602BFC4;
-D_602C044 = 0x0602C044;
-D_602C1D4 = 0x0602C1D4;
-D_602C218 = 0x0602C218;
-D_602C234 = 0x0602C234;
-D_602C250 = 0x0602C250;
-D_602C294 = 0x0602C294;
-D_602C2B0 = 0x0602C2B0;
-D_602CACC = 0x0602CACC;
 D_602CB80 = 0x0602CB80;
 D_MA_602CB80 = 0x0602CB80;
 D_602DAD0 = 0x0602DAD0;
@@ -388,7 +362,6 @@ D_A6_6023F20 = 0x06023F20;
 D_A6_6028760 = 0x06028760;
 D_VE1_6007E30 = 0x06007E30;
 D_SO_601F1F0 = 0x0601F1F0;
-D_ZO_60266D0 = 0x060266D0;
 D_MA_6030E30 = 0x06030E30;
 D_TI_6005000 = 0x06005000;
 D_AQ_602E540 = 0x0602E540;
@@ -628,15 +601,12 @@ D_6005CC0 = 0x06005CC0;
 D_60176D0 = 0x060176D0;
 D_6017810 = 0x06017810;
 D_6017770 = 0x06017770;
-D_6016D90 = 0x06016D90;
-D_6016E30 = 0x06016E30;
 D_60178B0 = 0x060178B0;
 D_6023690 = 0x06023690;
 D_6021BB0 = 0x06021BB0;
 D_6021C50 = 0x06021C50;
 D_6021CE0 = 0x06021CE0;
 D_6021D80 = 0x06021D80;
-D_6016350 = 0x06016350;
 D_6021E20 = 0x06021E20;
 D_60222A0 = 0x060222A0;
 D_6022BE0 = 0x06022BE0;
@@ -645,14 +615,8 @@ D_6022F00 = 0x06022F00;
 D_6020F10 = 0x06020F10;
 D_6021100 = 0x06021100;
 D_60214B0 = 0x060214B0;
-D_60163E0 = 0x060163E0;
-D_60165D0 = 0x060165D0;
-D_6016880 = 0x06016880;
-D_6016B50 = 0x06016B50;
-D_6000C40 = 0x06000C40;
 D_601F620 = 0x0601F620;
 D_601F420 = 0x0601F420;
-D_6018C80 = 0x06018C80;
 D_601F940 = 0x0601F940;
 D_601F260 = 0x0601F260;
 D_6014DB0 = 0x06014DB0;
@@ -696,7 +660,6 @@ D_6026C80 = 0x06026C80;
 D_FO_6000000 = 0x06000000;
 D_KA_6000000 = 0x06000000;
 D_SO_6000000 = 0x06000000;
-D_ZO_6000000 = 0x06000000;
 D_TI_6000000 = 0x06000000;
 D_MA_6000000 = 0x06000000;
 D_BO_6000000 = 0x06000000;
@@ -749,7 +712,6 @@ D_6020D50 = 0x06020D50;
 D_601B8F0 = 0x0601B8F0;
 D_601B3B0 = 0x0601B3B0;
 D_601B1C0 = 0x0601B1C0;
-D_6011660 = 0x06011660;
 D_TEX_6011660 = 0x06011660;
 D_5008020 = 0x05008020;
 D_5008110 = 0x05008110;
@@ -858,7 +820,6 @@ D_A6_6023F64 = 0x006023F64;
 D_A6_60287A4 = 0x0060287A4;
 D_VE1_6007E74 = 0x006007E74;
 D_SO_601F234 = 0x00601F234;
-D_ZO_6026714 = 0x006026714;
 D_TR_6006AA4 = 0x006006AA4;
 D_MA_6031000 = 0x006031000;
 D_TI_6006C60 = 0x006006C60;
@@ -880,7 +841,6 @@ D_SX_6009950 = 0x06009950;
 D_SX_600B2B0 = 0x0600B2B0;
 D_SX_600A2E0 = 0x0600A2E0;
 D_SX_600B830 = 0x0600B830;
-D_6004D00 = 0x06004D00;
 D_VE1_9012180 = 0x09012180;
 D_VE1_900EFC0 = 0x0900EFC0;
 D_MA_601C520 = 0x0601C520;
@@ -902,9 +862,7 @@ D_SX_6032894 = 0x06032894;
 D_SX_60328B0 = 0x060328B0;
 D_SX_603238C = 0x0603238C;
 D_SX_60328CC = 0x060328CC;
-D_602C1A0 = 0x0602C1A0;
 D_SX_60328E8 = 0x060328E8;
-D_602C294 = 0x0602C294;
 D_601B474 = 0x0601B474;
 D_AQ_6030B4C = 0x06030B4C;
 D_601B43C = 0x0601B43C;
@@ -1291,7 +1249,6 @@ D_500A320 = 0x500A320;
 D_500A410 = 0x500A410;
 D_500A500 = 0x500A500;
 D_500B600 = 0x500B600;
-D_6000000 = 0x6000000;
 D_60005B0 = 0x60005B0;
 D_TI_6000A80 = 0x6000A80;
 D_AQ_6000AE4 = 0x6000AE4;
@@ -1302,7 +1259,6 @@ D_6001080 = 0x6001080;
 D_SX_60010C0 = 0x60010C0;
 D_MA_6001180 = 0x6001180;
 D_6001260 = 0x6001260;
-D_60012A0 = 0x60012A0;
 D_60012D0 = 0x60012D0;
 D_6001360 = 0x6001360;
 D_MA_60014A0 = 0x60014A0;
@@ -1318,7 +1274,6 @@ D_AQ_6002874 = 0x6002874;
 D_6002890 = 0x6002890;
 D_MA_6002890 = 0x6002890;
 D_A6_60029A0 = 0x60029A0;
-D_6002E10 = 0x6002E10;
 D_6002E60 = 0x6002E60;
 D_MA_6002E60 = 0x6002E60;
 D_MA_6003070 = 0x6003070;
@@ -1326,7 +1281,6 @@ D_6003090 = 0x6003090;
 D_MA_6003370 = 0x6003370;
 D_A6_60038C0 = 0x60038C0;
 D_60038E0 = 0x60038E0;
-D_6004380 = 0x6004380;
 D_MA_6004440 = 0x6004440;
 D_6004500 = 0x6004500;
 D_60046F0 = 0x60046F0;
@@ -1335,7 +1289,6 @@ D_6005710 = 0x6005710;
 D_AQ_6005954 = 0x6005954;
 D_AQ_6005A80 = 0x6005A80;
 D_TI_600631C = 0x600631C;
-D_6006360 = 0x6006360;
 D_600636C = 0x600636C;
 D_6006558 = 0x6006558;
 D_MA_60066A0 = 0x60066A0;
@@ -1371,7 +1324,6 @@ D_6007980 = 0x6007980;
 D_6007CF0 = 0x6007CF0;
 D_6007D90 = 0x6007D90;
 D_6007E20 = 0x6007E20;
-D_6008830 = 0x6008830;
 D_AQ_6008970 = 0x6008970;
 D_AQ_6008EC8 = 0x6008EC8;
 D_TR_6008EF8 = 0x6008EF8;
@@ -1382,7 +1334,6 @@ D_TI_6009BB8 = 0x6009BB8;
 D_SX_6009C30 = 0x6009C30;
 D_MA_6009C50 = 0x6009C50;
 D_6009D30 = 0x6009D30;
-D_6009ED0 = 0x6009ED0;
 D_MA_6009F10 = 0x6009F10;
 D_6009F90 = 0x6009F90;
 D_SX_6009FF8 = 0x6009FF8;
@@ -1395,7 +1346,6 @@ D_MA_600AA70 = 0x600AA70;
 D_AQ_600AB10 = 0x600AB10;
 D_AQ_600AB68 = 0x600AB68;
 D_MA_600AD50 = 0x600AD50;
-D_600B0E0 = 0x600B0E0;
 D_600B1B4 = 0x600B1B4;
 D_600B4B0 = 0x600B4B0;
 D_600BAF0 = 0x600BAF0;
@@ -1412,7 +1362,6 @@ D_600C4E0 = 0x600C4E0;
 D_600C560 = 0x600C560;
 D_MA_600C65C = 0x600C65C;
 D_600C6A0 = 0x600C6A0;
-D_600C780 = 0x600C780;
 D_MA_600CD18 = 0x600CD18;
 D_600CDC0 = 0x600CDC0;
 D_600D090 = 0x600D090;
@@ -1424,7 +1373,6 @@ D_600D4E0 = 0x600D4E0;
 D_600D590 = 0x600D590;
 D_600D5C0 = 0x600D5C0;
 D_600D730 = 0x600D730;
-D_600D990 = 0x600D990;
 D_600D9F0 = 0x600D9F0;
 D_MA_600DA10 = 0x600DA10;
 D_AQ_600DB80 = 0x600DB80;
@@ -1437,8 +1385,6 @@ D_600E2C4 = 0x600E2C4;
 D_600E360 = 0x600E360;
 D_MA_600E360 = 0x600E360;
 D_600E470 = 0x600E470;
-D_600E5EC = 0x600E5EC;
-D_600E7D8 = 0x600E7D8;
 D_600E900 = 0x600E900;
 D_600E980 = 0x600E980;
 D_AQ_600EEF0 = 0x600EEF0;
@@ -1487,9 +1433,7 @@ D_AQ_6012C98 = 0x6012C98;
 D_MA_6012C98 = 0x6012C98;
 D_MA_6012F50 = 0x6012F50;
 D_MA_6013060 = 0x6013060;
-D_6013330 = 0x6013330;
 D_6013470 = 0x6013470;
-D_6013480 = 0x6013480;
 D_AQ_60135E0 = 0x60135E0;
 D_AQ_60136CC = 0x60136CC;
 D_SX_6013798 = 0x6013798;
@@ -1502,7 +1446,6 @@ D_AQ_6014030 = 0x6014030;
 D_6014140 = 0x6014140;
 D_AQ_6014438 = 0x6014438;
 D_AQ_6014504 = 0x6014504;
-D_6014510 = 0x6014510;
 D_AQ_6014520 = 0x6014520;
 D_6014658 = 0x6014658;
 D_60147C0 = 0x60147C0;
@@ -1514,14 +1457,12 @@ D_TITLE_60148D0 = 0x60148D0;
 D_6014904 = 0x6014904;
 D_60149D0 = 0x60149D0;
 D_AQ_6014FD0 = 0x6014FD0;
-D_6015430 = 0x6015430;
 D_MA_6015510 = 0x6015510;
 D_SX_60158C4 = 0x60158C4;
 D_MA_6015C24 = 0x6015C24;
 D_A6_6015EE0 = 0x6015EE0;
 D_MA_6016040 = 0x6016040;
 D_MA_60163F0 = 0x60163F0;
-D_6016880 = 0x6016880;
 D_MA_6016B2C = 0x6016B2C;
 D_6016CF0 = 0x6016CF0;
 D_SX_6016E28 = 0x6016E28;
@@ -1529,12 +1470,7 @@ D_6017090 = 0x6017090;
 D_6017370 = 0x6017370;
 D_MA_6017714 = 0x6017714;
 D_MA_6017720 = 0x6017720;
-D_6017950 = 0x6017950;
 D_6017AD0 = 0x6017AD0;
-D_60181E0 = 0x60181E0;
-D_6018550 = 0x6018550;
-D_601863C = 0x601863C;
-D_6018660 = 0x6018660;
 D_AQ_6018878 = 0x6018878;
 D_A6_6018994 = 0x6018994;
 D_6018AF0 = 0x6018AF0;
@@ -1548,42 +1484,29 @@ D_MA_6019220 = 0x6019220;
 D_AQ_6019238 = 0x6019238;
 D_AQ_6019338 = 0x6019338;
 D_AQ_60194D0 = 0x60194D0;
-D_60195EC = 0x60195EC;
 D_A6_6019730 = 0x6019730;
-D_6019738 = 0x6019738;
+D_ZO_601996C = 0x601996C;
-D_601996C = 0x601996C;
-D_6019E18 = 0x6019E18;
 D_AQ_6019E80 = 0x6019E80;
-D_6019EB0 = 0x6019EB0;
 D_A6_601A120 = 0x601A120;
 D_MA_601A2B0 = 0x601A2B0;
-D_601A340 = 0x601A340;
 D_MA_601A7A0 = 0x601A7A0;
 D_MA_601A840 = 0x601A840;
 D_SX_601AA28 = 0x601AA28;
-D_601AA48 = 0x601AA48;
-D_601AB14 = 0x601AB14;
-D_601AFB8 = 0x601AFB8;
 D_AQ_601AFF0 = 0x601AFF0;
-D_601B184 = 0x601B184;
 D_VE1_601B1E4 = 0x601B1E4;
 D_A6_601B2B0 = 0x601B2B0;
 D_601B4B0 = 0x601B4B0;
 D_601B4C4 = 0x601B4C4;
-D_601BAD0 = 0x601BAD0;
 D_A6_601BB40 = 0x601BB40;
-D_601BCC0 = 0x601BCC0;
 D_MA_601BE90 = 0x601BE90;
 D_MA_601C000 = 0x601C000;
 D_AQ_601C080 = 0x601C080;
 D_MA_601C170 = 0x601C170;
-D_601C590 = 0x601C590;
 D_SX_601C690 = 0x601C690;
 D_TITLE_601C7C0 = 0x601C7C0;
 D_601C820 = 0x601C820;
 D_MA_601D188 = 0x601D188;
 D_601D1F0 = 0x601D1F0;
-D_601D680 = 0x601D680;
 D_TITLE_601D750 = 0x601D750;
 D_TITLE_601DB50 = 0x601DB50;
 D_601DC10 = 0x601DC10;
@@ -1602,18 +1525,12 @@ D_MA_601EBBC = 0x601EBBC;
 D_AQ_601EC68 = 0x601EC68;
 D_AQ_601EDB4 = 0x601EDB4;
 D_MA_601F270 = 0x601F270;
-D_601F874 = 0x601F874;
 D_TITLE_601F8E0 = 0x601F8E0;
-D_601F920 = 0x601F920;
-D_601FBC4 = 0x601FBC4;
-D_601FC90 = 0x601FC90;
 D_60200E0 = 0x60200E0;
 D_6020A30 = 0x6020A30;
 D_SO_600631C = 0x6020DD0;
 D_6020E60 = 0x6020E60;
 D_6020F60 = 0x6020F60;
-D_6021ABC = 0x6021ABC;
-D_6021B88 = 0x6021B88;
 D_MA_6022200 = 0x6022200;
 D_MA_60223C0 = 0x60223C0;
 D_MA_6022450 = 0x6022450;
@@ -1626,8 +1543,6 @@ D_60231A4 = 0x60231A4;
 D_MA_6023228 = 0x6023228;
 D_MA_6023388 = 0x6023388;
 D_MA_60239D0 = 0x60239D0;
-D_6023D50 = 0x6023D50;
-D_6024220 = 0x6024220;
 D_MA_6024670 = 0x6024670;
 D_TITLE_60246F8 = 0x60246F8;
 D_AQ_6024A50 = 0x6024A50;
@@ -1637,7 +1552,6 @@ D_MA_60257B0 = 0x60257B0;
 D_MA_6025850 = 0x6025850;
 D_MA_6025CA0 = 0x6025CA0;
 D_MA_6025DAC = 0x6025DAC;
-D_6025E60 = 0x6025E60;
 D_MA_6026860 = 0x6026860;
 D_MA_60269E0 = 0x60269E0;
 D_MA_6027320 = 0x6027320;
@@ -1650,18 +1564,13 @@ D_MA_6027EB0 = 0x6027EB0;
 D_MA_60288A0 = 0x60288A0;
 D_MA_6029890 = 0x6029890;
 D_602A720 = 0x602A720;
-D_ZO_602AAC0 = 0x602AAC0;
 D_AQ_602AC28 = 0x602AC28;
 D_AQ_602AC40 = 0x602AC40;
-D_602AC50 = 0x602AC50;
 D_AQ_602ACC0 = 0x602ACC0;
 D_AQ_602B4C0 = 0x602B4C0;
-D_602BC58 = 0x602BC58;
 D_AQ_602BD60 = 0x602BD60;
-D_602C028 = 0x602C028;
 D_AQ_602C030 = 0x602C030;
 D_AQ_602C088 = 0x602C088;
-D_602C2CC = 0x602C2CC;
 D_MA_602D380 = 0x602D380;
 D_MA_602DCB8 = 0x602DCB8;
 D_TITLE_602E380 = 0x602E380;

src/main/fox_A4290_colheaders.c

@@ -12,6 +12,7 @@
 #include "assets/ast_sector_y.h"
 #include "assets/ast_sector_z.h"
 #include "assets/ast_versus.h"
+#include "assets/ast_zoness.h"
 
 static Vec3f D_800D2920[16] = {
     { 1075.0f, 0.0f, 0.0f },   { 746.0f, 0.0f, -746.0f },    { 202.0f, 361.0f, -202.0f }, { 0.0f, 0.0f, -1075.0f },
@@ -162,7 +163,7 @@ CollisionHeader2 D_800D2CA0[19] = {
         { -488.0f, 0.0f, -568.0f },
         { 488.0f, 148.0f, 567.0f },
         30,
-        D_602CACC,
+        D_ZO_602CACC,
         D_602CB80,
     },
     {

src/main/fox_bg.c

@@ -36,6 +36,7 @@ f32 D_80161394;             // can be static
 #include "assets/ast_andross.h"
 #include "assets/ast_warp_zone.h"
 #include "assets/ast_area_6.h"
+#include "assets/ast_zoness.h"
 
 f32 D_800C9C30 = 0.0f;
 u16 D_800C9C34 = 1;
@@ -476,7 +477,7 @@ void func_8003E1E8(void) {
                     } else if (gCurrentLevel == LEVEL_MACBETH) {
                         gSPDisplayList(gMasterDisp++, D_MA_6019220);
                     } else if (gCurrentLevel == LEVEL_ZONESS) {
-                        gSPDisplayList(gMasterDisp++, D_6013480);
+                        gSPDisplayList(gMasterDisp++, D_ZO_6013480);
                     } else if (gCurrentLevel == LEVEL_SOLAR) {
                         gSPDisplayList(gMasterDisp++, D_601E150);
                     }
@@ -492,7 +493,7 @@ void func_8003E1E8(void) {
                     } else if (gCurrentLevel == LEVEL_MACBETH) {
                         gSPDisplayList(gMasterDisp++, D_MA_6019220);
                     } else if (gCurrentLevel == LEVEL_ZONESS) {
-                        gSPDisplayList(gMasterDisp++, D_6013480);
+                        gSPDisplayList(gMasterDisp++, D_ZO_6013480);
                     } else if (gCurrentLevel == LEVEL_SOLAR) {
                         gSPDisplayList(gMasterDisp++, D_601E150);
                     }
@@ -1111,9 +1112,9 @@ void func_80040CE4(void) {
             Matrix_Scale(gGfxMatrix, 3.0f, 2.0f, 3.0f, 1);
             Matrix_SetGfxMtx(&gMasterDisp);
             if (gGameFrameCount & 1) {
-                gSPDisplayList(gMasterDisp++, D_6008830);
+                gSPDisplayList(gMasterDisp++, D_ZO_6008830);
             } else {
-                gSPDisplayList(gMasterDisp++, D_600B0E0);
+                gSPDisplayList(gMasterDisp++, D_ZO_600B0E0);
             }
             break;
     }

src/main/fox_edata_1C.c

@@ -21,6 +21,7 @@
 #include "assets/ast_andross.h"
 #include "assets/ast_ve1_boss.h"
 #include "assets/ast_area_6.h"
+#include "assets/ast_zoness.h"
 
 f32 D_800CBE70[] = {
     1.0f, 0.0f, 50.0f, 0.0f, 25.0f, 0.0f, 25.0f,
@@ -135,11 +136,11 @@ ObjectInfo D_800CC124[0x190] = {
   /* OBJ_80_40,  */  {(void*) func_80059F68, 1, (ObjectFunc) func_80066D5C,        D_CO_603E4A4,  1000.0f,  0, 0, 40, 0,   0.0f,  0 },
   /* OBJ_80_41,  */  {(void*) func_80059FDC, 1, (ObjectFunc) func_80066EA8,        D_CO_603E4DC,   300.0f,  0, 0, 40, 0,   0.0f,  0 },
   /* OBJ_80_42,  */  {(void*) func_80059BBC, 1, (ObjectFunc) func_8006B95C,        D_CO_603E514,  1000.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_80_43,  */  {(void*)     D_6024AC0, 0, (ObjectFunc)          NULL,        D_602B9EC,   200.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_80_43,  */  {(void*)     D_ZO_6024AC0, 0, (ObjectFunc)          NULL,        D_ZO_602B9EC,   200.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_80_44,  */  {(void*)     D_600F560, 0, (ObjectFunc)          NULL,        D_602BA20,  1500.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_80_44,  */  {(void*)     D_ZO_600F560, 0, (ObjectFunc)          NULL,        D_ZO_602BA20,  1500.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_80_45,  */  {(void*)     D_600EC90, 0, (ObjectFunc)          NULL,        D_602BAE4,  1500.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_80_45,  */  {(void*)     D_ZO_600EC90, 0, (ObjectFunc)          NULL,        D_ZO_602BAE4,  1500.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_80_46,  */  {(void*)     D_600E820, 0, (ObjectFunc)          NULL,        D_602BBD8,  1500.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_80_46,  */  {(void*)     D_ZO_600E820, 0, (ObjectFunc)          NULL,        D_ZO_602BBD8,  1500.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_80_47,  */  {(void*)     D_601FCB0, 0, (ObjectFunc)          NULL,        D_602BC54,   500.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_80_47,  */  {(void*)     D_ZO_601FCB0, 0, (ObjectFunc)          NULL,        D_ZO_602BC54,   500.0f,  0, 0, 40, 0,   0.0f,  0 },
   /* OBJ_80_48,  */  {(void*) func_800594F0, 1, (ObjectFunc)          NULL,        D_VE1_601B4E0,  2500.0f,  0, 0, 40, 0,   0.0f,  0 },
   /* OBJ_80_49,  */  {(void*) func_800595D0, 1, (ObjectFunc)          NULL,        D_VE1_601B4FC,  2500.0f,  0, 0, 40, 0,   0.0f,  0 },
   /* OBJ_80_50,  */  {(void*)     D_VE1_6007410, 0, (ObjectFunc)          NULL,        D_VE1_601B518,  2500.0f,  0, 0, 40, 0,   0.0f,  0 },
@@ -327,26 +328,26 @@ ObjectInfo D_800CC124[0x190] = {
   /* OBJ_ACTOR_232 */  {(void*) func_i5_8018B6AC, 1, (ObjectFunc) func_i5_8018B268,    D_TI_6006890,     0.0f,  0, 0, 39, 1,  20.0f,  1 },
   /* OBJ_ACTOR_233 */  {(void*) func_i5_8018A1C0, 1, (ObjectFunc) func_i5_80189CC8,        D_TI_60068F0,   200.0f,  0, 0, 39, 1,   1.0f,  1 },
   /* OBJ_ACTOR_234 */  {(void*) func_80077218, 1, (ObjectFunc) func_800771CC,       D_800CBF34,  2000.0f,  0, 0, 39, 0,   0.0f,  5 },
-  /* OBJ_ACTOR_235 */  {(void*) func_i3_80190430, 2, (ObjectFunc) func_i3_801904CC,        D_602C294,  1000.0f,  0, 1, 40, 0,   1.0f,  1 },
+  /* OBJ_ACTOR_235 */  {(void*) func_i3_80190430, 2, (ObjectFunc) func_i3_801904CC,        D_ZO_602C294,  1000.0f,  0, 1, 40, 0,   1.0f,  1 },
-  /* OBJ_ACTOR_236 */  {(void*) func_i3_80190F08, 1, (ObjectFunc) func_i3_80190A00,        D_602BC58,  5000.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_ACTOR_236 */  {(void*) func_i3_80190F08, 1, (ObjectFunc) func_i3_80190A00,        D_ZO_602BC58,  5000.0f,  0, 0, 40, 0,   0.0f,  0 },
   /* OBJ_ACTOR_237 */  {(void*) func_8006A978, 1, (ObjectFunc) func_8006A96C,       D_800CBF34,   200.0f,  0, 0, 40, 0,   0.0f,  2 },
   /* OBJ_ACTOR_238 */  {(void*) func_i3_801914C4, 2, (ObjectFunc) func_i3_80191010,       D_800CBE8C,   200.0f,  0, 1, 40, 0,   1.0f,  1 },
   /* OBJ_ACTOR_239 */  {(void*)          NULL, 1, (ObjectFunc)          NULL,       D_800CBF34,  1000.0f,  0, 0,  0, 0,   0.0f,  0 },
   /* OBJ_ACTOR_240 */  {(void*) func_i3_80191B4C, 1, (ObjectFunc) func_i3_80191680,       D_800CBE8C,  1500.0f,  0, 1, 40, 0,  20.0f,  0 },
   /* OBJ_ACTOR_241 */  {(void*) func_i3_80191DB0, 1, (ObjectFunc) func_i3_80191BC4,       D_800CBE70,  1500.0f,  0, 1, 40, 0,   0.0f,  0 },
-  /* OBJ_ACTOR_242 */  {(void*) func_i3_80191FFC, 2, (ObjectFunc) func_i3_80192094,        D_602BE3C,   500.0f,  0, 0, 40, 0,   1.0f,  0 },
+  /* OBJ_ACTOR_242 */  {(void*) func_i3_80191FFC, 2, (ObjectFunc) func_i3_80192094,        D_ZO_602BE3C,   500.0f,  0, 0, 40, 0,   1.0f,  0 },
   /* OBJ_ACTOR_243 */  {(void*) func_i3_80192C18, 2, (ObjectFunc) func_i3_80192834,       D_800CBE8C,     0.0f,  0, 1, 40, 0,   1.0f,  1 },
-  /* OBJ_ACTOR_244 */  {(void*) func_i3_80193240, 2, (ObjectFunc) func_i3_80192E64,        D_602BE58,  2000.0f,  0, 0, 40, 0,  50.0f,  0 },
+  /* OBJ_ACTOR_244 */  {(void*) func_i3_80193240, 2, (ObjectFunc) func_i3_80192E64,        D_ZO_602BE58,  2000.0f,  0, 0, 40, 0,  50.0f,  0 },
   /* OBJ_ACTOR_245 */  {(void*) func_i3_8019983C, 1, (ObjectFunc) func_i3_8019969C,       D_800CBE8C,   200.0f,  0, 0, 40, 0,   1.0f,  0 },
   /* OBJ_ACTOR_246 */  {(void*) func_i3_80199E24, 1, (ObjectFunc) func_i3_80199A28,       D_800CBE8C,  2000.0f,  0, 0, 40, 0,   1.0f,  0 },
-  /* OBJ_ACTOR_247 */  {(void*) func_i3_8019D3C4, 1, (ObjectFunc) func_i3_8019D15C,        D_602BFC4,   500.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_ACTOR_247 */  {(void*) func_i3_8019D3C4, 1, (ObjectFunc) func_i3_8019D15C,        D_ZO_602BFC4,   500.0f,  0, 0, 40, 0,   0.0f,  0 },
   /* OBJ_ACTOR_248 */  {(void*) func_i3_8019A1FC, 1, (ObjectFunc) func_i3_80199F10,       D_800CBEA8,  2000.0f,  0, 0, 40, 0,   0.0f,  0 },
   /* OBJ_ACTOR_249 */  {(void*) func_i3_8019ACCC, 1, (ObjectFunc) func_i3_8019A5D4,       D_800CBEC4,  5000.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_ACTOR_250 */  {(void*) func_i3_8019B7DC, 1, (ObjectFunc) func_i3_8019B548,        D_602C1D4, 10000.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_ACTOR_250 */  {(void*) func_i3_8019B7DC, 1, (ObjectFunc) func_i3_8019B548,        D_ZO_602C1D4, 10000.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_ACTOR_251 */  {(void*) func_i3_8019BDE0, 2, (ObjectFunc) func_i3_8019B854,        D_602C218,  1000.0f,  0, 0, 40, 0,   1.0f,  1 },
+  /* OBJ_ACTOR_251 */  {(void*) func_i3_8019BDE0, 2, (ObjectFunc) func_i3_8019B854,        D_ZO_602C218,  1000.0f,  0, 0, 40, 0,   1.0f,  1 },
-  /* OBJ_ACTOR_252 */  {(void*) func_i3_8019C1CC, 1, (ObjectFunc) func_i3_8019BE48,        D_602C234,   200.0f,  0, 0, 40, 0,  80.0f,  1 },
+  /* OBJ_ACTOR_252 */  {(void*) func_i3_8019C1CC, 1, (ObjectFunc) func_i3_8019BE48,        D_ZO_602C234,   200.0f,  0, 0, 40, 0,  80.0f,  1 },
-  /* OBJ_ACTOR_253 */  {(void*) func_i3_8019C83C, 1, (ObjectFunc) func_i3_8019C454,        D_602C250,   300.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_ACTOR_253 */  {(void*) func_i3_8019C83C, 1, (ObjectFunc) func_i3_8019C454,        D_ZO_602C250,   300.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_ACTOR_254 */  {(void*) func_i3_8019CE58, 1, (ObjectFunc) func_i3_8019CBEC,        D_602C2B0,   300.0f,  0, 0,  0, 0,   0.0f,  0 },
+  /* OBJ_ACTOR_254 */  {(void*) func_i3_8019CE58, 1, (ObjectFunc) func_i3_8019CBEC,        D_ZO_602C2B0,   300.0f,  0, 0,  0, 0,   0.0f,  0 },
   /* OBJ_ACTOR_255 */  {(void*) func_i3_801AE168, 1, (ObjectFunc) func_i3_801AD6C0,        D_AQ_6030BFC,   500.0f,  0, 0, 40, 0,   0.0f,  0 },
   /* OBJ_ACTOR_256 */  {(void*) func_i3_801AEB44, 1, (ObjectFunc) func_i3_801AE3D8,        D_AQ_6030C18, 10000.0f,  0, 0, 40, 0,   0.0f,  0 },
   /* OBJ_ACTOR_257 */  {(void*) func_i3_801B099C, 1, (ObjectFunc) func_i3_801AFA5C,        D_AQ_6030C44, 10000.0f,  0, 0, 40, 0,   0.0f,  0 },
@@ -399,7 +400,7 @@ ObjectInfo D_800CC124[0x190] = {
   /* OBJ_BOSS_304 */  {(void*) func_i2_8018FF84, 2, (ObjectFunc) func_i2_8018FE38,        D_SX_6032488,  1000.0f,  0, 0, 20, 0,   0.0f, 10 },
   /* OBJ_BOSS_305 */  {(void*) func_i2_80190020, 2, (ObjectFunc) func_i2_8018FF20,        D_SX_60324EC,  1000.0f,  0, 0, 20, 0,   0.0f, 10 },
   /* OBJ_BOSS_306 */  {(void*) func_i5_801982A8, 1, (ObjectFunc) func_i5_80197A94,D_i5_801B83A8,  1000.0f,  0, 0, 40, 1,   0.0f, 10 },
-  /* OBJ_BOSS_ZO */  {(void*) func_i3_801949DC, 2, (ObjectFunc) func_i3_80194A84,        D_602C044,  1000.0f,  0, 0, 40, 0,   1.0f, 10 },
+  /* OBJ_BOSS_ZO */  {(void*) func_i3_801949DC, 2, (ObjectFunc) func_i3_80194A84,        D_ZO_602C044,  1000.0f,  0, 0, 40, 0,   1.0f, 10 },
   /* OBJ_BOSS_308 */  {(void*) func_8008FE78, 1, (ObjectFunc) func_800907C4,        D_FO_600FFE0,     0.0f,  0, 0, 40, 1,   0.0f, 10 },
   /* OBJ_BOSS_309 */  {(void*) func_8002E604, 1, (ObjectFunc) func_8002E5E0,       D_800CBF34,     0.0f,  0, 0, 40, 1,   0.0f, 10 },
   /* OBJ_BOSS_310 */  {(void*) func_8002E64C, 1, (ObjectFunc) func_8002E628,       D_800CBF34,     0.0f,  0, 0, 40, 1,   0.0f, 10 },

src/main/fox_edisplay.c

@@ -1,7 +1,7 @@
 
 #include "global.h"
 #include "assets.h"
-// #include "prevent_bss_reordering.h"
+#include "prevent_bss_reordering.h"
 Vec3f D_801615D0;
 Vec3f D_801615E0;
 s32 D_801615EC;
@@ -26,6 +26,7 @@ WingInfo D_80161630;
 #include "assets/ast_enmy_space.h"
 #include "assets/ast_enmy_planet.h"
 #include "assets/ast_ve1_boss.h"
+#include "assets/ast_zoness.h"
 
 char D_800CF970[] = "$Id: fox_edisplay.c,v 1.196 1997/05/08 08:31:50 morita Exp $";
 
@@ -199,15 +200,15 @@ Gfx* D_800CFA54[] = {
     D_6024160,    D_6033290,    D_6017F10,    D_60074E0,    D_6007590, D_6007730, D_FO_6005CC0,
 };
 Gfx* D_800CFAC4[] = {
-    D_60176D0, D_6017810, D_6017770, D_6016D90, D_6016E30, D_60178B0,
+    D_60176D0, D_6017810, D_6017770, D_ZO_6016D90, D_ZO_6016E30, D_60178B0,
 };
 Gfx* D_800CFADC[] = {
-    D_6023690, D_6021BB0, D_6021C50, D_6021CE0, D_6021D80, D_6016350,
+    D_6023690, D_6021BB0, D_6021C50, D_6021CE0, D_6021D80, D_ZO_6016350,
     D_6021E20, D_60222A0, D_6022BE0, D_6022D70, D_6022F00,
 };
 Gfx* D_800CFB08[] = { D_6020F10, D_6021100, D_60214B0 };
-Gfx* D_800CFB14[] = { D_60163E0, D_60165D0, D_6016880, D_6016B50, D_6000C40 };
+Gfx* D_800CFB14[] = { D_ZO_60163E0, D_ZO_60165D0, D_ZO_6016880, D_ZO_6016B50, D_ZO_6000C40 };
-Gfx* D_800CFB28[] = { D_CO_6018E80, D_601F620, D_601F420, D_6018C80, D_601F940, D_601F260 };
+Gfx* D_800CFB28[] = { D_CO_6018E80, D_601F620, D_601F420, D_ZO_6018C80, D_601F940, D_601F260 };
 Gfx* D_800CFB40[] = {
     D_6014DB0, D_60146D0, D_6014B80, D_6014470, D_6014930, D_60138A0, D_60151A0, D_600F750, D_6015810,
 };
@@ -231,7 +232,7 @@ Gfx* D_800CFC40[] = { D_AQ_6014FD0, D_AQ_6014FD0, D_AQ_6014FD0, D_AQ_6014FD0 };
 Gfx* D_800CFC50[] = { D_601EDE0, D_601F2F0, D_601F830, D_601FD70, D_601D110 };
 Gfx* D_800CFC64[] = { D_6023940, D_6023D70, D_60249C0, D_6023EB0, D_60249C0, D_6023B80 };
 Gfx* D_800CFC7C[] = { D_601B570, D_VE1_601B710, D_60209B0, D_6020B70,   D_6020D50,
-                      D_601B8F0, D_601B3B0,     D_601B1C0, D_6011660 };
+                      D_601B8F0, D_601B3B0,     D_601B1C0, D_ZO_6011660 };
 
 void func_8005A094(Actor* actor) {
     switch (actor->state) {

src/main/fox_effect.c

@@ -6,9 +6,9 @@ const char D_800D7230[] = "Enm->wrk3=<%d>\n";
 const char D_800D7240[] = "a=<%d>\n";
 const char D_800D7248[] = "a=<%d>\n";
 
-extern Gfx D_6016880[];
+extern Gfx D_ZO_6016880[];
 extern Gfx D_6018AF0[];
-extern Gfx D_601BAD0[];
+extern Gfx D_ZO_601BAD0[];
 
 #include "assets/ast_blue_marine.h"
 #include "assets/ast_arwing.h"
@@ -26,6 +26,7 @@ extern Gfx D_601BAD0[];
 #include "assets/ast_A_ti.h"
 #include "assets/ast_ve1_boss.h"
 #include "assets/ast_enmy_planet.h"
+#include "assets/ast_zoness.h"
 
 s32 BonusText_Display(f32 xPos, f32 yPos, f32 zPos, s32 hits) {
     s32 i;
@@ -214,7 +215,7 @@ void func_80077A7C(Effect* effect) {
     Matrix_Scale(gGfxMatrix, effect->scale1, effect->scale2, 1.0f, 1);
     Matrix_Translate(gGfxMatrix, 0.0f, 20.0f, 0.0f, 1);
     Matrix_SetGfxMtx(&gMasterDisp);
-    gSPDisplayList(gMasterDisp++, D_6024220);
+    gSPDisplayList(gMasterDisp++, D_ZO_6024220);
     RCP_SetupDL(&gMasterDisp, 0x40);
 }
 
@@ -3908,7 +3909,7 @@ void func_80082F78(Effect* effect) {
                 gSPDisplayList(gMasterDisp++, D_AQ_600A220);
             }
             if (gCurrentLevel == LEVEL_ZONESS) {
-                gSPDisplayList(gMasterDisp++, D_6016880);
+                gSPDisplayList(gMasterDisp++, D_ZO_6016880);
             }
             break;
 
@@ -4060,7 +4061,7 @@ void func_80083B8C(Effect* effect) {
     gDPSetEnvColor(gMasterDisp++, 36, 45, 28, 255);
     Matrix_Scale(gGfxMatrix, effect->unk_60.x, effect->scale2 * effect->unk_60.y, effect->scale2, 1);
     Matrix_SetGfxMtx(&gMasterDisp);
-    gSPDisplayList(gMasterDisp++, D_601BAD0);
+    gSPDisplayList(gMasterDisp++, D_ZO_601BAD0);
     RCP_SetupDL(&gMasterDisp, 0x40);
 }
 

src/main/fox_enmy.c

@@ -15,6 +15,7 @@
 #include "assets/ast_area_6.h"
 #include "assets/ast_training.h"
 #include "assets/ast_versus.h"
+#include "assets/ast_zoness.h"
 
 s32 D_Timer_80161670[4];
 s32 D_80161680;

src/main/fox_enmy2.c

@@ -25,6 +25,7 @@ s32 D_80161690;
 #include "assets/ast_enmy_space.h"
 #include "assets/ast_enmy_planet.h"
 #include "assets/ast_ve1_boss.h"
+#include "assets/ast_zoness.h"
 
 void func_8006A7B0(u16* msg, s32 character) {
     PRINTF("Enm->obj.pos.y + tmp_xyz.y=<%10.3f>\n");
@@ -917,13 +918,13 @@ UnkStruct_D003C D_800D003C[108] = {
     { NULL, D_800CBE8C, 1.0f, 20000.0f, 3000.0f, 1, 0, 2, 0, 0.0f, 0 },
     { D_SY_60102C0, D_SY_6034588, -1.0f, 10000.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 },
     { D_ME_6017B60, D_800CBEC4, -1.0f, 300.0f, 3001.0f, 0, 0, 0, 0, 1.0f, 1 },
-    { D_6004D00, D_800CBEC4, 1.0f, 100.0f, 3000.0f, 1, 0, 4, 0, 1.0f, 1 },
+    { D_ZO_6004D00, D_800CBEC4, 1.0f, 100.0f, 3000.0f, 1, 0, 4, 0, 1.0f, 1 },
     { D_ME_601A880, D_800CBE8C, -1.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 1 },
     { NULL, D_SY_603405C, 0.3f, 100.0f, 3000.0f, 0, 0, 1, 0, 1.0f, 1 },
     { NULL, D_SY_603405C, 0.3f, 100.0f, 3000.0f, 0, 0, 1, 0, 1.0f, 1 },
     { NULL, D_SY_603405C, 0.3f, 100.0f, 3000.0f, 0, 0, 1, 0, 1.0f, 1 },
     { D_SY_6015D60, D_SY_6034124, 2.0f, 100.0f, 3000.0f, 0, 0, 1, 0, 1.0f, 1 },
-    { NULL, D_602C1A0, -1.0f, 1000.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 1 },
+    { NULL, D_ZO_602C1A0, -1.0f, 1000.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 1 },
     { D_SX_600B540, D_SX_60328E8, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 },
     { D_ENMY_SPACE_4000EC0, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 },
     { D_ENMY_SPACE_4008D50, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 },
@@ -950,7 +951,7 @@ UnkStruct_D003C D_800D003C[108] = {
     { D_SY_601C6A0, D_800CBF34, -1.0f, 10000.0f, 3001.0f, 0, 0, 1, 0, 0.0f, 1 },
     { D_SY_60188D0, D_SY_603486C, 3.0f, 100.0f, 3001.0f, 0, 0, 1, 0, 0.0f, 1 },
     { NULL, D_800CBEA8, 1.0f, 100.0f, 3000.0f, 2, 0, 0, 0, 1.0f, 0 },
-    { NULL, D_602C294, 1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 1.0f, 1 },
+    { NULL, D_ZO_602C294, 1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 1.0f, 1 },
     { NULL, D_VE1_601B474, -1.0f, 100.0f, 3000.0f, 2, 0, 0, 0, 0.0f, 1 },
     { NULL, D_800CBF34, -1.0f, 100.0f, 3000.0f, 0, 0, 0, 0, 0.0f, 1 },
     { NULL, D_800CBE8C, 2.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 },
@@ -3494,7 +3495,7 @@ void func_80072594(Actor* actor) {
             case 79:
                 if (actor->timer_0C4 == 0) {
                     actor->unk_0B6 += 1;
-                    if (Animation_GetFrameCount(&D_600E5EC) < actor->unk_0B6) {
+                    if (Animation_GetFrameCount(&D_ZO_600E5EC) < actor->unk_0B6) {
                         actor->unk_0B6 = 0;
                     }
                 }
@@ -3982,11 +3983,11 @@ void func_80074FF0(Actor* actor) {
                     break;
 
                 case 52:
-                    Animation_GetFrameData(&D_601F874, actor->unk_0B6, sp114);
+                    Animation_GetFrameData(&D_ZO_601F874, actor->unk_0B6, sp114);
                     sp114[2].z -= actor->fwork[15];
                     gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
                     Matrix_Scale(gGfxMatrix, 2.6f, 2.6f, 2.6f, 1);
-                    Animation_DrawSkeleton(1, D_601F920, sp114, NULL, NULL, actor, &gIdentityMatrix);
+                    Animation_DrawSkeleton(1, D_ZO_601F920, sp114, NULL, NULL, actor, &gIdentityMatrix);
                     gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
                     break;
 

src/main/fox_play.c

@@ -20,6 +20,7 @@
 #include "assets/ast_arwing.h"
 #include "assets/ast_versus.h"
 #include "assets/ast_area_6.h"
+#include "assets/ast_zoness.h"
 
 UNK_TYPE D_800D2F50 = 0;
 s32 D_800D2F54 = 0;
@@ -102,11 +103,11 @@ void func_800A3FEC(void) {
             break;
         case LEVEL_ZONESS:
             if (gGameFrameCount & 1) {
-                spB4 = SEGMENTED_TO_VIRTUAL(D_6009ED0);
+                spB4 = SEGMENTED_TO_VIRTUAL(D_ZO_6009ED0);
             } else {
-                spB4 = SEGMENTED_TO_VIRTUAL(D_600C780);
+                spB4 = SEGMENTED_TO_VIRTUAL(D_ZO_600C780);
             }
-            spB0 = SEGMENTED_TO_VIRTUAL(D_602AC50);
+            spB0 = SEGMENTED_TO_VIRTUAL(D_ZO_602AC50);
             spA8 = 7;
             sp90 = 40.0f;
             sp8C = 0.2f;
@@ -1002,8 +1003,8 @@ bool func_800A73E4(f32* arg0, s32* arg1, f32 xPos, f32 yPos, f32 zPos) {
             spA0 = SEGMENTED_TO_VIRTUAL(D_6022760);
             break;
         case LEVEL_ZONESS:
-            spA4 = SEGMENTED_TO_VIRTUAL(D_6009ED0);
+            spA4 = SEGMENTED_TO_VIRTUAL(D_ZO_6009ED0);
-            spA0 = SEGMENTED_TO_VIRTUAL(D_602AC50);
+            spA0 = SEGMENTED_TO_VIRTUAL(D_ZO_602AC50);
             break;
         default:
             return false;
@@ -2447,7 +2448,7 @@ void func_800AB334(void) {
                     mesh = SEGMENTED_TO_VIRTUAL(D_6001C50);
                     break;
                 case LEVEL_ZONESS:
-                    mesh = SEGMENTED_TO_VIRTUAL(D_6009ED0);
+                    mesh = SEGMENTED_TO_VIRTUAL(D_ZO_6009ED0);
                     break;
             }
             for (i = 0; i < 17 * 17; i++, mesh++) {
@@ -2467,7 +2468,7 @@ void func_800AB334(void) {
                     mesh = SEGMENTED_TO_VIRTUAL(D_6004500);
                     break;
                 case LEVEL_ZONESS:
-                    mesh = SEGMENTED_TO_VIRTUAL(D_600C780);
+                    mesh = SEGMENTED_TO_VIRTUAL(D_ZO_600C780);
                     break;
             }
             for (i = 0; i < 17 * 17; i++, mesh++) {
@@ -6248,12 +6249,12 @@ void func_800B79B0(void) {
         case LEVEL_ZONESS:
             func_800A3FEC();
             for (D_80177CE8; D_80177CE8 >= 20.0f; D_80177CE8 -= 20.0f) {
-                Texture_Scroll(D_602C2CC, 32, 32, 1);
+                Texture_Scroll(D_ZO_602C2CC, 32, 32, 1);
             }
             if (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_6) {
-                Texture_Scroll(D_602C2CC, 32, 32, 1);
+                Texture_Scroll(D_ZO_602C2CC, 32, 32, 1);
             }
-            func_8008C104(D_602C2CC, D_600D990);
+            func_8008C104(D_ZO_602C2CC, D_ZO_600D990);
             if (func_800A73E4(&sp3C, &sp40, gPlayer[0].camEye.x, gPlayer[0].camEye.y,
                               gPlayer[0].camEye.z - D_80177D20)) {
                 gLight1R = 0;

src/main/fox_radio.c

@@ -24,6 +24,7 @@ s32 D_80178748;
 #include "assets/ast_great_fox.h"
 #include "assets/ast_area_6.h"
 #include "assets/ast_title.h"
+#include "assets/ast_zoness.h"
 
 s32 gCurrentMsgPri = 0;
 
@@ -291,10 +292,10 @@ void func_800BAAE8(void) {
             sp44 = D_A6_60038C0;
             break;
         case RCID_BOSS_ZONESS:
-            sp44 = D_6014510;
+            sp44 = D_ZO_6014510;
             break;
         case RCID_BOSS_ZONESS_OPEN:
-            sp44 = D_6015430;
+            sp44 = D_ZO_6015430;
             break;
         case RCID_BOSS_SECTORX:
             sp44 = D_SX_6020FB0;

src/overlays/ovl_i3/fox_zo.c

@@ -2,6 +2,7 @@
 #include "global.h"
 #include "assets.h"
 #include "assets/ast_enmy_planet.h"
+#include "assets/ast_zoness.h"
 
 // f32 temp[] = {
 //     13.0f,
@@ -78,39 +79,38 @@ void func_i3_8019962C(Boss* bossZO, f32 arg1);
 // /* 0xC */ NO_SEGMENT,
 // /* 0xD */ ROM_SEGMENT(ast_955270),
 
-extern Gfx D_6002E10[];
+extern Gfx D_ZO_6002E10[];
-extern Gfx D_6004380[];
+extern Gfx D_ZO_6004380[];
-extern Gfx D_6006360[];
+extern Gfx D_ZO_6006360[];
-extern Limb* D_600E7D8[];
+extern Limb* D_ZO_600E7D8[];
-extern Gfx D_6013330[];
+extern Gfx D_ZO_6013330[];
-extern Gfx D_6017950[];
+extern Gfx D_ZO_6017950[];
-extern Gfx D_60181E0[];
+extern Gfx D_ZO_60181E0[];
-extern Animation D_6018550;
+extern Animation D_ZO_6018550;
-extern Limb* D_601863C[];
+extern Limb* D_ZO_601863C[];
-extern Gfx D_6018660[];
+extern Gfx D_ZO_6018660[];
-extern Animation D_60195EC;
+extern Animation D_ZO_60195EC;
-extern Limb* D_6019738[];
+extern Limb* D_ZO_6019738[];
-extern Animation D_601996C;
+extern Limb* D_ZO_6019E18[];
-extern Limb* D_6019E18[];
+extern Gfx D_ZO_6019EB0[];
-extern Gfx D_6019EB0[];
+extern Gfx D_ZO_601A340[];
-extern Gfx D_601A340[];
+extern Animation D_ZO_601AA48;
-extern Animation D_601AA48;
+extern Limb* D_ZO_601AB14[];
-extern Limb* D_601AB14[];
+extern Animation D_ZO_601AFB8;
-extern Animation D_601AFB8;
+extern Limb* D_ZO_601B184[];
-extern Limb* D_601B184[];
+extern Gfx D_ZO_601BCC0[];
-extern Gfx D_601BCC0[];
+extern Gfx D_ZO_601C590[];
-extern Gfx D_601C590[];
+extern Gfx D_ZO_601D680[];
-extern Gfx D_601D680[];
+extern Animation D_ZO_601FBC4;
-extern Animation D_601FBC4;
+extern Limb* D_ZO_601FC90[];
-extern Limb* D_601FC90[];
+extern Animation D_ZO_6021ABC;
-extern Animation D_6021ABC;
+extern Limb* D_ZO_6021B88[];
-extern Limb* D_6021B88[];
+extern Gfx D_ZO_6023D50[];
-extern Gfx D_6023D50[];
+extern Gfx D_ZO_6025E60[];
-extern Gfx D_6025E60[];
+extern f32 D_ZO_602C028[];
-extern f32 D_602C028[];
+extern Gfx D_ZO_60012A0[];
-extern Gfx D_60012A0[];
+extern Gfx D_ZO_60239E0[];
-extern Gfx D_60239E0[];
+extern Gfx D_ZO_6023730[];
-extern Gfx D_6023730[];
 
 // typedef struct {
 //     /* 0 */ char pad0[4];
@@ -686,8 +686,8 @@ void func_i3_80190430(Actor* actor) {
     Vec3f sp30[30];
 
     Matrix_Scale(gCalcMatrix, actor->scale, actor->scale, actor->scale, 1);
-    Animation_GetFrameData(&D_600E5EC, actor->unk_0B6, sp30);
+    Animation_GetFrameData(&D_ZO_600E5EC, actor->unk_0B6, sp30);
-    Animation_DrawSkeleton(3, D_600E7D8, sp30, func_i3_8019019C, func_i3_80190204, actor, gCalcMatrix);
+    Animation_DrawSkeleton(3, D_ZO_600E7D8, sp30, func_i3_8019019C, func_i3_80190204, actor, gCalcMatrix);
 }
 
 void func_i3_801904CC(Actor* actor) {
@@ -722,7 +722,7 @@ void func_i3_801904CC(Actor* actor) {
             break;
     }
     actor->unk_0B6++;
-    if (Animation_GetFrameCount(&D_600E5EC) < actor->unk_0B6) {
+    if (Animation_GetFrameCount(&D_ZO_600E5EC) < actor->unk_0B6) {
         actor->unk_0B6 = 0;
     }
     if ((actor->unk_0D0 != 0) && (actor->health != 0)) {
@@ -813,7 +813,7 @@ s16 D_i3_801BF56C[20] = {
 u8 D_i3_801BF594[20] = {
     0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2,
 };
-Gfx* D_i3_801BF5A8[3] = { D_60012A0, D_60239E0, D_6023730 };
+Gfx* D_i3_801BF5A8[3] = { D_ZO_60012A0, D_ZO_60239E0, D_ZO_6023730 };
 
 void func_i3_80190B4C(f32 xPos, f32 yPos, f32 zPos, f32 xRot, f32 yRot, f32 zRot, u8 arg6, s32 arg7) {
     Matrix_Push(&gGfxMatrix);
@@ -838,7 +838,7 @@ typedef struct {
 } JntHitbox;
 
 void func_i3_80190D0C(Actor* actor) {
-    Hitbox* var_s2 = (((JntHitbox*) SEGMENTED_TO_VIRTUAL(D_602BC58))->boxes);
+    Hitbox* var_s2 = (((JntHitbox*) SEGMENTED_TO_VIRTUAL(D_ZO_602BC58))->boxes);
     s32 i;
     s32 k;
     PosRot* temp_s0;
@@ -923,7 +923,7 @@ void func_i3_80191010(Actor* actor) {
                     actor->unk_0B6--;
                 }
             } else {
-                if (actor->unk_0B6 < Animation_GetFrameCount(&D_601AA48)) {
+                if (actor->unk_0B6 < Animation_GetFrameCount(&D_ZO_601AA48)) {
                     actor->unk_0B6++;
                 }
             }
@@ -979,8 +979,8 @@ void func_i3_801914C4(Actor* actor) {
 
     Matrix_Scale(gCalcMatrix, actor->scale, actor->scale, actor->scale, 1);
     gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
-    Animation_GetFrameData(&D_601AA48, actor->unk_0B6, sp38);
+    Animation_GetFrameData(&D_ZO_601AA48, actor->unk_0B6, sp38);
-    Animation_DrawSkeleton(3, D_601AB14, sp38, NULL, func_i3_80190F28, actor, gCalcMatrix);
+    Animation_DrawSkeleton(3, D_ZO_601AB14, sp38, NULL, func_i3_80190F28, actor, gCalcMatrix);
     gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
 }
 
@@ -1129,11 +1129,11 @@ void func_i3_80191BC4(Actor* actor) {
 
 void func_i3_80191DB0(Actor* actor) {
     RCP_SetupDL_40();
-    gSPDisplayList(gMasterDisp++, D_6019EB0);
+    gSPDisplayList(gMasterDisp++, D_ZO_6019EB0);
     Matrix_RotateY(gGfxMatrix, actor->fwork[0] * 0.7f * M_DTOR, 1);
     Matrix_RotateX(gGfxMatrix, actor->fwork[0] * M_DTOR, 1);
     Matrix_SetGfxMtx(&gMasterDisp);
-    gSPDisplayList(gMasterDisp++, D_6023D50);
+    gSPDisplayList(gMasterDisp++, D_ZO_6023D50);
 }
 
 void func_i3_80191E94(s32 limbIndex, Vec3f* rot, void* thisx) {
@@ -1174,8 +1174,8 @@ void func_i3_80191FFC(Actor* actor) {
     Vec3f sp30[20];
 
     Matrix_Scale(gCalcMatrix, actor->scale, actor->scale, actor->scale, 1);
-    Animation_GetFrameData(&D_60195EC, actor->unk_0B6, sp30);
+    Animation_GetFrameData(&D_ZO_60195EC, actor->unk_0B6, sp30);
-    Animation_DrawSkeleton(3, D_6019738, sp30, NULL, func_i3_80191E94, actor, gCalcMatrix);
+    Animation_DrawSkeleton(3, D_ZO_6019738, sp30, NULL, func_i3_80191E94, actor, gCalcMatrix);
 }
 
 void func_i3_80192094(Actor* actor) {
@@ -1218,7 +1218,7 @@ void func_i3_80192094(Actor* actor) {
             break;
         case 1:
             actor->unk_0B6++;
-            if (actor->unk_0B6 >= Animation_GetFrameCount(&D_60195EC)) {
+            if (actor->unk_0B6 >= Animation_GetFrameCount(&D_ZO_60195EC)) {
                 actor->unk_0B6 = 64;
                 Math_SmoothStepToF(&actor->vel.z, 0.0f, 1.0f, 100.0f, 0.00001f);
                 if (actor->obj.pos.y < -500.0f) {
@@ -1363,7 +1363,7 @@ void func_i3_80192834(Actor* actor) {
                     actor->unk_0B6++;
                 }
             } else {
-                if (actor->unk_0B6 < Animation_GetFrameCount(&D_6021ABC)) {
+                if (actor->unk_0B6 < Animation_GetFrameCount(&D_ZO_6021ABC)) {
                     actor->unk_0B6++;
                 }
             }
@@ -1405,8 +1405,8 @@ void func_i3_80192834(Actor* actor) {
 void func_i3_80192C18(Actor* actor) {
     Vec3f sp28[20];
 
-    Animation_GetFrameData(&D_6021ABC, actor->unk_0B6, sp28);
+    Animation_GetFrameData(&D_ZO_6021ABC, actor->unk_0B6, sp28);
-    Animation_DrawSkeleton(3, D_6021B88, sp28, NULL, func_i3_801926F4, actor, gCalcMatrix);
+    Animation_DrawSkeleton(3, D_ZO_6021B88, sp28, NULL, func_i3_801926F4, actor, gCalcMatrix);
 }
 
 void func_i3_80192C84(s32 limbIndex, Vec3f* rot, void* thisx) {
@@ -1487,7 +1487,7 @@ void func_i3_80192E64(Actor* actor) {
         case 2:
             Math_SmoothStepToF(&actor->vel.x, 0.0f, 0.1f, 1.0f, 0.0001f);
             Math_SmoothStepToF(&actor->vel.z, 0.0f, 0.1f, 1.0f, 0.0001f);
-            if (actor->unk_0B6 < Animation_GetFrameCount(&D_601AFB8)) {
+            if (actor->unk_0B6 < Animation_GetFrameCount(&D_ZO_601AFB8)) {
                 actor->unk_0B6++;
             } else {
                 actor->unk_0B6 = 0;
@@ -1527,8 +1527,8 @@ void func_i3_80192E64(Actor* actor) {
 void func_i3_80193240(Actor* actor) {
     Vec3f sp28[30];
 
-    Animation_GetFrameData(&D_601AFB8, actor->unk_0B6, sp28);
+    Animation_GetFrameData(&D_ZO_601AFB8, actor->unk_0B6, sp28);
-    Animation_DrawSkeleton(2, D_601B184, sp28, NULL, func_i3_80192C84, actor, gCalcMatrix);
+    Animation_DrawSkeleton(2, D_ZO_601B184, sp28, NULL, func_i3_80192C84, actor, gCalcMatrix);
 }
 
 s32 D_i3_801BF5F0[6] = {
@@ -2030,7 +2030,7 @@ void func_i3_80194394(s32 limbIndex, Vec3f* rot, void* thisx) {
 void func_i3_801949DC(Boss* bossZO) {
     Matrix_Translate(gCalcMatrix, 0.0f, bossZO->fwork[ZO_FWK_3], 0.0f, 1);
     Matrix_Scale(gCalcMatrix, 2.6f, 2.6f, 2.6f, 1);
-    Animation_DrawSkeleton(3, D_6019E18, bossZO->vwork, func_i3_80193D08, func_i3_80194394, bossZO, gCalcMatrix);
+    Animation_DrawSkeleton(3, D_ZO_6019E18, bossZO->vwork, func_i3_80193D08, func_i3_80194394, bossZO, gCalcMatrix);
 }
 
 f32 D_i3_801BF6BC[2] = { -600.0f, -3400.0f };
@@ -3087,7 +3087,7 @@ void func_i3_80194A84(Boss* bossZO) {
     ZO_HIT_0(bossZO)->x.offset = sZoFwork[ZO_BSF_43_X] - bossZO->obj.pos.x;
     ZO_HIT_1(bossZO)->z.offset = sZoFwork[ZO_BSF_43_Z] - bossZO->obj.pos.z;
     ZO_HIT_1(bossZO)->x.offset = sZoFwork[ZO_BSF_43_X] - bossZO->obj.pos.x;
-    Animation_GetFrameData(&D_601996C, 0, bossZO->vwork);
+    Animation_GetFrameData(&D_ZO_601996C, 0, bossZO->vwork);
     if (sZoSwork[ZO_BSS_38] != 0) {
         sZoSwork[ZO_BSS_37] -= 10;
         if (sZoSwork[ZO_BSS_37] < 0) {
@@ -3419,7 +3419,7 @@ void func_i3_8019983C(Actor* actor) {
     gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
     Matrix_Scale(gGfxMatrix, 2.6f, 2.6f, 2.6f, 1);
     Matrix_SetGfxMtx(&gMasterDisp);
-    gSPDisplayList(gMasterDisp++, D_6017950);
+    gSPDisplayList(gMasterDisp++, D_ZO_6017950);
 }
 
 void func_i3_801998E0(Effect* effect, f32 xPos, f32 yPos, f32 zPos) {
@@ -3530,7 +3530,7 @@ void func_i3_80199A28(Actor* actor) {
 void func_i3_80199E24(Actor* actor) {
     Matrix_Scale(gGfxMatrix, 2.0f, 2.0f, 2.0f, 1);
     Matrix_SetGfxMtx(&gMasterDisp);
-    gSPDisplayList(gMasterDisp++, D_6025E60);
+    gSPDisplayList(gMasterDisp++, D_ZO_6025E60);
 }
 
 void func_i3_80199E9C(Actor* actor, f32 arg1, f32 arg2) {
@@ -3611,7 +3611,7 @@ void func_i3_8019A1FC(Actor* actor) {
     Matrix_Scale(gGfxMatrix, 2.0f, 2.0f, 2.0f, 1);
     Matrix_SetGfxMtx(&gMasterDisp);
     RCP_SetupDL_57(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
-    gSPDisplayList(gMasterDisp++, D_601C590);
+    gSPDisplayList(gMasterDisp++, D_ZO_601C590);
     RCP_SetupDL_60(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
     gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
     if (((actor->state == 1) && (gBosses[0].timer_052 != 0)) || (actor->state == 0)) {
@@ -3634,7 +3634,7 @@ void func_i3_8019A1FC(Actor* actor) {
         Matrix_Push(&gGfxMatrix);
         Matrix_Scale(gGfxMatrix, 0.75f, 0.75f, 0.75f, 1);
         Matrix_SetGfxMtx(&gMasterDisp);
-        gSPDisplayList(gMasterDisp++, D_6018660);
+        gSPDisplayList(gMasterDisp++, D_ZO_6018660);
         Matrix_Pop(&gGfxMatrix);
     }
 }
@@ -3827,7 +3827,7 @@ void func_i3_8019ACCC(Actor* actor) {
             Matrix_RotateX(gGfxMatrix, 1.5707964f, 1);
             Matrix_Scale(gGfxMatrix, 1.5f, 1.5f, 1.5f, 1);
             Matrix_SetGfxMtx(&gMasterDisp);
-            gSPDisplayList(gMasterDisp++, D_6018660);
+            gSPDisplayList(gMasterDisp++, D_ZO_6018660);
             Matrix_Pop(&gGfxMatrix);
             Matrix_Pop(&gGfxMatrix);
             var_fs5 += 90.0f;
@@ -3842,13 +3842,13 @@ void func_i3_8019ACCC(Actor* actor) {
     Matrix_SetGfxMtx(&gMasterDisp);
     RCP_SetupDL(&gMasterDisp, 70);
     gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255);
-    gSPDisplayList(gMasterDisp++, D_6004380);
+    gSPDisplayList(gMasterDisp++, D_ZO_6004380);
     Matrix_RotateY(gGfxMatrix, sZoFwork[ZO_BSF_19] * M_DTOR, 1);
     Matrix_RotateX(gGfxMatrix, actor->fwork[2] * M_DTOR, 1);
     Matrix_RotateZ(gGfxMatrix, actor->fwork[3] * M_DTOR, 1);
     Matrix_SetGfxMtx(&gMasterDisp);
     RCP_SetupDL_55();
-    gSPDisplayList(gMasterDisp++, D_601BCC0);
+    gSPDisplayList(gMasterDisp++, D_ZO_601BCC0);
 }
 
 Vec3f D_i3_801BF744[3] = {
@@ -3975,7 +3975,7 @@ void func_i3_8019B548(Actor* actor) {
 }
 
 void func_i3_8019B7DC(Actor* actor) {
-    gSPDisplayList(gMasterDisp++, D_6006360);
+    gSPDisplayList(gMasterDisp++, D_ZO_6006360);
 }
 
 void func_i3_8019B810(Actor* actor) {
@@ -4093,8 +4093,8 @@ void func_i3_8019BC78(s32 limbIndex, Vec3f* rot, void* thisx) {
 void func_i3_8019BDE0(Actor* actor) {
     Vec3f sp28[20];
 
-    Animation_GetFrameData(&D_6018550, 0, sp28);
+    Animation_GetFrameData(&D_ZO_6018550, 0, sp28);
-    Animation_DrawSkeleton(3, D_601863C, sp28, NULL, func_i3_8019BC78, actor, gCalcMatrix);
+    Animation_DrawSkeleton(3, D_ZO_601863C, sp28, NULL, func_i3_8019BC78, actor, gCalcMatrix);
 }
 
 void func_i3_8019BE48(Actor* actor) {
@@ -4173,7 +4173,7 @@ void func_i3_8019BE48(Actor* actor) {
 }
 
 void func_i3_8019C1CC(Actor* actor) {
-    gSPDisplayList(gMasterDisp++, D_6002E10);
+    gSPDisplayList(gMasterDisp++, D_ZO_6002E10);
 }
 
 Vec3f D_i3_801BF8AC = { 230.0f, -50.0f, 0.0f };
@@ -4305,25 +4305,25 @@ void func_i3_8019C83C(Actor* actor) {
     Matrix_Push(&gGfxMatrix);
     Matrix_RotateZ(gGfxMatrix, actor->fwork[0] * M_DTOR, 1);
     Matrix_SetGfxMtx(&gMasterDisp);
-    gSPDisplayList(gMasterDisp++, D_601A340);
+    gSPDisplayList(gMasterDisp++, D_ZO_601A340);
     Matrix_Pop(&gGfxMatrix);
     Matrix_Push(&gGfxMatrix);
     Matrix_Translate(gGfxMatrix, 0.0f, -320.0f, 0.0f, 1);
     Matrix_Scale(gGfxMatrix, 1.0f, 1.3, 1.0f, 1);
     Matrix_SetGfxMtx(&gMasterDisp);
-    gSPDisplayList(gMasterDisp++, D_6013330);
+    gSPDisplayList(gMasterDisp++, D_ZO_6013330);
     Matrix_Pop(&gGfxMatrix);
     Matrix_Push(&gGfxMatrix);
     Matrix_RotateZ(gGfxMatrix, 1.5707964f, 1);
     Matrix_Translate(gGfxMatrix, -110.0f, 0.0f, 0.0f, 1);
     Matrix_SetGfxMtx(&gMasterDisp);
-    gSPDisplayList(gMasterDisp++, D_601D680);
+    gSPDisplayList(gMasterDisp++, D_ZO_601D680);
     Matrix_Pop(&gGfxMatrix);
     Matrix_Translate(gGfxMatrix, actor->fwork[1], actor->fwork[2], 0.0f, 1);
     Matrix_RotateY(gGfxMatrix, actor->fwork[4] * M_DTOR, 1);
     Matrix_Scale(gGfxMatrix, 0.75f, 0.75f, 0.75f, 1);
     Matrix_SetGfxMtx(&gMasterDisp);
-    gSPDisplayList(gMasterDisp++, D_601C590);
+    gSPDisplayList(gMasterDisp++, D_ZO_601C590);
     RCP_SetupDL_57(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
     Matrix_RotateY(gGfxMatrix, gGameFrameCount * M_DTOR, 1);
 
@@ -4344,7 +4344,7 @@ void func_i3_8019C83C(Actor* actor) {
         Matrix_Push(&gGfxMatrix);
         Matrix_Scale(gGfxMatrix, 0.5f, 0.5f, 0.5f, 1);
         Matrix_SetGfxMtx(&gMasterDisp);
-        gSPDisplayList(gMasterDisp++, D_6018660);
+        gSPDisplayList(gMasterDisp++, D_ZO_6018660);
         Matrix_Pop(&gGfxMatrix);
     }
 }
@@ -4432,7 +4432,7 @@ void func_i3_8019CE58(Actor* actor) {
         gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 50);
         gDPSetEnvColor(gMasterDisp++, 255, 255, 127, 255);
     }
-    gSPDisplayList(gMasterDisp++, D_60181E0);
+    gSPDisplayList(gMasterDisp++, D_ZO_60181E0);
 }
 
 void func_i3_8019D060(Actor* actor) {
@@ -4452,7 +4452,7 @@ void func_i3_8019D060(Actor* actor) {
 
             actor->unk_046 = i + 1;
             Object_SetInfo(&gActors[i].info, gActors[i].obj.id);
-            gActors[i].info.hitbox = SEGMENTED_TO_VIRTUAL(D_602C028);
+            gActors[i].info.hitbox = SEGMENTED_TO_VIRTUAL(D_ZO_602C028);
             break;
         }
     }
@@ -4516,8 +4516,8 @@ s32 func_i3_8019D340(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* t
 void func_i3_8019D3C4(Actor* actor) {
     Vec3f sp28[10];
 
-    Animation_GetFrameData(&D_601FBC4, 0, sp28);
+    Animation_GetFrameData(&D_ZO_601FBC4, 0, sp28);
-    Animation_DrawSkeleton(1, D_601FC90, sp28, func_i3_8019D340, NULL, actor, &gIdentityMatrix);
+    Animation_DrawSkeleton(1, D_ZO_601FC90, sp28, func_i3_8019D340, NULL, actor, &gIdentityMatrix);
 }
 
 void func_i3_8019D428(Player* player) {

tools/Torch

@@ -1 +1 @@
-Subproject commit 8786ab57b938617257bfbeb9a426267fe7499b8c
+Subproject commit c2303489e81fb2c4d496822d9856e7665fefd45e

yamls/us/assets.yaml

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