From 486500c514e79d86c46fc947b21a8ee9bbdbf3e2 Mon Sep 17 00:00:00 2001
From: Rangi42 <remy.oukaour+rangi42@gmail.com>
Date: Tue, 31 Oct 2023 23:17:31 -0400
Subject: [PATCH] Make requested revisions to recent PRs

---
 man/rgbasm.1        | 4 ++--
 man/rgbasm.5        | 8 ++++++--
 src/fix/main.cpp    | 4 ++--
 src/link/object.cpp | 6 +++---
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/man/rgbasm.1 b/man/rgbasm.1
index dbbe7d417..ed72c1b4d 100644
--- a/man/rgbasm.1
+++ b/man/rgbasm.1
@@ -147,9 +147,9 @@ 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.
+directives in ROM sections, unless overridden.
 The default is 0x00.
 .It Fl Q Ar fix_precision , Fl Fl q-precision Ar fix_precision
 Use this as the precision of fixed-point numbers after the decimal point, unless they specify their own precision.
diff --git a/man/rgbasm.5 b/man/rgbasm.5
index 39f524614..24ee103e0 100644
--- a/man/rgbasm.5
+++ b/man/rgbasm.5
@@ -430,8 +430,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
diff --git a/src/fix/main.cpp b/src/fix/main.cpp
index 172e642da..8023bd1bc 100644
--- a/src/fix/main.cpp
+++ b/src/fix/main.cpp
@@ -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) {
diff --git a/src/link/object.cpp b/src/link/object.cpp
index bab2f5c87..2c801de8f 100644
--- a/src/link/object.cpp
+++ b/src/link/object.cpp
@@ -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;