summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKiritoDv <kiritodev01@gmail.com>2025-08-09 13:30:21 -0600
committerKiritoDv <kiritodev01@gmail.com>2025-08-09 13:30:21 -0600
commita2fdf9849887de5f85ad51007eb1facb3f445cd5 (patch)
treeab273924e8a98d15b706e3eabaaf82f9272b0a88 /src
parent9eec95a16174329f6fb3b1e819bea777b105915f (diff)
Fixed 32 bit issues
Diffstat (limited to 'src')
-rw-r--r--src/audio/audio_load.c2
-rw-r--r--src/port/resource/importers/audio/AudioTableFactory.cpp4
-rw-r--r--src/port/resource/type/audio/AudioTable.h4
3 files changed, 5 insertions, 5 deletions
diff --git a/src/audio/audio_load.c b/src/audio/audio_load.c
index dccbb28f..9d376695 100644
--- a/src/audio/audio_load.c
+++ b/src/audio/audio_load.c
@@ -713,7 +713,7 @@ void* AudioLoad_AsyncLoadInner(s32 tableType, s32 id, s32 nChunks, s32 retData,
u8* ramAddr;
s32 medium;
s32 cachePolicy;
- u32 romAddr;
+ u64 romAddr;
s32 loadStatus = LOAD_STATUS_COMPLETE;
switch (tableType) {
diff --git a/src/port/resource/importers/audio/AudioTableFactory.cpp b/src/port/resource/importers/audio/AudioTableFactory.cpp
index 7833e8bc..62b30827 100644
--- a/src/port/resource/importers/audio/AudioTableFactory.cpp
+++ b/src/port/resource/importers/audio/AudioTableFactory.cpp
@@ -26,8 +26,8 @@ std::shared_ptr<Ship::IResource> ResourceFactoryBinaryAudioTableV0::ReadResource
int16_t sd3 = reader->ReadInt16();
table->mEntries.push_back({
- (uintptr_t) crc,
- size, medium, policy, sd1, sd2, sd3
+ crc, size, medium,
+ policy, sd1, sd2, sd3
});
}
diff --git a/src/port/resource/type/audio/AudioTable.h b/src/port/resource/type/audio/AudioTable.h
index 42fe8e29..f2926894 100644
--- a/src/port/resource/type/audio/AudioTable.h
+++ b/src/port/resource/type/audio/AudioTable.h
@@ -7,12 +7,12 @@ namespace SF64 {
struct AudioTableBase {
/* 0x00 */ int16_t numEntries;
/* 0x02 */ int16_t unkMediumParam;
- /* 0x04 */ uintptr_t romAddr;
+ /* 0x04 */ uint64_t romAddr;
/* 0x08 */ char pad[8];
};
struct AudioTableEntry {
- /* 0x00 */ uintptr_t romAddr;
+ /* 0x00 */ uint64_t romAddr;
/* 0x04 */ uint32_t size;
/* 0x08 */ int8_t medium;
/* 0x09 */ int8_t cachePolicy;