diff --git a/splat.yaml b/splat.yaml
index 58ce03c..aa77389 100644
--- a/splat.yaml
+++ b/splat.yaml
@@ -419,13 +419,13 @@ segments:
 
       - { start: 0x66E10, type: bss, vram: 0x80190F10 }
       
-  # __SOME_OVERLAY_TABLE
+  # __SOME_OVERLAY_TABLE[0]
   - type: code
-    dir: overlays/overlay_table_0
+    dir: overlay_66E10
     start: 0x66E10
     vram: 0x80197B70
     bss_size: 0x10
-    symbol_name_format: ovl00_$VRAM_$ROM
+    symbol_name_format: overlay_66E10_$VRAM_$ROM
     exclusive_ram_id: test_overlapping
     subsegments:
       - [0x66E10, asm]
@@ -439,13 +439,13 @@ segments:
 
       - { start: 0x69900, type: bss, vram: 0x8019A660 }
 
-  # __SOME_OVERLAY_TABLE_17
+  # __SOME_OVERLAY_TABLE[17]
   - type: code
-    dir: overlays/overlay_table_17
+    dir: overlay_69900
     start: 0x69900
     vram: 0x80197B70
     bss_size: 0x60
-    symbol_name_format: ovl17_$VRAM_$ROM
+    symbol_name_format: overlay_69900_$VRAM_$ROM
     exclusive_ram_id: test_overlapping
     subsegments:
       - [0x69900, asm]
@@ -460,13 +460,13 @@ segments:
 
       - { start: 0x6E660, type: bss, vram: 0x8019C8D0 }
 
-  # __SOME_OVERLAY_TABLE_1
+  # __SOME_OVERLAY_TABLE[1]
   - type: code
-    dir: overlays/overlay_table_1
+    dir: overlay_6E660
     start: 0x6E660
     vram: 0x80197B70
     bss_size: 0x10
-    symbol_name_format: ovl01_$VRAM_$ROM
+    symbol_name_format: overlay_6E660_$VRAM_$ROM
     exclusive_ram_id: test_overlapping
     subsegments:
       - [0x6E660, asm]
@@ -474,11 +474,11 @@ segments:
       - { start: 0x71280, type: bss, vram: 0x8019A790 }
 
   - type: code
-    dir: overlays/overlay3
+    dir: overlay_71280
     start: 0x71280
     vram: 0x8019A7A0
     bss_size: 0x40
-    symbol_name_format: overlay3_$VRAM_$ROM
+    symbol_name_format: overlay_71280_$VRAM_$ROM
     exclusive_ram_id: test_overlapping
     subsegments:
       - [0x71280, asm]
@@ -493,11 +493,11 @@ segments:
       - { start: 0x79730, type: bss, vram: 0x8019A790 }
 
   - type: code
-    dir: overlays/overlay5
+    dir: overlay_79730
     start: 0x79730
     vram: 0x8019A7A0
     bss_size: 0x0
-    symbol_name_format: overlay5_$VRAM_$ROM
+    symbol_name_format: overlay_79730_$VRAM_$ROM
     exclusive_ram_id: test_overlapping
     subsegments:
       - [0x79730, asm]
@@ -513,16 +513,12 @@ segments:
       - [0x869F0, rodata]
       - [0x86A70, rodata]
 
-      # - { start: 0x87200, type: bss, vram: 0x801A8270 }
-
-  - [0x87200, bin]
-
   - type: code
-    dir: overlays/overlay6
+    dir: overlay_87200
     start: 0x87200
     vram: 0x8019A7A0
     bss_size: 0x0
-    symbol_name_format: overlay6_$VRAM_$ROM
+    symbol_name_format: overlay_87200_$VRAM_$ROM
     exclusive_ram_id: test_overlapping
     subsegments:
       - [0x87200, asm]
@@ -561,17 +557,15 @@ segments:
       - [0xDCF90, rodata]
       - [0xDCFC0, rodata]
 
-      # - { start: 0xDDF60, type: bss, vram: 0x801F1500 }
-
   - [0xDDF60, bin]
 
-  # __SOME_OVERLAY_TABLE_2
+  # __SOME_OVERLAY_TABLE[2]
   - type: code
-    dir: overlays/overlay_table_2
+    dir: overlay_E48F0
     start: 0xE48F0
     vram: 0x80197B70
     bss_size: 0x20
-    symbol_name_format: ovl02_$VRAM_$ROM
+    symbol_name_format: overlay_E48F0_$VRAM_$ROM
     exclusive_ram_id: test_overlapping
     subsegments:
       - [0xE48F0, asm]      
@@ -585,16 +579,15 @@ segments:
 
   # __SOME_OVERLAY_TABLE_3
   - type: code
-    dir: overlays/overlay_table_3
+    dir: overlay_EBBB0
     start: 0xEBBB0
     vram: 0x8019EE50
     bss_size: 0x310
-    symbol_name_format: ovl03_$VRAM_$ROM
+    symbol_name_format: overlay_EBBB0_$VRAM_$ROM
     exclusive_ram_id: test_overlapping
     subsegments:
       - [0xEBBB0, asm]
-      - [0xED530, asm]
-      
+      - [0xED530, asm]      
       - [0xF6340, asm]
 
       - [0xF8550, rodata]
@@ -611,38 +604,35 @@ segments:
 
       - { start: 0xF9FF0, type: bss, vram: 0x801AD290 }
 
-  # __SOME_OVERLAY_TABLE_4
+  # __SOME_OVERLAY_TABLE[4]
   - type: code
-    dir: overlays/overlay_table_4
+    dir: overlay_F9FF0
     start: 0xF9FF0
     vram: 0x8019EE50
     bss_size: 0x0
-    symbol_name_format: ovl04_$VRAM_$ROM
+    symbol_name_format: overlay_F9FF0_$VRAM_$ROM
     exclusive_ram_id: test_overlapping
     subsegments:
       - [0xF9FF0, asm]
 
-      # - [0xFA5D0, rodata]
-      # - { start: 0xFA5D0, type: bss, vram: 0x8019F430 }
-
-  # __SOME_OVERLAY_TABLE_5
+  # __SOME_OVERLAY_TABLE[5]
   - type: code
-    dir: overlays/overlay_table_5
+    dir: overlay_FA5D0
     start: 0xFA5D0
     vram: 0x8019EE50
     bss_size: 0x0
-    symbol_name_format: ovl05_$VRAM_$ROM
+    symbol_name_format: overlay_FA5D0_$VRAM_$ROM
     exclusive_ram_id: test_overlapping
     subsegments:
       - [0xFA5D0, asm]
 
-  # __SOME_OVERLAY_TABLE_6
+  # __SOME_OVERLAY_TABLE[6]
   - type: code
-    dir: overlays/overlay_table_6
+    dir: overlay_FA5E0
     start: 0xFA5E0
     vram: 0x801AD5A0
     bss_size: 0xA0
-    symbol_name_format: ovl06_$VRAM_$ROM
+    symbol_name_format: overlay_FA5E0_$VRAM_$ROM
     exclusive_ram_id: test_overlapping
     subsegments:
       - [0xFA5E0, asm]
@@ -656,13 +646,13 @@ segments:
 
       - { start: 0x101CE0, type: bss, vram: 0x801B4CA0 }
 
-  # __SOME_OVERLAY_TABLE_7
+  # __SOME_OVERLAY_TABLE[7]
   - type: code
-    dir: overlays/overlay_table_7
+    dir: overlay_101CE0
     start: 0x101CE0
     vram: 0x801AD5A0
     bss_size: 0x3560
-    symbol_name_format: ovl07_$VRAM_$ROM
+    symbol_name_format: overlay_101CE0_$VRAM_$ROM
     exclusive_ram_id: test_overlapping
     subsegments:
       - [0x101CE0, asm]
@@ -731,13 +721,13 @@ segments:
 
       - { start: 0x145210, type: bss, vram: 0x801F0AD0 }
 
-  # __SOME_OVERLAY_TABLE_8
+  # __SOME_OVERLAY_TABLE[8]
   - type: code
-    dir: overlays/overlay_table_8
+    dir: overlay_145210
     start: 0x145210
     vram: 0x801F4030
     bss_size: 0x70
-    symbol_name_format: ovl08_$VRAM_$ROM
+    symbol_name_format: overlay_145210_$VRAM_$ROM
     exclusive_ram_id: test_overlapping
     subsegments:
       - [0x145210, asm]
@@ -758,13 +748,13 @@ segments:
 
       - { start: 0x14EBE0, type: bss, vram: 0x801FDA00 }
 
-  # __SOME_OVERLAY_TABLE_9
+  # __SOME_OVERLAY_TABLE[9]
   - type: code
-    dir: overlays/overlay_table_9
+    dir: overlay_14EBE0
     start: 0x14EBE0
     vram: 0x801FDA70
     bss_size: 0x130
-    symbol_name_format: ovl09_$VRAM_$ROM
+    symbol_name_format: overlay_14EBE0_$VRAM_$ROM
     exclusive_ram_id: test_overlapping
     subsegments:
       - [0x14EBE0, asm]      
@@ -792,11 +782,11 @@ segments:
       - { start: 0x165FC0, type: bss, vram: 0x80214E50 }
 
   - type: code
-    dir: overlays/overlay4
+    dir: overlay_165FC0
     start: 0x165FC0
     vram: 0x80214F80
     bss_size: 0xD0
-    symbol_name_format: overlay4_$VRAM_$ROM
+    symbol_name_format: overlay_165FC0_$VRAM_$ROM
     exclusive_ram_id: test_overlapping
     subsegments:
       - [0x165FC0, bin]
@@ -815,15 +805,32 @@ segments:
 
       - { start: 0x171EA0, type: bss, vram: 0x80220E60 }
 
-  - [0x171EA0, bin]
-
-  # __SOME_OVERLAY_TABLE_18
   - type: code
-    dir: overlays/overlay_table_18
+    dir: overlay_171EA0
+    start: 0x171EA0
+    vram: 0x80214F80
+    bss_size: 0x40
+    symbol_name_format: overlay_171EA0_$VRAM_$ROM
+    exclusive_ram_id: test_overlapping
+    subsegments:
+      - [0x171EA0, bin]      
+      # - [0x173D50, asm]
+
+      # - [0x175F30, bin]      
+      # - [0x177650, rodata]
+      # - [0x177990, rodata]
+
+      - { start: 0x177ED0, type: bss, vram: 0x8021AFB0 }
+
+  - [0x177ED0, bin]
+
+  # __SOME_OVERLAY_TABLE[18]
+  - type: code
+    dir: overlay_1BA050
     start: 0x1BA050
     vram: 0x80220F40
     bss_size: 0x650
-    symbol_name_format: ovl18_$VRAM_$ROM
+    symbol_name_format: overlay_1BA050_$VRAM_$ROM
     exclusive_ram_id: test_overlapping
     subsegments:
       - [0x1BA050, asm]
@@ -841,13 +848,13 @@ segments:
 
   - [0x1C3300, bin]
 
-  # __SOME_OVERLAY_TABLE_15
+  # __SOME_OVERLAY_TABLE[15]
   - type: code
-    dir: overlays/overlay_table_15
+    dir: overlay_1CE070
     start: 0x1CE070
     vram: 0x80197B70
     bss_size: 0x1E0
-    symbol_name_format: ovl15_$VRAM_$ROM
+    symbol_name_format: overlay_1CE070_$VRAM_$ROM
     exclusive_ram_id: test_overlapping
     subsegments:
       - [0x1CE070, asm]
@@ -892,13 +899,13 @@ segments:
 
       - { start: 0x1F0A30, type: bss, vram: 0x801BA530 }
 
-  # __SOME_OVERLAY_TABLE_10
+  # __SOME_OVERLAY_TABLE[10]
   - type: code
-    dir: overlays/overlay_table_10
+    dir: overlay_1F0A30
     start: 0x1F0A30
     vram: 0x801AD5A0
     bss_size: 0x130
-    symbol_name_format: ovl10_$VRAM_$ROM
+    symbol_name_format: overlay_1F0A30_$VRAM_$ROM
     exclusive_ram_id: test_overlapping
     subsegments:
       - [0x1F0A30, asm]
@@ -935,11 +942,11 @@ segments:
       - { start: 0x213B10, type: bss, vram: 0x801D0680 }
 
   - type: code
-    dir: overlays/overlay7
+    dir: overlay_213B10
     start: 0x213B10
     vram: 0x801D0840
     bss_size: 0x0
-    symbol_name_format: overlay7_$VRAM_$ROM
+    symbol_name_format: overlay_213B10_$VRAM_$ROM
     exclusive_ram_id: test_overlapping
     subsegments:
       - [0x213B10, asm]
@@ -962,14 +969,12 @@ segments:
       - [0x2298D0, rodata]
       - [0x229DB0, rodata]
 
-      # - { start: 0x22A280, type: bss, vram: 0x801E6FB0 }
-
   - type: code
-    dir: overlays/overlay8
+    dir: overlay_22A280
     start: 0x22A280
     vram: 0x801E6FB0
     bss_size: 0x0
-    symbol_name_format: overlay8_$VRAM_$ROM
+    symbol_name_format: overlay_22A280_$VRAM_$ROM
     exclusive_ram_id: test_overlapping
     subsegments:
       - [0x22A280, asm]
@@ -980,19 +985,17 @@ segments:
       - [0x239CA0, rodata]
       - [0x239F50, rodata]
 
-      # - { start: 0x23A3A0, type: bss, vram: 0x801F70D0 }
-
   - [0x23A3A0, bin]
 
   - [0x2447A0, bin]
 
-  # __SOME_OVERLAY_TABLE_11
+  # __SOME_OVERLAY_TABLE[11]
   - type: code
-    dir: overlays/overlay_table_11
+    dir: overlay_24BCA0
     start: 0x24BCA0
     vram: 0x801F70E0
     bss_size: 0x10
-    symbol_name_format: ovl11_$VRAM_$ROM
+    symbol_name_format: overlay_24BCA0_$VRAM_$ROM
     exclusive_ram_id: test_overlapping
     subsegments:
       - [0x24BCA0, asm]
@@ -1017,15 +1020,13 @@ segments:
 
       - { start: 0x25EE90, type: bss, vram: 0x8020A2D0 }
   
-  - [0x25EE90, bin]
-
-  # __SOME_OVERLAY_TABLE_12
+  # __SOME_OVERLAY_TABLE[12]
   - type: code
-    dir: overlays/overlay_table_12
+    dir: overlay_25EE90
     start: 0x25EE90
     vram: 0x8020A2E0
     bss_size: 0x420
-    symbol_name_format: ovl12_$VRAM_$ROM
+    symbol_name_format: overlay_25EE90_$VRAM_$ROM
     exclusive_ram_id: test_overlapping
     subsegments:
       - [0x25EE90, asm]
@@ -1090,15 +1091,13 @@ segments:
 
       - { start: 0x275850, type: bss, vram: 0x80220CA0 }
 
-  - [0x275850, bin]
-
-  # __SOME_OVERLAY_TABLE_13
+  # __SOME_OVERLAY_TABLE[13]
   - type: code
-    dir: overlays/overlay_table_13
+    dir: overlays_275850
     start: 0x275850
     vram: 0x802210C0
     bss_size: 0x0
-    symbol_name_format: ovl13_$VRAM_$ROM
+    symbol_name_format: overlays_275850_$VRAM_$ROM
     exclusive_ram_id: test_overlapping
     subsegments:
       - [0x275850, asm]      
@@ -1115,17 +1114,13 @@ segments:
       - [0x279FD0, rodata]
       - [0x27A010, rodata]
 
-      # - { start: 0x27A020, type: bss, vram: 0x80225890 }
-
-  - [0x27A020, bin]
-
-  # __SOME_OVERLAY_TABLE_16
+  # __SOME_OVERLAY_TABLE[16]
   - type: code
-    dir: overlays/overlay_table_16
+    dir: overlay_27A020
     start: 0x27A020
     vram: 0x80225890
     bss_size: 0xA0
-    symbol_name_format: ovl16_$VRAM_$ROM
+    symbol_name_format: overlay_27A020_$VRAM_$ROM
     exclusive_ram_id: test_overlapping
     subsegments:
       - [0x27A020, asm]
@@ -1142,15 +1137,13 @@ segments:
 
       - { start: 0x281860, type: bss, vram: 0x8022D0D0 }
 
-  - [0x281860, bin]
-
-  # __SOME_OVERLAY_TABLE_14
+  # __SOME_OVERLAY_TABLE[14]
   - type: code
-    dir: overlays/overlay_table_14
+    dir: overlay_281860
     start: 0x281860
     vram: 0x80225890
     bss_size: 0x90
-    symbol_name_format: ovl14_$VRAM_$ROM
+    symbol_name_format: overlay_281860_$VRAM_$ROM
     exclusive_ram_id: test_overlapping
     subsegments:
       - [0x281860, asm]      
diff --git a/symbol_addrs.txt b/symbol_addrs.txt
index bdf4fdf..c1df96e 100644
--- a/symbol_addrs.txt
+++ b/symbol_addrs.txt
@@ -1,6 +1,7 @@
 
 
 ITEM_DATA = 0x8018C410; // size:0x20
+
 item_get_field_0x0 = 0x8016F5C8;
 item_get_element = 0x8016F5E0;
 item_get_field_0x2 = 0x8016F614;
@@ -29,9 +30,10 @@ FP_ITEM_GET_ALL_STATS = 0x801EF298; // rom:0xDBCF8
 
 CHARACTER_NAME_ARRAY_00 = 0x8018EB48;
 
-__setup_overlay5 = 0x8017B5EC;
-__setup_overlay3 = 0x8017B774;
-__setup_overlay6 = 0x8017B6B0;
+__setup_overlay_79730 = 0x8017B5EC;
+__setup_overlay_71280 = 0x8017B774;
+__setup_overlay_87200 = 0x8017B6B0;
+__setup_overlay_165FC0 = 0x801B6900; // rom:0x10B040
 
 MakeRouteList = 0x801B3620; // rom:0x107D60
 STR_VALUE_CANNOT_BE_REACHED_MAKE_ROUTE_LIST = 0x801EE0A0; // type:asciz