From cf0a14e5cbbbe4718dbfb8f33d0875134dbb43db Mon Sep 17 00:00:00 2001
From: Ogre <ogre@noest.dev>
Date: Tue, 5 Sep 2023 01:45:52 +0200
Subject: [PATCH] Identified two more overlays Identified more symbols

---
 splat.yaml       | 67 +++++++++++++++++++++++++++++++++---------------
 symbol_addrs.txt |  9 ++++++-
 2 files changed, 55 insertions(+), 21 deletions(-)

diff --git a/splat.yaml b/splat.yaml
index ce07f92..299f36b 100644
--- a/splat.yaml
+++ b/splat.yaml
@@ -577,7 +577,7 @@ segments:
     subsegments:
       - [0xE48F0, asm]      
       - [0xE4BE0, asm]
-      - [0xE5960, asm]
+      - [0xE5960, asm, "speech"]
 
       - [0xEAF00, rodata]
       - [0xEAF10, rodata]
@@ -935,29 +935,56 @@ segments:
 
       - { start: 0x213B10, type: bss, vram: 0x801D0680 }
 
-  - [0x213B10, bin]
+  - type: code
+    dir: overlays/overlay7
+    start: 0x213B10
+    vram: 0x801D0840
+    bss_size: 0x0
+    symbol_name_format: overlay7_$VRAM_$ROM
+    exclusive_ram_id: test_overlapping
+    subsegments:
+      - [0x213B10, asm]
+      - [0x213B50, asm]
+      - [0x21C970, asm]
+      - [0x21D7F0, asm]
+      - [0x222190, asm]
+      - [0x224F30, asm]
 
-  # - type: code
-  #   dir: overlays/overlay7
-  #   start: 0x213B10
-  #   vram: 0x801D0840
-  #   bss_size: 0x0
-  #   symbol_name_format: overlay7_$VRAM_$ROM
-  #   exclusive_ram_id: test_overlapping
-  #   subsegments:
-  #     - [0x213B10, asm]
-      # - [0x213B50, asm]
-      # - [0x21C970, asm]
-      # - [0x21D7F0, asm]
-      # - [0x222190, asm]
-      # - [0x224F30, asm]
-
-      # - [0x228D70, rodata]
+      - [0x228D70, rodata]
+      - [0x228D90, rodata]
+      - [0x228E30, rodata]
+      - [0x228F40, rodata]
+      - [0x228F90, rodata]
+      - [0x228FF0, rodata]
+      - [0x2290C0, rodata]
+      - [0x2290F0, rodata]
+      - [0x229820, rodata]
+      - [0x229870, rodata]
+      - [0x2298D0, rodata]
+      - [0x229DB0, rodata]
 
       # - { start: 0x22A280, type: bss, vram: 0x801E6FB0 }
 
-  - [0x228D70, bin]
-  
+  - type: code
+    dir: overlays/overlay8
+    start: 0x22A280
+    vram: 0x801E6FB0
+    bss_size: 0x0
+    symbol_name_format: overlay8_$VRAM_$ROM
+    exclusive_ram_id: test_overlapping
+    subsegments:
+      - [0x22A280, asm]
+      - [0x233210, asm]
+
+      - [0x239BA0, rodata]
+      - [0x239BE0, rodata]
+      - [0x239CA0, rodata]
+      - [0x239F50, rodata]
+
+      # - { start: 0x23A3A0, type: bss, vram: 0x801F70D0 }
+
+  - [0x23A3A0, bin]
+
   - [0x2447A0, bin]
 
   # __SOME_OVERLAY_TABLE_11
diff --git a/symbol_addrs.txt b/symbol_addrs.txt
index 468dfdd..73cb2bc 100644
--- a/symbol_addrs.txt
+++ b/symbol_addrs.txt
@@ -2,6 +2,14 @@ __setup_overlay5 = 0x8017B5EC;
 __setup_overlay3 = 0x8017B774;
 __setup_overlay6 = 0x8017B6B0;
 
+MakeRouteList = 0x801B3620; // rom:0x107D60
+STR_VALUE_CANNOT_BE_REACHED_MAKE_ROUTE_LIST = 0x801EE0A0;
+Magnetic = 0x801B44DC; // rom:0x108C1C
+STR_MEM_ERROR_MAGNETIC = 0x801EE0F0;
+// Obviously wrong translated but whatevs..
+STR_FAILED_TO_CONTROL_THE_HEATER = 0x800ADE78;
+STR_EMPTY = 0x800AE334; // type:asciz
+
 NAME_MAGNUS = 0x8018E8F0; // type:asciz
 NAME_DIO = 0x8018E8F8; // type:asciz
 NAME_LEIA = 0x8018E8FC; // type:asciz
@@ -14,7 +22,6 @@ NAME_SHEEN = 0x8018E9FC; // type:asciz size:0x6
 
 CLASS_NAME_DRAGON_MASTER = 0x80190230; // type:asciz
 
-
 __SOME_OVERLAY_TABLE = 0x800A83C0; // size:0x28
 __SOME_OVERLAY_TABLE_1 = 0x800A83E8; // size:0x28
 __SOME_OVERLAY_TABLE_2 = 0x800A8410; // size:0x28