Sector Z, Fortuna & General Docs (#261)

* Sector Z Docs initial

* Sector Z docs

* some other things

* correction

* Space Junk

* SectorZ_SetLevelObjects

* rename assets with correct prefix

* aSzBackgroundTex

* details

* pr review

* Sector X initials

* Meteo Initials

* Sector X things I forgot

* fox_tr360 & fox_ve1 & fox_so initials

* fox_so details

* Zones initials

* More Zones initials

* more zones initials

* area 6 initials

* fortuna inits

* fortuna actors

* some more docs

* more docs for Fortuna

* fix mistake in data incorrectly imported

* Fortuna Radars

* BossFO

* Sector Y Initials

* Venom 2 general Docs

* Some Corneria Docs

* Actor, Scenery and Boss IDs in update and draw functions of gObjectInfo

* more docs and this usage

* fox_360 this usage

* more actor types and this usages

* fox_effect type usage

* training docs

* some Sector X docs

* fix incorrect usage of "this"

* fix comment

* more docs

* funcNames

* fox_bg spacing

* boolean

* scenery corneria bumbs

* terrain bumps

* corneria arch

* more corneria objects

* hitboxes

* more corneria objects

* more corneria level objects

* more corneria objects

* aCoWaterfallDL

* corneria docs

* more corneria docs

* Granga swork start

* corneria swork

* Corneria

* Corneria Granga docs

* more granga docs

* granga work buffer enum

* CarrierParts enum use

* option

* Corneria Docs

* GRANGA_FWK

* fox_co.h header

* fix Fault_FillRectangle typo

* PR reviews

* sCsTeamInitialPos

* Doodad

13 files changed, 395 insertions, 392 deletions

diff --git a/assets/yaml/jp/rev0/ast_arwing.yaml b/assets/yaml/jp/rev0/ast_arwing.yaml
index 45a7f400..89515c40 100644
--- a/assets/yaml/jp/rev0/ast_arwing.yaml
+++ b/assets/yaml/jp/rev0/ast_arwing.yaml
@@ -56,8 +56,8 @@ D_arwing_3007550:
 D_arwing_30075D0:
   { type: TEXTURE, format: RGBA16, offset: 0x30075D0, width: 8, height: 8, ctype: u16, symbol: D_arwing_30075D0 }
 
-D_arwing_3007650:
-  { type: GFX, offset: 0x3007650, symbol: D_arwing_3007650 }
+aArwingItemLasersDL:
+  { type: GFX, offset: 0x3007650, symbol: aArwingItemLasersDL }
 
 ast_arwing_seg3_vtx_7A20:
   { type: VTX, offset: 0x3007A20, count: 244, symbol: ast_arwing_seg3_vtx_7A20 }
diff --git a/assets/yaml/jp/rev0/ast_corneria.yaml b/assets/yaml/jp/rev0/ast_corneria.yaml
index 5f7be606..953521ce 100644
--- a/assets/yaml/jp/rev0/ast_corneria.yaml
+++ b/assets/yaml/jp/rev0/ast_corneria.yaml
@@ -18,8 +18,8 @@
 D_CO_6000000:
   { type: TEXTURE, ctype: u8, format: IA8, width: 128, height: 28, offset: 0x6000000, symbol: D_CO_6000000 }
 
-D_CO_6000E00:
-  { type: GFX, offset: 0x6000E00, symbol: D_CO_6000E00 }
+aCoWaterfallDL:
+  { type: GFX, offset: 0x6000E00, symbol: aCoWaterfallDL }
 
 D_CO_60018F8:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x060018F8, symbol: D_CO_60018F8 }
@@ -48,8 +48,8 @@ D_CO_60059F0:
 D_CO_6005A80:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x06005A80, symbol: D_CO_6005A80 }
 
-D_CO_6006A80:
-  { type: GFX, offset: 0x6006A80, symbol: D_CO_6006A80 }
+aCoArch3DL:
+  { type: GFX, offset: 0x6006A80, symbol: aCoArch3DL }
 
 D_CO_6006E08:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06006E08, symbol: D_CO_6006E08 }
@@ -102,11 +102,11 @@ D_CO_6010250:
 D_CO_6010F90:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06010F90, symbol: D_CO_6010F90 }
 
-D_CO_6010A50:
-  { type: GFX, offset: 0x6010A50, symbol: D_CO_6010A50 }
+aCoHighway7DL:
+  { type: GFX, offset: 0x6010A50, symbol: aCoHighway7DL }
 
-D_CO_6010E00:
-  { type: GFX, offset: 0x6010E00, symbol: D_CO_6010E00 }
+aCoHighway5DL:
+  { type: GFX, offset: 0x6010E00, symbol: aCoHighway5DL }
 
 D_CO_6011790:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06011790, symbol: D_CO_6011790 }
@@ -123,53 +123,53 @@ D_CO_6012840:
 D_CO_6012D00:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06012D00, symbol: D_CO_6012D00 }
 
-D_CO_60132B0:
-  { type: GFX, offset: 0x60132B0, symbol: D_CO_60132B0 }
+aCoHighway1DL:
+  { type: GFX, offset: 0x60132B0, symbol: aCoHighway1DL }
 
-D_CO_60137B0:
-  { type: GFX, offset: 0x60137B0, symbol: D_CO_60137B0 }
+aCoArch2DL:
+  { type: GFX, offset: 0x60137B0, symbol: aCoArch2DL }
 
-D_CO_6013B50:
-  { type: GFX, offset: 0x6013B50, symbol: D_CO_6013B50 }
+aCoRockwallDL:
+  { type: GFX, offset: 0x6013B50, symbol: aCoRockwallDL }
 
 D_CO_6013BE0:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06013BE0, symbol: D_CO_6013BE0 }
 
-D_CO_60143E0:
-  { type: GFX, offset: 0x60143E0, symbol: D_CO_60143E0 }
+aCoHighway8DL:
+  { type: GFX, offset: 0x60143E0, symbol: aCoHighway8DL }
 
-D_CO_6014500:
-  { type: GFX, offset: 0x6014500, symbol: D_CO_6014500 }
+aCoHighway4DL:
+  { type: GFX, offset: 0x6014500, symbol: aCoHighway4DL }
 
-D_CO_6014670:
-  { type: GFX, offset: 0x6014670, symbol: D_CO_6014670 }
+aCoHighway6DL:
+  { type: GFX, offset: 0x6014670, symbol: aCoHighway6DL }
 
-D_CO_6014A20:
-  { type: GFX, offset: 0x6014A20, symbol: D_CO_6014A20 }
+aCoHighway9DL:
+  { type: GFX, offset: 0x6014A20, symbol: aCoHighway9DL }
 
-D_CO_6014B50:
-  { type: GFX, offset: 0x6014B50, symbol: D_CO_6014B50 }
+aCoBuilding3DL:
+  { type: GFX, offset: 0x6014B50, symbol: aCoBuilding3DL }
 
 D_CO_60151A8:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x060151A8, symbol: D_CO_60151A8 }
 
-D_CO_60153B0:
-  { type: GFX, offset: 0x60153B0, symbol: D_CO_60153B0 }
+aCoTowerDL:
+  { type: GFX, offset: 0x60153B0, symbol: aCoTowerDL }
 
-D_CO_6015F00:
-  { type: GFX, offset: 0x6015F00, symbol: D_CO_6015F00 }
+aCoStoneArchDL:
+  { type: GFX, offset: 0x6015F00, symbol: aCoStoneArchDL }
 
 D_CO_6015700:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06015700, symbol: D_CO_6015700 }
 
-D_CO_6016270:
-  { type: GFX, offset: 0x6016270, symbol: D_CO_6016270 }
+aRadarDL:
+  { type: GFX, offset: 0x6016270, symbol: aRadarDL }
 
-D_CO_60164F0:
-  { type: GFX, offset: 0x60164F0, symbol: D_CO_60164F0 }
+aCoHighway3DL:
+  { type: GFX, offset: 0x60164F0, symbol: aCoHighway3DL }
 
-D_CO_6016580:
-  { type: GFX, offset: 0x6016580, symbol: D_CO_6016580 }
+aCoBuilding4DL:
+  { type: GFX, offset: 0x6016580, symbol: aCoBuilding4DL }
 
 D_CO_6017F10:
   { type: GFX, offset: 0x6017F10, symbol: D_CO_6017F10 }
@@ -177,8 +177,8 @@ D_CO_6017F10:
 D_CO_60186E0:
   { type: GFX, offset: 0x60186E0, symbol: D_CO_60186E0 }
 
-D_CO_6018E80:
-  { type: GFX, offset: 0x6018E80, symbol: D_CO_6018E80 }
+aCoBuilding7DL:
+  { type: GFX, offset: 0x6018E80, symbol: aCoBuilding7DL }
 
 D_CO_60191C8:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x060191C8, symbol: D_CO_60191C8 }
@@ -195,14 +195,14 @@ D_CO_6019E60:
 D_CO_601FF58:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0601FF58, symbol: D_CO_601FF58 }
 
-D_CO_601A7D0:
-  { type: GFX, offset: 0x601A7D0, symbol: D_CO_601A7D0 }
+aCoBuilding2DL:
+  { type: GFX, offset: 0x601A7D0, symbol: aCoBuilding2DL }
 
 D_CO_601AD60:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0601AD60, symbol: D_CO_601AD60 }
 
-D_CO_601B560:
-  { type: GFX, offset: 0x601B560, symbol: D_CO_601B560 }
+aCoBuilding5DL:
+  { type: GFX, offset: 0x601B560, symbol: aCoBuilding5DL }
 
 D_CO_601B640:
   { type: GFX, offset: 0x601B640, symbol: D_CO_601B640 }
@@ -210,14 +210,14 @@ D_CO_601B640:
 D_CO_601B6C0:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0601B6C0, symbol: D_CO_601B6C0 }
 
-D_CO_601BEC0:
-  { type: GFX, offset: 0x601BEC0, symbol: D_CO_601BEC0 }
+aCoBump2DL:
+  { type: GFX, offset: 0x601BEC0, symbol: aCoBump2DL }
 
 D_CO_601C1A8:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0601C1A8, symbol: D_CO_601C1A8 }
 
-D_CO_601C9B0:
-  { type: GFX, offset: 0x601C9B0, symbol: D_CO_601C9B0 }
+aCoTreeDL:
+  { type: GFX, offset: 0x601C9B0, symbol: aCoTreeDL }
 
 D_CO_601CAA0:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 64, offset: 0x0601CAA0, symbol: D_CO_601CAA0 }
@@ -234,8 +234,8 @@ D_CO_601ED00:
 D_CO_601F500:
   { type: GFX, offset: 0x601F500, symbol: D_CO_601F500 }
 
-D_CO_601F5A0:
-  { type: GFX, offset: 0x601F5A0, symbol: D_CO_601F5A0 }
+aCoArch1DL:
+  { type: GFX, offset: 0x601F5A0, symbol: aCoArch1DL }
 
 D_CO_6020760:
   { type: GFX, offset: 0x6020760, symbol: D_CO_6020760 }
@@ -258,8 +258,8 @@ D_CO_6023DE8:
 D_CO_6024160:
   { type: GFX, offset: 0x6024160, symbol: D_CO_6024160 }
 
-D_CO_60244A0:
-  { type: GFX, offset: 0x60244A0, symbol: D_CO_60244A0 }
+aCoBump4DL:
+  { type: GFX, offset: 0x60244A0, symbol: aCoBump4DL }
 
 D_CO_60245E0:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x060245E0, symbol: D_CO_60245E0 }
@@ -285,14 +285,14 @@ D_CO_6029528:
 D_CO_6029674:
   { type: SF64:SKELETON, offset: 0x6029674, symbol: D_CO_6029674 }
 
-D_CO_602991C:
-  { type: SF64:ANIM, offset: 0x602991C, symbol: D_CO_602991C }
+aCoGaruda1Anim:
+  { type: SF64:ANIM, offset: 0x602991C, symbol: aCoGaruda1Anim }
 
-D_CO_6029A48:
-  { type: SF64:SKELETON, offset: 0x6029A48, symbol: D_CO_6029A48 }
+aCoGarudaSkel:
+  { type: SF64:SKELETON, offset: 0x6029A48, symbol: aCoGarudaSkel }
 
-D_CO_602A520:
-  { type: SF64:ANIM, offset: 0x602A520, symbol: D_CO_602A520 }
+aCoGaruda3Anim:
+  { type: SF64:ANIM, offset: 0x602A520, symbol: aCoGaruda3Anim }
 
 D_CO_602AA04:
   { type: SF64:ANIM, offset: 0x602AA04, symbol: D_CO_602AA04 }
@@ -300,8 +300,8 @@ D_CO_602AA04:
 D_CO_602AA7C:
   { type: SF64:ANIM, offset: 0x602AA7C, symbol: D_CO_602AA7C }
 
-D_CO_602AB48:
-  { type: SF64:SKELETON, offset: 0x602AB48, symbol: D_CO_602AB48 }
+aCoDoorsSkel:
+  { type: SF64:SKELETON, offset: 0x602AB48, symbol: aCoDoorsSkel }
 
 D_CO_602BC18:
   { type: SF64:ANIM, offset: 0x602BC18, symbol: D_CO_602BC18 }
@@ -318,11 +318,11 @@ D_CO_602D31C:
 D_CO_602D400:
   { type: SF64:ANIM, offset: 0x602D400, symbol: D_CO_602D400 }
 
-D_CO_602D5AC:
-  { type: SF64:SKELETON, offset: 0x602D5AC, symbol: D_CO_602D5AC }
+aCoCarrierSkel:
+  { type: SF64:SKELETON, offset: 0x602D5AC, symbol: aCoCarrierSkel }
 
-D_CO_602D5F0:
-  { type: GFX, offset: 0x602D5F0, symbol: D_CO_602D5F0 }
+aCoBuilding1DL:
+  { type: GFX, offset: 0x602D5F0, symbol: aCoBuilding1DL }
 
 D_CO_602DA20:
   { type: GFX, offset: 0x602DA20, symbol: D_CO_602DA20 }
@@ -333,17 +333,17 @@ D_CO_602DCA0:
 D_CO_602DD40:
   { type: GFX, offset: 0x602DD40, symbol: D_CO_602DD40 }
 
-D_CO_602E080:
-  { type: GFX, offset: 0x602E080, symbol: D_CO_602E080 }
+aCoHighway2DL:
+  { type: GFX, offset: 0x602E080, symbol: aCoHighway2DL }
 
-D_CO_602E570:
-  { type: GFX, offset: 0x602E570, symbol: D_CO_602E570 }
+aCoBump5DL:
+  { type: GFX, offset: 0x602E570, symbol: aCoBump5DL }
 
-D_CO_602E7A0:
-  { type: GFX, offset: 0x602E7A0, symbol: D_CO_602E7A0 }
+aCoBump3DL:
+  { type: GFX, offset: 0x602E7A0, symbol: aCoBump3DL }
 
-D_CO_602E9E0:
-  { type: GFX, offset: 0x602E9E0, symbol: D_CO_602E9E0 }
+aCoBump1DL:
+  { type: GFX, offset: 0x602E9E0, symbol: aCoBump1DL }
 
 D_CO_602ECB0:
   { type: GFX, offset: 0x602ECB0, symbol: D_CO_602ECB0 }
@@ -351,8 +351,8 @@ D_CO_602ECB0:
 D_CO_602ED50:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 16, offset: 0x0602ED50, symbol: D_CO_602ED50 }
 
-D_CO_602F7C0:
-  { type: GFX, offset: 0x602F7C0, symbol: D_CO_602F7C0 }
+aCoPoleDL:
+  { type: GFX, offset: 0x602F7C0, symbol: aCoPoleDL }
 
 D_CO_602F848:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 64, offset: 0x0602F848, symbol: D_CO_602F848 }
@@ -408,11 +408,11 @@ D_CO_60355A0:
 D_CO_6035DA0:
   { type: GFX, offset: 0x6035DA0, symbol: D_CO_6035DA0 }
 
-D_CO_6035F10:
-  { type: GFX, offset: 0x6035F10, symbol: D_CO_6035F10 }
+aCoBuilding8DL:
+  { type: GFX, offset: 0x6035F10, symbol: aCoBuilding8DL }
 
-D_CO_60361F0:
-  { type: GFX, offset: 0x60361F0, symbol: D_CO_60361F0 }
+aCoBuilding6DL:
+  { type: GFX, offset: 0x60361F0, symbol: aCoBuilding6DL }
 
 D_CO_60363B0:
   { type: GFX, offset: 0x60363B0, symbol: D_CO_60363B0 }
@@ -435,11 +435,11 @@ D_CO_6036D58:
 D_CO_6037160:
   { type: SF64:ENVIRONMENT, offset: 0x6037160, symbol: D_CO_6037160 }
 
-D_CO_60371A4:
-  { type: SF64:OBJECT_INIT, offset: 0x60371A4, symbol: D_CO_60371A4 }
+aCoOnRailsLevelObjects:
+  { type: SF64:OBJECT_INIT, offset: 0x60371A4, symbol: aCoOnRailsLevelObjects }
 
-D_CO_603B074:
-  { type: SF64:OBJECT_INIT, offset: 0x603B074, symbol: D_CO_603B074 }
+aCoAllRangeLevelObjects:
+  { type: SF64:OBJECT_INIT, offset: 0x603B074, symbol: aCoAllRangeLevelObjects }
 
 D_CO_603D9E8:
   { type: SF64:SCRIPT, offset: 0x603D9E8, symbol: D_CO_603D9E8 }
@@ -448,50 +448,50 @@ D_CO_603D9E8:
 D_CO_603DC40:
   { type: SF64:HITBOX, offset: 0x603DC40, symbol: D_CO_603DC40 }
 
-D_CO_603DD40:
-  { type: SF64:HITBOX, offset: 0x603DD40, symbol: D_CO_603DD40 }
+aCoHighway2Hitbox:
+  { type: SF64:HITBOX, offset: 0x603DD40, symbol: aCoHighway2Hitbox }
 
-D_CO_603DDF0:
-  { type: SF64:HITBOX, offset: 0x603DDF0, symbol: D_CO_603DDF0 }
+aCoBuilding1Hitbox:
+  { type: SF64:HITBOX, offset: 0x603DDF0, symbol: aCoBuilding1Hitbox }
 
-D_CO_603DCA4:
-  { type: SF64:HITBOX, offset: 0x603DCA4, symbol: D_CO_603DCA4 }
+aCoHighway1Hitbox:
+  { type: SF64:HITBOX, offset: 0x603DCA4, symbol: aCoHighway1Hitbox }
 
-D_CO_603DE8C:
-  { type: SF64:HITBOX, offset: 0x603DE8C, symbol: D_CO_603DE8C }
+aCoBuilding2Hitbox:
+  { type: SF64:HITBOX, offset: 0x603DE8C, symbol: aCoBuilding2Hitbox }
 
-D_CO_603DEF4:
-  { type: SF64:HITBOX, offset: 0x603DEF4, symbol: D_CO_603DEF4 }
+aCoBuilding3Hitbox:
+  { type: SF64:HITBOX, offset: 0x603DEF4, symbol: aCoBuilding3Hitbox }
 
-D_CO_603DF8C:
-  { type: SF64:HITBOX, offset: 0x603DF8C, symbol: D_CO_603DF8C }
+aCoBuilding4Hitbox:
+  { type: SF64:HITBOX, offset: 0x603DF8C, symbol: aCoBuilding4Hitbox }
 
-D_CO_603DFDC:
-  { type: SF64:HITBOX, offset: 0x603DFDC, symbol: D_CO_603DFDC }
+aCoBuilding5Hitbox:
+  { type: SF64:HITBOX, offset: 0x603DFDC, symbol: aCoBuilding5Hitbox }
 
-D_CO_603E014:
-  { type: SF64:HITBOX, offset: 0x603E014, symbol: D_CO_603E014 }
+aCoBuilding6Hitbox:
+  { type: SF64:HITBOX, offset: 0x603E014, symbol: aCoBuilding6Hitbox }
 
-D_CO_603E030:
-  { type: SF64:HITBOX, offset: 0x603E030, symbol: D_CO_603E030 }
+aCoBuilding7Hitbox:
+  { type: SF64:HITBOX, offset: 0x603E030, symbol: aCoBuilding7Hitbox }
 
-D_CO_603E09C:
-  { type: SF64:HITBOX, offset: 0x603E09C, symbol: D_CO_603E09C }
+aCoBuilding8Hitbox:
+  { type: SF64:HITBOX, offset: 0x603E09C, symbol: aCoBuilding8Hitbox }
 
-D_CO_603E0EC:
-  { type: SF64:HITBOX, offset: 0x603E0EC, symbol: D_CO_603E0EC }
+aCoWaterfallHitbox:
+  { type: SF64:HITBOX, offset: 0x603E0EC, symbol: aCoWaterfallHitbox }
 
-D_CO_603E118:
-  { type: SF64:HITBOX, offset: 0x603E118, symbol: D_CO_603E118 }
+aCoTowerHitbox:
+  { type: SF64:HITBOX, offset: 0x603E118, symbol: aCoTowerHitbox }
 
-D_CO_603E14C:
-  { type: SF64:HITBOX, offset: 0x603E14C, symbol: D_CO_603E14C }
+aCoArch1Hitbox:
+  { type: SF64:HITBOX, offset: 0x603E14C, symbol: aCoArch1Hitbox }
 
-D_CO_603E1B4:
-  { type: SF64:HITBOX, offset: 0x603E1B4, symbol: D_CO_603E1B4 }
+aCoArch2Hitbox:
+  { type: SF64:HITBOX, offset: 0x603E1B4, symbol: aCoArch2Hitbox }
 
-D_CO_603E21C:
-  { type: SF64:HITBOX, offset: 0x603E21C, symbol: D_CO_603E21C }
+aCoArch3Hitbox:
+  { type: SF64:HITBOX, offset: 0x603E21C, symbol: aCoArch3Hitbox }
 
 # seems unused
 D_CO_603E2C0:
@@ -501,26 +501,26 @@ D_CO_603E2C0:
 D_CO_603E2F4:
   { type: SF64:HITBOX, offset: 0x603E2F4, symbol: D_CO_603E2F4 }
 
-D_CO_603E3E0:
-  { type: SF64:HITBOX, offset: 0x603E3E0, symbol: D_CO_603E3E0 }
+aCoStoneArchHitbox:
+  { type: SF64:HITBOX, offset: 0x603E3E0, symbol: aCoStoneArchHitbox }
 
-D_CO_603E468:
-  { type: SF64:HITBOX, offset: 0x603E468, symbol: D_CO_603E468 }
+aCoPoleHitbox:
+  { type: SF64:HITBOX, offset: 0x603E468, symbol: aCoPoleHitbox }
 
-D_CO_603E484:
-  { type: SF64:HITBOX, offset: 0x603E484, symbol: D_CO_603E484 }
+aCoTreeHitbox:
+  { type: SF64:HITBOX, offset: 0x603E484, symbol: aCoTreeHitbox }
 
-D_CO_603E4A0:
-  { type: SF64:HITBOX, offset: 0x603E4A0, symbol: D_CO_603E4A0 }
+aCoRadarHitbox:
+  { type: SF64:HITBOX, offset: 0x603E4A0, symbol: aCoRadarHitbox }
 
-D_CO_603E4A4:
-  { type: SF64:HITBOX, offset: 0x603E4A4, symbol: D_CO_603E4A4 }
+aCoBuilding9Hitbox:
+  { type: SF64:HITBOX, offset: 0x603E4A4, symbol: aCoBuilding9Hitbox }
 
-D_CO_603E4DC:
-  { type: SF64:HITBOX, offset: 0x603E4DC, symbol: D_CO_603E4DC }
+aCoBuilding10Hitbox:
+  { type: SF64:HITBOX, offset: 0x603E4DC, symbol: aCoBuilding10Hitbox }
 
-D_CO_603E514:
-  { type: SF64:HITBOX, offset: 0x603E514, symbol: D_CO_603E514 }
+aCoIBeamHitbox:
+  { type: SF64:HITBOX, offset: 0x603E514, symbol: aCoIBeamHitbox }
 
 D_CO_603E54C:
   { type: SF64:HITBOX, offset: 0x603E54C, symbol: D_CO_603E54C }
@@ -531,11 +531,11 @@ D_CO_603E598:
 D_CO_603E5B4:
   { type: SF64:HITBOX, offset: 0x603E5B4, symbol: D_CO_603E5B4 }
 
-D_CO_603E5D0:
-  { type: SF64:HITBOX, offset: 0x603E5D0, symbol: D_CO_603E5D0 }
+CoGarudaHitbox:
+  { type: SF64:HITBOX, offset: 0x603E5D0, symbol: CoGarudaHitbox }
 
-D_CO_603E604:
-  { type: SF64:HITBOX, offset: 0x603E604, symbol: D_CO_603E604 }
+aCoGarudaDestroyHitbox:
+  { type: SF64:HITBOX, offset: 0x603E604, symbol: aCoGarudaDestroyHitbox }
 
 D_CO_603E620:
   { type: SF64:HITBOX, offset: 0x603E620, symbol: D_CO_603E620 }
@@ -552,32 +552,32 @@ D_CO_603E7C4:
 D_CO_603E840:
   { type: SF64:HITBOX, offset: 0x603E840, symbol: D_CO_603E840 }
 
-D_CO_603E88C:
-  { type: SF64:HITBOX, offset: 0x603E88C, symbol: D_CO_603E88C }
+aCoRockwallHitbox:
+  { type: SF64:HITBOX, offset: 0x603E88C, symbol: aCoRockwallHitbox }
 
-D_CO_603E8A8:
-  { type: SF64:HITBOX, offset: 0x603E8A8, symbol: D_CO_603E8A8 }
+aCoDoorsHitbox:
+  { type: SF64:HITBOX, offset: 0x603E8A8, symbol: aCoDoorsHitbox }
 
 D_CO_603E924:
   { type: SF64:HITBOX, offset: 0x603E924, symbol: D_CO_603E924 }
 
-D_CO_603E98C:
-  { type: SF64:HITBOX, offset: 0x603E98C, symbol: D_CO_603E98C }
+aCoBuildingOnFireHitbox:
+  { type: SF64:HITBOX, offset: 0x603E98C, symbol: aCoBuildingOnFireHitbox }
 
-D_CO_603E9EC:
-  { type: SF64:HITBOX, offset: 0x603E9EC, symbol: D_CO_603E9EC }
+aCoHighway5Hitbox:
+  { type: SF64:HITBOX, offset: 0x603E9EC, symbol: aCoHighway5Hitbox }
 
-D_CO_603EA08:
-  { type: SF64:HITBOX, offset: 0x603EA08, symbol: D_CO_603EA08 }
+aCoHighway6Hitbox:
+  { type: SF64:HITBOX, offset: 0x603EA08, symbol: aCoHighway6Hitbox }
 
-D_CO_603EA74:
-  { type: SF64:HITBOX, offset: 0x603EA74, symbol: D_CO_603EA74 }
+aCoHighway7Hitbox:
+  { type: SF64:HITBOX, offset: 0x603EA74, symbol: aCoHighway7Hitbox }
 
-D_CO_603EAE0:
-  { type: SF64:HITBOX, offset: 0x603EAE0, symbol: D_CO_603EAE0 }
+aCoHighway8Hitbox:
+  { type: SF64:HITBOX, offset: 0x603EAE0, symbol: aCoHighway8Hitbox }
 
-D_CO_603EB0C:
-  { type: SF64:HITBOX, offset: 0x603EB0C, symbol: D_CO_603EB0C }
+aCoHighway9Hitbox:
+  { type: SF64:HITBOX, offset: 0x603EB0C, symbol: aCoHighway9Hitbox }
 
 D_CO_603EB38:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0603EB38, symbol: D_CO_603EB38 }
diff --git a/assets/yaml/jp/rev0/ast_fortuna.yaml b/assets/yaml/jp/rev0/ast_fortuna.yaml
index a6d15d0f..7815eeeb 100644
--- a/assets/yaml/jp/rev0/ast_fortuna.yaml
+++ b/assets/yaml/jp/rev0/ast_fortuna.yaml
@@ -116,8 +116,8 @@ D_FO_6009F90:
 D_FO_600A018:
   { type: TEXTURE, format: IA8, width: 32, height: 32, offset: 0x600A018, ctype: u8, symbol: D_FO_600A018 }
 
-D_FO_600A420:
-  { type: GFX, offset: 0x600A420, symbol: D_FO_600A420 }
+aFoPoleDL:
+  { type: GFX, offset: 0x600A420, symbol: aFoPoleDL }
 
 D_FO_600A4A8:
   { type: TEXTURE, format: RGBA16, width: 32, height: 64, offset: 0x600A4A8, ctype: u16, symbol: D_FO_600A4A8 }
@@ -158,14 +158,14 @@ D_FO_600F3F4:
 D_FO_600F60C:
   { type: SF64:COLPOLY, offset: 0x600F60C, count: 93, symbol: D_FO_600F60C, mesh_symbol: D_FO_OFFSET }
 
-D_FO_600FE9C:
-  { type: SF64:HITBOX, offset: 0x600FE9C, symbol: D_FO_600FE9C }
+aFoPoleHitbox:
+  { type: SF64:HITBOX, offset: 0x600FE9C, symbol: aFoPoleHitbox }
 
 D_FO_600FEB8:
   { type: SF64:HITBOX, offset: 0x600FEB8, symbol: D_FO_600FEB8 }
 
-D_FO_600FF30:
-  { type: SF64:HITBOX, offset: 0x600FF30, symbol: D_FO_600FF30 }
+aFoRadarHitbox:
+  { type: SF64:HITBOX, offset: 0x600FF30, symbol: aFoRadarHitbox }
 
 D_FO_600FF64:
   { type: SF64:HITBOX, offset: 0x600FF64, symbol: D_FO_600FF64 }
diff --git a/assets/yaml/jp/rev0/ast_sector_z.yaml b/assets/yaml/jp/rev0/ast_sector_z.yaml
index 4fb35bc7..96233307 100644
--- a/assets/yaml/jp/rev0/ast_sector_z.yaml
+++ b/assets/yaml/jp/rev0/ast_sector_z.yaml
@@ -30,11 +30,11 @@ D_SZ_6000840:
 D_SZ_60012D0:
   { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 9, offset: 0x60012D0, symbol: D_SZ_60012D0 }
 
-D_SZ_6001360:
-  { type: GFX, offset: 0x6001360, symbol: D_SZ_6001360 }
+aSzSpaceJunk1DL:
+  { type: GFX, offset: 0x6001360, symbol: aSzSpaceJunk1DL }
 
-D_SZ_6001A10:
-  { type: GFX, offset: 0x6001A10, symbol: D_SZ_6001A10 }
+aSzSpaceJunk2DL:
+  { type: GFX, offset: 0x6001A10, symbol: aSzSpaceJunk2DL }
 
 D_SZ_6001C80:
   { type: TEXTURE, ctype: u8, format: CI8, width: 16, height: 16, offset: 0x06001C80, symbol: D_SZ_6001C80, tlut: 0x06001D80 }
@@ -42,8 +42,8 @@ D_SZ_6001C80:
 D_SZ_6001D80:
   { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x06001D80, symbol: D_SZ_6001D80 }
 
-D_SZ_6001DA0:
-  { type: GFX, offset: 0x6001DA0, symbol: D_SZ_6001DA0 }
+aSzSpaceJunk3DL:
+  { type: GFX, offset: 0x6001DA0, symbol: aSzSpaceJunk3DL }
 
 D_SZ_60025F0:
   { type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x60025F0, symbol: D_SZ_60025F0, tlut: 0x060029F0 }
@@ -69,12 +69,12 @@ D_SZ_6002DE0:
 D_SZ_6002EE0:
   { type: TEXTURE, ctype: u16, format: TLUT, colors: 80, offset: 0x06002EE0, symbol: D_SZ_6002EE0 }
 
-D_SZ_6002F80:
-  { type: GFX, offset: 0x6002F80, symbol: D_SZ_6002F80 }
+aSzBackgroundDL:
+  { type: GFX, offset: 0x6002F80, symbol: aSzBackgroundDL }
 
 # Sector Z Background
-D_SZ_6003010:
-  { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x06003010, symbol: D_SZ_6003010 }
+aSzBackgroundTex:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x06003010, symbol: aSzBackgroundTex }
 
 D_SZ_6004010:
   { type: GFX, offset: 0x6004010, symbol: D_SZ_6004010 }
@@ -97,8 +97,8 @@ D_SZ_6004558:
 D_SZ_6004570:
   { type: GFX, offset: 0x6004570, symbol: D_SZ_6004570 }
 
-D_SZ_60045E0:
-  { type: GFX, offset: 0x60045E0, symbol: D_SZ_60045E0 }
+aSZSpaceJunk4DL:
+  { type: GFX, offset: 0x60045E0, symbol: aSZSpaceJunk4DL }
 
 D_SZ_60047E0:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x60047E0, symbol: D_SZ_60047E0 }
@@ -145,8 +145,8 @@ D_SZ_6006CD8:
 D_SZ_6006D64:
   { type: SF64:ANIM, offset: 0x6006D64, symbol: D_SZ_6006D64 }
 
-D_SZ_6006E50:
-  { type: SF64:SKELETON, offset: 0x6006E50, symbol: D_SZ_6006E50 }
+aSzMissileSkel:
+  { type: SF64:SKELETON, offset: 0x6006E50, symbol: aSzMissileSkel }
 
 D_SZ_6006E70:
   { type: SF64:ENVIRONMENT, offset: 0x6006E70, symbol: D_SZ_6006E70 }
diff --git a/assets/yaml/jp/rev0/ast_titania.yaml b/assets/yaml/jp/rev0/ast_titania.yaml
index 1e1210f4..d782b058 100644
--- a/assets/yaml/jp/rev0/ast_titania.yaml
+++ b/assets/yaml/jp/rev0/ast_titania.yaml
@@ -28,8 +28,8 @@ D_TI_6001B10:
 D_TI_6001BA8:
   {type: TEXTURE, format: RGBA16, ctype: u16, width: 32, height: 32, offset: 0x6001BA8, symbol: D_TI_6001BA8}
 
-D_TI_60023B0:
-  {type: GFX, offset: 0x60023B0, symbol: D_TI_60023B0}
+aTiCactusDL:
+  {type: GFX, offset: 0x60023B0, symbol: aTiCactusDL}
 
 D_TI_6002438:
   {type: TEXTURE, format: RGBA16, ctype: u16, width: 32, height: 64, offset: 0x6002438, symbol: D_TI_6002438}
@@ -82,35 +82,35 @@ D_TI_60064AC:
 D_TI_60064C8:
   {type: SF64:HITBOX, offset: 0x60064C8, symbol: D_TI_60064C8}
 
-D_TI_60064FC:
-  {type: SF64:HITBOX, offset: 0x60064FC, symbol: D_TI_60064FC}
+aTiSkullHitbox:
+  {type: SF64:HITBOX, offset: 0x60064FC, symbol: aTiSkullHitbox}
 
-D_TI_6006518:
-  {type: SF64:HITBOX, offset: 0x6006518, symbol: D_TI_6006518}
+aTiRib0Hitbox:
+  {type: SF64:HITBOX, offset: 0x6006518, symbol: aTiRib0Hitbox}
 
-D_TI_6006564:
-  {type: SF64:HITBOX, offset: 0x6006564, symbol: D_TI_6006564}
+aTiRib1Hitbox:
+  {type: SF64:HITBOX, offset: 0x6006564, symbol: aTiRib1Hitbox}
 
-D_TI_60065B0:
-  {type: SF64:HITBOX, offset: 0x60065B0, symbol: D_TI_60065B0}
+aTiRib2Hitbox:
+  {type: SF64:HITBOX, offset: 0x60065B0, symbol: aTiRib2Hitbox}
 
-D_TI_60065FC:
-  {type: SF64:HITBOX, offset: 0x60065FC, symbol: D_TI_60065FC}
+aTiRib3Hitbox:
+  {type: SF64:HITBOX, offset: 0x60065FC, symbol: aTiRib3Hitbox}
 
-D_TI_6006648:
-  {type: SF64:HITBOX, offset: 0x6006648, symbol: D_TI_6006648}
+aTiRib4Hitbox:
+  {type: SF64:HITBOX, offset: 0x6006648, symbol: aTiRib4Hitbox}
 
-D_TI_6006694:
-  {type: SF64:HITBOX, offset: 0x6006694, symbol: D_TI_6006694}
+aTiRib5Hitbox:
+  {type: SF64:HITBOX, offset: 0x6006694, symbol: aTiRib5Hitbox}
 
-D_TI_60066E0:
-  {type: SF64:HITBOX, offset: 0x60066E0, symbol: D_TI_60066E0}
+aTiRib6Hitbox:
+  {type: SF64:HITBOX, offset: 0x60066E0, symbol: aTiRib6Hitbox}
 
-D_TI_600672C:
-  {type: SF64:HITBOX, offset: 0x600672C, symbol: D_TI_600672C}
+aTiRib7Hitbox:
+  {type: SF64:HITBOX, offset: 0x600672C, symbol: aTiRib7Hitbox}
 
-D_TI_6006778:
-  {type: SF64:HITBOX, offset: 0x6006778, symbol: D_TI_6006778}
+aTiRib8Hitbox:
+  {type: SF64:HITBOX, offset: 0x6006778, symbol: aTiRib8Hitbox}
 
 D_TI_60067C4:
   {type: SF64:HITBOX, offset: 0x60067C4, symbol: D_TI_60067C4}
@@ -133,8 +133,8 @@ D_TI_6006874:
 D_TI_6006890:
   {type: SF64:HITBOX, offset: 0x6006890, symbol: D_TI_6006890}
 
-D_TI_60068BC:
-  {type: SF64:HITBOX, offset: 0x60068BC, symbol: D_TI_60068BC}
+aTiCactusHitbox:
+  {type: SF64:HITBOX, offset: 0x60068BC, symbol: aTiCactusHitbox}
 
 D_TI_60068F0:
   {type: SF64:HITBOX, offset: 0x60068F0, symbol: D_TI_60068F0}
diff --git a/assets/yaml/jp/rev0/ast_zoness.yaml b/assets/yaml/jp/rev0/ast_zoness.yaml
index 3961d8fb..8f634226 100644
--- a/assets/yaml/jp/rev0/ast_zoness.yaml
+++ b/assets/yaml/jp/rev0/ast_zoness.yaml
@@ -471,8 +471,8 @@ 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}
+aZoRock1DL:
+  { type: GFX, offset: 0x6024AC0, symbol: aZoRock1DL}
 
 D_ZO_6024D60:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6024D60, symbol: D_ZO_6024D60}
@@ -502,8 +502,8 @@ D_ZO_602AC50:
 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}
+aZoRock1Hitbox:
+  { type: SF64:HITBOX, offset: 0x602B9EC, symbol: aZoRock1Hitbox}
 
 D_ZO_602BA20:
   { type: SF64:HITBOX, offset: 0x602BA20, symbol: D_ZO_602BA20}
diff --git a/assets/yaml/us/rev1/ast_arwing.yaml b/assets/yaml/us/rev1/ast_arwing.yaml
index 43443489..dcd135ab 100644
--- a/assets/yaml/us/rev1/ast_arwing.yaml
+++ b/assets/yaml/us/rev1/ast_arwing.yaml
@@ -56,8 +56,8 @@ D_arwing_3007550:
 D_arwing_30075D0:
   { type: TEXTURE, format: RGBA16, offset: 0x30075D0, width: 8, height: 8, ctype: u16, symbol: D_arwing_30075D0 }
 
-D_arwing_3007650:
-  { type: GFX, offset: 0x3007650, symbol: D_arwing_3007650 }
+aArwingItemLasersDL:
+  { type: GFX, offset: 0x3007650, symbol: aArwingItemLasersDL }
 
 ast_arwing_seg3_vtx_7A20:
   { type: VTX, offset: 0x3007A20, count: 244, symbol: ast_arwing_seg3_vtx_7A20 }
diff --git a/assets/yaml/us/rev1/ast_corneria.yaml b/assets/yaml/us/rev1/ast_corneria.yaml
index cec3e86c..15f83392 100644
--- a/assets/yaml/us/rev1/ast_corneria.yaml
+++ b/assets/yaml/us/rev1/ast_corneria.yaml
@@ -18,8 +18,8 @@
 D_CO_6000000:
   { type: TEXTURE, ctype: u8, format: IA8, width: 128, height: 28, offset: 0x6000000, symbol: D_CO_6000000 }
   
-D_CO_6000E00:
-  { type: GFX, offset: 0x6000E00, symbol: D_CO_6000E00 }
+aCoWaterfallDL:
+  { type: GFX, offset: 0x6000E00, symbol: aCoWaterfallDL }
 
 D_CO_60018F8:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x060018F8, symbol: D_CO_60018F8 }
@@ -48,8 +48,8 @@ D_CO_60059F0:
 D_CO_6005A80:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x06005A80, symbol: D_CO_6005A80 }
   
-D_CO_6006A80:
-  { type: GFX, offset: 0x6006A80, symbol: D_CO_6006A80 }
+aCoArch3DL:
+  { type: GFX, offset: 0x6006A80, symbol: aCoArch3DL }
 
 D_CO_6006E08:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06006E08, symbol: D_CO_6006E08 }
@@ -102,11 +102,11 @@ D_CO_6010250:
 D_CO_6010F90:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06010F90, symbol: D_CO_6010F90 }
 
-D_CO_6010A50:
-  { type: GFX, offset: 0x6010A50, symbol: D_CO_6010A50 }
+aCoHighway7DL:
+  { type: GFX, offset: 0x6010A50, symbol: aCoHighway7DL }
 
-D_CO_6010E00:
-  { type: GFX, offset: 0x6010E00, symbol: D_CO_6010E00 }
+aCoHighway5DL:
+  { type: GFX, offset: 0x6010E00, symbol: aCoHighway5DL }
 
 D_CO_6011790:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06011790, symbol: D_CO_6011790 }
@@ -123,53 +123,53 @@ D_CO_6012840:
 D_CO_6012D00:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06012D00, symbol: D_CO_6012D00 }
 
-D_CO_60132B0: 
-  { type: GFX, offset: 0x60132B0, symbol: D_CO_60132B0 }
+aCoHighway1DL: 
+  { type: GFX, offset: 0x60132B0, symbol: aCoHighway1DL }
 
-D_CO_60137B0:
-  { type: GFX, offset: 0x60137B0, symbol: D_CO_60137B0 }
+aCoArch2DL:
+  { type: GFX, offset: 0x60137B0, symbol: aCoArch2DL }
 
-D_CO_6013B50: 
-  { type: GFX, offset: 0x6013B50, symbol: D_CO_6013B50 }
+aCoRockwallDL: 
+  { type: GFX, offset: 0x6013B50, symbol: aCoRockwallDL }
 
 D_CO_6013BE0:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06013BE0, symbol: D_CO_6013BE0 }
 
-D_CO_60143E0: 
-  { type: GFX, offset: 0x60143E0, symbol: D_CO_60143E0 }
+aCoHighway8DL: 
+  { type: GFX, offset: 0x60143E0, symbol: aCoHighway8DL }
 
-D_CO_6014500: 
-  { type: GFX, offset: 0x6014500, symbol: D_CO_6014500 }
+aCoHighway4DL: 
+  { type: GFX, offset: 0x6014500, symbol: aCoHighway4DL }
 
-D_CO_6014670: 
-  { type: GFX, offset: 0x6014670, symbol: D_CO_6014670 }
+aCoHighway6DL: 
+  { type: GFX, offset: 0x6014670, symbol: aCoHighway6DL }
 
-D_CO_6014A20: 
-  { type: GFX, offset: 0x6014A20, symbol: D_CO_6014A20 }
+aCoHighway9DL: 
+  { type: GFX, offset: 0x6014A20, symbol: aCoHighway9DL }
 
-D_CO_6014B50: 
-  { type: GFX, offset: 0x6014B50, symbol: D_CO_6014B50 }
+aCoBuilding3DL: 
+  { type: GFX, offset: 0x6014B50, symbol: aCoBuilding3DL }
   
 D_CO_60151A8: 
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x060151A8, symbol: D_CO_60151A8 }
 
-D_CO_60153B0: 
-  { type: GFX, offset: 0x60153B0, symbol: D_CO_60153B0 }
+aCoTowerDL: 
+  { type: GFX, offset: 0x60153B0, symbol: aCoTowerDL }
 
-D_CO_6015F00: 
-  { type: GFX, offset: 0x6015F00, symbol: D_CO_6015F00 }
+aCoStoneArchDL: 
+  { type: GFX, offset: 0x6015F00, symbol: aCoStoneArchDL }
 
 D_CO_6015700:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06015700, symbol: D_CO_6015700 }
 
-D_CO_6016270: 
-  { type: GFX, offset: 0x6016270, symbol: D_CO_6016270 }
+aRadarDL: 
+  { type: GFX, offset: 0x6016270, symbol: aRadarDL }
 
-D_CO_60164F0: 
-  { type: GFX, offset: 0x60164F0, symbol: D_CO_60164F0 }
+aCoHighway3DL: 
+  { type: GFX, offset: 0x60164F0, symbol: aCoHighway3DL }
 
-D_CO_6016580: 
-  { type: GFX, offset: 0x6016580, symbol: D_CO_6016580 }
+aCoBuilding4DL: 
+  { type: GFX, offset: 0x6016580, symbol: aCoBuilding4DL }
 
 D_CO_6017F10: 
   { type: GFX, offset: 0x6017F10, symbol: D_CO_6017F10 }
@@ -177,8 +177,8 @@ D_CO_6017F10:
 D_CO_60186E0: 
   { type: GFX, offset: 0x60186E0, symbol: D_CO_60186E0 }
 
-D_CO_6018E80: 
-  { type: GFX, offset: 0x6018E80, symbol: D_CO_6018E80 }
+aCoBuilding7DL: 
+  { type: GFX, offset: 0x6018E80, symbol: aCoBuilding7DL }
   
 D_CO_60191C8:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x060191C8, symbol: D_CO_60191C8 }
@@ -195,14 +195,14 @@ D_CO_6019E60:
 D_CO_601FF58: 
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0601FF58, symbol: D_CO_601FF58 }
     
-D_CO_601A7D0: 
-  { type: GFX, offset: 0x601A7D0, symbol: D_CO_601A7D0 }
+aCoBuilding2DL: 
+  { type: GFX, offset: 0x601A7D0, symbol: aCoBuilding2DL }
 
 D_CO_601AD60: 
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0601AD60, symbol: D_CO_601AD60 }
   
-D_CO_601B560: 
-  { type: GFX, offset: 0x601B560, symbol: D_CO_601B560 }
+aCoBuilding5DL: 
+  { type: GFX, offset: 0x601B560, symbol: aCoBuilding5DL }
   
 D_CO_601B640: 
   { type: GFX, offset: 0x601B640, symbol: D_CO_601B640 }
@@ -210,14 +210,14 @@ D_CO_601B640:
 D_CO_601B6C0: 
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0601B6C0, symbol: D_CO_601B6C0 }
     
-D_CO_601BEC0: 
-  { type: GFX, offset: 0x601BEC0, symbol: D_CO_601BEC0 }
+aCoBump2DL: 
+  { type: GFX, offset: 0x601BEC0, symbol: aCoBump2DL }
 
 D_CO_601C1A8: 
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0601C1A8, symbol: D_CO_601C1A8 }
     
-D_CO_601C9B0: 
-  { type: GFX, offset: 0x601C9B0, symbol: D_CO_601C9B0 }
+aCoTreeDL: 
+  { type: GFX, offset: 0x601C9B0, symbol: aCoTreeDL }
 
 D_CO_601CAA0:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 64, offset: 0x0601CAA0, symbol: D_CO_601CAA0 }
@@ -234,8 +234,8 @@ D_CO_601ED00:
 D_CO_601F500: 
   { type: GFX, offset: 0x601F500, symbol: D_CO_601F500 }
     
-D_CO_601F5A0: 
-  { type: GFX, offset: 0x601F5A0, symbol: D_CO_601F5A0 }
+aCoArch1DL: 
+  { type: GFX, offset: 0x601F5A0, symbol: aCoArch1DL }
     
 D_CO_6020760: 
   { type: GFX, offset: 0x6020760, symbol: D_CO_6020760 }
@@ -258,8 +258,8 @@ D_CO_6023DE8:
 D_CO_6024160: 
   { type: GFX, offset: 0x6024160, symbol: D_CO_6024160 }
     
-D_CO_60244A0: 
-  { type: GFX, offset: 0x60244A0, symbol: D_CO_60244A0 }
+aCoBump4DL: 
+  { type: GFX, offset: 0x60244A0, symbol: aCoBump4DL }
 
 D_CO_60245E0:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x060245E0, symbol: D_CO_60245E0 }
@@ -285,14 +285,14 @@ D_CO_6029528:
 D_CO_6029674:
   { type: SF64:SKELETON, offset: 0x6029674, symbol: D_CO_6029674 }
 
-D_CO_602991C:
-  { type: SF64:ANIM, offset: 0x602991C, symbol: D_CO_602991C }
+aCoGaruda1Anim:
+  { type: SF64:ANIM, offset: 0x602991C, symbol: aCoGaruda1Anim }
   
-D_CO_6029A48:
-  { type: SF64:SKELETON, offset: 0x6029A48, symbol: D_CO_6029A48 }
+aCoGarudaSkel:
+  { type: SF64:SKELETON, offset: 0x6029A48, symbol: aCoGarudaSkel }
 
-D_CO_602A520:
-  { type: SF64:ANIM, offset: 0x602A520, symbol: D_CO_602A520 }
+aCoGaruda3Anim:
+  { type: SF64:ANIM, offset: 0x602A520, symbol: aCoGaruda3Anim }
 
 D_CO_602AA04:
   { type: SF64:ANIM, offset: 0x602AA04, symbol: D_CO_602AA04 }
@@ -300,8 +300,8 @@ D_CO_602AA04:
 D_CO_602AA7C: 
   { type: SF64:ANIM, offset: 0x602AA7C, symbol: D_CO_602AA7C }
   
-D_CO_602AB48: 
-  { type: SF64:SKELETON, offset: 0x602AB48, symbol: D_CO_602AB48 }
+aCoDoorsSkel: 
+  { type: SF64:SKELETON, offset: 0x602AB48, symbol: aCoDoorsSkel }
 
 D_CO_602BC18:
   { type: SF64:ANIM, offset: 0x602BC18, symbol: D_CO_602BC18 }
@@ -318,11 +318,11 @@ D_CO_602D31C:
 D_CO_602D400:
   { type: SF64:ANIM, offset: 0x602D400, symbol: D_CO_602D400 }
   
-D_CO_602D5AC:
-  { type: SF64:SKELETON, offset: 0x602D5AC, symbol: D_CO_602D5AC }
+aCoCarrierSkel:
+  { type: SF64:SKELETON, offset: 0x602D5AC, symbol: aCoCarrierSkel }
   
-D_CO_602D5F0:
-  { type: GFX, offset: 0x602D5F0, symbol: D_CO_602D5F0 }
+aCoBuilding1DL:
+  { type: GFX, offset: 0x602D5F0, symbol: aCoBuilding1DL }
   
 D_CO_602DA20:
   { type: GFX, offset: 0x602DA20, symbol: D_CO_602DA20 }
@@ -333,17 +333,17 @@ D_CO_602DCA0:
 D_CO_602DD40:
   { type: GFX, offset: 0x602DD40, symbol: D_CO_602DD40 }
   
-D_CO_602E080:
-  { type: GFX, offset: 0x602E080, symbol: D_CO_602E080 }
+aCoHighway2DL:
+  { type: GFX, offset: 0x602E080, symbol: aCoHighway2DL }
   
-D_CO_602E570:
-  { type: GFX, offset: 0x602E570, symbol: D_CO_602E570 }
+aCoBump5DL:
+  { type: GFX, offset: 0x602E570, symbol: aCoBump5DL }
   
-D_CO_602E7A0:
-  { type: GFX, offset: 0x602E7A0, symbol: D_CO_602E7A0 }
+aCoBump3DL:
+  { type: GFX, offset: 0x602E7A0, symbol: aCoBump3DL }
   
-D_CO_602E9E0:
-  { type: GFX, offset: 0x602E9E0, symbol: D_CO_602E9E0 }
+aCoBump1DL:
+  { type: GFX, offset: 0x602E9E0, symbol: aCoBump1DL }
   
 D_CO_602ECB0:
   { type: GFX, offset: 0x602ECB0, symbol: D_CO_602ECB0 }
@@ -351,8 +351,8 @@ D_CO_602ECB0:
 D_CO_602ED50: 
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 16, offset: 0x0602ED50, symbol: D_CO_602ED50 }
 
-D_CO_602F7C0:
-  { type: GFX, offset: 0x602F7C0, symbol: D_CO_602F7C0 }
+aCoPoleDL:
+  { type: GFX, offset: 0x602F7C0, symbol: aCoPoleDL }
 
 D_CO_602F848:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 64, offset: 0x0602F848, symbol: D_CO_602F848 }
@@ -408,11 +408,11 @@ D_CO_60355A0:
 D_CO_6035DA0: 
   { type: GFX, offset: 0x6035DA0, symbol: D_CO_6035DA0 }
   
-D_CO_6035F10: 
-  { type: GFX, offset: 0x6035F10, symbol: D_CO_6035F10 }
+aCoBuilding8DL: 
+  { type: GFX, offset: 0x6035F10, symbol: aCoBuilding8DL }
   
-D_CO_60361F0: 
-  { type: GFX, offset: 0x60361F0, symbol: D_CO_60361F0 }
+aCoBuilding6DL: 
+  { type: GFX, offset: 0x60361F0, symbol: aCoBuilding6DL }
 
 D_CO_60363B0: 
   { type: GFX, offset: 0x60363B0, symbol: D_CO_60363B0 }
@@ -435,11 +435,11 @@ D_CO_6036D58:
 D_CO_6037160:
   { type: SF64:ENVIRONMENT, offset: 0x6037160, symbol: D_CO_6037160 }
 
-D_CO_60371A4: 
-  { type: SF64:OBJECT_INIT, offset: 0x60371A4, symbol: D_CO_60371A4 }
+aCoOnRailsLevelObjects: 
+  { type: SF64:OBJECT_INIT, offset: 0x60371A4, symbol: aCoOnRailsLevelObjects }
 
-D_CO_603B074: 
-  { type: SF64:OBJECT_INIT, offset: 0x603B074, symbol: D_CO_603B074 }
+aCoAllRangeLevelObjects: 
+  { type: SF64:OBJECT_INIT, offset: 0x603B074, symbol: aCoAllRangeLevelObjects }
 
 D_CO_603D9E8:
   { type: SF64:SCRIPT, offset: 0x603D9E8, symbol: D_CO_603D9E8 }
@@ -448,50 +448,50 @@ D_CO_603D9E8:
 D_CO_603DC40:
   { type: SF64:HITBOX, offset: 0x603DC40, symbol: D_CO_603DC40 }
 
-D_CO_603DD40:
-  { type: SF64:HITBOX, offset: 0x603DD40, symbol: D_CO_603DD40 }
+aCoHighway2Hitbox:
+  { type: SF64:HITBOX, offset: 0x603DD40, symbol: aCoHighway2Hitbox }
 
-D_CO_603DDF0:
-  { type: SF64:HITBOX, offset: 0x603DDF0, symbol: D_CO_603DDF0 }
+aCoBuilding1Hitbox:
+  { type: SF64:HITBOX, offset: 0x603DDF0, symbol: aCoBuilding1Hitbox }
 
-D_CO_603DCA4:
-  { type: SF64:HITBOX, offset: 0x603DCA4, symbol: D_CO_603DCA4 }
+aCoHighway1Hitbox:
+  { type: SF64:HITBOX, offset: 0x603DCA4, symbol: aCoHighway1Hitbox }
 
-D_CO_603DE8C:
-  { type: SF64:HITBOX, offset: 0x603DE8C, symbol: D_CO_603DE8C }
+aCoBuilding2Hitbox:
+  { type: SF64:HITBOX, offset: 0x603DE8C, symbol: aCoBuilding2Hitbox }
 
-D_CO_603DEF4:
-  { type: SF64:HITBOX, offset: 0x603DEF4, symbol: D_CO_603DEF4 }
+aCoBuilding3Hitbox:
+  { type: SF64:HITBOX, offset: 0x603DEF4, symbol: aCoBuilding3Hitbox }
 
-D_CO_603DF8C:
-  { type: SF64:HITBOX, offset: 0x603DF8C, symbol: D_CO_603DF8C }
+aCoBuilding4Hitbox:
+  { type: SF64:HITBOX, offset: 0x603DF8C, symbol: aCoBuilding4Hitbox }
 
-D_CO_603DFDC:
-  { type: SF64:HITBOX, offset: 0x603DFDC, symbol: D_CO_603DFDC }
+aCoBuilding5Hitbox:
+  { type: SF64:HITBOX, offset: 0x603DFDC, symbol: aCoBuilding5Hitbox }
 
-D_CO_603E014:
-  { type: SF64:HITBOX, offset: 0x603E014, symbol: D_CO_603E014 }
+aCoBuilding6Hitbox:
+  { type: SF64:HITBOX, offset: 0x603E014, symbol: aCoBuilding6Hitbox }
 
-D_CO_603E030:
-  { type: SF64:HITBOX, offset: 0x603E030, symbol: D_CO_603E030 }
+aCoBuilding7Hitbox:
+  { type: SF64:HITBOX, offset: 0x603E030, symbol: aCoBuilding7Hitbox }
 
-D_CO_603E09C:
-  { type: SF64:HITBOX, offset: 0x603E09C, symbol: D_CO_603E09C }
+aCoBuilding8Hitbox:
+  { type: SF64:HITBOX, offset: 0x603E09C, symbol: aCoBuilding8Hitbox }
 
-D_CO_603E0EC:
-  { type: SF64:HITBOX, offset: 0x603E0EC, symbol: D_CO_603E0EC }
+aCoWaterfallHitbox:
+  { type: SF64:HITBOX, offset: 0x603E0EC, symbol: aCoWaterfallHitbox }
 
-D_CO_603E118:
-  { type: SF64:HITBOX, offset: 0x603E118, symbol: D_CO_603E118 }
+aCoTowerHitbox:
+  { type: SF64:HITBOX, offset: 0x603E118, symbol: aCoTowerHitbox }
 
-D_CO_603E14C:
-  { type: SF64:HITBOX, offset: 0x603E14C, symbol: D_CO_603E14C }
+aCoArch1Hitbox:
+  { type: SF64:HITBOX, offset: 0x603E14C, symbol: aCoArch1Hitbox }
 
-D_CO_603E1B4:
-  { type: SF64:HITBOX, offset: 0x603E1B4, symbol: D_CO_603E1B4 }
+aCoArch2Hitbox:
+  { type: SF64:HITBOX, offset: 0x603E1B4, symbol: aCoArch2Hitbox }
 
-D_CO_603E21C:
-  { type: SF64:HITBOX, offset: 0x603E21C, symbol: D_CO_603E21C }
+aCoArch3Hitbox:
+  { type: SF64:HITBOX, offset: 0x603E21C, symbol: aCoArch3Hitbox }
 
 # seems unused
 D_CO_603E2C0:
@@ -501,26 +501,26 @@ D_CO_603E2C0:
 D_CO_603E2F4:
   { type: SF64:HITBOX, offset: 0x603E2F4, symbol: D_CO_603E2F4 }
 
-D_CO_603E3E0:
-  { type: SF64:HITBOX, offset: 0x603E3E0, symbol: D_CO_603E3E0 }
+aCoStoneArchHitbox:
+  { type: SF64:HITBOX, offset: 0x603E3E0, symbol: aCoStoneArchHitbox }
 
-D_CO_603E468:
-  { type: SF64:HITBOX, offset: 0x603E468, symbol: D_CO_603E468 }
+aCoPoleHitbox:
+  { type: SF64:HITBOX, offset: 0x603E468, symbol: aCoPoleHitbox }
 
-D_CO_603E484:
-  { type: SF64:HITBOX, offset: 0x603E484, symbol: D_CO_603E484 }
+aCoTreeHitbox:
+  { type: SF64:HITBOX, offset: 0x603E484, symbol: aCoTreeHitbox }
 
-D_CO_603E4A0:
-  { type: SF64:HITBOX, offset: 0x603E4A0, symbol: D_CO_603E4A0 }
+aCoRadarHitbox:
+  { type: SF64:HITBOX, offset: 0x603E4A0, symbol: aCoRadarHitbox }
 
-D_CO_603E4A4:
-  { type: SF64:HITBOX, offset: 0x603E4A4, symbol: D_CO_603E4A4 }
+aCoBuilding9Hitbox:
+  { type: SF64:HITBOX, offset: 0x603E4A4, symbol: aCoBuilding9Hitbox }
 
-D_CO_603E4DC:
-  { type: SF64:HITBOX, offset: 0x603E4DC, symbol: D_CO_603E4DC }
+aCoBuilding10Hitbox:
+  { type: SF64:HITBOX, offset: 0x603E4DC, symbol: aCoBuilding10Hitbox }
 
-D_CO_603E514:
-  { type: SF64:HITBOX, offset: 0x603E514, symbol: D_CO_603E514 }
+aCoIBeamHitbox:
+  { type: SF64:HITBOX, offset: 0x603E514, symbol: aCoIBeamHitbox }
 
 D_CO_603E54C:
   { type: SF64:HITBOX, offset: 0x603E54C, symbol: D_CO_603E54C }
@@ -531,14 +531,14 @@ D_CO_603E598:
 D_CO_603E5B4:
   { type: SF64:HITBOX, offset: 0x603E5B4, symbol: D_CO_603E5B4 }
 
-D_CO_603E5D0:
-  { type: SF64:HITBOX, offset: 0x603E5D0, symbol: D_CO_603E5D0 }
+CoGarudaHitbox:
+  { type: SF64:HITBOX, offset: 0x603E5D0, symbol: CoGarudaHitbox }
 
-D_CO_603E604:
-  { type: SF64:HITBOX, offset: 0x603E604, symbol: D_CO_603E604 }
+aCoGarudaDestroyHitbox:
+  { type: SF64:HITBOX, offset: 0x603E604, symbol: aCoGarudaDestroyHitbox }
 
-D_CO_603E620:
-  { type: SF64:HITBOX, offset: 0x603E620, symbol: D_CO_603E620 }
+aCoGrangaHitbox:
+  { type: SF64:HITBOX, offset: 0x603E620, symbol: aCoGrangaHitbox }
 
 D_CO_603E714:
   { type: SF64:HITBOX, offset: 0x603E714, symbol: D_CO_603E714 }
@@ -549,35 +549,35 @@ D_CO_603E748:
 D_CO_603E7C4:
   { type: SF64:HITBOX, offset: 0x603E7C4, symbol: D_CO_603E7C4 }
 
-D_CO_603E840:
-  { type: SF64:HITBOX, offset: 0x603E840, symbol: D_CO_603E840 }
+aCoCarrierHitbox:
+  { type: SF64:HITBOX, offset: 0x603E840, symbol: aCoCarrierHitbox }
 
-D_CO_603E88C:
-  { type: SF64:HITBOX, offset: 0x603E88C, symbol: D_CO_603E88C }
+aCoRockwallHitbox:
+  { type: SF64:HITBOX, offset: 0x603E88C, symbol: aCoRockwallHitbox }
 
-D_CO_603E8A8:
-  { type: SF64:HITBOX, offset: 0x603E8A8, symbol: D_CO_603E8A8 }
+aCoDoorsHitbox:
+  { type: SF64:HITBOX, offset: 0x603E8A8, symbol: aCoDoorsHitbox }
 
 D_CO_603E924:
   { type: SF64:HITBOX, offset: 0x603E924, symbol: D_CO_603E924 }
 
-D_CO_603E98C:
-  { type: SF64:HITBOX, offset: 0x603E98C, symbol: D_CO_603E98C }
+aCoBuildingOnFireHitbox:
+  { type: SF64:HITBOX, offset: 0x603E98C, symbol: aCoBuildingOnFireHitbox }
 
-D_CO_603E9EC:
-  { type: SF64:HITBOX, offset: 0x603E9EC, symbol: D_CO_603E9EC }
+aCoHighway5Hitbox:
+  { type: SF64:HITBOX, offset: 0x603E9EC, symbol: aCoHighway5Hitbox }
 
-D_CO_603EA08:
-  { type: SF64:HITBOX, offset: 0x603EA08, symbol: D_CO_603EA08 }
+aCoHighway6Hitbox:
+  { type: SF64:HITBOX, offset: 0x603EA08, symbol: aCoHighway6Hitbox }
 
-D_CO_603EA74:
-  { type: SF64:HITBOX, offset: 0x603EA74, symbol: D_CO_603EA74 }
+aCoHighway7Hitbox:
+  { type: SF64:HITBOX, offset: 0x603EA74, symbol: aCoHighway7Hitbox }
 
-D_CO_603EAE0:
-  { type: SF64:HITBOX, offset: 0x603EAE0, symbol: D_CO_603EAE0 }
+aCoHighway8Hitbox:
+  { type: SF64:HITBOX, offset: 0x603EAE0, symbol: aCoHighway8Hitbox }
 
-D_CO_603EB0C:
-  { type: SF64:HITBOX, offset: 0x603EB0C, symbol: D_CO_603EB0C }
+aCoHighway9Hitbox:
+  { type: SF64:HITBOX, offset: 0x603EB0C, symbol: aCoHighway9Hitbox }
 
 D_CO_603EB38:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0603EB38, symbol: D_CO_603EB38 }
diff --git a/assets/yaml/us/rev1/ast_fortuna.yaml b/assets/yaml/us/rev1/ast_fortuna.yaml
index 2c33e207..4fafae5e 100644
--- a/assets/yaml/us/rev1/ast_fortuna.yaml
+++ b/assets/yaml/us/rev1/ast_fortuna.yaml
@@ -116,8 +116,8 @@ D_FO_6009F90:
 D_FO_600A018:
   { type: TEXTURE, format: IA8, width: 32, height: 32, offset: 0x600A018, ctype: u8, symbol: D_FO_600A018 }
 
-D_FO_600A420:
-  { type: GFX, offset: 0x600A420, symbol: D_FO_600A420 }
+aFoPoleDL:
+  { type: GFX, offset: 0x600A420, symbol: aFoPoleDL }
 
 D_FO_600A4A8:
   { type: TEXTURE, format: RGBA16, width: 32, height: 64, offset: 0x600A4A8, ctype: u16, symbol: D_FO_600A4A8 }
@@ -158,14 +158,14 @@ D_FO_600F3F4:
 D_FO_600F60C:
   { type: SF64:COLPOLY, offset: 0x600F60C, count: 93, symbol: D_FO_600F60C, mesh_symbol: D_FO_OFFSET }
 
-D_FO_600FE9C:
-  { type: SF64:HITBOX, offset: 0x600FE9C, symbol: D_FO_600FE9C }
+aFoPoleHitbox:
+  { type: SF64:HITBOX, offset: 0x600FE9C, symbol: aFoPoleHitbox }
 
 D_FO_600FEB8:
   { type: SF64:HITBOX, offset: 0x600FEB8, symbol: D_FO_600FEB8 }
 
-D_FO_600FF30:
-  { type: SF64:HITBOX, offset: 0x600FF30, symbol: D_FO_600FF30 }
+aFoRadarHitbox:
+  { type: SF64:HITBOX, offset: 0x600FF30, symbol: aFoRadarHitbox }
 
 D_FO_600FF64:
   { type: SF64:HITBOX, offset: 0x600FF64, symbol: D_FO_600FF64 }
diff --git a/assets/yaml/us/rev1/ast_map.yaml b/assets/yaml/us/rev1/ast_map.yaml
index 44747cae..a77becb0 100644
--- a/assets/yaml/us/rev1/ast_map.yaml
+++ b/assets/yaml/us/rev1/ast_map.yaml
@@ -367,11 +367,14 @@ D_MAP_6047E70:
   { type: GFX, offset: 0x6047E70, symbol: D_MAP_6047E70 }
 
 D_MAP_6047F80:
-  { type: TEXTURE, format: IA8, offset: 0x06047F80, width: 64, height: 64, ctype: u8, symbol: D_MAP_6047F80 }
+  { type: TEXTURE, format: IA8, offset: 0x06047F80, width: 64, height: 32, ctype: u8, symbol: D_MAP_6047F80 }
+
+D_MAP_6048780:
+  { type: TEXTURE, format: IA8, offset: 0x06048780, width: 64, height: 32, ctype: u8, symbol: D_MAP_6048780 }
 
 D_MAP_6048F80:
   { type: TEXTURE, format: IA8, offset: 0x06048F80, width: 64, height: 64, ctype: u8, symbol: D_MAP_6048F80 }
-
+  
 D_MAP_6049F80:
   { type: GFX, offset: 0x6049F80, symbol: D_MAP_6049F80 }
 
diff --git a/assets/yaml/us/rev1/ast_sector_z.yaml b/assets/yaml/us/rev1/ast_sector_z.yaml
index bd532e3f..5213b9d2 100644
--- a/assets/yaml/us/rev1/ast_sector_z.yaml
+++ b/assets/yaml/us/rev1/ast_sector_z.yaml
@@ -30,11 +30,11 @@ D_SZ_6000840:
 D_SZ_60012D0:
   { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 9, offset: 0x60012D0, symbol: D_SZ_60012D0 }
 
-D_SZ_6001360:
-  { type: GFX, offset: 0x6001360, symbol: D_SZ_6001360 }
+aSzSpaceJunk1DL:
+  { type: GFX, offset: 0x6001360, symbol: aSzSpaceJunk1DL }
 
-D_SZ_6001A10:
-  { type: GFX, offset: 0x6001A10, symbol: D_SZ_6001A10 }
+aSzSpaceJunk2DL:
+  { type: GFX, offset: 0x6001A10, symbol: aSzSpaceJunk2DL }
 
 D_SZ_6001C80:
   { type: TEXTURE, ctype: u8, format: CI8, width: 16, height: 16, offset: 0x06001C80, symbol: D_SZ_6001C80, tlut: 0x06001D80 }
@@ -42,8 +42,8 @@ D_SZ_6001C80:
 D_SZ_6001D80:
   { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x06001D80, symbol: D_SZ_6001D80 }
 
-D_SZ_6001DA0:
-  { type: GFX, offset: 0x6001DA0, symbol: D_SZ_6001DA0 }
+aSzSpaceJunk3DL:
+  { type: GFX, offset: 0x6001DA0, symbol: aSzSpaceJunk3DL }
 
 D_SZ_60025F0:
   { type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x60025F0, symbol: D_SZ_60025F0, tlut: 0x060029F0 }
@@ -69,12 +69,12 @@ D_SZ_6002DE0:
 D_SZ_6002EE0:
   { type: TEXTURE, ctype: u16, format: TLUT, colors: 80, offset: 0x06002EE0, symbol: D_SZ_6002EE0 }
 
-D_SZ_6002F80:
-  { type: GFX, offset: 0x6002F80, symbol: D_SZ_6002F80 }
+aSzBackgroundDL:
+  { type: GFX, offset: 0x6002F80, symbol: aSzBackgroundDL }
 
 # Sector Z Background
-D_SZ_6003010:
-  { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x06003010, symbol: D_SZ_6003010 }
+aSzBackgroundTex:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x06003010, symbol: aSzBackgroundTex }
 
 D_SZ_6004010:
   { type: GFX, offset: 0x6004010, symbol: D_SZ_6004010 }
@@ -97,8 +97,8 @@ D_SZ_6004558:
 D_SZ_6004570:
   { type: GFX, offset: 0x6004570, symbol: D_SZ_6004570 }
 
-D_SZ_60045E0:
-  { type: GFX, offset: 0x60045E0, symbol: D_SZ_60045E0 }
+aSZSpaceJunk4DL:
+  { type: GFX, offset: 0x60045E0, symbol: aSZSpaceJunk4DL }
 
 D_SZ_60047E0:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x60047E0, symbol: D_SZ_60047E0 }
@@ -145,8 +145,8 @@ D_SZ_6006CD8:
 D_SZ_6006D64:
   { type: SF64:ANIM, offset: 0x6006D64, symbol: D_SZ_6006D64 }
 
-D_SZ_6006E50: 
-  { type: SF64:SKELETON, offset: 0x6006E50, symbol: D_SZ_6006E50 }
+aSzMissileSkel: 
+  { type: SF64:SKELETON, offset: 0x6006E50, symbol: aSzMissileSkel }
 
 D_SZ_6006E70:
   { type: SF64:ENVIRONMENT, offset: 0x6006E70, symbol: D_SZ_6006E70 }
@@ -157,8 +157,8 @@ D_SZ_6006EB4:
 D_SZ_6007558:
   {type: SF64:COLPOLY, count: 316, offset: 0x6007558, symbol: D_SZ_6007558, mesh_symbol: D_SZ_OFFSET }
 
-D_SZ_6009230:
-  { type: SF64:HITBOX, offset: 0x6009230, symbol: D_SZ_6009230 }
+aSZMissileHitbox:
+  { type: SF64:HITBOX, offset: 0x6009230, symbol: aSZMissileHitbox }
 
 D_SZ_600924C:
   { type: SF64:HITBOX, offset: 0x600924C, symbol: D_SZ_600924C }
diff --git a/assets/yaml/us/rev1/ast_titania.yaml b/assets/yaml/us/rev1/ast_titania.yaml
index 63bf8435..829c10bd 100644
--- a/assets/yaml/us/rev1/ast_titania.yaml
+++ b/assets/yaml/us/rev1/ast_titania.yaml
@@ -28,8 +28,8 @@ D_TI_6001B10:
 D_TI_6001BA8:
   {type: TEXTURE, format: RGBA16, ctype: u16, width: 32, height: 32, offset: 0x6001BA8, symbol: D_TI_6001BA8}
 
-D_TI_60023B0:
-  {type: GFX, offset: 0x60023B0, symbol: D_TI_60023B0}
+aTiCactusDL:
+  {type: GFX, offset: 0x60023B0, symbol: aTiCactusDL}
 
 D_TI_6002438:
   {type: TEXTURE, format: RGBA16, ctype: u16, width: 32, height: 64, offset: 0x6002438, symbol: D_TI_6002438}
@@ -82,35 +82,35 @@ D_TI_60064AC:
 D_TI_60064C8:
   {type: SF64:HITBOX, offset: 0x60064C8, symbol: D_TI_60064C8}
 
-D_TI_60064FC:
-  {type: SF64:HITBOX, offset: 0x60064FC, symbol: D_TI_60064FC}
+aTiSkullHitbox:
+  {type: SF64:HITBOX, offset: 0x60064FC, symbol: aTiSkullHitbox}
 
-D_TI_6006518:
-  {type: SF64:HITBOX, offset: 0x6006518, symbol: D_TI_6006518}
+aTiRib0Hitbox:
+  {type: SF64:HITBOX, offset: 0x6006518, symbol: aTiRib0Hitbox}
 
-D_TI_6006564:
-  {type: SF64:HITBOX, offset: 0x6006564, symbol: D_TI_6006564}
+aTiRib1Hitbox:
+  {type: SF64:HITBOX, offset: 0x6006564, symbol: aTiRib1Hitbox}
 
-D_TI_60065B0:
-  {type: SF64:HITBOX, offset: 0x60065B0, symbol: D_TI_60065B0}
+aTiRib2Hitbox:
+  {type: SF64:HITBOX, offset: 0x60065B0, symbol: aTiRib2Hitbox}
 
-D_TI_60065FC:
-  {type: SF64:HITBOX, offset: 0x60065FC, symbol: D_TI_60065FC}
+aTiRib3Hitbox:
+  {type: SF64:HITBOX, offset: 0x60065FC, symbol: aTiRib3Hitbox}
 
-D_TI_6006648:
-  {type: SF64:HITBOX, offset: 0x6006648, symbol: D_TI_6006648}
+aTiRib4Hitbox:
+  {type: SF64:HITBOX, offset: 0x6006648, symbol: aTiRib4Hitbox}
 
-D_TI_6006694:
-  {type: SF64:HITBOX, offset: 0x6006694, symbol: D_TI_6006694}
+aTiRib5Hitbox:
+  {type: SF64:HITBOX, offset: 0x6006694, symbol: aTiRib5Hitbox}
 
-D_TI_60066E0:
-  {type: SF64:HITBOX, offset: 0x60066E0, symbol: D_TI_60066E0}
+aTiRib6Hitbox:
+  {type: SF64:HITBOX, offset: 0x60066E0, symbol: aTiRib6Hitbox}
 
-D_TI_600672C:
-  {type: SF64:HITBOX, offset: 0x600672C, symbol: D_TI_600672C}
+aTiRib7Hitbox:
+  {type: SF64:HITBOX, offset: 0x600672C, symbol: aTiRib7Hitbox}
 
-D_TI_6006778:
-  {type: SF64:HITBOX, offset: 0x6006778, symbol: D_TI_6006778}
+aTiRib8Hitbox:
+  {type: SF64:HITBOX, offset: 0x6006778, symbol: aTiRib8Hitbox}
 
 D_TI_60067C4:
   {type: SF64:HITBOX, offset: 0x60067C4, symbol: D_TI_60067C4}
@@ -133,8 +133,8 @@ D_TI_6006874:
 D_TI_6006890:
   {type: SF64:HITBOX, offset: 0x6006890, symbol: D_TI_6006890}
 
-D_TI_60068BC:
-  {type: SF64:HITBOX, offset: 0x60068BC, symbol: D_TI_60068BC}
+aTiCactusHitbox:
+  {type: SF64:HITBOX, offset: 0x60068BC, symbol: aTiCactusHitbox}
 
 D_TI_60068F0:
   {type: SF64:HITBOX, offset: 0x60068F0, symbol: D_TI_60068F0}
diff --git a/assets/yaml/us/rev1/ast_zoness.yaml b/assets/yaml/us/rev1/ast_zoness.yaml
index 9a7e21ee..406db142 100644
--- a/assets/yaml/us/rev1/ast_zoness.yaml
+++ b/assets/yaml/us/rev1/ast_zoness.yaml
@@ -471,8 +471,8 @@ 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}
+aZoRock1DL:
+  { type: GFX, offset: 0x6024AC0, symbol: aZoRock1DL}
 
 D_ZO_6024D60:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6024D60, symbol: D_ZO_6024D60}
@@ -502,8 +502,8 @@ D_ZO_602AC50:
 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}
+aZoRock1Hitbox:
+  { type: SF64:HITBOX, offset: 0x602B9EC, symbol: aZoRock1Hitbox}
 
 D_ZO_602BA20:
   { type: SF64:HITBOX, offset: 0x602BA20, symbol: D_ZO_602BA20}