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/events.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/events.asm')
-rw-r--r-- | engine/events.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/events.asm b/engine/events.asm index 5849d6774..ae28e0c38 100644 --- a/engine/events.asm +++ b/engine/events.asm @@ -611,9 +611,9 @@ TryObjectEvent: ; 969b5 ld hl, OBJECT_MAP_OBJECT_INDEX add hl, bc ld a, [hl] - ld [$ffe0], a + ld [hLastTalked], a - ld a, [$ffe0] + ld a, [hLastTalked] call GetMapObject ld hl, MAPOBJECT_COLOR add hl, bc @@ -1094,7 +1094,7 @@ WarpToNewMapScript: ; 96c34 FallIntoMapScript: ; 96c38 newloadmap $f6 playsound SFX_KINESIS - applymovement $0, MovementData_0x96c48 + applymovement PLAYER, MovementData_0x96c48 playsound SFX_STRENGTH scall UnknownScript_0x96c4a end |