junglejourney

changeset 48:e51603c2d361

find changesets by author, revision, files, or words in the commit message
Adjusted the emerge position routines.
author David Boddie <david@boddie.org.uk>
date Mon Aug 22 01:17:34 2011 +0200
parents eb8ce2b29b9a
children 249c89334020
files mapcode.oph
diffstat 1 files changed, 9 insertions(+), 8 deletions(-) [+]
line diff
     1.1 --- a/mapcode.oph	Mon Aug 22 01:17:15 2011 +0200
     1.2 +++ b/mapcode.oph	Mon Aug 22 01:17:34 2011 +0200
     1.3 @@ -1861,9 +1861,9 @@
     1.4  
     1.5  emerge_x_position:              ; returns A=position
     1.6      jsr unlimited_values
     1.7 -    lda $3304
     1.8 -    and #2
     1.9 -    eor $7d
    1.10 +    lda $7d
    1.11 +    ora #2
    1.12 +    eor $3304
    1.13      and #7
    1.14      adc #1
    1.15      clc
    1.16 @@ -1871,9 +1871,9 @@
    1.17  
    1.18  emerge_y_position:              ; returns A=position
    1.19      jsr unlimited_values
    1.20 -    lda $3302
    1.21 -    and #2
    1.22 -    eor $7d
    1.23 +    lda $7d
    1.24 +    ora #2
    1.25 +    eor $3302
    1.26      and #7
    1.27      adc #1
    1.28      clc
    1.29 @@ -2844,8 +2844,9 @@
    1.30          ldy #3
    1.31          lda ($74),y         ; dy
    1.32          sec
    1.33 -        sbc $3309           ; dy - projectile dy
    1.34 -        bmi projectile_check_collide_y_equal_n
    1.35 +        sbc $3309           ; dy - projectile dy    ; this appears to be
    1.36 +        bmi projectile_check_collide_y_equal_n      ; required to deal with
    1.37 +                                                    ; negative results
    1.38  
    1.39          cmp #2                                  ; y - py >= 2 (to miss)
    1.40          bmi projectile_check_collide_x