diff --git a/009.anim_blit/anim_blit.s b/009.anim_blit/anim_blit.s index 0646436..9b8b9dd 100644 --- a/009.anim_blit/anim_blit.s +++ b/009.anim_blit/anim_blit.s @@ -25,7 +25,7 @@ moveBlitterObject: lea ypos(pc),a4 add.l #1,xpos ; move the blitter object one pixel to the right add.l #1,ypos ; move the blitter object one pixel down - bsr.s blitObject64 ; blit 64 pixel object (x=d0,y=d1,background=a0,object=a1,mask=a2) + bsr blitObject64 ; blit 64 pixel object (x=d0,y=d1,background=a0,object=a1,mask=a2) cmp.l #SCREEN_WIDTH-BLIT_BOB_WIDTH64+16,xpos ; check if we need to wrap the x bne.s .skip move.l #0,xpos ; wrap x back to 0 diff --git a/009.anim_blit/init.s b/009.anim_blit/init.s index 0cbf5d0..c0636eb 100644 --- a/009.anim_blit/init.s +++ b/009.anim_blit/init.s @@ -5,7 +5,7 @@ init: move #$7fff,INTENA(a6) ; disable all interrupts ;; set up default palette - bsr.s installPalette + bsr installPalette ;; set up playfield move.w #(RASTER_Y_START<<8)|RASTER_X_START,DIWSTRT(a6) diff --git a/010.blit_speed/blit_speed.s b/010.blit_speed/blit_speed.s index fbf427c..25197e4 100644 --- a/010.blit_speed/blit_speed.s +++ b/010.blit_speed/blit_speed.s @@ -7,7 +7,7 @@ entry: lea CUSTOM,a6 bsr init - bsr.s installColorPalette + bsr installColorPalette lea bitplanes(pc),a0 lea emoji,a1 @@ -19,7 +19,7 @@ entry: .blitLoop: bsr moveBlitterObject dbra d0,.blitLoop - bsr.s installColorPalette + bsr installColorPalette bra.s .mainLoop include "blit.s" @@ -31,7 +31,7 @@ moveBlitterObject: lea ypos(pc),a4 add.l #1,xpos ; move the blitter object one pixel to the left add.l #1,ypos ; move the blitter object one pixel down - bsr.s blitMaskedObject64 ; blit 64 pixel object (x=d0,y=d1,background=a0,object=a1,mask=a2) + bsr blitMaskedObject64 ; blit 64 pixel object (x=d0,y=d1,background=a0,object=a1,mask=a2) cmp.l #SCREEN_WIDTH-BLIT_BOB_WIDTH64+16,xpos ; check if we need to wrap the x bne.s .skip move.l #0,xpos ; wrap x back to 0 diff --git a/010.blit_speed/constants.i b/010.blit_speed/constants.i index 9f34d39..90c97e7 100644 --- a/010.blit_speed/constants.i +++ b/010.blit_speed/constants.i @@ -2,19 +2,19 @@ LVL3_INT_VECTOR equ $6c SCREEN_WIDTH equ 320 SCREEN_HEIGHT equ 256 SCREEN_WIDTH_BYTES equ (SCREEN_WIDTH/8) - if SCREEN_COLORS == 32 + if SCREEN_COLORS==32 SCREEN_BIT_DEPTH equ 5 endif - if SCREEN_COLORS == 16 + if SCREEN_COLORS==16 SCREEN_BIT_DEPTH equ 4 endif - if SCREEN_COLORS == 8 + if SCREEN_COLORS==8 SCREEN_BIT_DEPTH equ 3 endif - if SCREEN_COLORS == 4 + if SCREEN_COLORS==4 SCREEN_BIT_DEPTH equ 2 endif - if SCREEN_COLORS == 2 + if SCREEN_COLORS==2 SCREEN_BIT_DEPTH equ 1 endif SCREEN_RES equ 8 ; 8=lo resolution, 4=hi resolution diff --git a/010.blit_speed/init.s b/010.blit_speed/init.s index a39f8b2..5dff268 100644 --- a/010.blit_speed/init.s +++ b/010.blit_speed/init.s @@ -5,7 +5,7 @@ init: move #$7fff,INTENA(a6) ; disable all interrupts ;; set up default palette - bsr.s installColorPalette + bsr installColorPalette ;; set up playfield move.w #(RASTER_Y_START<<8)|RASTER_X_START,DIWSTRT(a6) diff --git a/011.ehb_mode/constants.i b/011.ehb_mode/constants.i index 04aab35..2459ae2 100644 --- a/011.ehb_mode/constants.i +++ b/011.ehb_mode/constants.i @@ -2,22 +2,22 @@ LVL3_INT_VECTOR equ $6c SCREEN_WIDTH equ 320 SCREEN_HEIGHT equ 256 SCREEN_WIDTH_BYTES equ (SCREEN_WIDTH/8) - if SCREEN_COLORS == 64 + if SCREEN_COLORS==64 SCREEN_BIT_DEPTH equ 6 endif - if SCREEN_COLORS == 32 + if SCREEN_COLORS==32 SCREEN_BIT_DEPTH equ 5 endif - if SCREEN_COLORS == 16 + if SCREEN_COLORS==16 SCREEN_BIT_DEPTH equ 4 endif - if SCREEN_COLORS == 8 + if SCREEN_COLORS==8 SCREEN_BIT_DEPTH equ 3 endif - if SCREEN_COLORS == 4 + if SCREEN_COLORS==4 SCREEN_BIT_DEPTH equ 2 endif - if SCREEN_COLORS == 2 + if SCREEN_COLORS==2 SCREEN_BIT_DEPTH equ 1 endif SCREEN_RES equ 8 ; 8=lo resolution, 4=hi resolution diff --git a/011.ehb_mode/ehb_mode.s b/011.ehb_mode/ehb_mode.s index 47ddadf..7af7e31 100644 --- a/011.ehb_mode/ehb_mode.s +++ b/011.ehb_mode/ehb_mode.s @@ -7,7 +7,7 @@ entry: lea CUSTOM,a6 bsr init - bsr.s installColorPalette + bsr installColorPalette .mainLoop: bsr waitVerticalBlank diff --git a/011.ehb_mode/init.s b/011.ehb_mode/init.s index a39f8b2..5dff268 100644 --- a/011.ehb_mode/init.s +++ b/011.ehb_mode/init.s @@ -5,7 +5,7 @@ init: move #$7fff,INTENA(a6) ; disable all interrupts ;; set up default palette - bsr.s installColorPalette + bsr installColorPalette ;; set up playfield move.w #(RASTER_Y_START<<8)|RASTER_X_START,DIWSTRT(a6) diff --git a/012.ham_mode/ham_mode.s b/012.ham_mode/ham_mode.s index b4c5881..747e4bf 100644 --- a/012.ham_mode/ham_mode.s +++ b/012.ham_mode/ham_mode.s @@ -7,7 +7,7 @@ entry: lea CUSTOM,a6 bsr init - bsr.s installColorPalette + bsr installColorPalette .mainLoop: bsr waitVerticalBlank diff --git a/012.ham_mode/init.s b/012.ham_mode/init.s index 7961c1c..cd9b238 100644 --- a/012.ham_mode/init.s +++ b/012.ham_mode/init.s @@ -6,7 +6,7 @@ init: move #$7fff,INTENA(a6) ; disable all interrupts ;; set up default palette - bsr.s installColorPalette + bsr installColorPalette ;; set up playfield move.w #(RASTER_Y_START<<8)|RASTER_X_START,DIWSTRT(a6) diff --git a/013.dithered_ham/dithered_ham.s b/013.dithered_ham/dithered_ham.s index b4c5881..747e4bf 100644 --- a/013.dithered_ham/dithered_ham.s +++ b/013.dithered_ham/dithered_ham.s @@ -7,7 +7,7 @@ entry: lea CUSTOM,a6 bsr init - bsr.s installColorPalette + bsr installColorPalette .mainLoop: bsr waitVerticalBlank diff --git a/013.dithered_ham/init.s b/013.dithered_ham/init.s index 7961c1c..cd9b238 100644 --- a/013.dithered_ham/init.s +++ b/013.dithered_ham/init.s @@ -6,7 +6,7 @@ init: move #$7fff,INTENA(a6) ; disable all interrupts ;; set up default palette - bsr.s installColorPalette + bsr installColorPalette ;; set up playfield move.w #(RASTER_Y_START<<8)|RASTER_X_START,DIWSTRT(a6) diff --git a/015.sliced_ham/bin/sliced_ham.adf b/015.sliced_ham/bin/sliced_ham.adf index 8529681..073216d 100644 Binary files a/015.sliced_ham/bin/sliced_ham.adf and b/015.sliced_ham/bin/sliced_ham.adf differ diff --git a/016.copper_fun/bin/copper_fun.adf b/016.copper_fun/bin/copper_fun.adf index d7f39f5..62e6545 100644 Binary files a/016.copper_fun/bin/copper_fun.adf and b/016.copper_fun/bin/copper_fun.adf differ diff --git a/020.shrinkler/constants.i b/020.shrinkler/constants.i index 689db18..81bd249 100644 --- a/020.shrinkler/constants.i +++ b/020.shrinkler/constants.i @@ -1,7 +1,7 @@ SCREEN_WIDTH equ 320 SCREEN_HEIGHT equ (256+(256*INTERLACE)) SCREEN_WIDTH_BYTES equ (SCREEN_WIDTH/8) - if HAM_MODE == 1 + if HAM_MODE==1 SCREEN_BIT_DEPTH equ 6 else SCREEN_BIT_DEPTH equ 5 diff --git a/021.calling_c/constants.i b/021.calling_c/constants.i index 689db18..81bd249 100644 --- a/021.calling_c/constants.i +++ b/021.calling_c/constants.i @@ -1,7 +1,7 @@ SCREEN_WIDTH equ 320 SCREEN_HEIGHT equ (256+(256*INTERLACE)) SCREEN_WIDTH_BYTES equ (SCREEN_WIDTH/8) - if HAM_MODE == 1 + if HAM_MODE==1 SCREEN_BIT_DEPTH equ 6 else SCREEN_BIT_DEPTH equ 5 diff --git a/022.photons_bootloader/constants.i b/022.photons_bootloader/constants.i index 689db18..81bd249 100644 --- a/022.photons_bootloader/constants.i +++ b/022.photons_bootloader/constants.i @@ -1,7 +1,7 @@ SCREEN_WIDTH equ 320 SCREEN_HEIGHT equ (256+(256*INTERLACE)) SCREEN_WIDTH_BYTES equ (SCREEN_WIDTH/8) - if HAM_MODE == 1 + if HAM_MODE==1 SCREEN_BIT_DEPTH equ 6 else SCREEN_BIT_DEPTH equ 5