summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2017-06-24 17:36:21 -0400
committerGitHub <noreply@github.com>2017-06-24 17:36:21 -0400
commit080704e49f49777baac124d1bba8c1066acd1bb1 (patch)
treef8e3d3b15f24b60c4c5c5909114a7c4a743d2ca8 /misc
parent217b7b8d9ba0d243ccbd9d4ae0a5b3ac7ab856e8 (diff)
parent7d5b9bb0c46fde6c7aa479e43725541a787a7db2 (diff)
Merge pull request #370 from yenatch/graphics
png everywhere
Diffstat (limited to 'misc')
-rw-r--r--misc/gbc_only.asm2
-rwxr-xr-xmisc/mobile_41.asm12
2 files changed, 8 insertions, 6 deletions
diff --git a/misc/gbc_only.asm b/misc/gbc_only.asm
index cae976a1c..f4b3eba8b 100644
--- a/misc/gbc_only.asm
+++ b/misc/gbc_only.asm
@@ -145,5 +145,5 @@ GBCOnlyString: ; 4eb38
GBCOnlyGFX: ; 4eb76
-INCBIN "gfx/misc/gbc_only.w112.2bpp.lz"
+INCBIN "gfx/misc/gbc_only.2bpp.lz"
; 4f0bc
diff --git a/misc/mobile_41.asm b/misc/mobile_41.asm
index 331242d88..ff661b1bc 100755
--- a/misc/mobile_41.asm
+++ b/misc/mobile_41.asm
@@ -1116,16 +1116,18 @@ INCBIN "gfx/unknown/106514.2bpp"
LoadOverworldFont:: ; 106594
- ld de, .bgfont
+ ld de, .font
ld hl, VTiles1
- lb bc, BANK(.bgfont), $80
+ lb bc, BANK(.font), $80
call Get2bpp
- ld de, .bgfont + $80 tiles
+ ld de, .space
ld hl, VTiles2 tile $7f
- lb bc, BANK(.bgfont), 1
+ lb bc, BANK(.space), 1
call Get2bpp
ret
; 1065ad
-.bgfont
+.font
INCBIN "gfx/unknown/1065ad.2bpp"
+.space
+INCBIN "gfx/unknown/106dad.2bpp"