summaryrefslogtreecommitdiff
path: root/misc/crystal_misc.asm
diff options
context:
space:
mode:
authorBryan Bishop <kanzure@gmail.com>2015-01-20 12:14:38 -0600
committerBryan Bishop <kanzure@gmail.com>2015-01-20 12:14:38 -0600
commit567b576f60866f92eda1660ecd19bf3e6d7519c6 (patch)
tree37f64e9b8e11b410fc6e3723827571e16dd07e0d /misc/crystal_misc.asm
parent4781d9a809565804a4b99024a69a51156fd2749e (diff)
parent0fa7b553bddeb4ba70b216c93eb09226b2674beb (diff)
Merge pull request #268 from yenatch/master
remove preprocessor
Diffstat (limited to 'misc/crystal_misc.asm')
-rw-r--r--misc/crystal_misc.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/misc/crystal_misc.asm b/misc/crystal_misc.asm
index 88a22043d..9774e5b63 100644
--- a/misc/crystal_misc.asm
+++ b/misc/crystal_misc.asm
@@ -740,22 +740,22 @@ Function17abcf: ; 17abcf (5e:6bcf)
push af
ld a, $5
ld [rSVBK], a ; $ff00+$70
- ld hl, $6c55
+ ld hl, Palette_17ac55
ld de, Unkn1Pals ; $d000
ld bc, $30
call CopyBytes
- ld hl, $6c95
+ ld hl, Palette_17ac95
ld de, Unkn2Pals
ld bc, $40
call CopyBytes
- ld hl, $74b5
+ ld hl, GFX_17afa5 + $510
ld de, $d048
ld bc, $10
call CopyBytes
- ld hl, $7471
+ ld hl, Palette_b471
ld de, $d058
ld bc, $8
- ld a, $2
+ ld a, BANK(Palette_b471)
call FarCopyBytes
pop af
ld [rSVBK], a ; $ff00+$70