diff options
| author | coco875 <59367621+coco875@users.noreply.github.com> | 2025-07-01 23:42:14 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-07-01 17:42:14 -0600 |
| commit | 7937896598f3df46eb78c158bde787bc4f12ad7f (patch) | |
| tree | 876548daaec2f8a5bb284374d834abcf9aad15b9 /src/audio/seqplayer.c | |
| parent | b57afa83b42bb14e526043be4ca9f6e322788edb (diff) | |
make some texture more flexible and editable + port documentation from the decomp + fix some bug (#309)
* support a more flexible background
* remove useless function
* rename of some font
* experimental png
* migrate to the new initdata
* fix skybox and adjust minimap
* format in audio
* simplify player render
* simplify shell render and support custom texture of shell
* clean redshell texture
* format and multiple fix
* some update of name
* allow change icon of character
* more rename
* continue rename
* more documentation and simplification
* change lus and continue rename
* continue rename
* few fix for asan
* fix ghost
* Update menu_items.c
* fix mac error
* some test of tweak for texture
* some tweak
* some button constant
* finish fix ghost
* Update menu_items.c
* Update render_objects.c
* Update menu_items.c
* Update libultraship
* Update libultraship
* Delete valgrind.report
* Update libultraship
* callgrind benchmark
* Update valgrind_callgrind.sh
* fix animation
* some rename
* remove useless submodule
* Update libultraship
* fix assets
* fix mistake
* fix more mistake
* Update menu_items.c
* sync more rename with the decom + fix review
* fix a mistake
* fix more mistake
* re add the limit of fps
* fix some hd texture and minimap
* fix a name
* Update menu_items.c
* fix a regression
* fix some segment 5 texture (not all)
* Update camera.c
* improve performance of custom sprite
* fix flatten bug and add documentation on player vertex
* Update render_player.c
* fix data menu
* fix trophy for 50 and 150
* Update memory.c
* Update code_80057C60.c
* fix ghost
* fix boo tlut
* fix a mistake in yaml
* fix yaml
* Update common_data.yml
* add comment for segment 3
* allow even more change in texture
* Update common_data.yml
* Update update.inc.c
* Update camera.c
* Update some_data.c
* wip changes
* Update other_textures.yml
* More changes
* Update update_objects.c
* Fix compile
* Update memory.c
* Update memory.c
---------
Co-authored-by: MegaMech <MegaMech@users.noreply.github.com>
Diffstat (limited to 'src/audio/seqplayer.c')
| -rw-r--r-- | src/audio/seqplayer.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/audio/seqplayer.c b/src/audio/seqplayer.c index c25eb8196..7b66d1058 100644 --- a/src/audio/seqplayer.c +++ b/src/audio/seqplayer.c @@ -11,6 +11,8 @@ #include "audio/external.h" #include "port/Engine.h" +#include <stdio.h> + /** * Given that (almost) all of these are format strings, it is highly likely * that they are meant to be used in some sort of printf variant. But I don't @@ -733,14 +735,15 @@ void seq_channel_layer_process_script(struct SequenceChannelLayer* layer) { if (seqChannel) {} } -u8 get_instrument(struct SequenceChannel *seqChannel, u8 instId, struct Instrument **instOut, struct AdsrSettings *adsr) { - struct CtlEntry *bank = GameEngine_LoadBank(seqChannel->bankId); - if(instId >= bank->numInstruments) { +u8 get_instrument(struct SequenceChannel* seqChannel, u8 instId, struct Instrument** instOut, + struct AdsrSettings* adsr) { + struct CtlEntry* bank = GameEngine_LoadBank(seqChannel->bankId); + if (instId >= bank->numInstruments) { *instOut = NULL; return 0; } struct Instrument* inst = bank->instruments[instId]; - if(inst == NULL) { + if (inst == NULL) { *instOut = NULL; return 0; } @@ -911,9 +914,9 @@ void sequence_channel_process_script(struct SequenceChannel* seqChannel) { case 0xEB: { cmd = m64_read_u8(state); - struct AudioSequenceData *sequence = GameEngine_LoadSequence(seqPlayer->seqId); + struct AudioSequenceData* sequence = GameEngine_LoadSequence(seqPlayer->seqId); cmd = sequence->banks[cmd]; - if(IS_BANK_LOAD_COMPLETE(cmd)) { + if (IS_BANK_LOAD_COMPLETE(cmd)) { seqChannel->bankId = cmd; } } @@ -1009,9 +1012,9 @@ void sequence_channel_process_script(struct SequenceChannel* seqChannel) { case 0xC6: { cmd = m64_read_u8(state); - struct AudioSequenceData *sequence = GameEngine_LoadSequence(seqPlayer->seqId); + struct AudioSequenceData* sequence = GameEngine_LoadSequence(seqPlayer->seqId); cmd = sequence->banks[cmd]; - if(IS_BANK_LOAD_COMPLETE(cmd)) { + if (IS_BANK_LOAD_COMPLETE(cmd)) { seqChannel->bankId = cmd; } break; @@ -1214,7 +1217,7 @@ void sequence_player_process_sequence(struct SequencePlayer* seqPlayer) { if (seqPlayer->enabled == false) { return; } - + GameEngine_LoadSequence(seqPlayer->seqId); GameEngine_LoadBank(seqPlayer->defaultBank[0]); |
