From 9102b9a498c1f3073b89367945330b7de6baf016 Mon Sep 17 00:00:00 2001 From: yenatch Date: Tue, 19 Feb 2013 00:06:18 -0500 Subject: Move fonts into gfx/misc --- gfx/font.1bpp | Bin 1024 -> 0 bytes gfx/font_battle_extra.2bpp | Bin 512 -> 0 bytes gfx/font_extra.2bpp | Bin 512 -> 0 bytes gfx/font_inversed.1bpp | 1 - gfx/misc/font.1bpp | Bin 0 -> 1024 bytes gfx/misc/font_battle_extra.2bpp | Bin 0 -> 512 bytes gfx/misc/font_extra.2bpp | Bin 0 -> 512 bytes gfx/misc/font_inversed.1bpp | 1 + main.asm | 8 ++++---- 9 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 gfx/font.1bpp delete mode 100644 gfx/font_battle_extra.2bpp delete mode 100644 gfx/font_extra.2bpp delete mode 100644 gfx/font_inversed.1bpp create mode 100644 gfx/misc/font.1bpp create mode 100644 gfx/misc/font_battle_extra.2bpp create mode 100644 gfx/misc/font_extra.2bpp create mode 100644 gfx/misc/font_inversed.1bpp diff --git a/gfx/font.1bpp b/gfx/font.1bpp deleted file mode 100644 index ff8d2d4fe..000000000 Binary files a/gfx/font.1bpp and /dev/null differ diff --git a/gfx/font_battle_extra.2bpp b/gfx/font_battle_extra.2bpp deleted file mode 100644 index 77c2f3576..000000000 Binary files a/gfx/font_battle_extra.2bpp and /dev/null differ diff --git a/gfx/font_extra.2bpp b/gfx/font_extra.2bpp deleted file mode 100644 index 50d66916f..000000000 Binary files a/gfx/font_extra.2bpp and /dev/null differ diff --git a/gfx/font_inversed.1bpp b/gfx/font_inversed.1bpp deleted file mode 100644 index 39a7e73d6..000000000 --- a/gfx/font_inversed.1bpp +++ /dev/null @@ -1 +0,0 @@ -׻}}{{}}ý{}}}{ýa}}}}}}}www{woO7{}}9Um}}}}=]muy}ǻ}}}}}ǻ}}u}}w{}{}}}}}}}}}}mU99}9׻9}߿ûýmmmmýÿ}mmU;׹߁׻}}ǻ}}}}}}ûý=}7w?i?l?a?A?]ouu'Www1ϗͥ3?ýǫmǻߏߏ׻߿ǻdz9999Ó39?99999999 \ No newline at end of file diff --git a/gfx/misc/font.1bpp b/gfx/misc/font.1bpp new file mode 100644 index 000000000..ff8d2d4fe Binary files /dev/null and b/gfx/misc/font.1bpp differ diff --git a/gfx/misc/font_battle_extra.2bpp b/gfx/misc/font_battle_extra.2bpp new file mode 100644 index 000000000..77c2f3576 Binary files /dev/null and b/gfx/misc/font_battle_extra.2bpp differ diff --git a/gfx/misc/font_extra.2bpp b/gfx/misc/font_extra.2bpp new file mode 100644 index 000000000..50d66916f Binary files /dev/null and b/gfx/misc/font_extra.2bpp differ diff --git a/gfx/misc/font_inversed.1bpp b/gfx/misc/font_inversed.1bpp new file mode 100644 index 000000000..39a7e73d6 --- /dev/null +++ b/gfx/misc/font_inversed.1bpp @@ -0,0 +1 @@ +׻}}{{}}ý{}}}{ýa}}}}}}}www{woO7{}}9Um}}}}=]muy}ǻ}}}}}ǻ}}u}}w{}{}}}}}}}}}}mU99}9׻9}߿ûýmmmmýÿ}mmU;׹߁׻}}ǻ}}}}}}ûý=}7w?i?l?a?A?]ouu'Www1ϗͥ3?ýǫmǻߏߏ׻߿ǻdz9999Ó39?99999999 \ No newline at end of file diff --git a/main.asm b/main.asm index 9a5c1c36e..8c4cdd88a 100644 --- a/main.asm +++ b/main.asm @@ -12324,7 +12324,7 @@ INCLUDE "gfx/pics/kanto_frames.asm" SECTION "bank36",DATA,BANK[$36] -FontInversed: INCBIN "gfx/font_inversed.1bpp" +FontInversed: INCBIN "gfx/misc/font_inversed.1bpp" ; Johto frame definitions INCLUDE "gfx/pics/johto_frames.asm" @@ -12677,13 +12677,13 @@ Music_BugCatchingContest: INCLUDE "audio/music/bugcatchingcontest.asm" SECTION "bank3E",DATA,BANK[$3E] FontExtra: -INCBIN "gfx/font_extra.2bpp",$0,$200 +INCBIN "gfx/misc/font_extra.2bpp",$0,$200 Font: -INCBIN "gfx/font.1bpp",$0,$400 +INCBIN "gfx/misc/font.1bpp",$0,$400 FontBattleExtra: -INCBIN "gfx/font_battle_extra.2bpp",$0,$200 +INCBIN "gfx/misc/font_battle_extra.2bpp",$0,$200 INCBIN "baserom.gbc", $f8800, $f8ba0 - $f8800 -- cgit v1.2.3