From 71fe65255625e47e07fbd6e7314babfe84592efc Mon Sep 17 00:00:00 2001
From: ISSOtm <eldredhabert0@gmail.com>
Date: Thu, 16 Jan 2020 22:24:05 +0100
Subject: [PATCH] Allow ROMX and WRAMX sections in restricted modes Closes
 #462, although with this implementation `BANK("some ROMX section")` would
 return 0 instead of 1, which I think is benign anyways

---
 src/link/section.c             | 20 ++++++++++++++------
 test/link/romx-tiny-t.out      |  3 +--
 test/link/wramx-dmg-mode-d.out |  2 --
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/link/section.c b/src/link/section.c
index 1cbdb541..13a127f8 100644
--- a/src/link/section.c
+++ b/src/link/section.c
@@ -111,12 +111,20 @@ static void doSanityChecks(struct Section *section, void *ptr)
 
 	if (section->type < 0 || section->type >= SECTTYPE_INVALID)
 		fail("Section \"%s\" has an invalid type.", section->name);
-	if (is32kMode && section->type == SECTTYPE_ROMX)
-		fail("%s: ROMX sections cannot be used with option -t.",
-		     section->name);
-	if (isWRA0Mode && section->type == SECTTYPE_WRAMX)
-		fail("%s: WRAMX sections cannot be used with options -w or -d.",
-		     section->name);
+	if (is32kMode && section->type == SECTTYPE_ROMX) {
+		if (section->isBankFixed && section->bank != 1)
+			fail("%s: ROMX sections must be in bank 1 with option -t.",
+			     section->name);
+		else
+			section->type = SECTTYPE_ROM0;
+	}
+	if (isWRA0Mode && section->type == SECTTYPE_WRAMX) {
+		if (section->isBankFixed && section->bank != 1)
+			fail("%s: WRAMX sections must be in bank 1 with options -w or -d.",
+			     section->name);
+		else
+			section->type = SECTTYPE_WRAMX;
+	}
 	if (isDmgMode && section->type == SECTTYPE_VRAM && section->bank == 1)
 		fail("%s: VRAM bank 1 can't be used with option -d.",
 		     section->name);
diff --git a/test/link/romx-tiny-t.out b/test/link/romx-tiny-t.out
index f9615036..6c007d90 100644
--- a/test/link/romx-tiny-t.out
+++ b/test/link/romx-tiny-t.out
@@ -1,2 +1 @@
-warning: rx: ROMX sections cannot be used with option -t.
-error: Sanity checks failed
+error: Unable to place "r0a" (ROM0 section) anywhere
diff --git a/test/link/wramx-dmg-mode-d.out b/test/link/wramx-dmg-mode-d.out
index 9e1c0541..e69de29b 100644
--- a/test/link/wramx-dmg-mode-d.out
+++ b/test/link/wramx-dmg-mode-d.out
@@ -1,2 +0,0 @@
-warning: wx: WRAMX sections cannot be used with options -w or -d.
-error: Sanity checks failed