diff options
author | yenatch <yenatch@gmail.com> | 2013-10-25 17:21:20 -0400 |
---|---|---|
committer | yenatch <yenatch@gmail.com> | 2013-10-25 17:21:20 -0400 |
commit | a41b870dfa7afb80b58534faf430f23016b43c8f (patch) | |
tree | 4c1055c50731dfa3f4364518f727e7dc1466b1f0 | |
parent | 15a6bd55f426ec04d213e3c66893db159e0b8bb2 (diff) | |
parent | 754325b270c86163541429bb4fb37c809bdf7ea3 (diff) |
Merge commit '754325b2' into merge-mrwint
Conflicts:
main.asm
-rw-r--r-- | main.asm | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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 |