diff options
author | dannye <corrnondacqb@yahoo.com> | 2015-07-14 00:58:09 -0500 |
---|---|---|
committer | dannye <corrnondacqb@yahoo.com> | 2015-07-14 00:58:09 -0500 |
commit | e25a7148d0a78549de4f33fa72d519dcaf660e97 (patch) | |
tree | 5fcc95934c26b1fc86345b10f2a5c80fa740d083 /engine/titlescreen.asm | |
parent | b509b48a7f5a9a80225b9c030d7334b26b521c62 (diff) | |
parent | 5d3b958763d48e6049e13b068d2f2d5382cdcad2 (diff) |
Merge branch 'master' of https://github.com/YamaArashi/pokered
Conflicts:
engine/town_map.asm
Diffstat (limited to 'engine/titlescreen.asm')
-rwxr-xr-x | engine/titlescreen.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engine/titlescreen.asm b/engine/titlescreen.asm index e582d1be..1d640909 100755 --- a/engine/titlescreen.asm +++ b/engine/titlescreen.asm @@ -348,7 +348,7 @@ Func_4524: ; 4524 (1:4524) jp LoadFrontSpriteByMonIndex Func_4533: ; 4533 (1:4533) - ld [$ffbd], a + ld [H_AUTOBGTRANSFERDEST + 1], a jp Delay3 LoadCopyrightAndTextBoxTiles: ; 4538 (1:4538) |