Extract the rest of the level graphics, and add gfx subdirectories

12 files changed, 209 insertions, 16 deletions

diff --git a/source/bank_69.asm b/source/bank_69.asm
index ccd64a6..f76b9d4 100644
--- a/source/bank_69.asm
+++ b/source/bank_69.asm
@@ -1,3 +1,18 @@
+SECTION "lv_1_tok", ROMX[$4800], BANK[$69]
+
+gfx_lv_1_tokiwa_forest::
+INCBIN "gfx/levels/lv_1_tokiwa_forest.bin"
+.end::
+
+gfx_lv_1_tokiwa_forest_sgb::
+INCBIN "gfx/levels/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"
+.end::
+
 SECTION "gfx_textbox_border", ROMX[$6000], BANK[$69]
 gfx_textbox_border::
 INCBIN "gfx/textbox_border.bin"
diff --git a/source/bank_6e.asm b/source/bank_6e.asm
index 765e5b3..aad1d67 100644
--- a/source/bank_6e.asm
+++ b/source/bank_6e.asm
@@ -1,49 +1,49 @@
 SECTION "bank6e", ROMX[$4000], BANK[$6e]
 
 gfx_text_chars_bw::
-INCBIN "gfx/text_chars_2.bin"
+INCBIN "gfx/fonts/text_chars_2.bin"
 .end::
 
 gfx_pikachu_walk::
-INCBIN "gfx/pikachu_walk.bin"
+INCBIN "gfx/sprites/pikachu_walk.bin"
 .end::
 
 gfx_bulbasaur_walk::
-INCBIN "gfx/bulbasaur_walk.bin"
+INCBIN "gfx/sprites/bulbasaur_walk.bin"
 .end::
 
 gfx_charmander_walk::
-INCBIN "gfx/charmander_walk.bin"
+INCBIN "gfx/sprites/charmander_walk.bin"
 .end::
 
 gfx_squirtle_walk::
-INCBIN "gfx/squirtle_walk.bin"
+INCBIN "gfx/sprites/squirtle_walk.bin"
 .end::
 
 gfx_clefairy_walk::
-INCBIN "gfx/clefairy_walk.bin"
+INCBIN "gfx/sprites/clefairy_walk.bin"
 .end::
 
 gfx_jigglypuff_walk::
-INCBIN "gfx/jigglypuff_walk.bin"
+INCBIN "gfx/sprites/jigglypuff_walk.bin"
 .end::
 
 gfx_misty_walk::
-INCBIN "gfx/misty_walk.bin"
+INCBIN "gfx/sprites/misty_walk.bin"
 .end::
 
 gfx_mew_walk::
-INCBIN "gfx/mew_walk.bin"
+INCBIN "gfx/sprites/mew_walk.bin"
 .end::
 
 gfx_mew_silhouette_walk::
-INCBIN "gfx/mew_silhouette_walk.bin"
+INCBIN "gfx/sprites/mew_silhouette_walk.bin"
 .end::
 
 gfx_psyduck_walk::
-INCBIN "gfx/psyduck_walk.bin"
+INCBIN "gfx/sprites/psyduck_walk.bin"
 .end::
 
 gfx_bill_walk::
-INCBIN "gfx/bill_walk.bin"
+INCBIN "gfx/sprites/bill_walk.bin"
 .end::
diff --git a/source/bank_6f.asm b/source/bank_6f.asm
index d4d908b..7240091 100644
--- a/source/bank_6f.asm
+++ b/source/bank_6f.asm
@@ -1,17 +1,17 @@
 SECTION "bank6f", ROMX[$4000], BANK[$6f]
 
 gfx_text_chars::
-INCBIN "gfx/text_chars.bin"
+INCBIN "gfx/fonts/text_chars.bin"
 .end::
 
 gfx_lv_2_mt_otsukimi::
-INCBIN "gfx/lv_2_mt_otsukimi.bin"
+INCBIN "gfx/levels/lv_2_mt_otsukimi.bin"
 .end::
 
 gfx_lv_2_mt_otsukimi_sgb::
-INCBIN "gfx/lv_2_mt_otsukimi_sgb.bin"
+INCBIN "gfx/levels/lv_2_mt_otsukimi_sgb.bin"
 .end::
 
 gfx_lv_2_mt_otsukimi_duplicate::
-INCBIN "gfx/lv_2_mt_otsukimi.bin"
+INCBIN "gfx/levels/lv_2_mt_otsukimi.bin"
 .end::
diff --git a/source/bank_70.asm b/source/bank_70.asm
new file mode 100644
index 0000000..0d6ed32
--- /dev/null
+++ b/source/bank_70.asm
@@ -0,0 +1,13 @@
+SECTION "bank70", ROMX[$64c0], BANK[$70]
+
+gfx_lv_2_lake_zone::
+INCBIN "gfx/levels/lv_2_lake_zone.bin"
+.end::
+
+gfx_lv_2_lake_zone_sgb::
+INCBIN "gfx/levels/lv_2_lake_zone_sgb.bin"
+.end::
+
+gfx_lv_2_lake_zone_duplicate::
+INCBIN "gfx/levels/lv_2_lake_zone.bin"
+.end::
diff --git a/source/bank_71.asm b/source/bank_71.asm
new file mode 100644
index 0000000..430f639
--- /dev/null
+++ b/source/bank_71.asm
@@ -0,0 +1,13 @@
+SECTION "bank71", ROMX[$6400], BANK[$71]
+
+gfx_lv_3_mountain_zone::
+INCBIN "gfx/levels/lv_3_mountain_zone.bin"
+.end::
+
+gfx_lv_3_mountain_zone_sgb::
+INCBIN "gfx/levels/lv_3_mountain_zone_sgb.bin"
+.end::
+
+gfx_lv_3_mountain_zone_duplicate::
+INCBIN "gfx/levels/lv_3_mountain_zone.bin"
+.end::
diff --git a/source/bank_72.asm b/source/bank_72.asm
new file mode 100644
index 0000000..fd5f5f5
--- /dev/null
+++ b/source/bank_72.asm
@@ -0,0 +1,17 @@
+SECTION "bank72", ROMX[$4800], BANK[$72]
+
+; 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"
+.end::
+
+gfx_lv_1_plain_zone_duplicate::
+INCBIN "gfx/levels/lv_1_forest_zone.bin"
+.end::
diff --git a/source/bank_73.asm b/source/bank_73.asm
new file mode 100644
index 0000000..7108756
--- /dev/null
+++ b/source/bank_73.asm
@@ -0,0 +1,15 @@
+SECTION "bank73", ROMX[$4800], BANK[$73]
+
+gfx_lv_0_home::
+INCBIN "gfx/levels/lv_0_home.bin"
+.end::
+
+gfx_lv_0_home_sgb::
+INCBIN "gfx/levels/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"
+.end::
diff --git a/source/bank_74.asm b/source/bank_74.asm
new file mode 100644
index 0000000..097f935
--- /dev/null
+++ b/source/bank_74.asm
@@ -0,0 +1,28 @@
+SECTION "bank74", ROMX[$4000], BANK[$74]
+
+gfx_lv_4_jungle_zone::
+INCBIN "gfx/levels/lv_4_jungle_zone.bin"
+.end::
+
+gfx_lv_4_jungle_zone_sgb::
+INCBIN "gfx/levels/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"
+.end::
+
+gfx_lv_3_sea_cottage::
+INCBIN "gfx/levels/lv_3_sea_cottage.bin"
+.end::
+
+gfx_lv_3_sea_cottage_sgb::
+INCBIN "gfx/levels/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"
+.end::
diff --git a/source/bank_75.asm b/source/bank_75.asm
new file mode 100644
index 0000000..0862024
--- /dev/null
+++ b/source/bank_75.asm
@@ -0,0 +1,25 @@
+SECTION "bank75", ROMX[$4000], BANK[$75]
+
+gfx_lv_4_s_s_anne::
+INCBIN "gfx/levels/lv_4_s_s_anne.bin"
+.end::
+
+gfx_lv_4_s_s_anne_sgb::
+INCBIN "gfx/levels/lv_4_s_s_anne_sgb.bin"
+.end::
+
+gfx_lv_4_s_s_anne_duplicate::
+INCBIN "gfx/levels/lv_4_s_s_anne.bin"
+.end::
+
+gfx_lv_5_pokemon_tower::
+INCBIN "gfx/levels/lv_5_pokemon_tower.bin"
+.end::
+
+gfx_lv_5_pokemon_tower_sgb::
+INCBIN "gfx/levels/lv_5_pokemon_tower_sgb.bin"
+.end::
+
+gfx_lv_5_pokemon_tower_duplicate::
+INCBIN "gfx/levels/lv_5_pokemon_tower.bin"
+.end::
diff --git a/source/bank_76.asm b/source/bank_76.asm
new file mode 100644
index 0000000..e4dbb0f
--- /dev/null
+++ b/source/bank_76.asm
@@ -0,0 +1,27 @@
+SECTION "bank76", ROMX[$4000], BANK[$76]
+
+gfx_lv_6_silph_company::
+INCBIN "gfx/levels/lv_6_silph_company.bin"
+.end::
+
+gfx_lv_6_silph_company_sgb::
+INCBIN "gfx/levels/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"
+.end::
+
+gfx_lv_7_cycling_road::
+INCBIN "gfx/levels/lv_7_cycling_road.bin"
+.end::
+
+gfx_lv_7_cycling_road_sgb::
+INCBIN "gfx/levels/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"
+.end::
diff --git a/source/bank_77.asm b/source/bank_77.asm
new file mode 100644
index 0000000..8874fb2
--- /dev/null
+++ b/source/bank_77.asm
@@ -0,0 +1,25 @@
+SECTION "bank77", ROMX[$4000], BANK[$77]
+
+gfx_lv_8_power_plant::
+INCBIN "gfx/levels/lv_8_power_plant.bin"
+.end::
+
+gfx_lv_8_power_plant_sgb::
+INCBIN "gfx/levels/lv_8_power_plant_sgb.bin"
+.end::
+
+gfx_lv_8_power_plant_duplicate::
+INCBIN "gfx/levels/lv_8_power_plant.bin"
+.end::
+
+gfx_lv_9_futago_island::
+INCBIN "gfx/levels/lv_9_futago_island.bin"
+.end::
+
+gfx_lv_9_futago_island_sgb::
+INCBIN "gfx/levels/lv_9_futago_island_sgb.bin"
+.end::
+
+gfx_lv_9_futago_island_duplicate::
+INCBIN "gfx/levels/lv_9_futago_island.bin"
+.end::
diff --git a/source/bank_78.asm b/source/bank_78.asm
new file mode 100644
index 0000000..f150592
--- /dev/null
+++ b/source/bank_78.asm
@@ -0,0 +1,15 @@
+SECTION "bank78", ROMX[$4000], BANK[$78]
+
+gfx_lv_10_hanada_cave::
+INCBIN "gfx/levels/lv_10_hanada_cave.bin"
+.end::
+
+gfx_lv_10_hanada_cave_sgb::
+INCBIN "gfx/levels/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"
+.end::