github/AmigaExamples
1
0
Fork 0
mirror of https://frontier.innolan.net/github/AmigaExamples.git synced 2026-09-12 23:53:56 +00:00
Code Releases Activity

2xcoin+arrow items

Browse Source
This commit is contained in:
alpine9000
2016-05-06 19:10:20 +10:00
parent 9fbe78b222
commit a304a4b614
7 changed files with 95 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
028.bs/assets/items.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

028.bs/assets/palette.pal
-25
View File
@@ -1,25 +0,0 @@
000 000 000 255
082 000 015 255
133 000 026 255
210 063 006 255
211 116 039 255
253 174 017 255
233 216 100 255
016 132 233 255
000 000 014 255
029 192 255 255
121 235 255 255
071 174 192 255
213 213 213 255
210 000 039 255
154 154 154 255
000 000 000 000
232 174 100 255
252 114 100 255
171 049 027 255
004 050 117 255
020 155 173 255
030 236 255 255
252 115 009 255
255 255 011 255
255 255 255 255
028.bs/constants.i
+4 -1
View File
@@ -34,9 +34,11 @@ ITEM_SPRITE_NUM_VERTICAL_SPRITES equ 6
ITEM_SPRITE_VERTICAL_BYTES equ ((ITEM_SPRITE_HEIGHT*4)+4)
ITEM_SPRITE_BYTES equ (ITEM_SPRITE_NUM_VERTICAL_SPRITES*ITEM_SPRITE_VERTICAL_BYTES)+4
ITEM_SPRITE_VSTART equ 149
ITEM_NUM_SLOTS equ 16
ITEM_NUM_SLOTS equ (8*3)
ITEM_SPRITE_HORIZONTAL_START_PIXELS equ 32
ITEM_SPRITE_Y_COLLISION_OFFSET equ 1
ITEM_SPRITE_ARROW_INDEX equ 16
ITEM_SPRITE_COINB_INDEX equ 8
;item control struct offsets
ITEM_X equ 0
@@ -44,6 +46,7 @@ ITEM_LAGX equ 2
ITEM_Y equ 4
ITEM_SPRITE equ 6
ITEM_INDEX equ 8
ITEM_SPRITE_ENABLED equ 10
ITEM_SPRITE_ADDRESS equ 12
ITEM_STRUCT_SIZE equ 16
ITEM_STRUCT_MULU_SHIFT equ 4
028.bs/foreground.tmx
+1 -1
View File
@@ -18,7 +18,7 @@
</layer>
<layer name="items" width="100" height="8">
<data encoding="base64" compression="zlib">
eJxjYBgFgxk4MRJW40iEGlLNRFbnRaL5ww2AwhdfGDszoqolx3xnEvR5D+H4IDbt4QOwMCYmrJHjzgWHeh8c4rjUE6t/pAFXaFj74skv2PISKXnGlQi1vjQqDwcjALkdGYMAqWUQcpy4kREWhPT40Th8SYm/wRLXpMaROxXV+w+SMBgFowAAAWIMrg==
eJxjYBgFgxk4MRJW40iEGlLNRFbnRaL5ww2AwhdfGDszoqolx3xnEvR5D+H4IDbt4QOwMCYmrJHjzgWHeh8c4rjUE6t/pAFXaFj7AnEojjDBlpdIyTOuRKj1pVF5OBgByO3IGARILYOQ48SNjLAgpMePxuFLSvwNlrgmNY7cqajef5CEwSgYBQB8ggzC
</data>
</layer>
</map>
028.bs/items.s
+78 -43
View File
@@ -104,7 +104,24 @@ SwitchItemSpriteBuffers:
dbra d1,.loop
rts
SetupItemSpriteData:
SetupItemSpriteData:
cmp.l #0,itemSpritesEnabled
bne .enableSprites
move.l #deadSprite,SPR2PTH(a6)
move.l #deadSprite,SPR3PTH(a6)
move.l #deadSprite,SPR4PTH(a6)
rts
.enableSprites:
move.l #ITEM_NUM_SLOTS,d0
.loop:
bsr _SetupItemSpriteData
dbra d0,.loop
rts
_SetupItemSpriteData:
;; d0 - item slot
move.l d0,-(sp)
move.l d0,d4 ; save item slot
@@ -113,15 +130,15 @@ SetupItemSpriteData:
lea item1,a1
add.l d0,a1
cmpi.w #0,ITEM_SPRITE_ENABLED(a1)
beq .spriteIsNotEnabled
move.w ITEM_Y(a1),d2
;; move.l #5,d2
move.w ITEM_Y(a1),d2
move.l ITEM_SPRITE_ADDRESS(a1),a0
cmp.w #(ITEM_NUM_COIN_ANIMS-1)<<3,ITEM_INDEX(a1)
ble .dontResetIndex
move.l #0,ITEM_INDEX(a1)
move.w #0,ITEM_INDEX(a1)
.dontResetIndex:
cmp.l #deadSprite,a0
bne .setupSprite
@@ -137,12 +154,11 @@ SetupItemSpriteData:
mulu.w #ITEM_SPRITE_VERTICAL_BYTES,d2
add.l d2,a0
move.w ITEM_LAGX(a1),d0
move.w ITEM_X(a1),d0
;; move.w ITEM_LAGX(a1),d0
lsr.w #FOREGROUND_SCROLL_SHIFT_CONVERT,d0 ; convert to pixels
;; move.w ITEM_X(a1),ITEM_LAGX(a1)
cmp.l #0,itemSpritesEnabled
beq .dontEnable
add.w #ITEM_SPRITE_HORIZONTAL_START_PIXELS,d0
move.w d0,d1
@@ -153,23 +169,23 @@ SetupItemSpriteData:
.c1:
sub.l d2,a0 ;#1*ITEM_SPRITE_VERTICAL_BYTES,a0
cmp.b #8,d4
cmp.b #ITEM_SPRITE_ARROW_INDEX,d4
bge .arrowSprite
cmp.b #ITEM_SPRITE_COINB_INDEX,d4
bge .coinBSprite
.coinASprite:
move.l a0,SPR2PTH(a6)
bra .done
.coinBSprite:
move.l a0,SPR3PTH(a6)
bra .done
.arrowSprite:
move.l a0,SPR4PTH(a6)
bra .done
.dontEnable:
cmp.b #8,d4
bge .dontEnableArrowSprite
move.l #deadSprite,SPR2PTH(a6)
bra .done
.dontEnableArrowSprite:
move.l #deadSprite,SPR4PTH(a6)
.done:
add.w #1,ITEM_INDEX(a1)
.spriteIsNotEnabled:
move.l (sp)+,d0
rts
@@ -196,7 +212,6 @@ GetSpriteSlot:
lea item1,a1
add.l d0,a1
;; move.l #deadSprite,ITEM_SPRITE_ADDRESS(a1)
move.w #336<<FOREGROUND_SCROLL_SHIFT_CONVERT,ITEM_X(a1)
sub.l #1,d2
move.w d2,ITEM_Y(a1)
@@ -205,7 +220,6 @@ GetSpriteSlot:
add.w #1,d1
move.w d1,ITEM_SPRITE(a1)
;; move.l #spriteCoin1,ITEM_SPRITE_ADDRESS(a1)
dontAddSprite:
movem.l (sp)+,d2-d3
rts
@@ -217,34 +231,54 @@ EnableItemSprites:
itemSpritesEnabled:
dc.l 0
;; coin1
ItemControl item1,spriteCoin1
ItemControl item2,spriteCoin1
ItemControl item3,spriteCoin1
ItemControl item4,spriteCoin1
ItemControl item5,spriteCoin1
ItemControl item6,spriteCoin1
ItemControl item7,spriteCoin1
ItemControl item8,spriteCoin1
;; coinA
ItemControl item1,spriteCoinA1,1
ItemControl item2,spriteCoinA1,1
ItemControl item3,spriteCoinA1,1
ItemControl item4,spriteCoinA1,1
ItemControl item5,spriteCoinA1,1
ItemControl item6,spriteCoinA1,1
ItemControl item7,spriteCoinA1,0
ItemControl item8,spriteCoinA1,0
;; coinB
ItemControl item9,spriteCoinB1,1
ItemControl item10,spriteCoinB1,1
ItemControl item11,spriteCoinB1,1
ItemControl item12,spriteCoinB1,1
ItemControl item13,spriteCoinB1,1
ItemControl item14,spriteCoinB1,1
ItemControl item15,spriteCoinB1,0
ItemControl item16,spriteCoinB1,0
;; arrow1
ItemControl item9,spriteArrow1
ItemControl item10,spriteArrow1
ItemControl item11,spriteArrow1
ItemControl item12,spriteArrow1
ItemControl item13,spriteArrow1
ItemControl item14,spriteArrow1
ItemControl item15,spriteArrow1
ItemControl item16,spriteArrow1
ItemControl item17,spriteArrow1,1
ItemControl item18,spriteArrow1,1
ItemControl item19,spriteArrow1,1
ItemControl item20,spriteArrow1,1
ItemControl item21,spriteArrow1,1
ItemControl item22,spriteArrow1,1
ItemControl item23,spriteArrow1,0
ItemControl item24,spriteArrow1,0
ItemSprite spriteCoin1,sprite_coin-0.bin
ItemSprite spriteCoin2,sprite_coin-0.bin
ItemSprite spriteCoin3,sprite_coin-1.bin
ItemSprite spriteCoin4,sprite_coin-2.bin
ItemSprite spriteCoin5,sprite_coin-3.bin
ItemSprite spriteCoin6,sprite_coin-2.bin
ItemSprite spriteCoin7,sprite_coin-1.bin
ItemSprite spriteCoinA1,sprite_coin-0.bin
ItemSprite spriteCoinA2,sprite_coin-0.bin
ItemSprite spriteCoinA3,sprite_coin-1.bin
ItemSprite spriteCoinA4,sprite_coin-2.bin
ItemSprite spriteCoinA5,sprite_coin-3.bin
ItemSprite spriteCoinA6,sprite_coin-2.bin
ItemSprite spriteCoinA7,sprite_coin-1.bin
ItemSprite spriteCoinA8,sprite_coin-1.bin
ItemSprite spriteCoinB1,sprite_coin-0.bin
ItemSprite spriteCoinB2,sprite_coin-0.bin
ItemSprite spriteCoinB3,sprite_coin-1.bin
ItemSprite spriteCoinB4,sprite_coin-2.bin
ItemSprite spriteCoinB5,sprite_coin-3.bin
ItemSprite spriteCoinB6,sprite_coin-2.bin
ItemSprite spriteCoinB7,sprite_coin-1.bin
ItemSprite spriteCoinB8,sprite_coin-1.bin
ItemSprite spriteArrow1,sprite_arrow-0.bin
ItemSprite spriteArrow2,sprite_arrow-0.bin
ItemSprite spriteArrow3,sprite_arrow-1.bin
@@ -252,6 +286,7 @@ itemSpritesEnabled:
ItemSprite spriteArrow5,sprite_arrow-3.bin
ItemSprite spriteArrow6,sprite_arrow-2.bin
ItemSprite spriteArrow7,sprite_arrow-1.bin
ItemSprite spriteArrow8,sprite_arrow-1.bin
nextSpriteSlot:
dc.w 0
028.bs/macros.i
+2 -2
View File
@@ -62,8 +62,8 @@ ItemControl: macro
dc.w 0
.itemIndex:
dc.w 0
.pad: ; make the control word 16 bytes
dc.w 0
.itemEnabled:
dc.w \3
.spriteAddress:
dc.l \2
endm
028.bs/player.s
+10 -11
View File
@@ -206,17 +206,12 @@ SetupSpriteData:
move.b d1,3(a0) ;spriteControl
move.l #ITEM_NUM_SLOTS-1,d0
.loop:
jsr SetupItemSpriteData
dbra d0,.loop
move.l #deadSprite,SPR1PTH(a6)
move.l #deadSprite,SPR3PTH(a6)
;; move.l #deadSprite,SPR4PTH(a6)
move.l #deadSprite,SPR5PTH(a6)
move.l #deadSprite,SPR6PTH(a6)
move.l #deadSprite,SPR7PTH(a6)
move.l #deadSprite,SPR1PTH(a6) ; unused - could only use if sprite resused player sprite palette
move.l #deadSprite,SPR5PTH(a6) ; unused - we only allow one arrow per line per screen
move.l #deadSprite,SPR6PTH(a6) ; unused - incompatible with oversize playfield data fetch
move.l #deadSprite,SPR7PTH(a6) ; unused - incompatible with oversize playfield data fetch
rts
InstallPlayerColorPalette:
@@ -295,7 +290,8 @@ CheckPlayerMiss:
;; a2 now points at the pathway tile under the sprite
move.w (a2),d0
move.w spriteCurrentPathwayTile,spriteLastPathwayTile
move.w d0,spriteCurrentPathwayTile
bsr CheckDirection
cmp.w #$78e,d0
@@ -481,4 +477,7 @@ spriteY:
dc.w $e4
spriteYEnd:
dc.w $f5
spriteCurrentPathwayTile:
dc.w 0
spriteLastPathwayTile:
dc.w 0