summaryrefslogtreecommitdiff
path: root/battle/objects/functions.asm
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-06-13 22:53:33 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-06-13 22:53:33 -0400
commit4e2487c056c4dcddd3059a105e6ac89144137ab1 (patch)
tree31fec08ba9384bc5baf3895a07fa8684ff84941c /battle/objects/functions.asm
parentca01a92880a5d71bce2bec6caa7714c8e1cf0f17 (diff)
hLCDCPointer and InitList
Diffstat (limited to 'battle/objects/functions.asm')
-rwxr-xr-xbattle/objects/functions.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/battle/objects/functions.asm b/battle/objects/functions.asm
index aec5b12bf..4ed9b67b7 100755
--- a/battle/objects/functions.asm
+++ b/battle/objects/functions.asm
@@ -1150,8 +1150,8 @@ BattleAnimFunction_0D: ; cd66a (33:566a)
dw .four
.zero
call BattleAnim_IncAnonJumptableIndex
- ld a, $42
- ld [hFFC6], a
+ ld a, rSCY - $ff00
+ ld [hLCDCPointer], a
ld a, $58
ld [hLYOverrideStart], a
ld a, $5e
@@ -1209,7 +1209,7 @@ BattleAnimFunction_0D: ; cd66a (33:566a)
cp $70
jr c, asm_cd6da
xor a
- ld [hFFC6], a
+ ld [hLCDCPointer], a
ld [hLYOverrideStart], a
ld [hLYOverrideEnd], a
.four