From 7b54312d9727dd3566f97119fba0304d93dc760d Mon Sep 17 00:00:00 2001 From: ISSOtm Date: Sat, 14 Mar 2020 16:50:33 +0100 Subject: [PATCH] Deprecate `OPT z` in favor of `OPT p` Fixes #298 --- src/asm/main.c | 3 +++ src/asm/rgbasm.5 | 4 ++-- test/run-tests.sh | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/asm/main.c b/src/asm/main.c index 3bbe4438..5426a1f4 100644 --- a/src/asm/main.c +++ b/src/asm/main.c @@ -157,6 +157,9 @@ void opt_Parse(char *s) } break; case 'z': + warning(WARNING_OBSOLETE, "Option 'z' is a deprecated alias for 'p'"); + /* fallthrough */ + case 'p': if (strlen(&s[1]) <= 2) { int32_t result; unsigned int fillchar; diff --git a/src/asm/rgbasm.5 b/src/asm/rgbasm.5 index 9140b350..b2539b7e 100644 --- a/src/asm/rgbasm.5 +++ b/src/asm/rgbasm.5 @@ -1279,9 +1279,9 @@ DW `00112233 .Ed .Pp The options that OPT can modify are currently: -.Cm b , e +.Cm b , g and -.Cm g . +.Cm p . .Pp .Ic POPO and diff --git a/test/run-tests.sh b/test/run-tests.sh index dfe88b1d..23d64337 100755 --- a/test/run-tests.sh +++ b/test/run-tests.sh @@ -26,7 +26,7 @@ if [ ! -d pokecrystal ]; then fi pushd pokecrystal git fetch -git checkout 80cf859cd31c3882f8c42dd19e56fcde02b8955c +git checkout c87f8512a4d736a847dbc69e09c781a29eeaa638 make clean make -j4 compare popd