ref: 6ea15c444e88d048b02cb7150f3b524d33ea5407
parent: a41b870dfa7afb80b58534faf430f23016b43c8f
parent: 650dc98be4a5cb79e23cf4495acc25b3af7dc6c0
author: yenatch <[email protected]>
date: Fri Oct 25 13:34:45 EDT 2013
Merge commit '650dc98b' into merge-mrwint Conflicts: main.asm
binary files /dev/null b/gfx/splash/logo.1bpp differ
--- a/main.asm
+++ b/main.asm
@@ -103838,9 +103838,9 @@
; e45e8
Functione45e8: ; e45e8
- ld de, $47cc
+ ld de, GameFreakLogo
ld hl, VTiles2
- ld bc, $391c
+ ld bc, BANK(GameFreakLogo) << 8 + $1c
call Get1bpp
ld a, [rSVBK]
push af
@@ -104129,8 +104129,11 @@
ret
; e47ac (39:47ac)
-INCBIN "baserom.gbc",$e47ac,$e48ac - $e47ac
-
+INCBIN "baserom.gbc",$e47ac,$e47cc - $e47ac
+
+GameFreakLogo: ; e47cc
+INCBIN "gfx/splash/logo.1bpp"
+; e48ac
Functione48ac: ; e48ac
ld a, [rSVBK]