From 9102b9a498c1f3073b89367945330b7de6baf016 Mon Sep 17 00:00:00 2001 From: yenatch Date: Tue, 19 Feb 2013 00:06:18 -0500 Subject: [PATCH] Move fonts into gfx/misc --- gfx/{ => misc}/font.1bpp | Bin gfx/{ => misc}/font_battle_extra.2bpp | Bin gfx/{ => misc}/font_extra.2bpp | Bin gfx/{ => misc}/font_inversed.1bpp | 0 main.asm | 8 ++++---- 5 files changed, 4 insertions(+), 4 deletions(-) rename gfx/{ => misc}/font.1bpp (100%) rename gfx/{ => misc}/font_battle_extra.2bpp (100%) rename gfx/{ => misc}/font_extra.2bpp (100%) rename gfx/{ => misc}/font_inversed.1bpp (100%) diff --git a/gfx/font.1bpp b/gfx/misc/font.1bpp similarity index 100% rename from gfx/font.1bpp rename to gfx/misc/font.1bpp diff --git a/gfx/font_battle_extra.2bpp b/gfx/misc/font_battle_extra.2bpp similarity index 100% rename from gfx/font_battle_extra.2bpp rename to gfx/misc/font_battle_extra.2bpp diff --git a/gfx/font_extra.2bpp b/gfx/misc/font_extra.2bpp similarity index 100% rename from gfx/font_extra.2bpp rename to gfx/misc/font_extra.2bpp diff --git a/gfx/font_inversed.1bpp b/gfx/misc/font_inversed.1bpp similarity index 100% rename from gfx/font_inversed.1bpp rename to gfx/misc/font_inversed.1bpp 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