castleraider

changeset 309:0bf40edb2449

find changesets by author, revision, files, or words in the commit message
Adjusted the positions of lives and objects on the panel. Merged some changes from the Wakefield 2014 branch.
author David Boddie <david@boddie.org.uk>
date Fri Apr 25 00:10:13 2014 +0200
parents c9449b95afbc
children 0428d6ebc288
files build.py images/panel.png
diffstat 2 files changed, 11 insertions(+), 7 deletions(-) [+]
line diff
     1.1 --- a/build.py	Wed Apr 23 00:23:23 2014 +0200
     1.2 +++ b/build.py	Fri Apr 25 00:10:13 2014 +0200
     1.3 @@ -366,17 +366,17 @@
     1.4      panel_address = 0x3000
     1.5      panel, offsets = makesprites.read_sprites(["images/panel.png"], panel_address)
     1.6      
     1.7 -    top_panel_objects_bank1 = 0x31e0
     1.8 +    top_panel_objects_bank1 = 0x31d8
     1.9      top_panel_objects_bank1_low = top_panel_objects_bank1 & 0xff
    1.10      top_panel_objects_bank1_high = top_panel_objects_bank1 >> 8
    1.11 -    top_panel_objects_bank2 = 0x59e0
    1.12 +    top_panel_objects_bank2 = 0x59d8
    1.13      top_panel_objects_bank2_low = top_panel_objects_bank2 & 0xff
    1.14      top_panel_objects_bank2_high = top_panel_objects_bank2 >> 8
    1.15      
    1.16 -    top_panel_lives_bank1 = 0x3000 + (0x140 + 0x20)
    1.17 +    top_panel_lives_bank1 = 0x3000 + (0x140 + 0x28)
    1.18      top_panel_lives_bank1_low = top_panel_lives_bank1 & 0xff
    1.19      top_panel_lives_bank1_high = top_panel_lives_bank1 >> 8
    1.20 -    top_panel_lives_bank2 = 0x5800 + (0x140 + 0x20)
    1.21 +    top_panel_lives_bank2 = 0x5800 + (0x140 + 0x28)
    1.22      top_panel_lives_bank2_low = top_panel_lives_bank2 & 0xff
    1.23      top_panel_lives_bank2_high = top_panel_lives_bank2 >> 8
    1.24      
    1.25 @@ -824,13 +824,17 @@
    1.26          disk.new()
    1.27          
    1.28          catalogue = disk.catalogue()
    1.29 -        catalogue.boot_option = 3
    1.30 +        catalogue.boot_option = 2
    1.31          
    1.32 -        disk_files = [makedfs.File("$.!BOOT", 'CHAIN "CASTLE"\r', 0, 0, 15)]
    1.33 +        disk_files = []
    1.34          for name, load, exec_, data in files:
    1.35 +            if name == "LOADER":
    1.36 +                name = "!BOOT"
    1.37 +            elif name == "CASTLE":
    1.38 +                continue
    1.39              disk_files.append(makedfs.File("$." + name, data, load, exec_, len(data)))
    1.40          
    1.41 -        catalogue.write("Castle Raider", disk_files)
    1.42 +        catalogue.write("CastleRaider", disk_files)
    1.43          
    1.44          disk.file.seek(0, 0)
    1.45          disk_data = disk.file.read()

     2.1 Binary file images/panel.png has changed