diff options
| -rw-r--r-- | Makefile | 12 | ||||
| -rw-r--r-- | gfx/fonts/text_chars.png (renamed from gfx/text_chars.png) | bin | 2200 -> 2200 bytes | |||
| -rw-r--r-- | gfx/fonts/text_chars_2.png (renamed from gfx/text_chars_2.png) | bin | 2298 -> 2298 bytes | |||
| -rw-r--r-- | gfx/levels/lv_0_home.png | bin | 0 -> 1197 bytes | |||
| -rw-r--r-- | gfx/levels/lv_0_home_sgb.png | bin | 0 -> 1174 bytes | |||
| -rw-r--r-- | gfx/levels/lv_0_home_unused.png | bin | 0 -> 1198 bytes | |||
| -rw-r--r-- | gfx/levels/lv_10_hanada_cave.png | bin | 0 -> 940 bytes | |||
| -rw-r--r-- | gfx/levels/lv_10_hanada_cave_sgb.png | bin | 0 -> 910 bytes | |||
| -rw-r--r-- | gfx/levels/lv_10_hanada_cave_unused.png | bin | 0 -> 930 bytes | |||
| -rw-r--r-- | gfx/levels/lv_1_forest_zone.png | bin | 0 -> 853 bytes | |||
| -rw-r--r-- | gfx/levels/lv_1_forest_zone_sgb.png | bin | 0 -> 824 bytes | |||
| -rw-r--r-- | gfx/levels/lv_1_plain_zone.png | bin | 0 -> 844 bytes | |||
| -rw-r--r-- | gfx/levels/lv_1_tokiwa_forest.png | bin | 0 -> 1093 bytes | |||
| -rw-r--r-- | gfx/levels/lv_1_tokiwa_forest_sgb.png | bin | 0 -> 1059 bytes | |||
| -rw-r--r-- | gfx/levels/lv_1_tokiwa_forest_unused.png | bin | 0 -> 1087 bytes | |||
| -rw-r--r-- | gfx/levels/lv_2_lake_zone.png | bin | 0 -> 1348 bytes | |||
| -rw-r--r-- | gfx/levels/lv_2_lake_zone_sgb.png | bin | 0 -> 1239 bytes | |||
| -rw-r--r-- | gfx/levels/lv_2_mt_otsukimi.png (renamed from gfx/lv_2_mt_otsukimi.png) | bin | 840 -> 840 bytes | |||
| -rw-r--r-- | gfx/levels/lv_2_mt_otsukimi_sgb.png (renamed from gfx/lv_2_mt_otsukimi_sgb.png) | bin | 766 -> 766 bytes | |||
| -rw-r--r-- | gfx/levels/lv_3_mountain_zone.png | bin | 0 -> 1464 bytes | |||
| -rw-r--r-- | gfx/levels/lv_3_mountain_zone_sgb.png | bin | 0 -> 1315 bytes | |||
| -rw-r--r-- | gfx/levels/lv_3_sea_cottage.png | bin | 0 -> 1364 bytes | |||
| -rw-r--r-- | gfx/levels/lv_3_sea_cottage_sgb.png | bin | 0 -> 1226 bytes | |||
| -rw-r--r-- | gfx/levels/lv_3_sea_cottage_unused.png | bin | 0 -> 1365 bytes | |||
| -rw-r--r-- | gfx/levels/lv_4_jungle_zone.png | bin | 0 -> 1567 bytes | |||
| -rw-r--r-- | gfx/levels/lv_4_jungle_zone_sgb.png | bin | 0 -> 1463 bytes | |||
| -rw-r--r-- | gfx/levels/lv_4_jungle_zone_unused.png | bin | 0 -> 1544 bytes | |||
| -rw-r--r-- | gfx/levels/lv_4_s_s_anne.png | bin | 0 -> 876 bytes | |||
| -rw-r--r-- | gfx/levels/lv_4_s_s_anne_sgb.png | bin | 0 -> 835 bytes | |||
| -rw-r--r-- | gfx/levels/lv_5_pokemon_tower.png | bin | 0 -> 1550 bytes | |||
| -rw-r--r-- | gfx/levels/lv_5_pokemon_tower_sgb.png | bin | 0 -> 1373 bytes | |||
| -rw-r--r-- | gfx/levels/lv_6_silph_company.png | bin | 0 -> 624 bytes | |||
| -rw-r--r-- | gfx/levels/lv_6_silph_company_sgb.png | bin | 0 -> 613 bytes | |||
| -rw-r--r-- | gfx/levels/lv_6_silph_company_unused.png | bin | 0 -> 628 bytes | |||
| -rw-r--r-- | gfx/levels/lv_7_cycling_road.png | bin | 0 -> 840 bytes | |||
| -rw-r--r-- | gfx/levels/lv_7_cycling_road_sgb.png | bin | 0 -> 816 bytes | |||
| -rw-r--r-- | gfx/levels/lv_7_cycling_road_unused.png | bin | 0 -> 851 bytes | |||
| -rw-r--r-- | gfx/levels/lv_8_power_plant.png | bin | 0 -> 1023 bytes | |||
| -rw-r--r-- | gfx/levels/lv_8_power_plant_sgb.png | bin | 0 -> 956 bytes | |||
| -rw-r--r-- | gfx/levels/lv_9_futago_island.png | bin | 0 -> 1100 bytes | |||
| -rw-r--r-- | gfx/levels/lv_9_futago_island_sgb.png | bin | 0 -> 1039 bytes | |||
| -rw-r--r-- | gfx/sprites/bill_walk.png (renamed from gfx/bill_walk.png) | bin | 298 -> 298 bytes | |||
| -rw-r--r-- | gfx/sprites/bulbasaur_walk.png (renamed from gfx/bulbasaur_walk.png) | bin | 291 -> 291 bytes | |||
| -rw-r--r-- | gfx/sprites/charmander_walk.png (renamed from gfx/charmander_walk.png) | bin | 363 -> 363 bytes | |||
| -rw-r--r-- | gfx/sprites/clefairy_walk.png (renamed from gfx/clefairy_walk.png) | bin | 329 -> 329 bytes | |||
| -rw-r--r-- | gfx/sprites/jigglypuff_walk.png (renamed from gfx/jigglypuff_walk.png) | bin | 279 -> 279 bytes | |||
| -rw-r--r-- | gfx/sprites/mew_silhouette_walk.png (renamed from gfx/mew_silhouette_walk.png) | bin | 177 -> 177 bytes | |||
| -rw-r--r-- | gfx/sprites/mew_walk.png (renamed from gfx/mew_walk.png) | bin | 317 -> 317 bytes | |||
| -rw-r--r-- | gfx/sprites/misty_walk.png (renamed from gfx/misty_walk.png) | bin | 295 -> 295 bytes | |||
| -rw-r--r-- | gfx/sprites/pikachu_walk.png (renamed from gfx/pikachu_walk.png) | bin | 338 -> 338 bytes | |||
| -rw-r--r-- | gfx/sprites/psyduck_walk.png (renamed from gfx/psyduck_walk.png) | bin | 338 -> 338 bytes | |||
| -rw-r--r-- | gfx/sprites/squirtle_walk.png (renamed from gfx/squirtle_walk.png) | bin | 301 -> 301 bytes | |||
| -rw-r--r-- | source/bank_69.asm | 15 | ||||
| -rw-r--r-- | source/bank_6e.asm | 24 | ||||
| -rw-r--r-- | source/bank_6f.asm | 8 | ||||
| -rw-r--r-- | source/bank_70.asm | 13 | ||||
| -rw-r--r-- | source/bank_71.asm | 13 | ||||
| -rw-r--r-- | source/bank_72.asm | 17 | ||||
| -rw-r--r-- | source/bank_73.asm | 15 | ||||
| -rw-r--r-- | source/bank_74.asm | 28 | ||||
| -rw-r--r-- | source/bank_75.asm | 25 | ||||
| -rw-r--r-- | source/bank_76.asm | 27 | ||||
| -rw-r--r-- | source/bank_77.asm | 25 | ||||
| -rw-r--r-- | source/bank_78.asm | 15 |
64 files changed, 210 insertions, 27 deletions
@@ -48,17 +48,7 @@ RGBGFXFLAGS := $(dir_build)/%.bin: %.png | $$(dir $$@) $(RGBGFX) $(RGBGFXFLAGS) -o $@ $< -$(dir_build)/gfx/pikachu_walk.bin: RGBGFXFLAGS = -h -$(dir_build)/gfx/bulbasaur_walk.bin: RGBGFXFLAGS = -h -$(dir_build)/gfx/charmander_walk.bin: RGBGFXFLAGS = -h -$(dir_build)/gfx/squirtle_walk.bin: RGBGFXFLAGS = -h -$(dir_build)/gfx/clefairy_walk.bin: RGBGFXFLAGS = -h -$(dir_build)/gfx/jigglypuff_walk.bin: RGBGFXFLAGS = -h -$(dir_build)/gfx/misty_walk.bin: RGBGFXFLAGS = -h -$(dir_build)/gfx/mew_walk.bin: RGBGFXFLAGS = -h -$(dir_build)/gfx/mew_silhouette_walk.bin: RGBGFXFLAGS = -h -$(dir_build)/gfx/psyduck_walk.bin: RGBGFXFLAGS = -h -$(dir_build)/gfx/bill_walk.bin: RGBGFXFLAGS = -h +$(dir_build)/gfx/sprites/%.bin: RGBGFXFLAGS = -h .PRECIOUS: %/ %/: diff --git a/gfx/text_chars.png b/gfx/fonts/text_chars.png Binary files differindex 71f1b74..71f1b74 100644 --- a/gfx/text_chars.png +++ b/gfx/fonts/text_chars.png diff --git a/gfx/text_chars_2.png b/gfx/fonts/text_chars_2.png Binary files differindex 033c695..033c695 100644 --- a/gfx/text_chars_2.png +++ b/gfx/fonts/text_chars_2.png diff --git a/gfx/levels/lv_0_home.png b/gfx/levels/lv_0_home.png Binary files differnew file mode 100644 index 0000000..a8fe43b --- /dev/null +++ b/gfx/levels/lv_0_home.png diff --git a/gfx/levels/lv_0_home_sgb.png b/gfx/levels/lv_0_home_sgb.png Binary files differnew file mode 100644 index 0000000..e05c0b9 --- /dev/null +++ b/gfx/levels/lv_0_home_sgb.png diff --git a/gfx/levels/lv_0_home_unused.png b/gfx/levels/lv_0_home_unused.png Binary files differnew file mode 100644 index 0000000..abb3b58 --- /dev/null +++ b/gfx/levels/lv_0_home_unused.png diff --git a/gfx/levels/lv_10_hanada_cave.png b/gfx/levels/lv_10_hanada_cave.png Binary files differnew file mode 100644 index 0000000..23ce5fd --- /dev/null +++ b/gfx/levels/lv_10_hanada_cave.png diff --git a/gfx/levels/lv_10_hanada_cave_sgb.png b/gfx/levels/lv_10_hanada_cave_sgb.png Binary files differnew file mode 100644 index 0000000..10991c7 --- /dev/null +++ b/gfx/levels/lv_10_hanada_cave_sgb.png diff --git a/gfx/levels/lv_10_hanada_cave_unused.png b/gfx/levels/lv_10_hanada_cave_unused.png Binary files differnew file mode 100644 index 0000000..89a5d92 --- /dev/null +++ b/gfx/levels/lv_10_hanada_cave_unused.png diff --git a/gfx/levels/lv_1_forest_zone.png b/gfx/levels/lv_1_forest_zone.png Binary files differnew file mode 100644 index 0000000..00e1ad1 --- /dev/null +++ b/gfx/levels/lv_1_forest_zone.png diff --git a/gfx/levels/lv_1_forest_zone_sgb.png b/gfx/levels/lv_1_forest_zone_sgb.png Binary files differnew file mode 100644 index 0000000..f0849ee --- /dev/null +++ b/gfx/levels/lv_1_forest_zone_sgb.png diff --git a/gfx/levels/lv_1_plain_zone.png b/gfx/levels/lv_1_plain_zone.png Binary files differnew file mode 100644 index 0000000..b344243 --- /dev/null +++ b/gfx/levels/lv_1_plain_zone.png diff --git a/gfx/levels/lv_1_tokiwa_forest.png b/gfx/levels/lv_1_tokiwa_forest.png Binary files differnew file mode 100644 index 0000000..f99830f --- /dev/null +++ b/gfx/levels/lv_1_tokiwa_forest.png diff --git a/gfx/levels/lv_1_tokiwa_forest_sgb.png b/gfx/levels/lv_1_tokiwa_forest_sgb.png Binary files differnew file mode 100644 index 0000000..adb9ad6 --- /dev/null +++ b/gfx/levels/lv_1_tokiwa_forest_sgb.png diff --git a/gfx/levels/lv_1_tokiwa_forest_unused.png b/gfx/levels/lv_1_tokiwa_forest_unused.png Binary files differnew file mode 100644 index 0000000..8587bce --- /dev/null +++ b/gfx/levels/lv_1_tokiwa_forest_unused.png diff --git a/gfx/levels/lv_2_lake_zone.png b/gfx/levels/lv_2_lake_zone.png Binary files differnew file mode 100644 index 0000000..2ca4f5a --- /dev/null +++ b/gfx/levels/lv_2_lake_zone.png diff --git a/gfx/levels/lv_2_lake_zone_sgb.png b/gfx/levels/lv_2_lake_zone_sgb.png Binary files differnew file mode 100644 index 0000000..acc30ef --- /dev/null +++ b/gfx/levels/lv_2_lake_zone_sgb.png diff --git a/gfx/lv_2_mt_otsukimi.png b/gfx/levels/lv_2_mt_otsukimi.png Binary files differindex 3b32a9a..3b32a9a 100644 --- a/gfx/lv_2_mt_otsukimi.png +++ b/gfx/levels/lv_2_mt_otsukimi.png diff --git a/gfx/lv_2_mt_otsukimi_sgb.png b/gfx/levels/lv_2_mt_otsukimi_sgb.png Binary files differindex 7099c74..7099c74 100644 --- a/gfx/lv_2_mt_otsukimi_sgb.png +++ b/gfx/levels/lv_2_mt_otsukimi_sgb.png diff --git a/gfx/levels/lv_3_mountain_zone.png b/gfx/levels/lv_3_mountain_zone.png Binary files differnew file mode 100644 index 0000000..64fe922 --- /dev/null +++ b/gfx/levels/lv_3_mountain_zone.png diff --git a/gfx/levels/lv_3_mountain_zone_sgb.png b/gfx/levels/lv_3_mountain_zone_sgb.png Binary files differnew file mode 100644 index 0000000..4a6867e --- /dev/null +++ b/gfx/levels/lv_3_mountain_zone_sgb.png diff --git a/gfx/levels/lv_3_sea_cottage.png b/gfx/levels/lv_3_sea_cottage.png Binary files differnew file mode 100644 index 0000000..970780e --- /dev/null +++ b/gfx/levels/lv_3_sea_cottage.png diff --git a/gfx/levels/lv_3_sea_cottage_sgb.png b/gfx/levels/lv_3_sea_cottage_sgb.png Binary files differnew file mode 100644 index 0000000..6ae479e --- /dev/null +++ b/gfx/levels/lv_3_sea_cottage_sgb.png diff --git a/gfx/levels/lv_3_sea_cottage_unused.png b/gfx/levels/lv_3_sea_cottage_unused.png Binary files differnew file mode 100644 index 0000000..c874e18 --- /dev/null +++ b/gfx/levels/lv_3_sea_cottage_unused.png diff --git a/gfx/levels/lv_4_jungle_zone.png b/gfx/levels/lv_4_jungle_zone.png Binary files differnew file mode 100644 index 0000000..25ca289 --- /dev/null +++ b/gfx/levels/lv_4_jungle_zone.png diff --git a/gfx/levels/lv_4_jungle_zone_sgb.png b/gfx/levels/lv_4_jungle_zone_sgb.png Binary files differnew file mode 100644 index 0000000..aaca3b7 --- /dev/null +++ b/gfx/levels/lv_4_jungle_zone_sgb.png diff --git a/gfx/levels/lv_4_jungle_zone_unused.png b/gfx/levels/lv_4_jungle_zone_unused.png Binary files differnew file mode 100644 index 0000000..cf23786 --- /dev/null +++ b/gfx/levels/lv_4_jungle_zone_unused.png diff --git a/gfx/levels/lv_4_s_s_anne.png b/gfx/levels/lv_4_s_s_anne.png Binary files differnew file mode 100644 index 0000000..a2fc3ea --- /dev/null +++ b/gfx/levels/lv_4_s_s_anne.png diff --git a/gfx/levels/lv_4_s_s_anne_sgb.png b/gfx/levels/lv_4_s_s_anne_sgb.png Binary files differnew file mode 100644 index 0000000..6201a1c --- /dev/null +++ b/gfx/levels/lv_4_s_s_anne_sgb.png diff --git a/gfx/levels/lv_5_pokemon_tower.png b/gfx/levels/lv_5_pokemon_tower.png Binary files differnew file mode 100644 index 0000000..6ca360a --- /dev/null +++ b/gfx/levels/lv_5_pokemon_tower.png diff --git a/gfx/levels/lv_5_pokemon_tower_sgb.png b/gfx/levels/lv_5_pokemon_tower_sgb.png Binary files differnew file mode 100644 index 0000000..74e63fb --- /dev/null +++ b/gfx/levels/lv_5_pokemon_tower_sgb.png diff --git a/gfx/levels/lv_6_silph_company.png b/gfx/levels/lv_6_silph_company.png Binary files differnew file mode 100644 index 0000000..663e4df --- /dev/null +++ b/gfx/levels/lv_6_silph_company.png diff --git a/gfx/levels/lv_6_silph_company_sgb.png b/gfx/levels/lv_6_silph_company_sgb.png Binary files differnew file mode 100644 index 0000000..fc09845 --- /dev/null +++ b/gfx/levels/lv_6_silph_company_sgb.png diff --git a/gfx/levels/lv_6_silph_company_unused.png b/gfx/levels/lv_6_silph_company_unused.png Binary files differnew file mode 100644 index 0000000..7e45711 --- /dev/null +++ b/gfx/levels/lv_6_silph_company_unused.png diff --git a/gfx/levels/lv_7_cycling_road.png b/gfx/levels/lv_7_cycling_road.png Binary files differnew file mode 100644 index 0000000..69f2d12 --- /dev/null +++ b/gfx/levels/lv_7_cycling_road.png diff --git a/gfx/levels/lv_7_cycling_road_sgb.png b/gfx/levels/lv_7_cycling_road_sgb.png Binary files differnew file mode 100644 index 0000000..316e00f --- /dev/null +++ b/gfx/levels/lv_7_cycling_road_sgb.png diff --git a/gfx/levels/lv_7_cycling_road_unused.png b/gfx/levels/lv_7_cycling_road_unused.png Binary files differnew file mode 100644 index 0000000..c808429 --- /dev/null +++ b/gfx/levels/lv_7_cycling_road_unused.png diff --git a/gfx/levels/lv_8_power_plant.png b/gfx/levels/lv_8_power_plant.png Binary files differnew file mode 100644 index 0000000..8e6cd27 --- /dev/null +++ b/gfx/levels/lv_8_power_plant.png diff --git a/gfx/levels/lv_8_power_plant_sgb.png b/gfx/levels/lv_8_power_plant_sgb.png Binary files differnew file mode 100644 index 0000000..157d593 --- /dev/null +++ b/gfx/levels/lv_8_power_plant_sgb.png diff --git a/gfx/levels/lv_9_futago_island.png b/gfx/levels/lv_9_futago_island.png Binary files differnew file mode 100644 index 0000000..12ddd9f --- /dev/null +++ b/gfx/levels/lv_9_futago_island.png diff --git a/gfx/levels/lv_9_futago_island_sgb.png b/gfx/levels/lv_9_futago_island_sgb.png Binary files differnew file mode 100644 index 0000000..fe1ffda --- /dev/null +++ b/gfx/levels/lv_9_futago_island_sgb.png diff --git a/gfx/bill_walk.png b/gfx/sprites/bill_walk.png Binary files differindex 8793237..8793237 100644 --- a/gfx/bill_walk.png +++ b/gfx/sprites/bill_walk.png diff --git a/gfx/bulbasaur_walk.png b/gfx/sprites/bulbasaur_walk.png Binary files differindex c4dabb8..c4dabb8 100644 --- a/gfx/bulbasaur_walk.png +++ b/gfx/sprites/bulbasaur_walk.png diff --git a/gfx/charmander_walk.png b/gfx/sprites/charmander_walk.png Binary files differindex 0e7ba5b..0e7ba5b 100644 --- a/gfx/charmander_walk.png +++ b/gfx/sprites/charmander_walk.png diff --git a/gfx/clefairy_walk.png b/gfx/sprites/clefairy_walk.png Binary files differindex 56658fa..56658fa 100644 --- a/gfx/clefairy_walk.png +++ b/gfx/sprites/clefairy_walk.png diff --git a/gfx/jigglypuff_walk.png b/gfx/sprites/jigglypuff_walk.png Binary files differindex fd4b6d5..fd4b6d5 100644 --- a/gfx/jigglypuff_walk.png +++ b/gfx/sprites/jigglypuff_walk.png diff --git a/gfx/mew_silhouette_walk.png b/gfx/sprites/mew_silhouette_walk.png Binary files differindex 2ec4862..2ec4862 100644 --- a/gfx/mew_silhouette_walk.png +++ b/gfx/sprites/mew_silhouette_walk.png diff --git a/gfx/mew_walk.png b/gfx/sprites/mew_walk.png Binary files differindex a44ef72..a44ef72 100644 --- a/gfx/mew_walk.png +++ b/gfx/sprites/mew_walk.png diff --git a/gfx/misty_walk.png b/gfx/sprites/misty_walk.png Binary files differindex ad30437..ad30437 100644 --- a/gfx/misty_walk.png +++ b/gfx/sprites/misty_walk.png diff --git a/gfx/pikachu_walk.png b/gfx/sprites/pikachu_walk.png Binary files differindex a94479d..a94479d 100644 --- a/gfx/pikachu_walk.png +++ b/gfx/sprites/pikachu_walk.png diff --git a/gfx/psyduck_walk.png b/gfx/sprites/psyduck_walk.png Binary files differindex d0d2b50..d0d2b50 100644 --- a/gfx/psyduck_walk.png +++ b/gfx/sprites/psyduck_walk.png diff --git a/gfx/squirtle_walk.png b/gfx/sprites/squirtle_walk.png Binary files differindex 9ef4f7e..9ef4f7e 100644 --- a/gfx/squirtle_walk.png +++ b/gfx/sprites/squirtle_walk.png 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:: |
