From 6d86f4e99fc18ebce11812efba0fb8d646151ae8 Mon Sep 17 00:00:00 2001
From: jaby <jaby@william.zone>
Date: Wed, 28 Sep 2022 20:53:32 +0200
Subject: [PATCH] Create Splash.cpp

---
 lib/Makefile                                              | 3 +++
 src/Library/Makefile                                      | 4 +++-
 src/Library/ressources/Splash.png                         | 4 ++--
 src/Tools/jaby_engine_fconv/src/images/reduced_tim/mod.rs | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/lib/Makefile b/lib/Makefile
index 5146b7ea..c4c98c50 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,3 +1,6 @@
+#Add the JabyEngine tools to path
+export PATH := $(JABY_ENGINE_DIR)/bin/:$(PATH)
+
 #Build architecture/variant string, possible values: x86, armv7le, etc...
 PLATFORM ?= PSX
 
diff --git a/src/Library/Makefile b/src/Library/Makefile
index 9a206061..98a2ba0f 100644
--- a/src/Library/Makefile
+++ b/src/Library/Makefile
@@ -1,3 +1,5 @@
+JABY_ENGINE_DIR = ../../
+
 ARTIFACT  = libJabyEngine
 BUILD_DIR = bin
 
@@ -21,7 +23,7 @@ $(LIB_DIR)/$(ARTIFACT).a: $(TARGET).a
 	cp $(TARGET).a $(LIB_DIR)/$(ARTIFACT).a
 
 ressources/Splash.cpp: ressources/Splash.png
-	echo wuff
+	jaby_engine_fconv $< simple-tim full16 | cpp_out --name SplashScreen -o $@
 
 #Rules section for default compilation and linking
 splash: ressources/Splash.cpp
diff --git a/src/Library/ressources/Splash.png b/src/Library/ressources/Splash.png
index 90190683..a1a37291 100644
--- a/src/Library/ressources/Splash.png
+++ b/src/Library/ressources/Splash.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e13a57ece356ffd9778f530b97ae25a2a4b85c70639e4a03dc050734ba87d2db
-size 216174
+oid sha256:2e0c1a6a53217c62a59a61774d771354414b6a92bfc6fc7ef6f59987ee4f01ff
+size 221312
diff --git a/src/Tools/jaby_engine_fconv/src/images/reduced_tim/mod.rs b/src/Tools/jaby_engine_fconv/src/images/reduced_tim/mod.rs
index d8c59a37..0ab72907 100644
--- a/src/Tools/jaby_engine_fconv/src/images/reduced_tim/mod.rs
+++ b/src/Tools/jaby_engine_fconv/src/images/reduced_tim/mod.rs
@@ -51,7 +51,7 @@ fn encode<T: PSXImageConverter>(image: T, clut_align: ClutAlignment, mut output:
         }
     };
 
-    let header = Header::encode(width, height, pal_width, pal_height).ok_or(Error::from_callback(|| {format!("Image size {}, {} needs to be even", width, height)}))?;
+    let header = Header::encode(width, height, pal_width, pal_height).ok_or(Error::from_callback(|| {format!("Image size (width: {}, height: {}) needs to be even", width, height)}))?;
 
     tool_helper::raw::write_generic(&mut output, header)?;
     if let Some(palette) = palette {