Format RGBFIX and RGBGFX warnings/errors the same way as RGBASM and RGBLINK

2025-11-20 10:12:06 +00:00 · 2025-08-11 15:16:00 -04:00
parent 02310489c6
commit 30a8503dcd
52 changed files with 105 additions and 186 deletions
--- a/test/fix/bad-mbc-number.err
+++ b/test/fix/bad-mbc-number.err
@@ -1,2 +1 @@
-warning: [-Wmbc]
-    MBC "(unknown)" has no RAM, but RAM size was set to 2
+warning: MBC "(unknown)" has no RAM, but RAM size was set to 2 [-Wmbc]
--- a/test/fix/color.err
+++ b/test/fix/color.err
@@ -1,2 +1 @@
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the CGB flag
+warning: Overwrote a non-zero byte in the CGB flag [-Woverwrite]
--- a/test/fix/compatible.err
+++ b/test/fix/compatible.err
@@ -1,2 +1 @@
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the CGB flag
+warning: Overwrote a non-zero byte in the CGB flag [-Woverwrite]
--- a/test/fix/custom-logo.err
+++ b/test/fix/custom-logo.err
@@ -1,2 +1 @@
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the logo
+warning: Overwrote a non-zero byte in the logo [-Woverwrite]
--- a/test/fix/dollar-hex.err
+++ b/test/fix/dollar-hex.err
@@ -1,2 +1 @@
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the cartridge type
+warning: Overwrote a non-zero byte in the cartridge type [-Woverwrite]
--- a/test/fix/fix-override.err
+++ b/test/fix/fix-override.err
@@ -1,3 +1,2 @@
 warning: 'l' overriding 'L' in fix spec
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the Nintendo logo
+warning: Overwrote a non-zero byte in the Nintendo logo [-Woverwrite]
--- a/test/fix/gameid-trunc.err
+++ b/test/fix/gameid-trunc.err
@@ -1,4 +1,2 @@
-warning: [-Wtruncation]
-    Truncating game ID "FOUR!" to 4 chars
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the manufacturer code
+warning: Truncating game ID "FOUR!" to 4 chars [-Wtruncation]
+warning: Overwrote a non-zero byte in the manufacturer code [-Woverwrite]
--- a/test/fix/gameid.err
+++ b/test/fix/gameid.err
@@ -1,2 +1 @@
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the manufacturer code
+warning: Overwrote a non-zero byte in the manufacturer code [-Woverwrite]
--- a/test/fix/global-large.err
+++ b/test/fix/global-large.err
@@ -1,2 +1 @@
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the global checksum
+warning: Overwrote a non-zero byte in the global checksum [-Woverwrite]
--- a/test/fix/global-larger.err
+++ b/test/fix/global-larger.err
@@ -1,2 +1 @@
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the global checksum
+warning: Overwrote a non-zero byte in the global checksum [-Woverwrite]
--- a/test/fix/global-trash.err
+++ b/test/fix/global-trash.err
@@ -1,2 +1 @@
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the global checksum
+warning: Overwrote a non-zero byte in the global checksum [-Woverwrite]
--- a/test/fix/global.err
+++ b/test/fix/global.err
@@ -1,2 +1 @@
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the global checksum
+warning: Overwrote a non-zero byte in the global checksum [-Woverwrite]
--- a/test/fix/header-edit.err
+++ b/test/fix/header-edit.err
@@ -1,4 +1,2 @@
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the CGB flag
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the header checksum
+warning: Overwrote a non-zero byte in the CGB flag [-Woverwrite]
+warning: Overwrote a non-zero byte in the header checksum [-Woverwrite]
--- a/test/fix/header-trash.err
+++ b/test/fix/header-trash.err
@@ -1,2 +1 @@
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the header checksum
+warning: Overwrote a non-zero byte in the header checksum [-Woverwrite]
--- a/test/fix/header.err
+++ b/test/fix/header.err
@@ -1,2 +1 @@
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the header checksum
+warning: Overwrote a non-zero byte in the header checksum [-Woverwrite]
--- a/test/fix/jp.err
+++ b/test/fix/jp.err
@@ -1,2 +1 @@
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the destination code
+warning: Overwrote a non-zero byte in the destination code [-Woverwrite]
--- a/test/fix/logo-trash.err
+++ b/test/fix/logo-trash.err
@@ -1,2 +1 @@
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the Nintendo logo
+warning: Overwrote a non-zero byte in the Nintendo logo [-Woverwrite]
--- a/test/fix/logo.err
+++ b/test/fix/logo.err
@@ -1,2 +1 @@
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the Nintendo logo
+warning: Overwrote a non-zero byte in the Nintendo logo [-Woverwrite]
--- a/test/fix/mbc-rom-ram-battery.err
+++ b/test/fix/mbc-rom-ram-battery.err
@@ -1,2 +1 @@
-warning: [-Wmbc]
-    MBC "ROM+RAM+BATTERY" is under-specified and poorly supported
+warning: MBC "ROM+RAM+BATTERY" is under-specified and poorly supported [-Wmbc]
--- a/test/fix/mbc-rom-ram.err
+++ b/test/fix/mbc-rom-ram.err
@@ -1,2 +1 @@
-warning: [-Wmbc]
-    MBC "ROM+RAM" is under-specified and poorly supported
+warning: MBC "ROM+RAM" is under-specified and poorly supported [-Wmbc]
--- a/test/fix/mbc.err
+++ b/test/fix/mbc.err
@@ -1,2 +1 @@
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the cartridge type
+warning: Overwrote a non-zero byte in the cartridge type [-Woverwrite]
--- a/test/fix/mbcless-ram.err
+++ b/test/fix/mbcless-ram.err
@@ -1,6 +1,3 @@
-warning: [-Wmbc]
-    MBC "ROM" has no RAM, but RAM size was set to 2
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the cartridge type
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the RAM size
+warning: MBC "ROM" has no RAM, but RAM size was set to 2 [-Wmbc]
+warning: Overwrote a non-zero byte in the cartridge type [-Woverwrite]
+warning: Overwrote a non-zero byte in the RAM size [-Woverwrite]
--- a/test/fix/new-lic-trunc.err
+++ b/test/fix/new-lic-trunc.err
@@ -1,4 +1,2 @@
-warning: [-Wtruncation]
-    Truncating new licensee "HOMEBREW" to 2 chars
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the new licensee code
+warning: Truncating new licensee "HOMEBREW" to 2 chars [-Wtruncation]
+warning: Overwrote a non-zero byte in the new licensee code [-Woverwrite]
--- a/test/fix/new-lic.err
+++ b/test/fix/new-lic.err
@@ -1,2 +1 @@
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the new licensee code
+warning: Overwrote a non-zero byte in the new licensee code [-Woverwrite]
--- a/test/fix/old-lic-hex.err
+++ b/test/fix/old-lic-hex.err
@@ -1,2 +1 @@
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the old licensee code
+warning: Overwrote a non-zero byte in the old licensee code [-Woverwrite]
--- a/test/fix/old-lic.err
+++ b/test/fix/old-lic.err
@@ -1,2 +1 @@
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the old licensee code
+warning: Overwrote a non-zero byte in the old licensee code [-Woverwrite]
--- a/test/fix/ram.err
+++ b/test/fix/ram.err
@@ -1,2 +1 @@
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the RAM size
+warning: Overwrote a non-zero byte in the RAM size [-Woverwrite]
--- a/test/fix/ramful-mbc-no-ram.err
+++ b/test/fix/ramful-mbc-no-ram.err
@@ -1,6 +1,3 @@
-warning: [-Wmbc]
-    MBC "MBC3+RAM" has RAM, but RAM size was set to 0
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the cartridge type
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the RAM size
+warning: MBC "MBC3+RAM" has RAM, but RAM size was set to 0 [-Wmbc]
+warning: Overwrote a non-zero byte in the cartridge type [-Woverwrite]
+warning: Overwrote a non-zero byte in the RAM size [-Woverwrite]
--- a/test/fix/ramful-mbc.err
+++ b/test/fix/ramful-mbc.err
@@ -1,4 +1,2 @@
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the cartridge type
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the RAM size
+warning: Overwrote a non-zero byte in the cartridge type [-Woverwrite]
+warning: Overwrote a non-zero byte in the RAM size [-Woverwrite]
--- a/test/fix/ramless-mbc.err
+++ b/test/fix/ramless-mbc.err
@@ -1,4 +1,2 @@
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the cartridge type
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the RAM size
+warning: Overwrote a non-zero byte in the cartridge type [-Woverwrite]
+warning: Overwrote a non-zero byte in the RAM size [-Woverwrite]
--- a/test/fix/sgb-licensee.err
+++ b/test/fix/sgb-licensee.err
@@ -1,6 +1,3 @@
-warning: [-Wsgb]
-    SGB compatibility enabled, but old licensee is 0x45, not 0x33
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the SGB flag
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the old licensee code
+warning: SGB compatibility enabled, but old licensee is 0x45, not 0x33 [-Wsgb]
+warning: Overwrote a non-zero byte in the SGB flag [-Woverwrite]
+warning: Overwrote a non-zero byte in the old licensee code [-Woverwrite]
--- a/test/fix/sgb-old-licensee.err
+++ b/test/fix/sgb-old-licensee.err
@@ -1,4 +1,2 @@
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the SGB flag
-warning: [-Wsgb]
-    SGB compatibility enabled, but old licensee was 0xc5, not 0x33
+warning: Overwrote a non-zero byte in the SGB flag [-Woverwrite]
+warning: SGB compatibility enabled, but old licensee was 0xc5, not 0x33 [-Wsgb]
--- a/test/fix/sgb.err
+++ b/test/fix/sgb.err
@@ -1,2 +1 @@
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the SGB flag
+warning: Overwrote a non-zero byte in the SGB flag [-Woverwrite]
--- a/test/fix/title-color-trunc-rev.err
+++ b/test/fix/title-color-trunc-rev.err
@@ -1,6 +1,3 @@
-warning: [-Wtruncation]
-    Truncating title "0123456789ABCDEF" to 15 chars
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the title
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the CGB flag
+warning: Truncating title "0123456789ABCDEF" to 15 chars [-Wtruncation]
+warning: Overwrote a non-zero byte in the title [-Woverwrite]
+warning: Overwrote a non-zero byte in the CGB flag [-Woverwrite]
--- a/test/fix/title-color-trunc.err
+++ b/test/fix/title-color-trunc.err
@@ -1,6 +1,3 @@
-warning: [-Wtruncation]
-    Truncating title "0123456789ABCDEF" to 15 chars
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the title
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the CGB flag
+warning: Truncating title "0123456789ABCDEF" to 15 chars [-Wtruncation]
+warning: Overwrote a non-zero byte in the title [-Woverwrite]
+warning: Overwrote a non-zero byte in the CGB flag [-Woverwrite]
--- a/test/fix/title-compat-trunc-rev.err
+++ b/test/fix/title-compat-trunc-rev.err
@@ -1,6 +1,3 @@
-warning: [-Wtruncation]
-    Truncating title "0123456789ABCDEF" to 15 chars
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the title
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the CGB flag
+warning: Truncating title "0123456789ABCDEF" to 15 chars [-Wtruncation]
+warning: Overwrote a non-zero byte in the title [-Woverwrite]
+warning: Overwrote a non-zero byte in the CGB flag [-Woverwrite]
--- a/test/fix/title-compat-trunc.err
+++ b/test/fix/title-compat-trunc.err
@@ -1,6 +1,3 @@
-warning: [-Wtruncation]
-    Truncating title "0123456789ABCDEF" to 15 chars
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the title
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the CGB flag
+warning: Truncating title "0123456789ABCDEF" to 15 chars [-Wtruncation]
+warning: Overwrote a non-zero byte in the title [-Woverwrite]
+warning: Overwrote a non-zero byte in the CGB flag [-Woverwrite]
--- a/test/fix/title-gameid-trunc-rev.err
+++ b/test/fix/title-gameid-trunc-rev.err
@@ -1,6 +1,3 @@
-warning: [-Wtruncation]
-    Truncating title "0123456789ABCDEF" to 11 chars
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the title
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the manufacturer code
+warning: Truncating title "0123456789ABCDEF" to 11 chars [-Wtruncation]
+warning: Overwrote a non-zero byte in the title [-Woverwrite]
+warning: Overwrote a non-zero byte in the manufacturer code [-Woverwrite]
--- a/test/fix/title-gameid-trunc.err
+++ b/test/fix/title-gameid-trunc.err
@@ -1,6 +1,3 @@
-warning: [-Wtruncation]
-    Truncating title "0123456789ABCDEF" to 11 chars
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the title
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the manufacturer code
+warning: Truncating title "0123456789ABCDEF" to 11 chars [-Wtruncation]
+warning: Overwrote a non-zero byte in the title [-Woverwrite]
+warning: Overwrote a non-zero byte in the manufacturer code [-Woverwrite]
--- a/test/fix/title-pad.err
+++ b/test/fix/title-pad.err
@@ -1,2 +1 @@
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the title
+warning: Overwrote a non-zero byte in the title [-Woverwrite]
--- a/test/fix/title-trunc.err
+++ b/test/fix/title-trunc.err
@@ -1,4 +1,2 @@
-warning: [-Wtruncation]
-    Truncating title "0123456789ABCDEFGHIJK" to 16 chars
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the title
+warning: Truncating title "0123456789ABCDEFGHIJK" to 16 chars [-Wtruncation]
+warning: Overwrote a non-zero byte in the title [-Woverwrite]
--- a/test/fix/title.err
+++ b/test/fix/title.err
@@ -1,2 +1 @@
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the title
+warning: Overwrote a non-zero byte in the title [-Woverwrite]
--- a/test/fix/tpp1-features.err
+++ b/test/fix/tpp1-features.err
@@ -1,10 +1,5 @@
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the cartridge type
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the TPP1 identification code
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the TPP1 revision number
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the RAM size
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the TPP1 feature flags
+warning: Overwrote a non-zero byte in the cartridge type [-Woverwrite]
+warning: Overwrote a non-zero byte in the TPP1 identification code [-Woverwrite]
+warning: Overwrote a non-zero byte in the TPP1 revision number [-Woverwrite]
+warning: Overwrote a non-zero byte in the RAM size [-Woverwrite]
+warning: Overwrote a non-zero byte in the TPP1 feature flags [-Woverwrite]
--- a/test/fix/tpp1-nonjap.err
+++ b/test/fix/tpp1-nonjap.err
@@ -1,10 +1,5 @@
-warning: [-Wmbc]
-    TPP1 overwrites region flag for its identification code, ignoring `-j`
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the cartridge type
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the TPP1 identification code
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the TPP1 revision number
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the TPP1 feature flags
+warning: TPP1 overwrites region flag for its identification code, ignoring `-j` [-Wmbc]
+warning: Overwrote a non-zero byte in the cartridge type [-Woverwrite]
+warning: Overwrote a non-zero byte in the TPP1 identification code [-Woverwrite]
+warning: Overwrote a non-zero byte in the TPP1 revision number [-Woverwrite]
+warning: Overwrote a non-zero byte in the TPP1 feature flags [-Woverwrite]
--- a/test/fix/verify-pad.err
+++ b/test/fix/verify-pad.err
@@ -1,6 +1,3 @@
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the Nintendo logo
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the header checksum
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the global checksum
+warning: Overwrote a non-zero byte in the Nintendo logo [-Woverwrite]
+warning: Overwrote a non-zero byte in the header checksum [-Woverwrite]
+warning: Overwrote a non-zero byte in the global checksum [-Woverwrite]
--- a/test/fix/verify-trash.err
+++ b/test/fix/verify-trash.err
@@ -1,6 +1,3 @@
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the Nintendo logo
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the header checksum
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the global checksum
+warning: Overwrote a non-zero byte in the Nintendo logo [-Woverwrite]
+warning: Overwrote a non-zero byte in the header checksum [-Woverwrite]
+warning: Overwrote a non-zero byte in the global checksum [-Woverwrite]
--- a/test/fix/verify.err
+++ b/test/fix/verify.err
@@ -1,6 +1,3 @@
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the Nintendo logo
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the header checksum
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the global checksum
+warning: Overwrote a non-zero byte in the Nintendo logo [-Woverwrite]
+warning: Overwrote a non-zero byte in the header checksum [-Woverwrite]
+warning: Overwrote a non-zero byte in the global checksum [-Woverwrite]
--- a/test/fix/version.err
+++ b/test/fix/version.err
@@ -1,2 +1 @@
-warning: [-Woverwrite]
-    Overwrote a non-zero byte in the mask ROM version number
+warning: Overwrote a non-zero byte in the mask ROM version number [-Woverwrite]