summaryrefslogtreecommitdiff
path: root/engine/gfx/load_overworld_font.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2018-06-24 21:23:51 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2018-06-24 21:23:51 -0400
commite2fb7acac0e3c1d598021b52fc2583dd983321bc (patch)
treeea5922596ce167e5b0485ea3bacd65f43339ca60 /engine/gfx/load_overworld_font.asm
parent1a888f22004aec967d2b6049ede7e04b1815f956 (diff)
parent364854623267a8a39242243b0cdf80144e868642 (diff)
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts: # engine/items/mart.asm
Diffstat (limited to 'engine/gfx/load_overworld_font.asm')
-rw-r--r--engine/gfx/load_overworld_font.asm3
1 files changed, 1 insertions, 2 deletions
diff --git a/engine/gfx/load_overworld_font.asm b/engine/gfx/load_overworld_font.asm
index f23f01c4e..f4ef84619 100644
--- a/engine/gfx/load_overworld_font.asm
+++ b/engine/gfx/load_overworld_font.asm
@@ -1,4 +1,4 @@
-LoadOverworldFont:: ; 106594
+LoadOverworldFont::
ld de, .OverworldFontGFX
ld hl, vTiles1
lb bc, BANK(.OverworldFontGFX), $80
@@ -8,7 +8,6 @@ LoadOverworldFont:: ; 106594
lb bc, BANK(.OverworldFontSpaceGFX), 1
call Get2bpp
ret
-; 1065ad
.OverworldFontGFX:
INCBIN "gfx/font/overworld.2bpp"