From 359d73ceefcd44143eb573dfe273c4d292df913b Mon Sep 17 00:00:00 2001 From: mid-kid Date: Tue, 21 Nov 2017 23:53:51 +0100 Subject: Move LoadOverworldFont to main.asm It doesn't fit correctly in misc/mobile_41.asm. Also moved the font images out of gfx/unknown and into gfx/font. --- gfx/font/overworld.png | Bin 0 -> 752 bytes gfx/font/space.png | Bin 0 -> 71 bytes gfx/unknown/1065ad.png | Bin 752 -> 0 bytes gfx/unknown/106dad.png | Bin 71 -> 0 bytes main.asm | 17 +++++++++++++++++ misc/mobile_41.asm | 18 ------------------ 6 files changed, 17 insertions(+), 18 deletions(-) create mode 100644 gfx/font/overworld.png create mode 100644 gfx/font/space.png delete mode 100644 gfx/unknown/1065ad.png delete mode 100644 gfx/unknown/106dad.png diff --git a/gfx/font/overworld.png b/gfx/font/overworld.png new file mode 100644 index 000000000..106c712dd Binary files /dev/null and b/gfx/font/overworld.png differ diff --git a/gfx/font/space.png b/gfx/font/space.png new file mode 100644 index 000000000..726178132 Binary files /dev/null and b/gfx/font/space.png differ diff --git a/gfx/unknown/1065ad.png b/gfx/unknown/1065ad.png deleted file mode 100644 index 106c712dd..000000000 Binary files a/gfx/unknown/1065ad.png and /dev/null differ diff --git a/gfx/unknown/106dad.png b/gfx/unknown/106dad.png deleted file mode 100644 index 726178132..000000000 Binary files a/gfx/unknown/106dad.png and /dev/null differ diff --git a/main.asm b/main.asm index b3f8a6816..123b4e434 100644 --- a/main.asm +++ b/main.asm @@ -5492,6 +5492,23 @@ INCLUDE "battle/used_move_text.asm" INCLUDE "misc/mobile_41.asm" +LoadOverworldFont:: ; 106594 + ld de, .font + ld hl, VTiles1 + lb bc, BANK(.font), $80 + call Get2bpp + ld de, .space + ld hl, VTiles2 tile $7f + lb bc, BANK(.space), 1 + call Get2bpp + ret +; 1065ad + +.font +INCBIN "gfx/font/overworld.2bpp" +.space +INCBIN "gfx/font/space.2bpp" + SECTION "bank42", ROMX INCLUDE "misc/mobile_42.asm" diff --git a/misc/mobile_41.asm b/misc/mobile_41.asm index 4bed1e321..37e10a01e 100755 --- a/misc/mobile_41.asm +++ b/misc/mobile_41.asm @@ -1113,21 +1113,3 @@ Function10650a: ; 10650a GFX_106514: INCBIN "gfx/unknown/106514.2bpp" - - -LoadOverworldFont:: ; 106594 - ld de, .font - ld hl, VTiles1 - lb bc, BANK(.font), $80 - call Get2bpp - ld de, .space - ld hl, VTiles2 tile $7f - lb bc, BANK(.space), 1 - call Get2bpp - ret -; 1065ad - -.font -INCBIN "gfx/unknown/1065ad.2bpp" -.space -INCBIN "gfx/unknown/106dad.2bpp" -- cgit v1.2.3