Actor Docs (#270)

* Docs

* actor timer_04C -> work_04C

* Actor & Boss unk_04A -> work_04A

* actor & boss unk_048 -> work_048

* actor & boss unk_046 -> work_046

* boss unk_044 -> work_044

* actor event docs

* ActorEvent docs

* name all Event Actor IDs

* EVID names in EventActorInfo comments

* refactor EVC_PASSED_ALL_RINGS by @inspectredc

* clarification comment

* some option docs

* audio enums and macros

* some audio renamings

48 files changed, 542 insertions, 540 deletions

diff --git a/assets/yaml/jp/rev0/ast_7_ti_1.yaml b/assets/yaml/jp/rev0/ast_7_ti_1.yaml
index 75a2ee61..b80991f5 100644
--- a/assets/yaml/jp/rev0/ast_7_ti_1.yaml
+++ b/assets/yaml/jp/rev0/ast_7_ti_1.yaml
@@ -209,11 +209,11 @@ aTi1DesertRoverSkel:
 aTi1FekudaGun2DL:
   { type: GFX, offset: 0x700C980, symbol: aTi1FekudaGun2DL }
 
-D_TI1_700CAF4:
-  { type: SF64:ANIM, offset: 0x700CAF4, symbol: D_TI1_700CAF4}
+aTiBomberAnim:
+  { type: SF64:ANIM, offset: 0x700CAF4, symbol: aTiBomberAnim}
 
-D_TI1_700CB60:
-  {type: SF64:SKELETON, offset: 0x700CB60, symbol: D_TI1_700CB60}
+aTiBomberSkel:
+  {type: SF64:SKELETON, offset: 0x700CB60, symbol: aTiBomberSkel}
 
 aTiRascoAnim:
   { type: SF64:ANIM, offset: 0x700D534, symbol: aTiRascoAnim }
diff --git a/assets/yaml/jp/rev0/ast_allies.yaml b/assets/yaml/jp/rev0/ast_allies.yaml
index 57a24582..9ccff794 100644
--- a/assets/yaml/jp/rev0/ast_allies.yaml
+++ b/assets/yaml/jp/rev0/ast_allies.yaml
@@ -59,8 +59,8 @@ D_D0098B0:
 D_D009938:
   { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 16, offset: 0x0D009938, symbol: D_D009938 }
 
-D_D009A40:
-  { type: GFX, offset: 0xD009A40, symbol: D_D009A40 }
+aKattShipDL:
+  { type: GFX, offset: 0xD009A40, symbol: aKattShipDL }
 
 D_D00A3B8:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0D00A3B8, symbol: D_D00A3B8 }
@@ -97,8 +97,8 @@ aJamesMarkTex:
 aJamesMarkTLUT:
   { type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0xD00B870, symbol: aJamesMarkTLUT }
 
-D_D00B880:
-  { type: GFX, offset: 0xD00B880, symbol: D_D00B880 }
+aBillShipDL:
+  { type: GFX, offset: 0xD00B880, symbol: aBillShipDL }
 
 ast_allies_seg13_vtx_BB70:
   { type: VTX, count: 144, offset: 0xD00BB70, symbol: ast_allies_seg13_vtx_BB70 }
diff --git a/assets/yaml/jp/rev0/ast_aquas.yaml b/assets/yaml/jp/rev0/ast_aquas.yaml
index 7140515e..ac9b2f32 100644
--- a/assets/yaml/jp/rev0/ast_aquas.yaml
+++ b/assets/yaml/jp/rev0/ast_aquas.yaml
@@ -22,8 +22,8 @@ aAqSquidAnim:
 aAqSquidSkel:
   { type: SF64:SKELETON, offset: 0x6000DB0, symbol: aAqSquidSkel }
 
-D_AQ_6000E10:
-  { type: GFX, offset: 0x6000E10, symbol: D_AQ_6000E10 }
+aAqShellDL:
+  { type: GFX, offset: 0x6000E10, symbol: aAqShellDL }
 
 D_AQ_6001130:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6001130, symbol: D_AQ_6001130 }
@@ -98,8 +98,8 @@ D_AQ_6003FF0:
 D_AQ_6008168:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6008168, symbol: D_AQ_6008168 }
 
-D_AQ_6008970:
-  { type: GFX, offset: 0x6008970, symbol: D_AQ_6008970 }
+aAqStarfishDL:
+  { type: GFX, offset: 0x6008970, symbol: aAqStarfishDL }
 
 D_AQ_6008EC8:
   { type: TEXTURE, ctype: u8, format: CI8, width: 16, height: 16, offset: 0x6008EC8, symbol: D_AQ_6008EC8, tlut: 0x6008FC8 }
@@ -659,14 +659,14 @@ D_AQ_60308B8:
 aBoss301Hitbox:
   { type: SF64:HITBOX, offset: 0x6030B10, symbol: aBoss301Hitbox }
 
-D_AQ_6030B14_f32:
-  { type: SF64:HITBOX, offset: 0x6030B14, symbol: D_AQ_6030B14_f32 }
+aAqShellHitbox:
+  { type: SF64:HITBOX, offset: 0x6030B14, symbol: aAqShellHitbox }
 
-D_AQ_6030B30:
-  { type: SF64:HITBOX, offset: 0x6030B30, symbol: D_AQ_6030B30 }
+aAqStarfishHitbox:
+  { type: SF64:HITBOX, offset: 0x6030B30, symbol: aAqStarfishHitbox }
 
-D_AQ_6030B4C:
-  { type: SF64:HITBOX, offset: 0x6030B4C, symbol: D_AQ_6030B4C }
+aAqOysterEvHitbox:
+  { type: SF64:HITBOX, offset: 0x6030B4C, symbol: aAqOysterEvHitbox }
 
 D_AQ_6030B68:
   { type: SF64:HITBOX, offset: 0x6030B68, symbol: D_AQ_6030B68 }
diff --git a/assets/yaml/jp/rev0/ast_area_6.yaml b/assets/yaml/jp/rev0/ast_area_6.yaml
index fe99d8e0..9b35795e 100644
--- a/assets/yaml/jp/rev0/ast_area_6.yaml
+++ b/assets/yaml/jp/rev0/ast_area_6.yaml
@@ -57,8 +57,8 @@ D_A6_6009718:
 D_A6_6009B18:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06009B18, symbol: D_A6_6009B18 }
 
-D_A6_600E0C0:
-  { type: GFX, offset: 0x600E0C0, symbol: D_A6_600E0C0 }
+aA6UmbraStationDL:
+  { type: GFX, offset: 0x600E0C0, symbol: aA6UmbraStationDL }
 
 D_A6_600EBE8:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 16, offset: 0x0600EBE8, symbol: D_A6_600EBE8 }
@@ -96,8 +96,8 @@ D_A6_6012550:
 D_A6_6012840:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06012840, symbol: D_A6_6012840 }
 
-D_A6_6012A40:
-  { type: GFX, offset: 0x6012A40, symbol: D_A6_6012A40 }
+aA6HarlockFrigateDL:
+  { type: GFX, offset: 0x6012A40, symbol: aA6HarlockFrigateDL }
 
 D_A6_6013CD8:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06013CD8, symbol: D_A6_6013CD8 }
@@ -117,8 +117,8 @@ D_A6_6015CD8:
 D_A6_6015EE0:
   { type: GFX, offset: 0x6015EE0, symbol: D_A6_6015EE0 }
 
-D_A6_6016190:
-  { type: GFX, offset: 0x6016190, symbol: D_A6_6016190 }
+aA6ZeramClassCruiserDL:
+  { type: GFX, offset: 0x6016190, symbol: aA6ZeramClassCruiserDL }
 
 D_A6_6017120:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06017120, symbol: D_A6_6017120 }
@@ -150,8 +150,8 @@ D_A6_6018994:
 D_A6_6018BA0:
   { type: SF64:SKELETON, offset: 0x6018BA0, symbol: D_A6_6018BA0 }
 
-D_A6_6018BF0:
-  { type: GFX, offset: 0x6018BF0, symbol: D_A6_6018BF0 }
+aA6NinjinMissileDL:
+  { type: GFX, offset: 0x6018BF0, symbol: aA6NinjinMissileDL }
 
 D_A6_6019130:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06019130, symbol: D_A6_6019130 }
@@ -162,8 +162,8 @@ D_A6_6019330:
 D_A6_6019530:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06019530, symbol: D_A6_6019530 }
 
-D_A6_6019730:
-  { type: GFX, offset: 0x6019730, symbol: D_A6_6019730 }
+aA6RocketDL:
+  { type: GFX, offset: 0x6019730, symbol: aA6RocketDL }
 
 D_A6_6019B20:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06019B20, symbol: D_A6_6019B20 }
@@ -174,8 +174,8 @@ D_A6_6019D20:
 D_A6_6019F20:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06019F20, symbol: D_A6_6019F20 }
 
-D_A6_601A120:
-  { type: GFX, offset: 0x601A120, symbol: D_A6_601A120 }
+aA6SpaceMineDL:
+  { type: GFX, offset: 0x601A120, symbol: aA6SpaceMineDL }
 
 D_A6_601A220:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0601A220, symbol: D_A6_601A220 }
@@ -228,14 +228,14 @@ D_A6_6023F64:
 D_A6_6027F50:
   { type: SF64:SCRIPT, offset: 0x6027F50, symbol: D_A6_6027F50}
 
-D_A6_60280E0:
-  { type: SF64:HITBOX, offset: 0x60280E0, symbol: D_A6_60280E0 }
+aA6UmbraStationHitbox:
+  { type: SF64:HITBOX, offset: 0x60280E0, symbol: aA6UmbraStationHitbox }
 
-D_A6_6028254:
-  { type: SF64:HITBOX, offset: 0x6028254, symbol: D_A6_6028254 }
+aA6HarlockFrigateHitbox:
+  { type: SF64:HITBOX, offset: 0x6028254, symbol: aA6HarlockFrigateHitbox }
 
-D_A6_60282A0:
-  { type: SF64:HITBOX, offset: 0x60282A0, symbol: D_A6_60282A0 }
+aA6ZeramClassCruiserHitbox:
+  { type: SF64:HITBOX, offset: 0x60282A0, symbol: aA6ZeramClassCruiserHitbox }
 
 aA6GorgonHitbox:
   { type: SF64:HITBOX, offset: 0x6028454, symbol: aA6GorgonHitbox }
diff --git a/assets/yaml/jp/rev0/ast_common.yaml b/assets/yaml/jp/rev0/ast_common.yaml
index c35f3bba..7d8d20ff 100644
--- a/assets/yaml/jp/rev0/ast_common.yaml
+++ b/assets/yaml/jp/rev0/ast_common.yaml
@@ -980,8 +980,8 @@ D_1031EC0:
 D_1032578:
   { type: TEXTURE, format: RGBA16, width: 16, height: 16, ctype: u16, offset: 0x1032578, symbol: D_1032578 }
 
-D_1032780:
-  { type: GFX, offset: 0x1032780, symbol: D_1032780 }
+aArwingShadowDL:
+  { type: GFX, offset: 0x1032780, symbol: aArwingShadowDL }
 
 D_1032808:
   { type: TEXTURE, format: IA8, width: 32, height: 32, ctype: u8, offset: 0x1032808, symbol: D_1032808 }
diff --git a/assets/yaml/jp/rev0/ast_corneria.yaml b/assets/yaml/jp/rev0/ast_corneria.yaml
index a037337a..b53b86c7 100644
--- a/assets/yaml/jp/rev0/ast_corneria.yaml
+++ b/assets/yaml/jp/rev0/ast_corneria.yaml
@@ -111,8 +111,8 @@ aCoHighway5DL:
 D_CO_6011790:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06011790, symbol: D_CO_6011790 }
 
-D_CO_6011F90:
-  { type: GFX, offset: 0x6011F90, symbol: D_CO_6011F90 }
+aCoCornerianFighterDL:
+  { type: GFX, offset: 0x6011F90, symbol: aCoCornerianFighterDL }
 
 D_CO_6012640:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06012640, symbol: D_CO_6012640 }
diff --git a/assets/yaml/jp/rev0/ast_enmy_planet.yaml b/assets/yaml/jp/rev0/ast_enmy_planet.yaml
index 87e949c1..9b595a75 100644
--- a/assets/yaml/jp/rev0/ast_enmy_planet.yaml
+++ b/assets/yaml/jp/rev0/ast_enmy_planet.yaml
@@ -15,14 +15,14 @@ D_ENMY_PLANET_4000290:
 ast_enmy_planet_seg4_vtx_8F8:
   { type: VTX, count: 90, offset: 0x40008F8, symbol: ast_enmy_planet_seg4_vtx_8F8 }
 
-D_ENMY_PLANET_40001A4:
-  { type: SF64:ANIM, offset: 0x40001A4, symbol: D_ENMY_PLANET_40001A4 }
+aTripodAnim:
+  { type: SF64:ANIM, offset: 0x40001A4, symbol: aTripodAnim }
 
-D_ENMY_PLANET_4000270:
-  { type: SF64:SKELETON, offset: 0x4000270, symbol: D_ENMY_PLANET_4000270 }
+aTripodSkel:
+  { type: SF64:SKELETON, offset: 0x4000270, symbol: aTripodSkel }
 
-D_ENMY_PLANET_4000710:
-  { type: GFX, offset: 0x4000710, symbol: D_ENMY_PLANET_4000710 }
+aVenomTankDL:
+  { type: GFX, offset: 0x4000710, symbol: aVenomTankDL }
 
 D_ENMY_PLANET_4001298:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x04001298, symbol: D_ENMY_PLANET_4001298 }
@@ -60,11 +60,11 @@ D_ENMY_PLANET_4004538:
 D_ENMY_PLANET_4004D38:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x04004D38, symbol: D_ENMY_PLANET_4004D38 }
 
-D_ENMY_PLANET_40057AC:
-  { type: SF64:ANIM, offset: 0x40057AC, symbol: D_ENMY_PLANET_40057AC }
+aFirebirdAnim:
+  { type: SF64:ANIM, offset: 0x40057AC, symbol: aFirebirdAnim }
 
-D_ENMY_PLANET_40058B8:
-  { type: SF64:SKELETON, offset: 0x40058B8, symbol: D_ENMY_PLANET_40058B8 }
+aFirebirdSkel:
+  { type: SF64:SKELETON, offset: 0x40058B8, symbol: aFirebirdSkel }
 
 D_ENMY_PLANET_4005E78:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x04005E78, symbol: D_ENMY_PLANET_4005E78 }
@@ -81,17 +81,17 @@ D_ENMY_PLANET_40064E8:
 D_ENMY_PLANET_40066E8:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x040066E8, symbol: D_ENMY_PLANET_40066E8 }
 
-D_ENMY_PLANET_40068F0:
-  { type: GFX, offset: 0x40068F0, symbol: D_ENMY_PLANET_40068F0 }
+aVenomFighter1DL:
+  { type: GFX, offset: 0x40068F0, symbol: aVenomFighter1DL }
 
-D_ENMY_PLANET_4006E90:
-  { type: GFX, offset: 0x4006E90, symbol: D_ENMY_PLANET_4006E90 }
+aVenomFighter2DL:
+  { type: GFX, offset: 0x4006E90, symbol: aVenomFighter2DL }
 
-D_ENMY_PLANET_40073C0:
-  { type: GFX, offset: 0x40073C0, symbol: D_ENMY_PLANET_40073C0 }
+aGrangaFighter1DL:
+  { type: GFX, offset: 0x40073C0, symbol: aGrangaFighter1DL }
 
-D_ENMY_PLANET_4007AF0:
-  { type: GFX, offset: 0x4007AF0, symbol: D_ENMY_PLANET_4007AF0 }
+aGrangaFighter2DL:
+  { type: GFX, offset: 0x4007AF0, symbol: aGrangaFighter2DL }
 
 D_ENMY_PLANET_4008100:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x04008100, symbol: D_ENMY_PLANET_4008100 }
@@ -108,5 +108,5 @@ D_ENMY_PLANET_4008FF8:
 D_ENMY_PLANET_4008F70:
   { type: GFX, offset: 0x4008F70, symbol: D_ENMY_PLANET_4008F70 }
 
-D_ENMY_PLANET_4009800:
-  { type: GFX, offset: 0x4009800, symbol: D_ENMY_PLANET_4009800 }
+aSpyEyeDL:
+  { type: GFX, offset: 0x4009800, symbol: aSpyEyeDL }
diff --git a/assets/yaml/jp/rev0/ast_enmy_space.yaml b/assets/yaml/jp/rev0/ast_enmy_space.yaml
index af0fd04e..0ba24a61 100644
--- a/assets/yaml/jp/rev0/ast_enmy_space.yaml
+++ b/assets/yaml/jp/rev0/ast_enmy_space.yaml
@@ -8,26 +8,26 @@
       - '#include "gfx.h"'
       - '#include "sf64object.h"'
 
-D_ENMY_SPACE_4000080:
-  { type: SF64:ANIM, offset: 0x4000080, symbol: D_ENMY_SPACE_4000080 }
+aKillerBeeAnim:
+  { type: SF64:ANIM, offset: 0x4000080, symbol: aKillerBeeAnim }
 
-D_ENMY_SPACE_400014C:
-  { type: SF64:SKELETON, offset: 0x400014C, symbol: D_ENMY_SPACE_400014C }
+aKillerBeeSkel:
+  { type: SF64:SKELETON, offset: 0x400014C, symbol: aKillerBeeSkel }
 
 aEnmySpMeMora1DL:
   { type: GFX, offset: 0x4000170, symbol: aEnmySpMeMora1DL }
 
-D_ENMY_SPACE_4000650:
-  { type: GFX, offset: 0x4000650, symbol: D_ENMY_SPACE_4000650 }
+aSpiderDL:
+  { type: GFX, offset: 0x4000650, symbol: aSpiderDL }
 
-D_ENMY_SPACE_4000EC0:
-  { type: GFX, offset: 0x4000EC0, symbol: D_ENMY_SPACE_4000EC0 }
+aGammaOnDL:
+  { type: GFX, offset: 0x4000EC0, symbol: aGammaOnDL }
 
 D_ENMY_SPACE_4001108:
   { type: TEXTURE, format: RGBA16, offset: 0x4001108, width: 16, height: 16, ctype: u16, symbol: D_ENMY_SPACE_4001108 }
 
-D_ENMY_SPACE_4001310:
-  { type: GFX, offset: 0x4001310, symbol: D_ENMY_SPACE_4001310 }
+aAttacker2DL:
+  { type: GFX, offset: 0x4001310, symbol: aAttacker2DL }
 
 D_ENMY_SPACE_4001A30:
   { type: TEXTURE, format: RGBA16, offset: 0x4001A30, width: 16, height: 16, ctype: u16, symbol: D_ENMY_SPACE_4001A30 }
@@ -95,11 +95,11 @@ aEnmySpMeMora2DL:
 D_ENMY_SPACE_4008550:
   { type: TEXTURE, format: RGBA16, offset: 0x04008550, width: 32, height: 32, ctype: u16, symbol: D_ENMY_SPACE_4008550 }
 
-D_ENMY_SPACE_4008D50:
-  { type: GFX, offset: 0x4008D50, symbol: D_ENMY_SPACE_4008D50 }
+aGammaOffDL:
+  { type: GFX, offset: 0x4008D50, symbol: aGammaOffDL }
 
-D_ENMY_SPACE_4008FA0:
-  { type: GFX, offset: 0x4008FA0, symbol: D_ENMY_SPACE_4008FA0 }
+aVenomFighter3DL:
+  { type: GFX, offset: 0x4008FA0, symbol: aVenomFighter3DL }
 
 D_ENMY_SPACE_40096B8:
   { type: TEXTURE, format: RGBA16, offset: 0x040096B8, width: 16, height: 16, ctype: u16, symbol: D_ENMY_SPACE_40096B8 }
@@ -110,25 +110,25 @@ D_ENMY_SPACE_40098B8:
 D_ENMY_SPACE_4009AB8:
   { type: TEXTURE, format: RGBA16, offset: 0x04009AB8, width: 32, height: 32, ctype: u16, symbol: D_ENMY_SPACE_4009AB8 }
 
-D_ENMY_SPACE_400A30C:
-  { type: SF64:ANIM, offset: 0x400A30C, symbol: D_ENMY_SPACE_400A30C }
+aCruiserGunAnim:
+  { type: SF64:ANIM, offset: 0x400A30C, symbol: aCruiserGunAnim }
 
-D_ENMY_SPACE_400A398:
-  { type: SF64:SKELETON, offset: 0x400A398, symbol: D_ENMY_SPACE_400A398 }
+aCruiserGunSkel:
+  { type: SF64:SKELETON, offset: 0x400A398, symbol: aCruiserGunSkel }
 
 aEnmySpMeMora3DL:
   { type: GFX, offset: 0x400A630, symbol: aEnmySpMeMora3DL }
 
 
-D_ENMY_SPACE_400AAE0:
-  { type: GFX, offset: 0x400AAE0, symbol: D_ENMY_SPACE_400AAE0 }
+aCommanderDL:
+  { type: GFX, offset: 0x400AAE0, symbol: aCommanderDL }
 
 
-D_ENMY_SPACE_400B390:
-  { type: GFX, offset: 0x400B390, symbol: D_ENMY_SPACE_400B390 }
+aAttacker3DL:
+  { type: GFX, offset: 0x400B390, symbol: aAttacker3DL }
 
 
-D_ENMY_SPACE_400BD20:
-  { type: GFX, offset: 0x400BD20, symbol: D_ENMY_SPACE_400BD20 }
+aAttacker1DL:
+  { type: GFX, offset: 0x400BD20, symbol: aAttacker1DL }
 
 # size = 0xC510
\ No newline at end of file
diff --git a/assets/yaml/jp/rev0/ast_fortuna.yaml b/assets/yaml/jp/rev0/ast_fortuna.yaml
index 5e9c029f..23b03d8a 100644
--- a/assets/yaml/jp/rev0/ast_fortuna.yaml
+++ b/assets/yaml/jp/rev0/ast_fortuna.yaml
@@ -110,8 +110,8 @@ D_FO_6008150:
 D_FO_6009070:
   { type: TEXTURE, format: RGBA16, width: 44, height: 44, offset: 0x6009070, ctype: u16, symbol: D_FO_6009070 }
 
-D_FO_6009F90:
-  { type: GFX, offset: 0x6009F90, symbol: D_FO_6009F90 }
+aFoEnemyShadowDL:
+  { type: GFX, offset: 0x6009F90, symbol: aFoEnemyShadowDL }
 
 D_FO_600A018:
   { type: TEXTURE, format: IA8, width: 32, height: 32, offset: 0x600A018, ctype: u8, symbol: D_FO_600A018 }
diff --git a/assets/yaml/jp/rev0/ast_katina.yaml b/assets/yaml/jp/rev0/ast_katina.yaml
index 6ec0a0a3..293c4a92 100644
--- a/assets/yaml/jp/rev0/ast_katina.yaml
+++ b/assets/yaml/jp/rev0/ast_katina.yaml
@@ -109,14 +109,14 @@ aDestroyedHatch4DL:
 aDestroyedHatch3DL:
   { type: GFX, offset: 0x600D4E0, symbol: aDestroyedHatch3DL }
 
-D_KA_600D730:
-  { type: GFX, offset: 0x600D730, symbol: D_KA_600D730 }
+aKaCornerianFighterShadowDL:
+  { type: GFX, offset: 0x600D730, symbol: aKaCornerianFighterShadowDL }
 
 D_KA_600D7B8:
   { type: TEXTURE, format: IA8, width: 32, height: 32, offset: 0x600D7B8, ctype: u8, symbol: D_KA_600D7B8 }
 
-D_KA_600DBC0:
-  { type: GFX, offset: 0x600DBC0, symbol: D_KA_600DBC0 }
+aKaEnemyShadowDL:
+  { type: GFX, offset: 0x600DBC0, symbol: aKaEnemyShadowDL }
 
 D_KA_600DC48:
   { type: TEXTURE, format: IA8, width: 32, height: 32, offset: 0x600DC48, ctype: u8, symbol: D_KA_600DC48 }
diff --git a/assets/yaml/jp/rev0/ast_macbeth.yaml b/assets/yaml/jp/rev0/ast_macbeth.yaml
index 2209552e..f455462c 100644
--- a/assets/yaml/jp/rev0/ast_macbeth.yaml
+++ b/assets/yaml/jp/rev0/ast_macbeth.yaml
@@ -61,8 +61,8 @@ D_MA_60026F8:
 D_MA_60027F8:
   { type: TEXTURE, format: TLUT, ctype: u16, colors: 72, offset: 0x60027F8, symbol: D_MA_60027F8}
 
-D_MA_6002890:
-  {type: GFX, offset: 0x6002890, symbol: D_MA_6002890}
+aMaGuillotine2DL:
+  {type: GFX, offset: 0x6002890, symbol: aMaGuillotine2DL}
 
 D_MA_6002C20:
   { type: TEXTURE, format: CI8, ctype: u8, width: 32, height: 16, offset: 0x6002C20, symbol: D_MA_6002C20, tlut: 0x6002E20}
@@ -238,8 +238,8 @@ D_MA_600AE18:
 D_MA_600AE98:
   { type: TEXTURE, format: TLUT, ctype: u16, colors: 80, offset: 0x600AE98, symbol: D_MA_600AE98}
 
-aMaGuillotineDL:
-  {type: GFX, offset: 0x600AF40, symbol: aMaGuillotineDL}
+aMaGuillotine1DL:
+  {type: GFX, offset: 0x600AF40, symbol: aMaGuillotine1DL}
 
 D_MA_600B2E0:
   { type: TEXTURE, format: RGBA16, ctype: u16, width: 32, height: 64, offset: 0x600B2E0, symbol: D_MA_600B2E0}
@@ -274,8 +274,8 @@ D_MA_600D878:
 D_MA_600D978:
   { type: TEXTURE, format: TLUT, ctype: u16, colors: 72, offset: 0x600D978, symbol: D_MA_600D978}
 
-D_MA_600DA10:
-  {type: GFX, offset: 0x600DA10, symbol: D_MA_600DA10}
+aMaLaserTurretDL:
+  {type: GFX, offset: 0x600DA10, symbol: aMaLaserTurretDL}
 
 D_MA_600DF60:
   { type: TEXTURE, format: CI8, ctype: u8, width: 32, height: 32, offset: 0x600DF60, symbol: D_MA_600DF60, tlut: 0x600E360}
@@ -478,8 +478,8 @@ aMaTowerTopDL:
 D_MA_601C170:
   {type: GFX, offset: 0x601C170, symbol: D_MA_601C170}
 
-D_MA_601C520:
-  {type: GFX, offset: 0x601C520, symbol: D_MA_601C520}
+aMaRailroadCartDL:
+  {type: GFX, offset: 0x601C520, symbol: aMaRailroadCartDL}
 
 D_MA_601D188:
   {type: SF64:ANIM, offset: 0x601D188, symbol: D_MA_601D188}
@@ -922,8 +922,8 @@ aMaGuillotineHousingHitbox:
 aMaGuillotineHitbox:
   {type: SF64:HITBOX, offset: 0x60368E0, symbol: aMaGuillotineHitbox}
 
-D_MA_60368FC:
-  {type: SF64:HITBOX, offset: 0x60368FC, symbol: D_MA_60368FC}
+aMaRailroadCartHitbox:
+  {type: SF64:HITBOX, offset: 0x60368FC, symbol: aMaRailroadCartHitbox}
 
 aMaBombDropHitbox:
   {type: SF64:HITBOX, offset: 0x6036930, symbol: aMaBombDropHitbox}
diff --git a/assets/yaml/jp/rev0/ast_map.yaml b/assets/yaml/jp/rev0/ast_map.yaml
index 6f4f4692..070fee15 100644
--- a/assets/yaml/jp/rev0/ast_map.yaml
+++ b/assets/yaml/jp/rev0/ast_map.yaml
@@ -409,8 +409,8 @@ D_MAP_604A8D8:
   { type: TEXTURE, ctype: u16, format: TLUT, colors: 136, offset: 0x0604A8D8, symbol: D_MAP_604A8D8 }
 
 # Arwing Model, used in the map.
-D_MAP_604A9F0:
-  { type: GFX, offset: 0x604A9F0, symbol: D_MAP_604A9F0 }
+aMapArwingDL:
+  { type: GFX, offset: 0x604A9F0, symbol: aMapArwingDL }
 
 ast_map_seg6_vtx_4AD50:
   { type: VTX, offset: 0x604AD50, count: 124, symbol: ast_map_seg6_vtx_4AD50 }
diff --git a/assets/yaml/jp/rev0/ast_meteo.yaml b/assets/yaml/jp/rev0/ast_meteo.yaml
index c6bd7384..d06d59ca 100644
--- a/assets/yaml/jp/rev0/ast_meteo.yaml
+++ b/assets/yaml/jp/rev0/ast_meteo.yaml
@@ -62,8 +62,8 @@ D_ME_60080C0:
 D_ME_6008A18:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x06008A18, symbol: D_ME_6008A18 }
 
-D_ME_6008AA0:
-  { type: GFX, offset: 0x6008AA0, symbol: D_ME_6008AA0 }
+aMeFlipBot1DL:
+  { type: GFX, offset: 0x6008AA0, symbol: aMeFlipBot1DL }
 
 D_ME_6009228:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06009228, symbol: D_ME_6009228 }
@@ -74,35 +74,35 @@ D_ME_6009A28:
 D_ME_6009C28:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06009C28, symbol: D_ME_6009C28 }
 
-D_ME_6009E30:
-  { type: GFX, offset: 0x6009E30, symbol: D_ME_6009E30 }
+aMeFlipBot2DL:
+  { type: GFX, offset: 0x6009E30, symbol: aMeFlipBot2DL }
 
-D_ME_6009F50:
-  { type: GFX, offset: 0x6009F50, symbol: D_ME_6009F50 }
+aMeBigMeteorDL:
+  { type: GFX, offset: 0x6009F50, symbol: aMeBigMeteorDL }
 
-D_ME_600AC70:
-  { type: GFX, offset: 0x600AC70, symbol: D_ME_600AC70 }
+aMeMeteor7DL:
+  { type: GFX, offset: 0x600AC70, symbol: aMeMeteor7DL }
 
 D_ME_600B540:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0600B540, symbol: D_ME_600B540 }
 
-D_ME_600BD40:
-  { type: GFX, offset: 0x600BD40, symbol: D_ME_600BD40 }
+aMeSecretMarker2DL:
+  { type: GFX, offset: 0x600BD40, symbol: aMeSecretMarker2DL }
 
 D_ME_600BF30:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0600BF30, symbol: D_ME_600BF30 }
 
-D_ME_600C130:
-  { type: GFX, offset: 0x600C130, symbol: D_ME_600C130 }
+aMeRockGull2DL:
+  { type: GFX, offset: 0x600C130, symbol: aMeRockGull2DL }
 
-D_ME_600C2A0:
-  { type: GFX, offset: 0x600C2A0, symbol: D_ME_600C2A0 }
+aMeMeteor6DL:
+  { type: GFX, offset: 0x600C2A0, symbol: aMeMeteor6DL }
 
-D_ME_600C740:
-  { type: GFX, offset: 0x600C740, symbol: D_ME_600C740 }
+aMeRockGull3DL:
+  { type: GFX, offset: 0x600C740, symbol: aMeRockGull3DL }
 
-D_ME_600CAA0:
-  { type: GFX, offset: 0x600CAA0, symbol: D_ME_600CAA0 }
+aMeRockGull1DL:
+  { type: GFX, offset: 0x600CAA0, symbol: aMeRockGull1DL }
 
 aMeMeteorShower3DL:
   { type: GFX, offset: 0x600CD60, symbol: aMeMeteorShower3DL }
@@ -149,20 +149,20 @@ D_ME_60172C8:
 aMeMeteorShower1DL:
   { type: GFX, offset: 0x06017AD0, symbol: aMeMeteorShower1DL }
 
-D_ME_6017B60:
-  { type: GFX, offset: 0x06017B60, symbol: D_ME_6017B60 }
+aMeMeteor3DL:
+  { type: GFX, offset: 0x06017B60, symbol: aMeMeteor3DL }
 
 aMeLaserCannon2DL:
   { type: GFX, offset: 0x06018450, symbol: aMeLaserCannon2DL }
 
-D_ME_6018960:
-  { type: GFX, offset: 0x06018960, symbol: D_ME_6018960 }
+aMeMeteor5DL:
+  { type: GFX, offset: 0x06018960, symbol: aMeMeteor5DL }
 
-aMeMeteorDL:
-  { type: GFX, offset: 0x06018C00, symbol: aMeMeteorDL }
+aMeMeteor1DL:
+  { type: GFX, offset: 0x06018C00, symbol: aMeMeteor1DL }
 
-D_ME_6019430:
-  { type: GFX, offset: 0x06019430, symbol: D_ME_6019430 }
+aMeMeteor4DL:
+  { type: GFX, offset: 0x06019430, symbol: aMeMeteor4DL }
 
 D_ME_6019880:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06019880, symbol: D_ME_6019880 }
@@ -170,8 +170,8 @@ D_ME_6019880:
 D_ME_601A080:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0601A080, symbol: D_ME_601A080 }
 
-D_ME_601A880:
-  { type: GFX, offset: 0x0601A880, symbol: D_ME_601A880 }
+aMeSecretMarker1DL:
+  { type: GFX, offset: 0x0601A880, symbol: aMeSecretMarker1DL }
 
 aMeMeteoTunnelDL:
   { type: GFX, offset: 0x0601AE40, symbol: aMeMeteoTunnelDL }
@@ -195,8 +195,8 @@ D_ME_601EA00:
 D_ME_601EA98:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0601EA98, symbol: D_ME_601EA98 }
 
-D_ME_601F2A0:
-  { type: GFX, offset: 0x0601F2A0, symbol: D_ME_601F2A0 }
+aMeMeteor2DL:
+  { type: GFX, offset: 0x0601F2A0, symbol: aMeMeteor2DL }
 
 D_ME_601F778:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0601F778, symbol: D_ME_601F778 }
@@ -280,8 +280,8 @@ D_ME_602B148:
 D_ME_602F3AC:
   { type: SF64:SCRIPT, offset: 0x602F3AC, symbol: D_ME_602F3AC }
 
-D_ME_602F604:
-  { type: SF64:HITBOX, offset: 0x602F604, symbol: D_ME_602F604 }
+aMeFlipBotHitbox:
+  { type: SF64:HITBOX, offset: 0x602F604, symbol: aMeFlipBotHitbox }
 
 D_ME_602F638:
   { type: SF64:HITBOX, offset: 0x602F638, symbol: D_ME_602F638 }
diff --git a/assets/yaml/jp/rev0/ast_sector_x.yaml b/assets/yaml/jp/rev0/ast_sector_x.yaml
index 6cef80a6..88bf0b54 100644
--- a/assets/yaml/jp/rev0/ast_sector_x.yaml
+++ b/assets/yaml/jp/rev0/ast_sector_x.yaml
@@ -16,8 +16,8 @@
 D_SX_6000000:
   { type: TEXTURE, ctype: u8, format: IA8, width: 176, height: 12, offset: 0x6000000, symbol: D_SX_6000000 }
 
-D_SX_6000840:
-  { type: GFX, offset: 0x6000840, symbol: D_SX_6000840 }
+aSxSpaceMineDL:
+  { type: GFX, offset: 0x6000840, symbol: aSxSpaceMineDL }
 
 # Flying mine
 D_SX_60008C0:
@@ -30,14 +30,14 @@ D_SX_60010C0:
 D_SX_6001150:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6001150, symbol: D_SX_6001150 }
 
-D_SX_6001950:
-  { type: GFX, offset: 0x6001950, symbol: D_SX_6001950 }
+aSxLaserDestroyedDL:
+  { type: GFX, offset: 0x6001950, symbol: aSxLaserDestroyedDL }
 
 D_SX_6001AD8:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6001AD8, symbol: D_SX_6001AD8 }
 
-D_SX_6001CE0:
-  { type: GFX, offset: 0x6001CE0, symbol: D_SX_6001CE0 }
+aSxWatchPostDL:
+  { type: GFX, offset: 0x6001CE0, symbol: aSxWatchPostDL }
 
 D_SX_60020C0:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x60020C0, symbol: D_SX_60020C0 }
@@ -75,8 +75,8 @@ D_SX_6004EE8:
 D_SX_6005EE8:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6005EE8, symbol: D_SX_6005EE8 }
 
-D_SX_60066F0:
-  { type: GFX, offset: 0x60066F0, symbol: D_SX_60066F0 }
+aSxLaserDL:
+  { type: GFX, offset: 0x60066F0, symbol: aSxLaserDL }
 
 D_SX_6006810:
   { type: GFX, offset: 0x6006810, symbol: D_SX_6006810 }
@@ -102,8 +102,8 @@ D_SX_6009548:
 D_SX_6009748:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6009748, symbol: D_SX_6009748 }
 
-D_SX_6009950:
-  { type: GFX, offset: 0x6009950, symbol: D_SX_6009950 }
+aSxBaseFloor1DL:
+  { type: GFX, offset: 0x6009950, symbol: aSxBaseFloor1DL }
 
 D_SX_6009C30:
   { type: GFX, offset: 0x6009C30, symbol: D_SX_6009C30 }
@@ -117,8 +117,8 @@ D_SX_6009FF8:
 D_SX_600A2D4:
   { type: SF64:ANIM, offset: 0x600A2D4, symbol: D_SX_600A2D4 }
 
-D_SX_600A2E0:
-  { type: GFX, offset: 0x600A2E0, symbol: D_SX_600A2E0 }
+aSxBaseWall3DL:
+  { type: GFX, offset: 0x600A2E0, symbol: aSxBaseWall3DL }
 
 D_SX_600A570:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x600A570, symbol: D_SX_600A570 }
@@ -126,17 +126,17 @@ D_SX_600A570:
 D_SX_600AD70:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x600AD70, symbol: D_SX_600AD70 }
 
-D_SX_600AF70:
-  { type: GFX, offset: 0x600AF70, symbol: D_SX_600AF70 }
+aSxBaseWall1DL:
+  { type: GFX, offset: 0x600AF70, symbol: aSxBaseWall1DL }
 
-D_SX_600B2B0:
-  { type: GFX, offset: 0x600B2B0, symbol: D_SX_600B2B0 }
+aSxBaseWall2DL:
+  { type: GFX, offset: 0x600B2B0, symbol: aSxBaseWall2DL }
 
-D_SX_600B540:
-  { type: GFX, offset: 0x600B540, symbol: D_SX_600B540 }
+aSxBaseWall4DL:
+  { type: GFX, offset: 0x600B540, symbol: aSxBaseWall4DL }
 
-D_SX_600B830:
-  { type: GFX, offset: 0x600B830, symbol: D_SX_600B830 }
+aSxBorzoiFighterDL:
+  { type: GFX, offset: 0x600B830, symbol: aSxBorzoiFighterDL }
 
 D_SX_600C000:
   { type: GFX, offset: 0x600C000, symbol: D_SX_600C000 }
@@ -189,8 +189,8 @@ D_SX_60206DC:
 aSxSpyborgSkel:
   { type: SF64:SKELETON, offset: 0x6020C68, symbol: aSxSpyborgSkel }
 
-D_SX_6020D20:
-  { type: GFX, offset: 0x6020D20, symbol: D_SX_6020D20 }
+aSxBaseWallTile1DL:
+  { type: GFX, offset: 0x6020D20, symbol: aSxBaseWallTile1DL }
 
 # Spyborg Radio
 D_SX_6020FB0:
@@ -199,20 +199,20 @@ D_SX_6020FB0:
 D_SX_6021ED0:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x06021ED0, symbol: D_SX_6021ED0 }
 
-D_SX_6022DF0:
-  { type: GFX, offset: 0x6022DF0, symbol: D_SX_6022DF0 }
+aSxCanineDL:
+  { type: GFX, offset: 0x6022DF0, symbol: aSxCanineDL }
 
-D_SX_6023500:
-  { type: GFX, offset: 0x6023500, symbol: D_SX_6023500 }
+aSxSpyEyeDL:
+  { type: GFX, offset: 0x6023500, symbol: aSxSpyEyeDL }
 
 D_SX_6023C30:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06023C30, symbol: D_SX_6023C30 }
 
-D_SX_6023E30:
-  { type: GFX, offset: 0x6023E30, symbol: D_SX_6023E30 }
+aSxBaseDebris2DL:
+  { type: GFX, offset: 0x6023E30, symbol: aSxBaseDebris2DL }
 
-D_SX_60285F0:
-  { type: GFX, offset: 0x60285F0, symbol: D_SX_60285F0 }
+aSxBaseDebris1DL:
+  { type: GFX, offset: 0x60285F0, symbol: aSxBaseDebris1DL }
 
 D_SX_6029098:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06029098, symbol: D_SX_6029098 }
@@ -241,8 +241,8 @@ D_SX_60320D0:
 D_SX_6032328:
   { type: SF64:HITBOX, offset: 0x6032328, symbol: D_SX_6032328 }
 
-D_SX_603238C:
-  { type: SF64:HITBOX, offset: 0x603238C, symbol: D_SX_603238C }
+aSxWarpGateHitbox:
+  { type: SF64:HITBOX, offset: 0x603238C, symbol: aSxWarpGateHitbox }
 
 D_SX_6032408:
   { type: SF64:HITBOX, offset: 0x6032408, symbol: D_SX_6032408 }
@@ -256,20 +256,20 @@ aSxSpyborgRightArmHitbox:
 aSxSpyborgHitbox:
   { type: SF64:HITBOX, offset: 0x6032550, symbol: aSxSpyborgHitbox }
 
-D_SX_603285C:
-  { type: SF64:HITBOX, offset: 0x603285C, symbol: D_SX_603285C }
+aSxLaserHitbox:
+  { type: SF64:HITBOX, offset: 0x603285C, symbol: aSxLaserHitbox }
 
-D_SX_6032878:
-  { type: SF64:HITBOX, offset: 0x6032878, symbol: D_SX_6032878 }
+aSxBaseFloor1Hitbox:
+  { type: SF64:HITBOX, offset: 0x6032878, symbol: aSxBaseFloor1Hitbox }
 
-D_SX_6032894:
-  { type: SF64:HITBOX, offset: 0x6032894, symbol: D_SX_6032894 }
+aSxBaseWall2Hitbox:
+  { type: SF64:HITBOX, offset: 0x6032894, symbol: aSxBaseWall2Hitbox }
 
-D_SX_60328B0:
-  { type: SF64:HITBOX, offset: 0x60328B0, symbol: D_SX_60328B0 }
+aSxBaseWall3Hitbox:
+  { type: SF64:HITBOX, offset: 0x60328B0, symbol: aSxBaseWall3Hitbox }
 
-D_SX_60328CC:
-  { type: SF64:HITBOX, offset: 0x60328CC, symbol: D_SX_60328CC }
+aSxBaseWallTile1Hitbox:
+  { type: SF64:HITBOX, offset: 0x60328CC, symbol: aSxBaseWallTile1Hitbox }
 
 D_SX_603265C:
   { type: SF64:HITBOX, offset: 0x603265C, symbol: D_SX_603265C }
@@ -277,22 +277,22 @@ D_SX_603265C:
 D_SX_6032768:
   { type: SF64:HITBOX, offset: 0x6032768, symbol: D_SX_6032768 }
 
-D_SX_60328E8:
-  { type: SF64:HITBOX, offset: 0x60328E8, symbol: D_SX_60328E8 }
+aSxBaseWall4Hitbox:
+  { type: SF64:HITBOX, offset: 0x60328E8, symbol: aSxBaseWall4Hitbox }
 
-D_SX_6032904:
-  { type: SF64:HITBOX, offset: 0x6032904, symbol: D_SX_6032904 }
+aSxBaseWall1Hitbox:
+  { type: SF64:HITBOX, offset: 0x6032904, symbol: aSxBaseWall1Hitbox }
 
-D_SX_6032938:
-  { type: SF64:HITBOX, offset: 0x6032938, symbol: D_SX_6032938 }
+aSxWatchPostHitbox:
+  { type: SF64:HITBOX, offset: 0x6032938, symbol: aSxWatchPostHitbox }
 
-D_SX_6032954:
-  { type: SF64:HITBOX, offset: 0x6032954, symbol: D_SX_6032954 }
+aSxSpaceMineHitbox:
+  { type: SF64:HITBOX, offset: 0x6032954, symbol: aSxSpaceMineHitbox }
 
-D_SX_6032970:
-  { type: SF64:HITBOX, offset: 0x6032970, symbol: D_SX_6032970 }
+aSxBaseDebris2Hitbox:
+  { type: SF64:HITBOX, offset: 0x6032970, symbol: aSxBaseDebris2Hitbox }
 
-D_SX_603298C:
-  { type: SF64:HITBOX, offset: 0x603298C, symbol: D_SX_603298C }
+aSxBaseDebris1Hitbox:
+  { type: SF64:HITBOX, offset: 0x603298C, symbol: aSxBaseDebris1Hitbox }
 
 # size = 0x32AC0
\ No newline at end of file
diff --git a/assets/yaml/jp/rev0/ast_sector_y.yaml b/assets/yaml/jp/rev0/ast_sector_y.yaml
index 4e0ef4dd..097b11cb 100644
--- a/assets/yaml/jp/rev0/ast_sector_y.yaml
+++ b/assets/yaml/jp/rev0/ast_sector_y.yaml
@@ -116,11 +116,11 @@ D_SY_60119D8:
 D_SY_60132A0:
   { type: GFX, offset: 0x60132A0, symbol: D_SY_60132A0 }
 
-D_SY_6015D60:
-  { type: GFX, offset: 0x6015D60, symbol: D_SY_6015D60 }
+aSyRobot4DL:
+  { type: GFX, offset: 0x6015D60, symbol: aSyRobot4DL }
 
-D_SY_601F3D0:
-  { type: GFX, offset: 0x601F3D0, symbol: D_SY_601F3D0 }
+aSySaruzinDL:
+  { type: GFX, offset: 0x601F3D0, symbol: aSySaruzinDL }
 
 D_SY_60121E0:
   { type: GFX, offset: 0x60121E0, symbol: D_SY_60121E0 }
@@ -158,8 +158,8 @@ D_SY_6015960:
 D_SY_6015B60:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06015B60, symbol: D_SY_6015B60 }
 
-aSyShipProjectileDL:
-  { type: GFX, offset: 0x60188D0, symbol: aSyShipProjectileDL }
+aSyShipMissileDL:
+  { type: GFX, offset: 0x60188D0, symbol: aSyShipMissileDL }
 
 D_SY_60183B0:
   { type: GFX, offset: 0x60183B0, symbol: D_SY_60183B0 }
@@ -170,8 +170,8 @@ D_SY_6018F30:
 D_SY_6019E50:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x06019E50, symbol: D_SY_6019E50 }
 
-D_SY_601AD70:
-  { type: GFX, offset: 0x601AD70, symbol: D_SY_601AD70 }
+aSyDebrisDL:
+  { type: GFX, offset: 0x601AD70, symbol: aSyDebrisDL }
 
 D_SY_601AE08:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0601AE08, symbol: D_SY_601AE08 }
@@ -194,11 +194,11 @@ aSyShip2DL:
 D_SY_601F3B8:
   { type: SF64:ANIM, offset: 0x601F3B8, symbol: D_SY_601F3B8 }
 
-D_SY_60205D0:
-  { type: GFX, offset: 0x60205D0, symbol: D_SY_60205D0 }
+aSyLaserTurretDL:
+  { type: GFX, offset: 0x60205D0, symbol: aSyLaserTurretDL }
 
-D_SY_60209F0:
-  { type: GFX, offset: 0x60209F0, symbol: D_SY_60209F0 }
+aSyRobotSpriteFrontDL:
+  { type: GFX, offset: 0x60209F0, symbol: aSyRobotSpriteFrontDL }
 
 D_SY_6020B08:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x06020B08, symbol: D_SY_6020B08 }
@@ -206,8 +206,8 @@ D_SY_6020B08:
 D_SY_6021B08:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x06021B08, symbol: D_SY_6021B08 }
 
-D_SY_6022B10:
-  { type: GFX, offset: 0x6022B10, symbol: D_SY_6022B10 }
+aSyRobotSpriteSideDL:
+  { type: GFX, offset: 0x6022B10, symbol: aSyRobotSpriteSideDL }
 
 D_SY_6022C28:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x06022C28, symbol: D_SY_6022C28 }
@@ -314,8 +314,8 @@ aSyRobotHitbox:
 D_SY_60340C0:
   { type: SF64:HITBOX, offset: 0x60340C0, symbol: D_SY_60340C0 }
 
-D_SY_6034124:
-  { type: SF64:HITBOX, offset: 0x6034124, symbol: D_SY_6034124 }
+aSyRobot4Hitbox:
+  { type: SF64:HITBOX, offset: 0x6034124, symbol: aSyRobot4Hitbox }
 
 D_SY_60341A8:
   { type: SF64:HITBOX, offset: 0x60341A8, symbol: D_SY_60341A8 }
@@ -332,8 +332,8 @@ D_SY_6034304:
 aSyScenery156Hitbox:
   { type: SF64:HITBOX, offset: 0x6034368, symbol: aSyScenery156Hitbox }
 
-D_SY_603445C:
-  { type: SF64:HITBOX, offset: 0x603445C, symbol: D_SY_603445C }
+aSyLaserTurretHitbox:
+  { type: SF64:HITBOX, offset: 0x603445C, symbol: aSyLaserTurretHitbox }
 
 aSyShip1Hitbox:
   { type: SF64:HITBOX, offset: 0x6034478, symbol: aSyShip1Hitbox }
@@ -356,7 +356,7 @@ aSyShipWindowsHitbox:
 aSyShip4DestroyedHitbox:
   { type: SF64:HITBOX, offset: 0x60347F0, symbol: aSyShip4DestroyedHitbox }
 
-aSyShipProjectileHitbox:
-  { type: SF64:HITBOX, offset: 0x603486C, symbol: aSyShipProjectileHitbox }
+aSyShipMissileHitbox:
+  { type: SF64:HITBOX, offset: 0x603486C, symbol: aSyShipMissileHitbox }
 
 # size = 0x34890
\ No newline at end of file
diff --git a/assets/yaml/jp/rev0/ast_sector_z.yaml b/assets/yaml/jp/rev0/ast_sector_z.yaml
index 112044ad..12c21624 100644
--- a/assets/yaml/jp/rev0/ast_sector_z.yaml
+++ b/assets/yaml/jp/rev0/ast_sector_z.yaml
@@ -142,8 +142,8 @@ D_SZ_6006BD8:
 D_SZ_6006CD8:
   { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x06006CD8, symbol: D_SZ_6006CD8 }
 
-D_SZ_6006D64:
-  { type: SF64:ANIM, offset: 0x6006D64, symbol: D_SZ_6006D64 }
+aSzMissileAnim:
+  { type: SF64:ANIM, offset: 0x6006D64, symbol: aSzMissileAnim }
 
 aSzMissileSkel:
   { type: SF64:SKELETON, offset: 0x6006E50, symbol: aSzMissileSkel }
diff --git a/assets/yaml/jp/rev0/ast_solar.yaml b/assets/yaml/jp/rev0/ast_solar.yaml
index d5c5aa0a..88b2b591 100644
--- a/assets/yaml/jp/rev0/ast_solar.yaml
+++ b/assets/yaml/jp/rev0/ast_solar.yaml
@@ -31,11 +31,11 @@ D_SO_6004500:
 D_SO_6005710:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6005710, symbol: D_SO_6005710}
 
-D_SO_600636C:
-  { type: SF64:ANIM, offset: 0x600636C, symbol: D_SO_600636C}
+aSoGoreAnim:
+  { type: SF64:ANIM, offset: 0x600636C, symbol: aSoGoreAnim}
 
-D_SO_6006558:
-  { type: SF64:SKELETON, offset: 0x6006558, symbol: D_SO_6006558}
+aSoGoreSkel:
+  { type: SF64:SKELETON, offset: 0x6006558, symbol: aSoGoreSkel}
 
 D_SO_6006DD8:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6006DD8, symbol: D_SO_6006DD8}
diff --git a/assets/yaml/jp/rev0/ast_star_wolf.yaml b/assets/yaml/jp/rev0/ast_star_wolf.yaml
index d7225ceb..e6e12660 100644
--- a/assets/yaml/jp/rev0/ast_star_wolf.yaml
+++ b/assets/yaml/jp/rev0/ast_star_wolf.yaml
@@ -56,8 +56,8 @@ D_STAR_WOLF_F00D3C0:
 D_STAR_WOLF_F00E2E0:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x0F00E2E0, symbol: D_STAR_WOLF_F00E2E0 }
 
-D_STAR_WOLF_F00F200:
-  { type: GFX, offset: 0xF00F200, symbol: D_STAR_WOLF_F00F200 }
+aStarWolfStandardShipDL:
+  { type: GFX, offset: 0xF00F200, symbol: aStarWolfStandardShipDL }
 
 D_STAR_WOLF_F0101D0:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0F0101D0, symbol: D_STAR_WOLF_F0101D0 }
@@ -68,8 +68,8 @@ D_STAR_WOLF_F011E80:
 D_STAR_WOLF_F011680:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0F011680, symbol: D_STAR_WOLF_F011680 }
 
-D_STAR_WOLF_F0103D0:
-  { type: GFX, offset: 0xF0103D0, symbol: D_STAR_WOLF_F0103D0 }
+aStarWolfUpgradedShipDL:
+  { type: GFX, offset: 0xF0103D0, symbol: aStarWolfUpgradedShipDL }
 
 D_STAR_WOLF_F011F00:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0F011F00, symbol: D_STAR_WOLF_F011F00 }
@@ -89,14 +89,14 @@ D_STAR_WOLF_F013180:
 D_STAR_WOLF_F013980:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0F013980, symbol: D_STAR_WOLF_F013980 }
 
-D_STAR_WOLF_F014180:
-  { type: GFX, offset: 0xF014180, symbol: D_STAR_WOLF_F014180 }
+aStarWolfRadarMarkDL:
+  { type: GFX, offset: 0xF014180, symbol: aStarWolfRadarMarkDL }
 
 D_STAR_WOLF_F014208:
   { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 16, offset: 0x0F014208, symbol: D_STAR_WOLF_F014208 }
 
-D_STAR_WOLF_F014310:
-  { type: GFX, offset: 0xF014310, symbol: D_STAR_WOLF_F014310 }
+aStarWolfShadowDL:
+  { type: GFX, offset: 0xF014310, symbol: aStarWolfShadowDL }
 
-D_STAR_WOLF_F014398:
-  { type: TEXTURE, ctype: u8, format: IA8, width: 32, height: 32, offset: 0x0F014398, symbol: D_STAR_WOLF_F014398 }
+aStarWolfShadowTex:
+  { type: TEXTURE, ctype: u8, format: IA8, width: 32, height: 32, offset: 0x0F014398, symbol: aStarWolfShadowTex }
diff --git a/assets/yaml/jp/rev0/ast_training.yaml b/assets/yaml/jp/rev0/ast_training.yaml
index 8c2f5bc9..4fda0b1c 100644
--- a/assets/yaml/jp/rev0/ast_training.yaml
+++ b/assets/yaml/jp/rev0/ast_training.yaml
@@ -25,8 +25,8 @@ D_TR_6000900:
 D_TR_6001820:
   { type: TEXTURE, format: RGBA16, offset: 0x6001820, width: 44, height: 44, ctype: u16, symbol: D_TR_6001820 }
 
-D_TR_6002740:
-  { type: GFX, offset: 0x6002740, symbol: D_TR_6002740 }
+aTrBarrierDL:
+  { type: GFX, offset: 0x6002740, symbol: aTrBarrierDL }
 
 D_TR_60028F0:
   { type: TEXTURE, format: RGBA16, offset: 0x060028F0, width: 32, height: 32, ctype: u16, symbol: D_TR_60028F0 }
@@ -82,7 +82,7 @@ aTrBuildingHitbox:
 aItemTrainingRingHitbox:
   { type: SF64:HITBOX, offset: 0x6009CFC, symbol: aItemTrainingRingHitbox }
 
-D_TR_6009D18:
-  { type: SF64:HITBOX, offset: 0x6009D18, symbol: D_TR_6009D18 }
+aTrBarrierHitbox:
+  { type: SF64:HITBOX, offset: 0x6009D18, symbol: aTrBarrierHitbox }
 
 # size = 0x9D40
\ No newline at end of file
diff --git a/assets/yaml/jp/rev0/ast_ve1_boss.yaml b/assets/yaml/jp/rev0/ast_ve1_boss.yaml
index 436fc334..ff054630 100644
--- a/assets/yaml/jp/rev0/ast_ve1_boss.yaml
+++ b/assets/yaml/jp/rev0/ast_ve1_boss.yaml
@@ -29,8 +29,8 @@ D_VE1_90012F0:
 D_VE1_9002CD8:
   {type: SF64:ANIM, offset: 0x9002CD8, symbol: D_VE1_9002CD8}
 
-D_VE1_9002CF0:
-  {type: GFX, offset: 0x9002CF0, symbol: D_VE1_9002CF0}
+aVe1BlockerDL:
+  {type: GFX, offset: 0x9002CF0, symbol: aVe1BlockerDL}
 
 D_VE1_9002F30:
   {type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x9002F30, symbol: D_VE1_9002F30, tlut: 0x9003330}
@@ -113,8 +113,8 @@ D_VE1_900DF20:
 D_VE1_900DFB8:
   {type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x900DFB8, symbol: D_VE1_900DFB8}
 
-D_VE1_900EFC0:
-  {type: GFX, offset: 0x900EFC0, symbol: D_VE1_900EFC0}
+aVe1TempleBgDL:
+  {type: GFX, offset: 0x900EFC0, symbol: aVe1TempleBgDL}
 
 aVe1TempleInterior2DL:
   {type: GFX, offset: 0x900F060, symbol: aVe1TempleInterior2DL}
@@ -128,14 +128,14 @@ D_VE1_9010FC4:
 D_VE1_9010FD0:
   {type: GFX, offset: 0x9010FD0, symbol: D_VE1_9010FD0}
 
-D_VE1_9011200:
-  {type: GFX, offset: 0x9011200, symbol: D_VE1_9011200}
+aVe1PillarDL:
+  {type: GFX, offset: 0x9011200, symbol: aVe1PillarDL}
 
 D_VE1_9011980:
   {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x9011980, symbol: D_VE1_9011980}
 
-D_VE1_9012180:
-  {type: GFX, offset: 0x9012180, symbol: D_VE1_9012180}
+aVe1Pillar5DL:
+  {type: GFX, offset: 0x9012180, symbol: aVe1Pillar5DL}
 
 D_VE1_90123C0:
   {type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 16, offset: 0x90123C0, symbol: D_VE1_90123C0, tlut: 0x90125C0}
diff --git a/assets/yaml/jp/rev0/ast_venom_1.yaml b/assets/yaml/jp/rev0/ast_venom_1.yaml
index 777321f2..1655355a 100644
--- a/assets/yaml/jp/rev0/ast_venom_1.yaml
+++ b/assets/yaml/jp/rev0/ast_venom_1.yaml
@@ -25,8 +25,8 @@ D_VE1_6000D80:
 D_VE1_6001B80:
   { type: TEXTURE, format: IA8, width: 128, height: 19, offset: 0x6001B80, ctype: u8, symbol: D_VE1_6001B80 }
 
-D_VE1_6002500:
-  { type: GFX, offset: 0x6002500, symbol: D_VE1_6002500 }
+aVe1EnemyGateDL:
+  { type: GFX, offset: 0x6002500, symbol: aVe1EnemyGateDL }
 
 D_VE1_60029F8:
   { type: TEXTURE, format: CI8, width: 8, height: 16, offset: 0x60029F8, tlut: 0x6002A78, ctype: u8, symbol: D_VE1_60029F8 }
@@ -52,11 +52,11 @@ aVe1WatchPostDL:
 D_VE1_6003B10:
   { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6003B10, ctype: u16, symbol: D_VE1_6003B10 }
 
-D_VE1_6004310:
-  { type: GFX, offset: 0x6004310, symbol: D_VE1_6004310 }
+aVe1EnemyGateDoorLeftDL:
+  { type: GFX, offset: 0x6004310, symbol: aVe1EnemyGateDoorLeftDL }
 
-D_VE1_60043F0:
-  { type: GFX, offset: 0x60043F0, symbol: D_VE1_60043F0 }
+aVe1EnemyGateDoorRightDL:
+  { type: GFX, offset: 0x60043F0, symbol: aVe1EnemyGateDoorRightDL }
 
 D_VE1_60044D0:
   { type: TEXTURE, format: CI8, width: 16, height: 16, offset: 0x60044D0, tlut: 0x60045D0, ctype: u8, symbol: D_VE1_60044D0 }
@@ -124,8 +124,8 @@ D_VE1_601B1E4:
 D_VE1_6010088:
   { type: SF64:OBJECT_INIT, offset: 0x6010088, symbol: D_VE1_6010088 }
 
-D_VE1_601B43C:
-  { type: SF64:HITBOX, offset: 0x601B43C, symbol: D_VE1_601B43C }
+aVe1Pillar5Hitbox:
+  { type: SF64:HITBOX, offset: 0x601B43C, symbol: aVe1Pillar5Hitbox }
 
 D_VE1_601B474:
   { type: SF64:HITBOX, offset: 0x601B474, symbol: D_VE1_601B474 }
@@ -178,5 +178,5 @@ aVe1Pillar4Hitbox:
 aVe1MonkeyStatueHitbox:
   { type: SF64:HITBOX, offset: 0x601B8D8, symbol: aVe1MonkeyStatueHitbox }
 
-D_VE1_601B944:
-  { type: SF64:HITBOX, offset: 0x601B944, symbol: D_VE1_601B944 }
\ No newline at end of file
+aVe1EnemyGateHitbox:
+  { type: SF64:HITBOX, offset: 0x601B944, symbol: aVe1EnemyGateHitbox }
\ No newline at end of file
diff --git a/assets/yaml/jp/rev0/ast_venom_2.yaml b/assets/yaml/jp/rev0/ast_venom_2.yaml
index c1f15a4b..3146fc88 100644
--- a/assets/yaml/jp/rev0/ast_venom_2.yaml
+++ b/assets/yaml/jp/rev0/ast_venom_2.yaml
@@ -174,11 +174,11 @@ D_VE2_60114A0:
 D_VE2_6013AF8:
   { type: TEXTURE, format: RGBA16, width: 16, height: 16, offset: 0x6013AF8, ctype: u16, symbol: D_VE2_6013AF8 }
 
-D_VE2_6014658:
-  { type: SF64:ANIM, offset: 0x6014658, symbol: D_VE2_6014658 }
+aVe2AndrossGateAnim:
+  { type: SF64:ANIM, offset: 0x6014658, symbol: aVe2AndrossGateAnim }
 
-D_VE2_6014844:
-  { type: SF64:SKELETON, offset: 0x6014844, symbol: D_VE2_6014844 }
+aVe2AndrossGateSkel:
+  { type: SF64:SKELETON, offset: 0x6014844, symbol: aVe2AndrossGateSkel }
 
 aVe2BaseAnim:
   { type: SF64:ANIM, offset: 0x6014904, symbol: aVe2BaseAnim }
diff --git a/assets/yaml/jp/rev0/ast_warp_zone.yaml b/assets/yaml/jp/rev0/ast_warp_zone.yaml
index 87af0cb6..d7ce93c7 100644
--- a/assets/yaml/jp/rev0/ast_warp_zone.yaml
+++ b/assets/yaml/jp/rev0/ast_warp_zone.yaml
@@ -8,14 +8,14 @@
       - '#include "gfx.h"'
       - '#include "sf64object.h"'
 
-D_WZ_7000000:
-  { type: GFX, offset: 0x7000000, symbol: D_WZ_7000000 }
+aWzSxEnemy1DL:
+  { type: GFX, offset: 0x7000000, symbol: aWzSxEnemy1DL }
 
-D_WZ_7000280:
-  { type: GFX, offset: 0x7000280, symbol: D_WZ_7000280 }
+aWzGateDL:
+  { type: GFX, offset: 0x7000280, symbol: aWzGateDL }
 
-D_WZ_70008F0:
-  { type: GFX, offset: 0x70008F0, symbol: D_WZ_70008F0 }
+aWzMeteor2DL:
+  { type: GFX, offset: 0x70008F0, symbol: aWzMeteor2DL }
 
 D_WZ_7000260:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 4, height: 4, offset: 0x7000260, symbol: D_WZ_7000260 }
@@ -26,14 +26,14 @@ D_WZ_7000A30:
 D_WZ_7000C30:
   { type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0x7000C30, symbol: D_WZ_7000C30 }
 
-D_WZ_7000C40:
-  { type: GFX, offset: 0x7000C40, symbol: D_WZ_7000C40 }
+aWzPillar1DL:
+  { type: GFX, offset: 0x7000C40, symbol: aWzPillar1DL }
 
-D_WZ_7000E80:
-  { type: GFX, offset: 0x7000E80, symbol: D_WZ_7000E80 }
+aWzMeteor1DL:
+  { type: GFX, offset: 0x7000E80, symbol: aWzMeteor1DL }
 
-D_WZ_70010E0:
-  { type: GFX, offset: 0x70010E0, symbol: D_WZ_70010E0 }
+aWzPillar2DL:
+  { type: GFX, offset: 0x70010E0, symbol: aWzPillar2DL }
 
 D_WZ_7001540:
   { type: GFX, offset: 0x7001540, symbol: D_WZ_7001540 }
diff --git a/assets/yaml/jp/rev0/ast_zoness.yaml b/assets/yaml/jp/rev0/ast_zoness.yaml
index f61f560b..129ddaf9 100644
--- a/assets/yaml/jp/rev0/ast_zoness.yaml
+++ b/assets/yaml/jp/rev0/ast_zoness.yaml
@@ -84,8 +84,8 @@ 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}
+aZoPatrolBoatDL:
+  { type: GFX, offset: 0x6004D00, symbol: aZoPatrolBoatDL}
 
 D_ZO_6005958:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6005958, symbol: D_ZO_6005958}
@@ -351,11 +351,11 @@ D_ZO_601F420:
 D_ZO_601F620:
   { type: GFX, offset: 0x601F620, symbol: D_ZO_601F620}
 
-D_ZO_601F874:
-  { type: SF64:ANIM, offset: 0x601F874, symbol: D_ZO_601F874}
+aZoSarumarinePeriscopeAnim:
+  { type: SF64:ANIM, offset: 0x601F874, symbol: aZoSarumarinePeriscopeAnim}
 
-D_ZO_601F920:
-  { type: SF64:SKELETON, offset: 0x601F920, symbol: D_ZO_601F920}
+aZoSarumarinePeriscopeSkel:
+  { type: SF64:SKELETON, offset: 0x601F920, symbol: aZoSarumarinePeriscopeSkel}
 
 D_ZO_601F940:
   { type: GFX, offset: 0x601F940, symbol: D_ZO_601F940}
@@ -535,8 +535,8 @@ D_ZO_602C028:
 aZoSarumarineHitbox:
   { type: SF64:HITBOX, offset: 0x602C044, symbol: aZoSarumarineHitbox}
 
-D_ZO_602C1A0:
-  { type: SF64:HITBOX, offset: 0x602C1A0, symbol: D_ZO_602C1A0}
+aZoSarumarinePeriscopeHitbox:
+  { type: SF64:HITBOX, offset: 0x602C1A0, symbol: aZoSarumarinePeriscopeHitbox}
 
 aZoCargoShipHitbox:
   { type: SF64:HITBOX, offset: 0x602C1D4, symbol: aZoCargoShipHitbox}
diff --git a/assets/yaml/us/rev1/ast_7_ti_1.yaml b/assets/yaml/us/rev1/ast_7_ti_1.yaml
index c755070c..318224f2 100644
--- a/assets/yaml/us/rev1/ast_7_ti_1.yaml
+++ b/assets/yaml/us/rev1/ast_7_ti_1.yaml
@@ -209,11 +209,11 @@ aTi1DesertRoverSkel:
 aTi1FekudaGun2DL:
   { type: GFX, offset: 0x700C980, symbol: aTi1FekudaGun2DL }
 
-D_TI1_700CAF4:
-  { type: SF64:ANIM, offset: 0x700CAF4, symbol: D_TI1_700CAF4}
+aTiBomberAnim:
+  { type: SF64:ANIM, offset: 0x700CAF4, symbol: aTiBomberAnim}
 
-D_TI1_700CB60:
-  {type: SF64:SKELETON, offset: 0x700CB60, symbol: D_TI1_700CB60}
+aTiBomberSkel:
+  {type: SF64:SKELETON, offset: 0x700CB60, symbol: aTiBomberSkel}
 
 aTiRascoAnim:
   { type: SF64:ANIM, offset: 0x700D534, symbol: aTiRascoAnim }
diff --git a/assets/yaml/us/rev1/ast_allies.yaml b/assets/yaml/us/rev1/ast_allies.yaml
index d4997d4b..c22d8734 100644
--- a/assets/yaml/us/rev1/ast_allies.yaml
+++ b/assets/yaml/us/rev1/ast_allies.yaml
@@ -59,8 +59,8 @@ D_D0098B0:
 D_D009938:
   { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 16, offset: 0x0D009938, symbol: D_D009938 }
 
-D_D009A40:
-  { type: GFX, offset: 0xD009A40, symbol: D_D009A40 }
+aKattShipDL:
+  { type: GFX, offset: 0xD009A40, symbol: aKattShipDL }
 
 D_D00A3B8:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0D00A3B8, symbol: D_D00A3B8 }
@@ -97,8 +97,8 @@ aJamesMarkTex:
 aJamesMarkTLUT:
   { type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0xD00B870, symbol: aJamesMarkTLUT }
 
-D_D00B880:
-  { type: GFX, offset: 0xD00B880, symbol: D_D00B880 }
+aBillShipDL:
+  { type: GFX, offset: 0xD00B880, symbol: aBillShipDL }
 
 ast_allies_seg13_vtx_BB70:
   { type: VTX, count: 144, offset: 0xD00BB70, symbol: ast_allies_seg13_vtx_BB70 }
diff --git a/assets/yaml/us/rev1/ast_aquas.yaml b/assets/yaml/us/rev1/ast_aquas.yaml
index b45cb0cd..32e9bdf2 100644
--- a/assets/yaml/us/rev1/ast_aquas.yaml
+++ b/assets/yaml/us/rev1/ast_aquas.yaml
@@ -22,8 +22,8 @@ aAqSquidAnim:
 aAqSquidSkel:
   { type: SF64:SKELETON, offset: 0x6000DB0, symbol: aAqSquidSkel }
 
-D_AQ_6000E10:
-  { type: GFX, offset: 0x6000E10, symbol: D_AQ_6000E10 }
+aAqShellDL:
+  { type: GFX, offset: 0x6000E10, symbol: aAqShellDL }
 
 D_AQ_6001130:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6001130, symbol: D_AQ_6001130 }
@@ -98,8 +98,8 @@ D_AQ_6003FF0:
 D_AQ_6008168:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6008168, symbol: D_AQ_6008168 }
 
-D_AQ_6008970:
-  { type: GFX, offset: 0x6008970, symbol: D_AQ_6008970 }
+aAqStarfishDL:
+  { type: GFX, offset: 0x6008970, symbol: aAqStarfishDL }
 
 D_AQ_6008EC8:
   { type: TEXTURE, ctype: u8, format: CI8, width: 16, height: 16, offset: 0x6008EC8, symbol: D_AQ_6008EC8, tlut: 0x6008FC8 }
@@ -659,14 +659,14 @@ D_AQ_60308B8:
 aBoss301Hitbox:
   { type: SF64:HITBOX, offset: 0x6030B10, symbol: aBoss301Hitbox }
 
-D_AQ_6030B14_f32:
-  { type: SF64:HITBOX, offset: 0x6030B14, symbol: D_AQ_6030B14_f32 }
+aAqShellHitbox:
+  { type: SF64:HITBOX, offset: 0x6030B14, symbol: aAqShellHitbox }
 
-D_AQ_6030B30:
-  { type: SF64:HITBOX, offset: 0x6030B30, symbol: D_AQ_6030B30 }
+aAqStarfishHitbox:
+  { type: SF64:HITBOX, offset: 0x6030B30, symbol: aAqStarfishHitbox }
 
-D_AQ_6030B4C:
-  { type: SF64:HITBOX, offset: 0x6030B4C, symbol: D_AQ_6030B4C }
+aAqOysterEvHitbox:
+  { type: SF64:HITBOX, offset: 0x6030B4C, symbol: aAqOysterEvHitbox }
 
 D_AQ_6030B68:
   { type: SF64:HITBOX, offset: 0x6030B68, symbol: D_AQ_6030B68 }
diff --git a/assets/yaml/us/rev1/ast_area_6.yaml b/assets/yaml/us/rev1/ast_area_6.yaml
index e673f924..7ff0e0cf 100644
--- a/assets/yaml/us/rev1/ast_area_6.yaml
+++ b/assets/yaml/us/rev1/ast_area_6.yaml
@@ -57,8 +57,8 @@ D_A6_6009718:
 D_A6_6009B18:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06009B18, symbol: D_A6_6009B18 }
 
-D_A6_600E0C0:
-  { type: GFX, offset: 0x600E0C0, symbol: D_A6_600E0C0 }
+aA6UmbraStationDL:
+  { type: GFX, offset: 0x600E0C0, symbol: aA6UmbraStationDL }
 
 D_A6_600EBE8:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 16, offset: 0x0600EBE8, symbol: D_A6_600EBE8 }
@@ -96,8 +96,8 @@ D_A6_6012550:
 D_A6_6012840:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06012840, symbol: D_A6_6012840 }
 
-D_A6_6012A40:
-  { type: GFX, offset: 0x6012A40, symbol: D_A6_6012A40 }
+aA6HarlockFrigateDL:
+  { type: GFX, offset: 0x6012A40, symbol: aA6HarlockFrigateDL }
 
 D_A6_6013CD8:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06013CD8, symbol: D_A6_6013CD8 }
@@ -117,8 +117,8 @@ D_A6_6015CD8:
 D_A6_6015EE0:
   { type: GFX, offset: 0x6015EE0, symbol: D_A6_6015EE0 }
 
-D_A6_6016190:
-  { type: GFX, offset: 0x6016190, symbol: D_A6_6016190 }
+aA6ZeramClassCruiserDL:
+  { type: GFX, offset: 0x6016190, symbol: aA6ZeramClassCruiserDL }
 
 D_A6_6017120:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06017120, symbol: D_A6_6017120 }
@@ -150,8 +150,8 @@ D_A6_6018994:
 D_A6_6018BA0:
   { type: SF64:SKELETON, offset: 0x6018BA0, symbol: D_A6_6018BA0 }
 
-D_A6_6018BF0:
-  { type: GFX, offset: 0x6018BF0, symbol: D_A6_6018BF0 }
+aA6NinjinMissileDL:
+  { type: GFX, offset: 0x6018BF0, symbol: aA6NinjinMissileDL }
 
 D_A6_6019130:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06019130, symbol: D_A6_6019130 }
@@ -162,8 +162,8 @@ D_A6_6019330:
 D_A6_6019530:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06019530, symbol: D_A6_6019530 }
 
-D_A6_6019730:
-  { type: GFX, offset: 0x6019730, symbol: D_A6_6019730 }
+aA6RocketDL:
+  { type: GFX, offset: 0x6019730, symbol: aA6RocketDL }
 
 D_A6_6019B20:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06019B20, symbol: D_A6_6019B20 }
@@ -174,8 +174,8 @@ D_A6_6019D20:
 D_A6_6019F20:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06019F20, symbol: D_A6_6019F20 }
 
-D_A6_601A120:
-  { type: GFX, offset: 0x601A120, symbol: D_A6_601A120 }
+aA6SpaceMineDL:
+  { type: GFX, offset: 0x601A120, symbol: aA6SpaceMineDL }
 
 D_A6_601A220:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0601A220, symbol: D_A6_601A220 }
@@ -228,14 +228,14 @@ D_A6_6023F64:
 D_A6_6027F50:
   { type: SF64:SCRIPT, offset: 0x6027F50, symbol: D_A6_6027F50}
 
-D_A6_60280E0:
-  { type: SF64:HITBOX, offset: 0x60280E0, symbol: D_A6_60280E0 }
+aA6UmbraStationHitbox:
+  { type: SF64:HITBOX, offset: 0x60280E0, symbol: aA6UmbraStationHitbox }
 
-D_A6_6028254:
-  { type: SF64:HITBOX, offset: 0x6028254, symbol: D_A6_6028254 }
+aA6HarlockFrigateHitbox:
+  { type: SF64:HITBOX, offset: 0x6028254, symbol: aA6HarlockFrigateHitbox }
 
-D_A6_60282A0:
-  { type: SF64:HITBOX, offset: 0x60282A0, symbol: D_A6_60282A0 }
+aA6ZeramClassCruiserHitbox:
+  { type: SF64:HITBOX, offset: 0x60282A0, symbol: aA6ZeramClassCruiserHitbox }
 
 aA6GorgonHitbox:
   { type: SF64:HITBOX, offset: 0x6028454, symbol: aA6GorgonHitbox }
diff --git a/assets/yaml/us/rev1/ast_common.yaml b/assets/yaml/us/rev1/ast_common.yaml
index 81a615f3..3372ef0e 100644
--- a/assets/yaml/us/rev1/ast_common.yaml
+++ b/assets/yaml/us/rev1/ast_common.yaml
@@ -980,8 +980,8 @@ D_1031EC0:
 D_1032578:
   { type: TEXTURE, format: RGBA16, width: 16, height: 16, ctype: u16, offset: 0x1032578, symbol: D_1032578 }
 
-D_1032780:
-  { type: GFX, offset: 0x1032780, symbol: D_1032780 }
+aArwingShadowDL:
+  { type: GFX, offset: 0x1032780, symbol: aArwingShadowDL }
 
 D_1032808:
   { type: TEXTURE, format: IA8, width: 32, height: 32, ctype: u8, offset: 0x1032808, symbol: D_1032808 }
diff --git a/assets/yaml/us/rev1/ast_corneria.yaml b/assets/yaml/us/rev1/ast_corneria.yaml
index 424a0f8c..2cc6ece2 100644
--- a/assets/yaml/us/rev1/ast_corneria.yaml
+++ b/assets/yaml/us/rev1/ast_corneria.yaml
@@ -111,8 +111,8 @@ aCoHighway5DL:
 D_CO_6011790:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06011790, symbol: D_CO_6011790 }
 
-D_CO_6011F90:
-  { type: GFX, offset: 0x6011F90, symbol: D_CO_6011F90 }
+aCoCornerianFighterDL:
+  { type: GFX, offset: 0x6011F90, symbol: aCoCornerianFighterDL }
 
 D_CO_6012640:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06012640, symbol: D_CO_6012640 }
diff --git a/assets/yaml/us/rev1/ast_enmy_planet.yaml b/assets/yaml/us/rev1/ast_enmy_planet.yaml
index 9ea49f50..e74507f8 100644
--- a/assets/yaml/us/rev1/ast_enmy_planet.yaml
+++ b/assets/yaml/us/rev1/ast_enmy_planet.yaml
@@ -15,14 +15,14 @@ D_ENMY_PLANET_4000290:
 ast_enmy_planet_seg4_vtx_8F8:
   { type: VTX, count: 90, offset: 0x40008F8, symbol: ast_enmy_planet_seg4_vtx_8F8 }
 
-D_ENMY_PLANET_40001A4:
-  { type: SF64:ANIM, offset: 0x40001A4, symbol: D_ENMY_PLANET_40001A4 }
+aTripodAnim:
+  { type: SF64:ANIM, offset: 0x40001A4, symbol: aTripodAnim }
 
-D_ENMY_PLANET_4000270: 
-  { type: SF64:SKELETON, offset: 0x4000270, symbol: D_ENMY_PLANET_4000270 }
+aTripodSkel: 
+  { type: SF64:SKELETON, offset: 0x4000270, symbol: aTripodSkel }
 
-D_ENMY_PLANET_4000710:
-  { type: GFX, offset: 0x4000710, symbol: D_ENMY_PLANET_4000710 }
+aVenomTankDL:
+  { type: GFX, offset: 0x4000710, symbol: aVenomTankDL }
 
 D_ENMY_PLANET_4001298:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x04001298, symbol: D_ENMY_PLANET_4001298 }
@@ -60,11 +60,11 @@ D_ENMY_PLANET_4004538:
 D_ENMY_PLANET_4004D38:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x04004D38, symbol: D_ENMY_PLANET_4004D38 }
 
-D_ENMY_PLANET_40057AC:
-  { type: SF64:ANIM, offset: 0x40057AC, symbol: D_ENMY_PLANET_40057AC }
+aFirebirdAnim:
+  { type: SF64:ANIM, offset: 0x40057AC, symbol: aFirebirdAnim }
 
-D_ENMY_PLANET_40058B8: 
-  { type: SF64:SKELETON, offset: 0x40058B8, symbol: D_ENMY_PLANET_40058B8 }
+aFirebirdSkel: 
+  { type: SF64:SKELETON, offset: 0x40058B8, symbol: aFirebirdSkel }
 
 D_ENMY_PLANET_4005E78:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x04005E78, symbol: D_ENMY_PLANET_4005E78 }
@@ -81,17 +81,17 @@ D_ENMY_PLANET_40064E8:
 D_ENMY_PLANET_40066E8:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x040066E8, symbol: D_ENMY_PLANET_40066E8 }
 
-D_ENMY_PLANET_40068F0:
-  { type: GFX, offset: 0x40068F0, symbol: D_ENMY_PLANET_40068F0 }
+aVenomFighter1DL:
+  { type: GFX, offset: 0x40068F0, symbol: aVenomFighter1DL }
 
-D_ENMY_PLANET_4006E90:
-  { type: GFX, offset: 0x4006E90, symbol: D_ENMY_PLANET_4006E90 }
+aVenomFighter2DL:
+  { type: GFX, offset: 0x4006E90, symbol: aVenomFighter2DL }
 
-D_ENMY_PLANET_40073C0:
-  { type: GFX, offset: 0x40073C0, symbol: D_ENMY_PLANET_40073C0 }
+aGrangaFighter1DL:
+  { type: GFX, offset: 0x40073C0, symbol: aGrangaFighter1DL }
 
-D_ENMY_PLANET_4007AF0:
-  { type: GFX, offset: 0x4007AF0, symbol: D_ENMY_PLANET_4007AF0 }
+aGrangaFighter2DL:
+  { type: GFX, offset: 0x4007AF0, symbol: aGrangaFighter2DL }
 
 D_ENMY_PLANET_4008100:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x04008100, symbol: D_ENMY_PLANET_4008100 }
@@ -108,5 +108,5 @@ D_ENMY_PLANET_4008FF8:
 D_ENMY_PLANET_4008F70:
   { type: GFX, offset: 0x4008F70, symbol: D_ENMY_PLANET_4008F70 }
 
-D_ENMY_PLANET_4009800:
-  { type: GFX, offset: 0x4009800, symbol: D_ENMY_PLANET_4009800 }
+aSpyEyeDL:
+  { type: GFX, offset: 0x4009800, symbol: aSpyEyeDL }
diff --git a/assets/yaml/us/rev1/ast_enmy_space.yaml b/assets/yaml/us/rev1/ast_enmy_space.yaml
index 0b4663af..959efde9 100644
--- a/assets/yaml/us/rev1/ast_enmy_space.yaml
+++ b/assets/yaml/us/rev1/ast_enmy_space.yaml
@@ -8,26 +8,26 @@
       - '#include "gfx.h"'
       - '#include "sf64object.h"'
 
-D_ENMY_SPACE_4000080:
-  { type: SF64:ANIM, offset: 0x4000080, symbol: D_ENMY_SPACE_4000080 }
+aKillerBeeAnim:
+  { type: SF64:ANIM, offset: 0x4000080, symbol: aKillerBeeAnim }
 
-D_ENMY_SPACE_400014C: 
-  { type: SF64:SKELETON, offset: 0x400014C, symbol: D_ENMY_SPACE_400014C }
+aKillerBeeSkel: 
+  { type: SF64:SKELETON, offset: 0x400014C, symbol: aKillerBeeSkel }
 
 aEnmySpMeMora1DL:
   { type: GFX, offset: 0x4000170, symbol: aEnmySpMeMora1DL }
 
-D_ENMY_SPACE_4000650:
-  { type: GFX, offset: 0x4000650, symbol: D_ENMY_SPACE_4000650 }
+aSpiderDL:
+  { type: GFX, offset: 0x4000650, symbol: aSpiderDL }
 
-D_ENMY_SPACE_4000EC0:
-  { type: GFX, offset: 0x4000EC0, symbol: D_ENMY_SPACE_4000EC0 }
+aGammaOnDL:
+  { type: GFX, offset: 0x4000EC0, symbol: aGammaOnDL }
 
 D_ENMY_SPACE_4001108:
   { type: TEXTURE, format: RGBA16, offset: 0x4001108, width: 16, height: 16, ctype: u16, symbol: D_ENMY_SPACE_4001108 }
 
-D_ENMY_SPACE_4001310:
-  { type: GFX, offset: 0x4001310, symbol: D_ENMY_SPACE_4001310 }
+aAttacker2DL:
+  { type: GFX, offset: 0x4001310, symbol: aAttacker2DL }
 
 D_ENMY_SPACE_4001A30:
   { type: TEXTURE, format: RGBA16, offset: 0x4001A30, width: 16, height: 16, ctype: u16, symbol: D_ENMY_SPACE_4001A30 }
@@ -95,11 +95,11 @@ aEnmySpMeMora2DL:
 D_ENMY_SPACE_4008550:
   { type: TEXTURE, format: RGBA16, offset: 0x04008550, width: 32, height: 32, ctype: u16, symbol: D_ENMY_SPACE_4008550 }
 
-D_ENMY_SPACE_4008D50:
-  { type: GFX, offset: 0x4008D50, symbol: D_ENMY_SPACE_4008D50 }
+aGammaOffDL:
+  { type: GFX, offset: 0x4008D50, symbol: aGammaOffDL }
 
-D_ENMY_SPACE_4008FA0:
-  { type: GFX, offset: 0x4008FA0, symbol: D_ENMY_SPACE_4008FA0 }
+aVenomFighter3DL:
+  { type: GFX, offset: 0x4008FA0, symbol: aVenomFighter3DL }
 
 D_ENMY_SPACE_40096B8:
   { type: TEXTURE, format: RGBA16, offset: 0x040096B8, width: 16, height: 16, ctype: u16, symbol: D_ENMY_SPACE_40096B8 }
@@ -110,25 +110,25 @@ D_ENMY_SPACE_40098B8:
 D_ENMY_SPACE_4009AB8:
   { type: TEXTURE, format: RGBA16, offset: 0x04009AB8, width: 32, height: 32, ctype: u16, symbol: D_ENMY_SPACE_4009AB8 }
 
-D_ENMY_SPACE_400A30C:
-  { type: SF64:ANIM, offset: 0x400A30C, symbol: D_ENMY_SPACE_400A30C }
+aCruiserGunAnim:
+  { type: SF64:ANIM, offset: 0x400A30C, symbol: aCruiserGunAnim }
 
-D_ENMY_SPACE_400A398:
-  { type: SF64:SKELETON, offset: 0x400A398, symbol: D_ENMY_SPACE_400A398 }
+aCruiserGunSkel:
+  { type: SF64:SKELETON, offset: 0x400A398, symbol: aCruiserGunSkel }
 
 aEnmySpMeMora3DL:
   { type: GFX, offset: 0x400A630, symbol: aEnmySpMeMora3DL }
 
   
-D_ENMY_SPACE_400AAE0:
-  { type: GFX, offset: 0x400AAE0, symbol: D_ENMY_SPACE_400AAE0 }
+aCommanderDL:
+  { type: GFX, offset: 0x400AAE0, symbol: aCommanderDL }
 
   
-D_ENMY_SPACE_400B390:
-  { type: GFX, offset: 0x400B390, symbol: D_ENMY_SPACE_400B390 }
+aAttacker3DL:
+  { type: GFX, offset: 0x400B390, symbol: aAttacker3DL }
   
   
-D_ENMY_SPACE_400BD20:
-  { type: GFX, offset: 0x400BD20, symbol: D_ENMY_SPACE_400BD20 }
+aAttacker1DL:
+  { type: GFX, offset: 0x400BD20, symbol: aAttacker1DL }
 
 # size = 0xC510
\ No newline at end of file
diff --git a/assets/yaml/us/rev1/ast_fortuna.yaml b/assets/yaml/us/rev1/ast_fortuna.yaml
index 81adb759..9c931460 100644
--- a/assets/yaml/us/rev1/ast_fortuna.yaml
+++ b/assets/yaml/us/rev1/ast_fortuna.yaml
@@ -110,8 +110,8 @@ D_FO_6008150:
 D_FO_6009070:
   { type: TEXTURE, format: RGBA16, width: 44, height: 44, offset: 0x6009070, ctype: u16, symbol: D_FO_6009070 }
 
-D_FO_6009F90:
-  { type: GFX, offset: 0x6009F90, symbol: D_FO_6009F90 }
+aFoEnemyShadowDL:
+  { type: GFX, offset: 0x6009F90, symbol: aFoEnemyShadowDL }
 
 D_FO_600A018:
   { type: TEXTURE, format: IA8, width: 32, height: 32, offset: 0x600A018, ctype: u8, symbol: D_FO_600A018 }
diff --git a/assets/yaml/us/rev1/ast_katina.yaml b/assets/yaml/us/rev1/ast_katina.yaml
index 6198381e..7a1a7729 100644
--- a/assets/yaml/us/rev1/ast_katina.yaml
+++ b/assets/yaml/us/rev1/ast_katina.yaml
@@ -109,14 +109,14 @@ aDestroyedHatch4DL:
 aDestroyedHatch3DL:
   { type: GFX, offset: 0x600D4E0, symbol: aDestroyedHatch3DL }
 
-D_KA_600D730:
-  { type: GFX, offset: 0x600D730, symbol: D_KA_600D730 }
+aKaCornerianFighterShadowDL:
+  { type: GFX, offset: 0x600D730, symbol: aKaCornerianFighterShadowDL }
 
 D_KA_600D7B8:
   { type: TEXTURE, format: IA8, width: 32, height: 32, offset: 0x600D7B8, ctype: u8, symbol: D_KA_600D7B8 }
 
-D_KA_600DBC0:
-  { type: GFX, offset: 0x600DBC0, symbol: D_KA_600DBC0 }
+aKaEnemyShadowDL:
+  { type: GFX, offset: 0x600DBC0, symbol: aKaEnemyShadowDL }
 
 D_KA_600DC48:
   { type: TEXTURE, format: IA8, width: 32, height: 32, offset: 0x600DC48, ctype: u8, symbol: D_KA_600DC48 }
diff --git a/assets/yaml/us/rev1/ast_macbeth.yaml b/assets/yaml/us/rev1/ast_macbeth.yaml
index 771ccfef..6f435c7b 100644
--- a/assets/yaml/us/rev1/ast_macbeth.yaml
+++ b/assets/yaml/us/rev1/ast_macbeth.yaml
@@ -61,8 +61,8 @@ D_MA_60026F8:
 D_MA_60027F8:
   { type: TEXTURE, format: TLUT, ctype: u16, colors: 72, offset: 0x60027F8, symbol: D_MA_60027F8}
 
-D_MA_6002890:
-  {type: GFX, offset: 0x6002890, symbol: D_MA_6002890}
+aMaGuillotine2DL:
+  {type: GFX, offset: 0x6002890, symbol: aMaGuillotine2DL}
 
 D_MA_6002C20:
   { type: TEXTURE, format: CI8, ctype: u8, width: 32, height: 16, offset: 0x6002C20, symbol: D_MA_6002C20, tlut: 0x6002E20}
@@ -238,8 +238,8 @@ D_MA_600AE18:
 D_MA_600AE98:
   { type: TEXTURE, format: TLUT, ctype: u16, colors: 80, offset: 0x600AE98, symbol: D_MA_600AE98}
 
-aMaGuillotineDL:
-  {type: GFX, offset: 0x600AF40, symbol: aMaGuillotineDL}
+aMaGuillotine1DL:
+  {type: GFX, offset: 0x600AF40, symbol: aMaGuillotine1DL}
 
 D_MA_600B2E0:
   { type: TEXTURE, format: RGBA16, ctype: u16, width: 32, height: 64, offset: 0x600B2E0, symbol: D_MA_600B2E0}
@@ -274,8 +274,8 @@ D_MA_600D878:
 D_MA_600D978:
   { type: TEXTURE, format: TLUT, ctype: u16, colors: 72, offset: 0x600D978, symbol: D_MA_600D978}
 
-D_MA_600DA10:
-  {type: GFX, offset: 0x600DA10, symbol: D_MA_600DA10}
+aMaLaserTurretDL:
+  {type: GFX, offset: 0x600DA10, symbol: aMaLaserTurretDL}
 
 D_MA_600DF60:
   { type: TEXTURE, format: CI8, ctype: u8, width: 32, height: 32, offset: 0x600DF60, symbol: D_MA_600DF60, tlut: 0x600E360}
@@ -478,8 +478,8 @@ aMaTowerTopDL:
 D_MA_601C170:
   {type: GFX, offset: 0x601C170, symbol: D_MA_601C170}
 
-D_MA_601C520:
-  {type: GFX, offset: 0x601C520, symbol: D_MA_601C520}
+aMaRailroadCartDL:
+  {type: GFX, offset: 0x601C520, symbol: aMaRailroadCartDL}
 
 D_MA_601D188:
   {type: SF64:ANIM, offset: 0x601D188, symbol: D_MA_601D188}
@@ -922,8 +922,8 @@ aMaGuillotineHousingHitbox:
 aMaGuillotineHitbox:
   {type: SF64:HITBOX, offset: 0x60368E0, symbol: aMaGuillotineHitbox}
 
-D_MA_60368FC:
-  {type: SF64:HITBOX, offset: 0x60368FC, symbol: D_MA_60368FC}
+aMaRailroadCartHitbox:
+  {type: SF64:HITBOX, offset: 0x60368FC, symbol: aMaRailroadCartHitbox}
 
 aMaBombDropHitbox:
   {type: SF64:HITBOX, offset: 0x6036930, symbol: aMaBombDropHitbox}
diff --git a/assets/yaml/us/rev1/ast_map.yaml b/assets/yaml/us/rev1/ast_map.yaml
index a77becb0..d920225d 100644
--- a/assets/yaml/us/rev1/ast_map.yaml
+++ b/assets/yaml/us/rev1/ast_map.yaml
@@ -412,8 +412,8 @@ D_MAP_604A8D8:
   { type: TEXTURE, ctype: u16, format: TLUT, colors: 136, offset: 0x0604A8D8, symbol: D_MAP_604A8D8 }
 
 # Arwing Model, used in the map.
-D_MAP_604A9F0:
-  { type: GFX, offset: 0x604A9F0, symbol: D_MAP_604A9F0 }
+aMapArwingDL:
+  { type: GFX, offset: 0x604A9F0, symbol: aMapArwingDL }
 
 ast_map_seg6_vtx_4AD50:
   { type: VTX, offset: 0x604AD50, count: 124, symbol: ast_map_seg6_vtx_4AD50 }
diff --git a/assets/yaml/us/rev1/ast_meteo.yaml b/assets/yaml/us/rev1/ast_meteo.yaml
index 88d29573..9d364b6b 100644
--- a/assets/yaml/us/rev1/ast_meteo.yaml
+++ b/assets/yaml/us/rev1/ast_meteo.yaml
@@ -62,8 +62,8 @@ D_ME_60080C0:
 D_ME_6008A18:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x06008A18, symbol: D_ME_6008A18 }
   
-D_ME_6008AA0: 
-  { type: GFX, offset: 0x6008AA0, symbol: D_ME_6008AA0 }
+aMeFlipBot1DL: 
+  { type: GFX, offset: 0x6008AA0, symbol: aMeFlipBot1DL }
 
 D_ME_6009228: 
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06009228, symbol: D_ME_6009228 }
@@ -74,35 +74,35 @@ D_ME_6009A28:
 D_ME_6009C28: 
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06009C28, symbol: D_ME_6009C28 }
   
-D_ME_6009E30: 
-  { type: GFX, offset: 0x6009E30, symbol: D_ME_6009E30 }
+aMeFlipBot2DL: 
+  { type: GFX, offset: 0x6009E30, symbol: aMeFlipBot2DL }
   
-D_ME_6009F50: 
-  { type: GFX, offset: 0x6009F50, symbol: D_ME_6009F50 }
+aMeBigMeteorDL: 
+  { type: GFX, offset: 0x6009F50, symbol: aMeBigMeteorDL }
   
-D_ME_600AC70: 
-  { type: GFX, offset: 0x600AC70, symbol: D_ME_600AC70 }
+aMeMeteor7DL: 
+  { type: GFX, offset: 0x600AC70, symbol: aMeMeteor7DL }
 
 D_ME_600B540: 
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0600B540, symbol: D_ME_600B540 }
 
-D_ME_600BD40: 
-  { type: GFX, offset: 0x600BD40, symbol: D_ME_600BD40 }
+aMeSecretMarker2DL: 
+  { type: GFX, offset: 0x600BD40, symbol: aMeSecretMarker2DL }
 
 D_ME_600BF30:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0600BF30, symbol: D_ME_600BF30 }
   
-D_ME_600C130:
-  { type: GFX, offset: 0x600C130, symbol: D_ME_600C130 }
+aMeRockGull2DL:
+  { type: GFX, offset: 0x600C130, symbol: aMeRockGull2DL }
   
-D_ME_600C2A0:
-  { type: GFX, offset: 0x600C2A0, symbol: D_ME_600C2A0 }
+aMeMeteor6DL:
+  { type: GFX, offset: 0x600C2A0, symbol: aMeMeteor6DL }
   
-D_ME_600C740:
-  { type: GFX, offset: 0x600C740, symbol: D_ME_600C740 }
+aMeRockGull3DL:
+  { type: GFX, offset: 0x600C740, symbol: aMeRockGull3DL }
   
-D_ME_600CAA0:
-  { type: GFX, offset: 0x600CAA0, symbol: D_ME_600CAA0 }
+aMeRockGull1DL:
+  { type: GFX, offset: 0x600CAA0, symbol: aMeRockGull1DL }
   
 aMeMeteorShower3DL:
   { type: GFX, offset: 0x600CD60, symbol: aMeMeteorShower3DL }
@@ -149,20 +149,20 @@ D_ME_60172C8:
 aMeMeteorShower1DL:
   { type: GFX, offset: 0x06017AD0, symbol: aMeMeteorShower1DL }
 
-D_ME_6017B60:
-  { type: GFX, offset: 0x06017B60, symbol: D_ME_6017B60 }
+aMeMeteor3DL:
+  { type: GFX, offset: 0x06017B60, symbol: aMeMeteor3DL }
 
 aMeLaserCannon2DL:
   { type: GFX, offset: 0x06018450, symbol: aMeLaserCannon2DL }
 
-D_ME_6018960:
-  { type: GFX, offset: 0x06018960, symbol: D_ME_6018960 }
+aMeMeteor5DL:
+  { type: GFX, offset: 0x06018960, symbol: aMeMeteor5DL }
 
-aMeMeteorDL:
-  { type: GFX, offset: 0x06018C00, symbol: aMeMeteorDL }
+aMeMeteor1DL:
+  { type: GFX, offset: 0x06018C00, symbol: aMeMeteor1DL }
 
-D_ME_6019430:
-  { type: GFX, offset: 0x06019430, symbol: D_ME_6019430 }
+aMeMeteor4DL:
+  { type: GFX, offset: 0x06019430, symbol: aMeMeteor4DL }
 
 D_ME_6019880:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06019880, symbol: D_ME_6019880 }
@@ -170,8 +170,8 @@ D_ME_6019880:
 D_ME_601A080: 
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0601A080, symbol: D_ME_601A080 }
 
-D_ME_601A880:
-  { type: GFX, offset: 0x0601A880, symbol: D_ME_601A880 }
+aMeSecretMarker1DL:
+  { type: GFX, offset: 0x0601A880, symbol: aMeSecretMarker1DL }
 
 aMeMeteoTunnelDL:
   { type: GFX, offset: 0x0601AE40, symbol: aMeMeteoTunnelDL }
@@ -195,8 +195,8 @@ D_ME_601EA00:
 D_ME_601EA98: 
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0601EA98, symbol: D_ME_601EA98 }
 
-D_ME_601F2A0: 
-  { type: GFX, offset: 0x0601F2A0, symbol: D_ME_601F2A0 }
+aMeMeteor2DL: 
+  { type: GFX, offset: 0x0601F2A0, symbol: aMeMeteor2DL }
 
 D_ME_601F778:  
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0601F778, symbol: D_ME_601F778 }
@@ -280,8 +280,8 @@ D_ME_602B148:
 D_ME_602F3AC:
   { type: SF64:SCRIPT, offset: 0x602F3AC, symbol: D_ME_602F3AC }
 
-D_ME_602F604:
-  { type: SF64:HITBOX, offset: 0x602F604, symbol: D_ME_602F604 }
+aMeFlipBotHitbox:
+  { type: SF64:HITBOX, offset: 0x602F604, symbol: aMeFlipBotHitbox }
 
 D_ME_602F638:
   { type: SF64:HITBOX, offset: 0x602F638, symbol: D_ME_602F638 }
diff --git a/assets/yaml/us/rev1/ast_sector_x.yaml b/assets/yaml/us/rev1/ast_sector_x.yaml
index 9faf8795..e36aea16 100644
--- a/assets/yaml/us/rev1/ast_sector_x.yaml
+++ b/assets/yaml/us/rev1/ast_sector_x.yaml
@@ -16,8 +16,8 @@
 D_SX_6000000:
   { type: TEXTURE, ctype: u8, format: IA8, width: 176, height: 12, offset: 0x6000000, symbol: D_SX_6000000 }
 
-D_SX_6000840:
-  { type: GFX, offset: 0x6000840, symbol: D_SX_6000840 }
+aSxSpaceMineDL:
+  { type: GFX, offset: 0x6000840, symbol: aSxSpaceMineDL }
 
 # Flying mine
 D_SX_60008C0:
@@ -30,14 +30,14 @@ D_SX_60010C0:
 D_SX_6001150:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6001150, symbol: D_SX_6001150 }
 
-D_SX_6001950:
-  { type: GFX, offset: 0x6001950, symbol: D_SX_6001950 }
+aSxLaserDestroyedDL:
+  { type: GFX, offset: 0x6001950, symbol: aSxLaserDestroyedDL }
 
 D_SX_6001AD8:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6001AD8, symbol: D_SX_6001AD8 }
 
-D_SX_6001CE0:
-  { type: GFX, offset: 0x6001CE0, symbol: D_SX_6001CE0 }
+aSxWatchPostDL:
+  { type: GFX, offset: 0x6001CE0, symbol: aSxWatchPostDL }
 
 D_SX_60020C0:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x60020C0, symbol: D_SX_60020C0 }
@@ -75,8 +75,8 @@ D_SX_6004EE8:
 D_SX_6005EE8:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6005EE8, symbol: D_SX_6005EE8 }
 
-D_SX_60066F0:
-  { type: GFX, offset: 0x60066F0, symbol: D_SX_60066F0 }
+aSxLaserDL:
+  { type: GFX, offset: 0x60066F0, symbol: aSxLaserDL }
 
 D_SX_6006810:
   { type: GFX, offset: 0x6006810, symbol: D_SX_6006810 }
@@ -102,8 +102,8 @@ D_SX_6009548:
 D_SX_6009748:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6009748, symbol: D_SX_6009748 }
 
-D_SX_6009950:
-  { type: GFX, offset: 0x6009950, symbol: D_SX_6009950 }
+aSxBaseFloor1DL:
+  { type: GFX, offset: 0x6009950, symbol: aSxBaseFloor1DL }
 
 D_SX_6009C30:
   { type: GFX, offset: 0x6009C30, symbol: D_SX_6009C30 }
@@ -117,8 +117,8 @@ D_SX_6009FF8:
 D_SX_600A2D4:
   { type: SF64:ANIM, offset: 0x600A2D4, symbol: D_SX_600A2D4 }
 
-D_SX_600A2E0:
-  { type: GFX, offset: 0x600A2E0, symbol: D_SX_600A2E0 }
+aSxBaseWall3DL:
+  { type: GFX, offset: 0x600A2E0, symbol: aSxBaseWall3DL }
 
 D_SX_600A570:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x600A570, symbol: D_SX_600A570 }
@@ -126,17 +126,17 @@ D_SX_600A570:
 D_SX_600AD70:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x600AD70, symbol: D_SX_600AD70 }
 
-D_SX_600AF70:
-  { type: GFX, offset: 0x600AF70, symbol: D_SX_600AF70 }
+aSxBaseWall1DL:
+  { type: GFX, offset: 0x600AF70, symbol: aSxBaseWall1DL }
 
-D_SX_600B2B0:
-  { type: GFX, offset: 0x600B2B0, symbol: D_SX_600B2B0 }
+aSxBaseWall2DL:
+  { type: GFX, offset: 0x600B2B0, symbol: aSxBaseWall2DL }
 
-D_SX_600B540:
-  { type: GFX, offset: 0x600B540, symbol: D_SX_600B540 }
+aSxBaseWall4DL:
+  { type: GFX, offset: 0x600B540, symbol: aSxBaseWall4DL }
 
-D_SX_600B830:
-  { type: GFX, offset: 0x600B830, symbol: D_SX_600B830 }
+aSxBorzoiFighterDL:
+  { type: GFX, offset: 0x600B830, symbol: aSxBorzoiFighterDL }
 
 D_SX_600C000:
   { type: GFX, offset: 0x600C000, symbol: D_SX_600C000 }
@@ -189,8 +189,8 @@ D_SX_60206DC:
 aSxSpyborgSkel:
   { type: SF64:SKELETON, offset: 0x6020C68, symbol: aSxSpyborgSkel }
 
-D_SX_6020D20:
-  { type: GFX, offset: 0x6020D20, symbol: D_SX_6020D20 }
+aSxBaseWallTile1DL:
+  { type: GFX, offset: 0x6020D20, symbol: aSxBaseWallTile1DL }
 
 # Spyborg Radio
 D_SX_6020FB0:
@@ -199,20 +199,20 @@ D_SX_6020FB0:
 D_SX_6021ED0:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x06021ED0, symbol: D_SX_6021ED0 }
 
-D_SX_6022DF0:
-  { type: GFX, offset: 0x6022DF0, symbol: D_SX_6022DF0 }
+aSxCanineDL:
+  { type: GFX, offset: 0x6022DF0, symbol: aSxCanineDL }
 
-D_SX_6023500:
-  { type: GFX, offset: 0x6023500, symbol: D_SX_6023500 }
+aSxSpyEyeDL:
+  { type: GFX, offset: 0x6023500, symbol: aSxSpyEyeDL }
 
 D_SX_6023C30:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06023C30, symbol: D_SX_6023C30 }
 
-D_SX_6023E30:
-  { type: GFX, offset: 0x6023E30, symbol: D_SX_6023E30 }
+aSxBaseDebris2DL:
+  { type: GFX, offset: 0x6023E30, symbol: aSxBaseDebris2DL }
 
-D_SX_60285F0:
-  { type: GFX, offset: 0x60285F0, symbol: D_SX_60285F0 }
+aSxBaseDebris1DL:
+  { type: GFX, offset: 0x60285F0, symbol: aSxBaseDebris1DL }
 
 D_SX_6029098:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06029098, symbol: D_SX_6029098 }
@@ -241,8 +241,8 @@ D_SX_60320D0:
 D_SX_6032328:
   { type: SF64:HITBOX, offset: 0x6032328, symbol: D_SX_6032328 }
 
-D_SX_603238C:
-  { type: SF64:HITBOX, offset: 0x603238C, symbol: D_SX_603238C }
+aSxWarpGateHitbox:
+  { type: SF64:HITBOX, offset: 0x603238C, symbol: aSxWarpGateHitbox }
 
 D_SX_6032408:
   { type: SF64:HITBOX, offset: 0x6032408, symbol: D_SX_6032408 }
@@ -256,20 +256,20 @@ aSxSpyborgRightArmHitbox:
 aSxSpyborgHitbox:
   { type: SF64:HITBOX, offset: 0x6032550, symbol: aSxSpyborgHitbox }
 
-D_SX_603285C:
-  { type: SF64:HITBOX, offset: 0x603285C, symbol: D_SX_603285C }
+aSxLaserHitbox:
+  { type: SF64:HITBOX, offset: 0x603285C, symbol: aSxLaserHitbox }
 
-D_SX_6032878:
-  { type: SF64:HITBOX, offset: 0x6032878, symbol: D_SX_6032878 }
+aSxBaseFloor1Hitbox:
+  { type: SF64:HITBOX, offset: 0x6032878, symbol: aSxBaseFloor1Hitbox }
 
-D_SX_6032894:
-  { type: SF64:HITBOX, offset: 0x6032894, symbol: D_SX_6032894 }
+aSxBaseWall2Hitbox:
+  { type: SF64:HITBOX, offset: 0x6032894, symbol: aSxBaseWall2Hitbox }
 
-D_SX_60328B0:
-  { type: SF64:HITBOX, offset: 0x60328B0, symbol: D_SX_60328B0 }
+aSxBaseWall3Hitbox:
+  { type: SF64:HITBOX, offset: 0x60328B0, symbol: aSxBaseWall3Hitbox }
 
-D_SX_60328CC:
-  { type: SF64:HITBOX, offset: 0x60328CC, symbol: D_SX_60328CC }
+aSxBaseWallTile1Hitbox:
+  { type: SF64:HITBOX, offset: 0x60328CC, symbol: aSxBaseWallTile1Hitbox }
 
 D_SX_603265C:
   { type: SF64:HITBOX, offset: 0x603265C, symbol: D_SX_603265C }
@@ -277,22 +277,22 @@ D_SX_603265C:
 D_SX_6032768:
   { type: SF64:HITBOX, offset: 0x6032768, symbol: D_SX_6032768 }
 
-D_SX_60328E8:
-  { type: SF64:HITBOX, offset: 0x60328E8, symbol: D_SX_60328E8 }
+aSxBaseWall4Hitbox:
+  { type: SF64:HITBOX, offset: 0x60328E8, symbol: aSxBaseWall4Hitbox }
 
-D_SX_6032904:
-  { type: SF64:HITBOX, offset: 0x6032904, symbol: D_SX_6032904 }
+aSxBaseWall1Hitbox:
+  { type: SF64:HITBOX, offset: 0x6032904, symbol: aSxBaseWall1Hitbox }
 
-D_SX_6032938:
-  { type: SF64:HITBOX, offset: 0x6032938, symbol: D_SX_6032938 }
+aSxWatchPostHitbox:
+  { type: SF64:HITBOX, offset: 0x6032938, symbol: aSxWatchPostHitbox }
 
-D_SX_6032954:
-  { type: SF64:HITBOX, offset: 0x6032954, symbol: D_SX_6032954 }
+aSxSpaceMineHitbox:
+  { type: SF64:HITBOX, offset: 0x6032954, symbol: aSxSpaceMineHitbox }
 
-D_SX_6032970:
-  { type: SF64:HITBOX, offset: 0x6032970, symbol: D_SX_6032970 }
+aSxBaseDebris2Hitbox:
+  { type: SF64:HITBOX, offset: 0x6032970, symbol: aSxBaseDebris2Hitbox }
 
-D_SX_603298C:
-  { type: SF64:HITBOX, offset: 0x603298C, symbol: D_SX_603298C }
+aSxBaseDebris1Hitbox:
+  { type: SF64:HITBOX, offset: 0x603298C, symbol: aSxBaseDebris1Hitbox }
 
 # size = 0x32AC0
\ No newline at end of file
diff --git a/assets/yaml/us/rev1/ast_sector_y.yaml b/assets/yaml/us/rev1/ast_sector_y.yaml
index 3e107fe7..3039dccc 100644
--- a/assets/yaml/us/rev1/ast_sector_y.yaml
+++ b/assets/yaml/us/rev1/ast_sector_y.yaml
@@ -116,11 +116,11 @@ D_SY_60119D8:
 D_SY_60132A0:
   { type: GFX, offset: 0x60132A0, symbol: D_SY_60132A0 }
 
-D_SY_6015D60:
-  { type: GFX, offset: 0x6015D60, symbol: D_SY_6015D60 }
+aSyRobot4DL:
+  { type: GFX, offset: 0x6015D60, symbol: aSyRobot4DL }
 
-D_SY_601F3D0:
-  { type: GFX, offset: 0x601F3D0, symbol: D_SY_601F3D0 }
+aSySaruzinDL:
+  { type: GFX, offset: 0x601F3D0, symbol: aSySaruzinDL }
 
 D_SY_60121E0:
   { type: GFX, offset: 0x60121E0, symbol: D_SY_60121E0 }
@@ -158,8 +158,8 @@ D_SY_6015960:
 D_SY_6015B60:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06015B60, symbol: D_SY_6015B60 }
 
-aSyShipProjectileDL:
-  { type: GFX, offset: 0x60188D0, symbol: aSyShipProjectileDL }
+aSyShipMissileDL:
+  { type: GFX, offset: 0x60188D0, symbol: aSyShipMissileDL }
 
 D_SY_60183B0:
   { type: GFX, offset: 0x60183B0, symbol: D_SY_60183B0 }
@@ -170,8 +170,8 @@ D_SY_6018F30:
 D_SY_6019E50:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x06019E50, symbol: D_SY_6019E50 }
 
-D_SY_601AD70: 
-  { type: GFX, offset: 0x601AD70, symbol: D_SY_601AD70 }
+aSyDebrisDL: 
+  { type: GFX, offset: 0x601AD70, symbol: aSyDebrisDL }
 
 D_SY_601AE08:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0601AE08, symbol: D_SY_601AE08 }
@@ -194,11 +194,11 @@ aSyShip2DL:
 D_SY_601F3B8:
   { type: SF64:ANIM, offset: 0x601F3B8, symbol: D_SY_601F3B8 }
 
-D_SY_60205D0: 
-  { type: GFX, offset: 0x60205D0, symbol: D_SY_60205D0 }
+aSyLaserTurretDL: 
+  { type: GFX, offset: 0x60205D0, symbol: aSyLaserTurretDL }
 
-D_SY_60209F0: 
-  { type: GFX, offset: 0x60209F0, symbol: D_SY_60209F0 }
+aSyRobotSpriteFrontDL: 
+  { type: GFX, offset: 0x60209F0, symbol: aSyRobotSpriteFrontDL }
 
 D_SY_6020B08:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x06020B08, symbol: D_SY_6020B08 }
@@ -206,8 +206,8 @@ D_SY_6020B08:
 D_SY_6021B08:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x06021B08, symbol: D_SY_6021B08 }
 
-D_SY_6022B10:
-  { type: GFX, offset: 0x6022B10, symbol: D_SY_6022B10 }
+aSyRobotSpriteSideDL:
+  { type: GFX, offset: 0x6022B10, symbol: aSyRobotSpriteSideDL }
 
 D_SY_6022C28:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x06022C28, symbol: D_SY_6022C28 }
@@ -314,8 +314,8 @@ aSyRobotHitbox:
 D_SY_60340C0:
   { type: SF64:HITBOX, offset: 0x60340C0, symbol: D_SY_60340C0 }
 
-D_SY_6034124:
-  { type: SF64:HITBOX, offset: 0x6034124, symbol: D_SY_6034124 }
+aSyRobot4Hitbox:
+  { type: SF64:HITBOX, offset: 0x6034124, symbol: aSyRobot4Hitbox }
 
 D_SY_60341A8:
   { type: SF64:HITBOX, offset: 0x60341A8, symbol: D_SY_60341A8 }
@@ -332,8 +332,8 @@ D_SY_6034304:
 aSyScenery156Hitbox:
   { type: SF64:HITBOX, offset: 0x6034368, symbol: aSyScenery156Hitbox }
 
-D_SY_603445C:
-  { type: SF64:HITBOX, offset: 0x603445C, symbol: D_SY_603445C }
+aSyLaserTurretHitbox:
+  { type: SF64:HITBOX, offset: 0x603445C, symbol: aSyLaserTurretHitbox }
 
 aSyShip1Hitbox:
   { type: SF64:HITBOX, offset: 0x6034478, symbol: aSyShip1Hitbox }
@@ -356,7 +356,7 @@ aSyShipWindowsHitbox:
 aSyShip4DestroyedHitbox:
   { type: SF64:HITBOX, offset: 0x60347F0, symbol: aSyShip4DestroyedHitbox }
 
-aSyShipProjectileHitbox:
-  { type: SF64:HITBOX, offset: 0x603486C, symbol: aSyShipProjectileHitbox }
+aSyShipMissileHitbox:
+  { type: SF64:HITBOX, offset: 0x603486C, symbol: aSyShipMissileHitbox }
 
 # size = 0x34890
\ No newline at end of file
diff --git a/assets/yaml/us/rev1/ast_sector_z.yaml b/assets/yaml/us/rev1/ast_sector_z.yaml
index c8eb2fec..9dde3d7c 100644
--- a/assets/yaml/us/rev1/ast_sector_z.yaml
+++ b/assets/yaml/us/rev1/ast_sector_z.yaml
@@ -142,8 +142,8 @@ D_SZ_6006BD8:
 D_SZ_6006CD8:
   { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x06006CD8, symbol: D_SZ_6006CD8 }
 
-D_SZ_6006D64:
-  { type: SF64:ANIM, offset: 0x6006D64, symbol: D_SZ_6006D64 }
+aSzMissileAnim:
+  { type: SF64:ANIM, offset: 0x6006D64, symbol: aSzMissileAnim }
 
 aSzMissileSkel: 
   { type: SF64:SKELETON, offset: 0x6006E50, symbol: aSzMissileSkel }
diff --git a/assets/yaml/us/rev1/ast_solar.yaml b/assets/yaml/us/rev1/ast_solar.yaml
index edd4f615..a6e5ee0e 100644
--- a/assets/yaml/us/rev1/ast_solar.yaml
+++ b/assets/yaml/us/rev1/ast_solar.yaml
@@ -31,11 +31,11 @@ D_SO_6004500:
 D_SO_6005710:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6005710, symbol: D_SO_6005710}
 
-D_SO_600636C:
-  { type: SF64:ANIM, offset: 0x600636C, symbol: D_SO_600636C}
+aSoGoreAnim:
+  { type: SF64:ANIM, offset: 0x600636C, symbol: aSoGoreAnim}
 
-D_SO_6006558:
-  { type: SF64:SKELETON, offset: 0x6006558, symbol: D_SO_6006558}
+aSoGoreSkel:
+  { type: SF64:SKELETON, offset: 0x6006558, symbol: aSoGoreSkel}
 
 D_SO_6006DD8:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6006DD8, symbol: D_SO_6006DD8}
diff --git a/assets/yaml/us/rev1/ast_star_wolf.yaml b/assets/yaml/us/rev1/ast_star_wolf.yaml
index 3bdb8ae4..763aaa05 100644
--- a/assets/yaml/us/rev1/ast_star_wolf.yaml
+++ b/assets/yaml/us/rev1/ast_star_wolf.yaml
@@ -56,8 +56,8 @@ D_STAR_WOLF_F00D3C0:
 D_STAR_WOLF_F00E2E0:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x0F00E2E0, symbol: D_STAR_WOLF_F00E2E0 }
 
-D_STAR_WOLF_F00F200:
-  { type: GFX, offset: 0xF00F200, symbol: D_STAR_WOLF_F00F200 }
+aStarWolfStandardShipDL:
+  { type: GFX, offset: 0xF00F200, symbol: aStarWolfStandardShipDL }
 
 D_STAR_WOLF_F0101D0:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0F0101D0, symbol: D_STAR_WOLF_F0101D0 }
@@ -68,8 +68,8 @@ D_STAR_WOLF_F011E80:
 D_STAR_WOLF_F011680: 
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0F011680, symbol: D_STAR_WOLF_F011680 }
 
-D_STAR_WOLF_F0103D0:
-  { type: GFX, offset: 0xF0103D0, symbol: D_STAR_WOLF_F0103D0 }
+aStarWolfUpgradedShipDL:
+  { type: GFX, offset: 0xF0103D0, symbol: aStarWolfUpgradedShipDL }
 
 D_STAR_WOLF_F011F00:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0F011F00, symbol: D_STAR_WOLF_F011F00 }
@@ -89,14 +89,16 @@ D_STAR_WOLF_F013180:
 D_STAR_WOLF_F013980:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0F013980, symbol: D_STAR_WOLF_F013980 }
 
-D_STAR_WOLF_F014180:
-  { type: GFX, offset: 0xF014180, symbol: D_STAR_WOLF_F014180 }
+# Star Wolf Radar mark
+aStarWolfRadarMarkDL:
+  { type: GFX, offset: 0xF014180, symbol: aStarWolfRadarMarkDL }
 
 D_STAR_WOLF_F014208:
   { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 16, offset: 0x0F014208, symbol: D_STAR_WOLF_F014208 }
 
-D_STAR_WOLF_F014310:
-  { type: GFX, offset: 0xF014310, symbol: D_STAR_WOLF_F014310 }
+# Star Wolf Shadow
+aStarWolfShadowDL:
+  { type: GFX, offset: 0xF014310, symbol: aStarWolfShadowDL }
 
-D_STAR_WOLF_F014398:
-  { type: TEXTURE, ctype: u8, format: IA8, width: 32, height: 32, offset: 0x0F014398, symbol: D_STAR_WOLF_F014398 }
+aStarWolfShadowTex:
+  { type: TEXTURE, ctype: u8, format: IA8, width: 32, height: 32, offset: 0x0F014398, symbol: aStarWolfShadowTex }
diff --git a/assets/yaml/us/rev1/ast_training.yaml b/assets/yaml/us/rev1/ast_training.yaml
index 3fe0e9fb..7c57f02e 100644
--- a/assets/yaml/us/rev1/ast_training.yaml
+++ b/assets/yaml/us/rev1/ast_training.yaml
@@ -25,8 +25,8 @@ D_TR_6000900:
 D_TR_6001820:
   { type: TEXTURE, format: RGBA16, offset: 0x6001820, width: 44, height: 44, ctype: u16, symbol: D_TR_6001820 }
 
-D_TR_6002740:
-  { type: GFX, offset: 0x6002740, symbol: D_TR_6002740 }
+aTrBarrierDL:
+  { type: GFX, offset: 0x6002740, symbol: aTrBarrierDL }
 
 D_TR_60028F0:
   { type: TEXTURE, format: RGBA16, offset: 0x060028F0, width: 32, height: 32, ctype: u16, symbol: D_TR_60028F0 }
@@ -82,7 +82,7 @@ aTrBuildingHitbox:
 aItemTrainingRingHitbox:
   { type: SF64:HITBOX, offset: 0x6009CFC, symbol: aItemTrainingRingHitbox }
 
-D_TR_6009D18:
-  { type: SF64:HITBOX, offset: 0x6009D18, symbol: D_TR_6009D18 }
+aTrBarrierHitbox:
+  { type: SF64:HITBOX, offset: 0x6009D18, symbol: aTrBarrierHitbox }
 
 # size = 0x9D40
\ No newline at end of file
diff --git a/assets/yaml/us/rev1/ast_ve1_boss.yaml b/assets/yaml/us/rev1/ast_ve1_boss.yaml
index 0be1c082..30a4d03e 100644
--- a/assets/yaml/us/rev1/ast_ve1_boss.yaml
+++ b/assets/yaml/us/rev1/ast_ve1_boss.yaml
@@ -29,8 +29,8 @@ D_VE1_90012F0:
 D_VE1_9002CD8:
   {type: SF64:ANIM, offset: 0x9002CD8, symbol: D_VE1_9002CD8}
 
-D_VE1_9002CF0:
-  {type: GFX, offset: 0x9002CF0, symbol: D_VE1_9002CF0}
+aVe1BlockerDL:
+  {type: GFX, offset: 0x9002CF0, symbol: aVe1BlockerDL}
 
 D_VE1_9002F30:
   {type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x9002F30, symbol: D_VE1_9002F30, tlut: 0x9003330}
@@ -113,8 +113,8 @@ D_VE1_900DF20:
 D_VE1_900DFB8:
   {type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x900DFB8, symbol: D_VE1_900DFB8}
 
-D_VE1_900EFC0:
-  {type: GFX, offset: 0x900EFC0, symbol: D_VE1_900EFC0}
+aVe1TempleBgDL:
+  {type: GFX, offset: 0x900EFC0, symbol: aVe1TempleBgDL}
 
 aVe1TempleInterior2DL:
   {type: GFX, offset: 0x900F060, symbol: aVe1TempleInterior2DL}
@@ -128,14 +128,14 @@ D_VE1_9010FC4:
 D_VE1_9010FD0:
   {type: GFX, offset: 0x9010FD0, symbol: D_VE1_9010FD0}
 
-D_VE1_9011200:
-  {type: GFX, offset: 0x9011200, symbol: D_VE1_9011200}
+aVe1PillarDL:
+  {type: GFX, offset: 0x9011200, symbol: aVe1PillarDL}
 
 D_VE1_9011980:
   {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x9011980, symbol: D_VE1_9011980}
 
-D_VE1_9012180:
-  {type: GFX, offset: 0x9012180, symbol: D_VE1_9012180}
+aVe1Pillar5DL:
+  {type: GFX, offset: 0x9012180, symbol: aVe1Pillar5DL}
 
 D_VE1_90123C0:
   {type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 16, offset: 0x90123C0, symbol: D_VE1_90123C0, tlut: 0x90125C0}
diff --git a/assets/yaml/us/rev1/ast_venom_1.yaml b/assets/yaml/us/rev1/ast_venom_1.yaml
index 2b67e7ba..95fc884a 100644
--- a/assets/yaml/us/rev1/ast_venom_1.yaml
+++ b/assets/yaml/us/rev1/ast_venom_1.yaml
@@ -25,8 +25,8 @@ D_VE1_6000D80:
 D_VE1_6001B80:
   { type: TEXTURE, format: IA8, width: 128, height: 19, offset: 0x6001B80, ctype: u8, symbol: D_VE1_6001B80 }
 
-D_VE1_6002500:
-  { type: GFX, offset: 0x6002500, symbol: D_VE1_6002500 }
+aVe1EnemyGateDL:
+  { type: GFX, offset: 0x6002500, symbol: aVe1EnemyGateDL }
 
 D_VE1_60029F8:
   { type: TEXTURE, format: CI8, width: 8, height: 16, offset: 0x60029F8, tlut: 0x6002A78, ctype: u8, symbol: D_VE1_60029F8 }
@@ -52,11 +52,11 @@ aVe1WatchPostDL:
 D_VE1_6003B10:
   { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6003B10, ctype: u16, symbol: D_VE1_6003B10 }
 
-D_VE1_6004310:
-  { type: GFX, offset: 0x6004310, symbol: D_VE1_6004310 }
+aVe1EnemyGateDoorLeftDL:
+  { type: GFX, offset: 0x6004310, symbol: aVe1EnemyGateDoorLeftDL }
 
-D_VE1_60043F0:
-  { type: GFX, offset: 0x60043F0, symbol: D_VE1_60043F0 }
+aVe1EnemyGateDoorRightDL:
+  { type: GFX, offset: 0x60043F0, symbol: aVe1EnemyGateDoorRightDL }
 
 D_VE1_60044D0:
   { type: TEXTURE, format: CI8, width: 16, height: 16, offset: 0x60044D0, tlut: 0x60045D0, ctype: u8, symbol: D_VE1_60044D0 }
@@ -124,8 +124,8 @@ D_VE1_601B1E4:
 D_VE1_6010088:
   { type: SF64:OBJECT_INIT, offset: 0x6010088, symbol: D_VE1_6010088 }
 
-D_VE1_601B43C:
-  { type: SF64:HITBOX, offset: 0x601B43C, symbol: D_VE1_601B43C }
+aVe1Pillar5Hitbox:
+  { type: SF64:HITBOX, offset: 0x601B43C, symbol: aVe1Pillar5Hitbox }
 
 D_VE1_601B474:
   { type: SF64:HITBOX, offset: 0x601B474, symbol: D_VE1_601B474 }
@@ -178,5 +178,5 @@ aVe1Pillar4Hitbox:
 aVe1MonkeyStatueHitbox:
   { type: SF64:HITBOX, offset: 0x601B8D8, symbol: aVe1MonkeyStatueHitbox }
 
-D_VE1_601B944:
-  { type: SF64:HITBOX, offset: 0x601B944, symbol: D_VE1_601B944 }
\ No newline at end of file
+aVe1EnemyGateHitbox:
+  { type: SF64:HITBOX, offset: 0x601B944, symbol: aVe1EnemyGateHitbox }
\ No newline at end of file
diff --git a/assets/yaml/us/rev1/ast_venom_2.yaml b/assets/yaml/us/rev1/ast_venom_2.yaml
index 92e8061f..f3246b04 100644
--- a/assets/yaml/us/rev1/ast_venom_2.yaml
+++ b/assets/yaml/us/rev1/ast_venom_2.yaml
@@ -174,11 +174,11 @@ D_VE2_60114A0:
 D_VE2_6013AF8:
   { type: TEXTURE, format: RGBA16, width: 16, height: 16, offset: 0x6013AF8, ctype: u16, symbol: D_VE2_6013AF8 }
 
-D_VE2_6014658:
-  { type: SF64:ANIM, offset: 0x6014658, symbol: D_VE2_6014658 }
+aVe2AndrossGateAnim:
+  { type: SF64:ANIM, offset: 0x6014658, symbol: aVe2AndrossGateAnim }
 
-D_VE2_6014844:
-  { type: SF64:SKELETON, offset: 0x6014844, symbol: D_VE2_6014844 }
+aVe2AndrossGateSkel:
+  { type: SF64:SKELETON, offset: 0x6014844, symbol: aVe2AndrossGateSkel }
 
 aVe2BaseAnim:
   { type: SF64:ANIM, offset: 0x6014904, symbol: aVe2BaseAnim }
diff --git a/assets/yaml/us/rev1/ast_warp_zone.yaml b/assets/yaml/us/rev1/ast_warp_zone.yaml
index 67dc362d..21a650b6 100644
--- a/assets/yaml/us/rev1/ast_warp_zone.yaml
+++ b/assets/yaml/us/rev1/ast_warp_zone.yaml
@@ -8,14 +8,14 @@
       - '#include "gfx.h"'
       - '#include "sf64object.h"'
 
-D_WZ_7000000:
-  { type: GFX, offset: 0x7000000, symbol: D_WZ_7000000 }
+aWzSxEnemy1DL:
+  { type: GFX, offset: 0x7000000, symbol: aWzSxEnemy1DL }
 
-D_WZ_7000280:
-  { type: GFX, offset: 0x7000280, symbol: D_WZ_7000280 }
+aWzGateDL:
+  { type: GFX, offset: 0x7000280, symbol: aWzGateDL }
 
-D_WZ_70008F0:
-  { type: GFX, offset: 0x70008F0, symbol: D_WZ_70008F0 }
+aWzMeteor2DL:
+  { type: GFX, offset: 0x70008F0, symbol: aWzMeteor2DL }
 
 D_WZ_7000260:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 4, height: 4, offset: 0x7000260, symbol: D_WZ_7000260 }
@@ -26,14 +26,14 @@ D_WZ_7000A30:
 D_WZ_7000C30:
   { type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0x7000C30, symbol: D_WZ_7000C30 }
 
-D_WZ_7000C40:
-  { type: GFX, offset: 0x7000C40, symbol: D_WZ_7000C40 }
+aWzPillar1DL:
+  { type: GFX, offset: 0x7000C40, symbol: aWzPillar1DL }
 
-D_WZ_7000E80:
-  { type: GFX, offset: 0x7000E80, symbol: D_WZ_7000E80 }
+aWzMeteor1DL:
+  { type: GFX, offset: 0x7000E80, symbol: aWzMeteor1DL }
 
-D_WZ_70010E0:
-  { type: GFX, offset: 0x70010E0, symbol: D_WZ_70010E0 }
+aWzPillar2DL:
+  { type: GFX, offset: 0x70010E0, symbol: aWzPillar2DL }
 
 D_WZ_7001540:
   { type: GFX, offset: 0x7001540, symbol: D_WZ_7001540 }
diff --git a/assets/yaml/us/rev1/ast_zoness.yaml b/assets/yaml/us/rev1/ast_zoness.yaml
index c2dda637..15b5e989 100644
--- a/assets/yaml/us/rev1/ast_zoness.yaml
+++ b/assets/yaml/us/rev1/ast_zoness.yaml
@@ -84,8 +84,8 @@ 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}
+aZoPatrolBoatDL:
+  { type: GFX, offset: 0x6004D00, symbol: aZoPatrolBoatDL}
 
 D_ZO_6005958:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6005958, symbol: D_ZO_6005958}
@@ -351,11 +351,11 @@ D_ZO_601F420:
 D_ZO_601F620:
   { type: GFX, offset: 0x601F620, symbol: D_ZO_601F620}
 
-D_ZO_601F874:
-  { type: SF64:ANIM, offset: 0x601F874, symbol: D_ZO_601F874}
+aZoSarumarinePeriscopeAnim:
+  { type: SF64:ANIM, offset: 0x601F874, symbol: aZoSarumarinePeriscopeAnim}
 
-D_ZO_601F920:
-  { type: SF64:SKELETON, offset: 0x601F920, symbol: D_ZO_601F920}
+aZoSarumarinePeriscopeSkel:
+  { type: SF64:SKELETON, offset: 0x601F920, symbol: aZoSarumarinePeriscopeSkel}
 
 D_ZO_601F940:
   { type: GFX, offset: 0x601F940, symbol: D_ZO_601F940}
@@ -535,8 +535,8 @@ D_ZO_602C028:
 aZoSarumarineHitbox:
   { type: SF64:HITBOX, offset: 0x602C044, symbol: aZoSarumarineHitbox}
 
-D_ZO_602C1A0:
-  { type: SF64:HITBOX, offset: 0x602C1A0, symbol: D_ZO_602C1A0}
+aZoSarumarinePeriscopeHitbox:
+  { type: SF64:HITBOX, offset: 0x602C1A0, symbol: aZoSarumarinePeriscopeHitbox}
 
 aZoCargoShipHitbox:
   { type: SF64:HITBOX, offset: 0x602C1D4, symbol: aZoCargoShipHitbox}