From cb723c7c38b65ba92ce16488584fffac385f3974 Mon Sep 17 00:00:00 2001
From: Zac <theonlyzac@gmail.com>
Date: Mon, 29 Apr 2024 23:37:56 +0000
Subject: [PATCH] Cleanup and reorganization

---
 .gitignore                                  | 7 ++++---
 README.md                                   | 4 +++-
 config/sly1.yaml                            | 8 ++++----
 config/sly1_may19.yaml                      | 4 ++--
 src/P2/ps2t/{spaprops.ic => .gitkeep}       | 0
 src/P2/temp/{do_not_remove.txt => .gitkeep} | 0
 6 files changed, 13 insertions(+), 10 deletions(-)
 rename src/P2/ps2t/{spaprops.ic => .gitkeep} (100%)
 rename src/P2/temp/{do_not_remove.txt => .gitkeep} (100%)

diff --git a/.gitignore b/.gitignore
index dee931f8..f7dc8467 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,11 +8,12 @@ docs/
 functions.txt
 
 # Splat files
+splat/
+assets/
+asm/
+c/
 undefined_funcs*.txt
 undefined_syms*.txt
-asm/
-assets/
-c/
 
 ## Binary/object products
 **/bin/
diff --git a/README.md b/README.md
index 8ad3a8d7..4cdb1548 100644
--- a/README.md
+++ b/README.md
@@ -129,8 +129,10 @@ When you build the executable, the following directories will be created:
 
 When you use splat to split the elf, the following directories will be created:
 
-* `asm` - Disassembled assembly code for each segment.
 * `assets`- Binary data extracted from the elf.
+* `splat` - Output of the binary splitting tool.
+  * `asm` - Disassembled assembly code.
+  * `src` - Generated C files.
 
 
 ## FAQ
diff --git a/config/sly1.yaml b/config/sly1.yaml
index d8fbe535..f29ff44a 100644
--- a/config/sly1.yaml
+++ b/config/sly1.yaml
@@ -9,8 +9,8 @@ options:
   platform: ps2
   compiler: GCC
 
-  asm_path: asm
-  src_path: c
+  asm_path: splat/release/asm
+  src_path: splat/release/src
   build_path: build
 
   find_file_boundaries: False
@@ -58,10 +58,10 @@ segments:
     # P2 sources
     #----------------------------------------
     - [0x0491A0, c, P2/coin]
-    - [0x049400, asm]
+    - [0x049400, asm] # TBD
 
     - [0x0eb408, c, P2/util]
-    - [0x0ec518, asm]
+    - [0x0ec518, asm] # TBD
 
     #----------------------------------------
 
diff --git a/config/sly1_may19.yaml b/config/sly1_may19.yaml
index 22bef522..b6798f0c 100644
--- a/config/sly1_may19.yaml
+++ b/config/sly1_may19.yaml
@@ -9,8 +9,8 @@ options:
   platform: ps2
   compiler: GCC
 
-  asm_path: asm
-  src_path: c
+  asm_path: splat/may19/asm
+  src_path: splat/may19/src
   build_path: build
 
   find_file_boundaries: False
diff --git a/src/P2/ps2t/spaprops.ic b/src/P2/ps2t/.gitkeep
similarity index 100%
rename from src/P2/ps2t/spaprops.ic
rename to src/P2/ps2t/.gitkeep
diff --git a/src/P2/temp/do_not_remove.txt b/src/P2/temp/.gitkeep
similarity index 100%
rename from src/P2/temp/do_not_remove.txt
rename to src/P2/temp/.gitkeep