From ec10d9dd6f8db685270529b49f0b3007a7242dcc Mon Sep 17 00:00:00 2001 From: yenatch Date: Tue, 21 Jul 2015 23:49:18 -0700 Subject: Add constants for common map object ids. --- engine/map_objects.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine/map_objects.asm') diff --git a/engine/map_objects.asm b/engine/map_objects.asm index 6cbdc87aa..28fadfd1a 100644 --- a/engine/map_objects.asm +++ b/engine/map_objects.asm @@ -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 -- cgit v1.2.3 From abf3fc21378ddc6a4028aa1852d256472bc859e0 Mon Sep 17 00:00:00 2001 From: yenatch Date: Sun, 26 Jul 2015 00:11:33 -0700 Subject: Name some map event reading functions. --- engine/map_objects.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'engine/map_objects.asm') diff --git a/engine/map_objects.asm b/engine/map_objects.asm index 28fadfd1a..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 @@ -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 -- cgit v1.2.3