drinkingtea/nostalgia
2
0
Fork 0
Code Issues 4 Pull Requests Actions Releases 13 Activity

[keel] Change Nostalgia media and preload headers to Keel

Browse Source
This commit is contained in:
Gary Talent
2023-04-01 20:29:24 -05:00
parent 834d01226d
commit a36a642cf5
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/keel/media.cpp
View File

@@ -95,8 +95,8 @@ ox::Error buildUuidMap(Context*) noexcept {
ox::Result<char*> loadRom(ox::CRStringView) noexcept { ox::Result<char*> loadRom(ox::CRStringView) noexcept {
// put the header in the wrong order to prevent mistaking this code for the // put the header in the wrong order to prevent mistaking this code for the
// media section // media section
constexpr auto headerP2 = "HEADER__________"; constexpr auto headerP2 = "R_______________";
constexpr auto headerP1 = "NOSTALGIA_MEDIA_"; constexpr auto headerP1 = "KEEL_MEDIA_HEADE";
constexpr auto headerP1Len = ox_strlen(headerP2); constexpr auto headerP1Len = ox_strlen(headerP2);
constexpr auto headerP2Len = ox_strlen(headerP1); constexpr auto headerP2Len = ox_strlen(headerP1);
constexpr auto headerLen = headerP1Len + headerP2Len; constexpr auto headerLen = headerP1Len + headerP2Len;

4
src/keel/pack.cpp
View File

@@ -213,8 +213,8 @@ 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 = "KEEL_MEDIA_HEADER_______________";
constexpr ox::StringView preloadHdr = "NOSTALGIA_PRELOAD_HEADER________"; constexpr ox::StringView preloadHdr = "KEEL_PRELOAD_HEADER_____________";
constexpr auto hdrSize = 32u; constexpr auto hdrSize = 32u;
static_assert(mediaHdr.bytes() == hdrSize); static_assert(mediaHdr.bytes() == hdrSize);
static_assert(preloadHdr.bytes() == hdrSize); static_assert(preloadHdr.bytes() == hdrSize);

2
src/keel/pack.hpp
View File

@@ -80,6 +80,6 @@ ox::Error appendBinary(ox::Buffer *binBuff, ox::Buffer *fsBuff, GbaPreloader *pl
ox::Error pack(keel::Context *ctx, ox::TypeStore *ts, ox::FileSystem *dest) noexcept; ox::Error pack(keel::Context *ctx, ox::TypeStore *ts, ox::FileSystem *dest) noexcept;
ox::Error preload(ox::TypeStore *ts, ox::FileSystem *src, GbaPreloader *ph) noexcept; ox::Error preload(ox::TypeStore *ts, ox::FileSystem *src, GbaPreloader *pl) noexcept;
} }

4
src/nostalgia/core/gba/core.cpp
View File

@@ -40,8 +40,8 @@ static void initTimer() noexcept {
static ox::Result<std::size_t> findPreloadSection() noexcept { static ox::Result<std::size_t> findPreloadSection() noexcept {
// put the header in the wrong order to prevent mistaking this code for the // put the header in the wrong order to prevent mistaking this code for the
// media section // media section
constexpr auto headerP2 = "D_HEADER________"; constexpr auto headerP2 = "DER_____________";
constexpr auto headerP1 = "NOSTALGIA_PRELOA"; constexpr auto headerP1 = "KEEL_PRELOAD_HEA";
constexpr auto headerP1Len = ox_strlen(headerP2); constexpr auto headerP1Len = ox_strlen(headerP2);
constexpr auto headerP2Len = ox_strlen(headerP1); constexpr auto headerP2Len = ox_strlen(headerP1);
constexpr auto headerLen = headerP1Len + headerP2Len; constexpr auto headerLen = headerP1Len + headerP2Len;