From 4fc05fce167fb674827754605a4a479a490115bb Mon Sep 17 00:00:00 2001
From: KiritoDv <kiritodev01@gmail.com>
Date: Sat, 16 Sep 2023 02:40:39 -0600
Subject: [PATCH] Fixed wrong cast

---
 libultraship         | 2 +-
 src/audio/internal.h | 6 ++++++
 src/audio/load.c     | 6 +++---
 src/port/Engine.cpp  | 6 +++---
 src/port/Engine.h    | 2 +-
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/libultraship b/libultraship
index 59f522b5..6ae0476d 160000
--- a/libultraship
+++ b/libultraship
@@ -1 +1 @@
-Subproject commit 59f522b5ca1e6f2eaebafdb6009ae8fc1477fd90
+Subproject commit 6ae0476d55c4a53f9d4ecd3bee28cda60c61314d
diff --git a/src/audio/internal.h b/src/audio/internal.h
index ad852ee8..97ea4cec 100644
--- a/src/audio/internal.h
+++ b/src/audio/internal.h
@@ -234,6 +234,12 @@ struct CtlEntry {
     struct Drum **drums;
 }; // size = 0xC
 
+struct AudioSequenceData {
+    u32 bankCount;
+    u8* banks;
+    u8* data;
+};
+
 struct M64ScriptState {
     u8 *pc;
     u8 *stack[4];
diff --git a/src/audio/load.c b/src/audio/load.c
index d71b050e..c4d4fe2b 100644
--- a/src/audio/load.c
+++ b/src/audio/load.c
@@ -398,7 +398,7 @@ out2:
 #endif
 }
 
-struct AudioBankSample* load_sequence_immediate(s32 seqId, s32 arg1) {
+uint8_t* load_sequence_immediate(s32 seqId, s32 arg1) {
     return GameEngine_LoadSequence(seqId);
 }
 
@@ -428,7 +428,7 @@ void preload_sequence(u32 seqId, u8 preloadMask) {
     }
 
     if (preloadMask & PRELOAD_SEQUENCE) {
-        struct AudioBankSample* sequenceData = load_sequence_immediate(seqId, 2);
+        uint8_t* sequenceData = load_sequence_immediate(seqId, 2);
         if (sequenceData == NULL) {
             gAudioLoadLock = AUDIO_LOCK_NOT_LOADING;
             return;
@@ -467,7 +467,7 @@ void load_sequence_internal(u32 player, u32 seqId, s32 loadAsync) {
     eu_stubbed_printf_2("Seq %d:Default Load Id is %d\n", seqId, seqPlayer->defaultBank[0]);
     eu_stubbed_printf_0("Seq Loading Start\n");
 
-    struct AudioBankSample* sequenceData = load_sequence_immediate(seqId, 2);
+    uint8_t* sequenceData = load_sequence_immediate(seqId, 2);
     if (sequenceData == NULL) {
         return;
     }
diff --git a/src/port/Engine.cpp b/src/port/Engine.cpp
index 0e3b3041..e8ac9ce3 100644
--- a/src/port/Engine.cpp
+++ b/src/port/Engine.cpp
@@ -21,7 +21,7 @@ GameEngine::GameEngine(){
     this->context->GetWindow()->SetMaximumFrameLatency(1);
     this->context->GetResourceManager()->GetResourceLoader()->RegisterResourceFactory(LUS::ResourceType::Anim, "Animation", std::make_shared<CubeOS::AnimationFactory>());
     this->context->GetResourceManager()->GetResourceLoader()->RegisterResourceFactory(LUS::ResourceType::Bank, "Bank", std::make_shared<CubeOS::AudioBankFactory>());
-    this->context->GetResourceManager()->GetResourceLoader()->RegisterResourceFactory(LUS::ResourceType::Audio, "Audio", std::make_shared<CubeOS::AudioSampleFactory>());
+    this->context->GetResourceManager()->GetResourceLoader()->RegisterResourceFactory(LUS::ResourceType::Sample, "Sample", std::make_shared<CubeOS::AudioSampleFactory>());
 }
 
 void GameEngine::Create(){
@@ -85,7 +85,7 @@ extern "C" void GameEngine_UnloadBank(uint8_t bankId) {
     }
 }
 
-extern "C" AudioBankSample* GameEngine_LoadSequence(uint8_t seqId) {
+extern "C" uint8_t* GameEngine_LoadSequence(uint8_t seqId) {
     auto engine = GameEngine::Instance;
     if(seqId > (sizeof(gSequenceTable) / sizeof(gSequenceTable[0]))){
         return nullptr;
@@ -93,7 +93,7 @@ extern "C" AudioBankSample* GameEngine_LoadSequence(uint8_t seqId) {
     if(engine->samples.contains(seqId)){
         return engine->samples[seqId];
     }
-    auto sample = static_cast<AudioBankSample *>(ResourceGetDataByName(gSequenceTable[seqId]));
+    auto sample = static_cast<uint8_t *>(ResourceGetDataByName(gSequenceTable[seqId]));
     engine->samples[seqId] = sample;
     return sample;
 }
diff --git a/src/port/Engine.h b/src/port/Engine.h
index 3403ac16..cbff966c 100644
--- a/src/port/Engine.h
+++ b/src/port/Engine.h
@@ -18,7 +18,7 @@ class GameEngine {
 
     std::shared_ptr<LUS::Context> context;
     std::unordered_map<uint8_t, CtlEntry*> banks;
-    std::unordered_map<uint8_t, AudioBankSample*> samples;
+    std::unordered_map<uint8_t, uint8_t*> samples;
 
     GameEngine();
     static void Create();