diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2016-07-21 07:58:36 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2016-07-21 07:58:36 -0400 |
| commit | 803c6081d7b458f1965c4b9e62be2714b73fcdf4 (patch) | |
| tree | 94632a90406f3b185d82cabee2beb834bd711215 /home/map_objects.asm | |
| parent | c33ba049a5a993fc678fd1698645039ce4974022 (diff) | |
| parent | a32b6ccbb5b9ad15befa3b9893659f2ceabd1ba0 (diff) | |
Merge github.com:pikalaxalt/pokecrystal
Diffstat (limited to 'home/map_objects.asm')
| -rw-r--r-- | home/map_objects.asm | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/home/map_objects.asm b/home/map_objects.asm index 3c70233eb..f64ebd8ab 100644 --- a/home/map_objects.asm +++ b/home/map_objects.asm @@ -28,9 +28,8 @@ GetSpriteVTile:: ; 180e .loop cp [hl] jr z, .found -rept 2 inc hl -endr + inc hl dec c jr nz, .loop ld a, [UsedSprites + 1] @@ -503,9 +502,8 @@ rept SPRITEMOVEDATA_FIELDS endr ld a, BANK(SpriteMovementData) call GetFarByte -rept 2 add a -endr + add a and $c pop de pop bc @@ -638,7 +636,7 @@ GetObjectStruct:: ; 1ae5 ret ; 1af1 -GetObjectSprite:: ; 1af1 +DoesObjectHaveASprite:: ; 1af1 ld hl, OBJECT_SPRITE add hl, bc ld a, [hl] |