diff --git a/ootw/intro.s b/ootw/intro.s index 35a9606e..eba1e73b 100644 --- a/ootw/intro.s +++ b/ootw/intro.s @@ -771,9 +771,6 @@ uz_loop: ; ; > # - ; RUN PROJECT 23# (typed) - ; # - lda #$a0 jsr clear_top_a jsr clear_bottom @@ -793,6 +790,9 @@ uz_loop: bit SET_TEXT + ; RUN PROJECT 23# (typed) + ; # + peanut_loop: lda KEYPRESS @@ -956,9 +956,6 @@ drinking_loop: lda #$c ; load to off-screen $c00 jsr load_rle_gr - ;================================= - ; copy $c00 to both pages $400/$800 - jsr gr_copy_to_current jsr page_flip @@ -974,9 +971,9 @@ collider_ui_loop: ;=============================== ;=============================== - lda #>(building_rle) + lda #>(building_car_rle) sta GBASH - lda #<(building_rle) + lda #<(building_car_rle) sta GBASL lda #$c ; load to off-screen $c00 jsr load_rle_gr @@ -1551,7 +1548,7 @@ powerup_sequence: .word powerup02_rle .byte 20 .word powerup03_rle - .byte 60 + .byte 80 .word powerup03_rle .byte 0 @@ -1573,9 +1570,9 @@ cursor_sequence: .word cursor06_rle .byte 20 .word cursor07_rle - .byte 60 + .byte 20 .word cursor08_rle - .byte 0 + .byte 60 .word cursor08_rle .byte 0 @@ -1585,3 +1582,17 @@ peanut: .byte 0,3,"ALL RIGHTS RESERVED.",0 .byte 0,5,"CDOS VERSION 5.01",0 .byte 0,18,"> ",0 + +accelerator: + .byte 0,0,"MODIFICATION OF PARAMETERS",0 + .byte 0,1,"RELATING TO PARTICLE",0 + .byte 0,2,"ACCELERATOR (SYNCHOTRON).",0 + .byte 15,3,"E: 23%",0 + .byte 15,4,"G: .005",0 + .byte 15,5,"RK: 77.2L",0 + .byte 15,7,"OPT: G+",0 + .byte 15,9," SHIELD:",0 + .byte 15,10,"1: OFF",0 + .byte 15,11,"2: ON",0 + .byte 15,12,"3: ON",0 + .byte 15,14," P^: 1",0 diff --git a/ootw/intro_graphics/06_console/intro_desktop.inc b/ootw/intro_graphics/06_console/intro_desktop.inc index c1f67dd0..a57cb1ce 100644 --- a/ootw/intro_graphics/06_console/intro_desktop.inc +++ b/ootw/intro_graphics/06_console/intro_desktop.inc @@ -50,158 +50,15 @@ desktop_rle: .byte $28 ; ysize=48 .byte $02, $A4,$00, $22,$22, $20, $A8,$00, $06, $A0,$A8,$00 .byte $A1 powerup01_rle: .byte $28 ; ysize=48 - .byte $A5,$22, $20, $22, $00, $02, $A5,$22, $02 - .byte $A3,$00, $22, $A3,$00, $25, $22, $00, $A3,$22 - .byte $00, $20, $50, $A3,$00, $62, $A5,$00, $A8,$22 - .byte $20, $00, $02, $22, $02, $00, $20 - .byte $00,$00, $22, $00, $20, $00,$00, $02,$02, $00 - .byte $22, $20, $22, $00, $22,$22, $A3,$00, $06 - .byte $60, $A4,$00, $22,$22, $02, $00, $02, $A5,$22 - .byte $20, $00, $20, $22,$22, $00, $22, $00,$00 - .byte $62, $22, $20, $00, $20, $02, $00 - .byte $22, $00, $02, $20, $A5,$00, $06, $60 - .byte $A3,$00, $A3,$22, $20,$20, $AA,$22, $00,$00, $20, $00 - .byte $A4,$22, $20, $00,$00, $22, $A3,$00, $02, $20 - .byte $22,$22, $00,$00, $26, $A3,$00, $AB,$22, $02, $52 - .byte $22,$22, $20, $00, $22, $00, $02, $A5,$22 - .byte $50, $52, $20,$20, $22,$22, $02, $A3,$22, $A5,$00 - .byte $AA,$22, $20, $05, $55, $25, $22, $00,$00 - .byte $22, $A6,$00, $02, $56, $55, $22, $A7,$02 - .byte $00, $62, $A3,$00, $A6,$22, $00, $A3,$56, $22,$22 - .byte $20, $22,$22, $00,$00, $22, $A5,$00, $20, $02 - .byte $00, $22, $20, $A8,$00, $66, $A3,$00, $A6,$22 - .byte $00, $A3,$55, $22,$22, $A3,$02, $00,$00, $22, $00,$00 - .byte $20, $22,$22, $02, $00, $22, $00, $22 - .byte $20, $A7,$00, $66, $A3,$00, $A6,$22, $00, $55 - .byte $52, $55, $00,$00, $A3,$60, $00, $20, $00 - .byte $20, $A3,$22, $02, $A5,$00, $22,$22, $A6,$00, $66 - .byte $A3,$00, $A6,$22, $00, $A3,$55, $26,$26, $A3,$22, $00 - .byte $02, $20, $00, $22,$22, $A3,$00, $25,$25, $66 - .byte $00, $02, $22, $26, $60, $A4,$00, $02 - .byte $A3,$00, $A6,$22, $00, $A3,$55, $22,$22, $02, $22 - .byte $A3,$00, $02, $20, $90, $99, $90, $00,$00 - .byte $22,$22, $56, $00,$00, $A3,$22, $A3,$00, $20, $A4,$00 - .byte $A6,$22, $00,$00, $55,$55, $65, $22,$22, $00,$00, $20 - .byte $02, $00, $02, $99,$99, $66, $00,$00, $02,$02 - .byte $05, $00,$00, $02, $20, $02, $00,$00, $20 - .byte $02, $A4,$00, $A6,$22, $00,$00, $55,$55, $66, $22 - .byte $02, $00,$00, $22, $A3,$00, $39, $69, $06 - .byte $A4,$04, $A7,$00, $20, $02, $A5,$00, $A6,$22, $00,$00 - .byte $55, $05, $A5,$00, $10, $00, $01, $A4,$00 - .byte $A3,$44, $CC, $04, $10, $06, $60, $66 - .byte $00, $60, $A7,$00, $A6,$22, $A8,$00, $06, $00 - .byte $06, $A5,$00, $30, $36, $03, $00, $06 - .byte $00,$00, $04, $50, $55, $66, $A7,$00, $A4,$22 - .byte $02, $AD,$00, $03, $22, $25, $55, $A8,$00 - .byte $55, $52, $66, $A7,$00, $22,$22, $02, $AF,$00 - .byte $02, $22, $00, $25, $A3,$00, $01, $A4,$00 - .byte $55,$55, $66, $A7,$00, $02, $A0,$11,$00, $22, $50 - .byte $00, $50,$50, $05, $A7,$00, $55, $66, $A0,$15,$00 - .byte $20, $A3,$00, $02,$02, $22, $AA,$00, $55, $66 - .byte $A0,$16,$00, $02, $A4,$00, $22,$22, $20, $A8,$00, $06 - .byte $A0,$A8,$00 + .byte $A0,$FF,$AA, $A0,$F7,$AA, $A4,$04, $00, $A0,$23,$AA, $A3,$44, $CC + .byte $04, $A0,$FF,$AA, $A0,$9E,$AA .byte $A1 powerup02_rle: .byte $28 ; ysize=48 - .byte $A5,$22, $20, $22, $00, $02, $A5,$22, $02 - .byte $A3,$00, $22, $A3,$00, $25, $22, $00, $A3,$22 - .byte $00, $20, $50, $A3,$00, $62, $A5,$00, $A8,$22 - .byte $20, $00, $02, $22, $02, $00, $20 - .byte $00,$00, $22, $00, $20, $00,$00, $02,$02, $00 - .byte $22, $20, $22, $00, $22,$22, $A3,$00, $06 - .byte $60, $A4,$00, $22,$22, $02, $00, $02, $A5,$22 - .byte $20, $00, $20, $22,$22, $00, $22, $00,$00 - .byte $62, $22, $20, $00, $20, $02, $00 - .byte $22, $00, $02, $20, $A5,$00, $06, $60 - .byte $A3,$00, $A3,$22, $20,$20, $AA,$22, $00,$00, $20, $00 - .byte $A4,$22, $20, $00,$00, $22, $A3,$00, $02, $20 - .byte $22,$22, $00,$00, $26, $A3,$00, $AB,$22, $02, $52 - .byte $22,$22, $20, $00, $22, $00, $02, $A5,$22 - .byte $50, $52, $20,$20, $22,$22, $02, $A3,$22, $A5,$00 - .byte $AA,$22, $20, $05, $55, $25, $22, $00,$00 - .byte $22, $A6,$00, $02, $56, $55, $22, $A7,$02 - .byte $00, $62, $A3,$00, $A6,$22, $00, $A3,$56, $22,$22 - .byte $20, $22,$22, $00,$00, $22, $A5,$00, $20, $02 - .byte $00, $22, $20, $A8,$00, $66, $A3,$00, $A6,$22 - .byte $00, $A3,$55, $22,$22, $A3,$02, $00,$00, $22, $00,$00 - .byte $20, $22,$22, $02, $00, $22, $00, $22 - .byte $20, $A7,$00, $66, $A3,$00, $A6,$22, $00, $55 - .byte $52, $55, $00,$00, $A3,$60, $00, $20, $00 - .byte $20, $A3,$22, $02, $A5,$00, $22,$22, $A6,$00, $66 - .byte $A3,$00, $A6,$22, $00, $A3,$55, $26,$26, $A3,$22, $00 - .byte $02, $20, $00, $22,$22, $A3,$00, $25,$25, $66 - .byte $00, $02, $22, $26, $60, $A4,$00, $02 - .byte $A3,$00, $A6,$22, $00, $A3,$55, $22,$22, $02, $22 - .byte $A3,$00, $02, $20, $90, $99, $90, $00,$00 - .byte $22,$22, $56, $00,$00, $A3,$22, $A3,$00, $20, $A4,$00 - .byte $A6,$22, $00,$00, $55,$55, $65, $22,$22, $00,$00, $20 - .byte $02, $00, $02, $99,$99, $66, $40,$40, $42 - .byte $02, $45, $00,$00, $02, $20, $02, $00,$00 - .byte $20, $02, $A4,$00, $A6,$22, $00,$00, $55,$55, $66 - .byte $22, $02, $00,$00, $22, $A3,$00, $39, $69 - .byte $06, $A5,$04, $A6,$00, $20, $02, $A5,$00, $A6,$22 - .byte $00,$00, $55, $05, $A5,$00, $10, $00, $01 - .byte $A4,$00, $A3,$44, $CC, $04, $10, $06, $60 - .byte $66, $00, $60, $A7,$00, $A6,$22, $A8,$00, $06 - .byte $00, $06, $A5,$00, $30, $36, $03, $00 - .byte $06, $00,$00, $04, $50, $55, $66, $A7,$00 - .byte $A4,$22, $02, $AD,$00, $03, $22, $25, $55 - .byte $A8,$00, $55, $52, $66, $A7,$00, $22,$22, $02 - .byte $AF,$00, $02, $22, $00, $25, $A3,$00, $01 - .byte $A4,$00, $55,$55, $66, $A7,$00, $02, $A0,$11,$00, $22 - .byte $50, $00, $50,$50, $05, $A7,$00, $55, $66 - .byte $A0,$15,$00, $20, $A3,$00, $02,$02, $22, $AA,$00, $55 - .byte $66, $A0,$16,$00, $02, $A4,$00, $22,$22, $20, $A8,$00 - .byte $06, $A0,$A8,$00 + .byte $A0,$FF,$AA, $A0,$CF,$AA, $A3,$4A, $0A, $4A, $A0,$23,$AA, $A5,$04 + .byte $A0,$23,$AA, $A3,$44, $CC, $04, $A0,$FF,$AA, $A0,$9E,$AA .byte $A1 powerup03_rle: .byte $28 ; ysize=48 - .byte $A5,$22, $20, $22, $00, $02, $A5,$22, $02 - .byte $A3,$00, $22, $A3,$00, $25, $22, $00, $A3,$22 - .byte $00, $20, $50, $A3,$00, $62, $A5,$00, $A8,$22 - .byte $20, $00, $02, $22, $02, $00, $20 - .byte $00,$00, $22, $00, $20, $00,$00, $02,$02, $00 - .byte $22, $20, $22, $00, $22,$22, $A3,$00, $06 - .byte $60, $A4,$00, $22,$22, $02, $00, $02, $A5,$22 - .byte $20, $00, $20, $22,$22, $00, $22, $00,$00 - .byte $62, $22, $20, $00, $20, $02, $00 - .byte $22, $00, $02, $20, $A5,$00, $06, $60 - .byte $A3,$00, $A3,$22, $20,$20, $AA,$22, $00,$00, $20, $00 - .byte $A4,$22, $20, $00,$00, $22, $A3,$00, $02, $20 - .byte $22,$22, $00,$00, $26, $A3,$00, $AB,$22, $02, $52 - .byte $22,$22, $20, $00, $22, $00, $02, $A5,$22 - .byte $50, $52, $20,$20, $22,$22, $02, $A3,$22, $A5,$00 - .byte $AA,$22, $20, $05, $55, $25, $22, $00,$00 - .byte $22, $A6,$00, $02, $56, $55, $22, $A7,$02 - .byte $00, $62, $A3,$00, $A6,$22, $00, $A3,$56, $22,$22 - .byte $20, $22,$22, $00,$00, $22, $A5,$00, $20, $02 - .byte $00, $22, $20, $A8,$00, $66, $A3,$00, $A6,$22 - .byte $00, $A3,$55, $22,$22, $A3,$02, $00,$00, $22, $00,$00 - .byte $20, $22,$22, $02, $00, $22, $00, $22 - .byte $20, $A7,$00, $66, $A3,$00, $A6,$22, $00, $55 - .byte $52, $55, $00,$00, $A3,$60, $00, $20, $00 - .byte $20, $A3,$22, $02, $A5,$00, $22,$22, $A6,$00, $66 - .byte $A3,$00, $A6,$22, $00, $A3,$55, $26,$26, $A3,$22, $00 - .byte $02, $20, $00, $22,$22, $A3,$00, $25,$25, $66 - .byte $00, $02, $22, $26, $60, $A4,$00, $02 - .byte $A3,$00, $A6,$22, $00, $A3,$55, $22,$22, $02, $22 - .byte $A3,$00, $02, $20, $90, $99, $90, $00,$00 - .byte $22,$22, $56, $00,$00, $A3,$22, $A3,$00, $20, $A4,$00 - .byte $A6,$22, $00,$00, $55,$55, $65, $22,$22, $00,$00, $20 - .byte $02, $00, $02, $99,$99, $66, $40, $44,$44 - .byte $04, $44, $04, $00, $02, $20, $02 - .byte $00,$00, $20, $02, $A4,$00, $A6,$22, $00,$00, $55,$55 - .byte $66, $22, $02, $00,$00, $22, $A3,$00, $39 - .byte $69, $06, $A3,$04, $C4, $04, $A6,$00, $20 - .byte $02, $A5,$00, $A6,$22, $00,$00, $55, $05, $A5,$00 - .byte $10, $00, $01, $A4,$00, $A3,$44, $CC, $04 - .byte $10, $06, $60, $66, $00, $60, $A7,$00 - .byte $A6,$22, $A8,$00, $06, $00, $06, $A5,$00, $30 - .byte $36, $03, $00, $06, $00,$00, $04, $50 - .byte $55, $66, $A7,$00, $A4,$22, $02, $AD,$00, $03 - .byte $22, $25, $55, $A8,$00, $55, $52, $66 - .byte $A7,$00, $22,$22, $02, $AF,$00, $02, $22, $00 - .byte $25, $A3,$00, $01, $A4,$00, $55,$55, $66, $A7,$00 - .byte $02, $A0,$11,$00, $22, $50, $00, $50,$50, $05 - .byte $A7,$00, $55, $66, $A0,$15,$00, $20, $A3,$00, $02,$02 - .byte $22, $AA,$00, $55, $66, $A0,$16,$00, $02, $A4,$00 - .byte $22,$22, $20, $A8,$00, $06, $A0,$A8,$00 + .byte $A0,$FF,$AA, $A0,$CF,$AA, $40, $44,$44, $04, $44, $04 + .byte $A0,$22,$AA, $A3,$04, $C4, $04, $00, $A0,$22,$AA, $A3,$44 + .byte $CC, $04, $A0,$01,$A0, $A0,$FF,$AA, $A0,$9D,$AA .byte $A1 diff --git a/ootw/intro_graphics/06_console/powerup01.png b/ootw/intro_graphics/06_console/powerup01.png index 9f135b18..dd1ffd45 100644 Binary files a/ootw/intro_graphics/06_console/powerup01.png and b/ootw/intro_graphics/06_console/powerup01.png differ diff --git a/ootw/intro_graphics/06_console/powerup02.png b/ootw/intro_graphics/06_console/powerup02.png index ffcf32e4..b18e5b3f 100644 Binary files a/ootw/intro_graphics/06_console/powerup02.png and b/ootw/intro_graphics/06_console/powerup02.png differ diff --git a/ootw/intro_graphics/06_console/powerup03.png b/ootw/intro_graphics/06_console/powerup03.png index 7c68fdf5..69ad56e2 100644 Binary files a/ootw/intro_graphics/06_console/powerup03.png and b/ootw/intro_graphics/06_console/powerup03.png differ