# HG changeset patch # User David Boddie # Date 1349978284 -7200 # Node ID 42c8701f4bc7f776259238906edc170a7dca4e2d # Parent 7d86294c2ad19146f3d36029ac1bc12cbcc92065 Fixed an error in a collision detection mask, as reported by Kees. diff -r 7d86294c2ad1 -r 42c8701f4bc7 documents/collisions.txt --- a/documents/collisions.txt Thu Oct 11 19:53:34 2012 +0200 +++ b/documents/collisions.txt Thu Oct 11 19:58:04 2012 +0200 @@ -58,7 +58,7 @@ above: above: above: dy: 0 11100000 $e0 dy: 0 1111?000 $f8 dy: 0 11111111 $ff 1 00111000 $38 1 0011111? $3f 1 00111111 $3f - 2 00001110 $e0 2 00001111 $0f 2 00001111 $0f + 2 00001110 $0e 2 00001111 $0f 2 00001111 $0f 3 00000011 $03 3 00000011 $03 3 00000011 $03 below: below: diff -r 7d86294c2ad1 -r 42c8701f4bc7 mapcode.oph --- a/mapcode.oph Thu Oct 11 19:53:34 2012 +0200 +++ b/mapcode.oph Thu Oct 11 19:58:04 2012 +0200 @@ -4074,7 +4074,7 @@ ; Player and enemy share the same tile or player is on the tile below. player_collision_mask_below: .byte $ff, $3f, $0f, $03 -projectile_collision_mask_below: .byte $e0, $38, $e0, $03 +projectile_collision_mask_below: .byte $e0, $38, $0e, $03 ; Player is above or on the same tile, enemy is below, checking the overlap in ; the lower tile.