This commit is contained in:
alpine9000
2016-04-24 15:13:16 +10:00
parent 485cc85e3e
commit aaf3376153
2 changed files with 18 additions and 14 deletions
+7 -9
View File
@@ -1,11 +1,10 @@
MPANEL_COPPER_WAIT equ $9ad1
MPANEL_COPPER_WAIT equ $9ad1 ; controls the vertical position of the message panel
PLAYER_INITIAL_X equ $c0
PLAYER_INITIAL_Y equ $e4
PLAYER_INITIAL_Y equ $e4-32
PLAYER_BOTTOM_Y equ $e4+16
PLAYER_TOP_Y equ (PLAYER_BOTTOM_Y-(7*16))
PLAYER_JUMP_PIXELS equ 8
PLAYER_CHECK_MISS_PIXELS equ 6
PLAYER_PAUSE_PIXELS equ 12
@@ -13,18 +12,16 @@ PLAYER_MOVE_PIXELS equ 2
PLAYER_SPRITE_VERTICAL_BYTES equ ((16*4)+12)
FOREGROUND_DELAY_BIT equ 0
FOREGROUND_SCROLL_SHIFT_CONVERT equ 4
FOREGROUND_SCROLL_TILE_INDEX_CONVERT equ 3
FOREGROUND_SCROLL_PIXELS equ 16
FOREGROUND_PLAYAREA_WIDTH_WORDS equ 24
FOREGROUND_PLAYAREA_RIGHT_MARGIN_BYTES equ 12
FOREGROUND_PLAYAREA_HEIGHT_WORDS equ 8
BACKGROUND_SCROLL_SHIFT_CONVERT equ 4
BACKGROUND_SCROLL_TILE_INDEX_CONVERT equ 3
BACKGROUND_SCROLL_PIXELS equ 16
FOREGROUND_PLAYAREA_WIDTH_WORDS equ 24
FOREGROUND_PLAYAREA_RIGHT_MARGIN_BYTES equ 12
FOREGROUND_PLAYAREA_HEIGHT_WORDS equ 8
ITEM_SPRITE_HEIGHT equ 15
ITEM_SPRITE_NUM_VERTICAL_SPRITES equ 6
@@ -32,7 +29,8 @@ 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 8
;item control struct offsets
ITEM_X equ 0
ITEM_LAGX equ 2
ITEM_Y equ 4
+11 -5
View File
@@ -139,13 +139,15 @@ GameLoop:
jsr CheckPlayerMiss
bsr Update
bsr RenderNextForegroundFrame
bsr RenderNextBackgroundFrame
bsr RenderNextBackgroundFrame
if 0
move.l #1000,d0
move.l #002,d0
.checkLoop:
dbra d0,.checkLoop
move.w #$f00,COLOR00(a6)
move.w #$f00,COLOR00(a6)
move.w #$f00,COLOR01(a6)
endif
bra GameLoop
@@ -576,14 +578,18 @@ copperListBpl2Ptr:
dc.w DDFSTOP,(RASTER_X_START/2-SCREEN_RES)+(8*((SCREEN_WIDTH/16)-1))
dc.w BPLCON0,(SCREEN_BIT_DEPTH*2<<12)|COLOR_ON|DBLPF
if 0
dc.l $fffffffe
endif
playAreaCopperPalettePtr:
include "out/foreground-copper-list.s"
include "out/background-copper-list.s"
mpanelWaitLinePtr:
dc.w MPANEL_COPPER_WAIT
dc.w $fffe
dc.w $fffe
mpanelCopperListBpl1Ptr:
dc.w BPL1PTL,0
dc.w BPL1PTH,0