diff options
author | mid-kid <esteve.varela@gmail.com> | 2017-11-21 23:53:51 +0100 |
---|---|---|
committer | mid-kid <esteve.varela@gmail.com> | 2017-11-21 23:53:51 +0100 |
commit | 359d73ceefcd44143eb573dfe273c4d292df913b (patch) | |
tree | fd9b148c7c5f5778e33a9f9f8990322ee1d93b24 | |
parent | df118afbcaef31c26df433ae52c26335796cdb40 (diff) |
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.
-rw-r--r-- | gfx/font/overworld.png (renamed from gfx/unknown/1065ad.png) | bin | 752 -> 752 bytes | |||
-rw-r--r-- | gfx/font/space.png (renamed from gfx/unknown/106dad.png) | bin | 71 -> 71 bytes | |||
-rw-r--r-- | main.asm | 17 | ||||
-rwxr-xr-x | misc/mobile_41.asm | 18 |
4 files changed, 17 insertions, 18 deletions
diff --git a/gfx/unknown/1065ad.png b/gfx/font/overworld.png Binary files differindex 106c712dd..106c712dd 100644 --- a/gfx/unknown/1065ad.png +++ b/gfx/font/overworld.png diff --git a/gfx/unknown/106dad.png b/gfx/font/space.png Binary files differindex 726178132..726178132 100644 --- a/gfx/unknown/106dad.png +++ b/gfx/font/space.png @@ -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" |