diff --git a/artwork/TALK1.txt b/artwork/TALK1.txt deleted file mode 100644 index 2ca9011..0000000 --- a/artwork/TALK1.txt +++ /dev/null @@ -1,54 +0,0 @@ -IN TIMES OF TROUBLE, GO WITH WHAT YOU KNOW. -DIE! -EAT MY SHORTS! -YOU'RE TOAST! -BANZAI! -FROM HELL'S HEART I STAB AT THEE... -I DIDN'T DO IT. NOBODY SAW ME DO IT. -TAKE A HIKE! -YOU'RE DEAD MEAT. -MAKE MY DAY. -CHARGE! -ATTACK! -YOU'RE OUTTA HERE. -WATTSA MATTA YOU? -FREEZE, OR I'LL SHOOT! -HA HA HA. -WE COME IN PEACE - SHOOT TO KILL! -IN YOUR FACE! -DIE COMMIE PIG! -I LOVE THE SMELL OF NAPALM IN THE MORNING. -VICTORY! -SHOW SOME RESPECT. -JUST WHO DO YOU THINK YOU ARE? -LOOK OUT BELOW! -KNOCK, KNOCK. -LOOK OVER THERE. -GUESS WHAT'S COMING FOR DINNER? -MERRY CHRISTMAS. -OPEN WIDE! -HERE GOES NOTHING... -DON'T WORRY, IT ISN'T A LIVE ROUND. -BLOOD, PAIN, VIOLENCE! -TAKE THIS, SISSY! -I SHALL FLATTEN YOU! -I SHALL SMASH YOUR UGLY TANK! -I WONDER WHAT THIS BUTTON DOES? -DON'T TAKE THIS PERSONALLY. -WOULD THIS MAKE YOU MAD? -I TOLD YOU TO LEAVE MY SISTER ALONE! -I COULD SPARE YOU, BUT WHY? -MY BOMB IS BIGGER THAN YOURS. -DON'T FORGET ABOUT ME! -HASTA LA VISTA, BABY! -THIS IS YOUR BRAIN ON SCORCH. -TAKE THIS! -THIS SCREEN AIN'T BIG ENOUGH FOR THE BOTH OF US. -DIE, ALIEN SWINE! -SAY 'ARRGGHHHHH....' -I SHALL OIL MY TURRET WITH YOUR BLOOD. -DIE, TANK-SCUM! -I'M GONNA BREAK YOUR FACE! -MAMA SAID KNOCK YOU OUT! -I HOPE YOU ENJOY PAIN! -PARTING IS SUCH SWEET SORROW... NOT! diff --git a/artwork/TALK2.txt b/artwork/TALK2.txt deleted file mode 100644 index ef9156a..0000000 --- a/artwork/TALK2.txt +++ /dev/null @@ -1,60 +0,0 @@ -UGH! -AARGH! -AAAGGHHH! -I'M MELTING! -OOF.. -OH! -EEEK! -AACCH! -I HATE IT WHEN THAT HAPPENS. -ONE DIRECT HIT CAN RUIN YOUR WHOLE DAY. -OH NO! -NOT ME! -OUCH. -OH NO, NOT AGAIN. -ANOTHER ONE BITES THE DUST. -GOODBYE. -HELP ME! -FAREWELL, CRUEL WORLD. -REMEMBER THE ALAMO! -OH MAN! -DOOUGH! -ANOTHER DAY, ANOTHER BOMB. -THIS IS THE END, MY ONLY FRIEND. -IT'S ALL OVER. -THE FAT LADY SANG. -WHY DOES EVERYTHING HAPPEN TO ME? -I'M GOING DOWN. -I'VE GOT A BAD FEELING ABOUT THIS. -CRAPOLA. -POW! -BIF! -BAM! -ZONK! -I SHOULD'VE LISTENED TO MY MOTHER... -NO... A BUD LIGHT! -WHAT WAS THAT NOISE? -MAMA SAID THERE'D BE DAYS LIKE THIS. -ITS JUST ONE OF THOSE DAYS... -I SEE A BRIGHT LIGHT... -MOMMY? IS THAT YOU? -I LET YOU HIT ME! -SUCKER SHOT! -I DIDN'T WANT TO LIVE ANYWAY. --- -WAS THAT AS CLOSE AS I THINK IT WAS? -JOIN THE ARMY, SEE THE WORLD THEY SAID. -IT WASN'T JUST A JOB IT WAS AN ADVENTURE! -I DIDN'T LIKE VIOLENCE ANYWAY! -I THOUGHT YOU LIKED ME? -SUCH SENSELESS VIOLENCE! I DON'T UNDERSTAND IT. -I THINK THIS GUY'S A LITTLE CRAZY. -SOMEHOW I DON'T FEEL LIKE KILLING ANYMORE. -HEY! KILLIN' AIN'T COOL. -GEE... THANKS. -I'VE FALLEN AND I CAN'T GET UP! -911? -OH NO! HERE I BLOW AGAIN! -I'LL BE BACK... -HEY - I'VE GOT LAWYERS. -TIME TO CALL 1-900-SUE-TANK. diff --git a/artwork/sfx/scorch_trial07_stripped.rmt b/artwork/sfx/scorch_trial07_stripped.rmt deleted file mode 100644 index 9bef4ce..0000000 Binary files a/artwork/sfx/scorch_trial07_stripped.rmt and /dev/null differ diff --git a/artwork/sfx/scorch_trial09_stripped.rmt b/artwork/sfx/scorch_trial09_stripped.rmt deleted file mode 100644 index 225bb86..0000000 Binary files a/artwork/sfx/scorch_trial09_stripped.rmt and /dev/null differ diff --git a/artwork/sfx/scorch_trial0g_stripped.rmt b/artwork/sfx/scorch_trial0h_stripped.rmt similarity index 50% rename from artwork/sfx/scorch_trial0g_stripped.rmt rename to artwork/sfx/scorch_trial0h_stripped.rmt index 95855e3..f2646c9 100644 Binary files a/artwork/sfx/scorch_trial0g_stripped.rmt and b/artwork/sfx/scorch_trial0h_stripped.rmt differ diff --git a/artwork/tanks.fnt b/artwork/tanks.fnt deleted file mode 100644 index 100ef24..0000000 Binary files a/artwork/tanks.fnt and /dev/null differ diff --git a/artwork/tanksv2.fnt b/artwork/tanksv2.fnt deleted file mode 100644 index d4461ac..0000000 Binary files a/artwork/tanksv2.fnt and /dev/null differ diff --git a/artwork/weapons.fnt b/artwork/weapons.fnt deleted file mode 100644 index 0bccd80..0000000 Binary files a/artwork/weapons.fnt and /dev/null differ diff --git a/definitions.asm b/definitions.asm index 06da232..f4b1e52 100644 --- a/definitions.asm +++ b/definitions.asm @@ -199,7 +199,8 @@ sfx_white_flag = $1d ;4 ; RMT songs (lines) ;-------------------------------- song_silencio = $00 -song_end_round = $02 +song_main_menu = $02 song_ingame = $06 -song_old_game_over = $0b +song_round_over = $0b song_game_over = $0e +song_ending_looped = $11 diff --git a/grafproc.asm b/grafproc.asm index 073a8e9..40f2072 100644 --- a/grafproc.asm +++ b/grafproc.asm @@ -1084,7 +1084,7 @@ EndOfFCycle ; here we draw parachute ldx TankNr jsr DrawTankParachute - jsr WaitOneFrame ; onli if tank with patachute + jsr WaitOneFrame ; only if tank with parachute RapidFalling DoNotDrawParachute lda EndOfTheFallFlag diff --git a/scorch.asm b/scorch.asm index cc3d052..02e8344 100644 --- a/scorch.asm +++ b/scorch.asm @@ -131,6 +131,10 @@ START jsr Initialize ;jsr GameOverScreen ; only for test !!! + + lda #song_main_menu + jsr RmtSongSelect + jsr Options ;startup screen lda escFlag @@ -174,7 +178,7 @@ MainGameLoop ; Results are number of other deaths ; before the player dies itself - lda #song_end_round + lda #song_round_over jsr RmtSongSelect jsr DisplayResults @@ -1433,7 +1437,8 @@ checkForHuman ; if all in skillTable other than 0 then switch to DEMO MODE dex bpl checkForHuman ; no people, just wait a bit - pause 150 + pause 250 + pause 50 jmp noKey peopleAreHere @@ -1485,7 +1490,7 @@ TankFont MODUL equ $b000 ;address of RMT module opt h- ;RMT module is standard Atari binary file already - ins "artwork/sfx/scorch_trial0g_stripped.rmt" ;include music RMT module + ins "artwork/sfx/scorch_trial0h_stripped.rmt" ;include music RMT module opt h+ ; ; diff --git a/scorch.xex b/scorch.xex index 025c9f4..3e10c5c 100644 Binary files a/scorch.xex and b/scorch.xex differ diff --git a/textproc.asm b/textproc.asm index 0884e7d..7058e68 100644 --- a/textproc.asm +++ b/textproc.asm @@ -1923,7 +1923,7 @@ MakeAllTanksVisible bpl MakeAllTanksVisible ; start music and animations - lda #song_game_over + lda #song_ending_looped jsr RmtSongSelect ; initial tank positions randomization ldx #(MaxPlayers-1) ;maxNumberOfPlayers-1