diff options
Diffstat (limited to 'engine/overworld/object_collision.asm')
| -rw-r--r-- | engine/overworld/object_collision.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/overworld/object_collision.asm b/engine/overworld/object_collision.asm index 31f43a8..1e1cc51 100644 --- a/engine/overworld/object_collision.asm +++ b/engine/overworld/object_collision.asm @@ -3,7 +3,7 @@ INCLUDE "constants.asm" SECTION "engine/overworld/object_collision.asm@GetSpritesNextTile", ROMX ; Get the tile that the sprite will walk onto next -GetSpritesNextTile: ; 01:774a +GetSpritesNextTile: ld hl, OBJECT_NEXT_MAP_X add hl, bc ld d, [hl] @@ -16,7 +16,7 @@ GetSpritesNextTile: ; 01:774a ret ; Sets carry flag if the object (bc) next tile is a collision -_IsObjectCollisionTileSolid: ; 01:775a +_IsObjectCollisionTileSolid: call GetSpritesNextTile ld e, a ld d, 0 @@ -35,7 +35,7 @@ SECTION "engine/overworld/object_collision.asm@_CheckObjectCollision", ROMX ; returns the carry flag if a sprite is at coords d, e ; will not collide with sprite index stored in hEventCollisionException -_CheckObjectCollision: ; 01:77dd +_CheckObjectCollision: ld bc, wObjectStructs xor a .loop @@ -95,7 +95,7 @@ _CheckObjectCollision: ; 01:77dd SECTION "engine/overworld/object_collision.asm@_CheckPlayerObjectCollision", ROMX ; Sets the carry flag if the player will collide with another sprite's current or next position -_CheckPlayerObjectCollision: ; 01:7894 +_CheckPlayerObjectCollision: ld a, [wPlayerNextMapX] ld d, a ld a, [wPlayerNextMapY] |