diff --git a/.vscode/settings.json b/.vscode/settings.json
index 44ca047c..43bfbe2e 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -99,7 +99,8 @@
     "ast_training.h": "c",
     "ast_sector_x.h": "c",
     "ast_aquas.h": "c",
-    "ast_enmy_space.h": "c"
+    "ast_enmy_space.h": "c",
+    "prevent_context_reordering.h": "c"
   },
   "C_Cpp_Runner.msvcBatchPath": ""
 }
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 14ee37ad..8999f6c7 100644
--- a/Makefile
+++ b/Makefile
@@ -298,6 +298,9 @@ all: uncompressed
 toolchain:
 	@$(MAKE) -s -C tools
 
+torch:
+	@$(MAKE) -s -C tools torch
+
 init:
 	@$(MAKE) clean
 	@$(MAKE) decompress
diff --git a/assets/yaml/us/ast_aquas.yaml b/assets/yaml/us/ast_aquas.yaml
index 641bd945..d5231664 100644
--- a/assets/yaml/us/ast_aquas.yaml
+++ b/assets/yaml/us/ast_aquas.yaml
@@ -10,8 +10,8 @@
       - '#include "structs.h"'
       - '#include "sf64level.h"'
 
-D_6000000:
-  { type: TEXTURE, ctype: u8, format: IA8, width: 96, height: 13, offset: 0x6000000, symbol: D_6000000 }
+D_AQ_6000000:
+  { type: TEXTURE, ctype: u8, format: IA8, width: 96, height: 13, offset: 0x6000000, symbol: D_AQ_6000000 }
 
 D_AQ_6000AE4:
   { type: SF64:ANIM, offset: 0x6000AE4, symbol: D_AQ_6000AE4 }
@@ -797,10 +797,10 @@ D_AQ_6031D90:
   { type: VTX, count: 34, offset: 0x6031D90, symbol: D_AQ_6031D90 }
 
 D_AQ_6031FB0:
-  { type: SF64:TRIANGLE, count: 8, mesh_count: 2, offset: 0x6031FB0, symbol: D_AQ_6031FB0 }
+  { type: SF64:TRIANGLE, count: 8, offset: 0x6031FB0, symbol: D_AQ_6031FB0, mesh_symbol: D_AQ_OFFSET, mesh_count: 2}
 
 D_AQ_60320B8:
-  { type: SF64:TRIANGLE, count: 30, mesh_count: 1, offset: 0x60320B8, symbol: D_AQ_60320B8 }
+  { type: SF64:TRIANGLE, count: 30, offset: 0x60320B8, symbol: D_AQ_60320B8, mesh_symbol: D_AQ_OFFSET }
 
 D_AQ_6032388:
-  { type: SF64:TRIANGLE, count: 28, offset: 0x6032388, symbol: D_AQ_6032388 }
+  { type: SF64:TRIANGLE, count: 28, offset: 0x6032388, symbol: D_AQ_6032388, mesh_symbol: D_AQ_OFFSET }
diff --git a/assets/yaml/us/ast_area_6.yaml b/assets/yaml/us/ast_area_6.yaml
index 4b6b559c..d0901f73 100644
--- a/assets/yaml/us/ast_area_6.yaml
+++ b/assets/yaml/us/ast_area_6.yaml
@@ -8,9 +8,285 @@
       - '#include "gfx.h"'
       - '#include "sf64object.h"'
       - '#include "structs.h"'
+      - '#include "sf64level.h"'
+D_A6_6000000:
+  { type: TEXTURE, ctype: u8, format: IA8, width: 104, height: 28, offset: 0x6000000, symbol: D_A6_6000000 }
 
-D_6028454:
-  {type: SF64:HITBOX, offset: 0x6028454, symbol: D_6028454}
+D_A6_6000B60:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x06000B60, symbol: D_A6_6000B60 }
 
-D_6028578:
-  {type: SF64:HITBOX, offset: 0x6028578, symbol: D_6028578}
\ No newline at end of file
+D_A6_6001A80:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x06001A80, symbol: D_A6_6001A80 }
+
+D_A6_60029A0:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x060029A0, symbol: D_A6_60029A0 }
+
+D_A6_60038C0:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x060038C0, symbol: D_A6_60038C0 }
+
+D_A6_60047E0:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x060047E0, symbol: D_A6_60047E0 }
+
+D_A6_6005700:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x06005700, symbol: D_A6_6005700 }
+
+D_A6_6006620:
+  { type: TEXTURE, ctype: u8, format: CI4, width: 48, height: 44, offset: 0x06006620, symbol: D_A6_6006620, tlut: 0x06006A40 }
+
+D_A6_6006A40:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 4, offset: 0x6006A40, symbol: D_A6_6006A40}
+
+PAD_A6_6006A48:
+  { type: BLOB, size: 0x8, offset: 0x6006A48, symbol: PAD_A6_6006A48}
+
+D_A6_6008918:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06008918, symbol: D_A6_6008918 }
+
+D_A6_6008B18:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06008B18, symbol: D_A6_6008B18 }
+
+D_A6_6008D18:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06008D18, symbol: D_A6_6008D18 }
+
+D_A6_6008F18:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06008F18, symbol: D_A6_6008F18 }
+
+D_A6_6009718:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 16, offset: 0x06009718, symbol: D_A6_6009718 }
+
+D_A6_6009B18:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06009B18, symbol: D_A6_6009B18 }
+
+PAD_A6_600A318:
+  { type: BLOB, size: 0x8, offset: 0x600A318, symbol: PAD_A6_600A318}
+
+PAD_A6_600C1E8:
+  { type: BLOB, size: 0x8, offset: 0x600C1E8, symbol: PAD_A6_600C1E8}
+
+PAD_A6_600E0B8:
+  { type: BLOB, size: 0x8, offset: 0x600E0B8, symbol: PAD_A6_600E0B8}
+
+D_A6_600E0C0:
+  { type: GFX, offset: 0x600E0C0, symbol: D_A6_600E0C0 }
+
+D_A6_600EBE8:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 16, offset: 0x0600EBE8, symbol: D_A6_600EBE8 }
+
+D_A6_600EFE8:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0600EFE8, symbol: D_A6_600EFE8 }
+
+PAD_A6_600F1E8:
+  { type: BLOB, size: 0x8, offset: 0x600F1E8, symbol: PAD_A6_600F1E8}
+
+D_A6_600F1F0:
+  { type: GFX, offset: 0x600F1F0, symbol: D_A6_600F1F0 }
+
+D_A6_600F850:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0600F850, symbol: D_A6_600F850 }
+
+D_A6_6010A88:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06010A88, symbol: D_A6_6010A88 }
+
+D_A6_6011288:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 16, offset: 0x06011288, symbol: D_A6_6011288 }
+
+D_A6_6011688:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06011688, symbol: D_A6_6011688 }
+
+D_A6_6011888:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width:  8, height:  8, offset: 0x06011888, symbol: D_A6_6011888 }
+
+PAD_A6_6011908:
+  { type: BLOB, size: 0x8, offset: 0x6011908, symbol: PAD_A6_6011908}
+
+D_A6_6011910:
+  { type: GFX, offset: 0x6011910, symbol: D_A6_6011910 }
+
+D_A6_6011D48:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06011D48, symbol: D_A6_6011D48 }
+
+PAD_A6_6012548:
+  { type: BLOB, size: 0x8, offset: 0x6012548, symbol: PAD_A6_6012548}
+
+D_A6_6012550:
+  { type: GFX, offset: 0x6012550, symbol: D_A6_6012550 }
+
+D_A6_6012840:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06012840, symbol: D_A6_6012840 }
+
+D_A6_6012A40:
+  { type: GFX, offset: 0x6012A40, symbol: D_A6_6012A40 }
+
+D_A6_6013CD8:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06013CD8, symbol: D_A6_6013CD8 }
+
+D_A6_60144D8:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x060144D8, symbol: D_A6_60144D8 }
+
+D_A6_6014CD8:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06014CD8, symbol: D_A6_6014CD8 }
+
+D_A6_60154D8:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x060154D8, symbol: D_A6_60154D8 }
+
+D_A6_6015CD8:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06015CD8, symbol: D_A6_6015CD8 }
+
+PAD_A6_6015ED8:
+  { type: BLOB, size: 0x8, offset: 0x6015ED8, symbol: PAD_A6_6015ED8}
+
+D_A6_6015EE0:
+  { type: GFX, offset: 0x6015EE0, symbol: D_A6_6015EE0 }
+
+PAD_A6_6016188:
+  { type: BLOB, size: 0x8, offset: 0x6016188, symbol: PAD_A6_6016188}
+
+D_A6_6016190:
+  { type: GFX, offset: 0x6016190, symbol: D_A6_6016190 }
+
+D_A6_6017120:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06017120, symbol: D_A6_6017120 }
+
+D_A6_6017920:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06017920, symbol: D_A6_6017920 }
+
+D_A6_6017B20:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06017B20, symbol: D_A6_6017B20 }
+
+D_A6_6017D20:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06017D20, symbol: D_A6_6017D20 }
+
+D_A6_6017F20:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x06017F20, symbol: D_A6_6017F20 }
+
+D_A6_6018720:
+  { type: GFX, offset: 0x6018720, symbol: D_A6_6018720 }
+
+D_A6_60187F8:
+  { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x60187F8, symbol: D_A6_60187F8, tlut: 0x6018878}
+
+D_A6_6018878:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0x6018878, symbol: D_A6_6018878}
+
+PAD_A6_6018888:
+  { type: BLOB, size: 0x8, offset: 0x6018888, symbol: PAD_A6_6018888}
+
+D_A6_6018994:
+  { type: SF64:ANIM, offset: 0x6018994, symbol: D_A6_6018994 }
+
+D_A6_6018BA0:
+  { type: SF64:SKELETON, offset: 0x6018BA0, symbol: D_A6_6018BA0 }
+
+PAD_A6_6018BE4:
+  { type: BLOB, size: 0xC, offset: 0x6018BE4, symbol: PAD_A6_6018BE4}
+
+D_A6_6018BF0:
+  { type: GFX, offset: 0x6018BF0, symbol: D_A6_6018BF0 }
+
+D_A6_6019130:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06019130, symbol: D_A6_6019130 }
+
+D_A6_6019330:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06019330, symbol: D_A6_6019330 }
+
+D_A6_6019530:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06019530, symbol: D_A6_6019530 }
+
+D_A6_6019730:
+  { type: GFX, offset: 0x6019730, symbol: D_A6_6019730 }
+
+D_A6_6019B20:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06019B20, symbol: D_A6_6019B20 }
+
+D_A6_6019D20:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06019D20, symbol: D_A6_6019D20 }
+
+D_A6_6019F20:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x06019F20, symbol: D_A6_6019F20 }
+
+D_A6_601A120:
+  { type: GFX, offset: 0x601A120, symbol: D_A6_601A120 }
+
+D_A6_601A220:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0601A220, symbol: D_A6_601A220 }
+
+D_A6_601AA20:
+  { type: GFX, offset: 0x601AA20, symbol: D_A6_601AA20 }
+
+D_A6_601AAA8:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0601AAA8, symbol: D_A6_601AAA8 }
+
+PAD_A6_601B2A8:
+  { type: BLOB, size: 0x8, offset: 0x601B2A8, symbol: PAD_A6_601B2A8}
+
+D_A6_601B2B0:
+  { type: GFX, offset: 0x601B2B0, symbol: D_A6_601B2B0 }
+
+D_A6_601B338:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0601B338, symbol: D_A6_601B338 }
+
+PAD_A6_601BB38:
+  { type: BLOB, size: 0x8, offset: 0x601BB38, symbol: PAD_A6_601BB38}
+
+D_A6_601BB40:
+  { type: GFX, offset: 0x601BB40, symbol: D_A6_601BB40 }
+
+D_A6_601BF20:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x0601BF20, symbol: D_A6_601BF20 }
+
+D_A6_601CF20:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x0601CF20, symbol: D_A6_601CF20 }
+
+D_A6_601DF20:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x0601DF20, symbol: D_A6_601DF20 }
+
+D_A6_601EF20:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x0601EF20, symbol: D_A6_601EF20 }
+
+D_A6_601FF20:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x0601FF20, symbol: D_A6_601FF20 }
+
+D_A6_6020F20:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x06020F20, symbol: D_A6_6020F20 }
+
+D_A6_6021F20:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x06021F20, symbol: D_A6_6021F20 }
+
+D_A6_6022F20:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x06022F20, symbol: D_A6_6022F20 }
+
+D_A6_6023F20:
+  { type: SF64:ENV_SETTINGS, offset: 0x6023F20, symbol: D_A6_6023F20}
+
+D_A6_6023F64:
+  { type: SF64:OBJECT_INIT, offset: 0x6023F64, symbol: D_A6_6023F64}
+
+D_A6_6027F50:
+  { type: SF64:SCRIPT, offset: 0x6027F50, symbol: D_A6_6027F50}
+
+D_A6_60280E0:
+  { type: SF64:HITBOX, offset: 0x60280E0, symbol: D_A6_60280E0 }
+
+D_A6_6028254:
+  { type: SF64:HITBOX, offset: 0x6028254, symbol: D_A6_6028254 }
+
+D_A6_60282A0:
+  { type: SF64:HITBOX, offset: 0x60282A0, symbol: D_A6_60282A0 }
+
+D_A6_6028454:
+  { type: SF64:HITBOX, offset: 0x6028454, symbol: D_A6_6028454 }
+
+D_A6_6028578:
+  { type: SF64:HITBOX, offset: 0x6028578, symbol: D_A6_6028578 }
+
+PAD_A6_6028754:
+  { type: BLOB, size: 0xC, offset: 0x6028754, symbol: PAD_A6_6028754}
+
+D_A6_6028760:
+  { type: SF64:ENV_SETTINGS, offset: 0x6028760, symbol: D_A6_6028760}
+
+D_A6_60287A4:
+  { type: SF64:OBJECT_INIT, offset: 0x60287A4, symbol: D_A6_60287A4}
+
+D_A6_60289FC:
+  { type: SF64:SCRIPT, offset: 0x60289FC, symbol: D_A6_60289FC}
diff --git a/assets/yaml/us/ast_arwing.yaml b/assets/yaml/us/ast_arwing.yaml
index 47cbc758..1ef3b94a 100644
--- a/assets/yaml/us/ast_arwing.yaml
+++ b/assets/yaml/us/ast_arwing.yaml
@@ -18,203 +18,209 @@ D_arwing_3000080:
 D_arwing_3000090:
   { type: GFX, offset: 0x3000090, symbol: D_arwing_3000090 }
 
-PAD_3001C88:
-  { type: BLOB, offset: 0x3001C88, size: 0x8, symbol: PAD_3001C88 }
+PAD_arwing_3001C88:
+  { type: BLOB, offset: 0x3001C88, size: 0x8, symbol: PAD_arwing_3001C88 }
 
-D_3001C90:
-  { type: GFX, offset: 0x3001C90, symbol: D_3001C90 }
+D_arwing_3001C90:
+  { type: GFX, offset: 0x3001C90, symbol: D_arwing_3001C90 }
 
-D_3003960:
-  { type: TEXTURE, format: RGBA16, offset: 0x3003960, width: 8, height: 8, ctype: u16, symbol: D_3003960 }
+D_arwing_3003960:
+  { type: TEXTURE, format: RGBA16, offset: 0x3003960, width: 8, height: 8, ctype: u16, symbol: D_arwing_3003960 }
 
-D_30039E0:
-  { type: TEXTURE, format: RGBA16, offset: 0x30039E0, width: 8, height: 8, ctype: u16, symbol: D_30039E0 }
+D_arwing_30039E0:
+  { type: TEXTURE, format: RGBA16, offset: 0x30039E0, width: 8, height: 8, ctype: u16, symbol: D_arwing_30039E0 }
 
-D_3003A60:
-  { type: TEXTURE, format: RGBA16, offset: 0x3003A60, width: 8, height: 8, ctype: u16, symbol: D_3003A60 }
+D_arwing_3003A60:
+  { type: TEXTURE, format: RGBA16, offset: 0x3003A60, width: 8, height: 8, ctype: u16, symbol: D_arwing_3003A60 }
 
-D_3003AE0:
-  { type: TEXTURE, format: RGBA16, offset: 0x3003AE0, width: 8, height: 8, ctype: u16, symbol: D_3003AE0 }
+D_arwing_3003AE0:
+  { type: TEXTURE, format: RGBA16, offset: 0x3003AE0, width: 8, height: 8, ctype: u16, symbol: D_arwing_3003AE0 }
 
-D_3003B60:
-  { type: TEXTURE, format: RGBA16, offset: 0x3003B60, width: 8, height: 8, ctype: u16, symbol: D_3003B60 }
+D_arwing_3003B60:
+  { type: TEXTURE, format: RGBA16, offset: 0x3003B60, width: 8, height: 8, ctype: u16, symbol: D_arwing_3003B60 }
 
-D_3003BE0:
-  { type: TEXTURE, format: RGBA16, offset: 0x3003BE0, width: 8, height: 8, ctype: u16, symbol: D_3003BE0 }
+D_arwing_3003BE0:
+  { type: TEXTURE, format: RGBA16, offset: 0x3003BE0, width: 8, height: 8, ctype: u16, symbol: D_arwing_3003BE0 }
 
-D_3003C60:
-  { type: TEXTURE, format: RGBA16, offset: 0x3003C60, width: 8, height: 8, ctype: u16, symbol: D_3003C60 }
+D_arwing_3003C60:
+  { type: TEXTURE, format: RGBA16, offset: 0x3003C60, width: 8, height: 8, ctype: u16, symbol: D_arwing_3003C60 }
 
-D_3003CE0:
-  { type: GFX, offset: 0x3003CE0, symbol: D_3003CE0 }
+D_arwing_3003CE0:
+  { type: GFX, offset: 0x3003CE0, symbol: D_arwing_3003CE0 }
 
-D_3005AB0:
-  { type: GFX, offset: 0x3005AB0, symbol: D_3005AB0 }
+D_arwing_3005AB0:
+  { type: GFX, offset: 0x3005AB0, symbol: D_arwing_3005AB0 }
 
-D_30074D0:
-  { type: TEXTURE, format: RGBA16, offset: 0x30074D0, width: 8, height: 8, ctype: u16, symbol: D_30074D0 }
+D_arwing_30074D0:
+  { type: TEXTURE, format: RGBA16, offset: 0x30074D0, width: 8, height: 8, ctype: u16, symbol: D_arwing_30074D0 }
 
-D_3007550:
-  { type: TEXTURE, format: RGBA16, offset: 0x3007550, width: 8, height: 8, ctype: u16, symbol: D_3007550 }
+D_arwing_3007550:
+  { type: TEXTURE, format: RGBA16, offset: 0x3007550, width: 8, height: 8, ctype: u16, symbol: D_arwing_3007550 }
 
-D_30075D0:
-  { type: TEXTURE, format: RGBA16, offset: 0x30075D0, width: 8, height: 8, ctype: u16, symbol: D_30075D0 }
+D_arwing_30075D0:
+  { type: TEXTURE, format: RGBA16, offset: 0x30075D0, width: 8, height: 8, ctype: u16, symbol: D_arwing_30075D0 }
 
-D_3007650:
-  { type: GFX, offset: 0x3007650, symbol: D_3007650 }
+D_arwing_3007650:
+  { type: GFX, offset: 0x3007650, symbol: D_arwing_3007650 }
 
 ast_arwing_seg3_vtx_7A20:
   { type: VTX, offset: 0x3007A20, count: 244, symbol: ast_arwing_seg3_vtx_7A20 }
 
-D_3008960:
-  { type: TEXTURE, format: RGBA16, offset: 0x3008960, width: 64, height: 32, ctype: u16, symbol: D_3008960 }
+D_arwing_3008960:
+  { type: TEXTURE, format: RGBA16, offset: 0x3008960, width: 64, height: 32, ctype: u16, symbol: D_arwing_3008960 }
 
-D_3009960:
-  { type: TEXTURE, format: RGBA16, offset: 0x3009960, width: 16, height: 16, ctype: u16, symbol: D_3009960 }
+D_arwing_3009960:
+  { type: TEXTURE, format: RGBA16, offset: 0x3009960, width: 16, height: 16, ctype: u16, symbol: D_arwing_3009960 }
 
-D_3009B60:
-  { type: GFX, offset: 0x3009B60, symbol: D_3009B60 }
+D_arwing_3009B60:
+  { type: GFX, offset: 0x3009B60, symbol: D_arwing_3009B60 }
 
-D_300AC48:
-  { type: TEXTURE, format: RGBA16, offset: 0x300AC48, width: 32, height: 32, ctype: u16, symbol: D_300AC48 }
+D_arwing_300AC48:
+  { type: TEXTURE, format: RGBA16, offset: 0x300AC48, width: 32, height: 32, ctype: u16, symbol: D_arwing_300AC48 }
 
-D_300B448:
-  { type: TEXTURE, format: RGBA16, offset: 0x300B448, width: 32, height: 32, ctype: u16, symbol: D_300B448 }
+D_arwing_300B448:
+  { type: TEXTURE, format: RGBA16, offset: 0x300B448, width: 32, height: 32, ctype: u16, symbol: D_arwing_300B448 }
 
-D_300BC48:
-  { type: TEXTURE, format: RGBA16, offset: 0x300BC48, width: 32, height: 32, ctype: u16, symbol: D_300BC48 }
+D_arwing_300BC48:
+  { type: TEXTURE, format: RGBA16, offset: 0x300BC48, width: 32, height: 32, ctype: u16, symbol: D_arwing_300BC48 }
 
-D_300C448:
-  { type: TEXTURE, format: RGBA16, offset: 0x300C448, width: 32, height: 32, ctype: u16, symbol: D_300C448 }
+D_arwing_300C448:
+  { type: TEXTURE, format: RGBA16, offset: 0x300C448, width: 32, height: 32, ctype: u16, symbol: D_arwing_300C448 }
 
-D_300CC48:
-  { type: TEXTURE, format: RGBA16, offset: 0x300CC48, width: 32, height: 32, ctype: u16, symbol: D_300CC48 }
+D_arwing_300CC48:
+  { type: TEXTURE, format: RGBA16, offset: 0x300CC48, width: 32, height: 32, ctype: u16, symbol: D_arwing_300CC48 }
 
-D_300D448:
-  { type: TEXTURE, format: RGBA16, offset: 0x300D448, width: 32, height: 32, ctype: u16, symbol: D_300D448 }
+D_arwing_300D448:
+  { type: TEXTURE, format: RGBA16, offset: 0x300D448, width: 32, height: 32, ctype: u16, symbol: D_arwing_300D448 }
 
-D_300DC48:
-  { type: TEXTURE, format: RGBA16, offset: 0x300DC48, width: 32, height: 32, ctype: u16, symbol: D_300DC48 }
+D_arwing_300DC48:
+  { type: TEXTURE, format: RGBA16, offset: 0x300DC48, width: 32, height: 32, ctype: u16, symbol: D_arwing_300DC48 }
 
-D_300E448:
-  { type: TEXTURE, format: RGBA16, offset: 0x300E448, width: 32, height: 32, ctype: u16, symbol: D_300E448 }
+D_arwing_300E448:
+  { type: TEXTURE, format: RGBA16, offset: 0x300E448, width: 32, height: 32, ctype: u16, symbol: D_arwing_300E448 }
 
-D_300EC48:
-  { type: TEXTURE, format: RGBA16, offset: 0x300EC48, width: 32, height: 32, ctype: u16, symbol: D_300EC48 }
+D_arwing_300EC48:
+  { type: TEXTURE, format: RGBA16, offset: 0x300EC48, width: 32, height: 32, ctype: u16, symbol: D_arwing_300EC48 }
 
-D_300F448:
-  { type: TEXTURE, format: RGBA16, offset: 0x300F448, width: 64, height: 32, ctype: u16, symbol: D_300F448 }
+D_arwing_300F448:
+  { type: TEXTURE, format: RGBA16, offset: 0x300F448, width: 64, height: 32, ctype: u16, symbol: D_arwing_300F448 }
 
-D_3010448:
-  { type: TEXTURE, format: RGBA16, offset: 0x3010448, width: 64, height: 32, ctype: u16, symbol: D_3010448, pad: 0x8 }
+D_arwing_3010448:
+  { type: TEXTURE, format: RGBA16, offset: 0x3010448, width: 64, height: 32, ctype: u16, symbol: D_arwing_3010448, pad: 0x8 }
 
-D_3011720:
-  { type: GFX, offset: 0x3011720, symbol: D_3011720 }
+D_arwing_3011720:
+  { type: GFX, offset: 0x3011720, symbol: D_arwing_3011720 }
 
-D_30119F0:
-  { type: TEXTURE, format: RGBA16, offset: 0x30119F0, width: 32, height: 32, ctype: u16, symbol: D_30119F0 }
+D_arwing_30119F0:
+  { type: TEXTURE, format: RGBA16, offset: 0x30119F0, width: 32, height: 32, ctype: u16, symbol: D_arwing_30119F0 }
 
-D_30121F0:
-  { type: TEXTURE, format: RGBA16, offset: 0x30121F0, width: 32, height: 32, ctype: u16, symbol: D_30121F0 }
+D_arwing_30121F0:
+  { type: TEXTURE, format: RGBA16, offset: 0x30121F0, width: 32, height: 32, ctype: u16, symbol: D_arwing_30121F0 }
 
-D_30129F0:
-  { type: TEXTURE, format: RGBA16, offset: 0x30129F0, width: 32, height: 32, ctype: u16, symbol: D_30129F0 }
+D_arwing_30129F0:
+  { type: TEXTURE, format: RGBA16, offset: 0x30129F0, width: 32, height: 32, ctype: u16, symbol: D_arwing_30129F0 }
 
-D_30131F0:
-  { type: GFX, offset: 0x30131F0, symbol: D_30131F0 }
+D_arwing_30131F0:
+  { type: GFX, offset: 0x30131F0, symbol: D_arwing_30131F0 }
 
-D_30137E8:
-  { type: TEXTURE, format: RGBA16, offset: 0x30137E8, width: 32, height: 32, ctype: u16, symbol: D_30137E8 }
+D_arwing_30137E8:
+  { type: TEXTURE, format: RGBA16, offset: 0x30137E8, width: 32, height: 32, ctype: u16, symbol: D_arwing_30137E8 }
 
-D_3013FE8:
-  { type: TEXTURE, format: RGBA16, offset: 0x3013FE8, width: 32, height: 32, ctype: u16, symbol: D_3013FE8 }
+D_arwing_3013FE8:
+  { type: TEXTURE, format: RGBA16, offset: 0x3013FE8, width: 32, height: 32, ctype: u16, symbol: D_arwing_3013FE8 }
 
-D_30147E8:
-  { type: TEXTURE, format: RGBA16, offset: 0x30147E8, width: 16, height: 32, ctype: u16, symbol: D_30147E8, pad: 8 }
+D_arwing_30147E8:
+  { type: TEXTURE, format: RGBA16, offset: 0x30147E8, width: 16, height: 32, ctype: u16, symbol: D_arwing_30147E8, pad: 8 }
 
-D_3014BF0:
-  { type: GFX, offset: 0x3014BF0, symbol: D_3014BF0 }
+D_arwing_3014BF0:
+  { type: GFX, offset: 0x3014BF0, symbol: D_arwing_3014BF0 }
 
-D_3014F20:
-  { type: TEXTURE, format: RGBA16, offset: 0x3014F20, width: 16, height: 16, ctype: u16, symbol: D_3014F20 }
+D_arwing_3014F20:
+  { type: TEXTURE, format: RGBA16, offset: 0x3014F20, width: 16, height: 16, ctype: u16, symbol: D_arwing_3014F20 }
 
-D_3015120:
-  { type: GFX, offset: 0x3015120, symbol: D_3015120 }
+D_arwing_3015120:
+  { type: GFX, offset: 0x3015120, symbol: D_arwing_3015120 }
 
-PAD_30155D8:
-  { type: BLOB, offset: 0x30155D8, size: 0x8, symbol: PAD_30155D8 }
+PAD_arwing_30155D8:
+  { type: BLOB, offset: 0x30155D8, size: 0x8, symbol: PAD_arwing_30155D8 }
 
-PAD_3015728:
-  { type: BLOB, offset: 0x3015728, size: 0x8, symbol: PAD_3015728 }
+D_arwing_30155E0:
+  { type: GFX, offset: 0x30155E0, symbol: D_arwing_30155E0}
 
-PAD_3015878:
-  { type: BLOB, offset: 0x3015878, size: 0x8, symbol: PAD_3015878 }
+PAD_arwing_3015728:
+  { type: BLOB, offset: 0x3015728, size: 0x8, symbol: PAD_arwing_3015728 }
 
-PAD_30159C8:
-  { type: BLOB, offset: 0x30159C8, size: 0x8, symbol: PAD_30159C8 }
+PAD_arwing_3015878:
+  { type: BLOB, offset: 0x3015878, size: 0x8, symbol: PAD_arwing_3015878 }
 
-D_3015AF4:
-  { type: SF64:ANIM, offset: 0x3015AF4, symbol: D_3015AF4 }
+PAD_arwing_30159C8:
+  { type: BLOB, offset: 0x30159C8, size: 0x8, symbol: PAD_arwing_30159C8 }
 
-D_3015C28:
-  { type: SF64:ANIM, offset: 0x3015C28, symbol: D_3015C28 }
+D_arwing_3015AF4:
+  { type: SF64:ANIM, offset: 0x3015AF4, symbol: D_arwing_3015AF4 }
 
-PAD_3015C34:
-  { type: BLOB, offset: 0x3015C34, size: 0xC, symbol: PAD_3015C34 }
+D_arwing_3015C28:
+  { type: SF64:ANIM, offset: 0x3015C28, symbol: D_arwing_3015C28 }
 
-D_3015D68:
-  { type: SF64:ANIM, offset: 0x3015D68, symbol: D_3015D68 }
+PAD_arwing_3015C34:
+  { type: BLOB, offset: 0x3015C34, size: 0xC, symbol: PAD_arwing_3015C34 }
 
-PAD_3015D74:
-  { type: BLOB, offset: 0x3015D74, size: 0xC, symbol: PAD_3015D74 }
+D_arwing_3015D68:
+  { type: SF64:ANIM, offset: 0x3015D68, symbol: D_arwing_3015D68 }
 
-D_3015D80:
-  { type: GFX, offset: 0x3015D80, symbol: D_3015D80 }
+PAD_arwing_3015D74:
+  { type: BLOB, offset: 0x3015D74, size: 0xC, symbol: PAD_arwing_3015D74 }
 
-PAD_3016298:
-  { type: BLOB, offset: 0x3016298, size: 0x8, symbol: PAD_3016298 }
+D_arwing_3015D80:
+  { type: GFX, offset: 0x3015D80, symbol: D_arwing_3015D80 }
 
-D_30163C4:
-  { type: SF64:ANIM, offset: 0x30163C4, symbol: D_30163C4 }
+PAD_arwing_3016298:
+  { type: BLOB, offset: 0x3016298, size: 0x8, symbol: PAD_arwing_3016298 }
 
-D_3016610:
-  { type: SF64:SKELETON, offset: 0x3016610, symbol: D_3016610 }
+D_arwing_30163C4:
+  { type: SF64:ANIM, offset: 0x30163C4, symbol: D_arwing_30163C4 }
 
-PAD_301665C:
-  { type: BLOB, offset: 0x301665C, size: 0x4, symbol: PAD_301665C }
+D_arwing_3016610:
+  { type: SF64:SKELETON, offset: 0x3016610, symbol: D_arwing_3016610 }
 
-PAD_3016B28:
-  { type: BLOB, offset: 0x3016B28, size: 0x8, symbol: PAD_3016B28 }
+PAD_arwing_301665C:
+  { type: BLOB, offset: 0x301665C, size: 0x4, symbol: PAD_arwing_301665C }
 
-D_3016B30:
-  { type: GFX, offset: 0x3016B30, symbol: D_3016B30 }
+D_arwing_3016660:
+  { type: GFX, offset: 0x3016660, symbol: D_arwing_3016660}
 
-D_3016BB8:
-  { type: TEXTURE, format: IA8, offset: 0x3016BB8, width: 16, height: 16, ctype: u8, symbol: D_3016BB8, pad: 8 }
+PAD_arwing_3016B28:
+  { type: BLOB, offset: 0x3016B28, size: 0x8, symbol: PAD_arwing_3016B28 }
 
-D_3016CC0:
-  { type: GFX, offset: 0x3016CC0, symbol: D_3016CC0 }
+D_arwing_3016B30:
+  { type: GFX, offset: 0x3016B30, symbol: D_arwing_3016B30 }
 
-D_30182C8:
-  { type: TEXTURE, format: RGBA16, offset: 0x30182C8, width: 8, height: 8, ctype: u16, symbol: D_30182C8 }
+D_arwing_3016BB8:
+  { type: TEXTURE, format: IA8, offset: 0x3016BB8, width: 16, height: 16, ctype: u8, symbol: D_arwing_3016BB8, pad: 8 }
 
-D_3018348:
-  { type: TEXTURE, format: RGBA16, offset: 0x3018348, width: 8, height: 8, ctype: u16, symbol: D_3018348, pad: 8 }
+D_arwing_3016CC0:
+  { type: GFX, offset: 0x3016CC0, symbol: D_arwing_3016CC0 }
 
-D_30183D0:
-  { type: GFX, offset: 0x30183D0, symbol: D_30183D0 }
+D_arwing_30182C8:
+  { type: TEXTURE, format: RGBA16, offset: 0x30182C8, width: 8, height: 8, ctype: u16, symbol: D_arwing_30182C8 }
 
-D_30184D8:
-  { type: TEXTURE, format: RGBA16, offset: 0x30184D8, width: 32, height: 32, ctype: u16, symbol: D_30184D8 }
+D_arwing_3018348:
+  { type: TEXTURE, format: RGBA16, offset: 0x3018348, width: 8, height: 8, ctype: u16, symbol: D_arwing_3018348, pad: 8 }
 
-D_3018CD8:
-  { type: TEXTURE, format: RGBA16, offset: 0x3018CD8, width: 64, height: 16, ctype: u16, symbol: D_3018CD8, pad: 8 }
+D_arwing_30183D0:
+  { type: GFX, offset: 0x30183D0, symbol: D_arwing_30183D0 }
 
-D_30194E0:
-  { type: GFX, offset: 0x30194E0, symbol: D_30194E0 }
+D_arwing_30184D8:
+  { type: TEXTURE, format: RGBA16, offset: 0x30184D8, width: 32, height: 32, ctype: u16, symbol: D_arwing_30184D8 }
 
-D_30195E8:
-  { type: TEXTURE, format: RGBA16, offset: 0x30195E8, width: 32, height: 32, ctype: u16, symbol: D_30195E8 }
+D_arwing_3018CD8:
+  { type: TEXTURE, format: RGBA16, offset: 0x3018CD8, width: 64, height: 16, ctype: u16, symbol: D_arwing_3018CD8, pad: 8 }
 
-PAD_3019DE8:
-  { type: BLOB, offset: 0x3019DE8, size: 0x8, symbol: PAD_3019DE8 }
\ No newline at end of file
+D_arwing_30194E0:
+  { type: GFX, offset: 0x30194E0, symbol: D_arwing_30194E0 }
+
+D_arwing_30195E8:
+  { type: TEXTURE, format: RGBA16, offset: 0x30195E8, width: 32, height: 32, ctype: u16, symbol: D_arwing_30195E8 }
+
+PAD_arwing_3019DE8:
+  { type: BLOB, offset: 0x3019DE8, size: 0x8, symbol: PAD_arwing_3019DE8 }
\ No newline at end of file
diff --git a/assets/yaml/us/ast_bg_planet.yaml b/assets/yaml/us/ast_bg_planet.yaml
index 5e011ba5..491be2b4 100644
--- a/assets/yaml/us/ast_bg_planet.yaml
+++ b/assets/yaml/us/ast_bg_planet.yaml
@@ -15,116 +15,116 @@ D_BG_PLANET_2000000:
 D_BG_PLANET_2000088:
   { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x2000088, symbol: D_BG_PLANET_2000088, pad: 8 }
 
-D_2001090:
-  { type: GFX, offset: 0x2001090, symbol: D_2001090 }
+D_BG_PLANET_2001090:
+  { type: GFX, offset: 0x2001090, symbol: D_BG_PLANET_2001090 }
 
-D_2001118:
-  { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x02001118, symbol: D_2001118, pad: 8 }
+D_BG_PLANET_2001118:
+  { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x02001118, symbol: D_BG_PLANET_2001118, pad: 8 }
 
-D_2002120:
-  { type: GFX, offset: 0x2002120, symbol: D_2002120 }
+D_BG_PLANET_2002120:
+  { type: GFX, offset: 0x2002120, symbol: D_BG_PLANET_2002120 }
 
-D_20021A8:
-  { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x020021A8, symbol: D_20021A8, pad: 8 }
+D_BG_PLANET_20021A8:
+  { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x020021A8, symbol: D_BG_PLANET_20021A8, pad: 8 }
 
-D_20031B0:
-  { type: GFX, offset: 0x20031B0, symbol: D_20031B0 }
+D_BG_PLANET_20031B0:
+  { type: GFX, offset: 0x20031B0, symbol: D_BG_PLANET_20031B0 }
 
-D_2003238:
-  { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x02003238, symbol: D_2003238, pad: 8 }
+D_BG_PLANET_2003238:
+  { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x02003238, symbol: D_BG_PLANET_2003238, pad: 8 }
 
-D_2004240:
-  { type: GFX, offset: 0x2004240, symbol: D_2004240 }
+D_BG_PLANET_2004240:
+  { type: GFX, offset: 0x2004240, symbol: D_BG_PLANET_2004240 }
 
-D_20042C8:
-  { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x020042C8, symbol: D_20042C8, pad: 8 }
+D_BG_PLANET_20042C8:
+  { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x020042C8, symbol: D_BG_PLANET_20042C8, pad: 8 }
 
-D_20052D0:
-  { type: GFX, offset: 0x20052D0, symbol: D_20052D0 }
+D_BG_PLANET_20052D0:
+  { type: GFX, offset: 0x20052D0, symbol: D_BG_PLANET_20052D0 }
 
-D_2005358:
-  { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x02005358, symbol: D_2005358, pad: 8 }
+D_BG_PLANET_2005358:
+  { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x02005358, symbol: D_BG_PLANET_2005358, pad: 8 }
 
-D_2006360:
-  { type: GFX, offset: 0x2006360, symbol: D_2006360 }
+D_BG_PLANET_2006360:
+  { type: GFX, offset: 0x2006360, symbol: D_BG_PLANET_2006360 }
 
-D_20063E8:
-  { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x020063E8, symbol: D_20063E8, pad: 8 }
+D_BG_PLANET_20063E8:
+  { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x020063E8, symbol: D_BG_PLANET_20063E8, pad: 8 }
 
-D_20073F0:
-  { type: GFX, offset: 0x20073F0, symbol: D_20073F0 }
+D_BG_PLANET_20073F0:
+  { type: GFX, offset: 0x20073F0, symbol: D_BG_PLANET_20073F0 }
 
-D_2007478:
-  { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x02007478, symbol: D_2007478, pad: 8 }
+D_BG_PLANET_2007478:
+  { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x02007478, symbol: D_BG_PLANET_2007478, pad: 8 }
 
-D_2008480:
-  { type: GFX, offset: 0x2008480, symbol: D_2008480 }
+D_BG_PLANET_2008480:
+  { type: GFX, offset: 0x2008480, symbol: D_BG_PLANET_2008480 }
 
-D_2008508:
-  { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x02008508, symbol: D_2008508, pad: 8 }
+D_BG_PLANET_2008508:
+  { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x02008508, symbol: D_BG_PLANET_2008508, pad: 8 }
 
-D_2009510:
-  { type: GFX, offset: 0x2009510, symbol: D_2009510 }
+D_BG_PLANET_2009510:
+  { type: GFX, offset: 0x2009510, symbol: D_BG_PLANET_2009510 }
 
-D_2009598:
-  { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x02009598, symbol: D_2009598, pad: 8 }
+D_BG_PLANET_2009598:
+  { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x02009598, symbol: D_BG_PLANET_2009598, pad: 8 }
 
-D_200A5A0:
-  { type: GFX, offset: 0x200A5A0, symbol: D_200A5A0 }
+D_BG_PLANET_200A5A0:
+  { type: GFX, offset: 0x200A5A0, symbol: D_BG_PLANET_200A5A0 }
 
-D_200A628:
-  { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x0200A628, symbol: D_200A628, pad: 8 }
+D_BG_PLANET_200A628:
+  { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x0200A628, symbol: D_BG_PLANET_200A628, pad: 8 }
 
-D_200B630:
-  { type: GFX, offset: 0x200B630, symbol: D_200B630 }
+D_BG_PLANET_200B630:
+  { type: GFX, offset: 0x200B630, symbol: D_BG_PLANET_200B630 }
 
-D_200B6B8:
-  { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x0200B6B8, symbol: D_200B6B8, pad: 8 }
+D_BG_PLANET_200B6B8:
+  { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x0200B6B8, symbol: D_BG_PLANET_200B6B8, pad: 8 }
 
-D_200C6C0:
-  { type: GFX, offset: 0x200C6C0, symbol: D_200C6C0 }
+D_BG_PLANET_200C6C0:
+  { type: GFX, offset: 0x200C6C0, symbol: D_BG_PLANET_200C6C0 }
 
-D_200C748:
-  { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x0200C748, symbol: D_200C748, pad: 8 }
+D_BG_PLANET_200C748:
+  { type: TEXTURE, ctype: u32, format: RGBA32, width: 32, height: 32, offset: 0x0200C748, symbol: D_BG_PLANET_200C748, pad: 8 }
 
-D_200D750:
-  { type: GFX, offset: 0x200D750, symbol: D_200D750 }
+D_BG_PLANET_200D750:
+  { type: GFX, offset: 0x200D750, symbol: D_BG_PLANET_200D750 }
 
-D_200D7E8:
-  { type: TEXTURE, ctype: u16, format: IA16, width: 64, height: 32, offset: 0x0200D7E8, symbol: D_200D7E8, pad: 8 }
+D_BG_PLANET_200D7E8:
+  { type: TEXTURE, ctype: u16, format: IA16, width: 64, height: 32, offset: 0x0200D7E8, symbol: D_BG_PLANET_200D7E8, pad: 8 }
 
-D_200E7F0:
-  { type: GFX, offset: 0x200E7F0, symbol: D_200E7F0 }
+D_BG_PLANET_200E7F0:
+  { type: GFX, offset: 0x200E7F0, symbol: D_BG_PLANET_200E7F0 }
 
-D_200E878:
-  { type: TEXTURE, ctype: u16, format: IA16, width: 32, height: 32, offset: 0x0200E878, symbol: D_200E878, pad: 8 }
+D_BG_PLANET_200E878:
+  { type: TEXTURE, ctype: u16, format: IA16, width: 32, height: 32, offset: 0x0200E878, symbol: D_BG_PLANET_200E878, pad: 8 }
 
-D_200F080:
-  { type: GFX, offset: 0x200F080, symbol: D_200F080 }
+D_BG_PLANET_200F080:
+  { type: GFX, offset: 0x200F080, symbol: D_BG_PLANET_200F080 }
 
-D_200F108:
-  { type: TEXTURE, ctype: u16, format: IA16, width: 32, height: 32, offset: 0x0200F108, symbol: D_200F108, pad: 8 }
+D_BG_PLANET_200F108:
+  { type: TEXTURE, ctype: u16, format: IA16, width: 32, height: 32, offset: 0x0200F108, symbol: D_BG_PLANET_200F108, pad: 8 }
 
-D_200F910:
-  { type: GFX, offset: 0x200F910, symbol: D_200F910 }
+D_BG_PLANET_200F910:
+  { type: GFX, offset: 0x200F910, symbol: D_BG_PLANET_200F910 }
 
-D_200F998:
-  { type: TEXTURE, ctype: u16, format: IA16, width: 32, height: 32, offset: 0x0200F998, symbol: D_200F998, pad: 8 }
+D_BG_PLANET_200F998:
+  { type: TEXTURE, ctype: u16, format: IA16, width: 32, height: 32, offset: 0x0200F998, symbol: D_BG_PLANET_200F998, pad: 8 }
 
-D_20101A0:
-  { type: GFX, offset: 0x20101A0, symbol: D_20101A0 }
+D_BG_PLANET_20101A0:
+  { type: GFX, offset: 0x20101A0, symbol: D_BG_PLANET_20101A0 }
 
-D_2010228:
-  { type: TEXTURE, ctype: u16, format: IA16, width: 32, height: 32, offset: 0x02010228, symbol: D_2010228, pad: 8 }
+D_BG_PLANET_2010228:
+  { type: TEXTURE, ctype: u16, format: IA16, width: 32, height: 32, offset: 0x02010228, symbol: D_BG_PLANET_2010228, pad: 8 }
 
-D_2010A30:
-  { type: GFX, offset: 0x2010A30, symbol: D_2010A30 }
+D_BG_PLANET_2010A30:
+  { type: GFX, offset: 0x2010A30, symbol: D_BG_PLANET_2010A30 }
 
-D_2010AB8:
-  { type: TEXTURE, ctype: u16, format: IA16, width: 32, height: 32, offset: 0x02010AB8, symbol: D_2010AB8, pad: 8 }
+D_BG_PLANET_2010AB8:
+  { type: TEXTURE, ctype: u16, format: IA16, width: 32, height: 32, offset: 0x02010AB8, symbol: D_BG_PLANET_2010AB8, pad: 8 }
 
-D_20112C0:
-  { type: GFX, offset: 0x20112C0, symbol: D_20112C0 }
+D_BG_PLANET_20112C0:
+  { type: GFX, offset: 0x20112C0, symbol: D_BG_PLANET_20112C0 }
 
-D_2011358:
-  { type: TEXTURE, ctype: u16, format: IA16, width: 32, height: 32, offset: 0x02011358, symbol: D_2011358, pad: 8 }
\ No newline at end of file
+D_BG_PLANET_2011358:
+  { type: TEXTURE, ctype: u16, format: IA16, width: 32, height: 32, offset: 0x02011358, symbol: D_BG_PLANET_2011358, pad: 8 }
\ No newline at end of file
diff --git a/assets/yaml/us/ast_bg_space.yaml b/assets/yaml/us/ast_bg_space.yaml
index b3c23fe6..9c7fa861 100644
--- a/assets/yaml/us/ast_bg_space.yaml
+++ b/assets/yaml/us/ast_bg_space.yaml
@@ -9,86 +9,86 @@
       - '#include "sf64object.h"'
       - '#include "structs.h"'
 
-D_2000000:
-  { type: GFX, offset: 0x2000000, symbol: D_2000000 }
+D_BG_SPACE_2000000:
+  { type: GFX, offset: 0x2000000, symbol: D_BG_SPACE_2000000 }
 
-D_2000088:
-  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x2000088, symbol: D_2000088, pad: 8 }
+D_BG_SPACE_2000088:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x2000088, symbol: D_BG_SPACE_2000088, pad: 8 }
 
-D_2000890:
-  { type: GFX, offset: 0x2000890, symbol: D_2000890 }
+D_BG_SPACE_2000890:
+  { type: GFX, offset: 0x2000890, symbol: D_BG_SPACE_2000890 }
 
-D_2000918:
-  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x2000918, symbol: D_2000918, pad: 8 }
+D_BG_SPACE_2000918:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x2000918, symbol: D_BG_SPACE_2000918, pad: 8 }
 
-D_2001120:
-  { type: GFX, offset: 0x2001120, symbol: D_2001120 }
+D_BG_SPACE_2001120:
+  { type: GFX, offset: 0x2001120, symbol: D_BG_SPACE_2001120 }
 
-D_20011A8:
-  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x020011A8, symbol: D_20011A8, pad: 8 }
+D_BG_SPACE_20011A8:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x020011A8, symbol: D_BG_SPACE_20011A8, pad: 8 }
 
-D_20019B0:
-  { type: GFX, offset: 0x20019B0, symbol: D_20019B0 }
+D_BG_SPACE_20019B0:
+  { type: GFX, offset: 0x20019B0, symbol: D_BG_SPACE_20019B0 }
 
-D_2001A38:
-  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x02001A38, symbol: D_2001A38, pad: 8 }
+D_BG_SPACE_2001A38:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x02001A38, symbol: D_BG_SPACE_2001A38, pad: 8 }
 
-D_2002240:
-  { type: GFX, offset: 0x2002240, symbol: D_2002240 }
+D_BG_SPACE_2002240:
+  { type: GFX, offset: 0x2002240, symbol: D_BG_SPACE_2002240 }
 
-D_20022C8:
-  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x020022C8, symbol: D_20022C8, pad: 8 }
+D_BG_SPACE_20022C8:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x020022C8, symbol: D_BG_SPACE_20022C8, pad: 8 }
 
-D_2002AD0:
-  { type: GFX, offset: 0x2002AD0, symbol: D_2002AD0 }
+D_BG_SPACE_2002AD0:
+  { type: GFX, offset: 0x2002AD0, symbol: D_BG_SPACE_2002AD0 }
 
-D_2002B58:
-  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x02002B58, symbol: D_2002B58, pad: 8 }
+D_BG_SPACE_2002B58:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x02002B58, symbol: D_BG_SPACE_2002B58, pad: 8 }
 
-D_2003360:
-  { type: GFX, offset: 0x2003360, symbol: D_2003360 }
+D_BG_SPACE_2003360:
+  { type: GFX, offset: 0x2003360, symbol: D_BG_SPACE_2003360 }
 
-D_20033E8:
-  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x020033E8, symbol: D_20033E8, pad: 8 }
+D_BG_SPACE_20033E8:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x020033E8, symbol: D_BG_SPACE_20033E8, pad: 8 }
 
-D_2003BF0:
-  { type: GFX, offset: 0x2003BF0, symbol: D_2003BF0 }
+D_BG_SPACE_2003BF0:
+  { type: GFX, offset: 0x2003BF0, symbol: D_BG_SPACE_2003BF0 }
 
-D_2003C78:
-  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x02003C78, symbol: D_2003C78, pad: 8 }
+D_BG_SPACE_2003C78:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x02003C78, symbol: D_BG_SPACE_2003C78, pad: 8 }
 
-D_2004480:
-  { type: GFX, offset: 0x2004480, symbol: D_2004480 }
+D_BG_SPACE_2004480:
+  { type: GFX, offset: 0x2004480, symbol: D_BG_SPACE_2004480 }
 
-D_2004508:
-  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x02004508, symbol: D_2004508, pad: 8 }
+D_BG_SPACE_2004508:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x02004508, symbol: D_BG_SPACE_2004508, pad: 8 }
 
-D_2004D10:
-  { type: GFX, offset: 0x2004D10, symbol: D_2004D10 }
+D_BG_SPACE_2004D10:
+  { type: GFX, offset: 0x2004D10, symbol: D_BG_SPACE_2004D10 }
 
-D_2004D98:
-  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x02004D98, symbol: D_2004D98, pad: 8 }
+D_BG_SPACE_2004D98:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x02004D98, symbol: D_BG_SPACE_2004D98, pad: 8 }
 
-D_20055A0:
-  { type: GFX, offset: 0x20055A0, symbol: D_20055A0 }
+D_BG_SPACE_20055A0:
+  { type: GFX, offset: 0x20055A0, symbol: D_BG_SPACE_20055A0 }
 
-D_2005628:
-  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x02005628, symbol: D_2005628, pad: 8 }
+D_BG_SPACE_2005628:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x02005628, symbol: D_BG_SPACE_2005628, pad: 8 }
 
-D_2005E30:
-  { type: GFX, offset: 0x2005E30, symbol: D_2005E30 }
+D_BG_SPACE_2005E30:
+  { type: GFX, offset: 0x2005E30, symbol: D_BG_SPACE_2005E30 }
 
-D_2005EB8:
-  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x02005EB8, symbol: D_2005EB8, pad: 8 }
+D_BG_SPACE_2005EB8:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x02005EB8, symbol: D_BG_SPACE_2005EB8, pad: 8 }
 
-D_20066C0:
-  { type: GFX, offset: 0x20066C0, symbol: D_20066C0 }
+D_BG_SPACE_20066C0:
+  { type: GFX, offset: 0x20066C0, symbol: D_BG_SPACE_20066C0 }
 
-D_2006748:
-  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x02006748, symbol: D_2006748, pad: 8 }
+D_BG_SPACE_2006748:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x02006748, symbol: D_BG_SPACE_2006748, pad: 8 }
 
-D_2006F50:
-  { type: GFX, offset: 0x2006F50, symbol: D_2006F50 }
+D_BG_SPACE_2006F50:
+  { type: GFX, offset: 0x2006F50, symbol: D_BG_SPACE_2006F50 }
 
-D_2006FD8:
-  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x02006FD8, symbol: D_2006FD8, pad: 8 }
+D_BG_SPACE_2006FD8:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x02006FD8, symbol: D_BG_SPACE_2006FD8, pad: 8 }
diff --git a/assets/yaml/us/ast_blue_marine.yaml b/assets/yaml/us/ast_blue_marine.yaml
index 99222064..64636ad9 100644
--- a/assets/yaml/us/ast_blue_marine.yaml
+++ b/assets/yaml/us/ast_blue_marine.yaml
@@ -18,74 +18,74 @@ D_blue_marine_3000080:
 D_blue_marine_3000090:
   { type: TEXTURE, ctype: u8, format: CI4, width: 32, height: 9, offset: 0x3000090, symbol: D_blue_marine_3000090, tlut: 0x3000120 }
 
-D_3000120:
-  { type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0x3000120, symbol: D_3000120 }
+D_blue_marine_3000120:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0x3000120, symbol: D_blue_marine_3000120 }
 
-D_3000130:
-  { type: GFX, offset: 0x3000130, symbol: D_3000130 }
+D_blue_marine_3000130:
+  { type: GFX, offset: 0x3000130, symbol: D_blue_marine_3000130 }
 
 ast_blue_marine_seg3_vtx_00000418:
-  { type: VTX, count: 5, offset: 0x3000418, symbol: D_3000418, pad: 2 }
+  { type: VTX, count: 5, offset: 0x3000418, symbol: D_blue_marine_3000418, pad: 2 }
 
-D_3000470:
-  { type: GFX, offset: 0x3000470, symbol: D_3000470 }
+D_blue_marine_3000470:
+  { type: GFX, offset: 0x3000470, symbol: D_blue_marine_3000470 }
 
-D_30005E8:
-  { type: BLOB, size: 24, offset: 0x30005E8, symbol: D_30005E8 }
+D_blue_marine_30005E8:
+  { type: BLOB, size: 24, offset: 0x30005E8, symbol: D_blue_marine_30005E8 }
 
-D_3000600:
-  { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 8, offset: 0x3000600, symbol: D_3000600, tlut: 0x3000640 }
+D_blue_marine_3000600:
+  { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 8, offset: 0x3000600, symbol: D_blue_marine_3000600, tlut: 0x3000640 }
 
-D_3000640:
-  { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x3000640, symbol: D_3000640 }
+D_blue_marine_3000640:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x3000640, symbol: D_blue_marine_3000640 }
 
-D_3000660:
-  { type: GFX, offset: 0x3000660, symbol: D_3000660 }
+D_blue_marine_3000660:
+  { type: GFX, offset: 0x3000660, symbol: D_blue_marine_3000660 }
 
-D_30006E8:
-  { type: TEXTURE, ctype: u8, format: IA8, width: 32, height: 32, offset: 0x30006E8, symbol: D_30006E8, pad: 2 }
+D_blue_marine_30006E8:
+  { type: TEXTURE, ctype: u8, format: IA8, width: 32, height: 32, offset: 0x30006E8, symbol: D_blue_marine_30006E8, pad: 2 }
 
-D_3000AF0:
-  { type: GFX, offset: 0x3000AF0, symbol: D_3000AF0 }
+D_blue_marine_3000AF0:
+  { type: GFX, offset: 0x3000AF0, symbol: D_blue_marine_3000AF0 }
 
-D_3000C70:
-  { type: GFX, offset: 0x3000C70, symbol: D_3000C70 }
+D_blue_marine_3000C70:
+  { type: GFX, offset: 0x3000C70, symbol: D_blue_marine_3000C70 }
 
-D_3001900:
-  { type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x3001900, symbol: D_3001900 }
+D_blue_marine_3001900:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x3001900, symbol: D_blue_marine_3001900 }
 
-D_3001980:
-  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x3001980, symbol: D_3001980 }
+D_blue_marine_3001980:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x3001980, symbol: D_blue_marine_3001980 }
 
-D_3002180:
-  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x3002180, symbol: D_3002180 }
+D_blue_marine_3002180:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x3002180, symbol: D_blue_marine_3002180 }
 
-D_3002980:
-  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x3002980, symbol: D_3002980 }
+D_blue_marine_3002980:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x3002980, symbol: D_blue_marine_3002980 }
 
-D_3003180:
-  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x3003180, symbol: D_3003180 }
+D_blue_marine_3003180:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x3003180, symbol: D_blue_marine_3003180 }
 
-D_3003980:
-  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x3003980, symbol: D_3003980 }
+D_blue_marine_3003980:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x3003980, symbol: D_blue_marine_3003980 }
 
-D_3004180:
-  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x3004180, symbol: D_3004180 }
+D_blue_marine_3004180:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x3004180, symbol: D_blue_marine_3004180 }
 
-D_3004980:
-  { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x3004980, symbol: D_3004980 }
+D_blue_marine_3004980:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x3004980, symbol: D_blue_marine_3004980 }
 
-D_3005980:
-  { type: GFX, offset: 0x3005980, symbol: D_3005980 }
+D_blue_marine_3005980:
+  { type: GFX, offset: 0x3005980, symbol: D_blue_marine_3005980 }
 
-D_30062E8:
-  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x30062E8, symbol: D_30062E8, pad: 4 }
+D_blue_marine_30062E8:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x30062E8, symbol: D_blue_marine_30062E8, pad: 4 }
 
-D_3006AF0:
-  { type: GFX, offset: 0x3006AF0, symbol: D_3006AF0 }
+D_blue_marine_3006AF0:
+  { type: GFX, offset: 0x3006AF0, symbol: D_blue_marine_3006AF0 }
 
-D_3006C70:
-  { type: GFX, offset: 0x3006C70, symbol: D_3006C70 }
+D_blue_marine_3006C70:
+  { type: GFX, offset: 0x3006C70, symbol: D_blue_marine_3006C70 }
 
 D_blue_marine_3006DE0:
   { type: GFX, offset: 0x3006DE0, symbol: D_blue_marine_3006DE0 }
diff --git a/assets/yaml/us/ast_landmaster.yaml b/assets/yaml/us/ast_landmaster.yaml
index 91f1251e..8694ac04 100644
--- a/assets/yaml/us/ast_landmaster.yaml
+++ b/assets/yaml/us/ast_landmaster.yaml
@@ -19,77 +19,77 @@ D_landmaster_3000080:
 D_landmaster_3000090:
   { type: GFX, offset: 0x3000090, symbol: D_landmaster_3000090 }
 
-D_3004CA8:
-  { type: TEXTURE, format: RGBA16, offset: 0x3004CA8, width: 32, height: 32, ctype: u16, symbol: D_3004CA8 }
+D_landmaster_3004CA8:
+  { type: TEXTURE, format: RGBA16, offset: 0x3004CA8, width: 32, height: 32, ctype: u16, symbol: D_landmaster_3004CA8 }
 
-D_30054A8:
-  { type: TEXTURE, format: RGBA16, offset: 0x30054A8, width: 32, height: 32, ctype: u16, symbol: D_30054A8 }
+D_landmaster_30054A8:
+  { type: TEXTURE, format: RGBA16, offset: 0x30054A8, width: 32, height: 32, ctype: u16, symbol: D_landmaster_30054A8 }
 
-D_3005CA8:
-  { type: TEXTURE, format: RGBA16, offset: 0x3005CA8, width: 16, height: 16, ctype: u16, symbol: D_3005CA8 }
+D_landmaster_3005CA8:
+  { type: TEXTURE, format: RGBA16, offset: 0x3005CA8, width: 16, height: 16, ctype: u16, symbol: D_landmaster_3005CA8 }
 
-D_3005EA8:
-  { type: TEXTURE, format: RGBA16, offset: 0x3005EA8, width: 32, height: 32, ctype: u16, symbol: D_3005EA8 }
+D_landmaster_3005EA8:
+  { type: TEXTURE, format: RGBA16, offset: 0x3005EA8, width: 32, height: 32, ctype: u16, symbol: D_landmaster_3005EA8 }
 
-D_3002680:
-  { type: TEXTURE, format: RGBA16, offset: 0x3002680, width: 32, height: 32, ctype: u16, symbol: D_3002680 }
+D_landmaster_3002680:
+  { type: TEXTURE, format: RGBA16, offset: 0x3002680, width: 32, height: 32, ctype: u16, symbol: D_landmaster_3002680 }
 
-D_3002E80:
-  { type: TEXTURE, format: RGBA16, offset: 0x3002E80, width: 32, height: 32, ctype: u16, symbol: D_3002E80 }
+D_landmaster_3002E80:
+  { type: TEXTURE, format: RGBA16, offset: 0x3002E80, width: 32, height: 32, ctype: u16, symbol: D_landmaster_3002E80 }
 
-D_3003680:
-  { type: TEXTURE, format: RGBA16, offset: 0x3003680, width: 64, height: 32, ctype: u16, symbol: D_3003680 }
+D_landmaster_3003680:
+  { type: TEXTURE, format: RGBA16, offset: 0x3003680, width: 64, height: 32, ctype: u16, symbol: D_landmaster_3003680 }
 
-D_3001680:
-  { type: TEXTURE, format: RGBA16, offset: 0x3001680, width: 32, height: 32, ctype: u16, symbol: D_3001680 }
+D_landmaster_3001680:
+  { type: TEXTURE, format: RGBA16, offset: 0x3001680, width: 32, height: 32, ctype: u16, symbol: D_landmaster_3001680 }
 
-D_3001E80:
-  { type: TEXTURE, format: RGBA16, offset: 0x3001E80, width: 32, height: 32, ctype: u16, symbol: D_3001E80 }
+D_landmaster_3001E80:
+  { type: TEXTURE, format: RGBA16, offset: 0x3001E80, width: 32, height: 32, ctype: u16, symbol: D_landmaster_3001E80 }
 
-D_3004680:
-  { type: GFX, offset: 0x3004680, symbol: D_3004680 }
+D_landmaster_3004680:
+  { type: GFX, offset: 0x3004680, symbol: D_landmaster_3004680 }
 
-PAD_30066A8:
-  { type: BLOB, offset: 0x30066A8, size: 0x8, symbol: PAD_30066A8 }
+PAD_landmaster_30066A8:
+  { type: BLOB, offset: 0x30066A8, size: 0x8, symbol: PAD_landmaster_30066A8 }
 
-D_30066B0:
-  { type: GFX, offset: 0x30066B0, symbol: D_30066B0 }
+D_landmaster_30066B0:
+  { type: GFX, offset: 0x30066B0, symbol: D_landmaster_30066B0 }
 
-D_3006738:
-  { type: TEXTURE, format: IA8, offset: 0x3006738, width: 16, height: 32, ctype: u8, symbol: D_3006738 }
+D_landmaster_3006738:
+  { type: TEXTURE, format: IA8, offset: 0x3006738, width: 16, height: 32, ctype: u8, symbol: D_landmaster_3006738 }
 
-PAD_3006938:
-  { type: BLOB, offset: 0x3006938, size: 0x8, symbol: PAD_3006938 }
+PAD_landmaster_3006938:
+  { type: BLOB, offset: 0x3006938, size: 0x8, symbol: PAD_landmaster_3006938 }
 
-D_3006940:
-  { type: GFX, offset: 0x3006940, symbol: D_3006940 }
+D_landmaster_3006940:
+  { type: GFX, offset: 0x3006940, symbol: D_landmaster_3006940 }
 
-D_30069D8:
-  { type: TEXTURE, format: IA8, offset: 0x030069D8, width: 32, height: 32, ctype: u8, symbol: D_30069D8 }
+D_landmaster_30069D8:
+  { type: TEXTURE, format: IA8, offset: 0x030069D8, width: 32, height: 32, ctype: u8, symbol: D_landmaster_30069D8 }
 
-PAD_3006DD8:
-  { type: BLOB, offset: 0x3006DD8, size: 0x8, symbol: PAD_3006DD8 }
+PAD_landmaster_3006DD8:
+  { type: BLOB, offset: 0x3006DD8, size: 0x8, symbol: PAD_landmaster_3006DD8 }
 
 D_landmaster_3006DE0:
   { type: GFX, offset: 0x3006DE0, symbol: D_landmaster_3006DE0 }
 
-D_3006E68:
-  { type: TEXTURE, format: RGBA32, offset: 0x3006E68, width: 32, height: 32, ctype: u32, symbol: D_3006E68 }
+D_landmaster_3006E68:
+  { type: TEXTURE, format: RGBA32, offset: 0x3006E68, width: 32, height: 32, ctype: u32, symbol: D_landmaster_3006E68 }
 
-PAD_3007E68:
-  { type: BLOB, offset: 0x3007E68, size: 0x8, symbol: PAD_3007E68 }
+PAD_landmaster_3007E68:
+  { type: BLOB, offset: 0x3007E68, size: 0x8, symbol: PAD_landmaster_3007E68 }
 
-D_3007E70:
-  { type: GFX, offset: 0x3007E70, symbol: D_3007E70 }
+D_landmaster_3007E70:
+  { type: GFX, offset: 0x3007E70, symbol: D_landmaster_3007E70 }
 
-D_3007EF8:
-  { type: TEXTURE, format: RGBA16, offset: 0x3007EF8, width: 16, height: 16, ctype: u16, symbol: D_3007EF8 }
+D_landmaster_3007EF8:
+  { type: TEXTURE, format: RGBA16, offset: 0x3007EF8, width: 16, height: 16, ctype: u16, symbol: D_landmaster_3007EF8 }
 
-PAD_30080F8:
-  { type: BLOB, offset: 0x30080F8, size: 0x8, symbol: PAD_30080F8 }
+PAD_landmaster_30080F8:
+  { type: BLOB, offset: 0x30080F8, size: 0x8, symbol: PAD_landmaster_30080F8 }
 
-D_3008100:
-  { type: GFX, offset: 0x3008100, symbol: D_3008100 }
+D_landmaster_3008100:
+  { type: GFX, offset: 0x3008100, symbol: D_landmaster_3008100 }
 
-D_3008188:
-  { type: TEXTURE, format: IA8, offset: 0x03008188, width: 32, height: 32, ctype: u8, symbol: D_3008188 }
+D_landmaster_3008188:
+  { type: TEXTURE, format: IA8, offset: 0x03008188, width: 32, height: 32, ctype: u8, symbol: D_landmaster_3008188 }
diff --git a/assets/yaml/us/ast_test.yaml b/assets/yaml/us/ast_test.yaml
index 574d620b..24d73b67 100644
--- a/assets/yaml/us/ast_test.yaml
+++ b/assets/yaml/us/ast_test.yaml
@@ -11,4 +11,4 @@
       - '#include "sf64level.h"'
 
 D_6014FEC:
-  {type: SF64:COLPOLY, count: 250, offset: 0x6014FEC, symbol: D_6014FEC}
+  {type: SF64:COLPOLY, count: 250, offset: 0x6014FEC, symbol: D_6014FEC, mesh_symbol: D_OFFSET}
diff --git a/assets/yaml/us/ast_vs_player.yaml b/assets/yaml/us/ast_vs_player.yaml
new file mode 100644
index 00000000..263e187e
--- /dev/null
+++ b/assets/yaml/us/ast_vs_player.yaml
@@ -0,0 +1,800 @@
+:config:
+  segments:
+    - [0x03, 0x8E92D0]
+  header:
+    code:
+      - '#include "assets/ast_vs_player.h"'
+    header:
+      - '#include "gfx.h"'
+      - '#include "sf64object.h"'
+      - '#include "structs.h"'
+      - '#include "sf64level.h"'
+
+D_vs_player_3000000:
+  { type: TEXTURE, ctype: u8, format: CI4, width:  16, height: 16, offset: 0x3000000, symbol: D_vs_player_3000000, tlut: 0x3000080 }
+D_vs_player_3000080:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x3000080, symbol: D_vs_player_3000080 }
+
+D_vs_player_30000A0:
+  { type: TEXTURE, ctype: u8, format: CI4, width:  16, height: 16, offset: 0x30000A0, symbol: D_vs_player_30000A0, tlut: 0x30000A0 }
+D_vs_player_3000120:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x3000120, symbol: D_vs_player_3000120 }
+
+D_vs_player_3000140:
+  { type: TEXTURE, ctype: u8, format: CI4, width:  16, height: 16, offset: 0x3000140, symbol: D_vs_player_3000140, tlut: 0x30001C0 }
+D_vs_player_30001C0:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x30001C0, symbol: D_vs_player_30001C0 }
+
+D_vs_player_30001E0:
+  { type: TEXTURE, ctype: u8, format: CI4, width:  64, height: 13, offset: 0x30001E0, symbol: D_vs_player_30001E0, tlut: 0x3000380 }
+D_vs_player_3000380:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x3000380, symbol: D_vs_player_3000380 }
+
+D_vs_player_30003A0:
+  { type: TEXTURE, ctype: u8, format: CI4, width:  64, height: 10, offset: 0x30003A0, symbol: D_vs_player_30003A0, tlut: 0x30004E0 }
+D_vs_player_30004E0:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x30004E0, symbol: D_vs_player_30004E0 }
+
+BLOB_3000500:
+  { type: BLOB, size: 0x10, offset: 0x3000500, symbol: BLOB_3000500} # 17th color for D_vs_player_30004E0?
+
+D_vs_player_3000510:
+  { type: TEXTURE, ctype: u8, format: CI4, width:  80, height: 10, offset: 0x3000510, symbol: D_vs_player_3000510, tlut: 0x30006A0 }
+D_vs_player_30006A0:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x30006A0, symbol: D_vs_player_30006A0 }
+
+BLOB_30006C0:
+  { type: BLOB, size: 0x10, offset: 0x30006C0, symbol: BLOB_30006C0} # 17th color for D_vs_player_30006A0?
+
+D_vs_player_30006D0:
+  { type: TEXTURE, ctype: u8, format: CI4, width:  64, height: 10, offset: 0x30006D0, symbol: D_vs_player_30006D0, tlut: 0x3000810 }
+D_vs_player_3000810:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x3000810, symbol: D_vs_player_3000810 }
+
+BLOB_3000830:
+  { type: BLOB, size: 0x10, offset: 0x3000830, symbol: BLOB_3000830} # 17th color for D_vs_player_3000810?
+
+D_vs_player_3000840:
+  { type: TEXTURE, ctype: u8, format: CI4, width:  32, height: 10, offset: 0x3000840, symbol: D_vs_player_3000840, tlut: 0x30008E0 }
+D_vs_player_30008E0:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x30008E0, symbol: D_vs_player_30008E0 }
+
+D_vs_player_3000900:
+  { type: TEXTURE, ctype: u8, format: CI4, width:  32, height: 15, offset: 0x3000900, symbol: D_vs_player_3000900, tlut: 0x30009F0 }
+D_vs_player_30009F0:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x30009F0, symbol: D_vs_player_30009F0 }
+
+D_vs_player_3000A10:
+  { type: TEXTURE, ctype: u8, format: CI4, width:  32, height: 15, offset: 0x3000A10, symbol: D_vs_player_3000A10, tlut: 0x3000B00 }
+D_vs_player_3000B00:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x3000B00, symbol: D_vs_player_3000B00 }
+
+D_vs_player_3000B20:
+  { type: TEXTURE, ctype: u8, format: IA8, width:  32, height:  5, offset: 0x3000B20, symbol: D_vs_player_3000B20 }
+
+D_vs_player_3000BC0:
+  { type: TEXTURE, ctype: u8, format: IA8, width:  80, height: 26, offset: 0x3000BC0, symbol: D_vs_player_3000BC0 }
+
+D_vs_player_30013E0:
+  { type: TEXTURE, ctype: u8, format: IA8, width:   8, height:  8, offset: 0x30013E0, symbol: D_vs_player_30013E0 }
+
+D_vs_player_3001420:
+  { type: TEXTURE, ctype: u8, format: CI8, width: 256, height: 42, offset: 0x3001420, symbol: D_vs_player_3001420, tlut: 0x3003E20 }
+D_vs_player_3003E20:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 248, offset: 0x3003E20, symbol: D_vs_player_3003E20 }
+
+D_vs_player_3004010:
+  { type: TEXTURE, ctype: u8, format: CI8, width: 136, height: 25, offset: 0x3004010, symbol: D_vs_player_3004010, tlut: 0x3004D58 }
+D_vs_player_3004D58:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 256, offset: 0x3004D58, symbol: D_vs_player_3004D58, pad: 8 }
+
+D_vs_player_3004F60:
+  { type: TEXTURE, ctype: u8, format: CI8, width: 152, height: 25, offset: 0x3004F60, symbol: D_vs_player_3004F60, tlut: 0x3005E38 }
+D_vs_player_3005E38:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 256, offset: 0x3005E38, symbol: D_vs_player_3005E38, pad: 8 }
+
+D_vs_player_3006040:
+  { type: TEXTURE, ctype: u8, format: CI8, width: 104, height: 25, offset: 0x3006040, symbol: D_vs_player_3006040, tlut: 0x3006A68 }
+D_vs_player_3006A68:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 248, offset: 0x3006A68, symbol: D_vs_player_3006A68, pad: 8 }
+
+D_vs_player_3006C60:
+  { type: TEXTURE, ctype: u8, format: CI8, width:  96, height: 23, offset: 0x3006C60, symbol: D_vs_player_3006C60, tlut: 0x3007500 }
+D_vs_player_3007500:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 224, offset: 0x3007500, symbol: D_vs_player_3007500 }
+
+D_vs_player_30076C0:
+  { type: TEXTURE, ctype: u8, format: CI8, width: 152, height: 25, offset: 0x30076C0, symbol: D_vs_player_30076C0, tlut: 0x3008598 }
+D_vs_player_3008598:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 256, offset: 0x3008598, symbol: D_vs_player_3008598, pad: 8 }
+
+D_vs_player_30087A0:
+  { type: TEXTURE, ctype: u8, format: CI8, width:  40, height: 40, offset: 0x30087A0, symbol: D_vs_player_30087A0, tlut: 0x3008DE0 }
+D_vs_player_3008DE0:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 112, offset: 0x3008DE0, symbol: D_vs_player_3008DE0 }
+
+D_vs_player_3008EC0:
+  { type: TEXTURE, ctype: u8, format: CI8, width:  64, height: 40, offset: 0x3008EC0, symbol: D_vs_player_3008EC0, tlut: 0x30098C0 }
+D_vs_player_30098C0:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 104, offset: 0x30098C0, symbol: D_vs_player_30098C0 }
+
+D_vs_player_3009990:
+  { type: TEXTURE, ctype: u8, format: CI8, width:  64, height: 40, offset: 0x3009990, symbol: D_vs_player_3009990, tlut: 0x300A390 }
+D_vs_player_300A390:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 112, offset: 0x300A390, symbol: D_vs_player_300A390 }
+
+D_vs_player_300A470:
+  { type: TEXTURE, ctype: u8, format: CI8, width: 152, height: 23, offset: 0x300A470, symbol: D_vs_player_300A470, tlut: 0x300B218 }
+D_vs_player_300B218:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 232, offset: 0x300B218, symbol: D_vs_player_300B218, pad: 8 }
+
+D_vs_player_300B3F0:
+  { type: TEXTURE, ctype: u8, format: CI8, width: 168, height: 25, offset: 0x300B3F0, symbol: D_vs_player_300B3F0, tlut: 0x300C458 }
+D_vs_player_300C458:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 256, offset: 0x300C458, symbol: D_vs_player_300C458, pad: 8 }
+
+D_vs_player_300C660:
+  {type: TEXTURE, ctype: u8, format: CI8, width: 112, height: 25, offset: 0x300C660, symbol: D_vs_player_300C660, tlut: 0x300D150 }
+D_vs_player_300D150:
+  {type: TEXTURE, ctype: u16, format: TLUT, colors: 251, offset: 0x300D150, symbol: D_vs_player_300D150, pad: 8}
+
+D_vs_player_300D350:
+  { type: TEXTURE, ctype: u8, format: CI8, width:  24, height:  3, offset: 0x300D350, symbol: D_vs_player_300D350, tlut: 0x300D398 }
+D_vs_player_300D398:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x300D398, symbol: D_vs_player_300D398, pad: 8 }
+
+D_vs_player_300D3C0:
+  { type: TEXTURE, ctype: u8, format: CI8, width:  24, height:  3, offset: 0x300D3C0, symbol: D_vs_player_300D3C0, tlut: 0x300D408 }
+D_vs_player_300D408:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 24, offset: 0x300D408, symbol: D_vs_player_300D408, pad: 8 }
+
+D_vs_player_300D440:
+  { type: TEXTURE, ctype: u8, format: CI8, width:  48, height:  4, offset: 0x300D440, symbol: D_vs_player_300D440, tlut: 0x300D500 }
+D_vs_player_300D500:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 40, offset: 0x300D500, symbol: D_vs_player_300D500 }
+
+D_vs_player_300D550:
+  { type: GFX, offset: 0x300D550, symbol: D_vs_player_300D550}
+D_vs_player_300DE80:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x300DE80, symbol: D_vs_player_300DE80 }
+
+D_vs_player_300E080:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x300E080, symbol: D_vs_player_300E080 }
+
+D_vs_player_300E280:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 16, offset: 0x300E280, symbol: D_vs_player_300E280 }
+
+D_vs_player_300E680:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x300E680, symbol: D_vs_player_300E680 }
+
+D_vs_player_300E880:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x300E880, symbol: D_vs_player_300E880 }
+
+D_vs_player_300EA80:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x300EA80, symbol: D_vs_player_300EA80 }
+
+D_vs_player_300EC80:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x300EC80, symbol: D_vs_player_300EC80 }
+
+D_vs_player_300EE80:
+  { type: GFX, offset: 0x300EE80, symbol: D_vs_player_300EE80}
+
+D_vs_player_300FB80:
+  { type: GFX, offset: 0x300FB80, symbol: D_vs_player_300FB80}
+
+D_vs_player_3010690:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x3010690, symbol: D_vs_player_3010690 }
+
+D_vs_player_3010890:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x3010890, symbol: D_vs_player_3010890 }
+
+D_vs_player_3010A90:
+  { type: GFX, offset: 0x3010A90, symbol: D_vs_player_3010A90}
+
+D_vs_player_3011470:
+  { type: GFX, offset: 0x3011470, symbol: D_vs_player_3011470}
+
+D_vs_player_3011E40:
+  { type: GFX, offset: 0x3011E40, symbol: D_vs_player_3011E40}
+
+D_vs_player_3011ED0:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x3011ED0, symbol: D_vs_player_3011ED0 }
+
+D_vs_player_3012ED0:
+  { type: GFX, offset: 0x3012ED0, symbol: D_vs_player_3012ED0}
+
+D_vs_player_3013580:
+  { type: GFX, offset: 0x3013580, symbol: D_vs_player_3013580}
+
+D_vs_player_3013780:
+  { type: GFX, offset: 0x3013780, symbol: D_vs_player_3013780}
+
+D_vs_player_3013F50:
+  {type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x3013F50, symbol: D_vs_player_3013F50, tlut: 0x3014350 }
+D_vs_player_3014350:
+  {type: TEXTURE, ctype: u16, format: TLUT, colors: 224, offset: 0x3014350, symbol: D_vs_player_3014350}
+
+D_vs_player_3014510:
+  {type: TEXTURE, ctype: u8, format: CI8, width:  8, height:  8, offset: 0x3014510, symbol: D_vs_player_3014510, tlut: 0x3014550 }
+D_vs_player_3014550:
+  {type: TEXTURE, ctype: u16, format: TLUT, colors: 32, offset: 0x3014550, symbol: D_vs_player_3014550}
+
+D_vs_player_3014590:
+  {type: TEXTURE, ctype: u8, format: CI8, width: 16, height: 16, offset: 0x3014590, symbol: D_vs_player_3014590, tlut: 0x3014690 }
+D_vs_player_3014690:
+  {type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x3014690, symbol: D_vs_player_3014690}
+
+D_vs_player_30146B0:
+  { type: GFX, offset: 0x30146B0, symbol: D_vs_player_30146B0}
+
+D_vs_player_3014740:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x3014740, symbol: D_vs_player_3014740 }
+
+D_vs_player_3015740:
+  { type: GFX, offset: 0x3015740, symbol: D_vs_player_3015740}
+
+D_vs_player_3015898:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x3015898, symbol: D_vs_player_3015898, pad: 8 }
+
+D_vs_player_30160A0:
+  { type: GFX, offset: 0x30160A0, symbol: D_vs_player_30160A0}
+
+D_vs_player_30162F8:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x30162F8, symbol: D_vs_player_30162F8, pad: 8 }
+
+D_vs_player_3016B00:
+  { type: GFX, offset: 0x3016B00, symbol: D_vs_player_3016B00}
+
+D_vs_player_3016DC0:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x3016DC0, symbol: D_vs_player_3016DC0 }
+
+D_vs_player_3016FC0:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x3016FC0, symbol: D_vs_player_3016FC0 }
+
+D_vs_player_30171C0:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x30171C0, symbol: D_vs_player_30171C0 }
+
+D_vs_player_30173C0:
+  { type: GFX, offset: 0x30173C0, symbol: D_vs_player_30173C0}
+
+D_vs_player_30174E0:
+  { type: GFX, offset: 0x30174E0, symbol: D_vs_player_30174E0}
+
+D_vs_player_3017600:
+  { type: GFX, offset: 0x3017600, symbol: D_vs_player_3017600}
+
+D_vs_player_3017800:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x3017800, symbol: D_vs_player_3017800 }
+
+D_vs_player_3018000:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x3018000, symbol: D_vs_player_3018000 }
+
+D_vs_player_3018800:
+  { type: GFX, offset: 0x3018800, symbol: D_vs_player_3018800}
+
+D_vs_player_3018D60:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x3018D60, symbol: D_vs_player_3018D60 }
+
+D_vs_player_3019560:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x3019560, symbol: D_vs_player_3019560 }
+
+D_vs_player_3019D60:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x3019D60, symbol: D_vs_player_3019D60 }
+
+D_vs_player_301A560:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x301A560, symbol: D_vs_player_301A560 }
+
+D_vs_player_301AD60:
+  { type: GFX, offset: 0x301AD60, symbol: D_vs_player_301AD60}
+
+D_vs_player_301ADE8:
+  {type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 16, offset: 0x301ADE8, symbol: D_vs_player_301ADE8, pad: 8 }
+
+D_vs_player_301AEF0:
+  { type: GFX, offset: 0x301AEF0, symbol: D_vs_player_301AEF0}
+
+D_vs_player_301AF78:
+  {type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 16, offset: 0x301AF78, symbol: D_vs_player_301AF78, pad: 8 }
+
+D_vs_player_301B080:
+  { type: GFX, offset: 0x301B080, symbol: D_vs_player_301B080}
+
+D_vs_player_301B438:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x301B438, symbol: D_vs_player_301B438, pad: 8 }
+
+D_vs_player_301B640:
+  { type: GFX, offset: 0x301B640, symbol: D_vs_player_301B640}
+
+PAD_vs_player_3001B6D8:
+  {type: BLOB, size: 0x8, offset: 0x301B6D8, symbol: PAD_vs_player_3001B6D8 }
+
+D_vs_player_301B6E0:
+  { type: GFX, offset: 0x301B6E0, symbol: D_vs_player_301B6E0}
+
+D_vs_player_301B768:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x301B768, symbol: D_vs_player_301B768, pad: 8 }
+
+D_vs_player_301C0A4:
+  { type: SF64:ANIM, offset: 0x301C0A4, symbol: D_vs_player_301C0A4}
+
+D_vs_player_301C3A8:
+  { type: SF64:ANIM, offset: 0x301C3A8, symbol: D_vs_player_301C3A8}
+
+D_vs_player_301C614:
+  { type: SF64:SKELETON, offset: 0x301C614, symbol: D_vs_player_301C614, pad: 12}
+
+D_vs_player_301C79C:
+  { type: SF64:ANIM, offset: 0x301C79C, symbol: D_vs_player_301C79C, pad: 8}
+
+D_vs_player_301C9B0:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x301C9B0, symbol: D_vs_player_301C9B0 }
+
+D_vs_player_301CCE4:
+  { type: SF64:ANIM, offset: 0x301CCE4, symbol: D_vs_player_301CCE4}
+
+D_vs_player_301CFEC:
+  { type: SF64:ANIM, offset: 0x301CFEC, symbol: D_vs_player_301CFEC}
+
+D_vs_player_301D258:
+  { type: SF64:SKELETON, offset: 0x301D258, symbol: D_vs_player_301D258, pad: 8}
+
+D_vs_player_301D3DC:
+  { type: SF64:ANIM, offset: 0x301D3DC, symbol: D_vs_player_301D3DC, pad: 8}
+
+D_vs_player_301D568:
+  { type: SF64:ANIM, offset: 0x301D568, symbol: D_vs_player_301D568, pad: 12}
+
+D_vs_player_301D888:
+  { type: SF64:ANIM, offset: 0x301D888, symbol: D_vs_player_301D888}
+
+D_vs_player_301DB94:
+  { type: SF64:SKELETON, offset: 0x301DB94, symbol: D_vs_player_301DB94, pad: 8}
+
+D_vs_player_301DD6C:
+  { type: SF64:ANIM, offset: 0x301DD6C, symbol: D_vs_player_301DD6C, pad: 8}
+
+D_vs_player_301DEA4:
+  { type: SF64:ANIM, offset: 0x301DEA4, symbol: D_vs_player_301DEA4}
+
+D_vs_player_301E19C:
+  { type: SF64:ANIM, offset: 0x301E19C, symbol: D_vs_player_301E19C}
+
+D_vs_player_301E3E8:
+  { type: SF64:SKELETON, offset: 0x301E3E8, symbol: D_vs_player_301E3E8, pad: 12}
+
+D_vs_player_301E560:
+  { type: SF64:ANIM, offset: 0x301E560, symbol: D_vs_player_301E560}
+
+D_vs_player_301E570:
+  { type: GFX, offset: 0x301E570, symbol: D_vs_player_301E570}
+
+D_vs_player_301E5F8:
+  {type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 16, offset: 0x301E5F8, symbol: D_vs_player_301E5F8, pad: 8 }
+
+D_vs_player_301E700:
+  { type: GFX, offset: 0x301E700, symbol: D_vs_player_301E700}
+
+D_vs_player_301E788:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x301E788, symbol: D_vs_player_301E788, pad: 8}
+
+D_vs_player_301E990:
+  { type: GFX, offset: 0x301E990, symbol: D_vs_player_301E990}
+
+D_vs_player_301EA18:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x301EA18, symbol: D_vs_player_301EA18, pad: 8}
+
+D_vs_player_301EC20:
+  { type: GFX, offset: 0x301EC20, symbol: D_vs_player_301EC20}
+
+D_vs_player_301ECA8:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x301ECA8, symbol: D_vs_player_301ECA8, pad: 8}
+
+D_vs_player_301EEB0:
+  { type: GFX, offset: 0x301EEB0, symbol: D_vs_player_301EEB0}
+
+D_vs_player_301EF38:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x301EF38, symbol: D_vs_player_301EF38, pad: 8}
+
+D_vs_player_301F140:
+  { type: GFX, offset: 0x301F140, symbol: D_vs_player_301F140}
+
+PAD_vs_player_3001F2D8:
+  {type: BLOB, size: 0x8, offset: 0x301F2D8, symbol: PAD_vs_player_3001F2D8 }
+
+D_vs_player_301F2E0:
+  { type: GFX, offset: 0x301F2E0, symbol: D_vs_player_301F2E0}
+
+D_vs_player_301F368:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x301F368, symbol: D_vs_player_301F368, pad: 8 }
+
+D_vs_player_301F570:
+  { type: GFX, offset: 0x301F570, symbol: D_vs_player_301F570}
+
+D_vs_player_301F5F8:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x301F5F8, symbol: D_vs_player_301F5F8, pad: 8 }
+
+D_vs_player_301F800:
+  { type: GFX, offset: 0x301F800, symbol: D_vs_player_301F800}
+
+D_vs_player_301F888:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x301F888, symbol: D_vs_player_301F888, pad: 8 }
+
+D_vs_player_301FA90:
+  { type: GFX, offset: 0x301FA90, symbol: D_vs_player_301FA90}
+
+D_vs_player_301FB18:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x301FB18, symbol: D_vs_player_301FB18, pad: 8 }
+
+
+D_vs_player_301FD20:
+  { type: GFX, offset: 0x301FD20, symbol: D_vs_player_301FD20}
+
+D_vs_player_301FDA8:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x301FDA8, symbol: D_vs_player_301FDA8, pad: 8 }
+
+D_vs_player_301FFB0:
+  { type: GFX, offset: 0x301FFB0, symbol: D_vs_player_301FFB0}
+
+D_vs_player_3020048:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x3020048, symbol: D_vs_player_3020048, pad: 8 }
+
+D_vs_player_3020850:
+  { type: GFX, offset: 0x3020850, symbol: D_vs_player_3020850}
+
+D_vs_player_30208D8:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x30208D8, symbol: D_vs_player_30208D8, pad: 8 }
+
+D_vs_player_3020AE0:
+  { type: GFX, offset: 0x3020AE0, symbol: D_vs_player_3020AE0}
+
+D_vs_player_3020B78:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x3020B78, symbol: D_vs_player_3020B78, pad: 8 }
+
+D_vs_player_3020D80:
+  { type: GFX, offset: 0x3020D80, symbol: D_vs_player_3020D80}
+
+D_vs_player_3020E18:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x3020E18, symbol: D_vs_player_3020E18, pad: 8 }
+
+D_vs_player_3021620:
+  { type: GFX, offset: 0x3021620, symbol: D_vs_player_3021620}
+
+D_vs_player_30216B8:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x30216B8, symbol: D_vs_player_30216B8, pad: 8 }
+
+D_vs_player_30218C0:
+  { type: GFX, offset: 0x30218C0, symbol: D_vs_player_30218C0}
+
+D_vs_player_3021958:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x3021958, symbol: D_vs_player_3021958, pad: 8 }
+
+D_vs_player_3022160:
+  { type: GFX, offset: 0x3022160, symbol: D_vs_player_3022160}
+
+D_vs_player_30221E8:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x30221E8, symbol: D_vs_player_30221E8, pad: 8 }
+
+D_vs_player_30223F0:
+  { type: GFX, offset: 0x30223F0, symbol: D_vs_player_30223F0}
+
+D_vs_player_30226D0:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width:  8, height:  8, offset: 0x30226D0, symbol: D_vs_player_30226D0 }
+
+D_vs_player_3022DE0:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width:  8, height:  8, offset: 0x3022DE0, symbol: D_vs_player_3022DE0 }
+
+D_vs_player_3022E60:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x3022E60, symbol: D_vs_player_3022E60 }
+
+D_vs_player_3023238:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x3023238, symbol: D_vs_player_3023238, pad: 8 }
+
+PAD_vs_player_30023AF8:
+  {type: BLOB, size: 0x8, offset: 0x3023AF8, symbol: PAD_vs_player_30023AF8 }
+
+PAD_vs_player_30023BB8:
+  {type: BLOB, size: 0x8, offset: 0x3023BB8, symbol: PAD_vs_player_30023BB8 }
+
+PAD_vs_player_30023C78:
+  {type: BLOB, size: 0x8, offset: 0x3023C78, symbol: PAD_vs_player_30023C78 }
+
+D_vs_player_3023F68:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width:  8, height:  8, offset: 0x3023F68, symbol: D_vs_player_3023F68, pad: 8 }
+
+D_vs_player_30242D0:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width:  8, height:  8, offset: 0x30242D0, symbol: D_vs_player_30242D0 }
+
+PAD_vs_player_30024518:
+  {type: BLOB, size: 0x8, offset: 0x3024518, symbol: PAD_vs_player_30024518 }
+
+PAD_vs_player_300245B8:
+  {type: BLOB, size: 0x8, offset: 0x30245B8, symbol: PAD_vs_player_300245B8 }
+
+PAD_vs_player_30024658:
+  {type: BLOB, size: 0x8, offset: 0x3024658, symbol: PAD_vs_player_30024658 }
+
+D_vs_player_30246E8:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width:  8, height:  8, offset: 0x30246E8, symbol: D_vs_player_30246E8, pad: 8 }
+
+D_vs_player_3024C30:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x3024C30, symbol: D_vs_player_3024C30 }
+
+D_vs_player_3025138:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x3025138, symbol: D_vs_player_3025138 }
+
+D_vs_player_3025938:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width:  8, height:  8, offset: 0x3025938, symbol: D_vs_player_3025938, pad: 8 }
+
+PAD_vs_player_30025B78:
+  {type: BLOB, size: 0x8, offset: 0x3025B78, symbol: PAD_vs_player_30025B78 }
+
+D_vs_player_3025C68:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x3025C68, symbol: D_vs_player_3025C68, pad: 8 }
+
+D_vs_player_30261A0:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width:  8, height:  8, offset: 0x30261A0, symbol: D_vs_player_30261A0 }
+
+D_vs_player_3026A38:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width:  8, height:  8, offset: 0x3026A38, symbol: D_vs_player_3026A38 }
+
+D_vs_player_3026AB8:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width:  8, height:  8, offset: 0x3026AB8, symbol: D_vs_player_3026AB8 }
+
+D_vs_player_3026B38:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width:  8, height:  8, offset: 0x3026B38, symbol: D_vs_player_3026B38 }
+
+D_vs_player_3026BB8:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width:  8, height:  8, offset: 0x3026BB8, symbol: D_vs_player_3026BB8 }
+
+D_vs_player_3026C38:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width:  8, height:  8, offset: 0x3026C38, symbol: D_vs_player_3026C38 }
+
+D_vs_player_3026CB8:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height:  8, offset: 0x3026CB8, symbol: D_vs_player_3026CB8 }
+
+D_vs_player_3026DB8:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height:  8, offset: 0x3026DB8, symbol: D_vs_player_3026DB8 }
+
+D_vs_player_3026EB8:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x3026EB8, symbol: D_vs_player_3026EB8, pad: 8 }
+
+D_vs_player_3027268:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x3027268, symbol: D_vs_player_3027268, pad: 8 }
+
+PAD_vs_player_30027BD8:
+  {type: BLOB, size: 0x8, offset: 0x3027BD8, symbol: PAD_vs_player_30027BD8 }
+
+D_vs_player_3028130:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width:  8, height: 16, offset: 0x3028130, symbol: D_vs_player_3028130 }
+
+D_vs_player_3028230:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 16, offset: 0x3028230, symbol: D_vs_player_3028230 }
+
+D_vs_player_3028C60:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width:  8, height:  8, offset: 0x3028C60, symbol: D_vs_player_3028C60 }
+
+D_vs_player_3028CE0:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x3028CE0, symbol: D_vs_player_3028CE0 }
+
+D_vs_player_3029160:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width:  8, height:  8, offset: 0x3029160, symbol: D_vs_player_3029160 }
+
+D_vs_player_3029388:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x3029388, symbol: D_vs_player_3029388, pad: 8 }
+
+PAD_vs_player_30029C48:
+  {type: BLOB, size: 0x8, offset: 0x3029C48, symbol: PAD_vs_player_30029C48 }
+
+PAD_vs_player_30029D18:
+  {type: BLOB, size: 0x8, offset: 0x3029D18, symbol: PAD_vs_player_30029D18 }
+
+PAD_vs_player_30029DE8:
+  {type: BLOB, size: 0x8, offset: 0x3029DE8, symbol: PAD_vs_player_30029DE8 }
+
+D_vs_player_302A0A0:
+  { type: GFX, offset: 0x302A0A0, symbol: D_vs_player_302A0A0}
+
+D_vs_player_302A138:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x302A138, symbol: D_vs_player_302A138, pad: 8}
+
+D_vs_player_302A940:
+  { type: GFX, offset: 0x302A940, symbol: D_vs_player_302A940}
+
+D_vs_player_302A9C8:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x302A9C8, symbol: D_vs_player_302A9C8, pad: 8}
+
+D_vs_player_302ABD0:
+  { type: GFX, offset: 0x302ABD0, symbol: D_vs_player_302ABD0}
+
+D_vs_player_302AC68:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x302AC68, symbol: D_vs_player_302AC68, pad: 8}
+
+D_vs_player_302B470:
+  { type: GFX, offset: 0x302B470, symbol: D_vs_player_302B470}
+
+D_vs_player_302B4F8:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x302B4F8, symbol: D_vs_player_302B4F8, pad: 8}
+
+D_vs_player_302B700:
+  { type: GFX, offset: 0x302B700, symbol: D_vs_player_302B700}
+
+D_vs_player_302B788:
+  { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 16, offset: 0x302B788, symbol: D_vs_player_302B788, pad: 8}
+
+D_vs_player_302B890:
+  { type: GFX, offset: 0x302B890, symbol: D_vs_player_302B890}
+
+D_vs_player_302B918:
+  { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 16, offset: 0x302B918, symbol: D_vs_player_302B918, pad: 8}
+
+D_vs_player_302BA20:
+  { type: GFX, offset: 0x302BA20, symbol: D_vs_player_302BA20}
+
+D_vs_player_302BAA8:
+  { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 16, offset: 0x302BAA8, symbol: D_vs_player_302BAA8, pad: 8}
+
+D_vs_player_302BBB0:
+  { type: GFX, offset: 0x302BBB0, symbol: D_vs_player_302BBB0}
+
+D_vs_player_302BC38:
+  { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 16, offset: 0x302BC38, symbol: D_vs_player_302BC38, pad: 8}
+
+D_vs_player_302BD40:
+  { type: GFX, offset: 0x302BD40, symbol: D_vs_player_302BD40}
+
+D_vs_player_302BDC8:
+  { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 16, offset: 0x302BDC8, symbol: D_vs_player_302BDC8, pad: 8}
+
+D_vs_player_302BED0:
+  { type: GFX, offset: 0x302BED0, symbol: D_vs_player_302BED0}
+
+D_vs_player_302BF88:
+  { type: TEXTURE, ctype: u8, format: CI8, width:  16, height: 16, offset: 0x302BF88, symbol: D_vs_player_302BF88, tlut: 0x302C088 }
+
+D_vs_player_302C088:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 34, offset: 0x302C088, symbol: D_vs_player_302C088 }
+
+D_vs_player_302C0D0:
+  { type: GFX, offset: 0x302C0D0, symbol: D_vs_player_302C0D0}
+
+D_vs_player_302C188:
+  { type: TEXTURE, ctype: u8, format: CI8, width:  16, height: 16, offset: 0x302C188, symbol: D_vs_player_302C188, tlut: 0x302C288 }
+D_vs_player_302C288:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 94, offset: 0x302C288, symbol: D_vs_player_302C288, pad: 12 }
+
+D_vs_player_302C350:
+  { type: GFX, offset: 0x302C350, symbol: D_vs_player_302C350}
+
+D_vs_player_302C408:
+  { type: TEXTURE, ctype: u8, format: CI8, width:  16, height: 16, offset: 0x302C408, symbol: D_vs_player_302C408, tlut: 0x302C508 }
+D_vs_player_302C508:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 76, offset: 0x302C508, symbol: D_vs_player_302C508 }
+
+D_vs_player_302C5A0:
+  { type: GFX, offset: 0x302C5A0, symbol: D_vs_player_302C5A0}
+
+D_vs_player_302C658:
+  { type: TEXTURE, ctype: u8, format: CI8, width:  16, height: 16, offset: 0x302C658, symbol: D_vs_player_302C658, tlut: 0x302C758 }
+D_vs_player_302C758:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 101, offset: 0x302C758, symbol: D_vs_player_302C758, pad: 12 }
+
+D_vs_player_302C830:
+  { type: GFX, offset: 0x302C830, symbol: D_vs_player_302C830}
+
+D_vs_player_302C8E8:
+  { type: TEXTURE, ctype: u8, format: CI8, width:  16, height: 16, offset: 0x302C8E8, symbol: D_vs_player_302C8E8, tlut: 0x302C9E8 }
+D_vs_player_302C9E8:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 165, offset: 0x302C9E8, symbol: D_vs_player_302C9E8, pad: 12 }
+
+D_vs_player_302CB40:
+  { type: GFX, offset: 0x302CB40, symbol: D_vs_player_302CB40}
+
+D_vs_player_302CBF8:
+  { type: TEXTURE, ctype: u8, format: CI8, width:  16, height: 16, offset: 0x302CBF8, symbol: D_vs_player_302CBF8, tlut: 0x302CCF8 }
+D_vs_player_302CCF8:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 158, offset: 0x302CCF8, symbol: D_vs_player_302CCF8, pad: 12 }
+
+D_vs_player_302CE40:
+  { type: GFX, offset: 0x302CE40, symbol: D_vs_player_302CE40}
+
+D_vs_player_302CEF8:
+  { type: TEXTURE, ctype: u8, format: CI8, width:  16, height: 16, offset: 0x302CEF8, symbol: D_vs_player_302CEF8, tlut: 0x302CFF8 }
+D_vs_player_302CFF8:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 146, offset: 0x302CFF8, symbol: D_vs_player_302CFF8}
+
+D_vs_player_302D120:
+  { type: GFX, offset: 0x302D120, symbol: D_vs_player_302D120}
+
+D_vs_player_302D1B8:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width:  8, height:  8, offset: 0x302D1B8, symbol: D_vs_player_302D1B8, pad: 8 }
+
+D_vs_player_302D240:
+  { type: GFX, offset: 0x302D240, symbol: D_vs_player_302D240}
+
+D_vs_player_302D2C8:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x302D2C8, symbol: D_vs_player_302D2C8, pad: 8 }
+
+D_vs_player_302D4D0:
+  { type: GFX, offset: 0x302D4D0, symbol: D_vs_player_302D4D0}
+
+D_vs_player_302D568:
+  {type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x302D568, symbol: D_vs_player_302D568, pad: 8 }
+
+D_vs_player_302DD70:
+  { type: SF64:ENV_SETTINGS, offset: 0x302DD70, symbol: D_vs_player_302DD70}
+
+D_vs_player_302DDB4:
+  { type: SF64:ENV_SETTINGS, offset: 0x302DDB4, symbol: D_vs_player_302DDB4}
+
+D_vs_player_302DDF8:
+  { type: SF64:ENV_SETTINGS, offset: 0x302DDF8, symbol: D_vs_player_302DDF8}
+
+D_vs_player_302DE3C:
+  { type: SF64:OBJECT_INIT, offset: 0x302DE3C, symbol: D_vs_player_302DE3C}
+
+D_vs_player_302E0E4:
+  { type: SF64:OBJECT_INIT, offset: 0x302E0E4, symbol: D_vs_player_302E0E4}
+
+D_vs_player_302E170:
+  { type: SF64:OBJECT_INIT, offset: 0x302E170, symbol: D_vs_player_302E170}
+
+D_vs_player_302E378:
+  { type: SF64:OBJECT_INIT, offset: 0x302E378, symbol: D_vs_player_302E378}
+
+D_vs_player_302ED4C:
+  { type: SF64:HITBOX, offset: 0x302ED4C, symbol: D_vs_player_302ED4C}
+
+D_vs_player_302ED98:
+  { type: SF64:HITBOX, offset: 0x302ED98, symbol: D_vs_player_302ED98}
+
+D_vs_player_302EDB4:
+  { type: SF64:HITBOX, offset: 0x302EDB4, symbol: D_vs_player_302EDB4}
+
+D_vs_player_302EE00:
+  { type: SF64:HITBOX, offset: 0x302EE00, symbol: D_vs_player_302EE00}
+
+D_vs_player_302EE64:
+  { type: SF64:HITBOX, offset: 0x302EE64, symbol: D_vs_player_302EE64}
+
+D_vs_player_302EE80:
+  { type: SF64:HITBOX, offset: 0x302EE80, symbol: D_vs_player_302EE80}
+
+D_vs_player_302EE9C:
+  { type: SF64:HITBOX, offset: 0x302EE9C, symbol: D_vs_player_302EE9C}
+
+D_vs_player_302EEE8:
+  { type: SF64:TRIANGLE, count: 4, offset: 0x302EEE8, symbol: D_vs_player_302EEE8, mesh_symbol: "D_vs_player_OFFSET"}
+
+D_vs_player_302EF6C:
+  { type: SF64:TRIANGLE, count: 4, offset: 0x302EF6C, symbol: D_vs_player_302EF6C, mesh_symbol: "D_vs_player_OFFSET"}
+
+D_vs_player_302EFF0:
+  { type: SF64:TRIANGLE, count: 4, offset: 0x302EFF0, symbol: D_vs_player_302EFF0, mesh_symbol: "D_vs_player_OFFSET"}
+
+D_vs_player_302F044:
+  { type: SF64:TRIANGLE, count: 14, offset: 0x302F044, symbol: D_vs_player_302F044, mesh_symbol: "D_vs_player_OFFSET"}
+
+D_vs_player_302E56C:
+  {type: VEC3F, count: 20, offset: 0x302E56C, symbol: D_vs_player_302E56C}
+  
+D_vs_player_302E65C:
+  {type: VEC3F, count: 20, offset: 0x302E65C, symbol: D_vs_player_302E65C}
+  
+D_vs_player_302E74C:
+  {type: VEC3F, count: 19, offset: 0x302E74C, symbol: D_vs_player_302E74C}
+  
+D_vs_player_302E830:
+  {type: VEC3F, count: 25, offset: 0x302E830, symbol: D_vs_player_302E830}
+  
+D_vs_player_302E95C:
+  {type: VEC3F, count: 20, offset: 0x302E95C, symbol: D_vs_player_302E95C}
+  
+D_vs_player_302EA4C:
+  {type: VEC3F, count: 20, offset: 0x302EA4C, symbol: D_vs_player_302EA4C}
+  
+D_vs_player_302EB3C:
+  {type: VEC3F, count: 19, offset: 0x302EB3C, symbol: D_vs_player_302EB3C}
+  
+D_vs_player_302EC20:
+  {type: VEC3F, count: 25, offset: 0x302EC20, symbol: D_vs_player_302EC20}
+  
\ No newline at end of file
diff --git a/include/assets.h b/include/assets.h
index efe38f89..0af6fbe4 100644
--- a/include/assets.h
+++ b/include/assets.h
@@ -23,13 +23,13 @@ extern Gfx D_4007AF0[];
  */
 extern Gfx D_60005B0[]; // fox_bg
 extern Gfx D_6000A80[]; // fox_bg, fox_effect
-extern u16 D_6000B60[]; // fox_radio
+extern u16 D_A6_6000B60[]; // fox_radio
 extern Gfx D_6000E00[]; // fox_edata_1C
 extern Gfx D_6001360[]; // fox_bg, fox_demo, fox_edata_1C
 extern Gfx D_6001530[]; // fox_360, fox_demo, fox_ka
 extern Gfx D_6001840[]; // fox_bg
 extern Gfx D_6001A60[]; // fox_effect
-extern u16 D_6001A80[]; // fox_radio
+extern u16 D_A6_6001A80[]; // fox_radio
 extern u8 D_6001B80[]; // fox_hud
 extern Vtx D_6001C50[]; // fox_play
 extern u8 D_6001C80[]; // fox_map
@@ -38,7 +38,7 @@ extern u8 D_60020D0[]; // fox_hud
 extern u8 D_6002160[]; // fox_map
 extern Gfx D_60023B0[]; // fox_edata_1C
 extern Gfx D_6002990[]; // fox_edata_1C
-extern u16 D_60029A0[]; // fox_radio
+extern u16 D_A6_60029A0[]; // fox_radio
 extern Gfx D_6002E60[]; // fox_bg
 extern Gfx D_6002F80[]; // fox_bg
 extern Gfx D_6003000[]; // fox_edata_1C
@@ -47,7 +47,7 @@ extern Gfx D_60030F0[]; // fox_edata_1C
 extern Gfx D_60034D0[]; // fox_edata_1C, fox_enmy2
 extern Gfx D_60036A0[]; // fox_edata_1C, fox_enmy2
 extern Gfx D_6003760[];
-extern u16 D_60038C0[];
+extern u16 D_A6_60038C0[];
 extern Gfx D_60038E0[];
 extern u16 D_60038F8[];
 extern u8 D_6003B50[];
@@ -56,13 +56,13 @@ extern Gfx D_6004330[];
 extern Vtx D_6004500[];
 extern Gfx D_6004570[];
 extern Gfx D_60046F0[];
-extern u16 D_60047E0[];
+extern u16 D_A6_60047E0[];
 extern Gfx D_6004900[];
 extern u8 D_6004AC0[];
 extern Gfx D_6004FE0[];
 extern EnvSettings D_6005000;
 extern Gfx D_6005360[];
-extern u16 D_6005700[];
+extern u16 D_A6_6005700[];
 extern u16 D_6005710[];
 extern u8 D_6005740[];
 extern Gfx D_6005780[];
@@ -180,7 +180,7 @@ extern Gfx D_600DBC0[];
 extern u8 D_600DDC0[];
 extern Gfx D_600DDF0[];
 extern Gfx D_600E050[];
-extern Gfx D_600E0C0[];
+extern Gfx D_A6_600E0C0[];
 extern u8 D_600E210[];
 extern Animation D_600E2C4;
 extern u8 D_600E360[];
@@ -194,7 +194,7 @@ extern Gfx D_600EFF0[];
 extern Gfx D_600F160[];
 extern Gfx D_600F1D0[];
 extern CollisionPoly D_600F1DC[];
-extern Gfx D_600F1F0[];
+extern Gfx D_A6_600F1F0[];
 extern Gfx D_600F2F0[];
 extern u8 D_600F390[];
 extern Vec3s D_600F394[];
@@ -239,7 +239,7 @@ extern f32 D_601115C[];
 extern u8 D_TEX_6011660[];
 extern Vec3s D_601170C[];
 extern u8 D_6011890[];
-extern Gfx D_6011910[];
+extern Gfx D_A6_6011910[];
 extern f32 D_6011B24[];
 extern u16 D_6011B40[];
 extern f32 D_6011BF4[];
@@ -279,7 +279,7 @@ extern CollisionPoly D_6014FEC[];
 extern Gfx D_60153B0[];
 extern u16 D_6015430[];
 extern u8 D_6015CE0[];
-extern Gfx D_6015EE0[];
+extern Gfx D_A6_6015EE0[];
 extern Gfx D_6015F00[];
 extern Gfx D_6016270[];
 extern Vec3s D_6016374[];
@@ -296,25 +296,25 @@ extern u8 D_6017640[];
 extern u8 D_6018280[];
 extern Gfx D_6018450[];
 extern Gfx D_60188D0[];
-extern Animation D_6018994;
-extern Limb* D_6018BA0[];
-extern Gfx D_6018BF0[];
+extern Animation D_A6_6018994;
+extern Limb* D_A6_6018BA0[];
+extern Gfx D_A6_6018BF0[];
 extern Gfx D_6018C00[]; // possible collision
 extern Gfx D_6018D40[];
 extern Gfx D_6018E80[];
 extern u16 D_6018F30[];
 extern u8 D_60190B0[];
 extern Gfx D_6019220[];
-extern Gfx D_6019730[];
+extern Gfx D_A6_6019730[];
 extern u16 D_6019E50[];
-extern Gfx D_601A120[];
+extern Gfx D_A6_601A120[];
 extern Gfx D_601A7A0[];
 extern Gfx D_601A7D0[];
 extern Gfx D_601AD70[];
 extern Gfx D_601AE40[];
 extern Gfx D_601B0D0[];
 extern u16* D_601B1E4[];
-extern Gfx D_601B2B0[];
+extern Gfx D_A6_601B2B0[];
 extern u16 D_601B4B0[];
 extern f32 D_601B4C4[];
 extern f32 D_601B4E0[];
@@ -337,7 +337,7 @@ extern f32 D_601B830[];
 extern f32 D_601B868[];
 extern f32 D_601B8A0[];
 extern f32 D_601B8D8[];
-extern Gfx D_601BB40[];
+extern Gfx D_A6_601BB40[];
 extern Gfx D_601BEC0[];
 extern Gfx D_601C0D0[];
 extern Gfx D_601C6A0[];
@@ -385,7 +385,7 @@ extern u16 D_60229A4[];
 extern f32 D_60231A4[];
 extern Gfx D_60238F0[];
 extern Gfx D_6023AC0[];
-extern EnvSettings D_6023F20;
+extern EnvSettings D_A6_6023F20;
 extern Gfx D_6024010[];
 extern Gfx D_6024220[];
 extern Gfx D_60244A0[];
@@ -407,12 +407,12 @@ extern Animation D_6027320;
 extern u16 D_6027340[];
 extern Limb* D_602742C[];
 extern Gfx D_6027900[];
-extern u16* D_6027F50[];
+extern u16* D_A6_6027F50[];
 extern u16 D_6028260[];
-extern f32 D_6028454[];
-extern f32 D_6028578[];
-extern EnvSettings D_6028760;
-extern u16* D_60289FC[];
+extern f32 D_A6_6028454[];
+extern f32 D_A6_6028578[];
+extern EnvSettings D_A6_6028760;
+extern u16* D_A6_60289FC[];
 extern u16 D_6028A60[];
 extern u16 D_6029170[];
 extern u8 D_6029220[];
@@ -494,12 +494,8 @@ extern Triangle D_6030F64[];
 extern Vec3f D_6030F7C[];
 extern Triangle D_6030FC4[];
 extern Vec3s D_603184C[];
-extern Vec3f D_6031FE0[];
-extern Vec3f D_603204C[];
 extern Gfx D_60320E0[];
-extern Vec3f D_603216C[];
 extern u16 D_60323D0[];
-extern Vec3f D_6032430[];
 extern u16 D_6032440[];
 extern Gfx D_6032580[];
 extern u16 D_6032A60[];
diff --git a/include/assets/ast_7_ti_2.h b/include/assets/ast_7_ti_2.h
index 81294984..8a863f36 100644
--- a/include/assets/ast_7_ti_2.h
+++ b/include/assets/ast_7_ti_2.h
@@ -5,7 +5,7 @@
 #include "sf64object.h"
 #include "structs.h"
 
-extern Animation D_7003EE8;
+extern Animation D_TI2_7003EE8;
 extern Animation D_70084CC;
 extern Animation D_70096EC;
 extern Animation D_700E244;
diff --git a/include/assets/ast_andross.h b/include/assets/ast_andross.h
index 0c4ce383..9cd967ec 100644
--- a/include/assets/ast_andross.h
+++ b/include/assets/ast_andross.h
@@ -44,6 +44,7 @@ extern Animation D_C030244;
 extern Animation D_C033780;
 extern Animation D_C033D98;
 extern EnvSettings D_C035110;
+extern ObjectInit D_C035154[];
 extern ObjectInit D_C0356A4[];
 extern ObjectInit D_C0356CC[];
 extern ObjectInit D_C036310[];
diff --git a/include/assets/ast_area_6.h b/include/assets/ast_area_6.h
deleted file mode 100644
index a5bd317b..00000000
--- a/include/assets/ast_area_6.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef AST_AREA_6_H
-#define AST_AREA_6_H
-
-#include "gfx.h"
-#include "sf64object.h"
-#include "structs.h"
-
-extern f32 D_6028454[];
-extern f32 D_6028578[];
-
-#endif
diff --git a/include/assets/ast_vs_player.h b/include/assets/ast_vs_player.h
deleted file mode 100644
index 32f60659..00000000
--- a/include/assets/ast_vs_player.h
+++ /dev/null
@@ -1,119 +0,0 @@
-#ifndef AST_VS_PLAYER_H
-#define AST_VS_PLAYER_H
-
-#include "gfx.h"
-#include "sf64object.h"
-#include "sf64level.h"
-#include "structs.h"
-
-extern u8  D_3000000[];
-extern u16 D_3000080[];
-extern u8  D_30001E0[];
-extern u16 D_3000380[];
-extern u8  D_30003A0[];
-extern u16 D_30004E0[];
-extern u8  D_3000510[];
-extern u16 D_30006A0[];
-extern u8  D_30006D0[];
-extern u16 D_3000810[];
-extern u16 D_3000B20[];
-extern u16 D_3000BC0[];
-extern u8  D_30013E0[];
-extern u8  D_3001420[];
-extern u16 D_3003E20[];
-extern u8  D_3004010[];
-extern u16 D_3004D58[];
-extern u8 D_3004F60[];
-extern u16 D_3005E38[];
-extern u8 D_3006040[];
-extern u16 D_3006A68[];
-extern u8  D_3006C60[];
-extern u16 D_3007500[];
-extern u8 D_30076C0[];
-extern u16 D_3008598[];
-extern u8 D_30087A0[];
-extern u16 D_3008DE0[];
-extern u8 D_3008EC0[];
-extern u16 D_30098C0[];
-extern u8 D_3009990[];
-extern u16 D_300A390[];
-extern u8  D_300A470[];
-extern u16 D_300B218[];
-extern u8 D_300B3F0[];
-extern u16 D_300C458[];
-extern u8 D_300D350[];
-extern u16 D_300D398[];
-extern u8 D_300D3C0[];
-extern u16 D_300D408[];
-extern u8 D_300D440[];
-extern u16 D_300D500[];
-extern Gfx D_300D550[];
-extern Gfx D_300EE80[];
-extern Gfx D_300FB80[];
-extern Gfx D_3010A90[];
-extern Gfx D_3011470[];
-extern Gfx D_3011E40[];
-extern Gfx D_3012ED0[];
-extern Gfx D_3013580[];
-extern Gfx D_3013780[];
-extern Gfx D_30146B0[];
-extern Gfx D_30155E0[];
-extern Gfx D_3015740[];
-extern Gfx D_30160A0[];
-extern Gfx D_3016660[];
-extern Gfx D_3016B00[];
-extern Gfx D_30173C0[];
-extern Gfx D_30174E0[];
-extern Gfx D_3017600[];
-extern Gfx D_3017600[];
-extern Gfx D_3018800[];
-extern Gfx D_301AD60[];
-extern Gfx D_301AEF0[];
-extern Gfx D_301B080[];
-extern Gfx D_301B6E0[];
-extern Animation D_301C3A8;
-extern Limb* D_301C614[];
-extern Animation D_301CFEC;
-extern Limb* D_301D258[];
-extern Animation D_301D888;
-extern Limb* D_301DB94[];
-extern Animation D_301E19C;
-extern Limb* D_301E3E8[];
-extern Gfx D_301E570[];
-extern Gfx D_301F140[];
-extern Gfx D_301FD20[];
-extern Gfx D_302D120[];
-extern Gfx D_302D240[];
-extern Gfx D_302D4D0[];
-extern EnvSettings D_302DD70;
-extern EnvSettings D_302DDB4;
-extern EnvSettings D_302DDF8;
-extern ObjectInit D_302DE3C[];
-extern ObjectInit D_302E0E4[];
-extern ObjectInit D_302E170[];
-extern ObjectInit D_302E378[];
-extern Vec3f D_302E56C[];
-extern Vec3f D_302E65C[];
-extern Vec3f D_302E74C[];
-extern Vec3f D_302E830[];
-extern Vec3f D_302E95C[];
-extern Vec3f D_302EA4C[];
-extern Vec3f D_302EB3C[];
-extern Vec3f D_302EC20[];
-extern f32 D_302ED4C[];
-extern f32 D_302ED98[];
-extern f32 D_302EDB4[];
-extern f32 D_302EE00[];
-extern f32 D_302EE64[];
-extern f32 D_302EE80[];
-extern f32 D_302EE9C[];
-extern Triangle D_302EEE8[];
-extern Vec3f D_302EF00[];
-extern Triangle D_302EF6C[];
-extern Vec3f D_302EF84[];
-extern Triangle D_302EFF0[];
-extern Vec3f D_302F008[];
-extern Triangle D_302F044[];
-extern Vec3f D_302F098[];
-
-#endif
diff --git a/include/context.h b/include/context.h
index 39208a24..479ee24c 100644
--- a/include/context.h
+++ b/include/context.h
@@ -236,8 +236,8 @@ extern Boss gBosses[4];
 extern Effect gEffects[100];
 extern Item gItems[20];
 extern PlayerShot gPlayerShots[16];
-extern UnkEntity30 gUnkEntities30[100];
-extern UnkEntity28 gUnkEntities28[65];
+extern TexturedLine gTexturedLines[100];
+extern RadarMark gRadarMarks[65];
 extern BonusText gBonusText[10];
 extern s32 D_80176550[2];
 extern f32 D_80176558[2][100];
diff --git a/include/fox_enmy2_assets.h b/include/fox_enmy2_assets.h
index 43c8f38a..87fbb0d8 100644
--- a/include/fox_enmy2_assets.h
+++ b/include/fox_enmy2_assets.h
@@ -19,9 +19,7 @@ extern Gfx D_4001310[];
 extern Gfx D_601F2A0[];
 extern Gfx D_400AAE0[];
 extern Gfx D_4000650[];
-extern Gfx D_6016190[];
 extern Gfx D_4008FA0[];
-extern Gfx D_6012A40[];
 extern Gfx D_60102C0[];
 extern Gfx D_6017B60[];
 extern Gfx D_6004D00[];
@@ -56,9 +54,6 @@ extern Gfx D_60043F0[];
 extern Gfx D_6004310[];
 extern Gfx D_6002890[];
 
-extern f32 D_60282A0[];
-extern f32 D_6028254[];
-extern f32 D_60280E0[];
 extern f32 D_6034478[];
 extern f32 D_603450C[];
 extern f32 D_6034588[];
diff --git a/include/fox_enmy_assets.h b/include/fox_enmy_assets.h
index 94d948e5..9dee9b4e 100644
--- a/include/fox_enmy_assets.h
+++ b/include/fox_enmy_assets.h
@@ -5,15 +5,10 @@
 
 extern ObjectInit D_60371A4[];
 extern ObjectInit D_6026CC4[];
-extern ObjectInit D_SX_602A164[];
-extern ObjectInit D_6023F64[];
-extern ObjectInit D_60287A4[];
 extern ObjectInit D_602E4F4[];
 extern ObjectInit D_6007E74[];
 extern ObjectInit D_601F234[];
 extern ObjectInit D_6026714[];
-extern ObjectInit D_0C035154[];
-extern ObjectInit D_TR_6006AA4[];
 extern ObjectInit D_6031000[];
 extern ObjectInit D_6006C60[];
 extern ObjectInit D_602E5C8[];
@@ -22,6 +17,5 @@ extern ObjectInit D_6011044[];
 extern ObjectInit D_600FF74[];
 extern ObjectInit D_6006EB4[];
 extern ObjectInit D_6014D94[];
-extern ObjectInit D_0302DE3C[];
 
 #endif
diff --git a/include/functions.h b/include/functions.h
index d993d3ba..6844c192 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -136,7 +136,7 @@ s32 func_8005F9DC(Vec3f*);
 // fox_enmy
 void func_80060714(s32 );
 void func_8006089C(u8 );
-void func_80060968(void);
+void TexturedLine_Draw(void);
 void func_80060D94(s32);
 void func_80060F30(f32* , u32 , s32 );
 void Object_Kill(Object*, f32*);
@@ -204,8 +204,8 @@ void Object_80_Update(Object_80*);
 void Object_4C_Update(Object_4C*);
 void Item_Update(Item*);
 void Effect_Update(Effect*);
-void func_8006A06C(UnkEntity30*);
-void func_8006A38C(void);
+void TexturedLine_Update(TexturedLine*);
+void TexturedLine_UpdateAll(void);
 void Object_UpdateAll(void);
 
 //fox_6B3B0
diff --git a/include/prevent_context_reordering.h b/include/prevent_context_reordering.h
index 48109fed..c7bebd28 100644
--- a/include/prevent_context_reordering.h
+++ b/include/prevent_context_reordering.h
@@ -1,10 +1,10 @@
 #ifndef PREVENT_CONTEXT_REORDERING_H
 #define PREVENT_CONTEXT_REORDERING_H
 
-extern int Dummyhalf;
+// extern int Dummyhalf;
 // struct Dummy0 {int x;};
 // struct Dummy1 {int x;};
-struct Dummy2 {int x;};
+// struct Dummy2 {int x;};
 struct Dummy3 {int x;};
 struct Dummy4 {int x;};
 struct Dummy5 {int x;};
diff --git a/include/sf64audio_external.h b/include/sf64audio_external.h
index 5b4f134c..817fd98f 100644
--- a/include/sf64audio_external.h
+++ b/include/sf64audio_external.h
@@ -7,6 +7,13 @@
 #define AUDIO_PLAY_SFX(sfxId, srcPos, token) (Audio_PlaySfx((sfxId),(srcPos),(token),&gDefaultMod,&gDefaultMod,&gDefaultReverb))
 #define AUDIO_PLAY_BGM(seqId) Audio_PlaySequence(SEQ_PLAYER_BGM, (seqId), 0, -1)
 
+typedef enum {
+    /* 0 */ SOUNDMODE_STEREO,
+    /* 1 */ SOUNDMODE_HEADSET,
+    /* 2 */ SOUNDMODE_SURROUND,
+    /* 3 */ SOUNDMODE_MONO
+} SoundMode;
+
 typedef enum {
     SEQ_ID_0,
     SEQ_ID_1,
diff --git a/include/sf64dma.h b/include/sf64dma.h
index 9b750179..9b50a534 100644
--- a/include/sf64dma.h
+++ b/include/sf64dma.h
@@ -97,7 +97,7 @@ extern OverlayInit sOvlending_Ending[6]; // overlay EF0260
 extern OverlayInit sOvlmenu_Title[1]; // EBFBE0
 extern OverlayInit sOvlmenu_Option[1]; // EBFBE0
 extern OverlayInit sOvlmenu_Map[1]; // EBFBE0
-extern OverlayInit sOvlmenu_State5[1]; // EBFBE0
+extern OverlayInit sOvlmenu_GameOver[1]; // EBFBE0
 extern OverlayInit sOvli1_Corneria[1]; // fox_i1
 extern OverlayInit sOvli2_Meteo[2]; // fox_i2
 extern OverlayInit sOvli5_Titania[6]; // E6A810
diff --git a/include/sf64level.h b/include/sf64level.h
index 5fd18853..e6ebe7d2 100644
--- a/include/sf64level.h
+++ b/include/sf64level.h
@@ -37,7 +37,7 @@ typedef enum {
     /*  0 */ OVL_SETUP_TITLE,
     /*  1 */ OVL_SETUP_MENU,
     /*  2 */ OVL_SETUP_MAP,
-    /*  3 */ OVL_SETUP_STATE_5,
+    /*  3 */ OVL_SETUP_GAME_OVER,
     /*  4 */ OVL_SETUP_CREDITS,
     /*  5 */ OVL_SETUP_CORNERIA,
     /*  6 */ OVL_SETUP_METEO,
diff --git a/include/structs.h b/include/structs.h
index 8e046d1f..332d943c 100644
--- a/include/structs.h
+++ b/include/structs.h
@@ -10,7 +10,7 @@ typedef struct {
     /* 0x04 */ Vec3f pos;
     /* 0x10 */ f32 unk_10;
     /* 0x14 */ char pad14[0x14];
-} UnkEntity28; // size = 0x28
+} RadarMark; // size = 0x28
 
 typedef struct {
     /* 0x00 */ u8 mode;
@@ -25,7 +25,7 @@ typedef struct {
     /* 0x2D */ u8 unk_2D;
     /* 0x2E */ u8 unk_2E;
     /* 0x2F */ u8 unk_2F;
-} UnkEntity30; // size = 0x30
+} TexturedLine; // size = 0x30
 
 typedef struct {
     /* 0x00 */ u8 hits;
@@ -66,4 +66,11 @@ typedef enum OptionState {
     OPTION_UPDATE
 } OptionState;
 
+typedef enum OptionSoundMode {
+    OPTIONSOUND_STEREO,
+    OPTIONSOUND_MONO,
+    OPTIONSOUND_HEADSET,
+    OPTIONSOUND_MAX,
+} OptionSoundMode;
+
 #endif
diff --git a/linker_scripts/us/symbol_addrs.txt b/linker_scripts/us/symbol_addrs.txt
index 61cfbd3e..813bbcab 100644
--- a/linker_scripts/us/symbol_addrs.txt
+++ b/linker_scripts/us/symbol_addrs.txt
@@ -31,6 +31,7 @@ D_800D0000 = 0x800D0000;//ignore:true
 D_7FFFFFFE = 0x7FFFFFFE;//ignore:true
 D_1000000 =  0x01000000;//ignore:true
 D_A000000 =  0x0A000000;//ignore:true
+D_4000000 = 0x04000000;//ignore:true
 
 // constant for K1 access
 D_A0000000 = 0xA0000000;//ignore:true
diff --git a/linker_scripts/us/symbol_addrs_assets.txt b/linker_scripts/us/symbol_addrs_assets.txt
index 476e1f87..6a3a1720 100644
--- a/linker_scripts/us/symbol_addrs_assets.txt
+++ b/linker_scripts/us/symbol_addrs_assets.txt
@@ -59,9 +59,17 @@ D_AQ_6000AE4 = 0x06000AE4;
 D_AQ_6002628 = 0x06002628;
 D_AQ_60260EC = 0x060260EC;
 D_AQ_60314AC = 0x060314AC;
-D_TI1_70067C4 = 0x70067C4;
-D_TI1_7006990 = 0x7006990;
-D_TI1_7006F74 = 0x7006F74;
-D_TI1_7007130 = 0x7007130;
-D_TI1_7007234 = 0x7007234;
-D_TI1_700733C = 0x700733C;
+D_TI1_70067C4 = 0x070067C4;
+D_TI1_7006990 = 0x07006990;
+D_TI1_7006F74 = 0x07006F74;
+D_TI1_7007130 = 0x07007130;
+D_TI1_7007234 = 0x07007234;
+D_TI1_700733C = 0x0700733C;
+D_TI2_7003EE8 = 0x07003EE8;
+
+D_A6_6018994 = 0x06018994;
+D_A6_6011910 = 0x06011910;
+D_A6_601B2B0 = 0x0601B2B0;
+D_A6_6018BA0 = 0x06018BA0;
+D_A6_6028578 = 0x06028578;
+D_A6_6028454 = 0x06028454;
diff --git a/linker_scripts/us/symbol_addrs_engine.txt b/linker_scripts/us/symbol_addrs_engine.txt
index a660caad..28eca998 100644
--- a/linker_scripts/us/symbol_addrs_engine.txt
+++ b/linker_scripts/us/symbol_addrs_engine.txt
@@ -227,7 +227,7 @@ Object_DrawAll = 0x8005FB70;
 func_8006046C = 0x8006046C;
 func_80060714 = 0x80060714;
 func_8006089C = 0x8006089C;
-func_80060968 = 0x80060968;
+TexturedLine_Draw = 0x80060968;
 func_80060D94 = 0x80060D94;
 
 // fox_effect
@@ -325,8 +325,8 @@ Object_80_Update = 0x80069DF4;
 Object_4C_Update = 0x80069E88;
 Item_Update = 0x80069F30;
 Effect_Update = 0x80069FD4;
-func_8006A06C = 0x8006A06C;
-func_8006A38C = 0x8006A38C;
+TexturedLine_Update = 0x8006A06C;
+TexturedLine_UpdateAll = 0x8006A38C;
 Object_UpdateAll = 0x8006A3E8;
 
 // fox_enmy2
@@ -410,8 +410,8 @@ gBosses = 0x8016F110; //size:0x1020
 gEffects = 0x80170130; //size:0x36B0
 gItems = 0x801737E0; //size:0x870
 gPlayerShots = 0x80174050; //size:0x700
-gUnkEntities30 = 0x80174750; //size:0x12C0
-gUnkEntities28 = 0x80175A10; //size:0xA28
+gTexturedLines = 0x80174750; //size:0x12C0
+gRadarMarks = 0x80175A10; //size:0xA28
 gBonusText = 0x80176438; //size:0x118
 D_80176550 = 0x80176550;
 D_80176558 = 0x80176558;
@@ -670,8 +670,8 @@ func_800A5FA0 = 0x800A5FA0;
 func_800A6028 = 0x800A6028;
 func_800A6070 = 0x800A6070;
 BonusText_Initialize = 0x800A60B8;
-func_800A60E8 = 0x800A60E8;
-func_800A6118 = 0x800A6118;
+TexturedLine_Initialize = 0x800A60E8;
+RadarMark_Initialize = 0x800A6118;
 func_800A6148 = 0x800A6148;
 func_800A6590 = 0x800A6590;
 func_800A668C = 0x800A668C;
diff --git a/linker_scripts/us/undefined_syms.ld b/linker_scripts/us/undefined_syms.ld
index 892cddad..74662987 100644
--- a/linker_scripts/us/undefined_syms.ld
+++ b/linker_scripts/us/undefined_syms.ld
@@ -58,62 +58,62 @@ D_1015B70 = 0x01015B70;
 D_1015320 = 0x01015320;
 
 
-D_2000000 = 0x02000000;
-D_2000890 = 0x02000890;
-D_2001090 = 0x02001090;
-D_2001120 = 0x02001120;
-D_20019B0 = 0x020019B0;
-D_2002120 = 0x02002120;
-D_2002240 = 0x02002240;
-D_2002AD0 = 0x02002AD0;
-D_2003360 = 0x02003360;
-D_2003BF0 = 0x02003BF0;
-D_2004240 = 0x02004240;
-D_2004480 = 0x02004480;
-D_2004D10 = 0x02004D10;
-D_20052D0 = 0x020052D0;
-D_20055A0 = 0x020055A0;
-D_2005E30 = 0x02005E30;
-D_2006360 = 0x02006360;
-D_20066C0 = 0x020066C0;
-D_20073F0 = 0x020073F0;
-D_2008480 = 0x02008480;
-D_2009510 = 0x02009510;
-D_200A5A0 = 0x0200A5A0;
-D_200B630 = 0x0200B630;
-D_200C6C0 = 0x0200C6C0;
-D_200E7F0 = 0x0200E7F0;
-D_200F080 = 0x0200F080;
-D_200F910 = 0x0200F910;
-D_20101A0 = 0x020101A0;
+D_BG_SPACE_2000000 = 0x02000000;
+D_BG_SPACE_2000890 = 0x02000890;
+D_BG_PLANET_2001090 = 0x02001090;
+D_BG_SPACE_2001120 = 0x02001120;
+D_BG_SPACE_20019B0 = 0x020019B0;
+D_BG_PLANET_2002120 = 0x02002120;
+D_BG_SPACE_2002240 = 0x02002240;
+D_BG_SPACE_2002AD0 = 0x02002AD0;
+D_BG_SPACE_2003360 = 0x02003360;
+D_BG_SPACE_2003BF0 = 0x02003BF0;
+D_BG_PLANET_2004240 = 0x02004240;
+D_BG_SPACE_2004480 = 0x02004480;
+D_BG_SPACE_2004D10 = 0x02004D10;
+D_BG_PLANET_20052D0 = 0x020052D0;
+D_BG_SPACE_20055A0 = 0x020055A0;
+D_BG_SPACE_2005E30 = 0x02005E30;
+D_BG_PLANET_2006360 = 0x02006360;
+D_BG_SPACE_20066C0 = 0x020066C0;
+D_BG_PLANET_20073F0 = 0x020073F0;
+D_BG_PLANET_2008480 = 0x02008480;
+D_BG_PLANET_2009510 = 0x02009510;
+D_BG_PLANET_200A5A0 = 0x0200A5A0;
+D_BG_PLANET_200B630 = 0x0200B630;
+D_BG_PLANET_200C6C0 = 0x0200C6C0;
+D_BG_PLANET_200E7F0 = 0x0200E7F0;
+D_BG_PLANET_200F080 = 0x0200F080;
+D_BG_PLANET_200F910 = 0x0200F910;
+D_BG_PLANET_20101A0 = 0x020101A0;
 
-D_3001C90 = 0x03001C90;
-D_3003CE0 = 0x03003CE0;
-D_3007650 = 0x03007650;
-D_3012ED0 = 0x03012ED0;
-D_3013580 = 0x03013580;
-D_3013780 = 0x03013780;
-D_3016B00 = 0x03016B00;
-D_3016CC0 = 0x03016CC0;
-D_30173C0 = 0x030173C0;
-D_30174E0 = 0x030174E0;
-D_3017600 = 0x03017600;
-D_301B080 = 0x0301B080;
-D_302ED4C = 0x0302ED4C;
-D_302ED98 = 0x0302ED98;
-D_302EDB4 = 0x0302EDB4;
-D_302EE00 = 0x0302EE00;
-D_302EE64 = 0x0302EE64;
-D_302EE80 = 0x0302EE80;
-D_302EE9C = 0x0302EE9C;
-D_302EEE8 = 0x0302EEE8;
-D_302EF00 = 0x0302EF00;
-D_302EF6C = 0x0302EF6C;
-D_302EF84 = 0x0302EF84;
-D_302EFF0 = 0x0302EFF0;
-D_302F008 = 0x0302F008;
-D_302F044 = 0x0302F044;
-D_302F098 = 0x0302F098;
+D_arwing_3001C90 = 0x03001C90;
+D_arwing_3003CE0 = 0x03003CE0;
+D_arwing_3007650 = 0x03007650;
+D_vs_player_3012ED0 = 0x03012ED0;
+D_vs_player_3013580 = 0x03013580;
+D_vs_player_3013780 = 0x03013780;
+D_vs_player_3016B00 = 0x03016B00;
+D_arwing_3016CC0 = 0x03016CC0;
+D_vs_player_30173C0 = 0x030173C0;
+D_vs_player_30174E0 = 0x030174E0;
+D_vs_player_3017600 = 0x03017600;
+D_vs_player_301B080 = 0x0301B080;
+D_vs_player_302ED4C = 0x0302ED4C;
+D_vs_player_302ED98 = 0x0302ED98;
+D_vs_player_302EDB4 = 0x0302EDB4;
+D_vs_player_302EE00 = 0x0302EE00;
+D_vs_player_302EE64 = 0x0302EE64;
+D_vs_player_302EE80 = 0x0302EE80;
+D_vs_player_302EE9C = 0x0302EE9C;
+D_vs_player_302EEE8 = 0x0302EEE8;
+D_arwing_302EF00 = 0x0302EF00;
+D_vs_player_302EF6C = 0x0302EF6C;
+D_arwing_302EF84 = 0x0302EF84;
+D_vs_player_302EFF0 = 0x0302EFF0;
+D_arwing_302F008 = 0x0302F008;
+D_vs_player_302F044 = 0x0302F044;
+D_arwing_302F098 = 0x0302F098;
 
 D_5000000 = 0x05000000;
 D_5000080 = 0x05000080;
@@ -297,7 +297,7 @@ D_6026C90 = 0x06026C90;
 D_60270E0 = 0x060270E0;
 D_6027180 = 0x06027180;
 D_6027900 = 0x06027900;
-D_6028454 = 0x06028454;
+D_A6_6028454 = 0x06028454;
 D_6029170 = 0x06029170;
 D_6029220 = 0x06029220;
 D_AQ_602B4C0 = 0x0602B4C0;
@@ -510,8 +510,8 @@ D_6029BE4 = 0x06029BE4;
 D_SX_602A120 = 0x0602A120;
 D_602A710 = 0x0602A710;
 D_6020058 = 0x06020058;
-D_6023F20 = 0x06023F20;
-D_6028760 = 0x06028760;
+D_A6_6023F20 = 0x06023F20;
+D_A6_6028760 = 0x06028760;
 D_602E4B0 = 0x0602E4B0;
 D_6007E30 = 0x06007E30;
 D_601F1F0 = 0x0601F1F0;
@@ -676,20 +676,20 @@ D_9004230 = 0x09004230;
 
 // fox_versus
 
-D_30087A0 = 0x030087A0;
-D_3008DE0 = 0x03008DE0;
-D_3008EC0 = 0x03008EC0;
-D_30098C0 = 0x030098C0;
-D_3009990 = 0x03009990;
-D_300A390 = 0x0300A390;
-D_3006A68 = 0x03006A68;
-D_3008598 = 0x03008598;
-D_300C458 = 0x0300C458;
-D_3005E38 = 0x03005E38;
-D_3006040 = 0x03006040;
-D_30076C0 = 0x030076C0;
-D_300B3F0 = 0x0300B3F0;
-D_3004F60 = 0x03004F60;
+D_vs_player_30087A0 = 0x030087A0;
+D_vs_player_3008DE0 = 0x03008DE0;
+D_vs_player_3008EC0 = 0x03008EC0;
+D_vs_player_30098C0 = 0x030098C0;
+D_vs_player_3009990 = 0x03009990;
+D_vs_player_300A390 = 0x0300A390;
+D_vs_player_3006A68 = 0x03006A68;
+D_vs_player_3008598 = 0x03008598;
+D_vs_player_300C458 = 0x0300C458;
+D_vs_player_3005E38 = 0x03005E38;
+D_vs_player_3006040 = 0x03006040;
+D_vs_player_30076C0 = 0x030076C0;
+D_vs_player_300B3F0 = 0x0300B3F0;
+D_vs_player_3004F60 = 0x03004F60;
 
 // fox_hud, to be ordered later
 D_101C170 = 0x0101C170;
@@ -704,8 +704,6 @@ D_101B5F0 = 0x0101B5F0;
 D_101B480 = 0x0101B480;
 D_101B310 = 0x0101B310;
 D_101B1A0 = 0x0101B1A0;
-D_03000000 = 0x03000000;
-D_3000080 = 0x03000080;
 D_5000D50 = 0x05000D50;
 D_5006CB0 = 0x05006CB0;
 D_5006E90 = 0x05006E90;
@@ -728,7 +726,7 @@ D_C038860 = 0x0C038860;
 D_C038954 = 0x0C038954;
 
 // fox_end2
-D_3016CC0 = 0x03016CC0;
+D_arwing_3016CC0 = 0x03016CC0;
 D_50054B0 = 0x050054B0;
 D_7016540 = 0x07016540;
 
@@ -1013,13 +1011,13 @@ D_601F3B8 = 0x0601F3B8;
 D_60371A4 = 0x0060371A4;
 D_6026CC4 = 0x006026CC4;
 D_SX_602A164 = 0x00602A164;
-D_6023F64 = 0x006023F64;
-D_60287A4 = 0x0060287A4;
+D_A6_6023F64 = 0x006023F64;
+D_A6_60287A4 = 0x0060287A4;
 D_602E4F4 = 0x00602E4F4;
 D_6007E74 = 0x006007E74;
 D_601F234 = 0x00601F234;
 D_6026714 = 0x006026714;
-D_0C035154 = 0x00C035154;
+D_C035154 = 0x00C035154;
 D_TR_6006AA4 = 0x006006AA4;
 D_6031000 = 0x006031000;
 D_6006C60 = 0x006006C60;
@@ -1029,20 +1027,19 @@ D_6011044 = 0x006011044;
 D_600FF74 = 0x00600FF74;
 D_6006EB4 = 0x006006EB4;
 D_6014D94 = 0x006014D94;
-D_0302DE3C = 0x00302DE3C;
 
 // fox_enmy2
 D_6011F90 = 0x06011F90;
 D_4000710 = 0x04000710;
 D_601F2A0 = 0x0601F2A0;
-D_6016190 = 0x06016190;
+D_A6_6016190 = 0x06016190;
 D_SX_6023500 = 0x06023500;
 D_SX_6022DF0 = 0x06022DF0;
 D_SX_60285F0 = 0x060285F0;
 D_SX_600AF70 = 0x0600AF70;
 D_SX_6023E30 = 0x06023E30;
 D_SX_6001CE0 = 0x06001CE0;
-D_6012A40 = 0x06012A40;
+D_A6_6012A40 = 0x06012A40;
 D_SX_6009950 = 0x06009950;
 D_SX_600B2B0 = 0x0600B2B0;
 D_SX_600A2E0 = 0x0600A2E0;
@@ -1071,15 +1068,15 @@ D_4006E90 = 0x04006E90;
 D_4009800 = 0x04009800;
 D_40073C0 = 0x040073C0;
 
-D_60282A0 = 0x060282A0;
+D_A6_60282A0 = 0x060282A0;
 D_SX_603298C = 0x0603298C;
 D_SX_6032904 = 0x06032904;
 D_SX_6032970 = 0x06032970;
 D_SX_603285C = 0x0603285C;
 D_SX_6032938 = 0x06032938;
 D_SX_6032954 = 0x06032954;
-D_6028254 = 0x06028254;
-D_60280E0 = 0x060280E0;
+D_A6_6028254 = 0x06028254;
+D_A6_60280E0 = 0x060280E0;
 D_SX_6032878 = 0x06032878;
 D_SX_6032894 = 0x06032894;
 D_SX_60328B0 = 0x060328B0;
@@ -1259,7 +1256,7 @@ D_A001EC0 = 0x0A001EC0;
 D_A001BE0 = 0x0A001BE0;
 D_7004270 = 0x07004270;
 
-D_3005AB0 = 0x3005AB0;
+D_arwing_3005AB0 = 0x3005AB0;
 D_1000000 = 0x1000000;
 D_1000280 = 0x1000280;
 D_1000640 = 0x1000640;
@@ -1356,105 +1353,105 @@ D_102FF08 = 0x102FF08;
 D_1031630 = 0x1031630;
 D_1031EC0 = 0x1031EC0;
 D_1032780 = 0x1032780;
-D_20031B0 = 0x20031B0;
-D_2006F50 = 0x2006F50;
-D_200D750 = 0x200D750;
-D_2010A30 = 0x2010A30;
-D_20112C0 = 0x20112C0;
-D_3000090 = 0x3000090;
-D_3000120 = 0x3000120;
-D_3000130 = 0x3000130;
-D_30001E0 = 0x30001E0;
-D_3000380 = 0x3000380;
-D_30003A0 = 0x30003A0;
-D_3000470 = 0x3000470;
-D_30004E0 = 0x30004E0;
-D_3000510 = 0x3000510;
-D_3000660 = 0x3000660;
-D_30006A0 = 0x30006A0;
-D_30006D0 = 0x30006D0;
-D_3000810 = 0x3000810;
-D_3000AF0 = 0x3000AF0;
-D_3000B20 = 0x3000B20;
-D_3000BC0 = 0x3000BC0;
-D_3000C70 = 0x3000C70;
-D_30013E0 = 0x30013E0;
-D_3001420 = 0x3001420;
-D_3003E20 = 0x3003E20;
-D_3004010 = 0x3004010;
-D_3004D58 = 0x3004D58;
-D_3005980 = 0x3005980;
-D_3005AB0 = 0x3005AB0;
-D_3006AF0 = 0x3006AF0;
-D_3006C60 = 0x3006C60;
-D_3006C70 = 0x3006C70;
-D_3007500 = 0x3007500;
-D_300A470 = 0x300A470;
-D_300B218 = 0x300B218;
-D_300D350 = 0x300D350;
-D_300D398 = 0x300D398;
-D_300D3C0 = 0x300D3C0;
-D_300D408 = 0x300D408;
-D_300D440 = 0x300D440;
-D_300D500 = 0x300D500;
-D_300D550 = 0x300D550;
-D_300EE80 = 0x300EE80;
-D_300FB80 = 0x300FB80;
-D_3010A90 = 0x3010A90;
-D_3011470 = 0x3011470;
-D_3011720 = 0x3011720;
-D_3011E40 = 0x3011E40;
-D_30131F0 = 0x30131F0;
-D_30146B0 = 0x30146B0;
-D_3014BF0 = 0x3014BF0;
-D_3015120 = 0x3015120;
-D_30155E0 = 0x30155E0;
-D_3015740 = 0x3015740;
-D_3015AF4 = 0x3015AF4;
-D_3015C28 = 0x3015C28;
-D_3015D80 = 0x3015D80;
-D_30160A0 = 0x30160A0;
-D_30163C4 = 0x30163C4;
-D_3016610 = 0x3016610;
-D_3016660 = 0x3016660;
-D_3016B30 = 0x3016B30;
-D_30183D0 = 0x30183D0;
-D_30184D8 = 0x30184D8;
-D_3018800 = 0x3018800;
-D_30194E0 = 0x30194E0;
-D_301AD60 = 0x301AD60;
-D_301AEF0 = 0x301AEF0;
-D_301B6E0 = 0x301B6E0;
-D_301C3A8 = 0x301C3A8;
-D_301C614 = 0x301C614;
-D_301CFEC = 0x301CFEC;
-D_301D258 = 0x301D258;
-D_301D888 = 0x301D888;
-D_301DB94 = 0x301DB94;
-D_301E19C = 0x301E19C;
-D_301E3E8 = 0x301E3E8;
-D_301E570 = 0x301E570;
-D_301F140 = 0x301F140;
-D_301FD20 = 0x301FD20;
-D_302D120 = 0x302D120;
-D_302D240 = 0x302D240;
-D_302D4D0 = 0x302D4D0;
-D_302DD70 = 0x302DD70;
-D_302DDB4 = 0x302DDB4;
-D_302DDF8 = 0x302DDF8;
-D_302DE3C = 0x302DE3C;
-D_302E0E4 = 0x302E0E4;
-D_302E170 = 0x302E170;
-D_302E378 = 0x302E378;
-D_302E56C = 0x302E56C;
-D_302E65C = 0x302E65C;
-D_302E74C = 0x302E74C;
-D_302E830 = 0x302E830;
-D_302E95C = 0x302E95C;
-D_302EA4C = 0x302EA4C;
-D_302EB3C = 0x302EB3C;
-D_302EC20 = 0x302EC20;
-D_04000000 = 0x04000000;
+D_BG_PLANET_20031B0 = 0x20031B0;
+D_BG_SPACE_2006F50 = 0x2006F50;
+D_BG_PLANET_200D750 = 0x200D750;
+D_BG_PLANET_2010A30 = 0x2010A30;
+D_BG_PLANET_20112C0 = 0x20112C0;
+D_arwing_3000090 = 0x3000090;
+D_vs_player_3000120 = 0x3000120;
+D_blue_marine_3000130 = 0x3000130;
+D_vs_player_30001E0 = 0x30001E0;
+D_vs_player_3000380 = 0x3000380;
+D_vs_player_30003A0 = 0x30003A0;
+D_blue_marine_3000470 = 0x3000470;
+D_vs_player_30004E0 = 0x30004E0;
+D_vs_player_3000510 = 0x3000510;
+D_blue_marine_3000660 = 0x3000660;
+D_vs_player_30006A0 = 0x30006A0;
+D_vs_player_30006D0 = 0x30006D0;
+D_vs_player_3000810 = 0x3000810;
+D_blue_marine_3000AF0 = 0x3000AF0;
+D_vs_player_3000B20 = 0x3000B20;
+D_vs_player_3000BC0 = 0x3000BC0;
+D_blue_marine_3000C70 = 0x3000C70;
+D_vs_player_30013E0 = 0x30013E0;
+D_vs_player_3001420 = 0x3001420;
+D_vs_player_3003E20 = 0x3003E20;
+D_vs_player_3004010 = 0x3004010;
+D_vs_player_3004D58 = 0x3004D58;
+D_blue_marine_3005980 = 0x3005980;
+D_arwing_3005AB0 = 0x3005AB0;
+D_blue_marine_3006AF0 = 0x3006AF0;
+D_vs_player_3006C60 = 0x3006C60;
+D_blue_marine_3006C70 = 0x3006C70;
+D_vs_player_3007500 = 0x3007500;
+D_vs_player_300A470 = 0x300A470;
+D_vs_player_300B218 = 0x300B218;
+D_vs_player_300D350 = 0x300D350;
+D_vs_player_300D398 = 0x300D398;
+D_vs_player_300D3C0 = 0x300D3C0;
+D_vs_player_300D408 = 0x300D408;
+D_vs_player_300D440 = 0x300D440;
+D_vs_player_300D500 = 0x300D500;
+D_vs_player_300D550 = 0x300D550;
+D_vs_player_300EE80 = 0x300EE80;
+D_vs_player_300FB80 = 0x300FB80;
+D_vs_player_3010A90 = 0x3010A90;
+D_vs_player_3011470 = 0x3011470;
+D_arwing_3011720 = 0x3011720;
+D_vs_player_3011E40 = 0x3011E40;
+D_arwing_30131F0 = 0x30131F0;
+D_vs_player_30146B0 = 0x30146B0;
+D_arwing_3014BF0 = 0x3014BF0;
+D_arwing_3015120 = 0x3015120;
+D_arwing_30155E0 = 0x30155E0;
+D_vs_player_3015740 = 0x3015740;
+D_arwing_3015AF4 = 0x3015AF4;
+D_arwing_3015C28 = 0x3015C28;
+D_arwing_3015D80 = 0x3015D80;
+D_vs_player_30160A0 = 0x30160A0;
+D_arwing_30163C4 = 0x30163C4;
+D_arwing_3016610 = 0x3016610;
+D_arwing_3016660 = 0x3016660;
+D_arwing_3016B30 = 0x3016B30;
+D_arwing_30183D0 = 0x30183D0;
+D_arwing_30184D8 = 0x30184D8;
+D_vs_player_3018800 = 0x3018800;
+D_arwing_30194E0 = 0x30194E0;
+D_vs_player_301AD60 = 0x301AD60;
+D_vs_player_301AEF0 = 0x301AEF0;
+D_vs_player_301B6E0 = 0x301B6E0;
+D_vs_player_301C3A8 = 0x301C3A8;
+D_vs_player_301C614 = 0x301C614;
+D_vs_player_301CFEC = 0x301CFEC;
+D_vs_player_301D258 = 0x301D258;
+D_vs_player_301D888 = 0x301D888;
+D_vs_player_301DB94 = 0x301DB94;
+D_vs_player_301E19C = 0x301E19C;
+D_vs_player_301E3E8 = 0x301E3E8;
+D_vs_player_301E570 = 0x301E570;
+D_vs_player_301F140 = 0x301F140;
+D_vs_player_301FD20 = 0x301FD20;
+D_vs_player_302D120 = 0x302D120;
+D_vs_player_302D240 = 0x302D240;
+D_vs_player_302D4D0 = 0x302D4D0;
+D_vs_player_302DD70 = 0x302DD70;
+D_vs_player_302DDB4 = 0x302DDB4;
+D_vs_player_302DDF8 = 0x302DDF8;
+D_vs_player_302DE3C = 0x302DE3C;
+D_vs_player_302E0E4 = 0x302E0E4;
+D_vs_player_302E170 = 0x302E170;
+D_vs_player_302E378 = 0x302E378;
+D_vs_player_302E56C = 0x302E56C;
+D_vs_player_302E65C = 0x302E65C;
+D_vs_player_302E74C = 0x302E74C;
+D_vs_player_302E830 = 0x302E830;
+D_vs_player_302E95C = 0x302E95C;
+D_vs_player_302EA4C = 0x302EA4C;
+D_vs_player_302EB3C = 0x302EB3C;
+D_vs_player_302EC20 = 0x302EC20;
+D_4000080 = 0x4000080;
 D_400014C = 0x400014C;
 D_40001A4 = 0x40001A4;
 D_4000270 = 0x4000270;
@@ -1498,7 +1495,7 @@ D_SX_6000840 = 0x6000840;
 D_6000840 = 0x6000840;
 D_6000A80 = 0x6000A80;
 D_AQ_6000AE4 = 0x6000AE4;
-D_6000B60 = 0x6000B60;
+D_A6_6000B60 = 0x6000B60;
 D_6000C80 = 0x6000C80;
 D_6000D80 = 0x6000D80;
 D_AQ_6000DB0 = 0x6000DB0;
@@ -1518,7 +1515,7 @@ D_60018C0 = 0x60018C0;
 D_SX_6001950 = 0x6001950;
 D_6001A10 = 0x6001A10;
 D_6001A60 = 0x6001A60;
-D_6001A80 = 0x6001A80;
+D_A6_6001A80 = 0x6001A80;
 D_6001BA8 = 0x6001BA8;
 D_6001C50 = 0x6001C50;
 D_6001C64 = 0x6001C64;
@@ -1528,7 +1525,7 @@ D_6002020 = 0x6002020;
 D_AQ_6002628 = 0x6002628;
 D_AQ_6002874 = 0x6002874;
 D_6002890 = 0x6002890;
-D_60029A0 = 0x60029A0;
+D_A6_60029A0 = 0x60029A0;
 D_AQ_6002C10 = 0x6002C10;
 D_6002E10 = 0x6002E10;
 D_6002E60 = 0x6002E60;
@@ -1538,7 +1535,7 @@ D_6003090 = 0x6003090;
 D_6003348 = 0x6003348;
 D_6003370 = 0x6003370;
 D_60034C4 = 0x60034C4;
-D_60038C0 = 0x60038C0;
+D_A6_60038C0 = 0x60038C0;
 D_60038E0 = 0x60038E0;
 D_60038F8 = 0x60038F8;
 D_6004330 = 0x6004330;
@@ -1548,10 +1545,10 @@ D_6004500 = 0x6004500;
 D_6004570 = 0x6004570;
 D_60045E0 = 0x60045E0;
 D_60046F0 = 0x60046F0;
-D_60047E0 = 0x60047E0;
+D_A6_60047E0 = 0x60047E0;
 D_6004900 = 0x6004900;
 D_6004FE0 = 0x6004FE0;
-D_6005700 = 0x6005700;
+D_A6_6005700 = 0x6005700;
 D_6005710 = 0x6005710;
 D_AQ_6005954 = 0x6005954;
 D_60059F0 = 0x60059F0;
@@ -1678,7 +1675,7 @@ D_600DDC0 = 0x600DDC0;
 D_600DDF0 = 0x600DDF0;
 D_600E010 = 0x600E010;
 D_600E050 = 0x600E050;
-D_600E0C0 = 0x600E0C0;
+D_A6_600E0C0 = 0x600E0C0;
 D_600E2C4 = 0x600E2C4;
 D_600E360 = 0x600E360;
 D_600E470 = 0x600E470;
@@ -1690,7 +1687,7 @@ D_AQ_600EEF0 = 0x600EEF0;
 D_600EFF0 = 0x600EFF0;
 D_600F160 = 0x600F160;
 D_600F1D0 = 0x600F1D0;
-D_600F1F0 = 0x600F1F0;
+D_A6_600F1F0 = 0x600F1F0;
 D_600F2E0 = 0x600F2E0;
 D_600F2F0 = 0x600F2F0;
 D_600F36C = 0x600F36C;
@@ -1722,7 +1719,7 @@ D_6010EF0 = 0x6010EF0;
 D_6010FA0 = 0x6010FA0;
 D_60117E0 = 0x60117E0;
 D_6011890 = 0x6011890;
-D_6011910 = 0x6011910;
+D_A6_6011910 = 0x6011910;
 D_AQ_60119A0 = 0x60119A0;
 D_AQ_6011A78 = 0x6011A78;
 D_6011B40 = 0x6011B40;
@@ -1731,8 +1728,8 @@ D_6011E28 = 0x6011E28;
 D_6012310 = 0x6012310;
 D_SX_60123BC = 0x60123BC;
 D_60123F0 = 0x60123F0;
-D_6012550 = 0x6012550;
-D_6012840 = 0x6012840;
+D_A6_6012550 = 0x6012550;
+D_A6_6012840 = 0x6012840;
 D_6012A60 = 0x6012A60;
 D_6012C00 = 0x6012C00;
 D_AQ_6012C98 = 0x6012C98;
@@ -1774,7 +1771,7 @@ D_6015430 = 0x6015430;
 D_6015510 = 0x6015510;
 D_SX_60158C4 = 0x60158C4;
 D_6015C24 = 0x6015C24;
-D_6015EE0 = 0x6015EE0;
+D_A6_6015EE0 = 0x6015EE0;
 D_6016040 = 0x6016040;
 D_6016240 = 0x6016240;
 D_60163F0 = 0x60163F0;
@@ -1793,10 +1790,10 @@ D_6018550 = 0x6018550;
 D_601863C = 0x601863C;
 D_6018660 = 0x6018660;
 D_AQ_6018878 = 0x6018878;
-D_6018994 = 0x6018994;
+D_A6_6018994 = 0x6018994;
 D_6018AF0 = 0x6018AF0;
-D_6018BA0 = 0x6018BA0;
-D_6018BF0 = 0x6018BF0;
+D_A6_6018BA0 = 0x6018BA0;
+D_A6_6018BF0 = 0x6018BF0;
 D_6018C00 = 0x6018C00;
 D_AQ_6018C78 = 0x6018C78;
 D_6018D40 = 0x6018D40;
@@ -1808,7 +1805,7 @@ D_AQ_6019238 = 0x6019238;
 D_AQ_6019338 = 0x6019338;
 D_AQ_60194D0 = 0x60194D0;
 D_60195EC = 0x60195EC;
-D_6019730 = 0x6019730;
+D_A6_6019730 = 0x6019730;
 D_6019738 = 0x6019738;
 D_AQ_6019880 = 0x6019880;
 D_601996C = 0x601996C;
@@ -1817,7 +1814,7 @@ D_6019E18 = 0x6019E18;
 D_6019E50 = 0x6019E50;
 D_AQ_6019E80 = 0x6019E80;
 D_6019EB0 = 0x6019EB0;
-D_601A120 = 0x601A120;
+D_A6_601A120 = 0x601A120;
 D_601A2B0 = 0x601A2B0;
 D_601A340 = 0x601A340;
 D_601A7A0 = 0x601A7A0;
@@ -1831,13 +1828,13 @@ D_601AFB8 = 0x601AFB8;
 D_AQ_601AFF0 = 0x601AFF0;
 D_601B184 = 0x601B184;
 D_601B1E4 = 0x601B1E4;
-D_601B2B0 = 0x601B2B0;
+D_A6_601B2B0 = 0x601B2B0;
 D_601B4B0 = 0x601B4B0;
 D_601B4C4 = 0x601B4C4;
 D_601B640 = 0x601B640;
 D_601B6C0 = 0x601B6C0;
 D_601BAD0 = 0x601BAD0;
-D_601BB40 = 0x601BB40;
+D_A6_601BB40 = 0x601BB40;
 D_601BCC0 = 0x601BCC0;
 D_601BE90 = 0x601BE90;
 D_601C000 = 0x601C000;
@@ -1956,12 +1953,12 @@ D_6027AF0 = 0x6027AF0;
 D_6027BF0 = 0x6027BF0;
 D_6027D40 = 0x6027D40;
 D_6027EB0 = 0x6027EB0;
-D_6027F50 = 0x6027F50;
+D_A6_6027F50 = 0x6027F50;
 D_6028260 = 0x6028260;
-D_6028454 = 0x6028454;
-D_6028578 = 0x6028578;
+D_A6_6028454 = 0x6028454;
+D_A6_6028578 = 0x6028578;
 D_60288A0 = 0x60288A0;
-D_60289FC = 0x60289FC;
+D_A6_60289FC = 0x60289FC;
 D_6028A60 = 0x6028A60;
 D_6029528 = 0x6029528;
 D_6029674 = 0x6029674;
@@ -2099,7 +2096,6 @@ D_604CDE0 = 0x604CDE0;
 D_604D680 = 0x604D680;
 D_605A120 = 0x605A120;
 D_605C230 = 0x605C230;
-D_07000000 = 0x7000000;
 D_TI1_7000A80 = 0x7000A80;
 D_7000F10 = 0x7000F10;
 D_7001030 = 0x7001030;
@@ -2114,8 +2110,7 @@ D_7003650 = 0x7003650;
 D_7003830 = 0x7003830;
 D_7003C70 = 0x7003C70;
 D_7003E10 = 0x7003E10;
-D_7003EE8 = 0x7003EE8;
-D_07003EE8 = 0x07003EE8;
+D_TI2_7003EE8 = 0x7003EE8;
 D_7003F10 = 0x7003F10;
 D_7004010 = 0x7004010;
 D_7004050 = 0x7004050;
diff --git a/src/main/audio_general.c b/src/main/audio_general.c
index 55a074fd..7fada77e 100644
--- a/src/main/audio_general.c
+++ b/src/main/audio_general.c
@@ -81,7 +81,7 @@ s32 gAudioFrameCounter = 0;
 u8 gSeqCmdWritePos = 0;
 u8 gSeqCmdReadPos = 0;
 u8 gStartSeqDisabled = 0;
-u8 gSoundModeList[4] = { 0, 1, 2, 3 };
+u8 gSoundModeList[4] = { SOUNDMODE_STEREO, SOUNDMODE_HEADSET, SOUNDMODE_SURROUND, SOUNDMODE_MONO };
 u8 sNewAudioSpecId = 0;
 u8 D_800C5D58 = 0;
 s32 D_800C5D5C = 0; // unused. file split?
diff --git a/src/main/audio_load.c b/src/main/audio_load.c
index 31c3f586..4bd85c87 100644
--- a/src/main/audio_load.c
+++ b/src/main/audio_load.c
@@ -859,7 +859,7 @@ void AudioLoad_Init(void) {
     gAudioTaskCountQ = 0;
     gAudioTaskIndexQ = 0;
     gCurAiBuffIndex = 0;
-    gAudioSoundMode = 0;
+    gAudioSoundMode = SOUNDMODE_STEREO;
     gAudioCurTask = NULL;
     gAudioRspTasks[0].task.t.data_size = 0;
     gAudioRspTasks[1].task.t.data_size = 0;
diff --git a/src/main/audio_playback.c b/src/main/audio_playback.c
index 71c07054..01026264 100644
--- a/src/main/audio_playback.c
+++ b/src/main/audio_playback.c
@@ -53,7 +53,7 @@ void func_80011890(Note* note, NoteAttributes* noteAttr) {
     sp26 = noteAttr->reverb;
     sp24 = noteAttr->stereo;
     sp27 &= 0x7F;
-    if ((temp_v0->bitField0.stereoHeadsetEffects) && (gAudioSoundMode == 1)) {
+    if ((temp_v0->bitField0.stereoHeadsetEffects) && (gAudioSoundMode == SOUNDMODE_HEADSET)) {
         var_a0 = sp27 >> 1;
         if (var_a0 >= 0x40) {
             var_a0 = 0x3F;
@@ -66,7 +66,7 @@ void func_80011890(Note* note, NoteAttributes* noteAttr) {
 
         var_fa0 = gHeadsetPanVolume[sp27];
         var_fa1 = gHeadsetPanVolume[127 - sp27];
-    } else if (temp_v0->bitField0.stereoHeadsetEffects && (gAudioSoundMode == 0)) {
+    } else if (temp_v0->bitField0.stereoHeadsetEffects && (gAudioSoundMode == SOUNDMODE_STEREO)) {
         temp_v0->unk_03 = 0;
         temp_v0->unk_04 = 0;
         temp_v0->bitField0.usesHeadsetPanEffects = 0;
@@ -98,7 +98,7 @@ void func_80011890(Note* note, NoteAttributes* noteAttr) {
                 temp_v0->bitField0.stereoStrongLeft = sp24.s.strongLeft ^ var_a1;
                 break;
         }
-    } else if (gAudioSoundMode == 3) {
+    } else if (gAudioSoundMode == SOUNDMODE_MONO) {
         var_fa0 = 0.707f;
         var_fa1 = 0.707f;
     } else {
diff --git a/src/main/fox_360.c b/src/main/fox_360.c
index 4c1f73cc..15d8999a 100644
--- a/src/main/fox_360.c
+++ b/src/main/fox_360.c
@@ -1156,7 +1156,7 @@ void func_800319AC(Actor* this) {
     s32 sp108;
     s32 sp104;
     s32 temp_v0_27;
-    UnkEntity28* ent28;
+    RadarMark* radarMark;
     f32 spF8;
     f32 spF4;
     f32 spF0;
@@ -2005,20 +2005,20 @@ void func_800319AC(Actor* this) {
         }
     }
     func_8003088C(this);
-    ent28 = &gUnkEntities28[this->index];
-    ent28->unk_00 = 1;
+    radarMark = &gRadarMarks[this->index];
+    radarMark->unk_00 = 1;
     if (this->unk_0E4 == 200) {
-        ent28->unk_02 = 100;
+        radarMark->unk_02 = 100;
     } else {
-        ent28->unk_02 = this->unk_0E4;
+        radarMark->unk_02 = this->unk_0E4;
     }
     if (gCurrentLevel == LEVEL_TRAINING) {
-        ent28->unk_02 = 4;
+        radarMark->unk_02 = 4;
     }
-    ent28->pos.x = this->obj.pos.x;
-    ent28->pos.y = this->obj.pos.y;
-    ent28->pos.z = this->obj.pos.z;
-    ent28->unk_10 = this->unk_0F4.y + 180.0f;
+    radarMark->pos.x = this->obj.pos.x;
+    radarMark->pos.y = this->obj.pos.y;
+    radarMark->pos.z = this->obj.pos.z;
+    radarMark->unk_10 = this->unk_0F4.y + 180.0f;
     if (this->iwork[1] != 0) {
         this->iwork[1]--;
         if ((this->iwork[1] == 0) && (gActors[0].state == 2) && (gRadioState == 0)) {
@@ -2271,7 +2271,7 @@ void func_80035448(Actor* actor) {
                     Matrix_Scale(gGfxMatrix, 10.0f, 10.0f, 10.0f, 1);
                     Animation_DrawSkeleton(0, D_600C2AC, actor->vwork, NULL, NULL, actor, &gIdentityMatrix);
                 } else if (gCurrentLevel == LEVEL_VERSUS) {
-                    gSPDisplayList(gMasterDisp++, D_3015740);
+                    gSPDisplayList(gMasterDisp++, D_vs_player_3015740);
                 } else if (gCurrentLevel == LEVEL_TRAINING) {
                     if (actor->unk_0E6 == 0) {
                         gSPDisplayList(gMasterDisp++, D_F00F200);
diff --git a/src/main/fox_A4290_colheaders.c b/src/main/fox_A4290_colheaders.c
index 7cf9fe83..26f42a5c 100644
--- a/src/main/fox_A4290_colheaders.c
+++ b/src/main/fox_A4290_colheaders.c
@@ -135,22 +135,22 @@ CollisionHeader2 D_800D2CA0[19] = {
         { -498.0f, -10.0f, -498.0f },
         { 498.0f, 705.0f, 498.0f },
         4,
-        D_302EEE8,
-        D_302EF00,
+        D_vs_player_302EEE8,
+        D_vs_player_302EF00,
     },
     {
         { -1494.0f, -30.0f, -1494.0f },
         { 1494.0f, 2115.0f, 1494.0f },
         4,
-        D_302EF6C,
-        D_302EF84,
+        D_vs_player_302EF6C,
+        D_vs_player_302EF84,
     },
     {
         { -623.0f, -10.0f, -623.0f },
         { 623.0f, 200.0f, 623.0f },
         4,
-        D_302EFF0,
-        D_302F008,
+        D_vs_player_302EFF0,
+        D_vs_player_302F008,
     },
     {
         { -488.0f, 0.0f, -568.0f },
@@ -206,34 +206,34 @@ CollisionHeader2 D_800D2CA0[19] = {
         { 74.0f, 125.0f, 84.0f },
         30,
         D_AQ_60320B8,
-        D_603216C,
+        D_AQ_603216C,
     },
     {
         { -1200.0f, 0.0f, -1315.0f },
         { 1403.0f, 200.0f, 1308.0f },
         8,
         D_AQ_6031FB0,
-        D_6031FE0,
+        D_AQ_6031FE0,
     },
     {
         { -600.0f, 0.0f, -657.0f },
         { 701.0f, 100.0f, 654.0f },
         8,
         D_AQ_6031FB0,
-        D_603204C,
+        D_AQ_603204C,
     },
     {
         { -2965.0f, -16.0f, -2965.0f },
         { 2965.0f, 544.0f, 2965.0f },
         14,
-        D_302F044,
-        D_302F098,
+        D_vs_player_302F044,
+        D_vs_player_302F098,
     },
     {
         { -814.0f, 0.0f, -691.0f },
         { 814.0f, 752.0f, 691.0f },
         28,
         D_AQ_6032388,
-        D_6032430,
+        D_AQ_6032430,
     },
 };
diff --git a/src/main/fox_beam.c b/src/main/fox_beam.c
index d13171d4..c557725b 100644
--- a/src/main/fox_beam.c
+++ b/src/main/fox_beam.c
@@ -1188,12 +1188,12 @@ void func_80039210(PlayerShot* shot) {
         if (gLaserStrength[shot->playerNum] != LASERS_SINGLE) {
             Matrix_Translate(gGfxMatrix, 6.0f, 0.0f, 0.0f, 1);
             Matrix_SetGfxMtx(&gMasterDisp);
-            gSPDisplayList(gMasterDisp++, D_302D120);
+            gSPDisplayList(gMasterDisp++, D_vs_player_302D120);
             Matrix_Translate(gGfxMatrix, -12.0f, 0.0f, 0.0f, 1);
             Matrix_SetGfxMtx(&gMasterDisp);
-            gSPDisplayList(gMasterDisp++, D_302D120);
+            gSPDisplayList(gMasterDisp++, D_vs_player_302D120);
         } else {
-            gSPDisplayList(gMasterDisp++, D_302D120);
+            gSPDisplayList(gMasterDisp++, D_vs_player_302D120);
         }
     }
 }
@@ -1323,13 +1323,13 @@ void func_80039A50(PlayerShot* shot) {
                         Matrix_RotateZ(gGfxMatrix, gGameFrameCount * 70.0f * M_DTOR, 1);
                         Matrix_Scale(gGfxMatrix, 2.0f, 2.0f, 2.0f, 1);
                         Matrix_SetGfxMtx(&gMasterDisp);
-                        gSPDisplayList(gMasterDisp++, D_301AD60);
+                        gSPDisplayList(gMasterDisp++, D_vs_player_301AD60);
                         Matrix_Pop(&gGfxMatrix);
                         Matrix_Translate(gGfxMatrix, 0.0f, -50.0f, 0.0f, 1);
                         Matrix_RotateZ(gGfxMatrix, gGameFrameCount * 70.0f * M_DTOR, 1);
                         Matrix_Scale(gGfxMatrix, 2.0f, 2.0f, 2.0f, 1);
                         Matrix_SetGfxMtx(&gMasterDisp);
-                        gSPDisplayList(gMasterDisp++, D_301AD60);
+                        gSPDisplayList(gMasterDisp++, D_vs_player_301AD60);
                     } else {
                         if (!(gGameFrameCount & 1)) {
                             var_fv1 = M_PI;
@@ -1340,7 +1340,7 @@ void func_80039A50(PlayerShot* shot) {
                         Matrix_RotateZ(gGfxMatrix, 30.0f * M_DTOR, 1);
                         Matrix_Scale(gGfxMatrix, 2.0f, 2.0f, 2.0f, 1);
                         Matrix_SetGfxMtx(&gMasterDisp);
-                        gSPDisplayList(gMasterDisp++, D_301AD60);
+                        gSPDisplayList(gMasterDisp++, D_vs_player_301AD60);
                     }
                 } else {
                     if (!(gGameFrameCount & 1)) {
@@ -1356,7 +1356,7 @@ void func_80039A50(PlayerShot* shot) {
                     gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255);
                     gDPSetEnvColor(gMasterDisp++, 0, 255, 0, 0);
                     gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
-                    gSPDisplayList(gMasterDisp++, D_3006940);
+                    gSPDisplayList(gMasterDisp++, D_landmaster_3006940);
                 }
                 break;
             case PLAYERSHOT_6:
@@ -1372,13 +1372,13 @@ void func_80039A50(PlayerShot* shot) {
                     Matrix_Push(&gGfxMatrix);
                     Matrix_Translate(gGfxMatrix, 0.f, 40.0f, 0.0f, 1);
                     Matrix_SetGfxMtx(&gMasterDisp);
-                    gSPDisplayList(gMasterDisp++, D_301AEF0);
+                    gSPDisplayList(gMasterDisp++, D_vs_player_301AEF0);
                     Matrix_Pop(&gGfxMatrix);
                     Matrix_Translate(gGfxMatrix, 0.f, -40.0f, 0.0f, 1);
                     Matrix_SetGfxMtx(&gMasterDisp);
-                    gSPDisplayList(gMasterDisp++, D_301AEF0);
+                    gSPDisplayList(gMasterDisp++, D_vs_player_301AEF0);
                 } else {
-                    gSPDisplayList(gMasterDisp++, D_301AEF0);
+                    gSPDisplayList(gMasterDisp++, D_vs_player_301AEF0);
                 }
                 break;
             case PLAYERSHOT_8:
diff --git a/src/main/fox_bg.c b/src/main/fox_bg.c
index b51fc942..e4e0dccb 100644
--- a/src/main/fox_bg.c
+++ b/src/main/fox_bg.c
@@ -32,8 +32,8 @@ u16 D_800C9C3C[16] = {
     0x294B, 0x18DF, 0x294B, 0x1085, 0x39FF, 0x108B, 0x18CD, 0x108B,
 };
 Gfx* D_800C9C5C[13] = {
-    D_102A8A0, D_102A8A0, D_102A8A0, D_102A8A0, D_102A8A0, D_20112C0, D_102A8A0,
-    D_102A8A0, D_102A8A0, D_102A8A0, D_102A8A0, D_20112C0, D_102A8A0,
+    D_102A8A0, D_102A8A0, D_102A8A0, D_102A8A0, D_102A8A0,           D_BG_PLANET_20112C0, D_102A8A0,
+    D_102A8A0, D_102A8A0, D_102A8A0, D_102A8A0, D_BG_PLANET_20112C0, D_102A8A0,
 };
 Gfx* D_800C9C90[13] = {
     D_102A8A0, D_102A8A0, D_102A8A0, D_102A8A0, D_102A8A0, D_102A8A0, D_102A8A0,
@@ -271,11 +271,11 @@ void func_8003E1E8(void) {
                     switch (gCurrentLevel) {
                         case LEVEL_VERSUS:
                             if (gVersusStage == VS_STAGE_CORNERIA) {
-                                gSPDisplayList(gMasterDisp++, D_302D4D0);
+                                gSPDisplayList(gMasterDisp++, D_vs_player_302D4D0);
                             } else if (gVersusStage == VS_STAGE_KATINA) {
-                                gSPDisplayList(gMasterDisp++, D_30146B0);
+                                gSPDisplayList(gMasterDisp++, D_vs_player_30146B0);
                             } else {
-                                gSPDisplayList(gMasterDisp++, D_3011E40);
+                                gSPDisplayList(gMasterDisp++, D_vs_player_3011E40);
                             }
                             break;
                         case LEVEL_FORTUNA:
@@ -293,11 +293,11 @@ void func_8003E1E8(void) {
                     switch (gCurrentLevel) {
                         case LEVEL_VERSUS:
                             if (gVersusStage == VS_STAGE_CORNERIA) {
-                                gSPDisplayList(gMasterDisp++, D_302D4D0);
+                                gSPDisplayList(gMasterDisp++, D_vs_player_302D4D0);
                             } else if (gVersusStage == VS_STAGE_KATINA) {
-                                gSPDisplayList(gMasterDisp++, D_30146B0);
+                                gSPDisplayList(gMasterDisp++, D_vs_player_30146B0);
                             } else {
-                                gSPDisplayList(gMasterDisp++, D_3011E40);
+                                gSPDisplayList(gMasterDisp++, D_vs_player_3011E40);
                             }
                             break;
                         case LEVEL_FORTUNA:
@@ -589,7 +589,7 @@ void func_8003E1E8(void) {
                             Matrix_Translate(gGfxMatrix, sp138 - 120.0f, -(sp134 - 120.0f), -290.0f, 1);
                             Matrix_Scale(gGfxMatrix, sp128 * 0.75, sp128 * 0.75f, 1.0f, 1);
                             Matrix_SetGfxMtx(&gMasterDisp);
-                            gSPDisplayList(gMasterDisp++, D_601BB40);
+                            gSPDisplayList(gMasterDisp++, D_A6_601BB40);
                             break;
                         case LEVEL_FORTUNA:
                             sp128 = 1.5f;
@@ -1108,9 +1108,9 @@ void func_80040CE4(void) {
                 Matrix_Translate(gGfxMatrix, D_800C9E64[i], 0.0f, D_800C9E74[i], 1);
                 Matrix_SetGfxMtx(&gMasterDisp);
                 if (gVersusStage == VS_STAGE_CORNERIA) {
-                    gSPDisplayList(gMasterDisp++, D_3018800);
+                    gSPDisplayList(gMasterDisp++, D_vs_player_3018800);
                 } else {
-                    gSPDisplayList(gMasterDisp++, D_30160A0);
+                    gSPDisplayList(gMasterDisp++, D_vs_player_30160A0);
                 }
                 Matrix_Pop(&gGfxMatrix);
             }
diff --git a/src/main/fox_context.c b/src/main/fox_context.c
index 18de7811..24d216da 100644
--- a/src/main/fox_context.c
+++ b/src/main/fox_context.c
@@ -253,8 +253,8 @@ Boss gBosses[4];
 Effect gEffects[100];
 Item gItems[20];
 PlayerShot gPlayerShots[16];
-UnkEntity30 gUnkEntities30[100];
-UnkEntity28 gUnkEntities28[65];
+TexturedLine gTexturedLines[100];
+RadarMark gRadarMarks[65];
 BonusText gBonusText[10];
 s32 D_80176550[2];
 f32 D_80176558[2][100];
diff --git a/src/main/fox_display.c b/src/main/fox_display.c
index 3e952494..cd7f5a6b 100644
--- a/src/main/fox_display.c
+++ b/src/main/fox_display.c
@@ -242,7 +242,7 @@ void func_80052584(Player* player) {
         Matrix_SetGfxMtx(&gMasterDisp);
         RCP_SetupDL_40();
         gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
-        gSPDisplayList(gMasterDisp++, D_302D240);
+        gSPDisplayList(gMasterDisp++, D_vs_player_302D240);
     }
     Matrix_Pop(&gGfxMatrix);
 }
@@ -253,16 +253,20 @@ void func_800526B8(Player* player) {
     Matrix_Translate(gCalcMatrix, 0.0f, 35.0f, 0.0f, 1);
     switch (player->num) {
         case 0:
-            Animation_DrawSkeleton(5, D_301D258, player->jointTable, func_800520FC, func_800523A8, player, gCalcMatrix);
+            Animation_DrawSkeleton(5, D_vs_player_301D258, player->jointTable, func_800520FC, func_800523A8, player,
+                                   gCalcMatrix);
             break;
         case 1:
-            Animation_DrawSkeleton(5, D_301DB94, player->jointTable, func_800520FC, func_80052420, player, gCalcMatrix);
+            Animation_DrawSkeleton(5, D_vs_player_301DB94, player->jointTable, func_800520FC, func_80052420, player,
+                                   gCalcMatrix);
             break;
         case 2:
-            Animation_DrawSkeleton(5, D_301E3E8, player->jointTable, func_800520FC, func_80052498, player, gCalcMatrix);
+            Animation_DrawSkeleton(5, D_vs_player_301E3E8, player->jointTable, func_800520FC, func_80052498, player,
+                                   gCalcMatrix);
             break;
         case 3:
-            Animation_DrawSkeleton(5, D_301C614, player->jointTable, func_800520FC, func_8005250C, player, gCalcMatrix);
+            Animation_DrawSkeleton(5, D_vs_player_301C614, player->jointTable, func_800520FC, func_8005250C, player,
+                                   gCalcMatrix);
             break;
     }
     Matrix_Pop(&gGfxMatrix);
@@ -281,7 +285,7 @@ void func_80052884(Player* player) {
     if (!gVersusMode) {
         gSPDisplayList(gMasterDisp++, D_arwing_3000090);
     } else {
-        gSPDisplayList(gMasterDisp++, D_300FB80);
+        gSPDisplayList(gMasterDisp++, D_vs_player_300FB80);
     }
     Matrix_MultVec3f(gGfxMatrix, &sp40, &D_80161518[player->num]);
     Matrix_Translate(gGfxMatrix, 0.0f, 51.0f, -10.0f, 1);
@@ -305,16 +309,16 @@ void func_80052884(Player* player) {
             RCP_SetupDL_64();
             gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 64, 255, 64, 255);
         }
-        gSPDisplayList(gMasterDisp++, D_3004680);
+        gSPDisplayList(gMasterDisp++, D_landmaster_3004680);
     } else {
-        gSPDisplayList(gMasterDisp++, D_301F140);
+        gSPDisplayList(gMasterDisp++, D_vs_player_301F140);
     }
     Matrix_MultVec3f(gGfxMatrix, &sp4C, &D_80161548[player->num]);
     Matrix_Pop(&gGfxMatrix);
 }
 
-Gfx* D_800CA26C[] = { D_arwing_3000090, D_3016CC0, D_3005AB0, D_3003CE0 };
-Gfx* D_800CA27C[] = { D_3001C90, D_3016CC0, D_3005AB0, D_3003CE0 };
+Gfx* D_800CA26C[] = { D_arwing_3000090, D_arwing_3016CC0, D_arwing_3005AB0, D_arwing_3003CE0 };
+Gfx* D_800CA27C[] = { D_arwing_3001C90, D_arwing_3016CC0, D_arwing_3005AB0, D_arwing_3003CE0 };
 f32 D_800CA28C = 2.0f;
 f32 D_800CA290 = 13.0f;
 f32 D_800CA294 = -10.0f;
@@ -332,7 +336,7 @@ void func_80052B80(Player* player) {
         if (gVersusMode) {
             RCP_SetupDL_40();
             gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
-            gSPDisplayList(gMasterDisp++, D_301FD20);
+            gSPDisplayList(gMasterDisp++, D_vs_player_301FD20);
         } else {
             Matrix_Scale(gGfxMatrix, 0.5f, 0.5f, 0.5f, 1);
             Matrix_SetGfxMtx(&gMasterDisp);
@@ -375,9 +379,9 @@ void func_80052D48(Player* player) {
         Matrix_Translate(gGfxMatrix, 0.0f, -30.0f, 0.0f, 1);
         Matrix_SetGfxMtx(&gMasterDisp);
         if (!gVersusMode) {
-            gSPDisplayList(gMasterDisp++, D_30066B0);
+            gSPDisplayList(gMasterDisp++, D_landmaster_30066B0);
         } else {
-            gSPDisplayList(gMasterDisp++, D_301B6E0);
+            gSPDisplayList(gMasterDisp++, D_vs_player_301B6E0);
         }
         Matrix_Pop(&gGfxMatrix);
     }
@@ -398,9 +402,9 @@ void func_80052D48(Player* player) {
         Matrix_Translate(gGfxMatrix, 0.0f, -30.0f, 0.0f, 1);
         Matrix_SetGfxMtx(&gMasterDisp);
         if (!gVersusMode) {
-            gSPDisplayList(gMasterDisp++, D_30066B0);
+            gSPDisplayList(gMasterDisp++, D_landmaster_30066B0);
         } else {
-            gSPDisplayList(gMasterDisp++, D_301B6E0);
+            gSPDisplayList(gMasterDisp++, D_vs_player_301B6E0);
         }
         Matrix_Pop(&gGfxMatrix);
     }
@@ -427,7 +431,7 @@ bool func_800531A4(s32 limbIndex, Gfx** gfxPtr, Vec3f* pos, Vec3f* rot, void* wi
                 *gfxPtr = NULL;
             }
             if (wings->rightState == WINGSTATE_BROKEN) {
-                *gfxPtr = D_3015120;
+                *gfxPtr = D_arwing_3015120;
             }
             if ((D_800CA22C != 0) && (D_80177D40[0] & 1)) {
                 RCP_SetupDL(&gMasterDisp, 0x22);
@@ -459,7 +463,7 @@ bool func_800531A4(s32 limbIndex, Gfx** gfxPtr, Vec3f* pos, Vec3f* rot, void* wi
                 *gfxPtr = NULL;
             }
             if (wings->leftState == WINGSTATE_BROKEN) {
-                *gfxPtr = D_3014BF0;
+                *gfxPtr = D_arwing_3014BF0;
             }
             if ((D_800CA22C != 0) && (D_80177D58[0] & 1)) {
                 RCP_SetupDL(&gMasterDisp, 0x22);
@@ -528,14 +532,15 @@ void func_80053658(WingInfo* wings) {
         wings->unk_18 = (-wings->unk_14 - 7.0f) * 2.5f;
     }
     if (gGameState == GSTATE_PLAY) {
-        Animation_DrawSkeleton(1, D_3016610, gPlayer[0].jointTable, func_800531A4, NULL, wings, &gIdentityMatrix);
+        Animation_DrawSkeleton(1, D_arwing_3016610, gPlayer[0].jointTable, func_800531A4, NULL, wings,
+                               &gIdentityMatrix);
     } else {
         if (gGameState == GSTATE_MENU) {
-            Animation_GetFrameData(&D_3015AF4, 0, sp68);
+            Animation_GetFrameData(&D_arwing_3015AF4, 0, sp68);
         } else {
-            Animation_GetFrameData(&D_3015C28, 0, sp68);
+            Animation_GetFrameData(&D_arwing_3015C28, 0, sp68);
         }
-        Animation_DrawSkeleton(1, D_3016610, sp68, func_800531A4, NULL, wings, &gIdentityMatrix);
+        Animation_DrawSkeleton(1, D_arwing_3016610, sp68, func_800531A4, NULL, wings, &gIdentityMatrix);
     }
     D_800CA22C = 0;
     sp64 = wings->unk_2C;
@@ -567,15 +572,15 @@ void func_80053658(WingInfo* wings) {
         (gCurrentLevel == LEVEL_CORNERIA)) {
         gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 120);
         gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
-        gSPDisplayList(gMasterDisp++, D_30194E0);
+        gSPDisplayList(gMasterDisp++, D_arwing_30194E0);
         RCP_SetupDL_46();
         gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 100);
-        gSPDisplayList(gMasterDisp++, D_30183D0);
+        gSPDisplayList(gMasterDisp++, D_arwing_30183D0);
     } else {
         RCP_SetupDL_46();
         gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 140);
         gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
-        gSPDisplayList(gMasterDisp++, D_30194E0);
+        gSPDisplayList(gMasterDisp++, D_arwing_30194E0);
     }
     gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
     Matrix_Pop(&gGfxMatrix);
@@ -593,7 +598,7 @@ void func_80053B18(void) {
     RCP_SetupDL_64_2();
     gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 120);
     gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
-    gSPDisplayList(gMasterDisp++, D_30194E0);
+    gSPDisplayList(gMasterDisp++, D_arwing_30194E0);
     gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
     Matrix_Pop(&gGfxMatrix);
 }
@@ -622,21 +627,21 @@ void func_80053C38(Player* player, s32 arg1) {
             Matrix_Translate(gGfxMatrix, 0.0f, -8.0f, 5.0f, 1);
             Matrix_RotateY(gGfxMatrix, M_PI, 1);
             Matrix_SetGfxMtx(&gMasterDisp);
-            gSPDisplayList(gMasterDisp++, D_30131F0);
+            gSPDisplayList(gMasterDisp++, D_arwing_30131F0);
             Matrix_Pop(&gGfxMatrix);
         }
     } else {
         if (gVersusMode) {
             if ((player->wings.rightState == WINGSTATE_INTACT) && (player->wings.leftState == WINGSTATE_INTACT)) {
-                gSPDisplayList(gMasterDisp++, D_300EE80);
+                gSPDisplayList(gMasterDisp++, D_vs_player_300EE80);
             } else if ((player->wings.rightState <= WINGSTATE_BROKEN) &&
                        (player->wings.leftState == WINGSTATE_INTACT)) {
-                gSPDisplayList(gMasterDisp++, D_3010A90);
+                gSPDisplayList(gMasterDisp++, D_vs_player_3010A90);
             } else if ((player->wings.rightState == WINGSTATE_INTACT) &&
                        (player->wings.leftState <= WINGSTATE_BROKEN)) {
-                gSPDisplayList(gMasterDisp++, D_3011470);
+                gSPDisplayList(gMasterDisp++, D_vs_player_3011470);
             } else {
-                gSPDisplayList(gMasterDisp++, D_300D550);
+                gSPDisplayList(gMasterDisp++, D_vs_player_300D550);
             }
         } else {
             if ((gLevelType == LEVELTYPE_SPACE) || (gCurrentLevel == LEVEL_BOLSE)) {
@@ -732,9 +737,9 @@ void func_80054300(Player* player) {
                 RCP_SetupDL(&gMasterDisp, 0x41);
             }
             if (!gVersusMode) {
-                gSPDisplayList(gMasterDisp++, D_3008100);
+                gSPDisplayList(gMasterDisp++, D_landmaster_3008100);
             } else {
-                gSPDisplayList(gMasterDisp++, D_301E570);
+                gSPDisplayList(gMasterDisp++, D_vs_player_301E570);
             }
             Matrix_Pop(&gGfxMatrix);
             break;
@@ -1272,7 +1277,7 @@ void func_800564C0(Player* player, s32 arg1) {
                     } else {
                         RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
                     }
-                } else if (gVersusStage == 2) {
+                } else if (gVersusStage == VS_STAGE_SECTOR_Z) {
                     RCP_SetupDL_29(128, 128, 255, 255, gFogNear, gFogFar);
                 } else {
                     RCP_SetupDL_29(0, 0, 0, 255, gFogNear, gFogFar);
@@ -1633,7 +1638,7 @@ void func_80057D00(void) {
     Lights_SetOneLight(&gMasterDisp, gLight1x, gLight1y, gLight1z, gLight1R, gLight1G, gLight1B, gAmbientR, gAmbientG,
                        gAmbientB);
     func_80060714(1);
-    func_80060968();
+    TexturedLine_Draw();
     D_80161410 = 1;
     func_8003DA0C();
     if ((D_80161A88 == 2) && (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_2)) {
diff --git a/src/main/fox_edata_1C.c b/src/main/fox_edata_1C.c
index c8046a44..aa0451cd 100644
--- a/src/main/fox_edata_1C.c
+++ b/src/main/fox_edata_1C.c
@@ -216,15 +216,15 @@ ObjectInfo D_800CC124[0x190] = {
   /* OBJ_80_135  */  {(void*) D_6006890_Gfx, 0, (ObjectFunc)          NULL,        D_C038B40,     0.0f,  0, 0, 41, 1,   0.0f,  0 },
   /* OBJ_80_136  */  {(void*)     D_6002990, 0, (ObjectFunc)          NULL,        D_C038B40,     0.0f,  0, 0, 41, 1,   0.0f,  0 },
   /* OBJ_80_137  */  {(void*)     D_6004170, 0, (ObjectFunc)          NULL,       D_800CBF34,     0.0f,  0, 0,  0, 1,   0.0f,  0 },
-  /* OBJ_80_138  */  {(void*)     D_3017600, 0, (ObjectFunc)          NULL,        D_302EE64,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_80_139  */  {(void*)     D_3017600, 0, (ObjectFunc)          NULL,        D_302EE80,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_80_140  */  {(void*)     D_30173C0, 0, (ObjectFunc)          NULL,       D_800CBF34,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_80_141  */  {(void*)     D_30174E0, 0, (ObjectFunc)          NULL,       D_800CBF34,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_80_142  */  {(void*)     D_301B080, 0, (ObjectFunc)          NULL,        D_302EE9C,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_80_143  */  {(void*)     D_3016B00, 0, (ObjectFunc)          NULL,        D_302EE00,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_80_144  */  {(void*)     D_3013780, 0, (ObjectFunc)          NULL,        D_302ED4C,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_80_145  */  {(void*)     D_3013580, 0, (ObjectFunc)          NULL,        D_302ED98,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
-  /* OBJ_80_146  */  {(void*)     D_3012ED0, 0, (ObjectFunc)          NULL,        D_302EDB4,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_80_138  */  {(void*)     D_vs_player_3017600, 0, (ObjectFunc)          NULL,        D_vs_player_302EE64,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_80_139  */  {(void*)     D_vs_player_3017600, 0, (ObjectFunc)          NULL,        D_vs_player_302EE80,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_80_140  */  {(void*)     D_vs_player_30173C0, 0, (ObjectFunc)          NULL,       D_800CBF34,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_80_141  */  {(void*)     D_vs_player_30174E0, 0, (ObjectFunc)          NULL,       D_800CBF34,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_80_142  */  {(void*)     D_vs_player_301B080, 0, (ObjectFunc)          NULL,        D_vs_player_302EE9C,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_80_143  */  {(void*)     D_vs_player_3016B00, 0, (ObjectFunc)          NULL,        D_vs_player_302EE00,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_80_144  */  {(void*)     D_vs_player_3013780, 0, (ObjectFunc)          NULL,        D_vs_player_302ED4C,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_80_145  */  {(void*)     D_vs_player_3013580, 0, (ObjectFunc)          NULL,        D_vs_player_302ED98,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
+  /* OBJ_80_146  */  {(void*)     D_vs_player_3012ED0, 0, (ObjectFunc)          NULL,        D_vs_player_302EDB4,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
   /* OBJ_80_147  */  {(void*)          NULL, 0, (ObjectFunc)          NULL,       D_800CBF34,     0.0f,  0, 0,  0, 0,   0.0f,  0 },
   /* OBJ_80_148  */  {(void*)     D_60079B0, 0, (ObjectFunc)          NULL,        D_600FF80,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
   /* OBJ_80_149  */  {(void*)     D_6007D80, 0, (ObjectFunc)          NULL,        D_600FFA0,     0.0f,  0, 0, 40, 0,   0.0f,  0 },
@@ -380,7 +380,7 @@ ObjectInfo D_800CC124[0x190] = {
   /* OBJ_BOSS_299 */  {(void*) func_80042FC4, 2, (ObjectFunc) func_80042FB8,       D_800CBF34, 20000.0f,  0, 0, 40, 0,   0.0f, 10 },
   /* OBJ_BOSS_300 */  {(void*) func_80042FE8, 1, (ObjectFunc) func_80042FDC,       D_800CBF34, 20000.0f,  0, 0, 40, 0,   0.0f, 10 },
   /* OBJ_BOSS_301 */  {(void*) func_i3_801BEC5C, 1, (ObjectFunc) func_i3_801BEC50,        D_AQ_6030B10,     0.0f,  0, 0, 40, 0,   0.0f, 10 },
-  /* OBJ_BOSS_A6 */  {(void*) func_i3_8018C54C, 1, (ObjectFunc) func_i3_80187944,        D_6028454,  2000.0f,  0, 0, 40, 0,   0.0f, 10 },
+  /* OBJ_BOSS_A6 */  {(void*) func_i3_8018C54C, 1, (ObjectFunc) func_i3_80187944,        D_A6_6028454,  2000.0f,  0, 0, 40, 0,   0.0f, 10 },
   /* OBJ_BOSS_303 */  {(void*) func_i2_80193434, 2, (ObjectFunc) func_i2_80190078,        D_SX_6032550, 20000.0f,  0, 0, 20, 0,   0.0f, 10 },
   /* OBJ_BOSS_304 */  {(void*) func_i2_8018FF84, 2, (ObjectFunc) func_i2_8018FE38,        D_SX_6032488,  1000.0f,  0, 0, 20, 0,   0.0f, 10 },
   /* OBJ_BOSS_305 */  {(void*) func_i2_80190020, 2, (ObjectFunc) func_i2_8018FF20,        D_SX_60324EC,  1000.0f,  0, 0, 20, 0,   0.0f, 10 },
@@ -415,7 +415,7 @@ ObjectInfo D_800CC124[0x190] = {
   /* OBJ_ITEM_334  */  {(void*)          NULL, 1, (ObjectFunc) func_80068C48,       D_800CBF18,   700.0f,  0, 0,  0, 0,   0.0f,  0 },
   /* OBJ_ITEM_1UP  */  {(void*)     D_1022120, 0, (ObjectFunc) func_80067B1C,       D_800CBE8C,   700.0f,  0, 0,  0, 0,   0.0f,  0 },
   /* OBJ_ITEM_GOLD_RING  */  {(void*) func_8005CA80, 1, (ObjectFunc) func_800685F8,       D_800CBF54,   700.0f,  0, 0,  0, 0,   0.0f,  0 },
-  /* OBJ_ITEM_WING_REPAIR  */  {(void*)     D_3007650, 0, (ObjectFunc) func_80068618,       D_800CBFA8,   700.0f,  0, 0,  0, 0,   0.0f,  0 },
+  /* OBJ_ITEM_WING_REPAIR  */  {(void*)     D_arwing_3007650, 0, (ObjectFunc) func_80068618,       D_800CBFA8,   700.0f,  0, 0,  0, 0,   0.0f,  0 },
   /* OBJ_ITEM_TRAINING_RING  */  {(void*)     gItemTrainingRingDL, 0, (ObjectFunc) func_i1_80198968,        D_TR_6009CFC,   700.0f,  0, 0,  0, 0,   0.0f,  0 },
   /* OBJ_EFFECT_339  */  {(void*) func_8007D55C, 1, (ObjectFunc) func_8007D2F4,             NULL,  -200.0f,  1, 2,  0, 0,   0.0f,  0 },
   /* OBJ_EFFECT_340  */  {(void*) func_8007D55C, 1, (ObjectFunc) func_8007D748,             NULL,  -200.0f,  1, 2,  0, 0,   0.0f,  0 },
diff --git a/src/main/fox_edisplay.c b/src/main/fox_edisplay.c
index fc543662..8a678e21 100644
--- a/src/main/fox_edisplay.c
+++ b/src/main/fox_edisplay.c
@@ -230,20 +230,20 @@ void func_8005A094(Actor* actor) {
             Matrix_Translate(gGfxMatrix, 18.0f, 15.0f, -15.0f, 1);
             Matrix_RotateY(gGfxMatrix, M_PI, 1);
             Matrix_SetGfxMtx(&gMasterDisp);
-            gSPDisplayList(gMasterDisp++, D_3016660);
+            gSPDisplayList(gMasterDisp++, D_arwing_3016660);
             break;
         case 1:
             Matrix_Translate(gGfxMatrix, -18.0f, 15.0f, -15.0f, 1);
             Matrix_RotateY(gGfxMatrix, M_PI, 1);
             Matrix_SetGfxMtx(&gMasterDisp);
-            gSPDisplayList(gMasterDisp++, D_3015D80);
+            gSPDisplayList(gMasterDisp++, D_arwing_3015D80);
             break;
         case 2:
             Graphics_SetScaleMtx(actor->scale);
-            gSPDisplayList(gMasterDisp++, D_30155E0);
+            gSPDisplayList(gMasterDisp++, D_arwing_30155E0);
             break;
         case 3:
-            gSPDisplayList(gMasterDisp++, D_3011720);
+            gSPDisplayList(gMasterDisp++, D_arwing_3011720);
             break;
         case 4:
             Graphics_SetScaleMtx(actor->scale);
@@ -808,7 +808,7 @@ void func_8005CA80(Item* item) {
 void func_8005CB44(Item* item) {
     if (gCurrentLevel == LEVEL_AQUAS) {
         Graphics_SetScaleMtx(item->scale);
-        gSPDisplayList(gMasterDisp++, D_3005980);
+        gSPDisplayList(gMasterDisp++, D_blue_marine_3005980);
     } else {
         Graphics_SetScaleMtx(item->scale * 0.1f);
         RCP_SetupDL(&gMasterDisp, 0x1D);
@@ -1747,7 +1747,7 @@ Gfx D_800CFD80[] = {
     gsSPEndDisplayList(),
 };
 
-void func_80060968(void) {
+void TexturedLine_Draw(void) {
     s32 i;
 
     if (gCurrentLevel == LEVEL_MACBETH) {
@@ -1758,16 +1758,16 @@ void func_80060968(void) {
     } else {
         RCP_SetupDL_14();
     }
-    for (i = 0; i < ARRAY_COUNT(gUnkEntities30); i++) {
-        UnkEntity30* ent30 = &gUnkEntities30[i];
+    for (i = 0; i < ARRAY_COUNT(gTexturedLines); i++) {
+        TexturedLine* texLine = &gTexturedLines[i];
 
-        if (gUnkEntities30[i].mode != 0) {
+        if (gTexturedLines[i].mode != 0) {
             Matrix_Push(&gGfxMatrix);
-            Matrix_Translate(gGfxMatrix, ent30->unk_04.x, ent30->unk_04.y, ent30->unk_04.z + D_80177D20, 1);
-            Matrix_RotateY(gGfxMatrix, ent30->unk_20, 1);
-            Matrix_RotateX(gGfxMatrix, ent30->unk_1C, 1);
-            Matrix_RotateZ(gGfxMatrix, ent30->unk_20, 1);
-            Matrix_Scale(gGfxMatrix, ent30->unk_28, ent30->unk_28, ent30->unk_24, 1);
+            Matrix_Translate(gGfxMatrix, texLine->unk_04.x, texLine->unk_04.y, texLine->unk_04.z + D_80177D20, 1);
+            Matrix_RotateY(gGfxMatrix, texLine->unk_20, 1);
+            Matrix_RotateX(gGfxMatrix, texLine->unk_1C, 1);
+            Matrix_RotateZ(gGfxMatrix, texLine->unk_20, 1);
+            Matrix_Scale(gGfxMatrix, texLine->unk_28, texLine->unk_28, texLine->unk_24, 1);
 
             if ((gCurrentLevel == LEVEL_AQUAS) || (gCurrentLevel == LEVEL_VENOM_ANDROSS)) {
                 s32 alpha = (gGameFrameCount & 1) ? 180 : 50;
@@ -1791,8 +1791,8 @@ void func_80060968(void) {
                 if (gCurrentLevel == LEVEL_MACBETH) {
                     gSPDisplayList(gMasterDisp++, D_6012C00_Gfx);
                 } else {
-                    gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, ent30->unk_2C, ent30->unk_2D, ent30->unk_2E,
-                                    ent30->unk_2F);
+                    gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, texLine->unk_2C, texLine->unk_2D, texLine->unk_2E,
+                                    texLine->unk_2F);
                     gSPDisplayList(gMasterDisp++, D_800CFD80);
                 }
             }
@@ -1802,20 +1802,20 @@ void func_80060968(void) {
 }
 
 void func_80060D94(s32 arg0) {
-    UnkEntity30* ent30 = &gUnkEntities30[arg0];
+    TexturedLine* texLine = &gTexturedLines[arg0];
 
-    if (ent30->unk_2F == 0xFF) {
+    if (texLine->unk_2F == 0xFF) {
         RCP_SetupDL(&gMasterDisp, 5);
     } else {
         RCP_SetupDL(&gMasterDisp, 0xE);
     }
-    gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, ent30->unk_2C, ent30->unk_2D, ent30->unk_2E, ent30->unk_2F);
+    gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, texLine->unk_2C, texLine->unk_2D, texLine->unk_2E, texLine->unk_2F);
     Matrix_Push(&gGfxMatrix);
-    Matrix_Translate(gGfxMatrix, ent30->unk_04.x, ent30->unk_04.y, ent30->unk_04.z, 1);
-    Matrix_RotateY(gGfxMatrix, ent30->unk_20, 1);
-    Matrix_RotateX(gGfxMatrix, ent30->unk_1C, 1);
-    Matrix_RotateZ(gGfxMatrix, ent30->unk_1C, 1);
-    Matrix_Scale(gGfxMatrix, ent30->unk_28, 1.0f, ent30->unk_24, 1);
+    Matrix_Translate(gGfxMatrix, texLine->unk_04.x, texLine->unk_04.y, texLine->unk_04.z, 1);
+    Matrix_RotateY(gGfxMatrix, texLine->unk_20, 1);
+    Matrix_RotateX(gGfxMatrix, texLine->unk_1C, 1);
+    Matrix_RotateZ(gGfxMatrix, texLine->unk_1C, 1);
+    Matrix_Scale(gGfxMatrix, texLine->unk_28, 1.0f, texLine->unk_24, 1);
     Matrix_SetGfxMtx(&gMasterDisp);
     gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
     gSPDisplayList(gMasterDisp++, D_800CFD80);
diff --git a/src/main/fox_effect.c b/src/main/fox_effect.c
index a9ac1990..ee04cf9a 100644
--- a/src/main/fox_effect.c
+++ b/src/main/fox_effect.c
@@ -15,8 +15,8 @@ extern Gfx D_6003580[];
 extern Gfx D_6003620[];
 extern Gfx D_60036C0[];
 extern Gfx D_6004900[];
-extern Gfx D_6012550[];
-extern u16 D_6012840[];
+extern Gfx D_A6_6012550[];
+extern u16 D_A6_6012840[];
 extern Gfx D_6016880[];
 extern Gfx D_6018AF0[];
 extern Gfx D_601BAD0[];
@@ -209,7 +209,7 @@ void func_8007797C(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f
 void func_80077A00(Effect* effect) {
     Graphics_SetScaleMtx(effect->scale2);
     gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, effect->unk_44);
-    gSPDisplayList(gMasterDisp++, D_3016B30);
+    gSPDisplayList(gMasterDisp++, D_arwing_3016B30);
 }
 
 void func_80077A7C(Effect* effect) {
@@ -373,7 +373,7 @@ void func_800780F8(Effect* effect) {
 void func_800783C0(Effect* effect) {
     gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, effect->unk_44);
     Graphics_SetScaleMtx(effect->scale2);
-    gSPDisplayList(gMasterDisp++, D_2006F50);
+    gSPDisplayList(gMasterDisp++, D_BG_SPACE_2006F50);
 }
 
 void func_80078438(Effect* effect) {
@@ -387,7 +387,7 @@ void func_800784B4(Effect* effect) {
     Graphics_SetScaleMtx(effect->scale2);
     Matrix_RotateX(gGfxMatrix, M_PI / 2, 1);
     Matrix_SetGfxMtx(&gMasterDisp);
-    gSPDisplayList(gMasterDisp++, D_200D750);
+    gSPDisplayList(gMasterDisp++, D_BG_PLANET_200D750);
 }
 
 void func_80078550(Effect* effect) {
@@ -395,7 +395,7 @@ void func_80078550(Effect* effect) {
     Graphics_SetScaleMtx(effect->scale2);
     gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, effect->unk_4A);
     gDPSetEnvColor(gMasterDisp++, 101, 138, 153, 255);
-    gSPDisplayList(gMasterDisp++, D_3000660);
+    gSPDisplayList(gMasterDisp++, D_blue_marine_3000660);
     RCP_SetupDL(&gMasterDisp, 0x40);
 }
 
@@ -403,7 +403,7 @@ void func_80078604(Effect* effect) {
     if (effect->timer_50 == 0) {
         Graphics_SetScaleMtx(effect->scale2);
         gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, effect->unk_44);
-        gSPDisplayList(gMasterDisp++, D_20112C0);
+        gSPDisplayList(gMasterDisp++, D_BG_PLANET_20112C0);
     }
 }
 
@@ -458,7 +458,7 @@ void func_800788B0(Effect* effect) {
 void func_80078A64(Effect* effect) {
     Graphics_SetScaleMtx(effect->scale2);
     gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, effect->unk_44);
-    gSPDisplayList(gMasterDisp++, D_20112C0);
+    gSPDisplayList(gMasterDisp++, D_BG_PLANET_20112C0);
 }
 
 void func_80078AE0(void* effect) {
@@ -1423,7 +1423,7 @@ void func_8007B9DC(Effect* effect) {
     }
     //! DEBUG: Hold Z on controller 4 to set up a display list.
     if (!(gControllerHold[3].button & A_BUTTON)) {
-        gSPDisplayList(gMasterDisp++, D_2010A30);
+        gSPDisplayList(gMasterDisp++, D_BG_PLANET_2010A30);
     }
     //! DEBUG: Hold Z on controller 4 to set up a display list.
     if (gControllerHold[3].button & Z_TRIG) {
@@ -1520,7 +1520,7 @@ void func_8007BE54(Effect* effect) {
 void func_8007BEE8(Effect* effect) {
     Graphics_SetScaleMtx(effect->scale2);
     gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, effect->unk_4A);
-    gSPDisplayList(gMasterDisp++, D_2010A30);
+    gSPDisplayList(gMasterDisp++, D_BG_PLANET_2010A30);
 }
 
 void func_8007BF64(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 scale2,
@@ -1792,7 +1792,7 @@ void func_8007CAF0(Effect* effect) {
         Matrix_Scale(gGfxMatrix, 1.5f, 1.5f, 1.5f, 1);
         Matrix_SetGfxMtx(&gMasterDisp);
         gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, effect->unk_4A);
-        gSPDisplayList(gMasterDisp++, D_20031B0);
+        gSPDisplayList(gMasterDisp++, D_BG_PLANET_20031B0);
     }
 }
 
@@ -2026,9 +2026,11 @@ void func_8007D2F4(Effect* effect) {
 }
 
 Gfx* D_800D17A4[] = {
-    D_200B630, D_200B630,           D_200B630, D_200B630, D_200A5A0, D_2009510, D_2008480,
-    D_20073F0, D_2006360,           D_200C6C0, D_20052D0, D_2004240, D_20031B0, D_2002120,
-    D_2001090, D_BG_PLANET_2000000, D_2010A30, D_20101A0, D_200F910, D_200F080, D_200E7F0,
+    D_BG_PLANET_200B630, D_BG_PLANET_200B630, D_BG_PLANET_200B630, D_BG_PLANET_200B630, D_BG_PLANET_200A5A0,
+    D_BG_PLANET_2009510, D_BG_PLANET_2008480, D_BG_PLANET_20073F0, D_BG_PLANET_2006360, D_BG_PLANET_200C6C0,
+    D_BG_PLANET_20052D0, D_BG_PLANET_2004240, D_BG_PLANET_20031B0, D_BG_PLANET_2002120, D_BG_PLANET_2001090,
+    D_BG_PLANET_2000000, D_BG_PLANET_2010A30, D_BG_PLANET_20101A0, D_BG_PLANET_200F910, D_BG_PLANET_200F080,
+    D_BG_PLANET_200E7F0,
 };
 
 f32 D_800D17F8[] = {
@@ -2047,8 +2049,9 @@ u8 D_800D184C[][4] = {
 };
 
 Gfx* D_800D18A0[] = {
-    D_20066C0, D_20066C0, D_2005E30, D_20055A0, D_2004D10, D_2004480, D_2003BF0,
-    D_2003360, D_2002AD0, D_2002240, D_20019B0, D_2001120, D_2000890, D_2000000,
+    D_BG_SPACE_20066C0, D_BG_SPACE_20066C0, D_BG_SPACE_2005E30, D_BG_SPACE_20055A0, D_BG_SPACE_2004D10,
+    D_BG_SPACE_2004480, D_BG_SPACE_2003BF0, D_BG_SPACE_2003360, D_BG_SPACE_2002AD0, D_BG_SPACE_2002240,
+    D_BG_SPACE_20019B0, D_BG_SPACE_2001120, D_BG_SPACE_2000890, D_BG_SPACE_2000000,
 };
 
 void func_8007D55C(Effect* effect) {
@@ -2299,7 +2302,7 @@ void func_8007E330(Effect* effect) {
     } else {
         gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, effect->unk_4A);
     }
-    gSPDisplayList(gMasterDisp++, D_2010A30);
+    gSPDisplayList(gMasterDisp++, D_BG_PLANET_2010A30);
 }
 
 void func_8007E3E4(Effect* effect) {
@@ -2351,7 +2354,7 @@ void func_8007E45C(Effect* effect) {
 void func_8007E5CC(Effect* effect) {
     Graphics_SetScaleMtx(effect->scale2);
     gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, effect->unk_44);
-    gSPDisplayList(gMasterDisp++, D_2010A30);
+    gSPDisplayList(gMasterDisp++, D_BG_PLANET_2010A30);
 }
 
 void func_8007E648(Effect* effect) {
@@ -3891,7 +3894,7 @@ void func_80082F78(Effect* effect) {
 
         case 3:
             RCP_SetupDL_60(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
-            gSPDisplayList(gMasterDisp++, D_601A120);
+            gSPDisplayList(gMasterDisp++, D_A6_601A120);
             break;
 
         case 4:
@@ -3944,13 +3947,13 @@ void func_80082F78(Effect* effect) {
 
         case 10:
             if (D_80177854 != 100) {
-                Texture_Scroll(D_6012840, 16, 16, 0);
+                Texture_Scroll(D_A6_6012840, 16, 16, 0);
             }
             RCP_SetupDL(&gMasterDisp, 0x35);
             Matrix_Scale(gGfxMatrix, effect->unk_60.x, effect->unk_60.y, effect->unk_60.z, 1);
             Matrix_SetGfxMtx(&gMasterDisp);
             gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
-            gSPDisplayList(gMasterDisp++, D_6012550);
+            gSPDisplayList(gMasterDisp++, D_A6_6012550);
             break;
 
         case 11:
diff --git a/src/main/fox_enmy.c b/src/main/fox_enmy.c
index c8d9e50a..198b5fcc 100644
--- a/src/main/fox_enmy.c
+++ b/src/main/fox_enmy.c
@@ -3,6 +3,9 @@
 #include "assets/ast_sector_x.h"
 #include "assets/ast_aquas.h"
 #include "assets/ast_andross.h"
+#include "assets/ast_area_6.h"
+#include "assets/ast_training.h"
+#include "assets/ast_vs_player.h"
 
 s32 D_Timer_80161670[4];
 s32 D_80161680;
@@ -11,9 +14,9 @@ u8 D_80161684;
 #include "fox_enmy_assets.h"
 
 ObjectInit* D_800CFDA0[] = {
-    D_60371A4, D_6026CC4, D_SX_602A164, D_6023F64,    D_60287A4, D_602E4F4, D_6007E74,
-    D_601F234, D_6026714, D_0C035154,   D_TR_6006AA4, D_6031000, D_6006C60, D_602E5C8,
-    D_600EAD4, NULL,      D_6011044,    D_600FF74,    D_6006EB4, D_6014D94, D_0302DE3C,
+    D_60371A4, D_6026CC4, D_SX_602A164, D_A6_6023F64, D_A6_60287A4, D_602E4F4, D_6007E74,
+    D_601F234, D_6026714, D_C035154,    D_TR_6006AA4, D_6031000,    D_6006C60, D_602E5C8,
+    D_600EAD4, NULL,      D_6011044,    D_600FF74,    D_6006EB4,    D_6014D94, D_vs_player_302DE3C,
 };
 s32 D_800CFDF4[] = {
     OBJ_80_0,
@@ -2005,12 +2008,12 @@ void func_8006753C(Actor* actor) {
             Object_Kill(&actor->obj, actor->sfxSource);
         }
     }
-    gUnkEntities28[63].unk_00 = 1;
-    gUnkEntities28[63].unk_02 = 103;
-    gUnkEntities28[63].pos.x = actor->obj.pos.x;
-    gUnkEntities28[63].pos.y = actor->obj.pos.y;
-    gUnkEntities28[63].pos.z = actor->obj.pos.z;
-    gUnkEntities28[63].unk_10 = 0.0f;
+    gRadarMarks[63].unk_00 = 1;
+    gRadarMarks[63].unk_02 = 103;
+    gRadarMarks[63].pos.x = actor->obj.pos.x;
+    gRadarMarks[63].pos.y = actor->obj.pos.y;
+    gRadarMarks[63].pos.z = actor->obj.pos.z;
+    gRadarMarks[63].unk_10 = 0.0f;
 }
 
 void func_80067874(Actor* actor) {
@@ -2768,64 +2771,64 @@ void Effect_Update(Effect* effect) {
     }
 }
 
-void func_8006A06C(UnkEntity30* ent30) {
+void TexturedLine_Update(TexturedLine* texLine) {
     Vec3f sp44;
     Vec3f sp38;
     f32 sp34;
     f32 sp30;
     f32 sp2C;
 
-    if (ent30->timer != 0) {
-        ent30->timer--;
+    if (texLine->timer != 0) {
+        texLine->timer--;
     }
-    sp34 = ent30->unk_04.x - ent30->unk_10.x;
-    sp30 = ent30->unk_04.y - ent30->unk_10.y;
-    sp2C = ent30->unk_04.z - ent30->unk_10.z;
-    ent30->unk_20 = Math_Atan2F(sp34, sp2C);
-    ent30->unk_1C = -Math_Atan2F(sp30, sqrtf(SQ(sp34) + SQ(sp2C)));
-    if (ent30->mode != 4) {
-        ent30->unk_24 = sqrtf(SQ(sp34) + SQ(sp30) + SQ(sp2C));
+    sp34 = texLine->unk_04.x - texLine->unk_10.x;
+    sp30 = texLine->unk_04.y - texLine->unk_10.y;
+    sp2C = texLine->unk_04.z - texLine->unk_10.z;
+    texLine->unk_20 = Math_Atan2F(sp34, sp2C);
+    texLine->unk_1C = -Math_Atan2F(sp30, sqrtf(SQ(sp34) + SQ(sp2C)));
+    if (texLine->mode != 4) {
+        texLine->unk_24 = sqrtf(SQ(sp34) + SQ(sp30) + SQ(sp2C));
     }
     if (gGameState == GSTATE_PLAY) {
-        if (((ent30->mode == 1) || (ent30->mode == 101) || (ent30->mode == 50)) &&
+        if (((texLine->mode == 1) || (texLine->mode == 101) || (texLine->mode == 50)) &&
             (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_3) && (gPlayer[0].unk_1F4 == 0)) {
-            Matrix_RotateX(gCalcMatrix, -ent30->unk_1C, 0);
-            Matrix_RotateY(gCalcMatrix, -ent30->unk_20, 1);
-            sp44.x = gPlayer[gPlayerNum].pos.x - ent30->unk_04.x;
-            sp44.y = gPlayer[gPlayerNum].pos.y - ent30->unk_04.y;
-            sp44.z = gPlayer[gPlayerNum].unk_138 - ent30->unk_04.z;
+            Matrix_RotateX(gCalcMatrix, -texLine->unk_1C, 0);
+            Matrix_RotateY(gCalcMatrix, -texLine->unk_20, 1);
+            sp44.x = gPlayer[gPlayerNum].pos.x - texLine->unk_04.x;
+            sp44.y = gPlayer[gPlayerNum].pos.y - texLine->unk_04.y;
+            sp44.z = gPlayer[gPlayerNum].unk_138 - texLine->unk_04.z;
             Matrix_MultVec3fNoTranslate(gCalcMatrix, &sp44, &sp38);
-            sp38.x += ent30->unk_04.x;
-            sp38.y += ent30->unk_04.y;
-            sp38.z += ent30->unk_04.z;
-            if ((fabsf(sp38.x - ent30->unk_04.x) < 30.0f) && (fabsf(sp38.y - ent30->unk_04.y) < 30.0f) &&
-                (sp38.z < ent30->unk_04.z) && ((ent30->unk_04.z - ent30->unk_24) < sp38.z)) {
+            sp38.x += texLine->unk_04.x;
+            sp38.y += texLine->unk_04.y;
+            sp38.z += texLine->unk_04.z;
+            if ((fabsf(sp38.x - texLine->unk_04.x) < 30.0f) && (fabsf(sp38.y - texLine->unk_04.y) < 30.0f) &&
+                (sp38.z < texLine->unk_04.z) && ((texLine->unk_04.z - texLine->unk_24) < sp38.z)) {
                 if (gCurrentLevel == LEVEL_AQUAS) {
                     Player_ApplyDamage(&gPlayer[0], 0, 30);
                 } else {
                     Player_ApplyDamage(&gPlayer[0], 0, 20);
                 }
-                if (ent30->mode < 100) {
-                    ent30->mode = 0;
+                if (texLine->mode < 100) {
+                    texLine->mode = 0;
                 }
             }
         }
-        if (((ent30->unk_04.z + D_80177D20) > 1000.0f) && (gLevelMode != LEVELMODE_ALL_RANGE)) {
-            ent30->mode = 0;
+        if (((texLine->unk_04.z + D_80177D20) > 1000.0f) && (gLevelMode != LEVELMODE_ALL_RANGE)) {
+            texLine->mode = 0;
         }
-        if (((ent30->mode == 3) || (ent30->mode == 50)) && (ent30->timer == 0)) {
-            ent30->mode = 0;
+        if (((texLine->mode == 3) || (texLine->mode == 50)) && (texLine->timer == 0)) {
+            texLine->mode = 0;
         }
     }
 }
 
-void func_8006A38C(void) {
-    UnkEntity30* ent30;
+void TexturedLine_UpdateAll(void) {
+    TexturedLine* texLine;
     s32 i;
 
-    for (i = 0, ent30 = gUnkEntities30; i < ARRAY_COUNT(gUnkEntities30); i++, ent30++) {
-        if (ent30->mode != 0) {
-            func_8006A06C(ent30);
+    for (i = 0, texLine = gTexturedLines; i < ARRAY_COUNT(gTexturedLines); i++, texLine++) {
+        if (texLine->mode != 0) {
+            TexturedLine_Update(texLine);
         }
     }
 }
@@ -2899,7 +2902,7 @@ void Object_UpdateAll(void) {
             Effect_Update(effect);
         }
     }
-    func_8006A38C();
+    TexturedLine_UpdateAll();
     for (i = 0; i < ARRAY_COUNT(D_Timer_80161670); i++) {
         if (D_Timer_80161670[i] != 0) {
             D_Timer_80161670[i]--;
diff --git a/src/main/fox_enmy2.c b/src/main/fox_enmy2.c
index 329f3c60..f031c165 100644
--- a/src/main/fox_enmy2.c
+++ b/src/main/fox_enmy2.c
@@ -13,6 +13,7 @@ s32 D_80161690;
 #include "assets/ast_aquas.h"
 #include "assets/ast_7_ti_1.h"
 #include "assets/ast_andross.h"
+#include "assets/ast_area_6.h"
 #include "assets/ast_enmy_space.h"
 
 void func_8006A7B0(u16* msg, s32 character) {
@@ -877,7 +878,7 @@ UnkStruct_D003C D_800D003C[108] = {
     { D_601F2A0, D_800CBEFC, 7.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 },
     { D_ENMY_SPACE_400AAE0, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 },
     { D_ENMY_SPACE_4000650, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 6, 0, 1.0f, 1 },
-    { D_6016190, D_60282A0, -2.0f, 2100.0f, 3000.0f, 0, 0, 7, 0, 0.0f, 5 },
+    { D_A6_6016190, D_A6_60282A0, -2.0f, 2100.0f, 3000.0f, 0, 0, 7, 0, 0.0f, 5 },
     { D_SX_6023500, D_800CBEC4, 2.0f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 },
     { D_SX_6022DF0, D_800CBE8C, 1.5f, 100.0f, 3000.0f, 1, 0, 1, 0, 1.0f, 1 },
     { NULL, D_800CBE8C, 1.0f, 100.0f, 3000.0f, 2, 1, 1, 0, 0.0f, 1 },
@@ -890,8 +891,8 @@ UnkStruct_D003C D_800D003C[108] = {
     { NULL, D_SX_603285C, 2.5f, 100.0f, 3000.0f, 2, 0, 0, 0, 1.0f, 1 },
     { D_SX_6001CE0, D_SX_6032938, 3.0f, 100.0f, 3000.0f, 2, 0, 0, 0, 1.0f, 1 },
     { D_SX_6000840, D_SX_6032954, 1.0f, 100.0f, 3000.0f, 2, 1, 0, 0, 1.0f, 1 },
-    { D_6012A40, D_6028254, -2.0f, 2100.0f, 3001.0f, 0, 0, 7, 0, 0.0f, 2 },
-    { NULL, D_60280E0, -2.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 3 },
+    { D_A6_6012A40, D_A6_6028254, -2.0f, 2100.0f, 3001.0f, 0, 0, 7, 0, 0.0f, 2 },
+    { NULL, D_A6_60280E0, -2.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 3 },
     { D_SX_6009950, D_SX_6032878, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 },
     { NULL, D_800CBEC4, 2.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 1 },
     { D_SX_600B2B0, D_SX_6032894, -1.0f, 2100.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 },
@@ -931,7 +932,7 @@ UnkStruct_D003C D_800D003C[108] = {
     { D_60205D0, D_603445C, 3.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 1.0f, 1 },
     { D_60036A0, D_6034664, -1.0f, 10000.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 },
     { D_601AD70, D_800CBF34, 4.0f, 100.0f, 3000.0f, 0, 0, 1, 0, 0.0f, 1 },
-    { D_3007650, D_800CBF34, 1.0f, 100.0f, 3000.0f, 2, 0, 5, 0, 0.0f, 1 },
+    { D_arwing_3007650, D_800CBF34, 1.0f, 100.0f, 3000.0f, 2, 0, 5, 0, 0.0f, 1 },
     { D_60034D0, D_60347D4, 3.0f, 100.0f, 3000.0f, 1, 0, 0, 0, 0.0f, 1 },
     { D_6005360, D_6034770, -1.0f, 10000.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 },
     { D_600F6C0, D_60347F0, -1.0f, 10000.0f, 3001.0f, 0, 0, 0, 0, 0.0f, 1 },
@@ -1003,10 +1004,10 @@ void func_8006D36C(Actor* actor) {
             var_v1 = SEGMENTED_TO_VIRTUAL(D_SX_60320D0);
             break;
         case LEVEL_UNK_4:
-            var_v1 = SEGMENTED_TO_VIRTUAL(D_60289FC);
+            var_v1 = SEGMENTED_TO_VIRTUAL(D_A6_60289FC);
             break;
         case LEVEL_AREA_6:
-            var_v1 = SEGMENTED_TO_VIRTUAL(D_6027F50);
+            var_v1 = SEGMENTED_TO_VIRTUAL(D_A6_6027F50);
             break;
         case LEVEL_SECTOR_Y:
             var_v1 = SEGMENTED_TO_VIRTUAL(D_6032E18);
@@ -1306,17 +1307,17 @@ void func_8006D36C(Actor* actor) {
 
         case EVOP_124 << 9:
             actor->iwork[7] = 1;
-            for (i = 0; i < ARRAY_COUNT(gUnkEntities30); i++) {
-                if (gUnkEntities30[i].mode == 0) {
-                    gUnkEntities30[i].mode = 1;
-                    gUnkEntities30[i].unk_28 = 3.0f;
-                    gUnkEntities30[i].unk_04.x = actor->obj.pos.x - actor->vel.x;
-                    gUnkEntities30[i].unk_04.y = actor->obj.pos.y - actor->vel.y;
-                    gUnkEntities30[i].unk_04.z = actor->obj.pos.z - actor->vel.z;
-                    gUnkEntities30[i].unk_2C = D_800D0DBC[temp_s1[actor->unk_0E6 + 1]][0];
-                    gUnkEntities30[i].unk_2D = D_800D0DBC[temp_s1[actor->unk_0E6 + 1]][1];
-                    gUnkEntities30[i].unk_2E = D_800D0DBC[temp_s1[actor->unk_0E6 + 1]][2];
-                    gUnkEntities30[i].unk_2F = D_800D0DBC[temp_s1[actor->unk_0E6 + 1]][3];
+            for (i = 0; i < ARRAY_COUNT(gTexturedLines); i++) {
+                if (gTexturedLines[i].mode == 0) {
+                    gTexturedLines[i].mode = 1;
+                    gTexturedLines[i].unk_28 = 3.0f;
+                    gTexturedLines[i].unk_04.x = actor->obj.pos.x - actor->vel.x;
+                    gTexturedLines[i].unk_04.y = actor->obj.pos.y - actor->vel.y;
+                    gTexturedLines[i].unk_04.z = actor->obj.pos.z - actor->vel.z;
+                    gTexturedLines[i].unk_2C = D_800D0DBC[temp_s1[actor->unk_0E6 + 1]][0];
+                    gTexturedLines[i].unk_2D = D_800D0DBC[temp_s1[actor->unk_0E6 + 1]][1];
+                    gTexturedLines[i].unk_2E = D_800D0DBC[temp_s1[actor->unk_0E6 + 1]][2];
+                    gTexturedLines[i].unk_2F = D_800D0DBC[temp_s1[actor->unk_0E6 + 1]][3];
                     actor->iwork[8] = i;
                     break;
                 }
@@ -1543,10 +1544,10 @@ void func_8006D36C(Actor* actor) {
 }
 
 void func_8006EA50(Actor* actor) {
-    if ((actor->iwork[7] != 0) && (gUnkEntities30[actor->iwork[8]].mode != 0)) {
-        gUnkEntities30[actor->iwork[8]].unk_10.x = actor->obj.pos.x;
-        gUnkEntities30[actor->iwork[8]].unk_10.y = actor->obj.pos.y;
-        gUnkEntities30[actor->iwork[8]].unk_10.z = actor->obj.pos.z;
+    if ((actor->iwork[7] != 0) && (gTexturedLines[actor->iwork[8]].mode != 0)) {
+        gTexturedLines[actor->iwork[8]].unk_10.x = actor->obj.pos.x;
+        gTexturedLines[actor->iwork[8]].unk_10.y = actor->obj.pos.y;
+        gTexturedLines[actor->iwork[8]].unk_10.z = actor->obj.pos.z;
     }
 }
 
@@ -3901,12 +3902,12 @@ void func_80074FF0(Actor* actor) {
 
                 case 20:
                     RCP_SetupDL_60(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
-                    gSPDisplayList(gMasterDisp++, D_601A120);
+                    gSPDisplayList(gMasterDisp++, D_A6_601A120);
                     break;
 
                 case 21:
                     gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
-                    gSPDisplayList(gMasterDisp++, D_6018BF0);
+                    gSPDisplayList(gMasterDisp++, D_A6_6018BF0);
                     gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
                     Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -30.0f, 1);
                     actor->iwork[11] = 1;
@@ -3915,7 +3916,7 @@ void func_80074FF0(Actor* actor) {
 
                 case 22:
                     gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
-                    gSPDisplayList(gMasterDisp++, D_6019730);
+                    gSPDisplayList(gMasterDisp++, D_A6_6019730);
                     gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
                     Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -30.0f, 1);
                     actor->iwork[11] = 1;
@@ -3940,7 +3941,7 @@ void func_80074FF0(Actor* actor) {
                 case 31:
                     Matrix_RotateX(gGfxMatrix, M_PI / 2, 1);
                     Matrix_SetGfxMtx(&gMasterDisp);
-                    gSPDisplayList(gMasterDisp++, D_600E0C0);
+                    gSPDisplayList(gMasterDisp++, D_A6_600E0C0);
                     break;
 
                 case 33:
diff --git a/src/main/fox_game.c b/src/main/fox_game.c
index 69a9483e..97093b6f 100644
--- a/src/main/fox_game.c
+++ b/src/main/fox_game.c
@@ -1,7 +1,8 @@
-#include "prevent_bss_reordering.h"
+// #include "prevent_bss_reordering.h"
 #include "global.h"
 #include "sf64dma.h"
 #include "assets/ast_logo.h"
+#include "audioseq_cmd.h"
 
 f32 D_80161A10;
 f32 D_80161A14;
@@ -282,33 +283,33 @@ void func_800A24DC(s32 arg0) {
 
 void func_800A25DC(void) {
     switch (gGameState) {
-        case 1:
+        case GSTATE_INIT:
             gOverlaySetup = OVL_SETUP_TITLE;
             gOverlayStage = 0;
             break;
-        case 2:
+        case GSTATE_TITLE:
             gOverlaySetup = OVL_SETUP_TITLE;
             gOverlayStage = 0;
             break;
-        case 3:
+        case GSTATE_MENU:
             gOverlaySetup = OVL_SETUP_MENU;
             gOverlayStage = 0;
             break;
-        case 4:
+        case GSTATE_MAP:
             gOverlaySetup = OVL_SETUP_MAP;
             gOverlayStage = 0;
             return;
-        case 6:
+        case GSTATE_VS_INIT:
             gOverlaySetup = OVL_SETUP_VERSUS;
             break;
-        case 7:
+        case GSTATE_PLAY:
             gOverlaySetup = sOverlaySetups[gCurrentLevel];
             break;
-        case 5:
-            gOverlaySetup = OVL_SETUP_STATE_5;
+        case GSTATE_GAME_OVER:
+            gOverlaySetup = OVL_SETUP_GAME_OVER;
             gOverlayStage = 0;
             break;
-        case 8:
+        case GSTATE_CREDITS:
             gOverlaySetup = OVL_SETUP_CREDITS;
             break;
     }
@@ -317,7 +318,7 @@ void func_800A25DC(void) {
 void Game_Update(void) {
     s32 i;
     u8 spBB;
-    u16 var_v0_3;
+    u8 var_v0_3;
 
     Game_SetGameState();
     if (D_80161A39) {
@@ -411,21 +412,21 @@ void Game_Update(void) {
                 gExpertMode = false;
                 gSoundMode = gSaveFile.save.data.soundMode;
                 switch (gSoundMode) {
-                    case 0:
-                        var_v0_3 = 0;
+                    case OPTIONSOUND_STEREO:
+                        var_v0_3 = SOUNDMODE_STEREO;
                         break;
-                    case 1:
-                        var_v0_3 = 3;
+                    case OPTIONSOUND_MONO:
+                        var_v0_3 = SOUNDMODE_MONO;
                         break;
-                    case 2:
-                        var_v0_3 = 1;
+                    case OPTIONSOUND_HEADSET:
+                        var_v0_3 = SOUNDMODE_HEADSET;
                         break;
                     default:
-                        gSoundMode = 0;
-                        var_v0_3 = 0;
+                        gSoundMode = OPTIONSOUND_STEREO;
+                        var_v0_3 = SOUNDMODE_STEREO;
                         break;
                 }
-                Audio_QueueSeqCmd(var_v0_3 | 0xE0000000);
+                SEQCMD_SET_SOUND_MODE(var_v0_3);
                 gVolumeSettings[0] = gSaveFile.save.data.musicVolume;
                 gVolumeSettings[1] = gSaveFile.save.data.voiceVolume;
                 gVolumeSettings[2] = gSaveFile.save.data.sfxVolume;
diff --git a/src/main/fox_hud.c b/src/main/fox_hud.c
index d738673c..4bec820d 100644
--- a/src/main/fox_hud.c
+++ b/src/main/fox_hud.c
@@ -9,7 +9,8 @@
 #include "assets/ast_vs_player.h"
 #include "assets/ast_bg_planet.h"
 #include "assets/ast_bg_space.h"
-#include "prevent_bss_reordering.h"
+#include "assets/ast_area_6.h"
+#include "assets/ast_aquas.h"
 
 // BSS section range:
 // D_801616A0 <==> D_80161910
@@ -285,7 +286,7 @@ void func_800856C0(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4) {
 
 void func_80085740(f32 arg0, f32 arg1, f32 arg2, f32 arg3) {
     if (gVersusMode) {
-        TextureRect_8bIA(&gMasterDisp, D_3000B20, 32, 5, arg0, arg1, arg2, arg3);
+        TextureRect_8bIA(&gMasterDisp, D_vs_player_3000B20, 32, 5, arg0, arg1, arg2, arg3);
     } else {
         TextureRect_8bIA(&gMasterDisp, D_1000E80, 48, 9, arg0, arg1, arg2, arg3);
     }
@@ -293,7 +294,7 @@ void func_80085740(f32 arg0, f32 arg1, f32 arg2, f32 arg3) {
 
 void func_800857DC(f32 arg0, f32 arg1, f32 arg2, f32 arg3) {
     if (gVersusMode) {
-        TextureRect_8bCI(&gMasterDisp, D_300D3C0, D_300D408, 24, 3, arg0, arg1, arg2, arg3);
+        TextureRect_8bCI(&gMasterDisp, D_vs_player_300D3C0, D_vs_player_300D408, 24, 3, arg0, arg1, arg2, arg3);
     } else {
         TextureRect_8bCI(&gMasterDisp, D_10128C0, D_1012988, 40, 5, arg0, arg1, arg2, arg3);
     }
@@ -301,7 +302,7 @@ void func_800857DC(f32 arg0, f32 arg1, f32 arg2, f32 arg3) {
 
 void func_80085890(f32 arg0, f32 arg1, f32 arg2, f32 arg3) {
     if (gVersusMode) {
-        TextureRect_8bCI(&gMasterDisp, D_300D350, D_300D398, 24, 3, arg0, arg1, arg2, arg3);
+        TextureRect_8bCI(&gMasterDisp, D_vs_player_300D350, D_vs_player_300D398, 24, 3, arg0, arg1, arg2, arg3);
     } else {
         TextureRect_8bCI(&gMasterDisp, D_10127D0, D_1012898, 40, 5, arg0, arg1, arg2, arg3);
     }
@@ -551,11 +552,11 @@ s32 func_800863C8(void) {
 UnkStruct_D_800D1AEC D_800D1AEC[] = {
     { D_500A050, 16, 15, D_6000000, 128, 28 }, { D_500A140, 16, 15, D_6000000, 96, 28 },
     { D_500A140, 16, 15, D_6000000, 176, 12 }, { D_500A230, 16, 15, D_6000000, 168, 28 },
-    { D_500A230, 16, 15, D_6000000, 168, 28 }, { D_500A230, 16, 15, D_6000000, 96, 13 },
+    { D_500A230, 16, 15, D_6000000, 168, 28 }, { D_500A230, 16, 15, D_AQ_6000000, 96, 13 },
     { D_500A320, 16, 15, D_6000000, 176, 12 }, { D_500A320, 16, 15, D_6000000, 112, 13 },
     { D_500A320, 16, 15, D_6000000, 112, 28 }, { D_500A410, 16, 15, D_6000000, 96, 28 },
     { D_500A410, 16, 15, D_6000000, 160, 28 }, { D_500A410, 16, 15, D_6000000, 176, 12 },
-    { D_500A500, 16, 15, D_6000000, 168, 19 }, { D_500A500, 16, 15, D_6000000, 104, 28 },
+    { D_500A500, 16, 15, D_6000000, 168, 19 }, { D_500A500, 16, 15, D_A6_6000000, 104, 28 },
     { D_500A5F0, 16, 15, D_6000D80, 128, 28 }, { D_500A5F0, 16, 15, D_60012D0, 128, 28 },
     { D_500A5F0, 16, 15, D_C000A80, 128, 28 }, { D_5009F60, 16, 15, D_5000D50, 80, 12 },
 };
@@ -1354,12 +1355,15 @@ s32 func_800886B8(void) {
 
 void func_80088784(s32 arg0) {
     Gfx* D_800D1D4C[] = {
-        D_200B630, D_200A5A0, D_2009510, D_2008480, D_20073F0, D_2006360, D_200C6C0, D_20052D0, D_2004240,
-        D_20031B0, D_2002120, D_2001090, D_2000000, D_2010A30, D_20101A0, D_200F910, D_200F080, D_200E7F0,
+        D_BG_PLANET_200B630, D_BG_PLANET_200A5A0, D_BG_PLANET_2009510, D_BG_PLANET_2008480, D_BG_PLANET_20073F0,
+        D_BG_PLANET_2006360, D_BG_PLANET_200C6C0, D_BG_PLANET_20052D0, D_BG_PLANET_2004240, D_BG_PLANET_20031B0,
+        D_BG_PLANET_2002120, D_BG_PLANET_2001090, D_BG_SPACE_2000000,  D_BG_PLANET_2010A30, D_BG_PLANET_20101A0,
+        D_BG_PLANET_200F910, D_BG_PLANET_200F080, D_BG_PLANET_200E7F0,
     };
     Gfx* D_800D1D94[] = {
-        D_20066C0, D_2005E30, D_20055A0, D_2004D10, D_2004480, D_2003BF0, D_2003360,
-        D_2002AD0, D_2002240, D_20019B0, D_2001120, D_2000890, D_2000000,
+        D_BG_SPACE_20066C0, D_BG_SPACE_2005E30, D_BG_SPACE_20055A0, D_BG_SPACE_2004D10, D_BG_SPACE_2004480,
+        D_BG_SPACE_2003BF0, D_BG_SPACE_2003360, D_BG_SPACE_2002AD0, D_BG_SPACE_2002240, D_BG_SPACE_20019B0,
+        D_BG_SPACE_2001120, D_BG_SPACE_2000890, D_BG_SPACE_2000000,
     };
     s32 D_800D1DC8[] = {
         255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 200, 150, 100, 50,
@@ -1834,7 +1838,7 @@ void func_80089D28(void) {
     gSPDisplayList(gMasterDisp++, D_1024230);
 }
 
-void func_80089E98(s32 arg0) {
+void RadarMark_Draw(s32 arg0) {
     s32 var_a1;
     s32 var_a1_2;
 
@@ -1951,11 +1955,11 @@ void func_8008A240(void) {
         if (gPlayer[i].state_1C8 == PLAYERSTATE_1C8_6) {
             continue;
         }
-        gUnkEntities28[i].unk_00 = 1;
-        gUnkEntities28[i].unk_02 = i;
-        gUnkEntities28[i].unk_10 = gPlayer[i].unk_114 + gPlayer[i].unk_0E8;
-        gUnkEntities28[i].pos.z = gPlayer[i].unk_138;
-        gUnkEntities28[i].pos.x = gPlayer[i].pos.x;
+        gRadarMarks[i].unk_00 = 1;
+        gRadarMarks[i].unk_02 = i;
+        gRadarMarks[i].unk_10 = gPlayer[i].unk_114 + gPlayer[i].unk_0E8;
+        gRadarMarks[i].pos.z = gPlayer[i].unk_138;
+        gRadarMarks[i].pos.x = gPlayer[i].pos.x;
 
         if (gPlayerNum == i) {
             continue;
@@ -1973,20 +1977,20 @@ void func_8008A240(void) {
             continue;
         }
 
-        if (gGameFrameCount & 63) {
-            gUnkEntities28[i].unk_02 = 999;
+        if (gGameFrameCount & 0x3F) {
+            gRadarMarks[i].unk_02 = 999;
         }
     }
 
     if (gVersusMode == 1) {
         for (i = 0, item = gItems; i < 20; i++, item++) {
             if (item->obj.status >= OBJ_ACTIVE) {
-                gUnkEntities28[item->index + 50].unk_00 = 1;
-                gUnkEntities28[item->index + 50].unk_02 = 103;
-                gUnkEntities28[item->index + 50].pos.x = item->obj.pos.x;
-                gUnkEntities28[item->index + 50].pos.y = item->obj.pos.y;
-                gUnkEntities28[item->index + 50].pos.z = item->obj.pos.z;
-                gUnkEntities28[item->index + 50].unk_10 = 0.0f;
+                gRadarMarks[item->index + 50].unk_00 = 1;
+                gRadarMarks[item->index + 50].unk_02 = 103;
+                gRadarMarks[item->index + 50].pos.x = item->obj.pos.x;
+                gRadarMarks[item->index + 50].pos.y = item->obj.pos.y;
+                gRadarMarks[item->index + 50].pos.z = item->obj.pos.z;
+                gRadarMarks[item->index + 50].unk_10 = 0.0f;
             }
         }
     }
@@ -2134,30 +2138,29 @@ s32 func_8008A4DC(void) {
     }
 
     for (i = 64; i >= 0; i--) {
-        if (gUnkEntities28[i].unk_00 == 0) {
+        if (gRadarMarks[i].unk_00 == 0) {
             continue;
         }
 
-        if (fabsf(gUnkEntities28[i].pos.x) >= (temp2 + 1000.0f) ||
-            fabsf(gUnkEntities28[i].pos.z) >= (temp2 + 1000.0f)) {
+        if (fabsf(gRadarMarks[i].pos.x) >= (temp2 + 1000.0f) || fabsf(gRadarMarks[i].pos.z) >= (temp2 + 1000.0f)) {
             continue;
         }
 
         Matrix_Push(&gGfxMatrix);
-        Matrix_Translate(gGfxMatrix, gUnkEntities28[i].pos.x * 0.008f, -gUnkEntities28[i].pos.z * 0.008f, 0.0f, 1);
+        Matrix_Translate(gGfxMatrix, gRadarMarks[i].pos.x * 0.008f, -gRadarMarks[i].pos.z * 0.008f, 0.0f, 1);
 
-        if (gUnkEntities28[i].unk_02 == 103) {
-            gUnkEntities28[i].unk_10 = 45.0f;
+        if (gRadarMarks[i].unk_02 == 103) {
+            gRadarMarks[i].unk_10 = 45.0f;
         }
 
-        Matrix_RotateZ(gGfxMatrix, M_DTOR * gUnkEntities28[i].unk_10, 1);
+        Matrix_RotateZ(gGfxMatrix, M_DTOR * gRadarMarks[i].unk_10, 1);
         Matrix_Scale(gGfxMatrix, scale, scale, 1.0f, 1);
         Matrix_SetGfxMtx(&gMasterDisp);
 
-        func_80089E98(gUnkEntities28[i].unk_02);
+        RadarMark_Draw(gRadarMarks[i].unk_02);
         Matrix_Pop(&gGfxMatrix);
 
-        gUnkEntities28[i].unk_00 = 0;
+        gRadarMarks[i].unk_00 = 0;
     }
 
     Matrix_Pop(&gGfxMatrix);
@@ -2804,7 +2807,7 @@ s32 func_8008CB8C(void) {
 }
 
 void func_8008CB98(f32 arg0, f32 arg1, f32 arg2) {
-    TextureRect_8bIA(&gMasterDisp, D_30013E0, 8, 8, arg0, arg1, arg2, arg2);
+    TextureRect_8bIA(&gMasterDisp, D_vs_player_30013E0, 8, 8, arg0, arg1, arg2, arg2);
 }
 
 void func_8008CBE4(void) {
@@ -2878,15 +2881,17 @@ void func_8008CFB8(f32 arg0, f32 arg1, f32 arg2, f32 arg3) {
     s32 i;
 
     for (i = 0; i < 3; i++) {
-        TextureRect_8bIA(&gMasterDisp, D_3000BC0 + ((640 * i) / 2), 80, 8, arg0, (8 * i * arg3) + arg1, arg2, arg3);
+        TextureRect_8bIA(&gMasterDisp, D_vs_player_3000BC0 + 2 * ((640 * i) / 2), 80, 8, arg0, (8 * i * arg3) + arg1,
+                         arg2, arg3);
     }
-    TextureRect_8bIA(&gMasterDisp, D_3000BC0 + ((640 * i) / 2), 80, 2, arg0, (8 * i * arg3) + arg1, arg2, arg3);
+    TextureRect_8bIA(&gMasterDisp, D_vs_player_3000BC0 + 2 * ((640 * i) / 2), 80, 2, arg0, (8 * i * arg3) + arg1, arg2,
+                     arg3);
 }
 
 void func_8008D0DC(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4) {
     u32 var_t8 = 48.0f * arg4;
 
-    func_80084E78(&gMasterDisp, D_300D440, D_300D500, 48, 4, arg0, arg1, arg2, arg3, var_t8, 4);
+    func_80084E78(&gMasterDisp, D_vs_player_300D440, D_vs_player_300D500, 48, 4, arg0, arg1, arg2, arg3, var_t8, 4);
 }
 
 void func_8008D1F0(f32 arg0, f32 arg1, f32 arg2, f32 arg3) {
@@ -3497,7 +3502,8 @@ void func_8008EA14(f32 x, f32 y) {
         case 6:
             RCP_SetupDL(&gMasterDisp, 0x4E);
             gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
-            TextureRect_4bCI(&gMasterDisp, D_blue_marine_3000090, D_3000120, 32, 9, x + 1.0f, y, 1.0f, 1.0f);
+            TextureRect_4bCI(&gMasterDisp, D_blue_marine_3000090, D_blue_marine_3000120, 32, 9, x + 1.0f, y, 1.0f,
+                             1.0f);
             break;
     }
 }
@@ -4431,12 +4437,12 @@ bool func_80091F00(Actor* actor) {
 }
 
 void func_80092244(Actor* actor) {
-    gUnkEntities28[actor->index].unk_00 = 1;
-    gUnkEntities28[actor->index].unk_02 = actor->unk_0E4;
-    gUnkEntities28[actor->index].pos.x = actor->obj.pos.x;
-    gUnkEntities28[actor->index].pos.y = actor->obj.pos.y;
-    gUnkEntities28[actor->index].pos.z = actor->obj.pos.z;
-    gUnkEntities28[actor->index].unk_10 = actor->unk_0F4.y + 180.0f;
+    gRadarMarks[actor->index].unk_00 = 1;
+    gRadarMarks[actor->index].unk_02 = actor->unk_0E4;
+    gRadarMarks[actor->index].pos.x = actor->obj.pos.x;
+    gRadarMarks[actor->index].pos.y = actor->obj.pos.y;
+    gRadarMarks[actor->index].pos.z = actor->obj.pos.z;
+    gRadarMarks[actor->index].unk_10 = actor->unk_0F4.y + 180.0f;
 }
 
 void func_800922F4(Actor* actor) {
diff --git a/src/main/fox_load.c b/src/main/fox_load.c
index 3c741358..e58dbb5a 100644
--- a/src/main/fox_load.c
+++ b/src/main/fox_load.c
@@ -109,8 +109,8 @@ u8 Overlay_Load(u8 ovlSetup, u8 ovlStage) {
         case OVL_SETUP_MAP:
             changeOvl = Overlay_Init(&sOvlmenu_Map[ovlStage]);
             break;
-        case OVL_SETUP_STATE_5:
-            changeOvl = Overlay_Init(&sOvlmenu_State5[ovlStage]);
+        case OVL_SETUP_GAME_OVER:
+            changeOvl = Overlay_Init(&sOvlmenu_GameOver[ovlStage]);
             break;
         case OVL_SETUP_CORNERIA:
             changeOvl = Overlay_Init(&sOvli1_Corneria[ovlStage]);
diff --git a/src/main/fox_load_inits.c b/src/main/fox_load_inits.c
index 9d6097b6..84f362cb 100644
--- a/src/main/fox_load_inits.c
+++ b/src/main/fox_load_inits.c
@@ -196,7 +196,7 @@ OverlayInit sOvlmenu_Map[1] = {
         /* 0xF */ NO_SEGMENT } },
 };
 
-OverlayInit sOvlmenu_State5[1] = {
+OverlayInit sOvlmenu_GameOver[1] = {
     { OVERLAY_OFFSETS(ovl_menu),
       { /* 0x1 */ NO_SEGMENT,
         /* 0x2 */ NO_SEGMENT,
diff --git a/src/main/fox_play.c b/src/main/fox_play.c
index 24b10893..47cff957 100644
--- a/src/main/fox_play.c
+++ b/src/main/fox_play.c
@@ -268,17 +268,17 @@ void func_800A4F7C(void) {
     s32 var_s4_2;
 
     switch (gVersusStage) {
-        case 0:
-            D_80178310 = SEGMENTED_TO_VIRTUAL(D_302DE3C);
+        case VS_STAGE_CORNERIA:
+            D_80178310 = SEGMENTED_TO_VIRTUAL(D_vs_player_302DE3C);
             break;
-        case 1:
-            D_80178310 = SEGMENTED_TO_VIRTUAL(D_302E0E4);
+        case VS_STAGE_KATINA:
+            D_80178310 = SEGMENTED_TO_VIRTUAL(D_vs_player_302E0E4);
             break;
-        case 2:
+        case VS_STAGE_SECTOR_Z:
             if (D_801778AC == 2) {
-                D_80178310 = SEGMENTED_TO_VIRTUAL(D_302E378);
+                D_80178310 = SEGMENTED_TO_VIRTUAL(D_vs_player_302E378);
             } else {
-                D_80178310 = SEGMENTED_TO_VIRTUAL(D_302E170);
+                D_80178310 = SEGMENTED_TO_VIRTUAL(D_vs_player_302E170);
             }
             break;
     }
@@ -459,22 +459,22 @@ void func_800A5844(void) {
 }
 
 EnvSettings* D_800D2F98[21] = {
-    &D_6037160, &D_ENV_6026C80, &D_SX_602A120, &D_6023F20,     &D_6028760,     &D_602E4B0, &D_6007E30,
+    &D_6037160, &D_ENV_6026C80, &D_SX_602A120, &D_A6_6023F20,  &D_A6_6028760,  &D_602E4B0, &D_6007E30,
     &D_601F1F0, &D_60266D0,     &D_C035110,    &D_TR_6006A60,  &D_6030E30_Env, &D_6005000, &D_AQ_602E540,
-    &D_600EA90, NULL,           &D_6011000,    &D_600FF30_Env, &D_6006E70,     &D_6014D50, &D_302DD70,
+    &D_600EA90, NULL,           &D_6011000,    &D_600FF30_Env, &D_6006E70,     &D_6014D50, &D_vs_player_302DD70,
 };
 
 void func_800A594C(void) {
     if (gVersusMode) {
         switch (gVersusStage) {
             case 0:
-                sEnvSettings = SEGMENTED_TO_VIRTUAL(&D_302DD70);
+                sEnvSettings = SEGMENTED_TO_VIRTUAL(&D_vs_player_302DD70);
                 break;
             case 1:
-                sEnvSettings = SEGMENTED_TO_VIRTUAL(&D_302DDB4);
+                sEnvSettings = SEGMENTED_TO_VIRTUAL(&D_vs_player_302DDB4);
                 break;
             case 2:
-                sEnvSettings = SEGMENTED_TO_VIRTUAL(&D_302DDF8);
+                sEnvSettings = SEGMENTED_TO_VIRTUAL(&D_vs_player_302DDF8);
                 break;
         }
     } else {
@@ -581,20 +581,20 @@ void BonusText_Initialize(BonusText* bonus) {
     }
 }
 
-void func_800A60E8(UnkEntity30* ent30) {
+void TexturedLine_Initialize(TexturedLine* texLine) {
     s32 i;
-    u8* ptr = (u8*) ent30;
+    u8* ptr = (u8*) texLine;
 
-    for (i = 0; i < sizeof(UnkEntity30); i++, ptr++) {
+    for (i = 0; i < sizeof(TexturedLine); i++, ptr++) {
         *ptr = 0;
     }
 }
 
-void func_800A6118(UnkEntity28* unkEnt28) {
+void RadarMark_Initialize(RadarMark* radarMark) {
     s32 i;
-    u8* ptr = (u8*) unkEnt28;
+    u8* ptr = (u8*) radarMark;
 
-    for (i = 0; i < sizeof(UnkEntity28); i++, ptr++) {
+    for (i = 0; i < sizeof(RadarMark); i++, ptr++) {
         *ptr = 0;
     }
 }
@@ -606,11 +606,11 @@ void func_800A6148(void) {
     for (i = 0; i < ARRAY_COUNT(gBonusText); i++) {
         BonusText_Initialize(&gBonusText[i]);
     }
-    for (i = 0; i < ARRAY_COUNT(gUnkEntities28); i++) {
-        func_800A6118(&gUnkEntities28[i]);
+    for (i = 0; i < ARRAY_COUNT(gRadarMarks); i++) {
+        RadarMark_Initialize(&gRadarMarks[i]);
     }
-    for (i = 0; i < ARRAY_COUNT(gUnkEntities30); i++) {
-        func_800A60E8(&gUnkEntities30[i]);
+    for (i = 0; i < ARRAY_COUNT(gTexturedLines); i++) {
+        TexturedLine_Initialize(&gTexturedLines[i]);
     }
     for (i = 0; i < ARRAY_COUNT(gObjects80); i++) {
         Object_Kill(&gObjects80[i].obj, gObjects80[i].sfxSource);
@@ -3916,7 +3916,7 @@ void func_800B0194(Player* player) {
     if (player->unk_1D4 != 0) {
         if (player->unk_0D0 > 1.0f) {
             player->unk_00C += player->unk_008;
-            if ((s32) player->unk_00C >= Animation_GetFrameCount(&D_301CFEC)) {
+            if ((s32) player->unk_00C >= Animation_GetFrameCount(&D_vs_player_301CFEC)) {
                 player->unk_00C = 0.0f;
             }
             player->unk_080 = 2.0f * SIN_DEG((player->unk_20C + 7) * 24.0f);
@@ -3927,16 +3927,16 @@ void func_800B0194(Player* player) {
             player->unk_20C = player->unk_00C;
             switch (gPlayerNum) {
                 case 0:
-                    sp44 = Animation_GetFrameData(&D_301CFEC, player->unk_20C, sp78);
+                    sp44 = Animation_GetFrameData(&D_vs_player_301CFEC, player->unk_20C, sp78);
                     break;
                 case 1:
-                    sp44 = Animation_GetFrameData(&D_301D888, player->unk_20C, sp78);
+                    sp44 = Animation_GetFrameData(&D_vs_player_301D888, player->unk_20C, sp78);
                     break;
                 case 2:
-                    sp44 = Animation_GetFrameData(&D_301E19C, player->unk_20C, sp78);
+                    sp44 = Animation_GetFrameData(&D_vs_player_301E19C, player->unk_20C, sp78);
                     break;
                 case 3:
-                    sp44 = Animation_GetFrameData(&D_301C3A8, player->unk_20C, sp78);
+                    sp44 = Animation_GetFrameData(&D_vs_player_301C3A8, player->unk_20C, sp78);
                     break;
             }
             Math_SmoothStepToVec3fArray(sp78, player->jointTable, 1, sp44, 1.0f, player->unk_010, 0.01f);
@@ -3958,16 +3958,16 @@ void func_800B0194(Player* player) {
             }
             switch (gPlayerNum) {
                 case 0:
-                    sp48 = SEGMENTED_TO_VIRTUAL(D_302E56C);
+                    sp48 = SEGMENTED_TO_VIRTUAL(D_vs_player_302E56C);
                     break;
                 case 1:
-                    sp48 = SEGMENTED_TO_VIRTUAL(D_302E830);
+                    sp48 = SEGMENTED_TO_VIRTUAL(D_vs_player_302E830);
                     break;
                 case 2:
-                    sp48 = SEGMENTED_TO_VIRTUAL(D_302E74C);
+                    sp48 = SEGMENTED_TO_VIRTUAL(D_vs_player_302E74C);
                     break;
                 case 3:
-                    sp48 = SEGMENTED_TO_VIRTUAL(D_302E65C);
+                    sp48 = SEGMENTED_TO_VIRTUAL(D_vs_player_302E65C);
                     break;
             }
             Math_SmoothStepToVec3fArray(sp48, player->jointTable, 1, 0x18, 0.2f, 10.0f, 0.01f);
@@ -3981,16 +3981,16 @@ void func_800B0194(Player* player) {
     if (player->unk_1D4 == 0) {
         switch (gPlayerNum) {
             case 0:
-                sp48 = SEGMENTED_TO_VIRTUAL(D_302E95C);
+                sp48 = SEGMENTED_TO_VIRTUAL(D_vs_player_302E95C);
                 break;
             case 1:
-                sp48 = SEGMENTED_TO_VIRTUAL(D_302EC20);
+                sp48 = SEGMENTED_TO_VIRTUAL(D_vs_player_302EC20);
                 break;
             case 2:
-                sp48 = SEGMENTED_TO_VIRTUAL(D_302EB3C);
+                sp48 = SEGMENTED_TO_VIRTUAL(D_vs_player_302EB3C);
                 break;
             case 3:
-                sp48 = SEGMENTED_TO_VIRTUAL(D_302EA4C);
+                sp48 = SEGMENTED_TO_VIRTUAL(D_vs_player_302EA4C);
                 break;
         }
         Math_SmoothStepToVec3fArray(sp48, player->jointTable, 1, 0x18, 0.2f, 10.0f, 0.01f);
@@ -4202,16 +4202,16 @@ void func_800B0F50(Player* playerx) {
                 player->unk_068 = 0;
                 switch (gPlayerNum) {
                     case 0:
-                        sp38 = SEGMENTED_TO_VIRTUAL(D_302E56C);
+                        sp38 = SEGMENTED_TO_VIRTUAL(D_vs_player_302E56C);
                         break;
                     case 1:
-                        sp38 = SEGMENTED_TO_VIRTUAL(D_302E830);
+                        sp38 = SEGMENTED_TO_VIRTUAL(D_vs_player_302E830);
                         break;
                     case 2:
-                        sp38 = SEGMENTED_TO_VIRTUAL(D_302E74C);
+                        sp38 = SEGMENTED_TO_VIRTUAL(D_vs_player_302E74C);
                         break;
                     case 3:
-                        sp38 = SEGMENTED_TO_VIRTUAL(D_302E65C);
+                        sp38 = SEGMENTED_TO_VIRTUAL(D_vs_player_302E65C);
                         break;
                 }
                 for (j = 0; j < 30; j++, sp38++) {
@@ -4380,13 +4380,13 @@ void func_800B0F50(Player* playerx) {
     if ((player->form == FORM_ARWING) && !gVersusMode) {
         switch (player->unk_204) {
             case 0:
-                Animation_GetFrameData(&D_3015AF4, 0, player->jointTable);
+                Animation_GetFrameData(&D_arwing_3015AF4, 0, player->jointTable);
                 break;
             case 1:
-                Animation_GetFrameData(&D_3015C28, 0, player->jointTable);
+                Animation_GetFrameData(&D_arwing_3015C28, 0, player->jointTable);
                 break;
             case 2:
-                Animation_GetFrameData(&D_30163C4, 0, player->jointTable);
+                Animation_GetFrameData(&D_arwing_30163C4, 0, player->jointTable);
                 break;
         }
     }
@@ -5282,13 +5282,13 @@ void func_800B48BC(Player* player) {
     if ((player->state_1C8 >= PLAYERSTATE_1C8_2) && (player->form == FORM_ARWING) && !gVersusMode) {
         switch (player->unk_204) {
             case 0:
-                sp1C4 = Animation_GetFrameData(&D_3015AF4, 0, sp58);
+                sp1C4 = Animation_GetFrameData(&D_arwing_3015AF4, 0, sp58);
                 break;
             case 1:
-                sp1C4 = Animation_GetFrameData(&D_3015C28, 0, sp58);
+                sp1C4 = Animation_GetFrameData(&D_arwing_3015C28, 0, sp58);
                 break;
             case 2:
-                sp1C4 = Animation_GetFrameData(&D_30163C4, 0, sp58);
+                sp1C4 = Animation_GetFrameData(&D_arwing_30163C4, 0, sp58);
                 break;
         }
         Math_SmoothStepToVec3fArray(sp58, player->jointTable, 1, sp1C4, 0.1f, 1.3f, 0.0f);
diff --git a/src/main/fox_radio.c b/src/main/fox_radio.c
index ac6680e4..544d5e75 100644
--- a/src/main/fox_radio.c
+++ b/src/main/fox_radio.c
@@ -273,16 +273,16 @@ void func_800BAAE8(void) {
             sp44 = D_601D800;
             break;
         case RCID_BOSS_AREA6:
-            sp44 = D_60047E0;
+            sp44 = D_A6_60047E0;
             break;
         case RCID_BOSS_AREA6_OPEN:
-            sp44 = D_6005700;
+            sp44 = D_A6_6005700;
             break;
         case RCID_CAIMAN_AREA6:
-            sp44 = D_60029A0;
+            sp44 = D_A6_60029A0;
             break;
         case RCID_CAIMAN_AREA6_OPEN:
-            sp44 = D_60038C0;
+            sp44 = D_A6_60038C0;
             break;
         case RCID_BOSS_ZONESS:
             sp44 = D_6014510;
@@ -332,7 +332,7 @@ void func_800BAAE8(void) {
         case RCID_ANDROSS:
             sp44 = D_D000170;
             if ((gGameState == GSTATE_PLAY) && (gCurrentLevel == LEVEL_AREA_6)) {
-                sp44 = D_6000B60;
+                sp44 = D_A6_6000B60;
             }
             D_80178744 = 1;
             break;
@@ -340,7 +340,7 @@ void func_800BAAE8(void) {
         case RCID_ANDROSS_OPEN:
             sp44 = D_D001090;
             if ((gGameState == GSTATE_PLAY) && (gCurrentLevel == LEVEL_AREA_6)) {
-                sp44 = D_6001A80;
+                sp44 = D_A6_6001A80;
             }
             D_80178744 = 1;
             break;
diff --git a/src/main/fox_tank.c b/src/main/fox_tank.c
index 92c055b9..9bcf8568 100644
--- a/src/main/fox_tank.c
+++ b/src/main/fox_tank.c
@@ -488,18 +488,18 @@ void func_80044868(Player* player) {
         }
     }
     if (player->unk_0D0 > 0.0f) {
-        Texture_Scroll(D_3002E80, 0x20, 0x20, 0);
+        Texture_Scroll(D_landmaster_3002E80, 0x20, 0x20, 0);
         if ((gCurrentLevel == LEVEL_TITANIA) && (gBossActive == 0)) {
-            func_80043280(D_3005EA8, D_6009BB8, gGameFrameCount * -55.0f);
+            func_80043280(D_landmaster_3005EA8, D_6009BB8, gGameFrameCount * -55.0f);
         }
         if ((gCurrentLevel == LEVEL_MACBETH) && (player->state_1C8 == PLAYERSTATE_1C8_7)) {
-            func_80043280(D_3005EA8, *D_Unk_800DACB8, gGameFrameCount * -55.0f);
+            func_80043280(D_landmaster_3005EA8, *D_Unk_800DACB8, gGameFrameCount * -55.0f);
         }
     }
     if (player->unk_0D0 > 10.0f) {
-        Texture_Scroll(D_3002E80, 0x20, 0x20, 0);
+        Texture_Scroll(D_landmaster_3002E80, 0x20, 0x20, 0);
         if ((gCurrentLevel == LEVEL_TITANIA) && (gBossActive == 0)) {
-            func_80043280(D_3005EA8, D_6009BB8, gGameFrameCount * -55.0f);
+            func_80043280(D_landmaster_3005EA8, D_6009BB8, gGameFrameCount * -55.0f);
         }
     }
     func_800A46A0(player);
diff --git a/src/main/fox_versus.c b/src/main/fox_versus.c
index 49acb385..0f02fe46 100644
--- a/src/main/fox_versus.c
+++ b/src/main/fox_versus.c
@@ -88,17 +88,17 @@ void func_800BC8D8(f32 xPos, f32 yPos, f32 scale) {
     s32 i;
 
     for (i = 0; i < 2; i++) {
-        TextureRect_8bCI(&gMasterDisp, D_300A470 + (i * 152 * 8), D_300B218, 152, 8, xPos, yPos + (8 * i * scale),
-                         scale, scale);
+        TextureRect_8bCI(&gMasterDisp, D_vs_player_300A470 + (i * 152 * 8), D_vs_player_300B218, 152, 8, xPos,
+                         yPos + (8 * i * scale), scale, scale);
     }
 
-    TextureRect_8bCI(&gMasterDisp, D_300A470 + (152 * 8 * i), D_300B218, 152, 7, xPos, yPos + (8 * i * scale), scale,
-                     scale);
+    TextureRect_8bCI(&gMasterDisp, D_vs_player_300A470 + (152 * 8 * i), D_vs_player_300B218, 152, 7, xPos,
+                     yPos + (8 * i * scale), scale, scale);
 }
 
 void func_800BC9DC(f32 xPos, f32 yPos, f32 scale, s32 yScale) {
-    u16* D_800D4AA4[] = { D_3008DE0, D_30098C0, D_300A390 };
-    u8* D_800D4ABC[] = { D_30087A0, D_3008EC0, D_3009990 };
+    u16* D_800D4AA4[] = { D_vs_player_3008DE0, D_vs_player_30098C0, D_vs_player_300A390 };
+    u8* D_800D4ABC[] = { D_vs_player_30087A0, D_vs_player_3008EC0, D_vs_player_3009990 };
     s32 D_800D4AB0[] = { 40, 64, 64 };
     s32 i;
 
@@ -112,16 +112,16 @@ void func_800BCB44(f32 xPos, f32 yPos, f32 scale) {
     s32 i;
 
     for (i = 0; i < 2; i++) {
-        TextureRect_8bCI(&gMasterDisp, D_3006C60 + (96 * 8 * i), D_3007500, 96, 8, xPos, yPos + (8 * i * scale), scale,
-                         scale);
+        TextureRect_8bCI(&gMasterDisp, D_vs_player_3006C60 + (96 * 8 * i), D_vs_player_3007500, 96, 8, xPos,
+                         yPos + (8 * i * scale), scale, scale);
     }
-    TextureRect_8bCI(&gMasterDisp, D_3006C60 + (96 * 8 * i), D_3007500, 96, 7, xPos, yPos + (8 * i * scale), scale,
-                     scale);
+    TextureRect_8bCI(&gMasterDisp, D_vs_player_3006C60 + (96 * 8 * i), D_vs_player_3007500, 96, 7, xPos,
+                     yPos + (8 * i * scale), scale, scale);
 }
 
 void func_800BCC48(f32 xPos, f32 yPos, f32 xScale, f32 yScale, s32 arg4) {
-    u16* D_800D4AC8[] = { D_3006A68, D_3008598, D_300C458, D_3005E38 };
-    u8* D_800D4AD8[] = { D_3006040, D_30076C0, D_300B3F0, D_3004F60 };
+    u16* D_800D4AC8[] = { D_vs_player_3006A68, D_vs_player_3008598, D_vs_player_300C458, D_vs_player_3005E38 };
+    u8* D_800D4AD8[] = { D_vs_player_3006040, D_vs_player_30076C0, D_vs_player_300B3F0, D_vs_player_3004F60 };
     s32 D_800D4AE8[] = { 104, 152, 168, 152 };
     s32 i;
 
@@ -137,8 +137,8 @@ void func_800BCE24(f32 xPos, f32 yPos, f32 xScale, f32 yScale) {
     s32 i;
 
     for (i = 0; i < 6; i++) {
-        TextureRect_8bCI(&gMasterDisp, D_3001420 + (256 * 7 * i), D_3003E20, 256, 7, xPos, yPos + (7 * i * yScale),
-                         xScale, yScale);
+        TextureRect_8bCI(&gMasterDisp, D_vs_player_3001420 + (256 * 7 * i), D_vs_player_3003E20, 256, 7, xPos,
+                         yPos + (7 * i * yScale), xScale, yScale);
     }
 }
 
@@ -146,11 +146,11 @@ void func_800BCEF8(f32 xPos, f32 yPos, f32 scale) {
     s32 i;
 
     for (i = 0; i < 12; i++) {
-        TextureRect_8bCI(&gMasterDisp, D_3004010 + (136 * 2 * i), D_3004D58, 136, 2, xPos, yPos + (2 * i * scale),
-                         scale, scale);
+        TextureRect_8bCI(&gMasterDisp, D_vs_player_3004010 + (136 * 2 * i), D_vs_player_3004D58, 136, 2, xPos,
+                         yPos + (2 * i * scale), scale, scale);
     }
-    TextureRect_8bCI(&gMasterDisp, D_3004010 + (136 * 2 * i), D_3004D58, 136, 1, xPos, yPos + (2 * i * scale), scale,
-                     scale);
+    TextureRect_8bCI(&gMasterDisp, D_vs_player_3004010 + (136 * 2 * i), D_vs_player_3004D58, 136, 1, xPos,
+                     yPos + (2 * i * scale), scale, scale);
 }
 
 void func_800BCFFC(f32 xPos, f32 yPos, f32 xScale, f32 yScale) {
@@ -158,15 +158,15 @@ void func_800BCFFC(f32 xPos, f32 yPos, f32 xScale, f32 yScale) {
 }
 
 void func_800BD05C(f32 xPos, f32 yPos, f32 scale) {
-    TextureRect_4bCI(&gMasterDisp, D_30003A0, D_30004E0, 64, 10, xPos, yPos, scale, scale);
+    TextureRect_4bCI(&gMasterDisp, D_vs_player_30003A0, D_vs_player_30004E0, 64, 10, xPos, yPos, scale, scale);
 }
 
 void func_800BD0B4(f32 xPos, f32 yPos, f32 scale) {
-    TextureRect_4bCI(&gMasterDisp, D_3000510, D_30006A0, 80, 10, xPos, yPos, scale, scale);
+    TextureRect_4bCI(&gMasterDisp, D_vs_player_3000510, D_vs_player_30006A0, 80, 10, xPos, yPos, scale, scale);
 }
 
 void func_800BD10C(f32 xPos, f32 yPos, f32 scale) {
-    TextureRect_4bCI(&gMasterDisp, D_30006D0, D_3000810, 64, 10, xPos, yPos, scale, scale);
+    TextureRect_4bCI(&gMasterDisp, D_vs_player_30006D0, D_vs_player_3000810, 64, 10, xPos, yPos, scale, scale);
 }
 
 void func_800BD164(f32 xPos, f32 yPos) {
@@ -229,11 +229,11 @@ void func_800BD4D4(f32 xPos, f32 yPos, s32 arg2) {
 }
 
 void func_800BD720(f32 xPos, f32 yPos) {
-    TextureRect_8bIA(&gMasterDisp, D_30013E0, 8, 8, xPos, yPos, 1.0f, 1.0f);
+    TextureRect_8bIA(&gMasterDisp, D_vs_player_30013E0, 8, 8, xPos, yPos, 1.0f, 1.0f);
 }
 
 void func_800BD76C(f32 xPos, f32 yPos) {
-    TextureRect_4bCI(&gMasterDisp, D_30001E0, D_3000380, 64, 13, xPos, yPos, 1.0f, 1.0f);
+    TextureRect_4bCI(&gMasterDisp, D_vs_player_30001E0, D_vs_player_3000380, 64, 13, xPos, yPos, 1.0f, 1.0f);
 }
 
 void func_800BD7C4(f32 xPos, f32 yPos, s32 arg2) {
diff --git a/src/overlays/ovl_ending/fox_end2.c b/src/overlays/ovl_ending/fox_end2.c
index c072e0a3..53376bf0 100644
--- a/src/overlays/ovl_ending/fox_end2.c
+++ b/src/overlays/ovl_ending/fox_end2.c
@@ -702,7 +702,7 @@ void func_ending_80190778(u32 arg0, AssetInfo* asset) {
 
     Matrix_SetGfxMtx(&gMasterDisp);
 
-    gSPDisplayList(gMasterDisp++, D_3005AB0);
+    gSPDisplayList(gMasterDisp++, D_arwing_3005AB0);
 }
 
 void func_ending_80190CF0(u32 arg0, AssetInfo* asset) {
diff --git a/src/overlays/ovl_ending/fox_end2_data.c b/src/overlays/ovl_ending/fox_end2_data.c
index 9572e92c..afbd90d8 100644
--- a/src/overlays/ovl_ending/fox_end2_data.c
+++ b/src/overlays/ovl_ending/fox_end2_data.c
@@ -221,40 +221,40 @@ AssetInfo D_ending_801934B4[] = {
     { NULL, func_ending_8018F2A8, 29, 520, 800, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { NULL, func_ending_8018F64C, 29, 100, 820, 1.0f, -900.0f, 600.0f, -1200.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 255, 0, 255, 255, 255, 255, 4, 0 },
     { NULL, func_ending_8018F64C, 29, 920, 960, 1.0f, -900.0f, 600.0f, -1200.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 6.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 255, 0, 255, 255, 255, 255, 4, 0 },
-    { &D_3015C28, D_3016610, 29, 100, 1780, 1.0f, -1000.0f, 500.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0 },
-    { D_3016CC0, NULL, 29, 920, 150, 1.0f, -1000.0f, 506.8f, -16.0f, 5.0f, -40.0f, 0.0f, 0.012f, 0.012f, 0.012f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0 },
-    { D_3016CC0, NULL, 29, 1070, 19, 1.0f, -1000.0f, 506.8f, -16.0f, 5.0f, -40.0f, 0.0f, 0.012f, 0.012f, 0.012f, 0.0f, 0.0f, 0.0f, 0.0f, 2.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0 },
-    { D_3016CC0, NULL, 29, 1089, 1, 1.0f, -1000.0f, 506.8f, -16.0f, 5.0f, -1.0f, 0.0f, 0.012f, 0.012f, 0.012f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0 },
-    { D_3016CC0, NULL, 29, 1090, 30, 1.0f, -1000.0f, 506.8f, -16.0f, 5.0f, 0.0f, 0.0f, 0.012f, 0.012f, 0.012f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0 },
-    { D_30194E0, NULL, 45, 100, 1020, 1.0f, -1000.0f, 516.9f, -25.9f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 255, 255, 255, 140, 7, 0 },
+    { &D_arwing_3015C28, D_arwing_3016610, 29, 100, 1780, 1.0f, -1000.0f, 500.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0 },
+    { D_arwing_3016CC0, NULL, 29, 920, 150, 1.0f, -1000.0f, 506.8f, -16.0f, 5.0f, -40.0f, 0.0f, 0.012f, 0.012f, 0.012f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0 },
+    { D_arwing_3016CC0, NULL, 29, 1070, 19, 1.0f, -1000.0f, 506.8f, -16.0f, 5.0f, -40.0f, 0.0f, 0.012f, 0.012f, 0.012f, 0.0f, 0.0f, 0.0f, 0.0f, 2.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0 },
+    { D_arwing_3016CC0, NULL, 29, 1089, 1, 1.0f, -1000.0f, 506.8f, -16.0f, 5.0f, -1.0f, 0.0f, 0.012f, 0.012f, 0.012f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0 },
+    { D_arwing_3016CC0, NULL, 29, 1090, 30, 1.0f, -1000.0f, 506.8f, -16.0f, 5.0f, 0.0f, 0.0f, 0.012f, 0.012f, 0.012f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0 },
+    { D_arwing_30194E0, NULL, 45, 100, 1020, 1.0f, -1000.0f, 516.9f, -25.9f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 255, 255, 255, 140, 7, 0 },
     { NULL, func_ending_8018E1B8, 67, 100, 1780, 1.0f, -1000.0f, 500.0f, -64.0f, 0.0f, 0.0f, 0.0f, 0.5f, 0.3f, 0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 240, 176, 64, 996, 1000, 0, 0, 255, 0, 255, 255, 255, 255, 0, 0 },
-    { &D_3015C28, D_3016610, 29, 100, 1780, 1.0f, -1000.0f, -500.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0 },
+    { &D_arwing_3015C28, D_arwing_3016610, 29, 100, 1780, 1.0f, -1000.0f, -500.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0 },
     { NULL, func_ending_80190778, 29, 1120, 200, 1.0f, -1000.0f, -493.2f, -16.0f, 0.0f, 0.0f, 0.0f, 0.012f, 0.012f, 0.012f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 5.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0 },
-    { D_30194E0, NULL, 45, 1120, 200, 1.0f, -1000.0f, -483.1f, -25.9f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 255, 255, 255, 140, 7, 0 },
+    { D_arwing_30194E0, NULL, 45, 1120, 200, 1.0f, -1000.0f, -483.1f, -25.9f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 255, 255, 255, 140, 7, 0 },
     { NULL, func_ending_8018E1B8, 67, 100, 1780, 1.0f, -1000.0f, -500.0f, -57.0f, 0.0f, 0.0f, 0.0f, 0.5f, 0.3f, 0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 240, 176, 64, 996, 1000, 0, 0, 255, 0, 255, 255, 255, 255, 0, 0 },
     { NULL, func_ending_8018FC60, 29, 100, 420, 1.0f, 1000.0f, 560.0f, -440.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 255, 0, 255, 255, 255, 255, 4, 0 },
     { NULL, func_ending_8018FC60, 29, 520, 130, 1.0f, 1000.0f, 560.0f, -440.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 4.0f, 0.0f, 0.0f, 1.8f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 255, 0, 255, 255, 255, 255, 4, 0 },
     { NULL, func_ending_8018FC60, 29, 650, 1230, 1.0f, 800.0f, -300.0f, 350.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 255, 0, 255, 255, 255, 255, 4, 0 },
     { NULL, func_ending_80191294, 29, 100, 1780, 1.0f, 1000.0f, 500.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0 },
     { NULL, func_ending_8018E1B8, 67, 100, 1780, 1.0f, 1000.0f, 500.0f, -57.0f, 0.0f, 0.0f, 0.0f, 0.5f, 0.3f, 0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 240, 176, 64, 996, 1000, 0, 0, 255, 0, 255, 255, 255, 255, 0, 0 },
-    { &D_3015C28, D_3016610, 29, 100, 1780, 1.0f, 1000.0f, -500.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0 },
-    { D_3003CE0, NULL, 29, 850, 20, 1.0f, 1000.0f, -493.2f, -16.0f, 5.0f, 0.0f, 0.0f, 0.012f, 0.012f, 0.012f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0 },
-    { D_3003CE0, NULL, 29, 870, 1, 1.0f, 1000.0f, -493.2f, -16.0f, 7.0f, 0.0f, 0.0f, 0.012f, 0.012f, 0.012f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0 },
-    { D_3003CE0, NULL, 29, 871, 1, 1.0f, 1000.0f, -493.2f, -16.0f, 10.0f, 0.0f, 0.0f, 0.012f, 0.012f, 0.012f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0 },
-    { D_3003CE0, NULL, 29, 872, 1, 1.0f, 1000.0f, -493.2f, -16.0f, 14.0f, 0.0f, 0.0f, 0.012f, 0.012f, 0.012f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0 },
-    { D_3003CE0, NULL, 29, 873, 1, 1.0f, 1000.0f, -493.2f, -16.0f, 16.0f, 0.0f, 0.0f, 0.012f, 0.012f, 0.012f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0 },
-    { D_3003CE0, NULL, 29, 874, 1, 1.0f, 1000.0f, -493.2f, -16.0f, 14.0f, 0.0f, 0.0f, 0.012f, 0.012f, 0.012f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0 },
-    { D_3003CE0, NULL, 29, 875, 1, 1.0f, 1000.0f, -493.2f, -16.0f, 11.0f, 0.0f, 0.0f, 0.012f, 0.012f, 0.012f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0 },
-    { D_3003CE0, NULL, 29, 876, 1, 1.0f, 1000.0f, -493.2f, -16.0f, 7.0f, 0.0f, 0.0f, 0.012f, 0.012f, 0.012f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0 },
-    { D_3003CE0, NULL, 29, 877, 1, 1.0f, 1000.0f, -493.2f, -16.0f, 7.0f, 0.0f, 0.0f, 0.012f, 0.012f, 0.012f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0 },
-    { D_3003CE0, NULL, 29, 878, 1, 1.0f, 1000.0f, -493.2f, -16.0f, 10.0f, 0.0f, 0.0f, 0.012f, 0.012f, 0.012f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0 },
-    { D_3003CE0, NULL, 29, 879, 1, 1.0f, 1000.0f, -493.2f, -16.0f, 14.0f, 0.0f, 0.0f, 0.012f, 0.012f, 0.012f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0 },
-    { D_3003CE0, NULL, 29, 880, 1, 1.0f, 1000.0f, -493.2f, -16.0f, 16.0f, 0.0f, 0.0f, 0.012f, 0.012f, 0.012f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0 },
-    { D_3003CE0, NULL, 29, 881, 1, 1.0f, 1000.0f, -493.2f, -16.0f, 14.0f, 0.0f, 0.0f, 0.012f, 0.012f, 0.012f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0 },
-    { D_3003CE0, NULL, 29, 882, 1, 1.0f, 1000.0f, -493.2f, -16.0f, 10.0f, 0.0f, 0.0f, 0.012f, 0.012f, 0.012f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0 },
-    { D_3003CE0, NULL, 29, 883, 1, 1.0f, 1000.0f, -493.2f, -16.0f, 7.0f, 0.0f, 0.0f, 0.012f, 0.012f, 0.012f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0 },
-    { D_3003CE0, NULL, 29, 884, 36, 1.0f, 1000.0f, -493.2f, -16.0f, 5.0f, 0.0f, 0.0f, 0.012f, 0.012f, 0.012f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0 },
-    { D_30194E0, NULL, 45, 850, 70, 1.0f, 999.0f, -483.1f, -25.9f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 255, 255, 255, 140, 11, 0 },
+    { &D_arwing_3015C28, D_arwing_3016610, 29, 100, 1780, 1.0f, 1000.0f, -500.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0 },
+    { D_arwing_3003CE0, NULL, 29, 850, 20, 1.0f, 1000.0f, -493.2f, -16.0f, 5.0f, 0.0f, 0.0f, 0.012f, 0.012f, 0.012f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0 },
+    { D_arwing_3003CE0, NULL, 29, 870, 1, 1.0f, 1000.0f, -493.2f, -16.0f, 7.0f, 0.0f, 0.0f, 0.012f, 0.012f, 0.012f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0 },
+    { D_arwing_3003CE0, NULL, 29, 871, 1, 1.0f, 1000.0f, -493.2f, -16.0f, 10.0f, 0.0f, 0.0f, 0.012f, 0.012f, 0.012f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0 },
+    { D_arwing_3003CE0, NULL, 29, 872, 1, 1.0f, 1000.0f, -493.2f, -16.0f, 14.0f, 0.0f, 0.0f, 0.012f, 0.012f, 0.012f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0 },
+    { D_arwing_3003CE0, NULL, 29, 873, 1, 1.0f, 1000.0f, -493.2f, -16.0f, 16.0f, 0.0f, 0.0f, 0.012f, 0.012f, 0.012f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0 },
+    { D_arwing_3003CE0, NULL, 29, 874, 1, 1.0f, 1000.0f, -493.2f, -16.0f, 14.0f, 0.0f, 0.0f, 0.012f, 0.012f, 0.012f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0 },
+    { D_arwing_3003CE0, NULL, 29, 875, 1, 1.0f, 1000.0f, -493.2f, -16.0f, 11.0f, 0.0f, 0.0f, 0.012f, 0.012f, 0.012f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0 },
+    { D_arwing_3003CE0, NULL, 29, 876, 1, 1.0f, 1000.0f, -493.2f, -16.0f, 7.0f, 0.0f, 0.0f, 0.012f, 0.012f, 0.012f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0 },
+    { D_arwing_3003CE0, NULL, 29, 877, 1, 1.0f, 1000.0f, -493.2f, -16.0f, 7.0f, 0.0f, 0.0f, 0.012f, 0.012f, 0.012f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0 },
+    { D_arwing_3003CE0, NULL, 29, 878, 1, 1.0f, 1000.0f, -493.2f, -16.0f, 10.0f, 0.0f, 0.0f, 0.012f, 0.012f, 0.012f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0 },
+    { D_arwing_3003CE0, NULL, 29, 879, 1, 1.0f, 1000.0f, -493.2f, -16.0f, 14.0f, 0.0f, 0.0f, 0.012f, 0.012f, 0.012f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0 },
+    { D_arwing_3003CE0, NULL, 29, 880, 1, 1.0f, 1000.0f, -493.2f, -16.0f, 16.0f, 0.0f, 0.0f, 0.012f, 0.012f, 0.012f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0 },
+    { D_arwing_3003CE0, NULL, 29, 881, 1, 1.0f, 1000.0f, -493.2f, -16.0f, 14.0f, 0.0f, 0.0f, 0.012f, 0.012f, 0.012f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0 },
+    { D_arwing_3003CE0, NULL, 29, 882, 1, 1.0f, 1000.0f, -493.2f, -16.0f, 10.0f, 0.0f, 0.0f, 0.012f, 0.012f, 0.012f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0 },
+    { D_arwing_3003CE0, NULL, 29, 883, 1, 1.0f, 1000.0f, -493.2f, -16.0f, 7.0f, 0.0f, 0.0f, 0.012f, 0.012f, 0.012f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0 },
+    { D_arwing_3003CE0, NULL, 29, 884, 36, 1.0f, 1000.0f, -493.2f, -16.0f, 5.0f, 0.0f, 0.0f, 0.012f, 0.012f, 0.012f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0 },
+    { D_arwing_30194E0, NULL, 45, 850, 70, 1.0f, 999.0f, -483.1f, -25.9f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.2f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 255, 255, 255, 140, 11, 0 },
     { NULL, func_ending_8018E1B8, 67, 100, 1780, 1.0f, 1000.0f, -500.0f, -34.0f, 0.0f, 0.0f, 0.0f, 0.5f, 0.3f, 0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 240, 176, 64, 996, 1000, 0, 0, 255, 0, 255, 255, 255, 255, 0, 0 },
     { NULL, func_ending_8018F2A8, 29, 100, 420, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { NULL, func_ending_8018F2A8, 29, 1320, 470, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
@@ -289,13 +289,13 @@ AssetInfo D_ending_801934B4[] = {
     { D_7016540, NULL, 17, 5100, 310, 1.0f, 0.0f, -2800.0f, -6900.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, -4.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { D_7016540, NULL, 17, 5410, 1490, 1.0f, 0.0f, -4040.0f, -6900.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 995, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { NULL, func_ending_80190CF0, 62, 6520, 380, 1.0f, 0.0f, 0.0f, -7000.0f, 0.0f, 0.0f, 0.0f, 12.0f, 12.0f, 12.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 200, 0, 0, 0, 0, 0, 255, 255, 255, 0, 0, 0 },
-    { &D_3015AF4, D_3016610, 29, 5100, 1800, 1.0f, 100.0f, 100.0f, -230.0f, 0.0f, 180.0f, 0.0f, 0.5f, 0.5f, 0.5f, 0.0f, 0.0f, -7.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 3.0f, 240, 176, 64, 996, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0 },
+    { &D_arwing_3015AF4, D_arwing_3016610, 29, 5100, 1800, 1.0f, 100.0f, 100.0f, -230.0f, 0.0f, 180.0f, 0.0f, 0.5f, 0.5f, 0.5f, 0.0f, 0.0f, -7.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 3.0f, 240, 176, 64, 996, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0 },
     { D_7010970, NULL, 38, 5100, 1800, 1.0f, 100.0f, 95.0f, -200.0f, 0.0f, 0.0f, 0.0f, 0.4f, 0.3f, 0.4f, 0.0f, 0.0f, -7.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 3.0f, 240, 176, 64, 996, 1000, 255, 0, 0, 0, 255, 255, 255, 255, 0, 0 },
-    { &D_3015AF4, D_3016610, 29, 5100, 1800, 1.0f, 100.0f, -100.0f, -230.0f, 0.0f, 180.0f, 0.0f, 0.5f, 0.5f, 0.5f, 0.0f, 0.0f, -7.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 3.0f, 240, 176, 64, 996, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0 },
+    { &D_arwing_3015AF4, D_arwing_3016610, 29, 5100, 1800, 1.0f, 100.0f, -100.0f, -230.0f, 0.0f, 180.0f, 0.0f, 0.5f, 0.5f, 0.5f, 0.0f, 0.0f, -7.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 3.0f, 240, 176, 64, 996, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0 },
     { D_7010970, NULL, 38, 5100, 1800, 1.0f, 100.0f, -105.0f, -200.0f, 0.0f, 0.0f, 0.0f, 0.4f, 0.3f, 0.4f, 0.0f, 0.0f, -7.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 3.0f, 240, 176, 64, 996, 1000, 255, 0, 0, 0, 255, 255, 255, 255, 5, 0 },
-    { &D_3015AF4, D_3016610, 29, 5100, 1800, 1.0f, -100.0f, 100.0f, -230.0f, 0.0f, 180.0f, 0.0f, 0.5f, 0.5f, 0.5f, 0.0f, 0.0f, -7.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 3.0f, 240, 176, 64, 996, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0 },
+    { &D_arwing_3015AF4, D_arwing_3016610, 29, 5100, 1800, 1.0f, -100.0f, 100.0f, -230.0f, 0.0f, 180.0f, 0.0f, 0.5f, 0.5f, 0.5f, 0.0f, 0.0f, -7.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 3.0f, 240, 176, 64, 996, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0 },
     { D_7010970, NULL, 38, 5100, 1800, 1.0f, -100.0f, 95.0f, -200.0f, 0.0f, 0.0f, 0.0f, 0.4f, 0.3f, 0.4f, 0.0f, 0.0f, -7.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 3.0f, 240, 176, 64, 996, 1000, 255, 0, 0, 0, 255, 255, 255, 255, 7, 0 },
-    { &D_3015AF4, D_3016610, 29, 5100, 1800, 1.0f, -100.0f, -100.0f, -230.0f, 0.0f, 180.0f, 0.0f, 0.5f, 0.5f, 0.5f, 0.0f, 0.0f, -7.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 3.0f, 240, 176, 64, 996, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0 },
+    { &D_arwing_3015AF4, D_arwing_3016610, 29, 5100, 1800, 1.0f, -100.0f, -100.0f, -230.0f, 0.0f, 180.0f, 0.0f, 0.5f, 0.5f, 0.5f, 0.0f, 0.0f, -7.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 3.0f, 240, 176, 64, 996, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0 },
     { D_7010970, NULL, 38, 5100, 1800, 1.0f, -100.0f, -105.0f, -200.0f, 0.0f, 0.0f, 0.0f, 0.4f, 0.3f, 0.4f, 0.0f, 0.0f, -7.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 3.0f, 240, 176, 64, 996, 1000, 255, 0, 0, 0, 255, 255, 255, 255, 11, 0 },
     { NULL, func_ending_8018F2A8, 29, 5100, 1800, 1.0f, 0.0f, 0.0f, -220.0f, 0.0f, 180.0f, 0.0f, 0.1f, 0.1f, 0.1f, 0.0f, 0.0f, -7.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 240, 176, 64, 996, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
     { NULL, func_ending_8018DA0C, 76, 6520, 380, 1.0f, 224.0f, 164.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 20, 0, 0, 0, 0, 0, 255, 255, 255, 255, 0, 0 },
diff --git a/src/overlays/ovl_i1/fox_co.c b/src/overlays/ovl_i1/fox_co.c
index 16ea94a2..b4adba60 100644
--- a/src/overlays/ovl_i1/fox_co.c
+++ b/src/overlays/ovl_i1/fox_co.c
@@ -575,13 +575,13 @@ void func_i1_80189058(Boss* boss) {
             gBossFrameCount = 0;
         }
         gBossFrameCount++;
-        gUnkEntities28[59].unk_00 = 1;
-        gUnkEntities28[59].unk_02 = 0x66;
-        gUnkEntities28[59].pos.x = boss->obj.pos.x;
-        gUnkEntities28[59].pos.y = boss->obj.pos.y;
-        gUnkEntities28[59].pos.z = boss->obj.pos.z;
+        gRadarMarks[59].unk_00 = 1;
+        gRadarMarks[59].unk_02 = 0x66;
+        gRadarMarks[59].pos.x = boss->obj.pos.x;
+        gRadarMarks[59].pos.y = boss->obj.pos.y;
+        gRadarMarks[59].pos.z = boss->obj.pos.z;
 
-        gUnkEntities28[59].unk_10 = boss->obj.rot.y + 180.0f;
+        gRadarMarks[59].unk_10 = boss->obj.rot.y + 180.0f;
         func_i1_80188D50(boss);
         if (D_801615D0.z > 0.0f) {
             if (D_801615D0.x > 0.0f) {
@@ -2605,26 +2605,26 @@ void func_i1_8018F880(Player* player) {
     D_80177A48[7] += fabsf(sp40);
 
     if (sp2C >= 0.0f) {
-        Texture_Scroll(&D_30184D8, 64, 32, 2);
-        Texture_Scroll(&D_30184D8, 64, 32, 2);
+        Texture_Scroll(&D_arwing_30184D8, 64, 32, 2);
+        Texture_Scroll(&D_arwing_30184D8, 64, 32, 2);
     } else {
-        Texture_Scroll(&D_30184D8, 64, 32, 3);
-        Texture_Scroll(&D_30184D8, 64, 32, 3);
+        Texture_Scroll(&D_arwing_30184D8, 64, 32, 3);
+        Texture_Scroll(&D_arwing_30184D8, 64, 32, 3);
     }
 
     for (i = 0; (i < 40 && D_80177A48[6] >= 0.2f); i++, D_80177A48[6] -= 0.2f) {
         if (sp44 >= 0) {
-            Texture_Scroll(&D_30184D8, 64, 32, 2);
+            Texture_Scroll(&D_arwing_30184D8, 64, 32, 2);
         } else {
-            Texture_Scroll(&D_30184D8, 64, 32, 3);
+            Texture_Scroll(&D_arwing_30184D8, 64, 32, 3);
         }
     }
 
     for (i = 0; (i < 40 && D_80177A48[7] >= 0.3f); i++, D_80177A48[7] -= 0.3f) {
         if (sp40 >= 0) {
-            Texture_Scroll(&D_30184D8, 64, 32, 0);
+            Texture_Scroll(&D_arwing_30184D8, 64, 32, 0);
         } else {
-            Texture_Scroll(&D_30184D8, 64, 32, 1);
+            Texture_Scroll(&D_arwing_30184D8, 64, 32, 1);
         }
     }
 
diff --git a/src/overlays/ovl_i1/fox_tr360.c b/src/overlays/ovl_i1/fox_tr360.c
index 8a0dd9af..a9a8bcf2 100644
--- a/src/overlays/ovl_i1/fox_tr360.c
+++ b/src/overlays/ovl_i1/fox_tr360.c
@@ -72,7 +72,7 @@ void func_i1_80199024(Actor* actor) {
     s32 pad[8];
     Vec3f sp54;
     f32 var_fv0;
-    UnkEntity28* ent28;
+    RadarMark* radarMark;
     f32 temp_fv0;
     f32 temp_fv1;
     f32 var_fv0_2;
@@ -143,13 +143,13 @@ void func_i1_80199024(Actor* actor) {
         actor->vel.y = 0.0f;
     }
     func_8003088C(actor);
-    ent28 = &gUnkEntities28[actor->index];
-    ent28->unk_00 = 1;
-    ent28->unk_02 = actor->unk_0E4;
-    ent28->pos.x = actor->obj.pos.x;
-    ent28->pos.y = actor->obj.pos.y;
-    ent28->pos.z = actor->obj.pos.z;
-    ent28->unk_10 = actor->unk_0F4.y + 180.0f;
+    radarMark = &gRadarMarks[actor->index];
+    radarMark->unk_00 = 1;
+    radarMark->unk_02 = actor->unk_0E4;
+    radarMark->pos.x = actor->obj.pos.x;
+    radarMark->pos.y = actor->obj.pos.y;
+    radarMark->pos.z = actor->obj.pos.z;
+    radarMark->unk_10 = actor->unk_0F4.y + 180.0f;
     if (actor->iwork[8] != 0) {
         actor->iwork[8]--;
     }
diff --git a/src/overlays/ovl_i3/fox_a6.c b/src/overlays/ovl_i3/fox_a6.c
index a2629c92..0a54714d 100644
--- a/src/overlays/ovl_i3/fox_a6.c
+++ b/src/overlays/ovl_i3/fox_a6.c
@@ -887,7 +887,7 @@ void func_i3_80187944(Boss* bossA6) {
                         bossA6->fwork[A6_FWK_1] = 90.0f;
                         bossA6->fwork[A6_FWK_2] = 2.0f;
                         AUDIO_PLAY_SFX(0x31404066, bossA6->sfxSource, 4);
-                        bossA6->info.hitbox = SEGMENTED_TO_VIRTUAL(D_6028578);
+                        bossA6->info.hitbox = SEGMENTED_TO_VIRTUAL(D_A6_6028578);
                         D_i3_801C2250[A6_BSS_7] = 0;
                     }
                 }
@@ -926,7 +926,7 @@ void func_i3_80187944(Boss* bossA6) {
                     D_i3_801C2250[A6_BSS_28] = 0;
                     bossA6->state = 4;
                     bossA6->fwork[A6_FWK_2] = 1.0f;
-                    bossA6->info.hitbox = SEGMENTED_TO_VIRTUAL(D_6028454);
+                    bossA6->info.hitbox = SEGMENTED_TO_VIRTUAL(D_A6_6028454);
                     D_i3_801C2250[A6_BSS_6] = 1;
                     Audio_KillSfxBySource(bossA6->sfxSource);
                     AUDIO_PLAY_SFX(0x31404067, bossA6->sfxSource, 4);
@@ -977,7 +977,7 @@ void func_i3_80187944(Boss* bossA6) {
                     bossA6->fwork[A6_FWK_8] = bossA6->fwork[A6_FWK_9] = 0;
                     bossA6->fwork[A6_FWK_2] = 2.0f;
                     AUDIO_PLAY_SFX(0x31404066, bossA6->sfxSource, 4);
-                    bossA6->info.hitbox = SEGMENTED_TO_VIRTUAL(D_6028578);
+                    bossA6->info.hitbox = SEGMENTED_TO_VIRTUAL(D_A6_6028578);
                     D_i3_801C2250[A6_BSS_7] = bossA6->swork[A6_SWK_37] = 0;
                     bossA6->state = 3;
                     if (D_i3_801C2250[A6_BSS_6] == 0) {
@@ -1698,14 +1698,14 @@ void func_i3_8018BCD4(Vec3f* arg0, f32 arg1, f32 arg2, Vec3f* arg3, s32 arg4, f3
                 Matrix_Mult(gGfxMatrix, gCalcMatrix, 1);
                 Matrix_SetGfxMtx(&gMasterDisp);
                 gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
-                gSPDisplayList(gMasterDisp++, D_600F1F0);
+                gSPDisplayList(gMasterDisp++, D_A6_600F1F0);
                 Matrix_MultVec3f(gCalcMatrix, &sp90, arg3);
             } else {
                 Matrix_Scale(gCalcMatrix, 2.0f, 2.0f, 2.0f, 1);
                 Matrix_Mult(gGfxMatrix, gCalcMatrix, 1);
                 Matrix_SetGfxMtx(&gMasterDisp);
                 gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
-                gSPDisplayList(gMasterDisp++, D_6015EE0);
+                gSPDisplayList(gMasterDisp++, D_A6_6015EE0);
                 if (arg6 != 12) {
                     Matrix_MultVec3f(gCalcMatrix, &sp90, arg3);
                 }
@@ -1796,7 +1796,7 @@ void func_i3_8018C54C(Boss* bossA6) {
         Matrix_SetGfxMtx(&gMasterDisp);
         gSPDisplayList(gMasterDisp++, D_101C2E0);
     } else if (D_i3_801C22F0.unk_24 != 0.0f) {
-        Animation_GetFrameData(&D_6018994, 0, spD0);
+        Animation_GetFrameData(&D_A6_6018994, 0, spD0);
         if (D_i3_801C22F0.unk_24 != 255.0f) {
             RCP_SetupDL(&gMasterDisp, 0x47);
             spAC.x = 0.0f;
@@ -1826,7 +1826,7 @@ void func_i3_8018C54C(Boss* bossA6) {
         spD0[3].z -= bossA6->fwork[A6_FWK_0];
         spD0[4].z -= bossA6->fwork[A6_FWK_0];
         spD0[5].z -= bossA6->fwork[A6_FWK_0];
-        Animation_DrawSkeleton(1, D_6018BA0, spD0, NULL, NULL, &bossA6->index, &gIdentityMatrix);
+        Animation_DrawSkeleton(1, D_A6_6018BA0, spD0, NULL, NULL, &bossA6->index, &gIdentityMatrix);
         if (bossA6->unk_3F8 >= 1.0f) {
             for (i = 0; i < 3; i++) {
                 if ((bossA6->swork[A6_SWK_33 + i] == 0) && (bossA6->state != 3) &&
@@ -1952,7 +1952,7 @@ void func_i3_8018C54C(Boss* bossA6) {
             gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, (s32) D_i3_801C22F0.unk_24);
         }
         Matrix_SetGfxMtx(&gMasterDisp);
-        gSPDisplayList(gMasterDisp++, D_601B2B0);
+        gSPDisplayList(gMasterDisp++, D_A6_601B2B0);
         Matrix_Pop(&gGfxMatrix);
         RCP_SetupDL(&gMasterDisp, 0x47);
         if (D_i3_801C22F0.unk_24 != 255.0f) {
@@ -1964,7 +1964,7 @@ void func_i3_8018C54C(Boss* bossA6) {
         }
         Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, 74.0f, 1);
         Matrix_SetGfxMtx(&gMasterDisp);
-        gSPDisplayList(gMasterDisp++, D_6011910);
+        gSPDisplayList(gMasterDisp++, D_A6_6011910);
         Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, 74.0f, 1);
     }
 }
diff --git a/src/overlays/ovl_i3/fox_aq.c b/src/overlays/ovl_i3/fox_aq.c
index aca1df18..7447ad0a 100644
--- a/src/overlays/ovl_i3/fox_aq.c
+++ b/src/overlays/ovl_i3/fox_aq.c
@@ -320,17 +320,17 @@ void func_i3_801A8E30(void) {
 }
 
 void func_i3_801A92EC(Actor* actor, f32 xUnk, f32 yUnk, f32 zUnk, s32 index, s32 mode) {
-    gUnkEntities30[index].mode = mode;
-    gUnkEntities30[index].unk_28 = 10.0f;
-    gUnkEntities30[index].unk_04.x = actor->obj.pos.x;
-    gUnkEntities30[index].unk_04.y = actor->obj.pos.y;
-    gUnkEntities30[index].unk_04.z = actor->obj.pos.z;
-    gUnkEntities30[index].unk_10.x = xUnk;
-    gUnkEntities30[index].unk_10.y = yUnk;
-    gUnkEntities30[index].unk_10.z = zUnk;
-    gUnkEntities30[index].unk_2C = gUnkEntities30[index].unk_2D = gUnkEntities30[index].unk_2E =
-        gUnkEntities30[index].unk_2F = 255;
-    gUnkEntities30[index].timer = 3;
+    gTexturedLines[index].mode = mode;
+    gTexturedLines[index].unk_28 = 10.0f;
+    gTexturedLines[index].unk_04.x = actor->obj.pos.x;
+    gTexturedLines[index].unk_04.y = actor->obj.pos.y;
+    gTexturedLines[index].unk_04.z = actor->obj.pos.z;
+    gTexturedLines[index].unk_10.x = xUnk;
+    gTexturedLines[index].unk_10.y = yUnk;
+    gTexturedLines[index].unk_10.z = zUnk;
+    gTexturedLines[index].unk_2C = gTexturedLines[index].unk_2D = gTexturedLines[index].unk_2E =
+        gTexturedLines[index].unk_2F = 255;
+    gTexturedLines[index].timer = 3;
 }
 
 void func_i3_801A9374(Actor* actor, Vec3f* pos, Vec3f* rot, f32 xVel, f32 yVel, f32 zVel, s32 state, f32 scale,
@@ -640,7 +640,7 @@ void func_i3_801AA20C(void) {
                 Matrix_Translate(gGfxMatrix, var_fs1, var_fs2, 0.0f, 1);
                 Matrix_Push(&gGfxMatrix);
                 Matrix_SetGfxMtx(&gMasterDisp);
-                gSPDisplayList(gMasterDisp++, D_3000470);
+                gSPDisplayList(gMasterDisp++, D_blue_marine_3000470);
                 Matrix_Pop(&gGfxMatrix);
             }
         } else {
@@ -648,7 +648,7 @@ void func_i3_801AA20C(void) {
             Matrix_Translate(gGfxMatrix, D_i3_801C41B8[0], D_i3_801C41B8[1], D_i3_801C41B8[2] + gPlayer[0].unk_144, 1);
             Matrix_Scale(gGfxMatrix, D_i3_801C41B8[5], D_i3_801C41B8[5], D_i3_801C41B8[5], 1);
             Matrix_SetGfxMtx(&gMasterDisp);
-            gSPDisplayList(gMasterDisp++, D_3000130);
+            gSPDisplayList(gMasterDisp++, D_blue_marine_3000130);
         }
         Matrix_Pop(&gGfxMatrix);
     }
@@ -1300,7 +1300,7 @@ void func_i3_801ACBB4(Player* player) {
     Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -40.0f, 1);
     Matrix_RotateY(gGfxMatrix, M_PI, 1);
     Matrix_SetGfxMtx(&gMasterDisp);
-    gSPDisplayList(gMasterDisp++, D_3000C70);
+    gSPDisplayList(gMasterDisp++, D_blue_marine_3000C70);
     Matrix_Push(&gGfxMatrix);
     Matrix_Translate(gGfxMatrix, 0.0f, -4.5f, 1.2f, 1);
     Matrix_RotateZ(gGfxMatrix, player->unk_178 * M_DTOR, 1);
@@ -1311,19 +1311,19 @@ void func_i3_801ACBB4(Player* player) {
     Matrix_Translate(gGfxMatrix, 0.0f, 2.0f, 40.0f, 1);
     Matrix_RotateY(gGfxMatrix, -player->unk_180 * M_DTOR, 1);
     Matrix_SetGfxMtx(&gMasterDisp);
-    gSPDisplayList(gMasterDisp++, D_3006C70);
+    gSPDisplayList(gMasterDisp++, D_blue_marine_3006C70);
     Matrix_Pop(&gGfxMatrix);
     Matrix_Push(&gGfxMatrix);
     Matrix_Translate(gGfxMatrix, -19.0f, -3.6f, 1.2f, 1);
     Matrix_RotateX(gGfxMatrix, player->unk_17C * M_DTOR, 1);
     Matrix_SetGfxMtx(&gMasterDisp);
-    gSPDisplayList(gMasterDisp++, D_3000AF0);
+    gSPDisplayList(gMasterDisp++, D_blue_marine_3000AF0);
     Matrix_Pop(&gGfxMatrix);
     Matrix_Push(&gGfxMatrix);
     Matrix_Translate(gGfxMatrix, 19.0f, -3.6f, 1.2f, 1);
     Matrix_RotateX(gGfxMatrix, player->unk_17C * M_DTOR, 1);
     Matrix_SetGfxMtx(&gMasterDisp);
-    gSPDisplayList(gMasterDisp++, D_3006AF0);
+    gSPDisplayList(gMasterDisp++, D_blue_marine_3006AF0);
     Matrix_Pop(&gGfxMatrix);
 }
 
diff --git a/src/overlays/ovl_i3/fox_so.c b/src/overlays/ovl_i3/fox_so.c
index c501dd5e..7700ff67 100644
--- a/src/overlays/ovl_i3/fox_so.c
+++ b/src/overlays/ovl_i3/fox_so.c
@@ -372,7 +372,7 @@ Vec3f D_i3_801BF8F0[4] = {
 };
 Vec3f D_i3_801BF920 = { 0.0f, 0.0f, 0.0f };
 Gfx* D_i3_801BF92C[6] = {
-    D_200B630, D_200A5A0, D_2009510, D_60084C0, D_6008D40, D_6007C40,
+    D_BG_PLANET_200B630, D_BG_PLANET_200A5A0, D_BG_PLANET_2009510, D_60084C0, D_6008D40, D_6007C40,
 };
 Gfx* D_i3_801BF944[6] = {
     D_601B790, D_601B790, D_601A700, D_6019670, D_60185E0, D_6017550,
@@ -2739,10 +2739,10 @@ void func_i3_801A71B8(Boss* bossSO) {
             Matrix_RotateX(gGfxMatrix, M_DTOR * 5.0f, 1);
             Matrix_Scale(gGfxMatrix, D_i3_801C2768[13], 1.0f, D_i3_801C2768[13], 1);
             Matrix_SetGfxMtx(&gMasterDisp);
-            gSPDisplayList(gMasterDisp++, D_20112C0);
+            gSPDisplayList(gMasterDisp++, D_BG_PLANET_20112C0);
             Matrix_Scale(gGfxMatrix, 0.6f, 1.0f, 0.6f, 1);
             Matrix_SetGfxMtx(&gMasterDisp);
-            gSPDisplayList(gMasterDisp++, D_20112C0);
+            gSPDisplayList(gMasterDisp++, D_BG_PLANET_20112C0);
             Matrix_Pop(&gGfxMatrix);
             Matrix_Push(&gGfxMatrix);
             Matrix_Translate(gGfxMatrix, bossSO->obj.pos.x, bossSO->obj.pos.y + 270.0f,
@@ -2750,10 +2750,10 @@ void func_i3_801A71B8(Boss* bossSO) {
             Matrix_RotateX(gGfxMatrix, -3.0f * M_DTOR, 1);
             Matrix_Scale(gGfxMatrix, D_i3_801C2768[13], 1.0f, D_i3_801C2768[13], 1);
             Matrix_SetGfxMtx(&gMasterDisp);
-            gSPDisplayList(gMasterDisp++, D_20112C0);
+            gSPDisplayList(gMasterDisp++, D_BG_PLANET_20112C0);
             Matrix_Scale(gGfxMatrix, 0.6f, 1.0f, 0.6f, 1);
             Matrix_SetGfxMtx(&gMasterDisp);
-            gSPDisplayList(gMasterDisp++, D_20112C0);
+            gSPDisplayList(gMasterDisp++, D_BG_PLANET_20112C0);
         }
     }
 }
diff --git a/src/overlays/ovl_i4/fox_ka.c b/src/overlays/ovl_i4/fox_ka.c
index ef20f78e..0e4f6f28 100644
--- a/src/overlays/ovl_i4/fox_ka.c
+++ b/src/overlays/ovl_i4/fox_ka.c
@@ -1148,12 +1148,12 @@ void func_i4_801946C4(Boss* boss) {
         if (boss->obj.rot.y < 0.0f) {
             boss->obj.rot.y += 360.0f;
         }
-        gUnkEntities28[64].unk_00 = 1;
-        gUnkEntities28[64].unk_02 = 101;
-        gUnkEntities28[64].pos.x = boss->obj.pos.x;
-        gUnkEntities28[64].pos.y = boss->obj.pos.y;
-        gUnkEntities28[64].pos.z = boss->obj.pos.z;
-        gUnkEntities28[64].unk_10 = boss->unk_078.y + 180.0f;
+        gRadarMarks[64].unk_00 = 1;
+        gRadarMarks[64].unk_02 = 101;
+        gRadarMarks[64].pos.x = boss->obj.pos.x;
+        gRadarMarks[64].pos.y = boss->obj.pos.y;
+        gRadarMarks[64].pos.z = boss->obj.pos.z;
+        gRadarMarks[64].unk_10 = boss->unk_078.y + 180.0f;
         if (boss->state < 6) {
             Math_SmoothStepToF(&boss->obj.pos.x, boss->vwork[0].x, 0.01f, boss->fwork[10], 0);
             Math_SmoothStepToF(&boss->obj.pos.y, boss->vwork[0].y, 0.01f, boss->fwork[10], 0);
@@ -1945,7 +1945,7 @@ void func_i4_80198AA0(Actor* actor) {
     f32 ySin;
     f32 xCos;
     f32 yCos;
-    UnkEntity28* entity;
+    RadarMark* radarMark;
     s32 pad2[9];
 
     zPos = 0.0f;
@@ -2116,13 +2116,13 @@ void func_i4_80198AA0(Actor* actor) {
                       actor->obj.rot.z);
     }
     func_8003088C(actor);
-    entity = &gUnkEntities28[actor->index];
-    entity->unk_00 = 1;
-    entity->unk_02 = actor->unk_0E4;
-    entity->pos.x = actor->obj.pos.x;
-    entity->pos.y = actor->obj.pos.y;
-    entity->pos.z = actor->obj.pos.z;
-    entity->unk_10 = actor->unk_0F4.y + 180.0f;
+    radarMark = &gRadarMarks[actor->index];
+    radarMark->unk_00 = 1;
+    radarMark->unk_02 = actor->unk_0E4;
+    radarMark->pos.x = actor->obj.pos.x;
+    radarMark->pos.y = actor->obj.pos.y;
+    radarMark->pos.z = actor->obj.pos.z;
+    radarMark->unk_10 = actor->unk_0F4.y + 180.0f;
     if (actor->iwork[8] != 0) {
         actor->iwork[8]--;
     }
diff --git a/src/overlays/ovl_i5/fox_ma.c b/src/overlays/ovl_i5/fox_ma.c
index e3aa557a..0b130336 100644
--- a/src/overlays/ovl_i5/fox_ma.c
+++ b/src/overlays/ovl_i5/fox_ma.c
@@ -3501,17 +3501,17 @@ void func_i5_801A68EC(Actor* actor) {
 }
 
 void func_i5_801A68F8(Actor* actor, s16 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7) {
-    gUnkEntities30[arg1].mode = 3;
-    gUnkEntities30[arg1].unk_04.x = arg2;
-    gUnkEntities30[arg1].unk_04.y = arg3;
-    gUnkEntities30[arg1].unk_28 = 5.0f;
-    gUnkEntities30[arg1].unk_2C = gUnkEntities30[arg1].unk_2D = gUnkEntities30[arg1].unk_2E =
-        gUnkEntities30[arg1].unk_2F = 255;
-    gUnkEntities30[arg1].timer = 3;
-    gUnkEntities30[arg1].unk_04.z = arg4;
-    gUnkEntities30[arg1].unk_10.x = arg5;
-    gUnkEntities30[arg1].unk_10.y = arg6;
-    gUnkEntities30[arg1].unk_10.z = arg7;
+    gTexturedLines[arg1].mode = 3;
+    gTexturedLines[arg1].unk_04.x = arg2;
+    gTexturedLines[arg1].unk_04.y = arg3;
+    gTexturedLines[arg1].unk_28 = 5.0f;
+    gTexturedLines[arg1].unk_2C = gTexturedLines[arg1].unk_2D = gTexturedLines[arg1].unk_2E =
+        gTexturedLines[arg1].unk_2F = 255;
+    gTexturedLines[arg1].timer = 3;
+    gTexturedLines[arg1].unk_04.z = arg4;
+    gTexturedLines[arg1].unk_10.x = arg5;
+    gTexturedLines[arg1].unk_10.y = arg6;
+    gTexturedLines[arg1].unk_10.z = arg7;
 }
 
 void func_i5_801A6984(Actor* actor) {
@@ -5107,7 +5107,7 @@ void func_i5_801AC754(Player* player) {
     player->unk_0A0 = 0.0f;
     player->unk_0F4 += player->vel.z * 5.0f;
     player->unk_0F0 = SIN_DEG(player->unk_0F4) * 0.7f;
-    Texture_Scroll(D_3002E80, 32, 32, 0);
+    Texture_Scroll(D_landmaster_3002E80, 32, 32, 0);
     if ((gCsFrameCount > 150) && ((-player->unk_138 - player->unk_144) > 200.0f)) {
         if (D_i5_801BA768 < 11.5f) {
             D_i5_801BA768 += 0.2f;
@@ -6759,11 +6759,11 @@ void func_i5_801B38E0(void) {
     s16 j;
 
     for (i = 0; i < 65; i++) {
-        gUnkEntities28[i].unk_00 = 0;
+        gRadarMarks[i].unk_00 = 0;
     }
 
     for (i = 0; i < 100; i++) {
-        gUnkEntities30[i].mode = 0;
+        gTexturedLines[i].mode = 0;
     }
 
     for (i = 0; i < 50; i++) {
diff --git a/src/overlays/ovl_i5/fox_ti.c b/src/overlays/ovl_i5/fox_ti.c
index 2ee06b7a..5d24b95d 100644
--- a/src/overlays/ovl_i5/fox_ti.c
+++ b/src/overlays/ovl_i5/fox_ti.c
@@ -90,7 +90,7 @@ void func_i5_80188FA8(Effect* effect) {
     Matrix_SetGfxMtx(&gMasterDisp);
     gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
     gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, effect->unk_44);
-    gSPDisplayList(gMasterDisp++, D_3007E70);
+    gSPDisplayList(gMasterDisp++, D_landmaster_3007E70);
 }
 
 void func_i5_80189090(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 yRot, f32 scale2) {
@@ -1786,7 +1786,7 @@ void func_i5_8018E5F8(Actor* actor) {
     Effect* temp_v0_4;
     f32 sp54;
     s32 i;
-    UnkEntity30* temp_v0_2;
+    TexturedLine* temp_v0_2;
     f32 sp48;
     f32 sp44;
     f32 sp40;
@@ -1828,7 +1828,7 @@ void func_i5_8018E5F8(Actor* actor) {
             func_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 10.0f);
             actor->iwork[2] = 1;
             if (actor->iwork[3] > 0) {
-                gUnkEntities30[actor->iwork[3] - 1].mode = 0;
+                gTexturedLines[actor->iwork[3] - 1].mode = 0;
             }
             actor->state++;
             break;
@@ -1904,7 +1904,7 @@ void func_i5_8018E5F8(Actor* actor) {
 
     if (actor->iwork[3] == 0) {
         for (i = 0; i < 100; i++) {
-            if (gUnkEntities30[i].mode == 0) {
+            if (gTexturedLines[i].mode == 0) {
                 actor->iwork[3] = i + 1;
                 break;
             }
@@ -1929,26 +1929,26 @@ void func_i5_8018E5F8(Actor* actor) {
 
     if (actor->iwork[2] == 0) {
         index = actor->iwork[3] - 1;
-        gUnkEntities30[index].mode = 0x65;
-        gUnkEntities30[index].unk_04.x = actor->obj.pos.x + actor->fwork[0];
-        gUnkEntities30[index].unk_04.y = actor->obj.pos.y + actor->fwork[1];
-        gUnkEntities30[index].unk_04.z = actor->obj.pos.z + actor->fwork[2];
-        gUnkEntities30[index].unk_2C = 0xFF;
-        gUnkEntities30[index].unk_2D = 0xFF;
-        gUnkEntities30[index].unk_2E = 0;
-        gUnkEntities30[index].unk_2F = 0xFF;
-        gUnkEntities30[index].unk_10.x = sp5C;
-        gUnkEntities30[index].unk_10.y = sp70;
-        gUnkEntities30[index].unk_10.z = sp54;
-        gUnkEntities30[index].unk_28 = 3.0f;
+        gTexturedLines[index].mode = 0x65;
+        gTexturedLines[index].unk_04.x = actor->obj.pos.x + actor->fwork[0];
+        gTexturedLines[index].unk_04.y = actor->obj.pos.y + actor->fwork[1];
+        gTexturedLines[index].unk_04.z = actor->obj.pos.z + actor->fwork[2];
+        gTexturedLines[index].unk_2C = 0xFF;
+        gTexturedLines[index].unk_2D = 0xFF;
+        gTexturedLines[index].unk_2E = 0;
+        gTexturedLines[index].unk_2F = 0xFF;
+        gTexturedLines[index].unk_10.x = sp5C;
+        gTexturedLines[index].unk_10.y = sp70;
+        gTexturedLines[index].unk_10.z = sp54;
+        gTexturedLines[index].unk_28 = 3.0f;
         if (actor->timer_0C0 == 0) {
-            gUnkEntities30[index].unk_2C = 0xFF;
-            gUnkEntities30[index].unk_2D = 0xFF;
-            gUnkEntities30[index].unk_2E = 0x40;
+            gTexturedLines[index].unk_2C = 0xFF;
+            gTexturedLines[index].unk_2D = 0xFF;
+            gTexturedLines[index].unk_2E = 0x40;
         } else {
-            gUnkEntities30[index].unk_2C = 0xFF;
-            gUnkEntities30[index].unk_2D = 0x64;
-            gUnkEntities30[index].unk_2E = 0;
+            gTexturedLines[index].unk_2C = 0xFF;
+            gTexturedLines[index].unk_2D = 0x64;
+            gTexturedLines[index].unk_2E = 0;
         }
         if (i < 0xBB9) {
             if (actor->timer_0C0 == 0) {
@@ -4131,7 +4131,7 @@ void func_i5_80193DF0(Boss* boss) {
             Animation_GetFrameData(&D_70084CC, boss->unk_04C >> 1, D_i5_801BC978);
             break;
         case 8:
-            Animation_GetFrameData(&D_7003EE8, boss->unk_04C >> 1, D_i5_801BC978);
+            Animation_GetFrameData(&D_TI2_7003EE8, boss->unk_04C >> 1, D_i5_801BC978);
             break;
         case 9:
             Animation_GetFrameData(&D_8008FE8, boss->unk_04C >> 1, D_i5_801BC978);
@@ -4310,7 +4310,7 @@ void func_i5_80193DF0(Boss* boss) {
                 boss->unk_04C = 0x3E;
             }
             if ((boss->unk_04C == 0x3E) && (boss->swork[0xC] <= 0)) {
-                boss->unk_04C = (Animation_GetFrameCount(&D_7003EE8) * 2) - 1;
+                boss->unk_04C = (Animation_GetFrameCount(&D_TI2_7003EE8) * 2) - 1;
                 D_i5_801BBEF4[12] = 0.0f;
             }
             if (boss->unk_04C == 0x62) {
@@ -4354,7 +4354,7 @@ void func_i5_80193DF0(Boss* boss) {
             Math_SmoothStepToF(&boss->fwork[0], 0.5f, 1.0f, 0.02f, 0.0f);
             Math_SmoothStepToVec3fArray(D_i5_801BC978, D_i5_801BCDC8, 1, 0x5C, boss->fwork[0], 360.0f, 0.01f);
             boss->unk_04C++;
-            if (boss->unk_04C >= (Animation_GetFrameCount(&D_7003EE8) * 2)) {
+            if (boss->unk_04C >= (Animation_GetFrameCount(&D_TI2_7003EE8) * 2)) {
                 spB8 = 1;
             }
             break;
@@ -4416,8 +4416,8 @@ void func_i5_80193DF0(Boss* boss) {
                 for (i = 0; i < 4; i++) {
                     if (D_i5_801BBEF0[i + 9] == 0) {
                         for (j = 0; j < 100; j++) {
-                            if (gUnkEntities30[j].mode == 0) {
-                                gUnkEntities30[j].mode = 1;
+                            if (gTexturedLines[j].mode == 0) {
+                                gTexturedLines[j].mode = 1;
                                 D_i5_801BBEF0[i + 9] = j + 1;
                                 break;
                             }
@@ -4429,7 +4429,7 @@ void func_i5_80193DF0(Boss* boss) {
                 for (i = 0; i < 4; i++) {
                     // stores in v instead of t
                     j = D_i5_801BBEF0[i + 9];
-                    gUnkEntities30[j - 1].mode = 0;
+                    gTexturedLines[j - 1].mode = 0;
                 }
 
                 boss->swork[32] = 0;
@@ -4954,7 +4954,7 @@ static f32 D_i5_801B8E24[4][2] = {
 };
 
 void func_i5_801982A8(Boss* boss) {
-    UnkEntity30* temp_v0_6;
+    TexturedLine* temp_v0_6;
     f32 sp120;
     f32 temp_fs0;
     f32 temp_fs1;
@@ -5079,14 +5079,14 @@ void func_i5_801982A8(Boss* boss) {
                 Matrix_Scale(gGfxMatrix, sp120, 1.0f, sp120, 1);
                 Matrix_SetGfxMtx(&gMasterDisp);
                 gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 120, 255, 220, D_i5_801BBEF0[7] * 50);
-                gSPDisplayList(gMasterDisp++, D_20112C0);
+                gSPDisplayList(gMasterDisp++, D_BG_PLANET_20112C0);
                 Matrix_Pop(&gGfxMatrix);
                 if (D_i5_801BBEF0[7] > 0) {
                     sp120 = (f32) (D_i5_801BBEF0[7] - 1) * 24.0f;
                     Matrix_Scale(gGfxMatrix, sp120, 1.0f, sp120, 1);
                     Matrix_SetGfxMtx(&gMasterDisp);
                     gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 120, 255, 220, D_i5_801BBEF0[7] * 50);
-                    gSPDisplayList(gMasterDisp++, D_20112C0);
+                    gSPDisplayList(gMasterDisp++, D_BG_PLANET_20112C0);
                 }
                 Matrix_Pop(&gGfxMatrix);
             }
@@ -5153,22 +5153,22 @@ void func_i5_801982A8(Boss* boss) {
                         spF4.y = D_i5_801B8E24[i][1] * boss->fwork[41];
                         spF4.z = boss->fwork[42];
                         Matrix_MultVec3f(gCalcMatrix, &spF4, &spE8);
-                        gUnkEntities30[temp_v1_28].unk_04.x = temp_fs0;
-                        gUnkEntities30[temp_v1_28].unk_04.y = temp_fs1;
-                        gUnkEntities30[temp_v1_28].unk_04.z = temp_fs2;
-                        gUnkEntities30[temp_v1_28].unk_10.x = temp_fs0 + spE8.x;
-                        gUnkEntities30[temp_v1_28].unk_10.y = temp_fs1 + spE8.y;
-                        gUnkEntities30[temp_v1_28].unk_10.z = temp_fs2 + spE8.z;
+                        gTexturedLines[temp_v1_28].unk_04.x = temp_fs0;
+                        gTexturedLines[temp_v1_28].unk_04.y = temp_fs1;
+                        gTexturedLines[temp_v1_28].unk_04.z = temp_fs2;
+                        gTexturedLines[temp_v1_28].unk_10.x = temp_fs0 + spE8.x;
+                        gTexturedLines[temp_v1_28].unk_10.y = temp_fs1 + spE8.y;
+                        gTexturedLines[temp_v1_28].unk_10.z = temp_fs2 + spE8.z;
                         if (boss->swork[32] == 0) {
-                            gUnkEntities30[temp_v1_28].mode = 0;
+                            gTexturedLines[temp_v1_28].mode = 0;
                         } else {
-                            gUnkEntities30[temp_v1_28].mode = 1;
+                            gTexturedLines[temp_v1_28].mode = 1;
                         }
-                        gUnkEntities30[temp_v1_28].unk_2C = 0;
-                        gUnkEntities30[temp_v1_28].unk_2E = 0;
-                        gUnkEntities30[temp_v1_28].unk_2D = 0;
-                        gUnkEntities30[temp_v1_28].unk_2F = 0;
-                        gUnkEntities30[temp_v1_28].unk_28 = 1;
+                        gTexturedLines[temp_v1_28].unk_2C = 0;
+                        gTexturedLines[temp_v1_28].unk_2E = 0;
+                        gTexturedLines[temp_v1_28].unk_2D = 0;
+                        gTexturedLines[temp_v1_28].unk_2F = 0;
+                        gTexturedLines[temp_v1_28].unk_28 = 1;
                     }
                 }
             }
diff --git a/src/overlays/ovl_i6/fox_andross.c b/src/overlays/ovl_i6/fox_andross.c
index dce679d8..0feaba66 100644
--- a/src/overlays/ovl_i6/fox_andross.c
+++ b/src/overlays/ovl_i6/fox_andross.c
@@ -525,15 +525,15 @@ void func_i6_80188CB8(Boss* boss) {
 
     for (i = 10; i < 12; i++) {
         if ((gActors[i].obj.status == OBJ_ACTIVE) && (gActors[i].obj.id == OBJ_ACTOR_197)) {
-            gUnkEntities30[i].mode = 50;
-            gUnkEntities30[i].unk_28 = 1.0f;
-            gUnkEntities30[i].unk_04.x = boss->obj.pos.x;
-            gUnkEntities30[i].unk_04.y = boss->obj.pos.y - 200.0f;
-            gUnkEntities30[i].unk_04.z = boss->obj.pos.z;
-            gUnkEntities30[i].timer = 3;
-            gUnkEntities30[i].unk_10.x = gActors[i].obj.pos.x;
-            gUnkEntities30[i].unk_10.y = gActors[i].obj.pos.y;
-            gUnkEntities30[i].unk_10.z = gActors[i].obj.pos.z;
+            gTexturedLines[i].mode = 50;
+            gTexturedLines[i].unk_28 = 1.0f;
+            gTexturedLines[i].unk_04.x = boss->obj.pos.x;
+            gTexturedLines[i].unk_04.y = boss->obj.pos.y - 200.0f;
+            gTexturedLines[i].unk_04.z = boss->obj.pos.z;
+            gTexturedLines[i].timer = 3;
+            gTexturedLines[i].unk_10.x = gActors[i].obj.pos.x;
+            gTexturedLines[i].unk_10.y = gActors[i].obj.pos.y;
+            gTexturedLines[i].unk_10.z = gActors[i].obj.pos.z;
             boss->swork[4] = 1;
         }
     }
@@ -1125,12 +1125,12 @@ void func_i6_80189B70(Boss* boss) {
     boss->vel.y = sp64.y;
     boss->vel.z = sp64.z - D_80177D08;
     if (boss->state < 20) {
-        gUnkEntities28[59].unk_00 = 1;
-        gUnkEntities28[59].unk_02 = 0x66;
-        gUnkEntities28[59].pos.x = boss->obj.pos.x;
-        gUnkEntities28[59].pos.y = boss->obj.pos.y;
-        gUnkEntities28[59].pos.z = boss->obj.pos.z;
-        gUnkEntities28[59].unk_10 = boss->unk_078.y + 180.0f;
+        gRadarMarks[59].unk_00 = 1;
+        gRadarMarks[59].unk_02 = 0x66;
+        gRadarMarks[59].pos.x = boss->obj.pos.x;
+        gRadarMarks[59].pos.y = boss->obj.pos.y;
+        gRadarMarks[59].pos.z = boss->obj.pos.z;
+        gRadarMarks[59].unk_10 = boss->unk_078.y + 180.0f;
     }
     gActors[10].info.unk_1C = 1.0f;
     gActors[11].info.unk_1C = 1.0f;
@@ -1545,7 +1545,8 @@ void func_i6_8018CAD4(Effect* effect) {
 }
 
 static Gfx* D_i6_801A6790[10] = {
-    D_C001880, D_C001880, D_C001880, D_C001880, D_C001880, D_C001880, D_C001880, D_C001880, D_3016660, D_3015D80,
+    D_C001880, D_C001880, D_C001880, D_C001880,        D_C001880,
+    D_C001880, D_C001880, D_C001880, D_arwing_3016660, D_arwing_3015D80,
 };
 
 void func_i6_8018CF98(Effect* effect) {
@@ -1554,7 +1555,7 @@ void func_i6_8018CF98(Effect* effect) {
         gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, effect->unk_44);
         Matrix_Scale(gGfxMatrix, effect->scale2, effect->scale2, effect->scale2, 1);
         Matrix_SetGfxMtx(&gMasterDisp);
-        gSPDisplayList(gMasterDisp++, D_2010A30);
+        gSPDisplayList(gMasterDisp++, D_BG_PLANET_2010A30);
     } else {
         RCP_SetupDL(&gMasterDisp, 0x1D);
         if (effect->unk_4C < 8) {
@@ -3228,15 +3229,15 @@ void func_i6_80192E94(Actor* actor) {
                     (fabsf(otherActor->obj.pos.z - actor->obj.pos.z) < 200.0f)) {
                     actor->timer_0BC = 5;
                     otherActor->timer_0BC = 5;
-                    gUnkEntities30[actor->index].mode = 50;
-                    gUnkEntities30[actor->index].unk_28 = 1.0f;
-                    gUnkEntities30[actor->index].unk_04.x = actor->obj.pos.x;
-                    gUnkEntities30[actor->index].unk_04.y = actor->obj.pos.y;
-                    gUnkEntities30[actor->index].unk_04.z = actor->obj.pos.z;
-                    gUnkEntities30[actor->index].unk_10.x = otherActor->obj.pos.x;
-                    gUnkEntities30[actor->index].unk_10.y = otherActor->obj.pos.y;
-                    gUnkEntities30[actor->index].unk_10.z = otherActor->obj.pos.z;
-                    gUnkEntities30[actor->index].timer = 3;
+                    gTexturedLines[actor->index].mode = 50;
+                    gTexturedLines[actor->index].unk_28 = 1.0f;
+                    gTexturedLines[actor->index].unk_04.x = actor->obj.pos.x;
+                    gTexturedLines[actor->index].unk_04.y = actor->obj.pos.y;
+                    gTexturedLines[actor->index].unk_04.z = actor->obj.pos.z;
+                    gTexturedLines[actor->index].unk_10.x = otherActor->obj.pos.x;
+                    gTexturedLines[actor->index].unk_10.y = otherActor->obj.pos.y;
+                    gTexturedLines[actor->index].unk_10.z = otherActor->obj.pos.z;
+                    gTexturedLines[actor->index].timer = 3;
                     break;
                 }
             }
diff --git a/src/overlays/ovl_i6/fox_i6_4.c b/src/overlays/ovl_i6/fox_i6_4.c
index 7d2ed2b0..9dc7e27f 100644
--- a/src/overlays/ovl_i6/fox_i6_4.c
+++ b/src/overlays/ovl_i6/fox_i6_4.c
@@ -96,23 +96,23 @@ void func_i6_801A58A8(Player* player) {
 
     for (i = 0; i < player->unk_1C0; i++) {
         if ((gActors[i].obj.status == OBJ_ACTIVE) && (gActors[i].obj.id == OBJ_ACTOR_200)) {
-            gUnkEntities30[i].mode = 3;
-            gUnkEntities30[i].unk_24 = 1.0f;
+            gTexturedLines[i].mode = 3;
+            gTexturedLines[i].unk_24 = 1.0f;
 
-            gUnkEntities30[i].unk_04.x = player->pos.x;
-            gUnkEntities30[i].unk_04.y = player->pos.y;
-            gUnkEntities30[i].unk_04.z = player->pos.z - 100.0f;
+            gTexturedLines[i].unk_04.x = player->pos.x;
+            gTexturedLines[i].unk_04.y = player->pos.y;
+            gTexturedLines[i].unk_04.z = player->pos.z - 100.0f;
 
-            gUnkEntities30[i].timer = 2;
+            gTexturedLines[i].timer = 2;
 
-            gUnkEntities30[i].unk_2C = 255;
-            gUnkEntities30[i].unk_2D = 255;
-            gUnkEntities30[i].unk_2E = 255;
-            gUnkEntities30[i].unk_2F = 255;
+            gTexturedLines[i].unk_2C = 255;
+            gTexturedLines[i].unk_2D = 255;
+            gTexturedLines[i].unk_2E = 255;
+            gTexturedLines[i].unk_2F = 255;
 
-            gUnkEntities30[i].unk_10.x = gActors[i].obj.pos.x;
-            gUnkEntities30[i].unk_10.y = gActors[i].obj.pos.y;
-            gUnkEntities30[i].unk_10.z = gActors[i].obj.pos.z;
+            gTexturedLines[i].unk_10.x = gActors[i].obj.pos.x;
+            gTexturedLines[i].unk_10.y = gActors[i].obj.pos.y;
+            gTexturedLines[i].unk_10.z = gActors[i].obj.pos.z;
         }
     }
     if (gControllerHold[player->num].button & 0x10) {
diff --git a/src/overlays/ovl_i6/fox_sy.c b/src/overlays/ovl_i6/fox_sy.c
index 76c896c2..0ae5ef45 100644
--- a/src/overlays/ovl_i6/fox_sy.c
+++ b/src/overlays/ovl_i6/fox_sy.c
@@ -1320,7 +1320,7 @@ void func_i6_8019C888(Boss* boss) {
     f32 sp1D8;
     f32 sp1D4;
     s32 sp1D0;
-    UnkEntity28* unkEntity28;
+    RadarMark* radarMark;
     Vec3f sp64[30];
     Vec3f sp58;
     Vec3f sp4C;
@@ -1550,21 +1550,21 @@ void func_i6_8019C888(Boss* boss) {
         }
 
         if (boss->index == 0) {
-            unkEntity28 = &gUnkEntities28[boss->index + 1];
-            unkEntity28->unk_00 = 1;
-            unkEntity28->unk_02 = 102;
-            unkEntity28->pos.x = boss->obj.pos.x;
-            unkEntity28->pos.y = boss->obj.pos.y;
-            unkEntity28->pos.z = boss->obj.pos.z;
-            unkEntity28->unk_10 = boss->unk_078.y + 180.0f;
+            radarMark = &gRadarMarks[boss->index + 1];
+            radarMark->unk_00 = 1;
+            radarMark->unk_02 = 102;
+            radarMark->pos.x = boss->obj.pos.x;
+            radarMark->pos.y = boss->obj.pos.y;
+            radarMark->pos.z = boss->obj.pos.z;
+            radarMark->unk_10 = boss->unk_078.y + 180.0f;
         } else {
-            unkEntity28 = &gUnkEntities28[boss->index + 4];
-            unkEntity28->unk_00 = 1;
-            unkEntity28->unk_02 = 10;
-            unkEntity28->pos.x = boss->obj.pos.x;
-            unkEntity28->pos.y = boss->obj.pos.y;
-            unkEntity28->pos.z = boss->obj.pos.z;
-            unkEntity28->unk_10 = boss->unk_078.y + 180.0f;
+            radarMark = &gRadarMarks[boss->index + 4];
+            radarMark->unk_00 = 1;
+            radarMark->unk_02 = 10;
+            radarMark->pos.x = boss->obj.pos.x;
+            radarMark->pos.y = boss->obj.pos.y;
+            radarMark->pos.z = boss->obj.pos.z;
+            radarMark->unk_10 = boss->unk_078.y + 180.0f;
         }
 
         if (gBossFrameCount == 250) {
diff --git a/src/overlays/ovl_menu/fox_map.c b/src/overlays/ovl_menu/fox_map.c
index 49f53f4c..59898f11 100644
--- a/src/overlays/ovl_menu/fox_map.c
+++ b/src/overlays/ovl_menu/fox_map.c
@@ -1614,7 +1614,7 @@ void func_menu_8019F600(void) {
     D_menu_801CD970 = 0;
     for (i = 0; i < 24; i++) {
         D_80177BD8[i] = 0;
-        gUnkEntities30[i].unk_24 = 0.0f;
+        gTexturedLines[i].unk_24 = 0.0f;
     }
 
     for (i = 0; i < 7; i++) {
@@ -1664,7 +1664,7 @@ void func_menu_8019F83C(void) {
         }
 
         sPaths[i].alpha = 0;
-        gUnkEntities30[i].unk_24 = 0.0f;
+        gTexturedLines[i].unk_24 = 0.0f;
     }
 }
 
@@ -6126,9 +6126,9 @@ void func_menu_801AC200(s32 index) {
     f32 r2;
     Vec3f vec;
 
-    v.x = gUnkEntities30[index].unk_10.x - gUnkEntities30[index].unk_04.x;
-    v.y = gUnkEntities30[index].unk_10.y - gUnkEntities30[index].unk_04.y;
-    v.z = gUnkEntities30[index].unk_10.z - gUnkEntities30[index].unk_04.z;
+    v.x = gTexturedLines[index].unk_10.x - gTexturedLines[index].unk_04.x;
+    v.y = gTexturedLines[index].unk_10.y - gTexturedLines[index].unk_04.y;
+    v.z = gTexturedLines[index].unk_10.z - gTexturedLines[index].unk_04.z;
 
     r = VEC3F_MAG(&v);
 
@@ -6141,9 +6141,9 @@ void func_menu_801AC200(s32 index) {
         vec.y = (v.y / r) * (r / (sPaths[index].length - 1));
         vec.z = (v.z / r) * (r / (sPaths[index].length - 1));
 
-        D_menu_801CEEB0.x = gUnkEntities30[index].unk_04.x + (vec.x * D_menu_801CEEA0);
-        D_menu_801CEEB0.y = gUnkEntities30[index].unk_04.y + (vec.y * D_menu_801CEEA0);
-        D_menu_801CEEB0.z = gUnkEntities30[index].unk_04.z + (vec.z * D_menu_801CEEA0);
+        D_menu_801CEEB0.x = gTexturedLines[index].unk_04.x + (vec.x * D_menu_801CEEA0);
+        D_menu_801CEEB0.y = gTexturedLines[index].unk_04.y + (vec.y * D_menu_801CEEA0);
+        D_menu_801CEEB0.z = gTexturedLines[index].unk_04.z + (vec.z * D_menu_801CEEA0);
 
         switch (D_menu_801CEEA4) {
             case 0:
@@ -6180,17 +6180,17 @@ void func_menu_801AC200(s32 index) {
             return;
         }
     } else {
-        vec.x = (v.x / r) * gUnkEntities30[index].unk_24;
-        vec.y = (v.y / r) * gUnkEntities30[index].unk_24;
-        vec.z = (v.z / r) * gUnkEntities30[index].unk_24;
+        vec.x = (v.x / r) * gTexturedLines[index].unk_24;
+        vec.y = (v.y / r) * gTexturedLines[index].unk_24;
+        vec.z = (v.z / r) * gTexturedLines[index].unk_24;
 
-        D_menu_801CEEB0.x = gUnkEntities30[index].unk_04.x + vec.x;
-        D_menu_801CEEB0.y = gUnkEntities30[index].unk_04.y + vec.y;
-        D_menu_801CEEB0.z = gUnkEntities30[index].unk_04.z + vec.z;
+        D_menu_801CEEB0.x = gTexturedLines[index].unk_04.x + vec.x;
+        D_menu_801CEEB0.y = gTexturedLines[index].unk_04.y + vec.y;
+        D_menu_801CEEB0.z = gTexturedLines[index].unk_04.z + vec.z;
 
-        v.x = D_menu_801CEEB0.x - gUnkEntities30[index].unk_04.x;
-        v.y = D_menu_801CEEB0.y - gUnkEntities30[index].unk_04.y;
-        v.z = D_menu_801CEEB0.z - gUnkEntities30[index].unk_04.z;
+        v.x = D_menu_801CEEB0.x - gTexturedLines[index].unk_04.x;
+        v.y = D_menu_801CEEB0.y - gTexturedLines[index].unk_04.y;
+        v.z = D_menu_801CEEB0.z - gTexturedLines[index].unk_04.z;
         r2 = VEC3F_MAG(&v);
 
         if (((r / 9.0f) * 8.0f) < r2) {
@@ -6235,9 +6235,9 @@ void func_menu_801AC530(s32 index) {
 
     Matrix_Translate(gGfxMatrix, D_menu_801CEEB0.x, D_menu_801CEEB0.y, D_menu_801CEEB0.z, 1);
 
-    Matrix_RotateY(gGfxMatrix, gUnkEntities30[index].unk_20, 1);
+    Matrix_RotateY(gGfxMatrix, gTexturedLines[index].unk_20, 1);
     Matrix_RotateX(gGfxMatrix, M_DTOR * -90.0f, 1);
-    Matrix_RotateX(gGfxMatrix, gUnkEntities30[index].unk_1C, 1);
+    Matrix_RotateX(gGfxMatrix, gTexturedLines[index].unk_1C, 1);
 
     Matrix_Scale(gGfxMatrix, 0.8f, 0.8f, 0.8f, 1);
 
@@ -6357,18 +6357,18 @@ void func_menu_801AC9A0(s32 index) {
 
     target = sqrtf(SQ(x) + SQ(y) + SQ(z));
 
-    gUnkEntities30[index].mode = 4;
+    gTexturedLines[index].mode = 4;
 
-    gUnkEntities30[index].unk_04.x = srcPos.x;
-    gUnkEntities30[index].unk_04.y = srcPos.y;
-    gUnkEntities30[index].unk_04.z = srcPos.z;
+    gTexturedLines[index].unk_04.x = srcPos.x;
+    gTexturedLines[index].unk_04.y = srcPos.y;
+    gTexturedLines[index].unk_04.z = srcPos.z;
 
-    gUnkEntities30[index].unk_10.x = destPos.x;
-    gUnkEntities30[index].unk_10.y = destPos.y;
-    gUnkEntities30[index].unk_10.z = destPos.z;
+    gTexturedLines[index].unk_10.x = destPos.x;
+    gTexturedLines[index].unk_10.y = destPos.y;
+    gTexturedLines[index].unk_10.z = destPos.z;
 
-    gUnkEntities30[index].unk_20 = Math_Atan2F(x, z);
-    gUnkEntities30[index].unk_1C = -Math_Atan2F(y, sqrtf(SQ(x) + SQ(z)));
+    gTexturedLines[index].unk_20 = Math_Atan2F(x, z);
+    gTexturedLines[index].unk_1C = -Math_Atan2F(y, sqrtf(SQ(x) + SQ(z)));
 
     switch (D_80177BD8[index]) {
         case 1:
@@ -6377,9 +6377,9 @@ void func_menu_801AC9A0(s32 index) {
             break;
 
         case 11:
-            Math_SmoothStepToF(&gUnkEntities30[index].unk_24, target, 0.1f, 100.0f, 4.0f);
-            gUnkEntities30[index].unk_2F = 255;
-            if (gUnkEntities30[index].unk_24 == target) {
+            Math_SmoothStepToF(&gTexturedLines[index].unk_24, target, 0.1f, 100.0f, 4.0f);
+            gTexturedLines[index].unk_2F = 255;
+            if (gTexturedLines[index].unk_24 == target) {
                 Audio_KillSfxById(0x1900404DU);
                 D_80177BD8[index] = 4;
             }
@@ -6387,9 +6387,9 @@ void func_menu_801AC9A0(s32 index) {
 
         case 5:
         case 6:
-            Math_SmoothStepToF(&gUnkEntities30[index].unk_24, target, 0.1f, 100.0f, 1.0f);
-            if (gUnkEntities30[index].unk_24 == target) {
-                gUnkEntities30[index].unk_24 = 0.0f;
+            Math_SmoothStepToF(&gTexturedLines[index].unk_24, target, 0.1f, 100.0f, 1.0f);
+            if (gTexturedLines[index].unk_24 == target) {
+                gTexturedLines[index].unk_24 = 0.0f;
                 D_80177BD8[index] = 6;
                 D_menu_801CEEAC = 255;
             }
@@ -6400,55 +6400,55 @@ void func_menu_801AC9A0(s32 index) {
             if (D_menu_801CD944 == 7) {
                 temp = 0.25f;
             }
-            Math_SmoothStepToF(&gUnkEntities30[index].unk_24, target, temp, 100.0f, 4.0f);
-            gUnkEntities30[index].unk_2F = 255;
-            if (gUnkEntities30[index].unk_24 == target) {
+            Math_SmoothStepToF(&gTexturedLines[index].unk_24, target, temp, 100.0f, 4.0f);
+            gTexturedLines[index].unk_2F = 255;
+            if (gTexturedLines[index].unk_24 == target) {
                 D_80177BD8[index] = 3;
             }
             break;
 
         case 3:
         case 4:
-            gUnkEntities30[index].unk_24 = target;
-            gUnkEntities30[index].unk_2F = sPaths[index].alpha;
+            gTexturedLines[index].unk_24 = target;
+            gTexturedLines[index].unk_2F = sPaths[index].alpha;
             break;
     }
 
     if ((D_80177BD8[index] == 1) || (D_80177BD8[index] == 11) || (D_80177BD8[index] == 4)) {
-        gUnkEntities30[index].unk_2C = 32;
-        gUnkEntities30[index].unk_2D = 32;
-        gUnkEntities30[index].unk_2E = 32;
-        gUnkEntities30[index].unk_28 = 4.0f;
+        gTexturedLines[index].unk_2C = 32;
+        gTexturedLines[index].unk_2D = 32;
+        gTexturedLines[index].unk_2E = 32;
+        gTexturedLines[index].unk_28 = 4.0f;
     } else {
         switch (sPaths[index].type) {
             case PL_PATH_BLU:
-                gUnkEntities30[index].unk_2C = 16;
-                gUnkEntities30[index].unk_2D = 64;
-                gUnkEntities30[index].unk_2E = 255;
-                gUnkEntities30[index].unk_28 = 8.0f;
+                gTexturedLines[index].unk_2C = 16;
+                gTexturedLines[index].unk_2D = 64;
+                gTexturedLines[index].unk_2E = 255;
+                gTexturedLines[index].unk_28 = 8.0f;
                 break;
 
             case PL_PATH_YLW:
-                gUnkEntities30[index].unk_2C = 255;
-                gUnkEntities30[index].unk_2D = 175;
-                gUnkEntities30[index].unk_2E = 0;
-                gUnkEntities30[index].unk_28 = 8.0f;
+                gTexturedLines[index].unk_2C = 255;
+                gTexturedLines[index].unk_2D = 175;
+                gTexturedLines[index].unk_2E = 0;
+                gTexturedLines[index].unk_28 = 8.0f;
                 break;
 
             case PL_PATH_RED:
-                gUnkEntities30[index].unk_2C = 255;
-                gUnkEntities30[index].unk_2D = 0;
-                gUnkEntities30[index].unk_2E = 0;
-                gUnkEntities30[index].unk_28 = 8.0f;
+                gTexturedLines[index].unk_2C = 255;
+                gTexturedLines[index].unk_2D = 0;
+                gTexturedLines[index].unk_2E = 0;
+                gTexturedLines[index].unk_28 = 8.0f;
                 break;
 
             case PL_WARP_YLW:
             case PL_WARP_RED:
-                gUnkEntities30[index].unk_2C = 0;
-                gUnkEntities30[index].unk_2D = 0;
-                gUnkEntities30[index].unk_2E = 0;
-                gUnkEntities30[index].unk_2F = 0;
-                gUnkEntities30[index].unk_28 = 0.1f;
+                gTexturedLines[index].unk_2C = 0;
+                gTexturedLines[index].unk_2D = 0;
+                gTexturedLines[index].unk_2E = 0;
+                gTexturedLines[index].unk_2F = 0;
+                gTexturedLines[index].unk_28 = 0.1f;
                 break;
         }
     }
diff --git a/src/overlays/ovl_menu/fox_option.c b/src/overlays/ovl_menu/fox_option.c
index a0a5b3a3..4b98badd 100644
--- a/src/overlays/ovl_menu/fox_option.c
+++ b/src/overlays/ovl_menu/fox_option.c
@@ -239,7 +239,7 @@ static OptionEntry sOptionVSCardList[] = {
         1,
     },
 };
-static u8 D_menu_801AE998[] = { 0, 3, 1 };
+static u8 D_menu_801AE998[] = { SOUNDMODE_STEREO, SOUNDMODE_MONO, SOUNDMODE_HEADSET };
 
 static u8 D_menu_801AE99C[] = { 0, 1, 2 };
 
@@ -1301,7 +1301,7 @@ void Option_SoundInit(void) {
     D_menu_801B91A0 = 0;
 
     gSoundMode = gSaveFile.save.data.soundMode;
-    Audio_QueueSeqCmd(D_menu_801AE998[gSoundMode] | 0xE0000000);
+    SEQCMD_SET_SOUND_MODE(D_menu_801AE998[gSoundMode]);
 
     gVolumeSettings[0] = gSaveFile.save.data.musicVolume;
     gVolumeSettings[1] = gSaveFile.save.data.voiceVolume;
@@ -1403,11 +1403,11 @@ void func_menu_80194AEC(void) {
     if (func_menu_8019C418(&sp3C, 2, 0, 0, 20, 5, 4, gMainController, &D_menu_801B9260)) {
         AUDIO_PLAY_SFX(0x49000002, gDefaultSfxSource, 4);
         gSoundMode = sp3C;
-        if (gSoundMode >= 3) {
-            gSoundMode = 0;
+        if (gSoundMode >= OPTIONSOUND_MAX) {
+            gSoundMode = OPTIONSOUND_STEREO;
         }
         gSaveFile.save.data.soundMode = gSoundMode;
-        Audio_QueueSeqCmd(D_menu_801AE998[gSoundMode] | 0xE0000000);
+        SEQCMD_SET_SOUND_MODE(D_menu_801AE998[gSoundMode]);
     }
 }
 
@@ -1499,15 +1499,15 @@ void Option_SoundDraw(void) {
     gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
 
     switch (gSoundMode) {
-        case 0:
+        case OPTIONSOUND_STEREO:
             TextureRect_8bIA(&gMasterDisp, D_800CD90, 56, 13, D_menu_801AEFA8[8], D_menu_801AEFD4[8], 1.0f, 1.0f);
             break;
 
-        case 1:
+        case OPTIONSOUND_MONO:
             TextureRect_8bIA(&gMasterDisp, D_80076E0, 56, 14, D_menu_801AEFA8[9], D_menu_801AEFD4[9], 1.0f, 1.0f);
             break;
 
-        case 2:
+        case OPTIONSOUND_HEADSET:
             TextureRect_8bIA(&gMasterDisp, D_8007210, 88, 14, D_menu_801AEFA8[10], D_menu_801AEFD4[10], 1.0f, 1.0f);
             break;
     }
diff --git a/tools/Torch b/tools/Torch
index 02f2c2f0..8465919a 160000
--- a/tools/Torch
+++ b/tools/Torch
@@ -1 +1 @@
-Subproject commit 02f2c2f03c5fb386258e62c377a0fcd686b57690
+Subproject commit 8465919ab7aba6cfde7d25ad1731673e5da01642
diff --git a/yamls/us/assets.yaml b/yamls/us/assets.yaml
index 5110a8b7..41644ebb 100644
--- a/yamls/us/assets.yaml
+++ b/yamls/us/assets.yaml
@@ -62,8 +62,12 @@
 
   - name: ast_vs_player
     exclusive_ram_id: segment_03
-    type: bin
+    type: code
+    dir: assets
     start: 0x8E92D0
+    vram: 0x03000000
+    subsegments:
+      - [0x8E92D0, .data, ast_vs_player/ast_vs_player]
 
   - name: ast_enmy_planet
     exclusive_ram_id: segment_04
@@ -167,9 +171,13 @@
 
   - name: ast_area_6
     exclusive_ram_id: segment_06
-    type: bin
+    type: code
+    dir: assets
     start: 0xA8B470
-
+    vram: 0x06000000
+    subsegments:
+     - [0xA8B470, .data, ast_area_6/ast_area_6]
+     
   - name: ast_venom_1
     exclusive_ram_id: segment_06
     type: bin