jaby/jabyengine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Play nice jingle and more clean-up

Browse Source
This commit is contained in:
Jaby
2024-10-05 17:43:16 +02:00
parent 6a1c5e704a
commit 74f3da97f6
12 changed files with 14 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/PoolBox/application/src/Custom/custom_files.hpp
View File

@@ -7,7 +7,7 @@ enum struct FileType : JabyEngine::CDFileType_t {
struct CustomCDFileBuilder {
static constexpr JabyEngine::CDFile jingle(uint32_t sfx_id) {
// TODO: This currently re-loads Paco; We should make this treat it's own file!
// v we reload Paco
return JabyEngine::CDFile::custom(0, FileType::Jingle, sfx_id);
}
};

2
examples/PoolBox/application/src/Custom/file_parser.cpp
View File

@@ -9,7 +9,7 @@ namespace JabyEngine {
};
static Progress parse_jingle(State::Configuration& config, JingleState& jingle) {
printf("Playing jingle: %i\n", jingle.sfx_id);
SPU::voice[jingle.sfx_id].play();
return Progress::Done;
}

3
examples/PoolBox/application/src/application.cpp
View File

@@ -170,7 +170,6 @@ static void setup() {
break;
}
},MenuEntries);
cd_player.play();
}
@@ -289,8 +288,8 @@ namespace LoadingScene {
void main() {
const auto& controller = Periphery::get_primary_controller_as<JabyEngine::Periphery::GenericController>();
setup();
while(true) {
if(state_changer.contains_state()) {
LoadingScene::run();

4
examples/PoolBox/application/src/asset_mgr.cpp
View File

@@ -20,6 +20,7 @@ namespace Assets {
__jabyengine_request_lba_for(JABY_LOAD, "ASSETS/MAIN/LOAD.IMG"),
__jabyengine_request_lba_for(APPLE_SFX, "SFX/APPLE.VAG"),
__jabyengine_request_lba_for(BLUBB_SFX, "SFX/BLUBB.VAG"),
__jabyengine_request_lba_for(FRIEND_SFX, "SFX/FRIEND.VAG"),
__jabyengine_request_lba_for(MIX_XA, "XAAUDIO/MIX.XA"),
__jabyengine_request_lba_for(BIOS_INFO_OVL, "BIO.BIN"),
__jabyengine_request_lba_for(GPU_TEST_OVL, "GTO.BIN"),
@@ -69,7 +70,8 @@ namespace Assets {
CDFileBuilder::simple_tim(LBA::JABY_LOAD, JabyLoader::TIMLoaction),
CDFileBuilder::sony_vag(LBA::APPLE_SFX, VAG::create(0, 1.0_vol)),
CDFileBuilder::sony_vag(LBA::BLUBB_SFX, VAG::create(1, 1.0_vol)),
CustomCDFileBuilder::jingle(32),
CDFileBuilder::sony_vag(LBA::FRIEND_SFX, VAG::create(2, 1.0_vol)),
CustomCDFileBuilder::jingle(2),
};
void load() {

BIN
examples/PoolBox/assets/JabyTails.png (Stored with Git LFS)
View File

Binary file not shown.

1
examples/PoolBox/assets/Makefile
View File

@@ -14,6 +14,7 @@ INPUT += $(OUTPUT_DIR)/Evacuation_cdda.xa
INPUT += $(OUTPUT_DIR)/fox.xa
INPUT += $(OUTPUT_DIR)/apple.vag
INPUT += $(OUTPUT_DIR)/blubb.vag
INPUT += $(OUTPUT_DIR)/Friendship_samp.vag
## Images
INPUT += $(OUTPUT_DIR)/TexturePage.img

5
examples/PoolBox/iso/Config.xml
View File

@@ -49,8 +49,9 @@
</InterleavedFile>
</Directory>
<Directory name = "SFX" hidden = "true">
<File name = "APPLE.VAG" lz4 = "already">../assets/bin/apple.vag</File>
<File name = "BLUBB.VAG" lz4 = "already">../assets/bin/blubb.vag</File>
<File name = "APPLE.VAG" lz4 = "already">../assets/bin/apple.vag</File>
<File name = "BLUBB.VAG" lz4 = "already">../assets/bin/blubb.vag</File>
<File name = "FRIEND.VAG">../assets/tmp.vag</File><!--TODO: Find working vag tool-->
</Directory>
</Filesystem>
<AudioTrack align = "true">../assets/audio/temp/breaking.wav</AudioTrack>