diff --git a/Art/Assets/16d59bd2ff00f204ad368d2fc2812fc4.jpg b/Art/Assets/16d59bd2ff00f204ad368d2fc2812fc4.jpg new file mode 100644 index 0000000..ee08fea Binary files /dev/null and b/Art/Assets/16d59bd2ff00f204ad368d2fc2812fc4.jpg differ diff --git a/Art/Assets/7a45e5cea8e85fba634f7a1cbfe72f00.png b/Art/Assets/7a45e5cea8e85fba634f7a1cbfe72f00.png new file mode 100644 index 0000000..f3d85f7 Binary files /dev/null and b/Art/Assets/7a45e5cea8e85fba634f7a1cbfe72f00.png differ diff --git a/Art/Assets/cat_sprite_sheet_by_inkybiscuits-da4qnkv.png b/Art/Assets/cat_sprite_sheet_by_inkybiscuits-da4qnkv.png new file mode 100644 index 0000000..96496df Binary files /dev/null and b/Art/Assets/cat_sprite_sheet_by_inkybiscuits-da4qnkv.png differ diff --git a/Art/Assets/tandywalk.png b/Art/Assets/tandywalk.png new file mode 100644 index 0000000..2c9336a Binary files /dev/null and b/Art/Assets/tandywalk.png differ diff --git a/Art/Block_001.xcf b/Art/Block_001.xcf deleted file mode 100644 index dd1805d..0000000 Binary files a/Art/Block_001.xcf and /dev/null differ diff --git a/Art/Cat_000.xcf b/Art/Cat_000.xcf index f731213..5727f04 100644 Binary files a/Art/Cat_000.xcf and b/Art/Cat_000.xcf differ diff --git a/Art/Cat_001.xcf b/Art/Cat_001.xcf new file mode 100644 index 0000000..a7c99cb Binary files /dev/null and b/Art/Cat_001.xcf differ diff --git a/Art/Spit0_004.xcf b/Art/Spit0_004.xcf index ac3212f..7ed7fab 100644 Binary files a/Art/Spit0_004.xcf and b/Art/Spit0_004.xcf differ diff --git a/Art/Spit1_005.xcf b/Art/Spit1_005.xcf index fc62826..0f6d974 100644 Binary files a/Art/Spit1_005.xcf and b/Art/Spit1_005.xcf differ diff --git a/Art/Spit2_006.xcf b/Art/Spit2_006.xcf index 49e99a6..35ee819 100644 Binary files a/Art/Spit2_006.xcf and b/Art/Spit2_006.xcf differ diff --git a/Art/block_001.gif b/Art/block_001.gif deleted file mode 100644 index dca532b..0000000 Binary files a/Art/block_001.gif and /dev/null differ diff --git a/Art/cat_000.gif b/Art/cat_000.gif index a269e38..57e6583 100644 Binary files a/Art/cat_000.gif and b/Art/cat_000.gif differ diff --git a/Art/cat_001.gif b/Art/cat_001.gif new file mode 100644 index 0000000..14b512d Binary files /dev/null and b/Art/cat_001.gif differ diff --git a/Art/spit0_004.gif b/Art/spit0_004.gif index 7500007..27019b2 100644 Binary files a/Art/spit0_004.gif and b/Art/spit0_004.gif differ diff --git a/Art/spit1_005.gif b/Art/spit1_005.gif index 249ce8d..b43e37e 100644 Binary files a/Art/spit1_005.gif and b/Art/spit1_005.gif differ diff --git a/Art/spit2_006.gif b/Art/spit2_006.gif index 60fab74..9a6306e 100644 Binary files a/Art/spit2_006.gif and b/Art/spit2_006.gif differ diff --git a/Makefile b/Makefile index 5093e9e..a6074a2 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ ADDR=800 PGM=gscats MRSPRITE=../MrSprite/mrsprite CHROMA=00ff00 -PALETTE=a4dffb a4dffb 008800 886611 cc9933 eebb44 dd6666 ff99aa 0e7db1 000000 ffff00 ffff00 ffff00 ffff00 ffff00 ffffff +PALETTE=a4dffb a4dffb 008800 886611 cc9933 eebb44 dd6666 ff99aa 00ff00 ffffff b7b7b7 dddddd 0e7db1 000000 ffff00 ffff00 SPRITES=SpriteBank REMOTESYMBOLS=-Wl $(shell ./ParseMapFile.py *.map) diff --git a/SpriteBank00.bin b/SpriteBank00.bin index edcef80..3ec2266 100644 Binary files a/SpriteBank00.bin and b/SpriteBank00.bin differ diff --git a/font.s b/font.s index 0f6cb54..d27411e 100644 --- a/font.s +++ b/font.s @@ -164,524 +164,524 @@ FontTable: FontData: s_Space: - qbyte7 $00000000 - qbyte7 $00000000 - qbyte7 $00000000 - qbyte7 $00000000 - qbyte7 $00000000 - qbyte7 $00000000 + qbyte $00000000 + qbyte $00000000 + qbyte $00000000 + qbyte $00000000 + qbyte $00000000 + qbyte $00000000 s_Exclaim: - qbyte7 $000FF000 - qbyte7 $000FF000 - qbyte7 $000FF000 - qbyte7 $000FF000 - qbyte7 $00000000 - qbyte7 $000FF000 + qbyte $000FF000 + qbyte $000FF000 + qbyte $000FF000 + qbyte $000FF000 + qbyte $00000000 + qbyte $000FF000 s_Quote: - qbyte7 $0FF00FF0 - qbyte7 $00F000F0 - qbyte7 $00000000 - qbyte7 $00000000 - qbyte7 $00000000 - qbyte7 $00000000 + qbyte $0FF00FF0 + qbyte $00F000F0 + qbyte $00000000 + qbyte $00000000 + qbyte $00000000 + qbyte $00000000 s_Number: - qbyte7 $00000000 - qbyte7 $00F00F00 - qbyte7 $0FFFFFF0 - qbyte7 $00F00F00 - qbyte7 $0FFFFFF0 - qbyte7 $00F00F00 + qbyte $00000000 + qbyte $00F00F00 + qbyte $0FFFFFF0 + qbyte $00F00F00 + qbyte $0FFFFFF0 + qbyte $00F00F00 s_Dollar: - qbyte7 $000F0F00 - qbyte7 $00FFFFF0 - qbyte7 $0F0F0F00 - qbyte7 $00FFFF00 - qbyte7 $000F0FF0 - qbyte7 $0FFFFF00 + qbyte $000F0F00 + qbyte $00FFFFF0 + qbyte $0F0F0F00 + qbyte $00FFFF00 + qbyte $000F0FF0 + qbyte $0FFFFF00 s_Percent: - qbyte7 $0FF000F0 - qbyte7 $00000F00 - qbyte7 $0000F000 - qbyte7 $000F0000 - qbyte7 $00F00000 - qbyte7 $0F000FF0 + qbyte $0FF000F0 + qbyte $00000F00 + qbyte $0000F000 + qbyte $000F0000 + qbyte $00F00000 + qbyte $0F000FF0 s_Amper: - qbyte7 $000FF000 - qbyte7 $00F00F00 - qbyte7 $0F00F000 - qbyte7 $00F000F0 - qbyte7 $0F0FFF00 - qbyte7 $00F0F000 + qbyte $000FF000 + qbyte $00F00F00 + qbyte $0F00F000 + qbyte $00F000F0 + qbyte $0F0FFF00 + qbyte $00F0F000 s_Single: - qbyte7 $000FF000 - qbyte7 $0000F000 - qbyte7 $00000000 - qbyte7 $00000000 - qbyte7 $00000000 - qbyte7 $00000000 + qbyte $000FF000 + qbyte $0000F000 + qbyte $00000000 + qbyte $00000000 + qbyte $00000000 + qbyte $00000000 s_OpenParen: - qbyte7 $000FF000 - qbyte7 $00FF0000 - qbyte7 $0FF00000 - qbyte7 $0FF00000 - qbyte7 $00FF0000 - qbyte7 $000FF000 + qbyte $000FF000 + qbyte $00FF0000 + qbyte $0FF00000 + qbyte $0FF00000 + qbyte $00FF0000 + qbyte $000FF000 s_CloseParen: ; Anger symbol - qbyte7 $0F0000F0 - qbyte7 $00F00F00 - qbyte7 $00000000 - qbyte7 $00FFFF00 - qbyte7 $0F0000F0 - qbyte7 $F000000F + qbyte $0F0000F0 + qbyte $00F00F00 + qbyte $00000000 + qbyte $00FFFF00 + qbyte $0F0000F0 + qbyte $F000000F s_Asterix: - qbyte7 $00000000 ; Angle symbol - qbyte7 $00000FF0 - qbyte7 $0000FF00 - qbyte7 $000FF000 - qbyte7 $00FFFFF0 - qbyte7 $00000000 + qbyte $00000000 ; Angle symbol + qbyte $00000FF0 + qbyte $0000FF00 + qbyte $000FF000 + qbyte $00FFFFF0 + qbyte $00000000 s_Plus: ; Power symbol - qbyte7 $000F0000 - qbyte7 $000F0000 - qbyte7 $0FFFFF00 - qbyte7 $000F0000 - qbyte7 $000F0000 - qbyte7 $00000000 + qbyte $000F0000 + qbyte $000F0000 + qbyte $0FFFFF00 + qbyte $000F0000 + qbyte $000F0000 + qbyte $00000000 s_Comma: - qbyte7 $00000000 - qbyte7 $00000000 - qbyte7 $00000000 - qbyte7 $00000000 - qbyte7 $0000FF00 - qbyte7 $0000F000 + qbyte $00000000 + qbyte $00000000 + qbyte $00000000 + qbyte $00000000 + qbyte $0000FF00 + qbyte $0000F000 s_Minus: - qbyte7 $00000000 - qbyte7 $00000000 - qbyte7 $0FFFFF00 - qbyte7 $00000000 - qbyte7 $00000000 - qbyte7 $00000000 + qbyte $00000000 + qbyte $00000000 + qbyte $0FFFFF00 + qbyte $00000000 + qbyte $00000000 + qbyte $00000000 s_Period: - qbyte7 $00000000 - qbyte7 $00000000 - qbyte7 $00000000 - qbyte7 $00000000 - qbyte7 $0000FF00 - qbyte7 $0000FF00 + qbyte $00000000 + qbyte $00000000 + qbyte $00000000 + qbyte $00000000 + qbyte $0000FF00 + qbyte $0000FF00 s_Slash: - qbyte7 $000000F0 - qbyte7 $00000F00 - qbyte7 $0000F000 - qbyte7 $000F0000 - qbyte7 $00F00000 - qbyte7 $0F000000 + qbyte $000000F0 + qbyte $00000F00 + qbyte $0000F000 + qbyte $000F0000 + qbyte $00F00000 + qbyte $0F000000 s_N0: - qbyte7 $00FFFF00 - qbyte7 $0F000FF0 - qbyte7 $0F00F0F0 - qbyte7 $0F0F00F0 - qbyte7 $0FF000F0 - qbyte7 $00FFFF00 + qbyte $00FFFF00 + qbyte $0F000FF0 + qbyte $0F00F0F0 + qbyte $0F0F00F0 + qbyte $0FF000F0 + qbyte $00FFFF00 s_N1: - qbyte7 $000F0000 - qbyte7 $00FF0000 - qbyte7 $000F0000 - qbyte7 $000F0000 - qbyte7 $000F0000 - qbyte7 $00FFF000 + qbyte $000F0000 + qbyte $00FF0000 + qbyte $000F0000 + qbyte $000F0000 + qbyte $000F0000 + qbyte $00FFF000 s_N2: - qbyte7 $00FFFF00 - qbyte7 $0F0000F0 - qbyte7 $00000F00 - qbyte7 $000FF000 - qbyte7 $00F00000 - qbyte7 $0FFFFFF0 + qbyte $00FFFF00 + qbyte $0F0000F0 + qbyte $00000F00 + qbyte $000FF000 + qbyte $00F00000 + qbyte $0FFFFFF0 s_N3: - qbyte7 $00FFFF00 - qbyte7 $000000F0 - qbyte7 $000FFF00 - qbyte7 $000000F0 - qbyte7 $000000F0 - qbyte7 $00FFFF00 + qbyte $00FFFF00 + qbyte $000000F0 + qbyte $000FFF00 + qbyte $000000F0 + qbyte $000000F0 + qbyte $00FFFF00 s_N4: - qbyte7 $0000FF00 - qbyte7 $000F0F00 - qbyte7 $00F00F00 - qbyte7 $0FFFFFF0 - qbyte7 $00000F00 - qbyte7 $00000F00 + qbyte $0000FF00 + qbyte $000F0F00 + qbyte $00F00F00 + qbyte $0FFFFFF0 + qbyte $00000F00 + qbyte $00000F00 s_N5: - qbyte7 $0FFFFFF0 - qbyte7 $0F000000 - qbyte7 $0FFFFF00 - qbyte7 $000000F0 - qbyte7 $0F0000F0 - qbyte7 $00FFFF00 + qbyte $0FFFFFF0 + qbyte $0F000000 + qbyte $0FFFFF00 + qbyte $000000F0 + qbyte $0F0000F0 + qbyte $00FFFF00 s_N6: - qbyte7 $000FFF00 - qbyte7 $00F00000 - qbyte7 $0F000000 - qbyte7 $0FFFFF00 - qbyte7 $0F0000F0 - qbyte7 $00FFFFF0 + qbyte $000FFF00 + qbyte $00F00000 + qbyte $0F000000 + qbyte $0FFFFF00 + qbyte $0F0000F0 + qbyte $00FFFFF0 s_N7: - qbyte7 $0FFFFFF0 - qbyte7 $000000F0 - qbyte7 $00000F00 - qbyte7 $0000F000 - qbyte7 $000F0000 - qbyte7 $000F0000 + qbyte $0FFFFFF0 + qbyte $000000F0 + qbyte $00000F00 + qbyte $0000F000 + qbyte $000F0000 + qbyte $000F0000 s_N8: - qbyte7 $00FFFF00 - qbyte7 $0F0000F0 - qbyte7 $00FFFF00 - qbyte7 $0F0000F0 - qbyte7 $0F0000F0 - qbyte7 $00FFFF00 + qbyte $00FFFF00 + qbyte $0F0000F0 + qbyte $00FFFF00 + qbyte $0F0000F0 + qbyte $0F0000F0 + qbyte $00FFFF00 s_N9: - qbyte7 $00FFFF00 - qbyte7 $0F0000F0 - qbyte7 $00FFFF00 - qbyte7 $0000F000 - qbyte7 $000F0000 - qbyte7 $00F00000 + qbyte $00FFFF00 + qbyte $0F0000F0 + qbyte $00FFFF00 + qbyte $0000F000 + qbyte $000F0000 + qbyte $00F00000 s_Colon: - qbyte7 $000FF000 - qbyte7 $000FF000 - qbyte7 $00000000 - qbyte7 $000FF000 - qbyte7 $000FF000 - qbyte7 $00000000 + qbyte $000FF000 + qbyte $000FF000 + qbyte $00000000 + qbyte $000FF000 + qbyte $000FF000 + qbyte $00000000 s_Semi: - qbyte7 $00000000 - qbyte7 $000FF000 - qbyte7 $000FF000 - qbyte7 $00000000 - qbyte7 $000FF000 - qbyte7 $000F0000 + qbyte $00000000 + qbyte $000FF000 + qbyte $000FF000 + qbyte $00000000 + qbyte $000FF000 + qbyte $000F0000 s_LAngle: - qbyte7 $0000F000 - qbyte7 $000F0000 - qbyte7 $00F00000 - qbyte7 $000F0000 - qbyte7 $0000F000 - qbyte7 $00000000 + qbyte $0000F000 + qbyte $000F0000 + qbyte $00F00000 + qbyte $000F0000 + qbyte $0000F000 + qbyte $00000000 s_Equal: - qbyte7 $00000000 - qbyte7 $00000000 - qbyte7 $0FFFFF00 - qbyte7 $00000000 - qbyte7 $0FFFFF00 - qbyte7 $00000000 + qbyte $00000000 + qbyte $00000000 + qbyte $0FFFFF00 + qbyte $00000000 + qbyte $0FFFFF00 + qbyte $00000000 s_RAngle: - qbyte7 $0000F000 - qbyte7 $00000F00 - qbyte7 $000000F0 - qbyte7 $00000F00 - qbyte7 $0000F000 - qbyte7 $00000000 + qbyte $0000F000 + qbyte $00000F00 + qbyte $000000F0 + qbyte $00000F00 + qbyte $0000F000 + qbyte $00000000 s_Question: - qbyte7 $00FFF000 - qbyte7 $0F000F00 - qbyte7 $00000F00 - qbyte7 $000FF000 - qbyte7 $00000000 - qbyte7 $000FF000 + qbyte $00FFF000 + qbyte $0F000F00 + qbyte $00000F00 + qbyte $000FF000 + qbyte $00000000 + qbyte $000FF000 s_At: - qbyte7 $00FFFF00 - qbyte7 $0F0000F0 - qbyte7 $0F00F0F0 - qbyte7 $0FFFF0F0 - qbyte7 $000000F0 - qbyte7 $0FFFFF00 + qbyte $00FFFF00 + qbyte $0F0000F0 + qbyte $0F00F0F0 + qbyte $0FFFF0F0 + qbyte $000000F0 + qbyte $0FFFFF00 s_A: - qbyte7 $000FF000 - qbyte7 $00F00F00 - qbyte7 $0F0000F0 - qbyte7 $0FFFFFF0 - qbyte7 $0F0000F0 - qbyte7 $0F0000F0 + qbyte $000FF000 + qbyte $00F00F00 + qbyte $0F0000F0 + qbyte $0FFFFFF0 + qbyte $0F0000F0 + qbyte $0F0000F0 s_B: - qbyte7 $0FFFFF00 - qbyte7 $0F0000F0 - qbyte7 $0FFFFF00 - qbyte7 $0F0000F0 - qbyte7 $0F0000F0 - qbyte7 $0FFFFF00 + qbyte $0FFFFF00 + qbyte $0F0000F0 + qbyte $0FFFFF00 + qbyte $0F0000F0 + qbyte $0F0000F0 + qbyte $0FFFFF00 s_C: - qbyte7 $00FFFFF0 - qbyte7 $0F000000 - qbyte7 $0F000000 - qbyte7 $0F000000 - qbyte7 $0F000000 - qbyte7 $00FFFFF0 + qbyte $00FFFFF0 + qbyte $0F000000 + qbyte $0F000000 + qbyte $0F000000 + qbyte $0F000000 + qbyte $00FFFFF0 s_D: - qbyte7 $0FFFFF00 - qbyte7 $0F0000F0 - qbyte7 $0F0000F0 - qbyte7 $0F0000F0 - qbyte7 $0F0000F0 - qbyte7 $0FFFFF00 + qbyte $0FFFFF00 + qbyte $0F0000F0 + qbyte $0F0000F0 + qbyte $0F0000F0 + qbyte $0F0000F0 + qbyte $0FFFFF00 s_E: - qbyte7 $0FFFFFF0 - qbyte7 $0F000000 - qbyte7 $0FFFF000 - qbyte7 $0F000000 - qbyte7 $0F000000 - qbyte7 $0FFFFFF0 + qbyte $0FFFFFF0 + qbyte $0F000000 + qbyte $0FFFF000 + qbyte $0F000000 + qbyte $0F000000 + qbyte $0FFFFFF0 s_F: - qbyte7 $0FFFFFF0 - qbyte7 $0F000000 - qbyte7 $0FFFF000 - qbyte7 $0F000000 - qbyte7 $0F000000 - qbyte7 $0F000000 + qbyte $0FFFFFF0 + qbyte $0F000000 + qbyte $0FFFF000 + qbyte $0F000000 + qbyte $0F000000 + qbyte $0F000000 s_G: - qbyte7 $00FFFFF0 - qbyte7 $0F000000 - qbyte7 $0F000000 - qbyte7 $0F00FFF0 - qbyte7 $0F0000F0 - qbyte7 $00FFFF00 + qbyte $00FFFFF0 + qbyte $0F000000 + qbyte $0F000000 + qbyte $0F00FFF0 + qbyte $0F0000F0 + qbyte $00FFFF00 s_H: - qbyte7 $0F0000F0 - qbyte7 $0F0000F0 - qbyte7 $0FFFFFF0 - qbyte7 $0F0000F0 - qbyte7 $0F0000F0 - qbyte7 $0F0000F0 + qbyte $0F0000F0 + qbyte $0F0000F0 + qbyte $0FFFFFF0 + qbyte $0F0000F0 + qbyte $0F0000F0 + qbyte $0F0000F0 s_I: - qbyte7 $0FFFFF00 - qbyte7 $000F0000 - qbyte7 $000F0000 - qbyte7 $000F0000 - qbyte7 $000F0000 - qbyte7 $0FFFFF00 + qbyte $0FFFFF00 + qbyte $000F0000 + qbyte $000F0000 + qbyte $000F0000 + qbyte $000F0000 + qbyte $0FFFFF00 s_J: - qbyte7 $000000F0 - qbyte7 $000000F0 - qbyte7 $000000F0 - qbyte7 $0F0000F0 - qbyte7 $0F0000F0 - qbyte7 $00FFFF00 + qbyte $000000F0 + qbyte $000000F0 + qbyte $000000F0 + qbyte $0F0000F0 + qbyte $0F0000F0 + qbyte $00FFFF00 s_K: - qbyte7 $0F000F00 - qbyte7 $0F00F000 - qbyte7 $0FFF0000 - qbyte7 $0F00F000 - qbyte7 $0F000F00 - qbyte7 $0F000F00 + qbyte $0F000F00 + qbyte $0F00F000 + qbyte $0FFF0000 + qbyte $0F00F000 + qbyte $0F000F00 + qbyte $0F000F00 s_L: - qbyte7 $0F000000 - qbyte7 $0F000000 - qbyte7 $0F000000 - qbyte7 $0F000000 - qbyte7 $0F000000 - qbyte7 $0FFFFFF0 + qbyte $0F000000 + qbyte $0F000000 + qbyte $0F000000 + qbyte $0F000000 + qbyte $0F000000 + qbyte $0FFFFFF0 s_M: - qbyte7 $0F0000F0 - qbyte7 $0FF00FF0 - qbyte7 $0F0FF0F0 - qbyte7 $0F0000F0 - qbyte7 $0F0000F0 - qbyte7 $0F0000F0 + qbyte $0F0000F0 + qbyte $0FF00FF0 + qbyte $0F0FF0F0 + qbyte $0F0000F0 + qbyte $0F0000F0 + qbyte $0F0000F0 s_N: - qbyte7 $0F0000F0 - qbyte7 $0FF000F0 - qbyte7 $0F0F00F0 - qbyte7 $0F00F0F0 - qbyte7 $0F000FF0 - qbyte7 $0F0000F0 + qbyte $0F0000F0 + qbyte $0FF000F0 + qbyte $0F0F00F0 + qbyte $0F00F0F0 + qbyte $0F000FF0 + qbyte $0F0000F0 s_O: - qbyte7 $00FFFF00 - qbyte7 $0F0000F0 - qbyte7 $0F0000F0 - qbyte7 $0F0000F0 - qbyte7 $0F0000F0 - qbyte7 $00FFFF00 + qbyte $00FFFF00 + qbyte $0F0000F0 + qbyte $0F0000F0 + qbyte $0F0000F0 + qbyte $0F0000F0 + qbyte $00FFFF00 s_P: - qbyte7 $0FFFFF00 - qbyte7 $0F0000F0 - qbyte7 $0FFFFF00 - qbyte7 $0F000000 - qbyte7 $0F000000 - qbyte7 $0F000000 + qbyte $0FFFFF00 + qbyte $0F0000F0 + qbyte $0FFFFF00 + qbyte $0F000000 + qbyte $0F000000 + qbyte $0F000000 s_Q: - qbyte7 $00FFFF00 - qbyte7 $0F0000F0 - qbyte7 $0F0000F0 - qbyte7 $0F00F0F0 - qbyte7 $0F000FF0 - qbyte7 $00FFFFF0 + qbyte $00FFFF00 + qbyte $0F0000F0 + qbyte $0F0000F0 + qbyte $0F00F0F0 + qbyte $0F000FF0 + qbyte $00FFFFF0 s_R: - qbyte7 $0FFFFF00 - qbyte7 $0F0000F0 - qbyte7 $0FFFFF00 - qbyte7 $0F000F00 - qbyte7 $0F0000F0 - qbyte7 $0F0000F0 + qbyte $0FFFFF00 + qbyte $0F0000F0 + qbyte $0FFFFF00 + qbyte $0F000F00 + qbyte $0F0000F0 + qbyte $0F0000F0 s_S: - qbyte7 $00FFFFF0 - qbyte7 $0F000000 - qbyte7 $00FFFF00 - qbyte7 $000000F0 - qbyte7 $000000F0 - qbyte7 $0FFFFF00 + qbyte $00FFFFF0 + qbyte $0F000000 + qbyte $00FFFF00 + qbyte $000000F0 + qbyte $000000F0 + qbyte $0FFFFF00 s_T: - qbyte7 $0FFFFF00 - qbyte7 $000F0000 - qbyte7 $000F0000 - qbyte7 $000F0000 - qbyte7 $000F0000 - qbyte7 $000F0000 + qbyte $0FFFFF00 + qbyte $000F0000 + qbyte $000F0000 + qbyte $000F0000 + qbyte $000F0000 + qbyte $000F0000 s_U: - qbyte7 $0F0000F0 - qbyte7 $0F0000F0 - qbyte7 $0F0000F0 - qbyte7 $0F0000F0 - qbyte7 $0F0000F0 - qbyte7 $00FFFF00 + qbyte $0F0000F0 + qbyte $0F0000F0 + qbyte $0F0000F0 + qbyte $0F0000F0 + qbyte $0F0000F0 + qbyte $00FFFF00 s_V: - qbyte7 $0F0000F0 - qbyte7 $0F0000F0 - qbyte7 $0F0000F0 - qbyte7 $0F0000F0 - qbyte7 $00F00F00 - qbyte7 $000FF000 + qbyte $0F0000F0 + qbyte $0F0000F0 + qbyte $0F0000F0 + qbyte $0F0000F0 + qbyte $00F00F00 + qbyte $000FF000 s_W: - qbyte7 $0F0000F0 - qbyte7 $0F0000F0 - qbyte7 $0F0000F0 - qbyte7 $0F0FF0F0 - qbyte7 $0FF00FF0 - qbyte7 $0F0000F0 + qbyte $0F0000F0 + qbyte $0F0000F0 + qbyte $0F0000F0 + qbyte $0F0FF0F0 + qbyte $0FF00FF0 + qbyte $0F0000F0 s_X: - qbyte7 $0F0000F0 - qbyte7 $00F00F00 - qbyte7 $000FF000 - qbyte7 $000FF000 - qbyte7 $00F00F00 - qbyte7 $0F0000F0 + qbyte $0F0000F0 + qbyte $00F00F00 + qbyte $000FF000 + qbyte $000FF000 + qbyte $00F00F00 + qbyte $0F0000F0 s_Y: - qbyte7 $F00000F0 - qbyte7 $0F000F00 - qbyte7 $00F0F000 - qbyte7 $000F0000 - qbyte7 $000F0000 - qbyte7 $000F0000 + qbyte $F00000F0 + qbyte $0F000F00 + qbyte $00F0F000 + qbyte $000F0000 + qbyte $000F0000 + qbyte $000F0000 s_Z: - qbyte7 $0FFFFFF0 - qbyte7 $00000F00 - qbyte7 $0000F000 - qbyte7 $000F0000 - qbyte7 $00F00000 - qbyte7 $0FFFFFF0 + qbyte $0FFFFFF0 + qbyte $00000F00 + qbyte $0000F000 + qbyte $000F0000 + qbyte $00F00000 + qbyte $0FFFFFF0 s_LBracket: - qbyte7 $000FFF00 - qbyte7 $000F0000 - qbyte7 $000F0000 - qbyte7 $000F0000 - qbyte7 $000F0000 - qbyte7 $000FFF00 + qbyte $000FFF00 + qbyte $000F0000 + qbyte $000F0000 + qbyte $000F0000 + qbyte $000F0000 + qbyte $000FFF00 s_BackSlash: - qbyte7 $0F000000 - qbyte7 $00F00000 - qbyte7 $000F0000 - qbyte7 $0000F000 - qbyte7 $00000F00 - qbyte7 $000000F0 + qbyte $0F000000 + qbyte $00F00000 + qbyte $000F0000 + qbyte $0000F000 + qbyte $00000F00 + qbyte $000000F0 s_RBracket: - qbyte7 $00FFF000 - qbyte7 $0000F000 - qbyte7 $0000F000 - qbyte7 $0000F000 - qbyte7 $0000F000 - qbyte7 $00FFF000 + qbyte $00FFF000 + qbyte $0000F000 + qbyte $0000F000 + qbyte $0000F000 + qbyte $0000F000 + qbyte $00FFF000 s_Caret: - qbyte7 $0000F000 - qbyte7 $000F0F00 - qbyte7 $00F000F0 - qbyte7 $00000000 - qbyte7 $00000000 - qbyte7 $00000000 + qbyte $0000F000 + qbyte $000F0F00 + qbyte $00F000F0 + qbyte $00000000 + qbyte $00000000 + qbyte $00000000 s_UnderLine: - qbyte7 $00000000 - qbyte7 $00000000 - qbyte7 $00000000 - qbyte7 $00000000 - qbyte7 $00000000 - qbyte7 $FFFFFFF0 + qbyte $00000000 + qbyte $00000000 + qbyte $00000000 + qbyte $00000000 + qbyte $00000000 + qbyte $FFFFFFF0 s_Template: - qbyte7 $00000000 - qbyte7 $00000000 - qbyte7 $00000000 - qbyte7 $00000000 - qbyte7 $00000000 - qbyte7 $00000000 + qbyte $00000000 + qbyte $00000000 + qbyte $00000000 + qbyte $00000000 + qbyte $00000000 + qbyte $00000000 diff --git a/gamemanager.s b/gamemanager.s index f0ad2c3..bca8eef 100644 --- a/gamemanager.s +++ b/gamemanager.s @@ -16,6 +16,18 @@ beginGameplay: lda #0 jsr setPalette + ; Set up palette for status bar + lda #statusBarPalette + sta PARAML0 + lda #1 + jsr setPalette + + lda #1 + sta PARAML0 + ldx #0 + ldy #10 + jsr setScanlinePalette + ; Set up sprite rendering BITS8 lda #3 @@ -320,7 +332,9 @@ fire: basePalette: - .word $0aef,$0aef,$0080,$0861,$0c93,$0eb4,$0d66,$0f9a,$007b,$0000,$0000,$0000,$0000,$0000,$0000,$0FFF + .word $0aef,$0aef,$0080,$0861,$0c93,$0eb4,$0d66,$0f9a,$00f0,$0fff,$0bbb,$ddd,$007b,$0000,$0ff0,$0fff +statusBarPalette: + .word $0888,$0aef,$0F00,$0861,$0c93,$0eb4,$0d66,$0f9a,$00f0,$0fff,$0bbb,$ddd,$007b,$0000,$0ff0,$0fff diff --git a/graphics.s b/graphics.s index 782c527..7ea6482 100644 --- a/graphics.s +++ b/graphics.s @@ -80,6 +80,29 @@ initSCBsLoop: rts +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +; setScanlinePalette +; Set the palette for a given scan line +; +; PARAML0 = Palette index +; X = Start scan line +; Y = Count + +setScanlinePalette: + pha + +setScanlinePaletteLoop: + lda $e19d00,x + ora PARAML0 + sta $e19d00,x + inx + dey + bne setScanlinePaletteLoop + + pla + rts + + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; enableFillMode ; Enables fill mode for a given scanline @@ -144,7 +167,7 @@ setPaletteColor: ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; setPalette -; Set a single color in a palette +; Set all colors in a palette from memory ; PARAML0 = Pointer to 32 color bytes ; A = Palette index ; @@ -156,13 +179,17 @@ setPalette: asl asl asl - tax + BITS8A + sta setPaletteLoop_SMC+1 + BITS16 + ldx #0 ldy #0 setPaletteLoop: - lda (PARAML0),y - sta $e19e00,x +setPaletteLoop_SMC: + sta $e19e00,x ; Self-modifying code! + iny iny inx diff --git a/gscats.2mg b/gscats.2mg index 3ed4c13..070ce62 100644 Binary files a/gscats.2mg and b/gscats.2mg differ diff --git a/inventory.s b/inventory.s index f433409..0a718c7 100644 --- a/inventory.s +++ b/inventory.s @@ -49,7 +49,7 @@ renderInventoryItem: phy phx - lda #1 + lda #2 clc jsr DrawSpriteBank diff --git a/spritebank.s b/spritebank.s index dc71519..fce6a17 100644 --- a/spritebank.s +++ b/spritebank.s @@ -8,7 +8,7 @@ DrawSpriteBank : JMP (SpriteBankBank,X) ; Bank Number Table SpriteBankNum : - .dbyt $0000,$0400,$0500,$0100,$0200,$0600,$0300 + .dbyt $0200,$0100,$0500,$0000,$0300,$0600,$0400 SpriteBankBank : .addr SpriteBankBank00,SpriteBankBank00,SpriteBankBank00,SpriteBankBank00,SpriteBankBank00,SpriteBankBank00,SpriteBankBank00