From 47fd5d01be4c3f23280c2ced4b4a1abc8e226ad7 Mon Sep 17 00:00:00 2001 From: Vince Weaver Date: Sat, 23 Feb 2019 15:53:56 -0500 Subject: [PATCH] ootw: intro: hook up some lightning --- ootw/intro.s | 238 ++++++++++++++---- ootw/intro_graphics/08_lightning/Makefile | 3 +- .../intro_graphics/08_lightning/lightning.inc | 3 + ootw/intro_graphics/08_lightning/nothing.png | Bin 0 -> 1021 bytes 4 files changed, 193 insertions(+), 51 deletions(-) create mode 100644 ootw/intro_graphics/08_lightning/nothing.png diff --git a/ootw/intro.s b/ootw/intro.s index 833e1ee3..648e1a9b 100644 --- a/ootw/intro.s +++ b/ootw/intro.s @@ -21,7 +21,7 @@ intro: lda #0 sta DISP_PAGE -; jmp soda + jmp soda ;=============================== ;=============================== @@ -1471,6 +1471,7 @@ particle_loop2: ;=============================== ;=============================== +thunderstorm: lda #>(building_car_rle) sta GBASH lda #<(building_car_rle) @@ -1482,56 +1483,12 @@ particle_loop2: jsr page_flip bit FULLGR + lda #lightning_sequence + sta INTRO_LOOPH - ; 125 start - ; 126, small central lightning - ; 1,2,3,4 - ; 128.2 center glow in cloud - ; 5,6,5 - ; 128.7 inverse flash - ; 129.6 center left glow in cloud - ; 8 - ; 130.1 glow in cloud, right - ; 9 - ; 130.4 glow in cloud, right - ; 10 - ; 131.7 small glow, center right - ; 11,12 - ; 133.5 lightning bolt right - ; 13,14,15,16 - ; 134.7 glow center left - ; 8 - ; 135.2 small glow center - ; 5,6,5 - ; 135.4 inverse flash - ; 135.8 another inverse flash - ; 135.5 glow right - ; 9 - ; 136 small glow right - ; 10 - ; 138.6 cloud glow - ; 12,11,12 - ; 139.6 small bolt center - ; 1,2,3,4 - ; 141.4 right glow in cloud - ; 10 - ; 143 glow in center - ; 5,6,5 - ; 144.8 glow left - ; 8 - ; 145.7 center glow cloud - ; 11,12 - ; 147 bolt right - ; 13,14,15 - ; screen goes white - ; *all white - ; lightning animation - ; * bolt1, 2,3,4,5,6,7 - ; * all white (a while) - ; * all black (a while) - ; 148.3 big bolt behind car - ; 29 .. 38, 40.. 42 (38 twice as long?) - ; by 150faded out and on to tunnel + jsr run_sequence @@ -2619,3 +2576,184 @@ drinking_sequence: .byte 0 .word drinking05_rle + + + ; Lightning sequence +lightning_sequence: + ; 125 start + ; 126, small central lightning 1,2,3,4 + ; + .byte 120 + .word storm01_rle + .byte 10 + .word storm02_rle + .byte 10 + .word storm03_rle + .byte 10 + .word storm04_rle + .byte 10 + ; 128.2 center glow in cloud 5,6,5 + ; + .word nothing_rle + .byte 200 + .word storm05_rle + .byte 10 + .word storm06_rle + .byte 10 + .word storm05_rle + .byte 10 + .word nothing_rle + .byte 50 + ; 128.7 inverse flash + ; + .word flash_rle + .byte 20 + .word nothing_rle + .byte 80 + ; 129.6 center left glow in cloud 8 + ; + .word storm08_rle + .byte 20 + .word nothing_rle + .byte 80 + ; 130.1 glow in cloud, right 9 + ; + .word storm09_rle + .byte 20 + .word nothing_rle + .byte 80 + ; 130.4 glow in cloud, right 10 + ; + .word storm10_rle + .byte 20 + .word nothing_rle + .byte 120 + ; 131.7 small glow, center right 11,12 + ; + .word storm11_rle + .byte 20 + .word storm12_rle + .byte 20 + .word nothing_rle + .byte 120 + ; 133.5 lightning bolt right 13,14,15,16 + ; + .word storm13_rle + .byte 20 + .word storm14_rle + .byte 20 + .word storm15_rle + .byte 20 + .word storm16_rle + .byte 20 + .word nothing_rle + .byte 120 + ; 134.7 glow center left 8 + ; + .word storm08_rle + .byte 20 + .word nothing_rle + .byte 80 + ; 135.2 small glow center 5,6,5 + ; + .word storm05_rle + .byte 20 + .word storm06_rle + .byte 20 + .word storm05_rle + .byte 20 + .word nothing_rle + .byte 50 + ; 135.4 inverse flash + ; + .word flash_rle + .byte 20 + .word nothing_rle + .byte 80 + ; 135.8 another inverse flash + ; + .word flash_rle + .byte 20 + .word nothing_rle + .byte 80 + ; 135.5 glow right 9 + ; + .word storm09_rle + .byte 20 + .word nothing_rle + .byte 80 + ; 136 small glow right 0 + ; + .word storm10_rle + .byte 20 + .word nothing_rle + .byte 120 + ; 138.6 cloud glow 12,11,12 + ; + .word storm12_rle + .byte 15 + .word storm11_rle + .byte 15 + .word storm12_rle + .byte 15 + .word nothing_rle + .byte 120 + ; 139.6 small bolt center 1,2,3,4 + ; + .word storm01_rle + .byte 15 + .word storm02_rle + .byte 15 + .word storm03_rle + .byte 15 + .word storm04_rle + .byte 15 + .word nothing_rle + .byte 120 + ; 141.4 right glow in cloud 10 + ; + .word storm10_rle + .byte 20 + .word nothing_rle + .byte 120 + ; 143 glow in center 5,6,5 + ; + .word storm05_rle + .byte 15 + .word storm06_rle + .byte 15 + .word storm05_rle + .byte 15 + .word nothing_rle + .byte 120 + ; 144.8 glow left 8 + ; + .word storm08_rle + .byte 20 + .word nothing_rle + .byte 120 + ; 145.7 center glow cloud 11,12 + ; + .word storm11_rle + .byte 20 + .word storm12_rle + .byte 20 + .word nothing_rle + .byte 120 + ;======================= + ; 147 bolt right + ;======================= + ; 13,14,15 + ; screen goes white + ; *all white + ; lightning animation + ; * bolt1, 2,3,4,5,6,7 + ; * all white (a while) + ; * all black (a while) + ; 148.3 big bolt behind car + ; 29 .. 38, 40.. 42 (38 twice as long?) + ; by 150faded out and on to tunnel + .word storm42_rle + .byte 0 + .word nothing_rle + diff --git a/ootw/intro_graphics/08_lightning/Makefile b/ootw/intro_graphics/08_lightning/Makefile index 36cb96c6..34bb258a 100644 --- a/ootw/intro_graphics/08_lightning/Makefile +++ b/ootw/intro_graphics/08_lightning/Makefile @@ -9,7 +9,7 @@ all: lightning.inc lightning.inc: $(PNG2RLE) \ bolt1.png bolt2.png bolt3.png bolt4.png bolt5.png bolt6.png bolt7.png \ - flash.png white.png black.png \ + flash.png white.png black.png nothing.png \ storm01.png storm02.png storm03.png storm04.png storm05.png \ storm06.png storm08.png storm09.png storm10.png storm11.png \ storm12.png storm13.png storm14.png storm15.png storm16.png \ @@ -26,6 +26,7 @@ lightning.inc: $(PNG2RLE) \ $(PNG2RLE) asm flash.png flash_rle >> lightning.inc $(PNG2RLE) asm white.png white_rle >> lightning.inc $(PNG2RLE) asm black.png black_rle >> lightning.inc + $(PNG2RLE) asm nothing.png nothing_rle >> lightning.inc $(PNG2RLE) asm storm01.png storm01_rle >> lightning.inc $(PNG2RLE) asm storm02.png storm02_rle >> lightning.inc $(PNG2RLE) asm storm03.png storm03_rle >> lightning.inc diff --git a/ootw/intro_graphics/08_lightning/lightning.inc b/ootw/intro_graphics/08_lightning/lightning.inc index 904dc4c2..89020834 100644 --- a/ootw/intro_graphics/08_lightning/lightning.inc +++ b/ootw/intro_graphics/08_lightning/lightning.inc @@ -221,6 +221,9 @@ white_rle: .byte $28 ; ysize=48 black_rle: .byte $28 ; ysize=48 .byte $A0,$FF,$00, $A0,$FF,$00, $A0,$FF,$00, $A0,$C3,$00 .byte $A1 +nothing_rle: .byte $28 ; ysize=48 + .byte $A0,$FF,$AA, $A0,$FF,$AA, $A0,$FF,$AA, $A0,$C3,$AA + .byte $A1 storm01_rle: .byte $28 ; ysize=48 .byte $AA,$AA, $66, $A7,$65, $A0,$20,$AA, $26, $27, $FF .byte $2F, $27, $A3,$26, $A0,$21,$AA, $FF, $A0,$FF,$AA, $A0,$FF,$AA diff --git a/ootw/intro_graphics/08_lightning/nothing.png b/ootw/intro_graphics/08_lightning/nothing.png new file mode 100644 index 0000000000000000000000000000000000000000..99b21fefc64580721627b969605a4a247c12d069 GIT binary patch literal 1021 zcmV zaB^>EX>4U6ba`-PAZ2)IW&i+q+U=EFj@=*(hTmC5mw;`I&2k6?sXOTM`$Nc?tEN+R zUMdZo5HOBy`~fGNzkZJJ1BJ50kkmYvoFhsqsc=Qd<5lWvDW=t~qI(MC7xEzY1Vc0j zTi|)iPskbiyyb1%sgUb4L*?8P$IFSj4Y6+rTYftdx*Wu9IMi)OczaIQ__&r8b8&mV zgtqm^o?mIe6K0ddIBO3zU%8UxeA!+O0#2uH6GIf@E=M~n@bjGfuiDlK_=_l08)eq6v2>yK+HHXlqni> zFd`(<0jMH$mc$3JkSccs$w?#w4o(4l;~S%;%F34*7a>5Xk1 zx81FT{_Nj&)vHB((6elw$hnSJ@aX&pXICr zTW!clLq{Gqe3UTigWAUWrv3#r+SGWFnu_+I2C3O?g64IilNpF{A^^8ZfFv+aX3;4n zp5!L8Sa2PRGJ@0zr_&?`g6SmIK@WCMCHw|m+xWeoHO^H4001*kOjJbx z00842U|>$Y|3v)&qhOqzoD|Rf(8K>=as&TrJe{4L|Dezm^*qqsjdK6c|Ns90005nj zhJXM7010qNS#tmYE+YT{E+YYWr9XB6000McNliru;{q2H9520tlwtq?02y>eSad^g zZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{001dTL_t(Y$L-894FCWP1EAjZFSsW5 rECB(e$08I8g+ifFC=?2XLgD{#VeOUyOuo0900000NkvXXu0mjfLbAxV literal 0 HcmV?d00001