Single files for tilesets/data.asm and maps/blockdata.asm

main.asm

@@ -620,26 +620,14 @@ INCLUDE "event/daycare.asm"
 INCLUDE "event/photo.asm"
 INCLUDE "engine/breeding/egg.asm"
 
-SECTION "Tileset Data 1", ROMX
 
-INCLUDE "tilesets/data_1.asm"
+INCLUDE "tilesets/data.asm"
 
-SECTION "Roofs", ROMX
-
-INCLUDE "tilesets/roofs.asm"
-
-SECTION "Tileset Data 2", ROMX
-
-INCLUDE "tilesets/data_2.asm"
 
 SECTION "bank8", ROMX
 
 INCLUDE "engine/clock_reset.asm"
 
-SECTION "Tileset Data 3", ROMX
-
-INCLUDE "tilesets/data_3.asm"
-
 SECTION "bank9", ROMX
 
 StringBufferPointers:: ; 24000
@@ -1618,10 +1606,6 @@ PlaceGraphic: ; 2ef6e
 	jr nz, .x2
 	ret
 
-SECTION "Tileset Data 4", ROMX
-
-INCLUDE "tilesets/data_4.asm"
-
 SECTION "Effect Commands", ROMX
 
 INCLUDE "battle/effect_commands.asm"
@@ -5032,10 +5016,6 @@ INCLUDE "text/phone/kenji_overworld.asm"
 INCLUDE "text/phone/parry_overworld.asm"
 INCLUDE "text/phone/erin_overworld.asm"
 
-SECTION "Tileset Data 5", ROMX
-
-INCLUDE "tilesets/data_5.asm"
-
 SECTION "bank2E", ROMX
 
 INCLUDE "engine/events_3.asm"
@@ -5318,10 +5298,6 @@ INCLUDE "gfx/pics/johto_frames.asm"
 INCLUDE "gfx/pics/unown_frame_pointers.asm"
 INCLUDE "gfx/pics/unown_frames.asm"
 
-SECTION "Tileset Data 6", ROMX
-
-INCLUDE "tilesets/data_6.asm"
-
 SECTION "bank38", ROMX
 
 RotateUnownFrontpic: ; e0000
@@ -5605,10 +5581,6 @@ INCBIN "gfx/mobile/hp.1bpp"
 MobileLvIcon: ; 1dc599
 INCBIN "gfx/mobile/lv.1bpp"
 
-SECTION "Tileset Data 7", ROMX
-
-INCLUDE "tilesets/data_7.asm"
-
 SECTION "bank77_2", ROMX
 
 Function1dd6a9: ; 1dd6a9
@@ -6040,10 +6012,6 @@ LeggiPostaInglese:
 	jr nz, .loop
 	ret
 
-SECTION "Tileset Data 8", ROMX
-
-INCLUDE "tilesets/data_8.asm"
-
 SECTION "bank7B", ROMX
 
 INCLUDE "text/battle_tower.asm"