diff --git a/libultraship b/libultraship index 4dad0831..68c3375c 160000 --- a/libultraship +++ b/libultraship @@ -1 +1 @@ -Subproject commit 4dad08318a4380fcb54dc66257197e3f36b924f8 +Subproject commit 68c3375c9bd38bc6dbe32a71e2ac54154ac4a683 diff --git a/src/audio/data.h b/src/audio/data.h index 207b0843..a704c0c2 100644 --- a/src/audio/data.h +++ b/src/audio/data.h @@ -139,9 +139,9 @@ extern OSMesgQueue *D_SH_80350FA8; #define AUDIO_HEAP_SIZE 0x2c500 #define AUDIO_INIT_POOL_SIZE 0x2c00 #else -#define UNUSED_COUNT_80333EE8 24 -#define AUDIO_HEAP_SIZE 0x51150 -#define AUDIO_INIT_POOL_SIZE 0x3500 +#define UNUSED_COUNT_80333EE8 16 +#define AUDIO_HEAP_SIZE 0x31150 +#define AUDIO_INIT_POOL_SIZE 0x2500 #endif #ifdef VERSION_SH diff --git a/src/port/Engine.cpp b/src/port/Engine.cpp index 87700d1e..11ac557a 100644 --- a/src/port/Engine.cpp +++ b/src/port/Engine.cpp @@ -41,7 +41,7 @@ GameEngine::GameEngine(){ } } } - this->context = LUS::Context::CreateInstance("Ghostship", "sm64", "ghostship.cfg.json", OTRFiles, {}, 3); + this->context = LUS::Context::CreateInstance("Ghostship", "sm64", "ghostship.cfg.json", OTRFiles, { 0xFF2B5A63 }, 3); this->context->GetWindow()->SetTargetFps(30); this->context->GetWindow()->SetMaximumFrameLatency(1); this->context->GetResourceManager()->GetResourceLoader()->RegisterResourceFactory(LUS::ResourceType::SAnim, "Animation", std::make_shared()); @@ -50,7 +50,6 @@ GameEngine::GameEngine(){ this->context->GetResourceManager()->GetResourceLoader()->RegisterResourceFactory(LUS::ResourceType::Sequence, "Sequence", std::make_shared()); this->context->GetResourceManager()->GetResourceLoader()->RegisterResourceFactory(LUS::ResourceType::SDialog, "Dialog", std::make_shared()); GameEngine::AudioInit(); - uint32_t version = LUS::Context::GetInstance()->GetResourceManager()->GetArchive()->GetGameVersions()[0]; } void GameEngine::Create(){