diff --git a/Art/Block1_002.xcf b/Art/Block1_002.xcf index b5e0578..5479661 100644 Binary files a/Art/Block1_002.xcf and b/Art/Block1_002.xcf differ diff --git a/Art/Block_001.xcf b/Art/Block_001.xcf index ef5fef6..6188cc2 100644 Binary files a/Art/Block_001.xcf and b/Art/Block_001.xcf differ diff --git a/Art/Cat_000.xcf b/Art/Cat_000.xcf index e840896..f731213 100644 Binary files a/Art/Cat_000.xcf and b/Art/Cat_000.xcf differ diff --git a/Art/TestPattern_003.xcf b/Art/TestPattern_003.xcf new file mode 100644 index 0000000..b19dd91 Binary files /dev/null and b/Art/TestPattern_003.xcf differ diff --git a/Art/block1_002.gif b/Art/block1_002.gif index f7b683c..cccd503 100644 Binary files a/Art/block1_002.gif and b/Art/block1_002.gif differ diff --git a/Art/block_001.gif b/Art/block_001.gif index 5188694..7902551 100644 Binary files a/Art/block_001.gif and b/Art/block_001.gif differ diff --git a/Art/cat_000.gif b/Art/cat_000.gif index 2b40907..a269e38 100644 Binary files a/Art/cat_000.gif and b/Art/cat_000.gif differ diff --git a/Art/testpattern_003.gif b/Art/testpattern_003.gif new file mode 100644 index 0000000..25c2899 Binary files /dev/null and b/Art/testpattern_003.gif differ diff --git a/MerlinToCA65.sh b/MerlinToCA65.sh index d2e605d..3566633 100755 --- a/MerlinToCA65.sh +++ b/MerlinToCA65.sh @@ -11,6 +11,8 @@ BEGIN { else if ($2 == "HEX") { $2 = ".dbyt" + $3 = "$" $3 + gsub(/,/,",$",$3) } } { diff --git a/SpriteBank00.bin b/SpriteBank00.bin index e18377c..79064b3 100644 Binary files a/SpriteBank00.bin and b/SpriteBank00.bin differ diff --git a/spritebank.s b/spritebank.s index 92dfa46..c1c2532 100644 --- a/spritebank.s +++ b/spritebank.s @@ -2,16 +2,16 @@ DrawSpriteBank : - ASL ; A=Sprite Number ($0000-$0002) + ASL ; A=Sprite Number ($0000-$0003) TAX ; Y=Target Screen Address ($2000-$9D00) LDA SpriteBankNum,X ; Relative Sprite Number Table JMP (SpriteBankBank,X) ; Bank Number Table SpriteBankNum : - .dbyt 0000,0200,0100 + .dbyt $0000,$0300,$0200,$0100 SpriteBankBank : - .addr SpriteBankBank00,SpriteBankBank00,SpriteBankBank00 + .addr SpriteBankBank00,SpriteBankBank00,SpriteBankBank00,SpriteBankBank00 SpriteBankBank00 : JSL $AA0000