From 5c5c0cc4100aff6940107c2ee5ffbb9de9bcdff9 Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Sat, 6 Feb 2021 13:05:39 +0900
Subject: [PATCH] git subrepo pull (merge) tools/splat

subrepo:
  subdir:   "tools/splat"
  merged:   "9304f9415"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "733546fea"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"
---
 tools/splat/.gitrepo         | 2 +-
 tools/splat/CHANGELOG.md     | 9 ++++++++-
 tools/splat/create_config.py | 4 ++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/tools/splat/.gitrepo b/tools/splat/.gitrepo
index ba57794e3e..92903add16 100644
--- a/tools/splat/.gitrepo
+++ b/tools/splat/.gitrepo
@@ -6,7 +6,7 @@
 [subrepo]
 	remote = https://github.com/ethteck/splat.git
 	branch = master
-	commit = 6898b0a98bc8f64e3076b97f789c63ca1058ea2d
+	commit = 733546feac9b29b100553aca1bc9916e1c211f5b
 	parent = f8a344e713fbe1244ae4f28cf9329179c46123b1
 	method = merge
 	cmdver = 0.4.3
diff --git a/tools/splat/CHANGELOG.md b/tools/splat/CHANGELOG.md
index fbbdcb23f3..ec37491297 100644
--- a/tools/splat/CHANGELOG.md
+++ b/tools/splat/CHANGELOG.md
@@ -23,4 +23,11 @@ Internally, there's a new Symbol class which stores information about a symbol a
 
 **data example**: `gSomeDataVar = 0x80024233; // type:data size:0x100`
 
-As always, feel free to reach out to me with any questions, suggestions, or feedback.
\ No newline at end of file
+As always, feel free to reach out to me with any questions, suggestions, or feedback.
+
+## 0.6.1: `assets_dir` option
+
+This release adds a new `assets_dir` option in `splat.yaml`s that allows you to override the default `img`, `bin`, and other directories that segments output to.
+
+Want to interdisperse split assets with your sourcecode? `assets_dir: src`!
+Want to have all assets live in a single directory? `assets_dir: assets`!
diff --git a/tools/splat/create_config.py b/tools/splat/create_config.py
index b0e10d9cfd..00850e711c 100755
--- a/tools/splat/create_config.py
+++ b/tools/splat/create_config.py
@@ -3,7 +3,7 @@
 import argparse
 from util.n64 import rominfo
 from util.n64 import find_code_length
-from segtypes.code import N64SegCode
+from segtypes.n64.code import N64SegCode
 
 parser = argparse.ArgumentParser(description="Create a splat config from a rom (currently only n64 .z64 roms supported)")
 parser.add_argument("rom", help="path to a .z64 rom")
@@ -23,7 +23,7 @@ options:
 
     with open(rom_path, "rb") as f:
       fbytes = f.read()
-    
+
     first_section_end = find_code_length.run(fbytes, 0x1000, rom.entry_point)
 
     segments = \