diff options
| author | yenatch <yenatch@gmail.com> | 2013-10-25 17:34:45 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2013-10-25 17:34:45 -0400 |
| commit | 6ea15c444e88d048b02cb7150f3b524d33ea5407 (patch) | |
| tree | 9647a00108f852c888100fe185f6b1e834884a39 | |
| parent | a41b870dfa7afb80b58534faf430f23016b43c8f (diff) | |
| parent | 650dc98be4a5cb79e23cf4495acc25b3af7dc6c0 (diff) | |
Merge commit '650dc98b' into merge-mrwint
Conflicts:
main.asm
| -rw-r--r-- | gfx/splash/logo.1bpp | bin | 0 -> 224 bytes | |||
| -rw-r--r-- | main.asm | 11 |
2 files changed, 7 insertions, 4 deletions
diff --git a/gfx/splash/logo.1bpp b/gfx/splash/logo.1bpp Binary files differnew file mode 100644 index 000000000..c59bf6197 --- /dev/null +++ b/gfx/splash/logo.1bpp @@ -103838,9 +103838,9 @@ Functione4579: ; e4579 ; 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 @@ Functione47ab: ; e47ab (39:47ab) 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] |