diff --git a/Makefile b/Makefile
index e43879d..654a989 100644
--- a/Makefile
+++ b/Makefile
@@ -103,7 +103,7 @@ endif
 RGBFIXFLAGS += -cjsv -k 01 -l 0x33 -m MBC5+RAM+BATTERY -p 0xff -r 03 -t POKECARD -i AXQE
 
 $(rom): $(rom_obj) src/layout.link
-	$(RGBLINK) $(RGBLINKFLAGS) -p 0xff -m $(rom:.gbc=.map) -n $(rom:.gbc=.sym) -l src/layout.link -o $@ $(filter %.o,$^)
+	$(RGBLINK) $(RGBLINKFLAGS) -p 0xff -m $(rom:.gbc=.map) -n $(rom:.gbc=.sym) -l src/layout.link -w -o $@ $(filter %.o,$^)
 	$(RGBFIX) $(RGBFIXFLAGS) $@
 
 
diff --git a/src/home/setup.asm b/src/home/setup.asm
index 1414b40..c4d5480 100644
--- a/src/home/setup.asm
+++ b/src/home/setup.asm
@@ -138,8 +138,8 @@ FillTileMap::
 
 ; zero work RAM, stack area, and high RAM ($C000-$DFFF, $FF80-$FFEF)
 ZeroRAM::
-	ld hl, $c000
-	ld bc, $e000 - $c000
+	ld hl, STARTOF(WRAM0)
+	ld bc, SIZEOF(WRAM0)
 .zero_wram_loop
 	xor a
 	ld [hli], a
@@ -147,8 +147,9 @@ ZeroRAM::
 	ld a, c
 	or b
 	jr nz, .zero_wram_loop
-	ld c, LOW($ff80)
-	ld b, $fff0 - $ff80
+
+	ld c, LOW(STARTOF("HRAM"))
+	ld b, SIZEOF("HRAM")
 	xor a
 .zero_hram_loop
 	ld [$ff00+c], a
diff --git a/src/hram.asm b/src/hram.asm
index dc11faf..35267cd 100644
--- a/src/hram.asm
+++ b/src/hram.asm
@@ -182,3 +182,5 @@ hffb6:: ; ffb6
 
 hffb7:: ; ffb7
 	ds $1
+
+	ds $38
diff --git a/src/layout.link b/src/layout.link
index 58b325a..7f5e451 100644
--- a/src/layout.link
+++ b/src/layout.link
@@ -175,16 +175,14 @@ ROMX $3e
 ROMX $3f
 	"Audio 3"
 WRAM0
-	"WRAM0"
-	"WRAM0 Duels 1"
-	"WRAM0 Text Engine"
-	"WRAM0 1"
-	"WRAM0 Serial Transfer"
-	"WRAM0 Duels 2"
-	"WRAM0 2"
-WRAMX 1
-	"WRAM1"
-	"WRAM1 Audio"
+	"WRAM"
+	"WRAM Duels 1"
+	"WRAM Text Engine"
+	"WRAM 1"
+	"WRAM Serial Transfer"
+	"WRAM Duels 2"
+	"WRAM 2"
+	"WRAM Audio"
 VRAM $00
 	"VRAM0"
 VRAM $01
diff --git a/src/wram.asm b/src/wram.asm
index 3acb74e..e83a1c3 100644
--- a/src/wram.asm
+++ b/src/wram.asm
@@ -3,7 +3,7 @@ INCLUDE "constants.asm"
 
 INCLUDE "vram.asm"
 
-SECTION "WRAM0", WRAM0
+SECTION "WRAM", WRAM0
 
 UNION
 
@@ -48,7 +48,7 @@ ENDU
 
 	ds $100
 
-SECTION "WRAM0 Duels 1", WRAM0
+SECTION "WRAM Duels 1", WRAM0
 
 ; this union spans from c200 to c3ff
 UNION
@@ -153,7 +153,7 @@ wCardPopNameSearchResult:: ; c5f3
 
 	ds $c
 
-SECTION "WRAM0 Text Engine", WRAM0
+SECTION "WRAM Text Engine", WRAM0
 
 wc600:: ; c600
 	ds $100
@@ -167,7 +167,7 @@ wc800:: ; c800
 wc900:: ; c900
 	ds $100
 
-SECTION "WRAM0 1", WRAM0
+SECTION "WRAM 1", WRAM0
 
 wOAM:: ; ca00
 	ds OAM_SIZE
@@ -350,7 +350,7 @@ wObjectPalettesCGB:: ; cb30
 wListPointer:: ; cb72
 	ds $2
 
-SECTION "WRAM0 Serial Transfer", WRAM0
+SECTION "WRAM Serial Transfer", WRAM0
 
 wSerialOp:: ; cb74
 	ds $1
@@ -405,7 +405,7 @@ wSerialRecvBuf:: ; cba5
 
 wSerialEnd:: ; cbc5
 
-SECTION "WRAM0 Duels 2", WRAM0
+SECTION "WRAM Duels 2", WRAM0
 
 	ds $1
 
@@ -853,7 +853,7 @@ wNoEffectFromWhichStatus:: ; ccf1
 wSkipDelayAllowed:: ; ccf2
 	ds $1
 
-SECTION "WRAM0 2", WRAM0
+SECTION "WRAM 2", WRAM0
 
 ; on CGB, attributes of the text box borders. (values 0-7 seem to be used, which only affect palette)
 ; on SGB, colorize text box border with SGB1 if non-0
@@ -1903,7 +1903,6 @@ wNamingScreenBuffer:: ; cfe7
 wNamingScreenBufferLength:: ; cfff
 	ds $1
 
-SECTION "WRAM1", WRAMX
 wNamingScreenDestPointer:: ; d000
 	ds $2
 
@@ -2953,7 +2952,7 @@ wd698:: ; d698
 
 	ds $6e4
 
-SECTION "WRAM1 Audio", WRAMX
+SECTION "WRAM Audio", WRAM0
 
 ; bit 7 is set once the song has been started
 wCurSongID:: ; dd80