diff --git a/Code/data.asm b/Code/data.asm
index a88db4c..efd8052 100644
--- a/Code/data.asm
+++ b/Code/data.asm
@@ -43,14 +43,13 @@ DefaultMap:
 	db 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 	db 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 
-EXPORT BackgroundTiles, BackgroundTilesEnd
 SECTION "Graphics", ROM0
+EXPORT BackgroundTiles, BackgroundTilesEnd
 BackgroundTiles:
 INCBIN "BackgroundTiles.bin"
 BackgroundTilesEnd: ds 0
 
 EXPORT SpriteTiles, SpriteTilesEnd
-SECTION "Graphics", ROM0
 SpriteTiles:
 INCBIN "SpriteTiles.bin"
-SpriteTilesEnd: ds 0
\ No newline at end of file
+SpriteTilesEnd: ds 0
diff --git a/Code/hardware.inc b/Code/hardware.inc
index d11442a..e451d88 100644
--- a/Code/hardware.inc
+++ b/Code/hardware.inc
@@ -25,7 +25,7 @@
 ; If all of these are already defined, don't do it again.
 
     IF !DEF(HARDWARE_INC)
-HARDWARE_INC SET 1
+HARDWARE_INC = 1
 
 rev_Check_hardware_inc : MACRO
 ;NOTE: REVISION NUMBER CHANGES MUST BE ADDED
diff --git a/build.bat b/build.bat
index 2241667..b5f6d40 100644
--- a/build.bat
+++ b/build.bat
@@ -1,10 +1,10 @@
-..\..\Assembler\rgbasm %* -i Graphics\ -i Code\ -o Build\main.o     Code\main.asm
-..\..\Assembler\rgbasm %* -i Graphics\ -i Code\ -o Build\data.o     Code\data.asm
-..\..\Assembler\rgbasm %* -i Graphics\ -i Code\ -o Build\automata.o Code\automata.asm
-..\..\Assembler\rgbasm %* -i Graphics\ -i Code\ -o Build\render.o   Code\render.asm
-..\..\Assembler\rgbasm %* -i Graphics\ -i Code\ -o Build\utils.o    Code\utils.asm
-..\..\Assembler\rgbasm %* -i Graphics\ -i Code\ -o Build\intro.o    Code\intro.asm
-..\..\Assembler\rgbasm %* -i Graphics\ -i Code\ -o Build\edit.o     Code\edit.asm
-..\..\Assembler\rgbasm %* -i Graphics\ -i Code\ -o Build\joypad.o   Code\joypad.asm
-..\..\Assembler\rgblink -n rom.sym -w -t -o rom.gb -d Build/main.o Build/data.o Build/automata.o Build/render.o Build/utils.o Build/intro.o Build/edit.o Build/joypad.o
-..\..\Assembler\rgbfix -t "Game of Life" -v -p 0 rom.gb
\ No newline at end of file
+rgbasm -i Graphics -i Code -o Build/main.o     Code/main.asm
+rgbasm -i Graphics -i Code -o Build/data.o     Code/data.asm
+rgbasm -i Graphics -i Code -o Build/automata.o Code/automata.asm
+rgbasm -i Graphics -i Code -o Build/render.o   Code/render.asm
+rgbasm -i Graphics -i Code -o Build/utils.o    Code/utils.asm
+rgbasm -i Graphics -i Code -o Build/intro.o    Code/intro.asm
+rgbasm -i Graphics -i Code -o Build/edit.o     Code/edit.asm
+rgbasm -i Graphics -i Code -o Build/joypad.o   Code/joypad.asm
+rgblink -n rom.sym -w -t -o rom.gb -d Build/main.o Build/data.o Build/automata.o Build/render.o Build/utils.o Build/intro.o Build/edit.o Build/joypad.o
+rgbfix -t "Game of Life" -v -p 0 rom.gb