diff options
| author | YamaArashi <shadow962@live.com> | 2016-06-11 17:51:03 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-11 17:51:03 -0700 |
| commit | 54143d33fc1211fb0c949ba62633d1c8d94f2717 (patch) | |
| tree | 9176ffc5b6384a48eb32ea8f33ac97d1d67f6865 /engine/overworld/boulders.asm | |
| parent | Merge pull request #14 from PikalaxALT/master (diff) | |
| parent | remove address comments (diff) | |
| download | pokeyellow-54143d33fc1211fb0c949ba62633d1c8d94f2717.tar.gz pokeyellow-54143d33fc1211fb0c949ba62633d1c8d94f2717.tar.xz pokeyellow-54143d33fc1211fb0c949ba62633d1c8d94f2717.zip | |
Merge pull request #13 from YamaArashi/master
remove address comments
Diffstat (limited to 'engine/overworld/boulders.asm')
| -rw-r--r-- | engine/overworld/boulders.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/overworld/boulders.asm b/engine/overworld/boulders.asm index edfda2d3..669b7b83 100644 --- a/engine/overworld/boulders.asm +++ b/engine/overworld/boulders.asm @@ -1,4 +1,4 @@ -CheckForCollisionWhenPushingBoulder: ; c356 (3:4356) +CheckForCollisionWhenPushingBoulder: call GetTileTwoStepsInFrontOfPlayer call IsTilePassable jr c, .done @@ -16,7 +16,7 @@ CheckForCollisionWhenPushingBoulder: ; c356 (3:4356) ret ; sets a to $ff if there is a collision and $00 if there is no collision -CheckForBoulderCollisionWithSprites: ; c378 (3:4378) +CheckForBoulderCollisionWithSprites: ld a, [wBoulderSpriteIndex] dec a swap a @@ -91,4 +91,4 @@ CheckForBoulderCollisionWithSprites: ; c378 (3:4378) ret .success xor a - ret
\ No newline at end of file + ret |