mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-25 10:52:19 -05:00
Code Issues Projects Releases Wiki Activity

Makes sequenceMap and seqLoadStatus a dynamic size (#2610)

Browse Source 
Refactors to allow the above two arrays to be a dynamic size when the game launches, size is set during the AudioLoad_Init function.
This commit is contained in:
Christopher Leggett 2023-03-12 15:55:25 -04:00 committed by GitHub
parent 1ce9634f65
commit d9008938f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
soh/include/z64audio.h
View File

@ -22,7 +22,8 @@
#define CALC_RESAMPLE_FREQ(sampleRate) ((float)sampleRate / (s32)gAudioContext.audioBufferParameters.frequency) #define CALC_RESAMPLE_FREQ(sampleRate) ((float)sampleRate / (s32)gAudioContext.audioBufferParameters.frequency)
#define MAX_SEQUENCES 0x400 //#define MAX_SEQUENCES 0x800
extern size_t sequenceMapSize;
extern char* fontMap[256]; extern char* fontMap[256];
@ -917,7 +918,7 @@ typedef struct {
/* 0x342C */ AudioPoolSplit3 temporaryCommonPoolSplit; /* 0x342C */ AudioPoolSplit3 temporaryCommonPoolSplit;
/* 0x3438 */ u8 sampleFontLoadStatus[0x30]; /* 0x3438 */ u8 sampleFontLoadStatus[0x30];
/* 0x3468 */ u8 fontLoadStatus[0x30]; /* 0x3468 */ u8 fontLoadStatus[0x30];
/* 0x3498 */ u8 seqLoadStatus[MAX_SEQUENCES]; /* 0x3498 */ u8* seqLoadStatus;
/* 0x3518 */ volatile u8 resetStatus; /* 0x3518 */ volatile u8 resetStatus;
/* 0x3519 */ u8 audioResetSpecIdToLoad; /* 0x3519 */ u8 audioResetSpecIdToLoad;
/* 0x351C */ s32 audioResetFadeOutFramesLeft; /* 0x351C */ s32 audioResetFadeOutFramesLeft;

2
soh/src/code/audio_heap.c
View File

@ -53,7 +53,7 @@ void AudioHeap_ResetLoadStatus(void) {
} }
} }
for (i = 0; i < MAX_SEQUENCES; i++) { for (i = 0; i < sequenceMapSize; i++) {
if (gAudioContext.seqLoadStatus[i] != 5) { if (gAudioContext.seqLoadStatus[i] != 5) {
gAudioContext.seqLoadStatus[i] = 0; gAudioContext.seqLoadStatus[i] = 0;
} }

12
soh/src/code/audio_load.c
View File

@ -77,7 +77,8 @@ void* sUnusedHandler = NULL;
s32 gAudioContextInitalized = false; s32 gAudioContextInitalized = false;
char* sequenceMap[MAX_SEQUENCES]; char** sequenceMap;
size_t sequenceMapSize;
// A map of authentic sequence IDs to their cache policies, for use with sequence swapping. // A map of authentic sequence IDs to their cache policies, for use with sequence swapping.
u8 seqCachePolicyMap[MAX_AUTHENTIC_SEQID]; u8 seqCachePolicyMap[MAX_AUTHENTIC_SEQID];
char* fontMap[256]; char* fontMap[256];
@ -488,7 +489,7 @@ u8* AudioLoad_GetFontsForSequence(s32 seqId, u32* outNumFonts) {
return NULL; return NULL;
u16 newSeqId = AudioEditor_GetReplacementSeq(seqId); u16 newSeqId = AudioEditor_GetReplacementSeq(seqId);
if (newSeqId > MAX_SEQUENCES || !sequenceMap[newSeqId]) { if (newSeqId > sequenceMapSize || !sequenceMap[newSeqId]) {
return NULL; return NULL;
} }
SequenceData sDat = ResourceMgr_LoadSeqByName(sequenceMap[newSeqId]); SequenceData sDat = ResourceMgr_LoadSeqByName(sequenceMap[newSeqId]);
@ -1342,7 +1343,12 @@ void AudioLoad_Init(void* heap, size_t heapSize) {
AudioHeap_ResetStep(); AudioHeap_ResetStep();
int seqListSize = 0; int seqListSize = 0;
int customSeqListSize = 0;
char** seqList = ResourceMgr_ListFiles("audio/sequences*", &seqListSize); char** seqList = ResourceMgr_ListFiles("audio/sequences*", &seqListSize);
char** customSeqList = ResourceMgr_ListFiles("custom/music/*", &customSeqListSize);
sequenceMapSize = (size_t)(seqListSize + customSeqListSize);
sequenceMap = malloc(sequenceMapSize * sizeof(char*));
gAudioContext.seqLoadStatus = malloc(sequenceMapSize * sizeof(char*));
for (size_t i = 0; i < seqListSize; i++) for (size_t i = 0; i < seqListSize; i++)
{ {
@ -1357,9 +1363,7 @@ void AudioLoad_Init(void* heap, size_t heapSize) {
free(seqList); free(seqList);
int customSeqListSize = 0;
int startingSeqNum = MAX_AUTHENTIC_SEQID; // 109 is the highest vanilla sequence int startingSeqNum = MAX_AUTHENTIC_SEQID; // 109 is the highest vanilla sequence
char** customSeqList = ResourceMgr_ListFiles("custom/music/*", &customSeqListSize);
qsort(customSeqList, customSeqListSize, sizeof(char*), strcmp_sort); qsort(customSeqList, customSeqListSize, sizeof(char*), strcmp_sort);
for (size_t i = startingSeqNum; i < startingSeqNum + customSeqListSize; i++) { for (size_t i = startingSeqNum; i < startingSeqNum + customSeqListSize; i++) {

2
soh/src/code/audio_seqplayer.c
View File

@ -3,7 +3,7 @@
#include <libultraship/libultra.h> #include <libultraship/libultra.h>
#include "global.h" #include "global.h"
extern char* sequenceMap[MAX_SEQUENCES]; extern char** sequenceMap;
#define PORTAMENTO_IS_SPECIAL(x) ((x).mode & 0x80) #define PORTAMENTO_IS_SPECIAL(x) ((x).mode & 0x80)
#define PORTAMENTO_MODE(x) ((x).mode & ~0x80) #define PORTAMENTO_MODE(x) ((x).mode & ~0x80)