# HG changeset patch
# User David Boddie <david@boddie.org.uk>
# Date 1318885531 -7200
# Node ID 958f6c30e575998c3b05e49ac97658a88d22fcdd
# Parent  59f37c9e74e48dda3559bf4f0c49fc4eb6f9f34d
Moved the tile and character sprites into the code ROM to see if
there is any effect on the game speed.

diff -r 59f37c9e74e4 -r 958f6c30e575 buildrom.py
--- a/buildrom.py	Sun Oct 16 21:36:30 2011 +0200
+++ b/buildrom.py	Mon Oct 17 23:05:31 2011 +0200
@@ -33,22 +33,30 @@
         code_rom_file = "junglecode.rom"
         loader_rom_file = "jungle.rom"
     
-    # Memory map
+    # Memory map (code ROM)
     #
     # 8000 ROM header code
     #      CODE
+    # A200 CHARS (0x1280 bytes of character sprites)
+    # B480 SPRITES (0x360 bytes of tile sprites)
+    # B7E0 space
+    #
+    # Memory map (loader ROM)
     #
     # 8000 ROM header code
     # 8400 title screen (0x1800 bytes including completion screen)
-    #
-    # 9C00 CHARS (0x1280 bytes of character sprites)
-    # AE80 SPRITES (0x360 bytes of tile sprites)
-    # B1E0 space
     
     system("ophis romcode.oph " + code_rom_file)
     
+    romcode = open(code_rom_file, "rb").read()
+    
+    # Add padding before the data is appended to the code.
+    romcode += (0x2200 - len(romcode))*"\x00"
+    
+    romcode += makesprites.read_sprites(makesprites.chars)
+    romcode += makesprites.read_sprites(makesprites.tiles)
+    
     # Add padding after the code to make a final image size of 16K.
-    romcode = open(code_rom_file, "rb").read()
     romcode += (0x4000 - len(romcode))*"\x00"
     open(code_rom_file, "wb").write(romcode)
     
@@ -65,8 +73,6 @@
     combined = makesprites.combine(completed, overlay)
     romdata += combined
     
-    romdata += makesprites.read_sprites(makesprites.chars)
-    romdata += makesprites.read_sprites(makesprites.tiles)
     romdata += (0x4000 - len(romdata))*"\x00"
     
     open(loader_rom_file, "wb").write(romdata)
diff -r 59f37c9e74e4 -r 958f6c30e575 romcode.oph
--- a/romcode.oph	Sun Oct 16 21:36:30 2011 +0200
+++ b/romcode.oph	Mon Oct 17 23:05:31 2011 +0200
@@ -83,20 +83,20 @@
 
 .include "mapcode.oph"
 
-tile_addresses_low:  .byte $00, $60, $c0, $00, $60, $c0, $20
-tile_addresses_high: .byte $54, $54, $54, $50, $50, $50, $51
+tile_addresses_low:  .byte $80, $E0, $40, $00, $60, $c0, $20
+tile_addresses_high: .byte $B4, $B4, $B5, $b3, $b3, $b3, $b4
 
 player_direction_chars_low: .byte $00,$30,$60,$90,$c0,$f0,$20,$50, $80,$b0,$e0,$10
-player_direction_chars_high: .byte $3f,$3f,$3f,$3f,$3f,$3f,$40,$40, $40,$40,$40,$41
+player_direction_chars_high: .byte $a2,$a2,$a2,$a2,$a2,$a2,$a3,$a3, $a3,$a3,$a3,$a4
 
 enemy_direction_chars_low:  .byte $c0,$00,$40,$80,$c0,$00,$40,$80
-enemy_direction_chars_high: .byte $41,$42,$42,$42,$42,$43,$43,$43
+enemy_direction_chars_high: .byte $a4,$a5,$a5,$a5,$a5,$a6,$a6,$a6
 
 emerge_explode_chars_low:  .byte $c0,$00,$40,$80,$c0,$00,$40,$80
-emerge_explode_chars_high: .byte $4b,$4c,$4c,$4c,$4c,$4d,$4d,$4d
+emerge_explode_chars_high: .byte $ae,$af,$af,$af,$af,$b0,$b0,$b0
 
 item_chars_low:  .byte $c0,$00,$40,$80,$c0,$00,$40,$80,$c0
-item_chars_high: .byte $4d,$4e,$4e,$4e,$4e,$4f,$4f,$4f,$4f
+item_chars_high: .byte $b0,$b1,$b1,$b1,$b1,$b2,$b2,$b2,$b2
 
 projectile_chars_low: .byte $40,$50,$60,$70,$80,$90,$a0,$b0
-.alias projectile_chars_high $41
+.alias projectile_chars_high $a4
diff -r 59f37c9e74e4 -r 958f6c30e575 romloader.oph
--- a/romloader.oph	Sun Oct 16 21:36:30 2011 +0200
+++ b/romloader.oph	Mon Oct 17 23:05:31 2011 +0200
@@ -159,8 +159,6 @@
     clc
 
     jsr move_completed_screen_down
-    jsr copy_sprites_from_rom
-    jsr copy_chars_from_rom
     jsr copy_launch_code
 
     jmp $1e00