From 51620e2082664d72a83abbf4faef6e563821db56 Mon Sep 17 00:00:00 2001 From: Jaby Date: Tue, 31 Dec 2024 18:36:02 +0100 Subject: [PATCH] Update assets --- examples/PoolBox/.gitignore | 3 +-- examples/PoolBox/application/src/application.cpp | 4 ++-- examples/PoolBox/assets/Makefile | 12 ++++++------ examples/PoolBox/assets/audio/Friendship_samp.wav | 3 +++ examples/PoolBox/assets/audio/OnMyOwn_BailBonds.mp3 | 3 +++ examples/PoolBox/assets/audio/apple.wav | 3 +++ examples/PoolBox/assets/audio/blubb-mono.wav | 3 +++ .../audio/jlbrock44_Three_Kings_Funk_cdda_ready.wav | 3 +++ examples/PoolBox/iso/Config.xml | 4 ++-- 9 files changed, 26 insertions(+), 12 deletions(-) create mode 100644 examples/PoolBox/assets/audio/Friendship_samp.wav create mode 100644 examples/PoolBox/assets/audio/OnMyOwn_BailBonds.mp3 create mode 100644 examples/PoolBox/assets/audio/apple.wav create mode 100644 examples/PoolBox/assets/audio/blubb-mono.wav create mode 100644 examples/PoolBox/assets/audio/jlbrock44_Three_Kings_Funk_cdda_ready.wav diff --git a/examples/PoolBox/.gitignore b/examples/PoolBox/.gitignore index 857bdbdb..32e75896 100644 --- a/examples/PoolBox/.gitignore +++ b/examples/PoolBox/.gitignore @@ -4,5 +4,4 @@ *.d *.o *.lba -**/bin -**/audio/temp/* \ No newline at end of file +**/bin \ No newline at end of file diff --git a/examples/PoolBox/application/src/application.cpp b/examples/PoolBox/application/src/application.cpp index dc45dece..11b9c4b8 100644 --- a/examples/PoolBox/application/src/application.cpp +++ b/examples/PoolBox/application/src/application.cpp @@ -206,8 +206,8 @@ namespace NormalScene { FontWriter::new_font_writer.write(cursor.change_position(Make::PositionI16((GPU::Display::Width-VersionLength)/2, 16 + DefaultFont::Info.get_kern_size().height)), Version, GPU::Color24::Green(0xD0), &FontWriter::wiggle); menu.update(FontWriter::bios_font_writer, cursor, Make::PositionI16(8, 64)); - cursor.change_position(Make::PositionI16(doener_fish.position.x + doener_fish.size.width, GPU::Display::Height - 32)); - FontWriter::bios_font_writer.write(cursor, "Audio:\n%s", cd_player.is_xa ? "CD-XA" : "CD-DA"); + cursor.change_position(Make::PositionI16(doener_fish.position.x + doener_fish.size.width, GPU::Display::Height - 48)); + FontWriter::bios_font_writer.write(cursor, "Audio:\n%s\n(SEL/R1/R2)", cd_player.is_xa ? "CD-XA" : "CD-DA"); if(Shared::load_test) { // Force state change if we are in the load_test state diff --git a/examples/PoolBox/assets/Makefile b/examples/PoolBox/assets/Makefile index 70b39b3f..dc7fc71f 100644 --- a/examples/PoolBox/assets/Makefile +++ b/examples/PoolBox/assets/Makefile @@ -7,7 +7,7 @@ CLUT_4_COLOR_TRANS_FLAGS = simple-tim clut4 --color-trans # Ressources to convert ## Music tracks INPUT += $(OUTPUT_DIR)/Evacuation_cdda.xa -INPUT += $(OUTPUT_DIR)/fox.xa +INPUT += $(OUTPUT_DIR)/OnMyOwn_BailBonds.xa INPUT += $(OUTPUT_DIR)/apple.vag INPUT += $(OUTPUT_DIR)/blubb-mono.vag INPUT += $(OUTPUT_DIR)/Friendship_samp.vag @@ -40,14 +40,14 @@ IMG_6921_TIM_FLAGS = tim full16 --clut-pos {384,255} --tex-pos {384,256} INPUT += $(OUTPUT_DIR)/AllTheJaby.tim AllTheJaby_TIM_FLAGS = tim full16 --tex-pos {0,0} -$(OUTPUT_DIR)/fox.xa: audio/temp/fox.wav - @mkdir -p $(OUTPUT_DIR) - psxfileconv $< -o $@ xa - -$(OUTPUT_DIR)/%.vag: audio/temp/%.wav +$(OUTPUT_DIR)/%.vag: audio/%.wav @mkdir -p $(OUTPUT_DIR) psxfileconv --lz4 $< -o $@ vag +$(OUTPUT_DIR)/OnMyOwn_BailBonds.xa: audio/OnMyOwn_BailBonds.mp3 + @mkdir -p $(OUTPUT_DIR) + psxfileconv $< -o $@ xa + $(OUTPUT_DIR)/%.xa: audio/%.wav @mkdir -p $(OUTPUT_DIR) psxfileconv $< -o $@ xa diff --git a/examples/PoolBox/assets/audio/Friendship_samp.wav b/examples/PoolBox/assets/audio/Friendship_samp.wav new file mode 100644 index 00000000..ed141ca8 --- /dev/null +++ b/examples/PoolBox/assets/audio/Friendship_samp.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cf9912a199e7b09f064ce96a0f84d60b2521aa3bf5f27b0f03157a100ed79d6e +size 184364 diff --git a/examples/PoolBox/assets/audio/OnMyOwn_BailBonds.mp3 b/examples/PoolBox/assets/audio/OnMyOwn_BailBonds.mp3 new file mode 100644 index 00000000..ed219df9 --- /dev/null +++ b/examples/PoolBox/assets/audio/OnMyOwn_BailBonds.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bcfdb99621b65241e027ffac7a31f499356b732124045698386bf35cc1aa99d9 +size 8193082 diff --git a/examples/PoolBox/assets/audio/apple.wav b/examples/PoolBox/assets/audio/apple.wav new file mode 100644 index 00000000..8562b61f --- /dev/null +++ b/examples/PoolBox/assets/audio/apple.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:822e8486397f99d2cc060c02a2364cb9e3805bc2326d1fc44d88153f53a31787 +size 57204 diff --git a/examples/PoolBox/assets/audio/blubb-mono.wav b/examples/PoolBox/assets/audio/blubb-mono.wav new file mode 100644 index 00000000..c70774b0 --- /dev/null +++ b/examples/PoolBox/assets/audio/blubb-mono.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:164d2f75349bcce06413d8e8de0ce346ccfc6303e3fc014e4cc8cb97b3c57feb +size 23320 diff --git a/examples/PoolBox/assets/audio/jlbrock44_Three_Kings_Funk_cdda_ready.wav b/examples/PoolBox/assets/audio/jlbrock44_Three_Kings_Funk_cdda_ready.wav new file mode 100644 index 00000000..22901976 --- /dev/null +++ b/examples/PoolBox/assets/audio/jlbrock44_Three_Kings_Funk_cdda_ready.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:db843da5092202b9c63331c69fd80d1639e6d2055211795ede327bf3460fcc44 +size 39023054 diff --git a/examples/PoolBox/iso/Config.xml b/examples/PoolBox/iso/Config.xml index a78b36f2..1a144b2b 100644 --- a/examples/PoolBox/iso/Config.xml +++ b/examples/PoolBox/iso/Config.xml @@ -47,7 +47,7 @@ - ../assets/audio/temp/breaking.wav + ../assets/audio/jlbrock44_Three_Kings_Funk_cdda_ready.wav \ No newline at end of file