From f42427a5956138f2f649eac47394d33f4b018288 Mon Sep 17 00:00:00 2001
From: gijs <ogre@noest.dev>
Date: Mon, 25 Sep 2023 17:33:22 +0200
Subject: [PATCH] Migrated rodata to main

---
 splat.yaml | 16 ++++++++++------
 src/main.c | 10 ++++++++++
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/splat.yaml b/splat.yaml
index ad1857d..4c609d0 100644
--- a/splat.yaml
+++ b/splat.yaml
@@ -48,11 +48,11 @@ segments:
     vram: 0x80070C60
     follows_vram: entry
     bss_size: 0x3AE70
-    find_file_boundaries: False
+    find_file_boundaries: True
     subsegments:
       - [0x1060, c, "main"]
       - [0x4AC0, asm]
-      - [0x5FC0, c, "_ob_overconfident_mother"]
+      - [0x5FC0, asm, "_ob_overconfident_mother"]
       - [0x68E0, asm]
       - [0x8700, asm] 
       - [0xA370, asm, "lha"]
@@ -93,6 +93,7 @@ segments:
       - [0x15FD0, asm]
 
       - [0x16100, asm]
+      - [0x161A0, asm]
       - [0x17090, asm]
       - [0x177B0, asm]
       - [0x17990, asm]
@@ -316,8 +317,9 @@ segments:
       - [0x3A2F0, .data, "gfx/ob_saucy_hose"]
       - [0x3A3E0, data]
 
-      - [0x3E330, rodata, "5FC0"]
-      # - [0x3E408, rodata, "5FC0"]
+      - [0x3E100, .rodata, "main"]
+
+      - [0x3E330, rodata, "_ob_overconfident_mother"]
       - [0x3E460, rodata, "lha"]
       - [0x3E7A0, rodata, "FDC0"]
       - [0x3E7C0, rodata, "10110"]
@@ -325,12 +327,13 @@ segments:
       - [0x3E7F0, rodata, "10CF0"]
       - [0x3E800, rodata, "11170"]
       - [0x3E810, rodata, "libmus"]
-      # - [0x3E8F0, rodata, "libmus"]
+      - [0x3E8F0, rodata]
       - [0x3E900, rodata, "16100"]
-      # - [0x3E930, rodata, "16100"]
+      - [0x3E930, rodata, "161A0"]
       - [0x3E9A0, rodata, "177B0"]
       - [0x3E9B0, rodata, "17990"]
       - [0x3E9F0, rodata, "189D0"]
+      
       - [0x3EA90, rodata, "libultra/io/devmgr"]
       - [0x3EAB0, rodata, "libultra/io/aigetlen"]
       - [0x3EAC0, rodata, "libultra/audio/drvrNew"]
@@ -343,6 +346,7 @@ segments:
       - [0x3EE20, rodata, "libultra/os/exceptasm"]
       - [0x3EE70, rodata, "libultra/gu/libm_vals"]
       - [0x3EE80, rodata, "29FE0"]
+      - [0x3EEA0, rodata, "2A560"]
 
       - [0x3F000, rodata, "libc/xlitob"]
       - [0x3F070, rodata, "2CDA0"]
diff --git a/src/main.c b/src/main.c
index ea481ae..7573144 100644
--- a/src/main.c
+++ b/src/main.c
@@ -269,3 +269,13 @@ INCLUDE_ASM(const s32, "main", func_8007422C);
 INCLUDE_ASM(const s32, "main", func_800742F4);
 
 INCLUDE_ASM(const s32, "main", func_80074494);
+
+INCLUDE_RODATA(const s32, "main", STR_FAILED_TO_CONTROL_THE_HEATER);
+
+INCLUDE_RODATA(const s32, "main", STR_ADDING_NEW_DATA);
+
+INCLUDE_RODATA(const s32, "main", STR_CREATING_A_NEW_FILE);
+
+INCLUDE_RODATA(const s32, "main", STR_CREATING_NEW_DATA);
+
+INCLUDE_RODATA(const s32, "main", STR_buSave_SAVING);