summaryrefslogtreecommitdiff
path: root/engine/overworld/object_collision.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi@gmail.com>2020-09-20 13:58:03 -0400
committerRangi <remy.oukaour+rangi@gmail.com>2020-09-20 13:58:03 -0400
commitfac958b280056922a1828b71a04d84a36e1e807a (patch)
treec094adc59182b253a61defb5fb85de7a9d77b7cc /engine/overworld/object_collision.asm
parentbfb981f1885d21cc59d2656e84c87bb8d64a089c (diff)
- Remove trailing whitespace
- Indent with single tabs, not spaces - Colons after labels - Capitalize BANK, HIGH, and LOW - dbw BANK(X), X -> dba X
Diffstat (limited to 'engine/overworld/object_collision.asm')
-rw-r--r--engine/overworld/object_collision.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/overworld/object_collision.asm b/engine/overworld/object_collision.asm
index 5c3b0b1..31f43a8 100644
--- a/engine/overworld/object_collision.asm
+++ b/engine/overworld/object_collision.asm
@@ -91,7 +91,7 @@ _CheckObjectCollision: ; 01:77dd
.collision
scf
ret
-
+
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
@@ -102,7 +102,7 @@ _CheckPlayerObjectCollision: ; 01:7894
ld e, a
ld bc, wObjectStructs
xor a
-
+
.loop
ldh [hObjectStructIndexBuffer], a
ld hl, OBJECT_SPRITE
@@ -120,13 +120,13 @@ _CheckPlayerObjectCollision: ; 01:7894
ld a, [hl]
cp d
jr nz, .check_last_position
-
+
; skip the player sprite
ldh a, [hObjectStructIndexBuffer]
cp PLAYER_OBJECT_INDEX
jr z, .next
jr .collision
-
+
.check_last_position
ld hl, OBJECT_MAP_Y
add hl, bc
@@ -151,7 +151,7 @@ _CheckPlayerObjectCollision: ; 01:7894
jr nz, .loop
xor a
ret
-
+
.collision
scf
ret