Do mass loading with AllTheJaby
This commit is contained in:
@@ -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()),
|
||||
};
|
||||
}
|
||||
|
@@ -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);
|
||||
|
@@ -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() {
|
||||
|
Reference in New Issue
Block a user