diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-14 23:02:38 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-14 23:02:38 -0500 |
| commit | b921226aea7e624655f0d32436638ea3ffd63419 (patch) | |
| tree | 633a43b363c5cfa23ab4ace0b178d8037541a31d /home/map_objects.asm | |
| parent | ed44de4bb4688f6b8c83aeb4f5fd8658d17615fb (diff) | |
More map object, swap StandingTile and NextTile
Diffstat (limited to 'home/map_objects.asm')
| -rw-r--r-- | home/map_objects.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/home/map_objects.asm b/home/map_objects.asm index c2512b22f..bcd5ad1ea 100644 --- a/home/map_objects.asm +++ b/home/map_objects.asm @@ -80,14 +80,14 @@ DoesSpriteHaveFacings:: ; 1836 Function184a:: ; 184a - ld a, [PlayerStandingTile] + ld a, [PlayerNextTile] call GetTileCollision ld b, a ret ; 1852 CheckOnWater:: ; 1852 - ld a, [PlayerStandingTile] + ld a, [PlayerNextTile] call GetTileCollision sub 1 ret z @@ -211,7 +211,7 @@ CheckWaterfallTile:: ; 18bd ; 18c3 CheckStandingOnEntrance:: ; 18c3 - ld a, [PlayerStandingTile] + ld a, [PlayerNextTile] cp $71 ; door ret z cp $79 @@ -447,7 +447,7 @@ LoadMovementDataPointer:: ; 19e9 add hl, bc ld [hl], SPRITEMOVEDATA_SCRIPTED - ld hl, OBJECT_09 + ld hl, OBJECT_STEP_TYPE add hl, bc ld [hl], 0 |