diff options
| author | yenatch <yenatch@gmail.com> | 2017-12-30 21:12:53 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-30 21:12:53 -0500 |
| commit | 93916b5536e028d7a50b9b65618aba25be3e8006 (patch) | |
| tree | 4fc88a070fb8a5f2bbb8e98cc9c6f74e3b4e6888 /engine/routines | |
| parent | 9f017cbab8e6856680c35278829c6388e9fdf697 (diff) | |
| parent | 2a7ba6685afac73b824f611bbff228ff73cc51da (diff) | |
Merge pull request #449 from xCrystal/master
Misc labeling and cleaning up
Diffstat (limited to 'engine/routines')
| -rw-r--r-- | engine/routines/getsquareroot.asm | 6 | ||||
| -rw-r--r-- | engine/routines/phonering_copytilemapatonce.asm | 4 |
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 |