diff --git a/028.game2/P6112-Options.i b/028.game2/P6112-Options.i index 79ee4f9..e8feee3 100644 --- a/028.game2/P6112-Options.i +++ b/028.game2/P6112-Options.i @@ -1,4 +1,4 @@ -P61mode =1 ;Try other modes ONLY IF there are no Fxx commands >= 20. +P61mode =2 ;Try other modes ONLY IF there are no Fxx commands >= 20. ;(f.ex., P61.new_ditty only works with P61mode=1) diff --git a/028.game2/P6112-Play.s b/028.game2/P6112-Play.s index 06ed1ed..20ab6d5 100644 --- a/028.game2/P6112-Play.s +++ b/028.game2/P6112-Play.s @@ -1,5 +1,6 @@ include "P6112-Options.i" xdef P61_Init + xdef P61_Music ; #-----+-----------------------------------------# ; |Name:| P6112 - Optimized Player 6.1 Playroutine| ; +-----+-----------------------------------------+ diff --git a/028.game2/game1.s b/028.game2/game1.s index d582324..e4b116a 100644 --- a/028.game2/game1.s +++ b/028.game2/game1.s @@ -28,19 +28,25 @@ Entry: move #$7ff,DMACON(a6) ; disable all dma move #$7fff,INTENA(a6) ; disable all interrupts - jsr StartMusic - jsr ShowSplash - lea Level3InterruptHandler,a3 move.l a3,LVL3_INT_VECTOR + + jsr StartMusic + + move.w #(INTF_SETCLR|INTF_VERTB|INTF_INTEN),INTENA(a6) + + jsr ShowSplash + + jsr InstallGreyPalette ;; d0 - fg bitplane pointer offset - ;; d1 - bg bitplane pointer offset + ;; d1 - bg bitplane pointer offset move.l #0,d0 move.l #1,d1 - jsr SwitchBuffers + jsr SwitchBuffers + - move.w #(INTF_SETCLR|INTF_VERTB|INTF_INTEN),INTENA(a6) + move.w #(INTF_SETCLR|INTF_VERTB|INTF_INTEN),INTENA(a6) move.w #(DMAF_BLITTER|DMAF_SETCLR!DMAF_MASTER),DMACON(a6) lea panelCopperListBpl1Ptr,a0 @@ -52,7 +58,7 @@ Entry: jsr Init ; enable the playfield jsr InstallSpriteColorPalette - jsr InstallGreyPalette + @@ -523,6 +529,7 @@ Level3InterruptHandler: move.w #INTF_VERTB,INTREQ(a6) ; clear interrupt bit add.l #1,verticalBlankCount jsr SetupSpriteData + jsr P61_Music .checkCopper: move.w INTREQR(a6),d0 and.w #INTF_COPER,d0