summaryrefslogtreecommitdiff
path: root/engine/routines
diff options
context:
space:
mode:
authorxCrystal <rgr.crystal@gmail.com>2017-12-29 18:53:21 +0100
committerxCrystal <rgr.crystal@gmail.com>2017-12-29 18:53:21 +0100
commit3c6c80f1b24487ae4aa9d250d1dff290f09c231e (patch)
tree5d6567d4f9fd6044bb3b7ea4af8f8dc70d8a5401 /engine/routines
parent69762a2bfd6b6134b99a24b3c8f091ff6a410ef9 (diff)
LY_BLANK and rLCDC constants
Diffstat (limited to 'engine/routines')
-rw-r--r--engine/routines/getsquareroot.asm6
-rw-r--r--engine/routines/phonering_copytilemapatonce.asm4
2 files changed, 5 insertions, 5 deletions
diff --git a/engine/routines/getsquareroot.asm b/engine/routines/getsquareroot.asm
index 009d9f4fe..0ba2e50a5 100644
--- a/engine/routines/getsquareroot.asm
+++ b/engine/routines/getsquareroot.asm
@@ -23,8 +23,8 @@ GetSquareRoot: ; 13b87
ret
.Squares: ; 13b98
-root set 1
+root = 1
rept $ff
- dw root*root
-root set root+1
+ dw root * root
+root = root + 1
endr
diff --git a/engine/routines/phonering_copytilemapatonce.asm b/engine/routines/phonering_copytilemapatonce.asm
index b1a726675..cefe9a66d 100644
--- a/engine/routines/phonering_copytilemapatonce.asm
+++ b/engine/routines/phonering_copytilemapatonce.asm
@@ -17,7 +17,7 @@ PhoneRing_CopyTilemapAtOnce: ; 4d188
ld [hMapAnims], a
.wait
ld a, [rLY]
- cp $8f
+ cp LY_VBLANK - 1
jr c, .wait
di
@@ -31,7 +31,7 @@ PhoneRing_CopyTilemapAtOnce: ; 4d188
call .CopyTilemapAtOnce
.wait2
ld a, [rLY]
- cp $8f
+ cp LY_VBLANK - 1
jr c, .wait2
ei