From 842aeabb9b0d2301e81e4bc956b9d517458727e9 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Wed, 17 Jul 2024 20:26:38 -0400 Subject: [PATCH] JASSeqParser: Fix data order --- src/JSystem/JAudio/JASSeqParser.cpp | 268 ++++++++++++++-------------- 1 file changed, 134 insertions(+), 134 deletions(-) diff --git a/src/JSystem/JAudio/JASSeqParser.cpp b/src/JSystem/JAudio/JASSeqParser.cpp index efd5cda8b..e7fe2c973 100644 --- a/src/JSystem/JAudio/JASSeqParser.cpp +++ b/src/JSystem/JAudio/JASSeqParser.cpp @@ -10,6 +10,140 @@ #include "JSystem/JSupport/JSupport.h" #include "JSystem/JUtility/JUTAssert.h" +int (JASystem::TSeqParser::*JASystem::TSeqParser::sCmdPList[64])(JASystem::TTrack*, u32*) = { + NULL, + &JASystem::TSeqParser::cmdOpenTrack, + &JASystem::TSeqParser::cmdOpenTrackBros, + NULL, + &JASystem::TSeqParser::cmdCall, + NULL, + &JASystem::TSeqParser::cmdRet, + NULL, + &JASystem::TSeqParser::cmdJmp, + &JASystem::TSeqParser::cmdLoopS, + &JASystem::TSeqParser::cmdLoopE, + &JASystem::TSeqParser::cmdReadPort, + &JASystem::TSeqParser::cmdWritePort, + &JASystem::TSeqParser::cmdCheckPortImport, + &JASystem::TSeqParser::cmdCheckPortExport, + &JASystem::TSeqParser::cmdWait, + NULL, + &JASystem::TSeqParser::cmdParentWritePort, + &JASystem::TSeqParser::cmdChildWritePort, + NULL, + &JASystem::TSeqParser::cmdSetLastNote, + &JASystem::TSeqParser::cmdTimeRelate, + &JASystem::TSeqParser::cmdSimpleOsc, + &JASystem::TSeqParser::cmdSimpleEnv, + &JASystem::TSeqParser::cmdSimpleADSR, + &JASystem::TSeqParser::cmdTranspose, + &JASystem::TSeqParser::cmdCloseTrack, + &JASystem::TSeqParser::cmdOutSwitch, + &JASystem::TSeqParser::cmdUpdateSync, + &JASystem::TSeqParser::cmdBusConnect, + &JASystem::TSeqParser::cmdPauseStatus, + &JASystem::TSeqParser::cmdSetInterrupt, + &JASystem::TSeqParser::cmdDisInterrupt, + &JASystem::TSeqParser::cmdClrI, + &JASystem::TSeqParser::cmdSetI, + &JASystem::TSeqParser::cmdRetI, + &JASystem::TSeqParser::cmdIntTimer, + &JASystem::TSeqParser::cmdVibDepth, + &JASystem::TSeqParser::cmdVibDepthMidi, + &JASystem::TSeqParser::cmdSyncCPU, + &JASystem::TSeqParser::cmdFlushAll, + &JASystem::TSeqParser::cmdFlushRelease, + &JASystem::TSeqParser::cmdWait, + &JASystem::TSeqParser::cmdPanPowSet, + &JASystem::TSeqParser::cmdIIRSet, + &JASystem::TSeqParser::cmdFIRSet, + &JASystem::TSeqParser::cmdEXTSet, + &JASystem::TSeqParser::cmdPanSwSet, + &JASystem::TSeqParser::cmdOscRoute, + &JASystem::TSeqParser::cmdIIRCutOff, + &JASystem::TSeqParser::cmdOscFull, + &JASystem::TSeqParser::cmdVolumeMode, + &JASystem::TSeqParser::cmdVibPitch, + NULL, + NULL, + NULL, + NULL, + NULL, + &JASystem::TSeqParser::cmdCheckWave, + &JASystem::TSeqParser::cmdPrintf, + &JASystem::TSeqParser::cmdNop, + &JASystem::TSeqParser::cmdTempo, + &JASystem::TSeqParser::cmdTimeBase, + &JASystem::TSeqParser::cmdFinish, +}; + +const u16 JASystem::Arglist[0x40][2] = { + {0x0000, 0x0000}, + {0x0002, 0x0008}, + {0x0002, 0x0008}, + {0x0001, 0x0002}, + {0x0000, 0x0000}, + {0x0000, 0x0000}, + {0x0001, 0x0000}, + {0x0001, 0x0002}, + {0x0000, 0x0000}, + {0x0001, 0x0001}, + {0x0000, 0x0000}, + {0x0002, 0x0000}, + {0x0002, 0x000C}, + {0x0001, 0x0000}, + {0x0001, 0x0000}, + {0x0001, 0x0003}, + {0x0000, 0x0000}, + {0x0002, 0x000C}, + {0x0002, 0x000C}, + {0x0000, 0x0000}, + {0x0001, 0x0000}, + {0x0001, 0x0000}, + {0x0001, 0x0000}, + {0x0002, 0x0008}, + {0x0005, 0x0155}, + {0x0001, 0x0000}, + {0x0001, 0x0000}, + {0x0001, 0x0000}, + {0x0001, 0x0001}, + {0x0002, 0x0004}, + {0x0001, 0x0000}, + {0x0002, 0x0008}, + {0x0001, 0x0000}, + {0x0000, 0x0000}, + {0x0000, 0x0000}, + {0x0000, 0x0000}, + {0x0002, 0x0004}, + {0x0001, 0x0000}, + {0x0001, 0x0001}, + {0x0001, 0x0001}, + {0x0000, 0x0000}, + {0x0000, 0x0000}, + {0x0001, 0x0002}, + {0x0005, 0x0000}, + {0x0004, 0x0055}, + {0x0001, 0x0002}, + {0x0001, 0x0002}, + {0x0003, 0x0000}, + {0x0001, 0x0000}, + {0x0001, 0x0000}, + {0x0003, 0x0028}, + {0x0001, 0x0000}, + {0x0001, 0x0000}, + {0x0000, 0x0000}, + {0x0000, 0x0000}, + {0x0000, 0x0000}, + {0x0000, 0x0000}, + {0x0000, 0x0000}, + {0x0001, 0x0001}, + {0x0000, 0x0000}, + {0x0000, 0x0000}, + {0x0001, 0x0001}, + {0x0001, 0x0001}, + {0x0000, 0x0000}, +}; + /* 8027E680-8027E728 .text cmdOpenTrack__Q28JASystem10TSeqParserFPQ28JASystem6TTrackPUl */ int JASystem::TSeqParser::cmdOpenTrack(TTrack* track, u32* args) { u32 param1 = args[0]; @@ -848,137 +982,3 @@ int JASystem::TSeqParser::parseSeq(TTrack* track) { return 0; } - -int (JASystem::TSeqParser::*JASystem::TSeqParser::sCmdPList[64])(JASystem::TTrack*, u32*) = { - NULL, - &JASystem::TSeqParser::cmdOpenTrack, - &JASystem::TSeqParser::cmdOpenTrackBros, - NULL, - &JASystem::TSeqParser::cmdCall, - NULL, - &JASystem::TSeqParser::cmdRet, - NULL, - &JASystem::TSeqParser::cmdJmp, - &JASystem::TSeqParser::cmdLoopS, - &JASystem::TSeqParser::cmdLoopE, - &JASystem::TSeqParser::cmdReadPort, - &JASystem::TSeqParser::cmdWritePort, - &JASystem::TSeqParser::cmdCheckPortImport, - &JASystem::TSeqParser::cmdCheckPortExport, - &JASystem::TSeqParser::cmdWait, - NULL, - &JASystem::TSeqParser::cmdParentWritePort, - &JASystem::TSeqParser::cmdChildWritePort, - NULL, - &JASystem::TSeqParser::cmdSetLastNote, - &JASystem::TSeqParser::cmdTimeRelate, - &JASystem::TSeqParser::cmdSimpleOsc, - &JASystem::TSeqParser::cmdSimpleEnv, - &JASystem::TSeqParser::cmdSimpleADSR, - &JASystem::TSeqParser::cmdTranspose, - &JASystem::TSeqParser::cmdCloseTrack, - &JASystem::TSeqParser::cmdOutSwitch, - &JASystem::TSeqParser::cmdUpdateSync, - &JASystem::TSeqParser::cmdBusConnect, - &JASystem::TSeqParser::cmdPauseStatus, - &JASystem::TSeqParser::cmdSetInterrupt, - &JASystem::TSeqParser::cmdDisInterrupt, - &JASystem::TSeqParser::cmdClrI, - &JASystem::TSeqParser::cmdSetI, - &JASystem::TSeqParser::cmdRetI, - &JASystem::TSeqParser::cmdIntTimer, - &JASystem::TSeqParser::cmdVibDepth, - &JASystem::TSeqParser::cmdVibDepthMidi, - &JASystem::TSeqParser::cmdSyncCPU, - &JASystem::TSeqParser::cmdFlushAll, - &JASystem::TSeqParser::cmdFlushRelease, - &JASystem::TSeqParser::cmdWait, - &JASystem::TSeqParser::cmdPanPowSet, - &JASystem::TSeqParser::cmdIIRSet, - &JASystem::TSeqParser::cmdFIRSet, - &JASystem::TSeqParser::cmdEXTSet, - &JASystem::TSeqParser::cmdPanSwSet, - &JASystem::TSeqParser::cmdOscRoute, - &JASystem::TSeqParser::cmdIIRCutOff, - &JASystem::TSeqParser::cmdOscFull, - &JASystem::TSeqParser::cmdVolumeMode, - &JASystem::TSeqParser::cmdVibPitch, - NULL, - NULL, - NULL, - NULL, - NULL, - &JASystem::TSeqParser::cmdCheckWave, - &JASystem::TSeqParser::cmdPrintf, - &JASystem::TSeqParser::cmdNop, - &JASystem::TSeqParser::cmdTempo, - &JASystem::TSeqParser::cmdTimeBase, - &JASystem::TSeqParser::cmdFinish, -}; - -const u16 JASystem::Arglist[0x40][2] = { - {0x0000, 0x0000}, - {0x0002, 0x0008}, - {0x0002, 0x0008}, - {0x0001, 0x0002}, - {0x0000, 0x0000}, - {0x0000, 0x0000}, - {0x0001, 0x0000}, - {0x0001, 0x0002}, - {0x0000, 0x0000}, - {0x0001, 0x0001}, - {0x0000, 0x0000}, - {0x0002, 0x0000}, - {0x0002, 0x000C}, - {0x0001, 0x0000}, - {0x0001, 0x0000}, - {0x0001, 0x0003}, - {0x0000, 0x0000}, - {0x0002, 0x000C}, - {0x0002, 0x000C}, - {0x0000, 0x0000}, - {0x0001, 0x0000}, - {0x0001, 0x0000}, - {0x0001, 0x0000}, - {0x0002, 0x0008}, - {0x0005, 0x0155}, - {0x0001, 0x0000}, - {0x0001, 0x0000}, - {0x0001, 0x0000}, - {0x0001, 0x0001}, - {0x0002, 0x0004}, - {0x0001, 0x0000}, - {0x0002, 0x0008}, - {0x0001, 0x0000}, - {0x0000, 0x0000}, - {0x0000, 0x0000}, - {0x0000, 0x0000}, - {0x0002, 0x0004}, - {0x0001, 0x0000}, - {0x0001, 0x0001}, - {0x0001, 0x0001}, - {0x0000, 0x0000}, - {0x0000, 0x0000}, - {0x0001, 0x0002}, - {0x0005, 0x0000}, - {0x0004, 0x0055}, - {0x0001, 0x0002}, - {0x0001, 0x0002}, - {0x0003, 0x0000}, - {0x0001, 0x0000}, - {0x0001, 0x0000}, - {0x0003, 0x0028}, - {0x0001, 0x0000}, - {0x0001, 0x0000}, - {0x0000, 0x0000}, - {0x0000, 0x0000}, - {0x0000, 0x0000}, - {0x0000, 0x0000}, - {0x0000, 0x0000}, - {0x0001, 0x0001}, - {0x0000, 0x0000}, - {0x0000, 0x0000}, - {0x0001, 0x0001}, - {0x0001, 0x0001}, - {0x0000, 0x0000}, -};