Merge commit '754325b2' into merge-mrwint

Conflicts: main.asm
2013-10-25 17:21:20 -04:00
parent 15a6bd55f4 754325b270
commit a41b870dfa
1 changed files with 2 additions and 2 deletions
--- a/main.asm
+++ b/main.asm
@@ -103846,9 +103846,9 @@ Functione45e8: ; e45e8
 	push af
 	ld a, $6
 	ld [rSVBK], a
-	ld hl, $5407
+	ld hl, IntroLogoGFX
 	ld de, $d000
-	ld a, $42
+	ld a, BANK(IntroLogoGFX)
 	call FarDecompress
 	ld hl, VTiles0
 	ld de, $d000