.bin -> .2bpp

26 files changed, 186 insertions, 186 deletions

diff --git a/gfx/gfx.mk b/gfx/gfx.mk
index d1b43d9..2299205 100644
--- a/gfx/gfx.mk
+++ b/gfx/gfx.mk
@@ -1,11 +1,11 @@
 RGBGFXFLAGS :=
-$(dir_build)/%.bin: %.png | $$(dir $$@)
+$(dir_build)/%.2bpp: %.png | $$(dir $$@)
 	$(RGBGFX) $(RGBGFXFLAGS) -o $@ $<
 
-$(dir_build)/gfx/sprites/%.bin: RGBGFXFLAGS = -h
+$(dir_build)/gfx/sprites/%.2bpp: RGBGFXFLAGS = -h
 
-# data_select.bin.xor decompresses to 2bpp-encoded data_select.png with an extra byte $33 (ASCII "3") appended
-$(dir_build)/gfx/data_select/data_select.bin: gfx/data_select/data_select.png | $$(dir $$@)
+# data_select.2bpp.xor decompresses to 2bpp-encoded data_select.png with an extra byte $33 (ASCII "3") appended
+$(dir_build)/gfx/data_select/data_select.2bpp: gfx/data_select/data_select.png | $$(dir $$@)
 	$(RGBGFX) $(RGBGFXFLAGS) -o $@ $<
 	printf 3 >> $@
 
diff --git a/source/bank_56.asm b/source/bank_56.asm
index 956e705..326757a 100644
--- a/source/bank_56.asm
+++ b/source/bank_56.asm
@@ -1,10 +1,10 @@
 SECTION "gfx_how_to_play", ROMX[$4000], BANK[$56]
 gfx_how_to_play::
-INCBIN "gfx/how_to_play/how_to_play.bin"
+INCBIN "gfx/how_to_play/how_to_play.2bpp"
 .end::
 
 SECTION "gfx_how_to_play_sgb", ROMX[$7800], BANK[$56]
 gfx_how_to_play_sgb::
-INCBIN "gfx/how_to_play/oak_mouth_sgb.bin"
-INCBIN "gfx/how_to_play/how_to_play_sgb.bin"
+INCBIN "gfx/how_to_play/oak_mouth_sgb.2bpp"
+INCBIN "gfx/how_to_play/how_to_play_sgb.2bpp"
 .end::
diff --git a/source/bank_57.asm b/source/bank_57.asm
index 93cc7f9..e9d2b7c 100644
--- a/source/bank_57.asm
+++ b/source/bank_57.asm
@@ -1,6 +1,6 @@
 SECTION "gfx_text_chars_light", ROMX[$4000], BANK[$57]
 gfx_text_chars_light::
-INCBIN "gfx/fonts/text_chars_light.bin"
+INCBIN "gfx/fonts/text_chars_light.2bpp"
 .end::
 
 SECTION "tilemap_how_to_play", ROMX[$7c00], BANK[$57]
diff --git a/source/bank_58.asm b/source/bank_58.asm
index a6792a1..9e10c4e 100644
--- a/source/bank_58.asm
+++ b/source/bank_58.asm
@@ -1,4 +1,4 @@
 SECTION "gfx_puzzle_demo", ROMX[$4000], BANK[$58]
 gfx_puzzle_demo::
-INCBIN "gfx/demo/puzzle_demo.bin"
+INCBIN "gfx/demo/puzzle_demo.2bpp"
 .end::
diff --git a/source/bank_5f.asm b/source/bank_5f.asm
index 39e9a7e..f58f15a 100644
--- a/source/bank_5f.asm
+++ b/source/bank_5f.asm
@@ -1,10 +1,10 @@
 SECTION "unused_gfx_picross_2", ROMX[$4000], BANK[$5f]
 unused_gfx_picross_2::
-INCBIN "gfx/unused/mario_wario.bin"
+INCBIN "gfx/unused/mario_wario.2bpp"
 .end::
 
 SECTION "unused_gfx_picross_2_finals", ROMX[$6c00], BANK[$5f]
 unused_gfx_picross_2_finals::
-INCBIN "gfx/unused/marios_picross_final.bin"
-INCBIN "gfx/unused/warios_picross_final.bin"
+INCBIN "gfx/unused/marios_picross_final.2bpp"
+INCBIN "gfx/unused/warios_picross_final.2bpp"
 .end::
diff --git a/source/bank_64.asm b/source/bank_64.asm
index e29534f..9251697 100644
--- a/source/bank_64.asm
+++ b/source/bank_64.asm
@@ -1,14 +1,14 @@
 SECTION "gfx_font_striped_dark", ROMX[$4d00], BANK[$64]
 gfx_font_striped_dark::
-INCBIN "gfx/fonts/font_striped_dark.bin"
+INCBIN "gfx/fonts/font_striped_dark.2bpp"
 .end::
 
 SECTION "gfx_font_striped_light", ROMX[$6500], BANK[$64]
 gfx_font_striped_light::
-INCBIN "gfx/fonts/font_striped_light.bin"
+INCBIN "gfx/fonts/font_striped_light.2bpp"
 .end::
 
 SECTION "gfx_font_1", ROMX[$7000], BANK[$64]
 gfx_font_1::
-INCBIN "gfx/fonts/font_1.bin"
+INCBIN "gfx/fonts/font_1.2bpp"
 .end::
diff --git a/source/bank_65.asm b/source/bank_65.asm
index f3e15a6..3739ccd 100644
--- a/source/bank_65.asm
+++ b/source/bank_65.asm
@@ -1,9 +1,9 @@
 SECTION "bank65", ROMX[$4000], BANK[$65]
 
 gfx_album_picture_frames::
-INCBIN "gfx/safari_zone_album/picture_frames.bin"
+INCBIN "gfx/safari_zone_album/picture_frames.2bpp"
 .end::
 
 gfx_font_2::
-INCBIN "gfx/fonts/font_2.bin"
+INCBIN "gfx/fonts/font_2.2bpp"
 .end::
diff --git a/source/bank_66.asm b/source/bank_66.asm
index 9ad743d..5b1e97e 100644
--- a/source/bank_66.asm
+++ b/source/bank_66.asm
@@ -1,126 +1,126 @@
 SECTION "bank66", ROMX[$4000], BANK[$66]
 
 gfx_bgm_pikachu_1::
-INCBIN "gfx/bgm/pikachu_blink.bin"
-INCBIN "gfx/bgm/pikachu_1.bin"
+INCBIN "gfx/bgm/pikachu_blink.2bpp"
+INCBIN "gfx/bgm/pikachu_1.2bpp"
 .end::
 
 gfx_bgm_pikachu_2::
-INCBIN "gfx/bgm/no_blink.bin"
-INCBIN "gfx/bgm/pikachu_2.bin"
+INCBIN "gfx/bgm/no_blink.2bpp"
+INCBIN "gfx/bgm/pikachu_2.2bpp"
 .end::
 
 gfx_bgm_pikachu_3::
-INCBIN "gfx/bgm/no_blink.bin"
-INCBIN "gfx/bgm/pikachu_3.bin"
+INCBIN "gfx/bgm/no_blink.2bpp"
+INCBIN "gfx/bgm/pikachu_3.2bpp"
 .end::
 
 gfx_bgm_pikachu_4::
-INCBIN "gfx/bgm/no_blink.bin"
-INCBIN "gfx/bgm/pikachu_4.bin"
+INCBIN "gfx/bgm/no_blink.2bpp"
+INCBIN "gfx/bgm/pikachu_4.2bpp"
 .end::
 
 gfx_bgm_bulbasaur_1::
-INCBIN "gfx/bgm/bulbasaur_blink.bin"
-INCBIN "gfx/bgm/bulbasaur_1.bin"
+INCBIN "gfx/bgm/bulbasaur_blink.2bpp"
+INCBIN "gfx/bgm/bulbasaur_1.2bpp"
 .end::
 
 gfx_bgm_bulbasaur_2::
-INCBIN "gfx/bgm/no_blink.bin"
-INCBIN "gfx/bgm/bulbasaur_2.bin"
+INCBIN "gfx/bgm/no_blink.2bpp"
+INCBIN "gfx/bgm/bulbasaur_2.2bpp"
 .end::
 
 gfx_bgm_bulbasaur_3::
-INCBIN "gfx/bgm/no_blink.bin"
-INCBIN "gfx/bgm/bulbasaur_3.bin"
+INCBIN "gfx/bgm/no_blink.2bpp"
+INCBIN "gfx/bgm/bulbasaur_3.2bpp"
 .end::
 
 gfx_bgm_bulbasaur_4::
-INCBIN "gfx/bgm/no_blink.bin"
-INCBIN "gfx/bgm/bulbasaur_4.bin"
+INCBIN "gfx/bgm/no_blink.2bpp"
+INCBIN "gfx/bgm/bulbasaur_4.2bpp"
 .end::
 
 gfx_bgm_charmander_1::
-INCBIN "gfx/bgm/charmander_blink.bin"
-INCBIN "gfx/bgm/charmander_1.bin"
+INCBIN "gfx/bgm/charmander_blink.2bpp"
+INCBIN "gfx/bgm/charmander_1.2bpp"
 .end::
 
 gfx_bgm_charmander_2::
-INCBIN "gfx/bgm/no_blink.bin"
-INCBIN "gfx/bgm/charmander_2.bin"
+INCBIN "gfx/bgm/no_blink.2bpp"
+INCBIN "gfx/bgm/charmander_2.2bpp"
 .end::
 
 gfx_bgm_charmander_3::
-INCBIN "gfx/bgm/no_blink.bin"
-INCBIN "gfx/bgm/charmander_3.bin"
+INCBIN "gfx/bgm/no_blink.2bpp"
+INCBIN "gfx/bgm/charmander_3.2bpp"
 .end::
 
 gfx_bgm_charmander_4::
-INCBIN "gfx/bgm/no_blink.bin"
-INCBIN "gfx/bgm/charmander_4.bin"
+INCBIN "gfx/bgm/no_blink.2bpp"
+INCBIN "gfx/bgm/charmander_4.2bpp"
 .end::
 
 gfx_bgm_squirtle_1::
-INCBIN "gfx/bgm/squirtle_blink.bin"
-INCBIN "gfx/bgm/squirtle_1.bin"
+INCBIN "gfx/bgm/squirtle_blink.2bpp"
+INCBIN "gfx/bgm/squirtle_1.2bpp"
 .end::
 
 gfx_bgm_squirtle_2::
-INCBIN "gfx/bgm/no_blink.bin"
-INCBIN "gfx/bgm/squirtle_2.bin"
+INCBIN "gfx/bgm/no_blink.2bpp"
+INCBIN "gfx/bgm/squirtle_2.2bpp"
 .end::
 
 gfx_bgm_squirtle_3::
-INCBIN "gfx/bgm/no_blink.bin"
-INCBIN "gfx/bgm/squirtle_3.bin"
+INCBIN "gfx/bgm/no_blink.2bpp"
+INCBIN "gfx/bgm/squirtle_3.2bpp"
 .end::
 
 gfx_bgm_squirtle_4::
-INCBIN "gfx/bgm/no_blink.bin"
-INCBIN "gfx/bgm/squirtle_4.bin"
+INCBIN "gfx/bgm/no_blink.2bpp"
+INCBIN "gfx/bgm/squirtle_4.2bpp"
 .end::
 
 gfx_bgm_clefairy_1::
-INCBIN "gfx/bgm/clefairy_blink.bin"
-INCBIN "gfx/bgm/clefairy_1.bin"
+INCBIN "gfx/bgm/clefairy_blink.2bpp"
+INCBIN "gfx/bgm/clefairy_1.2bpp"
 .end::
 
 gfx_bgm_clefairy_2::
-INCBIN "gfx/bgm/no_blink.bin"
-INCBIN "gfx/bgm/clefairy_2.bin"
+INCBIN "gfx/bgm/no_blink.2bpp"
+INCBIN "gfx/bgm/clefairy_2.2bpp"
 .end::
 
 gfx_bgm_clefairy_3::
-INCBIN "gfx/bgm/no_blink.bin"
-INCBIN "gfx/bgm/clefairy_3.bin"
+INCBIN "gfx/bgm/no_blink.2bpp"
+INCBIN "gfx/bgm/clefairy_3.2bpp"
 .end::
 
 gfx_bgm_clefairy_4::
-INCBIN "gfx/bgm/no_blink.bin"
-INCBIN "gfx/bgm/clefairy_4.bin"
+INCBIN "gfx/bgm/no_blink.2bpp"
+INCBIN "gfx/bgm/clefairy_4.2bpp"
 .end::
 
 gfx_bgm_jigglypuff_1::
-INCBIN "gfx/bgm/jigglypuff_blink.bin"
-INCBIN "gfx/bgm/jigglypuff_1.bin"
+INCBIN "gfx/bgm/jigglypuff_blink.2bpp"
+INCBIN "gfx/bgm/jigglypuff_1.2bpp"
 .end::
 
 gfx_bgm_jigglypuff_2::
-INCBIN "gfx/bgm/no_blink.bin"
-INCBIN "gfx/bgm/jigglypuff_2.bin"
+INCBIN "gfx/bgm/no_blink.2bpp"
+INCBIN "gfx/bgm/jigglypuff_2.2bpp"
 .end::
 
 gfx_bgm_jigglypuff_3::
-INCBIN "gfx/bgm/no_blink.bin"
-INCBIN "gfx/bgm/jigglypuff_3.bin"
+INCBIN "gfx/bgm/no_blink.2bpp"
+INCBIN "gfx/bgm/jigglypuff_3.2bpp"
 .end::
 
 gfx_bgm_jigglypuff_4::
-INCBIN "gfx/bgm/no_blink.bin"
-INCBIN "gfx/bgm/jigglypuff_4.bin"
+INCBIN "gfx/bgm/no_blink.2bpp"
+INCBIN "gfx/bgm/jigglypuff_4.2bpp"
 .end::
 
 SECTION "compressed_gfx_title_2", ROMX[$7ebf], BANK[$66]
 compressed_gfx_title_2::
-INCBIN "gfx/title/title_2.bin.xor"
+INCBIN "gfx/title/title_2.2bpp.xor"
 .end::
diff --git a/source/bank_67.asm b/source/bank_67.asm
index dbd6622..b60155b 100644
--- a/source/bank_67.asm
+++ b/source/bank_67.asm
@@ -1,4 +1,4 @@
 SECTION "compressed_gfx_title_1", ROMX[$7000], BANK[$67]
 compressed_gfx_title_1::
-INCBIN "gfx/title/title_1.bin.xor"
+INCBIN "gfx/title/title_1.2bpp.xor"
 .end::
diff --git a/source/bank_68.asm b/source/bank_68.asm
index b20508b..991ccbe 100644
--- a/source/bank_68.asm
+++ b/source/bank_68.asm
@@ -1,121 +1,121 @@
 SECTION "bank68", ROMX[$4000], BANK[$68]
 
 gfx_bgm_pikachu_1_sgb::
-INCBIN "gfx/bgm/pikachu_blink.bin"
-INCBIN "gfx/bgm/pikachu_1_sgb.bin"
+INCBIN "gfx/bgm/pikachu_blink.2bpp"
+INCBIN "gfx/bgm/pikachu_1_sgb.2bpp"
 .end::
 
 gfx_bgm_pikachu_2_sgb::
-INCBIN "gfx/bgm/no_blink.bin"
-INCBIN "gfx/bgm/pikachu_2_sgb.bin"
+INCBIN "gfx/bgm/no_blink.2bpp"
+INCBIN "gfx/bgm/pikachu_2_sgb.2bpp"
 .end::
 
 gfx_bgm_pikachu_3_sgb::
-INCBIN "gfx/bgm/no_blink.bin"
-INCBIN "gfx/bgm/pikachu_3_sgb.bin"
+INCBIN "gfx/bgm/no_blink.2bpp"
+INCBIN "gfx/bgm/pikachu_3_sgb.2bpp"
 .end::
 
 gfx_bgm_pikachu_4_sgb::
-INCBIN "gfx/bgm/no_blink.bin"
-INCBIN "gfx/bgm/pikachu_4_sgb.bin"
+INCBIN "gfx/bgm/no_blink.2bpp"
+INCBIN "gfx/bgm/pikachu_4_sgb.2bpp"
 .end::
 
 gfx_bgm_bulbasaur_1_sgb::
-INCBIN "gfx/bgm/bulbasaur_blink.bin"
-INCBIN "gfx/bgm/bulbasaur_1_sgb.bin"
+INCBIN "gfx/bgm/bulbasaur_blink.2bpp"
+INCBIN "gfx/bgm/bulbasaur_1_sgb.2bpp"
 .end::
 
 gfx_bgm_bulbasaur_2_sgb::
-INCBIN "gfx/bgm/no_blink.bin"
-INCBIN "gfx/bgm/bulbasaur_2_sgb.bin"
+INCBIN "gfx/bgm/no_blink.2bpp"
+INCBIN "gfx/bgm/bulbasaur_2_sgb.2bpp"
 .end::
 
 gfx_bgm_bulbasaur_3_sgb::
-INCBIN "gfx/bgm/no_blink.bin"
-INCBIN "gfx/bgm/bulbasaur_3_sgb.bin"
+INCBIN "gfx/bgm/no_blink.2bpp"
+INCBIN "gfx/bgm/bulbasaur_3_sgb.2bpp"
 .end::
 
 gfx_bgm_bulbasaur_4_sgb::
-INCBIN "gfx/bgm/no_blink.bin"
-INCBIN "gfx/bgm/bulbasaur_4_sgb.bin"
+INCBIN "gfx/bgm/no_blink.2bpp"
+INCBIN "gfx/bgm/bulbasaur_4_sgb.2bpp"
 .end::
 
 gfx_bgm_charmander_1_sgb::
-INCBIN "gfx/bgm/charmander_blink.bin"
-INCBIN "gfx/bgm/charmander_1_sgb.bin"
+INCBIN "gfx/bgm/charmander_blink.2bpp"
+INCBIN "gfx/bgm/charmander_1_sgb.2bpp"
 .end::
 
 gfx_bgm_charmander_2_sgb::
-INCBIN "gfx/bgm/no_blink.bin"
-INCBIN "gfx/bgm/charmander_2_sgb.bin"
+INCBIN "gfx/bgm/no_blink.2bpp"
+INCBIN "gfx/bgm/charmander_2_sgb.2bpp"
 .end::
 
 gfx_bgm_charmander_3_sgb::
-INCBIN "gfx/bgm/no_blink.bin"
-INCBIN "gfx/bgm/charmander_3_sgb.bin"
+INCBIN "gfx/bgm/no_blink.2bpp"
+INCBIN "gfx/bgm/charmander_3_sgb.2bpp"
 .end::
 
 gfx_bgm_charmander_4_sgb::
-INCBIN "gfx/bgm/no_blink.bin"
-INCBIN "gfx/bgm/charmander_4_sgb.bin"
+INCBIN "gfx/bgm/no_blink.2bpp"
+INCBIN "gfx/bgm/charmander_4_sgb.2bpp"
 .end::
 
 gfx_bgm_squirtle_1_sgb::
-INCBIN "gfx/bgm/squirtle_blink.bin"
-INCBIN "gfx/bgm/squirtle_1_sgb.bin"
+INCBIN "gfx/bgm/squirtle_blink.2bpp"
+INCBIN "gfx/bgm/squirtle_1_sgb.2bpp"
 .end::
 
 gfx_bgm_squirtle_2_sgb::
-INCBIN "gfx/bgm/no_blink.bin"
-INCBIN "gfx/bgm/squirtle_2_sgb.bin"
+INCBIN "gfx/bgm/no_blink.2bpp"
+INCBIN "gfx/bgm/squirtle_2_sgb.2bpp"
 .end::
 
 gfx_bgm_squirtle_3_sgb::
-INCBIN "gfx/bgm/no_blink.bin"
-INCBIN "gfx/bgm/squirtle_3_sgb.bin"
+INCBIN "gfx/bgm/no_blink.2bpp"
+INCBIN "gfx/bgm/squirtle_3_sgb.2bpp"
 .end::
 
 gfx_bgm_squirtle_4_sgb::
-INCBIN "gfx/bgm/no_blink.bin"
-INCBIN "gfx/bgm/squirtle_4_sgb.bin"
+INCBIN "gfx/bgm/no_blink.2bpp"
+INCBIN "gfx/bgm/squirtle_4_sgb.2bpp"
 .end::
 
 gfx_bgm_clefairy_1_sgb::
-INCBIN "gfx/bgm/clefairy_blink.bin"
-INCBIN "gfx/bgm/clefairy_1_sgb.bin"
+INCBIN "gfx/bgm/clefairy_blink.2bpp"
+INCBIN "gfx/bgm/clefairy_1_sgb.2bpp"
 .end::
 
 gfx_bgm_clefairy_2_sgb::
-INCBIN "gfx/bgm/no_blink.bin"
-INCBIN "gfx/bgm/clefairy_2_sgb.bin"
+INCBIN "gfx/bgm/no_blink.2bpp"
+INCBIN "gfx/bgm/clefairy_2_sgb.2bpp"
 .end::
 
 gfx_bgm_clefairy_3_sgb::
-INCBIN "gfx/bgm/no_blink.bin"
-INCBIN "gfx/bgm/clefairy_3_sgb.bin"
+INCBIN "gfx/bgm/no_blink.2bpp"
+INCBIN "gfx/bgm/clefairy_3_sgb.2bpp"
 .end::
 
 gfx_bgm_clefairy_4_sgb::
-INCBIN "gfx/bgm/no_blink.bin"
-INCBIN "gfx/bgm/clefairy_4_sgb.bin"
+INCBIN "gfx/bgm/no_blink.2bpp"
+INCBIN "gfx/bgm/clefairy_4_sgb.2bpp"
 .end::
 
 gfx_bgm_jigglypuff_1_sgb::
-INCBIN "gfx/bgm/jigglypuff_blink.bin"
-INCBIN "gfx/bgm/jigglypuff_1_sgb.bin"
+INCBIN "gfx/bgm/jigglypuff_blink.2bpp"
+INCBIN "gfx/bgm/jigglypuff_1_sgb.2bpp"
 .end::
 
 gfx_bgm_jigglypuff_2_sgb::
-INCBIN "gfx/bgm/no_blink.bin"
-INCBIN "gfx/bgm/jigglypuff_2_sgb.bin"
+INCBIN "gfx/bgm/no_blink.2bpp"
+INCBIN "gfx/bgm/jigglypuff_2_sgb.2bpp"
 .end::
 
 gfx_bgm_jigglypuff_3_sgb::
-INCBIN "gfx/bgm/no_blink.bin"
-INCBIN "gfx/bgm/jigglypuff_3_sgb.bin"
+INCBIN "gfx/bgm/no_blink.2bpp"
+INCBIN "gfx/bgm/jigglypuff_3_sgb.2bpp"
 .end::
 
 gfx_bgm_jigglypuff_4_sgb::
-INCBIN "gfx/bgm/no_blink.bin"
-INCBIN "gfx/bgm/jigglypuff_4_sgb.bin"
+INCBIN "gfx/bgm/no_blink.2bpp"
+INCBIN "gfx/bgm/jigglypuff_4_sgb.2bpp"
 .end::
diff --git a/source/bank_69.asm b/source/bank_69.asm
index 63bf7ae..53d7d1e 100644
--- a/source/bank_69.asm
+++ b/source/bank_69.asm
@@ -1,26 +1,26 @@
 SECTION "gfx_lv_1_tokiwa_forest", ROMX[$4800], BANK[$69]
 gfx_lv_1_tokiwa_forest::
-INCBIN "gfx/town_map/lv_1_tokiwa_forest.bin"
+INCBIN "gfx/town_map/lv_1_tokiwa_forest.2bpp"
 .end::
 gfx_lv_1_tokiwa_forest_sgb::
-INCBIN "gfx/town_map/lv_1_tokiwa_forest_sgb.bin"
+INCBIN "gfx/town_map/lv_1_tokiwa_forest_sgb.2bpp"
 .end::
 ; The unused tree trunk tiles are darker.
 gfx_lv_1_tokiwa_forest_duplicate::
-INCBIN "gfx/town_map/lv_1_tokiwa_forest_unused.bin"
+INCBIN "gfx/town_map/lv_1_tokiwa_forest_unused.2bpp"
 .end::
 
 SECTION "gfx_textbox_border_dark", ROMX[$6000], BANK[$69]
 gfx_textbox_border_dark::
-INCBIN "gfx/fonts/textbox_border_dark.bin"
+INCBIN "gfx/fonts/textbox_border_dark.2bpp"
 .end::
 
 SECTION "gfx_textbox_border", ROMX[$6800], BANK[$69]
 gfx_textbox_border_bw::
-INCBIN "gfx/fonts/textbox_border_bw.bin"
+INCBIN "gfx/fonts/textbox_border_bw.2bpp"
 .end::
 
 SECTION "compressed_gfx_data_select", ROMX[$7000], BANK[$69]
 compressed_gfx_data_select::
-INCBIN "gfx/data_select/data_select.bin.xor"
+INCBIN "gfx/data_select/data_select.2bpp.xor"
 .end::
diff --git a/source/bank_6c.asm b/source/bank_6c.asm
index da55e0e..e1dd702 100644
--- a/source/bank_6c.asm
+++ b/source/bank_6c.asm
@@ -1,6 +1,6 @@
 SECTION "gfx_unknown_6c_4000", ROMX[$4000], BANK[$6c]
 gfx_unknown_6c_4000::
-INCBIN "gfx/unknown/unknown_6c_4000.bin"
+INCBIN "gfx/unknown/unknown_6c_4000.2bpp"
 .end::
 
 SECTION "compressed_tilemap_attrmap_pokedex_pic", ROMX[$7c00], BANK[$6c]
diff --git a/source/bank_6d.asm b/source/bank_6d.asm
index a797818..8ca5fd3 100644
--- a/source/bank_6d.asm
+++ b/source/bank_6d.asm
@@ -1,4 +1,4 @@
 SECTION "gfx_album_picture_frames_light", ROMX[$4000], BANK[$6d]
 gfx_album_picture_frames_light::
-INCBIN "gfx/safari_zone_album/picture_frames_light.bin"
+INCBIN "gfx/safari_zone_album/picture_frames_light.2bpp"
 .end::
diff --git a/source/bank_6e.asm b/source/bank_6e.asm
index 686a2fc..f99916a 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/fonts/text_chars_bw.bin"
+INCBIN "gfx/fonts/text_chars_bw.2bpp"
 .end::
 
 gfx_pikachu_walk::
-INCBIN "gfx/sprites/pikachu_walk.bin"
+INCBIN "gfx/sprites/pikachu_walk.2bpp"
 .end::
 
 gfx_bulbasaur_walk::
-INCBIN "gfx/sprites/bulbasaur_walk.bin"
+INCBIN "gfx/sprites/bulbasaur_walk.2bpp"
 .end::
 
 gfx_charmander_walk::
-INCBIN "gfx/sprites/charmander_walk.bin"
+INCBIN "gfx/sprites/charmander_walk.2bpp"
 .end::
 
 gfx_squirtle_walk::
-INCBIN "gfx/sprites/squirtle_walk.bin"
+INCBIN "gfx/sprites/squirtle_walk.2bpp"
 .end::
 
 gfx_clefairy_walk::
-INCBIN "gfx/sprites/clefairy_walk.bin"
+INCBIN "gfx/sprites/clefairy_walk.2bpp"
 .end::
 
 gfx_jigglypuff_walk::
-INCBIN "gfx/sprites/jigglypuff_walk.bin"
+INCBIN "gfx/sprites/jigglypuff_walk.2bpp"
 .end::
 
 gfx_misty_walk::
-INCBIN "gfx/sprites/misty_walk.bin"
+INCBIN "gfx/sprites/misty_walk.2bpp"
 .end::
 
 gfx_mew_walk::
-INCBIN "gfx/sprites/mew_walk.bin"
+INCBIN "gfx/sprites/mew_walk.2bpp"
 .end::
 
 gfx_mew_silhouette_walk::
-INCBIN "gfx/sprites/mew_silhouette_walk.bin"
+INCBIN "gfx/sprites/mew_silhouette_walk.2bpp"
 .end::
 
 gfx_psyduck_walk::
-INCBIN "gfx/sprites/psyduck_walk.bin"
+INCBIN "gfx/sprites/psyduck_walk.2bpp"
 .end::
 
 gfx_bill_walk::
-INCBIN "gfx/sprites/bill_walk.bin"
+INCBIN "gfx/sprites/bill_walk.2bpp"
 .end::
diff --git a/source/bank_6f.asm b/source/bank_6f.asm
index e99942d..bf94fc1 100644
--- a/source/bank_6f.asm
+++ b/source/bank_6f.asm
@@ -1,15 +1,15 @@
 SECTION "bank6f", ROMX[$4000], BANK[$6f]
 
 gfx_text_chars_dark::
-INCBIN "gfx/fonts/text_chars_dark.bin"
+INCBIN "gfx/fonts/text_chars_dark.2bpp"
 .end::
 
 gfx_lv_2_mt_otsukimi::
-INCBIN "gfx/town_map/lv_2_mt_otsukimi.bin"
+INCBIN "gfx/town_map/lv_2_mt_otsukimi.2bpp"
 .end::
 gfx_lv_2_mt_otsukimi_sgb::
-INCBIN "gfx/town_map/lv_2_mt_otsukimi_sgb.bin"
+INCBIN "gfx/town_map/lv_2_mt_otsukimi_sgb.2bpp"
 .end::
 gfx_lv_2_mt_otsukimi_duplicate::
-INCBIN "gfx/town_map/lv_2_mt_otsukimi.bin"
+INCBIN "gfx/town_map/lv_2_mt_otsukimi.2bpp"
 .end::
diff --git a/source/bank_70.asm b/source/bank_70.asm
index 5b83df2..af3ff04 100644
--- a/source/bank_70.asm
+++ b/source/bank_70.asm
@@ -1,17 +1,17 @@
 SECTION "unused_gfx_picross_2_levels", ROMX[$4000], BANK[$70]
 unused_gfx_picross_2_levels::
-INCBIN "gfx/unused/picross_2.bin"
-INCBIN "gfx/unused/marios_picross.bin"
-INCBIN "gfx/unused/warios_picross.bin"
+INCBIN "gfx/unused/picross_2.2bpp"
+INCBIN "gfx/unused/marios_picross.2bpp"
+INCBIN "gfx/unused/warios_picross.2bpp"
 .end::
 
 SECTION "gfx_lv_2_lake_zone", ROMX[$64c0], BANK[$70]
 gfx_lv_2_lake_zone::
-INCBIN "gfx/safari_map/lv_2_lake_zone.bin"
+INCBIN "gfx/safari_map/lv_2_lake_zone.2bpp"
 .end::
 gfx_lv_2_lake_zone_sgb::
-INCBIN "gfx/safari_map/lv_2_lake_zone_sgb.bin"
+INCBIN "gfx/safari_map/lv_2_lake_zone_sgb.2bpp"
 .end::
 gfx_lv_2_lake_zone_duplicate::
-INCBIN "gfx/safari_map/lv_2_lake_zone.bin"
+INCBIN "gfx/safari_map/lv_2_lake_zone.2bpp"
 .end::
diff --git a/source/bank_71.asm b/source/bank_71.asm
index 8f7bb88..955fd26 100644
--- a/source/bank_71.asm
+++ b/source/bank_71.asm
@@ -1,10 +1,10 @@
 SECTION "gfx_lv_3_mountain_zone", ROMX[$6400], BANK[$71]
 gfx_lv_3_mountain_zone::
-INCBIN "gfx/safari_map/lv_3_mountain_zone.bin"
+INCBIN "gfx/safari_map/lv_3_mountain_zone.2bpp"
 .end::
 gfx_lv_3_mountain_zone_sgb::
-INCBIN "gfx/safari_map/lv_3_mountain_zone_sgb.bin"
+INCBIN "gfx/safari_map/lv_3_mountain_zone_sgb.2bpp"
 .end::
 gfx_lv_3_mountain_zone_duplicate::
-INCBIN "gfx/safari_map/lv_3_mountain_zone.bin"
+INCBIN "gfx/safari_map/lv_3_mountain_zone.2bpp"
 .end::
diff --git a/source/bank_72.asm b/source/bank_72.asm
index e8fd6fa..dc58f4d 100644
--- a/source/bank_72.asm
+++ b/source/bank_72.asm
@@ -1,13 +1,13 @@
 SECTION "gfx_lv_1_plain_zone", ROMX[$4800], BANK[$72]
 gfx_lv_1_plain_zone::
-INCBIN "gfx/safari_map/lv_1_plain_zone.bin"
+INCBIN "gfx/safari_map/lv_1_plain_zone.2bpp"
 .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_sgb::
-INCBIN "gfx/safari_map/lv_1_plain_zone_sgb.bin"
+INCBIN "gfx/safari_map/lv_1_plain_zone_sgb.2bpp"
 .end::
 gfx_lv_1_plain_zone_duplicate::
-INCBIN "gfx/safari_map/lv_1_plain_zone_unused.bin"
+INCBIN "gfx/safari_map/lv_1_plain_zone_unused.2bpp"
 .end::
diff --git a/source/bank_73.asm b/source/bank_73.asm
index 7d8c311..6607d53 100644
--- a/source/bank_73.asm
+++ b/source/bank_73.asm
@@ -1,12 +1,12 @@
 SECTION "gfx_lv_0_home", ROMX[$4800], BANK[$73]
 gfx_lv_0_home::
-INCBIN "gfx/easy_picross/lv_0_home.bin"
+INCBIN "gfx/easy_picross/lv_0_home.2bpp"
 .end::
 gfx_lv_0_home_sgb::
-INCBIN "gfx/easy_picross/lv_0_home_sgb.bin"
+INCBIN "gfx/easy_picross/lv_0_home_sgb.2bpp"
 .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/easy_picross/lv_0_home_unused.bin"
+INCBIN "gfx/easy_picross/lv_0_home_unused.2bpp"
 .end::
diff --git a/source/bank_74.asm b/source/bank_74.asm
index e6336d6..72f9694 100644
--- a/source/bank_74.asm
+++ b/source/bank_74.asm
@@ -1,26 +1,26 @@
 SECTION "bank74", ROMX[$4000], BANK[$74]
 
 gfx_lv_4_jungle_zone::
-INCBIN "gfx/safari_map/lv_4_jungle_zone.bin"
+INCBIN "gfx/safari_map/lv_4_jungle_zone.2bpp"
 .end::
 gfx_lv_4_jungle_zone_sgb::
-INCBIN "gfx/safari_map/lv_4_jungle_zone_sgb.bin"
+INCBIN "gfx/safari_map/lv_4_jungle_zone_sgb.2bpp"
 .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/safari_map/lv_4_jungle_zone_unused.bin"
+INCBIN "gfx/safari_map/lv_4_jungle_zone_unused.2bpp"
 .end::
 
 gfx_lv_3_sea_cottage::
-INCBIN "gfx/town_map/lv_3_sea_cottage.bin"
+INCBIN "gfx/town_map/lv_3_sea_cottage.2bpp"
 .end::
 gfx_lv_3_sea_cottage_sgb::
-INCBIN "gfx/town_map/lv_3_sea_cottage_sgb.bin"
+INCBIN "gfx/town_map/lv_3_sea_cottage_sgb.2bpp"
 .end::
 ; The unused "3" in "3/10" is has less of a black border.
 gfx_lv_3_sea_cottage_duplicate::
-INCBIN "gfx/town_map/lv_3_sea_cottage_unused.bin"
+INCBIN "gfx/town_map/lv_3_sea_cottage_unused.2bpp"
 .end::
 
 SECTION "compressed_tilemap_attrmap_easy_picross", ROMX[$7ddc], BANK[$74]
diff --git a/source/bank_75.asm b/source/bank_75.asm
index 722ecfe..4dfd295 100644
--- a/source/bank_75.asm
+++ b/source/bank_75.asm
@@ -1,26 +1,26 @@
 SECTION "bank75", ROMX[$4000], BANK[$75]
 
 gfx_lv_4_s_s_anne::
-INCBIN "gfx/town_map/lv_4_s_s_anne.bin"
+INCBIN "gfx/town_map/lv_4_s_s_anne.2bpp"
 .end::
 gfx_lv_4_s_s_anne_sgb::
-INCBIN "gfx/town_map/lv_4_s_s_anne_sgb.bin"
+INCBIN "gfx/town_map/lv_4_s_s_anne_sgb.2bpp"
 .end::
 gfx_lv_4_s_s_anne_duplicate::
-INCBIN "gfx/town_map/lv_4_s_s_anne.bin"
+INCBIN "gfx/town_map/lv_4_s_s_anne.2bpp"
 .end::
 
 gfx_lv_5_pokemon_tower::
-INCBIN "gfx/town_map/lv_5_pokemon_tower.bin"
+INCBIN "gfx/town_map/lv_5_pokemon_tower.2bpp"
 .end::
 gfx_lv_5_pokemon_tower_sgb::
-INCBIN "gfx/town_map/lv_5_pokemon_tower_sgb.bin"
+INCBIN "gfx/town_map/lv_5_pokemon_tower_sgb.2bpp"
 .end::
 gfx_lv_5_pokemon_tower_duplicate::
-INCBIN "gfx/town_map/lv_5_pokemon_tower.bin"
+INCBIN "gfx/town_map/lv_5_pokemon_tower.2bpp"
 .end::
 
 SECTION "compressed_gfx_copyright", ROMX[$7d35], BANK[$75]
 compressed_gfx_copyright::
-INCBIN "gfx/copyright/copyright.bin.xor"
+INCBIN "gfx/copyright/copyright.2bpp.xor"
 .end::
diff --git a/source/bank_76.asm b/source/bank_76.asm
index 01e74fc..e309c8a 100644
--- a/source/bank_76.asm
+++ b/source/bank_76.asm
@@ -1,25 +1,25 @@
 SECTION "bank76", ROMX[$4000], BANK[$76]
 
 gfx_lv_6_silph_company::
-INCBIN "gfx/town_map/lv_6_silph_company.bin"
+INCBIN "gfx/town_map/lv_6_silph_company.2bpp"
 .end::
 gfx_lv_6_silph_company_sgb::
-INCBIN "gfx/town_map/lv_6_silph_company_sgb.bin"
+INCBIN "gfx/town_map/lv_6_silph_company_sgb.2bpp"
 .end::
 ; The unused "6" in "6/10" is taller.
 gfx_lv_6_silph_company_duplicate::
-INCBIN "gfx/town_map/lv_6_silph_company_unused.bin"
+INCBIN "gfx/town_map/lv_6_silph_company_unused.2bpp"
 .end::
 
 gfx_lv_7_cycling_road::
-INCBIN "gfx/town_map/lv_7_cycling_road.bin"
+INCBIN "gfx/town_map/lv_7_cycling_road.2bpp"
 .end::
 gfx_lv_7_cycling_road_sgb::
-INCBIN "gfx/town_map/lv_7_cycling_road_sgb.bin"
+INCBIN "gfx/town_map/lv_7_cycling_road_sgb.2bpp"
 .end::
 ; The unused "/10" in "7/10" and "LV" are taller.
 gfx_lv_7_cycling_road_duplicate::
-INCBIN "gfx/town_map/lv_7_cycling_road_unused.bin"
+INCBIN "gfx/town_map/lv_7_cycling_road_unused.2bpp"
 .end::
 
 SECTION "compressed_tilemap_attrmap_safari_map", ROMX[$7000], BANK[$76]
diff --git a/source/bank_77.asm b/source/bank_77.asm
index 937516d..d30a32f 100644
--- a/source/bank_77.asm
+++ b/source/bank_77.asm
@@ -1,21 +1,21 @@
 SECTION "bank77", ROMX[$4000], BANK[$77]
 
 gfx_lv_8_power_plant::
-INCBIN "gfx/town_map/lv_8_power_plant.bin"
+INCBIN "gfx/town_map/lv_8_power_plant.2bpp"
 .end::
 gfx_lv_8_power_plant_sgb::
-INCBIN "gfx/town_map/lv_8_power_plant_sgb.bin"
+INCBIN "gfx/town_map/lv_8_power_plant_sgb.2bpp"
 .end::
 gfx_lv_8_power_plant_duplicate::
-INCBIN "gfx/town_map/lv_8_power_plant.bin"
+INCBIN "gfx/town_map/lv_8_power_plant.2bpp"
 .end::
 
 gfx_lv_9_futago_island::
-INCBIN "gfx/town_map/lv_9_futago_island.bin"
+INCBIN "gfx/town_map/lv_9_futago_island.2bpp"
 .end::
 gfx_lv_9_futago_island_sgb::
-INCBIN "gfx/town_map/lv_9_futago_island_sgb.bin"
+INCBIN "gfx/town_map/lv_9_futago_island_sgb.2bpp"
 .end::
 gfx_lv_9_futago_island_duplicate::
-INCBIN "gfx/town_map/lv_9_futago_island.bin"
+INCBIN "gfx/town_map/lv_9_futago_island.2bpp"
 .end::
diff --git a/source/bank_78.asm b/source/bank_78.asm
index 38358ae..ab02fcd 100644
--- a/source/bank_78.asm
+++ b/source/bank_78.asm
@@ -1,17 +1,17 @@
 SECTION "bank78", ROMX[$4000], BANK[$78]
 
 gfx_lv_10_hanada_cave::
-INCBIN "gfx/town_map/lv_10_hanada_cave.bin"
+INCBIN "gfx/town_map/lv_10_hanada_cave.2bpp"
 .end::
 gfx_lv_10_hanada_cave_sgb::
-INCBIN "gfx/town_map/lv_10_hanada_cave_sgb.bin"
+INCBIN "gfx/town_map/lv_10_hanada_cave_sgb.2bpp"
 .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/town_map/lv_10_hanada_cave_unused.bin"
+INCBIN "gfx/town_map/lv_10_hanada_cave_unused.2bpp"
 .end::
 
 gfx_how_to_play_safari::
-INCBIN "gfx/how_to_play/safari.bin"
+INCBIN "gfx/how_to_play/safari.2bpp"
 .end::
diff --git a/source/bank_79.asm b/source/bank_79.asm
index a475765..3a5c3f2 100644
--- a/source/bank_79.asm
+++ b/source/bank_79.asm
@@ -1,6 +1,6 @@
 SECTION "gfx_cancel_ok_no_yes", ROMX[$4000], BANK[$79]
 gfx_cancel_ok_no_yes::
-INCBIN "gfx/menus/cancel_ok_no_yes.bin"
+INCBIN "gfx/menus/cancel_ok_no_yes.2bpp"
 .end::
 
 SECTION "compressed_tilemap_attrmap_town_map", ROMX[$5800], BANK[$79]
@@ -10,5 +10,5 @@ INCBIN "gfx/town_map/town_map.tilemap_attrmap.xor"
 
 SECTION "compressed_gfx_game_select", ROMX[$6ba1], BANK[$79]
 compressed_gfx_game_select::
-INCBIN "gfx/game_select/game_select.bin.xor"
+INCBIN "gfx/game_select/game_select.2bpp.xor"
 .end::
diff --git a/source/bank_7c.asm b/source/bank_7c.asm
index 66c200b..325d435 100644
--- a/source/bank_7c.asm
+++ b/source/bank_7c.asm
@@ -1,6 +1,6 @@
 SECTION "gfx_alphabets", ROMX[$4000], BANK[$7c]
 gfx_alphabets::
-INCBIN "gfx/fonts/alphabets.bin"
+INCBIN "gfx/fonts/alphabets.2bpp"
 .end::
 
 SECTION "attrmap_how_to_play", ROMX[$5c00], BANK[$7c]