diff --git a/demosplash/create_update_type2.s b/demosplash/create_update_type2.s index d38a0418..d2028b92 100644 --- a/demosplash/create_update_type2.s +++ b/demosplash/create_update_type2.s @@ -208,7 +208,7 @@ another_scanline: .byte $A9,$00 ; lda #$00 ; 2 .byte $9D,$00,$02 ; sta $c00,X ; 5 .byte $A2,$00 ; ldx #$00 ; 2 -.byte $A5,$85 ; lda ZERO ; 3 +.byte $A5,$C5 ; lda ZERO ; 3 .byte $9D,$00,$02 ; sta $c00,X ; 5 ;========== ;=== ; 47??? ; 65 diff --git a/demosplash/escape.s b/demosplash/escape.s index e0d0c4ed..e8f3eaac 100644 --- a/demosplash/escape.s +++ b/demosplash/escape.s @@ -1303,7 +1303,7 @@ fire_line: ; COL0 ldy #39 ; 2 txa ; 2 - ora #$80 ; 2 + ora #$C0 ; 2 ; GREEN0 must live at C0 tax ; 2 sta (OUTL),Y ; 6 ;======= diff --git a/demosplash/zp.inc b/demosplash/zp.inc index 63b85a98..15e7a61d 100644 --- a/demosplash/zp.inc +++ b/demosplash/zp.inc @@ -38,11 +38,7 @@ ASTEROID_SPEED = $52 ASTEROID_X = $53 ASTEROID_Y = $54 RANDOM_PTR = $55 -GREEN0 = $56 -GREEN1 = $57 -GREEN2 = $58 -GREEN3 = $59 -GREEN4 = $5A + FIRE_Y = $5B SPRITE_XPOS = $5C SPRITE_YPOS = $5D @@ -55,11 +51,15 @@ ASTEROID_SUBX = $6C FIRE_X = $6D LEVEL_DONE = $6E YADD = $6F -ZERO = $B0 -WASTE_CYCLES = $B1 -FOREVER_OFFSET = $B2 -FRAME_OFFSET = $B3 -FRAME_PAGE = $B4 + + + + + +WASTE_CYCLES = $B6 +FOREVER_OFFSET = $B7 +FRAME_OFFSET = $B8 +FRAME_PAGE = $B9 FRAMEL = $60 FRAMEH = $61 @@ -117,12 +117,19 @@ FIRST_SHIELD = $BD COLLISION_X = $BE COLLISION_Y = $BF -DOOR_STATUS = $C0 -DOOR_STATUS_H = $C1 -DOOR_X = $C2 -DOOR_X_H = $C3 -DOOR_Y = $C4 -DOOR_Y_H = $C5 +GREEN0 = $C0 +GREEN1 = $C1 +GREEN2 = $C2 +GREEN3 = $C3 +GREEN4 = $C4 +ZERO = $C5 + +DOOR_STATUS = $B0 +DOOR_STATUS_H = $B1 +DOOR_X = $B2 +DOOR_X_H = $B3 +DOOR_Y = $B4 +DOOR_Y_H = $B5 DOOR_XMIN = $C6 DOOR_XMIN_H = $C7 DOOR_XMAX = $C8 diff --git a/space_bars/sprites_screen.s b/space_bars/sprites_screen.s index b6c2577f..2cdd84ed 100644 --- a/space_bars/sprites_screen.s +++ b/space_bars/sprites_screen.s @@ -628,25 +628,25 @@ smc029: ldx #$01 ; 2 sta $c00,X ; 5 ; 30 - bit PAGE0 ; 4 -smc030: ldx #$01 ; 2 - lda #$00 ; 2 - sta $980,X ; 5 - lda #$00 ; 2 - sta $981,X ; 5 - lda #$00 ; 2 - sta $982,X ; 5 - lda #$00 ; 2 - sta $983,X ; 5 - lda #$00 ; 2 - sta $984,X ; 5 - lda #$00 ; 2 - sta $985,X ; 5 - lda #$00 ; 2 - sta $986,X ; 5 - ldx #$00 ; 2 - lda ZERO ; 3 - sta $980,X ; 5 + bit PAGE0 ; 4 0 1 2 +smc030: ldx #$01 ; 2 0 1 3 4 + lda #$00 ; 2 2 3 5 6 + sta $980,X ; 5 4 5 6 7 8 9 + lda #$00 ; 2 7 8 10 11 + sta $981,X ; 5 9 10 11 12 13 14 + lda #$00 ; 2 12 13 15 16 + sta $982,X ; 5 14 15 16 17 18 19 + lda #$00 ; 2 17 18 20 21 + sta $983,X ; 5 19 20 21 22 23 24 + lda #$00 ; 2 22 23 25 26 + sta $984,X ; 5 24 25 26 27 28 29 + lda #$00 ; 2 27 28 30 31 + sta $985,X ; 5 29 30 31 32 33 34 + lda #$00 ; 2 32 33 35 36 + sta $986,X ; 5 34 35 36 37 38 39 + ldx #$00 ; 2 37 38 40 41 + lda ZERO ; 3 39 40 42 43 + sta $980,X ; 5 41 42 43 44 45 46 ; 31 bit PAGE1 ; 4