Merge commit '754325b2' into merge-mrwint

Conflicts:
	main.asm
This commit is contained in:
yenatch 2013-10-25 17:21:20 -04:00
commit a41b870dfa

View File

@ -103846,9 +103846,9 @@ Functione45e8: ; e45e8
push af push af
ld a, $6 ld a, $6
ld [rSVBK], a ld [rSVBK], a
ld hl, $5407 ld hl, IntroLogoGFX
ld de, $d000 ld de, $d000
ld a, $42 ld a, BANK(IntroLogoGFX)
call FarDecompress call FarDecompress
ld hl, VTiles0 ld hl, VTiles0
ld de, $d000 ld de, $d000