diff --git a/Art/Fan_009.xcf b/Art/Fan_009.xcf new file mode 100644 index 0000000..6e2ca01 Binary files /dev/null and b/Art/Fan_009.xcf differ diff --git a/Art/fan_009.gif b/Art/fan_009.gif new file mode 100644 index 0000000..a73d848 Binary files /dev/null and b/Art/fan_009.gif differ diff --git a/SpriteBank00.bin b/SpriteBank00.bin index 0a8197a..937f316 100644 Binary files a/SpriteBank00.bin and b/SpriteBank00.bin differ diff --git a/gscats.2mg b/gscats.2mg index b1f000c..c65cb38 100644 Binary files a/gscats.2mg and b/gscats.2mg differ diff --git a/inventory.s b/inventory.s index bb86e23..56f1794 100644 --- a/inventory.s +++ b/inventory.s @@ -6,7 +6,7 @@ ; -INVENTORY_ITEMS = 2 +INVENTORY_ITEMS = 3 ITEM_WIDTH = 16 ; In pixels ITEM_HEIGHT = 16 ; In pixels ICON_WIDTH = 8 ; In pixels diff --git a/player.s b/player.s index a077fce..0eba894 100644 --- a/player.s +++ b/player.s @@ -20,7 +20,7 @@ playerData: .word 100 ; Anger .byte 8,"SPROCKET " ; Name .word 1 ; Base Sprite - .word 0,5,0,0,0,0,0,0 ; Inventory + .word 0,5,5,0,0,0,0,0 ; Inventory .word 0 ; Current weapon .repeat 88 @@ -40,7 +40,7 @@ playerData: .word 100 ; Anger .byte 8,"TINKER " ; Name .word 0 ; Base Sprite - .word 0,5,0,0,0,0,0,0 ; Inventory + .word 0,5,5,0,0,0,0,0 ; Inventory .word 0 ; Current weapon .repeat 88 diff --git a/projectile.s b/projectile.s index 3b37de4..9cf7692 100644 --- a/projectile.s +++ b/projectile.s @@ -55,6 +55,15 @@ projectileTypes: .word 0,0,0 ; Padding to 16-byte boundary + ; Fan + .word 3 ; Damage + .word 3 ; Crater radius + .word 9 ; Frame 0 + .word 9 ; Frame 1 + .word 9 ; Frame 2 + + .word 0,0,0 ; Padding to 16-byte boundary + PT_DAMAGE = 0 ; Byte offsets into projectile type data structure PT_RADIUS = 2 diff --git a/spritebank.s b/spritebank.s index a9a31da..352006a 100644 --- a/spritebank.s +++ b/spritebank.s @@ -2,18 +2,18 @@ DrawSpriteBank : - ASL ; A=Sprite Number ($0000-$0008) + ASL ; A=Sprite Number ($0000-$0009) TAX ; Y=Target Screen Address ($2000-$9D00) LDA SpriteBankNum,X ; Relative Sprite Number Table JMP (SpriteBankBank,X) ; Bank Number Table SpriteBankNum : - .dbyt $0100,$0000,$0500,$0200,$0300,$0700,$0400,$0600 - .dbyt $0800 + .dbyt $0100,$0000,$0600,$0300,$0400,$0800,$0500,$0700 + .dbyt $0900,$0200 SpriteBankBank : .addr SpriteBankBank00,SpriteBankBank00,SpriteBankBank00,SpriteBankBank00,SpriteBankBank00,SpriteBankBank00,SpriteBankBank00,SpriteBankBank00 - .addr SpriteBankBank00 + .addr SpriteBankBank00,SpriteBankBank00 SpriteBankBank00 : JSL $AA0000