diff --git a/examples/PoolBox/application/Overlays.json b/examples/PoolBox/application/Overlays.json index 9a450a0e..7103e778 100644 --- a/examples/PoolBox/application/Overlays.json +++ b/examples/PoolBox/application/Overlays.json @@ -1,10 +1,10 @@ { "slot_0": { "timer_tests": { - "pattern": "bin/*/src/TimerTests/*.o" + "pattern": "bin/*/src/Overlay/TimerTests/*.o" }, "gpu_tests": { - "pattern": "bin/*/src/GPUTests/*.o" + "pattern": "bin/*/src/Overlay/GPUTests/*.o" } } } \ No newline at end of file diff --git a/examples/PoolBox/application/src/GPUTests/gpu_tests.cpp b/examples/PoolBox/application/src/Overlay/GPUTests/gpu_tests.cpp similarity index 100% rename from examples/PoolBox/application/src/GPUTests/gpu_tests.cpp rename to examples/PoolBox/application/src/Overlay/GPUTests/gpu_tests.cpp diff --git a/examples/PoolBox/application/src/TimerTests/timer_tests.cpp b/examples/PoolBox/application/src/Overlay/TimerTests/timer_tests.cpp similarity index 100% rename from examples/PoolBox/application/src/TimerTests/timer_tests.cpp rename to examples/PoolBox/application/src/Overlay/TimerTests/timer_tests.cpp diff --git a/examples/PoolBox/application/src/assets.hpp b/examples/PoolBox/application/src/assets.hpp new file mode 100644 index 00000000..000ae349 --- /dev/null +++ b/examples/PoolBox/application/src/assets.hpp @@ -0,0 +1,8 @@ +#ifndef __ASSETS_HPP__ +#define __ASSETS_HPP__ + +namespace Assets { + void load_for_main(); +} + +#endif //!__ASSETS_HPP__ \ No newline at end of file diff --git a/examples/PoolBox/application/src/main.cpp b/examples/PoolBox/application/src/main.cpp index ef5c08a2..9bc34324 100644 --- a/examples/PoolBox/application/src/main.cpp +++ b/examples/PoolBox/application/src/main.cpp @@ -1,5 +1,7 @@ +#include "assets.hpp" #include void main() { + Assets::load_for_main(); printf("Planschbecken c:\n"); } \ No newline at end of file diff --git a/examples/PoolBox/application/src/main_assets.cpp b/examples/PoolBox/application/src/main_assets.cpp new file mode 100644 index 00000000..050c9162 --- /dev/null +++ b/examples/PoolBox/application/src/main_assets.cpp @@ -0,0 +1,18 @@ +#include "assets.hpp" +#include +#include +#include + +namespace Assets { + enum LBA { + __jabyengine_start_lba_request + __jabyengine_request_lba_for(FONT, "ASSETS/MAIN/FONT.BIN"), + __jabyengine_end_lba_request + }; + + __declare_lba_header(LBA); + + void load_for_main() { + printf("Loading assets! %i\n", lba[LBA::FONT].get_lba()); + } +} \ No newline at end of file diff --git a/examples/PoolBox/assets/Makefile b/examples/PoolBox/assets/Makefile index 15b5e4ca..ba1dc0ad 100644 --- a/examples/PoolBox/assets/Makefile +++ b/examples/PoolBox/assets/Makefile @@ -11,7 +11,10 @@ $(OUTPUT_DIR)/IconTexture.bin: IconTexture.png @mkdir -p $(OUTPUT_DIR) jaby_engine_fconv --lz4 $< -o $@ simple-tim clut4 --semi-trans --color-trans -all: $(OUTPUT_DIR)/TexturePage.bin $(OUTPUT_DIR)/IconTexture.bin +$(OUTPUT_DIR)/YoshiFont.bin: YoshiFont.png + jaby_engine_fconv --lz4 $< -o $@ simple-tim clut4 --color-trans + +all: $(OUTPUT_DIR)/TexturePage.bin $(OUTPUT_DIR)/IconTexture.bin $(OUTPUT_DIR)/YoshiFont.bin clean: rm -fr $(OUTPUT_DIR) \ No newline at end of file diff --git a/examples/PoolBox/assets/YoshiFont.png b/examples/PoolBox/assets/YoshiFont.png new file mode 100644 index 00000000..653e8ff8 --- /dev/null +++ b/examples/PoolBox/assets/YoshiFont.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8d195c708c5642d2705039f1115c24c5d16bef6ec5ba332a6a6bbf9fa7e7bcaf +size 4452 diff --git a/examples/PoolBox/iso/Config.xml b/examples/PoolBox/iso/Config.xml index cad8f163..a12f195b 100644 --- a/examples/PoolBox/iso/Config.xml +++ b/examples/PoolBox/iso/Config.xml @@ -5,8 +5,11 @@ iso/System.cnf -
application/bin/PSX-release/PoolBox.psexe
- +
application/bin/PSX-release/PoolBox.psexe
+