diff --git a/Makefile b/Makefile
index 261b58c24..ccfd36357 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ includes  := $(PYTHON) $(poketools)/scan_includes.py
 
 crystal11_obj := \
 wram11.o \
-crystal11.o \
+main11.o \
 lib/mobile/main.o \
 home.o \
 audio.o \
@@ -42,10 +42,10 @@ misc/crystal_misc.o \
 text/common_text.o \
 gfx/pics.o
 
-all_obj := $(crystal_obj) crystal11.o wram11.o
+all_obj := $(crystal_obj) main11.o wram11.o
 
 # object dependencies
-$(foreach obj, $(all_obj), \
+$(foreach obj, $(crystal_obj), \
 	$(eval $(obj:.o=)_dep := $(shell $(includes) $(obj:.o=.asm))) \
 )
 
@@ -64,7 +64,9 @@ compare: pokecrystal.gbc pokecrystal11.gbc
 	@$(MD5) roms.md5
 
 %.asm: ;
-$(all_obj): $$*.asm $$($$*_dep)
+%11.o: %.asm $$(%_dep)
+	rgbasm -D CRYSTAL11 -o $@ $<
+%.o: %.asm $$(%_dep)
 	rgbasm -o $@ $<
 
 pokecrystal11.gbc: $(crystal11_obj)
diff --git a/crystal11.asm b/crystal11.asm
deleted file mode 100644
index c4c7712e8..000000000
--- a/crystal11.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-CRYSTAL11 = 1
-CORRUPT_TILES = 1
-
-INCLUDE "main.asm"
diff --git a/misc/mobile_5c.asm b/misc/mobile_5c.asm
index b8710a78a..8ecd35edf 100755
--- a/misc/mobile_5c.asm
+++ b/misc/mobile_5c.asm
@@ -934,7 +934,7 @@ GFX_172f1f:
 INCBIN "gfx/unknown/172f1f.2bpp"
 
 Tilemap_1733af:
-IF DEF(CORRUPT_TILES)
+IF DEF(CRYSTAL11)
 INCBIN "gfx/unknown/1733af_corrupt.tilemap"
 ELSE
 INCBIN "gfx/unknown/1733af.tilemap"
diff --git a/wram11.asm b/wram11.asm
deleted file mode 100644
index 4d3303fd0..000000000
--- a/wram11.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-CRYSTAL11 = 1
-
-INCLUDE "wram.asm"