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

Update assets

This commit is contained in:
jaby 2024-12-31 18:36:02 +01:00
parent aaf7f762c5
commit b09c8d3a18
9 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
examples/PoolBox/.gitignore vendored
View File

@ -4,5 +4,4 @@
*.d *.d
*.o *.o
*.lba *.lba
**/bin **/bin
**/audio/temp/*

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

@ -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); 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)); 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)); 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", cd_player.is_xa ? "CD-XA" : "CD-DA"); 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) { if(Shared::load_test) {
// Force state change if we are in the load_test state // Force state change if we are in the load_test state

12
examples/PoolBox/assets/Makefile
View File

@ -7,7 +7,7 @@ CLUT_4_COLOR_TRANS_FLAGS = simple-tim clut4 --color-trans
# Ressources to convert # Ressources to convert
## Music tracks ## Music tracks
INPUT += $(OUTPUT_DIR)/Evacuation_cdda.xa 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)/apple.vag
INPUT += $(OUTPUT_DIR)/blubb-mono.vag INPUT += $(OUTPUT_DIR)/blubb-mono.vag
INPUT += $(OUTPUT_DIR)/Friendship_samp.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 INPUT += $(OUTPUT_DIR)/AllTheJaby.tim
AllTheJaby_TIM_FLAGS = tim full16 --tex-pos {0,0} AllTheJaby_TIM_FLAGS = tim full16 --tex-pos {0,0}
$(OUTPUT_DIR)/fox.xa: audio/temp/fox.wav $(OUTPUT_DIR)/%.vag: audio/%.wav
@mkdir -p $(OUTPUT_DIR)
psxfileconv $< -o $@ xa
$(OUTPUT_DIR)/%.vag: audio/temp/%.wav
@mkdir -p $(OUTPUT_DIR) @mkdir -p $(OUTPUT_DIR)
psxfileconv --lz4 $< -o $@ vag 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 $(OUTPUT_DIR)/%.xa: audio/%.wav
@mkdir -p $(OUTPUT_DIR) @mkdir -p $(OUTPUT_DIR)
psxfileconv $< -o $@ xa psxfileconv $< -o $@ xa

BIN
examples/PoolBox/assets/audio/Friendship_samp.wav (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
examples/PoolBox/assets/audio/OnMyOwn_BailBonds.mp3 (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
examples/PoolBox/assets/audio/apple.wav (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
examples/PoolBox/assets/audio/blubb-mono.wav (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
examples/PoolBox/assets/audio/jlbrock44_Three_Kings_Funk_cdda_ready.wav (Stored with Git LFS) Normal file
View File

Binary file not shown.

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

@ -47,7 +47,7 @@
<Directory name = "XAAUDIO" hidden = "true"> <Directory name = "XAAUDIO" hidden = "true">
<InterleavedFile name = "MIX.XA"> <InterleavedFile name = "MIX.XA">
<Channel>../assets/bin/Evacuation_cdda.xa</Channel> <Channel>../assets/bin/Evacuation_cdda.xa</Channel>
<Channel>../assets/bin/fox.xa</Channel> <Channel>../assets/bin/OnMyOwn_BailBonds.xa</Channel>
</InterleavedFile> </InterleavedFile>
</Directory> </Directory>
<Directory name = "SFX" hidden = "true"> <Directory name = "SFX" hidden = "true">
@ -56,5 +56,5 @@
<File name = "FRIEND.VAG" lz4 = "already">../assets/bin/Friendship_samp.vag</File> <File name = "FRIEND.VAG" lz4 = "already">../assets/bin/Friendship_samp.vag</File>
</Directory> </Directory>
</Filesystem> </Filesystem>
<AudioTrack align = "true">../assets/audio/temp/breaking.wav</AudioTrack> <AudioTrack align = "true">../assets/audio/jlbrock44_Three_Kings_Funk_cdda_ready.wav</AudioTrack>
</PSXCD> </PSXCD>