diff options
| author | yenatch <yenatch@gmail.com> | 2018-02-03 17:15:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-03 17:15:20 -0500 |
| commit | b35eb72290b964b98844afbe741bb7ede34b9ef3 (patch) | |
| tree | 2cf2652bc9c3e69ae5f7b2a2632c02a12498615f /engine/tile_events.asm | |
| parent | 7547ad839cf1c8141b931d08ef16a894e7db68c9 (diff) | |
| parent | 32ade4ac9bf113d630d904aab51f2c49c91bf8c2 (diff) | |
Merge pull request #480 from luckytyphlosion/master
[Ready to merge] Prefix wram labels with w.
Diffstat (limited to 'engine/tile_events.asm')
| -rwxr-xr-x | engine/tile_events.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/tile_events.asm b/engine/tile_events.asm index 23a7a3c85..705c0e427 100755 --- a/engine/tile_events.asm +++ b/engine/tile_events.asm @@ -1,6 +1,6 @@ CheckWarpCollision:: ; 1499a ; Is this tile a warp? - ld a, [PlayerStandingTile] + ld a, [wPlayerStandingTile] cp COLL_PIT jr z, .warp cp COLL_PIT_68 @@ -19,7 +19,7 @@ CheckWarpCollision:: ; 1499a CheckDirectionalWarp:: ; 149af ; If this is a directional warp, clear carry (press the designated button to warp). ; Else, set carry (immediate warp). - ld a, [PlayerStandingTile] + ld a, [wPlayerStandingTile] cp COLL_WARP_CARPET_DOWN jr z, .directional cp COLL_WARP_CARPET_LEFT @@ -39,7 +39,7 @@ CheckDirectionalWarp:: ; 149af CheckWarpFacingDown: ; 149c6 ld de, 1 ld hl, .blocks - ld a, [PlayerStandingTile] + ld a, [wPlayerStandingTile] call IsInArray ret ; 149d3 @@ -58,7 +58,7 @@ CheckWarpFacingDown: ; 149c6 ; 149dd CheckGrassCollision:: ; 149dd - ld a, [PlayerStandingTile] + ld a, [wPlayerStandingTile] ld hl, .blocks ld de, 1 call IsInArray @@ -98,7 +98,7 @@ CheckCutCollision: ; 149f5 ; 14a07 GetWarpSFX:: ; 14a07 - ld a, [PlayerStandingTile] + ld a, [wPlayerStandingTile] ld de, SFX_ENTER_DOOR cp COLL_DOOR ret z |