diff options
| author | yenatch <yenatch@gmail.com> | 2015-11-03 07:56:05 -0500 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-11-03 07:56:05 -0500 |
| commit | 1c1fe276ca59726bb0008c60006c6b48cd093573 (patch) | |
| tree | 817fb9c92dd798e89a891c3924bda3df955344e0 /engine/events.asm | |
| parent | 25c126c69beebfdf26d0de286e25c65f6f3db16e (diff) | |
| parent | 2faa4a0f70edd91bde908139b3fd5b6b5aebf017 (diff) | |
Merge pull request #324 from PikalaxALT/master
Movement and map objects
Diffstat (limited to 'engine/events.asm')
| -rw-r--r-- | engine/events.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/events.asm b/engine/events.asm index 0740da545..20e2bc0dd 100644 --- a/engine/events.asm +++ b/engine/events.asm @@ -396,7 +396,7 @@ CheckTileEvent: ; 96874 ret .return6 - ld a, [StandingTile] + ld a, [PlayerStandingTile] call CheckPitTile jr nz, .pittile ld a, 6 @@ -606,7 +606,7 @@ TryObjectEvent: ; 969b5 .IsObject call PlayTalkObject - ld a, [hConnectedMapWidth] + ld a, [hObjectStructIndexBuffer] call GetObjectStruct ld hl, OBJECT_MAP_OBJECT_INDEX add hl, bc @@ -947,11 +947,11 @@ SelectMenuCallback: ; 96b66 ; 96b72 .Script ; 96b72 - ptjump wd0e8 + ptjump wQueuedScriptBank ; 96b75 .Asm ; 96b75 - ptcallasm wd0e8 + ptcallasm wQueuedScriptBank end ; 96b79 |