more actor docs

27 files changed, 264 insertions, 258 deletions

diff --git a/assets/yaml/jp/rev0/ast_aquas.yaml b/assets/yaml/jp/rev0/ast_aquas.yaml
index d56b32e7..437296fb 100644
--- a/assets/yaml/jp/rev0/ast_aquas.yaml
+++ b/assets/yaml/jp/rev0/ast_aquas.yaml
@@ -677,14 +677,14 @@ D_AQ_6030BAC:
 aAqActor188Hitbox:
   { type: SF64:HITBOX, offset: 0x6030BE0, symbol: aAqActor188Hitbox }
 
-D_AQ_6030BFC:
-  { type: SF64:HITBOX, offset: 0x6030BFC, symbol: D_AQ_6030BFC }
+aAqActor255Hitbox:
+  { type: SF64:HITBOX, offset: 0x6030BFC, symbol: aAqActor255Hitbox }
 
-D_AQ_6030C18:
-  { type: SF64:HITBOX, offset: 0x6030C18, symbol: D_AQ_6030C18 }
+aAqActor256Hitbox:
+  { type: SF64:HITBOX, offset: 0x6030C18, symbol: aAqActor256Hitbox }
 
-D_AQ_6030C44:
-  { type: SF64:HITBOX, offset: 0x6030C44, symbol: D_AQ_6030C44 }
+aAqActor257Hitbox:
+  { type: SF64:HITBOX, offset: 0x6030C44, symbol: aAqActor257Hitbox }
 
 aAqCoralReef1Hitbox:
   { type: SF64:HITBOX, offset: 0x6030C60, symbol: aAqCoralReef1Hitbox }
diff --git a/assets/yaml/jp/rev0/ast_corneria.yaml b/assets/yaml/jp/rev0/ast_corneria.yaml
index 7c50e853..0ae734bc 100644
--- a/assets/yaml/jp/rev0/ast_corneria.yaml
+++ b/assets/yaml/jp/rev0/ast_corneria.yaml
@@ -231,8 +231,8 @@ D_CO_601EAA0:
 D_CO_601ED00:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0601ED00, symbol: D_CO_601ED00 }
 
-D_CO_601F500:
-  { type: GFX, offset: 0x601F500, symbol: D_CO_601F500 }
+aCoRuin2DL:
+  { type: GFX, offset: 0x601F500, symbol: aCoRuin2DL }
 
 aCoArch1DL:
   { type: GFX, offset: 0x601F5A0, symbol: aCoArch1DL }
@@ -249,8 +249,8 @@ D_CO_6021188:
 D_CO_60220D0:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x060220D0, symbol: D_CO_60220D0 }
 
-D_CO_6023AC0:
-  { type: GFX, offset: 0x6023AC0, symbol: D_CO_6023AC0 }
+aCoIBeamDL:
+  { type: GFX, offset: 0x6023AC0, symbol: aCoIBeamDL }
 
 D_CO_6023DE8:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06023DE8, symbol: D_CO_6023DE8 }
@@ -297,8 +297,8 @@ aCoGaruda3Anim:
 D_CO_602AA04:
   { type: SF64:ANIM, offset: 0x602AA04, symbol: D_CO_602AA04 }
 
-D_CO_602AA7C:
-  { type: SF64:ANIM, offset: 0x602AA7C, symbol: D_CO_602AA7C }
+aCoDoorsAnim:
+  { type: SF64:ANIM, offset: 0x602AA7C, symbol: aCoDoorsAnim }
 
 aCoDoorsSkel:
   { type: SF64:SKELETON, offset: 0x602AB48, symbol: aCoDoorsSkel }
@@ -324,11 +324,11 @@ aCoCarrierSkel:
 aCoBuilding1DL:
   { type: GFX, offset: 0x602D5F0, symbol: aCoBuilding1DL }
 
-D_CO_602DA20:
-  { type: GFX, offset: 0x602DA20, symbol: D_CO_602DA20 }
+aCoBuilding9DL:
+  { type: GFX, offset: 0x602DA20, symbol: aCoBuilding9DL }
 
-D_CO_602DCA0:
-  { type: GFX, offset: 0x602DCA0, symbol: D_CO_602DCA0 }
+aCoRuin1DL:
+  { type: GFX, offset: 0x602DCA0, symbol: aCoRuin1DL }
 
 D_CO_602DD40:
   { type: GFX, offset: 0x602DD40, symbol: D_CO_602DD40 }
@@ -372,8 +372,8 @@ D_CO_6031280:
 D_CO_60329C0:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x060329C0, symbol: D_CO_60329C0 }
 
-D_CO_6032BC0:
-  { type: GFX, offset: 0x6032BC0, symbol: D_CO_6032BC0 }
+CoMoleMissileDL:
+  { type: GFX, offset: 0x6032BC0, symbol: CoMoleMissileDL }
 
 D_CO_6033000:
   { type: GFX, offset: 0x6033000, symbol: D_CO_6033000 }
@@ -390,8 +390,8 @@ D_CO_6033AF0:
 D_CO_6034388:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06034388, symbol: D_CO_6034388 }
 
-D_CO_6034B90:
-  { type: GFX, offset: 0x6034B90, symbol: D_CO_6034B90 }
+aCoShadow1DL:
+  { type: GFX, offset: 0x6034B90, symbol: aCoShadow1DL }
 
 D_CO_6034C28:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06034C28, symbol: D_CO_6034C28 }
@@ -405,8 +405,8 @@ D_CO_60354F0:
 D_CO_60355A0:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x060355A0, symbol: D_CO_60355A0 }
 
-D_CO_6035DA0:
-  { type: GFX, offset: 0x6035DA0, symbol: D_CO_6035DA0 }
+aCoBuilding10DL:
+  { type: GFX, offset: 0x6035DA0, symbol: aCoBuilding10DL }
 
 aCoBuilding8DL:
   { type: GFX, offset: 0x6035F10, symbol: aCoBuilding8DL }
diff --git a/assets/yaml/jp/rev0/ast_macbeth.yaml b/assets/yaml/jp/rev0/ast_macbeth.yaml
index 486da617..596eaf65 100644
--- a/assets/yaml/jp/rev0/ast_macbeth.yaml
+++ b/assets/yaml/jp/rev0/ast_macbeth.yaml
@@ -82,8 +82,8 @@ D_MA_6002FF0:
 D_MA_6003030:
   { type: TEXTURE, format: TLUT, ctype: u16, colors: 32, offset: 0x6003030, symbol: D_MA_6003030}
 
-D_MA_6003070:
-  {type: GFX, offset: 0x6003070, symbol: D_MA_6003070}
+aMaRailroadSwitch3DL:
+  {type: GFX, offset: 0x6003070, symbol: aMaRailroadSwitch3DL}
 
 D_MA_6003138:
   { type: TEXTURE, format: CI8, ctype: u8, width: 16, height: 16, offset: 0x6003138, symbol: D_MA_6003138, tlut: 0x6003238}
@@ -133,8 +133,8 @@ D_MA_6005828:
 D_MA_6006030:
   {type: GFX, offset: 0x6006030, symbol: D_MA_6006030}
 
-D_MA_60066A0:
-  {type: GFX, offset: 0x60066A0, symbol: D_MA_60066A0}
+aMaIndicatorSignDL:
+  {type: GFX, offset: 0x60066A0, symbol: aMaIndicatorSignDL}
 
 D_MA_60069A8:
   { type: TEXTURE, format: CI8, ctype: u8, width: 16, height: 16, offset: 0x60069A8, symbol: D_MA_60069A8, tlut: 0x6006AA8}
@@ -148,20 +148,20 @@ D_MA_6006BE8:
 D_MA_6006FE8:
   { type: TEXTURE, format: TLUT, ctype: u16, colors: 232, offset: 0x6006FE8, symbol: D_MA_6006FE8}
 
-D_MA_60071C0:
-  {type: GFX, offset: 0x60071C0, symbol: D_MA_60071C0}
+aMaDistanceSign4DL:
+  {type: GFX, offset: 0x60071C0, symbol: aMaDistanceSign4DL}
 
-D_MA_6007290:
-  {type: GFX, offset: 0x6007290, symbol: D_MA_6007290}
+aMaDistanceSign3DL:
+  {type: GFX, offset: 0x6007290, symbol: aMaDistanceSign3DL}
 
-D_MA_6007360:
-  {type: GFX, offset: 0x6007360, symbol: D_MA_6007360}
+aMaDistanceSign2DL:
+  {type: GFX, offset: 0x6007360, symbol: aMaDistanceSign2DL}
 
-D_MA_6007430:
-  {type: GFX, offset: 0x6007430, symbol: D_MA_6007430}
+aMaDistanceSign1DL:
+  {type: GFX, offset: 0x6007430, symbol: aMaDistanceSign1DL}
 
-D_MA_6007500:
-  {type: GFX, offset: 0x6007500, symbol: D_MA_6007500}
+aMaDistanceSign5DL:
+  {type: GFX, offset: 0x6007500, symbol: aMaDistanceSign5DL}
 
 aMaWeaponsFactoryDL:
   {type: GFX, offset: 0x60075D0, symbol: aMaWeaponsFactoryDL}
@@ -175,8 +175,8 @@ D_MA_6009AE0:
 D_MA_6009BE0:
   { type: TEXTURE, format: TLUT, ctype: u16, colors: 56, offset: 0x6009BE0, symbol: D_MA_6009BE0}
 
-D_MA_6009C50:
-  {type: GFX, offset: 0x6009C50, symbol: D_MA_6009C50}
+aMaRailroadSwitch8DL:
+  {type: GFX, offset: 0x6009C50, symbol: aMaRailroadSwitch8DL}
 
 D_MA_6009D18:
   { type: TEXTURE, format: CI8, ctype: u8, width: 16, height: 16, offset: 0x6009D18, symbol: D_MA_6009D18, tlut: 0x6009E18}
@@ -184,8 +184,8 @@ D_MA_6009D18:
 D_MA_6009E18:
   { type: TEXTURE, format: TLUT, ctype: u16, colors: 120, offset: 0x6009E18, symbol: D_MA_6009E18}
 
-D_MA_6009F10:
-  {type: GFX, offset: 0x6009F10, symbol: D_MA_6009F10}
+aMaRailroadSwitch7DL:
+  {type: GFX, offset: 0x6009F10, symbol: aMaRailroadSwitch7DL}
 
 D_MA_6009FD8:
   { type: TEXTURE, format: CI8, ctype: u8, width: 16, height: 16, offset: 0x6009FD8, symbol: D_MA_6009FD8, tlut: 0x600A0D8}
@@ -193,8 +193,8 @@ D_MA_6009FD8:
 D_MA_600A0D8:
   { type: TEXTURE, format: TLUT, ctype: u16, colors: 136, offset: 0x600A0D8, symbol: D_MA_600A0D8}
 
-D_MA_600A1F0:
-  {type: GFX, offset: 0x600A1F0, symbol: D_MA_600A1F0}
+aMaRailroadSwitch6DL:
+  {type: GFX, offset: 0x600A1F0, symbol: aMaRailroadSwitch6DL}
 
 D_MA_600A2B8:
   { type: TEXTURE, format: CI8, ctype: u8, width: 16, height: 16, offset: 0x600A2B8, symbol: D_MA_600A2B8, tlut: 0x600A3B8}
@@ -202,8 +202,8 @@ D_MA_600A2B8:
 D_MA_600A3B8:
   { type: TEXTURE, format: TLUT, ctype: u16, colors: 136, offset: 0x600A3B8, symbol: D_MA_600A3B8}
 
-D_MA_600A4D0:
-  {type: GFX, offset: 0x600A4D0, symbol: D_MA_600A4D0}
+aMaRailroadSwitch5DL:
+  {type: GFX, offset: 0x600A4D0, symbol: aMaRailroadSwitch5DL}
 
 D_MA_600A598:
   { type: TEXTURE, format: CI8, ctype: u8, width: 16, height: 16, offset: 0x600A598, symbol: D_MA_600A598, tlut: 0x600A698}
@@ -211,8 +211,8 @@ D_MA_600A598:
 D_MA_600A698:
   { type: TEXTURE, format: TLUT, ctype: u16, colors: 152, offset: 0x600A698, symbol: D_MA_600A698}
 
-D_MA_600A7D0:
-  {type: GFX, offset: 0x600A7D0, symbol: D_MA_600A7D0}
+aMaRailroadSwitch4DL:
+  {type: GFX, offset: 0x600A7D0, symbol: aMaRailroadSwitch4DL}
 
 D_MA_600A898:
   { type: TEXTURE, format: CI8, ctype: u8, width: 16, height: 16, offset: 0x600A898, symbol: D_MA_600A898, tlut: 0x600A998}
@@ -220,8 +220,8 @@ D_MA_600A898:
 D_MA_600A998:
   { type: TEXTURE, format: TLUT, ctype: u16, colors: 104, offset: 0x600A998, symbol: D_MA_600A998}
 
-D_MA_600AA70:
-  {type: GFX, offset: 0x600AA70, symbol: D_MA_600AA70}
+aMaRailroadSwitch2DL:
+  {type: GFX, offset: 0x600AA70, symbol: aMaRailroadSwitch2DL}
 
 D_MA_600AB38:
   { type: TEXTURE, format: CI8, ctype: u8, width: 16, height: 16, offset: 0x600AB38, symbol: D_MA_600AB38, tlut: 0x600AC38}
@@ -229,8 +229,8 @@ D_MA_600AB38:
 D_MA_600AC38:
   { type: TEXTURE, format: TLUT, ctype: u16, colors: 136, offset: 0x600AC38, symbol: D_MA_600AC38}
 
-D_MA_600AD50:
-  {type: GFX, offset: 0x600AD50, symbol: D_MA_600AD50}
+aMaRailroadSwitch1DL:
+  {type: GFX, offset: 0x600AD50, symbol: aMaRailroadSwitch1DL}
 
 D_MA_600AE18:
   { type: TEXTURE, format: CI8, ctype: u8, width: 8, height: 16, offset: 0x600AE18, symbol: D_MA_600AE18, tlut: 0x600AE98}
@@ -340,8 +340,8 @@ D_MA_601042C:
 D_MA_6010470:
   {type: GFX, offset: 0x6010470, symbol: D_MA_6010470}
 
-D_MA_6010700:
-  {type: GFX, offset: 0x6010700, symbol: D_MA_6010700}
+aMaProximityLightSidesDL:
+  {type: GFX, offset: 0x6010700, symbol: aMaProximityLightSidesDL}
 
 D_MA_6010C20:
   { type: TEXTURE, format: RGBA16, ctype: u16, width: 44, height: 44, offset: 0x6010C20, symbol: D_MA_6010C20}
@@ -472,8 +472,8 @@ D_MA_601BE08:
 D_MA_601BE90:
   {type: GFX, offset: 0x601BE90, symbol: D_MA_601BE90}
 
-D_MA_601C000:
-  {type: GFX, offset: 0x601C000, symbol: D_MA_601C000}
+aMaTowerTopDL:
+  {type: GFX, offset: 0x601C000, symbol: aMaTowerTopDL}
 
 D_MA_601C170:
   {type: GFX, offset: 0x601C170, symbol: D_MA_601C170}
@@ -496,8 +496,8 @@ D_MA_601EBBC:
 aMaWall2DL:
   {type: GFX, offset: 0x601F1D0, symbol: aMaWall2DL}
 
-D_MA_601F270:
-  {type: GFX, offset: 0x601F270, symbol: D_MA_601F270}
+aMaProximityLightTopDL:
+  {type: GFX, offset: 0x601F270, symbol: aMaProximityLightTopDL}
 
 D_MA_6020A30:
   {type: GFX, offset: 0x6020A30, symbol: D_MA_6020A30}
@@ -571,8 +571,8 @@ D_MA_6024670:
 aMaHorizontalLockBarDL:
   {type: GFX, offset: 0x60251A0, symbol: aMaHorizontalLockBarDL}
 
-D_MA_60253E0:
-  {type: GFX, offset: 0x60253E0, symbol: D_MA_60253E0}
+aMaTowerBottomDL:
+  {type: GFX, offset: 0x60253E0, symbol: aMaTowerBottomDL}
 
 aMaBarrierDL:
   {type: GFX, offset: 0x60257B0, symbol: aMaBarrierDL}
diff --git a/assets/yaml/jp/rev0/ast_meteo.yaml b/assets/yaml/jp/rev0/ast_meteo.yaml
index f97e017e..0b2c9796 100644
--- a/assets/yaml/jp/rev0/ast_meteo.yaml
+++ b/assets/yaml/jp/rev0/ast_meteo.yaml
@@ -158,8 +158,8 @@ aMeLaserCannon2DL:
 D_ME_6018960:
   { type: GFX, offset: 0x06018960, symbol: D_ME_6018960 }
 
-aMeMeteor1DL:
-  { type: GFX, offset: 0x06018C00, symbol: aMeMeteor1DL }
+aMeMeteorDL:
+  { type: GFX, offset: 0x06018C00, symbol: aMeMeteorDL }
 
 D_ME_6019430:
   { type: GFX, offset: 0x06019430, symbol: D_ME_6019430 }
@@ -173,8 +173,8 @@ D_ME_601A080:
 D_ME_601A880:
   { type: GFX, offset: 0x0601A880, symbol: D_ME_601A880 }
 
-D_ME_601AE40:
-  { type: GFX, offset: 0x0601AE40, symbol: D_ME_601AE40 }
+aMeMeteoTunnelDL:
+  { type: GFX, offset: 0x0601AE40, symbol: aMeMeteoTunnelDL }
 
 D_ME_601C8E0:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x0601C8E0, symbol: D_ME_601C8E0 }
@@ -216,8 +216,8 @@ D_ME_6020920:
 D_ME_6021920:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x06021920, symbol: D_ME_6021920 }
 
-D_ME_6022920:
-  { type: GFX, offset: 0x06022920, symbol: D_ME_6022920 }
+aMeLaserCannon1DL:
+  { type: GFX, offset: 0x06022920, symbol: aMeLaserCannon1DL }
 
 D_ME_6022E50:
   { type: GFX, offset: 0x06022E50, symbol: D_ME_6022E50 }
@@ -249,8 +249,8 @@ D_ME_60240B0:
 D_ME_6024AD0:
   { type: GFX, offset: 0x06024AD0, symbol: D_ME_6024AD0 }
 
-D_ME_6024B60:
-  { type: GFX, offset: 0x06024B60, symbol: D_ME_6024B60 }
+aMeMolarRockDL:
+  { type: GFX, offset: 0x06024B60, symbol: aMeMolarRockDL }
 
 # Unused Meteo Ball
 D_ME_6025B50:
diff --git a/assets/yaml/jp/rev0/ast_training.yaml b/assets/yaml/jp/rev0/ast_training.yaml
index ca3aee22..8c2f5bc9 100644
--- a/assets/yaml/jp/rev0/ast_training.yaml
+++ b/assets/yaml/jp/rev0/ast_training.yaml
@@ -55,8 +55,8 @@ D_TR_6005880:
 D_TR_6005938:
   { type: TEXTURE, format: RGBA16, offset: 0x06005938, width: 32, height: 32, ctype: u16, symbol: D_TR_6005938 }
 
-gItemTrainingRingDL:
-  { type: GFX, offset: 0x6006140, symbol: gItemTrainingRingDL }
+aItemTrainingRingDL:
+  { type: GFX, offset: 0x6006140, symbol: aItemTrainingRingDL }
 
 D_TR_6006958:
   { type: TEXTURE, format: RGBA16, offset: 0x06006958, width: 8, height: 8, ctype: u16, symbol: D_TR_6006958 }
@@ -79,8 +79,8 @@ D_TR_6009B34:
 aTrBuildingHitbox:
   { type: SF64:HITBOX, offset: 0x6009CC4, symbol: aTrBuildingHitbox }
 
-D_TR_6009CFC:
-  { type: SF64:HITBOX, offset: 0x6009CFC, symbol: D_TR_6009CFC }
+aItemTrainingRingHitbox:
+  { type: SF64:HITBOX, offset: 0x6009CFC, symbol: aItemTrainingRingHitbox }
 
 D_TR_6009D18:
   { type: SF64:HITBOX, offset: 0x6009D18, symbol: D_TR_6009D18 }
diff --git a/assets/yaml/jp/rev0/ast_venom_1.yaml b/assets/yaml/jp/rev0/ast_venom_1.yaml
index b012c997..777321f2 100644
--- a/assets/yaml/jp/rev0/ast_venom_1.yaml
+++ b/assets/yaml/jp/rev0/ast_venom_1.yaml
@@ -106,11 +106,11 @@ aVe1SceneryWall3DL:
 D_VE1_60074E8:
   { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x60074E8, ctype: u16, symbol: D_VE1_60074E8 }
 
-D_VE1_6007CF0:
-  { type: GFX, offset: 0x6007CF0, symbol: D_VE1_6007CF0 }
+aVe1Wall2DL:
+  { type: GFX, offset: 0x6007CF0, symbol: aVe1Wall2DL }
 
-D_VE1_6007D90:
-  { type: GFX, offset: 0x6007D90, symbol: D_VE1_6007D90 }
+aVe1Wall1DL:
+  { type: GFX, offset: 0x6007D90, symbol: aVe1Wall1DL }
 
 D_VE1_6007E30:
   { type: SF64:ENVIRONMENT, offset: 0x6007E30, symbol: D_VE1_6007E30 }
@@ -133,11 +133,11 @@ D_VE1_601B474:
 D_VE1_601B4C4:
   { type: SF64:HITBOX, offset: 0x601B4C4, symbol: D_VE1_601B4C4 }
 
-aVe1SceneryWall1Hitbox:
-  { type: SF64:HITBOX, offset: 0x601B4E0, symbol: aVe1SceneryWall1Hitbox }
+Ve1Wall1Hitbox:
+  { type: SF64:HITBOX, offset: 0x601B4E0, symbol: Ve1Wall1Hitbox }
 
-aVe1SceneryWall2Hitbox:
-  { type: SF64:HITBOX, offset: 0x601B4FC, symbol: aVe1SceneryWall2Hitbox }
+aVe1Wall2Hitbox:
+  { type: SF64:HITBOX, offset: 0x601B4FC, symbol: aVe1Wall2Hitbox }
 
 aVe1SceneryWall3Hitbox:
   { type: SF64:HITBOX, offset: 0x601B518, symbol: aVe1SceneryWall3Hitbox }
diff --git a/assets/yaml/us/rev1/ast_aquas.yaml b/assets/yaml/us/rev1/ast_aquas.yaml
index 654d670d..33d3d78b 100644
--- a/assets/yaml/us/rev1/ast_aquas.yaml
+++ b/assets/yaml/us/rev1/ast_aquas.yaml
@@ -677,14 +677,14 @@ D_AQ_6030BAC:
 aAqActor188Hitbox:
   { type: SF64:HITBOX, offset: 0x6030BE0, symbol: aAqActor188Hitbox }
 
-D_AQ_6030BFC:
-  { type: SF64:HITBOX, offset: 0x6030BFC, symbol: D_AQ_6030BFC }
+aAqActor255Hitbox:
+  { type: SF64:HITBOX, offset: 0x6030BFC, symbol: aAqActor255Hitbox }
 
-D_AQ_6030C18:
-  { type: SF64:HITBOX, offset: 0x6030C18, symbol: D_AQ_6030C18 }
+aAqActor256Hitbox:
+  { type: SF64:HITBOX, offset: 0x6030C18, symbol: aAqActor256Hitbox }
 
-D_AQ_6030C44:
-  { type: SF64:HITBOX, offset: 0x6030C44, symbol: D_AQ_6030C44 }
+aAqActor257Hitbox:
+  { type: SF64:HITBOX, offset: 0x6030C44, symbol: aAqActor257Hitbox }
 
 aAqCoralReef1Hitbox:
   { type: SF64:HITBOX, offset: 0x6030C60, symbol: aAqCoralReef1Hitbox }
diff --git a/assets/yaml/us/rev1/ast_corneria.yaml b/assets/yaml/us/rev1/ast_corneria.yaml
index 96933be6..54525ff1 100644
--- a/assets/yaml/us/rev1/ast_corneria.yaml
+++ b/assets/yaml/us/rev1/ast_corneria.yaml
@@ -231,8 +231,8 @@ D_CO_601EAA0:
 D_CO_601ED00:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0601ED00, symbol: D_CO_601ED00 }
     
-D_CO_601F500: 
-  { type: GFX, offset: 0x601F500, symbol: D_CO_601F500 }
+aCoRuin2DL: 
+  { type: GFX, offset: 0x601F500, symbol: aCoRuin2DL }
     
 aCoArch1DL: 
   { type: GFX, offset: 0x601F5A0, symbol: aCoArch1DL }
@@ -249,8 +249,8 @@ D_CO_6021188:
 D_CO_60220D0: 
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x060220D0, symbol: D_CO_60220D0 }
     
-D_CO_6023AC0: 
-  { type: GFX, offset: 0x6023AC0, symbol: D_CO_6023AC0 }
+aCoIBeamDL: 
+  { type: GFX, offset: 0x6023AC0, symbol: aCoIBeamDL }
 
 D_CO_6023DE8: 
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06023DE8, symbol: D_CO_6023DE8 }
@@ -297,8 +297,8 @@ aCoGaruda3Anim:
 D_CO_602AA04:
   { type: SF64:ANIM, offset: 0x602AA04, symbol: D_CO_602AA04 }
 
-D_CO_602AA7C: 
-  { type: SF64:ANIM, offset: 0x602AA7C, symbol: D_CO_602AA7C }
+aCoDoorsAnim: 
+  { type: SF64:ANIM, offset: 0x602AA7C, symbol: aCoDoorsAnim }
   
 aCoDoorsSkel: 
   { type: SF64:SKELETON, offset: 0x602AB48, symbol: aCoDoorsSkel }
@@ -324,11 +324,11 @@ aCoCarrierSkel:
 aCoBuilding1DL:
   { type: GFX, offset: 0x602D5F0, symbol: aCoBuilding1DL }
   
-D_CO_602DA20:
-  { type: GFX, offset: 0x602DA20, symbol: D_CO_602DA20 }
+aCoBuilding9DL:
+  { type: GFX, offset: 0x602DA20, symbol: aCoBuilding9DL }
   
-D_CO_602DCA0:
-  { type: GFX, offset: 0x602DCA0, symbol: D_CO_602DCA0 }
+aCoRuin1DL:
+  { type: GFX, offset: 0x602DCA0, symbol: aCoRuin1DL }
   
 D_CO_602DD40:
   { type: GFX, offset: 0x602DD40, symbol: D_CO_602DD40 }
@@ -372,8 +372,8 @@ D_CO_6031280:
 D_CO_60329C0:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x060329C0, symbol: D_CO_60329C0 }
   
-D_CO_6032BC0:
-  { type: GFX, offset: 0x6032BC0, symbol: D_CO_6032BC0 }
+CoMoleMissileDL:
+  { type: GFX, offset: 0x6032BC0, symbol: CoMoleMissileDL }
   
 D_CO_6033000:
   { type: GFX, offset: 0x6033000, symbol: D_CO_6033000 }
@@ -390,8 +390,8 @@ D_CO_6033AF0:
 D_CO_6034388: 
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06034388, symbol: D_CO_6034388 }
   
-D_CO_6034B90: 
-  { type: GFX, offset: 0x6034B90, symbol: D_CO_6034B90 }
+aCoShadow1DL: 
+  { type: GFX, offset: 0x6034B90, symbol: aCoShadow1DL }
 
 D_CO_6034C28: 
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06034C28, symbol: D_CO_6034C28 }
@@ -405,8 +405,8 @@ D_CO_60354F0:
 D_CO_60355A0:  
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x060355A0, symbol: D_CO_60355A0 }
   
-D_CO_6035DA0: 
-  { type: GFX, offset: 0x6035DA0, symbol: D_CO_6035DA0 }
+aCoBuilding10DL: 
+  { type: GFX, offset: 0x6035DA0, symbol: aCoBuilding10DL }
   
 aCoBuilding8DL: 
   { type: GFX, offset: 0x6035F10, symbol: aCoBuilding8DL }
diff --git a/assets/yaml/us/rev1/ast_macbeth.yaml b/assets/yaml/us/rev1/ast_macbeth.yaml
index b08087cc..2235bdb7 100644
--- a/assets/yaml/us/rev1/ast_macbeth.yaml
+++ b/assets/yaml/us/rev1/ast_macbeth.yaml
@@ -82,8 +82,8 @@ D_MA_6002FF0:
 D_MA_6003030:
   { type: TEXTURE, format: TLUT, ctype: u16, colors: 32, offset: 0x6003030, symbol: D_MA_6003030}
 
-D_MA_6003070:
-  {type: GFX, offset: 0x6003070, symbol: D_MA_6003070}
+aMaRailroadSwitch3DL:
+  {type: GFX, offset: 0x6003070, symbol: aMaRailroadSwitch3DL}
 
 D_MA_6003138:
   { type: TEXTURE, format: CI8, ctype: u8, width: 16, height: 16, offset: 0x6003138, symbol: D_MA_6003138, tlut: 0x6003238}
@@ -133,8 +133,8 @@ D_MA_6005828:
 D_MA_6006030:
   {type: GFX, offset: 0x6006030, symbol: D_MA_6006030}
 
-D_MA_60066A0:
-  {type: GFX, offset: 0x60066A0, symbol: D_MA_60066A0}
+aMaIndicatorSignDL:
+  {type: GFX, offset: 0x60066A0, symbol: aMaIndicatorSignDL}
 
 D_MA_60069A8:
   { type: TEXTURE, format: CI8, ctype: u8, width: 16, height: 16, offset: 0x60069A8, symbol: D_MA_60069A8, tlut: 0x6006AA8}
@@ -148,20 +148,20 @@ D_MA_6006BE8:
 D_MA_6006FE8:
   { type: TEXTURE, format: TLUT, ctype: u16, colors: 232, offset: 0x6006FE8, symbol: D_MA_6006FE8}
 
-D_MA_60071C0:
-  {type: GFX, offset: 0x60071C0, symbol: D_MA_60071C0}
+aMaDistanceSign4DL:
+  {type: GFX, offset: 0x60071C0, symbol: aMaDistanceSign4DL}
 
-D_MA_6007290:
-  {type: GFX, offset: 0x6007290, symbol: D_MA_6007290}
+aMaDistanceSign3DL:
+  {type: GFX, offset: 0x6007290, symbol: aMaDistanceSign3DL}
 
-D_MA_6007360:
-  {type: GFX, offset: 0x6007360, symbol: D_MA_6007360}
+aMaDistanceSign2DL:
+  {type: GFX, offset: 0x6007360, symbol: aMaDistanceSign2DL}
 
-D_MA_6007430:
-  {type: GFX, offset: 0x6007430, symbol: D_MA_6007430}
+aMaDistanceSign1DL:
+  {type: GFX, offset: 0x6007430, symbol: aMaDistanceSign1DL}
 
-D_MA_6007500:
-  {type: GFX, offset: 0x6007500, symbol: D_MA_6007500}
+aMaDistanceSign5DL:
+  {type: GFX, offset: 0x6007500, symbol: aMaDistanceSign5DL}
 
 aMaWeaponsFactoryDL:
   {type: GFX, offset: 0x60075D0, symbol: aMaWeaponsFactoryDL}
@@ -175,8 +175,8 @@ D_MA_6009AE0:
 D_MA_6009BE0:
   { type: TEXTURE, format: TLUT, ctype: u16, colors: 56, offset: 0x6009BE0, symbol: D_MA_6009BE0}
 
-D_MA_6009C50:
-  {type: GFX, offset: 0x6009C50, symbol: D_MA_6009C50}
+aMaRailroadSwitch8DL:
+  {type: GFX, offset: 0x6009C50, symbol: aMaRailroadSwitch8DL}
 
 D_MA_6009D18:
   { type: TEXTURE, format: CI8, ctype: u8, width: 16, height: 16, offset: 0x6009D18, symbol: D_MA_6009D18, tlut: 0x6009E18}
@@ -184,8 +184,8 @@ D_MA_6009D18:
 D_MA_6009E18:
   { type: TEXTURE, format: TLUT, ctype: u16, colors: 120, offset: 0x6009E18, symbol: D_MA_6009E18}
 
-D_MA_6009F10:
-  {type: GFX, offset: 0x6009F10, symbol: D_MA_6009F10}
+aMaRailroadSwitch7DL:
+  {type: GFX, offset: 0x6009F10, symbol: aMaRailroadSwitch7DL}
 
 D_MA_6009FD8:
   { type: TEXTURE, format: CI8, ctype: u8, width: 16, height: 16, offset: 0x6009FD8, symbol: D_MA_6009FD8, tlut: 0x600A0D8}
@@ -193,8 +193,8 @@ D_MA_6009FD8:
 D_MA_600A0D8:
   { type: TEXTURE, format: TLUT, ctype: u16, colors: 136, offset: 0x600A0D8, symbol: D_MA_600A0D8}
 
-D_MA_600A1F0:
-  {type: GFX, offset: 0x600A1F0, symbol: D_MA_600A1F0}
+aMaRailroadSwitch6DL:
+  {type: GFX, offset: 0x600A1F0, symbol: aMaRailroadSwitch6DL}
 
 D_MA_600A2B8:
   { type: TEXTURE, format: CI8, ctype: u8, width: 16, height: 16, offset: 0x600A2B8, symbol: D_MA_600A2B8, tlut: 0x600A3B8}
@@ -202,8 +202,8 @@ D_MA_600A2B8:
 D_MA_600A3B8:
   { type: TEXTURE, format: TLUT, ctype: u16, colors: 136, offset: 0x600A3B8, symbol: D_MA_600A3B8}
 
-D_MA_600A4D0:
-  {type: GFX, offset: 0x600A4D0, symbol: D_MA_600A4D0}
+aMaRailroadSwitch5DL:
+  {type: GFX, offset: 0x600A4D0, symbol: aMaRailroadSwitch5DL}
 
 D_MA_600A598:
   { type: TEXTURE, format: CI8, ctype: u8, width: 16, height: 16, offset: 0x600A598, symbol: D_MA_600A598, tlut: 0x600A698}
@@ -211,8 +211,8 @@ D_MA_600A598:
 D_MA_600A698:
   { type: TEXTURE, format: TLUT, ctype: u16, colors: 152, offset: 0x600A698, symbol: D_MA_600A698}
 
-D_MA_600A7D0:
-  {type: GFX, offset: 0x600A7D0, symbol: D_MA_600A7D0}
+aMaRailroadSwitch4DL:
+  {type: GFX, offset: 0x600A7D0, symbol: aMaRailroadSwitch4DL}
 
 D_MA_600A898:
   { type: TEXTURE, format: CI8, ctype: u8, width: 16, height: 16, offset: 0x600A898, symbol: D_MA_600A898, tlut: 0x600A998}
@@ -220,8 +220,8 @@ D_MA_600A898:
 D_MA_600A998:
   { type: TEXTURE, format: TLUT, ctype: u16, colors: 104, offset: 0x600A998, symbol: D_MA_600A998}
 
-D_MA_600AA70:
-  {type: GFX, offset: 0x600AA70, symbol: D_MA_600AA70}
+aMaRailroadSwitch2DL:
+  {type: GFX, offset: 0x600AA70, symbol: aMaRailroadSwitch2DL}
 
 D_MA_600AB38:
   { type: TEXTURE, format: CI8, ctype: u8, width: 16, height: 16, offset: 0x600AB38, symbol: D_MA_600AB38, tlut: 0x600AC38}
@@ -229,8 +229,8 @@ D_MA_600AB38:
 D_MA_600AC38:
   { type: TEXTURE, format: TLUT, ctype: u16, colors: 136, offset: 0x600AC38, symbol: D_MA_600AC38}
 
-D_MA_600AD50:
-  {type: GFX, offset: 0x600AD50, symbol: D_MA_600AD50}
+aMaRailroadSwitch1DL:
+  {type: GFX, offset: 0x600AD50, symbol: aMaRailroadSwitch1DL}
 
 D_MA_600AE18:
   { type: TEXTURE, format: CI8, ctype: u8, width: 8, height: 16, offset: 0x600AE18, symbol: D_MA_600AE18, tlut: 0x600AE98}
@@ -340,8 +340,8 @@ D_MA_601042C:
 D_MA_6010470:
   {type: GFX, offset: 0x6010470, symbol: D_MA_6010470}
 
-D_MA_6010700:
-  {type: GFX, offset: 0x6010700, symbol: D_MA_6010700}
+aMaProximityLightSidesDL:
+  {type: GFX, offset: 0x6010700, symbol: aMaProximityLightSidesDL}
 
 D_MA_6010C20:
   { type: TEXTURE, format: RGBA16, ctype: u16, width: 44, height: 44, offset: 0x6010C20, symbol: D_MA_6010C20}
@@ -472,8 +472,8 @@ D_MA_601BE08:
 D_MA_601BE90:
   {type: GFX, offset: 0x601BE90, symbol: D_MA_601BE90}
 
-D_MA_601C000:
-  {type: GFX, offset: 0x601C000, symbol: D_MA_601C000}
+aMaTowerTopDL:
+  {type: GFX, offset: 0x601C000, symbol: aMaTowerTopDL}
 
 D_MA_601C170:
   {type: GFX, offset: 0x601C170, symbol: D_MA_601C170}
@@ -496,8 +496,8 @@ D_MA_601EBBC:
 aMaWall2DL:
   {type: GFX, offset: 0x601F1D0, symbol: aMaWall2DL}
 
-D_MA_601F270:
-  {type: GFX, offset: 0x601F270, symbol: D_MA_601F270}
+aMaProximityLightTopDL:
+  {type: GFX, offset: 0x601F270, symbol: aMaProximityLightTopDL}
 
 D_MA_6020A30:
   {type: GFX, offset: 0x6020A30, symbol: D_MA_6020A30}
@@ -571,8 +571,8 @@ D_MA_6024670:
 aMaHorizontalLockBarDL:
   {type: GFX, offset: 0x60251A0, symbol: aMaHorizontalLockBarDL}
 
-D_MA_60253E0:
-  {type: GFX, offset: 0x60253E0, symbol: D_MA_60253E0}
+aMaTowerBottomDL:
+  {type: GFX, offset: 0x60253E0, symbol: aMaTowerBottomDL}
 
 aMaBarrierDL:
   {type: GFX, offset: 0x60257B0, symbol: aMaBarrierDL}
diff --git a/assets/yaml/us/rev1/ast_meteo.yaml b/assets/yaml/us/rev1/ast_meteo.yaml
index 26757edd..32e4a222 100644
--- a/assets/yaml/us/rev1/ast_meteo.yaml
+++ b/assets/yaml/us/rev1/ast_meteo.yaml
@@ -158,8 +158,8 @@ aMeLaserCannon2DL:
 D_ME_6018960:
   { type: GFX, offset: 0x06018960, symbol: D_ME_6018960 }
 
-aMeMeteor1DL:
-  { type: GFX, offset: 0x06018C00, symbol: aMeMeteor1DL }
+aMeMeteorDL:
+  { type: GFX, offset: 0x06018C00, symbol: aMeMeteorDL }
 
 D_ME_6019430:
   { type: GFX, offset: 0x06019430, symbol: D_ME_6019430 }
@@ -173,8 +173,8 @@ D_ME_601A080:
 D_ME_601A880:
   { type: GFX, offset: 0x0601A880, symbol: D_ME_601A880 }
 
-D_ME_601AE40:
-  { type: GFX, offset: 0x0601AE40, symbol: D_ME_601AE40 }
+aMeMeteoTunnelDL:
+  { type: GFX, offset: 0x0601AE40, symbol: aMeMeteoTunnelDL }
 
 D_ME_601C8E0: 
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x0601C8E0, symbol: D_ME_601C8E0 }
@@ -216,8 +216,8 @@ D_ME_6020920:
 D_ME_6021920:  
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x06021920, symbol: D_ME_6021920 }
 
-D_ME_6022920:
-  { type: GFX, offset: 0x06022920, symbol: D_ME_6022920 }
+aMeLaserCannon1DL:
+  { type: GFX, offset: 0x06022920, symbol: aMeLaserCannon1DL }
 
 D_ME_6022E50:
   { type: GFX, offset: 0x06022E50, symbol: D_ME_6022E50 }
@@ -249,8 +249,8 @@ D_ME_60240B0:
 D_ME_6024AD0:
   { type: GFX, offset: 0x06024AD0, symbol: D_ME_6024AD0 }
 
-D_ME_6024B60:
-  { type: GFX, offset: 0x06024B60, symbol: D_ME_6024B60 }
+aMeMolarRockDL:
+  { type: GFX, offset: 0x06024B60, symbol: aMeMolarRockDL }
 
 # Unused Meteo Ball
 D_ME_6025B50:
diff --git a/assets/yaml/us/rev1/ast_training.yaml b/assets/yaml/us/rev1/ast_training.yaml
index 6ac1d8e2..3fe0e9fb 100644
--- a/assets/yaml/us/rev1/ast_training.yaml
+++ b/assets/yaml/us/rev1/ast_training.yaml
@@ -55,8 +55,8 @@ D_TR_6005880:
 D_TR_6005938:
   { type: TEXTURE, format: RGBA16, offset: 0x06005938, width: 32, height: 32, ctype: u16, symbol: D_TR_6005938 }
 
-gItemTrainingRingDL:
-  { type: GFX, offset: 0x6006140, symbol: gItemTrainingRingDL }
+aItemTrainingRingDL:
+  { type: GFX, offset: 0x6006140, symbol: aItemTrainingRingDL }
 
 D_TR_6006958:
   { type: TEXTURE, format: RGBA16, offset: 0x06006958, width: 8, height: 8, ctype: u16, symbol: D_TR_6006958 }
@@ -79,8 +79,8 @@ D_TR_6009B34:
 aTrBuildingHitbox:
   { type: SF64:HITBOX, offset: 0x6009CC4, symbol: aTrBuildingHitbox }
 
-D_TR_6009CFC:
-  { type: SF64:HITBOX, offset: 0x6009CFC, symbol: D_TR_6009CFC }
+aItemTrainingRingHitbox:
+  { type: SF64:HITBOX, offset: 0x6009CFC, symbol: aItemTrainingRingHitbox }
 
 D_TR_6009D18:
   { type: SF64:HITBOX, offset: 0x6009D18, symbol: D_TR_6009D18 }
diff --git a/assets/yaml/us/rev1/ast_venom_1.yaml b/assets/yaml/us/rev1/ast_venom_1.yaml
index a8bbfaf9..2b67e7ba 100644
--- a/assets/yaml/us/rev1/ast_venom_1.yaml
+++ b/assets/yaml/us/rev1/ast_venom_1.yaml
@@ -106,11 +106,11 @@ aVe1SceneryWall3DL:
 D_VE1_60074E8:
   { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x60074E8, ctype: u16, symbol: D_VE1_60074E8 }
 
-D_VE1_6007CF0:
-  { type: GFX, offset: 0x6007CF0, symbol: D_VE1_6007CF0 }
+aVe1Wall2DL:
+  { type: GFX, offset: 0x6007CF0, symbol: aVe1Wall2DL }
 
-D_VE1_6007D90:
-  { type: GFX, offset: 0x6007D90, symbol: D_VE1_6007D90 }
+aVe1Wall1DL:
+  { type: GFX, offset: 0x6007D90, symbol: aVe1Wall1DL }
 
 D_VE1_6007E30:
   { type: SF64:ENVIRONMENT, offset: 0x6007E30, symbol: D_VE1_6007E30 }
@@ -133,11 +133,11 @@ D_VE1_601B474:
 D_VE1_601B4C4:
   { type: SF64:HITBOX, offset: 0x601B4C4, symbol: D_VE1_601B4C4 }
 
-aVe1SceneryWall1Hitbox:
-  { type: SF64:HITBOX, offset: 0x601B4E0, symbol: aVe1SceneryWall1Hitbox }
+Ve1Wall1Hitbox:
+  { type: SF64:HITBOX, offset: 0x601B4E0, symbol: Ve1Wall1Hitbox }
 
-aVe1SceneryWall2Hitbox:
-  { type: SF64:HITBOX, offset: 0x601B4FC, symbol: aVe1SceneryWall2Hitbox }
+aVe1Wall2Hitbox:
+  { type: SF64:HITBOX, offset: 0x601B4FC, symbol: aVe1Wall2Hitbox }
 
 aVe1SceneryWall3Hitbox:
   { type: SF64:HITBOX, offset: 0x601B518, symbol: aVe1SceneryWall3Hitbox }
diff --git a/include/functions.h b/include/functions.h
index 090c227e..9c302d0c 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -92,8 +92,8 @@ void Display_SetupPlayerSfxPos(Player*);
 void Display_Update(void);
 
 // fox_edata
-void Ve1SceneryWall1_Draw(Scenery*);
-void Ve1SceneryWall2_Draw(Scenery*);
+void Ve1Wall1_Draw(Scenery*);
+void Ve1Wall2_Draw(Scenery*);
 void Object_ApplyWaterDistortion(void);
 void AndJamesTrigger_Draw(Actor*);
 
@@ -230,7 +230,7 @@ void Actor_SpawnGreatFoxLaser(s32 actorId, f32 xPos, f32 yPos, f32 zPos, f32 xVe
 void ActorEvent_SpawnEffect347(f32 xPos, f32 yPos, f32 zPos, f32 scale1);
 void ActorEvent_8006F254(Actor*);
 void ActorEvent_Update(Actor*);
-s32 Scenery111_Draw(Scenery*);
+s32 SyShipDebris_Draw(Scenery*);
 void ActorEvent_Draw(Actor*);
 void func_enmy2_800763A4(Actor*);
 void ActorEvent_Dying(Actor*);
diff --git a/include/variables.h b/include/variables.h
index 9da23ce9..a0019f4e 100644
--- a/include/variables.h
+++ b/include/variables.h
@@ -197,7 +197,7 @@ extern u16 D_Tex_800DACB8[][32];
 extern u16 D_Tex_800D99F8[];
 extern u16 gTextCharPalettes[];
 extern Gfx gRcpInitDL[];
-extern Gfx D_Gfx_800DAC20[];
+extern Gfx aCoHighwayShadowDL[];
 extern Gfx D_Gfx_800D9688[];
 extern u8 D_Tex_800DB4B8[];
 extern Gfx D_Gfx_800D94D0[];
diff --git a/linker_scripts/eu/rev0/symbol_addrs.txt b/linker_scripts/eu/rev0/symbol_addrs.txt
index 0a546268..dc8958ef 100644
--- a/linker_scripts/eu/rev0/symbol_addrs.txt
+++ b/linker_scripts/eu/rev0/symbol_addrs.txt
@@ -2413,7 +2413,7 @@ D_800DBEC8 = 0x800DBEC8;
 D_800DBF68 = 0x800DBF68;
 D_800DBFB0 = 0x800DBFB0;
 D_800DC050 = 0x800DC050;
-D_Gfx_800DAC20 = 0x800DC090;
+aCoHighwayShadowDL = 0x800DC090;
 D_800DC0F0 = 0x800DC0F0;
 D_Tex_800DACB8 = 0x800DC128;
 D_Tex_800DB4B8 = 0x800DC928;
diff --git a/linker_scripts/jp/rev0/symbol_addrs.txt b/linker_scripts/jp/rev0/symbol_addrs.txt
index 0812be15..40ff4f45 100644
--- a/linker_scripts/jp/rev0/symbol_addrs.txt
+++ b/linker_scripts/jp/rev0/symbol_addrs.txt
@@ -3055,7 +3055,7 @@ D_800E5998 = 0x800E5998;
 D_800E5A38 = 0x800E5A38;
 D_800E5A80 = 0x800E5A80;
 D_800E5B20 = 0x800E5B20;
-D_Gfx_800DAC20 = 0x800E5B60;
+aCoHighwayShadowDL = 0x800E5B60;
 D_800E5BC0 = 0x800E5BC0;
 D_Tex_800DACB8 = 0x800E5BF8;
 D_Tex_800DB4B8 = 0x800E63F8;
diff --git a/linker_scripts/us/rev1/symbol_addrs_assets.txt b/linker_scripts/us/rev1/symbol_addrs_assets.txt
index 2aa0f73c..cb8cdc4c 100644
--- a/linker_scripts/us/rev1/symbol_addrs_assets.txt
+++ b/linker_scripts/us/rev1/symbol_addrs_assets.txt
@@ -8,11 +8,11 @@ D_Gfx_800DA9F8 = 0x800DA9F8; // type:Gfx
 D_Gfx_800DAA98 = 0x800DAA98; // type:Gfx
 D_Gfx_800DAB28 = 0x800DAB28; // type:Gfx
 D_Gfx_800DAB80 = 0x800DAB80; // type:Gfx
-D_Gfx_800DAC20 = 0x800DAC20; // type:Gfx
+aCoHighwayShadowDL = 0x800DAC20; // type:Gfx
 D_Gfx_800DACA0 = 0x800DACA0; // type:Gfx
 gRcpInitDL = 0x800DBAA0; // type:Gfx
 
-D_Tex_800DA1F8 = 0x800DA1F8;
+aCoHighwayShadowTex = 0x800DA1F8;
 D_Tex_800D99F8 = 0x800D99F8;
 gTextCharPalettes = 0x800DBA20;
 
@@ -26,7 +26,7 @@ D_Vtx_800D9910 = 0x800D9910;
 D_Vtx_800DAA58 = 0x800DAA58;
 D_Vtx_800DAAF8 = 0x800DAAF8;
 D_Vtx_800DAB40 = 0x800DAB40;
-D_Vtx_800DABE0 = 0x800DABE0;
+aCoHighwayShadowVTX = 0x800DABE0;
 D_Vtx_800DAC80 = 0x800DAC80;
 
 D_Tex_800DACB8 = 0x800DACB8;
diff --git a/src/engine/fox_bg.c b/src/engine/fox_bg.c
index 76c6be8b..09669d29 100644
--- a/src/engine/fox_bg.c
+++ b/src/engine/fox_bg.c
@@ -1145,7 +1145,7 @@ void Background_DrawGround(void) {
                 } else if (gCurrentLevel == LEVEL_BOLSE) {
                     gSPDisplayList(gMasterDisp++, D_BO_600A810);
                 } else if (gCurrentLevel == LEVEL_VENOM_2) {
-                    gSPDisplayList(gMasterDisp++, D_MA_6010700);
+                    gSPDisplayList(gMasterDisp++, aMaProximityLightSidesDL);
                 }
                 Matrix_Pop(&gGfxMatrix);
             }
diff --git a/src/engine/fox_edata.c b/src/engine/fox_edata.c
index b2c89e75..d53cfa51 100644
--- a/src/engine/fox_edata.c
+++ b/src/engine/fox_edata.c
@@ -4,21 +4,22 @@
 
 f32* D_edata_800CF964[] = { NULL }; // Likely a scrapped array of scenery shadow boxes
 
-void Ve1SceneryWall1_Draw(Scenery* scenery) {
+void Ve1Wall1_Draw(Ve1Wall1* this) {
     RCP_SetupDL_57(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
     Matrix_RotateY(gGfxMatrix, M_PI, MTXF_APPLY);
     Matrix_SetGfxMtx(&gMasterDisp);
-    gSPDisplayList(gMasterDisp++, D_VE1_6007D90);
+    gSPDisplayList(gMasterDisp++, aVe1Wall1DL);
     RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
 }
 
-void Ve1SceneryWall2_Draw(Scenery* scenery) {
+void Ve1Wall2_Draw(Ve1Wall2* this) {
     RCP_SetupDL_57(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
     Matrix_RotateY(gGfxMatrix, M_PI, MTXF_APPLY);
     Matrix_SetGfxMtx(&gMasterDisp);
-    gSPDisplayList(gMasterDisp++, D_VE1_6007CF0);
+    gSPDisplayList(gMasterDisp++, aVe1Wall2DL);
     RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
 }
 
-void AndJamesTrigger_Draw(Actor* actor) {
+void AndJamesTrigger_Draw(AndJamesTrigger* this) {
+    /* Unimplemented */
 }
diff --git a/src/engine/fox_edata_info.c b/src/engine/fox_edata_info.c
index 81cc18af..3b73923c 100644
--- a/src/engine/fox_edata_info.c
+++ b/src/engine/fox_edata_info.c
@@ -141,8 +141,8 @@ ObjectInfo gObjectInfo[] = {
   /* OBJ_SCENERY_ZO_OIL_RIG_2,  */  {(void*)     aZoOilRig2DL, 0, (ObjectFunc)          NULL,        aZoOilRig2Hitbox,  1500.0f,  0, 0, 40, 0,   0.0f,  0 },
   /* OBJ_SCENERY_ZO_OIL_RIG_3,  */  {(void*)     aZoOilRig3DL, 0, (ObjectFunc)          NULL,        aZoOilRig3Hitbox,  1500.0f,  0, 0, 40, 0,   0.0f,  0 },
   /* OBJ_SCENERY_ZO_ISLAND,  */  {(void*)     aZoIslandDL, 0, (ObjectFunc)          NULL,        aZoIslandHitbox,   500.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_VE1_WALL_1,  */  {(void*) Ve1SceneryWall1_Draw, 1, (ObjectFunc)          NULL,        aVe1SceneryWall1Hitbox,  2500.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_VE1_WALL_2,  */  {(void*) Ve1SceneryWall2_Draw, 1, (ObjectFunc)          NULL,        aVe1SceneryWall2Hitbox,  2500.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_VE1_WALL_1,  */  {(void*) Ve1Wall1_Draw, 1, (ObjectFunc)          NULL,        Ve1Wall1Hitbox,  2500.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_VE1_WALL_2,  */  {(void*) Ve1Wall2_Draw, 1, (ObjectFunc)          NULL,        aVe1Wall2Hitbox,  2500.0f,  0, 0, 40, 0,   0.0f,  0 },
   /* OBJ_SCENERY_VE1_WALL_3,  */  {(void*)     aVe1SceneryWall3DL, 0, (ObjectFunc)          NULL,        aVe1SceneryWall3Hitbox,  2500.0f,  0, 0, 40, 0,   0.0f,  0 },
   /* OBJ_SCENERY_VE1_HALLWAY_OBSTACLE,  */  {(void*)     aVe1HallwayObstacleDL, 0, (ObjectFunc)          NULL,        aVe1HallwayObstacleHitbox,  2500.0f,  0, 0, 40, 0,   0.0f,  0 },
   /* OBJ_SCENERY_VE1_GENERATOR,  */  {(void*)     aVe1GeneratorDL, 0, (ObjectFunc) Venom1_Ve1Generator_Update,        aVe1GeneratorHitbox,  2500.0f,  0, 0, 40, 0,   0.0f,  0 },
@@ -204,7 +204,7 @@ ObjectInfo gObjectInfo[] = {
   /* OBJ_SCENERY_SY_SHIP_3  */  {(void*)     aSyShip3DL, 0, (ObjectFunc)          NULL,        aSyShip3Hitbox,  4000.0f,  0, 0, 41, 0,   0.0f,  0 },
   /* OBJ_SCENERY_SY_SHIP_3_DESTROYED  */  {(void*)     aSyShip3DestroyedDL, 0, (ObjectFunc) SectorY_SyShip3Destroyed_Update,        aSyShip3DestroyedHitbox,  4000.0f,  0, 0, 41, 0,   0.0f,  0 },
   /* OBJ_SCENERY_SY_SHIP_4  */  {(void*)     aSyShip4DL, 0, (ObjectFunc)          NULL,        aSyShip4Hitbox,  4000.0f,  0, 0, 41, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_SY_SHIP_DEBRIS  */  {(void*) Scenery111_Draw, 1, (ObjectFunc)          NULL,       gNoHitbox,  2000.0f,  0, 0,  0, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_SY_SHIP_DEBRIS  */  {(void*) SyShipDebris_Draw, 1, (ObjectFunc)          NULL,       gNoHitbox,  2000.0f,  0, 0,  0, 0,   0.0f,  0 },
   /* OBJ_SCENERY_SY_SHIP_2_DESTROYED  */  {(void*)     aSyShip4DestroyedDL, 0, (ObjectFunc) SectorY_SyShip4Destroyed_Update,        aSyShip4DestroyedHitbox,  4000.0f,  0, 0, 41, 0,   0.0f,  0 },
   /* OBJ_SPRITE_SY_SHIP_2  */  {(void*)     aSyShip2SpriteDL, 0, (ObjectFunc)          NULL,       gNoHitbox,  2000.0f,  0, 0, 40, 0,   0.0f,  0 },
   /* OBJ_SPRITE_SY_SHIP_3  */  {(void*)     aSyShip3SpriteDL, 0, (ObjectFunc)          NULL,       gNoHitbox,  2000.0f,  0, 0, 40, 0,   0.0f,  0 },
@@ -258,8 +258,8 @@ ObjectInfo gObjectInfo[] = {
   /* OBJ_SPRITE_CO_TREE  */  {(void*)     aCoTreeDL, 0, (ObjectFunc) Sprite_UpdateDoodad,        aCoTreeHitbox,   100.0f,  0, 0, 40, 0,   0.0f,  0 },
   /* OBJ_SPRITE_FO_POLE  */  {(void*)     aFoPoleDL, 0, (ObjectFunc) Sprite_UpdateDoodad,        aFoPoleHitbox,   100.0f,  0, 0, 40, 0,   0.0f,  0 },
   /* OBJ_SPRITE_FOG_SHADOW  */  {(void*) FogShadow_Draw, 1, (ObjectFunc)          NULL,       gNoHitbox,  1800.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_SPRITE_CO_RUIN1  */  {(void*)     D_CO_602DCA0, 0, (ObjectFunc)          NULL,       gNoHitbox,  -100.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_SPRITE_CO_RUIN2  */  {(void*)     D_CO_601F500, 0, (ObjectFunc)          NULL,       gNoHitbox,  -100.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_SPRITE_CO_RUIN1  */  {(void*)     aCoRuin1DL, 0, (ObjectFunc)          NULL,       gNoHitbox,  -100.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_SPRITE_CO_RUIN2  */  {(void*)     aCoRuin2DL, 0, (ObjectFunc)          NULL,       gNoHitbox,  -100.0f,  0, 0, 40, 0,   0.0f,  0 },
   /* OBJ_SPRITE_167  */  {(void*) Sprite167_Draw, 1, (ObjectFunc) Sprite167_Update,       gNoHitbox,   500.0f,  0, 0, 40, 0,   0.0f,  0 },
   /* OBJ_SPRITE_168  */  {(void*) Sprite168_Draw, 1, (ObjectFunc)          NULL,       gNoHitbox,   100.0f,  0, 0, 40, 0,   0.0f,  0 },
   /* OBJ_SPRITE_TI_CACTUS  */  {(void*)     aTiCactusDL, 0, (ObjectFunc) Titania_Cactus_Update,        aTiCactusHitbox,   100.0f,  0, 0,  0, 0,   0.0f,  0 },
@@ -274,7 +274,7 @@ ObjectInfo gObjectInfo[] = {
   /* OBJ_ACTOR_CO_GARUDA_3 */  {(void*) Corneria_CoGaruda3_Draw, 2, (ObjectFunc) Corneria_CoGaruda3_Update,        CoGarudaHitbox,   500.0f,  0, 0, 39, 1, 200.0f,  1 },
   /* OBJ_ACTOR_CO_GARUDA_DESTROY */  {(void*) Corneria_CoGarudaDestroy_Draw, 2, (ObjectFunc) Corneria_CoGarudaDestroy_Update,        aCoGarudaDestroyHitbox,   500.0f,  0, 0, 39, 1,   0.0f,  1 },
   /* OBJ_ACTOR_ME_MOLAR_ROCK */  {(void*) MeMolarRock_Draw, 1, (ObjectFunc) MeMolarRock_Update,       gNoHitbox,  1000.0f,  0, 0, 39, 0,   0.0f,  1 },
-  /* OBJ_ACTOR_ME_METEOR_1 */  {(void*)     aMeMeteor1DL, 0, (ObjectFunc) Meteo_MeMeteor1_Update,        aMeMeteor1Hitbox,   200.0f,  0, 0, 39, 0,   1.0f,  1 },
+  /* OBJ_ACTOR_ME_METEOR_1 */  {(void*)     aMeMeteorDL, 0, (ObjectFunc) Meteo_MeMeteor1_Update,        aMeMeteor1Hitbox,   200.0f,  0, 0, 39, 0,   1.0f,  1 },
   /* OBJ_ACTOR_ME_METEOR_2 */  {(void*) MeMeteor2_Draw, 1, (ObjectFunc) Meteo_MeMeteor2_Update,        aMeMeteor2Hitbox,   100.0f,  0, 1, 39, 0,   1.0f,  1 },
   /* OBJ_ACTOR_ME_METEOR_SHOWER_1 */  {(void*) Meteo_MeMeteorShower1_Draw, 1, (ObjectFunc) Meteo_MeteorShower_Update,       gNoHitbox,   100.0f,  0, 1, 39, 0,   0.0f,  1 },
   /* OBJ_ACTOR_ME_METEOR_SHOWER_2 */  {(void*) Meteo_MeMeteorShower2_Draw, 1, (ObjectFunc) Meteo_MeteorShower_Update,       gNoHitbox,   100.0f,  0, 1, 39, 0,   0.0f,  1 },
@@ -348,9 +348,9 @@ ObjectInfo gObjectInfo[] = {
   /* OBJ_ACTOR_ZO_RADARBUOY */  {(void*) Zoness_ZoRadarBuoy_Draw, 1, (ObjectFunc) Zoness_ZoRadarBuoy_Update,        aZoRadarBuoyHitbox,   200.0f,  0, 0, 40, 0,  80.0f,  1 },
   /* OBJ_ACTOR_ZO_SUPPLYCRANE */  {(void*) Zoness_ZoSupplyCrane_Draw, 1, (ObjectFunc) Zoness_ZoSupplyCrane_Update,        aZoSupplyCraneHitbox,   300.0f,  0, 0, 40, 0,   0.0f,  0 },
   /* OBJ_ACTOR_ZO_SEARCHLIGHT */  {(void*) Zoness_ZoSearchLight_Draw, 1, (ObjectFunc) Zoness_ZoSearchLight_Update,        aZoSearchLightHitbox,   300.0f,  0, 0,  0, 0,   0.0f,  0 },
-  /* OBJ_ACTOR_255 */  {(void*) Aquas_Actor255_Draw, 1, (ObjectFunc) Aquas_Actor255_Update,        D_AQ_6030BFC,   500.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_ACTOR_256 */  {(void*) Aquas_Actor256_Draw, 1, (ObjectFunc) Aquas_Actor256_Update,        D_AQ_6030C18, 10000.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_ACTOR_257 */  {(void*) Aquas_Actor257_Draw, 1, (ObjectFunc) Aquas_Actor257_Update,        D_AQ_6030C44, 10000.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_ACTOR_255 */  {(void*) Aquas_Actor255_Draw, 1, (ObjectFunc) Aquas_Actor255_Update,        aAqActor255Hitbox,   500.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_ACTOR_256 */  {(void*) Aquas_Actor256_Draw, 1, (ObjectFunc) Aquas_Actor256_Update,        aAqActor256Hitbox, 10000.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_ACTOR_257 */  {(void*) Aquas_Actor257_Draw, 1, (ObjectFunc) Aquas_Actor257_Update,        aAqActor257Hitbox, 10000.0f,  0, 0, 40, 0,   0.0f,  0 },
   /* OBJ_ACTOR_AQ_PEARL */  {(void*) Aquas_AqPearl_Draw, 1, (ObjectFunc) Aquas_AqPearl_Update,       gCubeHitbox100,   200.0f,  0, 0, 40, 0,   0.0f,  0 },
   /* OBJ_ACTOR_AQ_ANGLERFISH */  {(void*) Aquas_AqAnglerFish_Draw, 2, (ObjectFunc) Aquas_AqAnglerFish_Update,        aAqAnglerFishHitbox, 10000.0f,  0, 0, 40, 0,   0.0f,  0 },
   /* OBJ_ACTOR_AQ_GAROA */  {(void*) Aquas_AqGaroa_Draw, 2, (ObjectFunc) Aquas_AqGaroa_Update,        aAqGaroaHitbox,   300.0f,  0, 0, 40, 0,   0.0f,  0 },
@@ -431,7 +431,7 @@ ObjectInfo gObjectInfo[] = {
   /* OBJ_ITEM_1UP  */  {(void*)     D_1022120, 0, (ObjectFunc) Item1up_Update,       gCubeHitbox100,   700.0f,  0, 0,  0, 0,   0.0f,  0 },
   /* OBJ_ITEM_GOLD_RING  */  {(void*) ItemGoldRing_Draw, 1, (ObjectFunc) ItemGoldRing_Update,       gItemSupplyRingHitbox,   700.0f,  0, 0,  0, 0,   0.0f,  0 },
   /* OBJ_ITEM_WING_REPAIR  */  {(void*)     aArwingItemLasersDL, 0, (ObjectFunc) ItemWingRepair_Update,       gItemLasersHitbox,   700.0f,  0, 0,  0, 0,   0.0f,  0 },
-  /* OBJ_ITEM_TRAINING_RING  */  {(void*)     gItemTrainingRingDL, 0, (ObjectFunc) Training_ItemRing_Update,        D_TR_6009CFC,   700.0f,  0, 0,  0, 0,   0.0f,  0 },
+  /* OBJ_ITEM_TRAINING_RING  */  {(void*)     aItemTrainingRingDL, 0, (ObjectFunc) Training_ItemRing_Update,        aItemTrainingRingHitbox,   700.0f,  0, 0,  0, 0,   0.0f,  0 },
   /* OBJ_EFFECT_FIRE_SMOKE_1  */  {(void*) Effect_FireSmoke_Draw, 1, (ObjectFunc) Effect_Effect339_Update,             NULL,  -200.0f,  1, 2,  0, 0,   0.0f,  0 },
   /* OBJ_EFFECT_FIRE_SMOKE_2  */  {(void*) Effect_FireSmoke_Draw, 1, (ObjectFunc) Effect_Effect340_Update,             NULL,  -200.0f,  1, 2,  0, 0,   0.0f,  0 },
   /* OBJ_EFFECT_FIRE_SMOKE_3  */  {(void*) Effect_FireSmoke_Draw, 1, (ObjectFunc) Effect_Effect341_Update,             NULL,  -200.0f,  1, 2,  0, 0,   0.0f,  0 },
diff --git a/src/engine/fox_edisplay.c b/src/engine/fox_edisplay.c
index 2dfc2869..a6086437 100644
--- a/src/engine/fox_edisplay.c
+++ b/src/engine/fox_edisplay.c
@@ -53,6 +53,7 @@ void Graphics_SetScaleMtx(f32 scale) {
 void Sprite168_Draw(Sprite168* this) {
     RCP_SetupDL(&gMasterDisp, SETUPDL_64);
     gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 60);
+    // Missing DList
     RCP_SetupDL_60(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
 }
 
@@ -99,7 +100,7 @@ void ActorHopBot_Draw(ActorHopBot* this) {
 }
 
 void MeteoTunnel_Draw(MeTunnel* this) {
-    gSPDisplayList(gMasterDisp++, D_ME_601AE40);
+    gSPDisplayList(gMasterDisp++, aMeMeteoTunnelDL);
 }
 
 void Scenery_DrawTitaniaBones(Scenery* scenery) {
@@ -115,12 +116,12 @@ void func_edisplay_80059BB0(void* arg0) {
 }
 
 void CoIBeam_Draw(CoIBeam* this) {
-    gSPDisplayList(gMasterDisp++, D_CO_6023AC0);
+    gSPDisplayList(gMasterDisp++, aCoIBeamDL);
 }
 
 void CoMoleMissile_Draw(CoMoleMissile* this) {
     if (this->animFrame != 0) {
-        gSPDisplayList(gMasterDisp++, D_CO_6032BC0);
+        gSPDisplayList(gMasterDisp++, CoMoleMissileDL);
     }
 }
 
@@ -128,6 +129,7 @@ void func_edisplay_80059C28(void* arg0) {
 }
 
 void Sprite167_Draw(Sprite167* this) {
+    /* Unimplemented */
 }
 
 void FogShadow_Draw(FogShadow* this) {
@@ -138,38 +140,38 @@ void FogShadow_Draw(FogShadow* this) {
         case OBJ_SCENERY_CO_STONE_ARCH:
             Matrix_Scale(gGfxMatrix, 2.0f, 1.0f, 0.7f, MTXF_APPLY);
             Matrix_SetGfxMtx(&gMasterDisp);
-            gSPDisplayList(gMasterDisp++, D_CO_6034B90);
+            gSPDisplayList(gMasterDisp++, aCoShadow1DL);
             break;
 
         case OBJ_SCENERY_CO_ARCH_2:
             Matrix_Scale(gGfxMatrix, 1.0f, 1.0f, 0.7f, MTXF_APPLY);
             Matrix_SetGfxMtx(&gMasterDisp);
-            gSPDisplayList(gMasterDisp++, D_CO_6034B90);
+            gSPDisplayList(gMasterDisp++, aCoShadow1DL);
             break;
 
         case OBJ_SCENERY_CO_HIGHWAY_1:
         case OBJ_SCENERY_CO_HIGHWAY_2:
             Matrix_Scale(gGfxMatrix, 1.0f, 1.0f, 10.55f, MTXF_APPLY);
             Matrix_SetGfxMtx(&gMasterDisp);
-            gSPDisplayList(gMasterDisp++, D_Gfx_800DAC20);
+            gSPDisplayList(gMasterDisp++, aCoHighwayShadowDL);
             break;
 
         case OBJ_SCENERY_CO_DOORS:
             Matrix_Scale(gGfxMatrix, 1.6f, 1.0f, 1.0f, MTXF_APPLY);
             Matrix_SetGfxMtx(&gMasterDisp);
-            gSPDisplayList(gMasterDisp++, D_CO_6034B90);
+            gSPDisplayList(gMasterDisp++, aCoShadow1DL);
             break;
 
         case OBJ_SCENERY_CO_ARCH_1:
             Matrix_Scale(gGfxMatrix, 1.2f, 1.0f, 1.3f, MTXF_APPLY);
             Matrix_SetGfxMtx(&gMasterDisp);
-            gSPDisplayList(gMasterDisp++, D_CO_6034B90);
+            gSPDisplayList(gMasterDisp++, aCoShadow1DL);
             break;
 
         case OBJ_SCENERY_CO_ARCH_3:
             Matrix_Scale(gGfxMatrix, 2.2f, 1.0f, 1.4f, MTXF_APPLY);
             Matrix_SetGfxMtx(&gMasterDisp);
-            gSPDisplayList(gMasterDisp++, D_CO_6034B90);
+            gSPDisplayList(gMasterDisp++, aCoShadow1DL);
             break;
     }
     RCP_SetupDL_60(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
@@ -178,11 +180,11 @@ void FogShadow_Draw(FogShadow* this) {
 void CoBuilding9_Draw(CoBuilding9* this) {
     Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -95.0f, MTXF_APPLY);
     Matrix_SetGfxMtx(&gMasterDisp);
-    gSPDisplayList(gMasterDisp++, D_CO_602DA20);
+    gSPDisplayList(gMasterDisp++, aCoBuilding9DL);
 }
 
 void CoBuilding10_Draw(CoBuilding10* this) {
-    gSPDisplayList(gMasterDisp++, D_CO_6035DA0);
+    gSPDisplayList(gMasterDisp++, aCoBuilding10DL);
 }
 
 // repurposed into OBJ_SCENERY_CO_BUILDING_6
@@ -600,19 +602,19 @@ void func_edisplay_8005B388(Actor199* this) {
 void MeMolarRock_Draw(MeMolarRock* this) {
     Matrix_Scale(gGfxMatrix, 1.0f, 1.0f, 1.0f, MTXF_APPLY);
     Matrix_SetGfxMtx(&gMasterDisp);
-    gSPDisplayList(gMasterDisp++, D_ME_6024B60);
+    gSPDisplayList(gMasterDisp++, aMeMolarRockDL);
 }
 
 void MeMeteor2_Draw(MeMeteor2* this) {
     RCP_SetupDL_29(this->unk_046, gFogGreen, gFogBlue, gFogAlpha, this->unk_048, gFogFar);
     Matrix_Scale(gGfxMatrix, 0.5f, 0.5f, 0.5f, MTXF_APPLY);
     Matrix_SetGfxMtx(&gMasterDisp);
-    gSPDisplayList(gMasterDisp++, aMeMeteor1DL);
+    gSPDisplayList(gMasterDisp++, aMeMeteorDL);
 }
 
 void MeLaserCannon1_Draw(MeLaserCannon1* this) {
     RCP_SetupDL_29(this->unk_046, gFogGreen, gFogBlue, gFogAlpha, this->unk_048, gFogFar);
-    gSPDisplayList(gMasterDisp++, D_ME_6022920);
+    gSPDisplayList(gMasterDisp++, aMeLaserCannon1DL);
 }
 
 void ActorMissileSeek_Draw(Actor* missile) {
@@ -716,7 +718,7 @@ void Object_SetShadowDL(ObjectId objId, s32 index) {
             break;
 
         case OBJ_BOSS_CO_GRANGA:
-            gSPDisplayList(gMasterDisp++, D_CO_6034B90);
+            gSPDisplayList(gMasterDisp++, aCoShadow1DL);
             break;
 
         case OBJ_BOSS_KA_SAUCERER:
@@ -759,7 +761,7 @@ void Object_SetShadowDL(ObjectId objId, s32 index) {
             gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 150);
             Matrix_Scale(gGfxMatrix, 0.4f, 0.4f, gActors[index].scale, MTXF_APPLY);
             Matrix_SetGfxMtx(&gMasterDisp);
-            gSPDisplayList(gMasterDisp++, D_CO_6034B90);
+            gSPDisplayList(gMasterDisp++, aCoShadow1DL);
             break;
 
         case OBJ_ACTOR_TI_BOULDER:
diff --git a/src/engine/fox_enmy2.c b/src/engine/fox_enmy2.c
index f931b99d..97b79cf7 100644
--- a/src/engine/fox_enmy2.c
+++ b/src/engine/fox_enmy2.c
@@ -954,7 +954,7 @@ static EventActorInfo sEventActorInfo[108] = {
     /*  10 */ { D_ENMY_SPACE_400BD20, gCubeHitbox200, 2.0f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 },
     /*  11 */ { D_ENMY_SPACE_4001310, gCubeHitbox100, 1.5f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ALIEN_FLY, 0, 1.0f, 1 },
     /*  12 */ { D_ENMY_SPACE_400B390, gCubeHitbox100, 2.0f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 },
-    /*  13 */ { aMeMeteor1DL, gCubeHitbox100, 2.5f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 },
+    /*  13 */ { aMeMeteorDL, gCubeHitbox100, 2.5f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 },
     /*  14 */ { D_ME_601F2A0, gCubeHitbox400, 7.0f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 },
     /*  15 */ { D_ENMY_SPACE_400AAE0, gCubeHitbox100, 1.5f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 },
     /*  16 */ { D_ENMY_SPACE_4000650, gCubeHitbox100, 1.5f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ALIEN_FLY, 0, 1.0f, 1 },
@@ -3847,7 +3847,7 @@ bool ActorEvent_OverrideLimbDraw3(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f*
     return false;
 }
 
-s32 Scenery111_Draw(SyShipDebris* this) {
+s32 SyShipDebris_Draw(SyShipDebris* this) {
     RCP_SetupDL(&gMasterDisp, SETUPDL_60);
     gSPDisplayList(gMasterDisp++, D_SY_601AD70);
     RCP_SetupDL(&gMasterDisp, SETUPDL_64);
diff --git a/src/engine/fox_shapes.c b/src/engine/fox_shapes.c
index f3be1210..411817ff 100644
--- a/src/engine/fox_shapes.c
+++ b/src/engine/fox_shapes.c
@@ -9,7 +9,7 @@ Vtx D_Vtx_800D94A0[] = {
 };
 
 Gfx D_Gfx_800D94D0[] = {
-    // used in fox_ti for the triangular light rays before firing his lazor
+    // used in fox_ti for the triangular light rays before firing his laser
     gsSPVertex(D_Vtx_800D94A0, 3, 0),
     gsSP1Triangle(0, 1, 2, 0),
     gsSPEndDisplayList(),
@@ -42,7 +42,7 @@ Vtx D_Vtx_800D9658[] = {
 };
 
 Gfx D_Gfx_800D9688[] = {
-    // used fox_fade for unused spinning fade
+    // used in fox_fade for unused spinning fade
     gsSPVertex(D_Vtx_800D9658, 3, 0),
     gsSP1Triangle(0, 1, 2, 0),
     gsSPEndDisplayList(),
@@ -208,7 +208,7 @@ u16 D_Tex_800D99F8[1024] = {
     0xFFFF, 0xFFFF,
 };
 
-u16 D_Tex_800DA1F8[1024] = {
+u16 aCoHighwayShadowTex[1024] = {
     0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001,
     0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001,
     0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001,
@@ -345,19 +345,19 @@ Gfx D_Gfx_800DAB80[] = {
     gsSPEndDisplayList(),
 };
 
-Vtx D_Vtx_800DABE0[] = {
+Vtx aCoHighwayShadowVTX[] = {
     VTX(-170, 0, -170, 0, 255, 0, 127, 0, 0),
     VTX(170, 0, -170, 255, 255, 0, 127, 0, 0),
     VTX(170, 0, 170, 255, 0, 0, 127, 0, 0),
     VTX(-179, 0, 170, 0, 0, 0, 127, 0, 0),
 };
 
-Gfx D_Gfx_800DAC20[] = {
+Gfx aCoHighwayShadowDL[] = {
     // used in fox_edisplay
     gsDPSetupTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 8, 0, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, 3, 3,
                   G_TX_NOLOD, G_TX_NOLOD),
-    gsDPLoadTileTexture(D_Tex_800DA1F8, G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 8),
-    gsSPVertex(D_Vtx_800DABE0, 4, 0),
+    gsDPLoadTileTexture(aCoHighwayShadowTex, G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 8),
+    gsSPVertex(aCoHighwayShadowVTX, 4, 0),
     gsSP1Triangle(0, 2, 1, 0),
     gsSP1Triangle(0, 3, 2, 0),
     gsSPEndDisplayList(),
diff --git a/src/overlays/ovl_i1/fox_co.c b/src/overlays/ovl_i1/fox_co.c
index c3fd6b13..4eef3cc8 100644
--- a/src/overlays/ovl_i1/fox_co.c
+++ b/src/overlays/ovl_i1/fox_co.c
@@ -2747,7 +2747,7 @@ bool Corneria_CoDoors_OverrideLimbDraw(s32 limbIndex, Gfx** dList, Vec3f* pos, V
 void Corneria_CoDoors_Draw(CoDoors* this) {
     Vec3f jointTable[10];
 
-    Animation_GetFrameData(&D_CO_602AA7C, 0, jointTable);
+    Animation_GetFrameData(&aCoDoorsAnim, 0, jointTable);
     Animation_DrawSkeleton(3, aCoDoorsSkel, jointTable, Corneria_CoDoors_OverrideLimbDraw, NULL, this, gCalcMatrix);
     RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
 }
diff --git a/src/overlays/ovl_i5/fox_ma.c b/src/overlays/ovl_i5/fox_ma.c
index e0e31d4b..d2683872 100644
--- a/src/overlays/ovl_i5/fox_ma.c
+++ b/src/overlays/ovl_i5/fox_ma.c
@@ -2722,8 +2722,8 @@ void Macbeth_TrainTrack_Draw(Scenery* this) {
 void Macbeth_MaTower_Draw(Scenery* this) {
     RCP_SetupDL(&gMasterDisp, SETUPDL_57);
     gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
-    gSPDisplayList(gMasterDisp++, D_MA_60253E0);
-    gSPDisplayList(gMasterDisp++, D_MA_601C000);
+    gSPDisplayList(gMasterDisp++, aMaTowerBottomDL);
+    gSPDisplayList(gMasterDisp++, aMaTowerTopDL);
     gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
     RCP_SetupDL(&gMasterDisp, SETUPDL_29);
 }
@@ -2738,46 +2738,46 @@ void Macbeth_IndicatorSign_Draw(Scenery* this) {
 
     switch (this->obj.id) {
         case OBJ_SCENERY_MA_INDICATOR_SIGN:
-            gSPDisplayList(gMasterDisp++, D_MA_60066A0);
+            gSPDisplayList(gMasterDisp++, aMaIndicatorSignDL);
             break;
         case OBJ_SCENERY_MA_DISTANCE_SIGN_1:
-            gSPDisplayList(gMasterDisp++, D_MA_6007430);
+            gSPDisplayList(gMasterDisp++, aMaDistanceSign1DL);
             break;
         case OBJ_SCENERY_MA_DISTANCE_SIGN_2:
-            gSPDisplayList(gMasterDisp++, D_MA_6007360);
+            gSPDisplayList(gMasterDisp++, aMaDistanceSign2DL);
             break;
         case OBJ_SCENERY_MA_DISTANCE_SIGN_3:
-            gSPDisplayList(gMasterDisp++, D_MA_6007290);
+            gSPDisplayList(gMasterDisp++, aMaDistanceSign3DL);
             break;
         case OBJ_SCENERY_MA_DISTANCE_SIGN_4:
-            gSPDisplayList(gMasterDisp++, D_MA_60071C0);
+            gSPDisplayList(gMasterDisp++, aMaDistanceSign4DL);
             break;
         case OBJ_SCENERY_MA_DISTANCE_SIGN_5:
-            gSPDisplayList(gMasterDisp++, D_MA_6007500);
+            gSPDisplayList(gMasterDisp++, aMaDistanceSign5DL);
             break;
         case OBJ_SCENERY_MA_RAILROAD_SWITCH_1:
-            gSPDisplayList(gMasterDisp++, D_MA_600AD50);
+            gSPDisplayList(gMasterDisp++, aMaRailroadSwitch1DL);
             break;
         case OBJ_SCENERY_MA_RAILROAD_SWITCH_2:
-            gSPDisplayList(gMasterDisp++, D_MA_600AA70);
+            gSPDisplayList(gMasterDisp++, aMaRailroadSwitch2DL);
             break;
         case OBJ_SCENERY_MA_RAILROAD_SWITCH_3:
-            gSPDisplayList(gMasterDisp++, D_MA_6003070);
+            gSPDisplayList(gMasterDisp++, aMaRailroadSwitch3DL);
             break;
         case OBJ_SCENERY_MA_RAILROAD_SWITCH_4:
-            gSPDisplayList(gMasterDisp++, D_MA_600A7D0);
+            gSPDisplayList(gMasterDisp++, aMaRailroadSwitch4DL);
             break;
         case OBJ_SCENERY_MA_RAILROAD_SWITCH_5:
-            gSPDisplayList(gMasterDisp++, D_MA_600A4D0);
+            gSPDisplayList(gMasterDisp++, aMaRailroadSwitch5DL);
             break;
         case OBJ_SCENERY_MA_RAILROAD_SWITCH_6:
-            gSPDisplayList(gMasterDisp++, D_MA_600A1F0);
+            gSPDisplayList(gMasterDisp++, aMaRailroadSwitch6DL);
             break;
         case OBJ_SCENERY_MA_RAILROAD_SWITCH_7:
-            gSPDisplayList(gMasterDisp++, D_MA_6009F10);
+            gSPDisplayList(gMasterDisp++, aMaRailroadSwitch7DL);
             break;
         case OBJ_SCENERY_MA_RAILROAD_SWITCH_8:
-            gSPDisplayList(gMasterDisp++, D_MA_6009C50);
+            gSPDisplayList(gMasterDisp++, aMaRailroadSwitch8DL);
             break;
     }
     RCP_SetupDL(&gMasterDisp, SETUPDL_29);
@@ -3777,9 +3777,9 @@ void Macbeth_MaProximityLight_Draw(MaProximityLight* this) {
         RCP_SetupDL(&gMasterDisp, SETUPDL_34);
         gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, this->vel.x, 0, 0, 255);
     }
-    gSPDisplayList(gMasterDisp++, D_MA_6010700);
+    gSPDisplayList(gMasterDisp++, aMaProximityLightSidesDL);
     RCP_SetupDL(&gMasterDisp, SETUPDL_29);
-    gSPDisplayList(gMasterDisp++, D_MA_601F270);
+    gSPDisplayList(gMasterDisp++, aMaProximityLightTopDL);
 }
 
 void Macbeth_801A67BC(s32 arg0) {
diff --git a/src/overlays/ovl_i5/fox_ti.c b/src/overlays/ovl_i5/fox_ti.c
index 87c763f2..bce3610a 100644
--- a/src/overlays/ovl_i5/fox_ti.c
+++ b/src/overlays/ovl_i5/fox_ti.c
@@ -2208,7 +2208,7 @@ void Titania_TiPillar_Draw(TiPillar* this) {
                 }
             }
 
-            if (this->unk_44 == 0) {
+            if (this->unk_44 == 0) { // Can never be true, this condition is never going to pass.
                 gSPDisplayList(gMasterDisp++, D_TI1_7002270);
             } else {
                 gSPDisplayList(gMasterDisp++, D_TI1_7000A80);
diff --git a/src/overlays/ovl_i6/fox_sy.c b/src/overlays/ovl_i6/fox_sy.c
index 6534def2..9e719808 100644
--- a/src/overlays/ovl_i6/fox_sy.c
+++ b/src/overlays/ovl_i6/fox_sy.c
@@ -3840,15 +3840,15 @@ bool SectorY_SyRobot_OverrideLimbDraw(s32 limbIndex, Gfx** dList, Vec3f* pos, Ve
 }
 
 void SectorY_SyRobot_PostLimbDraw(s32 limbIndex, Vec3f* rot, void* thisx) {
-    Vec3f sp2C = { 40.0f, -30.0f, 0.0f };
-    Vec3f sp20;
+    Vec3f src = { 40.0f, -30.0f, 0.0f };
+    Vec3f dest;
     SyRobot* actor = (SyRobot*) thisx;
 
     if (limbIndex == 1) {
-        Matrix_MultVec3f(gCalcMatrix, &sp2C, &sp20);
-        actor->fwork[16] = sp20.x;
-        actor->fwork[17] = sp20.y;
-        actor->fwork[18] = sp20.z;
+        Matrix_MultVec3f(gCalcMatrix, &src, &dest);
+        actor->fwork[16] = dest.x;
+        actor->fwork[17] = dest.y;
+        actor->fwork[18] = dest.z;
     }
 }
 
@@ -3878,70 +3878,73 @@ void SectorY_SyRobot_Draw(SyRobot* this) {
     }
 }
 
-void SectorY_SyShip3Destroyed_Update(SyShip3Destroyed* scenery) {
+void SectorY_SyShip3Destroyed_Update(SyShip3Destroyed* this) {
     Vec3f src;
     Vec3f dest;
 
-    if (scenery->state == 0) {
-        AUDIO_PLAY_SFX(NA_SE_OB_BROKEN_SPARK_L, scenery->sfxSource, 4);
-        scenery->state++;
+    if (this->state == 0) {
+        AUDIO_PLAY_SFX(NA_SE_OB_BROKEN_SPARK_L, this->sfxSource, 4);
+        this->state++;
     }
 
     if ((gGameFrameCount % 4) == 0) {
-        Matrix_RotateY(gCalcMatrix, scenery->obj.rot.y * M_DTOR, MTXF_NEW);
-        Matrix_RotateX(gCalcMatrix, scenery->obj.rot.x * M_DTOR, MTXF_APPLY);
-        Matrix_RotateZ(gCalcMatrix, scenery->obj.rot.z * M_DTOR, MTXF_APPLY);
+        Matrix_RotateY(gCalcMatrix, this->obj.rot.y * M_DTOR, MTXF_NEW);
+        Matrix_RotateX(gCalcMatrix, this->obj.rot.x * M_DTOR, MTXF_APPLY);
+        Matrix_RotateZ(gCalcMatrix, this->obj.rot.z * M_DTOR, MTXF_APPLY);
         src.x = RAND_FLOAT_CENTERED(100.0f) + 500.0f;
         src.y = RAND_FLOAT_CENTERED(900.0f) + -150.0f;
         src.z = 90.0f - RAND_FLOAT(50.0f);
         Matrix_MultVec3f(gCalcMatrix, &src, &dest);
-        Effect_Effect390_Spawn(scenery->obj.pos.x + dest.x, scenery->obj.pos.y + dest.y, scenery->obj.pos.z + dest.z,
-                               scenery->effectVel.x, scenery->effectVel.y, scenery->effectVel.z, 0.2f, 5);
+        Effect_Effect390_Spawn(this->obj.pos.x + dest.x, this->obj.pos.y + dest.y, this->obj.pos.z + dest.z,
+                               this->effectVel.x, this->effectVel.y, this->effectVel.z, 0.2f, 5);
+
         src.x = RAND_FLOAT_CENTERED(100.0f) + -500.0f;
         src.y = RAND_FLOAT_CENTERED(900.0f);
         src.z = 80.0f - RAND_FLOAT(50.0f);
         Matrix_MultVec3f(gCalcMatrix, &src, &dest);
-        Effect_Effect390_Spawn(scenery->obj.pos.x + dest.x, scenery->obj.pos.y + dest.y, scenery->obj.pos.z + dest.z,
-                               scenery->effectVel.x, scenery->effectVel.y, scenery->effectVel.z, 0.2f, 5);
+        Effect_Effect390_Spawn(this->obj.pos.x + dest.x, this->obj.pos.y + dest.y, this->obj.pos.z + dest.z,
+                               this->effectVel.x, this->effectVel.y, this->effectVel.z, 0.2f, 5);
+
         src.x = RAND_FLOAT_CENTERED(100.0f) + 500.0f;
         src.y = RAND_FLOAT_CENTERED(900.0f) + -50.0f;
         src.z = 1900.0f - RAND_FLOAT(50.0f);
         Matrix_MultVec3f(gCalcMatrix, &src, &dest);
-        Effect_Effect390_Spawn(scenery->obj.pos.x + dest.x, scenery->obj.pos.y + dest.y, scenery->obj.pos.z + dest.z,
-                               scenery->effectVel.x, scenery->effectVel.y, scenery->effectVel.z, 0.2f, 5);
+        Effect_Effect390_Spawn(this->obj.pos.x + dest.x, this->obj.pos.y + dest.y, this->obj.pos.z + dest.z,
+                               this->effectVel.x, this->effectVel.y, this->effectVel.z, 0.2f, 5);
+
         src.x = RAND_FLOAT_CENTERED(100.0f) + -1000.0f;
         src.y = RAND_FLOAT_CENTERED(900.0f) + -250.0f;
         src.z = 1100.0f - RAND_FLOAT(50.0f);
         Matrix_MultVec3f(gCalcMatrix, &src, &dest);
-        Effect_Effect390_Spawn(scenery->obj.pos.x + dest.x, scenery->obj.pos.y + dest.y, scenery->obj.pos.z + dest.z,
-                               scenery->effectVel.x, scenery->effectVel.y, scenery->effectVel.z, 0.2f, 5);
+        Effect_Effect390_Spawn(this->obj.pos.x + dest.x, this->obj.pos.y + dest.y, this->obj.pos.z + dest.z,
+                               this->effectVel.x, this->effectVel.y, this->effectVel.z, 0.2f, 5);
     }
 }
 
-void SectorY_SyShip4Destroyed_Update(SyShip2Destroyed* scenery) {
+void SectorY_SyShip4Destroyed_Update(SyShip2Destroyed* this) {
     Vec3f src;
     Vec3f dest;
 
-    if (scenery->state == 0) {
-        AUDIO_PLAY_SFX(NA_SE_OB_BROKEN_SPARK_L, scenery->sfxSource, 4);
-        scenery->state++;
+    if (this->state == 0) {
+        AUDIO_PLAY_SFX(NA_SE_OB_BROKEN_SPARK_L, this->sfxSource, 4);
+        this->state++;
     }
 
     if ((gGameFrameCount % 4) == 0) {
-        Matrix_RotateY(gCalcMatrix, scenery->obj.rot.y * M_DTOR, MTXF_NEW);
-        Matrix_RotateX(gCalcMatrix, scenery->obj.rot.x * M_DTOR, MTXF_APPLY);
-        Matrix_RotateZ(gCalcMatrix, scenery->obj.rot.z * M_DTOR, MTXF_APPLY);
+        Matrix_RotateY(gCalcMatrix, this->obj.rot.y * M_DTOR, MTXF_NEW);
+        Matrix_RotateX(gCalcMatrix, this->obj.rot.x * M_DTOR, MTXF_APPLY);
+        Matrix_RotateZ(gCalcMatrix, this->obj.rot.z * M_DTOR, MTXF_APPLY);
         src.x = RAND_FLOAT_CENTERED(100.0f) + -800.0f;
         src.y = RAND_FLOAT_CENTERED(300.0f) + -100.0f;
         src.z = RAND_FLOAT_CENTERED(5000.0f) + 500.0f;
         Matrix_MultVec3f(gCalcMatrix, &src, &dest);
-        Effect_Effect390_Spawn(scenery->obj.pos.x + dest.x, scenery->obj.pos.y + dest.y, scenery->obj.pos.z + dest.z,
-                               scenery->effectVel.x, scenery->effectVel.y, scenery->effectVel.z, 0.3f, 5);
+        Effect_Effect390_Spawn(this->obj.pos.x + dest.x, this->obj.pos.y + dest.y, this->obj.pos.z + dest.z,
+                               this->effectVel.x, this->effectVel.y, this->effectVel.z, 0.3f, 5);
         src.x = RAND_FLOAT_CENTERED(100.0f) + -600.0f;
         src.y = RAND_FLOAT_CENTERED(250.0f) + 300.0f;
         src.z = RAND_FLOAT_CENTERED(1500.0f) + -1650.0f;
         Matrix_MultVec3f(gCalcMatrix, &src, &dest);
-        Effect_Effect390_Spawn(scenery->obj.pos.x + dest.x, scenery->obj.pos.y + dest.y, scenery->obj.pos.z + dest.z,
-                               scenery->effectVel.x, scenery->effectVel.y, scenery->effectVel.z, 0.2f, 5);
+        Effect_Effect390_Spawn(this->obj.pos.x + dest.x, this->obj.pos.y + dest.y, this->obj.pos.z + dest.z,
+                               this->effectVel.x, this->effectVel.y, this->effectVel.z, 0.2f, 5);
     }
 }