diff options
| author | yenatch <yenatch@gmail.com> | 2015-08-17 00:14:40 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-08-17 00:14:40 -0400 |
| commit | 9974a2c7014cbe7db3d0e516580fea48001ab3df (patch) | |
| tree | 61c015b170efbe7975650f37d0f15cc775242aa0 /engine/map_objects.asm | |
| parent | b77741ff7020747dbee6b295b87afe6ef0963dd2 (diff) | |
| parent | abf3fc21378ddc6a4028aa1852d256472bc859e0 (diff) | |
Merge pull request #303 from yenatch/map-objects
Add constants for common map object ids.
Diffstat (limited to 'engine/map_objects.asm')
| -rw-r--r-- | engine/map_objects.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/map_objects.asm b/engine/map_objects.asm index 6cbdc87aa..02381de55 100644 --- a/engine/map_objects.asm +++ b/engine/map_objects.asm @@ -2660,7 +2660,7 @@ Function5579: ; 5579 Function5582: ; 5582 ld de, ObjectStructs - ld a, $d + ld a, NUM_OBJECT_STRUCTS .loop push af ld hl, OBJECT_04 @@ -2761,7 +2761,7 @@ Function5602: ; 5602 ld a, [wd459] bit 7, a jr z, .ok - ld a, [$ffe0] + ld a, [hLastTalked] and a jr z, .ok call Function5629 @@ -2780,7 +2780,7 @@ Function561d: ; 561d ; 5629 Function5629: ; 5629 - cp $10 + cp NUM_OBJECTS ret nc call GetMapObject ld hl, MAPOBJECT_OBJECT_STRUCT_ID @@ -2788,7 +2788,7 @@ Function5629: ; 5629 ld a, [hl] cp -1 ret z - cp $d + cp NUM_OBJECT_STRUCTS ret nc call GetObjectStruct call GetObjectSprite |