diff --git a/artwork/talk.asm b/artwork/talk.asm index 8ef8985..f2148ae 100644 --- a/artwork/talk.asm +++ b/artwork/talk.asm @@ -1,131 +1,123 @@ .proc talk ; Maximum text length is 63 characters!!! -L0 dta d"CYKA BLAT" -L1 dta d"DIE!" -L2 dta d"EAT MY SHORTS!" -L3 dta d"YOU'RE TOAST!" -L4 dta d"BANZAI!" -L5 dta d"FROM HELL'S HEART I STAB AT THEE..." -L6 dta d"I DIDN'T DO IT. NOBODY SAW ME DO IT." -L7 dta d"TAKE A HIKE!" -L8 dta d"YOU'RE DEAD MEAT." -L9 dta d"MAKE MY DAY." -L10 dta d"CHARGE!" -L11 dta d"ATTACK!" -L12 dta d"YOU'RE OUTTA HERE." -L13 dta d"WATTSA MATTA YOU?" -L14 dta d"FREEZE, OR I'LL SHOOT!" -L15 dta d"HA HA HA." -L16 dta d"WE COME IN PEACE - SHOOT TO KILL!" -L17 dta d"IN YOUR FACE!" -L18 dta d"DIE COMMIE PIG!" -L19 dta d"I LOVE THE SMELL OF NAPALM IN THE MORNING." -L20 dta d"VICTORY!" -L21 dta d"SHOW SOME RESPECT." -L22 dta d"JUST WHO DO YOU THINK YOU ARE?" -L23 dta d"LOOK OUT BELOW!" -L24 dta d"KNOCK, KNOCK." -L25 dta d"LOOK OVER THERE." -L26 dta d"GUESS WHAT'S COMING FOR DINNER?" -L27 dta d"MERRY CHRISTMAS." -L28 dta d"OPEN WIDE!" -L29 dta d"HERE GOES NOTHING..." -L30 dta d"DON'T WORRY, IT ISN'T A LIVE ROUND." -L31 dta d"BLOOD, PAIN, VIOLENCE!" -L32 dta d"TAKE THIS, SISSY!" -L33 dta d"I SHALL FLATTEN YOU!" -L34 dta d"I SHALL SMASH YOUR UGLY TANK!" -L35 dta d"I WONDER WHAT THIS BUTTON DOES?" -L36 dta d"DON'T TAKE THIS PERSONALLY." -L37 dta d"WOULD THIS MAKE YOU MAD?" -L38 dta d"I TOLD YOU TO LEAVE MY SISTER ALONE!" -L39 dta d"I COULD SPARE YOU, BUT WHY?" -L40 dta d"MY BOMB IS BIGGER THAN YOURS." -L41 dta d"DON'T FORGET ABOUT ME!" -L42 dta d"HASTA LA VISTA, BABY!" -L43 dta d"THIS IS YOUR BRAIN ON SCORCH." -L44 dta d"TAKE THIS!" -L45 dta d"THIS SCREEN AIN'T BIG ENOUGH FOR THE BOTH OF US." -L46 dta d"DIE, ALIEN SWINE!" -L47 dta d"AWRUK!!!" -L48 dta d"I SHALL OIL MY TURRET WITH YOUR BLOOD." -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) +L0 dta d"CYKA BLA", d"T"* +L1 dta d"DIE", d"!"* +L2 dta d"EAT MY SHORTS", d"!"* +L3 dta d"YOU'RE TOAST", d"!"* +L4 dta d"BANZAI", d"!"* +L5 dta d"FROM HELL'S HEART I STAB AT THEE..", d"."* +L6 dta d"I DIDN'T DO IT. NOBODY SAW ME DO IT", d"."* +L7 dta d"TAKE A HIKE", d"!"* +L8 dta d"YOU'RE DEAD MEAT", d"."* +L9 dta d"MAKE MY DAY", d"."* +L10 dta d"CHARGE", d"!"* +L11 dta d"ATTACK", d"!"* +L12 dta d"YOU'RE OUTTA HERE", d"."* +L13 dta d"WATTSA MATTA YOU", d"?"* +L14 dta d"FREEZE, OR I'LL SHOOT", d"!"* +L15 dta d"HA HA HA", d"."* +L16 dta d"WE COME IN PEACE - SHOOT TO KILL", d"!"* +L17 dta d"IN YOUR FACE", d"!"* +L18 dta d"DIE COMMIE PIG", d"!"* +L19 dta d"I LOVE THE SMELL OF NAPALM IN THE MORNING", d"."* +L20 dta d"VICTORY", d"!"* +L21 dta d"SHOW SOME RESPECT", d"."* +L22 dta d"JUST WHO DO YOU THINK YOU ARE", d"?"* +L23 dta d"LOOK OUT BELOW", d"!"* +L24 dta d"KNOCK, KNOCK", d"."* +L25 dta d"LOOK OVER THERE", d"."* +L26 dta d"GUESS WHAT'S COMING FOR DINNER", d"?"* +L27 dta d"MERRY CHRISTMAS", d"."* +L28 dta d"OPEN WIDE", d"!"* +L29 dta d"HERE GOES NOTHING..", d"."* +L30 dta d"DON'T WORRY, IT ISN'T A LIVE ROUND", d"."* +L31 dta d"BLOOD, PAIN, VIOLENCE", d"!"* +L32 dta d"TAKE THIS, SISSY", d"!"* +L33 dta d"I SHALL FLATTEN YOU", d"!"* +L34 dta d"I SHALL SMASH YOUR UGLY TANK", d"!"* +L35 dta d"I WONDER WHAT THIS BUTTON DOES", d"?"* +L36 dta d"DON'T TAKE THIS PERSONALLY", d"."* +L37 dta d"WOULD THIS MAKE YOU MAD", d"?"* +L38 dta d"I TOLD YOU TO LEAVE MY SISTER ALONE", d"!"* +L39 dta d"I COULD SPARE YOU, BUT WHY", d"?"* +L40 dta d"MY BOMB IS BIGGER THAN YOURS", d"."* +L41 dta d"DON'T FORGET ABOUT ME", d"!"* +L42 dta d"HASTA LA VISTA, BABY", d"!"* +L43 dta d"THIS IS YOUR BRAIN ON SCORCH", d"."* +L44 dta d"TAKE THIS", d"!"* +L45 dta d"THIS SCREEN AIN'T BIG ENOUGH FOR THE BOTH OF US", d"."* +L46 dta d"DIE, ALIEN SWINE", d"!"* +L47 dta d"AWRUK!!", d"!"* +L48 dta d"I SHALL OIL MY TURRET WITH YOUR BLOOD", d"."* +L49 dta d"DIE, TANK-SCUM", d"!"* +L50 dta d"I'M GONNA BREAK YOUR FACE", d"!"* +L51 dta d"MAMA SAID KNOCK YOU OUT", d"!"* +L52 dta d"I HOPE YOU ENJOY PAIN" +L53 dta d"HOW'D YOU LIKE ONE ACROSS YOUR LIPS", d"?"* ;(sanford and son) ;-------------------------------- -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"NEW DAY, NEW 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"I'VE GOT LAWYERS!" -L114 dta d"CALL 1-900-SUE-TANK." -L115 dta d"YOU BIG DUMMY!" ;(sanford and son) +L54 dta d"PARTING IS SUCH SWEET SORROW... NOT", d"!"* +L55 dta d"UGH", d"!"* +L56 dta d"AARGH", d"!"* +L57 dta d"AAAGGHHH", d"!"* +L58 dta d"I'M MELTING", d"!"* +L59 dta d"OOF.", d"."* +L60 dta d"OH", d"!"* +L61 dta d"EEEK", d"!"* +L62 dta d"AACCH", d"!"* +L63 dta d"I HATE IT WHEN THAT HAPPENS", d"."* +L64 dta d"ONE DIRECT HIT CAN RUIN YOUR WHOLE DAY", d"."* +L65 dta d"OH NO", d"!"* +L66 dta d"NOT ME", d"!"* +L67 dta d"OUCH", d"."* +L68 dta d"OH NO, NOT AGAIN", d"."* +L69 dta d"ANOTHER ONE BITES THE DUST", d"."* +L70 dta d"GOODBYE", d"."* +L71 dta d"HELP ME", d"!"* +L72 dta d"FAREWELL, CRUEL WORLD", d"."* +L73 dta d"REMEMBER THE ALAMO", d"!"* +L74 dta d"OH MAN", d"!"* +L75 dta d"DOOUGH", d"!"* +L76 dta d"NEW DAY, NEW BOMB", d"."* +L77 dta d"THIS IS THE END, MY ONLY FRIEND", d"."* +L78 dta d"VERY FUNNY", d"."* +L79 dta d"THE FAT LADY SANG", d"."* +L80 dta d"WHY DOES EVERYTHING HAPPEN TO ME", d"?"* +L81 dta d"I'M GOING DOWN", d"."* +L82 dta d"I'VE GOT A BAD FEELING ABOUT THIS", d"."* +L83 dta d"CRAPOLA", d"."* +L84 dta d"POW", d"!"* +L85 dta d"BIF", d"!"* +L86 dta d"BAM", d"!"* +L87 dta d"ZONK", d"!"* +L88 dta d"I SHOULD'VE LISTENED TO MY MOTHER", d"."* +L89 dta d"I WALK THROUGH THE VALLEY OF THE SHADOW..", d"."* +L90 dta d"WHAT WAS THAT NOISE", d"?"* +L91 dta d"MAMA SAID THERE'D BE DAYS LIKE THIS", d"."* +L92 dta d"ITS JUST ONE OF THOSE DAYS..", d"."* +L93 dta d"I SEE A BRIGHT LIGHT..", d"."* +L94 dta d"MOMMY? IS THAT YOU", d"?"* +L95 dta d"I LET YOU HIT ME", d"!"* +L96 dta d"SUCKER SHOT", d"!"* +L97 dta d"I DIDN'T WANT TO LIVE ANYWAY", d"."* +L98 dta d"-", d"-"* +L99 dta d"WAS THAT AS CLOSE AS I THINK IT WAS", d"?"* +L100 dta d"JOIN THE ARMY, SEE THE WORLD THEY SAID", d"."* +L101 dta d"IT WASN'T JUST A JOB IT WAS AN ADVENTURE", d"!"* +L102 dta d"I DIDN'T LIKE VIOLENCE ANYWAY", d"!"* +L103 dta d"I THOUGHT YOU LIKED ME", d"?"* +L104 dta d"CTO XYE", d"B"* +L105 dta d"I THINK THIS GUY'S A LITTLE CRAZY", d"."* +L106 dta d"SOMEHOW I DON'T FEEL LIKE KILLING ANYMORE", d"."* +L107 dta d"HEY! KILLIN' AIN'T COOL", d"."* +L108 dta d"GEE... THANKS", d"."* +L109 dta d"I'VE FALLEN AND I CAN'T GET UP", d"!"* +L110 dta d"911", d"?"* +L111 dta d"OH NO! HERE I BLOW AGAIN", d"!"* +L112 dta d"I'LL BE BACK..", d"."* +L113 dta d"I'VE GOT LAWYERS", d"!"* +L114 dta d"CALL 1-900-SUE-TANK", d"."* +L115 dta d"YOU BIG DUMMY", d"!"* ;(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,>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=54 NumberOfDeffensiveTexts=62 .endp diff --git a/grafproc.asm b/grafproc.asm index 5911d90..7f60054 100644 --- a/grafproc.asm +++ b/grafproc.asm @@ -1597,19 +1597,41 @@ NotHigher ;-------------------------------------------------------- .proc DisplayOffensiveTextNr ; - ldx TextNumberOff - lda talk.OffensiveTextTableL,x - sta LineAddress4x4 - lda talk.OffensiveTextTableH,x - sta LineAddress4x4+1 - inx ; the next text - lda talk.OffensiveTextTableH,x - sta temp+1 - lda talk.OffensiveTextTableL,x - sta temp ; opty possible - ; substract address of the next text from previous to get text length - sbw temp LineAddress4x4 temp2 - mva temp2 fx + ; all text start from `talk` and end with an inverse. + ; we go through the `talk`, count number of inverses. + ; if equal to TextNumberOff, it is our text, printit + talk_address = temp2 + inverse_counter = temp + + tya + tax ; save Y + mwa #0 inverse_counter + tay ; ldy #0 + mwa #(talk-1) talk_address + +@ + inw talk_address + lda (talk_address),y + spl:inc inverse_counter + lda TextNumberOff + beq zeroth_talk ; special treatment of talk #0 + cmp inverse_counter + bne @- + + inw talk_address ; we were pointing at the char with inverse, must go 1 further +zeroth_talk + mwa talk_address LineAddress4x4 + + ; now find length of the text +@ + iny + lda (talk_address),y + bpl @- + iny + sty fx + + txa ; load Y + tay ;jsr Display4x4AboveTank ;rts @@ -1653,7 +1675,7 @@ NotHigher bpl DOTNnotLessThanZero ;less than zero, so should be zero mwa #0 temp - beq DOTNnoOverflow + beq DOTNnoOverflow ; jmp DOTNnotLessThanZero ;so check if end larger than screenwidth @@ -1786,7 +1808,7 @@ TypeLine4x4Loop ldy LineCharNr lda (LineAddress4x4),y - and #$3f ;always CAPITAL letters + and #$3f ;always CAPITAL letters, also ignore inverse sta CharCode4x4 mwa LineXdraw dx mva LineYdraw dy diff --git a/scorch.bin b/scorch.bin index ba9e94e..4d4b35e 100644 Binary files a/scorch.bin and b/scorch.bin differ diff --git a/scorch.xex b/scorch.xex index 97febd0..8725a75 100644 Binary files a/scorch.xex and b/scorch.xex differ