General docs (#269)

* fox_display.c DOCS

* PRINTF

* actor->destroy boolean

* corneria docs

* Boss->unk_04C to Boss->animFrame

* aCoGrangaWalkingAnim

* more corneria docs

* Spawner

* Spawner code refined

* Spawner description

* Actor Spawn guard

* Molar Rock (name by @inspectredc)

* more docs

* actor docs

* initial disassembly config for lodgenet

* correct vram addresses for lodgenet

* Actor Docs

* More actor docs

* more actor docs

* correction

* correction

* more actor docs

* Preliminary work for Effect documentation

* Change Init for Setup

* fox_play cleanup and defake

* fox_zo function names

* fox_so function renaming

* more object docs

* venom 1 actors

* actor docs

* some fox_bo docs

* some fox_fo corrections

* fox_ma obj->this

* fox_ma renamings

* fox_ma docs

* fox_ti Actors

* revert permuter settings to ido

* some renames on fox_andross.c

* fox_sy actors

* object names

* corrections

* some effect comments

* fix AudioTable struct and data to avoid UB

* uintptr_t in audio

* audio load changes

* event id enum usage in fox_sy

* clear padding in sPlaylists

* HUD_FoBase_ExplodeCs

* HUD

.vscode/settings.json

@@ -149,7 +149,8 @@
     "sf64dma.h": "c",
     "string": "c",
     "prevent_bss_reordering3.h": "c",
-    "ast_a_ti.h": "c"
+    "ast_a_ti.h": "c",
+    "fox_co.h": "c"
   },
   "C_Cpp_Runner.msvcBatchPath": ""
 }

Makefile

@@ -99,7 +99,7 @@ else
   # we support Microsoft extensions such as anonymous structs, which the compiler does support but warns for their usage. Surpress the warnings with -woff.
   CFLAGS += -G 0 -non_shared -fullwarn -verbose -Xcpluscomm $(IINC) -nostdinc -Wab,-r4300_mul -woff 649,838,712,516
   MIPS_VERSION := -mips2
-  WARNINGS := -fullwarn -verbose -woff 624,649,838,712,516,513,596,564,594,709
+  WARNINGS := -fullwarn -verbose -woff 624,649,838,712,516,513,596,564,594,709,807
 endif
 
 ifeq ($(COMPILER),ido)

assets/yaml/jp/rev0/ast_7_ti_1.yaml

@@ -89,8 +89,8 @@ D_TI1_7005420:
 D_TI1_70067C4:
   { type: SF64:ANIM, offset: 0x70067C4, symbol: D_TI1_70067C4 }
 
-D_TI1_7006990:
+aTi1DesertCrawlerSkel:
-  { type: SF64:SKELETON, offset: 0x7006990, symbol: D_TI1_7006990}
+  { type: SF64:SKELETON, offset: 0x7006990, symbol: aTi1DesertCrawlerSkel}
 
 D_TI1_7006F74:
   { type: SF64:ANIM, offset: 0x7006F74, symbol: D_TI1_7006F74 }
@@ -146,8 +146,8 @@ D_TI1_7009510:
 D_TI1_70096D8:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x070096D8, symbol: D_TI1_70096D8 }
 
-D_TI1_70098E0:
+aTiDelphorDL:
-  { type: GFX, offset: 0x70098E0, symbol: D_TI1_70098E0 }
+  { type: GFX, offset: 0x70098E0, symbol: aTiDelphorDL }
 
 D_TI1_7009B58:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x07009B58, symbol: D_TI1_7009B58 }
@@ -158,8 +158,8 @@ D_TI1_7009D60:
 D_TI1_700A190:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0700A190, symbol: D_TI1_700A190 }
 
-D_TI1_700A990:
+aTi1BombDL:
-  { type: GFX, offset: 0x700A990, symbol: D_TI1_700A990 }
+  { type: GFX, offset: 0x700A990, symbol: aTi1BombDL }
 
 D_TI1_700AAD8:
   { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x700AAD8, symbol: D_TI1_700AAD8, tlut: 0x700AB58 }
@@ -167,8 +167,8 @@ D_TI1_700AAD8:
 D_TI1_700AB58:
   { type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0x700AB58, symbol: D_TI1_700AB58 }
 
-D_TI1_700AB70:
+aTi1LandmineDL:
-  { type: GFX, offset: 0x700AB70, symbol: D_TI1_700AB70 }
+  { type: GFX, offset: 0x700AB70, symbol: aTi1LandmineDL }
 
 D_TI1_700AEA8:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x0700AEA8, symbol: D_TI1_700AEA8 }
@@ -188,8 +188,8 @@ D_TI1_700B9C0:
 D_TI1_700BB10:
   { type: GFX, offset: 0x700BB10, symbol: D_TI1_700BB10 }
 
-D_TI1_700BE00:
+aTiBridgeDL:
-  { type: GFX, offset: 0x700BE00, symbol: D_TI1_700BE00 }
+  { type: GFX, offset: 0x700BE00, symbol: aTiBridgeDL }
 
 D_TI1_700BFB0:
   { type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x0700BFB0, symbol: D_TI1_700BFB0, tlut: 0x0700C3B0 }
@@ -200,11 +200,11 @@ D_TI1_700C3B0:
 D_TI1_700C4B0:
   { type: GFX, offset: 0x700C4B0, symbol: D_TI1_700C4B0 }
 
-D_TI1_700C8D8:
+aTi1DesertRoverAnim:
-  { type: SF64:ANIM, offset: 0x700C8D8, symbol: D_TI1_700C8D8 }
+  { type: SF64:ANIM, offset: 0x700C8D8, symbol: aTi1DesertRoverAnim }
 
-D_TI1_700C964:
+aTi1DesertRoverSkel:
-  { type: SF64:SKELETON, offset: 0x700C964, symbol: D_TI1_700C964 }
+  { type: SF64:SKELETON, offset: 0x700C964, symbol: aTi1DesertRoverSkel }
 
 D_TI1_700C980:
   { type: GFX, offset: 0x700C980, symbol: D_TI1_700C980 }
@@ -218,8 +218,8 @@ D_TI1_700CB60:
 D_TI1_700D534:
   { type: SF64:ANIM, offset: 0x700D534, symbol: D_TI1_700D534 }
 
-D_TI1_700D700:
+aTiRascoSkel:
-  {type: SF64:SKELETON, offset: 0x700D700, symbol: D_TI1_700D700}
+  {type: SF64:SKELETON, offset: 0x700D700, symbol: aTiRascoSkel}
 
 D_TI1_700D740:
   { type: GFX, offset: 0x700D740, symbol: D_TI1_700D740 }

assets/yaml/jp/rev0/ast_allies.yaml

@@ -8,8 +8,8 @@
       - '#include "gfx.h"'
       - '#include "sf64object.h"'
 
-D_D000000:
+aKattMarkDL:
-  { type: GFX, offset: 0xD000000, symbol: D_D000000 }
+  { type: GFX, offset: 0xD000000, symbol: aKattMarkDL }
 
 ast_allies_seg13_vtx_00000098:
   { type: VTX, count: 3, offset: 0x0D000098, symbol: ast_allies_seg13_vtx_00000098 }
@@ -17,11 +17,11 @@ ast_allies_seg13_vtx_00000098:
 D_D0000C8:
   { type: BLOB, size: 0x18, offset: 0x0D0000C8, symbol: D_D0000C8 }
 
-D_D0000E0:
+aKattMarkTex:
-  { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x0D0000E0, symbol: D_D0000E0, tlut: 0x0D000160 }
+  { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x0D0000E0, symbol: aKattMarkTex, tlut: 0x0D000160 }
 
-D_D000160:
+aKattMarkTLUT:
-  { type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0xD000160, symbol: D_D000160 }
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0xD000160, symbol: aKattMarkTLUT }
 
 D_D000170:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0xD000170, symbol: D_D000170 }
@@ -77,25 +77,25 @@ D_D00AFB8:
 D_D00B3B8:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0D00B3B8, symbol: D_D00B3B8 }
 
-D_D00B5C0:
+aBillMarkDL:
-  { type: GFX, offset: 0xD00B5C0, symbol: D_D00B5C0 }
+  { type: GFX, offset: 0xD00B5C0, symbol: aBillMarkDL }
 
 # Letter B
-D_D00B688:
+aBillMarkTex:
-  { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x0D00B688, symbol: D_D00B688, tlut: 0xD00B708 }
+  { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x0D00B688, symbol: aBillMarkTex, tlut: 0xD00B708 }
 
-D_D00B708:
+aBillMarkTLUT:
-  { type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0xD00B708, symbol: D_D00B708 }
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0xD00B708, symbol: aBillMarkTLUT }
 
-D_D00B720:
+aJamesMarkDL:
-  { type: GFX, offset: 0xD00B720, symbol: D_D00B720 }
+  { type: GFX, offset: 0xD00B720, symbol: aJamesMarkDL }
 
 # Letter J ?
-D_D00B7F0:
+aJamesMarkTex:
-  { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x0D00B7F0, symbol: D_D00B7F0, tlut: 0xD00B870 }
+  { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x0D00B7F0, symbol: aJamesMarkTex, tlut: 0xD00B870 }
 
-D_D00B870:
+aJamesMarkTLUT:
-  { type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0xD00B870, symbol: D_D00B870 }
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0xD00B870, symbol: aJamesMarkTLUT }
 
 D_D00B880:
   { type: GFX, offset: 0xD00B880, symbol: D_D00B880 }

assets/yaml/jp/rev0/ast_andross.yaml

@@ -232,8 +232,8 @@ D_ANDROSS_C038860:
 D_ANDROSS_C038954:
   {type: SF64:HITBOX, offset: 0xC038954, symbol: D_ANDROSS_C038954}
 
-D_ANDROSS_C038A48:
+aAndDoorHitbox:
-  {type: SF64:HITBOX, offset: 0xC038A48, symbol: D_ANDROSS_C038A48}
+  {type: SF64:HITBOX, offset: 0xC038A48, symbol: aAndDoorHitbox}
 
 D_ANDROSS_C038AC4:
   {type: SF64:HITBOX, offset: 0xC038AC4, symbol: D_ANDROSS_C038AC4}
@@ -241,20 +241,20 @@ D_ANDROSS_C038AC4:
 D_ANDROSS_C038B40:
   {type: SF64:HITBOX, offset: 0xC038B40, symbol: D_ANDROSS_C038B40}
 
-D_ANDROSS_C038BA4:
+aAndPathIntersectionHitbox:
-  {type: SF64:HITBOX, offset: 0xC038BA4, symbol: D_ANDROSS_C038BA4}
+  {type: SF64:HITBOX, offset: 0xC038BA4, symbol: aAndPathIntersectionHitbox}
 
-D_ANDROSS_C038BD8:
+aAndPassageHitbox:
-  {type: SF64:HITBOX, offset: 0xC038BD8, symbol: D_ANDROSS_C038BD8}
+  {type: SF64:HITBOX, offset: 0xC038BD8, symbol: aAndPassageHitbox}
 
 D_ANDROSS_C038CCC:
   {type: SF64:HITBOX, offset: 0xC038CCC, symbol: D_ANDROSS_C038CCC}
 
-D_ANDROSS_C038DC0:
+aAndAndrossHitbox:
-  {type: SF64:HITBOX, offset: 0xC038DC0, symbol: D_ANDROSS_C038DC0}
+  {type: SF64:HITBOX, offset: 0xC038DC0, symbol: aAndAndrossHitbox}
 
-D_ANDROSS_C038F24:
+aAndBrainHitbox:
-  {type: SF64:HITBOX, offset: 0xC038F24, symbol: D_ANDROSS_C038F24}
+  {type: SF64:HITBOX, offset: 0xC038F24, symbol: aAndBrainHitbox}
 
 D_ANDROSS_C038FE8:
   {type: VTX, count: 34, offset: 0xC038FE8, symbol: D_ANDROSS_C038FE8}

assets/yaml/jp/rev0/ast_aquas.yaml

@@ -35,8 +35,8 @@ D_AQ_6002874:
   { type: SF64:SKELETON, offset: 0x6002874, symbol: D_AQ_6002874 }
 
 #
-D_AQ_6002C10:
+aAqOysterDL:
-  { type: GFX, offset: 0x6002C10, symbol: D_AQ_6002C10 }
+  { type: GFX, offset: 0x6002C10, symbol: aAqOysterDL }
 
 D_AQ_6002D58:
   { type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x6002D58, symbol: D_AQ_6002D58, tlut: 0x6003158 }
@@ -152,8 +152,8 @@ D_AQ_600BD20:
 D_AQ_600B518:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x600B518, symbol: D_AQ_600B518 }
 
-D_AQ_600BF80:
+aAqTunnel2DL:
-  { type: GFX, offset: 0x600BF80, symbol: D_AQ_600BF80 }
+  { type: GFX, offset: 0x600BF80, symbol: aAqTunnel2DL }
 
 D_AQ_600C530:
   { type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x600C530, symbol: D_AQ_600C530, tlut: 0x600C930 }
@@ -197,11 +197,11 @@ D_AQ_600E150:
 D_AQ_600E368:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x600E368, symbol: D_AQ_600E368 }
 
-D_AQ_600EE10:
+aAqWall1DL:
-  { type: GFX, offset: 0x600EE10, symbol: D_AQ_600EE10 }
+  { type: GFX, offset: 0x600EE10, symbol: aAqWall1DL }
 
-D_AQ_600EEF0:
+aAqBump2DL:
-  { type: GFX, offset: 0x600EEF0, symbol: D_AQ_600EEF0 }
+  { type: GFX, offset: 0x600EEF0, symbol: aAqBump2DL }
 
 D_AQ_600F030:
   { type: GFX, offset: 0x600F030, symbol: D_AQ_600F030 }
@@ -230,11 +230,11 @@ D_AQ_6011A78:
 D_AQ_6011CD8:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6011CD8, symbol: D_AQ_6011CD8 }
 
-D_AQ_6011EE0:
+aAqTunnel1DL:
-  { type: GFX, offset: 0x6011EE0, symbol: D_AQ_6011EE0 }
+  { type: GFX, offset: 0x6011EE0, symbol: aAqTunnel1DL }
 
-D_AQ_60120F0:
+aAqRoofDL:
-  { type: GFX, offset: 0x60120F0, symbol: D_AQ_60120F0 }
+  { type: GFX, offset: 0x60120F0, symbol: aAqRoofDL }
 
 D_AQ_60126A8:
   { type: TEXTURE, ctype: u8, format: CI8, width: 16, height: 64, offset: 0x60126A8, symbol: D_AQ_60126A8, tlut: 0x6012AA8 }
@@ -254,14 +254,14 @@ D_AQ_6012EA8:
 D_AQ_60132A8:
   { type: TEXTURE, ctype: u16, format: TLUT, colors: 240, offset: 0x60132A8, symbol: D_AQ_60132A8 }
 
-D_AQ_60135E0:
+aAqFishGroupAnim:
-  { type: SF64:ANIM, offset: 0x60135E0, symbol: D_AQ_60135E0 }
+  { type: SF64:ANIM, offset: 0x60135E0, symbol: aAqFishGroupAnim }
 
-D_AQ_60136CC:
+aAqFishGroupSkel1:
-  { type: SF64:SKELETON, offset: 0x60136CC, symbol: D_AQ_60136CC }
+  { type: SF64:SKELETON, offset: 0x60136CC, symbol: aAqFishGroupSkel1 }
 
-D_AQ_60137CC:
+aAqFishGroupSkel2:
-  { type: SF64:SKELETON, offset: 0x60137CC, symbol: D_AQ_60137CC }
+  { type: SF64:SKELETON, offset: 0x60137CC, symbol: aAqFishGroupSkel2 }
 
 D_AQ_60137F0:
   { type: GFX, offset: 0x60137F0, symbol: D_AQ_60137F0 }
@@ -275,11 +275,11 @@ D_AQ_6013EC0:
 D_AQ_6014030:
   { type: GFX, offset: 0x6014030, symbol: D_AQ_6014030 }
 
-D_AQ_6014438:
+aAqStoneColumnAnim:
-  { type: SF64:ANIM, offset: 0x6014438, symbol: D_AQ_6014438 }
+  { type: SF64:ANIM, offset: 0x6014438, symbol: aAqStoneColumnAnim }
 
-D_AQ_6014504:
+aAqStoneColumnSkel:
-  { type: SF64:SKELETON, offset: 0x6014504, symbol: D_AQ_6014504 }
+  { type: SF64:SKELETON, offset: 0x6014504, symbol: aAqStoneColumnSkel }
 
 D_AQ_6014520:
   { type: GFX, offset: 0x6014520, symbol: D_AQ_6014520 }
@@ -293,8 +293,8 @@ D_AQ_6014CD0:
 D_AQ_6014E50:
   { type: GFX, offset: 0x6014E50, symbol: D_AQ_6014E50 }
 
-D_AQ_6014FD0:
+aAqBoulderDL:
-  { type: GFX, offset: 0x6014FD0, symbol: D_AQ_6014FD0 }
+  { type: GFX, offset: 0x6014FD0, symbol: aAqBoulderDL }
 
 D_AQ_6015430:
   { type: GFX, offset: 0x6015430, symbol: D_AQ_6015430 }
@@ -305,8 +305,8 @@ D_AQ_60154F8:
 D_AQ_60155F8:
   { type: TEXTURE, ctype: u16, format: TLUT, colors: 152, offset: 0x60155F8, symbol: D_AQ_60155F8 }
 
-D_AQ_6015730:
+aAqArchDL:
-  { type: GFX, offset: 0x6015730, symbol: D_AQ_6015730 }
+  { type: GFX, offset: 0x6015730, symbol: aAqArchDL }
 
 D_AQ_6015DD0:
   { type: GFX, offset: 0x6015DD0, symbol: D_AQ_6015DD0 }
@@ -383,8 +383,8 @@ D_AQ_601D110:
 D_AQ_601DE50:
   { type: SF64:ANIM, offset: 0x601DE50, symbol: D_AQ_601DE50 }
 
-D_AQ_601DE60:
+aAqCoralReef2DL:
-  { type: GFX, offset: 0x601DE60, symbol: D_AQ_601DE60 }
+  { type: GFX, offset: 0x601DE60, symbol: aAqCoralReef2DL }
 
 D_AQ_601E1F0:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x601E1F0, symbol: D_AQ_601E1F0 }
@@ -392,11 +392,11 @@ D_AQ_601E1F0:
 D_AQ_601E9F0:
   { type: GFX, offset: 0x601E9F0, symbol: D_AQ_601E9F0 }
 
-D_AQ_601EC68:
+aAqCoralAnim:
-  { type: SF64:ANIM, offset: 0x601EC68, symbol: D_AQ_601EC68 }
+  { type: SF64:ANIM, offset: 0x601EC68, symbol: aAqCoralAnim }
 
-D_AQ_601EDB4:
+aAqCoralSkel:
-  { type: SF64:SKELETON, offset: 0x601EDB4, symbol: D_AQ_601EDB4 }
+  { type: SF64:SKELETON, offset: 0x601EDB4, symbol: aAqCoralSkel }
 
 D_AQ_601EDE0:
   { type: GFX, offset: 0x601EDE0, symbol: D_AQ_601EDE0 }
@@ -425,11 +425,11 @@ D_AQ_6021858:
 D_AQ_6021C58:
   { type: TEXTURE, ctype: u16, format: TLUT, colors: 232, offset: 0x6021C58, symbol: D_AQ_6021C58 }
 
-D_AQ_602201C:
+aAqOysterAnim:
-  { type: SF64:ANIM, offset: 0x602201C, symbol: D_AQ_602201C }
+  { type: SF64:ANIM, offset: 0x602201C, symbol: aAqOysterAnim }
 
-D_AQ_60220E8:
+aAqOysterSkel:
-  { type: SF64:SKELETON, offset: 0x60220E8, symbol: D_AQ_60220E8 }
+  { type: SF64:SKELETON, offset: 0x60220E8, symbol: aAqOysterSkel }
 
 D_AQ_6022110:
   { type: GFX, offset: 0x6022110, symbol: D_AQ_6022110 }
@@ -449,14 +449,14 @@ D_AQ_6022888:
 D_AQ_60229B8:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x60229B8, symbol: D_AQ_60229B8 }
 
-D_AQ_60231C0:
+aAqCoralReef1DL:
-  { type: GFX, offset: 0x60231C0, symbol: D_AQ_60231C0 }
+  { type: GFX, offset: 0x60231C0, symbol: aAqCoralReef1DL }
 
-D_AQ_6023780:
+aAqJellyfishAnim:
-  { type: SF64:ANIM, offset: 0x6023780, symbol: D_AQ_6023780 }
+  { type: SF64:ANIM, offset: 0x6023780, symbol: aAqJellyfishAnim }
 
-D_AQ_602390C:
+aAqJellyfishSkel:
-  { type: SF64:SKELETON, offset: 0x602390C, symbol: D_AQ_602390C }
+  { type: SF64:SKELETON, offset: 0x602390C, symbol: aAqJellyfishSkel }
 
 D_AQ_6023940:
   { type: GFX, offset: 0x6023940, symbol: D_AQ_6023940 }
@@ -482,8 +482,8 @@ D_AQ_6024938:
 D_AQ_60249C0:
   { type: GFX, offset: 0x60249C0, symbol: D_AQ_60249C0 }
 
-D_AQ_6024A50:
+aAqPearlDL:
-  { type: GFX, offset: 0x6024A50, symbol: D_AQ_6024A50 }
+  { type: GFX, offset: 0x6024A50, symbol: aAqPearlDL }
 
 D_AQ_6024F80:
   { type: SF64:ANIM, offset: 0x6024F80, symbol: D_AQ_6024F80 }
@@ -605,8 +605,8 @@ D_AQ_602AC40:
 D_AQ_602ACC0:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x602ACC0, symbol: D_AQ_602ACC0 }
 
-D_AQ_602B4C0:
+aAqRockDL:
-  { type: GFX, offset: 0x602B4C0, symbol: D_AQ_602B4C0 }
+  { type: GFX, offset: 0x602B4C0, symbol: aAqRockDL }
 
 D_AQ_602B9D4: # unused and possibly broken
  { type: SF64:ANIM, offset: 0x602B9D4, symbol: D_AQ_602B9D4 }
@@ -656,8 +656,8 @@ D_AQ_602E5C8:
 D_AQ_60308B8:
   { type: SF64:SCRIPT, offset: 0x60308B8, symbol: D_AQ_60308B8 }
 
-D_AQ_6030B10:
+aBoss301Hitbox:
-  { type: SF64:HITBOX, offset: 0x6030B10, symbol: D_AQ_6030B10 }
+  { type: SF64:HITBOX, offset: 0x6030B10, symbol: aBoss301Hitbox }
 
 D_AQ_6030B14_f32:
   { type: SF64:HITBOX, offset: 0x6030B14, symbol: D_AQ_6030B14_f32 }
@@ -674,8 +674,8 @@ D_AQ_6030B68:
 D_AQ_6030BAC:
   { type: SF64:HITBOX, offset: 0x6030BAC, symbol: D_AQ_6030BAC }
 
-D_AQ_6030BE0:
+aAqActor188Hitbox:
-  { type: SF64:HITBOX, offset: 0x6030BE0, symbol: D_AQ_6030BE0 }
+  { type: SF64:HITBOX, offset: 0x6030BE0, symbol: aAqActor188Hitbox }
 
 D_AQ_6030BFC:
   { type: SF64:HITBOX, offset: 0x6030BFC, symbol: D_AQ_6030BFC }
@@ -686,14 +686,14 @@ D_AQ_6030C18:
 D_AQ_6030C44:
   { type: SF64:HITBOX, offset: 0x6030C44, symbol: D_AQ_6030C44 }
 
-D_AQ_6030C60:
+aAqCoralReef1Hitbox:
-  { type: SF64:HITBOX, offset: 0x6030C60, symbol: D_AQ_6030C60 }
+  { type: SF64:HITBOX, offset: 0x6030C60, symbol: aAqCoralReef1Hitbox }
 
-D_AQ_6030C7C:
+aAqTunnel1Hitbox:
-  { type: SF64:HITBOX, offset: 0x6030C7C, symbol: D_AQ_6030C7C }
+  { type: SF64:HITBOX, offset: 0x6030C7C, symbol: aAqTunnel1Hitbox }
 
-D_AQ_6030D20:
+aAqStoneColumnHitbox:
-  { type: SF64:HITBOX, offset: 0x6030D20, symbol: D_AQ_6030D20 }
+  { type: SF64:HITBOX, offset: 0x6030D20, symbol: aAqStoneColumnHitbox }
 
 D_AQ_6030D3C:
   { type: SF64:HITBOX, offset: 0x6030D3C, symbol: D_AQ_6030D3C }
@@ -701,65 +701,65 @@ D_AQ_6030D3C:
 D_AQ_6030D58:
   { type: SF64:HITBOX, offset: 0x6030D58, symbol: D_AQ_6030D58 }
 
-D_AQ_6030D74:
+aAqArchHitbox:
-  { type: SF64:HITBOX, offset: 0x6030D74, symbol: D_AQ_6030D74 }
+  { type: SF64:HITBOX, offset: 0x6030D74, symbol: aAqArchHitbox }
 
-D_AQ_6030DF8:
+aAqCoralReef2Hitbox:
-  { type: SF64:HITBOX, offset: 0x6030DF8, symbol: D_AQ_6030DF8 }
+  { type: SF64:HITBOX, offset: 0x6030DF8, symbol: aAqCoralReef2Hitbox }
 
-D_AQ_6030E14:
+aAqRockHitbox:
-  { type: SF64:HITBOX, offset: 0x6030E14, symbol: D_AQ_6030E14 }
+  { type: SF64:HITBOX, offset: 0x6030E14, symbol: aAqRockHitbox }
 
-D_AQ_6030E30_Hitbox:
+aAqWall1Hitbox:
-  { type: SF64:HITBOX, offset: 0x6030E30, symbol: D_AQ_6030E30_Hitbox }
+  { type: SF64:HITBOX, offset: 0x6030E30, symbol: aAqWall1Hitbox }
 
-D_AQ_6030E4C:
+aAqRoofHitbox:
-  { type: SF64:HITBOX, offset: 0x6030E4C, symbol: D_AQ_6030E4C }
+  { type: SF64:HITBOX, offset: 0x6030E4C, symbol: aAqRoofHitbox }
 
-D_AQ_6030E68:
+aAqTunnel2Hitbox:
-  { type: SF64:HITBOX, offset: 0x6030E68, symbol: D_AQ_6030E68 }
+  { type: SF64:HITBOX, offset: 0x6030E68, symbol: aAqTunnel2Hitbox }
 
-D_AQ_6030F74:
+aAqBacoonHitbox:
-  { type: SF64:HITBOX, offset: 0x6030F74, symbol: D_AQ_6030F74 }
+  { type: SF64:HITBOX, offset: 0x6030F74, symbol: aAqBacoonHitbox }
 
-D_AQ_6031398:
+aAqAnglerFishHitbox:
-  { type: SF64:HITBOX, offset: 0x6031398, symbol: D_AQ_6031398 }
+  { type: SF64:HITBOX, offset: 0x6031398, symbol: aAqAnglerFishHitbox }
 
-D_AQ_60313CC:
+aAqGaroaHitbox:
-  { type: SF64:HITBOX, offset: 0x60313CC, symbol: D_AQ_60313CC }
+  { type: SF64:HITBOX, offset: 0x60313CC, symbol: aAqGaroaHitbox }
 
-D_AQ_6031400:
+aAqSculpinHitbox:
-  { type: SF64:HITBOX, offset: 0x6031400, symbol: D_AQ_6031400 }
+  { type: SF64:HITBOX, offset: 0x6031400, symbol: aAqSculpinHitbox }
 
-D_AQ_603144C:
+aAqSpindlyFishHitbox:
-  { type: SF64:HITBOX, offset: 0x603144C, symbol: D_AQ_603144C }
+  { type: SF64:HITBOX, offset: 0x603144C, symbol: aAqSpindlyFishHitbox }
 
-D_AQ_6031480:
+aAqSquidHitbox:
-  { type: SF64:HITBOX, offset: 0x6031480, symbol: D_AQ_6031480 }
+  { type: SF64:HITBOX, offset: 0x6031480, symbol: aAqSquidHitbox }
 
 D_AQ_60314AC:
   { type: SF64:HITBOX, offset: 0x60314AC, symbol: D_AQ_60314AC }
 
-D_AQ_60314C8:
+aAqOysterHitbox:
-  { type: SF64:HITBOX, offset: 0x60314C8, symbol: D_AQ_60314C8 }
+  { type: SF64:HITBOX, offset: 0x60314C8, symbol: aAqOysterHitbox }
 
 D_AQ_60314E4:
   { type: SF64:HITBOX, offset: 0x60314E4, symbol: D_AQ_60314E4 }
 
-D_AQ_6031500:
+aAqBoulderHitbox:
-  { type: SF64:HITBOX, offset: 0x6031500, symbol: D_AQ_6031500 }
+  { type: SF64:HITBOX, offset: 0x6031500, symbol: aAqBoulderHitbox }
 
 D_AQ_603151C:
   { type: SF64:HITBOX, offset: 0x603151C, symbol: D_AQ_603151C }
 
-D_AQ_6031538:
+aAqCoralHitbox:
-  { type: SF64:HITBOX, offset: 0x6031538, symbol: D_AQ_6031538 }
+  { type: SF64:HITBOX, offset: 0x6031538, symbol: aAqCoralHitbox }
 
-D_AQ_6031554:
+aAqJellyfishHitbox:
-  { type: SF64:HITBOX, offset: 0x6031554, symbol: D_AQ_6031554 }
+  { type: SF64:HITBOX, offset: 0x6031554, symbol: aAqJellyfishHitbox }
 
-D_AQ_6031570:
+aAqFishGroupHitbox:
-  { type: SF64:HITBOX, offset: 0x6031570, symbol: D_AQ_6031570 }
+  { type: SF64:HITBOX, offset: 0x6031570, symbol: aAqFishGroupHitbox }
 
 D_AQ_603158C:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x603158C, symbol: D_AQ_603158C }

assets/yaml/jp/rev0/ast_area_6.yaml

@@ -237,8 +237,8 @@ D_A6_6028254:
 D_A6_60282A0:
   { type: SF64:HITBOX, offset: 0x60282A0, symbol: D_A6_60282A0 }
 
-D_A6_6028454:
+aA6GorgonHitbox:
-  { type: SF64:HITBOX, offset: 0x6028454, symbol: D_A6_6028454 }
+  { type: SF64:HITBOX, offset: 0x6028454, symbol: aA6GorgonHitbox }
 
 D_A6_6028578:
   { type: SF64:HITBOX, offset: 0x6028578, symbol: D_A6_6028578 }

assets/yaml/jp/rev0/ast_arwing.yaml

@@ -179,8 +179,8 @@ D_arwing_3018348:
 D_arwing_30183D0:
   { type: GFX, offset: 0x30183D0, symbol: D_arwing_30183D0 }
 
-D_arwing_30184D8:
+aWindshieldClouldReflextionTex:
-  { type: TEXTURE, format: RGBA16, offset: 0x30184D8, width: 32, height: 32, ctype: u16, symbol: D_arwing_30184D8 }
+  { type: TEXTURE, format: RGBA16, offset: 0x30184D8, width: 32, height: 32, ctype: u16, symbol: aWindshieldClouldReflextionTex }
 
 D_arwing_3018CD8:
   { type: TEXTURE, format: RGBA16, offset: 0x3018CD8, width: 64, height: 16, ctype: u16, symbol: D_arwing_3018CD8 }

assets/yaml/jp/rev0/ast_bolse.yaml

@@ -115,8 +115,8 @@ D_BO_600AB90:
 D_BO_600AD80:
   { type: TEXTURE, format: RGBA16, offset: 0x0600AD80, width: 32, height: 32, ctype: u16, symbol: D_BO_600AD80 }
 
-D_BO_600B8B0:
+aBoBuildingDL:
-  { type: GFX, offset: 0x600B8B0, symbol: D_BO_600B8B0 }
+  { type: GFX, offset: 0x600B8B0, symbol: aBoBuildingDL }
 
 D_BO_600BAA0:
   { type: GFX, offset: 0x600BAA0, symbol: D_BO_600BAA0 }
@@ -133,11 +133,11 @@ D_BO_600C0B8:
 D_BO_600C2D8:
   { type: TEXTURE, format: IA8, offset: 0x0600C2D8, width: 32, height: 16, ctype: u8, symbol: D_BO_600C2D8 }
 
-D_BO_600C4E0:
+aBoBaseShieldDL:
-  { type: GFX, offset: 0x600C4E0, symbol: D_BO_600C4E0 }
+  { type: GFX, offset: 0x600C4E0, symbol: aBoBaseShieldDL }
 
-D_BO_600CF88:
+aBoBaseShieldTex:
-  { type: TEXTURE, format: RGBA16, offset: 0x0600CF88, width: 16, height: 16, ctype: u16, symbol: D_BO_600CF88 }
+  { type: TEXTURE, format: RGBA16, offset: 0x0600CF88, width: 16, height: 16, ctype: u16, symbol: aBoBaseShieldTex }
 
 D_BO_600D190:
   { type: GFX, offset: 0x600D190, symbol: D_BO_600D190 }
@@ -148,20 +148,20 @@ D_BO_600D2A0:
 D_BO_600E2A0:
   { type: TEXTURE, format: RGBA16, offset: 0x0600E2A0, width: 32, height: 64, ctype: u16, symbol: D_BO_600E2A0 }
 
-D_BO_600F2E0:
+aBoLaserCannonAnim:
-  { type: SF64:ANIM, offset: 0x600F2E0, symbol: D_BO_600F2E0 }
+  { type: SF64:ANIM, offset: 0x600F2E0, symbol: aBoLaserCannonAnim }
 
-D_BO_600F36C:
+aBoLaserCannonSkel:
-  { type: SF64:SKELETON, offset: 0x600F36C, symbol: D_BO_600F36C }
+  { type: SF64:SKELETON, offset: 0x600F36C, symbol: aBoLaserCannonSkel }
 
-D_BO_600F3D8:
+aBoShieldReactorAnim:
-  { type: SF64:ANIM, offset: 0x600F3D8, symbol: D_BO_600F3D8 }
+  { type: SF64:ANIM, offset: 0x600F3D8, symbol: aBoShieldReactorAnim }
 
-D_BO_600F4A4:
+aBoShieldReactorSkel:
-  { type: SF64:SKELETON, offset: 0x600F4A4, symbol: D_BO_600F4A4 }
+  { type: SF64:SKELETON, offset: 0x600F4A4, symbol: aBoShieldReactorSkel }
 
-D_BO_600F4C0:
+aBoPoleDL:
-  { type: GFX, offset: 0x600F4C0, symbol: D_BO_600F4C0 }
+  { type: GFX, offset: 0x600F4C0, symbol: aBoPoleDL }
 
 D_BO_600F728:
   { type: TEXTURE, format: RGBA16, offset: 0x0600F728, width: 32, height: 32, ctype: u16, symbol: D_BO_600F728 }
@@ -178,23 +178,23 @@ D_BO_6010294:
 PAD_BO_6011B20:
   { type: BLOB, size: 0x4, offset: 0x6011B20, symbol: PAD_BO_6011B20, mesh_symbol: D_BO_OFFSET }
 
-D_BO_6011B24:
+aBoShieldReactorHitbox:
-  { type: SF64:HITBOX, offset: 0x6011B24, symbol: D_BO_6011B24 }
+  { type: SF64:HITBOX, offset: 0x6011B24, symbol: aBoShieldReactorHitbox }
 
 D_BO_6011BA4:
   { type: SF64:HITBOX, offset: 0x6011BA4, symbol: D_BO_6011BA4 }
 
-D_BO_6011BF4:
+aBoLaserCannonHitbox:
-  { type: SF64:HITBOX, offset: 0x6011BF4, symbol: D_BO_6011BF4 }
+  { type: SF64:HITBOX, offset: 0x6011BF4, symbol: aBoLaserCannonHitbox }
 
-D_BO_6011C10:
+aBoPoleHitbox:
-  { type: SF64:HITBOX, offset: 0x6011C10, symbol: D_BO_6011C10 }
+  { type: SF64:HITBOX, offset: 0x6011C10, symbol: aBoPoleHitbox }
 
-D_BO_6011C48:
+aBoBuildingHitbox:
-  { type: SF64:HITBOX, offset: 0x6011C48, symbol: D_BO_6011C48 }
+  { type: SF64:HITBOX, offset: 0x6011C48, symbol: aBoBuildingHitbox }
 
-D_BO_6011C80:
+aBoBaseCoreHitbox:
-  { type: SF64:HITBOX, offset: 0x6011C80, symbol: D_BO_6011C80 }
+  { type: SF64:HITBOX, offset: 0x6011C80, symbol: aBoBaseCoreHitbox }
 
 D_BO_6011E28:
   { type: VTX, count: 34, offset: 0x6011E28, symbol: D_BO_6011E28 }

assets/yaml/jp/rev0/ast_common.yaml

@@ -695,11 +695,11 @@ D_101CBC0:
 D_101CCC0:
   { type: TEXTURE, format: TLUT, colors: 88, offset: 0x101CCC0, ctype: u16, symbol: D_101CCC0 }
 
-D_101CD70:
+aUnusedShieldDL:
-  { type: GFX, offset: 0x101CD70, symbol: D_101CD70 }
+  { type: GFX, offset: 0x101CD70, symbol: aUnusedShieldDL }
 
-D_101D070:
+aUnusedShieldTex:
-  { type: TEXTURE, format: RGBA16, width: 32, height: 32, ctype: u16, offset: 0x101D070, symbol: D_101D070 }
+  { type: TEXTURE, format: RGBA16, width: 32, height: 32, ctype: u16, offset: 0x101D070, symbol: aUnusedShieldTex }
 
 D_101D870:
   { type: GFX, offset: 0x101D870, symbol: D_101D870 }
@@ -710,8 +710,8 @@ ast_common_seg1_vtx_1D9C8:
 D_101DE20:
   { type: TEXTURE, format: IA8, width: 128, height: 32, ctype: u8, offset: 0x101DE20, symbol: D_101DE20 }
 
-D_101DC10:
+aBarrelRollTex:
-  { type: GFX, offset: 0x101DC10, symbol: D_101DC10 }
+  { type: GFX, offset: 0x101DC10, symbol: aBarrelRollTex }
 
 D_101EE20:
   { type: TEXTURE, format: IA8, width: 128, height: 32, ctype: u8, offset: 0x101EE20, symbol: D_101EE20 }
@@ -806,32 +806,32 @@ D_1024230:
 D_1024290:
   { type: GFX, offset: 0x1024290, symbol: D_1024290 }
 
-D_1024410:
+aPeppyMarkDL:
-  { type: GFX, offset: 0x1024410, symbol: D_1024410 }
+  { type: GFX, offset: 0x1024410, symbol: aPeppyMarkDL }
 
-D_10244D8:
+aPeppyMarkTex:
-  { type: TEXTURE, format: CI4, width: 16, height: 16, ctype: u8, offset: 0x10244D8, tlut: 0x1024558, symbol: D_10244D8 }
+  { type: TEXTURE, format: CI4, width: 16, height: 16, ctype: u8, offset: 0x10244D8, tlut: 0x1024558, symbol: aPeppyMarkTex }
 
-D_1024558:
+aPeppyMarkTLUT:
-  { type: TEXTURE, format: TLUT, colors: 12, offset: 0x1024558, ctype: u16, symbol: D_1024558 }
+  { type: TEXTURE, format: TLUT, colors: 12, offset: 0x1024558, ctype: u16, symbol: aPeppyMarkTLUT }
 
-D_1024570:
+aFalcoMarkDL:
-  { type: GFX, offset: 0x1024570, symbol: D_1024570 }
+  { type: GFX, offset: 0x1024570, symbol: aFalcoMarkDL }
 
-D_1024638:
+aFalcoMarkTex:
-  { type: TEXTURE, format: CI4, width: 16, height: 16, ctype: u8, offset: 0x1024638, tlut: 0x10246B8, symbol: D_1024638 }
+  { type: TEXTURE, format: CI4, width: 16, height: 16, ctype: u8, offset: 0x1024638, tlut: 0x10246B8, symbol: aFalcoMarkTex }
 
-D_10246B8:
+aFalcoMarkTLUT:
-  { type: TEXTURE, format: TLUT, colors: 12, offset: 0x10246B8, ctype: u16, symbol: D_10246B8 }
+  { type: TEXTURE, format: TLUT, colors: 12, offset: 0x10246B8, ctype: u16, symbol: aFalcoMarkTLUT }
 
-D_10246D0:
+aSlippyMarkDL:
-  { type: GFX, offset: 0x10246D0, symbol: D_10246D0 }
+  { type: GFX, offset: 0x10246D0, symbol: aSlippyMarkDL }
 
-D_1024798:
+aSlippyMarkTex:
-  { type: TEXTURE, format: CI4, width: 16, height: 16, ctype: u8, offset: 0x1024798, tlut: 0x1024818, symbol: D_1024798 }
+  { type: TEXTURE, format: CI4, width: 16, height: 16, ctype: u8, offset: 0x1024798, tlut: 0x1024818, symbol: aSlippyMarkTex }
 
-D_1024818:
+aSlippyMarkTLUT:
-  { type: TEXTURE, format: TLUT, colors: 12, offset: 0x1024818, ctype: u16, symbol: D_1024818 }
+  { type: TEXTURE, format: TLUT, colors: 12, offset: 0x1024818, ctype: u16, symbol: aSlippyMarkTLUT }
 
 D_1024830:
   { type: GFX, offset: 0x1024830, symbol: D_1024830 }

assets/yaml/jp/rev0/ast_corneria.yaml

@@ -303,20 +303,20 @@ D_CO_602AA7C:
 aCoDoorsSkel:
   { type: SF64:SKELETON, offset: 0x602AB48, symbol: aCoDoorsSkel }
 
-D_CO_602BC18:
+aCoGrangaWalkingAnim:
-  { type: SF64:ANIM, offset: 0x602BC18, symbol: D_CO_602BC18 }
+  { type: SF64:ANIM, offset: 0x602BC18, symbol: aCoGrangaWalkingAnim }
 
 D_CO_602BE64:
   { type: SF64:SKELETON, offset: 0x602BE64, symbol: D_CO_602BE64 }
 
-D_CO_602C0D0:
+aCoGrangaStationaryAnim:
-  { type: SF64:ANIM, offset: 0x602C0D0, symbol: D_CO_602C0D0 }
+  { type: SF64:ANIM, offset: 0x602C0D0, symbol: aCoGrangaStationaryAnim }
 
 D_CO_602D31C:
   { type: SF64:ANIM, offset: 0x602D31C, symbol: D_CO_602D31C }
 
-D_CO_602D400:
+aCoCarrierAnim:
-  { type: SF64:ANIM, offset: 0x602D400, symbol: D_CO_602D400 }
+  { type: SF64:ANIM, offset: 0x602D400, symbol: aCoCarrierAnim }
 
 aCoCarrierSkel:
   { type: SF64:SKELETON, offset: 0x602D5AC, symbol: aCoCarrierSkel }
@@ -522,14 +522,14 @@ aCoBuilding10Hitbox:
 aCoIBeamHitbox:
   { type: SF64:HITBOX, offset: 0x603E514, symbol: aCoIBeamHitbox }
 
-D_CO_603E54C:
+aCoActorSkibotHitbox:
-  { type: SF64:HITBOX, offset: 0x603E54C, symbol: D_CO_603E54C }
+  { type: SF64:HITBOX, offset: 0x603E54C, symbol: aCoActorSkibotHitbox }
 
-D_CO_603E598:
+aCoActorRadarHitbox:
-  { type: SF64:HITBOX, offset: 0x603E598, symbol: D_CO_603E598 }
+  { type: SF64:HITBOX, offset: 0x603E598, symbol: aCoActorRadarHitbox }
 
-D_CO_603E5B4:
+aCoMoleMissileHitbox:
-  { type: SF64:HITBOX, offset: 0x603E5B4, symbol: D_CO_603E5B4 }
+  { type: SF64:HITBOX, offset: 0x603E5B4, symbol: aCoMoleMissileHitbox }
 
 CoGarudaHitbox:
   { type: SF64:HITBOX, offset: 0x603E5D0, symbol: CoGarudaHitbox }
@@ -540,14 +540,14 @@ aCoGarudaDestroyHitbox:
 D_CO_603E620:
   { type: SF64:HITBOX, offset: 0x603E620, symbol: D_CO_603E620 }
 
-D_CO_603E714:
+aCoCarrierLeftHitbox:
-  { type: SF64:HITBOX, offset: 0x603E714, symbol: D_CO_603E714 }
+  { type: SF64:HITBOX, offset: 0x603E714, symbol: aCoCarrierLeftHitbox }
 
-D_CO_603E748:
+aCoCarrierUpperHitbox:
-  { type: SF64:HITBOX, offset: 0x603E748, symbol: D_CO_603E748 }
+  { type: SF64:HITBOX, offset: 0x603E748, symbol: aCoCarrierUpperHitbox }
 
-D_CO_603E7C4:
+aCoCarrierBottomHitbox:
-  { type: SF64:HITBOX, offset: 0x603E7C4, symbol: D_CO_603E7C4 }
+  { type: SF64:HITBOX, offset: 0x603E7C4, symbol: aCoCarrierBottomHitbox }
 
 D_CO_603E840:
   { type: SF64:HITBOX, offset: 0x603E840, symbol: D_CO_603E840 }

assets/yaml/jp/rev0/ast_fortuna.yaml

@@ -62,11 +62,11 @@ D_FO_6006120:
 D_FO_6006220:
   { type: TEXTURE, format: TLUT, colors: 120, offset: 0x6006220, ctype: u16, symbol: D_FO_6006220 }
 
-D_FO_6006310:
+aFoMountain3DL:
-  { type: GFX, offset: 0x6006310, symbol: D_FO_6006310 }
+  { type: GFX, offset: 0x6006310, symbol: aFoMountain3DL }
 
-D_FO_60066E0:
+aFoTowerDL:
-  { type: GFX, offset: 0x60066E0, symbol: D_FO_60066E0 }
+  { type: GFX, offset: 0x60066E0, symbol: aFoTowerDL }
 
 ast_fortuna_seg6_vtx_6898:
   { type: VTX, count: 52, offset: 0x6006898, symbol: ast_fortuna_seg6_vtx_6898 }
@@ -92,17 +92,17 @@ D_FO_6007590:
 D_FO_6007730:
   { type: GFX, offset: 0x6007730, symbol: D_FO_6007730 }
 
-D_FO_6007854:
+aFoRadarAnim:
-  { type: SF64:ANIM, offset: 0x6007854, symbol: D_FO_6007854 }
+  { type: SF64:ANIM, offset: 0x6007854, symbol: aFoRadarAnim }
 
-D_FO_6007980:
+aFoRadarSkel:
-  { type: SF64:SKELETON, offset: 0x6007980, symbol: D_FO_6007980 }
+  { type: SF64:SKELETON, offset: 0x6007980, symbol: aFoRadarSkel }
 
-D_FO_60079B0:
+aFoMountain1DL:
-  { type: GFX, offset: 0x60079B0, symbol: D_FO_60079B0 }
+  { type: GFX, offset: 0x60079B0, symbol: aFoMountain1DL }
 
-D_FO_6007D80:
+aFoMountain2DL:
-  { type: GFX, offset: 0x6007D80, symbol: D_FO_6007D80 }
+  { type: GFX, offset: 0x6007D80, symbol: aFoMountain2DL }
 
 D_FO_6008150:
   { type: TEXTURE, format: RGBA16, width: 44, height: 44, offset: 0x6008150, ctype: u16, symbol: D_FO_6008150 }
@@ -161,8 +161,8 @@ D_FO_600F60C:
 aFoPoleHitbox:
   { type: SF64:HITBOX, offset: 0x600FE9C, symbol: aFoPoleHitbox }
 
-D_FO_600FEB8:
+aFoTowerHitbox:
-  { type: SF64:HITBOX, offset: 0x600FEB8, symbol: D_FO_600FEB8 }
+  { type: SF64:HITBOX, offset: 0x600FEB8, symbol: aFoTowerHitbox }
 
 aFoRadarHitbox:
   { type: SF64:HITBOX, offset: 0x600FF30, symbol: aFoRadarHitbox }
@@ -170,14 +170,14 @@ aFoRadarHitbox:
 D_FO_600FF64:
   { type: SF64:HITBOX, offset: 0x600FF64, symbol: D_FO_600FF64 }
 
-D_FO_600FF80:
+aFoMountain1Hitbox:
-  { type: SF64:HITBOX, offset: 0x600FF80, symbol: D_FO_600FF80 }
+  { type: SF64:HITBOX, offset: 0x600FF80, symbol: aFoMountain1Hitbox }
 
-D_FO_600FFA0:
+aFoMountain2Hitbox:
-  { type: SF64:HITBOX, offset: 0x600FFA0, symbol: D_FO_600FFA0 }
+  { type: SF64:HITBOX, offset: 0x600FFA0, symbol: aFoMountain2Hitbox }
 
-D_FO_600FFC0:
+aFoMountain3Hitbox:
-  { type: SF64:HITBOX, offset: 0x600FFC0, symbol: D_FO_600FFC0 }
+  { type: SF64:HITBOX, offset: 0x600FFC0, symbol: aFoMountain3Hitbox }
 
-D_FO_600FFE0:
+aFoBaseHitbox:
-  { type: SF64:HITBOX, offset: 0x600FFE0, symbol: D_FO_600FFE0 }
+  { type: SF64:HITBOX, offset: 0x600FFE0, symbol: aFoBaseHitbox }

assets/yaml/jp/rev0/ast_katina.yaml

@@ -57,8 +57,8 @@ D_KA_60062F8:
 D_KA_6006AF8:
   { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6006AF8, ctype: u16, symbol: D_KA_6006AF8 }
 
-aKaDestroyedSaucererDL:
+aKaDestroyedKaSaucererDL:
-  { type: GFX, offset: 0x6007300, symbol: aKaDestroyedSaucererDL }
+  { type: GFX, offset: 0x6007300, symbol: aKaDestroyedKaSaucererDL }
 
 D_KA_6009250:
   { type: GFX, offset: 0x6009250, symbol: D_KA_6009250 }
@@ -169,11 +169,11 @@ D_KA_6011000:
 D_KA_6011044:
   { type: SF64:OBJECT_INIT, offset: 0x6011044, symbol: D_KA_6011044 }
 
-D_KA_6011058:
+aKaSaucererHitbox:
-  { type: SF64:HITBOX, offset: 0x6011058, symbol: D_KA_6011058 }
+  { type: SF64:HITBOX, offset: 0x6011058, symbol: aKaSaucererHitbox }
 
-D_KA_601115C:
+aKaFrontlineBaseHitbox:
-  { type: SF64:HITBOX, offset: 0x601115C, symbol: D_KA_601115C }
+  { type: SF64:HITBOX, offset: 0x601115C, symbol: aKaFrontlineBaseHitbox }
 
 D_KA_60111D8:
   { type: SF64:HITBOX, offset: 0x60111D8, symbol: D_KA_60111D8 }

assets/yaml/jp/rev0/ast_landmaster.yaml

@@ -14,8 +14,8 @@ D_landmaster_3000000:
 D_landmaster_3000080:
   { type: TEXTURE, format: TLUT, offset: 0x3000080, colors: 8, ctype: u16, symbol: D_landmaster_3000080 }
 
-D_landmaster_3000090:
+aLandmasterModelDL:
-  { type: GFX, offset: 0x3000090, symbol: D_landmaster_3000090 }
+  { type: GFX, offset: 0x3000090, symbol: aLandmasterModelDL }
 
 D_landmaster_3004CA8:
   { type: TEXTURE, format: RGBA16, offset: 0x3004CA8, width: 32, height: 32, ctype: u16, symbol: D_landmaster_3004CA8 }
@@ -44,8 +44,8 @@ D_landmaster_3001680:
 D_landmaster_3001E80:
   { type: TEXTURE, format: RGBA16, offset: 0x3001E80, width: 32, height: 32, ctype: u16, symbol: D_landmaster_3001E80 }
 
-D_landmaster_3004680:
+aLandmasterCanonDL:
-  { type: GFX, offset: 0x3004680, symbol: D_landmaster_3004680 }
+  { type: GFX, offset: 0x3004680, symbol: aLandmasterCanonDL }
 
 D_landmaster_30066B0:
   { type: GFX, offset: 0x30066B0, symbol: D_landmaster_30066B0 }

assets/yaml/jp/rev0/ast_macbeth.yaml

@@ -163,8 +163,8 @@ D_MA_6007430:
 D_MA_6007500:
   {type: GFX, offset: 0x6007500, symbol: D_MA_6007500}
 
-D_MA_60075D0:
+aMaWeaponsFactoryDL:
-  {type: GFX, offset: 0x60075D0, symbol: D_MA_60075D0}
+  {type: GFX, offset: 0x60075D0, symbol: aMaWeaponsFactoryDL}
 
 D_MA_60092E0:
   { type: TEXTURE, format: RGBA16, ctype: u16, width: 32, height: 32, offset: 0x60092E0, symbol: D_MA_60092E0}
@@ -238,8 +238,8 @@ D_MA_600AE18:
 D_MA_600AE98:
   { type: TEXTURE, format: TLUT, ctype: u16, colors: 80, offset: 0x600AE98, symbol: D_MA_600AE98}
 
-D_MA_600AF40:
+aMaGuillotineDL:
-  {type: GFX, offset: 0x600AF40, symbol: D_MA_600AF40}
+  {type: GFX, offset: 0x600AF40, symbol: aMaGuillotineDL}
 
 D_MA_600B2E0:
   { type: TEXTURE, format: RGBA16, ctype: u16, width: 32, height: 64, offset: 0x600B2E0, symbol: D_MA_600B2E0}
@@ -265,8 +265,8 @@ D_MA_600D1E4:
 D_MA_600D280:
   { type: TEXTURE, format: IA16, ctype: u16, width: 16, height: 16, offset: 0x600D280, symbol: D_MA_600D280}
 
-D_MA_600D480:
+aMaSpearDL:
-  {type: GFX, offset: 0x600D480, symbol: D_MA_600D480}
+  {type: GFX, offset: 0x600D480, symbol: aMaSpearDL}
 
 D_MA_600D878:
   { type: TEXTURE, format: CI8, ctype: u8, width: 16, height: 16, offset: 0x600D878, symbol: D_MA_600D878, tlut: 0x600D978}
@@ -361,8 +361,8 @@ D_MA_6012C00:
 D_MA_6012C98:
   { type: TEXTURE, format: RGBA16, ctype: u16, width: 4, height: 8, offset: 0x6012C98, symbol: D_MA_6012C98}
 
-D_MA_6012F50:
+aMaShockBoxLightDL:
-  {type: GFX, offset: 0x6012F50, symbol: D_MA_6012F50}
+  {type: GFX, offset: 0x6012F50, symbol: aMaShockBoxLightDL}
 
 D_MA_6012FE0:
   { type: TEXTURE, format: IA8, ctype: u8, width: 16, height: 8, offset: 0x6012FE0, symbol: D_MA_6012FE0}
@@ -391,8 +391,8 @@ D_MA_6015494:
 D_MA_6015500:
   {type: SF64:SKELETON, offset: 0x6015500, symbol: D_MA_6015500}
 
-D_MA_6015510:
+aMaShockBoxDL:
-  {type: GFX, offset: 0x6015510, symbol: D_MA_6015510}
+  {type: GFX, offset: 0x6015510, symbol: aMaShockBoxDL}
 
 D_MA_6015C24:
   {type: SF64:ANIM, offset: 0x6015C24, symbol: D_MA_6015C24}
@@ -451,11 +451,11 @@ D_MA_601A840:
 D_MA_601A8C8:
   { type: TEXTURE, format: RGBA16, ctype: u16, width: 32, height: 32, offset: 0x601A8C8, symbol: D_MA_601A8C8}
 
-D_MA_601B0D0:
+aMaFloor6DL:
-  {type: GFX, offset: 0x601B0D0, symbol: D_MA_601B0D0}
+  {type: GFX, offset: 0x601B0D0, symbol: aMaFloor6DL}
 
-D_MA_601B7C0:
+aMaWall4DL:
-  {type: GFX, offset: 0x601B7C0, symbol: D_MA_601B7C0}
+  {type: GFX, offset: 0x601B7C0, symbol: aMaWall4DL}
 
 D_MA_601BB78:
   { type: TEXTURE, format: CI8, ctype: u8, width: 16, height: 16, offset: 0x601BB78, symbol: D_MA_601BB78, tlut: 0x601BC78}
@@ -493,8 +493,8 @@ D_MA_601EAB0:
 D_MA_601EBBC:
   {type: SF64:SKELETON, offset: 0x601EBBC, symbol: D_MA_601EBBC}
 
-D_MA_601F1D0:
+aMaWall2DL:
-  {type: GFX, offset: 0x601F1D0, symbol: D_MA_601F1D0}
+  {type: GFX, offset: 0x601F1D0, symbol: aMaWall2DL}
 
 D_MA_601F270:
   {type: GFX, offset: 0x601F270, symbol: D_MA_601F270}
@@ -550,14 +550,14 @@ D_MA_6023388:
 D_MA_6023788:
   { type: TEXTURE, format: TLUT, ctype: u16, colors: 176, offset: 0x6023788, symbol: D_MA_6023788}
 
-D_MA_60238F0:
+aMaWall3DL:
-  {type: GFX, offset: 0x60238F0, symbol: D_MA_60238F0}
+  {type: GFX, offset: 0x60238F0, symbol: aMaWall3DL}
 
 D_MA_60239D0:
   {type: GFX, offset: 0x60239D0, symbol: D_MA_60239D0}
 
-D_MA_6024010:
+aMaBuilding1DL:
-  {type: GFX, offset: 0x6024010, symbol: D_MA_6024010}
+  {type: GFX, offset: 0x6024010, symbol: aMaBuilding1DL}
 
 D_MA_6024230:
   { type: TEXTURE, format: CI8, ctype: u8, width: 32, height: 32, offset: 0x6024230, symbol: D_MA_6024230, tlut: 0x6024630}
@@ -568,17 +568,17 @@ D_MA_6024630:
 D_MA_6024670:
   {type: GFX, offset: 0x6024670, symbol: D_MA_6024670}
 
-D_MA_60251A0:
+aMaHorizontalLockBarDL:
-  {type: GFX, offset: 0x60251A0, symbol: D_MA_60251A0}
+  {type: GFX, offset: 0x60251A0, symbol: aMaHorizontalLockBarDL}
 
 D_MA_60253E0:
   {type: GFX, offset: 0x60253E0, symbol: D_MA_60253E0}
 
-D_MA_60257B0:
+aMaBarrierDL:
-  {type: GFX, offset: 0x60257B0, symbol: D_MA_60257B0}
+  {type: GFX, offset: 0x60257B0, symbol: aMaBarrierDL}
 
-D_MA_6025850:
+aMaVerticalLockBarDL:
-  {type: GFX, offset: 0x6025850, symbol: D_MA_6025850}
+  {type: GFX, offset: 0x6025850, symbol: aMaVerticalLockBarDL}
 
 D_MA_6025A70:
   {type: GFX, offset: 0x6025A70, symbol: D_MA_6025A70}
@@ -604,11 +604,11 @@ D_MA_6026C00:
 D_MA_6027000:
   { type: TEXTURE, format: TLUT, ctype: u16, colors: 112, offset: 0x6027000, symbol: D_MA_6027000}
 
-D_MA_60270E0:
+aMaWall1DL:
-  {type: GFX, offset: 0x60270E0, symbol: D_MA_60270E0}
+  {type: GFX, offset: 0x60270E0, symbol: aMaWall1DL}
 
-D_MA_6027180:
+aMaBuilding2DL:
-  { type: GFX, offset: 0x6027180, symbol: D_MA_6027180}
+  { type: GFX, offset: 0x6027180, symbol: aMaBuilding2DL}
 
 D_MA_6027320:
   {type: SF64:ANIM, offset: 0x6027320, symbol: D_MA_6027320}
@@ -616,8 +616,8 @@ D_MA_6027320:
 D_MA_602742C:
   {type: SF64:SKELETON, offset: 0x602742C, symbol: D_MA_602742C}
 
-D_MA_6027900:
+aMaFloor2DL:
-  {type: GFX, offset: 0x6027900, symbol: D_MA_6027900}
+  {type: GFX, offset: 0x6027900, symbol: aMaFloor2DL}
 
 D_MA_6027A04:
   {type: SF64:ANIM, offset: 0x6027A04, symbol: D_MA_6027A04}
@@ -658,14 +658,14 @@ D_MA_602CB80:
 D_MA_602D380:
   {type: GFX, offset: 0x602D380, symbol: D_MA_602D380}
 
-D_MA_602DAE0:
+aMaFloor1DL:
-  {type: GFX, offset: 0x602DAE0, symbol: D_MA_602DAE0}
+  {type: GFX, offset: 0x602DAE0, symbol: aMaFloor1DL}
 
-D_MA_602DB80:
+aMaFloor3DL:
-  {type: GFX, offset: 0x602DB80, symbol: D_MA_602DB80}
+  {type: GFX, offset: 0x602DB80, symbol: aMaFloor3DL}
 
-D_MA_602DC20:
+aMaFloor5DL:
-  {type: GFX, offset: 0x602DC20, symbol: D_MA_602DC20}
+  {type: GFX, offset: 0x602DC20, symbol: aMaFloor5DL}
 
 D_MA_602DCB8:
   {type: TEXTURE, format: RGBA16, ctype: u16,  width: 32, height: 32, offset: 0x602DCB8, symbol: D_MA_602DCB8}
@@ -703,11 +703,11 @@ D_MA_602FFA0:
 D_MA_602FFC0:
   {type: GFX, offset: 0x602FFC0, symbol: D_MA_602FFC0}
 
-D_MA_6030500:
+aMaTerrainBumpDL:
-  {type: GFX, offset: 0x6030500, symbol: D_MA_6030500}
+  {type: GFX, offset: 0x6030500, symbol: aMaTerrainBumpDL}
 
-D_MA_6030630:
+aMaFloor4DL:
-  {type: GFX, offset: 0x6030630, symbol: D_MA_6030630}
+  {type: GFX, offset: 0x6030630, symbol: aMaFloor4DL}
 
 D_MA_60306D0:
   {type: GFX, offset: 0x60306D0, symbol: D_MA_60306D0}
@@ -757,20 +757,20 @@ D_MA_6035920:
 D_MA_60359AC:
   {type: SF64:HITBOX, offset: 0x60359AC, symbol: D_MA_60359AC}
 
-D_MA_60359C8:
+aMaLocomotiveHitbox:
-  {type: SF64:HITBOX, offset: 0x60359C8, symbol: D_MA_60359C8}
+  {type: SF64:HITBOX, offset: 0x60359C8, symbol: aMaLocomotiveHitbox}
 
-D_MA_6035A14:
+aMaTrainCar2Hitbox:
-  {type: SF64:HITBOX, offset: 0x6035A14, symbol: D_MA_6035A14}
+  {type: SF64:HITBOX, offset: 0x6035A14, symbol: aMaTrainCar2Hitbox}
 
-D_MA_6035A48:
+aMaTrainCar1Hitbox:
-  {type: SF64:HITBOX, offset: 0x6035A48, symbol: D_MA_6035A48}
+  {type: SF64:HITBOX, offset: 0x6035A48, symbol: aMaTrainCar1Hitbox}
 
 D_MA_6035A94:
   {type: SF64:HITBOX, offset: 0x6035A94, symbol: D_MA_6035A94}
 
-D_MA_6035AE0:
+aMaTrainCar3Hitbox:
-  {type: SF64:HITBOX, offset: 0x6035AE0, symbol: D_MA_6035AE0}
+  {type: SF64:HITBOX, offset: 0x6035AE0, symbol: aMaTrainCar3Hitbox}
 
 D_MA_6035B44:
   {type: SF64:HITBOX, offset: 0x6035B44, symbol: D_MA_6035B44}
@@ -790,14 +790,14 @@ D_MA_6035CD4:
 D_MA_6035D38:
   {type: SF64:HITBOX, offset: 0x6035D38, symbol: D_MA_6035D38}
 
-D_MA_6035D9C:
+aMaTrainCar4Hitbox:
-  {type: SF64:HITBOX, offset: 0x6035D9C, symbol: D_MA_6035D9C}
+  {type: SF64:HITBOX, offset: 0x6035D9C, symbol: aMaTrainCar4Hitbox}
 
 D_MA_6035DD0:
   {type: SF64:HITBOX, offset: 0x6035DD0, symbol: D_MA_6035DD0}
 
-D_MA_6035E04:
+aMaTrainCar5Hitbox:
-  {type: SF64:HITBOX, offset: 0x6035E04, symbol: D_MA_6035E04}
+  {type: SF64:HITBOX, offset: 0x6035E04, symbol: aMaTrainCar5Hitbox}
 
 D_MA_6035E68:
   {type: SF64:HITBOX, offset: 0x6035E68, symbol: D_MA_6035E68}
@@ -817,101 +817,101 @@ D_MA_6035FF8:
 D_MA_603605C:
   {type: SF64:HITBOX, offset: 0x603605C, symbol: D_MA_603605C}
 
-D_MA_60360C0:
+aMaTrainCar6Hitbox:
-  {type: SF64:HITBOX, offset: 0x60360C0, symbol: D_MA_60360C0}
+  {type: SF64:HITBOX, offset: 0x60360C0, symbol: aMaTrainCar6Hitbox}
 
-D_MA_6036154:
+aMaTrainCar7Hitbox:
-  {type: SF64:HITBOX, offset: 0x6036154, symbol: D_MA_6036154}
+  {type: SF64:HITBOX, offset: 0x6036154, symbol: aMaTrainCar7Hitbox}
 
 D_MA_6036188:
   {type: SF64:HITBOX, offset: 0x6036188, symbol: D_MA_6036188}
 
-D_MA_6036204:
+aMaTrainTrack13Hitbox:
-  {type: SF64:HITBOX, offset: 0x6036204, symbol: D_MA_6036204}
+  {type: SF64:HITBOX, offset: 0x6036204, symbol: aMaTrainTrack13Hitbox}
 
 D_MA_6036250:
   {type: SF64:HITBOX, offset: 0x6036250, symbol: D_MA_6036250}
 
-D_MA_603626C:
+aMaBuilding1Hitbox:
-  {type: SF64:HITBOX, offset: 0x603626C, symbol: D_MA_603626C}
+  {type: SF64:HITBOX, offset: 0x603626C, symbol: aMaBuilding1Hitbox}
 
-D_MA_6036288:
+aMaBuilding2Hitbox:
-  {type: SF64:HITBOX, offset: 0x6036288, symbol: D_MA_6036288}
+  {type: SF64:HITBOX, offset: 0x6036288, symbol: aMaBuilding2Hitbox}
 
-D_MA_60362A4:
+aMaTowerHitbox:
-  {type: SF64:HITBOX, offset: 0x60362A4, symbol: D_MA_60362A4}
+  {type: SF64:HITBOX, offset: 0x60362A4, symbol: aMaTowerHitbox}
 
-D_MA_60362D8:
+aMaWall2Hitbox:
-  {type: SF64:HITBOX, offset: 0x60362D8, symbol: D_MA_60362D8}
+  {type: SF64:HITBOX, offset: 0x60362D8, symbol: aMaWall2Hitbox}
 
-D_MA_60362F4:
+aMaWall4Hitbox:
-  {type: SF64:HITBOX, offset: 0x60362F4, symbol: D_MA_60362F4}
+  {type: SF64:HITBOX, offset: 0x60362F4, symbol: aMaWall4Hitbox}
 
-D_MA_6036328:
+aMaWall3Hitbox:
-  {type: SF64:HITBOX, offset: 0x6036328, symbol: D_MA_6036328}
+  {type: SF64:HITBOX, offset: 0x6036328, symbol: aMaWall3Hitbox}
 
-D_MA_6036344:
+aMaIndicatorSignHitbox:
-  {type: SF64:HITBOX, offset: 0x6036344, symbol: D_MA_6036344}
+  {type: SF64:HITBOX, offset: 0x6036344, symbol: aMaIndicatorSignHitbox}
 
-D_MA_6036370:
+aMaTerrainBumpHitbox:
-  {type: SF64:HITBOX, offset: 0x6036370, symbol: D_MA_6036370}
+  {type: SF64:HITBOX, offset: 0x6036370, symbol: aMaTerrainBumpHitbox}
 
-D_MA_603638C:
+aMaFloor1Hitbox:
-  {type: SF64:HITBOX, offset: 0x603638C, symbol: D_MA_603638C}
+  {type: SF64:HITBOX, offset: 0x603638C, symbol: aMaFloor1Hitbox}
 
-D_MA_60363B8:
+aMaFloor2Hitbox:
-  {type: SF64:HITBOX, offset: 0x60363B8, symbol: D_MA_60363B8}
+  {type: SF64:HITBOX, offset: 0x60363B8, symbol: aMaFloor2Hitbox}
 
-D_MA_60363E4:
+aMaFloor3Hitbox:
-  {type: SF64:HITBOX, offset: 0x60363E4, symbol: D_MA_60363E4}
+  {type: SF64:HITBOX, offset: 0x60363E4, symbol: aMaFloor3Hitbox}
 
-D_MA_6036410:
+aMaFloor4Hitbox:
-  {type: SF64:HITBOX, offset: 0x6036410, symbol: D_MA_6036410}
+  {type: SF64:HITBOX, offset: 0x6036410, symbol: aMaFloor4Hitbox}
 
-D_MA_603643C:
+aMaFloor5Hitbox:
-  {type: SF64:HITBOX, offset: 0x603643C, symbol: D_MA_603643C}
+  {type: SF64:HITBOX, offset: 0x603643C, symbol: aMaFloor5Hitbox}
 
-D_MA_6036458:
+aMaMaRailroadSwitchHitbox:
-  {type: SF64:HITBOX, offset: 0x6036458, symbol: D_MA_6036458}
+  {type: SF64:HITBOX, offset: 0x6036458, symbol: aMaMaRailroadSwitchHitbox}
 
 D_MA_603648C:
   {type: SF64:HITBOX, offset: 0x603648C, symbol: D_MA_603648C}
 
-D_MA_60364C0:
+aMaBoulderHitbox:
-  {type: SF64:HITBOX, offset: 0x60364C0, symbol: D_MA_60364C0}
+  {type: SF64:HITBOX, offset: 0x60364C0, symbol: aMaBoulderHitbox}
 
-D_MA_60364DC:
+aMaRailwaySignalHitbox:
-  {type: SF64:HITBOX, offset: 0x60364DC, symbol: D_MA_60364DC}
+  {type: SF64:HITBOX, offset: 0x60364DC, symbol: aMaRailwaySignalHitbox}
 
 D_MA_6036520:
   {type: SF64:HITBOX, offset: 0x6036520, symbol: D_MA_6036520}
 
-D_MA_6036594:
+aMaSwitchTrackHitbox:
-  {type: SF64:HITBOX, offset: 0x6036594, symbol: D_MA_6036594}
+  {type: SF64:HITBOX, offset: 0x6036594, symbol: aMaSwitchTrackHitbox}
 
 D_MA_6036668:
   {type: SF64:HITBOX, offset: 0x6036668, symbol: D_MA_6036668}
 
-D_MA_60366EC:
+aMaHorizontalLockBarHitbox:
-  {type: SF64:HITBOX, offset: 0x60366EC, symbol: D_MA_60366EC}
+  {type: SF64:HITBOX, offset: 0x60366EC, symbol: aMaHorizontalLockBarHitbox}
 
-D_MA_6036708:
+aMaVerticalLockBarHitbox:
-  {type: SF64:HITBOX, offset: 0x6036708, symbol: D_MA_6036708}
+  {type: SF64:HITBOX, offset: 0x6036708, symbol: aMaVerticalLockBarHitbox}
 
-D_MA_6036724:
+aMaProximityLightHitbox:
-  {type: SF64:HITBOX, offset: 0x6036724, symbol: D_MA_6036724}
+  {type: SF64:HITBOX, offset: 0x6036724, symbol: aMaProximityLightHitbox}
 
-D_MA_6036728:
+aMaBarrierHitbox:
-  {type: SF64:HITBOX, offset: 0x6036728, symbol: D_MA_6036728}
+  {type: SF64:HITBOX, offset: 0x6036728, symbol: aMaBarrierHitbox}
 
-D_MA_6036744:
+aMaActor219Hitbox:
-  {type: SF64:HITBOX, offset: 0x6036744, symbol: D_MA_6036744}
+  {type: SF64:HITBOX, offset: 0x6036744, symbol: aMaActor219Hitbox}
 
-D_MA_6036760:
+aMaFloor6Hitbox:
-  {type: SF64:HITBOX, offset: 0x6036760, symbol: D_MA_6036760}
+  {type: SF64:HITBOX, offset: 0x6036760, symbol: aMaFloor6Hitbox}
 
-D_MA_603677C:
+aMaActor207Hitbox:
-  {type: SF64:HITBOX, offset: 0x603677C, symbol: D_MA_603677C}
+  {type: SF64:HITBOX, offset: 0x603677C, symbol: aMaActor207Hitbox}
 
 D_MA_6036818:
   {type: SF64:HITBOX, offset: 0x6036818, symbol: D_MA_6036818}
@@ -919,20 +919,20 @@ D_MA_6036818:
 D_MA_6036894:
   {type: SF64:HITBOX, offset: 0x6036894, symbol: D_MA_6036894}
 
-D_MA_60368E0:
+aMaGuillotineHitbox:
-  {type: SF64:HITBOX, offset: 0x60368E0, symbol: D_MA_60368E0}
+  {type: SF64:HITBOX, offset: 0x60368E0, symbol: aMaGuillotineHitbox}
 
 D_MA_60368FC:
   {type: SF64:HITBOX, offset: 0x60368FC, symbol: D_MA_60368FC}
 
-D_MA_6036930:
+aMaBombDropHitbox:
-  {type: SF64:HITBOX, offset: 0x6036930, symbol: D_MA_6036930}
+  {type: SF64:HITBOX, offset: 0x6036930, symbol: aMaBombDropHitbox}
 
-D_MA_603694C:
+aMaSpearHitbox:
-  {type: SF64:HITBOX, offset: 0x603694C, symbol: D_MA_603694C}
+  {type: SF64:HITBOX, offset: 0x603694C, symbol: aMaSpearHitbox}
 
-D_MA_6036968:
+aMaShockBoxHitbox:
-  {type: SF64:HITBOX, offset: 0x6036968, symbol: D_MA_6036968}
+  {type: SF64:HITBOX, offset: 0x6036968, symbol: aMaShockBoxHitbox}
 
 D_MA_60381D8:
   {type: SF64:SCRIPT, offset: 0x60381D8, symbol: D_MA_60381D8}

assets/yaml/jp/rev0/ast_meteo.yaml

@@ -104,8 +104,8 @@ D_ME_600C740:
 D_ME_600CAA0:
   { type: GFX, offset: 0x600CAA0, symbol: D_ME_600CAA0 }
 
-D_ME_600CD60:
+aMeMeteorShower3DL:
-  { type: GFX, offset: 0x600CD60, symbol: D_ME_600CD60 }
+  { type: GFX, offset: 0x600CD60, symbol: aMeMeteorShower3DL }
 
 D_ME_600CDE8:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x0600CDE8, symbol: D_ME_600CDE8 }
@@ -137,8 +137,8 @@ D_ME_6014238:
 D_ME_6015238:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 64, offset: 0x06015238, symbol: D_ME_6015238 }
 
-D_ME_6016240:
+aMeMeteorShower2DL:
-  { type: GFX, offset: 0x6016240, symbol: D_ME_6016240 }
+  { type: GFX, offset: 0x6016240, symbol: aMeMeteorShower2DL }
 
 D_ME_60162C8:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x060162C8, symbol: D_ME_60162C8 }
@@ -146,20 +146,20 @@ D_ME_60162C8:
 D_ME_60172C8:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x060172C8, symbol: D_ME_60172C8 }
 
-D_ME_6017AD0:
+aMeMeteorShower1DL:
-  { type: GFX, offset: 0x06017AD0, symbol: D_ME_6017AD0 }
+  { type: GFX, offset: 0x06017AD0, symbol: aMeMeteorShower1DL }
 
 D_ME_6017B60:
   { type: GFX, offset: 0x06017B60, symbol: D_ME_6017B60 }
 
-D_ME_6018450:
+aMeLaserCannon2DL:
-  { type: GFX, offset: 0x06018450, symbol: D_ME_6018450 }
+  { type: GFX, offset: 0x06018450, symbol: aMeLaserCannon2DL }
 
 D_ME_6018960:
   { type: GFX, offset: 0x06018960, symbol: D_ME_6018960 }
 
-D_ME_6018C00:
+aMeMeteor1DL:
-  { type: GFX, offset: 0x06018C00, symbol: D_ME_6018C00 }
+  { type: GFX, offset: 0x06018C00, symbol: aMeMeteor1DL }
 
 D_ME_6019430:
   { type: GFX, offset: 0x06019430, symbol: D_ME_6019430 }
@@ -286,29 +286,29 @@ D_ME_602F604:
 D_ME_602F638:
   { type: SF64:HITBOX, offset: 0x602F638, symbol: D_ME_602F638 }
 
-D_ME_602F684:
+aMeMeteoBallHitbox:
-  { type: SF64:HITBOX, offset: 0x602F684, symbol: D_ME_602F684 }
+  { type: SF64:HITBOX, offset: 0x602F684, symbol: aMeMeteoBallHitbox }
 
-D_ME_602F6A0:
+aMeHopBotHitbox:
-  { type: SF64:HITBOX, offset: 0x602F6A0, symbol: D_ME_602F6A0 }
+  { type: SF64:HITBOX, offset: 0x602F6A0, symbol: aMeHopBotHitbox }
 
-D_ME_602F6EC:
+aMeMeteor1Hitbox:
-  { type: SF64:HITBOX, offset: 0x602F6EC, symbol: D_ME_602F6EC }
+  { type: SF64:HITBOX, offset: 0x602F6EC, symbol: aMeMeteor1Hitbox }
 
-D_ME_602F708:
+aMeMeteor2Hitbox:
-  { type: SF64:HITBOX, offset: 0x602F708, symbol: D_ME_602F708 }
+  { type: SF64:HITBOX, offset: 0x602F708, symbol: aMeMeteor2Hitbox }
 
-D_ME_602F724:
+aMeLaserCannon1Hitbox:
-  { type: SF64:HITBOX, offset: 0x602F724, symbol: D_ME_602F724 }
+  { type: SF64:HITBOX, offset: 0x602F724, symbol: aMeLaserCannon1Hitbox }
 
-D_ME_602F740:
+aMeLaserCannon2Hitbox:
-  { type: SF64:HITBOX, offset: 0x602F740, symbol: D_ME_602F740 }
+  { type: SF64:HITBOX, offset: 0x602F740, symbol: aMeLaserCannon2Hitbox }
 
-D_ME_602F75C:
+aMeCrusherHitbox:
-  { type: SF64:HITBOX, offset: 0x602F75C, symbol: D_ME_602F75C }
+  { type: SF64:HITBOX, offset: 0x602F75C, symbol: aMeCrusherHitbox }
 
-D_ME_602FA50:
+aMeCrusherShieldHitbox:
-  { type: SF64:HITBOX, offset: 0x602FA50, symbol: D_ME_602FA50 }
+  { type: SF64:HITBOX, offset: 0x602FA50, symbol: aMeCrusherShieldHitbox }
 
 D_ME_602FA9C:
   {type: SF64:COLPOLY, count: 79, offset: 0x602FA9C, symbol: D_ME_602FA9C, mesh_symbol: D_ME_OFFSET }

assets/yaml/jp/rev0/ast_sector_x.yaml

@@ -247,14 +247,14 @@ D_SX_603238C:
 D_SX_6032408:
   { type: SF64:HITBOX, offset: 0x6032408, symbol: D_SX_6032408 }
 
-D_SX_6032488:
+aSxSpyborgLeftArmHitbox:
-  { type: SF64:HITBOX, offset: 0x6032488, symbol: D_SX_6032488 }
+  { type: SF64:HITBOX, offset: 0x6032488, symbol: aSxSpyborgLeftArmHitbox }
 
-D_SX_60324EC:
+aSxSpyborgRightArmHitbox:
-  { type: SF64:HITBOX, offset: 0x60324EC, symbol: D_SX_60324EC }
+  { type: SF64:HITBOX, offset: 0x60324EC, symbol: aSxSpyborgRightArmHitbox }
 
-D_SX_6032550:
+aSxSpyborgHitbox:
-  { type: SF64:HITBOX, offset: 0x6032550, symbol: D_SX_6032550 }
+  { type: SF64:HITBOX, offset: 0x6032550, symbol: aSxSpyborgHitbox }
 
 D_SX_603285C:
   { type: SF64:HITBOX, offset: 0x603285C, symbol: D_SX_603285C }

assets/yaml/jp/rev0/ast_sector_y.yaml

@@ -35,11 +35,11 @@ D_SY_6003348:
 D_SY_60034C4:
   { type: SF64:ANIM, offset: 0x60034C4, symbol: D_SY_60034C4 }
 
-D_SY_60034D0:
+aSyShipWindowsDL:
-  { type: GFX, offset: 0x60034D0, symbol: D_SY_60034D0 }
+  { type: GFX, offset: 0x60034D0, symbol: aSyShipWindowsDL }
 
-D_SY_60036A0:
+aSyShip3DestroyedDL:
-  { type: GFX, offset: 0x60036A0, symbol: D_SY_60036A0 }
+  { type: GFX, offset: 0x60036A0, symbol: aSyShip3DestroyedDL }
 
 D_SY_6004958:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06004958, symbol: D_SY_6004958 }
@@ -47,8 +47,8 @@ D_SY_6004958:
 D_SY_6005158:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06005158, symbol: D_SY_6005158 }
 
-D_SY_6005360:
+aSyShip4DL:
-  { type: GFX, offset: 0x6005360, symbol: D_SY_6005360 }
+  { type: GFX, offset: 0x6005360, symbol: aSyShip4DL }
 
 D_SY_6005BE0:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06005BE0, symbol: D_SY_6005BE0 }
@@ -74,8 +74,8 @@ D_SY_6008BE0:
 D_SY_6008FE0:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06008FE0, symbol: D_SY_6008FE0 }
 
-D_SY_60097E0:
+aSyShip1DL:
-  { type: GFX, offset: 0x060097E0, symbol: D_SY_60097E0 }
+  { type: GFX, offset: 0x060097E0, symbol: aSyShip1DL }
 
 D_SY_600AAC0:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 64, offset: 0x0600AAC0, symbol: D_SY_600AAC0 }
@@ -98,11 +98,11 @@ D_SY_600EAC0:
 D_SY_600F2C0:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 32, offset: 0x0600F2C0, symbol: D_SY_600F2C0 }
 
-D_SY_600F6C0:
+aSyShip4DestroyedDL:
-  { type: GFX, offset: 0x600F6C0, symbol: D_SY_600F6C0 }
+  { type: GFX, offset: 0x600F6C0, symbol: aSyShip4DestroyedDL }
 
-D_SY_60102C0:
+aSyShip3DL:
-  { type: GFX, offset: 0x60102C0, symbol: D_SY_60102C0 }
+  { type: GFX, offset: 0x60102C0, symbol: aSyShip3DL }
 
 D_SY_6011758:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x06011758, symbol: D_SY_6011758 }
@@ -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 }
 
-D_SY_60188D0:
+aSyShipProjectileDL:
-  { type: GFX, offset: 0x60188D0, symbol: D_SY_60188D0 }
+  { type: GFX, offset: 0x60188D0, symbol: aSyShipProjectileDL }
 
 D_SY_60183B0:
   { type: GFX, offset: 0x60183B0, symbol: D_SY_60183B0 }
@@ -176,20 +176,20 @@ D_SY_601AD70:
 D_SY_601AE08:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0601AE08, symbol: D_SY_601AE08 }
 
-D_SY_601B610:
+aSyShip2SpriteDL:
-  { type: GFX, offset: 0x601B610, symbol: D_SY_601B610 }
+  { type: GFX, offset: 0x601B610, symbol: aSyShip2SpriteDL }
 
 D_SY_601B6A0:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x0601B6A0, symbol: D_SY_601B6A0 }
 
-D_SY_601C6A0:
+aSyShip3SpriteDL:
-  { type: GFX, offset: 0x601C6A0, symbol: D_SY_601C6A0 }
+  { type: GFX, offset: 0x601C6A0, symbol: aSyShip3SpriteDL }
 
 D_SY_601C730:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x0601C730, symbol: D_SY_601C730 }
 
-D_SY_601D730:
+aSyShip2DL:
-  { type: GFX, offset: 0x601D730, symbol: D_SY_601D730 }
+  { type: GFX, offset: 0x601D730, symbol: aSyShip2DL }
 
 D_SY_601F3B8:
   { type: SF64:ANIM, offset: 0x601F3B8, symbol: D_SY_601F3B8 }
@@ -308,8 +308,8 @@ D_SY_6032E18:
 D_SY_6033070:
   {type: SF64:COLPOLY, count: 174, offset: 0x6033070, symbol: D_SY_6033070, mesh_symbol: D_SY_6033E08 }
 
-D_SY_603405C:
+aSyRobotHitbox:
-  { type: SF64:HITBOX, offset: 0x603405C, symbol: D_SY_603405C }
+  { type: SF64:HITBOX, offset: 0x603405C, symbol: aSyRobotHitbox }
 
 D_SY_60340C0:
   { type: SF64:HITBOX, offset: 0x60340C0, symbol: D_SY_60340C0 }
@@ -329,34 +329,34 @@ D_SY_60342A0:
 D_SY_6034304:
   { type: SF64:HITBOX, offset: 0x6034304, symbol: D_SY_6034304 }
 
-D_SY_6034368:
+aSyScenery156Hitbox:
-  { type: SF64:HITBOX, offset: 0x6034368, symbol: D_SY_6034368 }
+  { type: SF64:HITBOX, offset: 0x6034368, symbol: aSyScenery156Hitbox }
 
 D_SY_603445C:
   { type: SF64:HITBOX, offset: 0x603445C, symbol: D_SY_603445C }
 
-D_SY_6034478:
+aSyShip1Hitbox:
-  { type: SF64:HITBOX, offset: 0x6034478, symbol: D_SY_6034478 }
+  { type: SF64:HITBOX, offset: 0x6034478, symbol: aSyShip1Hitbox }
 
-D_SY_603450C:
+aSyShip2Hitbox:
-  { type: SF64:HITBOX, offset: 0x603450C, symbol: D_SY_603450C }
+  { type: SF64:HITBOX, offset: 0x603450C, symbol: aSyShip2Hitbox }
 
-D_SY_6034588:
+aSyShip3Hitbox:
-  { type: SF64:HITBOX, offset: 0x6034588, symbol: D_SY_6034588 }
+  { type: SF64:HITBOX, offset: 0x6034588, symbol: aSyShip3Hitbox }
 
-D_SY_6034664:
+aSyShip3DestroyedHitbox:
-  { type: SF64:HITBOX, offset: 0x6034664, symbol: D_SY_6034664 }
+  { type: SF64:HITBOX, offset: 0x6034664, symbol: aSyShip3DestroyedHitbox }
 
-D_SY_6034770:
+aSyShip4Hitbox:
-  { type: SF64:HITBOX, offset: 0x6034770, symbol: D_SY_6034770 }
+  { type: SF64:HITBOX, offset: 0x6034770, symbol: aSyShip4Hitbox }
 
-D_SY_60347D4:
+aSyShipWindowsHitbox:
-  { type: SF64:HITBOX, offset: 0x60347D4, symbol: D_SY_60347D4 }
+  { type: SF64:HITBOX, offset: 0x60347D4, symbol: aSyShipWindowsHitbox }
 
-D_SY_60347F0:
+aSyShip4DestroyedHitbox:
-  { type: SF64:HITBOX, offset: 0x60347F0, symbol: D_SY_60347F0 }
+  { type: SF64:HITBOX, offset: 0x60347F0, symbol: aSyShip4DestroyedHitbox }
 
-D_SY_603486C:
+aSyShipProjectileHitbox:
-  { type: SF64:HITBOX, offset: 0x603486C, symbol: D_SY_603486C }
+  { type: SF64:HITBOX, offset: 0x603486C, symbol: aSyShipProjectileHitbox }
 
 # size = 0x34890

assets/yaml/jp/rev0/ast_sector_z.yaml

@@ -85,8 +85,8 @@ D_SZ_60041F8:
 D_SZ_60042F8:
   { type: TEXTURE, ctype: u16, format: TLUT, colors: 24, offset: 0x060042F8, symbol: D_SZ_60042F8 }
 
-D_SZ_6004330:
+aSzMissileMark:
-  { type: GFX, offset: 0x6004330, symbol: D_SZ_6004330 }
+  { type: GFX, offset: 0x6004330, symbol: aSzMissileMark }
 
 D_SZ_6004458:
   { type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 8, offset: 0x06004458, symbol: D_SZ_6004458, tlut: 0x06004558 }
@@ -160,13 +160,13 @@ D_SZ_6007558:
 D_SZ_6009230:
   { type: SF64:HITBOX, offset: 0x6009230, symbol: D_SZ_6009230 }
 
-D_SZ_600924C:
+aSzSpaceJunk3Hitbox:
-  { type: SF64:HITBOX, offset: 0x600924C, symbol: D_SZ_600924C }
+  { type: SF64:HITBOX, offset: 0x600924C, symbol: aSzSpaceJunk3Hitbox }
 
-D_SZ_60092E8:
+aSzSpaceJunk1Hitbox:
-  { type: SF64:HITBOX, offset: 0x60092E8, symbol: D_SZ_60092E8 }
+  { type: SF64:HITBOX, offset: 0x60092E8, symbol: aSzSpaceJunk1Hitbox }
 
-D_SZ_6009388:
+aSzGreatFoxHitbox:
-  { type: SF64:HITBOX, offset: 0x6009388, symbol: D_SZ_6009388 }
+  { type: SF64:HITBOX, offset: 0x6009388, symbol: aSzGreatFoxHitbox }
 
 # size = 0x93B0

assets/yaml/jp/rev0/ast_titania.yaml

@@ -76,11 +76,11 @@ D_TI_6005000:
 D_TI_600631C:
   {type: SF64:SCRIPT, offset: 0x600631C, symbol: D_TI_600631C}
 
-D_TI_60064AC:
+aTi1LandmineHitbox:
-  {type: SF64:HITBOX, offset: 0x60064AC, symbol: D_TI_60064AC}
+  {type: SF64:HITBOX, offset: 0x60064AC, symbol: aTi1LandmineHitbox}
 
-D_TI_60064C8:
+aTiDesertRoverHitbox:
-  {type: SF64:HITBOX, offset: 0x60064C8, symbol: D_TI_60064C8}
+  {type: SF64:HITBOX, offset: 0x60064C8, symbol: aTiDesertRoverHitbox}
 
 aTiSkullHitbox:
   {type: SF64:HITBOX, offset: 0x60064FC, symbol: aTiSkullHitbox}
@@ -112,32 +112,32 @@ aTiRib7Hitbox:
 aTiRib8Hitbox:
   {type: SF64:HITBOX, offset: 0x6006778, symbol: aTiRib8Hitbox}
 
-D_TI_60067C4:
+aTiDelphorHitbox:
-  {type: SF64:HITBOX, offset: 0x60067C4, symbol: D_TI_60067C4}
+  {type: SF64:HITBOX, offset: 0x60067C4, symbol: aTiDelphorHitbox}
 
-D_TI_6006808:
+aTiDelphorHeadHitbox:
-  {type: SF64:HITBOX, offset: 0x6006808, symbol: D_TI_6006808}
+  {type: SF64:HITBOX, offset: 0x6006808, symbol: aTiDelphorHeadHitbox}
 
-D_TI_6006A3C:
+aTiDesertCrawlerHitbox:
-  {type: SF64:HITBOX, offset: 0x6006A3C, symbol: D_TI_6006A3C}
+  {type: SF64:HITBOX, offset: 0x6006A3C, symbol: aTiDesertCrawlerHitbox}
 
-D_TI_600683C:
+aTiBoulderHitbox:
-  {type: SF64:HITBOX, offset: 0x600683C, symbol: D_TI_600683C}
+  {type: SF64:HITBOX, offset: 0x600683C, symbol: aTiBoulderHitbox}
 
-D_TI_6006858:
+aTiBombHitbox:
-  {type: SF64:HITBOX, offset: 0x6006858, symbol: D_TI_6006858}
+  {type: SF64:HITBOX, offset: 0x6006858, symbol: aTiBombHitbox}
 
 D_TI_6006874:
   {type: SF64:HITBOX, offset: 0x6006874, symbol: D_TI_6006874}
 
-D_TI_6006890:
+aTiRascoHitbox:
-  {type: SF64:HITBOX, offset: 0x6006890, symbol: D_TI_6006890}
+  {type: SF64:HITBOX, offset: 0x6006890, symbol: aTiRascoHitbox}
 
 aTiCactusHitbox:
   {type: SF64:HITBOX, offset: 0x60068BC, symbol: aTiCactusHitbox}
 
-D_TI_60068F0:
+aTiFekudaHitbox:
-  {type: SF64:HITBOX, offset: 0x60068F0, symbol: D_TI_60068F0}
+  {type: SF64:HITBOX, offset: 0x60068F0, symbol: aTiFekudaHitbox}
 
 D_TI_6006940:
   {type: SF64:HITBOX, offset: 0x6006940, symbol: D_TI_6006940}
@@ -166,8 +166,8 @@ D_TI_6006A04:
 D_TI_6006A20:
   {type: SF64:HITBOX, offset: 0x6006A20, symbol: D_TI_6006A20}
 
-D_TI_6006BF0:
+aTiPillarHitbox:
-  {type: SF64:HITBOX, offset: 0x6006BF0, symbol: D_TI_6006BF0}
+  {type: SF64:HITBOX, offset: 0x6006BF0, symbol: aTiPillarHitbox}
 
 D_TI_6006924:
   {type: SF64:HITBOX, offset: 0x6006924, symbol: D_TI_6006924}
@@ -178,8 +178,8 @@ D_TI_6006C0C:
 D_TI_6006C28:
   {type: SF64:HITBOX, offset: 0x6006C28, symbol: D_TI_6006C28}
 
-D_TI_6006C44:
+aTiBridgeHitbox:
-  {type: SF64:HITBOX, offset: 0x6006C44, symbol: D_TI_6006C44}
+  {type: SF64:HITBOX, offset: 0x6006C44, symbol: aTiBridgeHitbox}
 
 D_TI_6006C60:
   {type: SF64:OBJECT_INIT, offset: 0x6006C60, symbol: D_TI_6006C60}

assets/yaml/jp/rev0/ast_training.yaml

@@ -31,8 +31,8 @@ D_TR_6002740:
 D_TR_60028F0:
   { type: TEXTURE, format: RGBA16, offset: 0x060028F0, width: 32, height: 32, ctype: u16, symbol: D_TR_60028F0 }
 
-D_TR_60030F0:
+aTrBuildingDL:
-  { type: GFX, offset: 0x60030F0, symbol: D_TR_60030F0 }
+  { type: GFX, offset: 0x60030F0, symbol: aTrBuildingDL }
 
 D_TR_6003360:
   { type: TEXTURE, format: RGBA16, offset: 0x06003360, width: 16, height: 16, ctype: u16, symbol: D_TR_6003360 }
@@ -76,8 +76,8 @@ D_TR_6008EF8:
 D_TR_6009B34:
   { type: SF64:SCRIPT, offset: 0x6009B34, symbol: D_TR_6009B34 }
 
-D_TR_6009CC4:
+aTrBuildingHitbox:
-  { type: SF64:HITBOX, offset: 0x6009CC4, symbol: D_TR_6009CC4 }
+  { type: SF64:HITBOX, offset: 0x6009CC4, symbol: aTrBuildingHitbox }
 
 D_TR_6009CFC:
   { type: SF64:HITBOX, offset: 0x6009CFC, symbol: D_TR_6009CFC }

assets/yaml/jp/rev0/ast_ve1_boss.yaml

@@ -50,8 +50,8 @@ D_VE1_90039F0:
 D_VE1_9003DF0:
   {type: TEXTURE, ctype: u16, format: TLUT, colors: 176, offset: 0x9003DF0, symbol: D_VE1_9003DF0}
 
-D_VE1_9003F50:
+aVe1TempleInterior1DL:
-  {type: GFX, offset: 0x9003F50, symbol: D_VE1_9003F50}
+  {type: GFX, offset: 0x9003F50, symbol: aVe1TempleInterior1DL}
 
 D_VE1_9004478:
   {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 32, offset: 0x9004478, symbol: D_VE1_9004478}
@@ -65,8 +65,8 @@ D_VE1_9005078:
 D_VE1_9005478:
   {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x9005478, symbol: D_VE1_9005478}
 
-D_VE1_9005C80:
+aVe1TempleEntranceDL:
-  {type: GFX, offset: 0x9005C80, symbol: D_VE1_9005C80}
+  {type: GFX, offset: 0x9005C80, symbol: aVe1TempleEntranceDL}
 
 D_VE1_9009700:
   {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x9009700, symbol: D_VE1_9009700}
@@ -92,8 +92,8 @@ D_VE1_900BF00:
 D_VE1_900C700:
   {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x900C700, symbol: D_VE1_900C700}
 
-D_VE1_900D098:
+aVe1MonkeyStatueAnim:
-  {type: SF64:ANIM, offset: 0x900D098, symbol: D_VE1_900D098}
+  {type: SF64:ANIM, offset: 0x900D098, symbol: aVe1MonkeyStatueAnim}
 
 D_VE1_900D164:
   {type: SF64:SKELETON, offset: 0x900D164, symbol: D_VE1_900D164}
@@ -104,8 +104,8 @@ D_VE1_900D180:
 D_VE1_900D520:
   {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x900D520, symbol: D_VE1_900D520}
 
-D_VE1_900DD20:
+aVe1Pillar1DL:
-  {type: GFX, offset: 0x900DD20, symbol: D_VE1_900DD20}
+  {type: GFX, offset: 0x900DD20, symbol: aVe1Pillar1DL}
 
 D_VE1_900DF20:
   {type: GFX, offset: 0x900DF20, symbol: D_VE1_900DF20}
@@ -116,11 +116,11 @@ D_VE1_900DFB8:
 D_VE1_900EFC0:
   {type: GFX, offset: 0x900EFC0, symbol: D_VE1_900EFC0}
 
-D_VE1_900F060:
+aVe1TempleInterior2DL:
-  {type: GFX, offset: 0x900F060, symbol: D_VE1_900F060}
+  {type: GFX, offset: 0x900F060, symbol: aVe1TempleInterior2DL}
 
-D_VE1_900F1D0:
+aVe1TempleInterior3DL:
-  {type: GFX, offset: 0x900F1D0, symbol: D_VE1_900F1D0}
+  {type: GFX, offset: 0x900F1D0, symbol: aVe1TempleInterior3DL}
 
 D_VE1_9010FC4:
   {type: SF64:ANIM, offset: 0x9010FC4, symbol: D_VE1_9010FC4}
@@ -179,8 +179,8 @@ D_VE1_901C0F4:
 D_VE1_901DA38:
   {type: SF64:ANIM, offset: 0x901DA38, symbol: D_VE1_901DA38}
 
-D_VE1_901DA50:
+aVe1Pillar3DL:
-  {type: GFX, offset: 0x901DA50, symbol: D_VE1_901DA50}
+  {type: GFX, offset: 0x901DA50, symbol: aVe1Pillar3DL}
 
 D_VE1_901DC90:
   {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 32, offset: 0x901DC90, symbol: D_VE1_901DC90}
@@ -230,8 +230,8 @@ D_VE1_90234D0:
 D_VE1_9023880:
   {type: GFX, offset: 0x9023880, symbol: D_VE1_9023880}
 
-D_VE1_9023AD0:
+aVe1Pillar4DL:
-  {type: GFX, offset: 0x9023AD0, symbol: D_VE1_9023AD0}
+  {type: GFX, offset: 0x9023AD0, symbol: aVe1Pillar4DL}
 
 D_VE1_9024738:
   {type: SF64:ANIM, offset: 0x9024738, symbol: D_VE1_9024738}

assets/yaml/jp/rev0/ast_venom_1.yaml

@@ -46,8 +46,8 @@ D_VE1_6003078:
 D_VE1_6003478:
   { type: TEXTURE, format: TLUT, colors: 204, offset: 0x6003478, ctype: u16, symbol: D_VE1_6003478 }
 
-D_VE1_6003610:
+aVe1WatchPostDL:
-  { type: GFX, offset: 0x6003610, symbol: D_VE1_6003610 }
+  { type: GFX, offset: 0x6003610, symbol: aVe1WatchPostDL }
 
 D_VE1_6003B10:
   { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6003B10, ctype: u16, symbol: D_VE1_6003B10 }
@@ -70,8 +70,8 @@ D_VE1_60046F0:
 D_VE1_6004780:
   { type: TEXTURE, format: RGBA16, width: 64, height: 32, offset: 0x6004780, ctype: u16, symbol: D_VE1_6004780 }
 
-D_VE1_6005780:
+aVe1GeneratorDL:
-  { type: GFX, offset: 0x6005780, symbol: D_VE1_6005780 }
+  { type: GFX, offset: 0x6005780, symbol: aVe1GeneratorDL }
 
 D_VE1_6005E50:
   { type: TEXTURE, format: TLUT, colors: 160, offset: 0x6005E50, ctype: u16, symbol: D_VE1_6005E50 }
@@ -97,11 +97,11 @@ D_VE1_60066D0:
 D_VE1_6006750:
   { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6006750, ctype: u16, symbol: D_VE1_6006750 }
 
-D_VE1_6006F50:
+aVe1HallwayObstacleDL:
-  { type: GFX, offset: 0x6006F50, symbol: D_VE1_6006F50 }
+  { type: GFX, offset: 0x6006F50, symbol: aVe1HallwayObstacleDL }
 
-D_VE1_6007410:
+aVe1SceneryWall3DL:
-  { type: GFX, offset: 0x6007410, symbol: D_VE1_6007410 }
+  { type: GFX, offset: 0x6007410, symbol: aVe1SceneryWall3DL }
 
 D_VE1_60074E8:
   { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x60074E8, ctype: u16, symbol: D_VE1_60074E8 }
@@ -133,50 +133,50 @@ D_VE1_601B474:
 D_VE1_601B4C4:
   { type: SF64:HITBOX, offset: 0x601B4C4, symbol: D_VE1_601B4C4 }
 
-D_VE1_601B4E0:
+aVe1SceneryWall1Hitbox:
-  { type: SF64:HITBOX, offset: 0x601B4E0, symbol: D_VE1_601B4E0 }
+  { type: SF64:HITBOX, offset: 0x601B4E0, symbol: aVe1SceneryWall1Hitbox }
 
-D_VE1_601B4FC:
+aVe1SceneryWall2Hitbox:
-  { type: SF64:HITBOX, offset: 0x601B4FC, symbol: D_VE1_601B4FC }
+  { type: SF64:HITBOX, offset: 0x601B4FC, symbol: aVe1SceneryWall2Hitbox }
 
-D_VE1_601B518:
+aVe1SceneryWall3Hitbox:
-  { type: SF64:HITBOX, offset: 0x601B518, symbol: D_VE1_601B518 }
+  { type: SF64:HITBOX, offset: 0x601B518, symbol: aVe1SceneryWall3Hitbox }
 
-D_VE1_601B584:
+aVe1HallwayObstacleHitbox:
-  { type: SF64:HITBOX, offset: 0x601B584, symbol: D_VE1_601B584 }
+  { type: SF64:HITBOX, offset: 0x601B584, symbol: aVe1HallwayObstacleHitbox }
 
-D_VE1_601B5F4:
+aVe1GeneratorHitbox:
-  { type: SF64:HITBOX, offset: 0x601B5F4, symbol: D_VE1_601B5F4 }
+  { type: SF64:HITBOX, offset: 0x601B5F4, symbol: aVe1GeneratorHitbox }
 
-D_VE1_601B644:
+aVe1WatchPostHitbox:
-  { type: SF64:HITBOX, offset: 0x601B644, symbol: D_VE1_601B644 }
+  { type: SF64:HITBOX, offset: 0x601B644, symbol: aVe1WatchPostHitbox }
 
-D_VE1_601B678:
+aVe1TempleEntranceHitbox:
-  { type: SF64:HITBOX, offset: 0x601B678, symbol: D_VE1_601B678 }
+  { type: SF64:HITBOX, offset: 0x601B678, symbol: aVe1TempleEntranceHitbox }
 
-D_VE1_601B6C4:
+aVe1TempleInterior1Hitbox:
-  { type: SF64:HITBOX, offset: 0x601B6C4, symbol: D_VE1_601B6C4 }
+  { type: SF64:HITBOX, offset: 0x601B6C4, symbol: aVe1TempleInterior1Hitbox }
 
-D_VE1_601B710:
+aVe1TempleInterior2Hitbox:
-  { type: SF64:HITBOX, offset: 0x601B710, symbol: D_VE1_601B710 }
+  { type: SF64:HITBOX, offset: 0x601B710, symbol: aVe1TempleInterior2Hitbox }
 
-D_VE1_601B75C:
+aVe1TempleInterior3Hitbox:
-  { type: SF64:HITBOX, offset: 0x601B75C, symbol: D_VE1_601B75C }
+  { type: SF64:HITBOX, offset: 0x601B75C, symbol: aVe1TempleInterior3Hitbox }
 
-D_VE1_601B7F8:
+aVe1Pillar1Hitbox:
-  { type: SF64:HITBOX, offset: 0x601B7F8, symbol: D_VE1_601B7F8 }
+  { type: SF64:HITBOX, offset: 0x601B7F8, symbol: aVe1Pillar1Hitbox }
 
-D_VE1_601B830:
+aVe1Pillar2Hitbox:
-  { type: SF64:HITBOX, offset: 0x601B830, symbol: D_VE1_601B830 }
+  { type: SF64:HITBOX, offset: 0x601B830, symbol: aVe1Pillar2Hitbox }
 
-D_VE1_601B868:
+aVe1Pillar3Hitbox:
-  { type: SF64:HITBOX, offset: 0x601B868, symbol: D_VE1_601B868 }
+  { type: SF64:HITBOX, offset: 0x601B868, symbol: aVe1Pillar3Hitbox }
 
-D_VE1_601B8A0:
+aVe1Pillar4Hitbox:
-  { type: SF64:HITBOX, offset: 0x601B8A0, symbol: D_VE1_601B8A0 }
+  { type: SF64:HITBOX, offset: 0x601B8A0, symbol: aVe1Pillar4Hitbox }
 
-D_VE1_601B8D8:
+aVe1MonkeyStatueHitbox:
-  { type: SF64:HITBOX, offset: 0x601B8D8, symbol: D_VE1_601B8D8 }
+  { type: SF64:HITBOX, offset: 0x601B8D8, symbol: aVe1MonkeyStatueHitbox }
 
 D_VE1_601B944:
   { type: SF64:HITBOX, offset: 0x601B944, symbol: D_VE1_601B944 }

assets/yaml/jp/rev0/ast_venom_2.yaml

@@ -27,11 +27,11 @@ D_VE2_60020D0:
 D_VE2_6002890:
   { type: TEXTURE, format: IA8, width: 16, height: 16, offset: 0x6002890, ctype: u8, symbol: D_VE2_6002890 }
 
-D_VE2_6002990:
+aAndPathExitDL:
-  { type: GFX, offset: 0x6002990, symbol: D_VE2_6002990 }
+  { type: GFX, offset: 0x6002990, symbol: aAndPathExitDL }
 
-D_VE2_6003000:
+aAndPathIntersectionDL:
-  { type: GFX, offset: 0x6003000, symbol: D_VE2_6003000 }
+  { type: GFX, offset: 0x6003000, symbol: aAndPathIntersectionDL }
 
 D_VE2_60038E0:
   { type: GFX, offset: 0x60038E0, symbol: D_VE2_60038E0 }
@@ -39,8 +39,8 @@ D_VE2_60038E0:
 D_VE2_6003970:
   { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6003970, ctype: u16, symbol: D_VE2_6003970 }
 
-D_VE2_6004170:
+aAndPathEntranceDL:
-  { type: GFX, offset: 0x6004170, symbol: D_VE2_6004170 }
+  { type: GFX, offset: 0x6004170, symbol: aAndPathEntranceDL }
 
 D_VE2_6004888:
   { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6004888, ctype: u16, symbol: D_VE2_6004888 }
@@ -57,8 +57,8 @@ D_VE2_6006088:
 D_VE2_60030D8:
   { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x60030D8, ctype: u16, symbol: D_VE2_60030D8 }
 
-D_VE2_6006890:
+aAndPathWallsDL:
-  { type: GFX, offset: 0x6006890, symbol: D_VE2_6006890 }
+  { type: GFX, offset: 0x6006890, symbol: aAndPathWallsDL }
 
 D_VE2_6006E20:
   { type: GFX, offset: 0x6006E20, symbol: D_VE2_6006E20 }
@@ -72,8 +72,8 @@ D_VE2_6007E20:
 D_VE2_6008170:
   { type: TEXTURE, format: RGBA16, width: 16, height: 16, offset: 0x6008170, ctype: u16, symbol: D_VE2_6008170 }
 
-D_VE2_6008370:
+aVe2TowerDL:
-  { type: GFX, offset: 0x6008370, symbol: D_VE2_6008370 }
+  { type: GFX, offset: 0x6008370, symbol: aVe2TowerDL }
 
 D_VE2_6008AF8:
   { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6008AF8, ctype: u16, symbol: D_VE2_6008AF8 }
@@ -162,8 +162,8 @@ D_VE2_600F700:
 D_VE2_6010700:
   { type: GFX, offset: 0x6010700, symbol: D_VE2_6010700 }
 
-D_VE2_6010960:
+aVe2MountainDL:
-  { type: GFX, offset: 0x6010960, symbol: D_VE2_6010960 }
+  { type: GFX, offset: 0x6010960, symbol: aVe2MountainDL }
 
 D_VE2_6010CA0:
   { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6010CA0, ctype: u16, symbol: D_VE2_6010CA0 }
@@ -195,11 +195,11 @@ D_VE2_6014D94:
 D_VE2_6014FEC:
   { type: SF64:COLPOLY, count: 250, offset: 0x6014FEC, symbol: D_VE2_6014FEC, mesh_symbol: D_VE2_OFFSET }
 
-D_VE2_601668C:
+aVe2TowerHitbox:
-  { type: SF64:HITBOX, offset: 0x601668C, symbol: D_VE2_601668C }
+  { type: SF64:HITBOX, offset: 0x601668C, symbol: aVe2TowerHitbox }
 
-D_VE2_60166F4:
+aVe2BaseHitbox:
-  { type: SF64:HITBOX, offset: 0x60166F4, symbol: D_VE2_60166F4 }
+  { type: SF64:HITBOX, offset: 0x60166F4, symbol: aVe2BaseHitbox }
 
-D_VE2_6016714:
+aVe2MountainHitbox:
-  { type: SF64:HITBOX, offset: 0x6016714, symbol: D_VE2_6016714 }
+  { type: SF64:HITBOX, offset: 0x6016714, symbol: aVe2MountainHitbox }

assets/yaml/jp/rev0/ast_versus.yaml

@@ -182,8 +182,8 @@ D_versus_300EC80:
 D_versus_300EE80:
   { type: GFX, offset: 0x300EE80, symbol: D_versus_300EE80}
 
-D_versus_300FB80:
+aVsLandmasterModelDL:
-  { type: GFX, offset: 0x300FB80, symbol: D_versus_300FB80}
+  { type: GFX, offset: 0x300FB80, symbol: aVsLandmasterModelDL}
 
 D_versus_3010690:
   {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x3010690, symbol: D_versus_3010690 }
@@ -203,14 +203,14 @@ D_versus_3011E40:
 D_versus_3011ED0:
   {type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x3011ED0, symbol: D_versus_3011ED0 }
 
-D_versus_3012ED0:
+aVsSpaceJunk3DL:
-  { type: GFX, offset: 0x3012ED0, symbol: D_versus_3012ED0}
+  { type: GFX, offset: 0x3012ED0, symbol: aVsSpaceJunk3DL}
 
-D_versus_3013580:
+aVsSpaceJunk2DL:
-  { type: GFX, offset: 0x3013580, symbol: D_versus_3013580}
+  { type: GFX, offset: 0x3013580, symbol: aVsSpaceJunk2DL}
 
-D_versus_3013780:
+aVsSpaceJunk1DL:
-  { type: GFX, offset: 0x3013780, symbol: D_versus_3013780}
+  { type: GFX, offset: 0x3013780, symbol: aVsSpaceJunk1DL}
 
 D_versus_3013F50:
   {type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x3013F50, symbol: D_versus_3013F50, tlut: 0x3014350 }
@@ -245,8 +245,8 @@ D_versus_30160A0:
 D_versus_30162F8:
   {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x30162F8, symbol: D_versus_30162F8 }
 
-D_versus_3016B00:
+aVsKaFlBaseDL:
-  { type: GFX, offset: 0x3016B00, symbol: D_versus_3016B00}
+  { type: GFX, offset: 0x3016B00, symbol: aVsKaFlBaseDL}
 
 D_versus_3016DC0:
   {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x3016DC0, symbol: D_versus_3016DC0 }
@@ -257,14 +257,14 @@ D_versus_3016FC0:
 D_versus_30171C0:
   {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x30171C0, symbol: D_versus_30171C0 }
 
-D_versus_30173C0:
+aVsPyramid1DL:
-  { type: GFX, offset: 0x30173C0, symbol: D_versus_30173C0}
+  { type: GFX, offset: 0x30173C0, symbol: aVsPyramid1DL}
 
-D_versus_30174E0:
+aVsPyramid2DL:
-  { type: GFX, offset: 0x30174E0, symbol: D_versus_30174E0}
+  { type: GFX, offset: 0x30174E0, symbol: aVsPyramid2DL}
 
-D_versus_3017600:
+aVsBuildingDL:
-  { type: GFX, offset: 0x3017600, symbol: D_versus_3017600}
+  { type: GFX, offset: 0x3017600, symbol: aVsBuildingDL}
 
 D_versus_3017800:
   {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x3017800, symbol: D_versus_3017800 }
@@ -299,8 +299,8 @@ D_versus_301AEF0:
 D_versus_301AF78:
   {type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 16, offset: 0x301AF78, symbol: D_versus_301AF78 }
 
-D_versus_301B080:
+aVsArchDL:
-  { type: GFX, offset: 0x301B080, symbol: D_versus_301B080}
+  { type: GFX, offset: 0x301B080, symbol: aVsArchDL}
 
 D_versus_301B438:
   {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x301B438, symbol: D_versus_301B438 }
@@ -320,8 +320,8 @@ D_versus_301C0A4:
 D_versus_301C3A8:
   { type: SF64:ANIM, offset: 0x301C3A8, symbol: D_versus_301C3A8}
 
-D_versus_301C614:
+aVsOnFootFalcoSkel:
-  { type: SF64:SKELETON, offset: 0x301C614, symbol: D_versus_301C614 }
+  { type: SF64:SKELETON, offset: 0x301C614, symbol: aVsOnFootFalcoSkel }
 
 D_versus_301C79C:
   { type: SF64:ANIM, offset: 0x301C79C, symbol: D_versus_301C79C }
@@ -335,8 +335,8 @@ D_versus_301CCE4:
 D_versus_301CFEC:
   { type: SF64:ANIM, offset: 0x301CFEC, symbol: D_versus_301CFEC}
 
-D_versus_301D258:
+aVsOnFootFoxSkel:
-  { type: SF64:SKELETON, offset: 0x301D258, symbol: D_versus_301D258 }
+  { type: SF64:SKELETON, offset: 0x301D258, symbol: aVsOnFootFoxSkel }
 
 D_versus_301D3DC:
   { type: SF64:ANIM, offset: 0x301D3DC, symbol: D_versus_301D3DC }
@@ -347,8 +347,8 @@ D_versus_301D568:
 D_versus_301D888:
   { type: SF64:ANIM, offset: 0x301D888, symbol: D_versus_301D888}
 
-D_versus_301DB94:
+aVsOnFootPeppySkel:
-  { type: SF64:SKELETON, offset: 0x301DB94, symbol: D_versus_301DB94 }
+  { type: SF64:SKELETON, offset: 0x301DB94, symbol: aVsOnFootPeppySkel }
 
 D_versus_301DD6C:
   { type: SF64:ANIM, offset: 0x301DD6C, symbol: D_versus_301DD6C }
@@ -359,8 +359,8 @@ D_versus_301DEA4:
 D_versus_301E19C:
   { type: SF64:ANIM, offset: 0x301E19C, symbol: D_versus_301E19C}
 
-D_versus_301E3E8:
+aVsOnFootSlippySkel:
-  { type: SF64:SKELETON, offset: 0x301E3E8, symbol: D_versus_301E3E8 }
+  { type: SF64:SKELETON, offset: 0x301E3E8, symbol: aVsOnFootSlippySkel }
 
 D_versus_301E560:
   { type: SF64:ANIM, offset: 0x301E560, symbol: D_versus_301E560}
@@ -395,8 +395,8 @@ D_versus_301EEB0:
 D_versus_301EF38:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x301EF38, symbol: D_versus_301EF38 }
 
-D_versus_301F140:
+aVsLandmasterCanonDL:
-  { type: GFX, offset: 0x301F140, symbol: D_versus_301F140}
+  { type: GFX, offset: 0x301F140, symbol: aVsLandmasterCanonDL}
 
 D_versus_301F2E0:
   { type: GFX, offset: 0x301F2E0, symbol: D_versus_301F2E0}
@@ -704,26 +704,26 @@ D_versus_302E170:
 D_versus_302E378:
   { type: SF64:OBJECT_INIT, offset: 0x302E378, symbol: D_versus_302E378}
 
-D_versus_302ED4C:
+aVsSpaceJunk1Hitbox:
-  { type: SF64:HITBOX, offset: 0x302ED4C, symbol: D_versus_302ED4C}
+  { type: SF64:HITBOX, offset: 0x302ED4C, symbol: aVsSpaceJunk1Hitbox}
 
-D_versus_302ED98:
+aVsSpaceJunk2Hitbox:
-  { type: SF64:HITBOX, offset: 0x302ED98, symbol: D_versus_302ED98}
+  { type: SF64:HITBOX, offset: 0x302ED98, symbol: aVsSpaceJunk2Hitbox}
 
-D_versus_302EDB4:
+aVsSpaceJunk3Hitbox:
-  { type: SF64:HITBOX, offset: 0x302EDB4, symbol: D_versus_302EDB4}
+  { type: SF64:HITBOX, offset: 0x302EDB4, symbol: aVsSpaceJunk3Hitbox}
 
-D_versus_302EE00:
+aVsKaFlBaseHitbox:
-  { type: SF64:HITBOX, offset: 0x302EE00, symbol: D_versus_302EE00}
+  { type: SF64:HITBOX, offset: 0x302EE00, symbol: aVsKaFlBaseHitbox}
 
-D_versus_302EE64:
+aVsBuilding1Hibox:
-  { type: SF64:HITBOX, offset: 0x302EE64, symbol: D_versus_302EE64}
+  { type: SF64:HITBOX, offset: 0x302EE64, symbol: aVsBuilding1Hibox}
 
-D_versus_302EE80:
+aVsBuilding2Hibox:
-  { type: SF64:HITBOX, offset: 0x302EE80, symbol: D_versus_302EE80}
+  { type: SF64:HITBOX, offset: 0x302EE80, symbol: aVsBuilding2Hibox}
 
-D_versus_302EE9C:
+aVsArchHitbox:
-  { type: SF64:HITBOX, offset: 0x302EE9C, symbol: D_versus_302EE9C}
+  { type: SF64:HITBOX, offset: 0x302EE9C, symbol: aVsArchHitbox}
 
 D_versus_302EEE8:
   { type: SF64:TRIANGLE, count: 4, offset: 0x302EEE8, symbol: D_versus_302EEE8, mesh_symbol: D_versus_OFFSET}

assets/yaml/jp/rev0/ast_zoness.yaml

@@ -141,14 +141,14 @@ D_ZO_600E5EC:
 D_ZO_600E7D8:
   { type: SF64:SKELETON, offset: 0x600E7D8, symbol: D_ZO_600E7D8}
 
-D_ZO_600E820:
+aZoOilRig3DL:
-  { type: GFX, offset: 0x600E820, symbol: D_ZO_600E820}
+  { type: GFX, offset: 0x600E820, symbol: aZoOilRig3DL}
 
-D_ZO_600EC90:
+aZoOilRig2DL:
-  { type: GFX, offset: 0x600EC90, symbol: D_ZO_600EC90}
+  { type: GFX, offset: 0x600EC90, symbol: aZoOilRig2DL}
 
-D_ZO_600F560:
+aZoOilRig1DL:
-  { type: GFX, offset: 0x600F560, symbol: D_ZO_600F560}
+  { type: GFX, offset: 0x600F560, symbol: aZoOilRig1DL}
 
 D_ZO_600FE58:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x600FE58, symbol: D_ZO_600FE58}
@@ -225,8 +225,8 @@ D_ZO_6017810:
 D_ZO_60178B0:
   { type: GFX, offset: 0x60178B0, symbol: D_ZO_60178B0}
 
-D_ZO_6017950:
+aZoBallDL:
-  { type: GFX, offset: 0x6017950, symbol: D_ZO_6017950}
+  { type: GFX, offset: 0x6017950, symbol: aZoBallDL}
 
 D_ZO_60179D8:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x60179D8, symbol: D_ZO_60179D8}
@@ -366,8 +366,8 @@ D_ZO_601FBC4:
 D_ZO_601FC90:
   { type: SF64:SKELETON, offset: 0x601FC90, symbol: D_ZO_601FC90}
 
-D_ZO_601FCB0:
+aZoIslandDL:
-  { type: GFX, offset: 0x601FCB0, symbol: D_ZO_601FCB0}
+  { type: GFX, offset: 0x601FCB0, symbol: aZoIslandDL}
 
 D_ZO_60201B0:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x60201B0, symbol: D_ZO_60201B0}
@@ -471,8 +471,8 @@ D_ZO_6024220:
 D_ZO_60242B8:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x60242B8, symbol: D_ZO_60242B8}
 
-aZoRock1DL:
+aZoRockDL:
-  { type: GFX, offset: 0x6024AC0, symbol: aZoRock1DL}
+  { type: GFX, offset: 0x6024AC0, symbol: aZoRockDL}
 
 D_ZO_6024D60:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6024D60, symbol: D_ZO_6024D60}
@@ -502,59 +502,59 @@ D_ZO_602AC50:
 D_ZO_602AE94:
   { type: ARRAY, count: 242, array_type: Vec3f, offset: 0x602AE94, symbol: D_ZO_602AE94}
 
-aZoRock1Hitbox:
+aZoRockHitbox:
-  { type: SF64:HITBOX, offset: 0x602B9EC, symbol: aZoRock1Hitbox}
+  { type: SF64:HITBOX, offset: 0x602B9EC, symbol: aZoRockHitbox}
 
-D_ZO_602BA20:
+aZoOilRig1Hitbox:
-  { type: SF64:HITBOX, offset: 0x602BA20, symbol: D_ZO_602BA20}
+  { type: SF64:HITBOX, offset: 0x602BA20, symbol: aZoOilRig1Hitbox}
 
-D_ZO_602BAE4:
+aZoOilRig2Hitbox:
-  { type: SF64:HITBOX, offset: 0x602BAE4, symbol: D_ZO_602BAE4}
+  { type: SF64:HITBOX, offset: 0x602BAE4, symbol: aZoOilRig2Hitbox}
 
-D_ZO_602BBD8:
+aZoOilRig3Hitbox:
-  { type: SF64:HITBOX, offset: 0x602BBD8, symbol: D_ZO_602BBD8}
+  { type: SF64:HITBOX, offset: 0x602BBD8, symbol: aZoOilRig3Hitbox}
 
-D_ZO_602BC54:
+aZoIslandHitbox:
-  { type: SF64:HITBOX, offset: 0x602BC54, symbol: D_ZO_602BC54}
+  { type: SF64:HITBOX, offset: 0x602BC54, symbol: aZoIslandHitbox}
 
-D_ZO_602BC58:
+aZoDodoraHitbox:
-  { type: SF64:HITBOX, offset: 0x602BC58, symbol: D_ZO_602BC58}
+  { type: SF64:HITBOX, offset: 0x602BC58, symbol: aZoDodoraHitbox}
 
-D_ZO_602BE3C:
+aZoTroikaHitbox:
-  { type: SF64:HITBOX, offset: 0x602BE3C, symbol: D_ZO_602BE3C}
+  { type: SF64:HITBOX, offset: 0x602BE3C, symbol: aZoTroikaHitbox}
 
-D_ZO_602BE58:
+aZoObnemaHitbox:
-  { type: SF64:HITBOX, offset: 0x602BE58, symbol: D_ZO_602BE58}
+  { type: SF64:HITBOX, offset: 0x602BE58, symbol: aZoObnemaHitbox}
 
-D_ZO_602BFC4:
+aZoBarrierHitbox:
-  { type: SF64:HITBOX, offset: 0x602BFC4, symbol: D_ZO_602BFC4}
+  { type: SF64:HITBOX, offset: 0x602BFC4, symbol: aZoBarrierHitbox}
 
 D_ZO_602C028:
   { type: SF64:HITBOX, offset: 0x602C028, symbol: D_ZO_602C028}
 
-D_ZO_602C044:
+aZoSarumarineHitbox:
-  { type: SF64:HITBOX, offset: 0x602C044, symbol: D_ZO_602C044}
+  { type: SF64:HITBOX, offset: 0x602C044, symbol: aZoSarumarineHitbox}
 
 D_ZO_602C1A0:
   { type: SF64:HITBOX, offset: 0x602C1A0, symbol: D_ZO_602C1A0}
 
-D_ZO_602C1D4:
+aZoCargoShipHitbox:
-  { type: SF64:HITBOX, offset: 0x602C1D4, symbol: D_ZO_602C1D4}
+  { type: SF64:HITBOX, offset: 0x602C1D4, symbol: aZoCargoShipHitbox}
 
-D_ZO_602C218:
+aZoContainerHitbox:
-  { type: SF64:HITBOX, offset: 0x602C218, symbol: D_ZO_602C218}
+  { type: SF64:HITBOX, offset: 0x602C218, symbol: aZoContainerHitbox}
 
-D_ZO_602C234:
+aZoRadarBuoyHitbox:
-  { type: SF64:HITBOX, offset: 0x602C234, symbol: D_ZO_602C234}
+  { type: SF64:HITBOX, offset: 0x602C234, symbol: aZoRadarBuoyHitbox}
 
-D_ZO_602C250:
+aZoSupplyCraneHitbox:
-  { type: SF64:HITBOX, offset: 0x602C250, symbol: D_ZO_602C250}
+  { type: SF64:HITBOX, offset: 0x602C250, symbol: aZoSupplyCraneHitbox}
 
-D_ZO_602C294:
+aZoBirdHitbox:
-  { type: SF64:HITBOX, offset: 0x602C294, symbol: D_ZO_602C294}
+  { type: SF64:HITBOX, offset: 0x602C294, symbol: aZoBirdHitbox}
 
-D_ZO_602C2B0:
+aZoSearchLightHitbox:
-  { type: SF64:HITBOX, offset: 0x602C2B0, symbol: D_ZO_602C2B0}
+  { type: SF64:HITBOX, offset: 0x602C2B0, symbol: aZoSearchLightHitbox}
 
 D_ZO_602C2CC:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x602C2CC, symbol: D_ZO_602C2CC}

assets/yaml/us/rev1/ast_7_ti_1.yaml

@@ -89,8 +89,8 @@ D_TI1_7005420:
 D_TI1_70067C4:
   { type: SF64:ANIM, offset: 0x70067C4, symbol: D_TI1_70067C4 }
 
-D_TI1_7006990:
+aTi1DesertCrawlerSkel:
-  { type: SF64:SKELETON, offset: 0x7006990, symbol: D_TI1_7006990}
+  { type: SF64:SKELETON, offset: 0x7006990, symbol: aTi1DesertCrawlerSkel}
 
 D_TI1_7006F74:
   { type: SF64:ANIM, offset: 0x7006F74, symbol: D_TI1_7006F74 }
@@ -146,8 +146,8 @@ D_TI1_7009510:
 D_TI1_70096D8:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x070096D8, symbol: D_TI1_70096D8 }
 
-D_TI1_70098E0:
+aTiDelphorDL:
-  { type: GFX, offset: 0x70098E0, symbol: D_TI1_70098E0 }
+  { type: GFX, offset: 0x70098E0, symbol: aTiDelphorDL }
 
 D_TI1_7009B58:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x07009B58, symbol: D_TI1_7009B58 }
@@ -158,8 +158,8 @@ D_TI1_7009D60:
 D_TI1_700A190:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0700A190, symbol: D_TI1_700A190 }
 
-D_TI1_700A990:
+aTi1BombDL:
-  { type: GFX, offset: 0x700A990, symbol: D_TI1_700A990 }
+  { type: GFX, offset: 0x700A990, symbol: aTi1BombDL }
 
 D_TI1_700AAD8:
   { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x700AAD8, symbol: D_TI1_700AAD8, tlut: 0x700AB58 }
@@ -167,8 +167,8 @@ D_TI1_700AAD8:
 D_TI1_700AB58:
   { type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0x700AB58, symbol: D_TI1_700AB58 }
 
-D_TI1_700AB70:
+aTi1LandmineDL:
-  { type: GFX, offset: 0x700AB70, symbol: D_TI1_700AB70 }
+  { type: GFX, offset: 0x700AB70, symbol: aTi1LandmineDL }
 
 D_TI1_700AEA8:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x0700AEA8, symbol: D_TI1_700AEA8 }
@@ -188,8 +188,8 @@ D_TI1_700B9C0:
 D_TI1_700BB10:
   { type: GFX, offset: 0x700BB10, symbol: D_TI1_700BB10 }
 
-D_TI1_700BE00:
+aTiBridgeDL:
-  { type: GFX, offset: 0x700BE00, symbol: D_TI1_700BE00 }
+  { type: GFX, offset: 0x700BE00, symbol: aTiBridgeDL }
 
 D_TI1_700BFB0:
   { type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x0700BFB0, symbol: D_TI1_700BFB0, tlut: 0x0700C3B0 }
@@ -200,11 +200,11 @@ D_TI1_700C3B0:
 D_TI1_700C4B0:
   { type: GFX, offset: 0x700C4B0, symbol: D_TI1_700C4B0 }
 
-D_TI1_700C8D8:
+aTi1DesertRoverAnim:
-  { type: SF64:ANIM, offset: 0x700C8D8, symbol: D_TI1_700C8D8 }
+  { type: SF64:ANIM, offset: 0x700C8D8, symbol: aTi1DesertRoverAnim }
 
-D_TI1_700C964:
+aTi1DesertRoverSkel:
-  { type: SF64:SKELETON, offset: 0x700C964, symbol: D_TI1_700C964 }
+  { type: SF64:SKELETON, offset: 0x700C964, symbol: aTi1DesertRoverSkel }
 
 D_TI1_700C980:
   { type: GFX, offset: 0x700C980, symbol: D_TI1_700C980 }
@@ -218,8 +218,8 @@ D_TI1_700CB60:
 D_TI1_700D534:
   { type: SF64:ANIM, offset: 0x700D534, symbol: D_TI1_700D534 }
 
-D_TI1_700D700:
+aTiRascoSkel:
-  {type: SF64:SKELETON, offset: 0x700D700, symbol: D_TI1_700D700}
+  {type: SF64:SKELETON, offset: 0x700D700, symbol: aTiRascoSkel}
 
 D_TI1_700D740:
   { type: GFX, offset: 0x700D740, symbol: D_TI1_700D740 }

assets/yaml/us/rev1/ast_allies.yaml

@@ -8,8 +8,8 @@
       - '#include "gfx.h"'
       - '#include "sf64object.h"'
 
-D_D000000:
+aKattMarkDL:
-  { type: GFX, offset: 0xD000000, symbol: D_D000000 }
+  { type: GFX, offset: 0xD000000, symbol: aKattMarkDL }
 
 ast_allies_seg13_vtx_00000098:
   { type: VTX, count: 3, offset: 0x0D000098, symbol: ast_allies_seg13_vtx_00000098 }
@@ -17,11 +17,11 @@ ast_allies_seg13_vtx_00000098:
 D_D0000C8:
   { type: BLOB, size: 0x18, offset: 0x0D0000C8, symbol: D_D0000C8 }
 
-D_D0000E0:
+aKattMarkTex:
-  { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x0D0000E0, symbol: D_D0000E0, tlut: 0x0D000160 }
+  { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x0D0000E0, symbol: aKattMarkTex, tlut: 0x0D000160 }
 
-D_D000160:
+aKattMarkTLUT:
-  { type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0xD000160, symbol: D_D000160 }
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0xD000160, symbol: aKattMarkTLUT }
 
 D_D000170:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0xD000170, symbol: D_D000170 }
@@ -77,25 +77,25 @@ D_D00AFB8:
 D_D00B3B8:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0D00B3B8, symbol: D_D00B3B8 }
 
-D_D00B5C0:
+aBillMarkDL:
-  { type: GFX, offset: 0xD00B5C0, symbol: D_D00B5C0 }
+  { type: GFX, offset: 0xD00B5C0, symbol: aBillMarkDL }
 
 # Letter B
-D_D00B688:
+aBillMarkTex:
-  { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x0D00B688, symbol: D_D00B688, tlut: 0xD00B708 }
+  { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x0D00B688, symbol: aBillMarkTex, tlut: 0xD00B708 }
 
-D_D00B708:
+aBillMarkTLUT:
-  { type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0xD00B708, symbol: D_D00B708 }
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0xD00B708, symbol: aBillMarkTLUT }
 
-D_D00B720:
+aJamesMarkDL:
-  { type: GFX, offset: 0xD00B720, symbol: D_D00B720 }
+  { type: GFX, offset: 0xD00B720, symbol: aJamesMarkDL }
 
 # Letter J ?
-D_D00B7F0:
+aJamesMarkTex:
-  { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x0D00B7F0, symbol: D_D00B7F0, tlut: 0xD00B870 }
+  { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x0D00B7F0, symbol: aJamesMarkTex, tlut: 0xD00B870 }
 
-D_D00B870:
+aJamesMarkTLUT:
-  { type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0xD00B870, symbol: D_D00B870 }
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0xD00B870, symbol: aJamesMarkTLUT }
 
 D_D00B880:
   { type: GFX, offset: 0xD00B880, symbol: D_D00B880 }

assets/yaml/us/rev1/ast_andross.yaml

@@ -232,8 +232,8 @@ D_ANDROSS_C038860:
 D_ANDROSS_C038954:
   {type: SF64:HITBOX, offset: 0xC038954, symbol: D_ANDROSS_C038954}
 
-D_ANDROSS_C038A48:
+aAndDoorHitbox:
-  {type: SF64:HITBOX, offset: 0xC038A48, symbol: D_ANDROSS_C038A48}
+  {type: SF64:HITBOX, offset: 0xC038A48, symbol: aAndDoorHitbox}
 
 D_ANDROSS_C038AC4:
   {type: SF64:HITBOX, offset: 0xC038AC4, symbol: D_ANDROSS_C038AC4}
@@ -241,20 +241,20 @@ D_ANDROSS_C038AC4:
 D_ANDROSS_C038B40:
   {type: SF64:HITBOX, offset: 0xC038B40, symbol: D_ANDROSS_C038B40}
 
-D_ANDROSS_C038BA4:
+aAndPathIntersectionHitbox:
-  {type: SF64:HITBOX, offset: 0xC038BA4, symbol: D_ANDROSS_C038BA4}
+  {type: SF64:HITBOX, offset: 0xC038BA4, symbol: aAndPathIntersectionHitbox}
 
-D_ANDROSS_C038BD8:
+aAndPassageHitbox:
-  {type: SF64:HITBOX, offset: 0xC038BD8, symbol: D_ANDROSS_C038BD8}
+  {type: SF64:HITBOX, offset: 0xC038BD8, symbol: aAndPassageHitbox}
 
 D_ANDROSS_C038CCC:
   {type: SF64:HITBOX, offset: 0xC038CCC, symbol: D_ANDROSS_C038CCC}
 
-D_ANDROSS_C038DC0:
+aAndAndrossHitbox:
-  {type: SF64:HITBOX, offset: 0xC038DC0, symbol: D_ANDROSS_C038DC0}
+  {type: SF64:HITBOX, offset: 0xC038DC0, symbol: aAndAndrossHitbox}
 
-D_ANDROSS_C038F24:
+aAndBrainHitbox:
-  {type: SF64:HITBOX, offset: 0xC038F24, symbol: D_ANDROSS_C038F24}
+  {type: SF64:HITBOX, offset: 0xC038F24, symbol: aAndBrainHitbox}
 
 D_ANDROSS_C038FE8:
   {type: VTX, count: 34, offset: 0xC038FE8, symbol: D_ANDROSS_C038FE8}

assets/yaml/us/rev1/ast_aquas.yaml

@@ -35,8 +35,8 @@ D_AQ_6002874:
   { type: SF64:SKELETON, offset: 0x6002874, symbol: D_AQ_6002874 }
 
 # 
-D_AQ_6002C10:
+aAqOysterDL:
-  { type: GFX, offset: 0x6002C10, symbol: D_AQ_6002C10 }
+  { type: GFX, offset: 0x6002C10, symbol: aAqOysterDL }
 
 D_AQ_6002D58:
   { type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x6002D58, symbol: D_AQ_6002D58, tlut: 0x6003158 }
@@ -152,8 +152,8 @@ D_AQ_600BD20:
 D_AQ_600B518:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x600B518, symbol: D_AQ_600B518 }
 
-D_AQ_600BF80:
+aAqTunnel2DL:
-  { type: GFX, offset: 0x600BF80, symbol: D_AQ_600BF80 }
+  { type: GFX, offset: 0x600BF80, symbol: aAqTunnel2DL }
 
 D_AQ_600C530:
   { type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x600C530, symbol: D_AQ_600C530, tlut: 0x600C930 }
@@ -197,11 +197,11 @@ D_AQ_600E150:
 D_AQ_600E368:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x600E368, symbol: D_AQ_600E368 }
 
-D_AQ_600EE10:
+aAqWall1DL:
-  { type: GFX, offset: 0x600EE10, symbol: D_AQ_600EE10 }
+  { type: GFX, offset: 0x600EE10, symbol: aAqWall1DL }
 
-D_AQ_600EEF0:
+aAqBump2DL:
-  { type: GFX, offset: 0x600EEF0, symbol: D_AQ_600EEF0 }
+  { type: GFX, offset: 0x600EEF0, symbol: aAqBump2DL }
 
 D_AQ_600F030:
   { type: GFX, offset: 0x600F030, symbol: D_AQ_600F030 }
@@ -230,11 +230,11 @@ D_AQ_6011A78:
 D_AQ_6011CD8:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6011CD8, symbol: D_AQ_6011CD8 }
 
-D_AQ_6011EE0:
+aAqTunnel1DL:
-  { type: GFX, offset: 0x6011EE0, symbol: D_AQ_6011EE0 }
+  { type: GFX, offset: 0x6011EE0, symbol: aAqTunnel1DL }
 
-D_AQ_60120F0:
+aAqRoofDL:
-  { type: GFX, offset: 0x60120F0, symbol: D_AQ_60120F0 }
+  { type: GFX, offset: 0x60120F0, symbol: aAqRoofDL }
 
 D_AQ_60126A8:
   { type: TEXTURE, ctype: u8, format: CI8, width: 16, height: 64, offset: 0x60126A8, symbol: D_AQ_60126A8, tlut: 0x6012AA8 }
@@ -254,14 +254,14 @@ D_AQ_6012EA8:
 D_AQ_60132A8:
   { type: TEXTURE, ctype: u16, format: TLUT, colors: 240, offset: 0x60132A8, symbol: D_AQ_60132A8 }
 
-D_AQ_60135E0:
+aAqFishGroupAnim:
-  { type: SF64:ANIM, offset: 0x60135E0, symbol: D_AQ_60135E0 }
+  { type: SF64:ANIM, offset: 0x60135E0, symbol: aAqFishGroupAnim }
 
-D_AQ_60136CC:
+aAqFishGroupSkel1:
-  { type: SF64:SKELETON, offset: 0x60136CC, symbol: D_AQ_60136CC }
+  { type: SF64:SKELETON, offset: 0x60136CC, symbol: aAqFishGroupSkel1 }
 
-D_AQ_60137CC:
+aAqFishGroupSkel2:
-  { type: SF64:SKELETON, offset: 0x60137CC, symbol: D_AQ_60137CC }
+  { type: SF64:SKELETON, offset: 0x60137CC, symbol: aAqFishGroupSkel2 }
 
 D_AQ_60137F0:
   { type: GFX, offset: 0x60137F0, symbol: D_AQ_60137F0 }
@@ -275,11 +275,11 @@ D_AQ_6013EC0:
 D_AQ_6014030:
   { type: GFX, offset: 0x6014030, symbol: D_AQ_6014030 }
 
-D_AQ_6014438:
+aAqStoneColumnAnim:
-  { type: SF64:ANIM, offset: 0x6014438, symbol: D_AQ_6014438 }
+  { type: SF64:ANIM, offset: 0x6014438, symbol: aAqStoneColumnAnim }
 
-D_AQ_6014504:
+aAqStoneColumnSkel:
-  { type: SF64:SKELETON, offset: 0x6014504, symbol: D_AQ_6014504 }
+  { type: SF64:SKELETON, offset: 0x6014504, symbol: aAqStoneColumnSkel }
 
 D_AQ_6014520:
   { type: GFX, offset: 0x6014520, symbol: D_AQ_6014520 }
@@ -293,8 +293,8 @@ D_AQ_6014CD0:
 D_AQ_6014E50:
   { type: GFX, offset: 0x6014E50, symbol: D_AQ_6014E50 }
 
-D_AQ_6014FD0:
+aAqBoulderDL:
-  { type: GFX, offset: 0x6014FD0, symbol: D_AQ_6014FD0 }
+  { type: GFX, offset: 0x6014FD0, symbol: aAqBoulderDL }
 
 D_AQ_6015430:
   { type: GFX, offset: 0x6015430, symbol: D_AQ_6015430 }
@@ -305,8 +305,8 @@ D_AQ_60154F8:
 D_AQ_60155F8:
   { type: TEXTURE, ctype: u16, format: TLUT, colors: 152, offset: 0x60155F8, symbol: D_AQ_60155F8 }
 
-D_AQ_6015730:
+aAqArchDL:
-  { type: GFX, offset: 0x6015730, symbol: D_AQ_6015730 }
+  { type: GFX, offset: 0x6015730, symbol: aAqArchDL }
 
 D_AQ_6015DD0:
   { type: GFX, offset: 0x6015DD0, symbol: D_AQ_6015DD0 }
@@ -383,8 +383,8 @@ D_AQ_601D110:
 D_AQ_601DE50:
   { type: SF64:ANIM, offset: 0x601DE50, symbol: D_AQ_601DE50 }
 
-D_AQ_601DE60:
+aAqCoralReef2DL:
-  { type: GFX, offset: 0x601DE60, symbol: D_AQ_601DE60 }
+  { type: GFX, offset: 0x601DE60, symbol: aAqCoralReef2DL }
 
 D_AQ_601E1F0:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x601E1F0, symbol: D_AQ_601E1F0 }
@@ -392,11 +392,11 @@ D_AQ_601E1F0:
 D_AQ_601E9F0:
   { type: GFX, offset: 0x601E9F0, symbol: D_AQ_601E9F0 }
 
-D_AQ_601EC68:
+aAqCoralAnim:
-  { type: SF64:ANIM, offset: 0x601EC68, symbol: D_AQ_601EC68 }
+  { type: SF64:ANIM, offset: 0x601EC68, symbol: aAqCoralAnim }
 
-D_AQ_601EDB4:
+aAqCoralSkel:
-  { type: SF64:SKELETON, offset: 0x601EDB4, symbol: D_AQ_601EDB4 }
+  { type: SF64:SKELETON, offset: 0x601EDB4, symbol: aAqCoralSkel }
 
 D_AQ_601EDE0:
   { type: GFX, offset: 0x601EDE0, symbol: D_AQ_601EDE0 }
@@ -425,11 +425,11 @@ D_AQ_6021858:
 D_AQ_6021C58:
   { type: TEXTURE, ctype: u16, format: TLUT, colors: 232, offset: 0x6021C58, symbol: D_AQ_6021C58 }
 
-D_AQ_602201C:
+aAqOysterAnim:
-  { type: SF64:ANIM, offset: 0x602201C, symbol: D_AQ_602201C }
+  { type: SF64:ANIM, offset: 0x602201C, symbol: aAqOysterAnim }
 
-D_AQ_60220E8:
+aAqOysterSkel:
-  { type: SF64:SKELETON, offset: 0x60220E8, symbol: D_AQ_60220E8 }
+  { type: SF64:SKELETON, offset: 0x60220E8, symbol: aAqOysterSkel }
 
 D_AQ_6022110:
   { type: GFX, offset: 0x6022110, symbol: D_AQ_6022110 }
@@ -449,14 +449,14 @@ D_AQ_6022888:
 D_AQ_60229B8:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x60229B8, symbol: D_AQ_60229B8 }
 
-D_AQ_60231C0:
+aAqCoralReef1DL:
-  { type: GFX, offset: 0x60231C0, symbol: D_AQ_60231C0 }
+  { type: GFX, offset: 0x60231C0, symbol: aAqCoralReef1DL }
 
-D_AQ_6023780:
+aAqJellyfishAnim:
-  { type: SF64:ANIM, offset: 0x6023780, symbol: D_AQ_6023780 }
+  { type: SF64:ANIM, offset: 0x6023780, symbol: aAqJellyfishAnim }
 
-D_AQ_602390C:
+aAqJellyfishSkel:
-  { type: SF64:SKELETON, offset: 0x602390C, symbol: D_AQ_602390C }
+  { type: SF64:SKELETON, offset: 0x602390C, symbol: aAqJellyfishSkel }
 
 D_AQ_6023940:
   { type: GFX, offset: 0x6023940, symbol: D_AQ_6023940 }
@@ -482,8 +482,8 @@ D_AQ_6024938:
 D_AQ_60249C0:
   { type: GFX, offset: 0x60249C0, symbol: D_AQ_60249C0 }
 
-D_AQ_6024A50:
+aAqPearlDL:
-  { type: GFX, offset: 0x6024A50, symbol: D_AQ_6024A50 }
+  { type: GFX, offset: 0x6024A50, symbol: aAqPearlDL }
 
 D_AQ_6024F80:
   { type: SF64:ANIM, offset: 0x6024F80, symbol: D_AQ_6024F80 }
@@ -605,8 +605,8 @@ D_AQ_602AC40:
 D_AQ_602ACC0:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x602ACC0, symbol: D_AQ_602ACC0 }
 
-D_AQ_602B4C0:
+aAqRockDL:
-  { type: GFX, offset: 0x602B4C0, symbol: D_AQ_602B4C0 }
+  { type: GFX, offset: 0x602B4C0, symbol: aAqRockDL }
 
 D_AQ_602B9D4: # unused and possibly broken
  { type: SF64:ANIM, offset: 0x602B9D4, symbol: D_AQ_602B9D4 }
@@ -656,8 +656,8 @@ D_AQ_602E5C8:
 D_AQ_60308B8:
   { type: SF64:SCRIPT, offset: 0x60308B8, symbol: D_AQ_60308B8 }
 
-D_AQ_6030B10:
+aBoss301Hitbox:
-  { type: SF64:HITBOX, offset: 0x6030B10, symbol: D_AQ_6030B10 }
+  { type: SF64:HITBOX, offset: 0x6030B10, symbol: aBoss301Hitbox }
 
 D_AQ_6030B14_f32:
   { type: SF64:HITBOX, offset: 0x6030B14, symbol: D_AQ_6030B14_f32 }
@@ -674,8 +674,8 @@ D_AQ_6030B68:
 D_AQ_6030BAC:
   { type: SF64:HITBOX, offset: 0x6030BAC, symbol: D_AQ_6030BAC }
 
-D_AQ_6030BE0:
+aAqActor188Hitbox:
-  { type: SF64:HITBOX, offset: 0x6030BE0, symbol: D_AQ_6030BE0 }
+  { type: SF64:HITBOX, offset: 0x6030BE0, symbol: aAqActor188Hitbox }
 
 D_AQ_6030BFC:
   { type: SF64:HITBOX, offset: 0x6030BFC, symbol: D_AQ_6030BFC }
@@ -686,14 +686,14 @@ D_AQ_6030C18:
 D_AQ_6030C44:
   { type: SF64:HITBOX, offset: 0x6030C44, symbol: D_AQ_6030C44 }
 
-D_AQ_6030C60:
+aAqCoralReef1Hitbox:
-  { type: SF64:HITBOX, offset: 0x6030C60, symbol: D_AQ_6030C60 }
+  { type: SF64:HITBOX, offset: 0x6030C60, symbol: aAqCoralReef1Hitbox }
 
-D_AQ_6030C7C:
+aAqTunnel1Hitbox:
-  { type: SF64:HITBOX, offset: 0x6030C7C, symbol: D_AQ_6030C7C }
+  { type: SF64:HITBOX, offset: 0x6030C7C, symbol: aAqTunnel1Hitbox }
 
-D_AQ_6030D20:
+aAqStoneColumnHitbox:
-  { type: SF64:HITBOX, offset: 0x6030D20, symbol: D_AQ_6030D20 }
+  { type: SF64:HITBOX, offset: 0x6030D20, symbol: aAqStoneColumnHitbox }
 
 D_AQ_6030D3C:
   { type: SF64:HITBOX, offset: 0x6030D3C, symbol: D_AQ_6030D3C }
@@ -701,65 +701,65 @@ D_AQ_6030D3C:
 D_AQ_6030D58:
   { type: SF64:HITBOX, offset: 0x6030D58, symbol: D_AQ_6030D58 }
 
-D_AQ_6030D74:
+aAqArchHitbox:
-  { type: SF64:HITBOX, offset: 0x6030D74, symbol: D_AQ_6030D74 }
+  { type: SF64:HITBOX, offset: 0x6030D74, symbol: aAqArchHitbox }
 
-D_AQ_6030DF8:
+aAqCoralReef2Hitbox:
-  { type: SF64:HITBOX, offset: 0x6030DF8, symbol: D_AQ_6030DF8 }
+  { type: SF64:HITBOX, offset: 0x6030DF8, symbol: aAqCoralReef2Hitbox }
 
-D_AQ_6030E14:
+aAqRockHitbox:
-  { type: SF64:HITBOX, offset: 0x6030E14, symbol: D_AQ_6030E14 }
+  { type: SF64:HITBOX, offset: 0x6030E14, symbol: aAqRockHitbox }
 
-D_AQ_6030E30_Hitbox:
+aAqWall1Hitbox:
-  { type: SF64:HITBOX, offset: 0x6030E30, symbol: D_AQ_6030E30_Hitbox }
+  { type: SF64:HITBOX, offset: 0x6030E30, symbol: aAqWall1Hitbox }
 
-D_AQ_6030E4C:
+aAqRoofHitbox:
-  { type: SF64:HITBOX, offset: 0x6030E4C, symbol: D_AQ_6030E4C }
+  { type: SF64:HITBOX, offset: 0x6030E4C, symbol: aAqRoofHitbox }
 
-D_AQ_6030E68:
+aAqTunnel2Hitbox:
-  { type: SF64:HITBOX, offset: 0x6030E68, symbol: D_AQ_6030E68 }
+  { type: SF64:HITBOX, offset: 0x6030E68, symbol: aAqTunnel2Hitbox }
 
-D_AQ_6030F74:
+aAqBacoonHitbox:
-  { type: SF64:HITBOX, offset: 0x6030F74, symbol: D_AQ_6030F74 }
+  { type: SF64:HITBOX, offset: 0x6030F74, symbol: aAqBacoonHitbox }
 
-D_AQ_6031398:
+aAqAnglerFishHitbox:
-  { type: SF64:HITBOX, offset: 0x6031398, symbol: D_AQ_6031398 }
+  { type: SF64:HITBOX, offset: 0x6031398, symbol: aAqAnglerFishHitbox }
 
-D_AQ_60313CC:
+aAqGaroaHitbox:
-  { type: SF64:HITBOX, offset: 0x60313CC, symbol: D_AQ_60313CC }
+  { type: SF64:HITBOX, offset: 0x60313CC, symbol: aAqGaroaHitbox }
 
-D_AQ_6031400:
+aAqSculpinHitbox:
-  { type: SF64:HITBOX, offset: 0x6031400, symbol: D_AQ_6031400 }
+  { type: SF64:HITBOX, offset: 0x6031400, symbol: aAqSculpinHitbox }
 
-D_AQ_603144C:
+aAqSpindlyFishHitbox:
-  { type: SF64:HITBOX, offset: 0x603144C, symbol: D_AQ_603144C }
+  { type: SF64:HITBOX, offset: 0x603144C, symbol: aAqSpindlyFishHitbox }
 
-D_AQ_6031480:
+aAqSquidHitbox:
-  { type: SF64:HITBOX, offset: 0x6031480, symbol: D_AQ_6031480 }
+  { type: SF64:HITBOX, offset: 0x6031480, symbol: aAqSquidHitbox }
 
 D_AQ_60314AC:
   { type: SF64:HITBOX, offset: 0x60314AC, symbol: D_AQ_60314AC }
 
-D_AQ_60314C8:
+aAqOysterHitbox:
-  { type: SF64:HITBOX, offset: 0x60314C8, symbol: D_AQ_60314C8 }
+  { type: SF64:HITBOX, offset: 0x60314C8, symbol: aAqOysterHitbox }
 
 D_AQ_60314E4:
   { type: SF64:HITBOX, offset: 0x60314E4, symbol: D_AQ_60314E4 }
 
-D_AQ_6031500:
+aAqBoulderHitbox:
-  { type: SF64:HITBOX, offset: 0x6031500, symbol: D_AQ_6031500 }
+  { type: SF64:HITBOX, offset: 0x6031500, symbol: aAqBoulderHitbox }
 
 D_AQ_603151C:
   { type: SF64:HITBOX, offset: 0x603151C, symbol: D_AQ_603151C }
 
-D_AQ_6031538:
+aAqCoralHitbox:
-  { type: SF64:HITBOX, offset: 0x6031538, symbol: D_AQ_6031538 }
+  { type: SF64:HITBOX, offset: 0x6031538, symbol: aAqCoralHitbox }
 
-D_AQ_6031554:
+aAqJellyfishHitbox:
-  { type: SF64:HITBOX, offset: 0x6031554, symbol: D_AQ_6031554 }
+  { type: SF64:HITBOX, offset: 0x6031554, symbol: aAqJellyfishHitbox }
 
-D_AQ_6031570:
+aAqFishGroupHitbox:
-  { type: SF64:HITBOX, offset: 0x6031570, symbol: D_AQ_6031570 }
+  { type: SF64:HITBOX, offset: 0x6031570, symbol: aAqFishGroupHitbox }
 
 D_AQ_603158C:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x603158C, symbol: D_AQ_603158C }

assets/yaml/us/rev1/ast_area_6.yaml

@@ -237,8 +237,8 @@ D_A6_6028254:
 D_A6_60282A0:
   { type: SF64:HITBOX, offset: 0x60282A0, symbol: D_A6_60282A0 }
 
-D_A6_6028454:
+aA6GorgonHitbox:
-  { type: SF64:HITBOX, offset: 0x6028454, symbol: D_A6_6028454 }
+  { type: SF64:HITBOX, offset: 0x6028454, symbol: aA6GorgonHitbox }
 
 D_A6_6028578:
   { type: SF64:HITBOX, offset: 0x6028578, symbol: D_A6_6028578 }

assets/yaml/us/rev1/ast_arwing.yaml

@@ -179,8 +179,8 @@ D_arwing_3018348:
 D_arwing_30183D0:
   { type: GFX, offset: 0x30183D0, symbol: D_arwing_30183D0 }
 
-D_arwing_30184D8:
+aWindshieldClouldReflextionTex:
-  { type: TEXTURE, format: RGBA16, offset: 0x30184D8, width: 32, height: 32, ctype: u16, symbol: D_arwing_30184D8 }
+  { type: TEXTURE, format: RGBA16, offset: 0x30184D8, width: 32, height: 32, ctype: u16, symbol: aWindshieldClouldReflextionTex }
 
 D_arwing_3018CD8:
   { type: TEXTURE, format: RGBA16, offset: 0x3018CD8, width: 64, height: 16, ctype: u16, symbol: D_arwing_3018CD8 }

assets/yaml/us/rev1/ast_bolse.yaml

@@ -115,8 +115,8 @@ D_BO_600AB90:
 D_BO_600AD80:
   { type: TEXTURE, format: RGBA16, offset: 0x0600AD80, width: 32, height: 32, ctype: u16, symbol: D_BO_600AD80 }
 
-D_BO_600B8B0:
+aBoBuildingDL:
-  { type: GFX, offset: 0x600B8B0, symbol: D_BO_600B8B0 }
+  { type: GFX, offset: 0x600B8B0, symbol: aBoBuildingDL }
 
 D_BO_600BAA0:
   { type: GFX, offset: 0x600BAA0, symbol: D_BO_600BAA0 }
@@ -133,11 +133,11 @@ D_BO_600C0B8:
 D_BO_600C2D8:
   { type: TEXTURE, format: IA8, offset: 0x0600C2D8, width: 32, height: 16, ctype: u8, symbol: D_BO_600C2D8 }
 
-D_BO_600C4E0:
+aBoBaseShieldDL:
-  { type: GFX, offset: 0x600C4E0, symbol: D_BO_600C4E0 }
+  { type: GFX, offset: 0x600C4E0, symbol: aBoBaseShieldDL }
 
-D_BO_600CF88:
+aBoBaseShieldTex:
-  { type: TEXTURE, format: RGBA16, offset: 0x0600CF88, width: 16, height: 16, ctype: u16, symbol: D_BO_600CF88 }
+  { type: TEXTURE, format: RGBA16, offset: 0x0600CF88, width: 16, height: 16, ctype: u16, symbol: aBoBaseShieldTex }
 
 D_BO_600D190:
   { type: GFX, offset: 0x600D190, symbol: D_BO_600D190 }
@@ -148,20 +148,20 @@ D_BO_600D2A0:
 D_BO_600E2A0:
   { type: TEXTURE, format: RGBA16, offset: 0x0600E2A0, width: 32, height: 64, ctype: u16, symbol: D_BO_600E2A0 }
 
-D_BO_600F2E0:
+aBoLaserCannonAnim:
-  { type: SF64:ANIM, offset: 0x600F2E0, symbol: D_BO_600F2E0 }
+  { type: SF64:ANIM, offset: 0x600F2E0, symbol: aBoLaserCannonAnim }
     
-D_BO_600F36C: 
+aBoLaserCannonSkel: 
-  { type: SF64:SKELETON, offset: 0x600F36C, symbol: D_BO_600F36C }
+  { type: SF64:SKELETON, offset: 0x600F36C, symbol: aBoLaserCannonSkel }
 
-D_BO_600F3D8:
+aBoShieldReactorAnim:
-  { type: SF64:ANIM, offset: 0x600F3D8, symbol: D_BO_600F3D8 }
+  { type: SF64:ANIM, offset: 0x600F3D8, symbol: aBoShieldReactorAnim }
     
-D_BO_600F4A4:
+aBoShieldReactorSkel:
-  { type: SF64:SKELETON, offset: 0x600F4A4, symbol: D_BO_600F4A4 }
+  { type: SF64:SKELETON, offset: 0x600F4A4, symbol: aBoShieldReactorSkel }
 
-D_BO_600F4C0:
+aBoPoleDL:
-  { type: GFX, offset: 0x600F4C0, symbol: D_BO_600F4C0 }
+  { type: GFX, offset: 0x600F4C0, symbol: aBoPoleDL }
 
 D_BO_600F728:
   { type: TEXTURE, format: RGBA16, offset: 0x0600F728, width: 32, height: 32, ctype: u16, symbol: D_BO_600F728 }
@@ -178,23 +178,23 @@ D_BO_6010294:
 D_BO_6011B20:
   { type: SF64:HITBOX, offset: 0x6011B20, symbol: D_BO_6011B20 }
 
-D_BO_6011B24:
+aBoShieldReactorHitbox:
-  { type: SF64:HITBOX, offset: 0x6011B24, symbol: D_BO_6011B24 }
+  { type: SF64:HITBOX, offset: 0x6011B24, symbol: aBoShieldReactorHitbox }
 
 D_BO_6011BA4:
   { type: SF64:HITBOX, offset: 0x6011BA4, symbol: D_BO_6011BA4 }
 
-D_BO_6011BF4:
+aBoLaserCannonHitbox:
-  { type: SF64:HITBOX, offset: 0x6011BF4, symbol: D_BO_6011BF4 }
+  { type: SF64:HITBOX, offset: 0x6011BF4, symbol: aBoLaserCannonHitbox }
 
-D_BO_6011C10:
+aBoPoleHitbox:
-  { type: SF64:HITBOX, offset: 0x6011C10, symbol: D_BO_6011C10 }
+  { type: SF64:HITBOX, offset: 0x6011C10, symbol: aBoPoleHitbox }
 
-D_BO_6011C48:
+aBoBuildingHitbox:
-  { type: SF64:HITBOX, offset: 0x6011C48, symbol: D_BO_6011C48 }
+  { type: SF64:HITBOX, offset: 0x6011C48, symbol: aBoBuildingHitbox }
 
-D_BO_6011C80:
+aBoBaseCoreHitbox:
-  { type: SF64:HITBOX, offset: 0x6011C80, symbol: D_BO_6011C80 }
+  { type: SF64:HITBOX, offset: 0x6011C80, symbol: aBoBaseCoreHitbox }
 
 D_BO_6011E28:
   { type: VTX, count: 34, offset: 0x6011E28, symbol: D_BO_6011E28 }

assets/yaml/us/rev1/ast_common.yaml

@@ -695,11 +695,11 @@ D_101CBC0:
 D_101CCC0:
   { type: TEXTURE, format: TLUT, colors: 88, offset: 0x101CCC0, ctype: u16, symbol: D_101CCC0 }
 
-D_101CD70:
+aUnusedShieldDL:
-  { type: GFX, offset: 0x101CD70, symbol: D_101CD70 }
+  { type: GFX, offset: 0x101CD70, symbol: aUnusedShieldDL }
 
-D_101D070:
+aUnusedShieldTex:
-  { type: TEXTURE, format: RGBA16, width: 32, height: 32, ctype: u16, offset: 0x101D070, symbol: D_101D070 }
+  { type: TEXTURE, format: RGBA16, width: 32, height: 32, ctype: u16, offset: 0x101D070, symbol: aUnusedShieldTex }
 
 D_101D870:
   { type: GFX, offset: 0x101D870, symbol: D_101D870 }
@@ -710,8 +710,8 @@ ast_common_seg1_vtx_1D9C8:
 D_101DE20:
   { type: TEXTURE, format: IA8, width: 128, height: 32, ctype: u8, offset: 0x101DE20, symbol: D_101DE20 }
 
-D_101DC10:
+aBarrelRollTex:
-  { type: GFX, offset: 0x101DC10, symbol: D_101DC10 }
+  { type: GFX, offset: 0x101DC10, symbol: aBarrelRollTex }
 
 D_101EE20:
   { type: TEXTURE, format: IA8, width: 128, height: 32, ctype: u8, offset: 0x101EE20, symbol: D_101EE20 }
@@ -806,32 +806,32 @@ D_1024230:
 D_1024290:
   { type: GFX, offset: 0x1024290, symbol: D_1024290 }
 
-D_1024410:
+aPeppyMarkDL:
-  { type: GFX, offset: 0x1024410, symbol: D_1024410 }
+  { type: GFX, offset: 0x1024410, symbol: aPeppyMarkDL }
 
-D_10244D8:
+aPeppyMarkTex:
-  { type: TEXTURE, format: CI4, width: 16, height: 16, ctype: u8, offset: 0x10244D8, tlut: 0x1024558, symbol: D_10244D8 }
+  { type: TEXTURE, format: CI4, width: 16, height: 16, ctype: u8, offset: 0x10244D8, tlut: 0x1024558, symbol: aPeppyMarkTex }
 
-D_1024558:
+aPeppyMarkTLUT:
-  { type: TEXTURE, format: TLUT, colors: 12, offset: 0x1024558, ctype: u16, symbol: D_1024558 }
+  { type: TEXTURE, format: TLUT, colors: 12, offset: 0x1024558, ctype: u16, symbol: aPeppyMarkTLUT }
 
-D_1024570:
+aFalcoMarkDL:
-  { type: GFX, offset: 0x1024570, symbol: D_1024570 }
+  { type: GFX, offset: 0x1024570, symbol: aFalcoMarkDL }
 
-D_1024638:
+aFalcoMarkTex:
-  { type: TEXTURE, format: CI4, width: 16, height: 16, ctype: u8, offset: 0x1024638, tlut: 0x10246B8, symbol: D_1024638 }
+  { type: TEXTURE, format: CI4, width: 16, height: 16, ctype: u8, offset: 0x1024638, tlut: 0x10246B8, symbol: aFalcoMarkTex }
 
-D_10246B8:
+aFalcoMarkTLUT:
-  { type: TEXTURE, format: TLUT, colors: 12, offset: 0x10246B8, ctype: u16, symbol: D_10246B8 }
+  { type: TEXTURE, format: TLUT, colors: 12, offset: 0x10246B8, ctype: u16, symbol: aFalcoMarkTLUT }
 
-D_10246D0:
+aSlippyMarkDL:
-  { type: GFX, offset: 0x10246D0, symbol: D_10246D0 }
+  { type: GFX, offset: 0x10246D0, symbol: aSlippyMarkDL }
 
-D_1024798:
+aSlippyMarkTex:
-  { type: TEXTURE, format: CI4, width: 16, height: 16, ctype: u8, offset: 0x1024798, tlut: 0x1024818, symbol: D_1024798 }
+  { type: TEXTURE, format: CI4, width: 16, height: 16, ctype: u8, offset: 0x1024798, tlut: 0x1024818, symbol: aSlippyMarkTex }
 
-D_1024818:
+aSlippyMarkTLUT:
-  { type: TEXTURE, format: TLUT, colors: 12, offset: 0x1024818, ctype: u16, symbol: D_1024818 }
+  { type: TEXTURE, format: TLUT, colors: 12, offset: 0x1024818, ctype: u16, symbol: aSlippyMarkTLUT }
 
 D_1024830:
   { type: GFX, offset: 0x1024830, symbol: D_1024830 }

assets/yaml/us/rev1/ast_corneria.yaml

@@ -303,20 +303,20 @@ D_CO_602AA7C:
 aCoDoorsSkel: 
   { type: SF64:SKELETON, offset: 0x602AB48, symbol: aCoDoorsSkel }
 
-D_CO_602BC18:
+aCoGrangaWalkingAnim:
-  { type: SF64:ANIM, offset: 0x602BC18, symbol: D_CO_602BC18 }
+  { type: SF64:ANIM, offset: 0x602BC18, symbol: aCoGrangaWalkingAnim }
   
 D_CO_602BE64: 
   { type: SF64:SKELETON, offset: 0x602BE64, symbol: D_CO_602BE64 }
 
-D_CO_602C0D0:
+aCoGrangaStationaryAnim:
-  { type: SF64:ANIM, offset: 0x602C0D0, symbol: D_CO_602C0D0 }
+  { type: SF64:ANIM, offset: 0x602C0D0, symbol: aCoGrangaStationaryAnim }
 
 D_CO_602D31C: 
   { type: SF64:ANIM, offset: 0x602D31C, symbol: D_CO_602D31C }
 
-D_CO_602D400:
+aCoCarrierAnim:
-  { type: SF64:ANIM, offset: 0x602D400, symbol: D_CO_602D400 }
+  { type: SF64:ANIM, offset: 0x602D400, symbol: aCoCarrierAnim }
   
 aCoCarrierSkel:
   { type: SF64:SKELETON, offset: 0x602D5AC, symbol: aCoCarrierSkel }
@@ -522,14 +522,14 @@ aCoBuilding10Hitbox:
 aCoIBeamHitbox:
   { type: SF64:HITBOX, offset: 0x603E514, symbol: aCoIBeamHitbox }
 
-D_CO_603E54C:
+aCoActorSkibotHitbox:
-  { type: SF64:HITBOX, offset: 0x603E54C, symbol: D_CO_603E54C }
+  { type: SF64:HITBOX, offset: 0x603E54C, symbol: aCoActorSkibotHitbox }
 
-D_CO_603E598:
+aCoActorRadarHitbox:
-  { type: SF64:HITBOX, offset: 0x603E598, symbol: D_CO_603E598 }
+  { type: SF64:HITBOX, offset: 0x603E598, symbol: aCoActorRadarHitbox }
 
-D_CO_603E5B4:
+aCoMoleMissileHitbox:
-  { type: SF64:HITBOX, offset: 0x603E5B4, symbol: D_CO_603E5B4 }
+  { type: SF64:HITBOX, offset: 0x603E5B4, symbol: aCoMoleMissileHitbox }
 
 CoGarudaHitbox:
   { type: SF64:HITBOX, offset: 0x603E5D0, symbol: CoGarudaHitbox }
@@ -540,14 +540,14 @@ aCoGarudaDestroyHitbox:
 aCoGrangaHitbox:
   { type: SF64:HITBOX, offset: 0x603E620, symbol: aCoGrangaHitbox }
 
-D_CO_603E714:
+aCoCarrierLeftHitbox:
-  { type: SF64:HITBOX, offset: 0x603E714, symbol: D_CO_603E714 }
+  { type: SF64:HITBOX, offset: 0x603E714, symbol: aCoCarrierLeftHitbox }
 
-D_CO_603E748:
+aCoCarrierUpperHitbox:
-  { type: SF64:HITBOX, offset: 0x603E748, symbol: D_CO_603E748 }
+  { type: SF64:HITBOX, offset: 0x603E748, symbol: aCoCarrierUpperHitbox }
 
-D_CO_603E7C4:
+aCoCarrierBottomHitbox:
-  { type: SF64:HITBOX, offset: 0x603E7C4, symbol: D_CO_603E7C4 }
+  { type: SF64:HITBOX, offset: 0x603E7C4, symbol: aCoCarrierBottomHitbox }
 
 aCoCarrierHitbox:
   { type: SF64:HITBOX, offset: 0x603E840, symbol: aCoCarrierHitbox }

assets/yaml/us/rev1/ast_fortuna.yaml

@@ -62,11 +62,11 @@ D_FO_6006120:
 D_FO_6006220:
   { type: TEXTURE, format: TLUT, colors: 120, offset: 0x6006220, ctype: u16, symbol: D_FO_6006220 }
 
-D_FO_6006310:
+aFoMountain3DL:
-  { type: GFX, offset: 0x6006310, symbol: D_FO_6006310 }
+  { type: GFX, offset: 0x6006310, symbol: aFoMountain3DL }
 
-D_FO_60066E0:
+aFoTowerDL:
-  { type: GFX, offset: 0x60066E0, symbol: D_FO_60066E0 }
+  { type: GFX, offset: 0x60066E0, symbol: aFoTowerDL }
 
 ast_fortuna_seg6_vtx_6898:
   { type: VTX, count: 52, offset: 0x6006898, symbol: ast_fortuna_seg6_vtx_6898 }
@@ -92,17 +92,17 @@ D_FO_6007590:
 D_FO_6007730:
   { type: GFX, offset: 0x6007730, symbol: D_FO_6007730 }
 
-D_FO_6007854:
+aFoRadarAnim:
-  { type: SF64:ANIM, offset: 0x6007854, symbol: D_FO_6007854 }
+  { type: SF64:ANIM, offset: 0x6007854, symbol: aFoRadarAnim }
 
-D_FO_6007980:
+aFoRadarSkel:
-  { type: SF64:SKELETON, offset: 0x6007980, symbol: D_FO_6007980 }
+  { type: SF64:SKELETON, offset: 0x6007980, symbol: aFoRadarSkel }
 
-D_FO_60079B0:
+aFoMountain1DL:
-  { type: GFX, offset: 0x60079B0, symbol: D_FO_60079B0 }
+  { type: GFX, offset: 0x60079B0, symbol: aFoMountain1DL }
 
-D_FO_6007D80:
+aFoMountain2DL:
-  { type: GFX, offset: 0x6007D80, symbol: D_FO_6007D80 }
+  { type: GFX, offset: 0x6007D80, symbol: aFoMountain2DL }
 
 D_FO_6008150:
   { type: TEXTURE, format: RGBA16, width: 44, height: 44, offset: 0x6008150, ctype: u16, symbol: D_FO_6008150 }
@@ -161,8 +161,8 @@ D_FO_600F60C:
 aFoPoleHitbox:
   { type: SF64:HITBOX, offset: 0x600FE9C, symbol: aFoPoleHitbox }
 
-D_FO_600FEB8:
+aFoTowerHitbox:
-  { type: SF64:HITBOX, offset: 0x600FEB8, symbol: D_FO_600FEB8 }
+  { type: SF64:HITBOX, offset: 0x600FEB8, symbol: aFoTowerHitbox }
 
 aFoRadarHitbox:
   { type: SF64:HITBOX, offset: 0x600FF30, symbol: aFoRadarHitbox }
@@ -170,14 +170,14 @@ aFoRadarHitbox:
 D_FO_600FF64:
   { type: SF64:HITBOX, offset: 0x600FF64, symbol: D_FO_600FF64 }
 
-D_FO_600FF80:
+aFoMountain1Hitbox:
-  { type: SF64:HITBOX, offset: 0x600FF80, symbol: D_FO_600FF80 }
+  { type: SF64:HITBOX, offset: 0x600FF80, symbol: aFoMountain1Hitbox }
 
-D_FO_600FFA0:
+aFoMountain2Hitbox:
-  { type: SF64:HITBOX, offset: 0x600FFA0, symbol: D_FO_600FFA0 }
+  { type: SF64:HITBOX, offset: 0x600FFA0, symbol: aFoMountain2Hitbox }
 
-D_FO_600FFC0:
+aFoMountain3Hitbox:
-  { type: SF64:HITBOX, offset: 0x600FFC0, symbol: D_FO_600FFC0 }
+  { type: SF64:HITBOX, offset: 0x600FFC0, symbol: aFoMountain3Hitbox }
 
-D_FO_600FFE0:
+aFoBaseHitbox:
-  { type: SF64:HITBOX, offset: 0x600FFE0, symbol: D_FO_600FFE0 }
+  { type: SF64:HITBOX, offset: 0x600FFE0, symbol: aFoBaseHitbox }

assets/yaml/us/rev1/ast_katina.yaml

@@ -57,8 +57,8 @@ D_KA_60062F8:
 D_KA_6006AF8:
   { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6006AF8, ctype: u16, symbol: D_KA_6006AF8 }
 
-aKaDestroyedSaucererDL:
+aKaDestroyedKaSaucererDL:
-  { type: GFX, offset: 0x6007300, symbol: aKaDestroyedSaucererDL }
+  { type: GFX, offset: 0x6007300, symbol: aKaDestroyedKaSaucererDL }
 
 D_KA_6009250:
   { type: GFX, offset: 0x6009250, symbol: D_KA_6009250 }
@@ -169,11 +169,11 @@ D_KA_6011000:
 D_KA_6011044:
   { type: SF64:OBJECT_INIT, offset: 0x6011044, symbol: D_KA_6011044 }
 
-D_KA_6011058:
+aKaSaucererHitbox:
-  { type: SF64:HITBOX, offset: 0x6011058, symbol: D_KA_6011058 }
+  { type: SF64:HITBOX, offset: 0x6011058, symbol: aKaSaucererHitbox }
 
-D_KA_601115C:
+aKaFrontlineBaseHitbox:
-  { type: SF64:HITBOX, offset: 0x601115C, symbol: D_KA_601115C }
+  { type: SF64:HITBOX, offset: 0x601115C, symbol: aKaFrontlineBaseHitbox }
 
 D_KA_60111D8:
   { type: SF64:HITBOX, offset: 0x60111D8, symbol: D_KA_60111D8 }

assets/yaml/us/rev1/ast_landmaster.yaml

@@ -14,8 +14,8 @@ D_landmaster_3000000:
 D_landmaster_3000080:
   { type: TEXTURE, format: TLUT, offset: 0x3000080, colors: 8, ctype: u16, symbol: D_landmaster_3000080 }
 
-D_landmaster_3000090:
+aLandmasterModelDL:
-  { type: GFX, offset: 0x3000090, symbol: D_landmaster_3000090 }
+  { type: GFX, offset: 0x3000090, symbol: aLandmasterModelDL }
 
 D_landmaster_3004CA8:
   { type: TEXTURE, format: RGBA16, offset: 0x3004CA8, width: 32, height: 32, ctype: u16, symbol: D_landmaster_3004CA8 }
@@ -44,8 +44,8 @@ D_landmaster_3001680:
 D_landmaster_3001E80:
   { type: TEXTURE, format: RGBA16, offset: 0x3001E80, width: 32, height: 32, ctype: u16, symbol: D_landmaster_3001E80 }
 
-D_landmaster_3004680:
+aLandmasterCanonDL:
-  { type: GFX, offset: 0x3004680, symbol: D_landmaster_3004680 }
+  { type: GFX, offset: 0x3004680, symbol: aLandmasterCanonDL }
 
 D_landmaster_30066B0:
   { type: GFX, offset: 0x30066B0, symbol: D_landmaster_30066B0 }

assets/yaml/us/rev1/ast_macbeth.yaml

@@ -163,8 +163,8 @@ D_MA_6007430:
 D_MA_6007500:
   {type: GFX, offset: 0x6007500, symbol: D_MA_6007500}
 
-D_MA_60075D0:
+aMaWeaponsFactoryDL:
-  {type: GFX, offset: 0x60075D0, symbol: D_MA_60075D0}
+  {type: GFX, offset: 0x60075D0, symbol: aMaWeaponsFactoryDL}
 
 D_MA_60092E0:
   { type: TEXTURE, format: RGBA16, ctype: u16, width: 32, height: 32, offset: 0x60092E0, symbol: D_MA_60092E0}
@@ -238,8 +238,8 @@ D_MA_600AE18:
 D_MA_600AE98:
   { type: TEXTURE, format: TLUT, ctype: u16, colors: 80, offset: 0x600AE98, symbol: D_MA_600AE98}
 
-D_MA_600AF40:
+aMaGuillotineDL:
-  {type: GFX, offset: 0x600AF40, symbol: D_MA_600AF40}
+  {type: GFX, offset: 0x600AF40, symbol: aMaGuillotineDL}
 
 D_MA_600B2E0:
   { type: TEXTURE, format: RGBA16, ctype: u16, width: 32, height: 64, offset: 0x600B2E0, symbol: D_MA_600B2E0}
@@ -265,8 +265,8 @@ D_MA_600D1E4:
 D_MA_600D280:
   { type: TEXTURE, format: IA16, ctype: u16, width: 16, height: 16, offset: 0x600D280, symbol: D_MA_600D280}
 
-D_MA_600D480:
+aMaSpearDL:
-  {type: GFX, offset: 0x600D480, symbol: D_MA_600D480}
+  {type: GFX, offset: 0x600D480, symbol: aMaSpearDL}
 
 D_MA_600D878:
   { type: TEXTURE, format: CI8, ctype: u8, width: 16, height: 16, offset: 0x600D878, symbol: D_MA_600D878, tlut: 0x600D978}
@@ -361,8 +361,8 @@ D_MA_6012C00:
 D_MA_6012C98:
   { type: TEXTURE, format: RGBA16, ctype: u16, width: 4, height: 8, offset: 0x6012C98, symbol: D_MA_6012C98}
   
-D_MA_6012F50:
+aMaShockBoxLightDL:
-  {type: GFX, offset: 0x6012F50, symbol: D_MA_6012F50}
+  {type: GFX, offset: 0x6012F50, symbol: aMaShockBoxLightDL}
   
 D_MA_6012FE0:
   { type: TEXTURE, format: IA8, ctype: u8, width: 16, height: 8, offset: 0x6012FE0, symbol: D_MA_6012FE0}
@@ -391,8 +391,8 @@ D_MA_6015494:
 D_MA_6015500:
   {type: SF64:SKELETON, offset: 0x6015500, symbol: D_MA_6015500}
 
-D_MA_6015510:
+aMaShockBoxDL:
-  {type: GFX, offset: 0x6015510, symbol: D_MA_6015510}
+  {type: GFX, offset: 0x6015510, symbol: aMaShockBoxDL}
 
 D_MA_6015C24:
   {type: SF64:ANIM, offset: 0x6015C24, symbol: D_MA_6015C24}
@@ -451,11 +451,11 @@ D_MA_601A840:
 D_MA_601A8C8:
   { type: TEXTURE, format: RGBA16, ctype: u16, width: 32, height: 32, offset: 0x601A8C8, symbol: D_MA_601A8C8}
 
-D_MA_601B0D0:
+aMaFloor6DL:
-  {type: GFX, offset: 0x601B0D0, symbol: D_MA_601B0D0}
+  {type: GFX, offset: 0x601B0D0, symbol: aMaFloor6DL}
 
-D_MA_601B7C0:
+aMaWall4DL:
-  {type: GFX, offset: 0x601B7C0, symbol: D_MA_601B7C0}
+  {type: GFX, offset: 0x601B7C0, symbol: aMaWall4DL}
 
 D_MA_601BB78:
   { type: TEXTURE, format: CI8, ctype: u8, width: 16, height: 16, offset: 0x601BB78, symbol: D_MA_601BB78, tlut: 0x601BC78}
@@ -493,8 +493,8 @@ D_MA_601EAB0:
 D_MA_601EBBC:
   {type: SF64:SKELETON, offset: 0x601EBBC, symbol: D_MA_601EBBC}
 
-D_MA_601F1D0:
+aMaWall2DL:
-  {type: GFX, offset: 0x601F1D0, symbol: D_MA_601F1D0}
+  {type: GFX, offset: 0x601F1D0, symbol: aMaWall2DL}
 
 D_MA_601F270:
   {type: GFX, offset: 0x601F270, symbol: D_MA_601F270}
@@ -550,14 +550,14 @@ D_MA_6023388:
 D_MA_6023788:
   { type: TEXTURE, format: TLUT, ctype: u16, colors: 176, offset: 0x6023788, symbol: D_MA_6023788}
 
-D_MA_60238F0:
+aMaWall3DL:
-  {type: GFX, offset: 0x60238F0, symbol: D_MA_60238F0}
+  {type: GFX, offset: 0x60238F0, symbol: aMaWall3DL}
 
 D_MA_60239D0:
   {type: GFX, offset: 0x60239D0, symbol: D_MA_60239D0}
 
-D_MA_6024010:
+aMaBuilding1DL:
-  {type: GFX, offset: 0x6024010, symbol: D_MA_6024010}
+  {type: GFX, offset: 0x6024010, symbol: aMaBuilding1DL}
 
 D_MA_6024230:
   { type: TEXTURE, format: CI8, ctype: u8, width: 32, height: 32, offset: 0x6024230, symbol: D_MA_6024230, tlut: 0x6024630}
@@ -568,17 +568,17 @@ D_MA_6024630:
 D_MA_6024670:
   {type: GFX, offset: 0x6024670, symbol: D_MA_6024670}
 
-D_MA_60251A0:
+aMaHorizontalLockBarDL:
-  {type: GFX, offset: 0x60251A0, symbol: D_MA_60251A0}
+  {type: GFX, offset: 0x60251A0, symbol: aMaHorizontalLockBarDL}
 
 D_MA_60253E0:
   {type: GFX, offset: 0x60253E0, symbol: D_MA_60253E0}
 
-D_MA_60257B0:
+aMaBarrierDL:
-  {type: GFX, offset: 0x60257B0, symbol: D_MA_60257B0}
+  {type: GFX, offset: 0x60257B0, symbol: aMaBarrierDL}
 
-D_MA_6025850:
+aMaVerticalLockBarDL:
-  {type: GFX, offset: 0x6025850, symbol: D_MA_6025850}
+  {type: GFX, offset: 0x6025850, symbol: aMaVerticalLockBarDL}
 
 D_MA_6025A70:
   {type: GFX, offset: 0x6025A70, symbol: D_MA_6025A70}
@@ -604,11 +604,11 @@ D_MA_6026C00:
 D_MA_6027000:
   { type: TEXTURE, format: TLUT, ctype: u16, colors: 112, offset: 0x6027000, symbol: D_MA_6027000}
 
-D_MA_60270E0:
+aMaWall1DL:
-  {type: GFX, offset: 0x60270E0, symbol: D_MA_60270E0}
+  {type: GFX, offset: 0x60270E0, symbol: aMaWall1DL}
 
-D_MA_6027180:
+aMaBuilding2DL:
-  { type: GFX, offset: 0x6027180, symbol: D_MA_6027180}
+  { type: GFX, offset: 0x6027180, symbol: aMaBuilding2DL}
 
 D_MA_6027320:
   {type: SF64:ANIM, offset: 0x6027320, symbol: D_MA_6027320}
@@ -616,8 +616,8 @@ D_MA_6027320:
 D_MA_602742C:
   {type: SF64:SKELETON, offset: 0x602742C, symbol: D_MA_602742C}
 
-D_MA_6027900:
+aMaFloor2DL:
-  {type: GFX, offset: 0x6027900, symbol: D_MA_6027900}
+  {type: GFX, offset: 0x6027900, symbol: aMaFloor2DL}
 
 D_MA_6027A04:
   {type: SF64:ANIM, offset: 0x6027A04, symbol: D_MA_6027A04}
@@ -658,14 +658,14 @@ D_MA_602CB80:
 D_MA_602D380:
   {type: GFX, offset: 0x602D380, symbol: D_MA_602D380}
 
-D_MA_602DAE0:
+aMaFloor1DL:
-  {type: GFX, offset: 0x602DAE0, symbol: D_MA_602DAE0}
+  {type: GFX, offset: 0x602DAE0, symbol: aMaFloor1DL}
 
-D_MA_602DB80:
+aMaFloor3DL:
-  {type: GFX, offset: 0x602DB80, symbol: D_MA_602DB80}
+  {type: GFX, offset: 0x602DB80, symbol: aMaFloor3DL}
 
-D_MA_602DC20:
+aMaFloor5DL:
-  {type: GFX, offset: 0x602DC20, symbol: D_MA_602DC20}
+  {type: GFX, offset: 0x602DC20, symbol: aMaFloor5DL}
 
 D_MA_602DCB8:
   {type: TEXTURE, format: RGBA16, ctype: u16,  width: 32, height: 32, offset: 0x602DCB8, symbol: D_MA_602DCB8}
@@ -703,11 +703,11 @@ D_MA_602FFA0:
 D_MA_602FFC0:
   {type: GFX, offset: 0x602FFC0, symbol: D_MA_602FFC0}
 
-D_MA_6030500:
+aMaTerrainBumpDL:
-  {type: GFX, offset: 0x6030500, symbol: D_MA_6030500}
+  {type: GFX, offset: 0x6030500, symbol: aMaTerrainBumpDL}
 
-D_MA_6030630:
+aMaFloor4DL:
-  {type: GFX, offset: 0x6030630, symbol: D_MA_6030630}
+  {type: GFX, offset: 0x6030630, symbol: aMaFloor4DL}
 
 D_MA_60306D0:
   {type: GFX, offset: 0x60306D0, symbol: D_MA_60306D0}
@@ -757,20 +757,20 @@ D_MA_6035920:
 D_MA_60359AC:
   {type: SF64:HITBOX, offset: 0x60359AC, symbol: D_MA_60359AC}
 
-D_MA_60359C8:
+aMaLocomotiveHitbox:
-  {type: SF64:HITBOX, offset: 0x60359C8, symbol: D_MA_60359C8}
+  {type: SF64:HITBOX, offset: 0x60359C8, symbol: aMaLocomotiveHitbox}
 
-D_MA_6035A14:
+aMaTrainCar2Hitbox:
-  {type: SF64:HITBOX, offset: 0x6035A14, symbol: D_MA_6035A14}
+  {type: SF64:HITBOX, offset: 0x6035A14, symbol: aMaTrainCar2Hitbox}
 
-D_MA_6035A48:
+aMaTrainCar1Hitbox:
-  {type: SF64:HITBOX, offset: 0x6035A48, symbol: D_MA_6035A48}
+  {type: SF64:HITBOX, offset: 0x6035A48, symbol: aMaTrainCar1Hitbox}
 
 D_MA_6035A94:
   {type: SF64:HITBOX, offset: 0x6035A94, symbol: D_MA_6035A94}
 
-D_MA_6035AE0:
+aMaTrainCar3Hitbox:
-  {type: SF64:HITBOX, offset: 0x6035AE0, symbol: D_MA_6035AE0}
+  {type: SF64:HITBOX, offset: 0x6035AE0, symbol: aMaTrainCar3Hitbox}
 
 D_MA_6035B44:
   {type: SF64:HITBOX, offset: 0x6035B44, symbol: D_MA_6035B44}
@@ -790,14 +790,14 @@ D_MA_6035CD4:
 D_MA_6035D38:
   {type: SF64:HITBOX, offset: 0x6035D38, symbol: D_MA_6035D38}
 
-D_MA_6035D9C:
+aMaTrainCar4Hitbox:
-  {type: SF64:HITBOX, offset: 0x6035D9C, symbol: D_MA_6035D9C}
+  {type: SF64:HITBOX, offset: 0x6035D9C, symbol: aMaTrainCar4Hitbox}
 
 D_MA_6035DD0:
   {type: SF64:HITBOX, offset: 0x6035DD0, symbol: D_MA_6035DD0}
 
-D_MA_6035E04:
+aMaTrainCar5Hitbox:
-  {type: SF64:HITBOX, offset: 0x6035E04, symbol: D_MA_6035E04}
+  {type: SF64:HITBOX, offset: 0x6035E04, symbol: aMaTrainCar5Hitbox}
 
 D_MA_6035E68:
   {type: SF64:HITBOX, offset: 0x6035E68, symbol: D_MA_6035E68}
@@ -817,101 +817,101 @@ D_MA_6035FF8:
 D_MA_603605C:
   {type: SF64:HITBOX, offset: 0x603605C, symbol: D_MA_603605C}
 
-D_MA_60360C0:
+aMaTrainCar6Hitbox:
-  {type: SF64:HITBOX, offset: 0x60360C0, symbol: D_MA_60360C0}
+  {type: SF64:HITBOX, offset: 0x60360C0, symbol: aMaTrainCar6Hitbox}
 
-D_MA_6036154:
+aMaTrainCar7Hitbox:
-  {type: SF64:HITBOX, offset: 0x6036154, symbol: D_MA_6036154}
+  {type: SF64:HITBOX, offset: 0x6036154, symbol: aMaTrainCar7Hitbox}
 
 D_MA_6036188:
   {type: SF64:HITBOX, offset: 0x6036188, symbol: D_MA_6036188}
 
-D_MA_6036204:
+aMaTrainTrack13Hitbox:
-  {type: SF64:HITBOX, offset: 0x6036204, symbol: D_MA_6036204}
+  {type: SF64:HITBOX, offset: 0x6036204, symbol: aMaTrainTrack13Hitbox}
 
 D_MA_6036250:
   {type: SF64:HITBOX, offset: 0x6036250, symbol: D_MA_6036250}
 
-D_MA_603626C:
+aMaBuilding1Hitbox:
-  {type: SF64:HITBOX, offset: 0x603626C, symbol: D_MA_603626C}
+  {type: SF64:HITBOX, offset: 0x603626C, symbol: aMaBuilding1Hitbox}
 
-D_MA_6036288:
+aMaBuilding2Hitbox:
-  {type: SF64:HITBOX, offset: 0x6036288, symbol: D_MA_6036288}
+  {type: SF64:HITBOX, offset: 0x6036288, symbol: aMaBuilding2Hitbox}
 
-D_MA_60362A4:
+aMaTowerHitbox:
-  {type: SF64:HITBOX, offset: 0x60362A4, symbol: D_MA_60362A4}
+  {type: SF64:HITBOX, offset: 0x60362A4, symbol: aMaTowerHitbox}
 
-D_MA_60362D8:
+aMaWall2Hitbox:
-  {type: SF64:HITBOX, offset: 0x60362D8, symbol: D_MA_60362D8}
+  {type: SF64:HITBOX, offset: 0x60362D8, symbol: aMaWall2Hitbox}
 
-D_MA_60362F4:
+aMaWall4Hitbox:
-  {type: SF64:HITBOX, offset: 0x60362F4, symbol: D_MA_60362F4}
+  {type: SF64:HITBOX, offset: 0x60362F4, symbol: aMaWall4Hitbox}
 
-D_MA_6036328:
+aMaWall3Hitbox:
-  {type: SF64:HITBOX, offset: 0x6036328, symbol: D_MA_6036328}
+  {type: SF64:HITBOX, offset: 0x6036328, symbol: aMaWall3Hitbox}
 
-D_MA_6036344:
+aMaIndicatorSignHitbox:
-  {type: SF64:HITBOX, offset: 0x6036344, symbol: D_MA_6036344}
+  {type: SF64:HITBOX, offset: 0x6036344, symbol: aMaIndicatorSignHitbox}
 
-D_MA_6036370:
+aMaTerrainBumpHitbox:
-  {type: SF64:HITBOX, offset: 0x6036370, symbol: D_MA_6036370}
+  {type: SF64:HITBOX, offset: 0x6036370, symbol: aMaTerrainBumpHitbox}
 
-D_MA_603638C:
+aMaFloor1Hitbox:
-  {type: SF64:HITBOX, offset: 0x603638C, symbol: D_MA_603638C}
+  {type: SF64:HITBOX, offset: 0x603638C, symbol: aMaFloor1Hitbox}
 
-D_MA_60363B8:
+aMaFloor2Hitbox:
-  {type: SF64:HITBOX, offset: 0x60363B8, symbol: D_MA_60363B8}
+  {type: SF64:HITBOX, offset: 0x60363B8, symbol: aMaFloor2Hitbox}
 
-D_MA_60363E4:
+aMaFloor3Hitbox:
-  {type: SF64:HITBOX, offset: 0x60363E4, symbol: D_MA_60363E4}
+  {type: SF64:HITBOX, offset: 0x60363E4, symbol: aMaFloor3Hitbox}
 
-D_MA_6036410:
+aMaFloor4Hitbox:
-  {type: SF64:HITBOX, offset: 0x6036410, symbol: D_MA_6036410}
+  {type: SF64:HITBOX, offset: 0x6036410, symbol: aMaFloor4Hitbox}
 
-D_MA_603643C:
+aMaFloor5Hitbox:
-  {type: SF64:HITBOX, offset: 0x603643C, symbol: D_MA_603643C}
+  {type: SF64:HITBOX, offset: 0x603643C, symbol: aMaFloor5Hitbox}
 
-D_MA_6036458:
+aMaMaRailroadSwitchHitbox:
-  {type: SF64:HITBOX, offset: 0x6036458, symbol: D_MA_6036458}
+  {type: SF64:HITBOX, offset: 0x6036458, symbol: aMaMaRailroadSwitchHitbox}
 
 D_MA_603648C:
   {type: SF64:HITBOX, offset: 0x603648C, symbol: D_MA_603648C}
 
-D_MA_60364C0:
+aMaBoulderHitbox:
-  {type: SF64:HITBOX, offset: 0x60364C0, symbol: D_MA_60364C0}
+  {type: SF64:HITBOX, offset: 0x60364C0, symbol: aMaBoulderHitbox}
 
-D_MA_60364DC:
+aMaRailwaySignalHitbox:
-  {type: SF64:HITBOX, offset: 0x60364DC, symbol: D_MA_60364DC}
+  {type: SF64:HITBOX, offset: 0x60364DC, symbol: aMaRailwaySignalHitbox}
 
 D_MA_6036520:
   {type: SF64:HITBOX, offset: 0x6036520, symbol: D_MA_6036520}
 
-D_MA_6036594:
+aMaSwitchTrackHitbox:
-  {type: SF64:HITBOX, offset: 0x6036594, symbol: D_MA_6036594}
+  {type: SF64:HITBOX, offset: 0x6036594, symbol: aMaSwitchTrackHitbox}
 
 D_MA_6036668:
   {type: SF64:HITBOX, offset: 0x6036668, symbol: D_MA_6036668}
 
-D_MA_60366EC:
+aMaHorizontalLockBarHitbox:
-  {type: SF64:HITBOX, offset: 0x60366EC, symbol: D_MA_60366EC}
+  {type: SF64:HITBOX, offset: 0x60366EC, symbol: aMaHorizontalLockBarHitbox}
 
-D_MA_6036708:
+aMaVerticalLockBarHitbox:
-  {type: SF64:HITBOX, offset: 0x6036708, symbol: D_MA_6036708}
+  {type: SF64:HITBOX, offset: 0x6036708, symbol: aMaVerticalLockBarHitbox}
 
-D_MA_6036724:
+aMaProximityLightHitbox:
-  {type: SF64:HITBOX, offset: 0x6036724, symbol: D_MA_6036724}
+  {type: SF64:HITBOX, offset: 0x6036724, symbol: aMaProximityLightHitbox}
 
-D_MA_6036728:
+aMaBarrierHitbox:
-  {type: SF64:HITBOX, offset: 0x6036728, symbol: D_MA_6036728}
+  {type: SF64:HITBOX, offset: 0x6036728, symbol: aMaBarrierHitbox}
 
-D_MA_6036744:
+aMaActor219Hitbox:
-  {type: SF64:HITBOX, offset: 0x6036744, symbol: D_MA_6036744}
+  {type: SF64:HITBOX, offset: 0x6036744, symbol: aMaActor219Hitbox}
 
-D_MA_6036760:
+aMaFloor6Hitbox:
-  {type: SF64:HITBOX, offset: 0x6036760, symbol: D_MA_6036760}
+  {type: SF64:HITBOX, offset: 0x6036760, symbol: aMaFloor6Hitbox}
 
-D_MA_603677C:
+aMaActor207Hitbox:
-  {type: SF64:HITBOX, offset: 0x603677C, symbol: D_MA_603677C}
+  {type: SF64:HITBOX, offset: 0x603677C, symbol: aMaActor207Hitbox}
 
 D_MA_6036818:
   {type: SF64:HITBOX, offset: 0x6036818, symbol: D_MA_6036818}
@@ -919,20 +919,20 @@ D_MA_6036818:
 D_MA_6036894:
   {type: SF64:HITBOX, offset: 0x6036894, symbol: D_MA_6036894}
 
-D_MA_60368E0:
+aMaGuillotineHitbox:
-  {type: SF64:HITBOX, offset: 0x60368E0, symbol: D_MA_60368E0}
+  {type: SF64:HITBOX, offset: 0x60368E0, symbol: aMaGuillotineHitbox}
 
 D_MA_60368FC:
   {type: SF64:HITBOX, offset: 0x60368FC, symbol: D_MA_60368FC}
 
-D_MA_6036930:
+aMaBombDropHitbox:
-  {type: SF64:HITBOX, offset: 0x6036930, symbol: D_MA_6036930}
+  {type: SF64:HITBOX, offset: 0x6036930, symbol: aMaBombDropHitbox}
 
-D_MA_603694C:
+aMaSpearHitbox:
-  {type: SF64:HITBOX, offset: 0x603694C, symbol: D_MA_603694C}
+  {type: SF64:HITBOX, offset: 0x603694C, symbol: aMaSpearHitbox}
 
-D_MA_6036968:
+aMaShockBoxHitbox:
-  {type: SF64:HITBOX, offset: 0x6036968, symbol: D_MA_6036968}
+  {type: SF64:HITBOX, offset: 0x6036968, symbol: aMaShockBoxHitbox}
 
 D_MA_60381D8:
   {type: SF64:SCRIPT, offset: 0x60381D8, symbol: D_MA_60381D8}

assets/yaml/us/rev1/ast_meteo.yaml

@@ -104,8 +104,8 @@ D_ME_600C740:
 D_ME_600CAA0:
   { type: GFX, offset: 0x600CAA0, symbol: D_ME_600CAA0 }
   
-D_ME_600CD60:
+aMeMeteorShower3DL:
-  { type: GFX, offset: 0x600CD60, symbol: D_ME_600CD60 }
+  { type: GFX, offset: 0x600CD60, symbol: aMeMeteorShower3DL }
 
 D_ME_600CDE8:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x0600CDE8, symbol: D_ME_600CDE8 }
@@ -137,8 +137,8 @@ D_ME_6014238:
 D_ME_6015238: 
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 64, offset: 0x06015238, symbol: D_ME_6015238 }
 
-D_ME_6016240:
+aMeMeteorShower2DL:
-  { type: GFX, offset: 0x6016240, symbol: D_ME_6016240 }
+  { type: GFX, offset: 0x6016240, symbol: aMeMeteorShower2DL }
 
 D_ME_60162C8:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x060162C8, symbol: D_ME_60162C8 }
@@ -146,20 +146,20 @@ D_ME_60162C8:
 D_ME_60172C8:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x060172C8, symbol: D_ME_60172C8 }
 
-D_ME_6017AD0:
+aMeMeteorShower1DL:
-  { type: GFX, offset: 0x06017AD0, symbol: D_ME_6017AD0 }
+  { type: GFX, offset: 0x06017AD0, symbol: aMeMeteorShower1DL }
 
 D_ME_6017B60:
   { type: GFX, offset: 0x06017B60, symbol: D_ME_6017B60 }
 
-D_ME_6018450:
+aMeLaserCannon2DL:
-  { type: GFX, offset: 0x06018450, symbol: D_ME_6018450 }
+  { type: GFX, offset: 0x06018450, symbol: aMeLaserCannon2DL }
 
 D_ME_6018960:
   { type: GFX, offset: 0x06018960, symbol: D_ME_6018960 }
 
-D_ME_6018C00:
+aMeMeteor1DL:
-  { type: GFX, offset: 0x06018C00, symbol: D_ME_6018C00 }
+  { type: GFX, offset: 0x06018C00, symbol: aMeMeteor1DL }
 
 D_ME_6019430:
   { type: GFX, offset: 0x06019430, symbol: D_ME_6019430 }
@@ -286,29 +286,29 @@ D_ME_602F604:
 D_ME_602F638:
   { type: SF64:HITBOX, offset: 0x602F638, symbol: D_ME_602F638 }
 
-D_ME_602F684:
+aMeMeteoBallHitbox:
-  { type: SF64:HITBOX, offset: 0x602F684, symbol: D_ME_602F684 }
+  { type: SF64:HITBOX, offset: 0x602F684, symbol: aMeMeteoBallHitbox }
 
-D_ME_602F6A0:
+aMeHopBotHitbox:
-  { type: SF64:HITBOX, offset: 0x602F6A0, symbol: D_ME_602F6A0 }
+  { type: SF64:HITBOX, offset: 0x602F6A0, symbol: aMeHopBotHitbox }
 
-D_ME_602F6EC:
+aMeMeteor1Hitbox:
-  { type: SF64:HITBOX, offset: 0x602F6EC, symbol: D_ME_602F6EC }
+  { type: SF64:HITBOX, offset: 0x602F6EC, symbol: aMeMeteor1Hitbox }
 
-D_ME_602F708:
+aMeMeteor2Hitbox:
-  { type: SF64:HITBOX, offset: 0x602F708, symbol: D_ME_602F708 }
+  { type: SF64:HITBOX, offset: 0x602F708, symbol: aMeMeteor2Hitbox }
 
-D_ME_602F724:
+aMeLaserCannon1Hitbox:
-  { type: SF64:HITBOX, offset: 0x602F724, symbol: D_ME_602F724 }
+  { type: SF64:HITBOX, offset: 0x602F724, symbol: aMeLaserCannon1Hitbox }
 
-D_ME_602F740:
+aMeLaserCannon2Hitbox:
-  { type: SF64:HITBOX, offset: 0x602F740, symbol: D_ME_602F740 }
+  { type: SF64:HITBOX, offset: 0x602F740, symbol: aMeLaserCannon2Hitbox }
 
-D_ME_602F75C:
+aMeCrusherHitbox:
-  { type: SF64:HITBOX, offset: 0x602F75C, symbol: D_ME_602F75C }
+  { type: SF64:HITBOX, offset: 0x602F75C, symbol: aMeCrusherHitbox }
 
-D_ME_602FA50:
+aMeCrusherShieldHitbox:
-  { type: SF64:HITBOX, offset: 0x602FA50, symbol: D_ME_602FA50 }
+  { type: SF64:HITBOX, offset: 0x602FA50, symbol: aMeCrusherShieldHitbox }
 
 D_ME_602FA9C:
   {type: SF64:COLPOLY, count: 79, offset: 0x602FA9C, symbol: D_ME_602FA9C, mesh_symbol: D_ME_OFFSET }

assets/yaml/us/rev1/ast_sector_x.yaml

@@ -247,14 +247,14 @@ D_SX_603238C:
 D_SX_6032408:
   { type: SF64:HITBOX, offset: 0x6032408, symbol: D_SX_6032408 }
 
-D_SX_6032488:
+aSxSpyborgLeftArmHitbox:
-  { type: SF64:HITBOX, offset: 0x6032488, symbol: D_SX_6032488 }
+  { type: SF64:HITBOX, offset: 0x6032488, symbol: aSxSpyborgLeftArmHitbox }
 
-D_SX_60324EC:
+aSxSpyborgRightArmHitbox:
-  { type: SF64:HITBOX, offset: 0x60324EC, symbol: D_SX_60324EC }
+  { type: SF64:HITBOX, offset: 0x60324EC, symbol: aSxSpyborgRightArmHitbox }
 
-D_SX_6032550:
+aSxSpyborgHitbox:
-  { type: SF64:HITBOX, offset: 0x6032550, symbol: D_SX_6032550 }
+  { type: SF64:HITBOX, offset: 0x6032550, symbol: aSxSpyborgHitbox }
 
 D_SX_603285C:
   { type: SF64:HITBOX, offset: 0x603285C, symbol: D_SX_603285C }

assets/yaml/us/rev1/ast_sector_y.yaml

@@ -35,11 +35,11 @@ D_SY_6003348:
 D_SY_60034C4:
   { type: SF64:ANIM, offset: 0x60034C4, symbol: D_SY_60034C4 }
 
-D_SY_60034D0:
+aSyShipWindowsDL:
-  { type: GFX, offset: 0x60034D0, symbol: D_SY_60034D0 }
+  { type: GFX, offset: 0x60034D0, symbol: aSyShipWindowsDL }
 
-D_SY_60036A0:
+aSyShip3DestroyedDL:
-  { type: GFX, offset: 0x60036A0, symbol: D_SY_60036A0 }
+  { type: GFX, offset: 0x60036A0, symbol: aSyShip3DestroyedDL }
 
 D_SY_6004958:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06004958, symbol: D_SY_6004958 }
@@ -47,8 +47,8 @@ D_SY_6004958:
 D_SY_6005158:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06005158, symbol: D_SY_6005158 }
 
-D_SY_6005360:
+aSyShip4DL:
-  { type: GFX, offset: 0x6005360, symbol: D_SY_6005360 }
+  { type: GFX, offset: 0x6005360, symbol: aSyShip4DL }
 
 D_SY_6005BE0:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06005BE0, symbol: D_SY_6005BE0 }
@@ -74,8 +74,8 @@ D_SY_6008BE0:
 D_SY_6008FE0:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06008FE0, symbol: D_SY_6008FE0 }
 
-D_SY_60097E0:
+aSyShip1DL:
-  { type: GFX, offset: 0x060097E0, symbol: D_SY_60097E0 }
+  { type: GFX, offset: 0x060097E0, symbol: aSyShip1DL }
 
 D_SY_600AAC0:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 64, offset: 0x0600AAC0, symbol: D_SY_600AAC0 }
@@ -98,11 +98,11 @@ D_SY_600EAC0:
 D_SY_600F2C0:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 32, offset: 0x0600F2C0, symbol: D_SY_600F2C0 }
 
-D_SY_600F6C0:
+aSyShip4DestroyedDL:
-  { type: GFX, offset: 0x600F6C0, symbol: D_SY_600F6C0 }
+  { type: GFX, offset: 0x600F6C0, symbol: aSyShip4DestroyedDL }
 
-D_SY_60102C0:
+aSyShip3DL:
-  { type: GFX, offset: 0x60102C0, symbol: D_SY_60102C0 }
+  { type: GFX, offset: 0x60102C0, symbol: aSyShip3DL }
 
 D_SY_6011758:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x06011758, symbol: D_SY_6011758 }
@@ -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 }
 
-D_SY_60188D0:
+aSyShipProjectileDL:
-  { type: GFX, offset: 0x60188D0, symbol: D_SY_60188D0 }
+  { type: GFX, offset: 0x60188D0, symbol: aSyShipProjectileDL }
 
 D_SY_60183B0:
   { type: GFX, offset: 0x60183B0, symbol: D_SY_60183B0 }
@@ -176,20 +176,20 @@ D_SY_601AD70:
 D_SY_601AE08:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0601AE08, symbol: D_SY_601AE08 }
 
-D_SY_601B610: 
+aSyShip2SpriteDL: 
-  { type: GFX, offset: 0x601B610, symbol: D_SY_601B610 }
+  { type: GFX, offset: 0x601B610, symbol: aSyShip2SpriteDL }
 
 D_SY_601B6A0: 
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x0601B6A0, symbol: D_SY_601B6A0 }
 
-D_SY_601C6A0: 
+aSyShip3SpriteDL: 
-  { type: GFX, offset: 0x601C6A0, symbol: D_SY_601C6A0 }
+  { type: GFX, offset: 0x601C6A0, symbol: aSyShip3SpriteDL }
 
 D_SY_601C730: 
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x0601C730, symbol: D_SY_601C730 }
 
-D_SY_601D730: 
+aSyShip2DL: 
-  { type: GFX, offset: 0x601D730, symbol: D_SY_601D730 }
+  { type: GFX, offset: 0x601D730, symbol: aSyShip2DL }
 
 D_SY_601F3B8:
   { type: SF64:ANIM, offset: 0x601F3B8, symbol: D_SY_601F3B8 }
@@ -308,8 +308,8 @@ D_SY_6032E18:
 D_SY_6033070:
   {type: SF64:COLPOLY, count: 174, offset: 0x6033070, symbol: D_SY_6033070, mesh_symbol: D_SY_6033E08 }
 
-D_SY_603405C:
+aSyRobotHitbox:
-  { type: SF64:HITBOX, offset: 0x603405C, symbol: D_SY_603405C }
+  { type: SF64:HITBOX, offset: 0x603405C, symbol: aSyRobotHitbox }
 
 D_SY_60340C0:
   { type: SF64:HITBOX, offset: 0x60340C0, symbol: D_SY_60340C0 }
@@ -329,34 +329,34 @@ D_SY_60342A0:
 D_SY_6034304:
   { type: SF64:HITBOX, offset: 0x6034304, symbol: D_SY_6034304 }
 
-D_SY_6034368:
+aSyScenery156Hitbox:
-  { type: SF64:HITBOX, offset: 0x6034368, symbol: D_SY_6034368 }
+  { type: SF64:HITBOX, offset: 0x6034368, symbol: aSyScenery156Hitbox }
 
 D_SY_603445C:
   { type: SF64:HITBOX, offset: 0x603445C, symbol: D_SY_603445C }
 
-D_SY_6034478:
+aSyShip1Hitbox:
-  { type: SF64:HITBOX, offset: 0x6034478, symbol: D_SY_6034478 }
+  { type: SF64:HITBOX, offset: 0x6034478, symbol: aSyShip1Hitbox }
 
-D_SY_603450C:
+aSyShip2Hitbox:
-  { type: SF64:HITBOX, offset: 0x603450C, symbol: D_SY_603450C }
+  { type: SF64:HITBOX, offset: 0x603450C, symbol: aSyShip2Hitbox }
 
-D_SY_6034588:
+aSyShip3Hitbox:
-  { type: SF64:HITBOX, offset: 0x6034588, symbol: D_SY_6034588 }
+  { type: SF64:HITBOX, offset: 0x6034588, symbol: aSyShip3Hitbox }
 
-D_SY_6034664:
+aSyShip3DestroyedHitbox:
-  { type: SF64:HITBOX, offset: 0x6034664, symbol: D_SY_6034664 }
+  { type: SF64:HITBOX, offset: 0x6034664, symbol: aSyShip3DestroyedHitbox }
 
-D_SY_6034770:
+aSyShip4Hitbox:
-  { type: SF64:HITBOX, offset: 0x6034770, symbol: D_SY_6034770 }
+  { type: SF64:HITBOX, offset: 0x6034770, symbol: aSyShip4Hitbox }
 
-D_SY_60347D4:
+aSyShipWindowsHitbox:
-  { type: SF64:HITBOX, offset: 0x60347D4, symbol: D_SY_60347D4 }
+  { type: SF64:HITBOX, offset: 0x60347D4, symbol: aSyShipWindowsHitbox }
 
-D_SY_60347F0:
+aSyShip4DestroyedHitbox:
-  { type: SF64:HITBOX, offset: 0x60347F0, symbol: D_SY_60347F0 }
+  { type: SF64:HITBOX, offset: 0x60347F0, symbol: aSyShip4DestroyedHitbox }
 
-D_SY_603486C:
+aSyShipProjectileHitbox:
-  { type: SF64:HITBOX, offset: 0x603486C, symbol: D_SY_603486C }
+  { type: SF64:HITBOX, offset: 0x603486C, symbol: aSyShipProjectileHitbox }
 
 # size = 0x34890

assets/yaml/us/rev1/ast_sector_z.yaml

@@ -85,8 +85,8 @@ D_SZ_60041F8:
 D_SZ_60042F8:
   { type: TEXTURE, ctype: u16, format: TLUT, colors: 24, offset: 0x060042F8, symbol: D_SZ_60042F8 }
 
-D_SZ_6004330:
+aSzMissileMark:
-  { type: GFX, offset: 0x6004330, symbol: D_SZ_6004330 }
+  { type: GFX, offset: 0x6004330, symbol: aSzMissileMark }
 
 D_SZ_6004458:
   { type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 8, offset: 0x06004458, symbol: D_SZ_6004458, tlut: 0x06004558 }
@@ -160,13 +160,13 @@ D_SZ_6007558:
 aSZMissileHitbox:
   { type: SF64:HITBOX, offset: 0x6009230, symbol: aSZMissileHitbox }
 
-D_SZ_600924C:
+aSzSpaceJunk3Hitbox:
-  { type: SF64:HITBOX, offset: 0x600924C, symbol: D_SZ_600924C }
+  { type: SF64:HITBOX, offset: 0x600924C, symbol: aSzSpaceJunk3Hitbox }
 
-D_SZ_60092E8:
+aSzSpaceJunk1Hitbox:
-  { type: SF64:HITBOX, offset: 0x60092E8, symbol: D_SZ_60092E8 }
+  { type: SF64:HITBOX, offset: 0x60092E8, symbol: aSzSpaceJunk1Hitbox }
 
-D_SZ_6009388:
+aSzGreatFoxHitbox:
-  { type: SF64:HITBOX, offset: 0x6009388, symbol: D_SZ_6009388 }
+  { type: SF64:HITBOX, offset: 0x6009388, symbol: aSzGreatFoxHitbox }
 
 # size = 0x93B0

assets/yaml/us/rev1/ast_titania.yaml

@@ -76,11 +76,11 @@ D_TI_6005000:
 D_TI_600631C:
   {type: SF64:SCRIPT, offset: 0x600631C, symbol: D_TI_600631C}
 
-D_TI_60064AC:
+aTi1LandmineHitbox:
-  {type: SF64:HITBOX, offset: 0x60064AC, symbol: D_TI_60064AC}
+  {type: SF64:HITBOX, offset: 0x60064AC, symbol: aTi1LandmineHitbox}
 
-D_TI_60064C8:
+aTiDesertRoverHitbox:
-  {type: SF64:HITBOX, offset: 0x60064C8, symbol: D_TI_60064C8}
+  {type: SF64:HITBOX, offset: 0x60064C8, symbol: aTiDesertRoverHitbox}
 
 aTiSkullHitbox:
   {type: SF64:HITBOX, offset: 0x60064FC, symbol: aTiSkullHitbox}
@@ -112,32 +112,32 @@ aTiRib7Hitbox:
 aTiRib8Hitbox:
   {type: SF64:HITBOX, offset: 0x6006778, symbol: aTiRib8Hitbox}
 
-D_TI_60067C4:
+aTiDelphorHitbox:
-  {type: SF64:HITBOX, offset: 0x60067C4, symbol: D_TI_60067C4}
+  {type: SF64:HITBOX, offset: 0x60067C4, symbol: aTiDelphorHitbox}
 
-D_TI_6006808:
+aTiDelphorHeadHitbox:
-  {type: SF64:HITBOX, offset: 0x6006808, symbol: D_TI_6006808}
+  {type: SF64:HITBOX, offset: 0x6006808, symbol: aTiDelphorHeadHitbox}
 
-D_TI_6006A3C:
+aTiDesertCrawlerHitbox:
-  {type: SF64:HITBOX, offset: 0x6006A3C, symbol: D_TI_6006A3C}
+  {type: SF64:HITBOX, offset: 0x6006A3C, symbol: aTiDesertCrawlerHitbox}
 
-D_TI_600683C:
+aTiBoulderHitbox:
-  {type: SF64:HITBOX, offset: 0x600683C, symbol: D_TI_600683C}
+  {type: SF64:HITBOX, offset: 0x600683C, symbol: aTiBoulderHitbox}
 
-D_TI_6006858:
+aTiBombHitbox:
-  {type: SF64:HITBOX, offset: 0x6006858, symbol: D_TI_6006858}
+  {type: SF64:HITBOX, offset: 0x6006858, symbol: aTiBombHitbox}
 
 D_TI_6006874:
   {type: SF64:HITBOX, offset: 0x6006874, symbol: D_TI_6006874}
 
-D_TI_6006890:
+aTiRascoHitbox:
-  {type: SF64:HITBOX, offset: 0x6006890, symbol: D_TI_6006890}
+  {type: SF64:HITBOX, offset: 0x6006890, symbol: aTiRascoHitbox}
 
 aTiCactusHitbox:
   {type: SF64:HITBOX, offset: 0x60068BC, symbol: aTiCactusHitbox}
 
-D_TI_60068F0:
+aTiFekudaHitbox:
-  {type: SF64:HITBOX, offset: 0x60068F0, symbol: D_TI_60068F0}
+  {type: SF64:HITBOX, offset: 0x60068F0, symbol: aTiFekudaHitbox}
 
 D_TI_6006940:
   {type: SF64:HITBOX, offset: 0x6006940, symbol: D_TI_6006940}
@@ -166,8 +166,8 @@ D_TI_6006A04:
 D_TI_6006A20:
   {type: SF64:HITBOX, offset: 0x6006A20, symbol: D_TI_6006A20}
 
-D_TI_6006BF0:
+aTiPillarHitbox:
-  {type: SF64:HITBOX, offset: 0x6006BF0, symbol: D_TI_6006BF0}
+  {type: SF64:HITBOX, offset: 0x6006BF0, symbol: aTiPillarHitbox}
 
 D_TI_6006924:
   {type: SF64:HITBOX, offset: 0x6006924, symbol: D_TI_6006924}
@@ -178,8 +178,8 @@ D_TI_6006C0C:
 D_TI_6006C28:
   {type: SF64:HITBOX, offset: 0x6006C28, symbol: D_TI_6006C28}
 
-D_TI_6006C44:
+aTiBridgeHitbox:
-  {type: SF64:HITBOX, offset: 0x6006C44, symbol: D_TI_6006C44}
+  {type: SF64:HITBOX, offset: 0x6006C44, symbol: aTiBridgeHitbox}
 
 D_TI_6006C60:
   {type: SF64:OBJECT_INIT, offset: 0x6006C60, symbol: D_TI_6006C60}

assets/yaml/us/rev1/ast_training.yaml

@@ -31,8 +31,8 @@ D_TR_6002740:
 D_TR_60028F0:
   { type: TEXTURE, format: RGBA16, offset: 0x060028F0, width: 32, height: 32, ctype: u16, symbol: D_TR_60028F0 }
 
-D_TR_60030F0:
+aTrBuildingDL:
-  { type: GFX, offset: 0x60030F0, symbol: D_TR_60030F0 }
+  { type: GFX, offset: 0x60030F0, symbol: aTrBuildingDL }
 
 D_TR_6003360:
   { type: TEXTURE, format: RGBA16, offset: 0x06003360, width: 16, height: 16, ctype: u16, symbol: D_TR_6003360 }
@@ -76,8 +76,8 @@ D_TR_6008EF8:
 D_TR_6009B34:
   { type: SF64:SCRIPT, offset: 0x6009B34, symbol: D_TR_6009B34 }
 
-D_TR_6009CC4:
+aTrBuildingHitbox:
-  { type: SF64:HITBOX, offset: 0x6009CC4, symbol: D_TR_6009CC4 }
+  { type: SF64:HITBOX, offset: 0x6009CC4, symbol: aTrBuildingHitbox }
 
 D_TR_6009CFC:
   { type: SF64:HITBOX, offset: 0x6009CFC, symbol: D_TR_6009CFC }

assets/yaml/us/rev1/ast_ve1_boss.yaml

@@ -50,8 +50,8 @@ D_VE1_90039F0:
 D_VE1_9003DF0:
   {type: TEXTURE, ctype: u16, format: TLUT, colors: 176, offset: 0x9003DF0, symbol: D_VE1_9003DF0}
 
-D_VE1_9003F50:
+aVe1TempleInterior1DL:
-  {type: GFX, offset: 0x9003F50, symbol: D_VE1_9003F50}
+  {type: GFX, offset: 0x9003F50, symbol: aVe1TempleInterior1DL}
 
 D_VE1_9004478:
   {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 32, offset: 0x9004478, symbol: D_VE1_9004478}
@@ -65,8 +65,8 @@ D_VE1_9005078:
 D_VE1_9005478:
   {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x9005478, symbol: D_VE1_9005478}
 
-D_VE1_9005C80:
+aVe1TempleEntranceDL:
-  {type: GFX, offset: 0x9005C80, symbol: D_VE1_9005C80}
+  {type: GFX, offset: 0x9005C80, symbol: aVe1TempleEntranceDL}
 
 D_VE1_9009700:
   {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x9009700, symbol: D_VE1_9009700}
@@ -92,8 +92,8 @@ D_VE1_900BF00:
 D_VE1_900C700:
   {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x900C700, symbol: D_VE1_900C700}
 
-D_VE1_900D098:
+aVe1MonkeyStatueAnim:
-  {type: SF64:ANIM, offset: 0x900D098, symbol: D_VE1_900D098}
+  {type: SF64:ANIM, offset: 0x900D098, symbol: aVe1MonkeyStatueAnim}
 
 D_VE1_900D164:
   {type: SF64:SKELETON, offset: 0x900D164, symbol: D_VE1_900D164}
@@ -104,8 +104,8 @@ D_VE1_900D180:
 D_VE1_900D520:
   {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x900D520, symbol: D_VE1_900D520}
 
-D_VE1_900DD20:
+aVe1Pillar1DL:
-  {type: GFX, offset: 0x900DD20, symbol: D_VE1_900DD20}
+  {type: GFX, offset: 0x900DD20, symbol: aVe1Pillar1DL}
 
 D_VE1_900DF20:
   {type: GFX, offset: 0x900DF20, symbol: D_VE1_900DF20}
@@ -116,11 +116,11 @@ D_VE1_900DFB8:
 D_VE1_900EFC0:
   {type: GFX, offset: 0x900EFC0, symbol: D_VE1_900EFC0}
 
-D_VE1_900F060:
+aVe1TempleInterior2DL:
-  {type: GFX, offset: 0x900F060, symbol: D_VE1_900F060}
+  {type: GFX, offset: 0x900F060, symbol: aVe1TempleInterior2DL}
 
-D_VE1_900F1D0:
+aVe1TempleInterior3DL:
-  {type: GFX, offset: 0x900F1D0, symbol: D_VE1_900F1D0}
+  {type: GFX, offset: 0x900F1D0, symbol: aVe1TempleInterior3DL}
 
 D_VE1_9010FC4:
   {type: SF64:ANIM, offset: 0x9010FC4, symbol: D_VE1_9010FC4}
@@ -179,8 +179,8 @@ D_VE1_901C0F4:
 D_VE1_901DA38:
   {type: SF64:ANIM, offset: 0x901DA38, symbol: D_VE1_901DA38}
 
-D_VE1_901DA50:
+aVe1Pillar3DL:
-  {type: GFX, offset: 0x901DA50, symbol: D_VE1_901DA50}
+  {type: GFX, offset: 0x901DA50, symbol: aVe1Pillar3DL}
 
 D_VE1_901DC90:
   {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 32, offset: 0x901DC90, symbol: D_VE1_901DC90}
@@ -230,8 +230,8 @@ D_VE1_90234D0:
 D_VE1_9023880:
   {type: GFX, offset: 0x9023880, symbol: D_VE1_9023880}
 
-D_VE1_9023AD0:
+aVe1Pillar4DL:
-  {type: GFX, offset: 0x9023AD0, symbol: D_VE1_9023AD0}
+  {type: GFX, offset: 0x9023AD0, symbol: aVe1Pillar4DL}
 
 D_VE1_9024738:
   {type: SF64:ANIM, offset: 0x9024738, symbol: D_VE1_9024738}

assets/yaml/us/rev1/ast_venom_1.yaml

@@ -46,8 +46,8 @@ D_VE1_6003078:
 D_VE1_6003478:
   { type: TEXTURE, format: TLUT, colors: 204, offset: 0x6003478, ctype: u16, symbol: D_VE1_6003478 }
 
-D_VE1_6003610:
+aVe1WatchPostDL:
-  { type: GFX, offset: 0x6003610, symbol: D_VE1_6003610 }
+  { type: GFX, offset: 0x6003610, symbol: aVe1WatchPostDL }
 
 D_VE1_6003B10:
   { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6003B10, ctype: u16, symbol: D_VE1_6003B10 }
@@ -70,8 +70,8 @@ D_VE1_60046F0:
 D_VE1_6004780:
   { type: TEXTURE, format: RGBA16, width: 64, height: 32, offset: 0x6004780, ctype: u16, symbol: D_VE1_6004780 }
 
-D_VE1_6005780:
+aVe1GeneratorDL:
-  { type: GFX, offset: 0x6005780, symbol: D_VE1_6005780 }
+  { type: GFX, offset: 0x6005780, symbol: aVe1GeneratorDL }
 
 D_VE1_6005E50:
   { type: TEXTURE, format: TLUT, colors: 160, offset: 0x6005E50, ctype: u16, symbol: D_VE1_6005E50 }
@@ -97,11 +97,11 @@ D_VE1_60066D0:
 D_VE1_6006750:
   { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6006750, ctype: u16, symbol: D_VE1_6006750 }
 
-D_VE1_6006F50:
+aVe1HallwayObstacleDL:
-  { type: GFX, offset: 0x6006F50, symbol: D_VE1_6006F50 }
+  { type: GFX, offset: 0x6006F50, symbol: aVe1HallwayObstacleDL }
 
-D_VE1_6007410:
+aVe1SceneryWall3DL:
-  { type: GFX, offset: 0x6007410, symbol: D_VE1_6007410 }
+  { type: GFX, offset: 0x6007410, symbol: aVe1SceneryWall3DL }
 
 D_VE1_60074E8:
   { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x60074E8, ctype: u16, symbol: D_VE1_60074E8 }
@@ -133,50 +133,50 @@ D_VE1_601B474:
 D_VE1_601B4C4:
   { type: SF64:HITBOX, offset: 0x601B4C4, symbol: D_VE1_601B4C4 }
 
-D_VE1_601B4E0:
+aVe1SceneryWall1Hitbox:
-  { type: SF64:HITBOX, offset: 0x601B4E0, symbol: D_VE1_601B4E0 }
+  { type: SF64:HITBOX, offset: 0x601B4E0, symbol: aVe1SceneryWall1Hitbox }
 
-D_VE1_601B4FC:
+aVe1SceneryWall2Hitbox:
-  { type: SF64:HITBOX, offset: 0x601B4FC, symbol: D_VE1_601B4FC }
+  { type: SF64:HITBOX, offset: 0x601B4FC, symbol: aVe1SceneryWall2Hitbox }
 
-D_VE1_601B518:
+aVe1SceneryWall3Hitbox:
-  { type: SF64:HITBOX, offset: 0x601B518, symbol: D_VE1_601B518 }
+  { type: SF64:HITBOX, offset: 0x601B518, symbol: aVe1SceneryWall3Hitbox }
 
-D_VE1_601B584:
+aVe1HallwayObstacleHitbox:
-  { type: SF64:HITBOX, offset: 0x601B584, symbol: D_VE1_601B584 }
+  { type: SF64:HITBOX, offset: 0x601B584, symbol: aVe1HallwayObstacleHitbox }
 
-D_VE1_601B5F4:
+aVe1GeneratorHitbox:
-  { type: SF64:HITBOX, offset: 0x601B5F4, symbol: D_VE1_601B5F4 }
+  { type: SF64:HITBOX, offset: 0x601B5F4, symbol: aVe1GeneratorHitbox }
 
-D_VE1_601B644:
+aVe1WatchPostHitbox:
-  { type: SF64:HITBOX, offset: 0x601B644, symbol: D_VE1_601B644 }
+  { type: SF64:HITBOX, offset: 0x601B644, symbol: aVe1WatchPostHitbox }
 
-D_VE1_601B678:
+aVe1TempleEntranceHitbox:
-  { type: SF64:HITBOX, offset: 0x601B678, symbol: D_VE1_601B678 }
+  { type: SF64:HITBOX, offset: 0x601B678, symbol: aVe1TempleEntranceHitbox }
 
-D_VE1_601B6C4:
+aVe1TempleInterior1Hitbox:
-  { type: SF64:HITBOX, offset: 0x601B6C4, symbol: D_VE1_601B6C4 }
+  { type: SF64:HITBOX, offset: 0x601B6C4, symbol: aVe1TempleInterior1Hitbox }
 
-D_VE1_601B710:
+aVe1TempleInterior2Hitbox:
-  { type: SF64:HITBOX, offset: 0x601B710, symbol: D_VE1_601B710 }
+  { type: SF64:HITBOX, offset: 0x601B710, symbol: aVe1TempleInterior2Hitbox }
 
-D_VE1_601B75C:
+aVe1TempleInterior3Hitbox:
-  { type: SF64:HITBOX, offset: 0x601B75C, symbol: D_VE1_601B75C }
+  { type: SF64:HITBOX, offset: 0x601B75C, symbol: aVe1TempleInterior3Hitbox }
 
-D_VE1_601B7F8:
+aVe1Pillar1Hitbox:
-  { type: SF64:HITBOX, offset: 0x601B7F8, symbol: D_VE1_601B7F8 }
+  { type: SF64:HITBOX, offset: 0x601B7F8, symbol: aVe1Pillar1Hitbox }
 
-D_VE1_601B830:
+aVe1Pillar2Hitbox:
-  { type: SF64:HITBOX, offset: 0x601B830, symbol: D_VE1_601B830 }
+  { type: SF64:HITBOX, offset: 0x601B830, symbol: aVe1Pillar2Hitbox }
 
-D_VE1_601B868:
+aVe1Pillar3Hitbox:
-  { type: SF64:HITBOX, offset: 0x601B868, symbol: D_VE1_601B868 }
+  { type: SF64:HITBOX, offset: 0x601B868, symbol: aVe1Pillar3Hitbox }
 
-D_VE1_601B8A0:
+aVe1Pillar4Hitbox:
-  { type: SF64:HITBOX, offset: 0x601B8A0, symbol: D_VE1_601B8A0 }
+  { type: SF64:HITBOX, offset: 0x601B8A0, symbol: aVe1Pillar4Hitbox }
 
-D_VE1_601B8D8:
+aVe1MonkeyStatueHitbox:
-  { type: SF64:HITBOX, offset: 0x601B8D8, symbol: D_VE1_601B8D8 }
+  { type: SF64:HITBOX, offset: 0x601B8D8, symbol: aVe1MonkeyStatueHitbox }
 
 D_VE1_601B944:
   { type: SF64:HITBOX, offset: 0x601B944, symbol: D_VE1_601B944 }

assets/yaml/us/rev1/ast_venom_2.yaml

@@ -27,11 +27,11 @@ D_VE2_60020D0:
 D_VE2_6002890:
   { type: TEXTURE, format: IA8, width: 16, height: 16, offset: 0x6002890, ctype: u8, symbol: D_VE2_6002890 }
 
-D_VE2_6002990:
+aAndPathExitDL:
-  { type: GFX, offset: 0x6002990, symbol: D_VE2_6002990 }
+  { type: GFX, offset: 0x6002990, symbol: aAndPathExitDL }
 
-D_VE2_6003000:
+aAndPathIntersectionDL:
-  { type: GFX, offset: 0x6003000, symbol: D_VE2_6003000 }
+  { type: GFX, offset: 0x6003000, symbol: aAndPathIntersectionDL }
 
 D_VE2_60038E0:
   { type: GFX, offset: 0x60038E0, symbol: D_VE2_60038E0 }
@@ -39,8 +39,8 @@ D_VE2_60038E0:
 D_VE2_6003970:
   { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6003970, ctype: u16, symbol: D_VE2_6003970 }
 
-D_VE2_6004170:
+aAndPathEntranceDL:
-  { type: GFX, offset: 0x6004170, symbol: D_VE2_6004170 }
+  { type: GFX, offset: 0x6004170, symbol: aAndPathEntranceDL }
 
 D_VE2_6004888:
   { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6004888, ctype: u16, symbol: D_VE2_6004888 }
@@ -57,8 +57,8 @@ D_VE2_6006088:
 D_VE2_60030D8:
   { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x60030D8, ctype: u16, symbol: D_VE2_60030D8 }
 
-D_VE2_6006890:
+aAndPathWallsDL:
-  { type: GFX, offset: 0x6006890, symbol: D_VE2_6006890 }
+  { type: GFX, offset: 0x6006890, symbol: aAndPathWallsDL }
 
 D_VE2_6006E20:
   { type: GFX, offset: 0x6006E20, symbol: D_VE2_6006E20 }
@@ -72,8 +72,8 @@ D_VE2_6007E20:
 D_VE2_6008170:
   { type: TEXTURE, format: RGBA16, width: 16, height: 16, offset: 0x6008170, ctype: u16, symbol: D_VE2_6008170 }
 
-D_VE2_6008370:
+aVe2TowerDL:
-  { type: GFX, offset: 0x6008370, symbol: D_VE2_6008370 }
+  { type: GFX, offset: 0x6008370, symbol: aVe2TowerDL }
 
 D_VE2_6008AF8:
   { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6008AF8, ctype: u16, symbol: D_VE2_6008AF8 }
@@ -162,8 +162,8 @@ D_VE2_600F700:
 D_VE2_6010700:
   { type: GFX, offset: 0x6010700, symbol: D_VE2_6010700 }
 
-D_VE2_6010960:
+aVe2MountainDL:
-  { type: GFX, offset: 0x6010960, symbol: D_VE2_6010960 }
+  { type: GFX, offset: 0x6010960, symbol: aVe2MountainDL }
 
 D_VE2_6010CA0:
   { type: TEXTURE, format: RGBA16, width: 32, height: 32, offset: 0x6010CA0, ctype: u16, symbol: D_VE2_6010CA0 }
@@ -195,11 +195,11 @@ D_VE2_6014D94:
 D_VE2_6014FEC:
   { type: SF64:COLPOLY, count: 250, offset: 0x6014FEC, symbol: D_VE2_6014FEC, mesh_symbol: D_VE2_OFFSET }
 
-D_VE2_601668C:
+aVe2TowerHitbox:
-  { type: SF64:HITBOX, offset: 0x601668C, symbol: D_VE2_601668C }
+  { type: SF64:HITBOX, offset: 0x601668C, symbol: aVe2TowerHitbox }
 
-D_VE2_60166F4:
+aVe2BaseHitbox:
-  { type: SF64:HITBOX, offset: 0x60166F4, symbol: D_VE2_60166F4 }
+  { type: SF64:HITBOX, offset: 0x60166F4, symbol: aVe2BaseHitbox }
 
-D_VE2_6016714:
+aVe2MountainHitbox:
-  { type: SF64:HITBOX, offset: 0x6016714, symbol: D_VE2_6016714 }
+  { type: SF64:HITBOX, offset: 0x6016714, symbol: aVe2MountainHitbox }

assets/yaml/us/rev1/ast_versus.yaml

@@ -182,8 +182,8 @@ D_versus_300EC80:
 D_versus_300EE80:
   { type: GFX, offset: 0x300EE80, symbol: D_versus_300EE80}
 
-D_versus_300FB80:
+aVsLandmasterModelDL:
-  { type: GFX, offset: 0x300FB80, symbol: D_versus_300FB80}
+  { type: GFX, offset: 0x300FB80, symbol: aVsLandmasterModelDL}
 
 D_versus_3010690:
   {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x3010690, symbol: D_versus_3010690 }
@@ -203,14 +203,14 @@ D_versus_3011E40:
 D_versus_3011ED0:
   {type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x3011ED0, symbol: D_versus_3011ED0 }
 
-D_versus_3012ED0:
+aVsSpaceJunk3DL:
-  { type: GFX, offset: 0x3012ED0, symbol: D_versus_3012ED0}
+  { type: GFX, offset: 0x3012ED0, symbol: aVsSpaceJunk3DL}
 
-D_versus_3013580:
+aVsSpaceJunk2DL:
-  { type: GFX, offset: 0x3013580, symbol: D_versus_3013580}
+  { type: GFX, offset: 0x3013580, symbol: aVsSpaceJunk2DL}
 
-D_versus_3013780:
+aVsSpaceJunk1DL:
-  { type: GFX, offset: 0x3013780, symbol: D_versus_3013780}
+  { type: GFX, offset: 0x3013780, symbol: aVsSpaceJunk1DL}
 
 D_versus_3013F50:
   {type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x3013F50, symbol: D_versus_3013F50, tlut: 0x3014350 }
@@ -245,8 +245,8 @@ D_versus_30160A0:
 D_versus_30162F8:
   {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x30162F8, symbol: D_versus_30162F8 }
 
-D_versus_3016B00:
+aVsKaFlBaseDL:
-  { type: GFX, offset: 0x3016B00, symbol: D_versus_3016B00}
+  { type: GFX, offset: 0x3016B00, symbol: aVsKaFlBaseDL}
 
 D_versus_3016DC0:
   {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x3016DC0, symbol: D_versus_3016DC0 }
@@ -257,14 +257,14 @@ D_versus_3016FC0:
 D_versus_30171C0:
   {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x30171C0, symbol: D_versus_30171C0 }
 
-D_versus_30173C0:
+aVsPyramid1DL:
-  { type: GFX, offset: 0x30173C0, symbol: D_versus_30173C0}
+  { type: GFX, offset: 0x30173C0, symbol: aVsPyramid1DL}
 
-D_versus_30174E0:
+aVsPyramid2DL:
-  { type: GFX, offset: 0x30174E0, symbol: D_versus_30174E0}
+  { type: GFX, offset: 0x30174E0, symbol: aVsPyramid2DL}
 
-D_versus_3017600:
+aVsBuildingDL:
-  { type: GFX, offset: 0x3017600, symbol: D_versus_3017600}
+  { type: GFX, offset: 0x3017600, symbol: aVsBuildingDL}
 
 D_versus_3017800:
   {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x3017800, symbol: D_versus_3017800 }
@@ -299,8 +299,8 @@ D_versus_301AEF0:
 D_versus_301AF78:
   {type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 16, offset: 0x301AF78, symbol: D_versus_301AF78 }
 
-D_versus_301B080:
+aVsArchDL:
-  { type: GFX, offset: 0x301B080, symbol: D_versus_301B080}
+  { type: GFX, offset: 0x301B080, symbol: aVsArchDL}
 
 D_versus_301B438:
   {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x301B438, symbol: D_versus_301B438 }
@@ -320,8 +320,8 @@ D_versus_301C0A4:
 D_versus_301C3A8:
   { type: SF64:ANIM, offset: 0x301C3A8, symbol: D_versus_301C3A8}
 
-D_versus_301C614:
+aVsOnFootFalcoSkel:
-  { type: SF64:SKELETON, offset: 0x301C614, symbol: D_versus_301C614 }
+  { type: SF64:SKELETON, offset: 0x301C614, symbol: aVsOnFootFalcoSkel }
 
 D_versus_301C79C:
   { type: SF64:ANIM, offset: 0x301C79C, symbol: D_versus_301C79C }
@@ -335,8 +335,8 @@ D_versus_301CCE4:
 D_versus_301CFEC:
   { type: SF64:ANIM, offset: 0x301CFEC, symbol: D_versus_301CFEC}
 
-D_versus_301D258:
+aVsOnFootFoxSkel:
-  { type: SF64:SKELETON, offset: 0x301D258, symbol: D_versus_301D258 }
+  { type: SF64:SKELETON, offset: 0x301D258, symbol: aVsOnFootFoxSkel }
 
 D_versus_301D3DC:
   { type: SF64:ANIM, offset: 0x301D3DC, symbol: D_versus_301D3DC }
@@ -347,8 +347,8 @@ D_versus_301D568:
 D_versus_301D888:
   { type: SF64:ANIM, offset: 0x301D888, symbol: D_versus_301D888}
 
-D_versus_301DB94:
+aVsOnFootPeppySkel:
-  { type: SF64:SKELETON, offset: 0x301DB94, symbol: D_versus_301DB94 }
+  { type: SF64:SKELETON, offset: 0x301DB94, symbol: aVsOnFootPeppySkel }
 
 D_versus_301DD6C:
   { type: SF64:ANIM, offset: 0x301DD6C, symbol: D_versus_301DD6C }
@@ -359,8 +359,8 @@ D_versus_301DEA4:
 D_versus_301E19C:
   { type: SF64:ANIM, offset: 0x301E19C, symbol: D_versus_301E19C}
 
-D_versus_301E3E8:
+aVsOnFootSlippySkel:
-  { type: SF64:SKELETON, offset: 0x301E3E8, symbol: D_versus_301E3E8 }
+  { type: SF64:SKELETON, offset: 0x301E3E8, symbol: aVsOnFootSlippySkel }
 
 D_versus_301E560:
   { type: SF64:ANIM, offset: 0x301E560, symbol: D_versus_301E560}
@@ -395,8 +395,8 @@ D_versus_301EEB0:
 D_versus_301EF38:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x301EF38, symbol: D_versus_301EF38 }
 
-D_versus_301F140:
+aVsLandmasterCanonDL:
-  { type: GFX, offset: 0x301F140, symbol: D_versus_301F140}
+  { type: GFX, offset: 0x301F140, symbol: aVsLandmasterCanonDL}
 
 D_versus_301F2E0:
   { type: GFX, offset: 0x301F2E0, symbol: D_versus_301F2E0}
@@ -704,26 +704,26 @@ D_versus_302E170:
 D_versus_302E378:
   { type: SF64:OBJECT_INIT, offset: 0x302E378, symbol: D_versus_302E378}
 
-D_versus_302ED4C:
+aVsSpaceJunk1Hitbox:
-  { type: SF64:HITBOX, offset: 0x302ED4C, symbol: D_versus_302ED4C}
+  { type: SF64:HITBOX, offset: 0x302ED4C, symbol: aVsSpaceJunk1Hitbox}
 
-D_versus_302ED98:
+aVsSpaceJunk2Hitbox:
-  { type: SF64:HITBOX, offset: 0x302ED98, symbol: D_versus_302ED98}
+  { type: SF64:HITBOX, offset: 0x302ED98, symbol: aVsSpaceJunk2Hitbox}
 
-D_versus_302EDB4:
+aVsSpaceJunk3Hitbox:
-  { type: SF64:HITBOX, offset: 0x302EDB4, symbol: D_versus_302EDB4}
+  { type: SF64:HITBOX, offset: 0x302EDB4, symbol: aVsSpaceJunk3Hitbox}
 
-D_versus_302EE00:
+aVsKaFlBaseHitbox:
-  { type: SF64:HITBOX, offset: 0x302EE00, symbol: D_versus_302EE00}
+  { type: SF64:HITBOX, offset: 0x302EE00, symbol: aVsKaFlBaseHitbox}
 
-D_versus_302EE64:
+aVsBuilding1Hibox:
-  { type: SF64:HITBOX, offset: 0x302EE64, symbol: D_versus_302EE64}
+  { type: SF64:HITBOX, offset: 0x302EE64, symbol: aVsBuilding1Hibox}
 
-D_versus_302EE80:
+aVsBuilding2Hibox:
-  { type: SF64:HITBOX, offset: 0x302EE80, symbol: D_versus_302EE80}
+  { type: SF64:HITBOX, offset: 0x302EE80, symbol: aVsBuilding2Hibox}
 
-D_versus_302EE9C:
+aVsArchHitbox:
-  { type: SF64:HITBOX, offset: 0x302EE9C, symbol: D_versus_302EE9C}
+  { type: SF64:HITBOX, offset: 0x302EE9C, symbol: aVsArchHitbox}
 
 D_versus_302EEE8:
   { type: SF64:TRIANGLE, count: 4, offset: 0x302EEE8, symbol: D_versus_302EEE8, mesh_symbol: D_versus_OFFSET}

assets/yaml/us/rev1/ast_zoness.yaml

@@ -141,14 +141,14 @@ D_ZO_600E5EC:
 D_ZO_600E7D8:
   { type: SF64:SKELETON, offset: 0x600E7D8, symbol: D_ZO_600E7D8}
 
-D_ZO_600E820:
+aZoOilRig3DL:
-  { type: GFX, offset: 0x600E820, symbol: D_ZO_600E820}
+  { type: GFX, offset: 0x600E820, symbol: aZoOilRig3DL}
 
-D_ZO_600EC90:
+aZoOilRig2DL:
-  { type: GFX, offset: 0x600EC90, symbol: D_ZO_600EC90}
+  { type: GFX, offset: 0x600EC90, symbol: aZoOilRig2DL}
 
-D_ZO_600F560:
+aZoOilRig1DL:
-  { type: GFX, offset: 0x600F560, symbol: D_ZO_600F560}
+  { type: GFX, offset: 0x600F560, symbol: aZoOilRig1DL}
 
 D_ZO_600FE58:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x600FE58, symbol: D_ZO_600FE58}
@@ -225,8 +225,8 @@ D_ZO_6017810:
 D_ZO_60178B0:
   { type: GFX, offset: 0x60178B0, symbol: D_ZO_60178B0}
 
-D_ZO_6017950:
+aZoBallDL:
-  { type: GFX, offset: 0x6017950, symbol: D_ZO_6017950}
+  { type: GFX, offset: 0x6017950, symbol: aZoBallDL}
 
 D_ZO_60179D8:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x60179D8, symbol: D_ZO_60179D8}
@@ -366,8 +366,8 @@ D_ZO_601FBC4:
 D_ZO_601FC90:
   { type: SF64:SKELETON, offset: 0x601FC90, symbol: D_ZO_601FC90}
 
-D_ZO_601FCB0:
+aZoIslandDL:
-  { type: GFX, offset: 0x601FCB0, symbol: D_ZO_601FCB0}
+  { type: GFX, offset: 0x601FCB0, symbol: aZoIslandDL}
 
 D_ZO_60201B0:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x60201B0, symbol: D_ZO_60201B0}
@@ -471,8 +471,8 @@ D_ZO_6024220:
 D_ZO_60242B8:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x60242B8, symbol: D_ZO_60242B8}
 
-aZoRock1DL:
+aZoRockDL:
-  { type: GFX, offset: 0x6024AC0, symbol: aZoRock1DL}
+  { type: GFX, offset: 0x6024AC0, symbol: aZoRockDL}
 
 D_ZO_6024D60:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x6024D60, symbol: D_ZO_6024D60}
@@ -502,59 +502,59 @@ D_ZO_602AC50:
 D_ZO_602AE94:
   { type: ARRAY, count: 242, array_type: Vec3f, offset: 0x602AE94, symbol: D_ZO_602AE94}
 
-aZoRock1Hitbox:
+aZoRockHitbox:
-  { type: SF64:HITBOX, offset: 0x602B9EC, symbol: aZoRock1Hitbox}
+  { type: SF64:HITBOX, offset: 0x602B9EC, symbol: aZoRockHitbox}
 
-D_ZO_602BA20:
+aZoOilRig1Hitbox:
-  { type: SF64:HITBOX, offset: 0x602BA20, symbol: D_ZO_602BA20}
+  { type: SF64:HITBOX, offset: 0x602BA20, symbol: aZoOilRig1Hitbox}
 
-D_ZO_602BAE4:
+aZoOilRig2Hitbox:
-  { type: SF64:HITBOX, offset: 0x602BAE4, symbol: D_ZO_602BAE4}
+  { type: SF64:HITBOX, offset: 0x602BAE4, symbol: aZoOilRig2Hitbox}
 
-D_ZO_602BBD8:
+aZoOilRig3Hitbox:
-  { type: SF64:HITBOX, offset: 0x602BBD8, symbol: D_ZO_602BBD8}
+  { type: SF64:HITBOX, offset: 0x602BBD8, symbol: aZoOilRig3Hitbox}
 
-D_ZO_602BC54:
+aZoIslandHitbox:
-  { type: SF64:HITBOX, offset: 0x602BC54, symbol: D_ZO_602BC54}
+  { type: SF64:HITBOX, offset: 0x602BC54, symbol: aZoIslandHitbox}
 
-D_ZO_602BC58:
+aZoDodoraHitbox:
-  { type: SF64:HITBOX, offset: 0x602BC58, symbol: D_ZO_602BC58}
+  { type: SF64:HITBOX, offset: 0x602BC58, symbol: aZoDodoraHitbox}
 
-D_ZO_602BE3C:
+aZoTroikaHitbox:
-  { type: SF64:HITBOX, offset: 0x602BE3C, symbol: D_ZO_602BE3C}
+  { type: SF64:HITBOX, offset: 0x602BE3C, symbol: aZoTroikaHitbox}
 
-D_ZO_602BE58:
+aZoObnemaHitbox:
-  { type: SF64:HITBOX, offset: 0x602BE58, symbol: D_ZO_602BE58}
+  { type: SF64:HITBOX, offset: 0x602BE58, symbol: aZoObnemaHitbox}
 
-D_ZO_602BFC4:
+aZoBarrierHitbox:
-  { type: SF64:HITBOX, offset: 0x602BFC4, symbol: D_ZO_602BFC4}
+  { type: SF64:HITBOX, offset: 0x602BFC4, symbol: aZoBarrierHitbox}
 
 D_ZO_602C028:
   { type: SF64:HITBOX, offset: 0x602C028, symbol: D_ZO_602C028}
 
-D_ZO_602C044:
+aZoSarumarineHitbox:
-  { type: SF64:HITBOX, offset: 0x602C044, symbol: D_ZO_602C044}
+  { type: SF64:HITBOX, offset: 0x602C044, symbol: aZoSarumarineHitbox}
 
 D_ZO_602C1A0:
   { type: SF64:HITBOX, offset: 0x602C1A0, symbol: D_ZO_602C1A0}
 
-D_ZO_602C1D4:
+aZoCargoShipHitbox:
-  { type: SF64:HITBOX, offset: 0x602C1D4, symbol: D_ZO_602C1D4}
+  { type: SF64:HITBOX, offset: 0x602C1D4, symbol: aZoCargoShipHitbox}
 
-D_ZO_602C218:
+aZoContainerHitbox:
-  { type: SF64:HITBOX, offset: 0x602C218, symbol: D_ZO_602C218}
+  { type: SF64:HITBOX, offset: 0x602C218, symbol: aZoContainerHitbox}
 
-D_ZO_602C234:
+aZoRadarBuoyHitbox:
-  { type: SF64:HITBOX, offset: 0x602C234, symbol: D_ZO_602C234}
+  { type: SF64:HITBOX, offset: 0x602C234, symbol: aZoRadarBuoyHitbox}
 
-D_ZO_602C250:
+aZoSupplyCraneHitbox:
-  { type: SF64:HITBOX, offset: 0x602C250, symbol: D_ZO_602C250}
+  { type: SF64:HITBOX, offset: 0x602C250, symbol: aZoSupplyCraneHitbox}
 
-D_ZO_602C294:
+aZoBirdHitbox:
-  { type: SF64:HITBOX, offset: 0x602C294, symbol: D_ZO_602C294}
+  { type: SF64:HITBOX, offset: 0x602C294, symbol: aZoBirdHitbox}
   
-D_ZO_602C2B0:
+aZoSearchLightHitbox:
-  { type: SF64:HITBOX, offset: 0x602C2B0, symbol: D_ZO_602C2B0}
+  { type: SF64:HITBOX, offset: 0x602C2B0, symbol: aZoSearchLightHitbox}
 
 D_ZO_602C2CC:
   { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x602C2CC, symbol: D_ZO_602C2CC}

include/context.h

@@ -158,7 +158,7 @@ extern s32 D_ctx_80178494;
 extern f32 gShotHitPosZ;
 extern f32 gShotHitPosX;
 extern f32 gShotHitPosY;
-extern s32 gZOSnakeWaypointCount;
+extern s32 gZoDodoraWaypointCount;
 extern UNK_TYPE F_801784A8;
 extern GroundType gGroundType;
 extern UNK_TYPE F_801784B0;
@@ -238,13 +238,13 @@ extern PlayerShot gPlayerShots[16];
 extern TexturedLine gTexturedLines[100];
 extern RadarMark gRadarMarks[65];
 extern BonusText gBonusText[10];
-extern s32 gActor194Status[2];
+extern s32 gMeMoraStatus[2];
-extern f32 gActor194xPos[2][100];
+extern f32 gMeMoraXpos[2][100];
-extern f32 gActor194yPos[2][100];
+extern f32 gMeMoraYpos[2][100];
-extern f32 gActor194zPos[2][100];
+extern f32 gMeMoraZpos[2][100];
-extern f32 gActor194xRot[2][100];
+extern f32 gMeMoraXrot[2][100];
-extern f32 gActor194yRot[2][100];
+extern f32 gMeMoraYrot[2][100];
-extern f32 gActor194zRot[2][100];
+extern f32 gMeMoraZrot[2][100];
 extern u16 gEnemyShotSpeed;
 extern u8 gShowLevelClearStatusScreen;
 extern s32 gLevelStartStatusScreenTimer;
@@ -291,7 +291,7 @@ extern u8 gTiStartLandmaster;
 extern u16 gControllerRumbleTimers[4];
 extern u16 gPlayerScores[4];
 extern s32 gCircleWipeFrame;
-extern s32 D_ctx_80177C70;
+extern s32 gFovYMode;
 extern s32 gTraining360MsgTimer;
 extern s32 gTraining360MsgIndex;
 extern s32 D_ctx_80177C94;
@@ -329,7 +329,7 @@ extern Scenery360* gScenery360;
 extern UNK_TYPE F_801782B0;
 extern s32 gDrawSmallRocks;
 extern s32 D_ctx_801782BC;
-extern PosRot* gZOSnakePosRots;
+extern PosRot* gZoDodoraPosRots;
 extern f32* D_ctx_801782CC;
 extern f32* D_ctx_801782D4;
 extern f32* D_ctx_801782DC;

include/fox_co.h

@@ -1,6 +1,9 @@
 #ifndef FOX_CO_H
 #define FOX_CO_H
 
+#define TEAM_HEAD_XROT (19)
+#define TEAM_HEAD_YROT (20)
+
 // Granga Boss:
 
 #define DMG_FLICKER_5 (5)    // Damage indicator flickers for 5 frames
@@ -9,13 +12,13 @@
 
 typedef enum GrangaStates {
     /* 0 */ GRANGA_STATIONARY,
-    /* 1 */ GRANGA_STATE_1,
+    /* 1 */ GRANGA_FORWARD_MISSILE,        // walk forward + missile
-    /* 2 */ GRANGA_STATE_2,
+    /* 2 */ GRANGA_BACKWARDS_LASER_PLASMA, // Walk backwards + lasers + plasma
-    /* 3 */ GRANGA_STATE_3,
+    /* 3 */ GRANGA_FORWARD_LASER_PLASMA,   // Walk towards player + lasers + plasma
-    /* 4 */ GRANGA_STATE_4,
+    /* 4 */ GRANGA_FORWARD,                // Walk forward
-    /* 5 */ GRANGA_STATE_5,
+    /* 5 */ GRANGA_FALL_TO_LEFT,           // Falling from missing left leg
-    /* 6 */ GRANGA_STATE_6,
+    /* 6 */ GRANGA_FALL_TO_RIGHT,          // Falling from missing right leg
-    /* 7 */ GRANGA_STATE_7,
+    /* 7 */ GRANGA_EXPLODE,                // BOOM!
 } GrangaStates;
 
 typedef enum GrangaWork {
@@ -36,9 +39,9 @@ typedef enum GrangaWork {
     /* 14 */ GRANGA_WORK_14,
     /* 15 */ GRANGA_WORK_15,
     /* 16 */ GRANGA_WORK_16,  // yRot of missiles launched from both arms ?
-    /* 17 */ GRANGA_WORK_17, // x of something
+    /* 17 */ GRANGA_TARGET_X, // player.pos.x target position
-    /* 18 */ GRANGA_WORK_18, // y of something
+    /* 18 */ GRANGA_TARGET_Y, // player.pos.y target position
-    /* 19 */ GRANGA_WORK_19, // z of something
+    /* 19 */ GRANGA_TARGET_Z, // player.pos.trueZpos target position
     /* 20 */ GRANGA_WORK_20,
     /* 21 */ GRANGA_WORK_21,
     /* 22 */ GRANGA_WORK_22,
@@ -123,7 +126,7 @@ typedef enum GrangaSwork {
 } GrangaSwork;
 
 typedef enum GrangaFwork {
-    /* 00 */ GRANGA_FWK_00,
+    /* 00 */ GRANGA_FWK_00, // left leg rock angle?
     /* 01 */ GRANGA_FWK_01,
     /* 02 */ GRANGA_FWK_02,
     /* 03 */ GRANGA_FWK_03,
@@ -149,14 +152,27 @@ typedef enum GrangaAttackState {
     /* 3 */ GRANGA_ATTACK_PLASMA,
 } GrangaAttackState;
 
-
 // Carrier Boss:
 
 typedef enum CoCarrierParts {
-    /* 0 */ CARRIER_0,
+    /* 0 */ CARRIER,       // Boss
-    /* 1 */ CARRIER_1,
+    /* 1 */ CARRIER_LEFT,  // Left launch bay
-    /* 2 */ CARRIER_2,
+    /* 2 */ CARRIER_UPPER, // Right upper launch bay
-    /* 3 */ CARRIER_3
+    /* 3 */ CARRIER_BOTTOM // Right lower launch bay
 } CarrierParts;
 
+typedef enum CoCarrierStates {
+    /* 0 */ CARRIER_STATE_0,
+    /* 1 */ CARRIER_STATE_1,
+    /* 2 */ CARRIER_STATE_2, // positioning
+    /* 3 */ CARRIER_STATE_3, // Close launch bays
+    /* 4 */ CARRIER_STATE_4, // Open left launch bay
+    /* 5 */ CARRIER_STATE_5, // open right launch bays
+    /* 6 */ CARRIER_STATE_6,
+    /* 7 */ CARRIER_STATE_7, // go around beam attack
+    /* 8 */ CARRIER_STATE_8, // Dying
+    /* 9 */ CARRIER_STATE_9, // Dying cutscene
+    /* 10 */ CARRIER_EXPLODE // BOOM!
+} CoCarrierStates;
+
 #endif

include/functions.h

@@ -10,14 +10,14 @@
 void AllRange_FortunaIntro(Player*);
 void AllRange_GetStarWolfHits(Actor*);
 void AllRange_DrawCountdown(void);
-void Boss309_Update(Boss*);
+void BoBase_Update(Boss*);
-void Boss309_Draw(Boss*);
+void BoBase_Draw(Boss*);
-void Boss310_Update(Boss*);
+void BoBaseShield_Update(Boss*);
-void Boss310_Draw(Boss*);
+void BoBaseShield_Draw(Boss*);
-void Actor271_Update(Actor*);
+void BoShieldReactor_Update(Actor*);
-void Actor271_Draw(Actor*);
+void BoShieldReactor_Draw(Actor*);
-void Actor272_Update(Actor*);
+void BoLaserCannon_Update(Actor*);
-void Actor272_Draw(Actor*);
+void BoLaserCannon_Draw(Actor*);
 bool AllRange_PlayMessage(u16*, RadioCharacterId);
 void AllRange_GreatFoxRepair(Player*);
 void AllRange_ClearRadio(void);
@@ -86,26 +86,26 @@ void ActorCutscene_Draw(Actor*);
 void Cutscene_DrawGreatFox(void);
 
 // fox_display
-void func_display_80053658(WingInfo*);
+void Display_ArwingWings(WingInfo*);
-void Play_DrawEngineGlow(s32);
+void Display_DrawEngineGlow(s32);
-void func_display_80057814(Player*);
+void Display_SetupPlayerSfxPos(Player*);
-void Play_Draw(void);
+void Display_Update(void);
 
 // fox_edata
-void Scenery48_Draw(Scenery*);
+void Ve1SceneryWall1_Draw(Scenery*);
-void Scenery49_Draw(Scenery*);
+void Ve1SceneryWall2_Draw(Scenery*);
 void Object_ApplyWaterDistortion(void);
-void Actor289_Draw(Actor*);
+void AndJamesTrigger_Draw(Actor*);
 
 // fox_edisplay
 void Graphics_SetScaleMtx(f32);
 void Sprite168_Draw(Sprite*);
-void Actor201_Draw(Actor*);
+void MeteoBall_Draw(Actor*);
-void Actor202_Draw(Actor*);
+void ActorHopBot_Draw(Actor*);
 void MeteoTunnel_Draw(Scenery*);
 void Scenery_DrawTitaniaBones(Scenery*);
 void CoIBeam_Draw(Scenery*);
-void Actor196_Draw(Actor*);
+void ActorMoleMissile_Draw(ActorMoleMissile*);
 void Sprite167_Draw(Sprite*);
 void FogShadow_Draw(Sprite*);
 void CoBuilding9_Draw(Scenery*);
@@ -114,12 +114,12 @@ void ActorDebris_Draw(Actor*);
 void Actor_DrawEngineAndContrails(Actor*);
 void Actor_DrawEngineGlow(Actor*, s32);
 void func_edisplay_8005B388(Actor*);
-void Actor180_Draw(Actor*);
+void MeMolarRock_Draw(Actor*);
-void Actor182_Draw(Actor*);
+void MeMeteor2_Draw(MeMeteor2*);
-void Actor186_Draw(Actor*);
+void MeLaserCannon1_Draw(MeLaserCannon1*);
-void Actor190_191_Draw(Actor*);
+void ActorMissileSeek_Draw(Actor*);
-void Actor192_Draw(Actor*);
+void ActorSkibot_Draw(ActorSkibot*);
-void Actor193_Draw(Actor*);
+void ActorRadar_Draw(CoRadar*);
 void ItemCheckpoint_Draw(Item*);
 void ItemSilverRing_Draw(Item*);
 void ItemSilverStar_Draw(Item*);
@@ -163,13 +163,13 @@ bool Object_CheckPolyCollision(Vec3f* , Vec3f* , ObjectId , Object* );
 s32 Object_CheckCollision(s32 index, Vec3f* pos, Vec3f* vel, s32 mode);
 void Scenery_UpdateTitaniaBones(Scenery*);
 void func_enmy_800654E4(Object*);
-void Actors190_191_Update(Actor*);
+void ActorMissileSeek_Update(Actor*);
 void func_enmy_800660F0(Actor*);
 void Actor_Despawn(Actor*);
-void Actor192_Update(Actor*);
+void ActorSkibot_Update(ActorSkibot*);
 void func_enmy_8006684C(Actor*);
-void Actor193_Update(Actor*);
+void ActorRadar_Update(CoRadar*);
-void Actor180_Update(Actor*);
+void MeMolarRock_Update(Actor*);
 void func_enmy_80066C00(Scenery*);
 void CoBuilding9_Update(Scenery*);
 void Sprite167_Update(Sprite*);
@@ -213,13 +213,13 @@ void Object_Update(void);
 void Actor237_Update(Actor*);
 void Actor237_Draw(Actor*);
 void CoWaterfall_Update(Scenery*);
-void Actor201_Update(Actor*);
+void MeteoBall_Update(Actor*);
-void Actor202_Update(Actor*);
+void ActorHopBot_Update(Actor*);
-void Actor194_Update(Actor*);
+void MeMora_Update(Actor*);
-void Actor194_Dying(Actor*);
+void MeMora_Dying(Actor*);
-void Actor194_Draw(Actor*);
+void MeMora_Draw(Actor*);
 void CoIBeam_Update(Scenery*);
-void Actor196_Update(Actor*);
+void ActorMoleMissile_Update(ActorMoleMissile*);
 void ActorDebris_Update(Actor*);
 void MeteoTunnel_Update(Scenery*);
 void Actor_SetupPlayerShot(PlayerShotId, PlayerShot*, s32, f32, f32, f32, f32, f32, f32, f32, f32, f32);
@@ -234,16 +234,16 @@ s32 Scenery111_Draw(Scenery*);
 void ActorEvent_Draw(Actor*);
 void func_enmy2_800763A4(Actor*);
 void ActorEvent_Dying(Actor*);
-void Actor234_Update(Actor*);
+void TiGreatFox_Update(Actor*);
-void Actor234_Draw(Actor*);
+void TiGreatFox_Draw(Actor*);
 
 // fox_effect
 s32 func_effect_80081B24(f32 xPos, f32 yPos, f32 zPos, f32 scale2);
 s32 BonusText_Display(f32 xPos, f32 yPos, f32 zPos, s32 hits);
 void BonusText_Update(void);
 void BonusText_DrawAll(void);
-Effect* func_effect_8007783C(ObjectId objId);
+Effect* Effect_Load(ObjectId objId);
-void func_effect_8007797C(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 scale2);
+void Effect_FireSmoke_Spawn2(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 scale2);
 void Effect_Effect372_Draw(Effect* );
 void Effect_Effect382_Draw(Effect* );
 void Effect_Effect388_Draw(Effect* );
@@ -261,77 +261,77 @@ void Effect_Effect346_Draw(Effect* );
 void Effect_Effect348_Draw(Effect* );
 void Effect_Effect355_Draw(Effect* );
 void Effect_Effect353_Draw(Effect*);
-void Macbeth_Effect377_Draw(Effect* );
+void Effect_Effect377_Draw(Effect* );
 void Effect_Effect356_Draw(Effect* );
-void Macbeth_Effect376_Draw(Effect* );
+void Effect_Effect376_Draw(Effect* );
-void func_effect_80078E50(f32 xPos, f32 yPos, f32 zPos, f32 scale2);
+void Effect_Effect393_Spawn(f32 xPos, f32 yPos, f32 zPos, f32 scale2);
 void Effect_Effect393_Update(Effect* );
 void Effect_Effect393_Draw(Effect* );
-void func_effect_800794CC(f32 xPos, f32 yPos, f32 zPos, f32 scale2);
+void Effect_Effect357_Spawn50(f32 xPos, f32 yPos, f32 zPos, f32 scale2);
-void func_effect_8007953C(f32 xPos, f32 yPos, f32 zPos, f32 scale2);
+void Effect_Effect357_Spawn80(f32 xPos, f32 yPos, f32 zPos, f32 scale2);
-void func_effect_800795AC(f32 xPos, f32 yPos, f32 zPos, f32 scale2);
+void Effect_Effect357_Spawn95(f32 xPos, f32 yPos, f32 zPos, f32 scale2);
 void func_effect_80079618(f32 xPos, f32 yPos, f32 zPos, f32 scale2);
 void Effect_Effect357_Update(Effect*);
 void Effect_Effect357_Draw(Effect* );
 void Effect_Effect383_Update(Effect* );
 void Effect_Effect383_Draw(Effect* );
-void func_effect_8007A568(f32 xPos, f32 yPos, f32 zPos, f32 scale1);
+void Effect_Effect383_Spawn(f32 xPos, f32 yPos, f32 zPos, f32 scale1);
 void Effect_SetupTimedSfxAtPos(Effect* , Vec3f* pos, u32 sfxId);
 void Effect_SpawnTimedSfxAtPos(Vec3f* pos, s32 sfxId);
 void Effect_TimedSfx_Update(Effect*);
 bool func_effect_8007A774(Player*, Effect*, f32);
-void func_effect_8007A900(f32 xPos, f32 yPos, f32 zPos, f32 scale1, u8, u8, u16);
+void Effect_Effect359_Spawn(f32 xPos, f32 yPos, f32 zPos, f32 scale1, u8, u8, u16);
 void Effect_Effect359_Update(Effect359*);
 void Effect_Effect359_Draw(Effect*);
 void Effect_Effect372_Update(Effect*);
-void func_effect_8007ACE0(f32 xPos, f32 yPos, f32 zPos, f32 scale2, f32 scale1, f32 yRot);
+void Effect_Effect372_Spawn1(f32 xPos, f32 yPos, f32 zPos, f32 scale2, f32 scale1, f32 yRot);
-void func_effect_8007ADF4(f32 xPos, f32 yPos, f32 zPos, f32 scale2, f32 scale1);
+void Effect_Effect372_Spawn2(f32 xPos, f32 yPos, f32 zPos, f32 scale2, f32 scale1);
-void func_effect_8007AFD0(f32 xPos, f32 zPos, f32 xVel, f32 zVel, f32 scale1);
+void Effect_Effect382_Spawn(f32 xPos, f32 zPos, f32 xVel, f32 zVel, f32 scale1);
 void Effect_Effect382_Update(Effect*);
 void Effect_Effect381_Update(Effect*);
-void func_effect_8007B228(f32 xPos, f32 yPos, f32 zPos, f32 scale1);
+void Effect_Effect381_Spawn(f32 xPos, f32 yPos, f32 zPos, f32 scale1);
-void func_effect_8007B344(f32 xPos, f32 yPos, f32 zPos, f32 scale1, s32 );
+void Effect_Effect384_Spawn(f32 xPos, f32 yPos, f32 zPos, f32 scale1, s32 );
 void Effect_Effect384_Update(Effect*);
-void func_effect_8007B550(f32 xPos, f32 yPos, f32 zPos, f32 scale1, s32 );
+void Effect_Effect385_Spawn(f32 xPos, f32 yPos, f32 zPos, f32 scale1, s32 );
 void Effect_Effect385_Update(Effect*);
 void Effect_Clouds_Update(Effect*);
 void Effect_Effect388_Update(Effect*);
 void Effect_Effect389_Update(Effect*);
 void Effect_Effect347_Update(Effect*);
-void func_effect_8007B8F8(f32 xPos, f32 yPos, f32 zPos, f32 scale2);
+void Effect_Effect364_Spawn(f32 xPos, f32 yPos, f32 zPos, f32 scale2);
 void Effect_Effect364_Update(Effect*);
-void func_effect_8007BC7C(f32 xPos, f32 yPos, f32 zPos, f32 scale2);
+void Effect_Effect362_Spawn(f32 xPos, f32 yPos, f32 zPos, f32 scale2);
 void Effect_Effect362_Update(Effect*);
 void Effect_Effect364_Draw(Effect*);
 void Effect_Effect361_Update(Effect*);
 void Effect_Effect360_Update(Effect*);
 void Effect_Effect360_361_362_Draw(Effect*);
-void func_effect_8007BFFC(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 scale2, s32 timer50);
+void Effect386_Spawn1(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 scale2, s32 timer50);
-void func_effect_8007C120(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 scale2, s32 timer50);
+void Effect_Effect390_Spawn(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 scale2, s32 timer50);
 void Effect_Effect386_Update(Effect*);
-void func_effect_8007C484(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 scale2, s32 arg7);
+void Effect_Effect389_Spawn(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 scale2, s32 arg7);
 void Effect_Effect390_Update(Effect*);
-void func_effect_8007C688(f32 xPos, f32 yPos, f32 zPos, f32 scale2, s32 timer50);
+void Effect_Effect387_Spawn(f32 xPos, f32 yPos, f32 zPos, f32 scale2, s32 timer50);
 void Effect_Effect387_Update(Effect*);
-void func_effect_8007C85C(f32 xPos, f32 yPos, f32 zPos, f32 scale2);
+void Effect_Effect343_Spawn(f32 xPos, f32 yPos, f32 zPos, f32 scale2);
 void Effect_Effect343_Update(Effect*);
 void Effect_Effect343_Draw(Effect*);
-void func_effect_8007CF30(f32 xPos, f32 yPos, f32 zPos, f32 scale2);
+void Effect_FireSmoke_Spawn(f32 xPos, f32 yPos, f32 zPos, f32 scale2);
 void func_effect_8007D074(f32 xPos, f32 yPos, f32 zPos, f32 scale2);
 void func_effect_8007D0E0(f32 xPos, f32 yPos, f32 zPos, f32 scale2);
 void func_effect_8007D10C(f32 xPos, f32 yPos, f32 zPos, f32 scale2);
-void func_effect_8007D1E0(f32 xPos, f32 yPos, f32 zPos, f32 scale2);
+void Effect_Effect341_Spawn(f32 xPos, f32 yPos, f32 zPos, f32 scale2);
 void func_effect_8007D24C(f32 xPos, f32 yPos, f32 zPos, f32 scale2);
 void func_effect_8007D2C8(f32 xPos, f32 yPos, f32 zPos, f32 scale2);
 void Effect_Effect339_Update(Effect*);
 void Effect_FireSmoke_Draw(Effect*);
 void Effect_Effect340_Update(Effect*);
 void Effect_Effect341_Update(Effect*);
-void func_effect_8007D9DC(f32 xPos, f32 yPos, f32 zPos, f32 scale2, f32 scale1, s32 timer50);
+void Effect_Effect367_Spawn(f32 xPos, f32 yPos, f32 zPos, f32 scale2, f32 scale1, s32 timer50);
 void Effect_Effect375_Update(Effect*);
-void Macbeth_Effect375_Draw(Effect*);
+void Effect_Effect375_Draw(Effect*);
 void Effect_Effect374_Update(Effect*);
-void Macbeth_Effect374_Draw(Effect*);
+void Effect_Effect374_Draw(Effect*);
 void Effect_Effect344_Update(Effect*);
 void Effect_Effect345_Update(Effect*);
 void Effect_Effect342_Update(Effect*);
@@ -364,10 +364,10 @@ void func_effect_80081A8C(f32 xPos, f32 yPos, f32 zPos, f32 scale2, s32 arg4);
 void func_effect_80081BEC(f32 xPos, f32 yPos, f32 zPos, f32 scale2, s32 arg4);
 void Effect_Effect395_Update(Effect*);
 void Effect_Effect395_Draw(Effect*);
-void func_effect_8008377C(f32, f32, f32, f32, f32);
+void Effect_Effect391_Spawn(f32, f32, f32, f32, f32);
 void Effect_Effect391_Update(Effect*);
 void Effect_Effect391_Draw(Effect*);
-void func_effect_80083C70(Effect* this, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 arg7, s32 arg8);
+void Effect_Effect399_Setup(Effect* this, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 arg7, s32 arg8);
 void func_effect_80083D2C(f32 xPos, f32 yPos, f32 zPos, f32 srcZ);
 void Effect_Effect399_Update(Effect*);
 void Effect_Effect399_Draw(Effect*);
@@ -386,8 +386,8 @@ void func_hud_80087530(f32, f32, s32);
 void func_hud_800884E4(void);
 void func_hud_80088564(void);
 void HUD_DrawStatusScreens(void);
-s32 Hud_MissileSeekModeCheck(s32);
+s32 ActorMissileSeek_ModeCheck(s32);
-void func_hud_8008AD94(void);
+void HUD_RadioCharacterName_Draw(void);
 void func_hud_8008B5B0(f32 x, f32 y);
 s32 func_hud_8008B774(void);
 void func_hud_8008BD00(u8*, s32, s32, u8);
@@ -404,11 +404,11 @@ void HUD_DrawCountdown(s32* , f32);
 void func_hud_8008E9EC(f32, f32);
 void func_hud_8008EA14(f32, f32);
 void HUD_Draw(void);
-void HUD_BossFO_Draw(Boss*);
+void HUD_FoBase_Draw(Boss*);
 void func_hud_8008FFF0(Boss*, s32);
-s32 func_hud_80090200(Boss* boss);
+s32 HUD_FoBase_ExplodeCs(Boss* this);
 bool func_hud_8009092C(Actor*);
-void HUD_BossFO_Update(Boss*);
+void HUD_FoBase_Update(Boss*);
 bool func_hud_800915FC(Actor*);
 bool func_hud_800924E0(Actor*);
 

include/global.h

@@ -5,14 +5,14 @@
 
 typedef enum OverlayCalls {
     /*  90 */ OVLCALL_FO_CS_COMPLETE = 90,
-    /*  91 */ OVLCALL_BOSS309_UPDATE,
+    /*  91 */ OVLCALL_BO_BASE_UPDATE,
-    /*  92 */ OVLCALL_BOSS309_DRAW,
+    /*  92 */ OVLCALL_BO_BASE_DRAW,
-    /*  93 */ OVLCALL_BOSS310_UPDATE,
+    /*  93 */ OVLCALL_BO_BASE_SHIELD_UPDATE,
-    /*  94 */ OVLCALL_BOSS310_DRAW,
+    /*  94 */ OVLCALL_BO_BASE_SHIELD_DRAW,
-    /*  95 */ OVLCALL_ACTOR271_UPDATE,
+    /*  95 */ OVLCALL_BO_SHIELD_REACTOR_UPDATE,
-    /*  96 */ OVLCALL_ACTOR271_DRAW,
+    /*  96 */ OVLCALL_BO_SHIELD_REACTOR_DRAW,
-    /*  97 */ OVLCALL_ACTOR272_UPDATE,
+    /*  97 */ OVLCALL_BO_LASER_CANNON_UPDATE,
-    /*  98 */ OVLCALL_ACTOR272_DRAW,
+    /*  98 */ OVLCALL_BO_LASER_CANNON_DRAW,
     /* 103 */ OVLCALL_TITLE_UPDATE = 103,
     /* 104 */ OVLCALL_TITLE_DRAW,
     /* 105 */ OVLCALL_MAP_UPDATE,

include/i1.h

@@ -8,15 +8,15 @@
 #include "sf64mesg.h"
 
 extern Gfx* D_VE1_8019A008[];
-extern f32 D_VE1_8019A9B8[];
+extern f32 aVe1GolemechHitbox[];
 
 extern void Corneria_LevelStart(Player*);
 extern void Corneria_LevelComplete1(Player*);
 extern void Venom1_LevelStart(Player*);
 
-void Corneria_Smoke_Update(Sprite*);
+void Corneria_CoSmoke_Update(Sprite*);
-void Corneria_Granga_Update(Granga*);
+void Corneria_CoGranga_Update(CoGranga*);
-void Corneria_Granga_Draw(Granga*);
+void Corneria_CoGranga_Draw(CoGranga*);
 void Corneria_CoGaruda1_Update(CoGaruda1*);
 void Corneria_CoGaruda2_Update(CoGaruda2*);
 void Corneria_CoGaruda3_Update(CoGaruda3*);
@@ -25,46 +25,46 @@ void Corneria_CoGaruda1_Draw(CoGaruda1*);
 void Corneria_CoGaruda2_Draw(CoGaruda2*);
 void Corneria_CoGaruda3_Draw(CoGaruda3*);
 void Corneria_CoGarudaDestroy_Draw(CoGarudaDestroy*);
-void Corneria_Carrier_Update(Carrier*);
+void Corneria_CoCarrier_Update(CoCarrier*);
-void Corneria_Boss294_Update(Boss294*);
+void Corneria_CarrierLeft_Update(CoCarrierLeft*);
-void Corneria_Boss295_Update(Boss295*);
+void Corneria_CarrierUpper_Update(CoCarrierUpper*);
-void Corneria_Boss296_Update(Boss296*);
+void Corneria_CarrierBottom_Update(CoCarrierBottom*);
-void Corneria_Carrier_Draw(Carrier*);
+void Corneria_CoCarrier_Draw(CoCarrier*);
-void Corneria_Boss294_Draw(Boss294*);
+void Corneria_CoCarrierLeft_Draw(CoCarrierLeft*);
-void Corneria_Boss295_Draw(Boss295*);
+void Corneria_CoCarrierUpper_Draw(CoCarrierUpper*);
-void Corneria_Boss296_Draw(Boss296*);
+void Corneria_CoCarrierBottom_Draw(CoCarrierBottom*);
-void Corneria_Doors_Update(Scenery*);
+void Corneria_CoDoors_Update(Scenery*);
-void Corneria_Doors_Draw(Scenery*);
+void Corneria_CoDoors_Draw(Scenery*);
 void Venom1_BossTrigger1_Update(Sprite*);
 void Venom1_BossTrigger2_Update(Sprite*);
 void Venom1_BossTrigger3_Update(Sprite*);
 void Venom1_BossTrigger4_Update(Sprite*);
-void Venom1_Actor280_Update(Actor*);
+void Venom1_Ve1Pillar1_Update(Actor*);
-void Venom1_Doodad_Update(Actor*);
+void Venom1_Pillar2_3_Update(Actor*);
-void Venom1_Actor281_Draw(Actor*);
+void Venom1_Ve1Pillar2_Draw(Actor*);
-void Venom1_Actor283_Update(Actor*);
+void Venom1_Ve1Pillar4_Update(Actor*);
-void Venom1_Actor284_Update(Actor*);
+void Venom1_Ve1MonkeyStatue_Update(Actor*);
-void Venom1_Actor284_Draw(Actor*);
+void Venom1_Ve1MonkeyStatue_Draw(Actor*);
-void Venom1_Scenery52_Update(Scenery*);
+void Venom1_Ve1Generator_Update(Scenery*);
-void Venom1_Boss_Update(Boss*);
+void Venom1_Ve1Golemech_Update(Boss*);
-void Venom1_Boss_Draw(Boss*);
+void Venom1_Ve1Golemech_Draw(Boss*);
 void Training_ItemRing_Update(Item*);
 
 void OvlI1_CallFunction(s32, void*);
-void Corneria_BuildingOnFire_Update(Scenery*);
+void Corneria_CoBuildingOnFire_Update(Scenery*);
-void Corneria_BuildingOnFire_Draw(Scenery*);
+void Corneria_CoBuildingOnFire_Draw(Scenery*);
 void Corneria_Granga_Init(Boss *);
-void Corneria_IBeam_Init(Actor *);
+void Corneria_CoIBeam_Init(Actor *);
-void Corneria_Carrier_Init(Carrier *);
+void Corneria_CoCarrier_Init(CoCarrier *);
-void Corneria_Boss294_Draw(Boss*);
+void Corneria_CoCarrierLeft_Draw(Boss*);
-void Venom1_Scenery127_Update(Scenery* );
+void Venom1_Ve1TempleEntrance_Update(Scenery* );
-void Venom1_8019250C(Actor *);
+void Venom1_Ve1Pillar1_Init(Actor *);
-void Venom1_80192CB0(Actor *);
+void Venom1_Ve1Pillar2_3_Init(Actor *);
-void Venom1_80192EA4(Actor *);
+void Venom1_Ve1Pillar4_Init(Actor *);
-void Venom1_801933B4(Actor *);
+void Venom1_Ve1MonkeyStatue_Init(Actor *);
-void Venom1_Boss319_Init(Boss *);
+void Venom1_Ve1Golemech_Init(Boss *);
-void Venom1_80198310(Boss *);
+void Venom1_Ve1Golemech_SetShadow(Boss *);
-void Venom1_80198594(Boss *);
+void Venom1_Ve1Golemech_Dying(Boss *);
 void Training_RingPassCount_Draw(void);
 void Training_Setup360(void);
 void Training_SpawnEnemies(void);

include/i2.h

@@ -15,34 +15,34 @@ void SectorX_LevelComplete(Player*);
 
 void OvlI2_CallFunction(s32, void*);
 void Meteo_80187B08(Actor *);
-void Meteo_Boss297_Init(Boss *);
+void Meteo_MeCrusher_Init(Boss *);
-void Meteo_8018CCF8(Actor *);
+void Meteo_Effect346_Spawn(Actor *);
 
-void Meteo_Actor181_Update(Actor*);
+void Meteo_MeMeteor1_Update(MeMeteor1*);
-void Meteo_Actor182_Update(Actor*);
+void Meteo_MeMeteor2_Update(MeMeteor2*);
-void Meteo_Actor187_Update(Actor*);
+void Meteo_MeLaserCannon1_Update(MeLaserCannon1*);
-void Meteo_Actor186_Update(Actor*);
+void Meteo_MeLaserCannon2_Update(MeLaserCannon2*);
-void Meteo_Boss298_Update(Boss*);
+void Meteo_MeCrusherShield_Update(Boss*);
-void Meteo_Boss298_Draw(Boss*);
+void Meteo_MeCrusherShield_Draw(Boss*);
 void Meteo_Effect369_Update(Effect*);
 void Meteo_Effect370_Update(Effect*);
 void Meteo_Effect371_Update(Effect*);
-void Meteo_Boss297_Update(Boss*);
+void Meteo_MeCrusher_Update(Boss*);
-void Meteo_Boss297_Draw(Boss*);
+void Meteo_MeCrusher_Draw(Boss*);
-void Meteo_ActorDoodad_Update(Actor*);
+void Meteo_MeteorShower_Update(Actor*);
-void Meteo_Actor183_Draw(Actor*);
+void Meteo_MeMeteorShower1_Draw(Actor*);
-void Meteo_Actor184_Draw(Actor*);
+void Meteo_MeMeteorShower2_Draw(Actor*);
-void Meteo_Actor185_Draw(Actor*);
+void Meteo_MeMeteorShower3_Draw(Actor*);
 void Meteo_Effect370_Draw(Effect*);
 void Meteo_Effect369_Draw(Effect*);
 void Meteo_Effect371_Draw(Effect*);
-void SectorX_Slippy_Update(Actor*);
+void SectorX_SxSlippy_Update(Actor*);
-void SectorX_Slippy_Draw(Actor*);
+void SectorX_SxSlippy_Draw(Actor*);
-void SectorX_Boss304_Update(Boss*);
+void SectorX_SxSpyborgLeftArm_Update(Boss*);
-void SectorX_Boss305_Update(Boss*);
+void SectorX_SxSpyborgRightArm_Update(Boss*);
-void SectorX_Boss304_Draw(Boss*);
+void SectorX_SxSpyborgLeftArm_Draw(Boss*);
-void SectorX_Boss305_Draw(Boss*);
+void SectorX_SxSpyborgRightArm_Draw(Boss*);
-void SectorX_Boss_Update(Boss*);
+void SectorX_SxSpyborg_Update(Boss*);
-void SectorX_Boss_Draw(Boss*);
+void SectorX_SxSpyborg_Draw(Boss*);
 
 #endif

include/i3.h

@@ -9,7 +9,7 @@
 
 extern f32 D_AQ_801C4188;
 
-void Aquas_801BE034(Actor*);
+void Aquas_CsAqFishGroup_Update(Actor*);
 
 void Area6_8018DA58(Actor*);
 void Zoness_8019E5F0(Actor*);
@@ -17,132 +17,132 @@ void Aquas_BlueMarineDown(Player*);
 void Aquas_801BE0F0(Actor*);
 
 void OvlI3_CallFunction(s32, void*);
-void Area6_BossA6_Init(Boss *);
+void Area6_A6Gorgon_Init(Boss *);
-void Area6_Boss_Update(Boss*);
+void Area6_A6Gorgon_Update(Boss*);
-void Area6_Boss_Draw(Boss*);
+void Area6_A6Gorgon_Draw(Boss*);
 void Area6_LevelStart(Player *player);
 void Area6_LevelComplete(Player*);
 
-void Zoness_SpawnDebris(Vec3f*, Vec3f*, f32, f32, f32, s32, f32, s32, s32);
+void Zoness_ActorDebris_Spawn(Vec3f*, Vec3f*, f32, f32, f32, s32, f32, s32, s32);
-void Zoness_Actor235_Draw(Actor235* this);
+void Zoness_ZoBird_Draw(ZoBird* this);
-void Zoness_Actor235_Update(Actor235* this);
+void Zoness_ZoBird_Update(ZoBird* this);
-void Zoness_Actor236_Update(Actor* this);
+void Zoness_ZoDodora_Update(Actor* this);
-void Zoness_Actor236_Draw(Actor* this);
+void Zoness_ZoDodora_Draw(Actor* this);
-void Zoness_Actor238_Update(Actor* this);
+void Zoness_ZoFish_Update(Actor* this);
-void Zoness_Actor238_Draw(Actor* this);
+void Zoness_ZoFish_Draw(Actor* this);
-void Zoness_801915A4(Actor* this);
+void Zoness_ZoEnergyBall_Init(Actor* this);
-void Zoness_Actor240_Update(Actor* this);
+void Zoness_ZGull_Update(Actor* this);
-void Zoness_Actor240_Draw(Actor* this);
+void Zoness_ZGull_Draw(Actor* this);
-void Zoness_80191BB8(Actor* actor);
+void Zoness_ZoEnergyBall_Init2(Actor* actor);
-void Zoness_Actor241_Update(Actor* this);
+void Zoness_ZoEnergyBall_Update(Actor* this);
-void Zoness_Actor241_Draw(Actor* this);
+void Zoness_ZoEnergyBall_Draw(Actor* this);
-void Zoness_Actor241_Draw(Actor* this);
+void Zoness_ZoEnergyBall_Draw(Actor* this);
-void Zoness_Actor242_Draw(Actor* this);
+void Zoness_ZoTroika_Draw(Actor* this);
-void Zoness_Actor242_Update(Actor* this);
+void Zoness_ZoTroika_Update(Actor* this);
-void Zoness_Actor243_Update(Actor* this);
+void Zoness_ZoShrimp_Update(Actor* this);
-void Zoness_Actor243_Draw(Actor* this);
+void Zoness_ZoShrimp_Draw(Actor* this);
-void Zoness_Actor244_Update(Actor* this);
+void Zoness_ZoObnema_Update(Actor* this);
-void Zoness_Actor244_Draw(Actor* actor);
+void Zoness_ZoObnema_Draw(Actor* actor);
-void Zoness_BossZo_Init(Boss* this);
+void Zoness_ZoSarumarine_Init(Boss* this);
-void Zoness_Boss_Draw(Boss* this);
+void Zoness_ZoSarumarine_Draw(Boss* this);
-void Zoness_Boss_Update(Boss* this);
+void Zoness_ZoSarumarine_Update(Boss* this);
-void Zoness_Actor245_Update(Actor245* this);
+void Zoness_ZoBall_Update(ZoBall* this);
-void Zoness_Actor245_Draw(Actor* actor);
+void Zoness_ZoBall_Draw(Actor* actor);
-void Zoness_Actor246_Update(Actor* this);
+void Zoness_ZoMine_Update(Actor* this);
-void Zoness_Actor246_Draw(Actor246* actor);
+void Zoness_ZoMine_Draw(ZoMine* actor);
-void Zoness_Actor248_Update(Actor* this);
+void Zoness_ZoCraneMagnet_Update(Actor* this);
-void Zoness_Actor248_Draw(Actor* this);
+void Zoness_ZoCraneMagnet_Draw(Actor* this);
-void Zoness_Actor249_Update(Actor* this);
+void Zoness_ZoSpikeBall_Update(Actor* this);
-void Zoness_Actor249_Draw(Actor* this);
+void Zoness_ZoSpikeBall_Draw(Actor* this);
-void Zoness_8019B1F0(Actor* actor);
+void Zoness_ZoCargoShip_Init(Actor* actor);
-void Zoness_Actor250_Update(Actor* this);
+void Zoness_ZoCargoShip_Update(Actor* this);
-void Zoness_Actor250_Draw(Actor* actor);
+void Zoness_ZoCargoShip_Draw(Actor* actor);
-void Zoness_8019B810(Actor* this);
+void Zoness_ZoContainer_Init(Actor* this);
-void Zoness_Actor251_Update(Actor* this);
+void Zoness_ZoContainer_Update(Actor* this);
-void Zoness_Actor251_Draw(Actor* this);
+void Zoness_ZoContainer_Draw(Actor* this);
-void Zoness_Actor252_Update(Actor* this);
+void Zoness_ZoRadarBuoy_Update(Actor* this);
-void Zoness_Actor252_Draw(Actor* actor);
+void Zoness_ZoRadarBuoy_Draw(Actor* actor);
-void Zoness_8019C200(Actor* this);
+void Zoness_ZoSupplyCrane_Init(Actor* this);
-void Zoness_Actor253_Update(Actor* this);
+void Zoness_ZoSupplyCrane_Update(Actor* this);
-void Zoness_Actor253_Draw(Actor* this);
+void Zoness_ZoSupplyCrane_Draw(Actor* this);
-void Zoness_Actor254_Update(Actor* this);
+void Zoness_ZoSearchLight_Update(Actor* this);
-void Zoness_Actor254_Draw(Actor* this);
+void Zoness_ZoSearchLight_Draw(Actor* this);
-void Zoness_Actor247_Init(Actor* this);
+void Zoness_ZoBarrier_Init(Actor* this);
-void Zoness_Actor247_Update(Actor* this);
+void Zoness_ZoBarrier_Update(Actor* this);
-void Zoness_Actor247_Draw(Actor* this);
+void Zoness_ZoBarrier_Draw(Actor* this);
 void Zoness_LevelStart(Player* player);
 void Zoness_LevelComplete(Player* player);
 
 void Solar_8019E8B8(f32, f32, f32, f32);
 void Solar_8019E9F4(f32, f32, f32, f32, f32, f32, f32, s32);
-void Solar_Actor278_Update(Actor278*);
+void Solar_SoWave_Update(SoWave*);
-void Solar_Doodad_Update(Actor*);
+void Solar_SoRock_Update(Actor*);
-void Solar_Doodad_Draw(Actor*);
+void Solar_SoRock_Draw(Actor*);
-void Solar_Actor279_Update(Actor279*);
+void Solar_SoProminence_Update(SoProminence*);
 void Solar_Effect392_Update(Effect392*);
 void Solar_Effect392_Draw(Effect392*);
 void Solar_LevelStart(Player* player);
-void Solar_Boss_Update(BossSO*);
+void Solar_SoVulkain_Update(SoVulkain*);
-void Solar_Boss_Draw(BossSO*);
+void Solar_SoVulkain_Draw(SoVulkain*);
 void Solar_801A8BE8(ActorCutscene*);
 void Solar_LevelComplete(Player* player);
 
-void Aquas_801A9824(void);
+void Aquas_InitLevel(void);
 void Aquas_801AA20C(void);
 void Aquas_UpdateCamera(Player*);
 void Aquas_BlueMarineMove(Player*);
 void Aquas_801ABA40(PlayerShot*);
 void Aquas_BlueMarineShoot(Player*);
-void Aquas_801AC8A8(f32, f32, f32, f32, s32);
+void Aquas_Effect366_Spawn(f32, f32, f32, f32, s32);
 void Aquas_Effect366_Update(Effect*);
-void Aquas_801ACBB4(Player*);
+void Aquas_BlueMarine_Draw(Player*);
 void Aquas_BlueMarineBoost(Player*);
 void Aquas_BlueMarineBrake(Player*);
-void Aquas_801AD688(Actor *);
+void Aquas_Actor255_Init(Actor *);
 void Aquas_Actor255_Update(Actor*);
 void Aquas_Actor255_Draw(Actor*);
-void Aquas_801AE3AC(Actor *);
+void Aquas_Actor256_Init(Actor *);
 void Aquas_Actor256_Update(Actor*);
 void Aquas_Actor256_Draw(Actor*);
-void Aquas_801AF9FC(Actor *);
+void Aquas_Actor257_Init(Actor *);
 void Aquas_Actor257_Update(Actor*);
 void Aquas_Actor257_Draw(Actor*);
-void Aquas_Actor258_Update(Actor*);
+void Aquas_AqPearl_Update(Actor*);
-void Aquas_Actor258_Draw(Actor*);
+void Aquas_AqPearl_Draw(Actor*);
-void Aquas_BossAq_Init(Boss*);
+void Aquas_AqBacoon_Init(Boss*);
-void Aquas_Boss_Update(Boss*);
+void Aquas_AqBacoon_Update(Boss*);
-void Aquas_Boss_Draw(Boss*);
+void Aquas_AqBacoon_Draw(Boss*);
-void Aquas_Actor261_Draw(Actor*);
+void Aquas_AqSculpin_Draw(Actor*);
-void Aquas_Actor261_Update(Actor*);
+void Aquas_AqSculpin_Update(Actor*);
-void Aquas_Actor259_Draw(Actor*);
+void Aquas_AqAnglerFish_Draw(Actor*);
-void Aquas_801B6344(Actor *);
+void Aquas_AqAnglerFish_Init(Actor *);
-void Aquas_Actor259_Update(Actor*);
+void Aquas_AqAnglerFish_Update(Actor*);
-void Aquas_801B6E54(Actor *);
+void Aquas_AqSpindlyFish_Init(Actor *);
-void Aquas_Actor262_Update(Actor*);
+void Aquas_AqSpindlyFish_Update(Actor*);
-void Aquas_Actor262_Draw(Actor*);
+void Aquas_AqSpindlyFish_Draw(Actor*);
-void Aquas_801B7AF0(Actor *);
+void Aquas_AqGaroa_Init(Actor *);
-void Aquas_Actor260_Update(Actor*);
+void Aquas_AqGaroa_Update(Actor*);
-void Aquas_Actor260_Draw(Actor*);
+void Aquas_AqGaroa_Draw(Actor*);
-void Aquas_Actor263_Update(Actor*);
+void Aquas_AqSquid_Update(Actor*);
-void Aquas_Actor263_Draw(Actor*);
+void Aquas_AqSquid_Draw(Actor*);
-void Aquas_Actor264_Update(Actor*);
+void Aquas_AqSeaweed_Update(Actor*);
-void Aquas_Actor264_Draw(Actor*);
+void Aquas_AqSeaweed_Draw(Actor*);
-void Aquas_801BA57C(Actor *);
+void Venom1_AqBoulder_Init(Actor *);
-void Aquas_Actor265_Update(Actor*);
+void Aquas_AqBoulder_Update(Actor*);
-void Aquas_Actor265_Draw(Actor*);
+void Aquas_AqBoulder_Draw(Actor*);
-void Aquas_Actor266_Update(Actor*);
+void Aquas_AqCoral_Update(Actor*);
-void Aquas_Actor266_Draw(Actor*);
+void Aquas_AqCoral_Draw(Actor*);
-void Aquas_801BB26C(Actor *);
+void Venom1_AqJellyfish_Init(Actor *);
-void Aquas_Actor267_Update(Actor*);
+void Aquas_AqJellyfish_Update(Actor*);
-void Aquas_Actor267_Draw(Actor*);
+void Aquas_AqJellyfish_Draw(Actor*);
-void Aquas_Actor269_Update(Actor*);
+void Aquas_AqStoneColumn_Update(Actor*);
-void Aquas_Actor269_Draw(Actor*);
+void Aquas_AqStoneColumn_Draw(Actor*);
-void Aquas_Actor268_Update(Actor*);
+void Aquas_AqFishGroup_Update(Actor*);
-void Aquas_Actor268_Draw(Actor*);
+void Aquas_AqFishGroup_Draw(Actor*);
 void Aquas_801BDF14(void);
-void Aquas_Scenery126_Draw(Scenery*);
+void Aquas_AqBump2_Draw(Scenery*);
-void Aquas_Actor270_Update(Actor*);
+void Aquas_AqOyster_Update(Actor*);
-void Aquas_Actor270_Draw(Actor*);
+void Aquas_AqOyster_Draw(Actor*);
 void Aquas_Boss301_Update(Boss*);
 void Aquas_Boss301_Draw(Boss*);
 void Aquas_Actor188_Update(Actor*);

include/i4.h

@@ -23,9 +23,9 @@ void OvlI4_CallFunction(u32, void*);
 void Fortuna_UpdateEvents(Actor*);
 void Fortuna_LoadLevelObjects(void);
 void Bolse_UpdateEventHandler(Actor*);
-void Bolse_80191ED8(void);
+void Bolse_LoadLevelObjects(void);
 void Bolse_DrawDynamicGround(void);
-void Katina_BossSetup(Boss *);
+void Katina_KaSaucerer_Init(Boss *);
 void Katina_UpdateEvents(Actor*);
 void Katina_Init(void);
 void SectorZ_MissileExplode(ActorAllRange* this, bool shotDown);
@@ -33,21 +33,21 @@ void SectorZ_Missile_Update(Actor*);
 void SectorZ_UpdateEvents(Actor*);
 void SectorZ_LoadLevelObjects(void);
 
-void Fortuna_Radar_Update(Actor*);
+void Fortuna_FoRadar_Update(Actor*);
-void Fortuna_Radar_Draw(Actor*);
+void Fortuna_FoRadar_Draw(Actor*);
 void Bolse_Effect397_Update(Effect*);
 void Bolse_Effect397_Draw(Effect*);
-void Bolse_Boss311_Update(Boss*);
+void Bolse_BoBaseCore_Update(Boss*);
-void Bolse_Boss311_Draw(Boss*);
+void Bolse_BoBaseCore_Draw(Boss*);
 void Katina_LaserEnergyParticlesUpdate(Effect*);
 void Katina_LaserEnergyParticlesDraw(Effect*);
-void Katina_BaseUpdate(Boss*);
+void Katina_KaFrontlineBase_Update(Boss*);
-void Katina_Base_Draw(Boss*);
+void Katina_KaFrontlineBase_Draw(Boss*);
-void Katina_BossUpdate(Boss*);
+void Katina_KaSaucerer_Update(Boss*);
-void Katina_BossDraw(Boss*);
+void Katina_KaSaucerer_Draw(Boss*);
 void SectorZ_SpaceJunkUpdate(Actor*);
 void SectorZ_SpaceJunkDraw(Actor*);
-void SectorZ_GreatFoxUpdate(Boss*);
+void SectorZ_SzGreatFox_Update(Boss*);
-void SectorZ_GreatFoxDraw(Boss*);
+void SectorZ_SzGreatFox_Draw(Boss*);
 
 #endif

include/i5.h

@@ -11,7 +11,7 @@
 extern Gfx* D_TI_801B7584[];
 extern Gfx* D_TI_801B7608[];
 extern Gfx* D_TI_801B769C[];
-extern f32 D_TI_801B83A8[];
+extern f32 aTiGorasHitbox[];
 extern u8 D_MA_801BA1E8;
 extern f32 D_MA_801BE250[40];
 extern s16 D_MA_801BE2F0[9];
@@ -26,27 +26,27 @@ void Macbeth_LevelComplete1(Player*);
 void OvlI5_CallFunction(u32 mode, void* ptr);
 void Titania_LevelStart(Player *);
 void Titania_80188F30(void);
-void Titania_80189B80(Actor *);
+void Titania_TiFekuda_Init(Actor *);
-void Titania_8018ADC4(Actor *);
+void Titania_TiRasco_Init(Actor *);
-void Titania_8018B720(Actor *);
+void Titania_TiRasco_Dying(Actor *);
-void Titania_Actor231_Init(Actor *);
+void Titania_TiBomb_Init(Actor *);
-void Titania_8018BFB0(Actor *);
+void Titania_TiDesertCrawler_Init(Actor *);
 void Titania_8018E3B0(Actor *);
-void Titania_8018E3CC(Actor *);
+void Titania_TiDelphor_Init(Actor *);
-void Titania_8018E5E8(Actor *);
+void Titania_TiDelphorHead_Init(Actor *);
-void Titania_8018EFF0(Sprite *);
+void Titania_TiCactus_Init(Sprite *);
-void Titania_8018F0D8(Scenery *);
+void Titania_TiPillar_Init(Scenery *);
-void Titania_Boss306_Init(Boss *);
+void Titania_TiGoras_Init(Boss *);
 void Titania_801990DC(Boss *);
-void Macbeth_80199920(void);
+void Macbeth_InitLevel(void);
-void Macbeth_80199F8C(Actor *);
+void Macbeth_Train_Init(Actor *);
-void Macbeth_801A3E70(Actor *);
+void Macbeth_MaMaRailroadSwitch_Init(Actor *);
-void Macbeth_801A4660(Actor *);
+void Macbeth_MaBoulder_Init(Actor *);
-void Macbeth_801A4AF8(Actor *);
+void Macbeth_MaRailwaySignal_Init(Actor *);
-void Macbeth_801A5E2C(Actor *);
+void Macbeth_LockBars_Init(Actor *);
-void Macbeth_801A6134(Actor *);
+void Macbeth_MaBarrier_Init(Actor *);
-void Macbeth_801A65E0(Scenery *);
+void Macbeth_MaProximityLight_Init(Scenery *);
-void Macbeth_801A7D98(Actor *);
+void Macbeth_Actor207_Init(Actor *);
 void Macbeth_801ACFBC(void);
 void Macbeth_801AD080(void);
 void Ground_801B5110(f32, f32, f32);
@@ -54,80 +54,80 @@ void Ground_801B58AC(Gfx **, f32);
 bool Ground_801B6AEC(f32, f32, f32);
 s32 Ground_801B6E20(f32, f32, f32 *, f32 *, f32 *);
 void Macbeth_801AD144(PlayerShot*);
-void Titania_80189120(f32, f32, f32, f32, f32);
+void Titania_Effect368_Spawn(f32, f32, f32, f32, f32);
 bool Macbeth_801A3C20(f32);
 bool Macbeth_801A3300(Player*, f32, f32);
 bool Macbeth_801A3790(Player*, f32, f32);
 
 void Titania_Effect368_Update(Effect*);
 void Titania_Effect368_Draw(Effect*);
-void Titania_Actor224_Update(Actor*);
+void Titania_TiTerrain_Update(Actor*);
-void Titania_Actor226_Update(Actor*);
+void Titania_TiDesertRover_Update(Actor*);
-void Titania_Actor226_Draw(Actor*);
+void Titania_TiDesertRover_Draw(Actor*);
-void Titania_Actor233_Update(Actor*);
+void Titania_TiFekuda_Update(Actor*);
-void Titania_Actor233_Draw(Actor*);
+void Titania_TiFekuda_Draw(Actor*);
-void Titania_Actor230_Update(Actor*);
+void Titania_TiBoulder_Update(Actor*);
-void Titania_Actor230_Draw(Actor*);
+void Titania_TiBoulder_Draw(Actor*);
-void Titania_Actor225_Update(Actor*);
+void Titania_TiLandmine_Update(Actor*);
-void Titania_Actor232_Update(Actor*);
+void Titania_TiRasco_Update(Actor*);
-void Titania_Actor232_Draw(Actor*);
+void Titania_TiRasco_Draw(Actor*);
-void Titania_Actor231_Update(Actor*);
+void Titania_TiBomb_Update(Actor*);
-void Titania_Actor231_Draw(Actor*);
+void Titania_TiBomb_Draw(Actor*);
-void Titania_Actor229_Update(Actor*);
+void Titania_TiDesertCrawler_Update(Actor*);
-void Titania_Actor229_Draw(Actor*);
+void Titania_TiDesertCrawler_Draw(Actor*);
-void Titania_Actor227_Update(Actor*);
+void Titania_TiDelphor_Update(Actor*);
-void Titania_Actor227_Draw(Actor*);
+void Titania_TiDelphor_Draw(Actor*);
-void Titania_Actor228_Update(Actor*);
+void Titania_TiDelphorHead_Update(Actor*);
-void Titania_Actor228_Draw(Actor*);
+void Titania_TiDelphorHead_Draw(Actor*);
 void Titania_Cactus_Update(Sprite*);
-void Titania_Scenery57_Update(Scenery*);
+void Titania_TiPillar_Update(Scenery*);
-void Titania_Scenery57_Draw(Scenery*);
+void Titania_TiPillar_Draw(Scenery*);
-void Titania_Boss_Update(Boss*);
+void Titania_TiGoras_Update(Boss*);
-void Titania_Boss_Draw(Boss*);
+void Titania_TiGoras_Draw(Boss*);
-void Macbeth_Actor205_Update(Actor*);
+void Macbeth_MaLocomotive_Update(Actor*);
-void Macbeth_Actor210_Update(Actor*);
+void Macbeth_MaTrainCar4_Update(Actor*);
-void Macbeth_Actor209_Update(Actor*);
+void Macbeth_MaTrainCar3_Update(Actor*);
-void Macbeth_Actor211_Update(Actor*);
+void Macbeth_MaTrainCar5_Update(Actor*);
-void Macbeth_Actor208_Update(Actor*);
+void Macbeth_MaTrainCar2_Update(Actor*);
-void Macbeth_Actor213_Update(Actor*);
+void Macbeth_MaTrainCar7_Update(Actor*);
-void Macbeth_Actor212_Update(Actor*);
+void Macbeth_MaTrainCar6_Update(Actor*);
-void Macbeth_Scenery104_Update(Scenery*);
+void Macbeth_MaSwitchTrack_Update(Scenery*);
-void Macbeth_ActorDoodad_Draw(Actor*);
+void Macbeth_Train_Draw(Actor*);
-void Macbeth_SceneryDoodad_Draw(Scenery*);
+void Macbeth_TrainTrack_Draw(Scenery*);
-void Macbeth_Scenery61_Draw(Scenery*);
+void Macbeth_MaTower_Draw(Scenery*);
-void Macbeth_SceneryDoodad2_Draw(Scenery*);
+void Macbeth_IndicatorSign_Draw(Scenery*);
-void Macbeth_Scenery83_Update(Scenery*);
+void Macbeth_MaTrainStopBlock_Update(Scenery*);
-void Macbeth_Scenery83_Draw(Scenery*);
+void Macbeth_MaTrainStopBlock_Draw(Scenery*);
-void Macbeth_Actor214_Update(Actor*);
+void Macbeth_MaRailroadSwitch_Update(Actor*);
-void Macbeth_Actor214_Draw(Actor*);
+void Macbeth_MaRailroadSwitch_Draw(Actor*);
-void Macbeth_Actor215_Update(Actor*);
+void Macbeth_MaBoulder_Update(Actor*);
-void Macbeth_Actor215_Draw(Actor*);
+void Macbeth_MaBoulder_Draw(Actor*);
-void Macbeth_Actor223_Update(Actor*);
+void Macbeth_MaRailwaySignal_Update(Actor*);
-void Macbeth_Actor223_Draw(Actor*);
+void Macbeth_MaRailwaySignal_Draw(Actor*);
 void Macbeth_Effect378_Update(Effect*);
 void Macbeth_Effect378_Draw(Effect*);
 void Macbeth_Effect380_Update(Effect*);
 void Macbeth_Effect380_Draw(Effect*);
-void Macbeth_Actor216_Update(Actor*);
+void Macbeth_MaHorizontalLockBar_Update(Actor*);
-void Macbeth_Actor216_Draw(Actor*);
+void Macbeth_MaHorizontalLockBar_Draw(Actor*);
-void Macbeth_Actor217_Update(Actor*);
+void Macbeth_MaVerticalLockBar_Update(Actor*);
-void Macbeth_Actor217_Draw(Actor*);
+void Macbeth_MaVerticalLockBar_Draw(Actor*);
-void Macbeth_Actor218_Update(Actor*);
+void Macbeth_MaBarrier_Update(Actor*);
-void Macbeth_Actor218_Draw(Actor*);
+void Macbeth_MaBarrier_Draw(Actor*);
-void Macbeth_Scenery65_Draw(Scenery*);
+void Macbeth_MaProximityLight_Draw(Scenery*);
 void Macbeth_Actor219_Update(Actor*);
 void Macbeth_Actor219_Draw(Actor*);
 void Macbeth_Actor207_Update(Actor*);
 void Macbeth_Actor207_Draw(Actor*);
-void Macbeth_Actor206_Update(Actor*);
+void Macbeth_MaTrainCar1_Update(Actor*);
-void Macbeth_Actor220_Update(Actor*);
+void Macbeth_MaBombDrop_Update(Actor*);
-void Macbeth_Actor220_Draw(Actor*);
+void Macbeth_MaBombDrop_Draw(Actor*);
-void Macbeth_Actor221_Update(Actor*);
+void Macbeth_MaSpear_Update(Actor*);
-void Macbeth_Actor221_Draw(Actor*);
+void Macbeth_MaSpear_Draw(Actor*);
 void Macbeth_Effect379_Update(Effect*);
 void Macbeth_Effect379_Draw(Effect*);
-void Macbeth_Actor222_Update(Actor*);
+void Macbeth_MaShockBox_Update(Actor*);
-void Macbeth_Actor222_Draw(Actor*);
+void Macbeth_MaShockBox_Draw(Actor*);
 s32 Macbeth_801A55D4(s32 , Vec3f* , Vec3f* , s32 );
 
 #endif

include/i6.h

@@ -29,44 +29,44 @@ void Andross_801888F4(Actor *);
 void Andross_80189214(void);
 void Andross_8018BDD8(void);
 void Andross_8018C390(Player*);
-void Andross_Boss320_Init(Boss *);
+void Andross_AndAndross_Init(Boss *);
 void Andross_801961AC(void);
 void Venom2_UpdateEvents(Actor*);
 void Venom2_LoadLevelObjects(void);
-void SectorY_Boss314_Init(Boss *);
+void SectorY_SyShogun_Init(Boss *);
-void SectorY_Actor204_Update(Actor*);
+void SectorY_SyRobot_Update(Actor*);
-void SectorY_Actor204_Draw(Actor*);
+void SectorY_SyRobot_Draw(Actor*);
 void Turret_Update(Player*);
 void Turret_UpdateCamera(Player*);
 void Turret_Draw(Player *);
 
 void Andross_Actor199_Update(Actor*);
 void Andross_Actor199_Draw(Actor*);
-void Andross_Actor286_Update(Actor*);
+void Andross_AndBrainWaste_Update(Actor*);
-void Andross_Actor286_Draw(Actor*);
+void Andross_AndBrainWaste_Draw(Actor*);
-void Andross_Actor290_Update(Actor*);
+void Andross_AndBossTimer_Update(Actor*);
-void Andross_Actor288_Update(Actor*);
+void Andross_AndRadio_Update(Actor*);
-void Andross_Actor289_Update(Actor*);
+void Andross_AndJamesTrigger_Update(Actor*);
-void Andross_Actor287_Update(Actor*);
+void Andross_AndExplosion_Update(Actor*);
-void Andross_Boss321_Update(Boss*);
+void Andross_AndBrain_Update(Boss*);
-void Andross_Boss321_Draw(Boss*);
+void Andross_AndBrain_Draw(Boss*);
 void Andross_Effect396_Update(Effect*);
 void Andross_Effect396_Draw(Effect*);
-void Andross_Boss320_Update(Boss*);
+void Andross_AndAndross_Update(Boss*);
-void Andross_Boss320_Draw(Boss*);
+void Andross_AndAndross_Draw(Boss*);
-void Andross_Actor285_Update(Actor*);
+void Andross_AndLaserEmitter_Update(Actor*);
-void Andross_Actor285_Draw(Actor*);
+void Andross_AndLaserEmitter_Draw(Actor*);
-void Andross_Scenery132_Update(Scenery*);
+void Andross_AndDoor_Update(Scenery*);
-void Andross_Scenery132_Draw(Scenery*);
+void Andross_AndDoor_Draw(Scenery*);
-void Andross_Scenery131_Update(Scenery*);
+void Andross_AndPassage_Update(Scenery*);
-void Andross_Scenery131_Draw(Scenery*);
+void Andross_AndPassage_Draw(Scenery*);
-void Venom2_Boss_Update(Boss*);
+void Venom2_Ve2Base_Update(Boss*);
-void Venom2_Boss_Draw(Boss*);
+void Venom2_Ve2Base_Draw(Boss*);
 void SectorY_Effect354_Draw(Effect*);
 void SectorY_Scenery156_Draw(Scenery*);
-void SectorY_Boss_Update(Boss*);
+void SectorY_SyShogun_Update(Boss*);
-void SectorY_Boss_Draw(Boss*);
+void SectorY_SyShogun_Draw(Boss*);
-void SectorY_Scenery109_Update(Scenery*);
+void SectorY_SyShip3Destroyed_Update(Scenery*);
-void SectorY_Scenery112_Update(Scenery*);
+void SectorY_SyShip4Destroyed_Update(Scenery*);
 
 #endif

include/mods.h

@@ -1,6 +1,7 @@
 #ifndef MODS_H
 #define MODS_H
 
+
 /**
  * Quick Boot:
  * Define this variable to a game state to boot into that
@@ -53,9 +54,23 @@
  * Use D-Pad to move the cursor and change values
  * Press L to edit the highlighted value
  */
-
 #define MODS_RAM_MOD 0
 
+/**
+ * Spawner:
+ * Spawn Scenery, Actors, Bosses, Sprites, Items, Effects or even Event Actors.
+ * 
+ * Controls:
+ * D-Pad left and right to set the object Id.
+ * C-Right to change between spawn modes.
+ * Analog stick sets the spawn position.
+ * L-Trigger to spawn the object.
+ * D-Pad UP to kill all objects.
+ * D-Pad DOWN to freeze/unfreeze the ship speed.
+ * WARNING: Spawning an object that's not loaded in memory will likely result in a crash.
+ */
+#define MODS_SPAWNER 0
+
 /* ************************* */
 
 #if MODS_LEVEL_SELECT == 1
@@ -70,4 +85,8 @@ static void Play_RenderFps(void);
 void RamMod_Update(void);
 #endif
 
+#if MODS_SPAWNER == 1
+void Spawner(void);
+#endif
+
 #endif

include/sf64audio_provisional.h

@@ -821,7 +821,14 @@ typedef struct {
 } AudioSlowLoadBuffer; // size = 0xC4
 
 typedef struct {
-    /* 0x00 */ u32 romAddr;
+    /* 0x00 */ s16 numEntries;
+    /* 0x02 */ s16 unkMediumParam;
+    /* 0x04 */ uintptr_t romAddr;
+    /* 0x08 */ char pad[8];
+} AudioTableBase;
+
+typedef struct {
+    /* 0x00 */ uintptr_t romAddr;
     /* 0x04 */ u32 size;
     /* 0x08 */ s8 medium;
     /* 0x09 */ s8 cachePolicy;
@@ -831,22 +838,8 @@ typedef struct {
 } AudioTableEntry; // size = 0x10
 
 typedef struct {
-    /* 0x00 */ s16 numEntries;
+    /* 0x00 */ AudioTableBase base;
-    /* 0x02 */ s16 unkMediumParam;
-    /* 0x04 */ u32 romAddr;
-    /* 0x08 */ char pad[0x8];
-} AudioTableBase;
-
-typedef struct {
-    /* 0x00 */ s16 numEntries;
-    /* 0x02 */ s16 unkMediumParam;
-    /* 0x04 */ u32 romAddr;
-    /* 0x08 */ char pad[0x8];
-    #ifdef AVOID_UB
     /* 0x10 */ AudioTableEntry entries[]; // (dynamic size)
-    #else
-    /* 0x10 */ AudioTableEntry entries[1]; // (dynamic size)
-    #endif
 } AudioTable;                             // size >= 0x20
 
 typedef struct SampleDma {
@@ -1097,12 +1090,9 @@ bool AudioThread_ResetComplete(void);
 void AudioThread_ResetAudioHeap(s32);
 void AudioThread_Init(void);
 
-extern AudioTableBase gSampleBankTableInit;
+extern AudioTable gSampleBankTableInit;
-// extern AudioTableEntry gSampleBankTableInitEntries[];
+extern AudioTable gSeqTableInit;
-extern AudioTableBase gSeqTableInit;
+extern AudioTable gSoundFontTableInit;
-// extern AudioTableEntry gSeqTableInitEntries[];
-extern AudioTableBase gSoundFontTableInit;
-// extern AudioTableEntry gSoundFontTableInitEntries[];
 extern u8 gSeqFontTableInit[];
 
 extern AudioSpec gAudioSpecs[];

include/sf64player.h

@@ -127,23 +127,23 @@ typedef struct PlayerShot {
     /* 0x6C */ u8 bonus;
 } PlayerShot; // size = 0x70
 
-typedef struct WingInfo {
+typedef struct WingInfo { // ArwingInfo
-    /* 0x00 */ u8 rightState;
+    /* 0x00 */ u8 rightState; // rightWingState
-    /* 0x01 */ u8 leftState;
+    /* 0x01 */ u8 leftState; // leftWingState
-    /* 0x04 */ f32 unk_04;
+    /* 0x04 */ f32 unk_04; // upperRightFlapYrot
-    /* 0x08 */ f32 unk_08;
+    /* 0x08 */ f32 unk_08; // bottomRightFlapYrot
-    /* 0x0C */ f32 unk_0C;
+    /* 0x0C */ f32 unk_0C; // upperLeftFlapYrot
-    /* 0x10 */ f32 unk_10;
+    /* 0x10 */ f32 unk_10; // bottomLeftFlapYrot
-    /* 0x14 */ f32 unk_14;
+    /* 0x14 */ f32 unk_14; // laserGunsYpos
-    /* 0x18 */ f32 unk_18;
+    /* 0x18 */ f32 unk_18; // laserGunsXpos
-    /* 0x1C */ f32 unk_1C;
+    /* 0x1C */ f32 unk_1C; // wingsXrot
-    /* 0x20 */ f32 unk_20;
+    /* 0x20 */ f32 unk_20; // wingsYrot
-    /* 0x24 */ f32 unk_24;
+    /* 0x24 */ f32 unk_24; // wingsZrot
     /* 0x28 */ f32 unk_28;
-    /* 0x2C */ u8 modelId;
+    /* 0x2C */ u8 modelId; // teamFaceId
-    /* 0x30 */ f32 unk_30;
+    /* 0x30 */ f32 unk_30; // teamFaceXrot
-    /* 0x34 */ f32 unk_34;
+    /* 0x34 */ f32 unk_34; // teamFaceYrot
-    /* 0x38 */ f32 unk_38;
+    /* 0x38 */ f32 unk_38; // windshieldXrot
 } WingInfo; // size = 0x3C
 
 typedef struct PlayerSfx {

include/sfx.h

@@ -475,8 +475,8 @@ typedef enum SfxBankId {
 #define NA_SE_GOOD_LUCK             0x49002016
 #define NA_SE_MESSAGE_MOVE          0x49000017 // Used for text in training mode
 #define NA_SE_COMMU_REQUEST         0x49002018 // C> call alert
-#define NA_SE_MAP_WINDOW_OPEN       0x49000019 // Also crosshairs on
+#define NA_SE_MAP_WINDOW_OPEN       0x49000019 // Also reticles on
-#define NA_SE_MAP_WINDOW_CLOSE      0x4900101A // Also crosshairs off
+#define NA_SE_MAP_WINDOW_CLOSE      0x4900101A // Also reticles off
 #define NA_SE_MAR_LOCKON            0x4900001B
 #define NA_SE_MISSILE_ALARM         0x4900001C
 #define NA_SE_CANCEL                0x4900101D
@@ -493,7 +493,7 @@ typedef enum SfxBankId {
 #define NA_SE_BOSS_GAUGE_OPEN       0x4900C028
 #define NA_SE_BANK4_UNK_1           0x40000029 // Unreferenced. Sounds like an item collect jingle
 #define NA_SE_COUNTDOWN             0x4900C02A
-#define NA_SE_VIEW_SITCHW_ON        0x4000002B // Unreferenced. Related to D_ctx_80177C70?
+#define NA_SE_VIEW_SITCHW_ON        0x4000002B // Unreferenced. Related to gFovYMode?
 #define NA_SE_VIEW_MOVE_IN          0x4900002C
 #define NA_SE_VIEW_MOVE_OUT         0x4900002D
 #define NA_SE_SEARCHLIGHT_MISS      0x4900402E

include/sys.h

@@ -40,7 +40,7 @@ s32 vsprintf(char* dst, const char* fmt, va_list args);
 void Game_Initialize(void);
 void Game_Update(void);
 
-extern bool gShowCrosshairs[];
+extern bool gShowReticles[];
 extern bool D_game_800D2870;
 
 extern f32 gNextVsViewScale;

include/variables.h

@@ -25,7 +25,7 @@ extern Actor* gTeamHelpActor;
 extern s32 gTeamHelpTimer;
 
 // fox_edata
-extern f32 gActor241Hitbox[];
+extern f32 gZoEnergyBallHitbox[];
 extern f32 gCubeHitbox100[];
 extern f32 gCubeHitbox150[];
 extern f32 gCubeHitbox200[];
@@ -39,8 +39,8 @@ extern f32 gMeteoWarpHitbox[];
 extern f32 gItemPathChangeHitbox[];
 extern f32 gItemLasersHitbox[];
 extern f32 gItemBombHitbox[];
-extern f32 gActor190_191Hitbox[];
+extern f32 gActorMissileSeekHitbox[];
-extern f32 gActor194Hitbox[];
+extern f32 gMeMoraHitbox[];
 extern f32 gTeamHitbox[];
 extern f32 gActorAllRangeHItbox[];
 extern f32 gWarpZoneEvent94Hitbox[];

linker_scripts/ln/rev0/symbol_addrs.txt

@@ -0,0 +1,8 @@
+// dma symbols
+gDmaTable = 0x8017DB20;
+dma_table_ROM_START = 0xE44F0; //defined:true
+audio_seq_ROM_START = 0xE4A90; //defined:true
+audio_bank_ROM_START = 0x11F780; //defined:true
+audio_table_ROM_START = 0x13D7A0; //defined:true
+ovl_ending = 0x00F02520; //defined:true
+ovl_unused = 0x00F025C0; //defined:true

linker_scripts/us/rev1/symbol_addrs_assets.txt

@@ -60,7 +60,7 @@ D_AQ_6002628 = 0x06002628;
 D_AQ_60260EC = 0x060260EC;
 D_AQ_60314AC = 0x060314AC;
 D_TI1_70067C4 = 0x70067C4;
-D_TI1_7006990 = 0x7006990;
+aTi1DesertCrawlerSkel = 0x7006990;
 D_TI1_7006F74 = 0x7006F74;
 D_TI1_7007130 = 0x7007130;
 D_TI1_7007234 = 0x7007234;
@@ -89,7 +89,7 @@ D_A6_6011910 = 0x6011910;
 D_A6_601B2B0 = 0x601B2B0;
 D_A6_6018BA0 = 0x6018BA0;
 D_A6_6028578 = 0x6028578;
-D_A6_6028454 = 0x6028454;
+aA6GorgonHitbox = 0x6028454;
 
 D_TITLE_60246F8 = 0x60246F8;
 D_TITLE_60338DC = 0x60338DC;

linker_scripts/us/rev1/symbol_addrs_engine.txt

@@ -170,14 +170,14 @@ Object_SetCullDirection = 0x800597C0;
 Graphics_SetScaleMtx = 0x8005980C;
 Sprite168_Draw = 0x80059850;
 Object_dummy_800598DC = 0x800598DC;
-Actor201_Draw = 0x800598E8;
+MeteoBall_Draw = 0x800598E8;
-Actor202_PostLimbDraw = 0x800599A4;
+ActorHopBot_PostLimbDraw = 0x800599A4;
-Actor202_Draw = 0x80059A24;
+ActorHopBot_Draw = 0x80059A24;
 MeteoTunnel_Draw = 0x80059AEC;
 Scenery_DrawTitaniaBones = 0x80059B20;
 func_edisplay_80059BB0 = 0x80059BB0;
 CoIBeam_Draw = 0x80059BBC;
-Actor196_Draw = 0x80059BF0;
+ActorMoleMissile_Draw = 0x80059BF0;
 func_edisplay_80059C28 = 0x80059C28;
 Sprite167_Draw = 0x80059C34;
 FogShadow_Draw = 0x80059C40;
@@ -190,12 +190,12 @@ ActorDebris_Draw = 0x8005A094;
 Actor_DrawEngineAndContrails = 0x8005ADAC;
 Actor_DrawEngineGlow = 0x8005B1E8;
 func_edisplay_8005B388 = 0x8005B388;
-Actor180_Draw = 0x8005B6A4;
+MeMolarRock_Draw = 0x8005B6A4;
-Actor182_Draw = 0x8005B71C;
+MeMeteor2_Draw = 0x8005B71C;
-Actor186_Draw = 0x8005B7CC;
+MeLaserCannon1_Draw = 0x8005B7CC;
-Actor190_191_Draw = 0x8005B848;
+ActorMissileSeek_Draw = 0x8005B848;
-Actor192_Draw = 0x8005B9A4;
+ActorSkibot_Draw = 0x8005B9A4;
-Actor193_Draw = 0x8005BA30;
+ActorRadar_Draw = 0x8005BA30;
 func_edisplay_8005BAAC = 0x8005BAAC;
 Object_SetShadowDL = 0x8005BAB4;
 ItemCheckpoint_Draw = 0x8005C5F0;
@@ -234,22 +234,22 @@ TexturedLine_DrawPath = 0x80060D94;
 
 // fox_effect
 BonusText_Display = 0x80077240;
-func_effect_8007783C = 0x8007783C;
+Effect_Load = 0x8007783C;
 func_effect_80079618 = 0x80079618;
-func_effect_8007A568 = 0x8007A568;
+Effect_Effect383_Spawn = 0x8007A568;
 Effect_SpawnTimedSfxAtPos = 0x8007A6F0;
-func_effect_8007A900 = 0x8007A900;
+Effect_Effect359_Spawn = 0x8007A900;
-func_effect_8007AFD0 = 0x8007AFD0;
+Effect_Effect382_Spawn = 0x8007AFD0;
-func_effect_8007B8F8 = 0x8007B8F8;
+Effect_Effect364_Spawn = 0x8007B8F8;
-func_effect_8007BC7C = 0x8007BC7C;
+Effect_Effect362_Spawn = 0x8007BC7C;
-func_effect_8007BFFC = 0x8007BFFC;
+Effect386_Spawn1 = 0x8007BFFC;
-func_effect_8007C120 = 0x8007C120;
+Effect_Effect390_Spawn = 0x8007C120;
 func_effect_8007D0E0 = 0x8007D0E0;
 func_effect_8007D2C8 = 0x8007D2C8;
 func_effect_8007EE68 = 0x8007EE68;
 func_effect_800815DC = 0x800815DC;
 func_effect_80081A8C = 0x80081A8C;
-func_effect_8008377C = 0x8008377C;
+Effect_Effect391_Spawn = 0x8008377C;
 
 // fox_enmy
 Object_PlayerSfx = 0x80060F30;
@@ -284,9 +284,9 @@ Object_CheckHitboxCollision = 0x80062DBC;
 Object_CheckSingleHitbox = 0x800631A8;
 Object_CheckPolyCollision = 0x8006326C;
 Object_CheckCollision = 0x8006351C;
-func_enmy_80063CAC = 0x80063CAC;
+Actor_CoRadar_Init = 0x80063CAC;
-func_enmy_80063D58 = 0x80063D58;
+Scenery_Corneria_Init = 0x80063D58;
-func_enmy_80063E5C = 0x80063E5C;
+Scenery_CoStoneArch_Init = 0x80063E5C;
 func_enmy_80063F4C = 0x80063F4C;
 func_enmy_80063F58 = 0x80063F58;
 func_enmy_80063F74 = 0x80063F74;
@@ -297,13 +297,13 @@ func_enmy_8006546C = 0x8006546C;
 func_enmy_800654E4 = 0x800654E4;
 func_enmy_800655C8 = 0x800655C8;
 func_enmy_8006566C = 0x8006566C;
-Actors190_191_Update = 0x800656D4;
+ActorMissileSeek_Update = 0x800656D4;
 func_enmy_800660F0 = 0x800660F0;
 Actor_Despawn = 0x80066254;
-Actor192_Update = 0x8006654C;
+ActorSkibot_Update = 0x8006654C;
 func_enmy_8006684C = 0x8006684C;
-Actor193_Update = 0x800669A0;
+ActorRadar_Update = 0x800669A0;
-Actor180_Update = 0x80066A80;
+MeMolarRock_Update = 0x80066A80;
 func_enmy_80066A8C = 0x80066A8C;
 func_enmy_80066C00 = 0x80066C00;
 CoBuilding9_Update = 0x80066D5C;
@@ -366,7 +366,7 @@ gGameStandby = 0x80161A39;
 gFovY = 0x80161A3C;
 gProjectNear = 0x80161A40;
 gProjectFar = 0x80161A44;
-gShowCrosshairs = 0x800D2860;
+gShowReticles = 0x800D2860;
 D_game_800D2870 = 0x800D2870;
 sVsCameraULx = 0x800D2874;
 sVsCameraLRx = 0x800D2884;
@@ -431,14 +431,14 @@ gPlayerShots = 0x80174050; //size:0x700
 gTexturedLines = 0x80174750; //size:0x12C0
 gRadarMarks = 0x80175A10; //size:0xA28
 gBonusText = 0x80176438; //size:0x118
-gActor194Status = 0x80176550;
+gMeMoraStatus = 0x80176550;
-gActor194xPos = 0x80176558;
+gMeMoraXpos = 0x80176558;
-gActor194yPos = 0x80176878;
+gMeMoraYpos = 0x80176878;
-gActor194zPos = 0x80176B98;
+gMeMoraZpos = 0x80176B98;
-gActor194xRot = 0x80176EB8;
+gMeMoraXrot = 0x80176EB8;
-gActor194yRot = 0x801771D8;
+gMeMoraYrot = 0x801771D8;
 gSceneId = 0x801774F8;
-gActor194zRot = 0x80177500;
+gMeMoraZrot = 0x80177500;
 gSceneSetup = 0x80177820;
 gClearPlayerInfo = 0x80177824;
 gEnemyShotSpeed = 0x80177828;
@@ -622,7 +622,7 @@ gBossDeathCamAtZ = 0x80178448;
 gCameraShakeY = 0x8017847C;
 gCameraShake = 0x80178480;
 gLoadLevelObjects = 0x80178488;
-gZOSnakeWaypointCount = 0x801784A4;
+gZoDodoraWaypointCount = 0x801784A4;
 gGroundType = 0x801784AC;
 gLight1xRot = 0x801784B8;
 gLight1yRot = 0x801784BC;

linker_scripts/us/rev1/symbol_addrs_overlays.txt

@@ -1,14 +1,14 @@
-Corneria_Boss294_Draw = 0x8018ED78;//segment:ovl_i1
+Corneria_CoCarrierLeft_Draw = 0x8018ED78;//segment:ovl_i1
-Corneria_Boss295_Draw = 0x8018EE84;//segment:ovl_i1
+Corneria_CoCarrierUpper_Draw = 0x8018EE84;//segment:ovl_i1
-Corneria_IBeam_Init = 0x8018B0B4;//segment:ovl_i1
+Corneria_CoIBeam_Init = 0x8018B0B4;//segment:ovl_i1
 Corneria_Granga_Init = 0x801878D8;//segment:ovl_i1
-Corneria_Carrier_Init = 0x8018BE7C;//segment:ovl_i1
+Corneria_CoCarrier_Init = 0x8018BE7C;//segment:ovl_i1
-Venom1_8019250C = 0x8019250C;//segment:ovl_i1
+Venom1_Ve1Pillar1_Init = 0x8019250C;//segment:ovl_i1
-Venom1_80192CB0 = 0x80192CB0;//segment:ovl_i1
+Venom1_Ve1Pillar2_3_Init = 0x80192CB0;//segment:ovl_i1
-Venom1_80192EA4 = 0x80192EA4;//segment:ovl_i1
+Venom1_Ve1Pillar4_Init = 0x80192EA4;//segment:ovl_i1
-Venom1_801933B4 = 0x801933B4;//segment:ovl_i1
+Venom1_Ve1MonkeyStatue_Init = 0x801933B4;//segment:ovl_i1
-Venom1_Boss319_Init = 0x801935CC;//segment:ovl_i1
+Venom1_Ve1Golemech_Init = 0x801935CC;//segment:ovl_i1
-Venom1_Boss_Update = 0x80194398;//segment:ovl_i1
+Venom1_Ve1Golemech_Update = 0x80194398;//segment:ovl_i1
 Venom1_801920F0 = 0x801920F0;//segment:ovl_i1
 D_i1_8019A04C = 0x8019A04C; // size:0xC type:s16 segment:ovl_i1
 D_i1_8019B6C0 = 0x8019B6C0;//segment:ovl_i1
@@ -21,7 +21,7 @@ D_i1_8019A500 = 0x8019A500; // segment:ovl_i1 type:s16 size:0x44
 D_i1_8019B838 = 0x8019B838; // segment:ovl_i1 size:0x880
 
 Meteo_80187B08 = 0x80187B08;//segment:ovl_i2
-Meteo_Boss297_Init = 0x80188A40;//segment:ovl_i2
+Meteo_MeCrusher_Init = 0x80188A40;//segment:ovl_i2
 D_i2_80195D70 = 0x80195D70;//segment:ovl_i2
 D_i4_8019F168 = 0x8019F168; // type:Vec3f segment:ovl_i4
 D_i4_8019F18C = 0x8019F18C; // type:f32 size:0xC segment:ovl_i4
@@ -55,25 +55,25 @@ D_menu_801AEE6C = 0x801AEE6C; // type:s32 size:0x58 force_migration:True segment
 D_menu_801AF25C = 0x801AF25C; // type:f32 size:0x18 force_migration:True segment:ovl_menu
 D_menu_801AF274 = 0x801AF274; // type:f32 size:0x18 force_migration:True segment:ovl_menu
 
-Area6_801875E4 = 0x801875E4;//segment:ovl_i3
+Area6_ActorMissileSeekPlayer_Spawn = 0x801875E4;//segment:ovl_i3
-Area6_80187704 = 0x80187704;//segment:ovl_i3
+Area6_Effect395_Spawn = 0x80187704;//segment:ovl_i3
-Area6_BossA6_Init = 0x80187754;//segment:ovl_i3
+Area6_A6Gorgon_Init = 0x80187754;//segment:ovl_i3
-Area6_Boss_Update = 0x80187944;//segment:ovl_i3
+Area6_A6Gorgon_Update = 0x80187944;//segment:ovl_i3
 Area6_8018A1B0 = 0x8018A1B0;//segment:ovl_i3
 Area6_8018A2C4 = 0x8018A2C4;//segment:ovl_i3
 Area6_8018A464 = 0x8018A464;//segment:ovl_i3
 Area6_8018B9BC = 0x8018B9BC;//segment:ovl_i3
 Area6_8018BCD4 = 0x8018BCD4;//segment:ovl_i3
 Area6_8018C0D0 = 0x8018C0D0;//segment:ovl_i3
-Area6_Boss_Draw = 0x8018C54C;//segment:ovl_i3
+Area6_A6Gorgon_Draw = 0x8018C54C;//segment:ovl_i3
-Zoness_SpawnDebris = 0x801900FC;//segment:ovl_i3
+Zoness_ActorDebris_Spawn = 0x801900FC;//segment:ovl_i3
-Zoness_801915A4 = 0x801915A4;//segment:ovl_i3
+Zoness_ZoEnergyBall_Init = 0x801915A4;//segment:ovl_i3
-Zoness_80191BB8 = 0x80191BB8;//segment:ovl_i3
+Zoness_ZoEnergyBall_Init2 = 0x80191BB8;//segment:ovl_i3
-Zoness_BossZo_Init = 0x801932AC;//segment:ovl_i3
+Zoness_ZoSarumarine_Init = 0x801932AC;//segment:ovl_i3
-Zoness_80193908 = 0x80193908;//segment:ovl_i3
+Zoness_Effect394_Spawn = 0x80193908;//segment:ovl_i3
-Zoness_80193A98 = 0x80193A98;//segment:ovl_i3
+Zoness_Effect394_Spawn2 = 0x80193A98;//segment:ovl_i3
 Zoness_80193CC8 = 0x80193CC8;//segment:ovl_i3
-Zoness_Boss_Update = 0x80194A84;//segment:ovl_i3
+Zoness_ZoSarumarine_Update = 0x80194A84;//segment:ovl_i3
 Zoness_801986FC = 0x801986FC;//segment:ovl_i3
 Zoness_801989FC = 0x801989FC;//segment:ovl_i3
 Zoness_80198BE8 = 0x80198BE8;//segment:ovl_i3
@@ -85,31 +85,31 @@ Zoness_801991D0 = 0x801991D0;//segment:ovl_i3
 Zoness_80199394 = 0x80199394;//segment:ovl_i3
 Zoness_80199470 = 0x80199470;//segment:ovl_i3
 Zoness_8019962C = 0x8019962C;//segment:ovl_i3
-Zoness_8019B1F0 = 0x8019B1F0;//segment:ovl_i3
+Zoness_ZoCargoShip_Init = 0x8019B1F0;//segment:ovl_i3
-Zoness_8019B810 = 0x8019B810;//segment:ovl_i3
+Zoness_ZoContainer_Init = 0x8019B810;//segment:ovl_i3
-Zoness_8019C200 = 0x8019C200;//segment:ovl_i3
+Zoness_ZoSupplyCrane_Init = 0x8019C200;//segment:ovl_i3
-Zoness_Actor247_Init = 0x8019D060;//segment:ovl_i3
+Zoness_ZoBarrier_Init = 0x8019D060;//segment:ovl_i3
 Solar_LevelComplete = 0x801A7930;//segment:ovl_i3
 Aquas_SpawnDebris = 0x801A9448;//segment:ovl_i3
-Aquas_801A94EC = 0x801A94EC;//segment:ovl_i3
+Aquas_SpawnItem = 0x801A94EC;//segment:ovl_i3
 Aquas_801A958C = 0x801A958C;//segment:ovl_i3
-Aquas_801AC8A8 = 0x801AC8A8;//segment:ovl_i3
+Aquas_Effect366_Spawn = 0x801AC8A8;//segment:ovl_i3
-Aquas_801AD688 = 0x801AD688;//segment:ovl_i3
+Aquas_Actor255_Init = 0x801AD688;//segment:ovl_i3
-Aquas_801AE3AC = 0x801AE3AC;//segment:ovl_i3
+Aquas_Actor256_Init = 0x801AE3AC;//segment:ovl_i3
-Aquas_801AF9FC = 0x801AF9FC;//segment:ovl_i3
+Aquas_Actor257_Init = 0x801AF9FC;//segment:ovl_i3
 Aquas_Actor257_Update = 0x801AFA5C;//segment:ovl_i3
 Aquas_801B0F88 = 0x801B0F88;//segment:ovl_i3
 Aquas_801B0FCC = 0x801B0FCC;//segment:ovl_i3
 Aquas_801B1008 = 0x801B1008;//segment:ovl_i3
-Aquas_BossAq_Init = 0x801B10F8;//segment:ovl_i3
+Aquas_AqBacoon_Init = 0x801B10F8;//segment:ovl_i3
-Aquas_Boss_Update = 0x801B134C;//segment:ovl_i3
+Aquas_AqBacoon_Update = 0x801B134C;//segment:ovl_i3
-Aquas_801B6344 = 0x801B6344;//segment:ovl_i3
+Aquas_AqAnglerFish_Init = 0x801B6344;//segment:ovl_i3
-Aquas_Actor259_Update = 0x801B638C;//segment:ovl_i3
+Aquas_AqAnglerFish_Update = 0x801B638C;//segment:ovl_i3
-Aquas_801B6E54 = 0x801B6E54;//segment:ovl_i3
+Aquas_AqSpindlyFish_Init = 0x801B6E54;//segment:ovl_i3
-Aquas_Actor262_Update = 0x801B6FF8;//segment:ovl_i3
+Aquas_AqSpindlyFish_Update = 0x801B6FF8;//segment:ovl_i3
-Aquas_801B7AF0 = 0x801B7AF0;//segment:ovl_i3
+Aquas_AqGaroa_Init = 0x801B7AF0;//segment:ovl_i3
-Aquas_801BA57C = 0x801BA57C;//segment:ovl_i3
+Venom1_AqBoulder_Init = 0x801BA57C;//segment:ovl_i3
-Aquas_801BB26C = 0x801BB26C;//segment:ovl_i3
+Venom1_AqJellyfish_Init = 0x801BB26C;//segment:ovl_i3
 D_i3_801C2240 = 0x801C2240;//segment:ovl_i3
 D_AQ_801C4188 = 0x801C4188;//segment:ovl_i3
 D_i3_801C2250 = 0x801C2250;//size:0xA0 segment:ovl_i3
@@ -141,7 +141,7 @@ D_i3_801C27C8 = 0x801C27C8; //segment:ovl_i3 size:0x12C0
 D_i3_801C3A88 = 0x801C3A88; //segment:ovl_i3 size:0x700
 D_i3_801C4190 = 0x801C4190; //segment:ovl_i3 size:0x28
 D_i3_801C41B8 = 0x801C41B8; //segment:ovl_i3 size:0x78
-sBossAQlimbTimers = 0x801C4230; //segment:ovl_i3 size:0x70
+sAqBacoonlimbTimers = 0x801C4230; //segment:ovl_i3 size:0x70
 D_i3_801C42A0 = 0x801C42A0; //segment:ovl_i3 size:0x68
 D_i3_801C4308 = 0x801C4308; //segment:ovl_i3 size:0x148
 D_i3_801C0060 = 0x801C0060; //segment:ovl_i3 type:f32
@@ -155,7 +155,7 @@ D_i3_801C2768 = 0x801C2768; //segment:ovl_i3 size:0x38
 D_i3_801C27A0 = 0x801C27A0; //segment:ovl_i3 size:0x20
 
 Katina_UpdateEvents = 0x80198594;//segment:ovl_i4
-Katina_BossSetup = 0x80193CA4;//segment:ovl_i4
+Katina_KaSaucerer_Init = 0x80193CA4;//segment:ovl_i4
 SectorZ_Missile_Update = 0x80199C60;//segment:ovl_i4
 SectorZ_MissileExplode = 0x80199900;//segment:ovl_i4
 D_i4_801A03C0 = 0x801A03C0;//segment:ovl_i4
@@ -165,29 +165,29 @@ D_BO_801A03DC = 0x801A03DC;//segment:ovl_i4
 
 Macbeth_801A55D4 = 0x801A55D4;//segment:ovl_i5
 Titania_8018E3B0 = 0x8018E3B0;//segment:ovl_i5
-Titania_8018B720 = 0x8018B720;//segment:ovl_i5
+Titania_TiRasco_Dying = 0x8018B720;//segment:ovl_i5
 Titania_801990DC = 0x801990DC;//segment:ovl_i5
 Ground_801B6AEC = 0x801B6AEC;//segment:ovl_i5
-Titania_80189B80 = 0x80189B80;//segment:ovl_i5
+Titania_TiFekuda_Init = 0x80189B80;//segment:ovl_i5
-Titania_8018ADC4 = 0x8018ADC4;//segment:ovl_i5
+Titania_TiRasco_Init = 0x8018ADC4;//segment:ovl_i5
-Titania_Actor231_Init = 0x8018B96C;//segment:ovl_i5
+Titania_TiBomb_Init = 0x8018B96C;//segment:ovl_i5
-Titania_8018BFB0 = 0x8018BFB0;//segment:ovl_i5
+Titania_TiDesertCrawler_Init = 0x8018BFB0;//segment:ovl_i5
-Titania_8018E3CC = 0x8018E3CC;//segment:ovl_i5
+Titania_TiDelphor_Init = 0x8018E3CC;//segment:ovl_i5
-Titania_8018E5E8 = 0x8018E5E8;//segment:ovl_i5
+Titania_TiDelphorHead_Init = 0x8018E5E8;//segment:ovl_i5
-Titania_8018EFF0 = 0x8018EFF0;//segment:ovl_i5
+Titania_TiCactus_Init = 0x8018EFF0;//segment:ovl_i5
-Titania_8018F0D8 = 0x8018F0D8;//segment:ovl_i5
+Titania_TiPillar_Init = 0x8018F0D8;//segment:ovl_i5
-Titania_Boss306_Init = 0x8018FA48;//segment:ovl_i5
+Titania_TiGoras_Init = 0x8018FA48;//segment:ovl_i5
-Macbeth_80199F8C = 0x80199F8C;//segment:ovl_i5
+Macbeth_Train_Init = 0x80199F8C;//segment:ovl_i5
 Titania_80193B30 = 0x80193B30;//segment:ovl_i5
 Titania_80193DF0 = 0x80193DF0;//segment:ovl_i5
 Titania_80190A08 = 0x80190A08;//segment:ovl_i5
-Macbeth_801A3E70 = 0x801A3E70;//segment:ovl_i5
+Macbeth_MaMaRailroadSwitch_Init = 0x801A3E70;//segment:ovl_i5
-Macbeth_801A4660 = 0x801A4660;//segment:ovl_i5
+Macbeth_MaBoulder_Init = 0x801A4660;//segment:ovl_i5
-Macbeth_801A4AF8 = 0x801A4AF8;//segment:ovl_i5
+Macbeth_MaRailwaySignal_Init = 0x801A4AF8;//segment:ovl_i5
-Macbeth_801A5E2C = 0x801A5E2C;//segment:ovl_i5
+Macbeth_LockBars_Init = 0x801A5E2C;//segment:ovl_i5
-Macbeth_801A6134 = 0x801A6134;//segment:ovl_i5
+Macbeth_MaBarrier_Init = 0x801A6134;//segment:ovl_i5
-Macbeth_801A65E0 = 0x801A65E0;//segment:ovl_i5
+Macbeth_MaProximityLight_Init = 0x801A65E0;//segment:ovl_i5
-Macbeth_801A7D98 = 0x801A7D98;//segment:ovl_i5
+Macbeth_Actor207_Init = 0x801A7D98;//segment:ovl_i5
 Ground_801B6E20 = 0x801B6E20;//segment:ovl_i5
 D_i5_801B74F0 = 0x801B74F0;//segment:ovl_i5 size:28
 D_TI_801B7584 = 0x801B7584;//segment:ovl_i5
@@ -197,7 +197,7 @@ D_MA_801BA1E8 = 0x801BA1E8;//segment:ovl_i5
 D_MA_801BE250 = 0x801BE250;//segment:ovl_i5 size:0x20
 D_MA_801BE2F0 = 0x801BE2F0;//segment:ovl_i5 size:0x12
 D_i5_801B8198 = 0x801B8198;//size:0x210 segment:ovl_i5
-D_TI_801B83A8 = 0x801B83A8;//size:0x814 type:f32 segment:ovl_i5
+aTiGorasHitbox = 0x801B83A8;//size:0x814 type:f32 segment:ovl_i5
 D_i5_801BA708 = 0x801BA708;//size:0xC type:Vec3f segment:ovl_i5
 D_i5_801BAA50 = 0x801BAA50;//size:0x28 type:s16 segment:ovl_i5
 D_i5_801BBEE0 = 0x801BBEE0;//segment:ovl_i5
@@ -211,8 +211,8 @@ D_i5_801B814C = 0x801B814C;//size:0x14 segment:ovl_i5
 D_i5_801B7630 = 0x801B7630;//size:0x24 segment:ovl_i5
 
 Andross_801888F4 = 0x801888F4; //segment:ovl_i6
-SectorY_Boss314_Init = 0x80197CC4; //segment:ovl_i6
+SectorY_SyShogun_Init = 0x80197CC4; //segment:ovl_i6
-Andross_Boss320_Init = 0x8018D16C; //segment:ovl_i6
+Andross_AndAndross_Init = 0x8018D16C; //segment:ovl_i6
 sTeamInitPos = 0x801A68B0;//size:0x48 type:Vec3f segment:ovl_i6
 sTeamInitRot = 0x801A68F8;//size:0xC type:f32 segment:ovl_i6
 D_i6_801A7F30 = 0x801A7F30; //segment:ovl_i6

src/audio/audio_general.c

@@ -203,106 +203,37 @@ PlaylistCmd sPlaylists[][100] = {
         { 255, 0, NA_BGM_STAGE_CO, 50, 255, 50 },
     },
     {
-        { 0, 0, NA_BGM_START_DEMO, 0, 255, 1620 },
+        { 0, 0, NA_BGM_START_DEMO, 0, 255, 1620 },    { 0, 0, NA_BGM_STAGE_CO, 0, 255, 2490 },
-        { 0, 0, NA_BGM_STAGE_CO, 0, 255, 2490 },
+        { 1, 0, NA_BGM_STAGE_CO, 50, 255, 50 },       { 0, 0, NA_BGM_BOSS_A_CARRIER, 0, 255, 1620 },
-        { 1, 0, NA_BGM_STAGE_CO, 50, 255, 50 },
+        { 1, 0, NA_BGM_BOSS_A_CARRIER, 1, 255, 50 },  { 0, 0, NA_BGM_COURSE_CLEAR, 0, 255, 1091 },
-        { 0, 0, NA_BGM_BOSS_A_CARRIER, 0, 255, 1620 },
+        { 1, 0, NA_BGM_COURSE_CLEAR, 100, 255, 100 }, { 0, 0, NA_BGM_START_DEMO_S, 0, 255, 242 },
-        { 1, 0, NA_BGM_BOSS_A_CARRIER, 1, 255, 50 },
+        { 0, 0, NA_BGM_STAGE_SY, 0, 255, 2096 },      { 1, 0, NA_BGM_STAGE_SY, 50, 255, 50 },
-        { 0, 0, NA_BGM_COURSE_CLEAR, 0, 255, 1091 },
+        { 0, 0, NA_BGM_BOSS_SY, 0, 2, 1600 },         { 1, 0, NA_BGM_BOSS_SY, 1, 255, 50 },
-        { 1, 0, NA_BGM_COURSE_CLEAR, 100, 255, 100 },
+        { 0, 0, NA_BGM_REAL_BOSS, 0, 255, 1600 },     { 1, 0, NA_BGM_REAL_BOSS, 1, 255, 50 },
-        { 0, 0, NA_BGM_START_DEMO_S, 0, 255, 242 },
+        { 0, 0, NA_BGM_COURSE_CLEAR, 0, 255, 1091 },  { 1, 0, NA_BGM_COURSE_CLEAR, 100, 255, 100 },
-        { 0, 0, NA_BGM_STAGE_SY, 0, 255, 2096 },
+        { 0, 0, NA_BGM_KA_START_DEMO, 0, 255, 241 },  { 0, 0, NA_BGM_STAGE_KA, 0, 255, 2184 },
-        { 1, 0, NA_BGM_STAGE_SY, 50, 255, 50 },
+        { 1, 0, NA_BGM_STAGE_KA, 1, 255, 100 },       { 0, 0, NA_BGM_BOSS_KA, 0, 1, 1115 },
-        { 0, 0, NA_BGM_BOSS_SY, 0, 2, 1600 },
+        { 1, 0, NA_BGM_BOSS_KA, 50, 255, 100 },       { 0, 0, NA_BGM_COURSE_CLEAR, 0, 255, 1091 },
-        { 1, 0, NA_BGM_BOSS_SY, 1, 255, 50 },
+        { 1, 0, NA_BGM_COURSE_CLEAR, 100, 255, 100 }, { 0, 0, NA_BGM_SO_START_DEMO, 0, 255, 250 },
-        { 0, 0, NA_BGM_REAL_BOSS, 0, 255, 1600 },
+        { 0, 0, NA_BGM_STAGE_SO, 0, 255, 1096 },      { 3, 0, NA_BGM_BILL, 0, 255, 1000 },
-        { 1, 0, NA_BGM_REAL_BOSS, 1, 255, 50 },
+        { 1, 0, NA_BGM_STAGE_SO, 50, 255, 50 },       { 0, 0, NA_BGM_BOSS_SO, 0, 255, 1600 },
-        { 0, 0, NA_BGM_COURSE_CLEAR, 0, 255, 1091 },
+        { 1, 0, NA_BGM_BOSS_SO, 1, 255, 50 },         { 0, 0, NA_BGM_COURSE_CLEAR, 0, 255, 1091 },
-        { 1, 0, NA_BGM_COURSE_CLEAR, 100, 255, 100 },
+        { 1, 0, NA_BGM_COURSE_CLEAR, 100, 255, 100 }, { 0, 0, NA_BGM_START_DEMO_S, 0, 255, 260 },
-        { 0, 0, NA_BGM_KA_START_DEMO, 0, 255, 241 },
+        { 0, 0, NA_BGM_STAGE_MA, 0, 255, 1920 },      { 1, 0, NA_BGM_STAGE_MA, 50, 255, 50 },
-        { 0, 0, NA_BGM_STAGE_KA, 0, 255, 2184 },
+        { 0, 0, NA_BGM_BOSS_MA, 0, 255, 1600 },       { 1, 0, NA_BGM_BOSS_MA, 1, 255, 50 },
-        { 1, 0, NA_BGM_STAGE_KA, 1, 255, 100 },
+        { 0, 0, NA_BGM_COURSE_CLEAR, 0, 255, 1091 },  { 1, 0, NA_BGM_COURSE_CLEAR, 100, 255, 100 },
-        { 0, 0, NA_BGM_BOSS_KA, 0, 1, 1115 },
+        { 0, 0, NA_BGM_BO_START_DEMO, 0, 255, 241 },  { 0, 0, NA_BGM_STAGE_BO, 0, 255, 1177 },
-        { 1, 0, NA_BGM_BOSS_KA, 50, 255, 100 },
+        { 1, 0, NA_BGM_STAGE_BO, 100, 255, 100 },     { 0, 0, NA_BGM_BOSS_BO, 0, 255, 1115 },
-        { 0, 0, NA_BGM_COURSE_CLEAR, 0, 255, 1091 },
+        { 1, 0, NA_BGM_BOSS_BO, 50, 255, 50 },        { 0, 0, NA_BGM_STARWOLF, 0, 255, 2120 },
-        { 1, 0, NA_BGM_COURSE_CLEAR, 100, 255, 100 },
+        { 1, 0, NA_BGM_STARWOLF, 1, 255, 50 },        { 0, 0, NA_BGM_COURSE_CLEAR, 0, 255, 1091 },
-        { 0, 0, NA_BGM_SO_START_DEMO, 0, 255, 250 },
+        { 1, 0, NA_BGM_COURSE_CLEAR, 100, 255, 100 }, { 0, 0, NA_BGM_STAGE_VE1, 0, 255, 1671 },
-        { 0, 0, NA_BGM_STAGE_SO, 0, 255, 1096 },
+        { 1, 0, NA_BGM_STAGE_VE1, 50, 255, 50 },      { 0, 0, NA_BGM_BOSS_VE, 0, 255, 1600 },
-        { 3, 0, NA_BGM_BILL, 0, 255, 1000 },
+        { 1, 0, NA_BGM_BOSS_VE, 1, 255, 50 },         { 0, 0, NA_BGM_DASH_INTO_BASE, 0, 0, 176 },
-        { 1, 0, NA_BGM_STAGE_SO, 50, 255, 50 },
+        { 0, 0, NA_BGM_STAGE_ANDROSS, 0, 255, 588 },  { 0, 0, NA_BGM_BOSS_ANDROSS, 0, 0, 2420 },
-        { 0, 0, NA_BGM_BOSS_SO, 0, 255, 1600 },
+        { 1, 0, NA_BGM_BOSS_ANDROSS, 10, 255, 50 },   { 0, 0, NA_BGM_BOSS_ANDROSS, 0, 255, 1200 },
-        { 1, 0, NA_BGM_BOSS_SO, 1, 255, 50 },
+        { 1, 0, NA_BGM_BOSS_ANDROSS, 1, 255, 150 },   { 0, 0, NA_BGM_ALL_CLEAR, 0, 255, 1091 },
-        { 0, 0, NA_BGM_COURSE_CLEAR, 0, 255, 1091 },
+        { 1, 0, NA_BGM_ALL_CLEAR, 80, 255, 160 },     { 0, 0, NA_BGM_STAFF_ROLL, 0, 255, 9500 },
-        { 1, 0, NA_BGM_COURSE_CLEAR, 100, 255, 100 },
-        { 0, 0, NA_BGM_START_DEMO_S, 0, 255, 260 },
-        { 0, 0, NA_BGM_STAGE_MA, 0, 255, 1920 },
-        { 1, 0, NA_BGM_STAGE_MA, 50, 255, 50 },
-        { 0, 0, NA_BGM_BOSS_MA, 0, 255, 1600 },
-        { 1, 0, NA_BGM_BOSS_MA, 1, 255, 50 },
-        { 0, 0, NA_BGM_COURSE_CLEAR, 0, 255, 1091 },
-        { 1, 0, NA_BGM_COURSE_CLEAR, 100, 255, 100 },
-        { 0, 0, NA_BGM_BO_START_DEMO, 0, 255, 241 },
-        { 0, 0, NA_BGM_STAGE_BO, 0, 255, 1177 },
-        { 1, 0, NA_BGM_STAGE_BO, 100, 255, 100 },
-        { 0, 0, NA_BGM_BOSS_BO, 0, 255, 1115 },
-        { 1, 0, NA_BGM_BOSS_BO, 50, 255, 50 },
-        { 0, 0, NA_BGM_STARWOLF, 0, 255, 2120 },
-        { 1, 0, NA_BGM_STARWOLF, 1, 255, 50 },
-        { 0, 0, NA_BGM_COURSE_CLEAR, 0, 255, 1091 },
-        { 1, 0, NA_BGM_COURSE_CLEAR, 100, 255, 100 },
-        { 0, 0, NA_BGM_STAGE_VE1, 0, 255, 1671 },
-        { 1, 0, NA_BGM_STAGE_VE1, 50, 255, 50 },
-        { 0, 0, NA_BGM_BOSS_VE, 0, 255, 1600 },
-        { 1, 0, NA_BGM_BOSS_VE, 1, 255, 50 },
-        { 0, 0, NA_BGM_DASH_INTO_BASE, 0, 0, 176 },
-        { 0, 0, NA_BGM_STAGE_ANDROSS, 0, 255, 588 },
-        { 0, 0, NA_BGM_BOSS_ANDROSS, 0, 0, 2420 },
-        { 1, 0, NA_BGM_BOSS_ANDROSS, 10, 255, 50 },
-        { 0, 0, NA_BGM_BOSS_ANDROSS, 0, 255, 1200 },
-        { 1, 0, NA_BGM_BOSS_ANDROSS, 1, 255, 150 },
-        { 0, 0, NA_BGM_ALL_CLEAR, 0, 255, 1091 },
-        { 1, 0, NA_BGM_ALL_CLEAR, 80, 255, 160 },
-        { 0, 0, NA_BGM_STAFF_ROLL, 0, 255, 9500 },
         { 255, 0, NA_BGM_STAGE_CO, 50, 255, 50 },
-        { 0 },
-        { 0 },
-        { 0 },
-        { 0 },
-        { 0 },
-        { 0 },
-        { 0 },
-        { 0 },
-        { 0 },
-        { 0 },
-        { 0 },
-        { 0 },
-        { 0 },
-        { 0 },
-        { 0 },
-        { 0 },
-        { 0 },
-        { 0 },
-        { 0 },
-        { 0 },
-        { 0 },
-        { 0 },
-        { 0 },
-        { 0 },
-        { 0 },
-        { 0 },
-        { 0 },
-        { 0 },
-        { 0 },
-        { 0 },
-        { 0 },
-        { 0 },
-        { 0 },
-        { 0 },
-        { 0 },
-        { 0 },
-        { 0 },
-        { 0 },
-        { 0 },
     },
     {
         { 0, 0, NA_BGM_START_DEMO, 0, 255, 1620 },    { 0, 0, NA_BGM_STAGE_CO, 0, 255, 2490 },

src/audio/audio_heap.c

@@ -915,7 +915,7 @@ void AudioHeap_DiscardSampleCacheEntry(SampleCacheEntry* entry) {
     s32 sampleBankId2;
     s32 sampleBankId1;
 
-    numFonts = gSoundFontTable->numEntries;
+    numFonts = gSoundFontTable->base.numEntries;
     for (fondId = 0; fondId < numFonts; fondId++) {
         sampleBankId1 = gSoundFontList[fondId].sampleBankId1;
         sampleBankId2 = gSoundFontList[fondId].sampleBankId2;
@@ -974,7 +974,7 @@ SampleCacheEntry* AudioHeap_AllocPersistentSampleCacheEntry(u32 size) {
 void AudioHeap_DiscardSampleCaches(void) {
     s32 fontId;
     s32 i;
-    s32 numFonts = gSoundFontTable->numEntries;
+    s32 numFonts = gSoundFontTable->base.numEntries;
     s32 pad;
     s32 sampleBankId2;
     s32 sampleBankId1;

src/audio/audio_load.c

@@ -50,6 +50,7 @@ void AudioLoad_DecreaseSampleDmaTtls(void) {
             }
         }
     }
+
     for (i = gSampleDmaListSize1; i < gSampleDmaCount; i++) {
         dma = &gSampleDmas[i];
         if (dma->ttl != 0) {
@@ -91,6 +92,7 @@ void* AudioLoad_DmaSampleData(u32 devAddr, u32 size, u32 arg2, u8* dmaIndexRef,
                 return &dma->ramAddr[devAddr - dma->devAddr];
             }
         }
+
         if ((gSampleDmaReuseQueue2RdPos != gSampleDmaReuseQueue2WrPos) && (arg2 != 0)) {
             sp38 = gSampleDmaReuseQueue2[gSampleDmaReuseQueue2RdPos];
             gSampleDmaReuseQueue2RdPos++;
@@ -156,6 +158,7 @@ void AudioLoad_InitSampleDmaBuffers(s32 numNotes) {
     u8* dma;
 
     gSampleDmaBuffSize = 0x2D0;
+
     for (i = 0; i < (3 * gNumNotes * gAudioBufferParams.count); i++) {
         dma = AudioHeap_Alloc(&gMiscPool, gSampleDmaBuffSize);
         gSampleDmas[gSampleDmaCount].ramAddr = dma;
@@ -169,17 +172,21 @@ void AudioLoad_InitSampleDmaBuffers(s32 numNotes) {
         gSampleDmas[gSampleDmaCount].size = gSampleDmaBuffSize;
         gSampleDmaCount++;
     }
+
     for (i = 0; i < gSampleDmaCount; i++) {
         gSampleDmaReuseQueue1[i] = i;
         gSampleDmas[i].reuseIndex = i;
     }
+
     for (i = gSampleDmaCount; i < 0x100; i++) {
         gSampleDmaReuseQueue1[i] = 0;
     }
+
     gSampleDmaReuseQueue1RdPos = 0;
     gSampleDmaReuseQueue1WrPos = gSampleDmaCount;
     gSampleDmaListSize1 = gSampleDmaCount;
     gSampleDmaBuffSize = 0x200;
+
     for (i = 0; i < gNumNotes; i++) {
         dma = AudioHeap_Alloc(&gMiscPool, gSampleDmaBuffSize);
         gSampleDmas[gSampleDmaCount].ramAddr = dma;
@@ -193,13 +200,16 @@ void AudioLoad_InitSampleDmaBuffers(s32 numNotes) {
         gSampleDmas[gSampleDmaCount].size = gSampleDmaBuffSize;
         gSampleDmaCount++;
     }
+
     for (i = gSampleDmaListSize1; i < gSampleDmaCount; i++) {
         gSampleDmaReuseQueue2[i - gSampleDmaListSize1] = i;
         gSampleDmas[i].reuseIndex = i - gSampleDmaListSize1;
     }
+
     for (i = gSampleDmaCount; i < 0x100; i++) {
         gSampleDmaReuseQueue2[i] = gSampleDmaListSize1;
     }
+
     gSampleDmaReuseQueue2RdPos = 0;
     gSampleDmaReuseQueue2WrPos = gSampleDmaCount - gSampleDmaListSize1;
 }
@@ -207,12 +217,12 @@ void AudioLoad_InitSampleDmaBuffers(s32 numNotes) {
 void AudioLoad_InitTable(AudioTable* table, u8* romAddr, u16 unkMediumParam) {
     s32 i;
 
-    table->unkMediumParam = unkMediumParam;
+    table->base.unkMediumParam = unkMediumParam;
-    table->romAddr = romAddr;
+    table->base.romAddr = (uintptr_t) romAddr;
 
-    for (i = 0; i < table->numEntries; i++) {
+    for (i = 0; i < table->base.numEntries; i++) {
         if ((table->entries[i].size != 0) && (table->entries[i].medium == MEDIUM_CART)) {
-            table->entries[i].romAddr += (u32) romAddr;
+            table->entries[i].romAddr += (uintptr_t) romAddr;
         }
     }
 }
@@ -227,7 +237,9 @@ void* AudioLoad_SyncLoadSeqFonts(s32 seqId, u32* outFontId) {
         fontId = gSeqFontTable[index++];
         soundFontData = AudioLoad_SyncLoadFont(fontId);
     }
+
     *outFontId = fontId;
+
     return soundFontData;
 }
 
@@ -253,7 +265,8 @@ s32 AudioLoad_SyncLoadSample(Sample* sample, s32 fontId) {
             return -1;
         }
         if (sample->medium == MEDIUM_UNK) {
-            AudioLoad_SyncDmaUnkMedium(sample->sampleAddr, sampleAddr, sample->size, gSampleBankTable->unkMediumParam);
+            AudioLoad_SyncDmaUnkMedium(sample->sampleAddr, sampleAddr, sample->size,
+                                       gSampleBankTable->base.unkMediumParam);
         } else {
             AudioLoad_SyncDma(sample->sampleAddr, sampleAddr, sample->size, sample->medium);
         }
@@ -296,7 +309,7 @@ void AudioLoad_AsyncLoadSampleBank(s32 sampleBankId, s32 nChunks, s32 retData, O
 }
 
 void AudioLoad_AsyncLoadSeq(s32 seqId, s32 nChunks, s32 retData, OSMesgQueue* retQueue) {
-    s32 index = ((u16*) gSeqFontTable)[AudioLoad_GetLoadTableIndex(SEQUENCE_TABLE, seqId)];
+    s32 index = *((u16*) gSeqFontTable + AudioLoad_GetLoadTableIndex(SEQUENCE_TABLE, seqId));
     s32 fontsLeft = gSeqFontTable[index++];
 
     for (fontsLeft; fontsLeft > 0; fontsLeft--) {
@@ -306,17 +319,18 @@ void AudioLoad_AsyncLoadSeq(s32 seqId, s32 nChunks, s32 retData, OSMesgQueue* re
 }
 
 u8* AudioLoad_GetFontsForSequence(s32 seqId, u32* outNumFonts) {
-    s32 index = ((u16*) gSeqFontTable)[AudioLoad_GetLoadTableIndex(SEQUENCE_TABLE, seqId)];
+    s32 index = *((u16*) gSeqFontTable + AudioLoad_GetLoadTableIndex(SEQUENCE_TABLE, seqId));
 
     *outNumFonts = gSeqFontTable[index++];
     if (*outNumFonts == 0) {
         return NULL;
-    }
+    } else {
         return &gSeqFontTable[index];
     }
+}
 
 void AudioLoad_DiscardSeqFonts(s32 seqId) {
-    s32 index = ((u16*) gSeqFontTable)[AudioLoad_GetLoadTableIndex(SEQUENCE_TABLE, seqId)];
+    s32 index = *((u16*) gSeqFontTable + AudioLoad_GetLoadTableIndex(SEQUENCE_TABLE, seqId));
     s32 numFonts = gSeqFontTable[index++];
     u32 fontId;
 
@@ -326,8 +340,8 @@ void AudioLoad_DiscardSeqFonts(s32 seqId) {
         if (AudioHeap_SearchPermanentCache(1, fontId) == NULL) {
             AudioLoad_DiscardFont(fontId);
             if (gFontLoadStatus[fontId] != 5) {
-                if (1) {}
                 gFontLoadStatus[fontId] = 0;
+                if (1) {}
             }
         }
     }
@@ -345,6 +359,7 @@ s32 AudioLoad_DiscardFont(s32 fontId) {
     } else if (tcache->entries[1].id == fontId) {
         tcache->entries[1].id = -1;
     }
+
     pcache = &cache->persistent;
     for (i = 0; i < pcache->numEntries; i++) {
         if (pcache->entries[i].id == fontId) {
@@ -366,16 +381,22 @@ void AudioLoad_SyncInitSeqPlayerInternal(s32 playerIdx, s32 seqId, s32 arg2) {
     s32 i;
 
     seqId = AudioLoad_GetLoadTableIndex(SEQUENCE_TABLE, seqId);
+
     func_800144E4(&gSeqPlayers[playerIdx]);
-    index = ((u16*) gSeqFontTable)[seqId];
+
+    index = *((u16*) gSeqFontTable + seqId);
     numFonts = gSeqFontTable[index++];
     fontId = 0xFF;
+
     for (numFonts; numFonts > 0; numFonts--) {
         fontId = gSeqFontTable[index++];
         AudioLoad_SyncLoadFont(fontId);
     }
+
     seqData = AudioLoad_SyncLoadSeq(seqId);
+
     func_80016804(playerIdx);
+
     gSeqPlayers[playerIdx].seqId = seqId;
     gSeqPlayers[playerIdx].defaultFont = fontId;
     gSeqPlayers[playerIdx].enabled = true;
@@ -384,6 +405,7 @@ void AudioLoad_SyncInitSeqPlayerInternal(s32 playerIdx, s32 seqId, s32 arg2) {
     gSeqPlayers[playerIdx].scriptState.depth = 0;
     gSeqPlayers[playerIdx].delay = 0;
     gSeqPlayers[playerIdx].finished = false;
+
     for (i = 0; i < 16; i++) {
         ;
     }
@@ -411,17 +433,21 @@ void* AudioLoad_SyncLoadSampleBank(u32 sampleBankId, s32* outMedium) {
         *outMedium = MEDIUM_RAM;
         return ramAddr;
     }
+
     cachePolicy = sampleBankTable->entries[sampleBankId].cachePolicy;
     if (cachePolicy == CACHEPOLICY_4) {
         *outMedium = sampleBankTable->entries[sampleBankId].medium;
         return sampleBankTable->entries[sampleBankId].romAddr;
     }
+
     ramAddr = AudioLoad_SyncLoad(2, sampleBankId, &noLoad);
     if (ramAddr != NULL) {
         *outMedium = MEDIUM_RAM;
         return ramAddr;
     }
+
     *outMedium = sampleBankTable->entries[sampleBankId].medium;
+
     return sampleBankTable->entries[sampleBankId].romAddr;
 }
 
@@ -433,25 +459,30 @@ void* AudioLoad_SyncLoadFont(s32 fontId) {
     SampleBankRelocInfo relocInfo;
 
     fontId = AudioLoad_GetLoadTableIndex(FONT_TABLE, fontId);
+
     sampleBankId1 = gSoundFontList[fontId].sampleBankId1;
     sampleBankId2 = gSoundFontList[fontId].sampleBankId2;
 
     relocInfo.sampleBankId1 = sampleBankId1;
     relocInfo.sampleBankId2 = sampleBankId2;
+
     if (sampleBankId1 != SAMPLES_NONE) {
         relocInfo.baseAddr1 = AudioLoad_SyncLoadSampleBank(sampleBankId1, &relocInfo.medium1);
     } else {
         relocInfo.baseAddr1 = NULL;
     }
+
     if (sampleBankId2 != SAMPLES_NONE) {
         relocInfo.baseAddr2 = AudioLoad_SyncLoadSampleBank(sampleBankId2, &relocInfo.medium2);
     } else {
         relocInfo.baseAddr2 = NULL;
     }
+
     fontData = AudioLoad_SyncLoad(1, fontId, &didAllocate);
     if (fontData == NULL) {
         return NULL;
     }
+
     if (didAllocate == 1) {
         AudioLoad_RelocateFontAndPreloadSamples(fontId, fontData, &relocInfo, AUDIOLOAD_SYNC);
     }
@@ -479,6 +510,7 @@ void* AudioLoad_SyncLoad(u32 tableType, u32 id, s32* didAllocate) {
         medium = table->entries[id].medium;
         cachePolicy = table->entries[id].cachePolicy;
         romAddr = table->entries[id].romAddr;
+
         switch (cachePolicy) {
             case CACHEPOLICY_0:
                 ramAddr = AudioHeap_AllocPermanent(tableType, id, size);
@@ -486,18 +518,21 @@ void* AudioLoad_SyncLoad(u32 tableType, u32 id, s32* didAllocate) {
                     return ramAddr;
                 }
                 break;
+
             case CACHEPOLICY_1:
                 ramAddr = AudioHeap_AllocCached(tableType, size, CACHE_PERSISTENT, id);
                 if (ramAddr == NULL) {
                     return ramAddr;
                 }
                 break;
+
             case CACHEPOLICY_2:
                 ramAddr = AudioHeap_AllocCached(tableType, size, CACHE_TEMPORARY, id);
                 if (ramAddr == NULL) {
                     return ramAddr;
                 }
                 break;
+
             case CACHEPOLICY_3:
             case CACHEPOLICY_4:
                 ramAddr = AudioHeap_AllocCached(tableType, size, CACHE_EITHER, id);
@@ -508,24 +543,28 @@ void* AudioLoad_SyncLoad(u32 tableType, u32 id, s32* didAllocate) {
         }
 
         *didAllocate = true;
+
         if (medium == MEDIUM_UNK) {
-            AudioLoad_SyncDmaUnkMedium(romAddr, ramAddr, size, table->unkMediumParam);
+            AudioLoad_SyncDmaUnkMedium(romAddr, ramAddr, size, table->base.unkMediumParam);
         } else {
             AudioLoad_SyncDma(romAddr, ramAddr, size, medium);
         }
         loadStatus = (cachePolicy == CACHEPOLICY_0) ? 5 : 2;
     }
+
     switch (tableType) {
         case SEQUENCE_TABLE:
             if (gSeqLoadStatus[id] != 5) {
                 gSeqLoadStatus[id] = loadStatus;
             }
             break;
+
         case FONT_TABLE:
             if (gFontLoadStatus[id] != 5) {
                 gFontLoadStatus[id] = loadStatus;
             }
             break;
+
         case SAMPLE_TABLE:
             if (gSampleFontLoadStatus[id] != 5) {
                 gSampleFontLoadStatus[id] = loadStatus;
@@ -551,6 +590,7 @@ void* AudioLoad_SearchCaches(s32 tableType, s32 id) {
     if (ramAddr != NULL) {
         return ramAddr;
     }
+
     ramAddr = AudioHeap_SearchCaches(tableType, CACHE_EITHER, id);
     if (ramAddr != NULL) {
         return ramAddr;
@@ -595,11 +635,11 @@ void AudioLoad_RelocateFont(s32 fontId, u32 fontBaseAddr, void* relocData) {
         fontDataPtrs[0] += fontBaseAddr;
 
         for (i = 0; i < numDrums; i++) {
-            offset = (*drumDataPtrs)[i];
+            offset = *(*drumDataPtrs + i);
             if (offset != 0) {
                 drum = offset += fontBaseAddr;
-                (*drumDataPtrs)[i] = drum;
+                *(*drumDataPtrs + i) = drum;
-                //  temp2;
+
                 if (!drum->isRelocated) {
                     AudioLoad_RelocateSample(&drum->tunedSample, fontBaseAddr, relocData);
                     offset = (u32) drum->envelope;
@@ -635,7 +675,9 @@ void AudioLoad_RelocateFont(s32 fontId, u32 fontBaseAddr, void* relocData) {
 
 void AudioLoad_SyncDma(u32 devAddr, u8* ramAddr, u32 size, s32 medium) {
     size = ALIGN16(size);
+
     osInvalDCache(ramAddr, size);
+
     while (true) {
         if (size < 0x400) {
             break;
@@ -646,6 +688,7 @@ void AudioLoad_SyncDma(u32 devAddr, u8* ramAddr, u32 size, s32 medium) {
         devAddr += 0x400;
         ramAddr += 0x400;
     }
+
     if (size != 0) {
         AudioLoad_Dma(&gSyncDmaIoMsg, 1, 0, devAddr, ramAddr, size, &gSyncDmaQueue, medium, "FastCopy");
         MQ_WAIT_FOR_MESG(&gSyncDmaQueue, NULL);
@@ -683,11 +726,13 @@ s32 AudioLoad_Dma(OSIoMesg* mesg, u32 priority, s32 direction, u32 devAddr, void
     if (size & 0xF) {
         size = ALIGN16(size);
     }
+
     mesg->hdr.pri = priority;
     mesg->hdr.retQueue = retQueue;
     mesg->dramAddr = ramAddr;
     mesg->devAddr = devAddr;
     mesg->size = size;
+
     handle->transferInfo.cmdType = 2;
     osEPiStartDma(handle, mesg, direction);
 
@@ -722,17 +767,20 @@ void* AudioLoad_AsyncLoadInner(s32 tableType, s32 id, s32 nChunks, s32 retData,
                 return NULL;
             }
             break;
+
         case FONT_TABLE:
             if (gFontLoadStatus[id] == 1) {
                 return NULL;
             }
             break;
+
         case SAMPLE_TABLE:
             if (gSampleFontLoadStatus[id] == 1) {
                 return NULL;
             }
             break;
     }
+
     ramAddr = AudioLoad_SearchCaches(tableType, id);
     if (ramAddr != NULL) {
         loadStatus = 2;
@@ -745,6 +793,7 @@ void* AudioLoad_AsyncLoadInner(s32 tableType, s32 id, s32 nChunks, s32 retData,
         cachePolicy = table->entries[id].cachePolicy;
         romAddr = table->entries[id].romAddr;
         loadStatus = 2;
+
         switch (cachePolicy) {
             case CACHEPOLICY_0:
                 ramAddr = AudioHeap_AllocPermanent(tableType, id, size);
@@ -753,18 +802,21 @@ void* AudioLoad_AsyncLoadInner(s32 tableType, s32 id, s32 nChunks, s32 retData,
                 }
                 loadStatus = 5;
                 break;
+
             case CACHEPOLICY_1:
                 ramAddr = AudioHeap_AllocCached(tableType, size, CACHE_PERSISTENT, id);
                 if (ramAddr == NULL) {
                     return ramAddr;
                 }
                 break;
+
             case CACHEPOLICY_2:
                 ramAddr = AudioHeap_AllocCached(tableType, size, CACHE_TEMPORARY, id);
                 if (ramAddr == NULL) {
                     return ramAddr;
                 }
                 break;
+
             case CACHEPOLICY_3:
             case CACHEPOLICY_4:
                 ramAddr = AudioHeap_AllocCached(tableType, size, CACHE_EITHER, id);
@@ -777,17 +829,20 @@ void* AudioLoad_AsyncLoadInner(s32 tableType, s32 id, s32 nChunks, s32 retData,
                                  (retData << 0x18) | (tableType << 0x10) | (id << 8) | loadStatus);
         loadStatus = 1;
     }
+
     switch (tableType) {
         case SEQUENCE_TABLE:
             if (gSeqLoadStatus[id] != 5) {
                 gSeqLoadStatus[id] = loadStatus;
             }
             break;
+
         case FONT_TABLE:
             if (gFontLoadStatus[id] != 5) {
                 gFontLoadStatus[id] = loadStatus;
             }
             break;
+
         case SAMPLE_TABLE:
             if (gSampleFontLoadStatus[id] != 5) {
                 gSampleFontLoadStatus[id] = loadStatus;
@@ -828,7 +883,7 @@ void AudioLoad_Init(void) {
     gAudioResetTimer = 0;
 
     for (i = 0; i < gAudioHeapSize / 8; i++) {
-        ((u64*) gAudioHeap)[i] = 0;
+        *((u64*) gAudioHeap + i) = 0;
     }
 
     clearContext = gAudioContextStart;
@@ -836,25 +891,31 @@ void AudioLoad_Init(void) {
     for (; dwordsLeft >= 0; dwordsLeft--) {
         *clearContext++ = 0;
     }
+
     switch (osTvType) {
         case OS_TV_PAL:
             gMaxTempoTvTypeFactors = 20.03042f;
             gRefreshRate = 50;
             break;
+
         case OS_TV_MPAL:
             gMaxTempoTvTypeFactors = 16.546f;
             gRefreshRate = 60;
             break;
+
         default:
         case OS_TV_NTSC:
             gMaxTempoTvTypeFactors = 16.713f;
             gRefreshRate = 60;
             break;
     }
+
     AudioThread_Init();
+
     for (i = 0; i < 3; i++) {
         gAiBuffLengths[i] = 0xA0;
     }
+
     gAudioTaskCountQ = 0;
     gAudioTaskIndexQ = 0;
     gCurAiBuffIndex = 0;
@@ -862,13 +923,17 @@ void AudioLoad_Init(void) {
     gAudioCurTask = NULL;
     gAudioRspTasks[0].task.t.data_size = 0;
     gAudioRspTasks[1].task.t.data_size = 0;
+
     osCreateMesgQueue(&gSyncDmaQueue, gSyncDmaMsg, 1);
     osCreateMesgQueue(&gCurAudioFrameDmaQueue, gCurAudioFrameDmaMsg, 64);
     osCreateMesgQueue(&gExternalLoadQueue, gExternalLoadMsg, 16);
     osCreateMesgQueue(&gPreloadSampleQueue, gPreloadSampleMsg, 16);
+
     gCurAudioFrameDmaCount = 0;
     gSampleDmaCount = 0;
+
     AudioHeap_InitMainPools(gInitPoolSize);
+
     for (i = 0; i < 3; i++) {
         gAiBuffers[i] = AudioHeap_Alloc(&gInitPool, AIBUF_SIZE);
         for (j = 0; j < AIBUF_LEN; j++) {
@@ -878,26 +943,33 @@ void AudioLoad_Init(void) {
     gAudioSpecId = AUDIOSPEC_0;
     gAudioResetStep = 1;
     AudioHeap_ResetStep();
-    gSequenceTable = (AudioTable*) &gSeqTableInit;
+
-    gSoundFontTable = (AudioTable*) &gSoundFontTableInit;
+    gSequenceTable = &gSeqTableInit;
-    gSampleBankTable = (AudioTable*) &gSampleBankTableInit;
+    gSoundFontTable = &gSoundFontTableInit;
+    gSampleBankTable = &gSampleBankTableInit;
     gSeqFontTable = gSeqFontTableInit;
-    gNumSequences = gSequenceTable->numEntries;
+    gNumSequences = gSequenceTable->base.numEntries;
+
     AudioLoad_InitTable(gSequenceTable, SEGMENT_ROM_START(audio_seq), gSequenceMedium);
     AudioLoad_InitTable(gSoundFontTable, SEGMENT_ROM_START(audio_bank), gSoundFontMedium);
     AudioLoad_InitTable(gSampleBankTable, SEGMENT_ROM_START(audio_table), gSampleBankMedium);
-    numFonts = gSoundFontTable->numEntries;
+
+    numFonts = gSoundFontTable->base.numEntries;
+
     gSoundFontList = AudioHeap_Alloc(&gInitPool, numFonts * sizeof(SoundFont));
+
     for (i = 0; i < numFonts; i++) {
         gSoundFontList[i].sampleBankId1 = (gSoundFontTable->entries[i].shortData1 >> 8) & 0xFF;
         gSoundFontList[i].sampleBankId2 = gSoundFontTable->entries[i].shortData1 & 0xFF;
         gSoundFontList[i].numInstruments = (gSoundFontTable->entries[i].shortData2 >> 8) & 0xFF;
         gSoundFontList[i].numDrums = gSoundFontTable->entries[i].shortData2 & 0xFF;
     }
+
     ramAddr = AudioHeap_Alloc(&gInitPool, gPermanentPoolSize);
     if (ramAddr == NULL) {
         gPermanentPoolSize = 0;
     }
+
     AudioHeap_InitPool(&gPermanentPool.pool, ramAddr, gPermanentPoolSize);
     func_800168BC();
 }
@@ -918,6 +990,7 @@ s32 AudioLoad_SlowLoadSample(s32 fontId, u8 instId, s8* status) {
         *status = SLOW_LOAD_STATUS_2;
         return 0;
     }
+
     slowLoad = &gSlowLoads.slowLoad[gSlowLoads.unk_00];
     if (slowLoad->state == SLOW_LOAD_DONE) {
         slowLoad->state = SLOW_LOAD_WAITING;
@@ -1003,7 +1076,7 @@ void AudioLoad_ProcessSlowLoads(s32 resetStatus) {
                 } else if (slowLoad->bytesRemaining < 0x1000) {
                     if (slowLoad->medium == MEDIUM_UNK) {
                         AudioLoad_DmaSlowCopyUnkMedium(slowLoad->curDevAddr, slowLoad->curRamAddr,
-                                                       slowLoad->bytesRemaining, sampleBankTable->unkMediumParam);
+                                                       slowLoad->bytesRemaining, sampleBankTable->base.unkMediumParam);
                     } else {
                         AudioLoad_DmaSlowCopy(&gSlowLoads.slowLoad[i], slowLoad->bytesRemaining);
                     }
@@ -1011,7 +1084,7 @@ void AudioLoad_ProcessSlowLoads(s32 resetStatus) {
                 } else {
                     if (slowLoad->medium == MEDIUM_UNK) {
                         AudioLoad_DmaSlowCopyUnkMedium(slowLoad->curDevAddr, slowLoad->curRamAddr, 0x1000,
-                                                       sampleBankTable->unkMediumParam);
+                                                       sampleBankTable->base.unkMediumParam);
                     } else {
                         AudioLoad_DmaSlowCopy(&gSlowLoads.slowLoad[i], 0x1000);
                     }
@@ -1059,6 +1132,7 @@ AudioAsyncLoad* AudioLoad_StartAsyncLoad(u32 devAddr, u8* ramAddr, u32 size, s32
     if (i == 16) {
         return NULL;
     }
+
     asyncLoad->status = 1;
     asyncLoad->curDevAddr = devAddr;
     asyncLoad->ramAddr = ramAddr;
@@ -1073,8 +1147,8 @@ AudioAsyncLoad* AudioLoad_StartAsyncLoad(u32 devAddr, u8* ramAddr, u32 size, s32
             asyncLoad->chunkSize = 0x100;
         }
     }
-    asyncLoad->retQueue = retQueue;
 
+    asyncLoad->retQueue = retQueue;
     asyncLoad->delay = 3;
     asyncLoad->medium = medium;
     asyncLoad->retMsg = retMesg;
@@ -1119,35 +1193,42 @@ void AudioLoad_ProcessAsyncLoad(AudioAsyncLoad* asyncLoad, s32 resetStatus) {
             return;
         }
     }
+
     if (asyncLoad->bytesRemaining == 0) {
         msg = asyncLoad->retMsg;
         tableType = (msg >> 0x10) & 0xFF;
         tableIndex = (msg >> 8) & 0xFF;
         loadStatus = msg & 0xFF;
+
         switch (tableType) {
             case SEQUENCE_TABLE:
                 if (gSeqLoadStatus[tableIndex] != 5) {
                     gSeqLoadStatus[tableIndex] = loadStatus;
                 }
                 break;
+
             case SAMPLE_TABLE:
                 if (gSampleFontLoadStatus[tableIndex] != 5) {
                     gSampleFontLoadStatus[tableIndex] = loadStatus;
                 }
                 break;
+
             case FONT_TABLE:
                 if (gFontLoadStatus[tableIndex] != 5) {
                     gFontLoadStatus[tableIndex] = loadStatus;
                 }
+
                 sampleBankId1 = gSoundFontList[tableIndex].sampleBankId1;
                 sampleBankId2 = gSoundFontList[tableIndex].sampleBankId2;
                 relocInfo.sampleBankId1 = sampleBankId1;
                 relocInfo.sampleBankId2 = sampleBankId2;
+
                 if (sampleBankId1 != SAMPLES_NONE) {
                     relocInfo.baseAddr1 = AudioLoad_SyncLoadSampleBank(sampleBankId1, &relocInfo.medium1);
                 } else {
                     relocInfo.baseAddr1 = NULL;
                 }
+
                 if (sampleBankId2 != SAMPLES_NONE) {
                     relocInfo.baseAddr2 = AudioLoad_SyncLoadSampleBank(sampleBankId2, &relocInfo.medium2);
                 } else {
@@ -1161,7 +1242,7 @@ void AudioLoad_ProcessAsyncLoad(AudioAsyncLoad* asyncLoad, s32 resetStatus) {
     } else if (asyncLoad->bytesRemaining < asyncLoad->chunkSize) {
         if (asyncLoad->medium == MEDIUM_UNK) {
             AudioLoad_AsyncDmaUnkMedium(asyncLoad->curDevAddr, asyncLoad->curRamAddr, asyncLoad->bytesRemaining,
-                                        sampleTable->unkMediumParam);
+                                        sampleTable->base.unkMediumParam);
         } else {
             AudioLoad_AsyncDma(asyncLoad, asyncLoad->bytesRemaining);
         }
@@ -1169,7 +1250,7 @@ void AudioLoad_ProcessAsyncLoad(AudioAsyncLoad* asyncLoad, s32 resetStatus) {
     } else {
         if (asyncLoad->medium == MEDIUM_UNK) {
             AudioLoad_AsyncDmaUnkMedium(asyncLoad->curDevAddr, asyncLoad->curRamAddr, asyncLoad->chunkSize,
-                                        sampleTable->unkMediumParam);
+                                        sampleTable->base.unkMediumParam);
         } else {
             AudioLoad_AsyncDma(asyncLoad, asyncLoad->chunkSize);
         }
@@ -1211,7 +1292,7 @@ void AudioLoad_RelocateSample(TunedSample* tSample, u32 fontDataAddr, SampleBank
         if ((sample->size != 0) && (sample->isRelocated != 1)) {
             sample->loop = reloc = (u32) sample->loop + fontDataAddr;
             sample->book = reloc = (u32) sample->book + fontDataAddr;
-            switch (sample->medium) { /* irregular */
+            switch (sample->medium) {
                 case MEDIUM_RAM:
                     sample->sampleAddr = reloc = sample->sampleAddr + relocInfo->baseAddr1;
                     sample->medium = relocInfo->medium1;
@@ -1224,6 +1305,7 @@ void AudioLoad_RelocateSample(TunedSample* tSample, u32 fontDataAddr, SampleBank
                 case MEDIUM_DISK_DRIVE:
                     break;
             }
+
             sample->isRelocated = true;
             if (sample->unk_bit26 && (sample->medium != 0)) {
                 gUsedSamples[gNumUsedSamples++] = sample;
@@ -1253,9 +1335,11 @@ s32 AudioLoad_RelocateFontAndPreloadSamples(s32 fontId, u32 fontDataAddr, Sample
     } else {
         D_80146D80 = 0;
     }
+
     gNumUsedSamples = 0;
     AudioLoad_RelocateFont(fontId, fontDataAddr, relocData);
     size = 0;
+
     for (i = 0; i < gNumUsedSamples; i++) {
         size += ALIGN16(gUsedSamples[i]->size);
     }
@@ -1268,7 +1352,7 @@ s32 AudioLoad_RelocateFontAndPreloadSamples(s32 fontId, u32 fontDataAddr, Sample
 #ifdef AVOID_UB
         sampleRamAddr = NULL;
 #endif
-        //! Bug: Those are assignments, not equality checks.
+        //! @bug Those are assignments, not equality checks.
         switch (isAsync) {
             case AUDIOLOAD_SYNC:
                 if (sample->medium = relocData->medium1) {
@@ -1279,6 +1363,7 @@ s32 AudioLoad_RelocateFontAndPreloadSamples(s32 fontId, u32 fontDataAddr, Sample
                                                                          sample->sampleAddr, sample->medium);
                 }
                 break;
+
             case AUDIOLOAD_ASYNC:
                 if (sample->medium = relocData->medium1) {
                     sampleRamAddr = AudioHeap_AllocTemporarySampleCache(sample->size, relocData->sampleBankId1,
@@ -1289,14 +1374,16 @@ s32 AudioLoad_RelocateFontAndPreloadSamples(s32 fontId, u32 fontDataAddr, Sample
                 }
                 break;
         }
+
         if (sampleRamAddr == NULL) {
             continue;
         }
+
         switch (isAsync) {
             case AUDIOLOAD_SYNC:
                 if (sample->medium == MEDIUM_UNK) {
                     AudioLoad_SyncDmaUnkMedium(sample->sampleAddr, sampleRamAddr, sample->size,
-                                               gSampleBankTable->unkMediumParam);
+                                               gSampleBankTable->base.unkMediumParam);
                     sample->sampleAddr = sampleRamAddr;
                     sample->medium = MEDIUM_RAM;
                 } else {
@@ -1305,6 +1392,7 @@ s32 AudioLoad_RelocateFontAndPreloadSamples(s32 fontId, u32 fontDataAddr, Sample
                     sample->medium = MEDIUM_RAM;
                 }
                 break;
+
             case AUDIOLOAD_ASYNC:
                 size = gPreloadSampleStackTop;
                 gPreloadSampleStack[size].sample = sample;
@@ -1317,7 +1405,9 @@ s32 AudioLoad_RelocateFontAndPreloadSamples(s32 fontId, u32 fontDataAddr, Sample
                 break;
         }
     }
+
     gNumUsedSamples = 0;
+
     if ((gPreloadSampleStackTop != 0) && !inProgress) {
         sample = gPreloadSampleStack[gPreloadSampleStackTop - 1].sample;
         nChunks = (sample->size / 0x1000) + 1;
@@ -1367,6 +1457,7 @@ s32 AudioLoad_ProcessSamplePreloads(s32 resetStatus) {
             //  "============Error: Magic is Broken after loading.\n"
             gPreloadSampleStack[preloadIndex].isFree = 1;
         }
+
         while (true) {
             if (gPreloadSampleStackTop <= 0) {
                 break;
@@ -1380,6 +1471,7 @@ s32 AudioLoad_ProcessSamplePreloads(s32 resetStatus) {
             sampleAddr = sample->sampleAddr;
             size = sample->size;
             nChunks = (size >> 0xC) + 1;
+
             key = sampleAddr + size + sample->medium;
             if (key != gPreloadSampleStack[gPreloadSampleStackTop - 1].endAndMediumKey) {
                 // "============Error: Magic is Broken: %x\n";
@@ -1418,13 +1510,9 @@ s32 AudioLoad_GetSamplesForFont(s32 fontId, Sample** sampleSet) {
     s32 i;
     Drum* drum;
     Instrument* inst;
-    s32 numLoaded;
+    s32 numLoaded = 0;
-    s32 numDrums;
+    s32 numDrums = gSoundFontList[fontId].numDrums;
-    s32 numInstruments;
+    s32 numInstruments = gSoundFontList[fontId].numInstruments;
-
-    numLoaded = 0;
-    numDrums = gSoundFontList[fontId].numDrums;
-    numInstruments = gSoundFontList[fontId].numInstruments;
 
     for (i = 0; i < numDrums; i++) {
         drum = Audio_GetDrum(fontId, i);
@@ -1433,6 +1521,7 @@ s32 AudioLoad_GetSamplesForFont(s32 fontId, Sample** sampleSet) {
         }
         numLoaded = AudioLoad_AddToSampleSet(drum->tunedSample.sample, numLoaded, sampleSet);
     }
+
     for (i = 0; i < numInstruments; i++) {
         inst = Audio_GetInstrument(fontId, i);
         if (inst == NULL) {
@@ -1446,5 +1535,6 @@ s32 AudioLoad_GetSamplesForFont(s32 fontId, Sample** sampleSet) {
         }
         numLoaded = AudioLoad_AddToSampleSet(inst->normalPitchTunedSample.sample, numLoaded, sampleSet);
     }
+
     return numLoaded;
 }

src/audio/audio_synthesis.c

@@ -499,23 +499,20 @@ void func_80009124(s16** arg0);
 
 void func_80009504(s16* arg0, UnkStruct_800097A8* arg1) {
     s32 i;
-    f32 temp_ft0;
-    f32* var_v0;
-    f32* var_v0_2;
-    s32 temp_v0;
-    void* var_s0;
 
-    var_s0 = arg0;
     if (arg1->unk_0 != NULL) {
         arg1->unk_C = arg1->unk_0;
         arg1->unk_0 = 0;
     }
+
     arg1->unk18 += D_8014C1B4;
     while (arg1->unk18 > 0x1000) {
         func_80009124(&arg1->unk_C);
         arg1->unk18 -= 0x1000;
     }
+
     func_80008364(D_80145D48, D_80146148, 8, D_80146548);
+
     for (i = 0; i < 0x100; i++) {
         if (D_80145D48[i] > 32767.0f) {
             D_80145D48[i] = 32767.0f;
@@ -524,6 +521,7 @@ void func_80009504(s16* arg0, UnkStruct_800097A8* arg1) {
             D_80145D48[i] = -32767.0f;
         }
     }
+
     for (i = 0; i < 0x100; i++, arg0++) {
         *arg0 = D_80145D48[i];
     }

src/audio/audio_tables.c

@@ -1,16 +1,19 @@
 #include "sys.h"
 #include "sf64audio_provisional.h"
 
-AudioTableBase gSampleBankTableInit = { 4, 0, 0 };
+AudioTable gSampleBankTableInit = {
-AudioTableEntry gSampleBankTableInitEntries[4] = {
+    { 4, 0, 0 },
+    {
         { 0x000000, 0x0E1E30, MEDIUM_CART, CACHEPOLICY_4 },
         { 0x0E1E30, 0x0FF9D0, MEDIUM_CART, CACHEPOLICY_4 },
         { 0x1E1800, 0x497480, MEDIUM_CART, CACHEPOLICY_4 },
         { 0x678C80, 0x0C3900, MEDIUM_CART, CACHEPOLICY_4 },
+    },
 };
 
-AudioTableBase gSeqTableInit = { SEQ_ID_MAX, 0, 0 };
+AudioTable gSeqTableInit = {
-AudioTableEntry gSeqTableInitEntries[SEQ_ID_MAX] = {
+    { SEQ_ID_MAX, 0, 0 },
+    {
         { 0x00000, 0x3AF0, MEDIUM_CART, CACHEPOLICY_0 },     { 0x03AF0, 0x56B0, MEDIUM_CART, CACHEPOLICY_0 },
         { 0x091A0, 0x2D80, MEDIUM_CART, CACHEPOLICY_3 },     { 0x0BF20, 0x1410, MEDIUM_CART, CACHEPOLICY_3 },
         { 0x0D330, 0x1600, MEDIUM_CART, CACHEPOLICY_3 },     { 0x0E930, 0xF20, MEDIUM_CART, CACHEPOLICY_3 },
@@ -44,6 +47,7 @@ AudioTableEntry gSeqTableInitEntries[SEQ_ID_MAX] = {
         { 0x35E00, 0xAB0, MEDIUM_CART, CACHEPOLICY_3 },      { 0x368B0, 0x13D0, MEDIUM_CART, CACHEPOLICY_3 },
         { 0x37C80, 0x250, MEDIUM_CART, CACHEPOLICY_3 },      { 0x37ED0, 0x6F0, MEDIUM_CART, CACHEPOLICY_3 },
         { 0x385C0, 0xFB0, MEDIUM_CART, CACHEPOLICY_3 },      { 0x39570, 0x1780, MEDIUM_CART, CACHEPOLICY_3 },
+    },
 };
 #define SOUNDFONT_ENTRY(offset, size, medium, cachePolicy, bank1, bank2, numInst, numDrums) \
     {                                                                                       \
@@ -51,8 +55,9 @@ AudioTableEntry gSeqTableInitEntries[SEQ_ID_MAX] = {
             (((numInst) &0xFF) << 8) | ((numDrums) &0xFF)                                   \
     }
 
-AudioTableBase gSoundFontTableInit = { 33, 0, 0 };
+AudioTable gSoundFontTableInit = {
-AudioTableEntry gSoundFontTableInitEntries[33] = {
+    { 33, 0, 0 },
+    {
         SOUNDFONT_ENTRY(0x00000, 0x2F00, MEDIUM_CART, CACHEPOLICY_0, SAMPLES_SFX, SAMPLES_NONE, 127, 0),
         SOUNDFONT_ENTRY(0x02F00, 0x0FE0, MEDIUM_CART, CACHEPOLICY_0, SAMPLES_MAP, SAMPLES_NONE, 127, 0),
         SOUNDFONT_ENTRY(0x03EE0, 0x0640, MEDIUM_CART, CACHEPOLICY_0, SAMPLES_VOICE, SAMPLES_NONE, 127, 0),
@@ -86,6 +91,7 @@ AudioTableEntry gSoundFontTableInitEntries[33] = {
         SOUNDFONT_ENTRY(0x1C370, 0x09E0, MEDIUM_CART, CACHEPOLICY_3, SAMPLES_INST, SAMPLES_NONE, 10, 64),
         SOUNDFONT_ENTRY(0x1CD50, 0x0A00, MEDIUM_CART, CACHEPOLICY_3, SAMPLES_INST, SAMPLES_NONE, 10, 64),
         SOUNDFONT_ENTRY(0x1D750, 0x08D0, MEDIUM_CART, CACHEPOLICY_3, SAMPLES_INST, SAMPLES_NONE, 10, 64),
+    },
 };
 
 #define AS_BYTES(x) (((x) >> 8) & 0xFF), ((x) &0xFF)

src/engine/fox_360.c

@@ -106,36 +106,36 @@ void AllRange_DrawCountdown(void) {
     }
 }
 
-void Boss309_Update(Boss309* this) {
+void BoBase_Update(BoBase* this) {
-    OvlI4_CallFunction(OVLCALL_BOSS309_UPDATE, this);
+    OvlI4_CallFunction(OVLCALL_BO_BASE_UPDATE, this);
 }
 
-void Boss309_Draw(Boss309* this) {
+void BoBase_Draw(BoBase* this) {
-    OvlI4_CallFunction(OVLCALL_BOSS309_DRAW, this);
+    OvlI4_CallFunction(OVLCALL_BO_BASE_DRAW, this);
 }
 
-void Boss310_Update(Boss310* this) {
+void BoBaseShield_Update(BoBaseShield* this) {
-    OvlI4_CallFunction(OVLCALL_BOSS310_UPDATE, this);
+    OvlI4_CallFunction(OVLCALL_BO_BASE_SHIELD_UPDATE, this);
 }
 
-void Boss310_Draw(Boss310* this) {
+void BoBaseShield_Draw(BoBaseShield* this) {
-    OvlI4_CallFunction(OVLCALL_BOSS310_DRAW, this);
+    OvlI4_CallFunction(OVLCALL_BO_BASE_SHIELD_DRAW, this);
 }
 
-void Actor271_Update(Actor271* this) {
+void BoShieldReactor_Update(BoShieldReactor* this) {
-    OvlI4_CallFunction(OVLCALL_ACTOR271_UPDATE, this);
+    OvlI4_CallFunction(OVLCALL_BO_SHIELD_REACTOR_UPDATE, this);
 }
 
-void Actor271_Draw(Actor271* this) {
+void BoShieldReactor_Draw(BoShieldReactor* this) {
-    OvlI4_CallFunction(OVLCALL_ACTOR271_DRAW, this);
+    OvlI4_CallFunction(OVLCALL_BO_SHIELD_REACTOR_DRAW, this);
 }
 
-void Actor272_Update(Actor272* this) {
+void BoLaserCannon_Update(BoLaserCannon* this) {
-    OvlI4_CallFunction(OVLCALL_ACTOR272_UPDATE, this);
+    OvlI4_CallFunction(OVLCALL_BO_LASER_CANNON_UPDATE, this);
 }
 
-void Actor272_Draw(Actor272* this) {
+void BoLaserCannon_Draw(BoLaserCannon* this) {
-    OvlI4_CallFunction(OVLCALL_ACTOR272_DRAW, this);
+    OvlI4_CallFunction(OVLCALL_BO_LASER_CANNON_DRAW, this);
 }
 
 void AllRange_GreatFoxRepair(Player* player) {
@@ -309,8 +309,9 @@ void ActorAllRange_SetShadowData(Actor* this) {
     if (this->drawShadow && (gLevelMode == LEVELMODE_ALL_RANGE) && (gLevelType == LEVELTYPE_PLANET)) {
         for (i = 0, scenery360 = gScenery360; i < 200; i++, scenery360++) {
             if ((scenery360->obj.status == OBJ_ACTIVE) &&
-                ((scenery360->obj.id == OBJ_SCENERY_150) || (scenery360->obj.id == OBJ_SCENERY_149) ||
+                ((scenery360->obj.id == OBJ_SCENERY_FO_MOUNTAIN_3) ||
-                 (scenery360->obj.id == OBJ_SCENERY_148) || (scenery360->obj.id == OBJ_SCENERY_CO_BUMP_1) ||
+                 (scenery360->obj.id == OBJ_SCENERY_FO_MOUNTAIN_2) ||
+                 (scenery360->obj.id == OBJ_SCENERY_FO_MOUNTAIN_1) || (scenery360->obj.id == OBJ_SCENERY_CO_BUMP_1) ||
                  (scenery360->obj.id == OBJ_SCENERY_CO_BUMP_3)) &&
                 (fabsf(scenery360->obj.pos.x - this->obj.pos.x) < 2500.0f) &&
                 (fabsf(scenery360->obj.pos.z - this->obj.pos.z) < 2500.0f)) {
@@ -332,8 +333,9 @@ void ActorAllRange_SetShadowData(Actor* this) {
                 spCC.y = spD8.y + temp1.y;
                 spCC.z = spD8.z + temp1.z;
 
-                if ((scenery360->obj.id == OBJ_SCENERY_149) || (scenery360->obj.id == OBJ_SCENERY_150)) {
+                if ((scenery360->obj.id == OBJ_SCENERY_FO_MOUNTAIN_2) ||
-                    if (scenery360->obj.id == OBJ_SCENERY_149) {
+                    (scenery360->obj.id == OBJ_SCENERY_FO_MOUNTAIN_3)) {
+                    if (scenery360->obj.id == OBJ_SCENERY_FO_MOUNTAIN_2) {
                         colId = COL1_5;
                     } else {
                         colId = COL1_6;
@@ -831,10 +833,10 @@ s32 func_360_8003049C(ActorAllRange* this) {
 
     if (boss->obj.id == OBJ_BOSS_CO_CARRIER) {
         var_ft5 = 350.0f;
-    } else if (boss->obj.id == OBJ_BOSS_309) {
+    } else if (boss->obj.id == OBJ_BOSS_BO_BASE) {
         sp44 = 2000.0f;
         var_ft5 = 750.0f;
-    } else if (boss->obj.id == OBJ_BOSS_KA_BASE) {
+    } else if (boss->obj.id == OBJ_BOSS_KA_FLBASE) {
         sp44 = 1500.0f;
         var_ft5 = 700.0f;
     }
@@ -2127,7 +2129,7 @@ void ActorAllRange_Update(ActorAllRange* this) {
                 spA8.y = 70.0f;
                 spA8.z = -70.0f;
                 Matrix_MultVec3fNoTranslate(gCalcMatrix, &spA8, &sp9C);
-                func_effect_80078E50(this->obj.pos.x + sp9C.x, this->obj.pos.y + sp9C.y, this->obj.pos.z + sp9C.z,
+                Effect_Effect393_Spawn(this->obj.pos.x + sp9C.x, this->obj.pos.y + sp9C.y, this->obj.pos.z + sp9C.z,
                                        3.1f);
             }
         }
@@ -2260,7 +2262,7 @@ void ActorAllRange_Update(ActorAllRange* this) {
                     this->timer_0BE = 2;
                     this->obj.status = OBJ_DYING;
                     this->itemDrop = DROP_NONE;
-                    func_effect_8007BFFC(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, 0.0f, 0.0f, 0.0f, 5.0f, 15);
+                    Effect386_Spawn1(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, 0.0f, 0.0f, 0.0f, 5.0f, 15);
                     Effect_SpawnTimedSfxAtPos(&this->obj.pos, NA_SE_EN_EXPLOSION_S);
                 } else {
                     this->dmgType = DMG_BEAM;
@@ -2339,7 +2341,7 @@ void ActorAllRange_DrawBarrelRoll(ActorAllRange* this) {
         RCP_SetupDL(&gMasterDisp, SETUPDL_67);
         gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, alpha);
         gDPSetEnvColor(gMasterDisp++, 0, 0, 160, alpha);
-        gSPDisplayList(gMasterDisp++, D_101DC10);
+        gSPDisplayList(gMasterDisp++, aBarrelRollTex);
         Matrix_Pop(&gGfxMatrix);
     }
 }

src/engine/fox_beam.c

@@ -61,13 +61,13 @@ void PlayerShot_ExplodeBomb(PlayerShot* shot) {
         if (shot->obj.pos.y < (gGroundHeight + 450.0f)) {
             gCameraShake = 15;
             if (gGroundSurface == SURFACE_WATER) {
-                func_effect_8007D9DC(shot->obj.pos.x, gGroundHeight + 2.0f, shot->obj.pos.z, shot->unk_48 * 0.1f,
+                Effect_Effect367_Spawn(shot->obj.pos.x, gGroundHeight + 2.0f, shot->obj.pos.z, shot->unk_48 * 0.1f,
                                        shot->unk_48 * 3.0f, 0);
-                func_effect_8007D9DC(shot->obj.pos.x, gGroundHeight + 2.0f, shot->obj.pos.z, shot->unk_48 * 0.1f,
+                Effect_Effect367_Spawn(shot->obj.pos.x, gGroundHeight + 2.0f, shot->obj.pos.z, shot->unk_48 * 0.1f,
                                        shot->unk_48 * 3.0f, 5);
-                func_effect_8007D9DC(shot->obj.pos.x, gGroundHeight + 2.0f, shot->obj.pos.z, shot->unk_48 * 0.1f,
+                Effect_Effect367_Spawn(shot->obj.pos.x, gGroundHeight + 2.0f, shot->obj.pos.z, shot->unk_48 * 0.1f,
                                        shot->unk_48 * 3.0f, 10);
-                func_effect_8007ADF4(shot->obj.pos.x, gGroundHeight, shot->obj.pos.z, shot->unk_48 * 0.05f,
+                Effect_Effect372_Spawn2(shot->obj.pos.x, gGroundHeight, shot->obj.pos.z, shot->unk_48 * 0.05f,
                                         shot->unk_48 * 0.5f);
                 Effect_SpawnTimedSfxAtPos(&shot->obj.pos, NA_SE_OB_WATER_BOUND_M);
             } else {
@@ -83,7 +83,7 @@ void PlayerShot_ExplodeBomb(PlayerShot* shot) {
             if (var_fv1 > 2.0f) {
                 var_fv1 = 2.0f;
             }
-            func_effect_8007B550(shot->obj.pos.x, gGroundHeight + 6.0f, shot->obj.pos.z,
+            Effect_Effect385_Spawn(shot->obj.pos.x, gGroundHeight + 6.0f, shot->obj.pos.z,
                                    shot->unk_48 * (1.5f + var_fv1), var_fv0);
         }
 
@@ -92,7 +92,7 @@ void PlayerShot_ExplodeBomb(PlayerShot* shot) {
         } else {
             var_v0 = 0;
         }
-        func_effect_8007B344(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, shot->unk_48 * 1.5f, var_v0);
+        Effect_Effect384_Spawn(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, shot->unk_48 * 1.5f, var_v0);
         if (gUseDynaFloor) {
             var_fs0 = 5.0f;
             if (shot->obj.pos.y > 300.0f) {
@@ -105,15 +105,15 @@ void PlayerShot_ExplodeBomb(PlayerShot* shot) {
                 var_fs0 = 4.0f;
             }
             var_fs0 *= 2.0f;
-            func_effect_8007AFD0(shot->obj.pos.x, shot->obj.pos.z, 50.0f, 0.0f, var_fs0);
+            Effect_Effect382_Spawn(shot->obj.pos.x, shot->obj.pos.z, 50.0f, 0.0f, var_fs0);
-            func_effect_8007AFD0(shot->obj.pos.x, shot->obj.pos.z, 46.0f, 19.0f, var_fs0);
+            Effect_Effect382_Spawn(shot->obj.pos.x, shot->obj.pos.z, 46.0f, 19.0f, var_fs0);
-            func_effect_8007AFD0(shot->obj.pos.x, shot->obj.pos.z, 35.0f, 35.0f, var_fs0);
+            Effect_Effect382_Spawn(shot->obj.pos.x, shot->obj.pos.z, 35.0f, 35.0f, var_fs0);
-            func_effect_8007AFD0(shot->obj.pos.x, shot->obj.pos.z, 19.0f, 46.0f, var_fs0);
+            Effect_Effect382_Spawn(shot->obj.pos.x, shot->obj.pos.z, 19.0f, 46.0f, var_fs0);
-            func_effect_8007AFD0(shot->obj.pos.x, shot->obj.pos.z, 0.0f, 50.0f, var_fs0);
+            Effect_Effect382_Spawn(shot->obj.pos.x, shot->obj.pos.z, 0.0f, 50.0f, var_fs0);
-            func_effect_8007AFD0(shot->obj.pos.x, shot->obj.pos.z, -50.0f, 0.0f, var_fs0);
+            Effect_Effect382_Spawn(shot->obj.pos.x, shot->obj.pos.z, -50.0f, 0.0f, var_fs0);
-            func_effect_8007AFD0(shot->obj.pos.x, shot->obj.pos.z, -46.0f, 19.0f, var_fs0);
+            Effect_Effect382_Spawn(shot->obj.pos.x, shot->obj.pos.z, -46.0f, 19.0f, var_fs0);
-            func_effect_8007AFD0(shot->obj.pos.x, shot->obj.pos.z, -35.0f, 35.0f, var_fs0);
+            Effect_Effect382_Spawn(shot->obj.pos.x, shot->obj.pos.z, -35.0f, 35.0f, var_fs0);
-            func_effect_8007AFD0(shot->obj.pos.x, shot->obj.pos.z, -19.0f, 46.0f, var_fs0);
+            Effect_Effect382_Spawn(shot->obj.pos.x, shot->obj.pos.z, -19.0f, 46.0f, var_fs0);
         }
     }
 }
@@ -144,15 +144,15 @@ void PlayerShot_Impact(PlayerShot* shot) {
         shot->vel.x = shot->vel.y = shot->vel.z = 0.0f;
         if (gCurrentLevel == LEVEL_AQUAS) {
             gLight3R = gLight3G = gLight3B = 0;
-            func_effect_8007B344(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 10.0f, 4);
+            Effect_Effect384_Spawn(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 10.0f, 4);
-            func_effect_8007C120(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 0.0f, 0.0f, 0.0f, 0.3f, 30);
+            Effect_Effect390_Spawn(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 0.0f, 0.0f, 0.0f, 0.3f, 30);
         } else {
             if (gVersusMode) {
                 var_v0_2 = shot->sourceId + 10;
             } else {
                 var_v0_2 = 12;
             }
-            func_effect_8007B344(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 10.0f, var_v0_2);
+            Effect_Effect384_Spawn(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 10.0f, var_v0_2);
             func_effect_8007D2C8(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 4.0f);
         }
     } else {
@@ -165,7 +165,7 @@ void PlayerShot_SetupEffect344(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32
                                s32 time) {
     Effect_Initialize(effect);
     effect->obj.status = OBJ_INIT;
-    effect->obj.id = OBJ_EFFECT_344;
+    effect->obj.id = OBJ_EFFECT_EXPLOSION_MARK_1;
     effect->obj.pos.x = xPos;
     effect->obj.pos.y = yPos;
     effect->obj.pos.z = zPos;
@@ -198,7 +198,7 @@ void PlayerShot_SpawnEffect344(f32 xPos, f32 yPos, f32 zPos, f32 arg3, f32 arg4,
 void PlayerShot_SetupEffect345(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 yRot, f32 scale) {
     Effect_Initialize(effect);
     effect->obj.status = OBJ_INIT;
-    effect->obj.id = OBJ_EFFECT_345;
+    effect->obj.id = OBJ_EFFECT_LASER_MARK_1;
     effect->obj.pos.x = xPos;
     effect->obj.pos.y = yPos;
     effect->obj.pos.z = zPos;
@@ -504,7 +504,7 @@ bool PlayerShot_CheckPolyCollision(PlayerShot* shot, ObjectId objId, Object* obj
         sp58.z = obj->pos.z;
         useCol2 = false;
         switch (objId) {
-            case OBJ_ACTOR_180:
+            case OBJ_ACTOR_ME_MOLAR_ROCK:
                 objId = COL1_0;
                 break;
             case OBJ_SCENERY_CO_BUMP_4:
@@ -512,19 +512,19 @@ bool PlayerShot_CheckPolyCollision(PlayerShot* shot, ObjectId objId, Object* obj
                 objId = COL2_1;
                 useCol2 = true;
                 break;
-            case OBJ_SCENERY_149:
+            case OBJ_SCENERY_FO_MOUNTAIN_2:
                 objId = COL1_5;
                 break;
-            case OBJ_SCENERY_150:
+            case OBJ_SCENERY_FO_MOUNTAIN_3:
                 objId = COL1_6;
                 break;
-            case OBJ_BOSS_FO:
+            case OBJ_BOSS_FO_BASE:
                 objId = COL1_4;
                 break;
-            case OBJ_BOSS_VE2:
+            case OBJ_BOSS_VE2_BASE:
                 objId = COL1_9;
                 break;
-            case OBJ_BOSS_309:
+            case OBJ_BOSS_BO_BASE:
                 objId = COL1_7;
                 break;
             case ACTOR_EVENT_ID:
@@ -536,23 +536,23 @@ bool PlayerShot_CheckPolyCollision(PlayerShot* shot, ObjectId objId, Object* obj
             case OBJ_SCENERY_ME_TUNNEL:
                 objId = COL1_1;
                 break;
-            case OBJ_SCENERY_120:
+            case OBJ_SCENERY_AQ_CORAL_REEF_2:
                 objId = COL2_18;
                 useCol2 = true;
                 break;
-            case OBJ_SCENERY_143:
+            case OBJ_SCENERY_VS_KA_FLBASE:
                 objId = COL2_17;
                 useCol2 = true;
                 break;
-            case OBJ_SCENERY_124:
+            case OBJ_SCENERY_AQ_BUMP_1:
                 objId = COL2_15;
                 useCol2 = true;
                 break;
-            case OBJ_SCENERY_126:
+            case OBJ_SCENERY_AQ_BUMP_2:
                 objId = COL2_16;
                 useCol2 = true;
                 break;
-            case OBJ_SCENERY_47:
+            case OBJ_SCENERY_ZO_ISLAND:
                 objId = COL2_7;
                 useCol2 = true;
                 break;
@@ -561,43 +561,43 @@ bool PlayerShot_CheckPolyCollision(PlayerShot* shot, ObjectId objId, Object* obj
                 useCol2 = true;
                 break;
             case OBJ_SCENERY_CO_BUMP_3:
-            case OBJ_SCENERY_69:
+            case OBJ_SCENERY_MA_TERRAIN_BUMP:
                 objId = COL2_3;
                 useCol2 = true;
                 break;
-            case OBJ_SCENERY_140:
+            case OBJ_SCENERY_VS_PYRAMID_1:
                 objId = COL2_4;
                 useCol2 = true;
                 break;
-            case OBJ_SCENERY_141:
+            case OBJ_SCENERY_VS_PYRAMID_2:
                 objId = COL2_6;
                 useCol2 = true;
                 break;
-            case OBJ_SCENERY_117:
+            case OBJ_SCENERY_AQ_CORAL_REEF_1:
                 objId = COL2_14;
                 useCol2 = true;
                 break;
-            case OBJ_SCENERY_70:
+            case OBJ_SCENERY_MA_FLOOR_1:
                 objId = COL2_8;
                 useCol2 = true;
                 break;
-            case OBJ_SCENERY_72:
+            case OBJ_SCENERY_MA_FLOOR_3:
                 objId = COL2_9;
                 useCol2 = true;
                 break;
-            case OBJ_SCENERY_71:
+            case OBJ_SCENERY_MA_FLOOR_2:
                 objId = COL2_10;
                 useCol2 = true;
                 break;
-            case OBJ_SCENERY_73:
+            case OBJ_SCENERY_MA_FLOOR_4:
                 objId = COL2_11;
                 useCol2 = true;
                 break;
-            case OBJ_SCENERY_67:
+            case OBJ_SCENERY_MA_WALL_3:
                 objId = COL2_12;
                 useCol2 = true;
                 break;
-            case OBJ_SCENERY_74:
+            case OBJ_SCENERY_MA_FLOOR_5:
                 objId = COL2_13;
                 useCol2 = true;
                 break;
@@ -625,8 +625,8 @@ bool PlayerShot_CheckPolyCollision(PlayerShot* shot, ObjectId objId, Object* obj
                     shot->obj.pos.z = obj->pos.z + sp70.z;
                 }
                 if (gCurrentLevel == LEVEL_FORTUNA) {
-                    func_effect_8007BC7C(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f);
+                    Effect_Effect362_Spawn(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f);
-                    func_effect_8007BC7C(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f);
+                    Effect_Effect362_Spawn(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f);
                 }
                 return true;
             }
@@ -638,8 +638,8 @@ bool PlayerShot_CheckPolyCollision(PlayerShot* shot, ObjectId objId, Object* obj
             PlayerShot_Impact(shot);
             Effect_SpawnTimedSfxAtPos(&shot->obj.pos, NA_SE_EN_REFLECT);
             if (gCurrentLevel == LEVEL_FORTUNA) {
-                func_effect_8007BC7C(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f);
+                Effect_Effect362_Spawn(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f);
-                func_effect_8007BC7C(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f);
+                Effect_Effect362_Spawn(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f);
             }
             return true;
         }
@@ -691,10 +691,10 @@ void PlayerShot_ApplyDamageToActor(PlayerShot* shot, Actor* actor, s32 hitIndex)
         ((actor->obj.id == OBJ_ACTOR_ALLRANGE) && (actor->fwork[23] > 1.0f)) ||
         ((actor->obj.id == OBJ_ACTOR_EVENT) && (actor->dmgPart == 0) &&
          (actor->eventType == EVID_METEO_PYRAMID_SHIP)) ||
-        ((actor->obj.id == OBJ_ACTOR_261) && (shot->obj.id != PLAYERSHOT_LOCK_ON) &&
+        ((actor->obj.id == OBJ_ACTOR_AQ_SCULPIN) && (shot->obj.id != PLAYERSHOT_LOCK_ON) &&
          ((actor->state < 3) || (actor->state >= 5))) ||
-        ((actor->obj.id == OBJ_ACTOR_260) && (shot->obj.id != PLAYERSHOT_LOCK_ON) && (actor->timer_0BC != 0))) {
+        ((actor->obj.id == OBJ_ACTOR_AQ_GAROA) && (shot->obj.id != PLAYERSHOT_LOCK_ON) && (actor->timer_0BC != 0))) {
-        if ((actor->obj.id == OBJ_ACTOR_261) && (actor->state < 2)) {
+        if ((actor->obj.id == OBJ_ACTOR_AQ_SCULPIN) && (actor->state < 2)) {
             actor->state = 2;
         }
         if ((shot->obj.id == PLAYERSHOT_LOCK_ON) || (shot->obj.id == PLAYERSHOT_BOMB)) {
@@ -713,7 +713,7 @@ void PlayerShot_ApplyDamageToActor(PlayerShot* shot, Actor* actor, s32 hitIndex)
             shot->obj.pos.y += shot->vel.y * 5.0f;
             shot->obj.pos.z += shot->vel.z * 5.0f;
             actor->timer_0C2 = 3;
-            func_effect_80078E50(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 8.0f);
+            Effect_Effect393_Spawn(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 8.0f);
             AUDIO_PLAY_SFX(NA_SE_EN_REFLECT, actor->sfxSource, 4);
             Play_SpawnHitmark(gShotHitPosX, gShotHitPosY, gShotHitPosZ);
         }
@@ -759,7 +759,7 @@ void PlayerShot_CollisionCheck(PlayerShot* shot) {
         for (i = 0, actor = gActors; i < ARRAY_COUNT(gActors); i++, actor++) {
             if ((actor->obj.status >= OBJ_ACTIVE) && (actor->timer_0C2 == 0)) {
                 switch (actor->obj.id) {
-                    case OBJ_ACTOR_180:
+                    case OBJ_ACTOR_ME_MOLAR_ROCK:
                         if (PlayerShot_CheckPolyCollision(shot, actor->obj.id, &actor->obj)) {
                             actor->dmgType = DMG_BEAM;
                             actor->dmgPart = shot->sourceId;
@@ -862,7 +862,7 @@ void PlayerShot_CollisionCheck(PlayerShot* shot) {
                         shot->obj.pos.z += 2.0f * shot->vel.z;
                         shot->timer = 5;
                         AUDIO_PLAY_SFX(NA_SE_ROLLING_REFLECT, player->sfxSource, 0);
-                        func_effect_80078E50(player->pos.x, player->pos.y, player->trueZpos, 8.0f);
+                        Effect_Effect393_Spawn(player->pos.x, player->pos.y, player->trueZpos, 8.0f);
                     } else {
                         PlayerShot_Impact(shot);
                         if (player->hitTimer == 0) {
@@ -879,7 +879,7 @@ void PlayerShot_CollisionCheck(PlayerShot* shot) {
                             player->knockback.y = shot->vel.y * 0.1f;
                             player->knockback.z = shot->vel.z * 0.1f;
                             if (player->form != FORM_ON_FOOT) {
-                                func_effect_8007D1E0(player->pos.x, player->pos.y, player->trueZpos, 2.0f);
+                                Effect_Effect341_Spawn(player->pos.x, player->pos.y, player->trueZpos, 2.0f);
                             }
                         }
                     }
@@ -890,25 +890,28 @@ void PlayerShot_CollisionCheck(PlayerShot* shot) {
     if ((gGroundType == 4) && Ground_801B6AEC(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z + gPathProgress)) {
         PlayerShot_Impact(shot);
         if (shot->obj.id != PLAYERSHOT_LOCK_SEARCH) {
-            func_effect_8007A900(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 2.0f, 255, 15, 0);
+            Effect_Effect359_Spawn(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 2.0f, 255, 15, 0);
         }
     }
     if (gUseDynaFloor &&
         Play_CheckDynaFloorCollision(&sp94, &spA4, shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z)) {
         PlayerShot_Impact(shot);
         if (shot->obj.id != PLAYERSHOT_LOCK_SEARCH) {
-            func_effect_8007B228(shot->obj.pos.x, sp94, shot->obj.pos.z, 1.0f);
+            Effect_Effect381_Spawn(shot->obj.pos.x, sp94, shot->obj.pos.z, 1.0f);
         }
     }
 
     if ((gLevelMode == LEVELMODE_ALL_RANGE) && (shot->sourceId < 110)) {
         for (i = 0, scenery360 = gScenery360; i < 200; i++, scenery360++) {
             if (scenery360->obj.status == OBJ_ACTIVE) {
-                if ((scenery360->obj.id == OBJ_SCENERY_117) || (scenery360->obj.id == OBJ_SCENERY_141) ||
+                if ((scenery360->obj.id == OBJ_SCENERY_AQ_CORAL_REEF_1) ||
-                    (scenery360->obj.id == OBJ_SCENERY_149) || (scenery360->obj.id == OBJ_SCENERY_150) ||
+                    (scenery360->obj.id == OBJ_SCENERY_VS_PYRAMID_2) ||
-                    (scenery360->obj.id == OBJ_SCENERY_148) || (scenery360->obj.id == OBJ_SCENERY_143) ||
+                    (scenery360->obj.id == OBJ_SCENERY_FO_MOUNTAIN_2) ||
-                    (scenery360->obj.id == OBJ_SCENERY_160) || (scenery360->obj.id == OBJ_SCENERY_CO_BUMP_1) ||
+                    (scenery360->obj.id == OBJ_SCENERY_FO_MOUNTAIN_3) ||
-                    (scenery360->obj.id == OBJ_SCENERY_CO_BUMP_3) || (scenery360->obj.id == OBJ_SCENERY_140)) {
+                    (scenery360->obj.id == OBJ_SCENERY_FO_MOUNTAIN_1) ||
+                    (scenery360->obj.id == OBJ_SCENERY_VS_KA_FLBASE) ||
+                    (scenery360->obj.id == OBJ_SCENERY_VE2_MOUNTAIN) || (scenery360->obj.id == OBJ_SCENERY_CO_BUMP_1) ||
+                    (scenery360->obj.id == OBJ_SCENERY_CO_BUMP_3) || (scenery360->obj.id == OBJ_SCENERY_VS_PYRAMID_1)) {
                     PlayerShot_CheckPolyCollision(shot, scenery360->obj.id, &scenery360->obj);
                 } else {
                     PlayerShot_CheckObjectHitbox(shot, scenery360->info.hitbox, &scenery360->obj);
@@ -920,10 +923,10 @@ void PlayerShot_CollisionCheck(PlayerShot* shot) {
             if (scenery->obj.status == OBJ_ACTIVE) {
                 if ((scenery->obj.id == OBJ_SCENERY_CO_BUMP_1) || (scenery->obj.id == OBJ_SCENERY_ME_TUNNEL) ||
                     (scenery->obj.id == OBJ_SCENERY_CO_BUMP_4) || (scenery->obj.id == OBJ_SCENERY_CO_BUMP_5) ||
-                    (scenery->obj.id == OBJ_SCENERY_120) || (scenery->obj.id == OBJ_SCENERY_124) ||
+                    (scenery->obj.id == OBJ_SCENERY_AQ_CORAL_REEF_2) || (scenery->obj.id == OBJ_SCENERY_AQ_BUMP_1) ||
-                    (scenery->obj.id == OBJ_SCENERY_126) || (scenery->obj.id == OBJ_SCENERY_47) ||
+                    (scenery->obj.id == OBJ_SCENERY_AQ_BUMP_2) || (scenery->obj.id == OBJ_SCENERY_ZO_ISLAND) ||
                     (scenery->obj.id == OBJ_SCENERY_CO_BUMP_2) || (scenery->obj.id == OBJ_SCENERY_CO_BUMP_3) ||
-                    (scenery->obj.id == OBJ_SCENERY_67) || (scenery->obj.id == OBJ_SCENERY_74) ||
+                    (scenery->obj.id == OBJ_SCENERY_MA_WALL_3) || (scenery->obj.id == OBJ_SCENERY_MA_FLOOR_5) ||
                     (scenery->obj.id == OBJ_SCENERY_CO_BUMP_3)) {
                     PlayerShot_CheckPolyCollision(shot, scenery->obj.id, &scenery->obj);
                 } else {
@@ -941,11 +944,11 @@ void PlayerShot_CollisionCheck(PlayerShot* shot) {
             if (sprite->obj.status == OBJ_ACTIVE) {
                 if (sprite->obj.id != OBJ_SPRITE_TI_CACTUS) {
                     if (PlayerShot_CheckSpriteHitbox(shot, sprite)) {
-                        sprite->destroy = 1;
+                        sprite->destroy = true;
                     }
                 } else {
                     if (PlayerShot_CheckObjectHitbox(shot, sprite->info.hitbox, &sprite->obj) != 0) {
-                        sprite->destroy = 1;
+                        sprite->destroy = true;
                     }
                 }
             }
@@ -953,10 +956,10 @@ void PlayerShot_CollisionCheck(PlayerShot* shot) {
     }
     for (i = 0, boss = gBosses; i < ARRAY_COUNT(gBosses); i++, boss++) {
         if ((boss->obj.status == OBJ_ACTIVE) && (boss->timer_05A == 0)) {
-            if ((boss->obj.id == OBJ_BOSS_FO) || (boss->obj.id == OBJ_BOSS_VE2) || (boss->obj.id == OBJ_BOSS_309) ||
+            if ((boss->obj.id == OBJ_BOSS_FO_BASE) || (boss->obj.id == OBJ_BOSS_VE2_BASE) ||
-                (boss->obj.id == OBJ_BOSS_SZ_GREAT_FOX)) {
+                (boss->obj.id == OBJ_BOSS_BO_BASE) || (boss->obj.id == OBJ_BOSS_SZ_GREAT_FOX)) {
                 PlayerShot_CheckPolyCollision(shot, boss->obj.id, &boss->obj);
-            } else if (boss->obj.id == OBJ_BOSS_310) {
+            } else if (boss->obj.id == OBJ_BOSS_BO_BASE_SHIELD) {
                 test.x = fabsf(boss->obj.pos.x - shot->obj.pos.x) * .8333333f;
                 test.y = fabsf(boss->obj.pos.y - shot->obj.pos.y) * 2;
                 test.z = fabsf(boss->obj.pos.z - shot->obj.pos.z) * 0.8333333f;
@@ -970,7 +973,7 @@ void PlayerShot_CollisionCheck(PlayerShot* shot) {
                     }
                 }
             } else {
-                if (boss->obj.id == OBJ_BOSS_KA) {
+                if (boss->obj.id == OBJ_BOSS_KA_SAUCERER) {
                     test.x = fabsf(boss->obj.pos.x - shot->obj.pos.x);
                     test.y = fabsf(boss->obj.pos.y - 300.0f - shot->obj.pos.y) * 7.42f;
                     test.z = fabsf(boss->obj.pos.z - shot->obj.pos.z);
@@ -990,7 +993,7 @@ void PlayerShot_CollisionCheck(PlayerShot* shot) {
                     if (shot->obj.id == PLAYERSHOT_LOCK_SEARCH) {
                         Object_Kill(&shot->obj, shot->sfxSource);
                     } else {
-                        if ((boss->obj.id == OBJ_BOSS_KA) && (shot->sourceId != TEAM_ID_FOX)) {
+                        if ((boss->obj.id == OBJ_BOSS_KA_SAUCERER) && (shot->sourceId != TEAM_ID_FOX)) {
                             break;
                         }
                         boss->dmgType = DMG_BEAM;
@@ -1016,13 +1019,13 @@ void PlayerShot_CollisionCheck(PlayerShot* shot) {
                                 }
                             }
                         }
-                        if (boss->obj.id == OBJ_BOSS_SY) {
+                        if (boss->obj.id == OBJ_BOSS_SY_SHOGUN) {
                             boss->swork[19] = shot->sourceId;
                         }
                         boss->dmgPart = temp_v0 - 1;
-                        if (boss->obj.id == OBJ_BOSS_301) {
+                        if (boss->obj.id == OBJ_BOSS_AQ_UNK_301) {
                             boss->swork[5] = shot->obj.id;
-                        } else if (boss->obj.id == OBJ_BOSS_VE1) {
+                        } else if (boss->obj.id == OBJ_BOSS_VE1_GOLEMECH) {
                             boss->fwork[47] = shot->obj.pos.x;
                             boss->fwork[48] = shot->obj.pos.y;
                             boss->fwork[49] = shot->obj.pos.z;
@@ -1594,9 +1597,9 @@ void PlayerShot_UpdateShot2(PlayerShot* shot, Player* player) {
             PlayerShot_Impact(shot);
             PlayerShot_HitGround(shot->obj.pos.x, gGroundHeight + 2.0f, shot->obj.pos.z, shot->obj.rot.y, 2.0f);
             if (gCurrentLevel == LEVEL_FORTUNA) {
-                func_effect_8007BC7C(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f);
+                Effect_Effect362_Spawn(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f);
-                func_effect_8007BC7C(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f);
+                Effect_Effect362_Spawn(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f);
-                func_effect_8007BC7C(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f);
+                Effect_Effect362_Spawn(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f);
             }
         }
         PlayerShot_CollisionCheck(shot);
@@ -1608,8 +1611,8 @@ void PlayerShot_UpdateBeam(PlayerShot* shot, s32 index) {
     Vec3f sp38;
 
     if ((gGroundSurface == SURFACE_WATER) && (shot->obj.pos.y < (gGroundHeight + 50.0f)) && (index == 0)) {
-        func_effect_8007ACE0(shot->obj.pos.x, gGroundHeight, shot->obj.pos.z, 0.1f, 1.5f, shot->obj.rot.y + 20.0f);
+        Effect_Effect372_Spawn1(shot->obj.pos.x, gGroundHeight, shot->obj.pos.z, 0.1f, 1.5f, shot->obj.rot.y + 20.0f);
-        func_effect_8007ACE0(shot->obj.pos.x, gGroundHeight, shot->obj.pos.z, 0.1f, 1.5f, shot->obj.rot.y - 20.0f);
+        Effect_Effect372_Spawn1(shot->obj.pos.x, gGroundHeight, shot->obj.pos.z, 0.1f, 1.5f, shot->obj.rot.y - 20.0f);
     }
     if ((shot->obj.pos.y < gGroundHeight) && (gGroundType != 4)) {
         PlayerShot_Impact(shot);
@@ -1641,20 +1644,20 @@ void PlayerShot_UpdateBeam(PlayerShot* shot, s32 index) {
             return;
         }
         if (gCurrentLevel == LEVEL_FORTUNA) {
-            func_effect_8007BC7C(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f);
+            Effect_Effect362_Spawn(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f);
-            func_effect_8007BC7C(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f);
+            Effect_Effect362_Spawn(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f);
-            func_effect_8007BC7C(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f);
+            Effect_Effect362_Spawn(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f);
         }
         if (gCurrentLevel == LEVEL_AQUAS) {
-            func_effect_8007B8F8(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f);
+            Effect_Effect364_Spawn(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f);
-            func_effect_8007B8F8(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f);
+            Effect_Effect364_Spawn(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f);
-            func_effect_8007B8F8(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f);
+            Effect_Effect364_Spawn(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f);
-            Aquas_801AC8A8(RAND_FLOAT_CENTERED(10.0f) + shot->obj.pos.x, RAND_FLOAT_CENTERED(10.0f) + shot->obj.pos.y,
+            Aquas_Effect366_Spawn(RAND_FLOAT_CENTERED(10.0f) + shot->obj.pos.x,
-                           shot->obj.pos.z, 0.8f, 0);
+                                  RAND_FLOAT_CENTERED(10.0f) + shot->obj.pos.y, shot->obj.pos.z, 0.8f, 0);
-            Aquas_801AC8A8(RAND_FLOAT_CENTERED(10.0f) + shot->obj.pos.x, RAND_FLOAT_CENTERED(10.0f) + shot->obj.pos.y,
+            Aquas_Effect366_Spawn(RAND_FLOAT_CENTERED(10.0f) + shot->obj.pos.x,
-                           shot->obj.pos.z, 0.8f, 0);
+                                  RAND_FLOAT_CENTERED(10.0f) + shot->obj.pos.y, shot->obj.pos.z, 0.8f, 0);
-            Aquas_801AC8A8(RAND_FLOAT_CENTERED(10.0f) + shot->obj.pos.x, RAND_FLOAT_CENTERED(10.0f) + shot->obj.pos.y,
+            Aquas_Effect366_Spawn(RAND_FLOAT_CENTERED(10.0f) + shot->obj.pos.x,
-                           shot->obj.pos.z, 0.8f, 0);
+                                  RAND_FLOAT_CENTERED(10.0f) + shot->obj.pos.y, shot->obj.pos.z, 0.8f, 0);
         }
     }
     if (shot->timer == 0) {
@@ -1777,7 +1780,7 @@ void PlayerShot_CheckBossHitbox(PlayerShot* shot) {
     boss = gBosses;
     for (i = 0; i < ARRAY_COUNT(gBosses); i++, boss++) {
         if ((boss->obj.status == OBJ_ACTIVE) && (boss->timer_05A == 0)) {
-            if (boss->obj.id == OBJ_BOSS_KA) {
+            if (boss->obj.id == OBJ_BOSS_KA_SAUCERER) {
                 var_s6 = gGameFrameCount % 8U;
                 var_fs2 = shot->scale * 40.0f;
             } else {
@@ -1883,17 +1886,17 @@ void PlayerShot_ApplyExplosionDamage(PlayerShot* shot, s32 damage) {
             dy = sprite->obj.pos.y - shot->obj.pos.y;
             dz = sprite->obj.pos.z - shot->obj.pos.z;
             if (sqrtf(SQ(dx) + SQ(dy) + SQ(dz)) < radius) {
-                sprite->destroy = 1;
+                sprite->destroy = true;
             }
         }
     }
     actor = gActors;
     for (i = 0; i < ARRAY_COUNT(gActors); i++, actor++) {
         if ((actor->obj.status == OBJ_ACTIVE) && (actor->timer_0C2 == 0) &&
-            !((gCurrentLevel == LEVEL_MACBETH) && (OBJ_ACTOR_205 <= actor->obj.id) &&
+            !((gCurrentLevel == LEVEL_MACBETH) && (OBJ_ACTOR_MA_LOCOMOTIVE <= actor->obj.id) &&
-              (actor->obj.id < OBJ_ACTOR_214)) &&
+              (actor->obj.id < OBJ_ACTOR_MA_RAILROAD_SWITCH)) &&
             !((actor->obj.id == OBJ_ACTOR_EVENT) && (actor->iwork[12] != 0)) &&
-            ((actor->scale >= 0.0f) || (actor->obj.id == OBJ_ACTOR_271))) {
+            ((actor->scale >= 0.0f) || (actor->obj.id == OBJ_ACTOR_BO_SHIELD_REACTOR))) {
             dx = actor->obj.pos.x - shot->obj.pos.x;
             dy = actor->obj.pos.y - shot->obj.pos.y;
             dz = actor->obj.pos.z - shot->obj.pos.z;
@@ -1904,12 +1907,12 @@ void PlayerShot_ApplyExplosionDamage(PlayerShot* shot, s32 damage) {
             actor->hitPos.y = shot->obj.pos.y;
             actor->hitPos.z = shot->obj.pos.z;
             if (sqrtf(SQ(dx) + SQ(dy) + SQ(dz)) < radius) {
-                if ((actor->obj.id == OBJ_ACTOR_193) || (actor->obj.id == OBJ_ACTOR_186) ||
+                if ((actor->obj.id == OBJ_ACTOR_CO_RADAR) || (actor->obj.id == OBJ_ACTOR_ME_LASER_CANNON_1) ||
-                    (actor->obj.id == OBJ_MISSILE_SEEK_TEAM) || (actor->obj.id == OBJ_ACTOR_202) ||
+                    (actor->obj.id == OBJ_MISSILE_SEEK_TEAM) || (actor->obj.id == OBJ_ACTOR_ME_HOPBOT) ||
-                    (actor->obj.id == OBJ_ACTOR_201) || (actor->obj.id == OBJ_ACTOR_187) ||
+                    (actor->obj.id == OBJ_ACTOR_ME_METEO_BALL) || (actor->obj.id == OBJ_ACTOR_ME_LASER_CANNON_2) ||
                     ((actor->obj.id == OBJ_ACTOR_EVENT) && (actor->eventType == EVID_SUPPLY_CRATE)) ||
                     ((actor->obj.id == OBJ_ACTOR_EVENT) && (actor->eventType == EVID_SX_WARP_GATE)) ||
-                    (actor->obj.id == OBJ_ACTOR_196)) {
+                    (actor->obj.id == OBJ_ACTOR_CO_MOLE_MISSILE)) {
                     actor->dmgType = DMG_EXPLOSION;
                     actor->dmgPart = 0;
                     actor->dmgSource = shot->sourceId + 1;
@@ -2088,11 +2091,11 @@ void PlayerShot_UpdateLockOnShot(PlayerShot* shot) {
     if ((shot->obj.pos.y < gGroundHeight) || (shot->timer == 1)) {
         if ((gGroundSurface == SURFACE_WATER) && (shot->obj.pos.y < gGroundHeight)) {
             shot->unk_48 = 10.0f;
-            func_effect_8007D9DC(shot->obj.pos.x, gGroundHeight + 2.0f, shot->obj.pos.z, shot->unk_48 * 0.1f,
+            Effect_Effect367_Spawn(shot->obj.pos.x, gGroundHeight + 2.0f, shot->obj.pos.z, shot->unk_48 * 0.1f,
                                    shot->unk_48 * 3.0f, 0);
-            func_effect_8007D9DC(shot->obj.pos.x, gGroundHeight + 2.0f, shot->obj.pos.z, shot->unk_48 * 0.1f,
+            Effect_Effect367_Spawn(shot->obj.pos.x, gGroundHeight + 2.0f, shot->obj.pos.z, shot->unk_48 * 0.1f,
                                    shot->unk_48 * 3.0f, 5);
-            func_effect_8007ADF4(shot->obj.pos.x, gGroundHeight, shot->obj.pos.z, shot->unk_48 * 0.05f,
+            Effect_Effect372_Spawn2(shot->obj.pos.x, gGroundHeight, shot->obj.pos.z, shot->unk_48 * 0.05f,
                                     shot->unk_48 * 0.5f);
             Effect_SpawnTimedSfxAtPos(&shot->obj.pos, NA_SE_OB_WATER_BOUND_M);
         }

src/engine/fox_bg.c

@@ -263,7 +263,7 @@ void Background_DrawBackdrop(void) {
 
     Matrix_Push(&gGfxMatrix);
 
-    if (D_ctx_80177C70 == 2) {
+    if (gFovYMode == 2) {
         Matrix_Scale(gGfxMatrix, 1.2f, 1.2f, 1.0f, MTXF_APPLY);
     }
 
@@ -931,7 +931,7 @@ void Background_DrawGround(void) {
     Matrix_Push(&gGfxMatrix);
     Matrix_Translate(gGfxMatrix, gPlayer[gPlayerNum].xPath, -3.0f + gCameraShakeY, sp1D4, MTXF_APPLY);
 
-    if (D_ctx_80177C70 == 2) {
+    if (gFovYMode == 2) {
         Matrix_Scale(gGfxMatrix, 1.2f, 1.2f, 1.0f, MTXF_APPLY);
     }
 

src/engine/fox_boss.c

@@ -31,7 +31,7 @@ void Boss_AwardBonus(Boss* this) {
         yOffset = 0.0f;
         if (this->obj.id == OBJ_BOSS_CO_GRANGA) {
             yOffset = 300.0f;
-        } else if (this->obj.id == OBJ_BOSS_TI) {
+        } else if (this->obj.id == OBJ_BOSS_TI_GORAS) {
             yOffset = 200.0f;
         }
         BonusText_Display(this->obj.pos.x, this->obj.pos.y + yOffset, this->obj.pos.z, bonus);
@@ -42,21 +42,27 @@ void Boss_AwardBonus(Boss* this) {
 }
 
 void Boss299_Init(Boss299* this) {
+    /* Unimplemented */
 }
 
 void Boss299_Update(Boss299* this) {
+    /* Unimplemented */
 }
 
 void Boss299_Draw(Boss299* this) {
+    /* Unimplemented */
 }
 
 void Boss300_Init(Boss300* this) {
+    /* Unimplemented */
 }
 
 void Boss300_Update(Boss300* this) {
+    /* Unimplemented */
 }
 
 void Boss300_Draw(Boss300* this) {
+    /* Unimplemented */
 }
 
 void Boss_SetupDebris(ActorDebris* this, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7, f32 arg8,

src/engine/fox_context.c

@@ -180,7 +180,7 @@ s32 D_ctx_80178494;        // Torpedoes have this set to their unk_5C. Were they
 f32 gShotHitPosZ;
 f32 gShotHitPosX;
 f32 gShotHitPosY;
-s32 gZOSnakeWaypointCount;
+s32 gZoDodoraWaypointCount;
 UNK_TYPE F_801784A8;
 GroundType gGroundType;
 UNK_TYPE F_801784B0;
@@ -276,13 +276,13 @@ PlayerShot gPlayerShots[16];
 TexturedLine gTexturedLines[100];
 RadarMark gRadarMarks[65];
 BonusText gBonusText[10];
-s32 gActor194Status[2];
+s32 gMeMoraStatus[2];
-f32 gActor194xPos[2][100];
+f32 gMeMoraXpos[2][100];
-f32 gActor194yPos[2][100];
+f32 gMeMoraYpos[2][100];
-f32 gActor194zPos[2][100];
+f32 gMeMoraZpos[2][100];
-f32 gActor194xRot[2][100];
+f32 gMeMoraXrot[2][100];
-f32 gActor194yRot[2][100];
+f32 gMeMoraYrot[2][100];
-f32 gActor194zRot[2][100];
+f32 gMeMoraZrot[2][100];
 UNK_TYPE P_800D31A8 = 0;
 u16 gEnemyShotSpeed; // enemy shot speed?
 u8 gShowLevelClearStatusScreen;
@@ -330,7 +330,7 @@ u8 gTiStartLandmaster;
 u16 gControllerRumbleTimers[4];
 u16 gPlayerScores[4];
 s32 gCircleWipeFrame;
-s32 D_ctx_80177C70; // sets camera field of view Y. initialized to 0 and never changed
+s32 gFovYMode; // sets camera field of view Y. initialized to 0 and never changed
 s32 gTraining360MsgTimer;
 s32 gTraining360MsgIndex;
 s32 D_ctx_80177C94; // these save player parameters across the Venom -> Andross transition
@@ -368,7 +368,7 @@ Scenery360* gScenery360;
 UNK_TYPE F_801782B0;
 s32 gDrawSmallRocks;
 s32 D_ctx_801782BC; // set to 0, never used
-PosRot* gZOSnakePosRots;
+PosRot* gZoDodoraPosRots;
 f32* D_ctx_801782CC; // arrays used for dynamic floor
 f32* D_ctx_801782D4;
 f32* D_ctx_801782DC;

src/engine/fox_demo.c

@@ -692,7 +692,7 @@ void func_demo_8004A840(s32 actor) {
     func_demo_8004A700(&gActors[actor], actor);
 }
 
-void func_demo_8004A888(Clouds* this) {
+void func_demo_8004A888(EffectClouds* this) {
     Vec3f src;
     Vec3f dest;
 
@@ -1226,7 +1226,7 @@ void Cutscene_CoComplete2(Player* player) {
                 player->csState = 5;
                 player->baseSpeed = 0.0f;
                 player->csTimer = 10;
-                func_effect_80078E50(player->pos.x, player->pos.y, player->trueZpos, 30.0f);
+                Effect_Effect393_Spawn(player->pos.x, player->pos.y, player->trueZpos, 30.0f);
             }
             gCsCamAtX = player->pos.x;
             gCsCamAtY = player->pos.y - D_ctx_80177A48[6];
@@ -1612,7 +1612,7 @@ void Cutscene_KillPlayer(Player* player) {
             if (gVsPointsToWin == gVsPoints[player->attacker - 1]) {
                 player->attacker = -1;
                 if (player->unk_284 == 0) {
-                    func_effect_8007C688(player->pos.x, player->pos.y, player->trueZpos, 3.0f, 1000);
+                    Effect_Effect387_Spawn(player->pos.x, player->pos.y, player->trueZpos, 3.0f, 1000);
                 }
             }
         }
@@ -1631,10 +1631,10 @@ void Cutscene_LandmasterDown(Player* player) {
     player->pos.y += 30.0f;
     func_effect_8007D0E0(player->pos.x, player->pos.y, player->trueZpos, 6.0f);
     if (gCamCount == 1) {
-        func_effect_8007BFFC(player->pos.x, player->pos.y, player->trueZpos, 0.0f, 0.0f, 0.0f, 3.0f, 80);
+        Effect386_Spawn1(player->pos.x, player->pos.y, player->trueZpos, 0.0f, 0.0f, 0.0f, 3.0f, 80);
-        func_effect_8007C688(player->pos.x, player->pos.y, player->trueZpos, 3.0f, 800);
+        Effect_Effect387_Spawn(player->pos.x, player->pos.y, player->trueZpos, 3.0f, 800);
     } else {
-        func_effect_8007BFFC(player->pos.x, player->pos.y, player->trueZpos, 0.0f, 0.0f, 0.0f, 3.0f, 10);
+        Effect386_Spawn1(player->pos.x, player->pos.y, player->trueZpos, 0.0f, 0.0f, 0.0f, 3.0f, 10);
     }
     Cutscene_KillPlayer(player);
 }
@@ -1704,7 +1704,8 @@ void Cutscene_ArwingDown360(Player* player) {
                (player->csTimer == 0)) {
         if (gCamCount != 4) {
             if (player->unk_284 == 0) {
-                func_effect_8007C688(player->pos.x, player->pos.y, player->trueZpos - (2.0f * player->vel.z), 3.0f, 80);
+                Effect_Effect387_Spawn(player->pos.x, player->pos.y, player->trueZpos - (2.0f * player->vel.z), 3.0f,
+                                       80);
             }
             if (player->pos.y < player->pathFloor) {
                 func_enmy_80062C38(player->pos.x, player->pos.z);
@@ -1720,8 +1721,7 @@ void Cutscene_ArwingDown360(Player* player) {
             }
         }
         func_effect_8007D0E0(player->pos.x, player->pos.y, player->trueZpos, 5.0f);
-        func_effect_8007BFFC(player->pos.x, player->pos.y, player->trueZpos, player->vel.x, 0.0f, player->vel.z, 5.0f,
+        Effect386_Spawn1(player->pos.x, player->pos.y, player->trueZpos, player->vel.x, 0.0f, player->vel.z, 5.0f, 20);
-                             20);
         Cutscene_KillPlayer(player);
     }
     Math_SmoothStepToF(&player->camRoll, 0.0f, 0.05f, 5.0f, 0.00001f);
@@ -1810,14 +1810,14 @@ void Cutscene_ArwingDownOnRails(Player* player) {
     } else if (((player->radioDamageTimer > 0) || (player->pos.y < player->pathFloor) || (player->csEventTimer == 0)) &&
                (player->csTimer == 0)) {
         if (player->pos.y < player->pathFloor) {
-            func_effect_8007C688(player->pos.x, gGroundHeight + 20.0f, player->trueZpos - (2.0f * player->vel.z), 3.0f,
+            Effect_Effect387_Spawn(player->pos.x, gGroundHeight + 20.0f, player->trueZpos - (2.0f * player->vel.z),
-                                 800);
+                                   3.0f, 800);
             func_enmy_80062C38(player->pos.x, player->pos.z);
         }
         func_effect_8007D0E0(player->pos.x, player->pos.y - (2.0f * player->vel.y),
                              player->trueZpos - (2.0f * player->vel.z), 6.0f);
-        func_effect_8007BFFC(player->pos.x, player->pos.y - player->vel.y, player->trueZpos - (2.0f * player->vel.z),
+        Effect386_Spawn1(player->pos.x, player->pos.y - player->vel.y, player->trueZpos - (2.0f * player->vel.z), 0.0f,
-                             0.0f, 0.0f, 0.0f, 3.0f, 20);
+                         0.0f, 0.0f, 3.0f, 20);
         if (gLevelType == LEVELTYPE_PLANET) {
             for (i = 0; i < 2; i++) {
                 Play_SpawnDebris(2, player->pos.x, player->pos.y, player->trueZpos);
@@ -1837,8 +1837,8 @@ void Cutscene_ArwingDownOnRails(Player* player) {
     }
 
     if ((gGroundSurface == SURFACE_WATER) && (player->pos.y <= player->pathFloor)) {
-        func_effect_8007D9DC(player->pos.x, gGroundHeight + 2.0f, player->trueZpos, 3.0f, 20.0f, 0);
+        Effect_Effect367_Spawn(player->pos.x, gGroundHeight + 2.0f, player->trueZpos, 3.0f, 20.0f, 0);
-        func_effect_8007ADF4(player->pos.x, gGroundHeight, player->trueZpos, 0.1f, 2.0f);
+        Effect_Effect372_Spawn2(player->pos.x, gGroundHeight, player->trueZpos, 0.1f, 2.0f);
     }
 }
 
@@ -2103,7 +2103,7 @@ void func_demo_8004EBD0(ActorCutscene* this) {
             this->vel.z = dest.z;
 
             if (this->timer_0BC == 0) {
-                func_effect_80078E50(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, 30.0f);
+                Effect_Effect393_Spawn(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, 30.0f);
                 Object_Kill(&this->obj, this->sfxSource);
             }
             break;
@@ -2299,7 +2299,6 @@ void func_demo_8004F798(ActorCutscene* this) {
 }
 
 void ActorCutscene_Update(ActorCutscene* this) {
-
     if (gCurrentLevel == LEVEL_AQUAS) {
         func_hud_80093164(this);
         return;
@@ -2747,14 +2746,14 @@ void ActorCutscene_Draw(ActorCutscene* this) {
             Matrix_SetGfxMtx(&gMasterDisp);
             /* fallthrough */
         case 39:
-            gSPDisplayList(gMasterDisp++, D_SY_60097E0);
+            gSPDisplayList(gMasterDisp++, aSyShip1DL);
             func_demo_8004FCB8(this, 4);
             break;
 
         case 36:
             Matrix_Scale(gGfxMatrix, this->scale, this->scale, this->scale, MTXF_APPLY);
             Matrix_SetGfxMtx(&gMasterDisp);
-            gSPDisplayList(gMasterDisp++, D_SY_601D730);
+            gSPDisplayList(gMasterDisp++, aSyShip2DL);
             func_demo_8004FCB8(this, 0);
             break;
 
@@ -2874,15 +2873,15 @@ void ActorCutscene_Draw(ActorCutscene* this) {
         case 45:
             Matrix_Scale(gGfxMatrix, 0.5f, 0.5f, 0.5f, MTXF_APPLY);
             Matrix_SetGfxMtx(&gMasterDisp);
-            gSPDisplayList(gMasterDisp++, D_AQ_600EEF0);
+            gSPDisplayList(gMasterDisp++, aAqBump2DL);
             break;
 
         case 46:
-            gSPDisplayList(gMasterDisp++, D_AQ_601DE60);
+            gSPDisplayList(gMasterDisp++, aAqCoralReef2DL);
             break;
 
         case 47:
-            gSPDisplayList(gMasterDisp++, D_AQ_602B4C0);
+            gSPDisplayList(gMasterDisp++, aAqRockDL);
             break;
     }
 }

src/engine/fox_edata.c

@@ -4,7 +4,7 @@
 
 f32* D_edata_800CF964[] = { NULL }; // Likely a scrapped array of scenery shadow boxes
 
-void Scenery48_Draw(Scenery* scenery) {
+void Ve1SceneryWall1_Draw(Scenery* scenery) {
     RCP_SetupDL_57(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
     Matrix_RotateY(gGfxMatrix, M_PI, MTXF_APPLY);
     Matrix_SetGfxMtx(&gMasterDisp);
@@ -12,7 +12,7 @@ void Scenery48_Draw(Scenery* scenery) {
     RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
 }
 
-void Scenery49_Draw(Scenery* scenery) {
+void Ve1SceneryWall2_Draw(Scenery* scenery) {
     RCP_SetupDL_57(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
     Matrix_RotateY(gGfxMatrix, M_PI, MTXF_APPLY);
     Matrix_SetGfxMtx(&gMasterDisp);
@@ -20,5 +20,5 @@ void Scenery49_Draw(Scenery* scenery) {
     RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
 }
 
-void Actor289_Draw(Actor* actor) {
+void AndJamesTrigger_Draw(Actor* actor) {
 }

src/engine/fox_edata_info.c

@@ -22,7 +22,7 @@
 #include "assets/ast_area_6.h"
 #include "assets/ast_zoness.h"
 
-f32 gActor241Hitbox[] = {
+f32 gZoEnergyBallHitbox[] = {
     1.0f, 0.0f, 50.0f, 0.0f, 25.0f, 0.0f, 25.0f,
 };
 f32 gCubeHitbox100[] = {
@@ -65,10 +65,10 @@ f32 gItemLasersHitbox[] = {
 f32 gItemBombHitbox[] = {
     1.0f, 0.0f, 120.0f, 0.0f, 120.0f, 0.0f, 120.0f,
 };
-f32 gActor190_191Hitbox[] = {
+f32 gActorMissileSeekHitbox[] = {
     1.0f, 0.0f, 40.0f, 0.0f, 40.0f, 0.0f, 40.0f,
 };
-f32 gActor194Hitbox[] = {
+f32 gMeMoraHitbox[] = {
     1.0f, 0.0f, 50.0f, 0.0f, 50.0f, 0.0f, 50.0f,
 };
 f32 gTeamHitbox[] = {
@@ -93,30 +93,30 @@ f32 gWarpZoneEvent93Hitbox[] = {
 
 // clang-format off
 ObjectInfo gObjectInfo[] = {
-  /* OBJ_SCENERY_CO_STONE_ARCH,   */  {(void*)     aCoStoneArchDL, 0, (ObjectFunc)          NULL,        aCoStoneArchHitbox,   800.0f,  0, 0, 39, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_CO_STONE_ARCH */  {(void*)     aCoStoneArchDL, 0, (ObjectFunc)          NULL,        aCoStoneArchHitbox,   800.0f,  0, 0, 39, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_CO_BUMP_1,   */  {(void*)     aCoBump1DL, 0, (ObjectFunc)          NULL,       gNoHitbox,  2000.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_CO_BUMP_1 */  {(void*)     aCoBump1DL, 0, (ObjectFunc)          NULL,       gNoHitbox,  2000.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_CO_BUMP_2,   */  {(void*)     aCoBump2DL, 0, (ObjectFunc)          NULL,       gNoHitbox,  3000.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_CO_BUMP_2 */  {(void*)     aCoBump2DL, 0, (ObjectFunc)          NULL,       gNoHitbox,  3000.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_CO_BUMP_3,   */  {(void*)     aCoBump3DL, 0, (ObjectFunc)          NULL,       gNoHitbox,  3000.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_CO_BUMP_3 */  {(void*)     aCoBump3DL, 0, (ObjectFunc)          NULL,       gNoHitbox,  3000.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_CO_BUMP_4,   */  {(void*)     aCoBump4DL, 0, (ObjectFunc)          NULL,       gNoHitbox,  3000.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_CO_BUMP_4 */  {(void*)     aCoBump4DL, 0, (ObjectFunc)          NULL,       gNoHitbox,  3000.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_CO_BUMP_5,   */  {(void*)     aCoBump5DL, 0, (ObjectFunc)          NULL,       gNoHitbox,  3000.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_CO_BUMP_5 */  {(void*)     aCoBump5DL, 0, (ObjectFunc)          NULL,       gNoHitbox,  3000.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_CO_HIGHWAY_1,   */  {(void*)     aCoHighway1DL, 0, (ObjectFunc)          NULL,        aCoHighway1Hitbox,  2500.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_CO_HIGHWAY_1 */  {(void*)     aCoHighway1DL, 0, (ObjectFunc)          NULL,        aCoHighway1Hitbox,  2500.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_CO_HIGHWAY_2,   */  {(void*)     aCoHighway2DL, 0, (ObjectFunc)          NULL,        aCoHighway2Hitbox,  2500.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_CO_HIGHWAY_2 */  {(void*)     aCoHighway2DL, 0, (ObjectFunc)          NULL,        aCoHighway2Hitbox,  2500.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_CO_HIGHWAY_3,   */  {(void*)     aCoHighway3DL, 0, (ObjectFunc)          NULL,       gNoHitbox,  2500.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_CO_HIGHWAY_3 */  {(void*)     aCoHighway3DL, 0, (ObjectFunc)          NULL,       gNoHitbox,  2500.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_CO_HIGHWAY_4,   */  {(void*)     aCoHighway4DL, 0, (ObjectFunc)          NULL,       gNoHitbox,  2500.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_CO_HIGHWAY_4 */  {(void*)     aCoHighway4DL, 0, (ObjectFunc)          NULL,       gNoHitbox,  2500.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_CO_BUILDING_1,  */  {(void*)     aCoBuilding1DL, 0, (ObjectFunc)          NULL,        aCoBuilding1Hitbox,   200.0f,  0, 0, 39, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_CO_BUILDING_1 */  {(void*)     aCoBuilding1DL, 0, (ObjectFunc)          NULL,        aCoBuilding1Hitbox,   200.0f,  0, 0, 39, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_CO_BUILDING_2,  */  {(void*)     aCoBuilding2DL, 0, (ObjectFunc)          NULL,        aCoBuilding2Hitbox,   200.0f,  0, 0, 39, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_CO_BUILDING_2 */  {(void*)     aCoBuilding2DL, 0, (ObjectFunc)          NULL,        aCoBuilding2Hitbox,   200.0f,  0, 0, 39, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_CO_BUILDING_3,  */  {(void*)     aCoBuilding3DL, 0, (ObjectFunc)          NULL,        aCoBuilding3Hitbox,   500.0f,  0, 0, 39, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_CO_BUILDING_3 */  {(void*)     aCoBuilding3DL, 0, (ObjectFunc)          NULL,        aCoBuilding3Hitbox,   500.0f,  0, 0, 39, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_CO_BUILDING_4,  */  {(void*)     aCoBuilding4DL, 0, (ObjectFunc)          NULL,        aCoBuilding4Hitbox,   200.0f,  0, 0, 39, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_CO_BUILDING_4 */  {(void*)     aCoBuilding4DL, 0, (ObjectFunc)          NULL,        aCoBuilding4Hitbox,   200.0f,  0, 0, 39, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_CO_BUILDING_5,  */  {(void*)     aCoBuilding5DL, 0, (ObjectFunc) SceneryRotateTowardsCamera,        aCoBuilding5Hitbox,   200.0f,  0, 0, 39, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_CO_BUILDING_5 */  {(void*)     aCoBuilding5DL, 0, (ObjectFunc) SceneryRotateTowardsCamera,        aCoBuilding5Hitbox,   200.0f,  0, 0, 39, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_CO_BUILDING_6,  */  {(void*)     aCoBuilding6DL, 0, (ObjectFunc) SceneryRotateTowardsCamera,        aCoBuilding6Hitbox,   200.0f,  0, 0, 39, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_CO_BUILDING_6 */  {(void*)     aCoBuilding6DL, 0, (ObjectFunc) SceneryRotateTowardsCamera,        aCoBuilding6Hitbox,   200.0f,  0, 0, 39, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_CO_BUILDING_7,  */  {(void*)     aCoBuilding7DL, 0, (ObjectFunc) SceneryRotateTowardsCamera,        aCoBuilding7Hitbox,   200.0f,  0, 0, 39, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_CO_BUILDING_7 */  {(void*)     aCoBuilding7DL, 0, (ObjectFunc) SceneryRotateTowardsCamera,        aCoBuilding7Hitbox,   200.0f,  0, 0, 39, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_CO_BUILDING_8,  */  {(void*)     aCoBuilding8DL, 0, (ObjectFunc) SceneryRotateTowardsCamera,        aCoBuilding8Hitbox,   200.0f,  0, 0, 39, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_CO_BUILDING_8 */  {(void*)     aCoBuilding8DL, 0, (ObjectFunc) SceneryRotateTowardsCamera,        aCoBuilding8Hitbox,   200.0f,  0, 0, 39, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_CO_BUILDING_ON_FIRE,  */  {(void*) Corneria_BuildingOnFire_Draw, 1, (ObjectFunc) Corneria_BuildingOnFire_Update,     aCoBuildingOnFireHitbox,   200.0f,  0, 0, 39, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_CO_BUILDING_ON_FIRE,  */  {(void*) Corneria_CoBuildingOnFire_Draw, 1, (ObjectFunc) Corneria_CoBuildingOnFire_Update,     aCoBuildingOnFireHitbox,   200.0f,  0, 0, 39, 0,   0.0f,  0 },
   /* OBJ_SCENERY_CO_TOWER,  */  {(void*)     aCoTowerDL, 0, (ObjectFunc)          NULL,        aCoTowerHitbox,   100.0f,  0, 0, 39, 0,   0.0f,  0 },
   /* OBJ_SCENERY_CO_ARCH_1,  */  {(void*)     aCoArch1DL, 0, (ObjectFunc)          NULL,        aCoArch1Hitbox,   500.0f,  0, 0, 39, 0,   0.0f,  0 },
   /* OBJ_SCENERY_CO_ARCH_2,  */  {(void*)     aCoArch2DL, 0, (ObjectFunc)          NULL,        aCoArch2Hitbox,   400.0f,  0, 0, 39, 0,   0.0f,  0 },
   /* OBJ_SCENERY_CO_ARCH_3,  */  {(void*)     aCoArch3DL, 0, (ObjectFunc)          NULL,        aCoArch3Hitbox,   400.0f,  0, 0, 39, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_CO_RADAR,  */  {(void*)     aRadarDL, 0,    (ObjectFunc)          NULL,        aCoRadarHitbox,   200.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_CO_RADAR_DISH,  */  {(void*)     aRadarDL, 0,    (ObjectFunc)          NULL,        aCoRadarHitbox,   200.0f,  0, 0, 40, 0,   0.0f,  0 },
   /* OBJ_SCENERY_CO_HIGHWAY_5,  */  {(void*)     aCoHighway5DL, 0, (ObjectFunc)          NULL,        aCoHighway5Hitbox,  2500.0f,  0, 0, 40, 0,   0.0f,  0 },
   /* OBJ_SCENERY_CO_HIGHWAY_6,  */  {(void*)     aCoHighway6DL, 0, (ObjectFunc)          NULL,        aCoHighway6Hitbox,  2500.0f,  0, 0, 40, 0,   0.0f,  0 },
   /* OBJ_SCENERY_CO_HIGHWAY_7,  */  {(void*)     aCoHighway7DL, 0, (ObjectFunc)          NULL,        aCoHighway7Hitbox,  2500.0f,  0, 0, 40, 0,   0.0f,  0 },
@@ -136,124 +136,124 @@ ObjectInfo gObjectInfo[] = {
   /* OBJ_SCENERY_CO_BUILDING_9,  */  {(void*) CoBuilding9_Draw, 1, (ObjectFunc) CoBuilding9_Update,        aCoBuilding9Hitbox,  1000.0f,  0, 0, 40, 0,   0.0f,  0 },
   /* OBJ_SCENERY_CO_BUILDING_10,  */  {(void*) CoBuilding10_Draw, 1, (ObjectFunc) SceneryRotateTowardsCamera,        aCoBuilding10Hitbox,   300.0f,  0, 0, 40, 0,   0.0f,  0 },
   /* OBJ_SCENERY_IBEAM,  */  {(void*) CoIBeam_Draw, 1, (ObjectFunc) CoIBeam_Update,        aCoIBeamHitbox,  1000.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_ZO_ROCK_1,  */  {(void*)     aZoRock1DL, 0, (ObjectFunc)          NULL,        aZoRock1Hitbox,   200.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_ZO_ROCK,  */  {(void*)     aZoRockDL, 0, (ObjectFunc)          NULL,        aZoRockHitbox,   200.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_44,  */  {(void*)     D_ZO_600F560, 0, (ObjectFunc)          NULL,        D_ZO_602BA20,  1500.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_ZO_OIL_RIG_1,  */  {(void*)     aZoOilRig1DL, 0, (ObjectFunc)          NULL,        aZoOilRig1Hitbox,  1500.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_45,  */  {(void*)     D_ZO_600EC90, 0, (ObjectFunc)          NULL,        D_ZO_602BAE4,  1500.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_ZO_OIL_RIG_2,  */  {(void*)     aZoOilRig2DL, 0, (ObjectFunc)          NULL,        aZoOilRig2Hitbox,  1500.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_46,  */  {(void*)     D_ZO_600E820, 0, (ObjectFunc)          NULL,        D_ZO_602BBD8,  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_47,  */  {(void*)     D_ZO_601FCB0, 0, (ObjectFunc)          NULL,        D_ZO_602BC54,   500.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_48,  */  {(void*) Scenery48_Draw, 1, (ObjectFunc)          NULL,        D_VE1_601B4E0,  2500.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_49,  */  {(void*) Scenery49_Draw, 1, (ObjectFunc)          NULL,        D_VE1_601B4FC,  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_50,  */  {(void*)     D_VE1_6007410, 0, (ObjectFunc)          NULL,        D_VE1_601B518,  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_51,  */  {(void*)     D_VE1_6006F50, 0, (ObjectFunc)          NULL,        D_VE1_601B584,  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_52,  */  {(void*)     D_VE1_6005780, 0, (ObjectFunc) Venom1_Scenery52_Update,        D_VE1_601B5F4,  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 },
-  /* OBJ_SCENERY_53,  */  {(void*)     D_VE1_6003610, 0, (ObjectFunc)          NULL,        D_VE1_601B644,  2500.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_VE1_WATCH_POST,  */  {(void*)     aVe1WatchPostDL, 0, (ObjectFunc)          NULL,        aVe1WatchPostHitbox,  2500.0f,  0, 0, 40, 0,   0.0f,  0 },
   /* OBJ_SCENERY_CO_WATERFALL,  */  {(void*)     aCoWaterfallDL, 0, (ObjectFunc) CoWaterfall_Update,        aCoWaterfallHitbox,  1000.0f,  0, 0, 40, 0,   0.0f,  0 },
   /* OBJ_SCENERY_CO_ROCKWALL,  */  {(void*)     aCoRockwallDL, 0, (ObjectFunc)          NULL,        aCoRockwallHitbox,  1000.0f,  0, 0, 41, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_CO_DOORS,  */  {(void*) Corneria_Doors_Draw, 2, (ObjectFunc) Corneria_Doors_Update,        aCoDoorsHitbox,  1000.0f,  0, 0, 39, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_CO_DOORS,  */  {(void*) Corneria_CoDoors_Draw, 2, (ObjectFunc) Corneria_CoDoors_Update,        aCoDoorsHitbox,  1000.0f,  0, 0, 39, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_57,  */  {(void*) Titania_Scenery57_Draw, 1, (ObjectFunc) Titania_Scenery57_Update,        D_TI_6006BF0,   800.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_TI_PILLAR,  */  {(void*) Titania_TiPillar_Draw, 1, (ObjectFunc) Titania_TiPillar_Update,        aTiPillarHitbox,   800.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_58,  */  {(void*)     D_TI1_700BE00, 0, (ObjectFunc)          NULL,        D_TI_6006C44,  2000.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_TI_BRIDGE,  */  {(void*)     aTiBridgeDL, 0, (ObjectFunc)          NULL,        aTiBridgeHitbox,  2000.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_59,  */  {(void*)     D_MA_6024010, 0, (ObjectFunc)          NULL,        D_MA_603626C,   300.0f,  0, 0,  5, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_MA_BUILDING_1,  */  {(void*)     aMaBuilding1DL, 0, (ObjectFunc)          NULL,        aMaBuilding1Hitbox,   300.0f,  0, 0,  5, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_60,  */  {(void*)     D_MA_6027180, 0, (ObjectFunc)          NULL,        D_MA_6036288,   400.0f,  0, 0,  5, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_MA_BUILDING_2,  */  {(void*)     aMaBuilding2DL, 0, (ObjectFunc)          NULL,        aMaBuilding2Hitbox,   400.0f,  0, 0,  5, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_61,  */  {(void*) Macbeth_Scenery61_Draw, 1, (ObjectFunc)          NULL,        D_MA_60362A4,   200.0f,  0, 0,  5, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_MA_TOWER,  */  {(void*) Macbeth_MaTower_Draw, 1, (ObjectFunc)          NULL,        aMaTowerHitbox,   200.0f,  0, 0,  5, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_62,  */  {(void*)     D_MA_60270E0, 0, (ObjectFunc)          NULL,       gNoHitbox,  1500.0f,  0, 0,  0, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_MA_WALL_1,  */  {(void*)     aMaWall1DL, 0, (ObjectFunc)          NULL,       gNoHitbox,  1500.0f,  0, 0,  0, 0,   0.0f,  0 },
   /* OBJ_SCENERY_63,  */  {(void*)     D_MA_6013960, 0, (ObjectFunc)          NULL,        D_MA_6036894,   500.0f,  0, 0,  5, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_64,  */  {(void*)     D_MA_600AF40, 0, (ObjectFunc)          NULL,        D_MA_60368E0,   100.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_MA_GUILLOTINE,  */  {(void*)     aMaGuillotineDL, 0, (ObjectFunc)          NULL,        aMaGuillotineHitbox,   100.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_65,  */  {(void*) Macbeth_Scenery65_Draw, 1, (ObjectFunc)          NULL,        D_MA_6036724,   400.0f,  0, 0,  0, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_MA_PROXIMITY_LIGHT,  */  {(void*) Macbeth_MaProximityLight_Draw, 1, (ObjectFunc)          NULL,        aMaProximityLightHitbox,   400.0f,  0, 0,  0, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_66,  */  {(void*)     D_MA_601F1D0, 0, (ObjectFunc)          NULL,        D_MA_60362D8,  2500.0f,  0, 0,  5, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_MA_WALL_2,  */  {(void*)     aMaWall2DL, 0, (ObjectFunc)          NULL,        aMaWall2Hitbox,  2500.0f,  0, 0,  5, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_67,  */  {(void*)     D_MA_60238F0, 0, (ObjectFunc)          NULL,        D_MA_6036328,  2000.0f,  0, 0,  5, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_MA_WALL_3,  */  {(void*)     aMaWall3DL, 0, (ObjectFunc)          NULL,        aMaWall3Hitbox,  2000.0f,  0, 0,  5, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_68,  */  {(void*)     D_MA_601B7C0, 0, (ObjectFunc)          NULL,        D_MA_60362F4,  2500.0f,  0, 0,  5, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_MA_WALL_4,  */  {(void*)     aMaWall4DL, 0, (ObjectFunc)          NULL,        aMaWall4Hitbox,  2500.0f,  0, 0,  5, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_69,  */  {(void*)     D_MA_6030500, 0, (ObjectFunc)          NULL,        D_MA_6036370,   500.0f,  0, 0,  0, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_MA_TERRAIN_BUMP,  */  {(void*)     aMaTerrainBumpDL, 0, (ObjectFunc)          NULL,        aMaTerrainBumpHitbox,   500.0f,  0, 0,  0, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_70,  */  {(void*)     D_MA_602DAE0, 0, (ObjectFunc)          NULL,        D_MA_603638C,  1900.0f,  0, 0,  0, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_MA_FLOOR_1,  */  {(void*)     aMaFloor1DL, 0, (ObjectFunc)          NULL,        aMaFloor1Hitbox,  1900.0f,  0, 0,  0, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_71,  */  {(void*)     D_MA_6027900, 0, (ObjectFunc)          NULL,        D_MA_60363B8,  1900.0f,  0, 0,  0, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_MA_FLOOR_2,  */  {(void*)     aMaFloor2DL, 0, (ObjectFunc)          NULL,        aMaFloor2Hitbox,  1900.0f,  0, 0,  0, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_72,  */  {(void*)     D_MA_602DB80, 0, (ObjectFunc)          NULL,        D_MA_60363E4,  1100.0f,  0, 0,  0, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_MA_FLOOR_3,  */  {(void*)     aMaFloor3DL, 0, (ObjectFunc)          NULL,        aMaFloor3Hitbox,  1100.0f,  0, 0,  0, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_73,  */  {(void*)     D_MA_6030630, 0, (ObjectFunc)          NULL,        D_MA_6036410,  1100.0f,  0, 0,  0, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_MA_FLOOR_4,  */  {(void*)     aMaFloor4DL, 0, (ObjectFunc)          NULL,        aMaFloor4Hitbox,  1100.0f,  0, 0,  0, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_74,  */  {(void*)     D_MA_602DC20, 0, (ObjectFunc)          NULL,        D_MA_603643C,  1000.0f,  0, 0,  0, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_MA_FLOOR_5,  */  {(void*)     aMaFloor5DL, 0, (ObjectFunc)          NULL,        aMaFloor5Hitbox,  1000.0f,  0, 0,  0, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_75,  */  {(void*)     D_MA_601B0D0, 0, (ObjectFunc)          NULL,        D_MA_6036760,  3000.0f,  0, 0,  0, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_MA_FLOOR_6,  */  {(void*)     aMaFloor6DL, 0, (ObjectFunc)          NULL,        aMaFloor6Hitbox,  3000.0f,  0, 0,  0, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_76,  */  {(void*)     D_MA_60075D0, 0, (ObjectFunc)          NULL,       gNoHitbox,  1000.0f,  0, 0,  0, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_MA_WEAPONS_FACTORY,  */  {(void*)     aMaWeaponsFactoryDL, 0, (ObjectFunc)          NULL,       gNoHitbox,  1000.0f,  0, 0,  0, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_77,  */  {(void*) Macbeth_SceneryDoodad2_Draw, 1, (ObjectFunc)          NULL,        D_MA_6036344,   200.0f,  0, 0,  0, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_MA_INDICATOR_SIGN,  */  {(void*) Macbeth_IndicatorSign_Draw, 1, (ObjectFunc)          NULL,        aMaIndicatorSignHitbox,   200.0f,  0, 0,  0, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_78,  */  {(void*) Macbeth_SceneryDoodad2_Draw, 1, (ObjectFunc)          NULL,       gNoHitbox,   200.0f,  0, 0,  0, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_MA_DISTANCE_SIGN_1,  */  {(void*) Macbeth_IndicatorSign_Draw, 1, (ObjectFunc)          NULL,       gNoHitbox,   200.0f,  0, 0,  0, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_79,  */  {(void*) Macbeth_SceneryDoodad2_Draw, 1, (ObjectFunc)          NULL,       gNoHitbox,   200.0f,  0, 0,  0, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_MA_DISTANCE_SIGN_2,  */  {(void*) Macbeth_IndicatorSign_Draw, 1, (ObjectFunc)          NULL,       gNoHitbox,   200.0f,  0, 0,  0, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_80,  */  {(void*) Macbeth_SceneryDoodad2_Draw, 1, (ObjectFunc)          NULL,       gNoHitbox,   200.0f,  0, 0,  0, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_MA_DISTANCE_SIGN_3,  */  {(void*) Macbeth_IndicatorSign_Draw, 1, (ObjectFunc)          NULL,       gNoHitbox,   200.0f,  0, 0,  0, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_81,  */  {(void*) Macbeth_SceneryDoodad2_Draw, 1, (ObjectFunc)          NULL,       gNoHitbox,   200.0f,  0, 0,  0, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_MA_DISTANCE_SIGN_4,  */  {(void*) Macbeth_IndicatorSign_Draw, 1, (ObjectFunc)          NULL,       gNoHitbox,   200.0f,  0, 0,  0, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_82,  */  {(void*) Macbeth_SceneryDoodad2_Draw, 1, (ObjectFunc)          NULL,       gNoHitbox,   200.0f,  0, 0,  0, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_MA_DISTANCE_SIGN_5,  */  {(void*) Macbeth_IndicatorSign_Draw, 1, (ObjectFunc)          NULL,       gNoHitbox,   200.0f,  0, 0,  0, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_83,  */  {(void*) Macbeth_Scenery83_Draw, 1, (ObjectFunc) Macbeth_Scenery83_Update,       gNoHitbox, 15000.0f,  0, 0,  0, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_MA_TRAIN_STOP_BLOCK,  */  {(void*) Macbeth_MaTrainStopBlock_Draw, 1, (ObjectFunc) Macbeth_MaTrainStopBlock_Update,       gNoHitbox, 15000.0f,  0, 0,  0, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_84,  */  {(void*) Macbeth_SceneryDoodad2_Draw, 1, (ObjectFunc)          NULL,       gNoHitbox,   500.0f,  0, 0,  0, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_MA_RAILROAD_SWITCH_1,  */  {(void*) Macbeth_IndicatorSign_Draw, 1, (ObjectFunc)          NULL,       gNoHitbox,   500.0f,  0, 0,  0, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_85,  */  {(void*) Macbeth_SceneryDoodad2_Draw, 1, (ObjectFunc)          NULL,       gNoHitbox,   500.0f,  0, 0,  0, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_MA_RAILROAD_SWITCH_2,  */  {(void*) Macbeth_IndicatorSign_Draw, 1, (ObjectFunc)          NULL,       gNoHitbox,   500.0f,  0, 0,  0, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_86,  */  {(void*) Macbeth_SceneryDoodad2_Draw, 1, (ObjectFunc)          NULL,       gNoHitbox,   500.0f,  0, 0,  0, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_MA_RAILROAD_SWITCH_3,  */  {(void*) Macbeth_IndicatorSign_Draw, 1, (ObjectFunc)          NULL,       gNoHitbox,   500.0f,  0, 0,  0, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_87,  */  {(void*) Macbeth_SceneryDoodad2_Draw, 1, (ObjectFunc)          NULL,       gNoHitbox,   500.0f,  0, 0,  0, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_MA_RAILROAD_SWITCH_4,  */  {(void*) Macbeth_IndicatorSign_Draw, 1, (ObjectFunc)          NULL,       gNoHitbox,   500.0f,  0, 0,  0, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_88,  */  {(void*) Macbeth_SceneryDoodad2_Draw, 1, (ObjectFunc)          NULL,       gNoHitbox,   500.0f,  0, 0,  0, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_MA_RAILROAD_SWITCH_5,  */  {(void*) Macbeth_IndicatorSign_Draw, 1, (ObjectFunc)          NULL,       gNoHitbox,   500.0f,  0, 0,  0, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_89,  */  {(void*) Macbeth_SceneryDoodad2_Draw, 1, (ObjectFunc)          NULL,       gNoHitbox,   500.0f,  0, 0,  0, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_MA_RAILROAD_SWITCH_6,  */  {(void*) Macbeth_IndicatorSign_Draw, 1, (ObjectFunc)          NULL,       gNoHitbox,   500.0f,  0, 0,  0, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_90,  */  {(void*) Macbeth_SceneryDoodad2_Draw, 1, (ObjectFunc)          NULL,       gNoHitbox,   500.0f,  0, 0,  0, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_MA_RAILROAD_SWITCH_7,  */  {(void*) Macbeth_IndicatorSign_Draw, 1, (ObjectFunc)          NULL,       gNoHitbox,   500.0f,  0, 0,  0, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_91,  */  {(void*) Macbeth_SceneryDoodad2_Draw, 1, (ObjectFunc)          NULL,       gNoHitbox,   500.0f,  0, 0,  0, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_MA_RAILROAD_SWITCH_8,  */  {(void*) Macbeth_IndicatorSign_Draw, 1, (ObjectFunc)          NULL,       gNoHitbox,   500.0f,  0, 0,  0, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_92,  */  {(void*) Macbeth_SceneryDoodad_Draw, 1, (ObjectFunc)          NULL,       gNoHitbox,   500.0f,  0, 0,  0, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_MA_TRAIN_TRACK_1,  */  {(void*) Macbeth_TrainTrack_Draw, 1, (ObjectFunc)          NULL,       gNoHitbox,   500.0f,  0, 0,  0, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_93,  */  {(void*) Macbeth_SceneryDoodad_Draw, 1, (ObjectFunc)          NULL,       gNoHitbox,   500.0f,  0, 0,  0, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_MA_TRAIN_TRACK_2,  */  {(void*) Macbeth_TrainTrack_Draw, 1, (ObjectFunc)          NULL,       gNoHitbox,   500.0f,  0, 0,  0, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_94,  */  {(void*) Macbeth_SceneryDoodad_Draw, 1, (ObjectFunc)          NULL,       gNoHitbox, 15000.0f,  0, 0,  0, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_MA_TRAIN_TRACK_3,  */  {(void*) Macbeth_TrainTrack_Draw, 1, (ObjectFunc)          NULL,       gNoHitbox, 15000.0f,  0, 0,  0, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_95,  */  {(void*) Macbeth_SceneryDoodad_Draw, 1, (ObjectFunc)          NULL,       gNoHitbox, 15000.0f,  0, 0,  0, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_MA_TRAIN_TRACK_4,  */  {(void*) Macbeth_TrainTrack_Draw, 1, (ObjectFunc)          NULL,       gNoHitbox, 15000.0f,  0, 0,  0, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_96,  */  {(void*) Macbeth_SceneryDoodad_Draw, 1, (ObjectFunc)          NULL,       gNoHitbox,  2500.0f,  0, 0,  0, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_MA_TRAIN_TRACK_5,  */  {(void*) Macbeth_TrainTrack_Draw, 1, (ObjectFunc)          NULL,       gNoHitbox,  2500.0f,  0, 0,  0, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_97,  */  {(void*) Macbeth_SceneryDoodad_Draw, 1, (ObjectFunc)          NULL,       gNoHitbox, 15000.0f,  0, 0,  0, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_MA_TRAIN_TRACK_6,  */  {(void*) Macbeth_TrainTrack_Draw, 1, (ObjectFunc)          NULL,       gNoHitbox, 15000.0f,  0, 0,  0, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_98,  */  {(void*) Macbeth_SceneryDoodad_Draw, 1, (ObjectFunc)          NULL,       gNoHitbox, 15000.0f,  0, 0,  0, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_MA_TRAIN_TRACK_7,  */  {(void*) Macbeth_TrainTrack_Draw, 1, (ObjectFunc)          NULL,       gNoHitbox, 15000.0f,  0, 0,  0, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_99,  */  {(void*) Macbeth_SceneryDoodad_Draw, 1, (ObjectFunc)          NULL,       gNoHitbox,  2500.0f,  0, 0,  0, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_MA_TRAIN_TRACK_8,  */  {(void*) Macbeth_TrainTrack_Draw, 1, (ObjectFunc)          NULL,       gNoHitbox,  2500.0f,  0, 0,  0, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_100  */  {(void*) Macbeth_SceneryDoodad_Draw, 1, (ObjectFunc)          NULL,       gNoHitbox,  2500.0f,  0, 0,  0, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_MA_TRAIN_TRACK_9  */  {(void*) Macbeth_TrainTrack_Draw, 1, (ObjectFunc)          NULL,       gNoHitbox,  2500.0f,  0, 0,  0, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_101  */  {(void*) Macbeth_SceneryDoodad_Draw, 1, (ObjectFunc)          NULL,       gNoHitbox,  2500.0f,  0, 0,  0, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_MA_TRAIN_TRACK_10  */  {(void*) Macbeth_TrainTrack_Draw, 1, (ObjectFunc)          NULL,       gNoHitbox,  2500.0f,  0, 0,  0, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_102  */  {(void*) Macbeth_SceneryDoodad_Draw, 1, (ObjectFunc)          NULL,       gNoHitbox,  2500.0f,  0, 0,  0, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_MA_TRAIN_TRACK_11  */  {(void*) Macbeth_TrainTrack_Draw, 1, (ObjectFunc)          NULL,       gNoHitbox,  2500.0f,  0, 0,  0, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_103  */  {(void*) Macbeth_SceneryDoodad_Draw, 1, (ObjectFunc)          NULL,       gNoHitbox,  2500.0f,  0, 0,  0, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_MA_TRAIN_TRACK_12  */  {(void*) Macbeth_TrainTrack_Draw, 1, (ObjectFunc)          NULL,       gNoHitbox,  2500.0f,  0, 0,  0, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_104  */  {(void*) Macbeth_SceneryDoodad_Draw, 1, (ObjectFunc) Macbeth_Scenery104_Update,        D_MA_6036594,  2500.0f,  0, 0,  0, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_MA_SWITCH_TRACK  */  {(void*) Macbeth_TrainTrack_Draw, 1, (ObjectFunc) Macbeth_MaSwitchTrack_Update,        aMaSwitchTrackHitbox,  2500.0f,  0, 0,  0, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_105  */  {(void*) Macbeth_SceneryDoodad_Draw, 1, (ObjectFunc)          NULL,        D_MA_6036204,  1300.0f,  0, 0,  0, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_MA_TRAIN_TRACK_13  */  {(void*) Macbeth_TrainTrack_Draw, 1, (ObjectFunc)          NULL,        aMaTrainTrack13Hitbox,  1300.0f,  0, 0,  0, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_106  */  {(void*)     D_SY_60097E0, 0, (ObjectFunc)          NULL,        D_SY_6034478,  4000.0f,  0, 0, 41, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_SY_SHIP_1  */  {(void*)     aSyShip1DL, 0, (ObjectFunc)          NULL,        aSyShip1Hitbox,  4000.0f,  0, 0, 41, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_107  */  {(void*)     D_SY_601D730, 0, (ObjectFunc)          NULL,        D_SY_603450C,  4000.0f,  0, 0, 41, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_SY_SHIP_2  */  {(void*)     aSyShip2DL, 0, (ObjectFunc)          NULL,        aSyShip2Hitbox,  4000.0f,  0, 0, 41, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_108  */  {(void*)     D_SY_60102C0, 0, (ObjectFunc)          NULL,        D_SY_6034588,  4000.0f,  0, 0, 41, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_SY_SHIP_3  */  {(void*)     aSyShip3DL, 0, (ObjectFunc)          NULL,        aSyShip3Hitbox,  4000.0f,  0, 0, 41, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_109  */  {(void*)     D_SY_60036A0, 0, (ObjectFunc) SectorY_Scenery109_Update,        D_SY_6034664,  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_110  */  {(void*)     D_SY_6005360, 0, (ObjectFunc)          NULL,        D_SY_6034770,  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_111  */  {(void*) Scenery111_Draw, 1, (ObjectFunc)          NULL,       gNoHitbox,  2000.0f,  0, 0,  0, 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_112  */  {(void*)     D_SY_600F6C0, 0, (ObjectFunc) SectorY_Scenery112_Update,        D_SY_60347F0,  4000.0f,  0, 0, 41, 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_SCENERY_113  */  {(void*)     D_SY_601B610, 0, (ObjectFunc)          NULL,       gNoHitbox,  2000.0f,  0, 0, 40, 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_SCENERY_114  */  {(void*)     D_SY_601C6A0, 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 },
-  /* OBJ_SCENERY_115  */  {(void*)     D_SY_60188D0, 0, (ObjectFunc)          NULL,        D_SY_603486C,  2000.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_SY_SHIP_PROJECTILE  */  {(void*)     aSyShipProjectileDL, 0, (ObjectFunc)          NULL,        aSyShipProjectileHitbox,  2000.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_116  */  {(void*)     D_SY_60034D0, 0, (ObjectFunc)          NULL,        D_SY_60347D4,  2000.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_SY_SHIP_WINDOWS  */  {(void*)     aSyShipWindowsDL, 0, (ObjectFunc)          NULL,        aSyShipWindowsHitbox,  2000.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_117  */  {(void*)     D_AQ_60231C0, 0, (ObjectFunc)          NULL,        D_AQ_6030C60,  2000.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_AQ_CORAL_REEF_1  */  {(void*)     aAqCoralReef1DL, 0, (ObjectFunc)          NULL,        aAqCoralReef1Hitbox,  2000.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_118  */  {(void*)     D_AQ_6011EE0, 0, (ObjectFunc)          NULL,        D_AQ_6030C7C,  2000.0f,  0, 0, 41, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_AQ_TUNNEL_1  */  {(void*)     aAqTunnel1DL, 0, (ObjectFunc)          NULL,        aAqTunnel1Hitbox,  2000.0f,  0, 0, 41, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_119  */  {(void*)     D_AQ_6015730, 0, (ObjectFunc)          NULL,        D_AQ_6030D74,  2000.0f,  0, 0, 39, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_AQ_ARCH  */  {(void*)     aAqArchDL, 0, (ObjectFunc)          NULL,        aAqArchHitbox,  2000.0f,  0, 0, 39, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_120  */  {(void*)     D_AQ_601DE60, 0, (ObjectFunc)          NULL,        D_AQ_6030DF8,  2000.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_AQ_CORAL_REEF_2  */  {(void*)     aAqCoralReef2DL, 0, (ObjectFunc)          NULL,        aAqCoralReef2Hitbox,  2000.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_121  */  {(void*)     D_AQ_602B4C0, 0, (ObjectFunc)          NULL,        D_AQ_6030E14,  2000.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_AQ_ROCK  */  {(void*)     aAqRockDL, 0, (ObjectFunc)          NULL,        aAqRockHitbox,  2000.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_122  */  {(void*)     D_AQ_600EE10, 0, (ObjectFunc)          NULL,        D_AQ_6030E30_Hitbox,  2000.0f,  0, 0, 41, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_AQ_WALL_1  */  {(void*)     aAqWall1DL, 0, (ObjectFunc)          NULL,        aAqWall1Hitbox,  2000.0f,  0, 0, 41, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_123  */  {(void*)     D_AQ_60120F0, 0, (ObjectFunc)          NULL,        D_AQ_6030E4C,  2000.0f,  0, 0, 41, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_AQ_ROOF  */  {(void*)     aAqRoofDL, 0, (ObjectFunc)          NULL,        aAqRoofHitbox,  2000.0f,  0, 0, 41, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_124  */  {(void*)     D_AQ_600EEF0, 0, (ObjectFunc)          NULL,       gNoHitbox,  2000.0f,  0, 0, 41, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_AQ_BUMP_1  */  {(void*)     aAqBump2DL, 0, (ObjectFunc)          NULL,       gNoHitbox,  2000.0f,  0, 0, 41, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_125  */  {(void*)     D_AQ_600BF80, 0, (ObjectFunc)          NULL,        D_AQ_6030E68,  2000.0f,  0, 0, 41, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_AQ_TUNNEL_2  */  {(void*)     aAqTunnel2DL, 0, (ObjectFunc)          NULL,        aAqTunnel2Hitbox,  2000.0f,  0, 0, 41, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_126  */  {(void*) Aquas_Scenery126_Draw, 1, (ObjectFunc)          NULL,       gNoHitbox,  2000.0f,  0, 0, 41, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_AQ_BUMP_2  */  {(void*) Aquas_AqBump2_Draw, 1, (ObjectFunc)          NULL,       gNoHitbox,  2000.0f,  0, 0, 41, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_127  */  {(void*)     D_VE1_9005C80, 0, (ObjectFunc) Venom1_Scenery127_Update,        D_VE1_601B678,  1000.0f,  0, 0, 42, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_VE1_TEMPLE_ENTRANCE  */  {(void*)     aVe1TempleEntranceDL, 0, (ObjectFunc) Venom1_Ve1TempleEntrance_Update,        aVe1TempleEntranceHitbox,  1000.0f,  0, 0, 42, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_128  */  {(void*)     D_VE1_9003F50, 0, (ObjectFunc)          NULL,        D_VE1_601B6C4,  3200.0f,  0, 0, 42, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_VE1_TEMPLE_INTERIOR_1  */  {(void*)     aVe1TempleInterior1DL, 0, (ObjectFunc)          NULL,        aVe1TempleInterior1Hitbox,  3200.0f,  0, 0, 42, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_129  */  {(void*)     D_VE1_900F060, 0, (ObjectFunc)          NULL,        D_VE1_601B710,  3200.0f,  0, 0, 42, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_VE1_TEMPLE_INTERIOR_2  */  {(void*)     aVe1TempleInterior2DL, 0, (ObjectFunc)          NULL,        aVe1TempleInterior2Hitbox,  3200.0f,  0, 0, 42, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_130  */  {(void*)     D_VE1_900F1D0, 0, (ObjectFunc)          NULL,        D_VE1_601B75C,  3200.0f,  0, 0, 42, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_VE1_TEMPLE_INTERIOR_3  */  {(void*)     aVe1TempleInterior3DL, 0, (ObjectFunc)          NULL,        aVe1TempleInterior3Hitbox,  3200.0f,  0, 0, 42, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_131  */  {(void*) Andross_Scenery131_Draw, 1, (ObjectFunc) Andross_Scenery131_Update,        D_ANDROSS_C038BD8,   500.0f,  0, 0, 41, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_AND_PASSAGE  */  {(void*) Andross_AndPassage_Draw, 1, (ObjectFunc) Andross_AndPassage_Update,        aAndPassageHitbox,   500.0f,  0, 0, 41, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_132  */  {(void*) Andross_Scenery132_Draw, 1, (ObjectFunc) Andross_Scenery132_Update,        D_ANDROSS_C038A48,   500.0f,  0, 0, 41, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_AND_DOOR  */  {(void*) Andross_AndDoor_Draw, 1, (ObjectFunc) Andross_AndDoor_Update,        aAndDoorHitbox,   500.0f,  0, 0, 41, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_133  */  {(void*)     D_TR_60030F0, 0, (ObjectFunc)          NULL,        D_TR_6009CC4,  1000.0f,  0, 0, 20, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_TR_BUILDING  */  {(void*)     aTrBuildingDL, 0, (ObjectFunc)          NULL,        aTrBuildingHitbox,  1000.0f,  0, 0, 20, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_134  */  {(void*)     D_VE2_6003000, 0, (ObjectFunc)          NULL,        D_ANDROSS_C038BA4,     0.0f,  0, 0, 41, 1,   0.0f,  0 },
+  /* OBJ_SCENERY_AND_PATH_INTERSECTION  */  {(void*)     aAndPathIntersectionDL, 0, (ObjectFunc)          NULL,        aAndPathIntersectionHitbox,     0.0f,  0, 0, 41, 1,   0.0f,  0 },
-  /* OBJ_SCENERY_135  */  {(void*) D_VE2_6006890, 0, (ObjectFunc)          NULL,        D_ANDROSS_C038B40,     0.0f,  0, 0, 41, 1,   0.0f,  0 },
+  /* OBJ_SCENERY_AND_PATH_WALLS  */  {(void*) aAndPathWallsDL, 0, (ObjectFunc)          NULL,        D_ANDROSS_C038B40,     0.0f,  0, 0, 41, 1,   0.0f,  0 },
-  /* OBJ_SCENERY_136  */  {(void*)     D_VE2_6002990, 0, (ObjectFunc)          NULL,        D_ANDROSS_C038B40,     0.0f,  0, 0, 41, 1,   0.0f,  0 },
+  /* OBJ_SCENERY_AND_PATH_EXIT  */  {(void*)     aAndPathExitDL, 0, (ObjectFunc)          NULL,        D_ANDROSS_C038B40,     0.0f,  0, 0, 41, 1,   0.0f,  0 },
-  /* OBJ_SCENERY_137  */  {(void*)     D_VE2_6004170, 0, (ObjectFunc)          NULL,       gNoHitbox,     0.0f,  0, 0,  0, 1,   0.0f,  0 },
+  /* OBJ_SCENERY_AND_PATH_ENTRANCE  */  {(void*)     aAndPathEntranceDL, 0, (ObjectFunc)          NULL,       gNoHitbox,     0.0f,  0, 0,  0, 1,   0.0f,  0 },
-  /* OBJ_SCENERY_138  */  {(void*)     D_versus_3017600, 0, (ObjectFunc)          NULL,        D_versus_302EE64,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_VS_BUILDING_1  */  {(void*)     aVsBuildingDL, 0, (ObjectFunc)          NULL,        aVsBuilding1Hibox,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_139  */  {(void*)     D_versus_3017600, 0, (ObjectFunc)          NULL,        D_versus_302EE80,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_VS_BUILDING_2  */  {(void*)     aVsBuildingDL, 0, (ObjectFunc)          NULL,        aVsBuilding2Hibox,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_140  */  {(void*)     D_versus_30173C0, 0, (ObjectFunc)          NULL,       gNoHitbox,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_VS_PYRAMID_1  */  {(void*)     aVsPyramid1DL, 0, (ObjectFunc)          NULL,       gNoHitbox,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_141  */  {(void*)     D_versus_30174E0, 0, (ObjectFunc)          NULL,       gNoHitbox,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_VS_PYRAMID_2  */  {(void*)     aVsPyramid2DL, 0, (ObjectFunc)          NULL,       gNoHitbox,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_142  */  {(void*)     D_versus_301B080, 0, (ObjectFunc)          NULL,        D_versus_302EE9C,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_VS_ARCH  */  {(void*)     aVsArchDL, 0, (ObjectFunc)          NULL,        aVsArchHitbox,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_143  */  {(void*)     D_versus_3016B00, 0, (ObjectFunc)          NULL,        D_versus_302EE00,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_VS_KA_FLBASE  */  {(void*)     aVsKaFlBaseDL, 0, (ObjectFunc)          NULL,        aVsKaFlBaseHitbox,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_144  */  {(void*)     D_versus_3013780, 0, (ObjectFunc)          NULL,        D_versus_302ED4C,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_VS_SPACE_JUNK_1  */  {(void*)     aVsSpaceJunk1DL, 0, (ObjectFunc)          NULL,        aVsSpaceJunk1Hitbox,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_145  */  {(void*)     D_versus_3013580, 0, (ObjectFunc)          NULL,        D_versus_302ED98,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_VS_SPACE_JUNK_2  */  {(void*)     aVsSpaceJunk2DL, 0, (ObjectFunc)          NULL,        aVsSpaceJunk2Hitbox,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_146  */  {(void*)     D_versus_3012ED0, 0, (ObjectFunc)          NULL,        D_versus_302EDB4,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_VS_SPACE_JUNK_3  */  {(void*)     aVsSpaceJunk3DL, 0, (ObjectFunc)          NULL,        aVsSpaceJunk3Hitbox,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
   /* OBJ_SCENERY_147  */  {(void*)          NULL, 0, (ObjectFunc)          NULL,       gNoHitbox,     0.0f,  0, 0,  0, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_148  */  {(void*)     D_FO_60079B0, 0, (ObjectFunc)          NULL,        D_FO_600FF80,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_FO_MOUNTAIN_1  */  {(void*)     aFoMountain1DL, 0, (ObjectFunc)          NULL,        aFoMountain1Hitbox,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_149  */  {(void*)     D_FO_6007D80, 0, (ObjectFunc)          NULL,        D_FO_600FFA0,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_FO_MOUNTAIN_2  */  {(void*)     aFoMountain2DL, 0, (ObjectFunc)          NULL,        aFoMountain2Hitbox,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_150  */  {(void*)     D_FO_6006310, 0, (ObjectFunc)          NULL,        D_FO_600FFC0,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_FO_MOUNTAIN_3  */  {(void*)     aFoMountain3DL, 0, (ObjectFunc)          NULL,        aFoMountain3Hitbox,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_151  */  {(void*)     D_FO_60066E0, 0, (ObjectFunc)          NULL,        D_FO_600FEB8,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_FO_TOWER  */  {(void*)     aFoTowerDL, 0, (ObjectFunc)          NULL,        aFoTowerHitbox,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_152  */  {(void*)     D_BO_600F4C0, 0, (ObjectFunc)          NULL,        D_BO_6011C10,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_BO_POLE  */  {(void*)     aBoPoleDL, 0, (ObjectFunc)          NULL,        aBoPoleHitbox,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_153  */  {(void*)     D_BO_600B8B0, 0, (ObjectFunc)          NULL,        D_BO_6011C48,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_BO_BUILDING  */  {(void*)     aBoBuildingDL, 0, (ObjectFunc)          NULL,        aBoBuildingHitbox,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_154  */  {(void*)     aKaFLBaseDL, 0, (ObjectFunc)          NULL,        D_KA_601115C,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_KA_FLBASE  */  {(void*)     aKaFLBaseDL, 0, (ObjectFunc)          NULL,        aKaFrontlineBaseHitbox,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_155  */  {(void*)          NULL, 0, (ObjectFunc)          NULL,       gNoHitbox,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_UNK_155  */  {(void*)          NULL, 0, (ObjectFunc)          NULL,       gNoHitbox,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_156  */  {(void*) SectorY_Scenery156_Draw, 1, (ObjectFunc)          NULL,        D_SY_6034368,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_UNK_156  */  {(void*) SectorY_Scenery156_Draw, 1, (ObjectFunc)          NULL,        aSyScenery156Hitbox,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_157  */  {(void*)     aSzSpaceJunk3DL, 0, (ObjectFunc)          NULL,        D_SZ_600924C,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_SZ_SPACE_JUNK_3  */  {(void*)     aSzSpaceJunk3DL, 0, (ObjectFunc)          NULL,        aSzSpaceJunk3Hitbox,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_158  */  {(void*)     aSzSpaceJunk1DL, 0, (ObjectFunc)          NULL,        D_SZ_60092E8,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_SZ_SPACE_JUNK_1  */  {(void*)     aSzSpaceJunk1DL, 0, (ObjectFunc)          NULL,        aSzSpaceJunk1Hitbox,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_159  */  {(void*)     D_VE2_6008370, 0, (ObjectFunc)          NULL,        D_VE2_601668C,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_VE2_TOWER  */  {(void*)     aVe2TowerDL, 0, (ObjectFunc)          NULL,        aVe2TowerHitbox,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_SCENERY_160  */  {(void*)     D_VE2_6010960, 0, (ObjectFunc)          NULL,        D_VE2_6016714,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_SCENERY_VE2_MOUNTAIN  */  {(void*)     aVe2MountainDL, 0, (ObjectFunc)          NULL,        aVe2MountainHitbox,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
   /* OBJ_SPRITE_CO_POLE  */  {(void*)     aCoPoleDL, 0, (ObjectFunc) Sprite_UpdateDoodad,        aCoPoleHitbox,   100.0f,  0, 0, 40, 0,   0.0f,  0 },
   /* 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 },
@@ -263,7 +263,7 @@ ObjectInfo gObjectInfo[] = {
   /* 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 },
-  /* OBJ_SPRITE_CO_SMOKE  */  {(void*)          NULL, 1, (ObjectFunc) Corneria_Smoke_Update,       gNoHitbox,     0.0f,  0, 0,  0, 0,   0.0f,  0 },
+  /* OBJ_SPRITE_CO_SMOKE  */  {(void*)          NULL, 1, (ObjectFunc) Corneria_CoSmoke_Update,       gNoHitbox,     0.0f,  0, 0,  0, 0,   0.0f,  0 },
   /* OBJ_SPRITE_VE1_BOSS_TRIGGER1  */  {(void*)          NULL, 1, (ObjectFunc) Venom1_BossTrigger1_Update,       gNoHitbox,     0.0f,  0, 0,  0, 0,   0.0f,  0 },
   /* OBJ_SPRITE_VE1_BOSS_TRIGGER2  */  {(void*)          NULL, 1, (ObjectFunc) Venom1_BossTrigger2_Update,       gNoHitbox,     0.0f,  0, 0,  0, 0,   0.0f,  0 },
   /* OBJ_SPRITE_VE1_BOSS_TRIGGER3  */  {(void*)          NULL, 1, (ObjectFunc) Venom1_BossTrigger3_Update,       gNoHitbox,     0.0f,  0, 0,  0, 0,   0.0f,  0 },
@@ -273,148 +273,148 @@ ObjectInfo gObjectInfo[] = {
   /* OBJ_ACTOR_CO_GARUDA_2 */  {(void*) Corneria_CoGaruda2_Draw, 2, (ObjectFunc) Corneria_CoGaruda2_Update,        CoGarudaHitbox,   500.0f,  0, 0, 39, 1, 200.0f,  1 },
   /* 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_180 */  {(void*) Actor180_Draw, 1, (ObjectFunc) Actor180_Update,       gNoHitbox,  1000.0f,  0, 0, 39, 0,   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_181 */  {(void*)     D_ME_6018C00, 0, (ObjectFunc) Meteo_Actor181_Update,        D_ME_602F6EC,   200.0f,  0, 0, 39, 0,   1.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_182 */  {(void*) Actor182_Draw, 1, (ObjectFunc) Meteo_Actor182_Update,        D_ME_602F708,   100.0f,  0, 1, 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_183 */  {(void*) Meteo_Actor183_Draw, 1, (ObjectFunc) Meteo_ActorDoodad_Update,       gNoHitbox,   100.0f,  0, 1, 39, 0,   0.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_184 */  {(void*) Meteo_Actor184_Draw, 1, (ObjectFunc) Meteo_ActorDoodad_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 },
-  /* OBJ_ACTOR_185 */  {(void*) Meteo_Actor185_Draw, 1, (ObjectFunc) Meteo_ActorDoodad_Update,       gNoHitbox,   100.0f,  0, 1, 39, 0,   0.0f,  1 },
+  /* OBJ_ACTOR_ME_METEOR_SHOWER_3 */  {(void*) Meteo_MeMeteorShower3_Draw, 1, (ObjectFunc) Meteo_MeteorShower_Update,       gNoHitbox,   100.0f,  0, 1, 39, 0,   0.0f,  1 },
-  /* OBJ_ACTOR_186 */  {(void*) Actor186_Draw, 1, (ObjectFunc) Meteo_Actor186_Update,        D_ME_602F724,   200.0f,  0, 1, 39, 0,   1.0f,  1 },
+  /* OBJ_ACTOR_ME_LASER_CANNON_1 */  {(void*) MeLaserCannon1_Draw, 1, (ObjectFunc) Meteo_MeLaserCannon1_Update,        aMeLaserCannon1Hitbox,   200.0f,  0, 1, 39, 0,   1.0f,  1 },
-  /* OBJ_ACTOR_187 */  {(void*)     D_ME_6018450, 0, (ObjectFunc) Meteo_Actor187_Update,        D_ME_602F740,   200.0f,  0, 1, 39, 0,   1.0f,  1 },
+  /* OBJ_ACTOR_ME_LASER_CANNON_2 */  {(void*)     aMeLaserCannon2DL, 0, (ObjectFunc) Meteo_MeLaserCannon2_Update,        aMeLaserCannon2Hitbox,   200.0f,  0, 1, 39, 0,   1.0f,  1 },
-  /* OBJ_ACTOR_188 */  {(void*) Aquas_Actor188_Draw, 1, (ObjectFunc) Aquas_Actor188_Update,        D_AQ_6030BE0,   200.0f,  0, 1, 39, 0,   1.0f,  1 },
+  /* OBJ_ACTOR_AQ_UNK_188 */  {(void*) Aquas_Actor188_Draw, 1, (ObjectFunc) Aquas_Actor188_Update,        aAqActor188Hitbox,   200.0f,  0, 1, 39, 0,   1.0f,  1 },
   /* OBJ_ACTOR_DEBRIS */  {(void*) ActorDebris_Draw, 1, (ObjectFunc) ActorDebris_Update,       gNoHitbox,     0.0f,  0, 0, 39, 0,   0.0f,  0 },
-  /* OBJ_MISSILE_SEEK_TEAM */  {(void*) Actor190_191_Draw, 1, (ObjectFunc) Actors190_191_Update,       gActor190_191Hitbox,   100.0f,  0, 1, 39, 0,   1.0f,  0 },
+  /* OBJ_MISSILE_SEEK_TEAM */  {(void*) ActorMissileSeek_Draw, 1, (ObjectFunc) ActorMissileSeek_Update,       gActorMissileSeekHitbox,   100.0f,  0, 1, 39, 0,   1.0f,  0 },
-  /* OBJ_MISSILE_SEEK_PLAYER */  {(void*) Actor190_191_Draw, 1, (ObjectFunc) Actors190_191_Update,       gActor190_191Hitbox,   100.0f,  0, 1, 39, 0,   1.0f,  0 },
+  /* OBJ_MISSILE_SEEK_PLAYER */  {(void*) ActorMissileSeek_Draw, 1, (ObjectFunc) ActorMissileSeek_Update,       gActorMissileSeekHitbox,   100.0f,  0, 1, 39, 0,   1.0f,  0 },
-  /* OBJ_ACTOR_192 */  {(void*) Actor192_Draw, 1, (ObjectFunc) Actor192_Update,        D_CO_603E54C,   200.0f,  0, 1, 39, 0,  50.0f,  1 },
+  /* OBJ_ACTOR_CO_SKIBOT */  {(void*) ActorSkibot_Draw, 1, (ObjectFunc) ActorSkibot_Update,        aCoActorSkibotHitbox,   200.0f,  0, 1, 39, 0,  50.0f,  1 },
-  /* OBJ_ACTOR_193 */  {(void*) Actor193_Draw, 1, (ObjectFunc) Actor193_Update,        D_CO_603E598,   100.0f,  0, 1, 39, 0,   0.0f,  0 },
+  /* OBJ_ACTOR_CO_RADAR */  {(void*) ActorRadar_Draw, 1, (ObjectFunc) ActorRadar_Update,        aCoActorRadarHitbox,   100.0f,  0, 1, 39, 0,   0.0f,  0 },
-  /* OBJ_ACTOR_194 */  {(void*) Actor194_Draw, 1, (ObjectFunc) Actor194_Update,       gActor194Hitbox,   200.0f,  0, 1, 39, 0,   0.0f,  1 },
+  /* OBJ_ACTOR_ME_MORA */  {(void*) MeMora_Draw, 1, (ObjectFunc) MeMora_Update,       gMeMoraHitbox,   200.0f,  0, 1, 39, 0,   0.0f,  1 },
   /* OBJ_ACTOR_CUTSCENE */  {(void*) ActorCutscene_Draw, 1, (ObjectFunc) ActorCutscene_Update,       gNoHitbox, 20000.0f,  0, 1, 39, 0,   0.0f,  0 },
-  /* OBJ_ACTOR_196 */  {(void*) Actor196_Draw, 1, (ObjectFunc) Actor196_Update,        D_CO_603E5B4,   200.0f,  0, 1, 39, 0,   1.0f,  1 },
+  /* OBJ_ACTOR_CO_MOLE_MISSILE */  {(void*) ActorMoleMissile_Draw, 1, (ObjectFunc) ActorMoleMissile_Update,        aCoMoleMissileHitbox,   200.0f,  0, 1, 39, 0,   1.0f,  1 },
   /* OBJ_ACTOR_ALLRANGE */  {(void*) ActorAllRange_Draw, 1, (ObjectFunc) ActorAllRange_Update,       gActorAllRangeHItbox, 20000.0f,  0, 1, 39, 1,   1.0f,  1 },
   /* OBJ_ACTOR_TEAM_BOSS */  {(void*) ActorAllRange_Draw, 1, (ObjectFunc) ActorTeamBoss_Update,       gTeamHitbox, 20000.0f,  0, 0, 39, 1,   0.0f,  0 },
   /* OBJ_ACTOR_199 */  {(void*) Andross_Actor199_Draw, 1, (ObjectFunc) Andross_Actor199_Update,       gNoHitbox, 20000.0f,  0, 0, 39, 1,   0.0f,  0 },
   /* OBJ_ACTOR_EVENT */  {(void*) ActorEvent_Draw, 1, (ObjectFunc) ActorEvent_Update,       gNoHitbox,  2000.0f,  0, 1, 39, 0,   0.0f,  1 },
-  /* OBJ_ACTOR_201 */  {(void*) Actor201_Draw, 1, (ObjectFunc) Actor201_Update,        D_ME_602F684,   100.0f,  0, 1, 39, 0,   1.0f,  1 },
+  /* OBJ_ACTOR_ME_METEO_BALL */  {(void*) MeteoBall_Draw, 1, (ObjectFunc) MeteoBall_Update,        aMeMeteoBallHitbox,   100.0f,  0, 1, 39, 0,   1.0f,  1 },
-  /* OBJ_ACTOR_202 */  {(void*) Actor202_Draw, 1, (ObjectFunc) Actor202_Update,        D_ME_602F6A0,   100.0f,  0, 1, 39, 0, 180.0f,  1 },
+  /* OBJ_ACTOR_ME_HOPBOT */  {(void*) ActorHopBot_Draw, 1, (ObjectFunc) ActorHopBot_Update,        aMeHopBotHitbox,   100.0f,  0, 1, 39, 0, 180.0f,  1 },
-  /* OBJ_ACTOR_SLIPPY_SX */  {(void*) SectorX_Slippy_Draw, 1, (ObjectFunc) SectorX_Slippy_Update,       gNoHitbox,  1000.0f,  0, 0, 39, 0,   0.0f,  0 },
+  /* OBJ_ACTOR_SLIPPY_SX */  {(void*) SectorX_SxSlippy_Draw, 1, (ObjectFunc) SectorX_SxSlippy_Update,       gNoHitbox,  1000.0f,  0, 0, 39, 0,   0.0f,  0 },
-  /* OBJ_ACTOR_204 */  {(void*) SectorY_Actor204_Draw, 1, (ObjectFunc) SectorY_Actor204_Update,        D_SY_603405C,  1000.0f,  0, 0, 39, 0,   1.0f,  1 },
+  /* OBJ_ACTOR_SY_ROBOT */  {(void*) SectorY_SyRobot_Draw, 1, (ObjectFunc) SectorY_SyRobot_Update,        aSyRobotHitbox,  1000.0f,  0, 0, 39, 0,   1.0f,  1 },
-  /* OBJ_ACTOR_205 */  {(void*) Macbeth_ActorDoodad_Draw, 1, (ObjectFunc) Macbeth_Actor205_Update,        D_MA_60359C8, 20000.0f,  0, 0, 40, 1,   0.0f,  0 },
+  /* OBJ_ACTOR_MA_LOCOMOTIVE */  {(void*) Macbeth_Train_Draw, 1, (ObjectFunc) Macbeth_MaLocomotive_Update,        aMaLocomotiveHitbox, 20000.0f,  0, 0, 40, 1,   0.0f,  0 },
-  /* OBJ_ACTOR_206 */  {(void*) Macbeth_ActorDoodad_Draw, 1, (ObjectFunc) Macbeth_Actor206_Update,        D_MA_6035A48, 20000.0f,  0, 0, 40, 1,   0.0f,  0 },
+  /* OBJ_ACTOR_MA_TRAIN_CAR_1 */  {(void*) Macbeth_Train_Draw, 1, (ObjectFunc) Macbeth_MaTrainCar1_Update,        aMaTrainCar1Hitbox, 20000.0f,  0, 0, 40, 1,   0.0f,  0 },
-  /* OBJ_ACTOR_207 */  {(void*) Macbeth_Actor207_Draw, 2, (ObjectFunc) Macbeth_Actor207_Update,        D_MA_603677C, 20000.0f,  0, 0, 40, 1,   0.0f,  0 },
+  /* OBJ_ACTOR_207 */  {(void*) Macbeth_Actor207_Draw, 2, (ObjectFunc) Macbeth_Actor207_Update,        aMaActor207Hitbox, 20000.0f,  0, 0, 40, 1,   0.0f,  0 },
-  /* OBJ_ACTOR_208 */  {(void*) Macbeth_ActorDoodad_Draw, 1, (ObjectFunc) Macbeth_Actor208_Update,        D_MA_6035A14, 20000.0f,  0, 0, 40, 1,   0.0f,  0 },
+  /* OBJ_ACTOR_MA_TRAIN_CAR_2 */  {(void*) Macbeth_Train_Draw, 1, (ObjectFunc) Macbeth_MaTrainCar2_Update,        aMaTrainCar2Hitbox, 20000.0f,  0, 0, 40, 1,   0.0f,  0 },
-  /* OBJ_ACTOR_209 */  {(void*) Macbeth_ActorDoodad_Draw, 1, (ObjectFunc) Macbeth_Actor209_Update,        D_MA_6035AE0, 20000.0f,  0, 0, 40, 1,   0.0f,  0 },
+  /* OBJ_ACTOR_MA_TRAIN_CAR_3 */  {(void*) Macbeth_Train_Draw, 1, (ObjectFunc) Macbeth_MaTrainCar3_Update,        aMaTrainCar3Hitbox, 20000.0f,  0, 0, 40, 1,   0.0f,  0 },
-  /* OBJ_ACTOR_210 */  {(void*) Macbeth_ActorDoodad_Draw, 1, (ObjectFunc) Macbeth_Actor210_Update,        D_MA_6035D9C, 20000.0f,  0, 0, 40, 1,   0.0f,  0 },
+  /* OBJ_ACTOR_MA_TRAIN_CAR_4 */  {(void*) Macbeth_Train_Draw, 1, (ObjectFunc) Macbeth_MaTrainCar4_Update,        aMaTrainCar4Hitbox, 20000.0f,  0, 0, 40, 1,   0.0f,  0 },
-  /* OBJ_ACTOR_211 */  {(void*) Macbeth_ActorDoodad_Draw, 1, (ObjectFunc) Macbeth_Actor211_Update,        D_MA_6035E04, 20000.0f,  0, 0, 40, 1,   0.0f,  0 },
+  /* OBJ_ACTOR_MA_TRAIN_CAR_5 */  {(void*) Macbeth_Train_Draw, 1, (ObjectFunc) Macbeth_MaTrainCar5_Update,        aMaTrainCar5Hitbox, 20000.0f,  0, 0, 40, 1,   0.0f,  0 },
-  /* OBJ_ACTOR_212 */  {(void*) Macbeth_ActorDoodad_Draw, 1, (ObjectFunc) Macbeth_Actor212_Update,        D_MA_60360C0, 20000.0f,  0, 0, 40, 1,   0.0f,  0 },
+  /* OBJ_ACTOR_MA_TRAIN_CAR_6 */  {(void*) Macbeth_Train_Draw, 1, (ObjectFunc) Macbeth_MaTrainCar6_Update,        aMaTrainCar6Hitbox, 20000.0f,  0, 0, 40, 1,   0.0f,  0 },
-  /* OBJ_ACTOR_213 */  {(void*) Macbeth_ActorDoodad_Draw, 1, (ObjectFunc) Macbeth_Actor213_Update,        D_MA_6036154, 20000.0f,  0, 0, 40, 1,   0.0f,  0 },
+  /* OBJ_ACTOR_MA_TRAIN_CAR_7 */  {(void*) Macbeth_Train_Draw, 1, (ObjectFunc) Macbeth_MaTrainCar7_Update,        aMaTrainCar7Hitbox, 20000.0f,  0, 0, 40, 1,   0.0f,  0 },
-  /* OBJ_ACTOR_214 */  {(void*) Macbeth_Actor214_Draw, 1, (ObjectFunc) Macbeth_Actor214_Update,        D_MA_6036458,   300.0f,  0, 0, 40, 1,   0.0f,  0 },
+  /* OBJ_ACTOR_MA_RAILROAD_SWITCH */  {(void*) Macbeth_MaRailroadSwitch_Draw, 1, (ObjectFunc) Macbeth_MaRailroadSwitch_Update,        aMaMaRailroadSwitchHitbox,   300.0f,  0, 0, 40, 1,   0.0f,  0 },
-  /* OBJ_ACTOR_215 */  {(void*) Macbeth_Actor215_Draw, 1, (ObjectFunc) Macbeth_Actor215_Update,        D_MA_60364C0,   300.0f,  0, 1, 40, 1,   0.0f,  1 },
+  /* OBJ_ACTOR_MA_BOULDER */  {(void*) Macbeth_MaBoulder_Draw, 1, (ObjectFunc) Macbeth_MaBoulder_Update,        aMaBoulderHitbox,   300.0f,  0, 1, 40, 1,   0.0f,  1 },
-  /* OBJ_ACTOR_216 */  {(void*) Macbeth_Actor216_Draw, 1, (ObjectFunc) Macbeth_Actor216_Update,        D_MA_60366EC,   200.0f,  0, 0, 40, 1,   0.0f,  0 },
+  /* OBJ_ACTOR_MA_HORIZONTAL_LOCK_BAR */  {(void*) Macbeth_MaHorizontalLockBar_Draw, 1, (ObjectFunc) Macbeth_MaHorizontalLockBar_Update,        aMaHorizontalLockBarHitbox,   200.0f,  0, 0, 40, 1,   0.0f,  0 },
-  /* OBJ_ACTOR_217 */  {(void*) Macbeth_Actor217_Draw, 1, (ObjectFunc) Macbeth_Actor217_Update,        D_MA_6036708,   200.0f,  0, 0, 40, 1,   0.0f,  0 },
+  /* OBJ_ACTOR_MA_VERTICAL_LOCK_BAR */  {(void*) Macbeth_MaVerticalLockBar_Draw, 1, (ObjectFunc) Macbeth_MaVerticalLockBar_Update,        aMaVerticalLockBarHitbox,   200.0f,  0, 0, 40, 1,   0.0f,  0 },
-  /* OBJ_ACTOR_218 */  {(void*) Macbeth_Actor218_Draw, 1, (ObjectFunc) Macbeth_Actor218_Update,        D_MA_6036728,   200.0f,  0, 0, 40, 1,   0.0f,  0 },
+  /* OBJ_ACTOR_MA_BARRIER */  {(void*) Macbeth_MaBarrier_Draw, 1, (ObjectFunc) Macbeth_MaBarrier_Update,        aMaBarrierHitbox,   200.0f,  0, 0, 40, 1,   0.0f,  0 },
-  /* OBJ_ACTOR_219 */  {(void*) Macbeth_Actor219_Draw, 1, (ObjectFunc) Macbeth_Actor219_Update,        D_MA_6036744,   300.0f,  0, 0, 40, 1,   0.0f,  0 },
+  /* OBJ_ACTOR_219 */  {(void*) Macbeth_Actor219_Draw, 1, (ObjectFunc) Macbeth_Actor219_Update,        aMaActor219Hitbox,   300.0f,  0, 0, 40, 1,   0.0f,  0 },
-  /* OBJ_ACTOR_220 */  {(void*) Macbeth_Actor220_Draw, 1, (ObjectFunc) Macbeth_Actor220_Update,        D_MA_6036930,   200.0f,  0, 0, 40, 1,   0.0f,  0 },
+  /* OBJ_ACTOR_MA_BOMBDROP */  {(void*) Macbeth_MaBombDrop_Draw, 1, (ObjectFunc) Macbeth_MaBombDrop_Update,        aMaBombDropHitbox,   200.0f,  0, 0, 40, 1,   0.0f,  0 },
-  /* OBJ_ACTOR_221 */  {(void*) Macbeth_Actor221_Draw, 1, (ObjectFunc) Macbeth_Actor221_Update,        D_MA_603694C,   300.0f,  0, 0, 40, 1,   1.0f,  0 },
+  /* OBJ_ACTOR_MA_SPEAR */  {(void*) Macbeth_MaSpear_Draw, 1, (ObjectFunc) Macbeth_MaSpear_Update,        aMaSpearHitbox,   300.0f,  0, 0, 40, 1,   1.0f,  0 },
-  /* OBJ_ACTOR_222 */  {(void*) Macbeth_Actor222_Draw, 1, (ObjectFunc) Macbeth_Actor222_Update,        D_MA_6036968,   300.0f,  0, 0, 40, 1,   1.0f,  0 },
+  /* OBJ_ACTOR_MA_SHOCK_BOX */  {(void*) Macbeth_MaShockBox_Draw, 1, (ObjectFunc) Macbeth_MaShockBox_Update,        aMaShockBoxHitbox,   300.0f,  0, 0, 40, 1,   1.0f,  0 },
-  /* OBJ_ACTOR_223 */  {(void*) Macbeth_Actor223_Draw, 1, (ObjectFunc) Macbeth_Actor223_Update,        D_MA_60364DC,   300.0f,  0, 0, 40, 1,   0.0f,  0 },
+  /* OBJ_ACTOR_MA_RAILWAY_SIGNAL */  {(void*) Macbeth_MaRailwaySignal_Draw, 1, (ObjectFunc) Macbeth_MaRailwaySignal_Update,        aMaRailwaySignalHitbox,   300.0f,  0, 0, 40, 1,   0.0f,  0 },
-  /* OBJ_ACTOR_224 */  {(void*)          NULL, 1, (ObjectFunc) Titania_Actor224_Update,       gNoHitbox,   200.0f,  0, 0, 39, 0,   0.0f,  0 },
+  /* OBJ_ACTOR_TI_TERRAIN */  {(void*)          NULL, 1, (ObjectFunc) Titania_TiTerrain_Update,       gNoHitbox,   200.0f,  0, 0, 39, 0,   0.0f,  0 },
-  /* OBJ_ACTOR_225 */  {(void*)     D_TI1_700AB70, 0, (ObjectFunc) Titania_Actor225_Update,        D_TI_60064AC,    50.0f,  0, 0, 39, 1,   1.0f,  0 },
+  /* OBJ_ACTOR_TI_LANDMINE */  {(void*)     aTi1LandmineDL, 0, (ObjectFunc) Titania_TiLandmine_Update,        aTi1LandmineHitbox,    50.0f,  0, 0, 39, 1,   1.0f,  0 },
-  /* OBJ_ACTOR_226 */  {(void*) Titania_Actor226_Draw, 1, (ObjectFunc) Titania_Actor226_Update,        D_TI_60064C8,   300.0f,  0, 0, 39, 1,  70.0f,  1 },
+  /* OBJ_ACTOR_TI_DESERT_ROVER */  {(void*) Titania_TiDesertRover_Draw, 1, (ObjectFunc) Titania_TiDesertRover_Update,        aTiDesertRoverHitbox,   300.0f,  0, 0, 39, 1,  70.0f,  1 },
-  /* OBJ_ACTOR_227 */  {(void*) Titania_Actor227_Draw, 1, (ObjectFunc) Titania_Actor227_Update,        D_TI_60067C4,     0.0f,  0, 0, 39, 1,   0.0f,  0 },
+  /* OBJ_ACTOR_TI_DELPHOR */  {(void*) Titania_TiDelphor_Draw, 1, (ObjectFunc) Titania_TiDelphor_Update,        aTiDelphorHitbox,     0.0f,  0, 0, 39, 1,   0.0f,  0 },
-  /* OBJ_ACTOR_228 */  {(void*) Titania_Actor228_Draw, 1, (ObjectFunc) Titania_Actor228_Update,        D_TI_6006808,     0.0f,  0, 0, 39, 1,   1.0f,  1 },
+  /* OBJ_ACTOR_TI_DELPHOR_HEAD */  {(void*) Titania_TiDelphorHead_Draw, 1, (ObjectFunc) Titania_TiDelphorHead_Update,        aTiDelphorHeadHitbox,     0.0f,  0, 0, 39, 1,   1.0f,  1 },
-  /* OBJ_ACTOR_229 */  {(void*) Titania_Actor229_Draw, 1, (ObjectFunc) Titania_Actor229_Update,        D_TI_6006A3C,  1000.0f,  0, 0, 20, 1,   0.0f,  1 },
+  /* OBJ_ACTOR_TI_DESERT_CRAWLER */  {(void*) Titania_TiDesertCrawler_Draw, 1, (ObjectFunc) Titania_TiDesertCrawler_Update,        aTiDesertCrawlerHitbox,  1000.0f,  0, 0, 20, 1,   0.0f,  1 },
-  /* OBJ_ACTOR_230 */  {(void*) Titania_Actor230_Draw, 1, (ObjectFunc) Titania_Actor230_Update,        D_TI_600683C,     0.0f,  0, 1, 39, 1,   0.0f,  1 },
+  /* OBJ_ACTOR_TI_BOULDER */  {(void*) Titania_TiBoulder_Draw, 1, (ObjectFunc) Titania_TiBoulder_Update,        aTiBoulderHitbox,     0.0f,  0, 1, 39, 1,   0.0f,  1 },
-  /* OBJ_ACTOR_231 */  {(void*) Titania_Actor231_Draw, 1, (ObjectFunc) Titania_Actor231_Update,        D_TI_6006858,     0.0f,  0, 0, 39, 1,   0.0f,  1 },
+  /* OBJ_ACTOR_TI_BOMB */  {(void*) Titania_TiBomb_Draw, 1, (ObjectFunc) Titania_TiBomb_Update,        aTiBombHitbox,     0.0f,  0, 0, 39, 1,   0.0f,  1 },
-  /* OBJ_ACTOR_232 */  {(void*) Titania_Actor232_Draw, 1, (ObjectFunc) Titania_Actor232_Update,    D_TI_6006890,     0.0f,  0, 0, 39, 1,  20.0f,  1 },
+  /* OBJ_ACTOR_TI_RASCO */  {(void*) Titania_TiRasco_Draw, 1, (ObjectFunc) Titania_TiRasco_Update,    aTiRascoHitbox,     0.0f,  0, 0, 39, 1,  20.0f,  1 },
-  /* OBJ_ACTOR_233 */  {(void*) Titania_Actor233_Draw, 1, (ObjectFunc) Titania_Actor233_Update,        D_TI_60068F0,   200.0f,  0, 0, 39, 1,   1.0f,  1 },
+  /* OBJ_ACTOR_TI_FEKUDA */  {(void*) Titania_TiFekuda_Draw, 1, (ObjectFunc) Titania_TiFekuda_Update,        aTiFekudaHitbox,   200.0f,  0, 0, 39, 1,   1.0f,  1 },
-  /* OBJ_ACTOR_234 */  {(void*) Actor234_Draw, 1, (ObjectFunc) Actor234_Update,       gNoHitbox,  2000.0f,  0, 0, 39, 0,   0.0f,  5 },
+  /* OBJ_ACTOR_TI_GREAT_FOX */  {(void*) TiGreatFox_Draw, 1, (ObjectFunc) TiGreatFox_Update,       gNoHitbox,  2000.0f,  0, 0, 39, 0,   0.0f,  5 },
-  /* OBJ_ACTOR_235 */  {(void*) Zoness_Actor235_Draw, 2, (ObjectFunc) Zoness_Actor235_Update,        D_ZO_602C294,  1000.0f,  0, 1, 40, 0,   1.0f,  1 },
+  /* OBJ_ACTOR_ZO_BIRD */  {(void*) Zoness_ZoBird_Draw, 2, (ObjectFunc) Zoness_ZoBird_Update,        aZoBirdHitbox,  1000.0f,  0, 1, 40, 0,   1.0f,  1 },
-  /* OBJ_ACTOR_236 */  {(void*) Zoness_Actor236_Draw, 1, (ObjectFunc) Zoness_Actor236_Update,        D_ZO_602BC58,  5000.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_ACTOR_ZO_DODORA */  {(void*) Zoness_ZoDodora_Draw, 1, (ObjectFunc) Zoness_ZoDodora_Update,        aZoDodoraHitbox,  5000.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_ACTOR_237 */  {(void*) Actor237_Draw, 1, (ObjectFunc) Actor237_Update,       gNoHitbox,   200.0f,  0, 0, 40, 0,   0.0f,  2 },
+  /* OBJ_ACTOR_UNK_237 */  {(void*) Actor237_Draw, 1, (ObjectFunc) Actor237_Update,       gNoHitbox,   200.0f,  0, 0, 40, 0,   0.0f,  2 },
-  /* OBJ_ACTOR_238 */  {(void*) Zoness_Actor238_Draw, 2, (ObjectFunc) Zoness_Actor238_Update,       gCubeHitbox100,   200.0f,  0, 1, 40, 0,   1.0f,  1 },
+  /* OBJ_ACTOR_ZO_FISH */  {(void*) Zoness_ZoFish_Draw, 2, (ObjectFunc) Zoness_ZoFish_Update,       gCubeHitbox100,   200.0f,  0, 1, 40, 0,   1.0f,  1 },
-  /* OBJ_ACTOR_239 */  {(void*)          NULL, 1, (ObjectFunc)          NULL,       gNoHitbox,  1000.0f,  0, 0,  0, 0,   0.0f,  0 },
+  /* OBJ_ACTOR_ZO_DODORA_WP_COUNT */  {(void*)          NULL, 1, (ObjectFunc)          NULL,       gNoHitbox,  1000.0f,  0, 0,  0, 0,   0.0f,  0 },
-  /* OBJ_ACTOR_240 */  {(void*) Zoness_Actor240_Draw, 1, (ObjectFunc) Zoness_Actor240_Update,       gCubeHitbox100,  1500.0f,  0, 1, 40, 0,  20.0f,  0 },
+  /* OBJ_ACTOR_ZO_Z_GULL */  {(void*) Zoness_ZGull_Draw, 1, (ObjectFunc) Zoness_ZGull_Update,       gCubeHitbox100,  1500.0f,  0, 1, 40, 0,  20.0f,  0 },
-  /* OBJ_ACTOR_241 */  {(void*) Zoness_Actor241_Draw, 1, (ObjectFunc) Zoness_Actor241_Update,       gActor241Hitbox,  1500.0f,  0, 1, 40, 0,   0.0f,  0 },
+  /* OBJ_ACTOR_ZO_ENERGY_BALL */  {(void*) Zoness_ZoEnergyBall_Draw, 1, (ObjectFunc) Zoness_ZoEnergyBall_Update,       gZoEnergyBallHitbox,  1500.0f,  0, 1, 40, 0,   0.0f,  0 },
-  /* OBJ_ACTOR_242 */  {(void*) Zoness_Actor242_Draw, 2, (ObjectFunc) Zoness_Actor242_Update,        D_ZO_602BE3C,   500.0f,  0, 0, 40, 0,   1.0f,  0 },
+  /* OBJ_ACTOR_ZO_TROIKA */  {(void*) Zoness_ZoTroika_Draw, 2, (ObjectFunc) Zoness_ZoTroika_Update,        aZoTroikaHitbox,   500.0f,  0, 0, 40, 0,   1.0f,  0 },
-  /* OBJ_ACTOR_243 */  {(void*) Zoness_Actor243_Draw, 2, (ObjectFunc) Zoness_Actor243_Update,       gCubeHitbox100,     0.0f,  0, 1, 40, 0,   1.0f,  1 },
+  /* OBJ_ACTOR_ZO_SHRIMP */  {(void*) Zoness_ZoShrimp_Draw, 2, (ObjectFunc) Zoness_ZoShrimp_Update,       gCubeHitbox100,     0.0f,  0, 1, 40, 0,   1.0f,  1 },
-  /* OBJ_ACTOR_244 */  {(void*) Zoness_Actor244_Draw, 2, (ObjectFunc) Zoness_Actor244_Update,        D_ZO_602BE58,  2000.0f,  0, 0, 40, 0,  50.0f,  0 },
+  /* OBJ_ACTOR_ZO_OBNEMA */  {(void*) Zoness_ZoObnema_Draw, 2, (ObjectFunc) Zoness_ZoObnema_Update,        aZoObnemaHitbox,  2000.0f,  0, 0, 40, 0,  50.0f,  0 },
-  /* OBJ_ACTOR_245 */  {(void*) Zoness_Actor245_Draw, 1, (ObjectFunc) Zoness_Actor245_Update,       gCubeHitbox100,   200.0f,  0, 0, 40, 0,   1.0f,  0 },
+  /* OBJ_ACTOR_ZO_BALL */  {(void*) Zoness_ZoBall_Draw, 1, (ObjectFunc) Zoness_ZoBall_Update,       gCubeHitbox100,   200.0f,  0, 0, 40, 0,   1.0f,  0 },
-  /* OBJ_ACTOR_246 */  {(void*) Zoness_Actor246_Draw, 1, (ObjectFunc) Zoness_Actor246_Update,       gCubeHitbox100,  2000.0f,  0, 0, 40, 0,   1.0f,  0 },
+  /* OBJ_ACTOR_ZO_MINE */  {(void*) Zoness_ZoMine_Draw, 1, (ObjectFunc) Zoness_ZoMine_Update,       gCubeHitbox100,  2000.0f,  0, 0, 40, 0,   1.0f,  0 },
-  /* OBJ_ACTOR_247 */  {(void*) Zoness_Actor247_Draw, 1, (ObjectFunc) Zoness_Actor247_Update,        D_ZO_602BFC4,   500.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_ACTOR_ZO_BARRIER */  {(void*) Zoness_ZoBarrier_Draw, 1, (ObjectFunc) Zoness_ZoBarrier_Update,        aZoBarrierHitbox,   500.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_ACTOR_248 */  {(void*) Zoness_Actor248_Draw, 1, (ObjectFunc) Zoness_Actor248_Update,       gCubeHitbox150,  2000.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_ACTOR_ZO_CRANE_MAGNET */  {(void*) Zoness_ZoCraneMagnet_Draw, 1, (ObjectFunc) Zoness_ZoCraneMagnet_Update,       gCubeHitbox150,  2000.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_ACTOR_249 */  {(void*) Zoness_Actor249_Draw, 1, (ObjectFunc) Zoness_Actor249_Update,       gCubeHitbox200,  5000.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_ACTOR_SPIKEBALL */  {(void*) Zoness_ZoSpikeBall_Draw, 1, (ObjectFunc) Zoness_ZoSpikeBall_Update,       gCubeHitbox200,  5000.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_ACTOR_250 */  {(void*) Zoness_Actor250_Draw, 1, (ObjectFunc) Zoness_Actor250_Update,        D_ZO_602C1D4, 10000.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_ACTOR_ZO_CARGOSHIP */  {(void*) Zoness_ZoCargoShip_Draw, 1, (ObjectFunc) Zoness_ZoCargoShip_Update,        aZoCargoShipHitbox, 10000.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_ACTOR_251 */  {(void*) Zoness_Actor251_Draw, 2, (ObjectFunc) Zoness_Actor251_Update,        D_ZO_602C218,  1000.0f,  0, 0, 40, 0,   1.0f,  1 },
+  /* OBJ_ACTOR_ZO_CONTAINER */  {(void*) Zoness_ZoContainer_Draw, 2, (ObjectFunc) Zoness_ZoContainer_Update,        aZoContainerHitbox,  1000.0f,  0, 0, 40, 0,   1.0f,  1 },
-  /* OBJ_ACTOR_252 */  {(void*) Zoness_Actor252_Draw, 1, (ObjectFunc) Zoness_Actor252_Update,        D_ZO_602C234,   200.0f,  0, 0, 40, 0,  80.0f,  1 },
+  /* 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_253 */  {(void*) Zoness_Actor253_Draw, 1, (ObjectFunc) Zoness_Actor253_Update,        D_ZO_602C250,   300.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* 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_254 */  {(void*) Zoness_Actor254_Draw, 1, (ObjectFunc) Zoness_Actor254_Update,        D_ZO_602C2B0,   300.0f,  0, 0,  0, 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_258 */  {(void*) Aquas_Actor258_Draw, 1, (ObjectFunc) Aquas_Actor258_Update,       gCubeHitbox100,   200.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_259 */  {(void*) Aquas_Actor259_Draw, 2, (ObjectFunc) Aquas_Actor259_Update,        D_AQ_6031398, 10000.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_260 */  {(void*) Aquas_Actor260_Draw, 2, (ObjectFunc) Aquas_Actor260_Update,        D_AQ_60313CC,   300.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 },
-  /* OBJ_ACTOR_261 */  {(void*) Aquas_Actor261_Draw, 2, (ObjectFunc) Aquas_Actor261_Update,        D_AQ_6031400,   300.0f,  0, 0, 40, 0,   0.0f,  1 },
+  /* OBJ_ACTOR_AQ_SCULPIN */  {(void*) Aquas_AqSculpin_Draw, 2, (ObjectFunc) Aquas_AqSculpin_Update,        aAqSculpinHitbox,   300.0f,  0, 0, 40, 0,   0.0f,  1 },
-  /* OBJ_ACTOR_262 */  {(void*) Aquas_Actor262_Draw, 2, (ObjectFunc) Aquas_Actor262_Update,        D_AQ_603144C,  2000.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_ACTOR_AQ_SPINDLYFISH */  {(void*) Aquas_AqSpindlyFish_Draw, 2, (ObjectFunc) Aquas_AqSpindlyFish_Update,        aAqSpindlyFishHitbox,  2000.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_ACTOR_263 */  {(void*) Aquas_Actor263_Draw, 2, (ObjectFunc) Aquas_Actor263_Update,        D_AQ_6031480,   200.0f,  0, 0, 40, 0,   0.0f,  1 },
+  /* OBJ_ACTOR_AQ_SQUID */  {(void*) Aquas_AqSquid_Draw, 2, (ObjectFunc) Aquas_AqSquid_Update,        aAqSquidHitbox,   200.0f,  0, 0, 40, 0,   0.0f,  1 },
-  /* OBJ_ACTOR_264 */  {(void*) Aquas_Actor264_Draw, 1, (ObjectFunc) Aquas_Actor264_Update,       gCubeHitbox100,   200.0f,  0, 0,  0, 0,   0.0f,  0 },
+  /* OBJ_ACTOR_AQ_SEAWEED */  {(void*) Aquas_AqSeaweed_Draw, 1, (ObjectFunc) Aquas_AqSeaweed_Update,       gCubeHitbox100,   200.0f,  0, 0,  0, 0,   0.0f,  0 },
-  /* OBJ_ACTOR_265 */  {(void*) Aquas_Actor265_Draw, 1, (ObjectFunc) Aquas_Actor265_Update,        D_AQ_6031500,   200.0f,  0, 0, 40, 0,   0.0f,  1 },
+  /* OBJ_ACTOR_AQ_BOULDER */  {(void*) Aquas_AqBoulder_Draw, 1, (ObjectFunc) Aquas_AqBoulder_Update,        aAqBoulderHitbox,   200.0f,  0, 0, 40, 0,   0.0f,  1 },
-  /* OBJ_ACTOR_266 */  {(void*) Aquas_Actor266_Draw, 2, (ObjectFunc) Aquas_Actor266_Update,        D_AQ_6031538,   200.0f,  0, 0,  0, 0,   0.0f,  0 },
+  /* OBJ_ACTOR_AQ_CORAL */  {(void*) Aquas_AqCoral_Draw, 2, (ObjectFunc) Aquas_AqCoral_Update,        aAqCoralHitbox,   200.0f,  0, 0,  0, 0,   0.0f,  0 },
-  /* OBJ_ACTOR_267 */  {(void*) Aquas_Actor267_Draw, 2, (ObjectFunc) Aquas_Actor267_Update,        D_AQ_6031554,   800.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_ACTOR_AQ_JELLYFISH */  {(void*) Aquas_AqJellyfish_Draw, 2, (ObjectFunc) Aquas_AqJellyfish_Update,        aAqJellyfishHitbox,   800.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_ACTOR_268 */  {(void*) Aquas_Actor268_Draw, 1, (ObjectFunc) Aquas_Actor268_Update,        D_AQ_6031570, 10000.0f,  0, 0,  0, 0,   0.0f,  0 },
+  /* OBJ_ACTOR_AQ_FISHGROUP */  {(void*) Aquas_AqFishGroup_Draw, 1, (ObjectFunc) Aquas_AqFishGroup_Update,        aAqFishGroupHitbox, 10000.0f,  0, 0,  0, 0,   0.0f,  0 },
-  /* OBJ_ACTOR_269 */  {(void*) Aquas_Actor269_Draw, 1, (ObjectFunc) Aquas_Actor269_Update,        D_AQ_6030D20,  2000.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_ACTOR_AQ_STONE_COLUMN */  {(void*) Aquas_AqStoneColumn_Draw, 1, (ObjectFunc) Aquas_AqStoneColumn_Update,        aAqStoneColumnHitbox,  2000.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_ACTOR_270 */  {(void*) Aquas_Actor270_Draw, 1, (ObjectFunc) Aquas_Actor270_Update,        D_AQ_60314C8,  1000.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_ACTOR_AQ_OYSTER */  {(void*) Aquas_AqOyster_Draw, 1, (ObjectFunc) Aquas_AqOyster_Update,        aAqOysterHitbox,  1000.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_ACTOR_271 */  {(void*) Actor271_Draw, 2, (ObjectFunc) Actor271_Update,        D_BO_6011B24,     0.0f,  0, 0, 39, 0, 730.0f,  1 },
+  /* OBJ_ACTOR_BO_SHIELD_REACTOR */  {(void*) BoShieldReactor_Draw, 2, (ObjectFunc) BoShieldReactor_Update,        aBoShieldReactorHitbox,     0.0f,  0, 0, 39, 0, 730.0f,  1 },
-  /* OBJ_ACTOR_272 */  {(void*) Actor272_Draw, 1, (ObjectFunc) Actor272_Update,        D_BO_6011BF4,     0.0f,  0, 0, 39, 0, 150.0f,  1 },
+  /* OBJ_ACTOR_BO_LASER_CANNON */  {(void*) BoLaserCannon_Draw, 1, (ObjectFunc) BoLaserCannon_Update,        aBoLaserCannonHitbox,     0.0f,  0, 0, 39, 0, 150.0f,  1 },
-  /* OBJ_ACTOR_FO_RADAR */  {(void*) Fortuna_Radar_Draw, 2, (ObjectFunc) Fortuna_Radar_Update,        aFoRadarHitbox,     0.0f,  0, 0, 39, 0, 220.0f,  1 },
+  /* OBJ_ACTOR_FO_RADAR */  {(void*) Fortuna_FoRadar_Draw, 2, (ObjectFunc) Fortuna_FoRadar_Update,        aFoRadarHitbox,     0.0f,  0, 0, 39, 0, 220.0f,  1 },
   /* OBJ_ACTOR_SZ_SPACE_JUNK */  {(void*) SectorZ_SpaceJunkDraw, 1, (ObjectFunc) SectorZ_SpaceJunkUpdate,       gCubeHitbox200,     0.0f,  0, 0, 39, 0,   1.0f,  0 },
-  /* OBJ_ACTOR_275 */  {(void*) Solar_Doodad_Draw, 1, (ObjectFunc) Solar_Doodad_Update,       gCubeHitbox100,   200.0f,  0, 0, 39, 0,   1.0f,  1 },
+  /* OBJ_ACTOR_SO_ROCK_1 */  {(void*) Solar_SoRock_Draw, 1, (ObjectFunc) Solar_SoRock_Update,       gCubeHitbox100,   200.0f,  0, 0, 39, 0,   1.0f,  1 },
-  /* OBJ_ACTOR_276 */  {(void*) Solar_Doodad_Draw, 1, (ObjectFunc) Solar_Doodad_Update,       gCubeHitbox100,   200.0f,  0, 0, 39, 0,   1.0f,  1 },
+  /* OBJ_ACTOR_SO_ROCK_2 */  {(void*) Solar_SoRock_Draw, 1, (ObjectFunc) Solar_SoRock_Update,       gCubeHitbox100,   200.0f,  0, 0, 39, 0,   1.0f,  1 },
-  /* OBJ_ACTOR_277 */  {(void*) Solar_Doodad_Draw, 1, (ObjectFunc) Solar_Doodad_Update,       gCubeHitbox200,   200.0f,  0, 0, 39, 0,   1.0f,  1 },
+  /* OBJ_ACTOR_SO_ROCK_3 */  {(void*) Solar_SoRock_Draw, 1, (ObjectFunc) Solar_SoRock_Update,       gCubeHitbox200,   200.0f,  0, 0, 39, 0,   1.0f,  1 },
-  /* OBJ_ACTOR_278 */  {(void*)          NULL, 1, (ObjectFunc) Solar_Actor278_Update,       gNoHitbox,   200.0f,  0, 0,  0, 0,   0.0f,  1 },
+  /* OBJ_ACTOR_SO_WAVE */  {(void*) NULL, 1, (ObjectFunc) Solar_SoWave_Update,       gNoHitbox,   200.0f,  0, 0,  0, 0,   0.0f,  1 },
-  /* OBJ_ACTOR_279 */  {(void*)          NULL, 1, (ObjectFunc) Solar_Actor279_Update,       gNoHitbox,  1000.0f,  0, 0,  0, 0,   0.0f,  1 },
+  /* OBJ_ACTOR_SO_PROMINENCE */  {(void*) NULL, 1, (ObjectFunc) Solar_SoProminence_Update,       gNoHitbox,  1000.0f,  0, 0,  0, 0,   0.0f,  1 },
-  /* OBJ_ACTOR_280 */  {(void*)     D_VE1_900DD20, 0, (ObjectFunc) Venom1_Actor280_Update,        D_VE1_601B7F8,  1000.0f,  0, 0, 40, 1,   0.0f,  0 },
+  /* OBJ_ACTOR_VE1_PILLAR_1 */  {(void*) aVe1Pillar1DL, 0, (ObjectFunc) Venom1_Ve1Pillar1_Update,        aVe1Pillar1Hitbox,  1000.0f,  0, 0, 40, 1,   0.0f,  0 },
-  /* OBJ_ACTOR_281 */  {(void*) Venom1_Actor281_Draw, 1, (ObjectFunc) Venom1_Doodad_Update,        D_VE1_601B830,  1000.0f,  0, 0, 40, 1,   0.0f,  0 },
+  /* OBJ_ACTOR_VE1_PILLAR_2 */  {(void*) Venom1_Ve1Pillar2_Draw, 1, (ObjectFunc) Venom1_Pillar2_3_Update,        aVe1Pillar2Hitbox,  1000.0f,  0, 0, 40, 1,   0.0f,  0 },
-  /* OBJ_ACTOR_282 */  {(void*)     D_VE1_901DA50, 0, (ObjectFunc) Venom1_Doodad_Update,        D_VE1_601B868,  1000.0f,  0, 0, 40, 1,   0.0f,  0 },
+  /* OBJ_ACTOR_VE1_PILLAR_3 */  {(void*)     aVe1Pillar3DL, 0, (ObjectFunc) Venom1_Pillar2_3_Update,        aVe1Pillar3Hitbox,  1000.0f,  0, 0, 40, 1,   0.0f,  0 },
-  /* OBJ_ACTOR_283 */  {(void*)     D_VE1_9023AD0, 0, (ObjectFunc) Venom1_Actor283_Update,        D_VE1_601B8A0,  1000.0f,  0, 0, 40, 1,   0.0f,  0 },
+  /* OBJ_ACTOR_VE1_PILLAR_4 */  {(void*)     aVe1Pillar4DL, 0, (ObjectFunc) Venom1_Ve1Pillar4_Update,        aVe1Pillar4Hitbox,  1000.0f,  0, 0, 40, 1,   0.0f,  0 },
-  /* OBJ_ACTOR_284 */  {(void*) Venom1_Actor284_Draw, 1, (ObjectFunc) Venom1_Actor284_Update,        D_VE1_601B8D8,  1000.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_ACTOR_VE1_MONKEY_STATUE */  {(void*) Venom1_Ve1MonkeyStatue_Draw, 1, (ObjectFunc) Venom1_Ve1MonkeyStatue_Update,        aVe1MonkeyStatueHitbox,  1000.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_ACTOR_285 */  {(void*) Andross_Actor285_Draw, 1, (ObjectFunc) Andross_Actor285_Update,       gCubeHitbox100,  1000.0f,  0, 0, 20, 0,   1.0f,  1 },
+  /* OBJ_ACTOR_AND_LASER_EMITTER */  {(void*) Andross_AndLaserEmitter_Draw, 1, (ObjectFunc) Andross_AndLaserEmitter_Update,       gCubeHitbox100,  1000.0f,  0, 0, 20, 0,   1.0f,  1 },
-  /* OBJ_ACTOR_286 */  {(void*) Andross_Actor286_Draw, 1, (ObjectFunc) Andross_Actor286_Update,       gCubeHitbox100,  1000.0f,  0, 0, 20, 0,   0.0f,  0 },
+  /* OBJ_ACTOR_AND_BRAIN_WASTE */  {(void*) Andross_AndBrainWaste_Draw, 1, (ObjectFunc) Andross_AndBrainWaste_Update,       gCubeHitbox100,  1000.0f,  0, 0, 20, 0,   0.0f,  0 },
-  /* OBJ_ACTOR_287 */  {(void*)          NULL, 1, (ObjectFunc) Andross_Actor287_Update,       gNoHitbox,  1000.0f,  0, 0, 40, 1,   0.0f,  0 },
+  /* OBJ_ACTOR_AND_EXPLOSION */  {(void*)          NULL, 1, (ObjectFunc) Andross_AndExplosion_Update,       gNoHitbox,  1000.0f,  0, 0, 40, 1,   0.0f,  0 },
-  /* OBJ_ACTOR_288 */  {(void*)          NULL, 1, (ObjectFunc) Andross_Actor288_Update,       gNoHitbox,  1000.0f,  0, 0, 20, 1,   0.0f,  0 },
+  /* OBJ_ACTOR_AND_RADIO */  {(void*)          NULL, 1, (ObjectFunc) Andross_AndRadio_Update,       gNoHitbox,  1000.0f,  0, 0, 20, 1,   0.0f,  0 },
-  /* OBJ_ACTOR_289 */  {(void*) Actor289_Draw, 1, (ObjectFunc) Andross_Actor289_Update,       gNoHitbox,  1000.0f,  0, 0, 20, 1,   0.0f,  0 },
+  /* OBJ_ACTOR_AND_JAMES_TRIGGER */  {(void*) AndJamesTrigger_Draw, 1, (ObjectFunc) Andross_AndJamesTrigger_Update,       gNoHitbox,  1000.0f,  0, 0, 20, 1,   0.0f,  0 },
-  /* OBJ_ACTOR_290 */  {(void*)          NULL, 1, (ObjectFunc) Andross_Actor290_Update,       gNoHitbox,  1000.0f,  0, 0, 20, 0,   0.0f,  0 },
+  /* OBJ_ACTOR_AND_BOSS_TIMER_SET */  {(void*)          NULL, 1, (ObjectFunc) Andross_AndBossTimer_Update,       gNoHitbox,  1000.0f,  0, 0, 20, 0,   0.0f,  0 },
   /* OBJ_ACTOR_SUPPLIES */  {(void*) ActorSupplies_Draw, 1, (ObjectFunc) ActorSupplies_Update,       gCubeHitbox150,  1000.0f,  0, 0,  0, 0,   1.0f,  0 },
-  /* OBJ_BOSS_CO_GRANGA */  {(void*) Corneria_Granga_Draw, 2, (ObjectFunc) Corneria_Granga_Update,        aCoGrangaHitbox, 20000.0f,  0, 0, 40, 1,   0.0f, 10 },
+  /* OBJ_BOSS_CO_GRANGA */  {(void*) Corneria_CoGranga_Draw, 2, (ObjectFunc) Corneria_CoGranga_Update,        aCoGrangaHitbox, 20000.0f,  0, 0, 40, 1,   0.0f, 10 },
-  /* OBJ_BOSS_CO_CARRIER */  {(void*) Corneria_Carrier_Draw, 1, (ObjectFunc) Corneria_Carrier_Update,        aCoCarrierHitbox, 20000.0f,  0, 0, 40, 0,   0.0f, 10 },
+  /* OBJ_BOSS_CO_CARRIER */  {(void*) Corneria_CoCarrier_Draw, 1, (ObjectFunc) Corneria_CoCarrier_Update,        aCoCarrierHitbox, 20000.0f,  0, 0, 40, 0,   0.0f, 10 },
-  /* OBJ_BOSS_294 */  {(void*) Corneria_Boss294_Draw, 1, (ObjectFunc) Corneria_Boss294_Update,        D_CO_603E714, 20000.0f,  0, 0, 40, 0,   0.0f, 10 },
+  /* OBJ_BOSS_CO_CARRIER_LEFT */  {(void*) Corneria_CoCarrierLeft_Draw, 1, (ObjectFunc) Corneria_CarrierLeft_Update,        aCoCarrierLeftHitbox, 20000.0f,  0, 0, 40, 0,   0.0f, 10 },
-  /* OBJ_BOSS_295 */  {(void*) Corneria_Boss295_Draw, 1, (ObjectFunc) Corneria_Boss295_Update,        D_CO_603E748, 20000.0f,  0, 0, 40, 0,   0.0f, 10 },
+  /* OBJ_BOSS_CO_CARRIER_UPPER */  {(void*) Corneria_CoCarrierUpper_Draw, 1, (ObjectFunc) Corneria_CarrierUpper_Update,        aCoCarrierUpperHitbox, 20000.0f,  0, 0, 40, 0,   0.0f, 10 },
-  /* OBJ_BOSS_296 */  {(void*) Corneria_Boss296_Draw, 1, (ObjectFunc) Corneria_Boss296_Update,        D_CO_603E7C4, 20000.0f,  0, 0, 40, 0,   0.0f, 10 },
+  /* OBJ_BOSS_CO_CARRIER_BOTTOM */  {(void*) Corneria_CoCarrierBottom_Draw, 1, (ObjectFunc) Corneria_CarrierBottom_Update,        aCoCarrierBottomHitbox, 20000.0f,  0, 0, 40, 0,   0.0f, 10 },
-  /* OBJ_BOSS_297 */  {(void*) Meteo_Boss297_Draw, 1, (ObjectFunc) Meteo_Boss297_Update,        D_ME_602F75C, 20000.0f,  0, 0, 40, 0,   0.0f, 10 },
+  /* OBJ_BOSS_ME_CRUSHER */  {(void*) Meteo_MeCrusher_Draw, 1, (ObjectFunc) Meteo_MeCrusher_Update,        aMeCrusherHitbox, 20000.0f,  0, 0, 40, 0,   0.0f, 10 },
-  /* OBJ_BOSS_298 */  {(void*) Meteo_Boss298_Draw, 1, (ObjectFunc) Meteo_Boss298_Update,        D_ME_602FA50, 20000.0f,  0, 0, 40, 0,   0.0f, 10 },
+  /* OBJ_BOSS_ME_CRUSHER_SHIELD */  {(void*) Meteo_MeCrusherShield_Draw, 1, (ObjectFunc) Meteo_MeCrusherShield_Update,        aMeCrusherShieldHitbox, 20000.0f,  0, 0, 40, 0,   0.0f, 10 },
-  /* OBJ_BOSS_299 */  {(void*) Boss299_Draw, 2, (ObjectFunc) Boss299_Update,       gNoHitbox, 20000.0f,  0, 0, 40, 0,   0.0f, 10 },
+  /* OBJ_BOSS_UNK_299 */  {(void*) Boss299_Draw, 2, (ObjectFunc) Boss299_Update,       gNoHitbox, 20000.0f,  0, 0, 40, 0,   0.0f, 10 },
-  /* OBJ_BOSS_300 */  {(void*) Boss300_Draw, 1, (ObjectFunc) Boss300_Update,       gNoHitbox, 20000.0f,  0, 0, 40, 0,   0.0f, 10 },
+  /* OBJ_BOSS_UNK_300 */  {(void*) Boss300_Draw, 1, (ObjectFunc) Boss300_Update,       gNoHitbox, 20000.0f,  0, 0, 40, 0,   0.0f, 10 },
-  /* OBJ_BOSS_301 */  {(void*) Aquas_Boss301_Draw, 1, (ObjectFunc) Aquas_Boss301_Update,        D_AQ_6030B10,     0.0f,  0, 0, 40, 0,   0.0f, 10 },
+  /* OBJ_BOSS_AQ_UNK_301 */  {(void*) Aquas_Boss301_Draw, 1, (ObjectFunc) Aquas_Boss301_Update,        aBoss301Hitbox,     0.0f,  0, 0, 40, 0,   0.0f, 10 },
-  /* OBJ_BOSS_A6 */  {(void*) Area6_Boss_Draw, 1, (ObjectFunc) Area6_Boss_Update,        D_A6_6028454,  2000.0f,  0, 0, 40, 0,   0.0f, 10 },
+  /* OBJ_BOSS_A6_GORGON */  {(void*) Area6_A6Gorgon_Draw, 1, (ObjectFunc) Area6_A6Gorgon_Update,        aA6GorgonHitbox,  2000.0f,  0, 0, 40, 0,   0.0f, 10 },
-  /* OBJ_BOSS_SX_SPYBORG */  {(void*) SectorX_Boss_Draw, 2, (ObjectFunc) SectorX_Boss_Update,        D_SX_6032550, 20000.0f,  0, 0, 20, 0,   0.0f, 10 },
+  /* OBJ_BOSS_SX_SPYBORG */  {(void*) SectorX_SxSpyborg_Draw, 2, (ObjectFunc) SectorX_SxSpyborg_Update,        aSxSpyborgHitbox, 20000.0f,  0, 0, 20, 0,   0.0f, 10 },
-  /* OBJ_BOSS_304 */  {(void*) SectorX_Boss304_Draw, 2, (ObjectFunc) SectorX_Boss304_Update,        D_SX_6032488,  1000.0f,  0, 0, 20, 0,   0.0f, 10 },
+  /* OBJ_BOSS_SX_SPYBORG_LEFT_ARM */  {(void*) SectorX_SxSpyborgLeftArm_Draw, 2, (ObjectFunc) SectorX_SxSpyborgLeftArm_Update,        aSxSpyborgLeftArmHitbox,  1000.0f,  0, 0, 20, 0,   0.0f, 10 },
-  /* OBJ_BOSS_305 */  {(void*) SectorX_Boss305_Draw, 2, (ObjectFunc) SectorX_Boss305_Update,        D_SX_60324EC,  1000.0f,  0, 0, 20, 0,   0.0f, 10 },
+  /* OBJ_BOSS_SX_SPYBORG_RIGHT_ARM */  {(void*) SectorX_SxSpyborgRightArm_Draw, 2, (ObjectFunc) SectorX_SxSpyborgRightArm_Update,        aSxSpyborgRightArmHitbox,  1000.0f,  0, 0, 20, 0,   0.0f, 10 },
-  /* OBJ_BOSS_TI */  {(void*) Titania_Boss_Draw, 1, (ObjectFunc) Titania_Boss_Update,D_TI_801B83A8,  1000.0f,  0, 0, 40, 1,   0.0f, 10 },
+  /* OBJ_BOSS_TI_GORAS */  {(void*) Titania_TiGoras_Draw, 1, (ObjectFunc) Titania_TiGoras_Update, aTiGorasHitbox,  1000.0f,  0, 0, 40, 1,   0.0f, 10 },
-  /* OBJ_BOSS_ZO */  {(void*) Zoness_Boss_Draw, 2, (ObjectFunc) Zoness_Boss_Update,        D_ZO_602C044,  1000.0f,  0, 0, 40, 0,   1.0f, 10 },
+  /* OBJ_BOSS_ZO_SARUMARINE */  {(void*) Zoness_ZoSarumarine_Draw, 2, (ObjectFunc) Zoness_ZoSarumarine_Update,        aZoSarumarineHitbox,  1000.0f,  0, 0, 40, 0,   1.0f, 10 },
-  /* OBJ_BOSS_FO */  {(void*) HUD_BossFO_Draw, 1, (ObjectFunc) HUD_BossFO_Update,        D_FO_600FFE0,     0.0f,  0, 0, 40, 1,   0.0f, 10 },
+  /* OBJ_BOSS_FO_BASE */  {(void*) HUD_FoBase_Draw, 1, (ObjectFunc) HUD_FoBase_Update,        aFoBaseHitbox,     0.0f,  0, 0, 40, 1,   0.0f, 10 },
-  /* OBJ_BOSS_309 */  {(void*) Boss309_Draw, 1, (ObjectFunc) Boss309_Update,       gNoHitbox,     0.0f,  0, 0, 40, 1,   0.0f, 10 },
+  /* OBJ_BOSS_BO_BASE */  {(void*) BoBase_Draw, 1, (ObjectFunc) BoBase_Update,       gNoHitbox,     0.0f,  0, 0, 40, 1,   0.0f, 10 },
-  /* OBJ_BOSS_310 */  {(void*) Boss310_Draw, 1, (ObjectFunc) Boss310_Update,       gNoHitbox,     0.0f,  0, 0, 40, 1,   0.0f, 10 },
+  /* OBJ_BOSS_BO_BASE_SHIELD */  {(void*) BoBaseShield_Draw, 1, (ObjectFunc) BoBaseShield_Update,       gNoHitbox,     0.0f,  0, 0, 40, 1,   0.0f, 10 },
-  /* OBJ_BOSS_311 */  {(void*) Bolse_Boss311_Draw, 2, (ObjectFunc) Bolse_Boss311_Update,        D_BO_6011C80,     0.0f,  0, 0, 40, 1,   0.0f, 10 },
+  /* OBJ_BOSS_BO_BASE_CORE */  {(void*) Bolse_BoBaseCore_Draw, 2, (ObjectFunc) Bolse_BoBaseCore_Update,        aBoBaseCoreHitbox,     0.0f,  0, 0, 40, 1,   0.0f, 10 },
-  /* OBJ_BOSS_VE2 */  {(void*) Venom2_Boss_Draw, 2, (ObjectFunc) Venom2_Boss_Update,        D_VE2_60166F4,     0.0f,  0, 0, 40, 1,   0.0f, 10 },
+  /* OBJ_BOSS_VE2_BASE */  {(void*) Venom2_Ve2Base_Draw, 2, (ObjectFunc) Venom2_Ve2Base_Update,        aVe2BaseHitbox,     0.0f,  0, 0, 40, 1,   0.0f, 10 },
-  /* OBJ_BOSS_SZ_GREAT_FOX */  {(void*) SectorZ_GreatFoxDraw, 1, (ObjectFunc) SectorZ_GreatFoxUpdate,        D_SZ_6009388,     0.0f,  0, 0, 40, 0,   0.0f, 10 },
+  /* OBJ_BOSS_SZ_GREAT_FOX */  {(void*) SectorZ_SzGreatFox_Draw, 1, (ObjectFunc) SectorZ_SzGreatFox_Update,        aSzGreatFoxHitbox,     0.0f,  0, 0, 40, 0,   0.0f, 10 },
-  /* OBJ_BOSS_SY */  {(void*) SectorY_Boss_Draw, 2, (ObjectFunc) SectorY_Boss_Update,       gNoHitbox,     0.0f,  0, 0, 40, 0,   0.0f, 10 },
+  /* OBJ_BOSS_SY_SHOGUN */  {(void*) SectorY_SyShogun_Draw, 2, (ObjectFunc) SectorY_SyShogun_Update,       gNoHitbox,     0.0f,  0, 0, 40, 0,   0.0f, 10 },
-  /* OBJ_BOSS_SO */  {(void*) Solar_Boss_Draw, 2, (ObjectFunc) Solar_Boss_Update,       gNoHitbox,     0.0f,  0, 0, 40, 0,   0.0f, 10 },
+  /* OBJ_BOSS_SO_VULKAIN */  {(void*) Solar_SoVulkain_Draw, 2, (ObjectFunc) Solar_SoVulkain_Update,       gNoHitbox,     0.0f,  0, 0, 40, 0,   0.0f, 10 },
-  /* OBJ_BOSS_KA */  {(void*) Katina_BossDraw, 1, (ObjectFunc) Katina_BossUpdate,        D_KA_6011058,     0.0f,  0, 0, 40, 0,   0.0f, 10 },
+  /* OBJ_BOSS_KA_SAUCERER */  {(void*) Katina_KaSaucerer_Draw, 1, (ObjectFunc) Katina_KaSaucerer_Update,        aKaSaucererHitbox,     0.0f,  0, 0, 40, 0,   0.0f, 10 },
-  /* OBJ_BOSS_KA_BASE */  {(void*) Katina_Base_Draw, 1, (ObjectFunc) Katina_BaseUpdate,        D_KA_601115C,     0.0f,  0, 0, 40, 1,   0.0f, 10 },
+  /* OBJ_BOSS_KA_FLBASE */  {(void*) Katina_KaFrontlineBase_Draw, 1, (ObjectFunc) Katina_KaFrontlineBase_Update,        aKaFrontlineBaseHitbox,     0.0f,  0, 0, 40, 1,   0.0f, 10 },
-  /* OBJ_BOSS_AQ */  {(void*) Aquas_Boss_Draw, 2, (ObjectFunc) Aquas_Boss_Update,        D_AQ_6030F74, 10000.0f,  0, 0, 40, 0,   0.0f, 10 },
+  /* OBJ_BOSS_AQ_BACOON */  {(void*) Aquas_AqBacoon_Draw, 2, (ObjectFunc) Aquas_AqBacoon_Update,        aAqBacoonHitbox, 10000.0f,  0, 0, 40, 0,   0.0f, 10 },
-  /* OBJ_BOSS_VE1 */  {(void*) Venom1_Boss_Draw, 1, (ObjectFunc) Venom1_Boss_Update,D_VE1_8019A9B8,  3000.0f,  0, 0, 40, 1,   0.0f, 10 },
+  /* OBJ_BOSS_VE1_GOLEMECH */  {(void*) Venom1_Ve1Golemech_Draw, 1, (ObjectFunc) Venom1_Ve1Golemech_Update, aVe1GolemechHitbox,  3000.0f,  0, 0, 40, 1,   0.0f, 10 },
-  /* OBJ_BOSS_320 */  {(void*) Andross_Boss320_Draw, 2, (ObjectFunc) Andross_Boss320_Update,        D_ANDROSS_C038DC0, 10000.0f,  0, 0, 40, 0,   0.0f, 10 },
+  /* OBJ_BOSS_AND_ANDROSS */  {(void*) Andross_AndAndross_Draw, 2, (ObjectFunc) Andross_AndAndross_Update,        aAndAndrossHitbox, 10000.0f,  0, 0, 40, 0,   0.0f, 10 },
-  /* OBJ_BOSS_321 */  {(void*) Andross_Boss321_Draw, 1, (ObjectFunc) Andross_Boss321_Update,        D_ANDROSS_C038F24, 10000.0f,  0, 0, 40, 0,   0.0f, 10 },
+  /* OBJ_BOSS_AND_BRAIN */  {(void*) Andross_AndBrain_Draw, 1, (ObjectFunc) Andross_AndBrain_Update,        aAndBrainHitbox, 10000.0f,  0, 0, 40, 0,   0.0f, 10 },
   /* OBJ_ITEM_LASERS  */  {(void*) ItemLasers_Draw, 1, (ObjectFunc) ItemLasers_Update,       gItemLasersHitbox,   700.0f,  0, 0,  0, 0,   0.0f,  0 },
   /* OBJ_ITEM_CHECKPOINT  */  {(void*) ItemCheckpoint_Draw, 1, (ObjectFunc) ItemCheckpoint_Update,       gItemCheckpointHitbox,   700.0f,  0, 0,  0, 0,   0.0f,  0 },
   /* OBJ_ITEM_SILVER_RING  */  {(void*) ItemSilverRing_Draw, 1, (ObjectFunc) ItemSupplyRing_Update,       gItemSupplyRingHitbox,   700.0f,  0, 0,  0, 0,   0.0f,  0 },
@@ -432,13 +432,13 @@ ObjectInfo gObjectInfo[] = {
   /* 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_EFFECT_FIRE_SMOKE  */  {(void*) Effect_FireSmoke_Draw, 1, (ObjectFunc) Effect_Effect339_Update,             NULL,  -200.0f,  1, 2,  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_340  */  {(void*) Effect_FireSmoke_Draw, 1, (ObjectFunc) Effect_Effect340_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_341  */  {(void*) Effect_FireSmoke_Draw, 1, (ObjectFunc) Effect_Effect341_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 },
-  /* OBJ_EFFECT_342  */  {(void*) Effect_Effect342_Draw, 1, (ObjectFunc) Effect_Effect342_Update,             NULL,  -200.0f,  1, 2,  0, 0,   0.0f,  0 },
+  /* OBJ_EFFECT_SMOKE_1  */  {(void*) Effect_Effect342_Draw, 1, (ObjectFunc) Effect_Effect342_Update,             NULL,  -200.0f,  1, 2,  0, 0,   0.0f,  0 },
-  /* OBJ_EFFECT_343  */  {(void*) Effect_Effect343_Draw, 1, (ObjectFunc) Effect_Effect343_Update,             NULL,  -200.0f,  1, 2,  0, 0,   0.0f,  0 },
+  /* OBJ_EFFECT_SMOKE_2  */  {(void*) Effect_Effect343_Draw, 1, (ObjectFunc) Effect_Effect343_Update,             NULL,  -200.0f,  1, 2,  0, 0,   0.0f,  0 },
-  /* OBJ_EFFECT_344  */  {(void*) Effect_Effect344_Draw, 1, (ObjectFunc) Effect_Effect344_Update,             NULL,  -200.0f, -1, 1,  0, 0,   0.0f,  0 },
+  /* OBJ_EFFECT_EXPLOSION_MARK_1  */  {(void*) Effect_Effect344_Draw, 1, (ObjectFunc) Effect_Effect344_Update,             NULL,  -200.0f, -1, 1,  0, 0,   0.0f,  0 },
-  /* OBJ_EFFECT_345  */  {(void*) Effect_Effect345_Draw, 1, (ObjectFunc) Effect_Effect345_Update,             NULL,  -200.0f, -1, 1,  0, 0,   0.0f,  0 },
+  /* OBJ_EFFECT_LASER_MARK_1  */  {(void*) Effect_Effect345_Draw, 1, (ObjectFunc) Effect_Effect345_Update,             NULL,  -200.0f, -1, 1,  0, 0,   0.0f,  0 },
   /* OBJ_EFFECT_346  */  {(void*) Effect_Effect346_Draw, 1, (ObjectFunc) Effect_Effect346_Update,             NULL,  -200.0f,  1, 0,  0, 0,   0.0f,  0 },
   /* OBJ_EFFECT_347  */  {(void*) Effect_Effect347_Draw, 1, (ObjectFunc) Effect_Effect347_Update,             NULL,   100.0f,  1, 0, 40, 0,   0.0f,  0 },
   /* OBJ_EFFECT_348  */  {(void*) Effect_Effect348_Draw, 1, (ObjectFunc) Effect_Effect348_Update,             NULL,  -200.0f, -1, 1,  0, 0,   0.0f,  0 },
@@ -451,7 +451,7 @@ ObjectInfo gObjectInfo[] = {
   /* OBJ_EFFECT_355  */  {(void*) Effect_Effect355_Draw, 1, (ObjectFunc) Effect_Effect355_Update,             NULL,   100.0f,  1, 0, 20, 1,   0.0f,  0 },
   /* OBJ_EFFECT_356  */  {(void*) Effect_Effect356_Draw, 1, (ObjectFunc) Effect_Effect356_Update,             NULL,   100.0f,  1, 0, 20, 0,   0.0f,  0 },
   /* OBJ_EFFECT_357  */  {(void*) Effect_Effect357_Draw, 1, (ObjectFunc) Effect_Effect357_Update,             NULL,   100.0f,  0, 1,  0, 0,   0.0f,  0 },
-  /* OBJ_EFFECT_358  */  {(void*) Katina_LaserEnergyParticlesDraw, 1, (ObjectFunc) Katina_LaserEnergyParticlesUpdate,             NULL,   100.0f,  1, 1,  0, 0,   0.0f,  0 },
+  /* OBJ_EFFECT_KA_ENERGY_PARTICLES  */  {(void*) Katina_LaserEnergyParticlesDraw, 1, (ObjectFunc) Katina_LaserEnergyParticlesUpdate,             NULL,   100.0f,  1, 1,  0, 0,   0.0f,  0 },
   /* OBJ_EFFECT_359  */  {(void*) Effect_Effect359_Draw, 1, (ObjectFunc) Effect_Effect359_Update,             NULL,  -100.0f,  1, 2,  0, 0,   0.0f,  0 },
   /* OBJ_EFFECT_360  */  {(void*) Effect_Effect360_361_362_Draw, 1, (ObjectFunc) Effect_Effect360_Update,             NULL,  -200.0f,  1, 2,  0, 0,   0.0f,  0 },
   /* OBJ_EFFECT_361  */  {(void*) Effect_Effect360_361_362_Draw, 1, (ObjectFunc) Effect_Effect361_Update,             NULL,  -200.0f,  1, 2,  0, 0,   0.0f,  0 },
@@ -467,10 +467,10 @@ ObjectInfo gObjectInfo[] = {
   /* OBJ_EFFECT_371  */  {(void*) Meteo_Effect371_Draw, 1, (ObjectFunc) Meteo_Effect371_Update,             NULL,   100.0f,  0, 1, 40, 0,   0.0f,  0 },
   /* OBJ_EFFECT_372  */  {(void*) Effect_Effect372_Draw, 1, (ObjectFunc) Effect_Effect372_Update,             NULL,  -200.0f,  0, 1,  0, 0,   0.0f,  0 },
   /* OBJ_EFFECT_TIMED_SFX  */  {(void*)          NULL, 1, (ObjectFunc) Effect_TimedSfx_Update,             NULL,   500.0f,  0, 1,  0, 0,   0.0f,  0 },
-  /* OBJ_EFFECT_374  */  {(void*) Macbeth_Effect374_Draw, 1, (ObjectFunc) Effect_Effect374_Update,             NULL,   100.0f,  0, 1, 40, 0,   0.0f,  0 },
+  /* OBJ_EFFECT_374  */  {(void*) Effect_Effect374_Draw, 1, (ObjectFunc) Effect_Effect374_Update,             NULL,   100.0f,  0, 1, 40, 0,   0.0f,  0 },
-  /* OBJ_EFFECT_375  */  {(void*) Macbeth_Effect375_Draw, 1, (ObjectFunc) Effect_Effect375_Update,             NULL,  -200.0f,  0, 1,  0, 0,   0.0f,  0 },
+  /* OBJ_EFFECT_375  */  {(void*) Effect_Effect375_Draw, 1, (ObjectFunc) Effect_Effect375_Update,             NULL,  -200.0f,  0, 1,  0, 0,   0.0f,  0 },
-  /* OBJ_EFFECT_376  */  {(void*) Macbeth_Effect376_Draw, 1, (ObjectFunc) Effect_Effect376_Update,             NULL,  -200.0f,  1, 0,  0, 0,   0.0f,  0 },
+  /* OBJ_EFFECT_376  */  {(void*) Effect_Effect376_Draw, 1, (ObjectFunc) Effect_Effect376_Update,             NULL,  -200.0f,  1, 0,  0, 0,   0.0f,  0 },
-  /* OBJ_EFFECT_377  */  {(void*) Macbeth_Effect377_Draw, 1, (ObjectFunc) Effect_Effect377_Update,             NULL,   100.0f,  1, 0, 20, 0,   0.0f,  0 },
+  /* OBJ_EFFECT_377  */  {(void*) Effect_Effect377_Draw, 1, (ObjectFunc) Effect_Effect377_Update,             NULL,   100.0f,  1, 0, 20, 0,   0.0f,  0 },
   /* OBJ_EFFECT_378  */  {(void*) Macbeth_Effect378_Draw, 1, (ObjectFunc) Macbeth_Effect378_Update,             NULL,   100.0f,  0, 0, 20, 0,   0.0f,  0 },
   /* OBJ_EFFECT_379  */  {(void*) Macbeth_Effect379_Draw, 1, (ObjectFunc) Macbeth_Effect379_Update,             NULL,   100.0f,  1, 1,  0, 0,   0.0f,  0 },
   /* OBJ_EFFECT_380  */  {(void*) Macbeth_Effect380_Draw, 1, (ObjectFunc) Macbeth_Effect380_Update,             NULL,   100.0f,  0, 0, 20, 0,   0.0f,  0 },

src/engine/fox_edisplay.c

@@ -59,13 +59,13 @@ void Sprite168_Draw(Sprite168* this) {
 void Object_dummy_800598DC(s32 arg0) {
 }
 
-void Actor201_Draw(Actor201* this) {
+void MeteoBall_Draw(MeteoBall* this) {
     RCP_SetupDL_60(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
     gSPDisplayList(gMasterDisp++, D_MA_6025B50);
     RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
 }
 
-void Actor202_PostLimbDraw(s32 limbIndex, Vec3f* rot, void* index) {
+void ActorHopBot_PostLimbDraw(s32 limbIndex, Vec3f* rot, void* index) {
     Vec3f sp24;
     Vec3f sp18;
 
@@ -88,17 +88,17 @@ f32 D_edisplay_800CFA2C[] = {
     1.0f, 1.0f, 0.95f, 0.9f, 0.85f, 0.8f, 0.75f, 0.7f, 0.65f, 0.6f,
 };
 
-void Actor202_Draw(Actor202* this) {
+void ActorHopBot_Draw(ActorHopBot* this) {
     Vec3f sp30[30];
     f32 temp = D_edisplay_800CF9B0[this->animFrame] - 114.0f;
 
     Matrix_Translate(gGfxMatrix, 0.f, -temp, 0.0f, MTXF_APPLY);
     Matrix_SetGfxMtx(&gMasterDisp);
     Animation_GetFrameData(&D_ME_601E8C4, this->animFrame, sp30);
-    Animation_DrawSkeleton(1, D_ME_601E9D0, sp30, NULL, Actor202_PostLimbDraw, &this->index, &gIdentityMatrix);
+    Animation_DrawSkeleton(1, D_ME_601E9D0, sp30, NULL, ActorHopBot_PostLimbDraw, &this->index, &gIdentityMatrix);
 }
 
-void MeteoTunnel_Draw(MeteoTunnel* this) {
+void MeteoTunnel_Draw(MeTunnel* this) {
     gSPDisplayList(gMasterDisp++, D_ME_601AE40);
 }
 
@@ -118,7 +118,7 @@ void CoIBeam_Draw(CoIBeam* this) {
     gSPDisplayList(gMasterDisp++, D_CO_6023AC0);
 }
 
-void Actor196_Draw(Actor196* this) {
+void ActorMoleMissile_Draw(ActorMoleMissile* this) {
     if (this->animFrame != 0) {
         gSPDisplayList(gMasterDisp++, D_CO_6032BC0);
     }
@@ -231,7 +231,7 @@ Gfx* D_edisplay_800CFC0C[] = {
     D_AQ_60294A0, D_AQ_60291B0, D_AQ_60287F0, D_AQ_6029330, D_AQ_6029240, D_AQ_6029790, D_AQ_6029900,
     D_AQ_6028F50, D_AQ_60290C0, D_AQ_6029530, D_AQ_60296A0, D_AQ_6028A80, D_AQ_6028910,
 };
-Gfx* D_edisplay_800CFC40[] = { D_AQ_6014FD0, D_AQ_6014FD0, D_AQ_6014FD0, D_AQ_6014FD0 };
+Gfx* D_edisplay_800CFC40[] = { aAqBoulderDL, aAqBoulderDL, aAqBoulderDL, aAqBoulderDL };
 Gfx* D_edisplay_800CFC50[] = { D_AQ_601EDE0, D_AQ_601F2F0, D_AQ_601F830, D_AQ_601FD70, D_AQ_601D110 };
 Gfx* D_edisplay_800CFC64[] = { D_AQ_6023940, D_AQ_6023D70, D_AQ_60249C0, D_AQ_6023EB0, D_AQ_60249C0, D_AQ_6023B80 };
 Gfx* D_edisplay_800CFC7C[] = { D_ZO_601B570, D_ZO_601B710, D_ZO_60209B0, D_ZO_6020B70, D_ZO_6020D50,
@@ -448,7 +448,7 @@ void Actor_DrawEngineAndContrails(Actor* actor) {
         Matrix_RotateY(gGfxMatrix, -gPlayer[gPlayerNum].camYaw, MTXF_APPLY);
         Matrix_RotateX(gGfxMatrix, gPlayer[gPlayerNum].camPitch, MTXF_APPLY);
         Matrix_SetGfxMtx(&gMasterDisp);
-        Play_DrawEngineGlow(gLevelType);
+        Display_DrawEngineGlow(gLevelType);
         Matrix_Pop(&gGfxMatrix);
     }
     sp5C = actor->fwork[21];
@@ -502,16 +502,17 @@ void Actor_DrawEngineGlow(Actor* actor, s32 levelType) {
         Matrix_RotateY(gGfxMatrix, -actor->obj.rot.y * M_DTOR, MTXF_APPLY);
         Matrix_RotateY(gGfxMatrix, -gPlayer[gPlayerNum].camYaw, MTXF_APPLY);
         Matrix_SetGfxMtx(&gMasterDisp);
-        Play_DrawEngineGlow(levelType);
+        Display_DrawEngineGlow(levelType);
         Matrix_Pop(&gGfxMatrix);
     }
 }
 
-void func_edisplay_8005B388(Actor* actor) {
+void func_edisplay_8005B388(Actor199* actor) {
     Vec3f sp3C = { 0.0f, 0.0f, 0.0f };
     Vec3f sp30;
 
     Matrix_MultVec3f(gGfxMatrix, &sp3C, &sp30);
+
     if ((((fabsf(sp30.z) < 3000.0f) && (fabsf(sp30.x) < 3000.0f) && !gBossActive) ||
          (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_STANDBY) || (gCurrentLevel == LEVEL_VENOM_ANDROSS) ||
          (gCurrentLevel == LEVEL_VENOM_2) || (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_LEVEL_COMPLETE)) &&
@@ -545,7 +546,7 @@ void func_edisplay_8005B388(Actor* actor) {
             D_edisplay_80161630.unk_04 = D_edisplay_80161630.unk_08 = D_edisplay_80161630.unk_0C =
                 D_edisplay_80161630.unk_10 = 0.0f;
         }
-        func_display_80053658(&D_edisplay_80161630);
+        Display_ArwingWings(&D_edisplay_80161630);
     } else if (gLevelType == LEVELTYPE_PLANET) {
         gSPDisplayList(gMasterDisp++, D_ENMY_PLANET_40018A0);
     } else if (gPlayer[0].wingPosition == 2) {
@@ -556,25 +557,25 @@ void func_edisplay_8005B388(Actor* actor) {
     Actor_DrawEngineAndContrails(actor);
 }
 
-void Actor180_Draw(Actor* actor) {
+void MeMolarRock_Draw(Actor* actor) {
     Matrix_Scale(gGfxMatrix, 1.0f, 1.0f, 1.0f, MTXF_APPLY);
     Matrix_SetGfxMtx(&gMasterDisp);
     gSPDisplayList(gMasterDisp++, D_ME_6024B60);
 }
 
-void Actor182_Draw(Actor* actor) {
+void MeMeteor2_Draw(Actor* actor) {
     RCP_SetupDL_29(actor->unk_046, gFogGreen, gFogBlue, gFogAlpha, actor->unk_048, gFogFar);
     Matrix_Scale(gGfxMatrix, 0.5f, 0.5f, 0.5f, MTXF_APPLY);
     Matrix_SetGfxMtx(&gMasterDisp);
-    gSPDisplayList(gMasterDisp++, D_ME_6018C00);
+    gSPDisplayList(gMasterDisp++, aMeMeteor1DL);
 }
 
-void Actor186_Draw(Actor* actor) {
+void MeLaserCannon1_Draw(Actor* actor) {
     RCP_SetupDL_29(actor->unk_046, gFogGreen, gFogBlue, gFogAlpha, actor->unk_048, gFogFar);
     gSPDisplayList(gMasterDisp++, D_ME_6022920);
 }
 
-void Actor190_191_Draw(Actor* actor) {
+void ActorMissileSeek_Draw(Actor* actor) {
     f32 scale;
 
     switch (actor->eventType) {
@@ -599,13 +600,13 @@ void Actor190_191_Draw(Actor* actor) {
     Actor_DrawEngineGlow(actor, 2);
 }
 
-void Actor192_Draw(Actor* actor) {
+void ActorSkibot_Draw(Actor* actor) {
     Matrix_Translate(gGfxMatrix, 0.0f, -124.0f, 0.0f, MTXF_APPLY);
     Animation_GetFrameData(&D_CO_6029528, actor->animFrame, actor->vwork);
     Animation_DrawSkeleton(1, D_CO_6029674, actor->vwork, NULL, NULL, actor, &gIdentityMatrix);
 }
 
-void Actor193_Draw(Actor* actor) {
+void ActorRadar_Draw(Actor* actor) {
     if (actor->timer_0BC != 0) {
         RCP_SetupDL_27();
         gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
@@ -670,7 +671,7 @@ void Object_SetShadowDL(ObjectId objId, s32 index) {
         case OBJ_BOSS_CO_GRANGA:
             gSPDisplayList(gMasterDisp++, D_CO_6034B90);
             break;
-        case OBJ_BOSS_KA:
+        case OBJ_BOSS_KA_SAUCERER:
             if (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_STANDBY) {
                 RCP_SetupDL(&gMasterDisp, SETUPDL_64);
                 gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 0, 0, 0, 200);
@@ -680,9 +681,9 @@ void Object_SetShadowDL(ObjectId objId, s32 index) {
             gSPDisplayList(gMasterDisp++, D_102A8A0);
             break;
         case OBJ_BOSS_CO_CARRIER:
-        case OBJ_BOSS_294:
+        case OBJ_BOSS_CO_CARRIER_LEFT:
-        case OBJ_BOSS_295:
+        case OBJ_BOSS_CO_CARRIER_UPPER:
-        case OBJ_BOSS_296:
+        case OBJ_BOSS_CO_CARRIER_BOTTOM:
             COS_DEG(gBosses[index].obj.rot.z);
             if (gGroundSurface == SURFACE_WATER) {
                 gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 90);
@@ -693,22 +694,22 @@ void Object_SetShadowDL(ObjectId objId, s32 index) {
                 case OBJ_BOSS_CO_CARRIER:
                     gSPDisplayList(gMasterDisp++, D_CO_6036840);
                     break;
-                case OBJ_BOSS_294:
+                case OBJ_BOSS_CO_CARRIER_LEFT:
                     gSPDisplayList(gMasterDisp++, D_CO_6036CD0);
                     break;
-                case OBJ_BOSS_295:
+                case OBJ_BOSS_CO_CARRIER_UPPER:
-                case OBJ_BOSS_296:
+                case OBJ_BOSS_CO_CARRIER_BOTTOM:
                     gSPDisplayList(gMasterDisp++, D_CO_60363B0);
                     break;
             }
             break;
-        case OBJ_ACTOR_192:
+        case OBJ_ACTOR_CO_SKIBOT:
             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);
             break;
-        case OBJ_ACTOR_230:
+        case OBJ_ACTOR_TI_BOULDER:
             RCP_SetupDL_48();
             RCP_SetupDL(&gMasterDisp, SETUPDL_69);
             gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
@@ -721,7 +722,7 @@ void Object_SetShadowDL(ObjectId objId, s32 index) {
             Matrix_SetGfxMtx(&gMasterDisp);
             gSPDisplayList(gMasterDisp++, D_1024AC0);
             break;
-        case OBJ_ACTOR_229:
+        case OBJ_ACTOR_TI_DESERT_CRAWLER:
             RCP_SetupDL(&gMasterDisp, SETUPDL_68);
             gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
             gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 0, 0, 0, 255);
@@ -735,7 +736,7 @@ void Object_SetShadowDL(ObjectId objId, s32 index) {
             Matrix_SetGfxMtx(&gMasterDisp);
             gSPDisplayList(gMasterDisp++, D_1024AC0);
             break;
-        case OBJ_ACTOR_231:
+        case OBJ_ACTOR_TI_BOMB:
             RCP_SetupDL(&gMasterDisp, SETUPDL_69);
             gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 0, 0, 0, 255);
             gDPSetEnvColor(gMasterDisp++, 0, 0, 0, 0);
@@ -747,7 +748,7 @@ void Object_SetShadowDL(ObjectId objId, s32 index) {
             Matrix_SetGfxMtx(&gMasterDisp);
             gSPDisplayList(gMasterDisp++, D_1024AC0);
             break;
-        case OBJ_ACTOR_215:
+        case OBJ_ACTOR_MA_BOULDER:
             RCP_SetupDL_48();
             gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 0, 0, 0, 255);
             gDPSetEnvColor(gMasterDisp++, 0, 0, 0, 255);
@@ -755,8 +756,8 @@ void Object_SetShadowDL(ObjectId objId, s32 index) {
             Matrix_SetGfxMtx(&gMasterDisp);
             gSPDisplayList(gMasterDisp++, D_1024AC0);
             break;
-        case OBJ_BOSS_VE1:
+        case OBJ_BOSS_VE1_GOLEMECH:
-            Venom1_80198310(&gBosses[index]);
+            Venom1_Ve1Golemech_SetShadow(&gBosses[index]);
             break;
     }
 }
@@ -947,7 +948,7 @@ void Scenery_Draw(Scenery* this, s32 arg1) {
     this->obj.pos.y -= gCameraShakeY;
     if (this->info.drawType == 0) {
         if ((this->obj.id == OBJ_SCENERY_CO_TOWER) || (this->obj.id == OBJ_SCENERY_CO_ROCKWALL) ||
-            (this->obj.id == OBJ_SCENERY_CO_HIGHWAY_4) || (this->obj.id == OBJ_SCENERY_50)) {
+            (this->obj.id == OBJ_SCENERY_CO_HIGHWAY_4) || (this->obj.id == OBJ_SCENERY_VE1_WALL_3)) {
             RCP_SetupDL_57(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
             gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
             if (arg1 < 0) {
@@ -995,15 +996,15 @@ void Actor_DrawOnRails(Actor* this) {
 
     if (this->info.draw != NULL) {
         switch (this->obj.id) {
-            case OBJ_ACTOR_194:
+            case OBJ_ACTOR_ME_MORA:
-                Actor194_Draw(this);
+                MeMora_Draw(this);
                 return;
-            case OBJ_ACTOR_236:
+            case OBJ_ACTOR_ZO_DODORA:
-                Zoness_Actor236_Draw(this);
+                Zoness_ZoDodora_Draw(this);
                 return;
         }
         if ((this->obj.id == OBJ_ACTOR_EVENT) && (this->eventType == EVID_200)) {
-            Actor194_Draw(this);
+            MeMora_Draw(this);
         } else {
             if (this->info.unk_19 != 0) {
                 this->obj.pos.y += gCameraShakeY;
@@ -1115,7 +1116,7 @@ void Actor_DrawAllRange(Actor* this) {
     }
     if (!sDrewActor) {
         this->lockOnTimers[gPlayerNum] = 0;
-        if ((this->obj.id == OBJ_ACTOR_DEBRIS) || (this->obj.id == OBJ_ACTOR_286)) {
+        if ((this->obj.id == OBJ_ACTOR_DEBRIS) || (this->obj.id == OBJ_ACTOR_AND_BRAIN_WASTE)) {
             Object_Kill(&this->obj, this->sfxSource);
         }
     }
@@ -1149,7 +1150,7 @@ void Boss_Draw(Boss* this, s32 arg1) {
     }
     Matrix_MultVec3f(&D_edisplay_801615F0, &origin, &D_edisplay_801615D0);
     Object_SetSfxSourceToView(this->sfxSource, &D_edisplay_801615D0);
-    if ((this->obj.id == OBJ_BOSS_KA) || (this->obj.id == OBJ_BOSS_KA_BASE)) {
+    if ((this->obj.id == OBJ_BOSS_KA_SAUCERER) || (this->obj.id == OBJ_BOSS_KA_FLBASE)) {
         var_fa1 = 6000.0f;
         var_fv0 = 6000.0f;
         var_ft5 = 0.9f;
@@ -1170,8 +1171,8 @@ void Boss_Draw(Boss* this, s32 arg1) {
         if (fabsf(D_edisplay_801615D0.x) < (fabsf(D_edisplay_801615D0.z * var_ft5) + var_fa1)) {
             if (fabsf(D_edisplay_801615D0.y) < (fabsf(D_edisplay_801615D0.z * var_ft5) + var_fa1)) {
                 sp3C = 1.0f;
-                if (this->obj.id != OBJ_BOSS_309) {
+                if (this->obj.id != OBJ_BOSS_BO_BASE) {
-                    if (this->obj.id != OBJ_BOSS_KA) {
+                    if (this->obj.id != OBJ_BOSS_KA_SAUCERER) {
                         Display_SetSecondLight(&this->obj.pos);
                     }
                     if (this->info.drawType != 2) {
@@ -1186,7 +1187,7 @@ void Boss_Draw(Boss* this, s32 arg1) {
         }
     }
     D_edisplay_801615D0.y = sp3C;
-    if (this->obj.id == OBJ_BOSS_309) {
+    if (this->obj.id == OBJ_BOSS_BO_BASE) {
         this->vwork[30] = D_edisplay_801615D0;
         Display_SetSecondLight(&this->obj.pos);
         Matrix_SetGfxMtx(&gMasterDisp);
@@ -1321,16 +1322,16 @@ void Object_DrawShadow(s32 index, Object* obj) {
         ActorAllRange_DrawShadow(&gActors[index]);
     } else {
         switch (obj->id) {
-            case OBJ_ACTOR_230:
+            case OBJ_ACTOR_TI_BOULDER:
                 Matrix_Translate(gGfxMatrix, obj->pos.x, gGroundHeight + 2.0f + gActors[index].fwork[1],
                                  obj->pos.z + gPathProgress, MTXF_APPLY);
                 break;
-            case OBJ_ACTOR_229:
+            case OBJ_ACTOR_TI_DESERT_CRAWLER:
-            case OBJ_ACTOR_231:
+            case OBJ_ACTOR_TI_BOMB:
                 Matrix_Translate(gGfxMatrix, obj->pos.x, gGroundHeight + 2.0f + gActors[index].fwork[0],
                                  obj->pos.z + gPathProgress, MTXF_APPLY);
                 break;
-            case OBJ_BOSS_KA:
+            case OBJ_BOSS_KA_SAUCERER:
                 Matrix_Translate(gGfxMatrix, obj->pos.x, gGroundHeight + 2.0f + gCameraShakeY, obj->pos.z, MTXF_APPLY);
                 break;
             default:
@@ -1342,8 +1343,8 @@ void Object_DrawShadow(s32 index, Object* obj) {
             Matrix_Scale(gGfxMatrix, 1.0f, 0.0f, 1.0f, MTXF_APPLY);
             Matrix_RotateY(gGfxMatrix, obj->rot.y * M_DTOR, MTXF_APPLY);
         }
-        if ((obj->id < OBJ_ACTOR_MAX) && (obj->id != OBJ_ACTOR_230) && (obj->id != OBJ_ACTOR_229) &&
+        if ((obj->id < OBJ_ACTOR_MAX) && (obj->id != OBJ_ACTOR_TI_BOULDER) &&
-            (obj->id != OBJ_ACTOR_231)) {
+            (obj->id != OBJ_ACTOR_TI_DESERT_CRAWLER) && (obj->id != OBJ_ACTOR_TI_BOMB)) {
             Matrix_RotateX(gGfxMatrix, obj->rot.x * M_DTOR, MTXF_APPLY);
             Matrix_RotateZ(gGfxMatrix, obj->rot.z * M_DTOR, MTXF_APPLY);
         }
@@ -1428,14 +1429,14 @@ void Scenery360_Draw(Scenery360* this) {
     f32 sp3C = 2000.0f;
     f32 sp38 = 0.5f;
 
-    if (this->obj.id == OBJ_SCENERY_156) {
+    if (this->obj.id == OBJ_SCENERY_UNK_156) {
         sp44 = 4000.0f;
         sp40 = -13000.0f;
         sp3C = 4500.0f;
     } else if (gCurrentLevel == LEVEL_VENOM_ANDROSS) {
         sp40 = -20000.0f;
         sp38 = 0.4f;
-    } else if (this->obj.id == OBJ_SCENERY_143) {
+    } else if (this->obj.id == OBJ_SCENERY_VS_KA_FLBASE) {
         sp44 = 6000.0f;
         sp40 = -20000.0f;
         sp3C = 6000.0f;
@@ -1451,7 +1452,7 @@ void Scenery360_Draw(Scenery360* this) {
         if (fabsf(sp48.y) < (fabsf(sp48.z * sp38) + sp3C)) {
             if (fabsf(sp48.x) < (fabsf(sp48.z * sp38) + sp3C)) {
                 Display_SetSecondLight(&this->obj.pos);
-                if (this->obj.id == OBJ_SCENERY_131) {
+                if (this->obj.id == OBJ_SCENERY_AND_PASSAGE) {
                     Matrix_RotateY(gGfxMatrix, this->obj.rot.y * M_DTOR, MTXF_APPLY);
                     Matrix_RotateX(gGfxMatrix, this->obj.rot.x * M_DTOR, MTXF_APPLY);
                     Matrix_RotateZ(gGfxMatrix, this->obj.rot.z * M_DTOR, MTXF_APPLY);
@@ -1583,7 +1584,7 @@ void Object_DrawAll(s32 arg0) {
         }
     }
     for (i = 0, boss = gBosses; i < ARRAY_COUNT(gBosses); i++, boss++) {
-        if ((boss->obj.status >= OBJ_ACTIVE) && (boss->obj.id != OBJ_BOSS_310)) {
+        if ((boss->obj.status >= OBJ_ACTIVE) && (boss->obj.id != OBJ_BOSS_BO_BASE_SHIELD)) {
             if ((boss->timer_05C % 2) == 0) {
                 RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
             } else {
@@ -1708,7 +1709,7 @@ void Effect_DrawAll(s32 arg0) {
         }
     }
     for (i = 0, boss = gBosses; i < ARRAY_COUNT(gBosses); i++, boss++) {
-        if ((boss->obj.status >= OBJ_ACTIVE) && (boss->obj.id == OBJ_BOSS_310)) {
+        if ((boss->obj.status >= OBJ_ACTIVE) && (boss->obj.id == OBJ_BOSS_BO_BASE_SHIELD)) {
             if ((boss->timer_05C % 2) == 0) {
                 RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
             } else {

src/engine/fox_enmy2.c

@@ -70,9 +70,11 @@ void func_enmy2_8006A900(f32 xPos, f32 yPos, f32 zPos, f32 scale2) {
 }
 
 void Actor237_Update(Actor237* this) {
+    /* Unimplemented */
 }
 
 void Actor237_Draw(Actor237* this) {
+    /* Unimplemented */
 }
 
 void Obj54_8006A984(Effect* this, f32 xPos, f32 yPos, f32 zPos) {
@@ -120,17 +122,18 @@ void CoWaterfall_Update(CoWaterfall* this) {
     }
 }
 
-bool Actor201_8006ABA4(Actor201* this) {
+bool MeteoBall_IsCloseToPlayer(MeteoBall* this) {
     if ((fabsf(this->obj.pos.x - gPlayer[0].pos.x) < 700.0f) && (fabsf(this->obj.pos.y - gPlayer[0].pos.y) < 700.0f)) {
         return true;
     }
     return false;
 }
 
-void Actor201_Update(Actor201* this) {
+// Unused Meteo Ball
+void MeteoBall_Update(MeteoBall* this) {
     f32 sp2C;
 
-    if (Actor201_8006ABA4(this) && (this->timer_0BC == 0)) {
+    if (MeteoBall_IsCloseToPlayer(this) && (this->timer_0BC == 0)) {
         Effect_EnemyLaser(OBJ_EFFECT_ENEMY_LASER_1, this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, gEnemyShotSpeed);
         this->timer_0BC = 20;
     }
@@ -141,7 +144,7 @@ void Actor201_Update(Actor201* this) {
                     sqrtf(SQ(gPlayer[0].cam.eye.z - sp2C) + SQ(gPlayer[0].cam.eye.x - this->obj.pos.x))));
 }
 
-void Actor202_Update(Actor202* this) {
+void ActorHopBot_Update(ActorHopBot* this) {
     bool sp34;
 
     this->gravity = 1.5f;
@@ -213,7 +216,7 @@ void Actor202_Update(Actor202* this) {
         this->health -= 10;
         if ((this->health <= 0) || (this->dmgType >= DMG_EXPLOSION)) {
             func_effect_8007D2C8(this->obj.pos.x, this->obj.pos.y + 180.0f, this->obj.pos.z, 10.0f);
-            func_effect_8007BFFC(this->obj.pos.x, this->obj.pos.y + 180.0f, this->obj.pos.z, this->vel.x, this->vel.y,
+            Effect386_Spawn1(this->obj.pos.x, this->obj.pos.y + 180.0f, this->obj.pos.z, this->vel.x, this->vel.y,
                              this->vel.z, 8.0f, 30);
             Object_Kill(&this->obj, this->sfxSource);
             Effect_SpawnTimedSfxAtPos(&this->obj.pos, NA_SE_EN_EXPLOSION_S);
@@ -223,12 +226,12 @@ void Actor202_Update(Actor202* this) {
             this->dmgType = DMG_NONE;
             this->timer_0C6 = 20;
             AUDIO_PLAY_SFX(NA_SE_EN_DAMAGE_S, this->sfxSource, 4);
-            func_effect_8007D1E0(this->obj.pos.x, this->obj.pos.y + 180.0f, this->obj.pos.z, 5.0f);
+            Effect_Effect341_Spawn(this->obj.pos.x, this->obj.pos.y + 180.0f, this->obj.pos.z, 5.0f);
         }
     }
 }
 
-void Actor194_Update(Actor194* this) {
+void MeMora_Update(MeMora* this) {
 }
 
 static s16 D_800CFF94[16] = {
@@ -240,9 +243,9 @@ static f32 D_800CFFC4[16] = {
 };
 static Gfx* D_800D0004[3] = { D_ENMY_SPACE_4000170, D_ENMY_SPACE_40084D0, D_ENMY_SPACE_400A630 };
 
-void Actor194_Dying(Actor194* this) {
+void MeMora_Dying(MeMora* this) {
     Vec3f sp34;
-    s32 temp_hi;
+    s32 index;
 
     this->counter_04E++;
 
@@ -250,12 +253,12 @@ void Actor194_Dying(Actor194* this) {
         this->counter_04E = 0;
     }
 
-    gActor194xPos[this->unk_046][this->counter_04E] = this->obj.pos.x;
+    gMeMoraXpos[this->unk_046][this->counter_04E] = this->obj.pos.x;
-    gActor194yPos[this->unk_046][this->counter_04E] = this->obj.pos.y;
+    gMeMoraYpos[this->unk_046][this->counter_04E] = this->obj.pos.y;
-    gActor194zPos[this->unk_046][this->counter_04E] = this->obj.pos.z;
+    gMeMoraZpos[this->unk_046][this->counter_04E] = this->obj.pos.z;
-    gActor194xRot[this->unk_046][this->counter_04E] = this->obj.rot.x;
+    gMeMoraXrot[this->unk_046][this->counter_04E] = this->obj.rot.x;
-    gActor194yRot[this->unk_046][this->counter_04E] = this->obj.rot.y;
+    gMeMoraYrot[this->unk_046][this->counter_04E] = this->obj.rot.y;
-    gActor194zRot[this->unk_046][this->counter_04E] = this->obj.rot.z;
+    gMeMoraZrot[this->unk_046][this->counter_04E] = this->obj.rot.z;
 
     this->obj.rot.x -= 10.0f;
     this->obj.rot.y += 3.0f;
@@ -268,13 +271,13 @@ void Actor194_Dying(Actor194* this) {
     this->vel.z = sp34.z;
 
     if ((this->timer_0BC == 0) && ((gGameFrameCount % 4) == 0)) {
-        temp_hi = (D_800CFF94[this->unk_04A] + this->counter_04E) % 100;
+        index = (D_800CFF94[this->unk_04A] + this->counter_04E) % 100;
         if (this->unk_04A == 0) {
-            func_effect_8007D2C8(gActor194xPos[this->unk_046][temp_hi], gActor194yPos[this->unk_046][temp_hi],
+            func_effect_8007D2C8(gMeMoraXpos[this->unk_046][index], gMeMoraYpos[this->unk_046][index],
-                                 gActor194zPos[this->unk_046][temp_hi], 7.0f);
+                                 gMeMoraZpos[this->unk_046][index], 7.0f);
         } else {
-            func_effect_8007D2C8(gActor194xPos[this->unk_046][temp_hi], gActor194yPos[this->unk_046][temp_hi],
+            func_effect_8007D2C8(gMeMoraXpos[this->unk_046][index], gMeMoraYpos[this->unk_046][index],
-                                 gActor194zPos[this->unk_046][temp_hi], 4.0f);
+                                 gMeMoraZpos[this->unk_046][index], 4.0f);
         }
 
         AUDIO_PLAY_SFX(NA_SE_EN_EXPLOSION_M, this->sfxSource, 4);
@@ -282,15 +285,15 @@ void Actor194_Dying(Actor194* this) {
 
         if (this->unk_04A > 15) {
             Object_Kill(&this->obj, this->sfxSource);
-            gActor194Status[this->unk_046] = 0;
+            gMeMoraStatus[this->unk_046] = 0;
             gHitCount += this->info.bonus;
             D_ctx_80177850 = 15;
         }
     }
 }
 
-void Actor194_8006B46C(Actor194* this, f32 xTrans, f32 yTrans, f32 zTrans, f32 xRot, f32 yRot, f32 zRot, u8 arg7,
+void MeMora_8006B46C(MeMora* this, f32 xTrans, f32 yTrans, f32 zTrans, f32 xRot, f32 yRot, f32 zRot, u8 arg7, f32 scale,
-                       f32 scale, s32 arg9) {
+                     s32 arg9) {
     Vec3f sp34 = { 0.0f, 0.0f, 0.0f };
 
     Matrix_Push(&gGfxMatrix);
@@ -328,16 +331,15 @@ void Actor194_8006B46C(Actor194* this, f32 xTrans, f32 yTrans, f32 zTrans, f32 x
     RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
 }
 
-void Actor194_Draw(Actor194* this) {
+void MeMora_Draw(MeMora* this) {
-    s16 var_s0;
+    s16 i;
-    s16 temp_hi;
+    s16 j;
 
-    for (var_s0 = this->unk_04A; var_s0 < 16; var_s0++) {
+    for (i = this->unk_04A; i < ARRAY_COUNT(D_800CFF94); i++) {
-        temp_hi = (D_800CFF94[var_s0] + this->counter_04E) % 100;
+        j = (D_800CFF94[i] + this->counter_04E) % 100;
-        Actor194_8006B46C(this, gActor194xPos[this->unk_046][temp_hi], gActor194yPos[this->unk_046][temp_hi],
+        MeMora_8006B46C(this, gMeMoraXpos[this->unk_046][j], gMeMoraYpos[this->unk_046][j],
-                          gActor194zPos[this->unk_046][temp_hi], gActor194xRot[this->unk_046][temp_hi],
+                        gMeMoraZpos[this->unk_046][j], gMeMoraXrot[this->unk_046][j], gMeMoraYrot[this->unk_046][j],
-                          gActor194yRot[this->unk_046][temp_hi], gActor194zRot[this->unk_046][temp_hi],
+                        gMeMoraZrot[this->unk_046][j], D_800CFFB4[i], D_800CFFC4[i], this->timer_0C6 % 2U);
-                          D_800CFFB4[var_s0], D_800CFFC4[var_s0], this->timer_0C6 % 2U);
     }
 }
 
@@ -394,7 +396,7 @@ void func_enmy2_8006BB1C(f32 xPos, f32 yPos, f32 zPos) {
     }
 }
 
-void Actor196_Update(Actor196* this) {
+void ActorMoleMissile_Update(ActorMoleMissile* this) {
     Vec3f sp44;
 
     switch (this->state) {
@@ -481,7 +483,7 @@ void Actor196_Update(Actor196* this) {
     }
 
     if ((this->dmgType != DMG_NONE) && (this->animFrame != 0)) {
-        func_effect_8007BFFC(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, 0.0f, this->vel.y, 0.0f, 3.0f, 5);
+        Effect386_Spawn1(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, 0.0f, this->vel.y, 0.0f, 3.0f, 5);
         Object_Kill(&this->obj, this->sfxSource);
         this->itemDrop = DROP_SILVER_RING;
         Actor_Despawn(this);
@@ -489,8 +491,8 @@ void Actor196_Update(Actor196* this) {
     this->dmgType = DMG_NONE;
 }
 
-static f32 D_800D001C[5] = { 0.0f, 30.0f, 60.0f, -60.0f, -30.0f }; // could be in-function
 void func_enmy2_8006BF7C(f32 xPos, f32 yPos, f32 zPos) {
+    static f32 D_800D001C[5] = { 0.0f, 30.0f, 60.0f, -60.0f, -30.0f };
     s32 i;
 
     for (i = 0; i < ARRAY_COUNT(D_800D001C); i++) {
@@ -664,7 +666,7 @@ void ActorDebris_Update(ActorDebris* this) {
             if (((this->timer_0BC == 0) || (Object_CheckCollision(this->index, &this->obj.pos, &D_800D0030, 1) != 0) ||
                  (this->obj.pos.y < (gGroundHeight + 10.0f))) &&
                 (this->timer_0BE == 0)) {
-                func_effect_8007B8F8(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z + 50.0f, this->scale * 10.0f);
+                Effect_Effect364_Spawn(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z + 50.0f, this->scale * 10.0f);
                 Object_Kill(&this->obj, this->sfxSource);
                 Effect_SpawnTimedSfxAtPos(&this->obj.pos, NA_SE_EN_EXPLOSION_S);
             }
@@ -675,7 +677,7 @@ void ActorDebris_Update(ActorDebris* this) {
             if (((this->timer_0BC == 0) || (Object_CheckCollision(this->index, &this->obj.pos, &D_800D0030, 1) != 0) ||
                  (this->obj.pos.y < (gGroundHeight + 10.0f))) &&
                 (this->timer_0BE == 0)) {
-                func_effect_8007B8F8(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z + 50.0f, this->scale * 10.0f);
+                Effect_Effect364_Spawn(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z + 50.0f, this->scale * 10.0f);
                 Object_Kill(&this->obj, this->sfxSource);
                 Effect_SpawnTimedSfxAtPos(&this->obj.pos, NA_SE_EN_EXPLOSION_S);
             }
@@ -696,7 +698,7 @@ void ActorDebris_Update(ActorDebris* this) {
             if (((this->timer_0BC == 0) || (Object_CheckCollision(this->index, &this->obj.pos, &D_800D0030, 1) != 0) ||
                  (this->obj.pos.y < (gGroundHeight + 10.0f))) &&
                 (this->timer_0BE == 0)) {
-                func_effect_8007B8F8(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z + 50.0f, this->scale * 10.0f);
+                Effect_Effect364_Spawn(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z + 50.0f, this->scale * 10.0f);
                 Object_Kill(&this->obj, this->sfxSource);
                 Effect_SpawnTimedSfxAtPos(&this->obj.pos, NA_SE_EN_EXPLOSION_S);
             }
@@ -706,8 +708,8 @@ void ActorDebris_Update(ActorDebris* this) {
             if (((this->timer_0BC == 0) || (Object_CheckCollision(this->index, &this->obj.pos, &D_800D0030, 1) != 0) ||
                  (this->obj.pos.y < (gGroundHeight + 10.0f))) &&
                 (this->timer_0BE == 0)) {
-                func_effect_8007B8F8(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z + 70.0f, this->scale * 20.0f);
+                Effect_Effect364_Spawn(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z + 70.0f, this->scale * 20.0f);
-                func_effect_8007B8F8(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z + 70.0f, this->scale * 20.0f);
+                Effect_Effect364_Spawn(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z + 70.0f, this->scale * 20.0f);
                 Object_Kill(&this->obj, this->sfxSource);
                 Effect_SpawnTimedSfxAtPos(&this->obj.pos, NA_SE_EN_EXPLOSION_S);
             }
@@ -792,7 +794,7 @@ void ActorDebris_Update(ActorDebris* this) {
                     Effect_SpawnTimedSfxAtPos(&this->obj.pos, NA_SE_EN_EXPLOSION_S);
                 }
                 if (Play_CheckDynaFloorCollision(&sp44, &sp40, this->obj.pos.x, this->obj.pos.y, this->obj.pos.z)) {
-                    func_effect_8007B228(this->obj.pos.x, sp44, this->obj.pos.z, 2.0f);
+                    Effect_Effect381_Spawn(this->obj.pos.x, sp44, this->obj.pos.z, 2.0f);
                     Object_Kill(&this->obj, this->sfxSource);
                 }
             } else if (this->state >= 10) {
@@ -803,7 +805,7 @@ void ActorDebris_Update(ActorDebris* this) {
                      (Object_CheckCollision(this->index, &this->obj.pos, &D_800D0030, 1) != 0) ||
                      (this->obj.pos.y < (gGroundHeight + 10.0f))) &&
                     (this->timer_0BE == 0)) {
-                    func_effect_8007BFFC(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, this->vel.x, this->vel.y,
+                    Effect386_Spawn1(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, this->vel.x, this->vel.y,
                                      this->vel.z, this->scale * 1.5f, 4);
                     Object_Kill(&this->obj, this->sfxSource);
                     Effect_SpawnTimedSfxAtPos(&this->obj.pos, NA_SE_EN_EXPLOSION_S);
@@ -831,11 +833,11 @@ void ActorDebris_Update(ActorDebris* this) {
                     if ((this->state != 2) && (this->state != 4)) {
                         func_enmy2_8006BF7C(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z);
                     } else if (gCurrentLevel == LEVEL_FORTUNA) {
-                        func_effect_8007BC7C(RAND_FLOAT_CENTERED(10.0f) + this->obj.pos.x, this->obj.pos.y,
+                        Effect_Effect362_Spawn(RAND_FLOAT_CENTERED(10.0f) + this->obj.pos.x, this->obj.pos.y,
                                                this->obj.pos.z, 1.0f);
-                        func_effect_8007BC7C(RAND_FLOAT_CENTERED(10.0f) + this->obj.pos.x, this->obj.pos.y,
+                        Effect_Effect362_Spawn(RAND_FLOAT_CENTERED(10.0f) + this->obj.pos.x, this->obj.pos.y,
                                                this->obj.pos.z, 1.0f);
-                        func_effect_8007BC7C(RAND_FLOAT_CENTERED(10.0f) + this->obj.pos.x, this->obj.pos.y,
+                        Effect_Effect362_Spawn(RAND_FLOAT_CENTERED(10.0f) + this->obj.pos.x, this->obj.pos.y,
                                                this->obj.pos.z, 1.0f);
                     }
                 }
@@ -909,7 +911,7 @@ void func_enmy2_8006D0F4(Actor* this) {
     }
 }
 
-void MeteoTunnel_Update(MeteoTunnel* this) {
+void MeteoTunnel_Update(MeTunnel* this) {
     this->obj.rot.z += 1.0f;
 }
 
@@ -952,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 */ { D_ME_6018C00, gCubeHitbox100, 2.5f, 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 },
     /*  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 },
@@ -980,23 +982,23 @@ static EventActorInfo sEventActorInfo[108] = {
     /*  38 */ { NULL, D_SX_603238C, 1.0f, 500.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 0.0f, 1 },
     /*  39 */ { D_SX_6020D20, D_SX_60328CC, -1.0f, 2100.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 },
     /*  40 */ { NULL, gNoHitbox, 1.0f, 100.0f, 3001.0f, 2, 0, EISFX_NONE, 0, 0.0f, 1 },
-    /*  41 */ { D_SY_60097E0, D_SY_6034478, -1.0f, 10000.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 },
+    /*  41 */ { aSyShip1DL, aSyShip1Hitbox, -1.0f, 10000.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 },
-    /*  42 */ { D_SY_601D730, D_SY_603450C, -1.0f, 10000.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 },
+    /*  42 */ { aSyShip2DL, aSyShip2Hitbox, -1.0f, 10000.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 },
     /*  43 */ { NULL, gCubeHitbox100, 1.0f, 20000.0f, 3000.0f, 1, 0, EISFX_ARWING_ENGINE_FG, 0, 0.0f, 0 },
-    /*  44 */ { D_SY_60102C0, D_SY_6034588, -1.0f, 10000.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 },
+    /*  44 */ { aSyShip3DL, aSyShip3Hitbox, -1.0f, 10000.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 },
     /*  45 */ { D_ME_6017B60, gCubeHitbox200, -1.0f, 300.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 1.0f, 1 },
     /*  46 */ { D_ZO_6004D00, gCubeHitbox200, 1.0f, 100.0f, 3000.0f, 1, 0, EISFX_EN_SHIP_ENGINE_S, 0, 1.0f, 1 },
     /*  47 */ { D_ME_601A880, gCubeHitbox100, -1.0f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 0.0f, 1 },
-    /*  48 */ { NULL, D_SY_603405C, 0.3f, 100.0f, 3000.0f, 0, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 },
+    /*  48 */ { NULL, aSyRobotHitbox, 0.3f, 100.0f, 3000.0f, 0, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 },
-    /*  49 */ { NULL, D_SY_603405C, 0.3f, 100.0f, 3000.0f, 0, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 },
+    /*  49 */ { NULL, aSyRobotHitbox, 0.3f, 100.0f, 3000.0f, 0, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 },
-    /*  50 */ { NULL, D_SY_603405C, 0.3f, 100.0f, 3000.0f, 0, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 },
+    /*  50 */ { NULL, aSyRobotHitbox, 0.3f, 100.0f, 3000.0f, 0, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 },
     /*  51 */ { D_SY_6015D60, D_SY_6034124, 2.0f, 100.0f, 3000.0f, 0, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 },
     /*  52 */ { NULL, D_ZO_602C1A0, -1.0f, 1000.0f, 3000.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 },
     /*  53 */ { D_SX_600B540, D_SX_60328E8, -1.0f, 2100.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 },
     /*  54 */ { D_ENMY_SPACE_4000EC0, gCubeHitbox100, 1.5f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 },
     /*  55 */ { D_ENMY_SPACE_4008D50, gCubeHitbox100, 1.5f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 },
     /*  56 */ { NULL, gNoHitbox, -1.0f, 2000.0f, 3000.0f, 0, 0, EISFX_GREATFOX_ENGINE, 0, 0.0f, 1 },
-    /*  57 */ { D_SY_60102C0, gNoHitbox, -1.0f, 10000.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 },
+    /*  57 */ { aSyShip3DL, gNoHitbox, -1.0f, 10000.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 },
     /*  58 */ { D_SY_601F3D0, gNoHitbox, -1.0f, 10000.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 },
     /*  59 */ { D_SY_6022B10, gNoHitbox, 2.0f, 100.0f, 3000.0f, 0, 0, EISFX_EN_ENGINE_01, 0, 0.0f, 1 },
     /*  60 */ { D_SY_60209F0, gNoHitbox, 2.0f, 100.0f, 3000.0f, 0, 0, EISFX_EN_ENGINE_01, 0, 0.0f, 1 },
@@ -1008,17 +1010,18 @@ static EventActorInfo sEventActorInfo[108] = {
     /*  66 */ { D_ME_600BD40, gCubeHitbox100, -1.0f, 100.0f, 8000.0f, 1, 0, EISFX_NONE, 0, 0.0f, 1 },
     /*  67 */ { NULL, D_ME_602F604, 3.0f, 100.0f, 3000.0f, 2, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 },
     /*  68 */ { D_SY_60205D0, D_SY_603445C, 3.0f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 1.0f, 1 },
-    /*  69 */ { D_SY_60036A0, D_SY_6034664, -1.0f, 10000.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 },
+    /*  69 */ { aSyShip3DestroyedDL, aSyShip3DestroyedHitbox, -1.0f, 10000.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 },
     /*  70 */ { D_SY_601AD70, gNoHitbox, 4.0f, 100.0f, 3000.0f, 0, 0, EISFX_EN_ENGINE_01, 0, 0.0f, 1 },
     /*  71 */ { aArwingItemLasersDL, gNoHitbox, 1.0f, 100.0f, 3000.0f, 2, 0, EISFX_OB_WING, 0, 0.0f, 1 },
-    /*  72 */ { D_SY_60034D0, D_SY_60347D4, 3.0f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 0.0f, 1 },
+    /*  72 */ { aSyShipWindowsDL, aSyShipWindowsHitbox, 3.0f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 0.0f, 1 },
-    /*  73 */ { D_SY_6005360, D_SY_6034770, -1.0f, 10000.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 },
+    /*  73 */ { aSyShip4DL, aSyShip4Hitbox, -1.0f, 10000.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 },
-    /*  74 */ { D_SY_600F6C0, D_SY_60347F0, -1.0f, 10000.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 },
+    /*  74 */ { aSyShip4DestroyedDL, aSyShip4DestroyedHitbox, -1.0f, 10000.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 },
-    /*  75 */ { D_SY_601B610, gNoHitbox, -1.0f, 10000.0f, 3001.0f, 0, 0, EISFX_EN_ENGINE_01, 0, 0.0f, 1 },
+    /*  75 */ { aSyShip2SpriteDL, gNoHitbox, -1.0f, 10000.0f, 3001.0f, 0, 0, EISFX_EN_ENGINE_01, 0, 0.0f, 1 },
-    /*  76 */ { D_SY_601C6A0, gNoHitbox, -1.0f, 10000.0f, 3001.0f, 0, 0, EISFX_EN_ENGINE_01, 0, 0.0f, 1 },
+    /*  76 */ { aSyShip3SpriteDL, gNoHitbox, -1.0f, 10000.0f, 3001.0f, 0, 0, EISFX_EN_ENGINE_01, 0, 0.0f, 1 },
-    /*  77 */ { D_SY_60188D0, D_SY_603486C, 3.0f, 100.0f, 3001.0f, 0, 0, EISFX_EN_ENGINE_01, 0, 0.0f, 1 },
+    /*  77 */
+    { aSyShipProjectileDL, aSyShipProjectileHitbox, 3.0f, 100.0f, 3001.0f, 0, 0, EISFX_EN_ENGINE_01, 0, 0.0f, 1 },
     /*  78 */ { NULL, gCubeHitbox150, 1.0f, 100.0f, 3000.0f, 2, 0, EISFX_NONE, 0, 1.0f, 0 },
-    /*  79 */ { NULL, D_ZO_602C294, 1.0f, 100.0f, 3000.0f, 0, 0, EISFX_NONE, 0, 1.0f, 1 },
+    /*  79 */ { NULL, aZoBirdHitbox, 1.0f, 100.0f, 3000.0f, 0, 0, EISFX_NONE, 0, 1.0f, 1 },
     /*  80 */ { NULL, D_VE1_601B474, -1.0f, 100.0f, 3000.0f, 2, 0, EISFX_NONE, 0, 0.0f, 1 },
     /*  81 */ { NULL, gNoHitbox, -1.0f, 100.0f, 3000.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 },
     /*  82 */ { NULL, gCubeHitbox100, 2.0f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 },
@@ -1030,14 +1033,14 @@ static EventActorInfo sEventActorInfo[108] = {
     /*  88 */ { NULL, D_AQ_6030B30, 1.0f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 1.0f, 1 },
     /*  89 */ { NULL, D_AQ_6030B14_f32, 1.0f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 1.0f, 1 },
     /*  90 */ { D_MA_601C520, D_MA_60368FC, 1.0f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 0.0f, 1 },
-    /*  91 */ { D_MA_600AF40, D_MA_60368E0, -1.0f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 0.0f, 1 },
+    /*  91 */ { aMaGuillotineDL, aMaGuillotineHitbox, -1.0f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 0.0f, 1 },
     /*  92 */ { D_WZ_7000C40, gWarpZoneEvent92Hitbox, -1.0f, 2100.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 },
     /*  93 */ { D_WZ_70010E0, gWarpZoneEvent93Hitbox, -1.0f, 2100.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 },
     /*  94 */ { D_WZ_7000E80, gWarpZoneEvent94Hitbox, 2.5f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 1.0f, 1 },
     /*  95 */ { D_WZ_70008F0, gCubeHitbox100, -1.0f, 100.0f, 8000.0f, 1, 0, EISFX_NONE, 0, 0.0f, 0 },
     /*  96 */ { D_WZ_7000280, gWarpZoneEvent96Hitbox, -1.0f, 1000.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 0.0f, 0 },
     /*  97 */ { D_ME_600AC70, gCubeHitbox100, -1.0f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 0.0f, 1 },
-    /*  98 */ { D_MA_601A2B0, D_MA_60364C0, 1.0f, 100.0f, 3000.0f, 1, 1, EISFX_NONE, 0, 0.0f, 1 },
+    /*  98 */ { D_MA_601A2B0, aMaBoulderHitbox, 1.0f, 100.0f, 3000.0f, 1, 1, EISFX_NONE, 0, 0.0f, 1 },
     /*  99 */ { D_VE1_6002500, D_VE1_601B944, -1.0f, 100.0f, 3000.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 },
     /* 100 */ { D_VE1_60043F0, gNoHitbox, -1.0f, 100.0f, 3000.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 },
     /* 101 */ { D_VE1_6004310, gNoHitbox, -1.0f, 100.0f, 3000.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 },
@@ -1046,7 +1049,7 @@ static EventActorInfo sEventActorInfo[108] = {
     /* 104 */ { NULL, gNoHitbox, -1.0f, 500.0f, 3000.0f, 0, 0, EISFX_NONE, 0, 0.0f, 0 },
     /* 105 */ { NULL, gCubeHitbox200, 1.0f, 100.0f, 3000.0f, 0, 0, EISFX_NONE, 0, 1.0f, 1 },
     /* 106 */ { NULL, gCubeHitbox100, 1.0f, 100.0f, 3000.0f, 0, 0, EISFX_EN_ALIEN_FLY, 0, 0.0f, 0 },
-    /* 107 */ { D_MA_6002890, D_MA_60368E0, -1.0f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 0.0f, 1 },
+    /* 107 */ { D_MA_6002890, aMaGuillotineHitbox, -1.0f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 0.0f, 1 },
 };
 
 static Color_RGBA32 sEventTexLineColors[6] = {
@@ -1148,12 +1151,12 @@ void ActorEvent_ProcessScript(ActorEvent* this) {
                 this->info.targetOffset = 1.0f;
 
                 for (i = 0; i < 2; i++) {
-                    if (gActor194Status[i] == 0) {
+                    if (gMeMoraStatus[i] == 0) {
-                        gActor194Status[i] = 1;
+                        gMeMoraStatus[i] = 1;
                         this->unk_046 = i;
                         for (j = 0; j < 100; j++) {
-                            gActor194yPos[i][j] = this->obj.pos.y;
+                            gMeMoraYpos[i][j] = this->obj.pos.y;
-                            gActor194zPos[i][j] = this->obj.pos.z;
+                            gMeMoraZpos[i][j] = this->obj.pos.z;
                         }
                         if (this->eventType == EVID_200) {
                             AUDIO_PLAY_SFX(NA_SE_EN_SPACE_SNAKE, this->sfxSource, 4);
@@ -1658,7 +1661,7 @@ void ActorEvent_SpawnEffect374(f32 xPos, f32 yPos, f32 zPos) {
 void ActorEvent_SetupTIMine(Actor* actor, f32 xPos, f32 yPos, f32 zPos) {
     Actor_Initialize(actor);
     actor->obj.status = OBJ_INIT;
-    actor->obj.id = OBJ_ACTOR_225;
+    actor->obj.id = OBJ_ACTOR_TI_LANDMINE;
 
     actor->obj.pos.x = xPos;
     actor->obj.pos.y = yPos;
@@ -1941,7 +1944,7 @@ void ActorEvent_ProcessActions(ActorEvent* this) {
                 break;
 
             case EVACT_11:
-                func_effect_8007BFFC(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, this->vel.x, this->vel.y,
+                Effect386_Spawn1(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, this->vel.x, this->vel.y,
                                  this->vel.z, this->scale * 3.0f, 15);
                 Actor_Despawn(this);
                 Object_Kill(&this->obj, this->sfxSource);
@@ -2043,7 +2046,7 @@ void ActorEvent_8006FEEC(ActorEvent* this) {
 
         if (this->health <= 0) {
             for (i = 3; i < 11; i++) {
-                Zoness_SpawnDebris(&this->vwork[i], &this->vwork[i + 11], RAND_FLOAT_CENTERED(20.0f),
+                Zoness_ActorDebris_Spawn(&this->vwork[i], &this->vwork[i + 11], RAND_FLOAT_CENTERED(20.0f),
                                          RAND_FLOAT(-10.0f), RAND_FLOAT(10.0f), 41, this->scale, 200, i);
             }
             this->itemDrop = DROP_NONE;
@@ -2189,7 +2192,7 @@ void ActorEvent_800701E0(ActorEvent* this) {
                             break;
 
                         case EVID_61:
-                            Meteo_8018CCF8(this);
+                            Meteo_Effect346_Spawn(this);
                             break;
 
                         case EVID_27:
@@ -2218,7 +2221,7 @@ void ActorEvent_800701E0(ActorEvent* this) {
             if (this->eventType == EVID_82) {
                 AUDIO_PLAY_SFX(NA_SE_OB_SMOKE, this->sfxSource, 0);
                 this->dmgType = DMG_BEAM;
-                func_effect_8007C688(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, 3.0f, 60);
+                Effect_Effect387_Spawn(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, 3.0f, 60);
             }
         } else {
             this->timer_0C6 = 20;
@@ -2292,12 +2295,12 @@ void ActorEvent_800701E0(ActorEvent* this) {
             this->obj.pos.z -= this->vel.z;
             this->dmgType = DMG_BEAM;
             if (this->eventType == EVID_13) {
-                this->obj.id = OBJ_ACTOR_182;
+                this->obj.id = OBJ_ACTOR_ME_METEOR_2;
                 func_enmy_800654E4(&this->obj);
             }
 
             if (this->eventType == EVID_61) {
-                Meteo_8018CCF8(this);
+                Meteo_Effect346_Spawn(this);
             }
         }
     }
@@ -2308,8 +2311,8 @@ void ActorEvent_80070BA8(ActorEvent* this) {
         this->dmgType = DMG_NONE;
         if ((this->eventType != EVID_17) || ((this->eventType == EVID_17) && (this->dmgPart == 0))) {
             this->timer_0C6 = 10;
-            func_effect_8007C120(this->hitPos.x, this->hitPos.y, this->hitPos.z, this->vel.x, this->vel.y, this->vel.z,
+            Effect_Effect390_Spawn(this->hitPos.x, this->hitPos.y, this->hitPos.z, this->vel.x, this->vel.y,
-                                 0.2f, 10);
+                                   this->vel.z, 0.2f, 10);
             this->health -= this->damage;
             AUDIO_PLAY_SFX(NA_SE_EN_SPARK_DAMAGE_M, this->sfxSource, 4);
             if (this->health <= 0) {
@@ -2871,12 +2874,12 @@ void ActorEvent_80071DC0(ActorEvent* this) {
     }
 
     if (((gGameFrameCount % 2) == 0)) {
-        func_effect_8007C120(this->obj.pos.x + sp38.x, this->obj.pos.y + sp38.y, this->obj.pos.z + sp38.z, this->vel.x,
+        Effect_Effect390_Spawn(this->obj.pos.x + sp38.x, this->obj.pos.y + sp38.y, this->obj.pos.z + sp38.z,
-                             this->vel.y, this->vel.z, 0.3f, 20);
+                               this->vel.x, this->vel.y, this->vel.z, 0.3f, 20);
     }
 
     if (((gGameFrameCount % 8) == 0)) {
-        func_effect_8007BFFC(this->obj.pos.x + sp38.x, this->obj.pos.y + sp38.y, this->obj.pos.z + sp38.z, this->vel.x,
+        Effect386_Spawn1(this->obj.pos.x + sp38.x, this->obj.pos.y + sp38.y, this->obj.pos.z + sp38.z, this->vel.x,
                          this->vel.y, this->vel.z, 10.0f, 9);
     }
 
@@ -3033,8 +3036,8 @@ void ActorEvent_Update(ActorEvent* this) {
     if (this->state == EVSTATE_1000) {
         this->obj.rot.y += this->fwork[15];
         this->obj.rot.x += this->fwork[16];
-        if (((gGameFrameCount % 16) == 0)) {
+        if ((gGameFrameCount % 16) == 0) {
-            func_effect_8007C120(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, this->vel.x, this->vel.y,
+            Effect_Effect390_Spawn(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, this->vel.x, this->vel.y,
                                    this->vel.z, 0.3f, 10);
         }
         return;
@@ -3054,12 +3057,12 @@ void ActorEvent_Update(ActorEvent* this) {
             this->counter_04E = 0;
         }
 
-        gActor194xPos[this->unk_046][this->counter_04E] = this->obj.pos.x;
+        gMeMoraXpos[this->unk_046][this->counter_04E] = this->obj.pos.x;
-        gActor194yPos[this->unk_046][this->counter_04E] = this->obj.pos.y;
+        gMeMoraYpos[this->unk_046][this->counter_04E] = this->obj.pos.y;
-        gActor194zPos[this->unk_046][this->counter_04E] = this->obj.pos.z;
+        gMeMoraZpos[this->unk_046][this->counter_04E] = this->obj.pos.z;
-        gActor194xRot[this->unk_046][this->counter_04E] = this->obj.rot.x;
+        gMeMoraXrot[this->unk_046][this->counter_04E] = this->obj.rot.x;
-        gActor194yRot[this->unk_046][this->counter_04E] = this->obj.rot.y;
+        gMeMoraYrot[this->unk_046][this->counter_04E] = this->obj.rot.y;
-        gActor194zRot[this->unk_046][this->counter_04E] = this->obj.rot.z;
+        gMeMoraZrot[this->unk_046][this->counter_04E] = this->obj.rot.z;
 
         if (this->dmgType != DMG_NONE) {
             this->dmgType = DMG_NONE;
@@ -3074,7 +3077,7 @@ void ActorEvent_Update(ActorEvent* this) {
                 func_effect_8007D2C8(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, 8.0f);
                 this->obj.status = OBJ_DYING;
                 this->timer_0BC = 20;
-                this->obj.id = OBJ_ACTOR_194;
+                this->obj.id = OBJ_ACTOR_ME_MORA;
             }
         }
     }
@@ -3484,7 +3487,7 @@ void ActorEvent_Update(ActorEvent* this) {
         case EVID_94:
         case EVID_95:
         case EVID_96:
-            if (((gGameFrameCount % 8) == 0)) {
+            if ((gGameFrameCount % 8) == 0) {
                 this->fwork[18] = RAND_FLOAT(255.0f);
                 this->fwork[19] = RAND_FLOAT(255.0f);
                 this->fwork[20] = RAND_FLOAT(255.0f);
@@ -3561,7 +3564,7 @@ void ActorEvent_Update(ActorEvent* this) {
         case EVID_48:
         case EVID_49:
         case EVID_50:
-            SectorY_Actor204_Update(this);
+            SectorY_SyRobot_Update(this);
             break;
 
         case EVID_52:
@@ -3598,7 +3601,7 @@ void ActorEvent_Update(ActorEvent* this) {
 
                     if ((this->obj.pos.y + sp90.y) > -30.0f) {
                         for (sp74 = 0; sp74 < 7; sp74++) {
-                            effect = func_effect_8007783C(OBJ_EFFECT_394);
+                            effect = Effect_Load(OBJ_EFFECT_394);
 
                             if (effect != NULL) {
                                 effect->unk_78 = effect->unk_7A = 12;
@@ -3630,7 +3633,7 @@ void ActorEvent_Update(ActorEvent* this) {
             }
 
             if ((fabsf(this->fwork[0]) > 10.0f) && ((gGameFrameCount % 2) == 0)) {
-                effect = func_effect_8007783C(OBJ_EFFECT_394);
+                effect = Effect_Load(OBJ_EFFECT_394);
                 if (effect != NULL) {
                     Matrix_RotateZ(gCalcMatrix, this->rot_0F4.z * M_DTOR, MTXF_NEW);
                     Matrix_MultVec3fNoTranslate(gCalcMatrix, &D_800D1290, &sp90);
@@ -3661,7 +3664,7 @@ void ActorEvent_Update(ActorEvent* this) {
                 }
 
                 if (((gGameFrameCount % 4) == 0)) {
-                    effect = func_effect_8007783C(OBJ_EFFECT_394);
+                    effect = Effect_Load(OBJ_EFFECT_394);
                     if (effect != NULL) {
                         effect->unk_78 = effect->unk_7A = 11;
                         effect->obj.status = OBJ_ACTIVE;
@@ -3724,7 +3727,7 @@ void ActorEvent_Update(ActorEvent* this) {
                 }
 
                 if ((this->animFrame >= 18) && (this->animFrame < 24)) {
-                    func_effect_8007BC7C(this->obj.pos.x, this->obj.pos.y + 80.0f, this->obj.pos.z + 60.0f, 20.0f);
+                    Effect_Effect362_Spawn(this->obj.pos.x, this->obj.pos.y + 80.0f, this->obj.pos.z + 60.0f, 20.0f);
                 }
 
                 if (this->animFrame < 49) {
@@ -3733,7 +3736,7 @@ void ActorEvent_Update(ActorEvent* this) {
                         this->animFrame = 49;
                     }
                     if ((gGameFrameCount % 2) != 0) {
-                        Aquas_801AC8A8(RAND_FLOAT_CENTERED(100.0f) + this->obj.pos.x,
+                        Aquas_Effect366_Spawn(RAND_FLOAT_CENTERED(100.0f) + this->obj.pos.x,
                                               RAND_FLOAT(50.0f) + this->obj.pos.y,
                                               RAND_FLOAT_CENTERED(100.0f) + this->obj.pos.z, 1.0f, 0);
                     }
@@ -3843,7 +3846,7 @@ bool ActorEvent_OverrideLimbDraw3(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f*
     return false;
 }
 
-s32 Scenery111_Draw(Scenery_111* this) {
+s32 Scenery111_Draw(SyShipDebris* this) {
     RCP_SetupDL(&gMasterDisp, SETUPDL_60);
     gSPDisplayList(gMasterDisp++, D_SY_601AD70);
     RCP_SetupDL(&gMasterDisp, SETUPDL_64);
@@ -3862,7 +3865,7 @@ void ActorEvent_Draw(ActorEvent* this) {
             (this->eventType != EVID_62) && (this->eventType != EVID_AQ_CLAM) && (this->eventType != EVID_98) &&
             (this->scale > 0.5f) && (this->timer_0C6 >= 9) && ((this->timer_0C6 & 3) == 0) &&
             (gPlayState != PLAY_PAUSE)) {
-            func_effect_8007C120(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, this->vel.x, this->vel.y,
+            Effect_Effect390_Spawn(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, this->vel.x, this->vel.y,
                                    this->vel.z, this->scale * 0.07f, 3);
         }
 
@@ -4063,7 +4066,7 @@ void ActorEvent_Draw(ActorEvent* this) {
                 case EVID_48:
                 case EVID_49:
                 case EVID_50:
-                    SectorY_Actor204_Draw(this);
+                    SectorY_SyRobot_Draw(this);
                     break;
 
                 case EVID_52:
@@ -4104,7 +4107,7 @@ void ActorEvent_Draw(ActorEvent* this) {
                 case EVID_79:
                     temp_s0 = this->state;
                     this->state = 2; // actor 235 state
-                    Zoness_Actor235_Draw(this);
+                    Zoness_ZoBird_Draw(this);
                     this->state = temp_s0;
                     break;
 
@@ -4131,8 +4134,8 @@ void ActorEvent_Draw(ActorEvent* this) {
 
                 case EVID_AQ_CLAM:
                     Matrix_Scale(gGfxMatrix, 3.0f, 3.0f, 3.0f, MTXF_APPLY);
-                    Animation_GetFrameData(&D_AQ_602201C, this->animFrame, sp114);
+                    Animation_GetFrameData(&aAqOysterAnim, this->animFrame, sp114);
-                    Animation_DrawSkeleton(1, D_AQ_60220E8, sp114, NULL, NULL, this, &gIdentityMatrix);
+                    Animation_DrawSkeleton(1, aAqOysterSkel, sp114, NULL, NULL, this, &gIdentityMatrix);
                     break;
 
                 case EVID_BILL:
@@ -4260,9 +4263,9 @@ void func_enmy2_800763A4(Actor* actor) {
 
         if (gUseDynaFloor &&
             Play_CheckDynaFloorCollision(&sp58, &sp5C, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z)) {
-            func_effect_8007BFFC(actor->obj.pos.x, sp58 + 20.0f, actor->obj.pos.z, 0.0f, 0.0f, 0.0f,
+            Effect386_Spawn1(actor->obj.pos.x, sp58 + 20.0f, actor->obj.pos.z, 0.0f, 0.0f, 0.0f, actor->scale * 3.0f,
-                                 actor->scale * 3.0f, 5);
+                             5);
-            func_effect_8007B228(actor->obj.pos.x, sp58, actor->obj.pos.z, 2.0f);
+            Effect_Effect381_Spawn(actor->obj.pos.x, sp58, actor->obj.pos.z, 2.0f);
             actor->timer_0BE = 2;
             Effect_SpawnTimedSfxAtPos(&actor->obj.pos, NA_SE_EN_EXPLOSION_S);
             return;
@@ -4271,7 +4274,7 @@ void func_enmy2_800763A4(Actor* actor) {
         if (gGroundType == 4) {
             if (Ground_801B6AEC(actor->obj.pos.x, actor->obj.pos.y - 10.0f, actor->obj.pos.z + gPathProgress) != 0) {
                 func_effect_8007D2C8(actor->obj.pos.x, actor->obj.pos.y + 20.0f, actor->obj.pos.z, actor->scale * 6.0f);
-                func_effect_8007BFFC(actor->obj.pos.x - actor->vel.x, actor->obj.pos.y + 30.0f,
+                Effect386_Spawn1(actor->obj.pos.x - actor->vel.x, actor->obj.pos.y + 30.0f,
                                  actor->obj.pos.z - actor->vel.z, 0.0f, 0.0f, 0.0f, actor->scale * 4.0f, 20);
                 func_enmy_80062C38(actor->obj.pos.x, actor->obj.pos.z);
                 actor->timer_0BE = 2;
@@ -4326,21 +4329,21 @@ void func_enmy2_800763A4(Actor* actor) {
                     if ((actor->obj.pos.y < (gGroundHeight + 30.0f)) && (gLevelType == LEVELTYPE_PLANET)) {
                         actor->vel.z = 0.0f;
                         if (gGroundSurface == SURFACE_WATER) {
-                            func_effect_8007D9DC(actor->obj.pos.x, gGroundHeight + 2.0f, actor->obj.pos.z, 3.0f, 20.0f,
+                            Effect_Effect367_Spawn(actor->obj.pos.x, gGroundHeight + 2.0f, actor->obj.pos.z, 3.0f,
-                                                 0);
+                                                   20.0f, 0);
-                            func_effect_8007D9DC(actor->obj.pos.x, gGroundHeight + 2.0f, actor->obj.pos.z, 3.0f, 20.0f,
+                            Effect_Effect367_Spawn(actor->obj.pos.x, gGroundHeight + 2.0f, actor->obj.pos.z, 3.0f,
-                                                 10);
+                                                   20.0f, 10);
-                            func_effect_8007D9DC(actor->obj.pos.x, gGroundHeight + 2.0f, actor->obj.pos.z, 3.0f, 20.0f,
+                            Effect_Effect367_Spawn(actor->obj.pos.x, gGroundHeight + 2.0f, actor->obj.pos.z, 3.0f,
-                                                 20);
+                                                   20.0f, 20);
-                            func_effect_8007ADF4(actor->obj.pos.x, gGroundHeight, actor->obj.pos.z, 0.1f, 3.0f);
+                            Effect_Effect372_Spawn2(actor->obj.pos.x, gGroundHeight, actor->obj.pos.z, 0.1f, 3.0f);
                         } else {
                             PlayerShot_SpawnEffect344(actor->obj.pos.x, 3.0f, actor->obj.pos.z, actor->obj.pos.x,
                                                       actor->obj.pos.z, 0.0f, 0.0f, 90.0f, 6.5f, 0, 0);
                         }
-                        func_effect_8007C120(actor->obj.pos.x, 20.0f, actor->obj.pos.z, 0.0f, 0.0f, 0.0f,
+                        Effect_Effect390_Spawn(actor->obj.pos.x, 20.0f, actor->obj.pos.z, 0.0f, 0.0f, 0.0f,
                                                actor->scale * 0.05f, 30);
                         if ((gCurrentLevel == LEVEL_FORTUNA) || (gCurrentLevel == LEVEL_VENOM_2)) {
-                            func_effect_8007C688(actor->obj.pos.x, gGroundHeight + 30.0f, actor->obj.pos.z, 3.0f, 60);
+                            Effect_Effect387_Spawn(actor->obj.pos.x, gGroundHeight + 30.0f, actor->obj.pos.z, 3.0f, 60);
                             if (gCurrentLevel == LEVEL_FORTUNA) {
                                 func_enmy_80062C38(actor->obj.pos.x, actor->obj.pos.z);
                             }
@@ -4351,10 +4354,10 @@ void func_enmy2_800763A4(Actor* actor) {
                     func_effect_8007D0E0(actor->obj.pos.x - actor->vel.x, actor->obj.pos.y + 30.0f,
                                          actor->obj.pos.z - actor->vel.z, actor->scale * 5.0f);
                     if (gLevelMode == LEVELMODE_ALL_RANGE) {
-                        func_effect_8007BFFC(actor->obj.pos.x, actor->obj.pos.y + 30.0f, actor->obj.pos.z, actor->vel.x,
+                        Effect386_Spawn1(actor->obj.pos.x, actor->obj.pos.y + 30.0f, actor->obj.pos.z, actor->vel.x,
                                          10.0f, actor->vel.z, actor->scale * 3.0f, 20);
                         if (sp60 == 999) {
-                            func_effect_8007C688(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z,
+                            Effect_Effect387_Spawn(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z,
                                                    actor->scale * 3.0f, 70);
                         }
                         for (var_s0 = 0; var_s0 < 4; var_s0++) {
@@ -4362,12 +4365,13 @@ void func_enmy2_800763A4(Actor* actor) {
                                 if (gCurrentLevel == LEVEL_FORTUNA) {
                                     Play_SpawnDebris(4, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z);
                                 } else {
-                                    func_effect_800794CC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 1.0f);
+                                    Effect_Effect357_Spawn50(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z,
+                                                             1.0f);
                                 }
                             }
                         }
                     } else {
-                        func_effect_8007BFFC(actor->obj.pos.x - actor->vel.x, actor->obj.pos.y + 30.0f,
+                        Effect386_Spawn1(actor->obj.pos.x - actor->vel.x, actor->obj.pos.y + 30.0f,
                                          (actor->obj.pos.z - actor->vel.z) + 48.0f, 0.0f, 0.0f, 0.0f,
                                          actor->scale * 3.0f, 5);
                     }
@@ -4390,12 +4394,12 @@ void func_enmy2_800763A4(Actor* actor) {
                         if (gCurrentLevel == LEVEL_FORTUNA) {
                             Play_SpawnDebris(4, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z);
                         } else {
-                            func_effect_800794CC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 1.0f);
+                            Effect_Effect357_Spawn50(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 1.0f);
                         }
                     }
                 }
 
-                func_effect_8007BFFC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, actor->vel.x, actor->vel.y,
+                Effect386_Spawn1(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, actor->vel.x, actor->vel.y,
                                  actor->vel.z, 5.0f, 15);
                 func_effect_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z - actor->vel.z, 8.0f);
             } else {
@@ -4405,8 +4409,8 @@ void func_enmy2_800763A4(Actor* actor) {
                 }
 
                 if (actor->eventType == EVID_36) {
-                    func_effect_8007BFFC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, actor->vel.x,
+                    Effect386_Spawn1(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, actor->vel.x, actor->vel.y,
-                                         actor->vel.y, actor->vel.z, 5.0f, 15);
+                                     actor->vel.z, 5.0f, 15);
                 }
             }
 
@@ -4433,13 +4437,13 @@ void func_enmy2_800763A4(Actor* actor) {
 
 void ActorEvent_Dying(ActorEvent* this) {
     if ((this->eventType == EVID_48) || (this->eventType == EVID_49) || (this->eventType == EVID_50)) {
-        SectorY_Actor204_Update(this);
+        SectorY_SyRobot_Update(this);
     } else {
         func_enmy2_800763A4(this);
     }
 }
 
-void Actor234_Update(Actor234* this) {
+void TiGreatFox_Update(TiGreatFox* this) {
     Vec3f sp24;
 
     Math_Vec3fFromAngles(&sp24, this->obj.rot.x, this->obj.rot.y, 50.0f);
@@ -4448,6 +4452,6 @@ void Actor234_Update(Actor234* this) {
     this->vel.z = sp24.z;
 }
 
-void Actor234_Draw(Actor234* this) {
+void TiGreatFox_Draw(TiGreatFox* this) {
     Cutscene_DrawGreatFox();
 }

src/engine/fox_fade.c

@@ -41,7 +41,7 @@ void Wipe_Draw(WipeMode mode, s32 frame) {
                 Wipe_Vertical(frame);
                 break;
             default:
-                (void) "そのような フェード は ない (%d)\n"; // There is no such fade
+                PRINTF("そのような フェード は ない (%d)\n"); // There is no such fade
                 break;
         }
     }

src/engine/fox_game.c

@@ -20,7 +20,7 @@ f32 gFovY;
 f32 gProjectNear;
 f32 gProjectFar;
 
-bool gShowCrosshairs[4] = { true, true, true, true };
+bool gShowReticles[4] = { true, true, true, true };
 bool D_game_800D2870 = false;
 static s32 sVsCameraULx[] = { 0, SCREEN_WIDTH / 2, 0, SCREEN_WIDTH / 2 };
 static s32 sVsCameraLRx[] = { SCREEN_WIDTH / 2 - 1, SCREEN_WIDTH - 1, SCREEN_WIDTH / 2 - 1, SCREEN_WIDTH - 1 };
@@ -114,6 +114,7 @@ void Game_SetGameState(void) {
     gSceneSetup = 0;
     gFillScreenColor = gBgColor = 0;
     gPathProgress = 0.0f;
+
     if ((gCurrentLevel == LEVEL_VENOM_2) && (gLevelPhase == 2)) {
         gFillScreenColor = gBgColor = 0xFFFF; // 248, 248, 248
         gFillScreenRed = gFillScreenGreen = gFillScreenBlue = 255;
@@ -281,7 +282,7 @@ void Game_Draw(s32 playerNum) {
             break;
         case DRAW_PLAY:
             gPlayerNum = playerNum;
-            Play_Draw();
+            Display_Update();
             break;
         case DRAW_UNK_MAP: // likely game over
             Background_DrawStarfield();
@@ -342,29 +343,36 @@ void Game_Update(void) {
     u8 soundMode;
 
     Game_SetGameState();
+
     if (gGameStandby) {
         Game_InitStandbyDL(&gUnkDisp1);
         gGameStandby = false;
         return;
     }
+
     Game_InitMasterDL(&gUnkDisp1);
     Game_SetScene();
+
     if (Game_ChangeScene() != true) {
         Lib_InitPerspective(&gUnkDisp1);
         Game_InitViewport(&gUnkDisp1, gCamCount, 0);
+
         if (gNextGameStateTimer != 0) {
             gNextGameStateTimer--;
         }
+
         switch (gGameState) {
             case GSTATE_BOOT:
                 gNextGameStateTimer = 2;
                 gGameState++;
                 break;
+
             case GSTATE_BOOT_WAIT:
                 if (gNextGameStateTimer == 0) {
                     gGameState++;
                 }
                 break;
+
             case GSTATE_SHOW_LOGO:
                 RCP_SetupDL(&gMasterDisp, SETUPDL_76);
                 gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255);
@@ -375,6 +383,7 @@ void Game_Update(void) {
                 TextureRect_IA8(&gMasterDisp, &gNintendoLogo[128 * 16 * 4], 128, 10, 100.0f, 150.0f, 1.0f, 1.0f);
                 gGameState++;
                 break;
+
             case GSTATE_CHECK_SAVE:
                 if (Save_Read() != 0) {
 #ifdef AVOID_UB
@@ -397,11 +406,13 @@ void Game_Update(void) {
                 TextureRect_IA8(&gMasterDisp, &gNintendoLogo[128 * 16 * 3], 128, 16, 100.0f, 134.0f, 1.0f, 1.0f);
                 TextureRect_IA8(&gMasterDisp, &gNintendoLogo[128 * 16 * 4], 128, 10, 100.0f, 150.0f, 1.0f, 1.0f);
                 break;
+
             case GSTATE_START:
                 gGameState = GSTATE_INIT;
                 gSceneId = SCENE_TITLE;
                 gSceneSetup = 0;
                 break;
+
             case GSTATE_INIT:
                 gGameState = GSTATE_TITLE;
                 gTitleState = 1;
@@ -430,17 +441,21 @@ void Game_Update(void) {
 
                     D_ctx_80177858[i] = 3;
                     gPlayerForms[i] = FORM_ARWING;
-                    gShowCrosshairs[i] = true;
+                    gShowReticles[i] = true;
                     gPlayerGlareAlphas[i] = 0;
                 }
+
                 gVersusStage = 0;
                 gVsPointsToWin = 3;
                 gBlurAlpha = 255;
+
                 for (i = 0; i < ARRAY_COUNT(gLeveLClearStatus); i++) {
                     gLeveLClearStatus[i] = 0;
                 }
+
                 gExpertMode = false;
                 gOptionSoundMode = gSaveFile.save.data.soundMode;
+
                 switch (gOptionSoundMode) {
                     case OPTIONSOUND_STEREO:
                         soundMode = SOUNDMODE_STEREO;
@@ -456,10 +471,12 @@ void Game_Update(void) {
                         soundMode = SOUNDMODE_STEREO;
                         break;
                 }
+
                 SEQCMD_SET_SOUND_MODE(soundMode);
                 gVolumeSettings[AUDIO_TYPE_MUSIC] = gSaveFile.save.data.musicVolume;
                 gVolumeSettings[AUDIO_TYPE_VOICE] = gSaveFile.save.data.voiceVolume;
                 gVolumeSettings[AUDIO_TYPE_SFX] = gSaveFile.save.data.sfxVolume;
+
                 if (gVolumeSettings[AUDIO_TYPE_MUSIC] > 99) {
                     gVolumeSettings[AUDIO_TYPE_MUSIC] = 99;
                 }
@@ -473,6 +490,7 @@ void Game_Update(void) {
                 Audio_SetVolume(AUDIO_TYPE_VOICE, gVolumeSettings[AUDIO_TYPE_VOICE]);
                 Audio_SetVolume(AUDIO_TYPE_SFX, gVolumeSettings[AUDIO_TYPE_SFX]);
                 break;
+
             case GSTATE_TITLE:
                 OvlMenu_CallFunction(OVLCALL_TITLE_UPDATE, NULL);
                 break;
@@ -498,7 +516,9 @@ void Game_Update(void) {
             default:
                 break;
         }
+
         Game_Draw(0);
+
         if (gCamCount == 2) {
             Game_InitViewport(&gMasterDisp, gCamCount, 1);
             Game_Draw(1);
@@ -538,7 +558,9 @@ void Game_Update(void) {
 
             HUD_dummy_8008CB8C();
         }
+
         partialFill = false;
+
         if (gCamCount == 1) {
             Graphics_FillRectangle(&gMasterDisp, 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1, gPlayerGlareReds[0],
                                    gPlayerGlareGreens[0], gPlayerGlareBlues[0], gPlayerGlareAlphas[0]);
@@ -565,9 +587,11 @@ void Game_Update(void) {
                 }
             }
         }
+
         Background_dummy_80040CDC();
         HUD_DrawStatusScreens();
         AllRange_DrawCountdown();
+
         if ((gGameState == GSTATE_PLAY) && gVersusMode) {
             Versus_Draw();
         }
@@ -584,6 +608,9 @@ void Game_Update(void) {
 #endif
 #if MODS_FPS_COUNTER == 1
         Play_RenderFps();
+#endif
+#if MODS_SPAWNER == 1
+        Spawner();
 #endif
     }
 }
@@ -594,6 +621,9 @@ void Game_Update(void) {
 #if MODS_RAM_MOD == 1
 #include "../mods/object_ram.c"
 #endif
+#if MODS_SPAWNER == 1
+#include "../mods/spawner.c"
+#endif
 
 Actor* Game_SpawnActor(ObjectId objId) {
     Actor* actor = gActors;

src/engine/fox_radio.c

@@ -769,7 +769,7 @@ void Radio_Draw(void) {
         }
         if (((gCurrentRadioPortrait != RCID_STATIC) && (gCurrentRadioPortrait != RCID_STATIC + 1)) &&
             (gCurrentRadioPortrait != RCID_1000)) {
-            func_hud_8008AD94();
+            HUD_RadioCharacterName_Draw();
         }
     }
 

src/engine/fox_tank.c

@@ -179,12 +179,12 @@ void func_tank_80043B18(Player* player) {
             func_tank_80043AA0(player->pos.x + sp3C.x, player->pos.y + sp3C.y, player->trueZpos + sp3C.z, 0.2f);
         } else {
             if (((gGameFrameCount % 2) == 0)) {
-                Titania_80189120(player->pos.x + sp3C.x, player->pos.y + sp3C.y, player->trueZpos + sp3C.z,
+                Titania_Effect368_Spawn(player->pos.x + sp3C.x, player->pos.y + sp3C.y, player->trueZpos + sp3C.z,
                                         player->rot.y + sp38, 1.3f);
             }
             if (((gGameFrameCount % 4) == 0)) {
-                func_effect_8007A900(player->pos.x + sp3C.x, player->pos.y + sp3C.y + 20.0f, player->trueZpos + sp3C.z,
+                Effect_Effect359_Spawn(player->pos.x + sp3C.x, player->pos.y + sp3C.y + 20.0f,
-                                     2.0f, 255, 15, 0);
+                                       player->trueZpos + sp3C.z, 2.0f, 255, 15, 0);
             }
         }
     } else {
@@ -198,11 +198,11 @@ void func_tank_80043B18(Player* player) {
                 }
             } else {
                 if (((gGameFrameCount % 2) == 0)) {
-                    Titania_80189120(player->pos.x + sp3C.x, player->pos.y + sp3C.y, player->trueZpos + sp3C.z,
+                    Titania_Effect368_Spawn(player->pos.x + sp3C.x, player->pos.y + sp3C.y, player->trueZpos + sp3C.z,
                                             player->rot.y + sp38, 1.0f);
                 }
                 if (((gGameFrameCount % 4) == 0) && (player->baseSpeed >= 5.0f)) {
-                    func_effect_8007A900(player->pos.x + sp3C.x, player->pos.y + sp3C.y + 20.0f,
+                    Effect_Effect359_Spawn(player->pos.x + sp3C.x, player->pos.y + sp3C.y + 20.0f,
                                            player->trueZpos + sp3C.z, 2.0f, 255, 15, 0);
                 }
             }
@@ -216,11 +216,11 @@ void func_tank_80043B18(Player* player) {
                 }
             } else {
                 if (((gGameFrameCount % 2) == 0)) {
-                    Titania_80189120(player->pos.x + sp3C.x, player->pos.y + sp3C.y, player->trueZpos + sp3C.z,
+                    Titania_Effect368_Spawn(player->pos.x + sp3C.x, player->pos.y + sp3C.y, player->trueZpos + sp3C.z,
                                             player->rot.y + sp38, 1.0f);
                 }
                 if (((gGameFrameCount % 4) == 0) && (player->baseSpeed >= 5.0f)) {
-                    func_effect_8007A900(player->pos.x + sp3C.x, player->pos.y + sp3C.y + 20.0f,
+                    Effect_Effect359_Spawn(player->pos.x + sp3C.x, player->pos.y + sp3C.y + 20.0f,
                                            player->trueZpos + sp3C.z, 2.0f, 255, 15, 0);
                 }
             }
@@ -285,7 +285,7 @@ void func_tank_800443DC(Player* player) {
     s32 i;
 
     for (i = 0, scenery = gScenery; i < ARRAY_COUNT(gScenery); i++, scenery++) {
-        if ((scenery->obj.status == OBJ_ACTIVE) && (scenery->obj.id == OBJ_SCENERY_58) &&
+        if ((scenery->obj.status == OBJ_ACTIVE) && (scenery->obj.id == OBJ_SCENERY_TI_BRIDGE) &&
             ((player->trueZpos - 2000.0f) < scenery->obj.pos.z)) {
             func_tank_800441C8(player, scenery->info.hitbox, scenery->obj.pos.x, scenery->obj.pos.y, scenery->obj.pos.z,
                                scenery->obj.rot.x, scenery->obj.rot.y, scenery->obj.rot.z);
@@ -673,19 +673,21 @@ void func_tank_80045678(Player* player) {
             Math_SmoothStepToF(&player->vel.y, 0.0f, 0.1f, 2.0f, 0);
         }
         if ((gCamCount == 1) && ((gGameFrameCount % 2) == 0)) {
-            func_effect_8007A900(RAND_FLOAT_CENTERED(20.0f) + player->pos.x, player->groundPos.y + 10.0f,
+            Effect_Effect359_Spawn(RAND_FLOAT_CENTERED(20.0f) + player->pos.x, player->groundPos.y + 10.0f,
                                    player->trueZpos - 10.0f, RAND_FLOAT(2.0f) + 3.5f, 255, 16, 1);
         }
     } else {
         D_800C9F3C = 0;
         if ((gCamCount == 1) && ((gGameFrameCount % 4) == 0) && (player->rollState == 0)) {
             if ((player->unk_16C > 0.2f) && (player->radioDamageTimer == 0)) {
-                func_effect_8007A900(RAND_FLOAT_CENTERED(10.0f) + (player->pos.x - 57.0f), player->groundPos.y + 10.0f,
+                Effect_Effect359_Spawn(RAND_FLOAT_CENTERED(10.0f) + (player->pos.x - 57.0f),
-                                     player->trueZpos - 10.0f, RAND_FLOAT(1.0f) + 1.5f, 255, 15, 0);
+                                       player->groundPos.y + 10.0f, player->trueZpos - 10.0f, RAND_FLOAT(1.0f) + 1.5f,
+                                       255, 15, 0);
             }
             if ((player->unk_170 > 0.2f) && (player->radioDamageTimer == 0)) {
-                func_effect_8007A900(RAND_FLOAT_CENTERED(10.0f) + (player->pos.x + 57.0f), player->groundPos.y + 10.0f,
+                Effect_Effect359_Spawn(RAND_FLOAT_CENTERED(10.0f) + (player->pos.x + 57.0f),
-                                     player->trueZpos - 10.0f, RAND_FLOAT(1.0f) + 1.5f, 255, 15, 0);
+                                       player->groundPos.y + 10.0f, player->trueZpos - 10.0f, RAND_FLOAT(1.0f) + 1.5f,
+                                       255, 15, 0);
             }
         }
     }
@@ -789,7 +791,7 @@ void func_tank_80046260(Player* player) {
     s32 i;
 
     for (i = 0, scenery = gScenery; i < ARRAY_COUNT(gScenery); i++, scenery++) {
-        if ((scenery->obj.status == OBJ_ACTIVE) && (scenery->obj.id == OBJ_SCENERY_58) &&
+        if ((scenery->obj.status == OBJ_ACTIVE) && (scenery->obj.id == OBJ_SCENERY_TI_BRIDGE) &&
             ((player->trueZpos - 2000.0f) < scenery->obj.pos.z) && (scenery->obj.pos.y < player->pos.y)) {
             func_tank_800460E0(player, scenery->info.hitbox, scenery->obj.pos.x, scenery->obj.pos.y, scenery->obj.pos.z,
                                scenery->obj.rot.x, scenery->obj.rot.y, scenery->obj.rot.z);
@@ -844,14 +846,14 @@ void func_tank_8004641C(Player* player, s32 arg1, f32 arg2, f32 arg3, f32 arg4,
     if (Play_CheckPolyCollision(arg1, arg2, arg3, arg4, sp84, sp80, sp7C, &sp58, &sp4C)) {
         if (D_MA_801BE250[27] < arg3 + sp58.y) {
             D_MA_801BE250[27] = arg3 + sp58.y;
-            if (arg1 == OBJ_SCENERY_67) {
+            if (arg1 == OBJ_SCENERY_MA_WALL_3) {
                 player->rollState = 0;
                 D_800C9F04 = 1;
             }
         }
         D_MA_801BE250[28] = sp58.x;
         D_MA_801BE250[29] = sp58.z;
-    } else if ((arg1 == OBJ_SCENERY_67) && (D_MA_801BE250[27] == 0.0f) &&
+    } else if ((arg1 == OBJ_SCENERY_MA_WALL_3) && (D_MA_801BE250[27] == 0.0f) &&
                Play_CheckPolyCollision(arg1, arg2 + 20.0f, arg3, arg4, sp84, sp80, sp7C, &sp58, &sp4C)) {
         player->rollState = 9;
         player->rollTimer = 15;
@@ -886,9 +888,9 @@ void func_tank_80046704(Player* player) {
     if (1) {}
     for (i = 0, scenery = gScenery; i < ARRAY_COUNT(gScenery); i++, scenery++) {
         if ((scenery->obj.status == OBJ_ACTIVE) && ((player->trueZpos - 2000.0f) < scenery->obj.pos.z)) {
-            if ((scenery->obj.id == OBJ_SCENERY_69) || (scenery->obj.id == OBJ_SCENERY_70) ||
+            if ((scenery->obj.id == OBJ_SCENERY_MA_TERRAIN_BUMP) || (scenery->obj.id == OBJ_SCENERY_MA_FLOOR_1) ||
-                (scenery->obj.id == OBJ_SCENERY_71) || (scenery->obj.id == OBJ_SCENERY_72) ||
+                (scenery->obj.id == OBJ_SCENERY_MA_FLOOR_2) || (scenery->obj.id == OBJ_SCENERY_MA_FLOOR_3) ||
-                (scenery->obj.id == OBJ_SCENERY_73) || (scenery->obj.id == OBJ_SCENERY_67)) {
+                (scenery->obj.id == OBJ_SCENERY_MA_FLOOR_4) || (scenery->obj.id == OBJ_SCENERY_MA_WALL_3)) {
                 temp1 = scenery->obj.pos.x - player->pos.x;
                 temp2 = scenery->obj.pos.z - player->trueZpos;
 
@@ -896,7 +898,7 @@ void func_tank_80046704(Player* player) {
                     func_tank_8004641C(player, scenery->obj.id, scenery->obj.pos.x, scenery->obj.pos.y,
                                        scenery->obj.pos.z, scenery->obj.rot.x, scenery->obj.rot.y, scenery->obj.rot.z);
                 }
-            } else if (scenery->obj.id == OBJ_SCENERY_74) {
+            } else if (scenery->obj.id == OBJ_SCENERY_MA_FLOOR_5) {
                 if (((player->pos.x - 820.0f) <= scenery->obj.pos.x) &&
                     (scenery->obj.pos.x <= (player->pos.x + 820.0f)) &&
                     ((player->pos.y - 50.0f) <= scenery->obj.pos.y) &&
@@ -907,10 +909,10 @@ void func_tank_80046704(Player* player) {
                     player->groundPos.y = D_MA_801BE250[27] - 3.0f;
                 }
             }
-            if ((scenery->obj.id == OBJ_SCENERY_59) || (scenery->obj.id == OBJ_SCENERY_60) ||
+            if ((scenery->obj.id == OBJ_SCENERY_MA_BUILDING_1) || (scenery->obj.id == OBJ_SCENERY_MA_BUILDING_2) ||
-                (scenery->obj.id == OBJ_SCENERY_61) || (scenery->obj.id == OBJ_SCENERY_63) ||
+                (scenery->obj.id == OBJ_SCENERY_MA_TOWER) || (scenery->obj.id == OBJ_SCENERY_63) ||
-                (scenery->obj.id == OBJ_SCENERY_105) || (scenery->obj.id == OBJ_SCENERY_66) ||
+                (scenery->obj.id == OBJ_SCENERY_MA_TRAIN_TRACK_13) || (scenery->obj.id == OBJ_SCENERY_MA_WALL_2) ||
-                (scenery->obj.id == OBJ_SCENERY_67) || (scenery->obj.id == OBJ_SCENERY_68)) {
+                (scenery->obj.id == OBJ_SCENERY_MA_WALL_3) || (scenery->obj.id == OBJ_SCENERY_MA_WALL_4)) {
                 s32 temp_v0;
                 s32 sp94;
 
@@ -934,9 +936,9 @@ void func_tank_80046704(Player* player) {
                         player->pos.x += (D_800C9F4C[temp_v0] * 5.0f);
                         break;
                     case 3:
-                        if ((scenery->obj.id == OBJ_SCENERY_59) || (scenery->obj.id == OBJ_SCENERY_60) ||
+                        if ((scenery->obj.id == OBJ_SCENERY_MA_BUILDING_1) ||
-                            (scenery->obj.id == OBJ_SCENERY_63) || (scenery->obj.id == OBJ_SCENERY_66) ||
+                            (scenery->obj.id == OBJ_SCENERY_MA_BUILDING_2) || (scenery->obj.id == OBJ_SCENERY_63) ||
-                            (scenery->obj.id == OBJ_SCENERY_68)) {
+                            (scenery->obj.id == OBJ_SCENERY_MA_WALL_2) || (scenery->obj.id == OBJ_SCENERY_MA_WALL_4)) {
                             Player_ApplyDamage(player, temp_v0, 5);
                         }
                         player->baseSpeed = -(D_800C9F00 * 1.5f);
@@ -945,7 +947,7 @@ void func_tank_80046704(Player* player) {
                         AUDIO_PLAY_SFX(NA_SE_TANK_WALL_HIT, player->sfxSource, 0);
                         break;
                 }
-                if (scenery->obj.id == OBJ_SCENERY_59) {
+                if (scenery->obj.id == OBJ_SCENERY_MA_BUILDING_1) {
                     if (((player->pos.x - 230.0f) <= scenery->obj.pos.x) &&
                         (scenery->obj.pos.x <= (player->pos.x + 230.0f)) &&
                         ((80.0f <= player->pos.y - scenery->obj.pos.y)) &&
@@ -975,7 +977,7 @@ void func_tank_80046704(Player* player) {
                         (scenery->obj.pos.z <= (player->trueZpos + 220.0f)) && (player->pos.y >= 200.0f)) {
                         player->groundPos.y = scenery->obj.pos.y + 204.0f;
                     }
-                } else if ((scenery->obj.id == OBJ_SCENERY_105) && Macbeth_801A3C20(player->trueZpos)) {
+                } else if ((scenery->obj.id == OBJ_SCENERY_MA_TRAIN_TRACK_13) && Macbeth_801A3C20(player->trueZpos)) {
                     if (((player->pos.x - 200.0f) < D_MA_801BE250[21]) &&
                         (D_MA_801BE250[21] < (player->pos.x + 200.0f))) {
                         player->groundPos.y = D_MA_801BE250[22] - 1.0f;
@@ -1342,14 +1344,15 @@ void func_tank_800481F4(Player* player) {
     func_tank_800444BC(player);
     if (player->mercyTimer == 0) {
         for (i = 0, scenery = gScenery; i < ARRAY_COUNT(gScenery); i++, scenery++) {
-            if ((scenery->obj.status == OBJ_ACTIVE) && (scenery->obj.id != OBJ_SCENERY_58) &&
+            if ((scenery->obj.status == OBJ_ACTIVE) && (scenery->obj.id != OBJ_SCENERY_TI_BRIDGE) &&
-                (scenery->obj.id != OBJ_SCENERY_105) && (scenery->obj.id != OBJ_SCENERY_59) &&
+                (scenery->obj.id != OBJ_SCENERY_MA_TRAIN_TRACK_13) && (scenery->obj.id != OBJ_SCENERY_MA_BUILDING_1) &&
-                (scenery->obj.id != OBJ_SCENERY_60) && (scenery->obj.id != OBJ_SCENERY_63) &&
+                (scenery->obj.id != OBJ_SCENERY_MA_BUILDING_2) && (scenery->obj.id != OBJ_SCENERY_63) &&
-                (scenery->obj.id != OBJ_SCENERY_66) && (scenery->obj.id != OBJ_SCENERY_67) &&
+                (scenery->obj.id != OBJ_SCENERY_MA_WALL_2) && (scenery->obj.id != OBJ_SCENERY_MA_WALL_3) &&
-                (scenery->obj.id != OBJ_SCENERY_68) && (scenery->obj.id != OBJ_SCENERY_70) &&
+                (scenery->obj.id != OBJ_SCENERY_MA_WALL_4) && (scenery->obj.id != OBJ_SCENERY_MA_FLOOR_1) &&
-                (scenery->obj.id != OBJ_SCENERY_72) && (scenery->obj.id != OBJ_SCENERY_71) &&
+                (scenery->obj.id != OBJ_SCENERY_MA_FLOOR_3) && (scenery->obj.id != OBJ_SCENERY_MA_FLOOR_2) &&
-                (scenery->obj.id != OBJ_SCENERY_73) && (scenery->obj.id != OBJ_SCENERY_74) &&
+                (scenery->obj.id != OBJ_SCENERY_MA_FLOOR_4) && (scenery->obj.id != OBJ_SCENERY_MA_FLOOR_5) &&
-                (scenery->obj.id != OBJ_SCENERY_69) && ((player->trueZpos - 2000.0f) < scenery->obj.pos.z)) {
+                (scenery->obj.id != OBJ_SCENERY_MA_TERRAIN_BUMP) &&
+                ((player->trueZpos - 2000.0f) < scenery->obj.pos.z)) {
                 var_fv1 = scenery->obj.rot.y;
                 if (scenery->info.action == (ObjectFunc) SceneryRotateTowardsCamera) {
                     var_fv1 = 0.0f;
@@ -1429,7 +1432,7 @@ void func_tank_800481F4(Player* player) {
                         Player_ApplyDamage(player, 0, 5);
                         player->mercyTimer = 1;
                     }
-                } else if ((OBJ_ACTOR_205 <= actor->obj.id) && (actor->obj.id <= OBJ_ACTOR_213)) {
+                } else if ((OBJ_ACTOR_MA_LOCOMOTIVE <= actor->obj.id) && (actor->obj.id <= OBJ_ACTOR_MA_TRAIN_CAR_7)) {
                     if (func_tank_80046E40(player, actor->info.hitbox, &sp98, actor->fwork[25] + actor->obj.pos.x,
                                            actor->fwork[8] + actor->obj.pos.y + 25.0f, actor->obj.pos.z,
                                            actor->fwork[29], actor->fwork[26], actor->obj.rot.z, 0.0f, 0.0f,
@@ -1463,12 +1466,12 @@ void func_tank_800481F4(Player* player) {
                                                           actor->obj.rot.y, actor->obj.rot.z, 0.0f, 0.0f, 0.0f);
                     if (temp_v0 != 0) {
                         actor->dmgType = DMG_COLLISION;
-                        if ((actor->obj.id == OBJ_ACTOR_225) || (actor->obj.id == OBJ_MISSILE_SEEK_TEAM)) {
+                        if ((actor->obj.id == OBJ_ACTOR_TI_LANDMINE) || (actor->obj.id == OBJ_MISSILE_SEEK_TEAM)) {
                             actor->dmgType = -1;
                         }
                         if (actor->info.damage) {
                             Player_ApplyDamage(player, temp_v0, actor->info.damage);
-                            if (actor->obj.id == OBJ_ACTOR_225) {
+                            if (actor->obj.id == OBJ_ACTOR_TI_LANDMINE) {
                                 player->knockback.y = 0.0f;
                             }
                         } else {
@@ -1487,11 +1490,11 @@ void func_tank_800481F4(Player* player) {
                     if (temp_v0 != 0) {
                         if ((sprite->obj.id == OBJ_SPRITE_FO_POLE) || (sprite->obj.id == OBJ_SPRITE_CO_POLE) ||
                             (sprite->obj.id == OBJ_SPRITE_CO_TREE)) {
-                            sprite->destroy = 1;
+                            sprite->destroy = true;
                             player->hitTimer = 6;
                             player->hitDirection = 0;
                         } else if (sprite->obj.id == OBJ_SPRITE_TI_CACTUS) {
-                            sprite->destroy = 1;
+                            sprite->destroy = true;
                         } else {
                             Player_ApplyDamage(player, temp_v0, sprite->info.damage);
                         }

src/engine/fox_versus.c

@@ -246,7 +246,7 @@ void func_versus_800BD7C4(f32 xPos, f32 yPos, s32 arg2) {
     s32 i;
 
     for (i = 10; i != 1; i /= 10) {
-        if (xPos > 0 && (yPos > 0)) {
+        if ((xPos > 0) && (yPos > 0)) {
             TextureRect_IA8(&gMasterDisp, D_800D4B20[arg2 / i], 16, 8, xPos, yPos, 1.0f, 1.0f);
         }
         xPos += 9.0f;

src/mods/spawner.c

@@ -0,0 +1,458 @@
+/*
+ * File: spawner.c
+ * System: Spawner
+ * Description: Spawner module meant to help documenting the rest of the code
+ * by being able to spawn Scenery, Sprites, Actors, Bosses, Items, Effects and Events.
+ * This is not part of the original game.
+ */
+
+#include "global.h"
+#include "sf64object.h"
+
+typedef enum ObjType {
+    /* 0 */ OBJ_SPAWN_SCENERY,
+    /* 1 */ OBJ_SPAWN_SCENERY_360,
+    /* 2 */ OBJ_SPAWN_SPRITE,
+    /* 3 */ OBJ_SPAWN_ACTOR,
+    /* 4 */ OBJ_SPAWN_BOSS,
+    /* 5 */ OBJ_SPAWN_ITEM,
+    /* 6 */ OBJ_SPAWN_EFFECT,
+    /* 7 */ OBJ_SPAWN_EVENT,
+    /* 8 */ OBJ_SPAWN_MAX
+} ObjType;
+
+typedef struct ObjCount {
+    s32 actor;
+    s32 boss;
+    s32 scenery;
+    s32 sprite;
+    s32 effect;
+    s32 item;
+} ObjCount;
+
+static int sObjId = 0;
+static int sObjType = 0;
+
+static int sTextXpos = 239;
+static int sTextYpos = 173;
+
+static OSContPad* sContPress;
+static OSContPad* sContHold;
+
+void Scenery_Load(Scenery* this, ObjectInit* objInit);
+void Sprite_Load(Sprite* this, ObjectInit* objInit);
+void Item_Load(Item* this, ObjectInit* objInit);
+void Boss_Load(Boss* this, ObjectInit* objInit);
+
+void Spawner_Actor(int actorId) {
+    if ((gControllerPress[0].button & L_TRIG) && (actorId >= OBJ_ACTOR_CO_GARUDA_1) &&
+        (actorId <= OBJ_ACTOR_SUPPLIES)) {
+        Vec3f* reticlePos = &D_display_801613E0[0];
+        Actor* actorSpawn = Game_SpawnActor(actorId);
+
+        if (actorSpawn != NULL) {
+            actorSpawn->obj.pos.x = reticlePos->x * 1.7f;
+            actorSpawn->obj.pos.y = 200.0f;
+            actorSpawn->obj.pos.z = gPlayer[0].pos.z - 1500.0f - (reticlePos->y * 1.7f);
+            actorSpawn->state = 0;
+        }
+    }
+}
+
+void Spawner_Boss(int bossId) {
+    if ((gControllerPress[0].button & L_TRIG) && (bossId >= OBJ_BOSS_CO_GRANGA) && (bossId <= OBJ_BOSS_AND_BRAIN)) {
+        Vec3f* reticlePos = &D_display_801613E0[0];
+        ObjectInit objInit;
+        s32 i;
+
+        objInit.zPos1 = objInit.zPos2 = 0;
+        objInit.xPos = reticlePos->x * 1.7f;
+        objInit.yPos = 200.0f;
+        objInit.rot.x = objInit.rot.y = objInit.rot.z = 0;
+        objInit.id = bossId;
+
+        for (i = 0; i < ARRAY_COUNT(gBosses); i++) {
+            if (gBosses[i].obj.status == OBJ_FREE) {
+                Boss_Load(&gBosses[i], &objInit);
+                gBosses[i].obj.pos.z = gPlayer[0].pos.z - 1500.0f - (reticlePos->y * 1.7f);
+                break;
+            }
+        }
+    }
+}
+
+void Spawner_Scenery(int sceneryId) {
+    if ((gControllerPress[0].button & L_TRIG) && (sceneryId >= OBJ_SCENERY_CO_STONE_ARCH) &&
+        (sceneryId <= OBJ_SCENERY_VE2_MOUNTAIN)) {
+        Vec3f* reticlePos = &D_display_801613E0[0];
+        ObjectInit objInit;
+        s32 i;
+
+        objInit.zPos1 = objInit.zPos2 = 0;
+        objInit.xPos = reticlePos->x * 1.7f;
+        objInit.yPos = 200.0f;
+        objInit.rot.x = objInit.rot.y = objInit.rot.z = 0;
+        objInit.id = sceneryId;
+
+        for (i = 0; i < ARRAY_COUNT(gScenery); i++) {
+            if (gScenery[i].obj.status == OBJ_FREE) {
+                Scenery_Load(&gScenery[i], &objInit);
+                gScenery[i].obj.pos.z = gPlayer[0].pos.z - 1500.0f - (reticlePos->y * 4.7f);
+                break;
+            }
+        }
+    }
+}
+
+void Spawner_Scenery360(s32 scenery360Id) {
+    if ((gControllerPress[0].button & L_TRIG) && (scenery360Id >= OBJ_SCENERY_AND_PATH_INTERSECTION) &&
+        (scenery360Id <= OBJ_SCENERY_VE2_MOUNTAIN)) {
+        Vec3f* reticlePos = &D_display_801613E0[0];
+        s32 i;
+
+        for (i = 0; i < 200; i++) {
+            if (gScenery360[i].obj.status == OBJ_FREE) {
+                Scenery360_Initialize(&gScenery360[i]);
+                gScenery360[i].obj.status = OBJ_ACTIVE;
+                gScenery360[i].obj.id = scenery360Id;
+
+                gScenery360[i].obj.pos.x = +reticlePos->x * 5.0f;
+                gScenery360[i].obj.pos.z = -reticlePos->y * 5.0f;
+
+                if (gLevelType == LEVELTYPE_PLANET) {
+                    gScenery360[i].obj.pos.y = gGroundHeight;
+                } else {
+                    gScenery360[i].obj.pos.y = gPlayer[0].pos.y;
+                }
+
+                gScenery360[i].obj.rot.y = 0;
+                Object_SetInfo(&gScenery360[i].info, gScenery360[i].obj.id);
+                break;
+            }
+        }
+    }
+}
+
+void Spawner_Sprite(int spriteId) {
+    if ((gControllerPress[0].button & L_TRIG) && (spriteId >= OBJ_SPRITE_CO_POLE) &&
+        (spriteId <= OBJ_SPRITE_GFOX_TARGET)) {
+        Vec3f* reticlePos = &D_display_801613E0[0];
+        ObjectInit objInit;
+        s32 i;
+
+        objInit.zPos1 = objInit.zPos2 = 0;
+        objInit.xPos = reticlePos->x * 1.7f;
+        objInit.yPos = 200.0f;
+        objInit.rot.x = objInit.rot.y = objInit.rot.z = 0;
+        objInit.id = spriteId;
+
+        for (i = 0; i < ARRAY_COUNT(gSprites); i++) {
+            if (gSprites[i].obj.status == OBJ_FREE) {
+                Sprite_Load(&gSprites[i], &objInit);
+                gSprites[i].obj.pos.z = gPlayer[0].pos.z - 1500.0f - (reticlePos->y * 1.7f);
+                break;
+            }
+        }
+    }
+}
+
+void Spawner_Item(int itemId) {
+    if ((gControllerPress[0].button & L_TRIG) && (itemId >= OBJ_ITEM_LASERS) && (itemId <= OBJ_ITEM_TRAINING_RING)) {
+        Vec3f* reticlePos = &D_display_801613E0[0];
+        ObjectInit objInit;
+        s32 i;
+
+        objInit.zPos1 = objInit.zPos2 = 0;
+        objInit.xPos = reticlePos->x * 1.7f;
+        objInit.yPos = 200.0f;
+        objInit.rot.x = objInit.rot.y = objInit.rot.z = 0;
+        objInit.id = itemId;
+
+        for (i = 0; i < ARRAY_COUNT(gItems); i++) {
+            if (gItems[i].obj.status == OBJ_FREE) {
+                Item_Load(&gItems[i], &objInit);
+                gItems[i].obj.pos.z = gPlayer[0].pos.z - 1500.0f - (reticlePos->y * 1.7f);
+                break;
+            }
+        }
+    }
+}
+
+void Spawner_Event(int eventId) {
+    if (gControllerPress[0].button & L_TRIG) {
+        Vec3f* reticlePos = &D_display_801613E0[0];
+        ObjectInit objInit;
+        s32 i;
+
+        for (i = 0; i < ARRAY_COUNT(gActors); i++) {
+            if (gActors[i].obj.status == OBJ_FREE) {
+                objInit.zPos1 = gPlayer[0].pos.z - 1500.0f - (reticlePos->y * 1.7f);
+                objInit.zPos2 = gPlayer[0].pos.z - 1500.0f - (reticlePos->y * 1.7f) + 300.0f;
+                objInit.xPos = reticlePos->x * 1.7f;
+                objInit.yPos = 200.0f;
+                objInit.rot.x = 0;
+                objInit.rot.y = 0;
+                objInit.rot.z = 0;
+                objInit.id = ACTOR_EVENT_ID + eventId;
+                ActorEvent_Load(&gActors[i], &objInit, i);
+                gActors[i].obj.pos.z = gPlayer[0].pos.z - 1500.0f - (reticlePos->y * 1.7f);
+                break;
+            }
+        }
+    }
+}
+
+void Spawner_Effect(int effectId) {
+    if ((gControllerPress[0].button & L_TRIG) && (effectId >= OBJ_EFFECT_FIRE_SMOKE_1) && (effectId < OBJ_ID_MAX)) {
+        Vec3f* reticlePos = &D_display_801613E0[0];
+        s32 i;
+
+        for (i = 0; i < ARRAY_COUNT(gEffects); i++) {
+            if (gEffects[i].obj.status == OBJ_FREE) {
+                Effect_Initialize(&gEffects[i]);
+                gEffects[i].obj.status = OBJ_INIT;
+                gEffects[i].obj.id = effectId;
+                gEffects[i].obj.pos.x = reticlePos->x * 1.7f;
+                gEffects[i].obj.pos.y = 200.0f;
+                gEffects[i].obj.pos.z = gPlayer[0].pos.z - 1000.0f - (reticlePos->y * 1.7f);
+                gEffects[i].vel.x = 0;
+                gEffects[i].vel.y = 0;
+                gEffects[i].vel.z = 0;
+                gEffects[i].obj.rot.x = 0;
+                gEffects[i].obj.rot.y = 0;
+                gEffects[i].obj.rot.z = 0;
+                // gEffects[i].timer_50 = 200;
+                Object_SetInfo(&gEffects[i].info, gEffects[i].obj.id);
+                break;
+            }
+        }
+    }
+}
+
+ObjCount Spawner_ObjCount(void) {
+    ObjCount counter = { 0, 0, 0, 0, 0, 0 };
+    s32 i;
+
+    for (i = 0; i < ARRAY_COUNT(gActors); i++) {
+        if (gActors[i].obj.status != OBJ_FREE) {
+            counter.actor++;
+        }
+    }
+    for (i = 0; i < ARRAY_COUNT(gBosses); i++) {
+        if (gBosses[i].obj.status != OBJ_FREE) {
+            counter.boss++;
+        }
+    }
+    for (i = 0; i < ARRAY_COUNT(gScenery); i++) {
+        if (gScenery[i].obj.status != OBJ_FREE) {
+            counter.scenery++;
+        }
+    }
+    if (gLevelMode == LEVELMODE_ALL_RANGE) {
+        for (i = 0; i < 200; i++) {
+            if (gScenery360[i].obj.status != OBJ_FREE) {
+                counter.scenery++;
+            }
+        }
+    }
+    for (i = 0; i < ARRAY_COUNT(gSprites); i++) {
+        if (gSprites[i].obj.status != OBJ_FREE) {
+            counter.sprite++;
+        }
+    }
+    for (i = 0; i < ARRAY_COUNT(gEffects); i++) {
+        if (gEffects[i].obj.status != OBJ_FREE) {
+            counter.effect++;
+        }
+    }
+    for (i = 0; i < ARRAY_COUNT(gItems); i++) {
+        if (gItems[i].obj.status != OBJ_FREE) {
+            counter.item++;
+        }
+    }
+    return counter;
+}
+
+void Spawner_ObjKill(void) {
+    s32 i;
+
+    for (i = 0; i <= ARRAY_COUNT(gActors); i++) {
+        Object_Kill(&gActors[i].obj, gActors[i].sfxSource);
+    }
+    for (i = 0; i <= ARRAY_COUNT(gBosses); i++) {
+        Object_Kill(&gBosses[i].obj, gBosses[i].sfxSource);
+    }
+    for (i = 0; i <= ARRAY_COUNT(gScenery); i++) {
+        Object_Kill(&gScenery[i].obj, gScenery[i].sfxSource);
+    }
+    for (i = 0; i <= ARRAY_COUNT(gSprites); i++) {
+        Sprite_Initialize(&gSprites[i]);
+    }
+    for (i = 0; i <= ARRAY_COUNT(gEffects); i++) {
+        Object_Kill(&gEffects[i].obj, gEffects[i].sfxSource);
+    }
+    for (i = 0; i <= ARRAY_COUNT(gItems); i++) {
+        Object_Kill(&gItems[i].obj, gItems[i].sfxSource);
+    }
+    if (gLevelMode == LEVELMODE_ALL_RANGE) {
+        for (i = 0; i < 200; i++) {
+            gScenery360[i].obj.status = OBJ_FREE;
+        }
+    }
+}
+
+// Use this function to add code that eases your documentation work!
+Spawner_Playground(void) {
+    Player* player = &gPlayer[0];
+
+    player->mercyTimer = 100;
+    gLaserStrength[0] = 2;
+    gBombCount[0] = 9;
+    gLifeCount[0] = 9;
+}
+
+void Spawner(void) {
+    static bool sFreeze = true;
+    static s32 sHoldTimer = 0;
+    ObjCount counter;
+
+    /* Prevent execution before gameplay */
+    if ((gGameState != GSTATE_PLAY) || (gPlayState <= PLAY_INIT)) {
+        return;
+    }
+
+    Spawner_Playground();
+
+    /* Object Selector */
+    sContPress = &gControllerPress[gMainController];
+    sContHold = &gControllerHold[gMainController];
+
+    if (sContHold->button & (L_JPAD | R_JPAD)) {
+        sHoldTimer++;
+    } else {
+        sHoldTimer = 0;
+    }
+
+    if (((sContHold->button & L_JPAD) && (sHoldTimer > 15)) || (sContPress->button & L_JPAD)) {
+        sObjId--;
+    } else if (((sContHold->button & R_JPAD) && (sHoldTimer > 15)) || (sContPress->button & R_JPAD)) {
+        sObjId++;
+    } else if (gControllerPress[0].button & D_JPAD) {
+        sFreeze ^= 1; // Freeze arwing.
+    } else if (gControllerPress[0].button & U_JPAD) {
+        Spawner_ObjKill();
+    } else if (gControllerPress[0].button & R_CBUTTONS) {
+        sObjType++;
+        switch (sObjType) {
+            case OBJ_SPAWN_EVENT:
+                sObjId = EVID_0;
+                break;
+            case OBJ_SPAWN_SCENERY:
+                sObjId = OBJ_SCENERY_CO_STONE_ARCH;
+                break;
+            case OBJ_SPAWN_SCENERY_360:
+                sObjId = OBJ_SCENERY_AND_PATH_INTERSECTION;
+                break;
+            case OBJ_SPAWN_SPRITE:
+                sObjId = OBJ_SPRITE_CO_POLE;
+                break;
+            case OBJ_SPAWN_ACTOR:
+                sObjId = OBJ_ACTOR_CO_GARUDA_1;
+                break;
+            case OBJ_SPAWN_BOSS:
+                sObjId = OBJ_BOSS_CO_GRANGA;
+                break;
+            case OBJ_SPAWN_ITEM:
+                sObjId = OBJ_ITEM_LASERS;
+                break;
+            case OBJ_SPAWN_EFFECT:
+                sObjId = OBJ_EFFECT_FIRE_SMOKE_1;
+                break;
+            default:
+                sObjId = 0;
+                break;
+        }
+    }
+
+    if (sObjId < 0) {
+        sObjId = 0;
+    }
+
+    if (sObjType >= OBJ_SPAWN_MAX) {
+        sObjType = OBJ_SPAWN_SCENERY;
+    }
+
+    /* Freeze arwing */
+    if (sFreeze) {
+        gPlayer[0].baseSpeed = 0;
+    } else {
+        gPlayer[0].baseSpeed = gArwingSpeed;
+    }
+
+    RCP_SetupDL(&gMasterDisp, SETUPDL_83);
+    gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255);
+
+    /* Spawners */
+    switch (sObjType) {
+        case OBJ_SPAWN_SCENERY:
+            Graphics_DisplaySmallText(10, 220, 1.0f, 1.0f, "SCENERY:");
+            Graphics_DisplaySmallNumber(80, 220, sObjId);
+            Spawner_Scenery(sObjId);
+            break;
+        case OBJ_SPAWN_SCENERY_360:
+            Graphics_DisplaySmallText(10, 220, 1.0f, 1.0f, "SCENERY360:");
+            Graphics_DisplaySmallNumber(100, 220, sObjId);
+            Spawner_Scenery360(sObjId);
+            break;
+        case OBJ_SPAWN_SPRITE:
+            Graphics_DisplaySmallText(10, 220, 1.0f, 1.0f, "SPRITE:");
+            Graphics_DisplaySmallNumber(65, 220, sObjId);
+            Spawner_Sprite(sObjId);
+            break;
+        case OBJ_SPAWN_ACTOR:
+            Graphics_DisplaySmallText(10, 220, 1.0f, 1.0f, "ACTOR:");
+            Graphics_DisplaySmallNumber(60, 220, sObjId);
+            Spawner_Actor(sObjId);
+            break;
+        case OBJ_SPAWN_BOSS:
+            Graphics_DisplaySmallText(10, 220, 1.0f, 1.0f, "BOSS:");
+            Graphics_DisplaySmallNumber(55, 220, sObjId);
+            Spawner_Boss(sObjId);
+            break;
+        case OBJ_SPAWN_ITEM:
+            Graphics_DisplaySmallText(10, 220, 1.0f, 1.0f, "ITEM:");
+            Graphics_DisplaySmallNumber(50, 220, sObjId);
+            Spawner_Item(sObjId);
+            break;
+        case OBJ_SPAWN_EFFECT:
+            Graphics_DisplaySmallText(10, 220, 1.0f, 1.0f, "EFFECT:");
+            Graphics_DisplaySmallNumber(65, 220, sObjId);
+            Spawner_Effect(sObjId);
+            break;
+        case OBJ_SPAWN_EVENT:
+            Graphics_DisplaySmallText(10, 220, 1.0f, 1.0f, "EVENT:");
+            Graphics_DisplaySmallNumber(60, 220, sObjId);
+            Spawner_Event(sObjId);
+            break;
+        default:
+            break;
+    }
+
+    gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
+
+    Graphics_DisplaySmallText(sTextXpos - 8, sTextYpos + 00, 1.0f, 1.0f, "SCENERY:");
+    Graphics_DisplaySmallText(sTextXpos - 4, sTextYpos + 10, 1.0f, 1.0f, "SPRITES:");
+    Graphics_DisplaySmallText(sTextXpos + 0, sTextYpos + 20, 1.0f, 1.0f, "ACTORS:");
+    Graphics_DisplaySmallText(sTextXpos + 0, sTextYpos + 30, 1.0f, 1.0f, "BOSSES:");
+    Graphics_DisplaySmallText(sTextXpos + 12, sTextYpos + 40, 1.0f, 1.0f, "ITEMS:");
+    Graphics_DisplaySmallText(sTextXpos - 8, sTextYpos + 50, 1.0f, 1.0f, "EFFECTS:");
+
+    counter = Spawner_ObjCount();
+
+    Graphics_DisplaySmallNumber(sTextXpos + 55, sTextYpos + 00, counter.scenery);
+    Graphics_DisplaySmallNumber(sTextXpos + 55, sTextYpos + 10, counter.sprite);
+    Graphics_DisplaySmallNumber(sTextXpos + 55, sTextYpos + 20, counter.actor);
+    Graphics_DisplaySmallNumber(sTextXpos + 55, sTextYpos + 30, counter.boss);
+    Graphics_DisplaySmallNumber(sTextXpos + 55, sTextYpos + 40, counter.item);
+    Graphics_DisplaySmallNumber(sTextXpos + 55, sTextYpos + 50, counter.effect);
+}

src/overlays/ovl_ending/fox_end2.c

@@ -865,7 +865,7 @@ void Ending_80191294(u32 arg0, AssetInfo* asset) {
     D_ending_80198590.unk_30 = +D_ending_801985F0.x;
     D_ending_80198590.unk_34 = -D_ending_801985F0.y;
 
-    func_display_80053658(&D_ending_80198590);
+    Display_ArwingWings(&D_ending_80198590);
 }
 
 void Ending_80191700(u32 arg0, AssetInfo* asset) {