From 5538fd2e4ed372a43b8fa1f86d935d98ed0f13e3 Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Fri, 13 Oct 2023 10:56:33 -0700 Subject: [PATCH] Fix synthvoice local ordering Former-commit-id: f9f2e23ea94fd2521a1288267af3ceef41c25eee --- config/GM8E01_00/symbols.txt | 2 +- src/musyx/runtime/synthvoice.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/GM8E01_00/symbols.txt b/config/GM8E01_00/symbols.txt index 1ebacb4a..01812678 100644 --- a/config/GM8E01_00/symbols.txt +++ b/config/GM8E01_00/symbols.txt @@ -22311,7 +22311,7 @@ voicePrioSortRootListRoot = .sbss:0x805A9ACC; // type:object size:0x2 scope:glob voiceMusicRunning = .sbss:0x805A9ACE; // type:object size:0x1 scope:global data:byte voiceFxRunning = .sbss:0x805A9ACF; // type:object size:0x1 scope:global data:byte voiceListInsert = .sbss:0x805A9AD0; // type:object size:0x1 scope:global data:byte -voiceListRoot = .sbss:0x805A9AD1; // type:object size:0x7 scope:global data:byte +voiceListRoot = .sbss:0x805A9AD1; // type:object size:0x1 scope:global data:byte sp = .sbss:0x805A9AD8; // type:object size:0x2 scope:local data:2byte dspARAMZeroBuffer = .sbss:0x805A9AE0; // type:object size:0x4 scope:global data:4byte dspCmdLastLoad = .sbss:0x805A9AE4; // type:object size:0x4 scope:global data:4byte diff --git a/src/musyx/runtime/synthvoice.c b/src/musyx/runtime/synthvoice.c index 9801f47f..f7fad91c 100644 --- a/src/musyx/runtime/synthvoice.c +++ b/src/musyx/runtime/synthvoice.c @@ -10,9 +10,9 @@ SYNTH_VOICELIST voiceList[64]; SYNTH_ROOTLIST voicePrioSortRootList[256]; u8 voicePrioSortVoicesRoot[256]; SYNTH_VOICELIST voicePrioSortVoices[64]; -static u32 vidCurrentId = 0; -static VID_LIST* vidRoot = NULL; static VID_LIST* vidFree = NULL; +static VID_LIST* vidRoot = NULL; +static u32 vidCurrentId = 0; u16 voicePrioSortRootListRoot = 0; u8 voiceMusicRunning = 0; u8 voiceFxRunning = 0;