diff --git a/.gitignore b/.gitignore index 36161dd..015326c 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ scorch.lab scorch.lst textproc.lab textproc.lst +artwork/talk.as_ diff --git a/artwork/talk.asm b/artwork/talk.asm index 81b049c..7eb46ab 100644 --- a/artwork/talk.asm +++ b/artwork/talk.asm @@ -53,79 +53,81 @@ L49 dta d"DIE, TANK-SCUM!" L50 dta d"I'M GONNA BREAK YOUR FACE!" L51 dta d"MAMA SAID KNOCK YOU OUT!" L52 dta d"I HOPE YOU ENJOY PAIN!" +L53 dta d"HOW'D YOU LIKE ONE ACROSS YOUR LIPS?" ;(sanford and son) ;-------------------------------- -L53 dta d"PARTING IS SUCH SWEET SORROW... NOT!" -L54 dta d"UGH!" -L55 dta d"AARGH!" -L56 dta d"AAAGGHHH!" -L57 dta d"I'M MELTING!" -L58 dta d"OOF.." -L59 dta d"OH!" -L60 dta d"EEEK!" -L61 dta d"AACCH!" -L62 dta d"I HATE IT WHEN THAT HAPPENS." -L63 dta d"ONE DIRECT HIT CAN RUIN YOUR WHOLE DAY." -L64 dta d"OH NO!" -L65 dta d"NOT ME!" -L66 dta d"OUCH." -L67 dta d"OH NO, NOT AGAIN." -L68 dta d"ANOTHER ONE BITES THE DUST." -L69 dta d"GOODBYE." -L70 dta d"HELP ME!" -L71 dta d"FAREWELL, CRUEL WORLD." -L72 dta d"REMEMBER THE ALAMO!" -L73 dta d"OH MAN!" -L74 dta d"DOOUGH!" -L75 dta d"ANOTHER DAY, ANOTHER BOMB." -L76 dta d"THIS IS THE END, MY ONLY FRIEND." -L77 dta d"VERY FUNNY." -L78 dta d"THE FAT LADY SANG." -L79 dta d"WHY DOES EVERYTHING HAPPEN TO ME?" -L80 dta d"I'M GOING DOWN." -L81 dta d"I'VE GOT A BAD FEELING ABOUT THIS." -L82 dta d"CRAPOLA." -L83 dta d"POW!" -L84 dta d"BIF!" -L85 dta d"BAM!" -L86 dta d"ZONK!" -L87 dta d"I SHOULD'VE LISTENED TO MY MOTHER..." -L88 dta d"I WALK THROUGH THE VALLEY OF THE SHADOW..." -L89 dta d"WHAT WAS THAT NOISE?" -L90 dta d"MAMA SAID THERE'D BE DAYS LIKE THIS." -L91 dta d"ITS JUST ONE OF THOSE DAYS..." -L92 dta d"I SEE A BRIGHT LIGHT..." -L93 dta d"MOMMY? IS THAT YOU?" -L94 dta d"I LET YOU HIT ME!" -L95 dta d"SUCKER SHOT!" -L96 dta d"I DIDN'T WANT TO LIVE ANYWAY." -L97 dta d"--" -L98 dta d"WAS THAT AS CLOSE AS I THINK IT WAS?" -L99 dta d"JOIN THE ARMY, SEE THE WORLD THEY SAID." -L100 dta d"IT WASN'T JUST A JOB IT WAS AN ADVENTURE!" -L101 dta d"I DIDN'T LIKE VIOLENCE ANYWAY!" -L102 dta d"I THOUGHT YOU LIKED ME?" -L103 dta d"CTO XYEB" -L104 dta d"I THINK THIS GUY'S A LITTLE CRAZY." -L105 dta d"SOMEHOW I DON'T FEEL LIKE KILLING ANYMORE." -L106 dta d"HEY! KILLIN' AIN'T COOL." -L107 dta d"GEE... THANKS." -L108 dta d"I'VE FALLEN AND I CAN'T GET UP!" -L109 dta d"911?" -L110 dta d"OH NO! HERE I BLOW AGAIN!" -L111 dta d"I'LL BE BACK..." -L112 dta d"HEY - I'VE GOT LAWYERS." -L113 dta d"TIME TO CALL 1-900-SUE-TANK." +L54 dta d"PARTING IS SUCH SWEET SORROW... NOT!" +L55 dta d"UGH!" +L56 dta d"AARGH!" +L57 dta d"AAAGGHHH!" +L58 dta d"I'M MELTING!" +L59 dta d"OOF.." +L60 dta d"OH!" +L61 dta d"EEEK!" +L62 dta d"AACCH!" +L63 dta d"I HATE IT WHEN THAT HAPPENS." +L64 dta d"ONE DIRECT HIT CAN RUIN YOUR WHOLE DAY." +L65 dta d"OH NO!" +L66 dta d"NOT ME!" +L67 dta d"OUCH." +L68 dta d"OH NO, NOT AGAIN." +L69 dta d"ANOTHER ONE BITES THE DUST." +L70 dta d"GOODBYE." +L71 dta d"HELP ME!" +L72 dta d"FAREWELL, CRUEL WORLD." +L73 dta d"REMEMBER THE ALAMO!" +L74 dta d"OH MAN!" +L75 dta d"DOOUGH!" +L76 dta d"ANOTHER DAY, ANOTHER BOMB." +L77 dta d"THIS IS THE END, MY ONLY FRIEND." +L78 dta d"VERY FUNNY." +L79 dta d"THE FAT LADY SANG." +L80 dta d"WHY DOES EVERYTHING HAPPEN TO ME?" +L81 dta d"I'M GOING DOWN." +L82 dta d"I'VE GOT A BAD FEELING ABOUT THIS." +L83 dta d"CRAPOLA." +L84 dta d"POW!" +L85 dta d"BIF!" +L86 dta d"BAM!" +L87 dta d"ZONK!" +L88 dta d"I SHOULD'VE LISTENED TO MY MOTHER..." +L89 dta d"I WALK THROUGH THE VALLEY OF THE SHADOW..." +L90 dta d"WHAT WAS THAT NOISE?" +L91 dta d"MAMA SAID THERE'D BE DAYS LIKE THIS." +L92 dta d"ITS JUST ONE OF THOSE DAYS..." +L93 dta d"I SEE A BRIGHT LIGHT..." +L94 dta d"MOMMY? IS THAT YOU?" +L95 dta d"I LET YOU HIT ME!" +L96 dta d"SUCKER SHOT!" +L97 dta d"I DIDN'T WANT TO LIVE ANYWAY." +L98 dta d"--" +L99 dta d"WAS THAT AS CLOSE AS I THINK IT WAS?" +L100 dta d"JOIN THE ARMY, SEE THE WORLD THEY SAID." +L101 dta d"IT WASN'T JUST A JOB IT WAS AN ADVENTURE!" +L102 dta d"I DIDN'T LIKE VIOLENCE ANYWAY!" +L103 dta d"I THOUGHT YOU LIKED ME?" +L104 dta d"CTO XYEB" +L105 dta d"I THINK THIS GUY'S A LITTLE CRAZY." +L106 dta d"SOMEHOW I DON'T FEEL LIKE KILLING ANYMORE." +L107 dta d"HEY! KILLIN' AIN'T COOL." +L108 dta d"GEE... THANKS." +L109 dta d"I'VE FALLEN AND I CAN'T GET UP!" +L110 dta d"911?" +L111 dta d"OH NO! HERE I BLOW AGAIN!" +L112 dta d"I'LL BE BACK..." +L113 dta d"HEY - I'VE GOT LAWYERS." +L114 dta d"TIME TO CALL 1-900-SUE-TANK." +L115 dta d"YOU BIG DUMMY!" ;(sanford and son) LEND OffensiveTextTableL - dta L0,>L1,>L2,>L3,>L4,>L5,>L6,>L7,>L8,>L9,>L10,>L11,>L12,>L13,>L14,>L15,>L16,>L17,>L18,>L19,>L20,>L21,>L22,>L23,>L24,>L25,>L26,>L27,>L28,>L29,>L30,>L31,>L32,>L33,>L34,>L35,>L36,>L37,>L38,>L39,>L40,>L41,>L42,>L43,>L44,>L45,>L46,>L47,>L48,>L49,>L50,>L51,>L52 - dta >L53,>L54,>L55,>L56,>L57,>L58,>L59,>L60,>L61,>L62,>L63,>L64,>L65,>L66,>L67,>L68,>L69,>L70,>L71,>L72,>L73,>L74,>L75,>L76,>L77,>L78,>L79,>L80,>L81,>L82,>L83,>L84,>L85,>L86,>L87,>L88,>L89,>L90,>L91,>L92,>L93,>L94,>L95,>L96,>L97,>L98,>L99,>L100,>L101,>L102,>L103,>L104,>L105,>L106,>L107,>L108,>L109,>L110,>L111,>L112,>L113 + dta >L0,>L1,>L2,>L3,>L4,>L5,>L6,>L7,>L8,>L9,>L10,>L11,>L12,>L13,>L14,>L15,>L16,>L17,>L18,>L19,>L20,>L21,>L22,>L23,>L24,>L25,>L26,>L27,>L28,>L29,>L30,>L31,>L32,>L33,>L34,>L35,>L36,>L37,>L38,>L39,>L40,>L41,>L42,>L43,>L44,>L45,>L46,>L47,>L48,>L49,>L50,>L51,>L52,>L53 + dta >L54,>L55,>L56,>L57,>L58,>L59,>L60,>L61,>L62,>L63,>L64,>L65,>L66,>L67,>L68,>L69,>L70,>L71,>L72,>L73,>L74,>L75,>L76,>L77,>L78,>L79,>L80,>L81,>L82,>L83,>L84,>L85,>L86,>L87,>L88,>L89,>L90,>L91,>L92,>L93,>L94,>L95,>L96,>L97,>L98,>L99,>L100,>L101,>L102,>L103,>L104,>L105,>L106,>L107,>L108,>L109,>L110,>L111,>L112,>L113,>L114,>L115 dta >LEND -NumberOfOffensiveTexts=53 -NumberOfDeffensiveTexts=61 +NumberOfOffensiveTexts=54 +NumberOfDeffensiveTexts=62 .endp hoverFull dta d"MY HOVERCRAFT IS FULL OF EELS!" hoverFullEnd diff --git a/grafproc.asm b/grafproc.asm index c7b3f0b..877e1dd 100644 --- a/grafproc.asm +++ b/grafproc.asm @@ -2205,15 +2205,12 @@ ybarrel rts .endp ;-------------------------------------------------- -.proc ColorsOfSprites - lda TankColoursTable ; colours of sprites under tanks - sta PCOLR0 - lda TankColoursTable+1 - sta PCOLR1 - lda TankColoursTable+2 - sta PCOLR2 - lda TankColoursTable+3 - sta PCOLR3 +.proc ColorsOfSprites + ldy #3 +@ lda TankColoursTable,y ; colours of sprites under tanks + sta PCOLR0,y + dey + bpl @- LDA TankColoursTable+4 STA COLOR3 ; joined missiles (5th tank) rts diff --git a/scorch.bin b/scorch.bin index b6ae662..9aac8ae 100644 Binary files a/scorch.bin and b/scorch.bin differ diff --git a/scorch.xex b/scorch.xex index 0e3d414..2b8452e 100644 Binary files a/scorch.xex and b/scorch.xex differ