diff --git a/028.game2/blittext.s b/028.game2/blittext.s index fa8886d..1ebdd3c 100644 --- a/028.game2/blittext.s +++ b/028.game2/blittext.s @@ -66,7 +66,7 @@ DrawChar8: lsr.w #5,d5 ; char / 32 = fontmap line andi.w #$1f,d2 ; char index in line (char index - start of line index) - add.l #1,d5 ; while we have a weird font image, '!' starts on second line + add.l #1,d5 ; while we have a weird font image, ' ' starts on second line move.l a5,a1 ; #font if 1 diff --git a/028.game2/game1.s b/028.game2/game1.s index e7c1090..d25e86e 100644 --- a/028.game2/game1.s +++ b/028.game2/game1.s @@ -77,8 +77,11 @@ SetupBoardLoop: .gotoGameLoop: add.l #1,d6 jsr WaitVerticalBlank - cmp.l #FOREGROUND_PLAYAREA_WIDTH_WORDS+50,d6 - bne .gotoGameLoop + jsr ProcessJoystick + ;; cmp.l #FOREGROUND_PLAYAREA_WIDTH_WORDS+50,d6 + ;; bne .gotoGameLoop + btst.b #0,joystick + beq .gotoGameLoop move.w #0,moving move.l #FOREGROUND_SCROLL_PIXELS,foregroundScrollPixels move.w #$ffff,mpanelWaitLinePtr diff --git a/028.game2/image.s b/028.game2/image.s index fdf3d80..aec6ba7 100644 --- a/028.game2/image.s +++ b/028.game2/image.s @@ -7,32 +7,31 @@ SwitchBuffers: ;; offscreen - bitplane address move.l foregroundScrollX,d0 - lsr.l #FOREGROUND_SCROLL_SHIFT_CONVERT,d0 ; convert to pixels - lsr.l #3,d0 ; bytes to scroll + lsr.w #FOREGROUND_SCROLL_SHIFT_CONVERT,d0 ; convert to pixels + lsr.w #3,d0 ; bytes to scroll move.l foregroundOffscreen,a0 move.l foregroundOnscreen,foregroundOffscreen move.l a0,foregroundOnscreen move.l a0,a1 lea copperListBpl1Ptr,a0 - jsr PokeBitplanePointers + bsr.s PokeBitplanePointers add.l #BITPLANE_WIDTH_BYTES*SCREEN_BIT_DEPTH*(96-1),d0 lea copperListBpl1Ptr2,a0 - jsr PokeBitplanePointers + bsr.s PokeBitplanePointers ;; background is not double buffered move.l backgroundScrollX,d0 - lsr.l #BACKGROUND_SCROLL_SHIFT_CONVERT,d0 ; convert to pixels - lsr.l #3,d0 ; bytes to scroll + lsr.w #BACKGROUND_SCROLL_SHIFT_CONVERT,d0 ; convert to pixels + lsr.w #3,d0 ; bytes to scroll move.l backgroundOnscreen,a1 lea copperListBpl2Ptr,a0 - jsr PokeBitplanePointers + bsr.s PokeBitplanePointers add.l #BITPLANE_WIDTH_BYTES*SCREEN_BIT_DEPTH*(96-48+16),d0 - move.l backgroundOnscreen,a1 lea copperListBpl2Ptr2,a0 - jsr PokeBitplanePointers + bsr.s PokeBitplanePointers rts @@ -40,7 +39,6 @@ PokeBitplanePointers: ; d0 = frame offset in bytes ; a0 = BPLP copper list address ; a1 = bitplanes pointer - ;; movem.l d0-a6,-(sp) movem.l d0/a1,-(sp) add.l d0,a1 ; bitplane offset moveq #SCREEN_BIT_DEPTH-1,d0 @@ -53,7 +51,6 @@ PokeBitplanePointers: addq #8,a0 dbra d0,.bitplaneloop movem.l (sp)+,d0/a1 - ;; movem.l (sp)+,d0-a6 rts