gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-20 10:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make requested revisions to recent PRs (#1195)

Browse Source
This commit is contained in:
Rangi
2023-11-07 17:11:08 -05:00
committed by GitHub
parent 05a0905582
commit 5379e51094
4 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/fix/main.cpp
View File

@@ -1416,7 +1416,7 @@ do { \
if (ramSize != UNSPECIFIED && (cartridgeType & 0xFF00) == 0) {
if (cartridgeType == ROM_RAM || cartridgeType == ROM_RAM_BATTERY) {
if (ramSize != 1)
fprintf(stderr, "warning: MBC \"%s\" should have 2kiB of RAM (-r 1)\n",
fprintf(stderr, "warning: MBC \"%s\" should have 2 KiB of RAM (-r 1)\n",
mbcName(cartridgeType));
} else if (hasRAM(cartridgeType)) {
if (!ramSize) {
@@ -1425,7 +1425,7 @@ do { \
mbcName(cartridgeType));
} else if (ramSize == 1) {
fprintf(stderr,
"warning: RAM size 1 (2 kiB) was specified for MBC \"%s\"\n",
"warning: RAM size 1 (2 KiB) was specified for MBC \"%s\"\n",
mbcName(cartridgeType));
} // TODO: check possible values?
} else if (ramSize) {

6
src/link/object.cpp
View File

@@ -503,10 +503,10 @@ void obj_ReadFile(char const *fileName, unsigned int fileID)
tryReadlong(revNum, file, "%s: Cannot read revision number: %s",
fileName);
if (revNum != RGBDS_OBJECT_REV)
errx("%s: Unsupported object file for rgblink %s; try rebuilding it%s"
errx("%s: Unsupported object file for rgblink %s; try rebuilding \"%s\"%s"
" (expected revision %d, got %d)", fileName, get_package_version_string(),
revNum > RGBDS_OBJECT_REV ? " or updating rgblink" : "", RGBDS_OBJECT_REV,
revNum);
fileName, revNum > RGBDS_OBJECT_REV ? " or updating rgblink" : "",
RGBDS_OBJECT_REV, revNum);
uint32_t nbSymbols;
uint32_t nbSections;