diff --git a/data/tilesets.asm b/data/tilesets.asm
index 196dcd6ae..e7f68d894 100644
--- a/data/tilesets.asm
+++ b/data/tilesets.asm
@@ -6,7 +6,7 @@ tileset: MACRO
 ENDM
 
 ; Associated data:
-; - The *GFX, *Meta, and *Coll are defined in data/tileset_data.asm
+; - The *GFX, *Meta, and *Coll are defined in gfx/tilesets.asm
 ; - The *Anim are defined in engine/tileset_anims.asm
 ; - The *PalMap are defined in gfx/tilesets/palette_maps.asm
 
diff --git a/engine/mapgroup_roofs.asm b/engine/mapgroup_roofs.asm
index 72999efc6..2cd734234 100644
--- a/engine/mapgroup_roofs.asm
+++ b/engine/mapgroup_roofs.asm
@@ -5,13 +5,13 @@ LoadMapGroupRoof:: ; 1c000
 	ld hl, MapGroupRoofs
 	add hl, de
 	ld a, [hl]
-	cp $ff
+	cp -1
 	ret z
 	ld hl, Roofs
-	ld bc, $90
+	ld bc, 9 tiles
 	call AddNTimes
 	ld de, vTiles2 tile $0a
-	ld bc, $90
+	ld bc, 9 tiles
 	call CopyBytes
 	ret
 ; 1c021
diff --git a/data/tileset_data.asm b/gfx/tilesets.asm
similarity index 100%
rename from data/tileset_data.asm
rename to gfx/tilesets.asm
diff --git a/gfx/tilesets/palette_maps.asm b/gfx/tilesets/palette_maps.asm
index a0efab45d..2b6564e7b 100644
--- a/gfx/tilesets/palette_maps.asm
+++ b/gfx/tilesets/palette_maps.asm
@@ -1,4 +1,5 @@
 tilepal: MACRO
+; used in gfx/tilesets/*_palette_map.asm
 ; vram bank, pals
 x = \1 << OAM_TILE_BANK
 rept (_NARG +- 1) / 2
diff --git a/main.asm b/main.asm
index b375060f4..bd0719561 100644
--- a/main.asm
+++ b/main.asm
@@ -85,7 +85,7 @@ INCLUDE "engine/events/daycare.asm"
 INCLUDE "engine/events/print_unown.asm"
 INCLUDE "engine/events/print_photo.asm"
 INCLUDE "engine/breeding.asm"
-INCLUDE "data/tileset_data.asm"
+INCLUDE "gfx/tilesets.asm"
 
 
 SECTION "Roofs", ROMX