mirror of
https://github.com/izzy2lost/Starship.git
synced 2026-07-05 15:19:42 -07:00
Merge branch 'main' of https://github.com/izzy2lost/Starship
This commit is contained in:
@@ -847,12 +847,12 @@ typedef struct {
|
||||
typedef struct {
|
||||
/* 0x00 */ s16 numEntries;
|
||||
/* 0x02 */ s16 unkMediumParam;
|
||||
/* 0x04 */ uintptr_t romAddr;
|
||||
/* 0x04 */ u64 romAddr;
|
||||
/* 0x08 */ char pad[8];
|
||||
} AudioTableBase;
|
||||
|
||||
typedef struct {
|
||||
/* 0x00 */ uintptr_t romAddr;
|
||||
/* 0x00 */ u64 romAddr;
|
||||
/* 0x04 */ u32 size;
|
||||
/* 0x08 */ s8 medium;
|
||||
/* 0x09 */ s8 cachePolicy;
|
||||
|
||||
@@ -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
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -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;
|
||||
/* 0x04 */ uint64_t romAddr;
|
||||
/* 0x04 */ uint32_t size;
|
||||
/* 0x08 */ int8_t medium;
|
||||
/* 0x09 */ int8_t cachePolicy;
|
||||
@@ -38,4 +38,4 @@ class AudioTable : public Ship::Resource<AudioTableData> {
|
||||
AudioTableData mTable;
|
||||
std::vector<AudioTableEntry> mEntries;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user