Group level graphics with respective tilemaps/attrmaps

11 files changed, 53 insertions, 90 deletions

diff --git a/source/bank_69.asm b/source/bank_69.asm
index 50e3978..63bf7ae 100644
--- a/source/bank_69.asm
+++ b/source/bank_69.asm
@@ -1,16 +1,13 @@
-SECTION "lv_1_tok", ROMX[$4800], BANK[$69]
-
+SECTION "gfx_lv_1_tokiwa_forest", ROMX[$4800], BANK[$69]
 gfx_lv_1_tokiwa_forest::
-INCBIN "gfx/levels/lv_1_tokiwa_forest.bin"
+INCBIN "gfx/town_map/lv_1_tokiwa_forest.bin"
 .end::
-
 gfx_lv_1_tokiwa_forest_sgb::
-INCBIN "gfx/levels/lv_1_tokiwa_forest_sgb.bin"
+INCBIN "gfx/town_map/lv_1_tokiwa_forest_sgb.bin"
 .end::
-
 ; The unused tree trunk tiles are darker.
 gfx_lv_1_tokiwa_forest_duplicate::
-INCBIN "gfx/levels/lv_1_tokiwa_forest_unused.bin"
+INCBIN "gfx/town_map/lv_1_tokiwa_forest_unused.bin"
 .end::
 
 SECTION "gfx_textbox_border_dark", ROMX[$6000], BANK[$69]
diff --git a/source/bank_6f.asm b/source/bank_6f.asm
index cb56bd7..e99942d 100644
--- a/source/bank_6f.asm
+++ b/source/bank_6f.asm
@@ -5,13 +5,11 @@ INCBIN "gfx/fonts/text_chars_dark.bin"
 .end::
 
 gfx_lv_2_mt_otsukimi::
-INCBIN "gfx/levels/lv_2_mt_otsukimi.bin"
+INCBIN "gfx/town_map/lv_2_mt_otsukimi.bin"
 .end::
-
 gfx_lv_2_mt_otsukimi_sgb::
-INCBIN "gfx/levels/lv_2_mt_otsukimi_sgb.bin"
+INCBIN "gfx/town_map/lv_2_mt_otsukimi_sgb.bin"
 .end::
-
 gfx_lv_2_mt_otsukimi_duplicate::
-INCBIN "gfx/levels/lv_2_mt_otsukimi.bin"
+INCBIN "gfx/town_map/lv_2_mt_otsukimi.bin"
 .end::
diff --git a/source/bank_70.asm b/source/bank_70.asm
index 0d6ed32..bb21991 100644
--- a/source/bank_70.asm
+++ b/source/bank_70.asm
@@ -1,13 +1,10 @@
-SECTION "bank70", ROMX[$64c0], BANK[$70]
-
+SECTION "gfx_lv_2_lake_zone", ROMX[$64c0], BANK[$70]
 gfx_lv_2_lake_zone::
-INCBIN "gfx/levels/lv_2_lake_zone.bin"
+INCBIN "gfx/safari_map/lv_2_lake_zone.bin"
 .end::
-
 gfx_lv_2_lake_zone_sgb::
-INCBIN "gfx/levels/lv_2_lake_zone_sgb.bin"
+INCBIN "gfx/safari_map/lv_2_lake_zone_sgb.bin"
 .end::
-
 gfx_lv_2_lake_zone_duplicate::
-INCBIN "gfx/levels/lv_2_lake_zone.bin"
+INCBIN "gfx/safari_map/lv_2_lake_zone.bin"
 .end::
diff --git a/source/bank_71.asm b/source/bank_71.asm
index 430f639..8f7bb88 100644
--- a/source/bank_71.asm
+++ b/source/bank_71.asm
@@ -1,13 +1,10 @@
-SECTION "bank71", ROMX[$6400], BANK[$71]
-
+SECTION "gfx_lv_3_mountain_zone", ROMX[$6400], BANK[$71]
 gfx_lv_3_mountain_zone::
-INCBIN "gfx/levels/lv_3_mountain_zone.bin"
+INCBIN "gfx/safari_map/lv_3_mountain_zone.bin"
 .end::
-
 gfx_lv_3_mountain_zone_sgb::
-INCBIN "gfx/levels/lv_3_mountain_zone_sgb.bin"
+INCBIN "gfx/safari_map/lv_3_mountain_zone_sgb.bin"
 .end::
-
 gfx_lv_3_mountain_zone_duplicate::
-INCBIN "gfx/levels/lv_3_mountain_zone.bin"
+INCBIN "gfx/safari_map/lv_3_mountain_zone.bin"
 .end::
diff --git a/source/bank_72.asm b/source/bank_72.asm
index fd5f5f5..e8fd6fa 100644
--- a/source/bank_72.asm
+++ b/source/bank_72.asm
@@ -1,17 +1,13 @@
-SECTION "bank72", ROMX[$4800], BANK[$72]
-
+SECTION "gfx_lv_1_plain_zone", ROMX[$4800], BANK[$72]
+gfx_lv_1_plain_zone::
+INCBIN "gfx/safari_map/lv_1_plain_zone.bin"
+.end::
 ; The Safari Zone level 1 was renamed from Forest Zone to Plain Zone,
 ; but only the CGB graphics were updated, leaving the old name in
 ; the SGB and duplicate CGB graphics.
-
-gfx_lv_1_plain_zone::
-INCBIN "gfx/levels/lv_1_plain_zone.bin"
-.end::
-
 gfx_lv_1_plain_zone_sgb::
-INCBIN "gfx/levels/lv_1_forest_zone_sgb.bin"
+INCBIN "gfx/safari_map/lv_1_plain_zone_sgb.bin"
 .end::
-
 gfx_lv_1_plain_zone_duplicate::
-INCBIN "gfx/levels/lv_1_forest_zone.bin"
+INCBIN "gfx/safari_map/lv_1_plain_zone_unused.bin"
 .end::
diff --git a/source/bank_73.asm b/source/bank_73.asm
index 7108756..7d8c311 100644
--- a/source/bank_73.asm
+++ b/source/bank_73.asm
@@ -1,15 +1,12 @@
-SECTION "bank73", ROMX[$4800], BANK[$73]
-
+SECTION "gfx_lv_0_home", ROMX[$4800], BANK[$73]
 gfx_lv_0_home::
-INCBIN "gfx/levels/lv_0_home.bin"
+INCBIN "gfx/easy_picross/lv_0_home.bin"
 .end::
-
 gfx_lv_0_home_sgb::
-INCBIN "gfx/levels/lv_0_home_sgb.bin"
+INCBIN "gfx/easy_picross/lv_0_home_sgb.bin"
 .end::
-
 ; The edges of the unused house roof tiles are dark gray
 ; like the rest of the roof, not white.
 gfx_lv_0_home_duplicate::
-INCBIN "gfx/levels/lv_0_home_unused.bin"
+INCBIN "gfx/easy_picross/lv_0_home_unused.bin"
 .end::
diff --git a/source/bank_74.asm b/source/bank_74.asm
index 59a2103..e6336d6 100644
--- a/source/bank_74.asm
+++ b/source/bank_74.asm
@@ -1,30 +1,26 @@
 SECTION "bank74", ROMX[$4000], BANK[$74]
 
 gfx_lv_4_jungle_zone::
-INCBIN "gfx/levels/lv_4_jungle_zone.bin"
+INCBIN "gfx/safari_map/lv_4_jungle_zone.bin"
 .end::
-
 gfx_lv_4_jungle_zone_sgb::
-INCBIN "gfx/levels/lv_4_jungle_zone_sgb.bin"
+INCBIN "gfx/safari_map/lv_4_jungle_zone_sgb.bin"
 .end::
-
 ; The edges of the unused tree trunk tiles are light and dark gray
 ; like the rest of the tree, not white and light gray.
 gfx_lv_4_jungle_zone_duplicate::
-INCBIN "gfx/levels/lv_4_jungle_zone_unused.bin"
+INCBIN "gfx/safari_map/lv_4_jungle_zone_unused.bin"
 .end::
 
 gfx_lv_3_sea_cottage::
-INCBIN "gfx/levels/lv_3_sea_cottage.bin"
+INCBIN "gfx/town_map/lv_3_sea_cottage.bin"
 .end::
-
 gfx_lv_3_sea_cottage_sgb::
-INCBIN "gfx/levels/lv_3_sea_cottage_sgb.bin"
+INCBIN "gfx/town_map/lv_3_sea_cottage_sgb.bin"
 .end::
-
 ; The unused "3" in "3/10" is has less of a black border.
 gfx_lv_3_sea_cottage_duplicate::
-INCBIN "gfx/levels/lv_3_sea_cottage_unused.bin"
+INCBIN "gfx/town_map/lv_3_sea_cottage_unused.bin"
 .end::
 
 SECTION "compressed_tilemap_attrmap_easy_picross", ROMX[$7ddc], BANK[$74]
diff --git a/source/bank_75.asm b/source/bank_75.asm
index a23a85e..722ecfe 100644
--- a/source/bank_75.asm
+++ b/source/bank_75.asm
@@ -1,27 +1,23 @@
 SECTION "bank75", ROMX[$4000], BANK[$75]
 
 gfx_lv_4_s_s_anne::
-INCBIN "gfx/levels/lv_4_s_s_anne.bin"
+INCBIN "gfx/town_map/lv_4_s_s_anne.bin"
 .end::
-
 gfx_lv_4_s_s_anne_sgb::
-INCBIN "gfx/levels/lv_4_s_s_anne_sgb.bin"
+INCBIN "gfx/town_map/lv_4_s_s_anne_sgb.bin"
 .end::
-
 gfx_lv_4_s_s_anne_duplicate::
-INCBIN "gfx/levels/lv_4_s_s_anne.bin"
+INCBIN "gfx/town_map/lv_4_s_s_anne.bin"
 .end::
 
 gfx_lv_5_pokemon_tower::
-INCBIN "gfx/levels/lv_5_pokemon_tower.bin"
+INCBIN "gfx/town_map/lv_5_pokemon_tower.bin"
 .end::
-
 gfx_lv_5_pokemon_tower_sgb::
-INCBIN "gfx/levels/lv_5_pokemon_tower_sgb.bin"
+INCBIN "gfx/town_map/lv_5_pokemon_tower_sgb.bin"
 .end::
-
 gfx_lv_5_pokemon_tower_duplicate::
-INCBIN "gfx/levels/lv_5_pokemon_tower.bin"
+INCBIN "gfx/town_map/lv_5_pokemon_tower.bin"
 .end::
 
 SECTION "compressed_gfx_copyright", ROMX[$7d35], BANK[$75]
diff --git a/source/bank_76.asm b/source/bank_76.asm
index 339a6fa..01e74fc 100644
--- a/source/bank_76.asm
+++ b/source/bank_76.asm
@@ -1,29 +1,25 @@
 SECTION "bank76", ROMX[$4000], BANK[$76]
 
 gfx_lv_6_silph_company::
-INCBIN "gfx/levels/lv_6_silph_company.bin"
+INCBIN "gfx/town_map/lv_6_silph_company.bin"
 .end::
-
 gfx_lv_6_silph_company_sgb::
-INCBIN "gfx/levels/lv_6_silph_company_sgb.bin"
+INCBIN "gfx/town_map/lv_6_silph_company_sgb.bin"
 .end::
-
 ; The unused "6" in "6/10" is taller.
 gfx_lv_6_silph_company_duplicate::
-INCBIN "gfx/levels/lv_6_silph_company_unused.bin"
+INCBIN "gfx/town_map/lv_6_silph_company_unused.bin"
 .end::
 
 gfx_lv_7_cycling_road::
-INCBIN "gfx/levels/lv_7_cycling_road.bin"
+INCBIN "gfx/town_map/lv_7_cycling_road.bin"
 .end::
-
 gfx_lv_7_cycling_road_sgb::
-INCBIN "gfx/levels/lv_7_cycling_road_sgb.bin"
+INCBIN "gfx/town_map/lv_7_cycling_road_sgb.bin"
 .end::
-
 ; The unused "/10" in "7/10" and "LV" are taller.
 gfx_lv_7_cycling_road_duplicate::
-INCBIN "gfx/levels/lv_7_cycling_road_unused.bin"
+INCBIN "gfx/town_map/lv_7_cycling_road_unused.bin"
 .end::
 
 SECTION "compressed_tilemap_attrmap_safari_map", ROMX[$7000], BANK[$76]
diff --git a/source/bank_77.asm b/source/bank_77.asm
index 8874fb2..937516d 100644
--- a/source/bank_77.asm
+++ b/source/bank_77.asm
@@ -1,25 +1,21 @@
 SECTION "bank77", ROMX[$4000], BANK[$77]
 
 gfx_lv_8_power_plant::
-INCBIN "gfx/levels/lv_8_power_plant.bin"
+INCBIN "gfx/town_map/lv_8_power_plant.bin"
 .end::
-
 gfx_lv_8_power_plant_sgb::
-INCBIN "gfx/levels/lv_8_power_plant_sgb.bin"
+INCBIN "gfx/town_map/lv_8_power_plant_sgb.bin"
 .end::
-
 gfx_lv_8_power_plant_duplicate::
-INCBIN "gfx/levels/lv_8_power_plant.bin"
+INCBIN "gfx/town_map/lv_8_power_plant.bin"
 .end::
 
 gfx_lv_9_futago_island::
-INCBIN "gfx/levels/lv_9_futago_island.bin"
+INCBIN "gfx/town_map/lv_9_futago_island.bin"
 .end::
-
 gfx_lv_9_futago_island_sgb::
-INCBIN "gfx/levels/lv_9_futago_island_sgb.bin"
+INCBIN "gfx/town_map/lv_9_futago_island_sgb.bin"
 .end::
-
 gfx_lv_9_futago_island_duplicate::
-INCBIN "gfx/levels/lv_9_futago_island.bin"
+INCBIN "gfx/town_map/lv_9_futago_island.bin"
 .end::
diff --git a/source/bank_78.asm b/source/bank_78.asm
index f150592..bb0b341 100644
--- a/source/bank_78.asm
+++ b/source/bank_78.asm
@@ -1,15 +1,12 @@
-SECTION "bank78", ROMX[$4000], BANK[$78]
-
+SECTION "gfx_lv_10_hanada_cave", ROMX[$4000], BANK[$78]
 gfx_lv_10_hanada_cave::
-INCBIN "gfx/levels/lv_10_hanada_cave.bin"
+INCBIN "gfx/town_map/lv_10_hanada_cave.bin"
 .end::
-
 gfx_lv_10_hanada_cave_sgb::
-INCBIN "gfx/levels/lv_10_hanada_cave_sgb.bin"
+INCBIN "gfx/town_map/lv_10_hanada_cave_sgb.bin"
 .end::
-
 ; The water behind cliff corner tiles is dark gray
 ; like the rest of the water, not white.
 gfx_lv_10_hanada_cave_duplicate::
-INCBIN "gfx/levels/lv_10_hanada_cave_unused.bin"
+INCBIN "gfx/town_map/lv_10_hanada_cave_unused.bin"
 .end::