Found more overlay boundaries

splat.yaml

@@ -824,6 +824,68 @@ segments:
 
   - [0x177ED0, bin]
 
+  - type: code
+    dir: overlay_177ED0
+    start: 0x177ED0
+    vram: 0x80214F80
+    bss_size: 0x18D0
+    symbol_name_format: overlay_177ED0_$VRAM_$ROM
+    exclusive_ram_id: test_overlapping
+    subsegments:
+      - [0x177ED0, bin]
+      # - [0x1782C0, asm]
+      # - [0x178450, asm]
+
+      # - [0x17BCD0, rodata]
+      # - [0x17BCE0, rodata]
+      # - [0x17C500, rodata]
+      # - [0x17CC20, rodata]
+      # - [0x17CCE0, rodata]
+      # - [0x17F130, rodata]
+      # - [0x17F460, rodata]
+      # - [0x17F7F0, rodata]
+      # - [0x17F8D0, rodata]
+      # - [0x17F8F0, rodata]
+      # - [0x17F900, rodata]
+      # - [0x17F910, rodata]
+
+      - { start: 0x17F9C0, type: bss, vram: 0x8021CA70 }
+
+  - [0x17F9C0, bin]
+  # Overlay here
+  - [0x188B60, bin]
+  # Overlay here
+  - [0x18F100, bin]
+  # Overlay here
+  - [0x195410, bin]
+  # Overlay here
+  - [0x1977E0, bin]
+  # Overlay here
+  - [0x19C760, bin]
+  # Overlay here
+  - [0x1A2C20, bin]
+  # Overlay here
+  - [0x1A4C10, bin]
+  # Overlay here
+  - [0x1A9290, bin]
+
+  # - type: code
+  #   dir: overlay_1A9290
+  #   start: 0x1A9290
+  #   vram: 0x80214F80
+  #   bss_size: 0x90
+  #   symbol_name_format: overlay_1A9290_$VRAM_$ROM
+  #   exclusive_ram_id: test_overlapping
+  #   subsegments:
+  #     - [0x1A9290, asm]
+
+  #     - [0x1B2270, data]
+
+  #     - { start: 0x1B2670, type: bss, vram: 0x8021E360 }
+
+  - [0x1B2670, bin]
+  # Overlay here
+
   # __SOME_OVERLAY_TABLE[18]
   - type: code
     dir: overlay_1BA050
@@ -986,8 +1048,11 @@ segments:
       - [0x239F50, rodata]
 
   - [0x23A3A0, bin]
-
+  # Overlay here
+  - [0x23B220, bin]
+  # Overlay here
   - [0x2447A0, bin]
+  # Overlay here
 
   # __SOME_OVERLAY_TABLE[11]
   - type: code
@@ -1158,18 +1223,13 @@ segments:
       - { start: 0x286BD0, type: bss, vram: 0x8022AC00 }
 
   - [0x286BD0, bin]
-
-  # - type: code
-  #   dir: overlays/overlay99
-  #   start: 0x002AE3C0
-  #   vram: 0x8031DFC0
-  #   subsegments:
-  #     - [0x2AE3C0, c]      
-  #     - [0x2B5230, asm]
-  #     - [0x2B6F40, asm]
-  #     - [0x2B8610, asm]
-
-  - [0x2B89C0, bin]
+  # Overlay here
+  - [0x29A4C0, bin]
+  # Overlay here
+  - [0x2A8D20, bin]
+  # Overlay here
+  - [0x2AE3C0, bin]
+  # Overlay here
 
   - [0x2B8BA0, bin, "n64_ptr_tables_v2_00"]
   - [0x2BF250, bin, "n64_wave_table_00"] # N64 WaveTable

src/4D5C0.c

@@ -97,7 +97,7 @@ INCLUDE_ASM(const s32, "4D5C0", func_80177B5C);
 
 INCLUDE_ASM(const s32, "4D5C0", func_80177B78);
 
-INCLUDE_ASM(const s32, "4D5C0", func_80177B84);
+INCLUDE_ASM(const s32, "4D5C0", __setup_overlay_23B220);
 
 INCLUDE_ASM(const s32, "4D5C0", func_80177CC0);
 
@@ -173,7 +173,7 @@ INCLUDE_ASM(const s32, "4D5C0", func_8017829C);
 
 INCLUDE_ASM(const s32, "4D5C0", func_801782B8);
 
-INCLUDE_ASM(const s32, "4D5C0", func_801782C4);
+INCLUDE_ASM(const s32, "4D5C0", __setup_overlay_2447A0);
 
 INCLUDE_ASM(const s32, "4D5C0", func_801783A8);
 

symbol_addrs.txt

@@ -34,6 +34,14 @@ __setup_overlay_79730 = 0x8017B5EC;
 __setup_overlay_71280 = 0x8017B774;
 __setup_overlay_87200 = 0x8017B6B0;
 __setup_overlay_165FC0 = 0x801B6900; // rom:0x10B040
+__setup_overlay_171EA0 = 0x801B85CC; // rom:0x10CD0C
+__setup_overlay_177ED0 = 0x801B6D2C; // rom:0x10B46C
+__setup_overlay_1977E0 = 0x801B73EC; // rom:0x10BB2C
+__setup_overlay_1A4C10 = 0x801B750C; // rom:0x10BC4C
+__setup_overlay_1A9290 = 0x801B7A68; // rom:0x10C1A8
+__setup_overlay_1B2670 = 0x801E49B0; // rom:0x1390F0
+__setup_overlay_23B220 = 0x80177B84; // rom:0x4DA84
+__setup_overlay_2447A0 = 0x801782C4; // rom:0x4E1C4
 
 MakeRouteList = 0x801B3620; // rom:0x107D60
 STR_VALUE_CANNOT_BE_REACHED_MAKE_ROUTE_LIST = 0x801EE0A0; // type:asciz