diff options
| author | yenatch <yenatch@gmail.com> | 2015-06-26 11:00:39 -0700 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-06-26 11:00:39 -0700 |
| commit | 0f57aefdf2b97df9ed017ec5f4c6afd5df65149b (patch) | |
| tree | 0220d87eea2805996447b9f30c802016e7230905 /misc/crystal_misc.asm | |
| parent | 89073da581022316228818272892cb12c851cb68 (diff) | |
| parent | 07b9c4b03044a6e24bfeb784df62da71ff58ae94 (diff) | |
Merge branch 'tilesets' into master
Conflicts:
tilesets/tileset_headers.asm
Diffstat (limited to 'misc/crystal_misc.asm')
| -rw-r--r-- | misc/crystal_misc.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/misc/crystal_misc.asm b/misc/crystal_misc.asm index 5a58bd706..676fe7bbb 100644 --- a/misc/crystal_misc.asm +++ b/misc/crystal_misc.asm @@ -752,10 +752,10 @@ Function17abcf: ; 17abcf (5e:6bcf) ld de, $d048 ld bc, $10 call CopyBytes - ld hl, Palette_b471 + ld hl, MapObjectPals + 8 ld de, $d058 ld bc, $8 - ld a, BANK(Palette_b471) + ld a, BANK(MapObjectPals) call FarCopyBytes pop af ld [rSVBK], a ; $ff00+$70 |