drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 7 Pull Requests Actions Releases 9 Activity

[nostalgia/tools/pack] Improve output and fix a sign conversion

Browse Source
This commit is contained in:
Gary Talent 2022-12-01 00:15:37 -06:00
parent 8329bf9217
commit 0e0f43895a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/nostalgia/tools/pack.cpp
View File

@ -69,8 +69,8 @@ static ox::Error run(const ox::ClArgs &args) noexcept {
oxRequireM(romBuff, readFileBuff(argRomBin.c_str())); oxRequireM(romBuff, readFileBuff(argRomBin.c_str()));
oxReturnError(appendBinary(&romBuff, &dstBuff, pl.get())); oxReturnError(appendBinary(&romBuff, &dstBuff, pl.get()));
oxOutf("new size: {} bytes\n", dstSize); oxOutf("Dest FS size: {} bytes\n", dstSize);
oxOutf("preload buff size: {} bytes\n", pl->buff().size()); oxOutf("Preload buff size: {} bytes\n", pl->buff().size());
oxOutf("ROM buff size: {} bytes\n", romBuff.size()); oxOutf("ROM buff size: {} bytes\n", romBuff.size());
oxReturnError(writeFileBuff(argRomBin, romBuff)); oxReturnError(writeFileBuff(argRomBin, romBuff));

2
src/nostalgia/tools/pack/pack.cpp
View File

@ -188,7 +188,7 @@ static ox::Error padbin(ox::BufferWriter *w, unsigned factor) noexcept {
ox::Error appendBinary(ox::Buffer *binBuff, ox::Buffer *fsBuff, GbaPreloader *pl) noexcept { ox::Error appendBinary(ox::Buffer *binBuff, ox::Buffer *fsBuff, GbaPreloader *pl) noexcept {
constexpr ox::StringView mediaHdr = "NOSTALGIA_MEDIA_HEADER__________"; constexpr ox::StringView mediaHdr = "NOSTALGIA_MEDIA_HEADER__________";
constexpr ox::StringView preloadHdr = "NOSTALGIA_PRELOAD_HEADER________"; constexpr ox::StringView preloadHdr = "NOSTALGIA_PRELOAD_HEADER________";
constexpr auto hdrSize = 32; constexpr auto hdrSize = 32u;
static_assert(mediaHdr.bytes() == hdrSize); static_assert(mediaHdr.bytes() == hdrSize);
static_assert(preloadHdr.bytes() == hdrSize); static_assert(preloadHdr.bytes() == hdrSize);
ox::BufferWriter w(binBuff); ox::BufferWriter w(binBuff);