diff --git a/libultraship b/libultraship index 5787c1b3d..274ec5e19 160000 --- a/libultraship +++ b/libultraship @@ -1 +1 @@ -Subproject commit 5787c1b3d89ff8d40a52d7405da627d802ca5dce +Subproject commit 274ec5e195f40c526f489242c3c2bf66f10eb9af diff --git a/soh/soh/GbiWrap.cpp b/soh/soh/GbiWrap.cpp index eb9e6be36..e06f802bc 100644 --- a/soh/soh/GbiWrap.cpp +++ b/soh/soh/GbiWrap.cpp @@ -13,7 +13,7 @@ void OTRSetFrameDivisor(int divisor); void OTRGetPixelDepthPrepare(float x, float y); uint16_t OTRGetPixelDepth(float x, float y); int32_t OTRGetLastScancode(); -void ResourceMgr_CacheDirectory(const char* resName); +void ResourceMgr_LoadDirectory(const char* resName); void ResourceMgr_LoadFile(const char* resName); char* ResourceMgr_LoadFileFromDisk(const char* filePath); char* GetResourceDataByName(char* texPath); diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp index 9b420273a..ae6db5a84 100644 --- a/soh/soh/OTRGlobals.cpp +++ b/soh/soh/OTRGlobals.cpp @@ -340,7 +340,7 @@ extern "C" void AudioMgr_CreateNextAudioBuffer(s16* samples, u32 num_samples); extern "C" void AudioPlayer_Play(const uint8_t* buf, uint32_t len); extern "C" int AudioPlayer_Buffered(void); extern "C" int AudioPlayer_GetDesiredBuffered(void); -extern "C" void ResourceMgr_CacheDirectory(const char* resName); +extern "C" void ResourceMgr_LoadDirectory(const char* resName); extern "C" SequenceData ResourceMgr_LoadSeqByName(const char* path); std::unordered_map ExtensionCache; @@ -393,7 +393,7 @@ void OTRAudio_Thread() { extern "C" void OTRAudio_Init() { // Precache all our samples, sequences, etc... - ResourceMgr_CacheDirectory("audio"); + ResourceMgr_LoadDirectory("audio"); if (!audio.running) { audio.running = true; @@ -866,8 +866,8 @@ extern "C" uint32_t ResourceMgr_IsGameMasterQuest() { return IsGameMasterQuest(); } -extern "C" void ResourceMgr_CacheDirectory(const char* resName) { - OTRGlobals::Instance->context->GetResourceManager()->CacheDirectory(resName); +extern "C" void ResourceMgr_LoadDirectory(const char* resName) { + OTRGlobals::Instance->context->GetResourceManager()->LoadDirectory(resName); } extern "C" void ResourceMgr_DirtyDirectory(const char* resName) { OTRGlobals::Instance->context->GetResourceManager()->DirtyDirectory(resName); diff --git a/soh/soh/OTRGlobals.h b/soh/soh/OTRGlobals.h index cbe0cc4cf..398a91b6c 100644 --- a/soh/soh/OTRGlobals.h +++ b/soh/soh/OTRGlobals.h @@ -58,7 +58,7 @@ uint32_t ResourceMgr_GameHasMasterQuest(); uint32_t ResourceMgr_GameHasOriginal(); uint32_t ResourceMgr_GetNumGameVersions(); uint32_t ResourceMgr_GetGameVersion(int index); -void ResourceMgr_CacheDirectory(const char* resName); +void ResourceMgr_LoadDirectory(const char* resName); char** ResourceMgr_ListFiles(const char* searchMask, int* resultSize); char* GetResourceDataByNameHandlingMQ(const char* path); void ResourceMgr_LoadFile(const char* resName); diff --git a/soh/src/overlays/gamestates/ovl_title/z_title.c b/soh/src/overlays/gamestates/ovl_title/z_title.c index d30b6f693..e4a8ca56c 100644 --- a/soh/src/overlays/gamestates/ovl_title/z_title.c +++ b/soh/src/overlays/gamestates/ovl_title/z_title.c @@ -309,7 +309,7 @@ void Title_Init(GameState* thisx) { osSyncPrintf("z_title.c\n"); //ASSERT(this->staticSegment != NULL); - //ResourceMgr_CacheDirectory("nintendo_rogo_static*"); + //ResourceMgr_LoadDirectory("nintendo_rogo_static*"); // Disable vismono D_801614B0.a = 0;