diff options
| author | yenatch <yenatch@gmail.com> | 2015-07-21 23:49:18 -0700 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-07-21 23:49:18 -0700 |
| commit | ec10d9dd6f8db685270529b49f0b3007a7242dcc (patch) | |
| tree | 37b8a2883a5439baf83578eb1456d1145d5a0804 /engine/events.asm | |
| parent | dc620c08ee43a4baee7cb4b04b22661ccf2ad60a (diff) | |
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 |