Merge branch 'contiguous-wram' of git://github.com/TwitchPlaysPokemon/rgbds into TwitchPlaysPokemon-contiguous-wram

This commit is contained in:
AntonioND
2017-03-15 20:52:44 +00:00
3 changed files with 20 additions and 5 deletions

View File

@@ -35,7 +35,7 @@ static void
usage(void)
{
printf(
"usage: rgblink [-t] [-m mapfile] [-n symfile] [-O overlay] [-o outfile] \n"
"usage: rgblink [-tw] [-m mapfile] [-n symfile] [-O overlay] [-o outfile] \n"
" [-p pad_value] [-s symbol] file [...]\n");
exit(1);
}
@@ -56,7 +56,7 @@ main(int argc, char *argv[])
progname = argv[0];
while ((ch = getopt(argc, argv, "m:n:o:O:p:s:t")) != -1) {
while ((ch = getopt(argc, argv, "m:n:o:O:p:s:tw")) != -1) {
switch (ch) {
case 'm':
SetMapfileName(optarg);
@@ -88,6 +88,12 @@ main(int argc, char *argv[])
case 't':
options |= OPT_SMALL;
break;
case 'w':
/* Set to set WRAM as a single continuous block as on DMG.
All WRAM sections must be WRAM0 as bankable WRAM sections do
not exist in this mode. A WRAMX section will raise an error. */
options |= OPT_CONTWRAM;
break;
default:
usage();
/* NOTREACHED */