diff --git a/bun.c b/bun.c index 9d69eb7..5fa8ace 100644 --- a/bun.c +++ b/bun.c @@ -94,7 +94,7 @@ void bun_offRightSide( bltalwm += (1 << (15 - i)); } - bltcon0 = BLTCON0(0xc0, 0, 1, 0, 1, shift); + bltcon0 = BLTCON0(0xf0, 1, 0, 0, 1, shift); bltcon1 = BLTCON1(bunClear->direction, shift); bltdmod = screenSetup->byteWidth - COOL_BUN_WIDTH_BYTES + @@ -106,15 +106,14 @@ void bun_offRightSide( custom.bltcon0 = bltcon0; custom.bltcon1 = bltcon1; - custom.bltadat = 0xffff; - custom.bltbpt = coolbunPlaneStarts[BUN_OFF_LEFT_SIDE][plane]; + custom.bltapt = coolbunPlaneStarts[BUN_OFF_LEFT_SIDE][plane]; custom.bltdpt = currentScreen->planes[plane] + bunClear->memoryStartOffsetBytes; custom.bltafwm = 0xffff; custom.bltalwm = bltalwm; - custom.bltbmod = wordShift * 2; + custom.bltamod = wordShift * 2; custom.bltdmod = bltdmod; custom.bltsize = bltsize; @@ -150,7 +149,7 @@ void bun_offLeftSide( bltalwm += (1 << i); } - bltcon0 = BLTCON0(0xc0, 0, 1, 0, 1, shift); + bltcon0 = BLTCON0(0xf0, 1, 0, 0, 1, shift); bltcon1 = BLTCON1(bunClear->direction, shift); bltdmod = screenSetup->byteWidth - 4 + wordShift * 2; @@ -161,10 +160,8 @@ void bun_offLeftSide( custom.bltcon0 = bltcon0; custom.bltcon1 = bltcon1; - // a has a mask we're shifting - custom.bltadat = 0xffff; - // b has bun data - custom.bltbpt = coolbunPlaneStarts[BUN_OFF_RIGHT_SIDE][plane]; + // a has bun data + custom.bltapt = coolbunPlaneStarts[BUN_OFF_RIGHT_SIDE][plane]; // d is the part on screen custom.bltdpt = currentScreen->planes[plane] + bunClear->memoryStartOffsetBytes; @@ -172,7 +169,7 @@ void bun_offLeftSide( custom.bltafwm = 0xffff; custom.bltalwm = bltalwm; - custom.bltbmod = wordShift * 2; + custom.bltamod = wordShift * 2; custom.bltdmod = bltdmod; custom.bltsize = bltsize; @@ -221,7 +218,6 @@ void bun_anywhere( custom.bltdpt = currentScreen->planes[plane] + bunClear->memoryStartOffsetBytes; - // custom.bltdpt = screenSetup.memoryStart; custom.bltafwm = 0xffff; custom.bltalwm = bltalwm; diff --git a/main b/main index 660f09c..7f0ca0d 100755 Binary files a/main and b/main differ diff --git a/main.c b/main.c index 5be08e9..721dcf7 100644 --- a/main.c +++ b/main.c @@ -52,7 +52,7 @@ extern uint8_t chip TopazBitplanes[]; extern uint16_t chip CopperColors[]; extern uint16_t chip SpriteCopperlist[]; extern uint16_t chip SpriteData[]; -extern uint16_t chip MaskBitplane[]; +extern uint8_t chip MaskBitplane[]; #define TOPAZ_WIDTH_PIXELS (160) #define TOPAZ_WIDTH_BYTES (TOPAZ_WIDTH_PIXELS / 8)