diff --git a/examples/PoolBox/application/src/Overlay/GPUTest/gpu_test_assets.cpp b/examples/PoolBox/application/src/Overlay/GPUTest/gpu_test_assets.cpp
index a2cf1e07..6e74d656 100644
--- a/examples/PoolBox/application/src/Overlay/GPUTest/gpu_test_assets.cpp
+++ b/examples/PoolBox/application/src/Overlay/GPUTest/gpu_test_assets.cpp
@@ -7,8 +7,9 @@ namespace GPUTest {
enum LBA {
__jabyengine_start_lba_request
- __jabyengine_request_lba_for(TEX, "ASSETS/TEX.IMG"),
- __jabyengine_request_lba_for(ICON, "ASSETS/ICON.IMG"),
+ __jabyengine_request_lba_for(TEX, "ASSETS/TEX.IMG"),
+ __jabyengine_request_lba_for(ICON, "ASSETS/ICON.IMG"),
+ __jabyengine_request_lba_for(ALL_THE_JABY, "ASSETS/ATJ.TIM"),
__jabyengine_end_lba_request
};
__declare_lba_header(LBA);
@@ -19,41 +20,41 @@ namespace GPUTest {
};
CDFile LargeAssets[36] = {
- CDFileBuilder::simple_tim(LBA::TEX, TexPageTIM),
- CDFileBuilder::simple_tim(LBA::ICON, IconTIM),
- CDFileBuilder::simple_tim(LBA::TEX, TexPageTIM),
- CDFileBuilder::simple_tim(LBA::TEX, TexPageTIM),
- CDFileBuilder::simple_tim(LBA::ICON, IconTIM),
- CDFileBuilder::simple_tim(LBA::ICON, IconTIM),
- CDFileBuilder::simple_tim(LBA::ICON, IconTIM),
- CDFileBuilder::simple_tim(LBA::TEX, TexPageTIM),
- CDFileBuilder::simple_tim(LBA::TEX, TexPageTIM),
- CDFileBuilder::simple_tim(LBA::ICON, IconTIM),
- CDFileBuilder::simple_tim(LBA::TEX, TexPageTIM),
- CDFileBuilder::simple_tim(LBA::TEX, TexPageTIM),
- CDFileBuilder::simple_tim(LBA::ICON, IconTIM),
- CDFileBuilder::simple_tim(LBA::ICON, IconTIM),
- CDFileBuilder::simple_tim(LBA::ICON, IconTIM),
- CDFileBuilder::simple_tim(LBA::TEX, TexPageTIM),
- CDFileBuilder::simple_tim(LBA::TEX, TexPageTIM),
- CDFileBuilder::simple_tim(LBA::ICON, IconTIM),
- CDFileBuilder::simple_tim(LBA::TEX, TexPageTIM),
- CDFileBuilder::simple_tim(LBA::ICON, IconTIM),
- CDFileBuilder::simple_tim(LBA::TEX, TexPageTIM),
- CDFileBuilder::simple_tim(LBA::TEX, TexPageTIM),
- CDFileBuilder::simple_tim(LBA::ICON, IconTIM),
- CDFileBuilder::simple_tim(LBA::ICON, IconTIM),
- CDFileBuilder::simple_tim(LBA::ICON, IconTIM),
- CDFileBuilder::simple_tim(LBA::TEX, TexPageTIM),
- CDFileBuilder::simple_tim(LBA::TEX, TexPageTIM),
- CDFileBuilder::simple_tim(LBA::ICON, IconTIM),
- CDFileBuilder::simple_tim(LBA::TEX, TexPageTIM),
- CDFileBuilder::simple_tim(LBA::TEX, TexPageTIM),
- CDFileBuilder::simple_tim(LBA::ICON, IconTIM),
- CDFileBuilder::simple_tim(LBA::ICON, IconTIM),
- CDFileBuilder::simple_tim(LBA::ICON, IconTIM),
- CDFileBuilder::simple_tim(LBA::TEX, TexPageTIM),
- CDFileBuilder::simple_tim(LBA::TEX, TexPageTIM),
- CDFileBuilder::simple_tim(LBA::ICON, IconTIM),
+ CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
+ CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
+ CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
+ CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
+ CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
+ CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
+ CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
+ CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
+ CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
+ CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
+ CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
+ CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
+ CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
+ CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
+ CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
+ CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
+ CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
+ CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
+ CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
+ CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
+ CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
+ CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
+ CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
+ CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
+ CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
+ CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
+ CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
+ CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
+ CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
+ CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
+ CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
+ CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
+ CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
+ CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
+ CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
+ CDFileBuilder::sony_tim(LBA::ALL_THE_JABY, TIM::create()),
};
}
diff --git a/examples/PoolBox/application/src/application.cpp b/examples/PoolBox/application/src/application.cpp
index 1c0a6b89..dc45dece 100644
--- a/examples/PoolBox/application/src/application.cpp
+++ b/examples/PoolBox/application/src/application.cpp
@@ -129,9 +129,6 @@ namespace Shared {
}
static void setup() {
- // Use this size for the doener fish state?
- // doener_fish.set_rect_size_fast(Make::SizeI16(64, 32));
-
Assets::Main::load();
FontWriter::setup();
paco.setup();
@@ -262,7 +259,7 @@ namespace LoadingScene {
}
jaby_sprt.tex_offset.add(jaby_frame_offset, 0);
- GPU::swap_buffers();
+ GPU::swap_buffers(!Shared::load_test);
GPU::render(jaby_sprt);
GPU::render(load_font);
jaby_sprt.position.move(Assets::Main::JabyLoader::FontFrame.size.width + Assets::Main::JabyLoader::JabyFrame.size.width + 8, 0);
diff --git a/examples/PoolBox/application/src/asset_mgr.cpp b/examples/PoolBox/application/src/asset_mgr.cpp
index b5b8f337..8f19c5bc 100644
--- a/examples/PoolBox/application/src/asset_mgr.cpp
+++ b/examples/PoolBox/application/src/asset_mgr.cpp
@@ -10,6 +10,8 @@
extern "C" uint32_t __bios_info_start;
extern "C" uint32_t __controller_tests_start;
extern "C" uint32_t __gpu_tests_start;
+extern "C" uint32_t __gte_tests_start;
+extern "C" uint32_t __font_cycler_start;
extern "C" uint32_t __screen_center_start;
namespace Assets {
@@ -113,11 +115,11 @@ namespace Assets {
}
void load_gte_test() {
- load(CDFileBuilder::overlay(LBA::GTE_TEST_OVL, &__gpu_tests_start), GTETest::lba, GTETest::Assets);
+ load(CDFileBuilder::overlay(LBA::GTE_TEST_OVL, &__gte_tests_start), GTETest::lba, GTETest::Assets);
}
void load_font_cycler() {
- load(CDFileBuilder::overlay(LBA::FONT_CYC_OVL, &__screen_center_start));
+ load(CDFileBuilder::overlay(LBA::FONT_CYC_OVL, &__font_cycler_start));
}
void load_screen_center() {
diff --git a/examples/PoolBox/assets/AllTheJaby.png b/examples/PoolBox/assets/AllTheJaby.png
new file mode 100644
index 00000000..c7a95939
--- /dev/null
+++ b/examples/PoolBox/assets/AllTheJaby.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fcb7f29d021b384b1afff8d654a4abee39c855408332c0c63a6938e055852322
+size 539396
diff --git a/examples/PoolBox/assets/Makefile b/examples/PoolBox/assets/Makefile
index 6aee6cbe..70b39b3f 100644
--- a/examples/PoolBox/assets/Makefile
+++ b/examples/PoolBox/assets/Makefile
@@ -37,6 +37,9 @@ JabyTails_FLAGS = $(CLUT_4_COLOR_TRANS_FLAGS)
INPUT += $(OUTPUT_DIR)/IMG_6921.tim
IMG_6921_TIM_FLAGS = tim full16 --clut-pos {384,255} --tex-pos {384,256}
+INPUT += $(OUTPUT_DIR)/AllTheJaby.tim
+AllTheJaby_TIM_FLAGS = tim full16 --tex-pos {0,0}
+
$(OUTPUT_DIR)/fox.xa: audio/temp/fox.wav
@mkdir -p $(OUTPUT_DIR)
psxfileconv $< -o $@ xa
diff --git a/examples/PoolBox/iso/Config.xml b/examples/PoolBox/iso/Config.xml
index a1a20b2a..f7b4ad92 100644
--- a/examples/PoolBox/iso/Config.xml
+++ b/examples/PoolBox/iso/Config.xml
@@ -42,6 +42,7 @@
../assets/bin/TexturePage.img
../assets/bin/IconTexture.img
../assets/bin/IMG_6921.tim
+ ../assets/bin/AllTheJaby.tim