Skip to content

Commit

Permalink
Make requested revisions to recent PRs
Browse files Browse the repository at this point in the history
  • Loading branch information
Rangi42 committed Nov 1, 2023
1 parent 32bc68d commit d8032c0
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 8 deletions.
2 changes: 1 addition & 1 deletion man/rgbasm.1
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ This acts as if a
was read before the input
.Ar asmfile .
.It Fl p Ar pad_value , Fl Fl pad-value Ar pad_value
Use this as the fill value for
Use this as the value for
.Ic DS
directives in ROM sections, unless they specify their own value or values.
The default is 0x00.
Expand Down
8 changes: 6 additions & 2 deletions man/rgbasm.5
Original file line number Diff line number Diff line change
Expand Up @@ -414,8 +414,12 @@ Most of them return a string, however some of these functions actually return an
.It Fn STRIN str1 str2 Ta Returns the first position of Ar str2 No in Ar str1 No or zero if it's not present Pq first character is position 1 .
.It Fn STRRIN str1 str2 Ta Returns the last position of Ar str2 No in Ar str1 No or zero if it's not present Pq first character is position 1 .
.It Fn STRSUB str pos len Ta Returns a substring from Ar str No starting at Ar pos No (first character is position 1, last is position -1) and Ar len No characters long. If Ar len No is not specified the substring continues to the end of Ar str .
.It Fn STRUPR str Ta Returns Ar str No with all ASCII letters (`a-z`) in uppercase.
.It Fn STRLWR str Ta Returns Ar str No with all ASCII letters (`A-Z`) in lowercase.
.It Fn STRUPR str Ta Returns Ar str No with all ASCII letters
.Pq Ql a-z
in uppercase.
.It Fn STRLWR str Ta Returns Ar str No with all ASCII letters
.Pq Ql A-Z
in lowercase.
.It Fn STRRPL str old new Ta Returns Ar str No with each non-overlapping occurrence of the substring Ar old No replaced with Ar new .
.It Fn STRFMT fmt args... Ta Returns the string Ar fmt No with each
.Ql %spec
Expand Down
4 changes: 2 additions & 2 deletions src/fix/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -1415,7 +1415,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) {
Expand All @@ -1424,7 +1424,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) {
Expand Down
6 changes: 3 additions & 3 deletions src/link/object.c
Original file line number Diff line number Diff line change
Expand Up @@ -520,10 +520,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;
Expand Down

0 comments on commit d8032c0

Please sign in to comment.