junglejourney

changeset 155:548640592fab

Moved code, pictures and work areas down in memory.
author David Boddie <david@boddie.org.uk>
date Sat Sep 17 22:37:45 2011 +0200
parents bea00c159d85
children 4068ea0fad17
files build.py loader.oph mapcode.oph
diffstat 3 files changed, 21 insertions(+), 21 deletions(-) [+]
line diff
     1.1 --- a/build.py	Sat Sep 17 02:30:32 2011 +0200
     1.2 +++ b/build.py	Sat Sep 17 22:37:45 2011 +0200
     1.3 @@ -47,11 +47,11 @@
     1.4      out_uef_file = sys.argv[1]
     1.5      
     1.6      # Memory map
     1.7 -    # 0FE0 enemy x locations in the current room
     1.8 -    # 0FF0 enemy x locations in the current room
     1.9 -    # 1000 completion screen
    1.10 -    # 1780 title screen
    1.11 -    # 1F00 CODE
    1.12 +    # 0EE0 enemy x locations in the current room
    1.13 +    # 0EF0 enemy x locations in the current room
    1.14 +    # 0F00 completion screen
    1.15 +    # 1680 title screen
    1.16 +    # 1E00 CODE
    1.17      #
    1.18      # 3F00 CHARS (character sprites)
    1.19      #       4 * 2 * 0x30 (player movement)
    1.20 @@ -163,7 +163,7 @@
    1.21  
    1.22      system("ophis mapcode.oph CODE")
    1.23      code = open("CODE").read()
    1.24 -    code_start = 0x1f00
    1.25 +    code_start = 0x1e00
    1.26      files.append(("CODE", code_start, code_start, code))
    1.27      
    1.28      u = UEFfile.UEFfile(creator = 'build.py '+version)
     2.1 --- a/loader.oph	Sat Sep 17 02:30:32 2011 +0200
     2.2 +++ b/loader.oph	Sat Sep 17 22:37:45 2011 +0200
     2.3 @@ -66,7 +66,7 @@
     2.4      ldy #>code_block
     2.5      jsr $ffdd
     2.6  
     2.7 -    jmp $1f00
     2.8 +    jmp $1e00
     2.9  
    2.10  sprites_file_name: .byte "SPRITES", 13
    2.11  chars_file_name: .byte "CHARS", 13
    2.12 @@ -92,10 +92,10 @@
    2.13                 .byte $00, $71, 0, 0
    2.14  
    2.15  code_block: .byte <code_file_name, >code_file_name
    2.16 -               .byte $00, $1f, 0, 0
    2.17 -               .byte $00, $1f, 0, 0
    2.18 +               .byte $00, $1e, 0, 0
    2.19 +               .byte $00, $1e, 0, 0
    2.20                 .byte $95, $1f, 0, 0
    2.21 -               .byte $95, $3e, 0, 0
    2.22 +               .byte $95, $3d, 0, 0
    2.23  
    2.24  init_load_window_vdu_bytes: .byte 28,0,29,19,24
    2.25  
     3.1 --- a/mapcode.oph	Sat Sep 17 02:30:32 2011 +0200
     3.2 +++ b/mapcode.oph	Sat Sep 17 22:37:45 2011 +0200
     3.3 @@ -13,7 +13,7 @@
     3.4  ; You should have received a copy of the GNU General Public License
     3.5  ; along with this program.  If not, see <http://www.gnu.org/licenses/>.
     3.6  
     3.7 -.org $1f00
     3.8 +.org $1e00
     3.9  jmp main
    3.10  
    3.11  seeds:         .byte 100, 239, 183, 144   ; $ef, $b7, $90, $d6, $89
    3.12 @@ -638,10 +638,10 @@
    3.13          bne create_enemy_positions_next
    3.14  
    3.15          lda $70
    3.16 -        sta $0fe0,x                     ; store the x value
    3.17 +        sta $0ee0,x                     ; store the x value
    3.18  
    3.19          lda $71
    3.20 -        sta $0ff0,x                     ; store the y value
    3.21 +        sta $0ef0,x                     ; store the y value
    3.22  
    3.23          dex
    3.24          bmi create_enemy_positions_exit
    3.25 @@ -657,7 +657,7 @@
    3.26      lda #0
    3.27      create_enemy_positions_fill_loop:
    3.28  
    3.29 -        sta $0fe0,x
    3.30 +        sta $0ee0,x
    3.31          dex
    3.32          bpl create_enemy_positions_fill_loop
    3.33  
    3.34 @@ -2250,12 +2250,12 @@
    3.35      jsr unlimited_values
    3.36      and #$0f
    3.37      tax
    3.38 -    lda $0fe0,x
    3.39 +    lda $0ee0,x
    3.40      cmp #0                  ; check for an invalid value and exit if found
    3.41      beq emerge_character_exit
    3.42  
    3.43      sta $80                 ; temporary
    3.44 -    lda $0ff0,x
    3.45 +    lda $0ef0,x
    3.46      tax
    3.47  
    3.48      ; Add an emerging enemy.
    3.49 @@ -4144,7 +4144,7 @@
    3.50  
    3.51      lda #$80
    3.52      sta $72
    3.53 -    lda #$1e
    3.54 +    lda #$1d
    3.55      sta $73
    3.56  
    3.57      ; Run on into the following routine.
    3.58 @@ -4175,7 +4175,7 @@
    3.59  
    3.60      lda #$80
    3.61      sta $70
    3.62 -    lda #$1e
    3.63 +    lda #$1d
    3.64      sta $71
    3.65  
    3.66      lda #$80
    3.67 @@ -4194,7 +4194,7 @@
    3.68  
    3.69      lda #$00
    3.70      sta $72
    3.71 -    lda #$10
    3.72 +    lda #$0f
    3.73      sta $73
    3.74  
    3.75      move_completed_screen_loop:
    3.76 @@ -4240,7 +4240,7 @@
    3.77          bne move_completed_screen_loop
    3.78  
    3.79          lda $73
    3.80 -        cmp #$17
    3.81 +        cmp #$16
    3.82          bne move_completed_screen_loop
    3.83  
    3.84      rts
    3.85 @@ -4249,7 +4249,7 @@
    3.86  
    3.87      lda #$00
    3.88      sta $70
    3.89 -    lda #$17
    3.90 +    lda #$16
    3.91      sta $71
    3.92  
    3.93      lda #$00